diff --git a/.eslintrc.js b/.eslintrc.js
index 7574bf64..2b09c43c 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -10,6 +10,7 @@ module.exports = {
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'arrow-body-style': 'off',
     'prefer-arrow-callback': 'off',
+    'vue/no-mutating-props': 'off',
     'vue/multi-word-component-names': 'off',
     'vue/no-useless-template-attributes': 'off',
   },
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c78e4097..d49750f2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,11 +24,8 @@ jobs:
       - name: Install Dependencies
         run: yarn
 
-      - name: Install RPM
-        run: HOMEBREW_NO_AUTO_UPDATE=1 brew install rpm
-
       - name: Run build
         env:
           CSC_IDENTITY_AUTO_DISCOVERY: false
           APPLE_NOTARIZE: 0
-        run: yarn electron:build -mwl --publish never
+        run: yarn electron:build -mw --publish never
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 29a6c700..b1676bdf 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -34,13 +34,12 @@ jobs:
       - name: Run build
         env:
           APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_APP_PASSWORD: ${{ secrets.APPLE_APP_PASSWORD }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
           CSC_IDENTITY_AUTO_DISCOVERY: true
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          APPLE_NOTARIZE: 1
         run: |
           yarn set version 1.22.18
           yarn electron:build --mac --publish always
diff --git a/README.md b/README.md
index 7ed78e16..70335ca6 100644
--- a/README.md
+++ b/README.md
@@ -121,8 +121,7 @@ If you want to contribute code then you can fork this repo, make changes and rai
 
 ## Links
 
-- [Telegram Group](https://t.me/frappebooks): Used for discussions regarding features, issues, changes, etc. This group is also be used to make decisions regarding project direction.
-- [Project Board](https://github.com/frappe/books/projects/1): Roadmap that is updated with acceptable latency.
+- [Telegram Group](https://t.me/frappebooks): Used for discussions and decisions regarding everything Frappe Books.
 - [GitHub Discussions](https://github.com/frappe/books/discussions): Used for discussions around a specific topic.
 - [Frappe Books Blog](https://tech.frappebooks.com/): Sporadically updated dev blog regarding the development of this project.
 
diff --git a/backend/patches/createInventoryNumberSeries.ts b/backend/patches/createInventoryNumberSeries.ts
index 2852691a..96410427 100644
--- a/backend/patches/createInventoryNumberSeries.ts
+++ b/backend/patches/createInventoryNumberSeries.ts
@@ -2,9 +2,19 @@ import { getDefaultMetaFieldValueMap } from '../../backend/helpers';
 import { DatabaseManager } from '../database/manager';
 
 async function execute(dm: DatabaseManager) {
+  const s = (await dm.db?.getAll('SingleValue', {
+    fields: ['value'],
+    filters: { fieldname: 'setupComplete' },
+  })) as { value: string }[];
+
+  if (!Number(s?.[0]?.value ?? '0')) {
+    return;
+  }
+
   const names: Record<string, string> = {
     StockMovement: 'SMOV-',
-    Shipment: 'SHP-',
+    PurchaseReceipt: 'PREC-',
+    Shipment: 'SHPM-',
   };
 
   for (const referenceType in names) {
diff --git a/build/notarize.js b/build/notarize.js
deleted file mode 100644
index 56fdfeb6..00000000
--- a/build/notarize.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const { notarize } = require('electron-notarize');
-
-exports.default = async (context) => {
-  const { electronPlatformName, appOutDir } = context;
-  if (
-    electronPlatformName !== 'darwin' ||
-    !parseInt(process.env.APPLE_NOTARIZE)
-  ) {
-    return;
-  }
-
-  const appName = context.packager.appInfo.productFilename;
-
-  return await notarize({
-    appBundleId: 'io.frappe.books',
-    appPath: `${appOutDir}/${appName}.app`,
-    appleId: process.env.APPLE_ID,
-    appleIdPassword: process.env.APPLE_APP_PASSWORD,
-    teamId: process.env.APPLE_TEAM_ID,
-  });
-};
diff --git a/electron-builder.yml b/electron-builder.yml
index 63de2d59..95647edb 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -1,6 +1,5 @@
 productName: Frappe Books
 appId: io.frappe.books
-afterSign: build/notarize.js
 asarUnpack: '**/*.node'
 extraResources:
   [
@@ -11,6 +10,8 @@ mac:
   type: distribution
   category: public.app-category.finance
   icon: build/icon.icns
+  notarize:
+    appBundleId: io.frappe.books
   hardenedRuntime: true
   gatekeeperAssess: false
   darkModeSupport: false
diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts
index 7a3c2d55..c9220163 100644
--- a/fyo/core/converter.ts
+++ b/fyo/core/converter.ts
@@ -3,7 +3,6 @@ import { Doc } from 'fyo/model/doc';
 import { isPesa } from 'fyo/utils';
 import { ValueError } from 'fyo/utils/errors';
 import { DateTime } from 'luxon';
-import { Money } from 'pesa';
 import { Field, FieldTypeEnum, RawValue, TargetField } from 'schemas/types';
 import { getIsNullOrUndef, safeParseFloat, safeParseInt } from 'utils';
 import { DatabaseHandler } from './dbHandler';
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index c78d9aba..18128bfd 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -5,7 +5,6 @@ import { Verb } from 'fyo/telemetry/types';
 import { DEFAULT_USER } from 'fyo/utils/consts';
 import { ConflictError, MandatoryError, NotFoundError } from 'fyo/utils/errors';
 import Observable from 'fyo/utils/observable';
-import { Money } from 'pesa';
 import {
   DynamicLinkField,
   Field,
@@ -142,6 +141,10 @@ export class Doc extends Observable<DocValue | Doc[]> {
       return false;
     }
 
+    if (this.schema.isChild) {
+      return false;
+    }
+
     if (!this.schema.isSubmittable) {
       return true;
     }
@@ -186,6 +189,14 @@ export class Doc extends Observable<DocValue | Doc[]> {
       return false;
     }
 
+    if (this.schema.isSingle) {
+      return false;
+    }
+
+    if (this.schema.isChild) {
+      return false;
+    }
+
     return true;
   }
 
diff --git a/fyo/utils/format.ts b/fyo/utils/format.ts
index d5c80df1..335addb9 100644
--- a/fyo/utils/format.ts
+++ b/fyo/utils/format.ts
@@ -188,7 +188,7 @@ function getField(df: string | Field): Field {
       label: '',
       fieldname: '',
       fieldtype: df as FieldType,
-    };
+    } as Field;
   }
 
   return df;
diff --git a/fyo/utils/index.ts b/fyo/utils/index.ts
index c35bbff9..e7bad878 100644
--- a/fyo/utils/index.ts
+++ b/fyo/utils/index.ts
@@ -1,8 +1,9 @@
 import { Fyo } from 'fyo';
+import { DocValue } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
 import { Action } from 'fyo/model/types';
 import { Money } from 'pesa';
-import { Field, OptionField, SelectOption } from 'schemas/types';
+import { Field, FieldType, OptionField, SelectOption } from 'schemas/types';
 import { getIsNullOrUndef, safeParseInt } from 'utils';
 
 export function slug(str: string) {
@@ -109,3 +110,34 @@ function getRawOptionList(field: Field, doc: Doc | undefined | null) {
 
   return getList(doc!);
 }
+
+export function getEmptyValuesByFieldTypes(
+  fieldtype: FieldType,
+  fyo: Fyo
+): DocValue {
+  switch (fieldtype) {
+    case 'Date':
+    case 'Datetime':
+      return new Date();
+    case 'Float':
+    case 'Int':
+      return 0;
+    case 'Currency':
+      return fyo.pesa(0);
+    case 'Check':
+      return false;
+    case 'DynamicLink':
+    case 'Link':
+    case 'Select':
+    case 'AutoComplete':
+    case 'Text':
+    case 'Data':
+    case 'Color':
+      return null;
+    case 'Table':
+    case 'Attachment':
+    case 'AttachImage':
+    default:
+      return null;
+  }
+}
diff --git a/models/inventory/StockMovement.ts b/models/inventory/StockMovement.ts
index 070d8c95..15632c19 100644
--- a/models/inventory/StockMovement.ts
+++ b/models/inventory/StockMovement.ts
@@ -6,7 +6,12 @@ import {
   FormulaMap,
   ListViewSettings,
 } from 'fyo/model/types';
-import { addItem, getDocStatusListColumn, getLedgerLinkAction } from 'models/helpers';
+import { ValidationError } from 'fyo/utils/errors';
+import {
+  addItem,
+  getDocStatusListColumn,
+  getLedgerLinkAction,
+} from 'models/helpers';
 import { LedgerPosting } from 'models/Transactional/LedgerPosting';
 import { ModelNameEnum } from 'models/types';
 import { Money } from 'pesa';
@@ -42,6 +47,24 @@ export class StockMovement extends Transfer {
     },
   };
 
+  async validate() {
+    await super.validate();
+    if (this.movementType !== MovementType.Manufacture) {
+      return;
+    }
+
+    const hasFrom = this.items?.findIndex((f) => f.fromLocation) !== -1;
+    const hasTo = this.items?.findIndex((f) => f.toLocation) !== -1;
+
+    if (!hasFrom) {
+      throw new ValidationError(this.fyo.t`Item with From location not found`);
+    }
+
+    if (!hasTo) {
+      throw new ValidationError(this.fyo.t`Item with To location not found`);
+    }
+  }
+
   static filters: FiltersMap = {
     numberSeries: () => ({ referenceType: ModelNameEnum.StockMovement }),
   };
@@ -68,6 +91,7 @@ export class StockMovement extends Transfer {
                 [MovementType.MaterialIssue]: fyo.t`Material Issue`,
                 [MovementType.MaterialReceipt]: fyo.t`Material Receipt`,
                 [MovementType.MaterialTransfer]: fyo.t`Material Transfer`,
+                [MovementType.Manufacture]: fyo.t`Manufacture`,
               }[movementType] ?? '';
 
             return {
diff --git a/models/inventory/StockMovementItem.ts b/models/inventory/StockMovementItem.ts
index 7ce8742e..1276227a 100644
--- a/models/inventory/StockMovementItem.ts
+++ b/models/inventory/StockMovementItem.ts
@@ -4,7 +4,9 @@ import {
   FormulaMap,
   ReadOnlyMap,
   RequiredMap,
+  ValidationMap,
 } from 'fyo/model/types';
+import { ValidationError } from 'fyo/utils/errors';
 import { ModelNameEnum } from 'models/types';
 import { Money } from 'pesa';
 import { StockMovement } from './StockMovement';
@@ -33,6 +35,10 @@ export class StockMovementItem extends Doc {
     return this.parentdoc?.movementType === MovementType.MaterialTransfer;
   }
 
+  get isManufacture() {
+    return this.parentdoc?.movementType === MovementType.Manufacture;
+  }
+
   static filters: FiltersMap = {
     item: () => ({ trackItem: true }),
   };
@@ -53,14 +59,14 @@ export class StockMovementItem extends Doc {
       dependsOn: ['item', 'rate', 'quantity'],
     },
     fromLocation: {
-      formula: (fn) => {
-        if (this.isReceipt || this.isTransfer) {
+      formula: () => {
+        if (this.isReceipt || this.isTransfer || this.isManufacture) {
           return null;
         }
 
         const defaultLocation = this.fyo.singles.InventorySettings
           ?.defaultLocation as string | undefined;
-        if (defaultLocation && !this.location && this.isIssue) {
+        if (defaultLocation && !this.fromLocation && this.isIssue) {
           return defaultLocation;
         }
 
@@ -69,14 +75,14 @@ export class StockMovementItem extends Doc {
       dependsOn: ['movementType'],
     },
     toLocation: {
-      formula: (fn) => {
-        if (this.isIssue || this.isTransfer) {
+      formula: () => {
+        if (this.isIssue || this.isTransfer || this.isManufacture) {
           return null;
         }
 
         const defaultLocation = this.fyo.singles.InventorySettings
           ?.defaultLocation as string | undefined;
-        if (defaultLocation && !this.location && this.isReceipt) {
+        if (defaultLocation && !this.toLocation && this.isReceipt) {
           return defaultLocation;
         }
 
@@ -86,6 +92,31 @@ export class StockMovementItem extends Doc {
     },
   };
 
+  validations: ValidationMap = {
+    fromLocation: (value) => {
+      if (!this.isManufacture) {
+        return;
+      }
+
+      if (value && this.toLocation) {
+        throw new ValidationError(
+          this.fyo.t`Only From or To can be set for Manucature`
+        );
+      }
+    },
+    toLocation: (value) => {
+      if (!this.isManufacture) {
+        return;
+      }
+
+      if (value && this.fromLocation) {
+        throw new ValidationError(
+          this.fyo.t`Only From or To can be set for Manufacture`
+        );
+      }
+    },
+  };
+
   required: RequiredMap = {
     fromLocation: () => this.isIssue || this.isTransfer,
     toLocation: () => this.isReceipt || this.isTransfer,
diff --git a/models/inventory/tests/testStockMovement.spec.ts b/models/inventory/tests/testStockMovement.spec.ts
new file mode 100644
index 00000000..8de6a767
--- /dev/null
+++ b/models/inventory/tests/testStockMovement.spec.ts
@@ -0,0 +1,136 @@
+import { ModelNameEnum } from 'models/types';
+import test from 'tape';
+import { getItem } from './helpers';
+import { closeTestFyo, getTestFyo, setupTestFyo } from 'tests/helpers';
+import { MovementType } from '../types';
+import {
+  assertDoesNotThrow,
+  assertThrows,
+} from 'backend/database/tests/helpers';
+import { StockMovement } from '../StockMovement';
+
+const fyo = getTestFyo();
+setupTestFyo(fyo, __filename);
+
+test('check store and create test items', async (t) => {
+  const e = await fyo.db.exists(ModelNameEnum.Location, 'Stores');
+  t.equals(e, true, 'location Stores exist');
+
+  const items = [
+    getItem('RawOne', 100),
+    getItem('RawTwo', 100),
+    getItem('Final', 200),
+  ];
+
+  const exists: boolean[] = [];
+  for (const item of items) {
+    await fyo.doc.getNewDoc('Item', item).sync();
+    exists.push(await fyo.db.exists('Item', item.name));
+  }
+
+  t.ok(exists.every(Boolean), 'items created');
+});
+
+test('Stock Movement, Material Receipt', async (t) => {
+  const sm = fyo.doc.getNewDoc(ModelNameEnum.StockMovement);
+
+  await sm.set({
+    date: new Date('2022-01-01'),
+    movementType: MovementType.MaterialReceipt,
+  });
+
+  await sm.append('items', {
+    item: 'RawOne',
+    quantity: 1,
+    rate: 100,
+    toLocation: 'Stores',
+  });
+
+  await sm.append('items', {
+    item: 'RawTwo',
+    quantity: 1,
+    rate: 100,
+    toLocation: 'Stores',
+  });
+
+  await assertDoesNotThrow(async () => await sm.sync());
+  await assertDoesNotThrow(async () => await sm.submit());
+
+  t.equal(
+    await fyo.db.getStockQuantity('RawOne', 'Stores'),
+    1,
+    'item RawOne added'
+  );
+  t.equal(
+    await fyo.db.getStockQuantity('RawTwo', 'Stores'),
+    1,
+    'item RawTwo added'
+  );
+  t.equal(
+    await fyo.db.getStockQuantity('Final', 'Stores'),
+    null,
+    'item Final not yet added'
+  );
+});
+
+test('Stock Movement, Manufacture', async (t) => {
+  const sm = fyo.doc.getNewDoc(ModelNameEnum.StockMovement) as StockMovement;
+
+  await sm.set({
+    date: new Date('2022-01-02'),
+    movementType: MovementType.Manufacture,
+  });
+
+  await sm.append('items', {
+    item: 'RawOne',
+    quantity: 1,
+    rate: 100,
+  });
+
+  await assertDoesNotThrow(
+    async () => await sm.items?.[0].set('fromLocation', 'Stores')
+  );
+  await assertThrows(
+    async () => await sm.items?.[0].set('toLocation', 'Stores')
+  );
+  t.notOk(sm.items?.[0].to, 'to location not set');
+
+  await sm.append('items', {
+    item: 'RawTwo',
+    quantity: 1,
+    rate: 100,
+    fromLocation: 'Stores',
+  });
+
+  await assertThrows(async () => await sm.sync());
+
+  await sm.append('items', {
+    item: 'Final',
+    quantity: 1,
+    rate: 100,
+    toLocation: 'Stores',
+  });
+
+  await assertDoesNotThrow(async () => await sm.sync());
+  await assertDoesNotThrow(async () => await sm.submit());
+
+  t.equal(
+    await fyo.db.getStockQuantity('RawOne', 'Stores'),
+    0,
+    'item RawOne removed'
+  );
+
+  t.equal(
+    await fyo.db.getStockQuantity('RawTwo', 'Stores'),
+    0,
+    'item RawTwo removed'
+  );
+
+  t.equal(
+    await fyo.db.getStockQuantity('Final', 'Stores'),
+    1,
+    'item Final added'
+  );
+});
+
+closeTestFyo(fyo, __filename);
diff --git a/models/inventory/types.ts b/models/inventory/types.ts
index 0809a0e4..c07bc3e4 100644
--- a/models/inventory/types.ts
+++ b/models/inventory/types.ts
@@ -9,6 +9,7 @@ export enum MovementType {
   'MaterialIssue' = 'MaterialIssue',
   'MaterialReceipt' = 'MaterialReceipt',
   'MaterialTransfer' = 'MaterialTransfer',
+  'Manufacture' = 'Manufacture',
 }
 
 export interface SMDetails {
diff --git a/package.json b/package.json
index 9fc4e14a..06fda008 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frappe-books",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Simple book-keeping app for everyone",
   "main": "background.js",
   "author": {
@@ -55,10 +55,9 @@
     "autoprefixer": "^9",
     "babel-loader": "^8.2.3",
     "dotenv": "^16.0.0",
-    "electron": "^18.3.7",
-    "electron-builder": "^23.0.3",
+    "electron": "18.3.7",
+    "electron-builder": "24.0.0-alpha.12",
     "electron-devtools-installer": "^3.2.0",
-    "electron-notarize": "^1.1.1",
     "electron-rebuild": "^3.2.9",
     "electron-updater": "^5.2.1",
     "eslint": "^7.32.0",
@@ -81,7 +80,7 @@
     "webpack": "^5.66.0"
   },
   "resolutions": {
-    "electron-builder": "^23.3.3"
+    "electron-builder": "24.0.0-alpha.12"
   },
   "prettier": {
     "semi": true,
diff --git a/reports/types.ts b/reports/types.ts
index 416df57b..8e010b44 100644
--- a/reports/types.ts
+++ b/reports/types.ts
@@ -1,6 +1,6 @@
 import { DateTime } from 'luxon';
 import { AccountRootType } from 'models/baseModels/Account/types';
-import { BaseField, RawValue } from 'schemas/types';
+import { BaseField, FieldType, RawValue } from 'schemas/types';
 
 export type ExportExtention = 'csv' | 'json';
 
@@ -24,7 +24,8 @@ export interface ReportRow {
   foldedBelow?: boolean;
 }
 export type ReportData = ReportRow[];
-export interface ColumnField extends BaseField {
+export interface ColumnField extends Omit<BaseField, 'fieldtype'> {
+  fieldtype: FieldType;
   align?: 'left' | 'right' | 'center';
   width?: number;
 }
diff --git a/schemas/app/Party.json b/schemas/app/Party.json
index 96ceff80..820efd1d 100644
--- a/schemas/app/Party.json
+++ b/schemas/app/Party.json
@@ -73,7 +73,6 @@
       "label": "Address",
       "fieldtype": "Link",
       "target": "Address",
-      "placeholder": "Click to create",
       "inline": true
     },
     {
diff --git a/schemas/app/PrintSettings.json b/schemas/app/PrintSettings.json
index ed88843e..1499093e 100644
--- a/schemas/app/PrintSettings.json
+++ b/schemas/app/PrintSettings.json
@@ -40,7 +40,6 @@
       "label": "Address",
       "fieldtype": "Link",
       "target": "Address",
-      "placeholder": "Click to create",
       "inline": true
     },
     {
diff --git a/schemas/app/inventory/Location.json b/schemas/app/inventory/Location.json
index 6926aaee..45161032 100644
--- a/schemas/app/inventory/Location.json
+++ b/schemas/app/inventory/Location.json
@@ -16,7 +16,6 @@
       "label": "Address",
       "fieldtype": "Link",
       "target": "Address",
-      "placeholder": "Click to create",
       "inline": true
     }
   ],
diff --git a/schemas/app/inventory/StockMovement.json b/schemas/app/inventory/StockMovement.json
index b4d41684..99651250 100644
--- a/schemas/app/inventory/StockMovement.json
+++ b/schemas/app/inventory/StockMovement.json
@@ -35,6 +35,10 @@
         {
           "value": "MaterialTransfer",
           "label": "Material Transfer"
+        },
+        {
+          "value": "Manufacture",
+          "label": "Manufacture"
         }
       ],
       "required": true
diff --git a/schemas/tests/Party.json b/schemas/tests/Party.json
index 121a7065..b833ec4e 100644
--- a/schemas/tests/Party.json
+++ b/schemas/tests/Party.json
@@ -73,7 +73,6 @@
       "label": "Address",
       "fieldtype": "Link",
       "target": "Address",
-      "placeholder": "Click to create",
       "inline": true
     }
   ],
diff --git a/schemas/types.ts b/schemas/types.ts
index 10ffa0b8..2cf49c28 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -1,28 +1,56 @@
-export enum FieldTypeEnum {
-  Data = 'Data',
-  Select = 'Select',
-  Link = 'Link',
-  Date = 'Date',
-  Datetime = 'Datetime',
-  Table = 'Table',
-  AutoComplete = 'AutoComplete',
-  Check = 'Check',
-  AttachImage = 'AttachImage',
-  DynamicLink = 'DynamicLink',
-  Int = 'Int',
-  Float = 'Float',
-  Currency = 'Currency',
-  Text = 'Text',
-  Color = 'Color',
-  Attachment = 'Attachment',
-}
+import { PropertyEnum } from "utils/types";
+
+export type FieldType =
+  | 'Data'
+  | 'Select'
+  | 'Link'
+  | 'Date'
+  | 'Datetime'
+  | 'Table'
+  | 'AutoComplete'
+  | 'Check'
+  | 'AttachImage'
+  | 'DynamicLink'
+  | 'Int'
+  | 'Float'
+  | 'Currency'
+  | 'Text'
+  | 'Color'
+  | 'Attachment';
+
+export const FieldTypeEnum: PropertyEnum<Record<FieldType, FieldType>> = {
+  Data: 'Data',
+  Select: 'Select',
+  Link: 'Link',
+  Date: 'Date',
+  Datetime: 'Datetime',
+  Table: 'Table',
+  AutoComplete: 'AutoComplete',
+  Check: 'Check',
+  AttachImage: 'AttachImage',
+  DynamicLink: 'DynamicLink',
+  Int: 'Int',
+  Float: 'Float',
+  Currency: 'Currency',
+  Text: 'Text',
+  Color: 'Color',
+  Attachment: 'Attachment',
+};
+
+type OptionFieldType = 'Select' | 'AutoComplete' | 'Color';
+type TargetFieldType = 'Table' | 'Link';
+type NumberFieldType = 'Int' | 'Float';
+type DynamicLinkFieldType = 'DynamicLink';
+type BaseFieldType = Exclude<
+  FieldType,
+  TargetFieldType | DynamicLinkFieldType | OptionFieldType | NumberFieldType
+>;
 
-export type FieldType = keyof typeof FieldTypeEnum;
 export type RawValue = string | number | boolean | null;
 
 export interface BaseField {
-  fieldname: string;             // Column name in the db
-  fieldtype: FieldType;          // UI Descriptive field types that map to column types
+  fieldname: string;              // Column name in the db
+  fieldtype: BaseFieldType;       // UI Descriptive field types that map to column types
   label: string;                 // Translateable UI facing name
   schemaName?: string;           // Convenient access to schemaName incase just the field is passed
   required?: boolean;            // Implies Not Null
@@ -39,31 +67,28 @@ export interface BaseField {
 }
 
 export type SelectOption = { value: string; label: string };
-export interface OptionField extends BaseField {
-  fieldtype:
-    | FieldTypeEnum.Select
-    | FieldTypeEnum.AutoComplete
-    | FieldTypeEnum.Color;
+export interface OptionField extends Omit<BaseField, 'fieldtype'> {
+  fieldtype: OptionFieldType;
   options: SelectOption[];
   emptyMessage?: string;
   allowCustom?: boolean;
 }
 
-export interface TargetField extends BaseField {
-  fieldtype: FieldTypeEnum.Table | FieldTypeEnum.Link;
+export interface TargetField extends Omit<BaseField, 'fieldtype'> {
+  fieldtype: TargetFieldType;
   target: string;                // Name of the table or group of tables to fetch values
   create?: boolean;              // Whether to show Create in the dropdown
   edit?: boolean;                // Whether the Table has quick editable columns
 }
 
-export interface DynamicLinkField extends BaseField {
-  fieldtype: FieldTypeEnum.DynamicLink;
+export interface DynamicLinkField extends Omit<BaseField, 'fieldtype'> {
+  fieldtype: DynamicLinkFieldType;
   emptyMessage?: string;
   references: string;            // Reference to an option field that links to schema
 }
 
-export interface NumberField extends BaseField {
-  fieldtype: FieldTypeEnum.Float | FieldTypeEnum.Int;
+export interface NumberField extends Omit<BaseField, 'fieldtype'> {
+  fieldtype: NumberFieldType;
   minvalue?: number;             // UI Facing used to restrict lower bound
   maxvalue?: number;             // UI Facing used to restrict upper bound
 }
@@ -80,7 +105,7 @@ export type Naming = 'autoincrement' | 'random' | 'numberSeries' | 'manual';
 export interface Schema {
   name: string;                  // Table name
   label: string;                 // Translateable UI facing name
-  fields: Field[];               // Maps to database columns
+  fields: Field[];                // Maps to database columns
   isTree?: boolean;              // Used for nested set, eg for Chart of Accounts
   extends?: string;              // Value points to an Abstract schema. Indicates Subclass schema
   isChild?: boolean;             // Indicates a child table, i.e table with "parent" FK column
diff --git a/src/App.vue b/src/App.vue
index 40cb66de..f3312327 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -41,6 +41,7 @@
 import { ConfigKeys } from 'fyo/core/types';
 import { RTL_LANGUAGES } from 'fyo/utils/consts';
 import { ModelNameEnum } from 'models/types';
+import { systemLanguageRef } from 'src/utils/refs';
 import { computed } from 'vue';
 import WindowsTitleBar from './components/WindowsTitleBar.vue';
 import { handleErrorWithDialog } from './errorHandling';
@@ -54,6 +55,7 @@ import { initializeInstance } from './utils/initialization';
 import { checkForUpdates } from './utils/ipcCalls';
 import { updateConfigFiles } from './utils/misc';
 import { Search } from './utils/search';
+import { setGlobalShortcuts } from './utils/shortcuts';
 import { routeTo } from './utils/ui';
 import { Shortcuts, useKeys } from './utils/vueUtils';
 
@@ -69,8 +71,6 @@ export default {
       companyName: '',
       searcher: null,
       shortcuts: null,
-      languageDirection: 'ltr',
-      language: '',
     };
   },
   provide() {
@@ -88,11 +88,8 @@ export default {
     WindowsTitleBar,
   },
   async mounted() {
-    this.language = fyo.config.get('language');
-    this.languageDirection = RTL_LANGUAGES.includes(this.language)
-      ? 'rtl'
-      : 'ltr';
-    this.shortcuts = new Shortcuts(this.keys);
+    const shortcuts = new Shortcuts(this.keys);
+    this.shortcuts = shortcuts;
     const lastSelectedFilePath = fyo.config.get(
       ConfigKeys.LastSelectedFilePath,
       null
@@ -108,6 +105,16 @@ export default {
       await handleErrorWithDialog(err, undefined, true, true);
       await this.showDbSelector();
     }
+
+    setGlobalShortcuts(shortcuts);
+  },
+  computed: {
+    language() {
+      return systemLanguageRef.value;
+    },
+    languageDirection() {
+      return RTL_LANGUAGES.includes(this.language) ? 'rtl' : 'ltr';
+    },
   },
   methods: {
     async setDesk(filePath) {
diff --git a/src/components/Controls/AutoComplete.vue b/src/components/Controls/AutoComplete.vue
index 321289fb..ab65c594 100644
--- a/src/components/Controls/AutoComplete.vue
+++ b/src/components/Controls/AutoComplete.vue
@@ -108,6 +108,10 @@ export default {
         option = this.options.find((o) => o.label === value);
       }
 
+      if (!value && option === undefined) {
+        return null;
+      }
+
       return option?.label ?? oldValue;
     },
     async updateSuggestions(keyword) {
diff --git a/src/components/Controls/Select.vue b/src/components/Controls/Select.vue
index cc5e154e..087c04ba 100644
--- a/src/components/Controls/Select.vue
+++ b/src/components/Controls/Select.vue
@@ -23,7 +23,7 @@
         @change="(e) => triggerChange(e.target.value)"
         @focus="(e) => $emit('focus', e)"
       >
-        <option value="" disabled selected>
+        <option value="" disabled selected v-if="inputPlaceholder">
           {{ inputPlaceholder }}
         </option>
         <option
diff --git a/src/components/Controls/TableRow.vue b/src/components/Controls/TableRow.vue
index 6824adfb..bef30b88 100644
--- a/src/components/Controls/TableRow.vue
+++ b/src/components/Controls/TableRow.vue
@@ -62,6 +62,7 @@
 import { Doc } from 'fyo/model/doc';
 import Row from 'src/components/Row.vue';
 import { getErrorMessage } from 'src/utils';
+import { nextTick } from 'vue';
 import Button from '../Button.vue';
 import FormControl from './FormControl.vue';
 
@@ -102,15 +103,18 @@ export default {
     },
   },
   methods: {
-    onChange(df, value) {
-      if (value == null) {
-        return;
-      }
+    async onChange(df, value) {
+      const fieldname = df.fieldname;
+      this.errors[fieldname] = null;
+      const oldValue = this.row[fieldname];
 
-      this.errors[df.fieldname] = null;
-      this.row.set(df.fieldname, value).catch((e) => {
-        this.errors[df.fieldname] = getErrorMessage(e, this.row);
-      });
+      try {
+        await this.row.set(fieldname, value);
+      } catch (e) {
+        this.errors[fieldname] = getErrorMessage(e, this.row);
+        this.row[fieldname] = '';
+        nextTick(() => (this.row[fieldname] = oldValue));
+      }
     },
     getErrorString() {
       return Object.values(this.errors).filter(Boolean).join(' ');
diff --git a/src/components/Controls/Text.vue b/src/components/Controls/Text.vue
index dbdcc6e7..1d6fda3b 100644
--- a/src/components/Controls/Text.vue
+++ b/src/components/Controls/Text.vue
@@ -6,7 +6,7 @@
     <div :class="showMandatory ? 'show-mandatory' : ''">
       <textarea
         ref="input"
-        rows="3"
+        :rows="rows"
         :class="['resize-none', inputClasses, containerClasses]"
         :value="value"
         :placeholder="inputPlaceholder"
@@ -27,5 +27,6 @@ export default {
   name: 'Text',
   extends: Base,
   emits: ['focus', 'input'],
+  props: { rows: { type: Number, default: 3 } },
 };
 </script>
diff --git a/src/components/FormContainer.vue b/src/components/FormContainer.vue
index dddc9cb2..2ad11f78 100644
--- a/src/components/FormContainer.vue
+++ b/src/components/FormContainer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex bg-gray-25">
+  <div class="flex bg-gray-25 overflow-x-auto">
     <div class="flex flex-1 flex-col">
       <!-- Page Header (Title, Buttons, etc) -->
       <PageHeader :title="title" :border="false" :searchborder="searchborder">
diff --git a/src/components/ImportWizard.vue b/src/components/ImportWizard.vue
deleted file mode 100644
index b8405900..00000000
--- a/src/components/ImportWizard.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-  <div id="importWizard" class="modal-body" style="overflow: hidden;">
-    <div class="mx-auto col-12 text-center pb-3">
-      <input ref="fileInput" @change="importCSV" id="file-input" type="file" />
-      <div class="form-check-label bold">{{ "Drag & Drop a CSV file" }}</div>
-    </div>
-    <div class="row footer-divider mb-3">
-      <div class="col-12" style="border-bottom:1px solid #e9ecef"></div>
-    </div>
-    <div class="row">
-      <div class="col-12 text-end">
-        <f-button primary @click="importCSV">{{ 'Import' }}</f-button>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: ['importHandler', 'report'],
-  methods: {
-    close() {
-      this.$modal.hide();
-    },
-    async importCSV(evt) {
-      if (evt.target.files) {
-        const file = evt.target.files[0];
-        this.importHandler(file, this.report);
-        this.$modal.hide();
-      }
-      this.$refs.fileInput.click();
-    }
-  }
-};
-</script>
-<style scoped>
-.fixed-btn-width {
-  width: 5vw !important;
-}
-.bold {
-  font-size: 1.1rem;
-  font-weight: 600;
-}
-#file-input {
-  position: absolute;
-  left: 0;
-  opacity: 0;
-  width: 100%;
-  height: 100%;
-}
-</style>
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index 34cf627a..a39b8752 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -4,7 +4,7 @@
       class="
         fixed
         top-0
-        left-0
+        start-0
         w-screen
         h-screen
         z-20
@@ -12,19 +12,16 @@
         justify-center
         items-center
       "
-      style="background: rgba(0, 0, 0, 0.2); backdrop-filter: blur(4px)"
+      :style="
+        useBackdrop
+          ? 'background: rgba(0, 0, 0, 0.1); backdrop-filter: blur(2px)'
+          : ''
+      "
       @click="$emit('closemodal')"
       v-if="openModal"
     >
       <div
-        class="
-          bg-white
-          rounded-lg
-          shadow-2xl
-          border
-          overflow-hidden
-          inner
-        "
+        class="bg-white rounded-lg shadow-2xl border overflow-hidden inner"
         v-bind="$attrs"
         @click.stop
       >
@@ -43,6 +40,10 @@ export default defineComponent({
       default: false,
       type: Boolean,
     },
+    useBackdrop: {
+      default: true,
+      type: Boolean,
+    },
   },
   emits: ['closemodal'],
   watch: {
diff --git a/src/components/PageHeader.vue b/src/components/PageHeader.vue
index af34b537..fd436dc2 100644
--- a/src/components/PageHeader.vue
+++ b/src/components/PageHeader.vue
@@ -8,7 +8,7 @@
   >
     <Transition name="spacer">
       <div
-        v-if="!sidebar && platform === 'Mac'"
+        v-if="!sidebar && platform === 'Mac' && languageDirection !== 'rtl'"
         class="h-full"
         :class="sidebar ? '' : 'w-tl me-4 border-e'"
       />
@@ -16,7 +16,10 @@
     <h1 class="text-xl font-semibold select-none" v-if="title">
       {{ title }}
     </h1>
-    <div class="flex items-stretch window-no-drag gap-2 ms-auto">
+    <div
+      class="flex items-stretch window-no-drag gap-2 ms-auto"
+      :class="platform === 'Mac' && languageDirection === 'rtl' ? 'me-18' : ''"
+    >
       <slot />
       <div class="border-e" v-if="showBorder" />
       <BackLink v-if="backLink" class="window-no-drag rtl-rotate-180" />
@@ -30,7 +33,7 @@ import BackLink from './BackLink.vue';
 import SearchBar from './SearchBar.vue';
 
 export default {
-  inject: ['sidebar'],
+  inject: ['sidebar', 'languageDirection'],
   props: {
     title: { type: String, default: '' },
     backLink: { type: Boolean, default: true },
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index a4e02cae..df5583f3 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -4,8 +4,8 @@
     <Button @click="open" class="px-2" :padding="false">
       <feather-icon name="search" class="w-4 h-4 me-1 text-gray-800" />
       <p>{{ t`Search` }}</p>
-      <div class="text-gray-500 px-1 ms-4 text-sm">
-        {{ modKey('k') }}
+      <div class="text-gray-500 px-1 ms-4 text-sm whitespace-nowrap">
+        {{ modKeyText('k') }}
       </div>
     </Button>
   </div>
@@ -16,174 +16,183 @@
     @closemodal="close"
     :set-close-listener="false"
   >
-    <!-- Search Input -->
-    <div class="p-1 w-form">
-      <input
-        ref="input"
-        type="search"
-        autocomplete="off"
-        spellcheck="false"
-        :placeholder="t`Type to search...`"
-        v-model="inputValue"
-        @focus="search"
-        @input="search"
-        @keydown.up="up"
-        @keydown.down="down"
-        @keydown.enter="() => select()"
-        @keydown.esc="close"
-        class="
-          bg-gray-100
-          text-2xl
-          focus:outline-none
-          w-full
-          placeholder-gray-500
-          text-gray-900
-          rounded-md
-          p-3
-        "
-      />
-    </div>
-    <hr v-if="suggestions.length" />
+    <div class="w-form">
+      <!-- Search Input -->
+      <div class="p-1">
+        <input
+          ref="input"
+          type="search"
+          autocomplete="off"
+          spellcheck="false"
+          :placeholder="t`Type to search...`"
+          v-model="inputValue"
+          @focus="search"
+          @input="search"
+          @keydown.up="up"
+          @keydown.down="down"
+          @keydown.enter="() => select()"
+          @keydown.esc="close"
+          class="
+            bg-gray-100
+            text-2xl
+            focus:outline-none
+            w-full
+            placeholder-gray-500
+            text-gray-900
+            rounded-md
+            p-3
+          "
+        />
+      </div>
+      <hr v-if="suggestions.length" />
 
-    <!-- Search List -->
-    <div :style="`max-height: ${49 * 6 - 1}px`" class="overflow-auto">
-      <div
-        v-for="(si, i) in suggestions"
-        :key="`${i}-${si.key}`"
-        ref="suggestions"
-        class="hover:bg-gray-50 cursor-pointer"
-        :class="idx === i ? 'border-blue-500 bg-gray-50 border-s-4' : ''"
-        @click="select(i)"
-      >
-        <!-- Search List Item -->
+      <!-- Search List -->
+      <div :style="`max-height: ${49 * 6 - 1}px`" class="overflow-auto">
         <div
-          class="flex w-full justify-between px-3 items-center"
-          style="height: var(--h-row-mid)"
+          v-for="(si, i) in suggestions"
+          :key="`${i}-${si.key}`"
+          ref="suggestions"
+          class="hover:bg-gray-50 cursor-pointer"
+          :class="idx === i ? 'border-blue-500 bg-gray-50 border-s-4' : ''"
+          @click="select(i)"
         >
-          <div class="flex items-center">
+          <!-- Search List Item -->
+          <div
+            class="flex w-full justify-between px-3 items-center"
+            style="height: var(--h-row-mid)"
+          >
+            <div class="flex items-center">
+              <p
+                :class="idx === i ? 'text-blue-600' : 'text-gray-900'"
+                :style="idx === i ? 'margin-left: -4px' : ''"
+              >
+                {{ si.label }}
+              </p>
+              <p class="text-gray-600 text-sm ms-3" v-if="si.group === 'Docs'">
+                {{ si.more.filter(Boolean).join(', ') }}
+              </p>
+            </div>
             <p
-              :class="idx === i ? 'text-blue-600' : 'text-gray-900'"
-              :style="idx === i ? 'margin-left: -4px' : ''"
+              class="text-sm text-end justify-self-end"
+              :class="`text-${groupColorMap[si.group]}-500`"
             >
-              {{ si.label }}
-            </p>
-            <p class="text-gray-600 text-sm ms-3" v-if="si.group === 'Docs'">
-              {{ si.more.filter(Boolean).join(', ') }}
+              {{
+                si.group === 'Docs' ? si.schemaLabel : groupLabelMap[si.group]
+              }}
             </p>
           </div>
-          <p
-            class="text-sm text-end justify-self-end"
-            :class="`text-${groupColorMap[si.group]}-500`"
-          >
-            {{ si.group === 'Docs' ? si.schemaLabel : groupLabelMap[si.group] }}
-          </p>
-        </div>
 
-        <hr v-if="i !== suggestions.length - 1" />
-      </div>
-    </div>
-
-    <!-- Footer -->
-    <hr />
-    <div class="m-1 flex justify-between flex-col gap-2 text-sm select-none">
-      <!-- Group Filters -->
-      <div class="flex justify-between">
-        <div class="flex gap-1">
-          <button
-            v-for="g in searchGroups"
-            :key="g"
-            class="border px-1 py-0.5 rounded-lg"
-            :class="getGroupFilterButtonClass(g)"
-            @click="searcher.set(g, !searcher.filters.groupFilters[g])"
-          >
-            {{ groupLabelMap[g] }}
-          </button>
-        </div>
-        <button
-          class="hover:text-gray-900 py-0.5 rounded text-gray-700"
-          @click="showMore = !showMore"
-        >
-          {{ showMore ? t`Less Filters` : t`More Filters` }}
-        </button>
-      </div>
-
-      <!-- Additional Filters -->
-      <div v-if="showMore" class="-mt-1">
-        <!-- Group Skip Filters -->
-        <div class="flex gap-1 text-gray-800">
-          <button
-            v-for="s in ['skipTables', 'skipTransactions']"
-            :key="s"
-            class="border px-1 py-0.5 rounded-lg"
-            :class="{ 'bg-gray-200': searcher.filters[s] }"
-            @click="searcher.set(s, !searcher.filters[s])"
-          >
-            {{
-              s === 'skipTables' ? t`Skip Child Tables` : t`Skip Transactions`
-            }}
-          </button>
-        </div>
-
-        <!-- Schema Name Filters -->
-        <div class="flex mt-1 gap-1 text-blue-500 flex-wrap">
-          <button
-            v-for="sf in schemaFilters"
-            :key="sf.value"
-            class="
-              border
-              px-1
-              py-0.5
-              rounded-lg
-              border-blue-100
-              whitespace-nowrap
-            "
-            :class="{ 'bg-blue-100': searcher.filters.schemaFilters[sf.value] }"
-            @click="
-              searcher.set(sf.value, !searcher.filters.schemaFilters[sf.value])
-            "
-          >
-            {{ sf.label }}
-          </button>
+          <hr v-if="i !== suggestions.length - 1" />
         </div>
       </div>
 
-      <!-- Keybindings Help -->
-      <div class="flex text-sm text-gray-500 justify-between items-baseline">
-        <div class="flex gap-4">
-          <p>↑↓ {{ t`Navigate` }}</p>
-          <p>↩ {{ t`Select` }}</p>
-          <p><span class="tracking-tighter">esc</span> {{ t`Close` }}</p>
-          <button
-            class="flex items-center hover:text-gray-800"
-            @click="openDocs"
-          >
-            <feather-icon name="help-circle" class="w-4 h-4 me-1" />
-            {{ t`Help` }}
-          </button>
-        </div>
-
-        <p v-if="searcher?.numSearches" class="ms-auto">
-          {{ t`${suggestions.length} out of ${searcher.numSearches}` }}
-        </p>
-
-        <div
-          class="border border-gray-100 rounded flex justify-self-end ms-2"
-          v-if="(searcher?.numSearches ?? 0) > 50"
-        >
-          <template
-            v-for="c in allowedLimits.filter(
-              (c) => c < searcher.numSearches || c === -1
-            )"
-            :key="c + '-count'"
-          >
+      <!-- Footer -->
+      <hr />
+      <div class="m-1 flex justify-between flex-col gap-2 text-sm select-none">
+        <!-- Group Filters -->
+        <div class="flex justify-between">
+          <div class="flex gap-1">
             <button
-              @click="limit = parseInt(c)"
-              class="w-9"
-              :class="limit === c ? 'bg-gray-100' : ''"
+              v-for="g in searchGroups"
+              :key="g"
+              class="border px-1 py-0.5 rounded-lg"
+              :class="getGroupFilterButtonClass(g)"
+              @click="searcher.set(g, !searcher.filters.groupFilters[g])"
             >
-              {{ c === -1 ? t`All` : c }}
+              {{ groupLabelMap[g] }}
             </button>
-          </template>
+          </div>
+          <button
+            class="hover:text-gray-900 py-0.5 rounded text-gray-700"
+            @click="showMore = !showMore"
+          >
+            {{ showMore ? t`Less Filters` : t`More Filters` }}
+          </button>
+        </div>
+
+        <!-- Additional Filters -->
+        <div v-if="showMore" class="-mt-1">
+          <!-- Group Skip Filters -->
+          <div class="flex gap-1 text-gray-800">
+            <button
+              v-for="s in ['skipTables', 'skipTransactions']"
+              :key="s"
+              class="border px-1 py-0.5 rounded-lg"
+              :class="{ 'bg-gray-200': searcher.filters[s] }"
+              @click="searcher.set(s, !searcher.filters[s])"
+            >
+              {{
+                s === 'skipTables' ? t`Skip Child Tables` : t`Skip Transactions`
+              }}
+            </button>
+          </div>
+
+          <!-- Schema Name Filters -->
+          <div class="flex mt-1 gap-1 text-blue-500 flex-wrap">
+            <button
+              v-for="sf in schemaFilters"
+              :key="sf.value"
+              class="
+                border
+                px-1
+                py-0.5
+                rounded-lg
+                border-blue-100
+                whitespace-nowrap
+              "
+              :class="{
+                'bg-blue-100': searcher.filters.schemaFilters[sf.value],
+              }"
+              @click="
+                searcher.set(
+                  sf.value,
+                  !searcher.filters.schemaFilters[sf.value]
+                )
+              "
+            >
+              {{ sf.label }}
+            </button>
+          </div>
+        </div>
+
+        <!-- Keybindings Help -->
+        <div class="flex text-sm text-gray-500 justify-between items-baseline">
+          <div class="flex gap-4">
+            <p>↑↓ {{ t`Navigate` }}</p>
+            <p>↩ {{ t`Select` }}</p>
+            <p><span class="tracking-tighter">esc</span> {{ t`Close` }}</p>
+            <button
+              class="flex items-center hover:text-gray-800"
+              @click="openDocs"
+            >
+              <feather-icon name="help-circle" class="w-4 h-4 me-1" />
+              {{ t`Help` }}
+            </button>
+          </div>
+
+          <p v-if="searcher?.numSearches" class="ms-auto">
+            {{ t`${suggestions.length} out of ${searcher.numSearches}` }}
+          </p>
+
+          <div
+            class="border border-gray-100 rounded flex justify-self-end ms-2"
+            v-if="(searcher?.numSearches ?? 0) > 50"
+          >
+            <template
+              v-for="c in allowedLimits.filter(
+                (c) => c < searcher.numSearches || c === -1
+              )"
+              :key="c + '-count'"
+            >
+              <button
+                @click="limit = parseInt(c)"
+                class="w-9"
+                :class="limit === c ? 'bg-gray-100' : ''"
+              >
+                {{ c === -1 ? t`All` : c }}
+              </button>
+            </template>
+          </div>
         </div>
       </div>
     </div>
@@ -195,7 +204,6 @@ import { getBgTextColorClass } from 'src/utils/colors';
 import { openLink } from 'src/utils/ipcCalls';
 import { docsPathMap } from 'src/utils/misc';
 import { getGroupLabelMap, searchGroups } from 'src/utils/search';
-import { getModKeyCode } from 'src/utils/vueUtils';
 import { nextTick } from 'vue';
 import Button from './Button.vue';
 import Modal from './Modal.vue';
@@ -233,18 +241,19 @@ export default {
       openLink('https://docs.frappebooks.com/' + docsPathMap.Search);
     },
     getShortcuts() {
-      const modKey = getModKeyCode(this.platform);
       const ifOpen = (cb) => () => this.openModal && cb();
       const ifClose = (cb) => () => !this.openModal && cb();
 
       const shortcuts = [
-        { shortcut: ['KeyK', modKey], callback: ifClose(() => this.open()) },
-        { shortcut: ['Escape'], callback: ifOpen(() => this.close()) },
+        {
+          shortcut: 'KeyK',
+          callback: ifClose(() => this.open()),
+        },
       ];
 
       for (const i in searchGroups) {
         shortcuts.push({
-          shortcut: [modKey, `Digit${Number(i) + 1}`],
+          shortcut: `Digit${Number(i) + 1}`,
           callback: ifOpen(() => {
             const group = searchGroups[i];
             const value = this.searcher.filters.groupFilters[group];
@@ -261,15 +270,15 @@ export default {
     },
     setShortcuts() {
       for (const { shortcut, callback } of this.getShortcuts()) {
-        this.shortcuts.set(shortcut, callback);
+        this.shortcuts.pmod.set([shortcut], callback);
       }
     },
     deleteShortcuts() {
       for (const { shortcut } of this.getShortcuts()) {
-        this.shortcuts.delete(shortcut);
+        this.shortcuts.pmod.delete([shortcut]);
       }
     },
-    modKey(key) {
+    modKeyText(key) {
       key = key.toUpperCase();
       if (this.platform === 'Mac') {
         return `⌘ ${key}`;
diff --git a/src/components/ShortcutsHelper.vue b/src/components/ShortcutsHelper.vue
new file mode 100644
index 00000000..0c8321e6
--- /dev/null
+++ b/src/components/ShortcutsHelper.vue
@@ -0,0 +1,199 @@
+<template>
+  <div>
+    <FormHeader :form-title="t`Shortcuts`" />
+    <hr />
+    <div class="h-96 overflow-y-auto text-gray-900">
+      <template v-for="g in groups" :key="g.label">
+        <div class="p-4 w-full">
+          <!-- Shortcut Group Header -->
+          <div @click="g.collapsed = !g.collapsed" class="cursor-pointer mb-4">
+            <div class="font-semibold">
+              {{ g.label }}
+            </div>
+            <div class="text-base">
+              {{ g.description }}
+            </div>
+          </div>
+          <!-- Shortcuts -->
+          <div v-if="!g.collapsed" class="flex flex-col gap-4">
+            <div
+              v-for="(s, i) in g.shortcuts"
+              :key="g.label + ' ' + i"
+              class="grid gap-4 items-start"
+              style="grid-template-columns: 6rem auto"
+            >
+              <!-- <div class="w-2 text-base">{{ i + 1 }}.</div> -->
+              <div
+                class="
+                  text-base
+                  font-medium
+                  flex-shrink-0 flex
+                  items-center
+                  gap-1
+                  bg-gray-200
+                  text-gray-700
+                  px-1.5
+                  py-0.5
+                  rounded
+                "
+                style="width: fit-content"
+              >
+                <span
+                  v-for="k in s.shortcut"
+                  :key="k"
+                  class="tracking-tighter"
+                  >{{ k }}</span
+                >
+              </div>
+              <div class="whitespace-normal text-base">{{ s.description }}</div>
+            </div>
+          </div>
+          <!-- Shortcut count if collapsed -->
+          <div v-else class="text-base text-gray-600">
+            {{ t`${g.shortcuts.length} shortcuts` }}
+          </div>
+        </div>
+        <hr />
+      </template>
+      <div class="p-4 text-base text-gray-600">
+        {{ t`More shortcuts will be added soon.` }}
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts">
+import { t } from 'fyo';
+import { defineComponent } from 'vue';
+import FormHeader from './FormHeader.vue';
+
+type Group = {
+  label: string;
+  description: string;
+  collapsed: boolean;
+  shortcuts: { shortcut: string[]; description: string }[];
+};
+
+export default defineComponent({
+  data() {
+    return { groups: [] } as { groups: Group[] };
+  },
+  mounted() {
+    this.groups = [
+      {
+        label: t`Global`,
+        description: t`Applicable anywhere in Frappe Books`,
+        collapsed: false,
+        shortcuts: [
+          {
+            shortcut: [this.pmod, 'K'],
+            description: t`Open Quick Search`,
+          },
+          {
+            shortcut: [this.del],
+            description: t`Go back to the previous page`,
+          },
+          {
+            shortcut: [this.shift, 'H'],
+            description: t`Toggle sidebar`,
+          },
+          {
+            shortcut: ['F1'],
+            description: t`Open Documentation`,
+          },
+        ],
+      },
+      {
+        label: t`Doc`,
+        description: t`Applicable when a Doc is open in the Form view or Quick Edit view`,
+        collapsed: false,
+        shortcuts: [
+          {
+            shortcut: [this.pmod, 'S'],
+            description: [
+              t`Save or Submit a doc.`,
+              t`A doc is submitted only if it is submittable and is in the saved state.`,
+            ].join(' '),
+          },
+          {
+            shortcut: [this.pmod, this.del],
+            description: [
+              t`Cancel or Delete a doc.`,
+              t`A doc is cancelled only if it is in the submitted state.`,
+              t`A submittable doc is deleted only if it is in the cancelled state.`,
+            ].join(' '),
+          },
+        ],
+      },
+      {
+        label: t`Quick Search`,
+        description: t`Applicable when Quick Search is open`,
+        collapsed: false,
+        shortcuts: [
+          { shortcut: [this.esc], description: t`Close Quick Search` },
+          {
+            shortcut: [this.pmod, '1'],
+            description: t`Toggle the Docs filter`,
+          },
+          {
+            shortcut: [this.pmod, '2'],
+            description: t`Toggle the List filter`,
+          },
+          {
+            shortcut: [this.pmod, '3'],
+            description: t`Toggle the Create filter`,
+          },
+          {
+            shortcut: [this.pmod, '4'],
+            description: t`Toggle the Report filter`,
+          },
+          {
+            shortcut: [this.pmod, '5'],
+            description: t`Toggle the Page filter`,
+          },
+        ],
+      },
+    ];
+  },
+  computed: {
+    pmod() {
+      if (this.isMac) {
+        return '⌘';
+      }
+
+      return 'Ctrl';
+    },
+    shift() {
+      if (this.isMac) {
+        return 'shift';
+      }
+
+      return '⇧';
+    },
+    alt() {
+      if (this.isMac) {
+        return '⌥';
+      }
+
+      return 'Alt';
+    },
+    del() {
+      if (this.isMac) {
+        return 'delete';
+      }
+
+      return 'Backspace';
+    },
+    esc() {
+      if (this.isMac) {
+        return 'esc';
+      }
+
+      return 'Esc';
+    },
+    isMac() {
+      return this.platform === 'Mac';
+    },
+  },
+  components: { FormHeader },
+});
+</script>
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index a61a8a88..e4cf08d3 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -9,7 +9,9 @@
       <!-- Company name and DB Switcher -->
       <div
         class="px-4 flex flex-row items-center justify-between mb-4"
-        :class="platform === 'Mac' ? 'mt-10' : 'mt-2'"
+        :class="
+          platform === 'Mac' && languageDirection === 'ltr' ? 'mt-10' : 'mt-2'
+        "
       >
         <h6
           class="
@@ -98,6 +100,20 @@
         </p>
       </button>
 
+      <button
+        class="
+          flex
+          text-sm text-gray-600
+          hover:text-gray-800
+          gap-1
+          items-center
+        "
+        @click="viewShortcuts = true"
+      >
+        <feather-icon name="command" class="h-4 w-4 flex-shrink-0" />
+        <p>{{ t`Shortcuts` }}</p>
+      </button>
+
       <button
         class="
           flex
@@ -153,6 +169,10 @@
     >
       <feather-icon name="chevrons-left" class="w-4 h-4" />
     </button>
+
+    <Modal :open-modal="viewShortcuts" @closemodal="viewShortcuts = false">
+      <ShortcutsHelper class="w-form" />
+    </Modal>
   </div>
 </template>
 <script>
@@ -160,18 +180,23 @@ import Button from 'src/components/Button.vue';
 import { reportIssue } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
 import { openLink } from 'src/utils/ipcCalls';
+import { docsPathRef } from 'src/utils/refs';
 import { getSidebarConfig } from 'src/utils/sidebarConfig';
-import { docsPath, routeTo } from 'src/utils/ui';
+import { routeTo } from 'src/utils/ui';
 import router from '../router';
 import Icon from './Icon.vue';
+import Modal from './Modal.vue';
+import ShortcutsHelper from './ShortcutsHelper.vue';
 
 export default {
   components: [Button],
+  inject: ['languageDirection', 'shortcuts'],
   emits: ['change-db-file', 'toggle-sidebar'],
   data() {
     return {
       companyName: '',
       groups: [],
+      viewShortcuts: false,
       activeGroup: null,
     };
   },
@@ -182,6 +207,8 @@ export default {
   },
   components: {
     Icon,
+    Modal,
+    ShortcutsHelper,
   },
   async mounted() {
     const { companyName } = await fyo.doc.getDoc('AccountingSettings');
@@ -192,12 +219,23 @@ export default {
     router.afterEach(() => {
       this.setActiveGroup();
     });
+
+    this.shortcuts.shift.set(['KeyH'], () => {
+      if (document.body === document.activeElement) {
+        this.$emit('toggle-sidebar');
+      }
+    });
+    this.shortcuts.set(['F1'], () => this.openDocumentation());
+  },
+  unmounted() {
+    this.shortcuts.alt.delete(['KeyH']);
+    this.shortcuts.delete(['F1']);
   },
   methods: {
     routeTo,
     reportIssue,
     openDocumentation() {
-      openLink('https://docs.frappebooks.com/' + docsPath.value);
+      openLink('https://docs.frappebooks.com/' + docsPathRef.value);
     },
     setActiveGroup() {
       const { fullPath } = this.$router.currentRoute.value;
diff --git a/src/dataImport.ts b/src/dataImport.ts
deleted file mode 100644
index 91e4bc7c..00000000
--- a/src/dataImport.ts
+++ /dev/null
@@ -1,421 +0,0 @@
-import { Fyo, t } from 'fyo';
-import { Converter } from 'fyo/core/converter';
-import { DocValueMap } from 'fyo/core/types';
-import { Doc } from 'fyo/model/doc';
-import { isNameAutoSet } from 'fyo/model/naming';
-import { Noun, Verb } from 'fyo/telemetry/types';
-import { ModelNameEnum } from 'models/types';
-import {
-  Field,
-  FieldType,
-  FieldTypeEnum,
-  OptionField,
-  SelectOption,
-  TargetField,
-} from 'schemas/types';
-import {
-  getDefaultMapFromList,
-  getMapFromList,
-  getValueMapFromList,
-} from 'utils';
-import { generateCSV, parseCSV } from '../utils/csvParser';
-
-export const importable = [
-  ModelNameEnum.SalesInvoice,
-  ModelNameEnum.PurchaseInvoice,
-  ModelNameEnum.Payment,
-  ModelNameEnum.Party,
-  ModelNameEnum.Item,
-  ModelNameEnum.JournalEntry,
-];
-
-type Status = {
-  success: boolean;
-  message: string;
-  names: string[];
-};
-
-type Exclusion = Record<string, string[]>;
-
-type LoadingStatusCallback = (
-  isMakingEntries: boolean,
-  entriesMade: number,
-  totalEntries: number
-) => void;
-
-interface TemplateField {
-  label: string;
-  fieldname: string;
-  required: boolean;
-  schemaName: string;
-  options?: SelectOption[];
-  fieldtype: FieldType;
-  parentField: string;
-}
-
-const exclusion: Exclusion = {
-  Item: ['image'],
-  Party: ['address', 'outstandingAmount', 'image'],
-};
-
-function getFilteredDocFields(
-  df: string | string[],
-  fyo: Fyo
-): [TemplateField[], string[][]] {
-  let schemaName = df[0];
-  let parentField = df[1] ?? '';
-
-  if (typeof df === 'string') {
-    schemaName = df;
-    parentField = '';
-  }
-
-  const primaryFields: Field[] = fyo.schemaMap[schemaName]!.fields;
-  const fields: TemplateField[] = [];
-  const tableTypes: string[][] = [];
-  const exclusionFields: string[] = exclusion[schemaName] ?? [];
-
-  for (const field of primaryFields) {
-    const { label, fieldtype, fieldname, required } = field;
-
-    if (shouldSkip(field, exclusionFields, parentField)) {
-      continue;
-    }
-
-    if (fieldtype === FieldTypeEnum.Table) {
-      const { target } = field as TargetField;
-      tableTypes.push([target, fieldname]);
-      continue;
-    }
-
-    const options: SelectOption[] = (field as OptionField).options ?? [];
-
-    fields.push({
-      label,
-      fieldname,
-      schemaName,
-      options,
-      fieldtype,
-      parentField,
-      required: required ?? false,
-    });
-  }
-
-  return [fields, tableTypes];
-}
-
-function shouldSkip(
-  field: Field,
-  exclusionFields: string[],
-  parentField: string
-): boolean {
-  if (field.meta) {
-    return true;
-  }
-
-  if (field.fieldname === 'name' && parentField) {
-    return true;
-  }
-
-  if (field.required) {
-    return false;
-  }
-
-  if (exclusionFields.includes(field.fieldname)) {
-    return true;
-  }
-
-  if (field.hidden || field.readOnly) {
-    return true;
-  }
-
-  return false;
-}
-
-function getTemplateFields(schemaName: string, fyo: Fyo): TemplateField[] {
-  const fields: TemplateField[] = [];
-  if (!schemaName) {
-    return [];
-  }
-
-  const schemaNames: string[][] = [[schemaName]];
-  while (schemaNames.length > 0) {
-    const sn = schemaNames.pop();
-    if (!sn) {
-      break;
-    }
-
-    const [templateFields, tableTypes] = getFilteredDocFields(sn, fyo);
-    fields.push(...templateFields);
-    schemaNames.push(...tableTypes);
-  }
-  return fields;
-}
-
-export class Importer {
-  schemaName: string;
-  templateFields: TemplateField[];
-  labelTemplateFieldMap: Record<string, TemplateField> = {};
-  template: string;
-  indices: number[] = [];
-  parsedLabels: string[] = [];
-  parsedValues: string[][] = [];
-  assignedMap: Record<string, string> = {}; // target: import
-  requiredMap: Record<string, boolean> = {};
-  shouldSubmit: boolean = false;
-  labelIndex: number = -1;
-  csv: string[][] = [];
-  fyo: Fyo;
-
-  constructor(schemaName: string, fyo: Fyo) {
-    this.schemaName = schemaName;
-    this.fyo = fyo;
-    this.templateFields = getTemplateFields(schemaName, this.fyo);
-    this.template = generateCSV([this.templateFields.map((t) => t.label)]);
-    this.labelTemplateFieldMap = getMapFromList(this.templateFields, 'label');
-    this.assignedMap = getDefaultMapFromList(this.templateFields, '', 'label');
-    this.requiredMap = getValueMapFromList(
-      this.templateFields,
-      'label',
-      'required'
-    ) as Record<string, boolean>;
-  }
-
-  get assignableLabels() {
-    const req: string[] = [];
-    const nreq: string[] = [];
-
-    for (const label in this.labelTemplateFieldMap) {
-      if (this.requiredMap[label]) {
-        req.push(label);
-        continue;
-      }
-
-      nreq.push(label);
-    }
-
-    return [req, nreq].flat();
-  }
-
-  get unassignedLabels() {
-    const assigned = Object.keys(this.assignedMap).map(
-      (k) => this.assignedMap[k]
-    );
-    return this.parsedLabels.filter((l) => !assigned.includes(l));
-  }
-
-  get columnLabels() {
-    const req: string[] = [];
-    const nreq: string[] = [];
-
-    this.assignableLabels.forEach((k) => {
-      if (!this.assignedMap[k]) {
-        return;
-      }
-
-      if (this.requiredMap[k]) {
-        req.push(k);
-        return;
-      }
-
-      nreq.push(k);
-    });
-
-    return [...req, ...nreq];
-  }
-
-  get assignedMatrix() {
-    this.indices = this.columnLabels
-      .map((k) => this.assignedMap[k])
-      .filter(Boolean)
-      .map((k) => this.parsedLabels.indexOf(k as string));
-
-    const rows = this.parsedValues.length;
-    const cols = this.columnLabels.length;
-
-    const matrix = [];
-    for (let i = 0; i < rows; i++) {
-      const row = [];
-      for (let j = 0; j < cols; j++) {
-        const ix = this.indices[j];
-        const value = this.parsedValues[i][ix] ?? '';
-        row.push(value);
-      }
-      matrix.push(row);
-    }
-
-    return matrix;
-  }
-
-  dropRow(i: number) {
-    this.parsedValues = this.parsedValues.filter((_, ix) => i !== ix);
-  }
-
-  updateValue(value: string, i: number, j: number) {
-    this.parsedValues[i][this.indices[j]] = value ?? '';
-  }
-
-  selectFile(text: string): boolean {
-    this.csv = parseCSV(text);
-    try {
-      this.initialize(0, true);
-    } catch (err) {
-      return false;
-    }
-    return true;
-  }
-
-  initialize(labelIndex: number, force: boolean) {
-    if (
-      (typeof labelIndex !== 'number' && !labelIndex) ||
-      (labelIndex === this.labelIndex && !force)
-    ) {
-      return;
-    }
-
-    const source = this.csv.map((row) => [...row]);
-    this.labelIndex = labelIndex;
-    this.parsedLabels = source[labelIndex];
-    this.parsedValues = source.slice(labelIndex + 1);
-    this.setAssigned();
-  }
-
-  setAssigned() {
-    const labels = [...this.parsedLabels];
-
-    for (const k of Object.keys(this.assignedMap)) {
-      const l = this.assignedMap[k] as string;
-      if (!labels.includes(l)) {
-        this.assignedMap[k] = '';
-      }
-    }
-
-    labels.forEach((l) => {
-      if (this.assignedMap[l] !== '') {
-        return;
-      }
-
-      this.assignedMap[l] = l;
-    });
-  }
-
-  getDocs(): DocValueMap[] {
-    const fields = this.columnLabels.map((k) => this.labelTemplateFieldMap[k]);
-    const nameIndex = fields.findIndex(({ fieldname }) => fieldname === 'name');
-
-    const docMap: Record<string, DocValueMap> = {};
-
-    const assignedMatrix = this.assignedMatrix;
-    for (let r = 0; r < assignedMatrix.length; r++) {
-      const row = assignedMatrix[r];
-      const cts: Record<string, DocValueMap> = {};
-      const name = row[nameIndex];
-
-      docMap[name] ??= {};
-
-      for (let f = 0; f < fields.length; f++) {
-        const field = fields[f];
-        const value = Converter.toDocValue(row[f], field, this.fyo);
-
-        if (field.parentField) {
-          cts[field.parentField] ??= {};
-          cts[field.parentField][field.fieldname] = value;
-          continue;
-        }
-
-        docMap[name][field.fieldname] = value;
-      }
-
-      for (const k of Object.keys(cts)) {
-        docMap[name][k] ??= [];
-        (docMap[name][k] as DocValueMap[]).push(cts[k]);
-      }
-    }
-
-    return Object.keys(docMap).map((k) => docMap[k]);
-  }
-
-  async importData(setLoadingStatus: LoadingStatusCallback): Promise<Status> {
-    const status: Status = { success: false, names: [], message: '' };
-    const shouldDeleteName = isNameAutoSet(this.schemaName, this.fyo);
-    const docObjs = this.getDocs();
-
-    let entriesMade = 0;
-    setLoadingStatus(true, 0, docObjs.length);
-
-    for (const docObj of docObjs) {
-      if (shouldDeleteName) {
-        delete docObj.name;
-      }
-
-      for (const key in docObj) {
-        if (docObj[key] !== '') {
-          continue;
-        }
-
-        delete docObj[key];
-      }
-
-      const doc: Doc = this.fyo.doc.getNewDoc(this.schemaName, {}, false);
-      try {
-        await this.makeEntry(doc, docObj);
-        entriesMade += 1;
-        setLoadingStatus(true, entriesMade, docObjs.length);
-      } catch (err) {
-        setLoadingStatus(false, entriesMade, docObjs.length);
-
-        this.fyo.telemetry.log(Verb.Imported, this.schemaName as Noun, {
-          success: false,
-          count: entriesMade,
-        });
-
-        return this.handleError(doc, err as Error, status);
-      }
-
-      status.names.push(doc.name!);
-    }
-
-    setLoadingStatus(false, entriesMade, docObjs.length);
-    status.success = true;
-
-    this.fyo.telemetry.log(Verb.Imported, this.schemaName as Noun, {
-      success: true,
-      count: entriesMade,
-    });
-    return status;
-  }
-
-  addRow() {
-    const emptyRow = Array(this.columnLabels.length).fill('');
-    this.parsedValues.push(emptyRow);
-  }
-
-  async makeEntry(doc: Doc, docObj: DocValueMap) {
-    await doc.setAndSync(docObj);
-    if (this.shouldSubmit) {
-      await doc.submit();
-    }
-  }
-
-  handleError(doc: Doc, err: Error, status: Status): Status {
-    const messages = [t`Could not import ${this.schemaName} ${doc.name!}.`];
-
-    const message = err.message;
-    if (message?.includes('UNIQUE constraint failed')) {
-      messages.push(t`${doc.name!} already exists.`);
-    } else if (message) {
-      messages.push(message);
-    }
-
-    if (status.names.length) {
-      messages.push(
-        t`The following ${
-          status.names.length
-        } entries were created: ${status.names.join(', ')}`
-      );
-    }
-
-    status.message = messages.join(' ');
-    return status;
-  }
-}
diff --git a/src/importer.ts b/src/importer.ts
new file mode 100644
index 00000000..38de3fcc
--- /dev/null
+++ b/src/importer.ts
@@ -0,0 +1,634 @@
+import { Fyo } from 'fyo';
+import { Converter } from 'fyo/core/converter';
+import { DocValue, DocValueMap } from 'fyo/core/types';
+import { Doc } from 'fyo/model/doc';
+import { getEmptyValuesByFieldTypes } from 'fyo/utils';
+import { ValidationError } from 'fyo/utils/errors';
+import {
+  Field,
+  FieldType,
+  FieldTypeEnum,
+  OptionField,
+  RawValue,
+  Schema,
+  TargetField,
+} from 'schemas/types';
+import { generateCSV, parseCSV } from 'utils/csvParser';
+import { getValueMapFromList } from 'utils/index';
+
+export type TemplateField = Field & TemplateFieldProps;
+
+type TemplateFieldProps = {
+  schemaName: string;
+  schemaLabel: string;
+  fieldKey: string;
+  parentSchemaChildField?: TargetField;
+};
+
+type ValueMatrixItem =
+  | {
+      value: DocValue;
+      rawValue?: RawValue;
+      error?: boolean;
+    }
+  | { value?: DocValue; rawValue: RawValue; error?: boolean };
+
+type ValueMatrix = ValueMatrixItem[][];
+
+const skippedFieldsTypes: FieldType[] = [
+  FieldTypeEnum.AttachImage,
+  FieldTypeEnum.Attachment,
+  FieldTypeEnum.Table,
+];
+
+/**
+ * Tool that
+ * - Can make bulk entries for any kind of Doc
+ * - Takes in unstructured CSV data, converts it into Docs
+ * - Saves and or Submits the converted Docs
+ */
+export class Importer {
+  schemaName: string;
+  fyo: Fyo;
+
+  /**
+   * List of template fields that have been assigned a column, in
+   * the order they have been assigned.
+   */
+  assignedTemplateFields: (string | null)[];
+
+  /**
+   * Map of all the template fields that can be imported.
+   */
+  templateFieldsMap: Map<string, TemplateField>;
+
+  /**
+   * Map of Fields that have been picked, i.e.
+   * - Fields which will be included in the template
+   * - Fields for which values will be provided
+   */
+  templateFieldsPicked: Map<string, boolean>;
+
+  /**
+   * Whether the schema type being imported has table fields
+   */
+  hasChildTables: boolean;
+
+  /**
+   * Matrix containing the raw values which will be converted to
+   * doc values before importing.
+   */
+  valueMatrix: ValueMatrix;
+
+  /**
+   * Data from the valueMatrix rows will be converted into Docs
+   * which will be stored in this array.
+   */
+  docs: Doc[];
+
+  /**
+   * Used if an options field is imported where the import data
+   * provided maybe the label and not the value
+   */
+  optionsMap: {
+    values: Record<string, Set<string>>;
+    labelValueMap: Record<string, Record<string, string>>;
+  };
+
+  constructor(schemaName: string, fyo: Fyo) {
+    if (!fyo.schemaMap[schemaName]) {
+      throw new ValidationError(
+        `Invalid schemaName ${schemaName} found in importer`
+      );
+    }
+
+    this.hasChildTables = false;
+    this.schemaName = schemaName;
+    this.fyo = fyo;
+    this.docs = [];
+    this.valueMatrix = [];
+    this.optionsMap = {
+      values: {},
+      labelValueMap: {},
+    };
+
+    const templateFields = getTemplateFields(schemaName, fyo, this);
+    this.assignedTemplateFields = templateFields.map((f) => f.fieldKey);
+    this.templateFieldsMap = new Map();
+    this.templateFieldsPicked = new Map();
+
+    templateFields.forEach((f, i) => {
+      this.templateFieldsMap.set(f.fieldKey, f);
+      this.templateFieldsPicked.set(f.fieldKey, true);
+    });
+  }
+
+  selectFile(data: string): boolean {
+    try {
+      const parsed = parseCSV(data);
+      this.selectParsed(parsed);
+    } catch {
+      return false;
+    }
+
+    return true;
+  }
+
+  async checkLinks() {
+    const tfKeys = this.assignedTemplateFields
+      .map((key, index) => ({
+        key,
+        index,
+        tf: this.templateFieldsMap.get(key ?? ''),
+      }))
+      .filter(({ key, tf }) => {
+        if (!key || !tf) {
+          return false;
+        }
+
+        return tf.fieldtype === FieldTypeEnum.Link;
+      }) as { key: string; index: number; tf: TemplateField }[];
+
+    const linksNames: Map<string, Set<string>> = new Map();
+    for (const row of this.valueMatrix) {
+      for (const { tf, index } of tfKeys) {
+        const target = (tf as TargetField).target;
+        const value = row[index]?.value;
+        if (typeof value !== 'string' || !value) {
+          continue;
+        }
+
+        if (!linksNames.has(target)) {
+          linksNames.set(target, new Set());
+        }
+
+        linksNames.get(target)?.add(value);
+      }
+    }
+
+    const doesNotExist = [];
+    for (const [target, values] of linksNames.entries()) {
+      for (const value of values) {
+        const exists = await this.fyo.db.exists(target, value);
+        if (exists) {
+          continue;
+        }
+
+        doesNotExist.push({
+          schemaName: target,
+          schemaLabel: this.fyo.schemaMap[this.schemaName]?.label,
+          name: value,
+        });
+      }
+    }
+
+    return doesNotExist;
+  }
+
+  checkCellErrors() {
+    const assigned = this.assignedTemplateFields
+      .map((key, index) => ({
+        key,
+        index,
+        tf: this.templateFieldsMap.get(key ?? ''),
+      }))
+      .filter(({ key, tf }) => !!key && !!tf) as {
+      key: string;
+      index: number;
+      tf: TemplateField;
+    }[];
+
+    const cellErrors = [];
+    for (const i in this.valueMatrix) {
+      const row = this.valueMatrix[i];
+      for (const { tf, index } of assigned) {
+        if (!row[index]?.error) {
+          continue;
+        }
+
+        const rowLabel = this.fyo.t`Row ${i + 1}`;
+        const columnLabel = getColumnLabel(tf);
+        cellErrors.push(`(${rowLabel}, ${columnLabel})`);
+      }
+    }
+
+    return cellErrors;
+  }
+
+  populateDocs() {
+    const { dataMap, childTableMap } =
+      this.getDataAndChildTableMapFromValueMatrix();
+
+    const schema = this.fyo.schemaMap[this.schemaName];
+    const targetFieldnameMap = schema?.fields
+      .filter((f) => f.fieldtype === FieldTypeEnum.Table)
+      .reduce((acc, f) => {
+        const { target, fieldname } = f as TargetField;
+        acc[target] = fieldname;
+        return acc;
+      }, {} as Record<string, string>);
+
+    for (const [name, data] of dataMap.entries()) {
+      const doc = this.fyo.doc.getNewDoc(this.schemaName, data, false);
+      for (const schemaName in targetFieldnameMap) {
+        const fieldname = targetFieldnameMap[schemaName];
+        const childTable = childTableMap[name][schemaName];
+        if (!childTable) {
+          continue;
+        }
+
+        for (const childData of childTable.values()) {
+          doc.push(fieldname, childData);
+        }
+      }
+
+      this.docs.push(doc);
+    }
+  }
+
+  getDataAndChildTableMapFromValueMatrix() {
+    /**
+     * Record key is the doc.name value
+     */
+    const dataMap: Map<string, DocValueMap> = new Map();
+
+    /**
+     * Record key is doc.name, childSchemaName, childDoc.name
+     */
+    const childTableMap: Record<
+      string,
+      Record<string, Map<string, DocValueMap>>
+    > = {};
+
+    const nameIndices = this.assignedTemplateFields
+      .map((key, index) => ({ key, index }))
+      .filter((f) => f.key?.endsWith('.name'))
+      .reduce((acc, f) => {
+        if (f.key == null) {
+          return acc;
+        }
+
+        const schemaName = f.key.split('.')[0];
+        acc[schemaName] = f.index;
+        return acc;
+      }, {} as Record<string, number>);
+
+    const nameIndex = nameIndices?.[this.schemaName];
+    if (nameIndex < 0) {
+      return { dataMap, childTableMap };
+    }
+
+    for (const i in this.valueMatrix) {
+      const row = this.valueMatrix[i];
+      const name = row[nameIndex]?.value;
+      if (typeof name !== 'string') {
+        continue;
+      }
+
+      for (const j in row) {
+        const key = this.assignedTemplateFields[j];
+        const tf = this.templateFieldsMap.get(key ?? '');
+        if (!tf || !key) {
+          continue;
+        }
+
+        const isChild = this.fyo.schemaMap[tf.schemaName]?.isChild;
+        const vmi = row[j];
+        if (vmi.value == null) {
+          continue;
+        }
+
+        if (!isChild && !dataMap.has(name)) {
+          dataMap.set(name, {});
+        }
+
+        if (!isChild) {
+          dataMap.get(name)![tf.fieldname] = vmi.value;
+          continue;
+        }
+
+        const childNameIndex = nameIndices[tf.schemaName];
+        let childName = row[childNameIndex]?.value;
+        if (typeof childName !== 'string') {
+          childName = `${tf.schemaName}-${i}`;
+        }
+
+        childTableMap[name] ??= {};
+        childTableMap[name][tf.schemaName] ??= new Map();
+
+        const childMap = childTableMap[name][tf.schemaName];
+        if (!childMap.has(childName)) {
+          childMap.set(childName, {});
+        }
+
+        const childDocValueMap = childMap.get(childName);
+        if (!childDocValueMap) {
+          continue;
+        }
+
+        childDocValueMap[tf.fieldname] = vmi.value;
+      }
+    }
+
+    return { dataMap, childTableMap };
+  }
+
+  selectParsed(parsed: string[][]): void {
+    if (!parsed?.length) {
+      return;
+    }
+
+    let startIndex = -1;
+    let templateFieldsAssigned;
+
+    for (let i = 3; i >= 0; i--) {
+      const row = parsed[i];
+      if (!row?.length) {
+        continue;
+      }
+
+      templateFieldsAssigned = this.assignTemplateFieldsFromParsedRow(row);
+      if (templateFieldsAssigned) {
+        startIndex = i + 1;
+        break;
+      }
+    }
+
+    if (!templateFieldsAssigned) {
+      this.clearAndResizeAssignedTemplateFields(parsed[0].length);
+    }
+
+    if (startIndex === -1) {
+      startIndex = 0;
+    }
+
+    this.assignValueMatrixFromParsed(parsed.slice(startIndex));
+  }
+
+  clearAndResizeAssignedTemplateFields(size: number) {
+    for (let i = 0; i < size; i++) {
+      if (i >= this.assignedTemplateFields.length) {
+        this.assignedTemplateFields.push(null);
+      } else {
+        this.assignedTemplateFields[i] = null;
+      }
+    }
+  }
+
+  assignValueMatrixFromParsed(parsed: string[][]) {
+    if (!parsed?.length) {
+      return;
+    }
+
+    for (const row of parsed) {
+      this.pushToValueMatrixFromParsedRow(row);
+    }
+  }
+
+  pushToValueMatrixFromParsedRow(row: string[]) {
+    const vmRow: ValueMatrix[number] = [];
+    for (const i in row) {
+      const rawValue = row[i];
+      const index = Number(i);
+
+      if (index >= this.assignedTemplateFields.length) {
+        this.assignedTemplateFields.push(null);
+      }
+
+      vmRow.push(this.getValueMatrixItem(index, rawValue));
+    }
+
+    this.valueMatrix.push(vmRow);
+  }
+
+  setTemplateField(index: number, key: string | null) {
+    if (index >= this.assignedTemplateFields.length) {
+      this.assignedTemplateFields.push(key);
+    } else {
+      this.assignedTemplateFields[index] = key;
+    }
+
+    this.updateValueMatrixColumn(index);
+  }
+
+  updateValueMatrixColumn(index: number) {
+    for (const row of this.valueMatrix) {
+      const vmi = this.getValueMatrixItem(index, row[index].rawValue ?? null);
+
+      if (index >= row.length) {
+        row.push(vmi);
+      } else {
+        row[index] = vmi;
+      }
+    }
+  }
+
+  getValueMatrixItem(index: number, rawValue: RawValue) {
+    const vmi: ValueMatrixItem = { rawValue };
+    const key = this.assignedTemplateFields[index];
+    if (!key) {
+      return vmi;
+    }
+
+    const tf = this.templateFieldsMap.get(key);
+    if (!tf) {
+      return vmi;
+    }
+
+    if (vmi.rawValue === '') {
+      vmi.value = null;
+      return vmi;
+    }
+
+    if ('options' in tf && typeof vmi.rawValue === 'string') {
+      return this.getOptionFieldVmi(vmi, tf);
+    }
+
+    try {
+      vmi.value = Converter.toDocValue(rawValue, tf, this.fyo);
+    } catch {
+      vmi.error = true;
+    }
+
+    return vmi;
+  }
+
+  getOptionFieldVmi(
+    { rawValue }: ValueMatrixItem,
+    tf: OptionField & TemplateFieldProps
+  ): ValueMatrixItem {
+    if (typeof rawValue !== 'string') {
+      return { error: true, value: null, rawValue };
+    }
+
+    if (!tf?.options.length) {
+      return { value: null, rawValue };
+    }
+
+    if (!this.optionsMap.labelValueMap[tf.fieldKey]) {
+      const values = new Set(tf.options.map(({ value }) => value));
+      const labelValueMap = getValueMapFromList(tf.options, 'label', 'value');
+
+      this.optionsMap.labelValueMap[tf.fieldKey] = labelValueMap;
+      this.optionsMap.values[tf.fieldKey] = values;
+    }
+
+    const hasValue = this.optionsMap.values[tf.fieldKey].has(rawValue);
+    if (hasValue) {
+      return { value: rawValue, rawValue };
+    }
+
+    const value = this.optionsMap.labelValueMap[tf.fieldKey][rawValue];
+    if (value) {
+      return { value, rawValue };
+    }
+
+    return { error: true, value: null, rawValue };
+  }
+
+  assignTemplateFieldsFromParsedRow(row: string[]): boolean {
+    const isKeyRow = row.some((key) => this.templateFieldsMap.has(key));
+    if (!isKeyRow) {
+      return false;
+    }
+
+    for (const i in row) {
+      const value = row[i];
+      const tf = this.templateFieldsMap.get(value);
+      let key: string | null = value;
+
+      if (!tf) {
+        key = null;
+      }
+
+      if (key !== null && !this.templateFieldsPicked.get(value)) {
+        key = null;
+      }
+
+      if (Number(i) >= this.assignedTemplateFields.length) {
+        this.assignedTemplateFields.push(key);
+      } else {
+        this.assignedTemplateFields[i] = key;
+      }
+    }
+
+    return true;
+  }
+
+  addRow() {
+    const valueRow: ValueMatrix[number] = this.assignedTemplateFields.map(
+      (key) => {
+        key ??= '';
+        const { fieldtype } = this.templateFieldsMap.get(key) ?? {};
+        let value = null;
+        if (fieldtype) {
+          value = getEmptyValuesByFieldTypes(fieldtype, this.fyo);
+        }
+
+        return { value };
+      }
+    );
+
+    this.valueMatrix.push(valueRow);
+  }
+
+  removeRow(index: number) {
+    this.valueMatrix = this.valueMatrix.filter((_, i) => i !== index);
+  }
+
+  getCSVTemplate(): string {
+    const schemaLabels: string[] = [];
+    const fieldLabels: string[] = [];
+    const fieldKey: string[] = [];
+
+    for (const [name, picked] of this.templateFieldsPicked.entries()) {
+      if (!picked) {
+        continue;
+      }
+
+      const field = this.templateFieldsMap.get(name);
+      if (!field) {
+        continue;
+      }
+
+      schemaLabels.push(field.schemaLabel);
+      fieldLabels.push(field.label);
+      fieldKey.push(field.fieldKey);
+    }
+
+    return generateCSV([schemaLabels, fieldLabels, fieldKey]);
+  }
+}
+
+function getTemplateFields(
+  schemaName: string,
+  fyo: Fyo,
+  importer: Importer
+): TemplateField[] {
+  const schemas: { schema: Schema; parentSchemaChildField?: TargetField }[] = [
+    { schema: fyo.schemaMap[schemaName]! },
+  ];
+  const fields: TemplateField[] = [];
+
+  while (schemas.length) {
+    const { schema, parentSchemaChildField } = schemas.pop() ?? {};
+    if (!schema) {
+      continue;
+    }
+
+    for (const field of schema.fields) {
+      if (
+        field.computed ||
+        field.meta ||
+        field.hidden ||
+        (field.readOnly && !field.required)
+      ) {
+        continue;
+      }
+
+      if (field.fieldtype === FieldTypeEnum.Table) {
+        importer.hasChildTables = true;
+        schemas.push({
+          schema: fyo.schemaMap[field.target]!,
+          parentSchemaChildField: field,
+        });
+      }
+
+      if (skippedFieldsTypes.includes(field.fieldtype)) {
+        continue;
+      }
+
+      const tf = { ...field };
+
+      if (tf.readOnly) {
+        tf.readOnly = false;
+      }
+
+      if (schema.isChild && tf.fieldname === 'name') {
+        tf.required = false;
+      }
+
+      const schemaName = schema.name;
+      const schemaLabel = schema.label;
+      const fieldKey = `${schema.name}.${field.fieldname}`;
+
+      fields.push({
+        ...tf,
+        schemaName,
+        schemaLabel,
+        fieldKey,
+        parentSchemaChildField,
+      });
+    }
+  }
+
+  return fields;
+}
+
+export function getColumnLabel(field: TemplateField): string {
+  if (field.parentSchemaChildField) {
+    return `${field.label} (${field.parentSchemaChildField.label})`;
+  }
+
+  return field.label;
+}
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index a03cf9c9..67d4e661 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -147,7 +147,8 @@ import { ModelNameEnum } from 'models/types';
 import PageHeader from 'src/components/PageHeader.vue';
 import { fyo } from 'src/initFyo';
 import { docsPathMap } from 'src/utils/misc';
-import { docsPath, openQuickEdit } from 'src/utils/ui';
+import { docsPathRef } from 'src/utils/refs';
+import { openQuickEdit } from 'src/utils/ui';
 import { getMapFromList, removeAtIndex } from 'utils/index';
 import { nextTick } from 'vue';
 import Button from '../components/Button.vue';
@@ -184,7 +185,7 @@ export default {
       window.coa = this;
     }
 
-    docsPath.value = docsPathMap.ChartOfAccounts;
+    docsPathRef.value = docsPathMap.ChartOfAccounts;
 
     if (this.refetchTotals) {
       await this.setTotalDebitAndCredit();
@@ -192,7 +193,7 @@ export default {
     }
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
   },
   methods: {
     async expand() {
diff --git a/src/pages/Dashboard/Dashboard.vue b/src/pages/Dashboard/Dashboard.vue
index 427f6186..fd084cc5 100644
--- a/src/pages/Dashboard/Dashboard.vue
+++ b/src/pages/Dashboard/Dashboard.vue
@@ -65,12 +65,12 @@
 
 <script>
 import PageHeader from 'src/components/PageHeader.vue';
-import { docsPath } from 'src/utils/ui';
 import UnpaidInvoices from './UnpaidInvoices.vue';
 import Cashflow from './Cashflow.vue';
 import Expenses from './Expenses.vue';
 import PeriodSelector from './PeriodSelector.vue';
 import ProfitAndLoss from './ProfitAndLoss.vue';
+import { docsPathRef } from 'src/utils/refs';
 
 export default {
   name: 'Dashboard',
@@ -86,10 +86,10 @@ export default {
     return { period: 'This Year' };
   },
   activated() {
-    docsPath.value = 'analytics/dashboard';
+    docsPathRef.value = 'analytics/dashboard';
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
   },
   methods: {
     handlePeriodChange(period) {
diff --git a/src/pages/DataImport.vue b/src/pages/DataImport.vue
deleted file mode 100644
index a6c44a43..00000000
--- a/src/pages/DataImport.vue
+++ /dev/null
@@ -1,653 +0,0 @@
-<template>
-  <div class="flex flex-col overflow-hidden w-full">
-    <!-- Header -->
-    <PageHeader :title="t`Data Import`">
-      <DropdownWithActions
-        :actions="actions"
-        v-if="(canCancel || importType) && !complete"
-      />
-      <Button
-        v-if="importType && !complete"
-        type="primary"
-        class="text-sm"
-        @click="handlePrimaryClick"
-        >{{ primaryLabel }}</Button
-      >
-    </PageHeader>
-
-    <div class="flex text-base w-full flex-col" v-if="!complete">
-      <!-- Type selector -->
-      <div
-        class="
-          flex flex-row
-          justify-start
-          items-center
-          w-full
-          gap-2
-          border-b
-          p-4
-        "
-      >
-        <FormControl
-          :df="importableDf"
-          input-class="bg-transparent text-gray-900 text-base"
-          class="w-40 bg-gray-100 rounded"
-          :value="importType"
-          size="small"
-          @change="setImportType"
-        />
-
-        <p
-          class="text-base ms-2"
-          :class="fileName ? 'text-gray-900 font-semibold' : 'text-gray-700'"
-        >
-          <span v-if="fileName" class="font-normal"
-            >{{ t`Selected file` }}
-          </span>
-          {{ helperText }}{{ fileName ? ',' : '' }}
-          <span v-if="fileName" class="font-normal">
-            {{ t`verify the imported data and click on` }} </span
-          >{{ ' ' }}<span v-if="fileName">{{ t`Import Data` }}</span>
-        </p>
-      </div>
-
-      <!-- Settings -->
-      <div v-if="fileName" class="border-b p-4">
-        <h2 class="text-lg font-semibold">{{ t`Importer Settings` }}</h2>
-        <div class="mt-2 flex gap-2">
-          <div
-            v-if="file && isSubmittable"
-            class="
-              gap-2
-              flex
-              justify-between
-              items-center
-              bg-gray-100
-              px-2
-              rounded
-              text-gray-900
-              w-40
-            "
-          >
-            <p>{{ t`Submit on Import` }}</p>
-            <FormControl
-              size="small"
-              input-class="bg-gray-100"
-              :df="{
-                fieldname: 'shouldSubmit',
-                fieldtype: 'Check',
-              }"
-              :value="Number(importer.shouldSubmit)"
-              @change="(value) => (importer.shouldSubmit = !!value)"
-            />
-          </div>
-          <div
-            class="
-              flex flex-row
-              justify-center
-              items-center
-              gap-2
-              bg-gray-100
-              ps-2
-              rounded
-              text-gray-900
-              w-40
-            "
-          >
-            <p class="text-gray-900">{{ t`Label Index` }}</p>
-            <input
-              type="number"
-              class="
-                bg-gray-100
-                outline-none
-                focus:bg-gray-200
-                px-2
-                py-1
-                rounded-md
-                w-10
-                text-end
-              "
-              min="1"
-              :max="importer.csv.length - 1"
-              :value="labelIndex + 1"
-              @change="setLabelIndex"
-            />
-          </div>
-          <button
-            class="w-28 bg-gray-100 focus:bg-gray-200 rounded-md"
-            v-if="canReset"
-            @click="
-              () => {
-                importer.initialize(0, true);
-                canReset = false;
-              }
-            "
-          >
-            <span class="text-gray-900">
-              {{ t`Reset` }}
-            </span>
-          </button>
-        </div>
-      </div>
-
-      <!-- Label Assigner -->
-      <div v-if="fileName" class="p-4 border-b">
-        <div class="flex items-center gap-2">
-          <h2 class="text-lg font-semibold">{{ t`Assign Imported Labels` }}</h2>
-          <p class="text-red-400 text-sm" v-if="isRequiredUnassigned">
-            {{ t`* required fields` }}
-          </p>
-        </div>
-        <div class="gap-2 mt-4 grid grid-flow-col overflow-x-auto no-scrollbar">
-          <div
-            v-for="(f, k) in importer.assignableLabels"
-            :key="'assigner-' + f + '-' + k"
-          >
-            <p class="text-gray-600 text-sm mb-1">
-              {{ f }}
-              <span
-                v-if="importer.requiredMap[f] && !importer.assignedMap[f]"
-                class="text-red-400"
-                >*</span
-              >
-            </p>
-            <FormControl
-              size="small"
-              class="w-28"
-              input-class="bg-gray-100"
-              :df="getAssignerField(f)"
-              :value="importer.assignedMap[f] ?? ''"
-              @change="(v) => onAssignedChange(f, v)"
-            />
-          </div>
-        </div>
-      </div>
-
-      <!-- Data Verifier -->
-      <div v-if="fileName">
-        <div class="overflow-auto border-b">
-          <!-- Column Name Rows  -->
-          <div
-            class="
-              grid grid-flow-col
-              border-b
-              gap-2
-              sticky
-              top-0
-              bg-white
-              px-4
-              h-row-mid
-              items-center
-            "
-            style="width: fit-content"
-            v-if="importer.columnLabels.length > 0"
-          >
-            <div class="w-4 h-4" />
-            <p
-              v-for="(c, i) in importer.columnLabels"
-              class="px-2 w-28 font-semibold text-gray-600"
-              :key="'column-' + i"
-            >
-              {{ c }}
-            </p>
-          </div>
-          <div v-else>
-            <p class="text-gray-600">
-              {{ t`No labels have been assigned.` }}
-            </p>
-          </div>
-
-          <!-- Data Rows -->
-          <div
-            v-if="importer.columnLabels.length > 0"
-            style="max-height: 500px"
-          >
-            <div
-              class="
-                grid grid-flow-col
-                border-b
-                gap-2
-                items-center
-                px-4
-                h-row-mid
-              "
-              style="width: fit-content"
-              v-for="(r, i) in assignedMatrix"
-              :key="'matrix-row-' + i"
-            >
-              <button
-                class="
-                  w-4
-                  h-4
-                  text-gray-600
-                  hover:text-gray-900
-                  cursor-pointer
-                  outline-none
-                "
-                @click="
-                  () => {
-                    importer.dropRow(i);
-                    canReset = true;
-                  }
-                "
-              >
-                <FeatherIcon name="x" />
-              </button>
-              <input
-                v-for="(c, j) in r"
-                type="text"
-                class="
-                  w-28
-                  text-gray-900
-                  px-2
-                  py-1
-                  outline-none
-                  rounded
-                  focus:bg-gray-200
-                "
-                @change="
-                  (e) => {
-                    onValueChange(e, i, j);
-                    canReset = true;
-                  }
-                "
-                :key="'matrix-cell-' + i + '-' + j"
-                :value="c"
-              />
-            </div>
-
-            <!-- Add Row button -->
-            <button
-              class="
-                text-gray-600
-                hover:bg-gray-50
-                flex flex-row
-                w-full
-                px-4
-                h-row-mid
-                border-b
-                items-center
-                outline-none
-              "
-              @click="
-                () => {
-                  importer.addRow();
-                  canReset = true;
-                }
-              "
-            >
-              <FeatherIcon name="plus" class="w-4 h-4" />
-              <p class="ps-4">
-                {{ t`Add Row` }}
-              </p>
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div v-if="complete" class="flex justify-center h-full items-center">
-      <div
-        class="
-          flex flex-col
-          justify-center
-          items-center
-          gap-8
-          rounded-lg
-          shadow-md
-          p-6
-        "
-        style="width: 450px"
-      >
-        <h2 class="text-xl font-semibold mt-4">{{ t`Import Success` }} 🎉</h2>
-        <p class="text-lg text-center">
-          {{ t`Successfully created the following ${names.length} entries:` }}
-        </p>
-        <div class="max-h-96 overflow-y-auto">
-          <div
-            v-for="(n, i) in names"
-            :key="'name-' + i"
-            class="grid grid-cols-2 gap-2 border-b pb-2 mb-2 pe-4 text-lg w-60"
-            style="grid-template-columns: 2rem auto"
-          >
-            <p class="text-end">{{ i + 1 }}.</p>
-            <p>
-              {{ n }}
-            </p>
-          </div>
-        </div>
-        <div class="flex w-full justify-between">
-          <Button type="secondary" class="text-sm w-32" @click="clear">{{
-            t`Import More`
-          }}</Button>
-          <Button type="primary" class="text-sm w-32" @click="showMe">{{
-            t`Show Me`
-          }}</Button>
-        </div>
-      </div>
-    </div>
-    <div
-      v-if="!importType"
-      class="flex justify-center h-full w-full items-center mb-16"
-    >
-      <HowTo
-        link="https://youtu.be/ukHAgcnVxTQ"
-        class="text-gray-900 rounded-lg text-base border px-3 py-2"
-      >
-        {{ t`How to Use Data Import` }}
-      </HowTo>
-    </div>
-    <Loading
-      v-if="isMakingEntries"
-      :open="isMakingEntries"
-      :percent="percentLoading"
-      :message="messageLoading"
-    />
-  </div>
-</template>
-<script>
-import Button from 'src/components/Button.vue';
-import FormControl from 'src/components/Controls/FormControl.vue';
-import DropdownWithActions from 'src/components/DropdownWithActions.vue';
-import FeatherIcon from 'src/components/FeatherIcon.vue';
-import HowTo from 'src/components/HowTo.vue';
-import PageHeader from 'src/components/PageHeader.vue';
-import { importable, Importer } from 'src/dataImport';
-import { fyo } from 'src/initFyo';
-import { getSavePath, saveData, selectFile } from 'src/utils/ipcCalls';
-import { docsPathMap } from 'src/utils/misc';
-import { docsPath, showMessageDialog } from 'src/utils/ui';
-import Loading from '../components/Loading.vue';
-
-export default {
-  components: {
-    PageHeader,
-    FormControl,
-    Button,
-    DropdownWithActions,
-    FeatherIcon,
-    HowTo,
-    Loading,
-  },
-  data() {
-    return {
-      canReset: false,
-      complete: false,
-      names: ['Bat', 'Baseball', 'Other Shit'],
-      file: null,
-      importer: null,
-      importType: '',
-      isMakingEntries: false,
-      percentLoading: 0,
-      messageLoading: '',
-    };
-  },
-  mounted() {
-    if (fyo.store.isDevelopment) {
-      window.di = this;
-    }
-  },
-  computed: {
-    labelIndex() {
-      return this.importer.labelIndex;
-    },
-    requiredUnassigned() {
-      return this.importer.assignableLabels.filter(
-        (k) => this.importer.requiredMap[k] && !this.importer.assignedMap[k]
-      );
-    },
-    isRequiredUnassigned() {
-      return this.requiredUnassigned.length > 0;
-    },
-    assignedMatrix() {
-      return this.importer.assignedMatrix;
-    },
-    actions() {
-      const actions = [];
-
-      const secondaryAction = {
-        component: {
-          template: '<span>{{ t`Save Template` }}</span>',
-        },
-        condition: () => true,
-        action: this.handleSecondaryClick,
-      };
-      actions.push(secondaryAction);
-
-      if (this.file) {
-        actions.push({
-          component: {
-            template: '<span>{{ t`Change File` }}</span>',
-          },
-          condition: () => true,
-          action: this.selectFile,
-        });
-      }
-
-      const cancelAction = {
-        component: {
-          template: '<span class="text-red-700" >{{ t`Cancel` }}</span>',
-        },
-        condition: () => true,
-        action: this.clear,
-      };
-      actions.push(cancelAction);
-
-      return actions;
-    },
-
-    fileName() {
-      if (!this.file) {
-        return '';
-      }
-      return this.file.name;
-    },
-    helperText() {
-      if (!this.importType) {
-        return this.t`Set an Import Type`;
-      } else if (!this.fileName) {
-        return this.t`Select a file for import`;
-      }
-      return this.fileName;
-    },
-    primaryLabel() {
-      return this.file ? this.t`Import Data` : this.t`Select File`;
-    },
-    isSubmittable() {
-      const schemaName = this.importer?.schemaName;
-      if (schemaName) {
-        return fyo.schemaMap[schemaName].isSubmittable ?? false;
-      }
-      return false;
-    },
-    importableDf() {
-      return {
-        fieldname: 'importType',
-        label: this.t`Import Type`,
-        fieldtype: 'AutoComplete',
-        placeholder: this.t`Import Type`,
-        options: Object.keys(this.labelSchemaNameMap),
-      };
-    },
-    labelSchemaNameMap() {
-      return importable
-        .map((i) => ({
-          name: i,
-          label: fyo.schemaMap[i].label,
-        }))
-        .reduce((acc, { name, label }) => {
-          acc[label] = name;
-          return acc;
-        }, {});
-    },
-    canCancel() {
-      return !!(this.file || this.importType);
-    },
-  },
-  activated() {
-    docsPath.value = docsPathMap.DataImport;
-  },
-  deactivated() {
-    docsPath.value = '';
-    if (!this.complete) {
-      return;
-    }
-
-    this.clear();
-  },
-  methods: {
-    showMe() {
-      const schemaName = this.importer.schemaName;
-      this.clear();
-      this.$router.push(`/list/${schemaName}`);
-    },
-    clear() {
-      this.file = null;
-      this.names = [];
-      this.importer = null;
-      this.importType = '';
-      this.complete = false;
-      this.canReset = false;
-      this.isMakingEntries = false;
-      this.percentLoading = 0;
-      this.messageLoading = '';
-    },
-    handlePrimaryClick() {
-      if (!this.file) {
-        this.selectFile();
-        return;
-      }
-
-      this.importData();
-    },
-    handleSecondaryClick() {
-      if (!this.importer) {
-        return;
-      }
-
-      this.saveTemplate();
-    },
-    setLabelIndex(e) {
-      const labelIndex = (e.target.value ?? 1) - 1;
-      this.importer.initialize(labelIndex);
-    },
-    async saveTemplate() {
-      const template = this.importer.template;
-      const templateName = this.importType + ' ' + this.t`Template`;
-      const { cancelled, filePath } = await getSavePath(templateName, 'csv');
-
-      if (cancelled || filePath === '') {
-        return;
-      }
-      await saveData(template, filePath);
-    },
-    getAssignerField(targetLabel) {
-      const assigned = this.importer.assignedMap[targetLabel];
-      return {
-        fieldname: 'assignerField',
-        label: targetLabel,
-        placeholder: `Select Label`,
-        fieldtype: 'Select',
-        options: [
-          '',
-          ...(assigned ? [assigned] : []),
-          ...this.importer.unassignedLabels,
-        ],
-        default: assigned ?? '',
-      };
-    },
-    onAssignedChange(target, value) {
-      this.importer.assignedMap[target] = value;
-    },
-    onValueChange(event, i, j) {
-      this.importer.updateValue(event.target.value, i, j);
-    },
-    async importData() {
-      if (this.isMakingEntries || this.complete) {
-        return;
-      }
-
-      if (this.isRequiredUnassigned) {
-        return await showMessageDialog({
-          message: this.t`Required Fields not Assigned`,
-          detail: this
-            .t`Please assign the following fields ${this.requiredUnassigned.join(
-            ', '
-          )}`,
-        });
-      }
-
-      if (this.importer.assignedMatrix.length === 0) {
-        return await showMessageDialog({
-          message: this.t`No Data to Import`,
-          detail: this.t`Please select a file with data to import.`,
-        });
-      }
-
-      const { success, names, message } = await this.importer.importData(
-        this.setLoadingStatus
-      );
-      if (!success) {
-        return await showMessageDialog({
-          message: this.t`Import Failed`,
-          detail: message,
-        });
-      }
-
-      this.names = names;
-      this.complete = true;
-    },
-    setImportType(importType) {
-      if (this.importType) {
-        this.clear();
-      }
-      this.importType = importType;
-      this.importer = new Importer(
-        this.labelSchemaNameMap[this.importType],
-        fyo
-      );
-    },
-    setLoadingStatus(isMakingEntries, entriesMade, totalEntries) {
-      this.isMakingEntries = isMakingEntries;
-      this.percentLoading = entriesMade / totalEntries;
-      this.messageLoading = isMakingEntries
-        ? `${entriesMade} entries made out of ${totalEntries}...`
-        : '';
-    },
-    async selectFile() {
-      const options = {
-        title: this.t`Select File`,
-        filters: [{ name: 'CSV', extensions: ['csv'] }],
-      };
-
-      const { success, canceled, filePath, data, name } = await selectFile(
-        options
-      );
-
-      if (!success && !canceled) {
-        return await showMessageDialog({
-          message: this.t`File selection failed.`,
-        });
-      }
-
-      if (!success || canceled) {
-        return;
-      }
-
-      const text = new TextDecoder().decode(data);
-      const isValid = this.importer.selectFile(text);
-      if (!isValid) {
-        return await showMessageDialog({
-          message: this.t`Bad import data.`,
-          detail: this.t`Could not select file.`,
-        });
-      }
-
-      this.file = {
-        name,
-        filePath,
-        text,
-      };
-    },
-  },
-};
-</script>
diff --git a/src/pages/Desk.vue b/src/pages/Desk.vue
index 99726604..20fcaebd 100644
--- a/src/pages/Desk.vue
+++ b/src/pages/Desk.vue
@@ -36,15 +36,16 @@
       class="
         absolute
         bottom-0
-        left-0
+        start-0
         text-gray-600
         bg-gray-100
         rounded
+        rtl-rotate-180
         p-1
         m-4
-        opacity-0
         hover:opacity-100 hover:shadow-md
       "
+
       @click="sidebar = !sidebar"
     >
       <feather-icon name="chevrons-right" class="w-4 h-4" />
@@ -76,6 +77,11 @@ export default {
   transform: translateX(calc(-1 * var(--w-sidebar)));
   width: 0px;
 }
+[dir='rtl'] .sidebar-leave-to {
+  opacity: 0;
+  transform: translateX(calc(1 * var(--w-sidebar)));
+  width: 0px;
+}
 
 .sidebar-enter-to,
 .sidebar-leave-from {
diff --git a/src/pages/GeneralForm.vue b/src/pages/GeneralForm.vue
index 4d178983..ed92a0b1 100644
--- a/src/pages/GeneralForm.vue
+++ b/src/pages/GeneralForm.vue
@@ -130,7 +130,6 @@
 
     <template #quickedit v-if="quickEditDoc">
       <QuickEditForm
-        class="w-quick-edit"
         :name="quickEditDoc.name"
         :show-name="false"
         :show-save="false"
@@ -160,8 +159,8 @@ import FormHeader from 'src/components/FormHeader.vue';
 import StatusBadge from 'src/components/StatusBadge.vue';
 import { fyo } from 'src/initFyo';
 import { docsPathMap } from 'src/utils/misc';
+import { docsPathRef, focusedDocsRef } from 'src/utils/refs';
 import {
-  docsPath,
   getGroupedActionsForDoc,
   routeTo,
   showMessageDialog,
@@ -232,14 +231,17 @@ export default {
     },
   },
   activated() {
-    docsPath.value = docsPathMap[this.schemaName];
+    docsPathRef.value = docsPathMap[this.schemaName];
+    focusedDocsRef.add(this.doc);
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
+    focusedDocsRef.delete(this.doc);
   },
   async mounted() {
     try {
       this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
+      focusedDocsRef.add(this.doc);
     } catch (error) {
       if (error instanceof fyo.errors.NotFoundError) {
         routeTo(`/list/${this.schemaName}`);
diff --git a/src/pages/ImportWizard.vue b/src/pages/ImportWizard.vue
new file mode 100644
index 00000000..084a4545
--- /dev/null
+++ b/src/pages/ImportWizard.vue
@@ -0,0 +1,952 @@
+<template>
+  <div class="flex flex-col overflow-hidden w-full">
+    <!-- Header -->
+    <PageHeader :title="t`Import Wizard`">
+      <DropdownWithActions
+        :actions="actions"
+        v-if="hasImporter"
+        :disabled="isMakingEntries"
+        :title="t`More`"
+      />
+      <Button
+        v-if="hasImporter"
+        :title="t`Add Row`"
+        @click="() => importer.addRow()"
+        :disabled="isMakingEntries"
+        :icon="true"
+      >
+        <feather-icon name="plus" class="w-4 h-4" />
+      </Button>
+      <Button
+        v-if="hasImporter"
+        :title="t`Save Template`"
+        @click="saveTemplate"
+        :icon="true"
+      >
+        <feather-icon name="download" class="w-4 h-4" />
+      </Button>
+      <Button
+        v-if="canImportData"
+        :title="t`Import Data`"
+        type="primary"
+        @click="importData"
+        :disabled="errorMessage.length > 0 || isMakingEntries"
+      >
+        {{ t`Import Data` }}
+      </Button>
+      <Button
+        v-if="importType && !canImportData"
+        :title="t`Select File`"
+        type="primary"
+        @click="selectFile"
+      >
+        {{ t`Select File` }}
+      </Button>
+    </PageHeader>
+
+    <!-- Main Body of the Wizard -->
+    <div class="flex text-base w-full flex-col">
+      <!-- Select Import Type -->
+      <div
+        class="
+          h-row-largest
+          flex flex-row
+          justify-start
+          items-center
+          w-full
+          gap-2
+          border-b
+          p-4
+        "
+      >
+        <AutoComplete
+          :df="{
+            fieldname: 'importType',
+            label: t`Import Type`,
+            fieldtype: 'AutoComplete',
+            options: importableSchemaNames.map((value) => ({
+              value,
+              label: fyo.schemaMap[value]?.label ?? value,
+            })),
+          }"
+          input-class="bg-transparent text-gray-900 text-base"
+          class="w-40"
+          :border="true"
+          :value="importType"
+          size="small"
+          @change="setImportType"
+        />
+
+        <p v-if="errorMessage.length > 0" class="text-base ms-2 text-red-500">
+          {{ errorMessage }}
+        </p>
+        <p
+          v-else
+          class="text-base ms-2"
+          :class="fileName ? 'text-gray-900 font-semibold' : 'text-gray-700'"
+        >
+          <span v-if="fileName" class="font-normal">{{ t`Selected` }} </span>
+          {{ helperMessage }}{{ fileName ? ',' : '' }}
+          <span v-if="fileName" class="font-normal">
+            {{ t`check values and click on` }} </span
+          >{{ ' ' }}<span v-if="fileName">{{ t`Import Data.` }}</span>
+          <span
+            v-if="hasImporter && importer.valueMatrix.length > 0"
+            class="font-normal"
+            >{{
+              ' ' +
+              (importer.valueMatrix.length === 2
+                ? t`${importer.valueMatrix.length} row added.`
+                : t`${importer.valueMatrix.length} rows added.`)
+            }}</span
+          >
+        </p>
+      </div>
+
+      <!-- Assignment Row and Value Grid container -->
+      <div
+        v-if="hasImporter"
+        class="overflow-auto custom-scroll"
+        style="max-height: calc(100vh - (2 * var(--h-row-largest)) - 2px)"
+      >
+        <!-- Column Assignment Row -->
+        <div
+          class="grid sticky top-0 py-4 pe-4 bg-white border-b gap-4"
+          style="z-index: 1; width: fit-content"
+          :style="gridTemplateColumn"
+        >
+          <div class="index-cell">#</div>
+          <Select
+            v-for="index in columnIterator"
+            class="flex-shrink-0"
+            size="small"
+            :border="true"
+            :key="index"
+            :df="gridColumnTitleDf"
+            :value="importer.assignedTemplateFields[index]"
+            @change="(value: string | null) => importer.setTemplateField(index, value)"
+          />
+        </div>
+
+        <!-- Values Grid -->
+        <div
+          v-if="importer.valueMatrix.length"
+          class="grid py-4 pe-4 bg-white gap-4"
+          style="width: fit-content"
+          :style="gridTemplateColumn"
+        >
+          <!-- Grid Value Row Cells, Allow Editing Values -->
+          <template v-for="(row, ridx) of importer.valueMatrix" :key="ridx">
+            <div
+              class="index-cell group cursor-pointer"
+              @click="importer.removeRow(ridx)"
+            >
+              <feather-icon
+                name="x"
+                class="w-4 h-4 hidden group-hover:inline-block -me-1"
+                :button="true"
+              />
+              <span class="group-hover:hidden">
+                {{ ridx + 1 }}
+              </span>
+            </div>
+
+            <template
+              v-for="(val, cidx) of row.slice(0, columnCount)"
+              :key="`cell-${ridx}-${cidx}`"
+            >
+              <!-- Raw Data Field if Column is Not Assigned -->
+              <Data
+                v-if="!importer.assignedTemplateFields[cidx]"
+                :title="getFieldTitle(val)"
+                :df="{
+                  fieldname: 'tempField',
+                  label: t`Temporary`,
+                  placeholder: t`Select column`,
+                }"
+                size="small"
+                :border="true"
+                :value="
+                  val.value != null
+                    ? String(val.value)
+                    : val.rawValue != null
+                    ? String(val.rawValue)
+                    : ''
+                "
+                :read-only="true"
+              />
+
+              <!-- FormControl Field if Column is Assigned -->
+              <FormControl
+                v-else
+                :class="val.error ? 'border border-red-300 rounded-md' : ''"
+                :title="getFieldTitle(val)"
+                :df="
+                    importer.templateFieldsMap.get(
+                      importer.assignedTemplateFields[cidx]!
+                    )
+                  "
+                size="small"
+                :rows="1"
+                :border="true"
+                :value="val.error ? null : val.value"
+                @change="(value: DocValue)=> {
+                    importer.valueMatrix[ridx][cidx]!.error = false
+                    importer.valueMatrix[ridx][cidx]!.value = value
+                  }"
+              />
+            </template>
+          </template>
+        </div>
+
+        <div
+          v-else
+          class="ps-4 text-gray-700 sticky left-0 flex items-center"
+          style="height: 62.5px"
+        >
+          {{ t`No rows added. Select a file or add rows.` }}
+        </div>
+      </div>
+    </div>
+
+    <!-- Loading Bar when Saving Docs -->
+    <Loading
+      v-if="isMakingEntries"
+      :open="isMakingEntries"
+      :percent="percentLoading"
+      :message="messageLoading"
+    />
+
+    <!-- Pick Column Modal -->
+    <Modal
+      :open-modal="showColumnPicker"
+      @closemodal="showColumnPicker = false"
+    >
+      <div class="w-form">
+        <!-- Pick Column Header -->
+        <FormHeader :form-title="t`Pick Import Columns`" />
+        <hr />
+
+        <!-- Pick Column Checkboxes -->
+        <div
+          class="p-4 max-h-80 overflow-auto custom-scroll"
+          v-for="[key, value] of columnPickerFieldsMap.entries()"
+          :key="key"
+        >
+          <h2 class="text-sm font-semibold text-gray-800">
+            {{ key }}
+          </h2>
+          <div class="grid grid-cols-3 border rounded mt-1">
+            <div
+              v-for="tf of value"
+              :key="tf.fieldKey"
+              class="flex items-center"
+            >
+              <Check
+                :df="{
+                  fieldname: tf.fieldname,
+                  label: tf.label,
+                }"
+                :show-label="true"
+                :read-only="tf.required"
+                :value="importer.templateFieldsPicked.get(tf.fieldKey)"
+                @change="(value:boolean) => pickColumn(tf.fieldKey, value)"
+              />
+              <p v-if="tf.required" class="w-0 text-red-600 -ml-4">*</p>
+            </div>
+          </div>
+        </div>
+
+        <!-- Pick Column Footer -->
+        <hr />
+        <div class="p-4 flex justify-between items-center">
+          <p class="text-sm text-gray-600">
+            {{ t`${numColumnsPicked} fields selected` }}
+          </p>
+          <Button type="primary" @click="showColumnPicker = false">{{
+            t`Done`
+          }}</Button>
+        </div>
+      </div>
+    </Modal>
+
+    <!-- Import Completed Modal -->
+    <Modal :open-modal="complete" @closemodal="clear">
+      <div class="w-form">
+        <!-- Import Completed Header -->
+        <FormHeader :form-title="t`Import Complete`" />
+        <hr />
+        <!-- Success -->
+        <div v-if="success.length > 0">
+          <!-- Success Section Header -->
+          <div class="flex justify-between px-4 pt-4 pb-1">
+            <p class="text-base font-semibold">{{ t`Success` }}</p>
+            <p class="text-sm text-gray-600">
+              {{
+                success.length === 1
+                  ? t`${success.length} entry imported`
+                  : t`${success.length} entries imported`
+              }}
+            </p>
+          </div>
+          <!-- Success Body -->
+          <div class="max-h-40 overflow-auto text-gray-900">
+            <div
+              v-for="(name, i) of success"
+              :key="name"
+              class="px-4 py-1 grid grid-cols-2 text-base gap-4"
+              style="grid-template-columns: 1rem auto"
+            >
+              <div class="text-end">{{ i + 1 }}.</div>
+              <p class="whitespace-nowrap overflow-auto no-scrollbar">
+                {{ name }}
+              </p>
+            </div>
+          </div>
+          <hr />
+        </div>
+
+        <!-- Failed -->
+        <div v-if="failed.length > 0">
+          <!-- Failed Section Header -->
+          <div class="flex justify-between px-4 pt-4 pb-1">
+            <p class="text-base font-semibold">{{ t`Failed` }}</p>
+            <p class="text-sm text-gray-600">
+              {{
+                failed.length === 1
+                  ? t`${failed.length} entry failed`
+                  : t`${failed.length} entries failed`
+              }}
+            </p>
+          </div>
+          <!-- Failed Body -->
+          <div class="max-h-40 overflow-auto text-gray-900">
+            <div
+              v-for="(f, i) of failed"
+              :key="f.name"
+              class="px-4 py-1 grid grid-cols-2 text-base gap-4"
+              style="grid-template-columns: 1rem 8rem auto"
+            >
+              <div class="text-end">{{ i + 1 }}.</div>
+              <p class="whitespace-nowrap overflow-auto no-scrollbar">
+                {{ f.name }}
+              </p>
+              <p class="whitespace-nowrap overflow-auto no-scrollbar">
+                {{ f.error.message }}
+              </p>
+            </div>
+          </div>
+          <hr />
+        </div>
+
+        <!-- Fallback Div -->
+        <div
+          v-if="failed.length === 0 && success.length === 0"
+          class="p-4 text-base"
+        >
+          {{ t`No entries were imported.` }}
+        </div>
+
+        <!-- Footer Button -->
+        <div class="flex justify-between p-4">
+          <Button
+            v-if="failed.length > 0"
+            @click="clearSuccessfullyImportedEntries"
+            >{{ t`Fix Failed` }}</Button
+          >
+          <Button
+            v-if="failed.length === 0 && success.length > 0"
+            @click="showMe"
+            >{{ t`Show Me` }}</Button
+          >
+          <Button @click="clear">{{ t`Done` }}</Button>
+        </div>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script lang="ts">
+import { DocValue } from 'fyo/core/types';
+import { Action as BaseAction } from 'fyo/model/types';
+import { ValidationError } from 'fyo/utils/errors';
+import { ModelNameEnum } from 'models/types';
+import { OptionField, RawValue, SelectOption } from 'schemas/types';
+import Button from 'src/components/Button.vue';
+import AutoComplete from 'src/components/Controls/AutoComplete.vue';
+import Check from 'src/components/Controls/Check.vue';
+import Data from 'src/components/Controls/Data.vue';
+import FormControl from 'src/components/Controls/FormControl.vue';
+import Select from 'src/components/Controls/Select.vue';
+import DropdownWithActions from 'src/components/DropdownWithActions.vue';
+import FormHeader from 'src/components/FormHeader.vue';
+import Modal from 'src/components/Modal.vue';
+import PageHeader from 'src/components/PageHeader.vue';
+import { getColumnLabel, Importer, TemplateField } from 'src/importer';
+import { fyo } from 'src/initFyo';
+import { getSavePath, saveData, selectFile } from 'src/utils/ipcCalls';
+import { docsPathMap } from 'src/utils/misc';
+import { docsPathRef } from 'src/utils/refs';
+import { showMessageDialog } from 'src/utils/ui';
+import { defineComponent } from 'vue';
+import Loading from '../components/Loading.vue';
+
+type Action = Pick<BaseAction, 'condition' | 'component'> & {
+  action: Function;
+};
+
+type ImportWizardData = {
+  showColumnPicker: boolean;
+  complete: boolean;
+  success: string[];
+  successOldName: string[];
+  failed: { name: string; error: Error }[];
+  file: null | { name: string; filePath: string; text: string };
+  nullOrImporter: null | Importer;
+  importType: string;
+  isMakingEntries: boolean;
+  percentLoading: number;
+  messageLoading: string;
+};
+
+export default defineComponent({
+  components: {
+    PageHeader,
+    FormControl,
+    Button,
+    DropdownWithActions,
+    Loading,
+    AutoComplete,
+    Data,
+    Modal,
+    FormHeader,
+    Check,
+    Select,
+  },
+  data() {
+    return {
+      showColumnPicker: false,
+      complete: false,
+      success: [],
+      successOldName: [],
+      failed: [],
+      file: null,
+      nullOrImporter: null,
+      importType: '',
+      isMakingEntries: false,
+      percentLoading: 0,
+      messageLoading: '',
+    } as ImportWizardData;
+  },
+  mounted() {
+    if (fyo.store.isDevelopment) {
+      // @ts-ignore
+      window.iw = this;
+    }
+  },
+  watch: {
+    columnCount(val) {
+      if (!this.hasImporter) {
+        return;
+      }
+
+      const possiblyAssigned = this.importer.assignedTemplateFields.length;
+      if (val >= this.importer.assignedTemplateFields.length) {
+        return;
+      }
+
+      for (let i = val; i < possiblyAssigned; i++) {
+        this.importer.assignedTemplateFields[i] = null;
+      }
+    },
+  },
+  computed: {
+    gridTemplateColumn(): string {
+      return `grid-template-columns: 4rem repeat(${this.columnCount}, 10rem)`;
+    },
+    duplicates(): string[] {
+      if (!this.hasImporter) {
+        return [];
+      }
+
+      const dupes = new Set<string>();
+      const assignedSet = new Set<string>();
+
+      for (const key of this.importer.assignedTemplateFields) {
+        if (!key) {
+          continue;
+        }
+
+        const tf = this.importer.templateFieldsMap.get(key);
+        if (assignedSet.has(key) && tf) {
+          dupes.add(getColumnLabel(tf));
+        }
+
+        assignedSet.add(key);
+      }
+
+      return Array.from(dupes);
+    },
+    requiredNotSelected(): string[] {
+      if (!this.hasImporter) {
+        return [];
+      }
+
+      const assigned = new Set(this.importer.assignedTemplateFields);
+      return [...this.importer.templateFieldsMap.values()]
+        .filter((f) => f.required && !assigned.has(f.fieldKey))
+        .map((f) => getColumnLabel(f));
+    },
+    errorMessage(): string {
+      if (this.duplicates.length) {
+        return this.t`Duplicate columns found: ${this.duplicates.join(', ')}`;
+      }
+
+      if (this.requiredNotSelected.length) {
+        return this
+          .t`Required fields not selected: ${this.requiredNotSelected.join(
+          ', '
+        )}`;
+      }
+
+      return '';
+    },
+    canImportData(): boolean {
+      if (!this.hasImporter) {
+        return false;
+      }
+
+      return this.importer.valueMatrix.length > 0;
+    },
+    canSelectFile(): boolean {
+      return !this.file;
+    },
+    columnCount(): number {
+      if (!this.hasImporter) {
+        return 0;
+      }
+
+      if (!this.file) {
+        return this.numColumnsPicked;
+      }
+
+      if (!this.importer.valueMatrix.length) {
+        return this.importer.assignedTemplateFields.length;
+      }
+
+      return Math.min(
+        this.importer.assignedTemplateFields.length,
+        this.importer.valueMatrix[0].length
+      );
+    },
+    columnIterator(): number[] {
+      return Array(this.columnCount)
+        .fill(null)
+        .map((_, i) => i);
+    },
+    hasImporter(): boolean {
+      return !!this.nullOrImporter;
+    },
+    numColumnsPicked(): number {
+      return [...this.importer.templateFieldsPicked.values()].filter(Boolean)
+        .length;
+    },
+    columnPickerFieldsMap(): Map<string, TemplateField[]> {
+      const map: Map<string, TemplateField[]> = new Map();
+
+      for (const value of this.importer.templateFieldsMap.values()) {
+        let label = value.schemaLabel;
+        if (value.parentSchemaChildField) {
+          label = `${value.parentSchemaChildField.label} (${value.schemaLabel})`;
+        }
+
+        if (!map.has(label)) {
+          map.set(label, []);
+        }
+
+        map.get(label)!.push(value);
+      }
+
+      return map;
+    },
+    importer(): Importer {
+      if (!this.nullOrImporter) {
+        throw new ValidationError(this.t`Importer not set, reload tool`, false);
+      }
+
+      return this.nullOrImporter as Importer;
+    },
+    importableSchemaNames(): ModelNameEnum[] {
+      const importables = [
+        ModelNameEnum.SalesInvoice,
+        ModelNameEnum.PurchaseInvoice,
+        ModelNameEnum.Payment,
+        ModelNameEnum.Party,
+        ModelNameEnum.Item,
+        ModelNameEnum.JournalEntry,
+        ModelNameEnum.Tax,
+        ModelNameEnum.Account,
+        ModelNameEnum.Address,
+        ModelNameEnum.NumberSeries,
+      ];
+
+      const hasInventory = fyo.doc.singles.AccountingSettings?.enableInventory;
+      if (hasInventory) {
+        importables.push(
+          ModelNameEnum.StockMovement,
+          ModelNameEnum.Shipment,
+          ModelNameEnum.PurchaseReceipt,
+          ModelNameEnum.Location
+        );
+      }
+
+      return importables;
+    },
+    actions(): Action[] {
+      const actions: Action[] = [];
+
+      let selectFileLabel = this.t`Select File`;
+      if (this.file) {
+        selectFileLabel = this.t`Change File`;
+      }
+
+      if (this.canImportData) {
+        actions.push({
+          component: {
+            template: `<span>{{ "${selectFileLabel}" }}</span>`,
+          },
+          action: this.selectFile,
+        });
+      }
+
+      const pickColumnsAction = {
+        component: {
+          template: '<span>{{ t`Pick Import Columns` }}</span>',
+        },
+        action: () => (this.showColumnPicker = true),
+      };
+
+      const cancelAction = {
+        component: {
+          template: '<span class="text-red-700" >{{ t`Cancel` }}</span>',
+        },
+        action: this.clear,
+      };
+      actions.push(pickColumnsAction, cancelAction);
+
+      return actions;
+    },
+    fileName(): string {
+      if (!this.file) {
+        return '';
+      }
+
+      return this.file.name;
+    },
+    helperMessage(): string {
+      if (!this.importType) {
+        return this.t`Set an Import Type`;
+      } else if (!this.fileName) {
+        return '';
+      }
+
+      return this.fileName;
+    },
+    isSubmittable(): boolean {
+      const schemaName = this.importer.schemaName;
+      return fyo.schemaMap[schemaName]?.isSubmittable ?? false;
+    },
+    gridColumnTitleDf(): OptionField {
+      const options: SelectOption[] = [];
+      for (const field of this.importer.templateFieldsMap.values()) {
+        const value = field.fieldKey;
+        if (!this.importer.templateFieldsPicked.get(value)) {
+          continue;
+        }
+
+        const label = getColumnLabel(field);
+
+        options.push({ value, label });
+      }
+
+      options.push({ value: '', label: this.t`None` });
+      return {
+        fieldname: 'col',
+        fieldtype: 'Select',
+        options,
+      } as OptionField;
+    },
+    pickedArray(): string[] {
+      return [...this.importer.templateFieldsPicked.entries()]
+        .filter(([_, picked]) => picked)
+        .map(([key, _]) => key);
+    },
+  },
+  activated(): void {
+    docsPathRef.value = docsPathMap.ImportWizard ?? '';
+  },
+  deactivated(): void {
+    docsPathRef.value = '';
+    if (!this.complete) {
+      return;
+    }
+
+    this.clear();
+  },
+  methods: {
+    getFieldTitle(vmi: {
+      value?: DocValue;
+      rawValue?: RawValue;
+      error?: boolean;
+    }): string {
+      const title: string[] = [];
+      if (vmi.value != null) {
+        title.push(this.t`Value: ${String(vmi.value)}`);
+      }
+
+      if (vmi.rawValue != null) {
+        title.push(this.t`Raw Value: ${String(vmi.rawValue)}`);
+      }
+
+      if (vmi.error) {
+        title.push(this.t`Conversion Error`);
+      }
+
+      if (!title.length) {
+        return this.t`No Value`;
+      }
+
+      return title.join(', ');
+    },
+    pickColumn(fieldKey: string, value: boolean): void {
+      this.importer.templateFieldsPicked.set(fieldKey, value);
+      if (value) {
+        return;
+      }
+
+      const idx = this.importer.assignedTemplateFields.findIndex(
+        (f) => f === fieldKey
+      );
+
+      if (idx >= 0) {
+        this.importer.assignedTemplateFields[idx] = null;
+        this.reassignTemplateFields();
+      }
+    },
+    reassignTemplateFields(): void {
+      if (this.importer.valueMatrix.length) {
+        return;
+      }
+
+      for (const idx in this.importer.assignedTemplateFields) {
+        this.importer.assignedTemplateFields[idx] = null;
+      }
+
+      let idx = 0;
+      for (const [fieldKey, value] of this.importer.templateFieldsPicked) {
+        if (!value) {
+          continue;
+        }
+
+        this.importer.assignedTemplateFields[idx] = fieldKey;
+        idx += 1;
+      }
+    },
+    showMe(): void {
+      const schemaName = this.importer.schemaName;
+      this.clear();
+      this.$router.push(`/list/${schemaName}`);
+    },
+    clear(): void {
+      this.file = null;
+      this.success = [];
+      this.successOldName = [];
+      this.failed = [];
+      this.nullOrImporter = null;
+      this.importType = '';
+      this.complete = false;
+      this.isMakingEntries = false;
+      this.percentLoading = 0;
+      this.messageLoading = '';
+    },
+    async saveTemplate(): Promise<void> {
+      const template = this.importer.getCSVTemplate();
+      const templateName = this.importType + ' ' + this.t`Template`;
+      const { canceled, filePath } = await getSavePath(templateName, 'csv');
+
+      if (canceled || !filePath) {
+        return;
+      }
+
+      await saveData(template, filePath);
+    },
+    async preImportValidations(): Promise<boolean> {
+      const message = this.t`Cannot Import`;
+      if (this.errorMessage.length) {
+        await showMessageDialog({
+          message,
+          detail: this.errorMessage,
+        });
+        return false;
+      }
+
+      const cellErrors = this.importer.checkCellErrors();
+      if (cellErrors.length) {
+        await showMessageDialog({
+          message,
+          detail: this.t`Following cells have errors: ${cellErrors.join(', ')}`,
+        });
+        return false;
+      }
+
+      const absentLinks = await this.importer.checkLinks();
+      if (absentLinks.length) {
+        await showMessageDialog({
+          message,
+          detail: this.t`Following links do not exist: ${absentLinks
+            .map((l) => `(${l.schemaLabel}, ${l.name})`)
+            .join(', ')}`,
+        });
+        return false;
+      }
+
+      return true;
+    },
+    async importData(): Promise<void> {
+      const isValid = await this.preImportValidations();
+      if (!isValid || this.isMakingEntries || this.complete) {
+        return;
+      }
+
+      this.isMakingEntries = true;
+      this.importer.populateDocs();
+
+      const shouldSubmit = await this.askShouldSubmit();
+
+      let doneCount = 0;
+      for (const doc of this.importer.docs) {
+        this.setLoadingStatus(doneCount, this.importer.docs.length);
+        const oldName = doc.name ?? '';
+        try {
+          await doc.sync();
+          if (shouldSubmit) {
+            await doc.submit();
+          }
+          doneCount += 1;
+
+          this.success.push(doc.name!);
+          this.successOldName.push(oldName);
+        } catch (error) {
+          if (error instanceof Error) {
+            this.failed.push({ name: doc.name!, error });
+          }
+        }
+      }
+
+      this.isMakingEntries = false;
+      this.complete = true;
+    },
+    async askShouldSubmit(): Promise<boolean> {
+      if (!this.fyo.schemaMap[this.importType]?.isSubmittable) {
+        return false;
+      }
+
+      let shouldSubmit = false;
+      await showMessageDialog({
+        message: this.t`Should entries be submitted after syncing?`,
+        buttons: [
+          {
+            label: this.t`Yes`,
+            action() {
+              shouldSubmit = true;
+            },
+          },
+          {
+            label: this.t`No`,
+            action() {},
+          },
+        ],
+      });
+
+      return shouldSubmit;
+    },
+    clearSuccessfullyImportedEntries() {
+      const schemaName = this.importer.schemaName;
+      const nameFieldKey = `${schemaName}.name`;
+      const nameIndex = this.importer.assignedTemplateFields.findIndex(
+        (n) => n === nameFieldKey
+      );
+
+      const failedEntriesValueMatrix = this.importer.valueMatrix.filter(
+        (row) => {
+          const value = row[nameIndex].value;
+          if (typeof value !== 'string') {
+            return false;
+          }
+
+          return !this.successOldName.includes(value);
+        }
+      );
+
+      this.setImportType(this.importType);
+      this.importer.valueMatrix = failedEntriesValueMatrix;
+    },
+    setImportType(importType: string): void {
+      this.clear();
+      if (!importType) {
+        return;
+      }
+
+      this.importType = importType;
+      this.nullOrImporter = new Importer(importType, fyo);
+    },
+    setLoadingStatus(entriesMade: number, totalEntries: number): void {
+      this.percentLoading = entriesMade / totalEntries;
+      this.messageLoading = this.isMakingEntries
+        ? `${entriesMade} entries made out of ${totalEntries}...`
+        : '';
+    },
+    async selectFile(): Promise<void> {
+      const options = {
+        title: this.t`Select File`,
+        filters: [{ name: 'CSV', extensions: ['csv'] }],
+      };
+
+      const { success, canceled, filePath, data, name } = await selectFile(
+        options
+      );
+
+      if (!success && !canceled) {
+        await showMessageDialog({
+          message: this.t`File selection failed.`,
+        });
+        return;
+      }
+
+      if (!success || canceled) {
+        return;
+      }
+
+      const text = new TextDecoder().decode(data);
+      const isValid = this.importer.selectFile(text);
+      if (!isValid) {
+        await showMessageDialog({
+          message: this.t`Bad import data`,
+          detail: this.t`Could not read file`,
+        });
+        return;
+      }
+
+      this.file = {
+        name,
+        filePath,
+        text,
+      };
+    },
+  },
+});
+</script>
+<style scoped>
+.index-cell {
+  @apply flex pe-4 justify-end items-center border-e  bg-white sticky left-0 -my-4 text-gray-600;
+}
+</style>
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index dddb41ef..fc71686d 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -273,7 +273,6 @@
       <Transition name="quickedit">
         <QuickEditForm
           v-if="quickEditDoc && !linked"
-          class="w-quick-edit"
           :name="quickEditDoc.name"
           :show-name="false"
           :show-save="false"
@@ -313,8 +312,8 @@ import StatusBadge from 'src/components/StatusBadge.vue';
 import LinkedEntryWidget from 'src/components/Widgets/LinkedEntryWidget.vue';
 import { fyo } from 'src/initFyo';
 import { docsPathMap } from 'src/utils/misc';
+import { docsPathRef, focusedDocsRef } from 'src/utils/refs';
 import {
-  docsPath,
   getGroupedActionsForDoc,
   routeTo,
   showMessageDialog,
@@ -339,6 +338,7 @@ export default {
     LinkedEntryWidget,
     Barcode,
   },
+  inject: ['shortcuts'],
   provide() {
     return {
       schemaName: this.schemaName,
@@ -455,14 +455,17 @@ export default {
     },
   },
   activated() {
-    docsPath.value = docsPathMap[this.schemaName];
+    docsPathRef.value = docsPathMap[this.schemaName];
+    focusedDocsRef.add(this.doc);
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
+    focusedDocsRef.delete(this.doc);
   },
   async mounted() {
     try {
       this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
+      focusedDocsRef.add(this.doc);
     } catch (error) {
       if (error instanceof fyo.errors.NotFoundError) {
         routeTo(`/list/${this.schemaName}`);
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index c346e603..bc884acb 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -148,8 +148,8 @@ import FormHeader from 'src/components/FormHeader.vue';
 import StatusBadge from 'src/components/StatusBadge.vue';
 import { fyo } from 'src/initFyo';
 import { docsPathMap } from 'src/utils/misc';
+import { docsPathRef, focusedDocsRef } from 'src/utils/refs';
 import {
-  docsPath,
   getGroupedActionsForDoc,
   routeTo,
   showMessageDialog,
@@ -182,14 +182,17 @@ export default {
     };
   },
   activated() {
-    docsPath.value = docsPathMap.JournalEntry;
+    docsPathRef.value = docsPathMap.JournalEntry;
+    focusedDocsRef.add(this.doc);
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
+    focusedDocsRef.delete(this.doc);
   },
   async mounted() {
     try {
       this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
+      focusedDocsRef.add(this.doc);
     } catch (error) {
       if (error instanceof fyo.errors.NotFoundError) {
         routeTo(`/list/${this.schemaName}`);
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index 58006d1f..7e4fb100 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -51,7 +51,8 @@ import {
   docsPathMap,
   getCreateFiltersFromListViewFilters,
 } from 'src/utils/misc';
-import { docsPath, openQuickEdit, routeTo } from 'src/utils/ui';
+import { docsPathRef } from 'src/utils/refs';
+import { openQuickEdit, routeTo } from 'src/utils/ui';
 import List from './List.vue';
 
 export default {
@@ -82,14 +83,14 @@ export default {
     }
 
     this.listConfig = getListConfig(this.schemaName);
-    docsPath.value = docsPathMap[this.schemaName] ?? docsPathMap.Entries;
+    docsPathRef.value = docsPathMap[this.schemaName] ?? docsPathMap.Entries;
 
     if (this.fyo.store.isDevelopment) {
       window.lv = this;
     }
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
   },
   methods: {
     updatedData(listFilters) {
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index 4eae317b..9dc1b461 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -105,6 +105,7 @@ import StatusBadge from 'src/components/StatusBadge.vue';
 import TwoColumnForm from 'src/components/TwoColumnForm.vue';
 import { fyo } from 'src/initFyo';
 import { getQuickEditWidget } from 'src/utils/quickEditWidgets';
+import { focusedDocsRef } from 'src/utils/refs';
 import { getActionsForDoc, openQuickEdit } from 'src/utils/ui';
 
 export default {
@@ -131,6 +132,7 @@ export default {
     DropdownWithActions,
   },
   emits: ['close'],
+  inject: ['shortcuts'],
   provide() {
     return {
       schemaName: this.schemaName,
@@ -147,17 +149,26 @@ export default {
       statusText: null,
     };
   },
-  mounted() {
+  async mounted() {
     if (this.defaults) {
       this.values = JSON.parse(this.defaults);
     }
 
+    await this.fetchFieldsAndDoc();
+    focusedDocsRef.add(this.doc);
+
     if (fyo.store.isDevelopment) {
       window.qef = this;
     }
   },
-  async created() {
-    await this.fetchFieldsAndDoc();
+  activated() {
+    focusedDocsRef.add(this.doc);
+  },
+  deactivated() {
+    focusedDocsRef.delete(this.doc);
+  },
+  unmounted() {
+    focusedDocsRef.delete(this.doc);
   },
   computed: {
     isChild() {
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index 8f226c96..608bda2b 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -46,7 +46,7 @@ import PageHeader from 'src/components/PageHeader.vue';
 import ListReport from 'src/components/Report/ListReport.vue';
 import { fyo } from 'src/initFyo';
 import { docsPathMap } from 'src/utils/misc';
-import { docsPath } from 'src/utils/ui';
+import { docsPathRef } from 'src/utils/refs';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
@@ -70,7 +70,7 @@ export default defineComponent({
   },
   components: { PageHeader, FormControl, ListReport, DropdownWithActions },
   async activated() {
-    docsPath.value = docsPathMap[this.reportClassName] ?? docsPathMap.Reports;
+    docsPathRef.value = docsPathMap[this.reportClassName] ?? docsPathMap.Reports;
     await this.setReportData();
 
     const filters = JSON.parse(this.defaultFilters);
@@ -88,7 +88,7 @@ export default defineComponent({
     }
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
   },
   computed: {
     title() {
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
index ac814296..2d0c2db7 100644
--- a/src/pages/Settings/Settings.vue
+++ b/src/pages/Settings/Settings.vue
@@ -49,7 +49,8 @@ import Row from 'src/components/Row.vue';
 import StatusBadge from 'src/components/StatusBadge.vue';
 import { fyo } from 'src/initFyo';
 import { docsPathMap } from 'src/utils/misc';
-import { docsPath, showToast } from 'src/utils/ui';
+import { docsPathRef } from 'src/utils/refs';
+import { showToast } from 'src/utils/ui';
 import { IPC_MESSAGES } from 'utils/messages';
 import { h, markRaw } from 'vue';
 import TabBase from './TabBase.vue';
@@ -112,10 +113,10 @@ export default {
   },
   activated() {
     this.setActiveTab();
-    docsPath.value = docsPathMap.Settings;
+    docsPathRef.value = docsPathMap.Settings;
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
     if (this.fieldsChanged.length === 0) {
       return;
     }
diff --git a/src/router.ts b/src/router.ts
index ab73c275..5f862a01 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,7 +1,7 @@
 import { ModelNameEnum } from 'models/types';
 import ChartOfAccounts from 'src/pages/ChartOfAccounts.vue';
 import Dashboard from 'src/pages/Dashboard/Dashboard.vue';
-import DataImport from 'src/pages/DataImport.vue';
+import ImportWizard from 'src/pages/ImportWizard.vue';
 import GeneralForm from 'src/pages/GeneralForm.vue';
 import GetStarted from 'src/pages/GetStarted.vue';
 import InvoiceForm from 'src/pages/InvoiceForm.vue';
@@ -138,9 +138,9 @@ const routes: RouteRecordRaw[] = [
     },
   },
   {
-    path: '/data-import',
-    name: 'Data Import',
-    component: DataImport,
+    path: '/import-wizard',
+    name: 'Import Wizard',
+    component: ImportWizard,
   },
   {
     path: '/settings',
diff --git a/src/styles/index.css b/src/styles/index.css
index 680d4048..3d1b724a 100644
--- a/src/styles/index.css
+++ b/src/styles/index.css
@@ -82,6 +82,7 @@ input[type='number']::-webkit-inner-spin-button {
 
 .w-quick-edit {
   width: var(--w-quick-edit);
+  flex-shrink: 0;
 }
 
 .h-form {
diff --git a/src/utils/export.ts b/src/utils/export.ts
index 48e3a918..6f7c9659 100644
--- a/src/utils/export.ts
+++ b/src/utils/export.ts
@@ -1,12 +1,18 @@
 import { Fyo } from 'fyo';
 import { RawValueMap } from 'fyo/core/types';
-import { Field, FieldTypeEnum, RawValue, TargetField } from 'schemas/types';
+import {
+  Field,
+  FieldType,
+  FieldTypeEnum,
+  RawValue,
+  TargetField,
+} from 'schemas/types';
 import { generateCSV } from 'utils/csvParser';
 import { GetAllOptions, QueryFilter } from 'utils/db/types';
 import { getMapFromList, safeParseFloat } from 'utils/index';
 import { ExportField, ExportTableField } from './types';
 
-const excludedFieldTypes = [
+const excludedFieldTypes: FieldType[] = [
   FieldTypeEnum.AttachImage,
   FieldTypeEnum.Attachment,
 ];
@@ -26,7 +32,7 @@ export function getExportFields(
     .filter((f) => !f.computed && f.label && !exclude.includes(f.fieldname))
     .map((field) => {
       const { fieldname, label } = field;
-      const fieldtype = field.fieldtype as FieldTypeEnum;
+      const fieldtype = field.fieldtype as FieldType;
       return {
         fieldname,
         fieldtype,
@@ -323,7 +329,7 @@ async function getChildTableData(
   return data;
 }
 
-function convertRawPesaToFloat(data: RawValueMap[], fields: Field[]) {
+function convertRawPesaToFloat(data: RawValueMap[], fields: ExportField[]) {
   const currencyFields = fields.filter(
     (f) => f.fieldtype === FieldTypeEnum.Currency
   );
diff --git a/src/utils/language.ts b/src/utils/language.ts
index 413c5c19..901a0a88 100644
--- a/src/utils/language.ts
+++ b/src/utils/language.ts
@@ -3,6 +3,7 @@ import { DEFAULT_LANGUAGE } from 'fyo/utils/consts';
 import { setLanguageMapOnTranslationString } from 'fyo/utils/translation';
 import { fyo } from 'src/initFyo';
 import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
+import { systemLanguageRef } from './refs';
 import { showToast } from './ui';
 
 // Language: Language Code in books/translations
@@ -42,6 +43,7 @@ export async function setLanguageMap(
 
   if (success && !usingDefault) {
     fyo.config.set('language', language);
+    systemLanguageRef.value = language;
   }
 
   if (!dontReload && success && initLanguage !== oldLanguage) {
diff --git a/src/utils/misc.ts b/src/utils/misc.ts
index 4e06b252..d135172d 100644
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@@ -1,5 +1,6 @@
 import { Fyo } from 'fyo';
 import { ConfigFile, ConfigKeys } from 'fyo/core/types';
+import { Doc } from 'fyo/model/doc';
 import { DateTime } from 'luxon';
 import { SetupWizard } from 'models/baseModels/SetupWizard/SetupWizard';
 import { ModelNameEnum } from 'models/types';
@@ -117,7 +118,7 @@ export const docsPathMap: Record<string, string | undefined> = {
   // Miscellaneous
   Search: 'miscellaneous/search',
   NumberSeries: 'miscellaneous/number-series',
-  DataImport: 'miscellaneous/data-import',
+  ImportWizard: 'miscellaneous/import-wizard',
   Settings: 'miscellaneous/settings',
   ChartOfAccounts: 'miscellaneous/chart-of-accounts',
 };
@@ -160,3 +161,45 @@ export function getCreateFiltersFromListViewFilters(filters: QueryFilter) {
 
   return createFilters;
 }
+
+export class FocusedDocContextSet {
+  set: Doc[];
+  constructor() {
+    this.set = [];
+  }
+
+  add(doc: unknown) {
+    if (!(doc instanceof Doc)) {
+      return;
+    }
+
+    const index = this.findIndex(doc);
+    if (index !== -1) {
+      this.delete(index);
+    }
+
+    return this.set.push(doc);
+  }
+
+  delete(index: Doc | number) {
+    if (typeof index !== 'number') {
+      index = this.findIndex(index);
+    }
+
+    if (index === -1) {
+      return;
+    }
+
+    this.set = this.set.filter((_, i) => i !== index);
+  }
+
+  last() {
+    return this.set.at(-1);
+  }
+
+  findIndex(doc: Doc) {
+    return this.set.findIndex(
+      (d) => d.name === doc.name && d.schemaName === doc.schemaName
+    );
+  }
+}
diff --git a/src/utils/refs.ts b/src/utils/refs.ts
new file mode 100644
index 00000000..c2f06744
--- /dev/null
+++ b/src/utils/refs.ts
@@ -0,0 +1,8 @@
+import { reactive, ref } from 'vue';
+import { FocusedDocContextSet } from './misc';
+
+export const docsPathRef = ref<string>('');
+export const systemLanguageRef = ref<string>('');
+export const focusedDocsRef = reactive<FocusedDocContextSet>(
+  new FocusedDocContextSet()
+);
diff --git a/src/utils/search.ts b/src/utils/search.ts
index 71c76c7b..95eb60cd 100644
--- a/src/utils/search.ts
+++ b/src/utils/search.ts
@@ -323,8 +323,8 @@ function getSetupList(): SearchItem[] {
       group: 'Page',
     },
     {
-      label: t`Data Import`,
-      route: '/data-import',
+      label: t`Import Wizard`,
+      route: '/import-wizard',
       group: 'Page',
     },
     {
@@ -594,10 +594,7 @@ export class Search {
     keys.sort((a, b) => safeParseFloat(b) - safeParseFloat(a));
     const array: SearchItems = [];
     for (const key of keys) {
-      const keywords = groupedKeywords[key];
-      if (!keywords?.length) {
-        continue;
-      }
+      const keywords = groupedKeywords[key] ?? [];
 
       this._pushDocSearchItems(keywords, array, input);
       if (key === '0') {
diff --git a/src/utils/shortcuts.ts b/src/utils/shortcuts.ts
new file mode 100644
index 00000000..89f6f622
--- /dev/null
+++ b/src/utils/shortcuts.ts
@@ -0,0 +1,78 @@
+import { t } from 'fyo';
+import type { Doc } from 'fyo/model/doc';
+import { fyo } from 'src/initFyo';
+import router from 'src/router';
+import { focusedDocsRef } from './refs';
+import { showMessageDialog } from './ui';
+import { Shortcuts } from './vueUtils';
+
+export function setGlobalShortcuts(shortcuts: Shortcuts) {
+  /**
+   * PMod              : if macOS then Meta (⌘) else Ctrl, both Left and Right
+   *
+   * Backspace         : Go to the previous page
+   * PMod + S          : Save or Submit focused doc if possible
+   * PMod + Backspace  : Cancel or Delete  focused doc if possible
+   */
+  shortcuts.set(['Backspace'], async () => {
+    if (document.body !== document.activeElement) {
+      return;
+    }
+
+    router.back();
+  });
+
+  shortcuts.pmod.set(['KeyS'], async () => {
+    const doc = focusedDocsRef.last();
+    if (!doc) {
+      return;
+    }
+
+    if (doc.canSave) {
+      await showDocStateChangeMessageDialog(doc, 'sync');
+    } else if (doc.canSubmit) {
+      await showDocStateChangeMessageDialog(doc, 'submit');
+    }
+  });
+
+  shortcuts.pmod.set(['Backspace'], async () => {
+    const doc = focusedDocsRef.last();
+    if (!doc) {
+      return;
+    }
+
+    if (doc.canCancel) {
+      await showDocStateChangeMessageDialog(doc, 'cancel');
+    } else if (doc.canDelete) {
+      await showDocStateChangeMessageDialog(doc, 'delete');
+    }
+  });
+}
+
+async function showDocStateChangeMessageDialog(
+  doc: Doc,
+  state: 'sync' | 'submit' | 'cancel' | 'delete'
+) {
+  const label = fyo.schemaMap[doc.schemaName]?.label ?? t`Doc`;
+  const name = doc.name ?? '';
+  const message =
+    { sync: t`Save`, submit: t`Submit`, cancel: t`Cancel`, delete: t`Delete` }[
+      state
+    ] + ` ${label} ${name}`;
+
+  await showMessageDialog({
+    message,
+    buttons: [
+      {
+        label: t`Yes`,
+        async action() {
+          await doc[state]();
+        },
+      },
+      {
+        label: t`No`,
+        action() {},
+      },
+    ],
+  });
+}
diff --git a/src/utils/sidebarConfig.ts b/src/utils/sidebarConfig.ts
index 7dfc6005..a60e603c 100644
--- a/src/utils/sidebarConfig.ts
+++ b/src/utils/sidebarConfig.ts
@@ -268,9 +268,9 @@ async function getCompleteSidebar(): Promise<SidebarConfig> {
           schemaName: 'Tax',
         },
         {
-          label: t`Data Import`,
-          name: 'data-import',
-          route: '/data-import',
+          label: t`Import Wizard`,
+          name: 'import-wizard',
+          route: '/import-wizard',
         },
         {
           label: t`Settings`,
diff --git a/src/utils/types.ts b/src/utils/types.ts
index 58ff7f57..00e6c1a4 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -1,5 +1,5 @@
 import { Doc } from "fyo/model/doc";
-import { FieldTypeEnum } from "schemas/types";
+import { FieldType } from "schemas/types";
 import { QueryFilter } from "utils/db/types";
 
 export interface MessageDialogButton {
@@ -58,7 +58,7 @@ export interface SidebarItem {
 
 export interface ExportField {
   fieldname: string;
-  fieldtype: FieldTypeEnum;
+  fieldtype: FieldType;
   label: string;
   export: boolean;
 }
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index 093b3170..38a59c55 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -4,7 +4,7 @@
  */
 import { ipcRenderer } from 'electron';
 import { t } from 'fyo';
-import { Doc } from 'fyo/model/doc';
+import type { Doc } from 'fyo/model/doc';
 import { Action } from 'fyo/model/types';
 import { getActions } from 'fyo/utils';
 import { getDbError, LinkValidationError, ValueError } from 'fyo/utils/errors';
@@ -23,8 +23,6 @@ import {
   ToastOptions,
 } from './types';
 
-export const docsPath = ref('');
-
 export async function openQuickEdit({
   doc,
   schemaName,
diff --git a/src/utils/vueUtils.ts b/src/utils/vueUtils.ts
index 4a266ddd..222e36ef 100644
--- a/src/utils/vueUtils.ts
+++ b/src/utils/vueUtils.ts
@@ -1,7 +1,6 @@
-import { onMounted, onUnmounted, Ref, ref, watch } from 'vue';
+import { onMounted, onUnmounted, reactive, ref, watch } from 'vue';
 
-interface Keys {
-  pressed: Set<string>;
+interface ModMap {
   alt: boolean;
   ctrl: boolean;
   meta: boolean;
@@ -9,13 +8,27 @@ interface Keys {
   repeat: boolean;
 }
 
-export class Shortcuts {
-  keys: Ref<Keys>;
-  shortcuts: Map<string, Function>;
+type Mod = keyof ModMap;
 
-  constructor(keys?: Ref<Keys>) {
+interface Keys extends ModMap {
+  pressed: Set<string>;
+}
+
+type ShortcutFunction = () => void;
+
+const mods: Readonly<Mod[]> = ['alt', 'ctrl', 'meta', 'repeat', 'shift'];
+
+export class Shortcuts {
+  keys: Keys;
+  isMac: boolean;
+  shortcuts: Map<string, ShortcutFunction>;
+  modMap: Partial<Record<Mod, boolean>>;
+
+  constructor(keys?: Keys) {
+    this.modMap = {};
     this.keys = keys ?? useKeys();
     this.shortcuts = new Map();
+    this.isMac = getIsMac();
 
     watch(this.keys, (keys) => {
       this.#trigger(keys);
@@ -23,17 +36,22 @@ export class Shortcuts {
   }
 
   #trigger(keys: Keys) {
-    const key = Array.from(keys.pressed).sort().join('+');
+    const key = this.getKey(Array.from(keys.pressed), keys);
     this.shortcuts.get(key)?.();
   }
 
   has(shortcut: string[]) {
-    const key = shortcut.sort().join('+');
+    const key = this.getKey(shortcut);
     return this.shortcuts.has(key);
   }
 
-  set(shortcut: string[], callback: Function, removeIfSet: boolean = true) {
-    const key = shortcut.sort().join('+');
+  set(
+    shortcut: string[],
+    callback: ShortcutFunction,
+    removeIfSet: boolean = true
+  ) {
+    const key = this.getKey(shortcut);
+
     if (removeIfSet) {
       this.shortcuts.delete(key);
     }
@@ -46,13 +64,68 @@ export class Shortcuts {
   }
 
   delete(shortcut: string[]) {
-    const key = shortcut.sort().join('+');
+    const key = this.getKey(shortcut);
     this.shortcuts.delete(key);
   }
+
+  getKey(shortcut: string[], modMap?: Partial<ModMap>): string {
+    const _modMap = modMap || this.modMap;
+    this.modMap = {};
+
+    const shortcutString = shortcut.sort().join('+');
+    const modString = mods.filter((k) => _modMap[k]).join('+');
+    if (shortcutString && modString) {
+      return modString + '+' + shortcutString;
+    }
+
+    if (!modString) {
+      return shortcutString;
+    }
+
+    if (!shortcutString) {
+      return modString;
+    }
+
+    return '';
+  }
+
+  get alt() {
+    this.modMap['alt'] = true;
+    return this;
+  }
+
+  get ctrl() {
+    this.modMap['ctrl'] = true;
+    return this;
+  }
+
+  get meta() {
+    this.modMap['meta'] = true;
+    return this;
+  }
+
+  get shift() {
+    this.modMap['shift'] = true;
+    return this;
+  }
+
+  get repeat() {
+    this.modMap['repeat'] = true;
+    return this;
+  }
+
+  get pmod() {
+    if (this.isMac) {
+      return this.meta;
+    } else {
+      return this.ctrl;
+    }
+  }
 }
 
 export function useKeys() {
-  const keys: Ref<Keys> = ref({
+  const isMac = getIsMac();
+  const keys: Keys = reactive({
     pressed: new Set<string>(),
     alt: false,
     ctrl: false,
@@ -62,21 +135,32 @@ export function useKeys() {
   });
 
   const keydownListener = (e: KeyboardEvent) => {
-    keys.value.pressed.add(e.code);
-    keys.value.alt = e.altKey;
-    keys.value.ctrl = e.ctrlKey;
-    keys.value.meta = e.metaKey;
-    keys.value.shift = e.shiftKey;
-    keys.value.repeat = e.repeat;
+    keys.alt = e.altKey;
+    keys.ctrl = e.ctrlKey;
+    keys.meta = e.metaKey;
+    keys.shift = e.shiftKey;
+    keys.repeat = e.repeat;
+
+    const { code } = e;
+    if (
+      code.startsWith('Alt') ||
+      code.startsWith('Control') ||
+      code.startsWith('Meta') ||
+      code.startsWith('Shift')
+    ) {
+      return;
+    }
+
+    keys.pressed.add(code);
   };
 
   const keyupListener = (e: KeyboardEvent) => {
-    keys.value.pressed.delete(e.code);
-
-    // Key up won't trigger on macOS for other keys.
-    if (e.code === 'MetaLeft') {
-      keys.value.pressed.clear();
+    const { code } = e;
+    if (code.startsWith('Meta') && isMac) {
+      return keys.pressed.clear();
     }
+
+    keys.pressed.delete(code);
   };
 
   onMounted(() => {
@@ -110,10 +194,6 @@ export function useMouseLocation() {
   return loc;
 }
 
-export function getModKeyCode(platform: 'Windows' | 'Linux' | 'Mac') {
-  if (platform === 'Mac') {
-    return 'MetaLeft';
-  }
-
-  return 'CtrlLeft';
+function getIsMac() {
+  return navigator.userAgent.indexOf('Mac') !== -1;
 }
diff --git a/tests/items.csv b/tests/items.csv
new file mode 100644
index 00000000..bd5ff56d
--- /dev/null
+++ b/tests/items.csv
@@ -0,0 +1,13 @@
+"Item Name",Description,"Unit Type",Type,For,"Sales Acc.","Purchase Acc.",Tax,Rate,HSN/SAC,Barcode,"Track Item","Created By","Modified By",Created,Modified
+Item.name,Item.description,Item.unit,Item.itemType,Item.for,Item.incomeAccount,Item.expenseAccount,Item.tax,Item.rate,Item.hsnCode,Item.barcode,Item.trackItem,Item.createdBy,Item.modifiedBy,Item.created,Item.modified
+"Final Item","A final item made from raw items",Unit,Product,Both,Sales,"Stock Received But Not Billed",,500,0,,1,lin@to.co,lin@to.co,2023-01-31T06:46:00.200Z,2023-01-31T06:46:00.200Z
+"Raw Two","Another Raw item used to make a final item",Unit,Product,Both,Sales,"Stock Received But Not Billed",,200,0,,1,lin@to.co,lin@to.co,2023-01-31T06:45:32.449Z,2023-01-31T06:45:32.449Z
+"Raw One","A raw item used to make a final item.",Unit,Product,Both,Sales,"Stock Received But Not Billed",,100,0,,1,lin@to.co,lin@to.co,2023-01-31T06:44:58.047Z,2023-01-31T06:44:58.047Z
+"Test One",,Unit,Product,Both,Sales,"Stock Received But Not Billed",GST-18,200,0,,1,lin@to.co,lin@to.co,2023-01-09T10:46:02.217Z,2023-01-09T10:46:02.217Z
+Stuff,"Some stuff.",Unit,Product,Both,Sales,"Stock Received But Not Billed",GST-18,200,101192,,1,lin@to.co,lin@to.co,2023-01-09T07:14:12.208Z,2023-01-09T07:14:12.208Z
+"Something Sellable",,Unit,Product,Sales,Sales,"Cost of Goods Sold",,300,0,,0,lin@to.co,lin@to.co,2022-10-11T09:15:15.724Z,2023-01-16T08:49:49.267Z
+Ball,"Just a ball..",Unit,Product,Both,Sales,"Cost of Goods Sold",,30,0,,0,Administrator,Administrator,2022-02-24T04:38:09.181Z,2022-02-24T04:38:09.181Z
+Bat,"Regular old bat...",Unit,Product,Both,Sales,"Cost of Goods Sold",,129,0,,0,Administrator,Administrator,2022-02-24T04:38:09.174Z,2022-02-24T04:38:09.174Z
+"Holy Icon","The holiest of icons.",Unit,Product,Both,Sales,"Cost of Goods Sold",GST-3,330,0,,0,Administrator,Administrator,2022-02-11T11:32:33.342Z,2022-02-11T11:32:33.342Z
+"Flower Pot","Just a flower pot.",Unit,Product,Both,Sales,"Cost of Goods Sold",GST-12,200,,,0,Administrator,Administrator,2021-12-16T07:04:08.233Z,2021-12-16T07:04:08.233Z
+Flow,"Used to test the flow of operations.",Unit,Product,Both,Sales,"Cost of Goods Sold",GST-12,100,,,0,Administrator,Administrator,2021-12-16T05:42:02.081Z,2021-12-16T05:48:48.203Z
\ No newline at end of file
diff --git a/tests/parties.csv b/tests/parties.csv
new file mode 100644
index 00000000..b3cae66a
--- /dev/null
+++ b/tests/parties.csv
@@ -0,0 +1,8 @@
+Name,Role,"Default Account","Outstanding Amount",Currency,Email,Phone,Address,"GSTIN No.","GST Registration","Created By","Modified By",Created,Modified
+Party.name,Party.role,Party.defaultAccount,Party.outstandingAmount,Party.currency,Party.email,Party.phone,Party.address,Party.gstin,Party.gstType,Party.createdBy,Party.modifiedBy,Party.created,Party.modified
+Randoe,Both,,259.6,INR,,,,,Unregistered,lin@to.co,lin@to.co,2023-01-09T04:58:16.050Z,2023-01-09T10:46:46.128Z
+Saipan,Customer,Debtors,299.99999999921,USD,sai@pan.co,,,,Unregistered,lin@to.co,lin@to.co,2022-07-18T17:07:35.103Z,2023-01-30T14:36:50.058Z
+Lordham,Customer,Debtors,851.8,INR,lo@gamil.com,8989004444,,,Unregistered,Administrator,lin@to.co,2022-02-04T06:35:19.404Z,2022-07-18T17:05:42.976Z
+Lyn,Customer,Debtors,100,INR,lyn@to.co,,,,Consumer,Administrator,Administrator,2022-02-04T06:21:19.069Z,2022-02-28T05:18:32.743Z
+Bølèn,Customer,Debtors,0,INR,bo@len.co,,,22ABCIK123401Z5,"Registered Regular",Administrator,Administrator,2022-01-12T08:44:58.879Z,2022-01-12T08:45:26.714Z
+Bé,Customer,Debtors,46,INR,bey@more.tips,6969969600,,,Consumer,Administrator,Administrator,2021-12-16T11:32:11.595Z,2021-12-16T12:00:28.558Z
\ No newline at end of file
diff --git a/tests/sales_invoices.csv b/tests/sales_invoices.csv
new file mode 100644
index 00000000..fb53678e
--- /dev/null
+++ b/tests/sales_invoices.csv
@@ -0,0 +1,30 @@
+"Invoice No",Date,Party,Account,"Customer Currency","Exchange Rate","Net Total","Grand Total","Base Grand Total","Outstanding Amount","Set Discount Amount","Discount Amount","Discount Percent","Discount After Tax","Entry Currency",Notes,"Stock Not Transferred","Number Series","Created By","Modified By",Created,Modified,Submitted,Cancelled,"Tax Account",Rate,Amount,Item,Description,Quantity,Rate,Account,Tax,Amount,"Set Discount Amount","Discount Amount","Discount Percent",HSN/SAC,"Stock Not Transferred"
+SalesInvoice.name,SalesInvoice.date,SalesInvoice.party,SalesInvoice.account,SalesInvoice.currency,SalesInvoice.exchangeRate,SalesInvoice.netTotal,SalesInvoice.grandTotal,SalesInvoice.baseGrandTotal,SalesInvoice.outstandingAmount,SalesInvoice.setDiscountAmount,SalesInvoice.discountAmount,SalesInvoice.discountPercent,SalesInvoice.discountAfterTax,SalesInvoice.entryCurrency,SalesInvoice.terms,SalesInvoice.stockNotTransferred,SalesInvoice.numberSeries,SalesInvoice.createdBy,SalesInvoice.modifiedBy,SalesInvoice.created,SalesInvoice.modified,SalesInvoice.submitted,SalesInvoice.cancelled,TaxSummary.account,TaxSummary.rate,TaxSummary.amount,SalesInvoiceItem.item,SalesInvoiceItem.description,SalesInvoiceItem.quantity,SalesInvoiceItem.rate,SalesInvoiceItem.account,SalesInvoiceItem.tax,SalesInvoiceItem.amount,SalesInvoiceItem.setItemDiscountAmount,SalesInvoiceItem.itemDiscountAmount,SalesInvoiceItem.itemDiscountPercent,SalesInvoiceItem.hsnCode,SalesInvoiceItem.stockNotTransferred
+1020,2023-01-31,Lordham,Debtors,INR,1,500,500,500,500,0,0,0,0,Party,,1,SINV-,lin@to.co,lin@to.co,2023-01-31T09:00:45.858Z,2023-01-31T09:00:45.858Z,0,0,,,,"Final Item","A final item made from raw items",1,500,Sales,,500,0,0,0,0,1
+1019,2023-01-09,Randoe,Debtors,INR,1,220,259.6,259.6,259.6,0,0,0,0,Party,,1,SINV-,lin@to.co,lin@to.co,2023-01-09T10:46:40.923Z,2023-01-09T10:46:46.085Z,1,0,CGST,9,19.8,,,,,,,,,,,,
+1019,2023-01-09,Randoe,Debtors,INR,1,220,259.6,259.6,259.6,0,0,0,0,Party,,1,SINV-,lin@to.co,lin@to.co,2023-01-09T10:46:40.923Z,2023-01-09T10:46:46.085Z,1,0,SGST,9,19.8,,,,,,,,,,,,
+1019,2023-01-09,Randoe,Debtors,INR,1,220,259.6,259.6,259.6,0,0,0,0,Party,,1,SINV-,lin@to.co,lin@to.co,2023-01-09T10:46:40.923Z,2023-01-09T10:46:46.085Z,1,0,,,,"Test One",,1,220,Sales,GST-18,220,0,0,0,0,1
+1018,2022-10-11,Saipan,Debtors,USD,82.47,3.63768643142,3.63768643142,299.99999999921,299.99999999921,0,0,0,0,Party,,0,SINV-,lin@to.co,lin@to.co,2022-10-11T09:16:50.373Z,2023-01-30T14:36:50.021Z,1,0,,,,"Something Sellable",,1,3.63768643142,Sales,,3.63768643142,0,0,0,0,0
+1014,2022-07-11,Lordham,Debtors,INR,1,660,679.8,679.8,679.8,0,0,,0,Party,,,SINV-,lin@to.co,lin@to.co,2022-07-11T11:06:18.788Z,2022-07-18T17:05:42.922Z,1,0,CGST,1.5,9.9,,,,,,,,,,,,
+1014,2022-07-11,Lordham,Debtors,INR,1,660,679.8,679.8,679.8,0,0,,0,Party,,,SINV-,lin@to.co,lin@to.co,2022-07-11T11:06:18.788Z,2022-07-18T17:05:42.922Z,1,0,SGST,1.5,9.9,,,,,,,,,,,,
+1014,2022-07-11,Lordham,Debtors,INR,1,660,679.8,679.8,679.8,0,0,,0,Party,,,SINV-,lin@to.co,lin@to.co,2022-07-11T11:06:18.788Z,2022-07-18T17:05:42.922Z,1,0,,,,"Holy Icon","The holiest of icons.",2,330,Sales,GST-3,660,0,0,,0,
+1011,2022-02-22,Lyn,Debtors,INR,1,1410,1471.2,1471.2,100,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-02-24T05:07:23.656Z,2022-02-28T05:18:32.731Z,1,0,SGST,1.5,30.6,,,,,,,,,,,,
+1011,2022-02-22,Lyn,Debtors,INR,1,1410,1471.2,1471.2,100,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-02-24T05:07:23.656Z,2022-02-28T05:18:32.731Z,1,0,CGST,1.5,30.6,,,,,,,,,,,,
+1011,2022-02-22,Lyn,Debtors,INR,1,1410,1471.2,1471.2,100,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-02-24T05:07:23.656Z,2022-02-28T05:18:32.731Z,1,0,,,,"Flower Pot","Just a flower pot.",1,210,Sales,GST-12,210,0,0,,,
+1011,2022-02-22,Lyn,Debtors,INR,1,1410,1471.2,1471.2,100,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-02-24T05:07:23.656Z,2022-02-28T05:18:32.731Z,1,0,,,,"Holy Icon","The holiest of icons.",3,400,Sales,GST-3,1200,0,0,,0,
+1012,2022-02-20,Lordham,Debtors,INR,1,2230,2353.6,2353.6,0,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-02-24T05:07:23.685Z,2022-02-28T05:18:11.657Z,1,0,SGST,1.5,61.8,,,,,,,,,,,,
+1012,2022-02-20,Lordham,Debtors,INR,1,2230,2353.6,2353.6,0,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-02-24T05:07:23.685Z,2022-02-28T05:18:11.657Z,1,0,CGST,1.5,61.8,,,,,,,,,,,,
+1012,2022-02-20,Lordham,Debtors,INR,1,2230,2353.6,2353.6,0,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-02-24T05:07:23.685Z,2022-02-28T05:18:11.657Z,1,0,,,,"Flower Pot","Just a flower pot.",3,210,Sales,GST-12,630,0,0,,,
+1012,2022-02-20,Lordham,Debtors,INR,1,2230,2353.6,2353.6,0,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-02-24T05:07:23.685Z,2022-02-28T05:18:11.657Z,1,0,,,,"Holy Icon","The holiest of icons.",4,400,Sales,GST-3,1600,0,0,,0,
+1008,2022-02-11,Lordham,Debtors,INR,1,600,672,672,172,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-02-11T08:40:28.193Z,2022-02-11T09:48:18.274Z,1,0,SGST,6,36,,,,,,,,,,,,
+1008,2022-02-11,Lordham,Debtors,INR,1,600,672,672,172,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-02-11T08:40:28.193Z,2022-02-11T09:48:18.274Z,1,0,CGST,6,36,,,,,,,,,,,,
+1008,2022-02-11,Lordham,Debtors,INR,1,600,672,672,172,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-02-11T08:40:28.193Z,2022-02-11T09:48:18.274Z,1,0,,,,"Flower Pot","Just a flower pot.",3,200,Sales,GST-12,600,0,0,,,
+1007,2022-02-04,Lyn,Debtors,INR,1,200,224,224,0,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-02-04T06:21:24.058Z,2022-02-04T06:21:46.308Z,1,0,SGST,6,12,,,,,,,,,,,,
+1007,2022-02-04,Lyn,Debtors,INR,1,200,224,224,0,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-02-04T06:21:24.058Z,2022-02-04T06:21:46.308Z,1,0,CGST,6,12,,,,,,,,,,,,
+1007,2022-02-04,Lyn,Debtors,INR,1,200,224,224,0,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-02-04T06:21:24.058Z,2022-02-04T06:21:46.308Z,1,0,,,,"Flower Pot","Just a flower pot.",1,200,Sales,GST-12,200,0,0,,,
+1004,2022-01-12,Bølèn,Debtors,INR,1,1800,2016,2016,0,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-01-12T08:45:19.774Z,2022-01-12T08:45:26.702Z,1,0,SGST,6,108,,,,,,,,,,,,
+1004,2022-01-12,Bølèn,Debtors,INR,1,1800,2016,2016,0,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-01-12T08:45:19.774Z,2022-01-12T08:45:26.702Z,1,0,CGST,6,108,,,,,,,,,,,,
+1004,2022-01-12,Bølèn,Debtors,INR,1,1800,2016,2016,0,0,0,,0,Party,,,SINV-,Administrator,Administrator,2022-01-12T08:45:19.774Z,2022-01-12T08:45:26.702Z,1,0,,,,"Flower Pot","Just a flower pot.",9,200,Sales,GST-12,1800,0,0,,,
+1001,2021-12-16,Bé,Debtors,INR,1,100,112,112,46,0,0,,0,Party,,,SINV-,Administrator,Administrator,2021-12-16T11:34:06.174Z,2021-12-16T12:00:28.526Z,1,0,SGST,6,6,,,,,,,,,,,,
+1001,2021-12-16,Bé,Debtors,INR,1,100,112,112,46,0,0,,0,Party,,,SINV-,Administrator,Administrator,2021-12-16T11:34:06.174Z,2021-12-16T12:00:28.526Z,1,0,CGST,6,6,,,,,,,,,,,,
+1001,2021-12-16,Bé,Debtors,INR,1,100,112,112,46,0,0,,0,Party,,,SINV-,Administrator,Administrator,2021-12-16T11:34:06.174Z,2021-12-16T12:00:28.526Z,1,0,,,,Flow,"Used to test the flow of operations.",1,100,Sales,GST-12,100,0,0,,,
\ No newline at end of file
diff --git a/tests/testImporter.spec.ts b/tests/testImporter.spec.ts
new file mode 100644
index 00000000..fc26a734
--- /dev/null
+++ b/tests/testImporter.spec.ts
@@ -0,0 +1,67 @@
+import { assertDoesNotThrow } from 'backend/database/tests/helpers';
+import { readFileSync } from 'fs';
+import { ModelNameEnum } from 'models/types';
+import { join } from 'path';
+import { Importer } from 'src/importer';
+import test from 'tape';
+import { closeTestFyo, getTestFyo, setupTestFyo } from './helpers';
+
+const fyo = getTestFyo();
+setupTestFyo(fyo, __filename);
+
+test('importer init', (t) => {
+  const importer = new Importer(ModelNameEnum.SalesInvoice, fyo);
+  t.equal(
+    typeof importer.getCSVTemplate(),
+    'string',
+    'csv template is a string'
+  );
+  t.end();
+});
+
+test('import Items', async (t) => {
+  const importer = new Importer(ModelNameEnum.Item, fyo);
+  const csvPath = join(__dirname, 'items.csv');
+  const data = readFileSync(csvPath, { encoding: 'utf-8' });
+  t.equal(importer.selectFile(data), true, 'file selection');
+  t.equal((await importer.checkLinks()).length, 0, 'all links exist');
+  t.doesNotThrow(() => importer.populateDocs(), 'populating docs');
+  for (const doc of importer.docs) {
+    await assertDoesNotThrow(async () => await doc.sync());
+  }
+});
+
+test('import Party', async (t) => {
+  const importer = new Importer(ModelNameEnum.Party, fyo);
+  const csvPath = join(__dirname, 'parties.csv');
+  const data = readFileSync(csvPath, { encoding: 'utf-8' });
+  t.equal(importer.selectFile(data), true, 'file selection');
+  t.equal((await importer.checkLinks()).length, 0, 'all links exist');
+  t.doesNotThrow(() => importer.populateDocs(), 'populating docs');
+  for (const doc of importer.docs) {
+    await assertDoesNotThrow(async () => await doc.sync());
+  }
+});
+
+test('import SalesInvoices', async (t) => {
+  const importer = new Importer(ModelNameEnum.SalesInvoice, fyo);
+  const csvPath = join(__dirname, 'sales_invoices.csv');
+  const data = readFileSync(csvPath, { encoding: 'utf-8' });
+
+  t.equal(importer.selectFile(data), true, 'file selection');
+  t.equal((await importer.checkLinks()).length, 0, 'all links exist');
+  t.doesNotThrow(() => importer.populateDocs(), 'populating docs');
+
+  const names = [];
+  for (const doc of importer.docs.slice(0, 2)) {
+    await assertDoesNotThrow(async () => await doc.sync());
+    names.push(doc.name);
+  }
+
+  t.ok(
+    names.every((n) => n?.startsWith('SINV-')),
+    'numberSeries assigned'
+  );
+});
+
+closeTestFyo(fyo, __filename);
diff --git a/translations/fr.csv b/translations/fr.csv
index 715b4fb4..ab9670f8 100644
--- a/translations/fr.csv
+++ b/translations/fr.csv
@@ -38,7 +38,7 @@ Accounts,Comptes,
 "Add a remark","Ajouter une remarque",
 "Add invoice terms","Ajouter votre politique de vente",
 "Add products or services that you buy from your suppliers","Ajoutez des produits ou services que vous achetez à vos fournisseurs",
-"Add products or services that you sell to your customers","Ajouter les produits ou services que vous vendez à vos clients.",
+"Add products or services that you sell to your customers","Ajouter les produits ou services que vous vendez à vos clients",
 Address,Adresse,
 "Address Display","Affichage de l'adresse",
 "Address Line 1","Ligne d'adresse 1",
@@ -76,7 +76,7 @@ Buildings,Bâtiments,
 Business,Entreprise,
 Cancel,Annuler,
 "Cancel ${0} ${1}?","Annuler ${0} ${1} ?",
-Cancelled,Anulé,
+Cancelled,Annulé,
 "Cannot Delete","Impossible à supprimer",
 "Cannot delete ${0} ${1} because of linked entries.","Impossible de supprimer ${0} ${1} à cause des entrées liées.",
 "Capital Equipments","Biens d'équipement",
@@ -102,6 +102,7 @@ Close,Fermer,
 Closing,Fermeture,
 "Closing (Cr)","Fermeture (Cr)",
 "Closing (Dr)","Fermeture (Dr)",
+Collapse,Réduire,
 Color,Couleur,
 "Commission on Sales","Commission sur les ventes",
 Common,Autres,
@@ -143,8 +144,8 @@ Credit,Crédit,
 "Credit Card Entry","Entrée Carte de Crédit",
 "Credit Note",Avoir,
 Creditors,Créanciers,
-Currency,Monnaie,
-"Currency Name","Nom de la monnaie",
+Currency,Devise,
+"Currency Name","Nom de la devise",
 Current,Actuel,
 "Current Assets","Actifs courants",
 "Current Liabilities","Passifs courants",
@@ -153,11 +154,11 @@ Customer,Client,
 "Customer Created","Client créé",
 "Customer Currency","Monnaie du client",
 Customers,Clients,
-Customise,Personnalisez,
-"Customize your invoices by adding a logo and address details","Customisez vos factures en y ajoutant votre logo et adresse",
+Customise,Personnaliser,
+"Customize your invoices by adding a logo and address details",Personnalisez vos factures en y ajoutant votre logo et adresse,
 Dashboard,"Tableau de bord",
 "Data Import","Importation de données",
-"Database file: ${0}","Fichier de base de donnée : ${0}",
+"Database file: ${0}","Fichier de base de données : ${0}",
 Date,,
 "Date Format","Format de la date",
 Debit,Débit,
@@ -176,7 +177,7 @@ Details,Détails,
 "Direct Income","Revenu direct",
 Discount,Réduction,
 "Discount Account","Compte des réductions",
-"Discount Account is not set.","Le compte des réductions n'est pas défini",
+"Discount Account is not set.","Le compte des réductions n'est pas défini.",
 "Discount After Tax","Réduction après taxes",
 "Discount Amount","Montant de la réduction",
 "Discount Amount (${0}) cannot be greated than Amount (${1}).","Le montant de la réduction (${0}) ne peut pas être plus grand que le montant (${1}).",
@@ -189,7 +190,7 @@ Discounts,"Réductions",
 "Display Logo in Invoice","Afficher le logo sur la facture",
 "Display Precision","Précision de l'affichage",
 "Display Precision should have a value between 0 and 9.","La précision de l'affichage doit avoir une valeur comprise entre 0 et 9.",
-"Dividends Paid","Dividendes versés",
+"Dividends Paid","Dividendes versées",
 Docs,Documents,
 Documentation,Documentation,
 "Does Not Contain","Ne contient pas",
@@ -205,6 +206,7 @@ Email,,
 "Email Address","Adresse électronique",
 Empty,Vide,
 "Enable Discount Accounting","Activer la gestion des réductions",
+"Enable Inventory","Activer l'inventaire",
 "Enter Country to load States","Entrez le Pays pour charger le département",
 "Enter State","Entrez le département",
 "Entertainment Expenses","Dépenses liées au divertissement",
@@ -216,13 +218,14 @@ Error,Erreur,
 "Exchange Rate","Taux de change",
 "Excise Entry","Entrée d'acquis",
 "Existing File","Fichier existant",
+Expand,Développer,
 Expense,Dépenses,
 "Expense Account","Compte de dépenses",
 Expenses,Dépenses,
 "Expenses Included In Valuation","Dépenses incluses dans la valorisation ",
 Export,Exporter,
 "Export Failed","Export Échoué",
-"Export Successful","Export réussie",
+"Export Successful","Export réussi",
 Fax,Fax,
 Field,Champ,
 Fieldname,"Nom du champ",
@@ -377,13 +380,13 @@ Orange,,
 Organisation,Organisation,
 Outflow,Dépenses,
 "Outstanding Amount","Montant impayé",
-"Pad Zeros","Remplir  de zéros",
+"Pad Zeros","Remplir de zéros",
 Page,,
 Paid,Payé,
 Parent,,
 "Parent Account","Compte parent",
 Party,Partie,
-"Patch Run","Éxecuter les correctifs",
+"Patch Run","Exécuter les correctifs",
 Pay,Payer,
 Payable,Payable,
 Payment,Paiement,
@@ -434,7 +437,7 @@ Purchases,Achats,
 Purple,Violet,
 Quantity,Quantité,
 Quarterly,Trimestriel,
-Quarters,Trimestre,
+Quarters,Trimestres,
 Rate,Tarif,
 "Rate (${0}) cannot be less zero.","Le Tarif (${0}) ne peut pas être inférieur à zéro.",
 "Rate (Company Currency)","Tarif (devise utilisée par la société)",
@@ -511,6 +514,7 @@ Service,,
 "Sets how many digits are shown after the decimal point.","Définit le nombre de chiffres affichés après le point décimal.",
 "Sets the app-wide date display format.","Définit le format d'affichage de la date pour l'application.",
 "Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","Définit la précision interne utilisée pour les calculs monétaires. Une précision supérieure à 6 devrait être suffisante pour la plupart des monnaies.",
+"Set Up","Configurer",
 "Setting Up Instance","Paramétrage de l'Instance",
 "Setting Up...",Paramétrage...,
 Settings,Paramètres,
@@ -584,7 +588,7 @@ Terms,Conditions,
 "This action is permanent","Cette action est permanente",
 "This action is permanent and will cancel the following payment: ${0}","Cette action est permanente et annulera le paiement suivant : ${0}",
 "This action is permanent and will cancel the following payments: ${0}","Cette action est permanente et annulera les paiements suivants : ${0}",
-"This action is permanent and will delete associated ledger entries.","Cette action est permanente et supprimera les écritures dans le registre associées.",
+"This action is permanent and will delete associated ledger entries.","Cette action est permanente et supprimera les écritures dans le registre associés.",
 "This action is permanent.","Cette action est permanente",
 "Times New Roman",,
 "To Account","Au compte",
diff --git a/translations/gu.csv b/translations/gu.csv
index 2205e511..337e5487 100644
--- a/translations/gu.csv
+++ b/translations/gu.csv
@@ -1,35 +1,36 @@
 ${0} ${1} already exists.,${0} ${1} પહેલાથી અસ્તિત્વમાં છે.,
 ${0} ${1} does not exist,${0} ${1} અસ્તિત્વમાં નથી,
-${0} ${1} has been modified after loading,${0} ${1} લોડિંગ પછી ફેરબદલ  કરવામાં આવેલ  છે,
+${0} ${1} has been modified after loading,${0} ${1} લોડિંગ પછી ફેરબદલ થયેલ છે,
 ${0} ${1} is linked with existing records.,${0} ${1} હાલમાં રેકોર્ડ્સ સાથે જોડાયેલ છે.,
 ${0} account not set in Inventory Settings.,${0} ખાતું માલસૂચી સંયોજન માં સક્ષમ નથી,
 ${0} already exists.,${0} પહેલેથી જ અસ્તિત્વમાં છે.,
-${0} fields selected,${0} ખાનાઓ  લાગુ,
+${0} fields selected,${0} ખાનાઓ લાગુ,
 ${0} filters applied,${0} તપાસો લાગુ,
 ${0} of type ${1} does not exist,${0}નો પ્રકાર ${1} અસ્તિત્વ માં નથી,
-${0} out of ${1},${0} માંથી ${1},
-${0} party ${1} is different from ${2},${0} {1} પેઢી ${2}  થી અલગ છે,
+${0} out of ${1},${1} માંથી ${0},
+${0} party ${1} is different from ${2},${0} {1} પેઢી ${2} થી અલગ છે,
+${0} quantity 1 added.,${0} માત્રા 1 ઉમેરાણી,
 ${0} rows,${0} પંક્તિઓ,
-${0} value ${1} does not exist.,{0} મૂલ્ય ${1}  અસ્તિત્વમાં નથી,
+${0} value ${1} does not exist.,{0} મૂલ્ય ${1} અસ્તિત્વમાં નથી,
 * required fields,* જરૂરી કોઠા,
 0%,0%,
 03-23-2022,03-23-2022,
 03/23/2022,03/23/2022,
 1 filter applied,1 તપાસ લાગુ,
+2022-03-23,,
+"23 Mar, 2022",,
 23-03-2022,23-03-2022,
-23-Mar-22,"23 માર્ચ, 2022",
-23-03-2022,23-03-2022,
-0.983819444,0.983819444,
-23-03-2022,23-03-2022,
+23.03.2022,,
+23/03/2022,,
 9888900000,9888900000,
 Account,ખાતું,
 Account ${0} does not exist.,${0} ખાતું અસ્તિત્વ માં નથી,
 Account Entries,ખાતા લેવડદેવડ,
 Account Name,ખાતા નું નામ,
-Account Type,ખાતાના  પ્રકાર,
+Account Type,ખાતાના પ્રકાર,
 Accounting Entries,હિસાબી લેવડદેવડ,
 Accounting Ledger Entry,ખાતાવહી ખતવણી,
-Accounting Settings,હિસાબી  સંયોજન,
+Accounting Settings,હિસાબી સંયોજન,
 Accounts,હિસાબ,
 Accounts Payable,ચુકવવાપાત્ર ખાતાઓ,
 Accounts Receivable,મળવાપાત્ર હિસાબ,
@@ -40,17 +41,17 @@ Add Group,સમૂહ ઉમેરો,
 Add Items,ઉત્પાદન ઉમેરો,
 Add Row,વિગત ઉમેરો,
 Add Suppliers,વિક્રેતાઓ ઉમેરો,
-Add Taxes,કરવેરા  ઉમેરો,
-Add a few customers to create your first sales invoice,પ્રથમ  વેચાણ ભરતિયું નિર્માણ કરવા પહેલા થોડાક ગ્રાહક ઉમેરો,
-Add a few suppliers to create your first purchase invoice,પ્રથમ  ખરીદી ભરતિયું નિર્માણ કરવા પહેલા થોડાક વિક્રેતા ઉમેરો,
-Add a filter,તપાસ  ઉમેરો,
+Add Taxes,કરવેરા ઉમેરો,
+Add a few customers to create your first sales invoice,પ્રથમ વેચાણ ભરતિયું નિર્માણ કરવા પહેલા થોડાક ગ્રાહક ઉમેરો,
+Add a few suppliers to create your first purchase invoice,પ્રથમ ખરીદી ભરતિયું નિર્માણ કરવા પહેલા થોડાક વિક્રેતા ઉમેરો,
+Add a filter,તપાસ ઉમેરો,
 Add a remark,એક ટિપ્પણી ઉમેરો,
 Add attachment,ટાંચ ઉમેરો,
 Add invoice terms,બિલ શરતો ઉમેરો,
 Add products or services that you buy from your suppliers,તમે તમારા વિક્રેતા પાસેથી ખરીદેલા ઉત્પાદનો અથવા સેવાઓ ઉમેરો,
 Add products or services that you sell to your customers,તમે તમારા ગ્રાહકોને વેચતા ઉત્પાદનો અથવા સેવાઓ ઉમેરો,
 Add transfer terms,સ્થળાંતર શરતો ઉમેરો,
-Additional quantity (${0}) required to make outward transfer of item ${1} from ${2} on ${3},વધારાની (${0}) માત્રા જરૂરી છે બાહ્ય સ્થળાંતર માટે વસ્તુ ${2}  માંથી ${1}  પર ${3},
+Additional quantity (${0}) required to make outward transfer of item ${1} from ${2} on ${3},વધારાની (${0}) માત્રા જરૂરી છે બાહ્ય સ્થળાંતર માટે વસ્તુ ${2} માંથી ${1} પર ${3},
 Address,સરનામું,
 Address Display,પ્રદર્શિત સરનામુ,
 Address Line 1,સરનામું કડી 1,
@@ -70,7 +71,7 @@ Asset,રોકાણ,
 Assign Imported Labels,આયાત કરેલા લેબલ્સ સોંપો,
 Attachment,સંપેતરું,
 August,ઓગસ્ટ,
-Back Reference,ઊલટ  સંદર્ભ,
+Back Reference,ઊલટ સંદર્ભ,
 Bad import data.,ખરાબ આયાત ડેટા.,
 Balance,સિલક,
 Balance Sheet,પાકું સરવૈયું,
@@ -79,7 +80,8 @@ Bank Accounts,બેંક ખાતા,
 Bank Entry,બેંક ખતવણી,
 Bank Name,બેંકનું નામ,
 Bank Overdraft Account,બેંક ઓવરડ્રાફ્ટ ખાતું,
-Base Grand Total,Base કુલ રકમ,
+Barcode,બારકોડ,
+Base Grand Total,પ્રમુખ કુલ રકમ,
 Based On,આના આધારે,
 Basic,Basic,
 Bill Created,બિલ નિર્માણ,
@@ -88,13 +90,13 @@ Blue,Blue,
 Both,બંને,
 Both From and To Location cannot be undefined,બન્ને થકી અને પ્રત્યે સ્થળ ખાલી હોય શકે નહીં,
 Buildings,મકાનો,
-Business,વ્યવસાય,
+Business,,
 Cancel,ફોક,
 Cancel ${0} ${1}?,${0} ${1} ફોક કરો ?,
 Cancelled,ફોક કરાયેલ,
 Cannot Commit Error,,
 Cannot Delete,કાઢી શકાય તેમ નથી,
-Cannot cancel ${0} ${1} because of the following ${2}: ${3},${2} ના કારણે ${0} {1}  ફોક થાઈ તેમ નથી : ${3},
+Cannot cancel ${0} ${1} because of the following ${2}: ${3},${2} ના કારણે ${0} {1} ફોક થાઈ તેમ નથી : ${3},
 Cannot delete ${0} ${1} because of linked entries.,${0} ${1} સંકળાયેલા લેવડદેવડ ના કારણે કાઢી શકાય તેમ નથી.,
 Cannot perform operation.,પ્રક્રિયા નહીં થઈ શકે.,
 Capital Equipments,મૂડીનાં સાધનો,
@@ -102,11 +104,11 @@ Capital Stock,મૂડીનો હિસ્સો,
 Cash,રોકડ,
 Cash Entry,રોકડ ખતવણી,
 Cash In Hand,હાથ પર રોકડ,
-Cashflow,કેશફલૉ,
+Cashflow,રોકડ પ્રવાહ,
 Central Tax,કેન્દ્રીય કર,
 Change DB,ડીબી બદલો,
 Change File,ફાઈલ બદલો,
-Change Ref Type,સંદર્ભ પ્રકાર બદલો ,
+Change Ref Type,સંદર્ભ પ્રકાર બદલો,
 Chargeable,તહોમતપાત્ર,
 Chart Of Accounts Reviewed,હિસાબી આલેખ સમીક્ષા,
 Chart of Accounts,હિસાબી આલેખ,
@@ -117,9 +119,9 @@ Clearance Date,ક્લિઅરન્સ તારીખ,
 Click to create,નિર્માણ માટે ક્લિક કરો,
 Close,બંધ,
 Close Frappe Books and try manually,Frappe Books બંધ કરી ને જાતે પ્રયાસ કરો,
-Closing,બંધ થાય છે,
-Closing (Cr),આખર સિલક  (Cr),
-Closing (Dr),આખર સિલક  (Dr),
+Closing,આખર,
+Closing (Cr),આખર સિલક (Cr),
+Closing (Dr),આખર સિલક (Dr),
 Collapse,સંકોચો,
 Color,રંગ,
 Commission on Sales,વેચાણ પર આડત,
@@ -143,7 +145,7 @@ Country,દેશ,
 Country Code,દેશનો કોડ,
 Country code used to initialize regional settings.,પ્રાદેશિક નિયમન પ્રારંભ કરવા માટે દેશ કોડ વપરાય છે.,
 Courier,Courier,
-Cr.,જ.,
+Cr.,,
 Create,નિર્માણ કરો,
 Create Demo,ડેમો નિર્માણ,
 Create Purchase,ખરીદી નિર્માણ,
@@ -156,9 +158,9 @@ Create your first purchase invoice from the created supplier,મોજૂદ વ
 Create your first sales invoice for the created customer,મોજૂદ ગ્રાહક પરથી પ્રથમ વેચાણ ભરતિયું નિર્માણ કરો,
 Created,નિર્માણ થયું,
 Created By,નિર્માણ પ્રમાણે,
-Creating Items and Parties,વસ્તુઓ અને પક્ષૉ નિર્માણ થઈ રહ્યા છે,
-Creating Journal Entries,આમનોંધ લેવડદેવડ નિર્માણ થઈ રહી છે ,
-Creating Purchase Invoices,ખરીદી ભરતિયું નિર્માણ થઈ રહ્યું છે ,
+Creating Items and Parties,ચીજવસ્તુઓ અને પક્ષૉ નિર્માણ થઈ રહ્યા છે,
+Creating Journal Entries,આમનોંધ લેવડદેવડ નિર્માણ થઈ રહી છે,
+Creating Purchase Invoices,ખરીદી ભરતિયું નિર્માણ થઈ રહ્યું છે,
 Credit,જમા,
 Credit Card Entry,ક્રેડિટ કાર્ડ ખતવણી,
 Credit Note,જમા-ચિઠ્ઠી,
@@ -174,15 +176,15 @@ Customer Created,ગ્રાહક નિર્માણ,
 Customer Currency,ગ્રાહક ચલણ,
 Customers,ગ્રાહકો,
 Customise,રૂપરેખા,
-Customize your invoices by adding a logo and address details,પ્રતીક અને સરનામાંની વિગતો ઉમેરીને  તમારા ભરતીયા ની રૂપરેખા બદલો,
+Customize your invoices by adding a logo and address details,પ્રતીક અને સરનામાંની વિગતો ઉમેરીને તમારા ભરતીયા ની રૂપરેખા બદલો,
 Dashboard,મુખ્ય પૃષ્ઠ,
-Data Import,ડેટા આયાત ,
+Data Import,ડેટા આયાત,
 Database Error,ડેટાબેઝ ચૂક,
 Database file: ${0},ડેટાબેઝ ફાઇલ: ${0},
 Date,તારીખ,
 Date Format,તારીખ બંધારણ,
 Day,દિવસ,
-Debit,ઉધાર ,
+Debit,ઉધાર,
 Debit Note,ઉધાર-ચિઠ્ઠી,
 Debtors,દેવાદાર,
 December,ડીસેમ્બર,
@@ -219,7 +221,7 @@ Dividends Paid,ચૂકવેલ ડિવિડન,
 Docs,દસ્તાવેજ,
 Documentation,દસ્તાવેજીકરણ,
 Does Not Contain,સમાવિષ્ટ નથી,
-Dr.,ઉ.,
+Dr.,,
 Draft,મુસદ્દો,
 Duplicate,નકલ બનાવો,
 Duplicate ${0} ${1}?,નકલ ${0} ${1}?,
@@ -230,10 +232,12 @@ Electronic Equipments,વિદ્યુત સાધન,
 Email,ઇ-મેઇલ,
 Email Address,ઈ - મેઈલ સરનામું,
 Empty,ખાલી,
+Enable Barcodes,બારકોડ સક્ષમ કરો,
 Enable Discount Accounting,વટાવ હિસાબ સક્ષમ કરો,
 Enable Inventory,માલસૂચિ સક્ષમ કરો,
 Enter Country to load States,રાજ્યો લોડ કરવા માટે દેશ દાખલ કરો,
 Enter State,રાજ્ય દાખલ કરો,
+Enter barcode,બારકોડ ઉમેરો,
 Entertainment Expenses,મનોરંજન ખર્ચ,
 Entry Currency,ખતવણી ચલણ,
 Entry No,ખતવણી ક્રમ,
@@ -266,18 +270,18 @@ Fiscal Year,નાણાકીય વર્ષ,
 Fiscal Year End Date,નાણાકીય વર્ષની અંતિમ તારીખ,
 Fiscal Year Start Date,નાણાકીય વર્ષની શરૂઆતની તારીખ,
 Fixed Asset,નિયત રોકાણ,
-Fixed Assets,નિયત અસ્કયામતો
+Fixed Assets,નિયત અસ્કયામતો,
 Font,અક્ષર વર્ણ,
 For,ને માટે,
 Forbidden Error,પ્રતિબંધિત ચૂક,
-Fr,,
+Fr,શુક્ર,
 Fraction,દશાંશ,
 Fraction Units,દશાંશ એકમો,
 Freight and Forwarding Charges,ભાડા અને આગળના ખર્ચ,
 From,થકી,
 From Account,ખાતા થકી,
 From Date,આ તારીખ થી,
-From Loc.,સ્થાન થકી, 
+From Loc.,સ્થાન થકી,
 From Year,વર્ષ થકી,
 Full Name,પૂરું નામ,
 Furnitures and Fixtures,ફર્નિચર અને ફિક્સર,
@@ -285,7 +289,7 @@ GST,,
 GSTIN No.,GSTIN ક્રમ,
 GSTR1,GSTR 1,
 GSTR2,GSTR 2,
-Gain/Loss on Asset Disposal,રોકાણ  પતાવટ પર લાભ/ખોટ,
+Gain/Loss on Asset Disposal,રોકાણ પતાવટ પર લાભ/ખોટ,
 General,સામાન્ય વિગતો,
 General Ledger,સામાન્ય ખાતાવહી,
 Get Started,અહીં શરૂઆત,
@@ -296,7 +300,7 @@ Green,Green,
 Group By,સમૂહ પ્રમાણે,
 HSN/SAC,HSN/SAC,
 HSN/SAC Code,HSN/SAC Code,
-Half Yearly,અર્ધવાર્ષિક ,
+Half Yearly,અર્ધવાર્ષિક,
 Half Years,અર્ધ વર્ષ,
 Help,મદદ,
 Hex Value,Hex Value,
@@ -325,7 +329,8 @@ Instance Id,દાખલો,
 Insufficient Quantity.,અપૂર્ણ માત્રા,
 Intergrated Tax,આંતરગ્રાહી કર,
 Internal Precision,આંતરિક ખરાપણું,
-Invalid value ${0} for ${1},${0} માટે ${1}  અમાન્ય મૂલ્ય,
+Invalid barcode value ${0}.,બારકોડનું મૂલ્ય ${0} અમાન્ય છે,
+Invalid value ${0} for ${1},${0} માટે ${1} અમાન્ય મૂલ્ય,
 Inventory,માલસૂચિ,
 Inventory Settings,માલસૂચિ સંયોજન,
 Investments,રોકાણ,
@@ -341,17 +346,18 @@ Invoice Value,ભરતિયું મૂલ્ય,
 Invoices,ભરતિયું,
 Is,,
 Is Empty,,
-Is Group,,
+Is Group,સમૂહ છે,
 Is Not,,
 Is Not Empty,,
 Is Whole,શું પરિપૂર્ણ છે,
 Item,વિગત,
 Item Description,વર્ણન,
-Item Name,નામ,
-Items,વસ્તુઓ ,
+Item Name,ચીજવસ્તુનું નામ,
+Item with barcode ${0} not found.,બારકોડ ${0} વાળી ચીજવસ્તુ હજાર નથી.,
+Items,ચીજવસ્તુઓ,
 January,જાન્યુઆરી,
 John Doe,John Doe,
-Journal Entries,આમનોંધ  લેવડદેવડ,
+Journal Entries,આમનોંધ લેવડદેવડ,
 Journal Entry,આમનોંધ ખતવણી,
 Journal Entry Account,આમનોંધ ખતવણી ખાતું,
 Journal Entry Number Series,આમનોંધ ખતવણી ક્રમાંકન,
@@ -369,19 +375,19 @@ Limit,મર્યાદા,
 Link Validation Error,લિંક માન્યતા ચૂક,
 List,યાદી,
 Load an existing .db file from your computer.,તમારા કમ્પ્યુટરથી અસ્તિત્વમાં હોય એવી .db ફાઇલ લોડ કરો.,
-Loading Report...,લોડિંગ રિપોર્ટ ...,
-Loading...,લોડ કરી રહ્યું છે ...,
+Loading Report...,અહેવાલ રજૂ થાય છે...,
+Loading...,રજૂ થાય છે...,
 Loans (Liabilities),લોન (દેવું),
-Loans and Advances (Assets),કરજ અને ધિરાણ  (રોકાણ),
+Loans and Advances (Assets),કરજ અને ધિરાણ (રોકાણ),
 Locale,પ્રાદેશિક નિયમન,
 Location,સ્થાન,
-Location Name,સ્થાનનું નામ ,
+Location Name,સ્થાનનું નામ,
 Logo,પ્રતીક,
 Make Entry,લેવડદેવડ ઉમેરો,
 Mandatory Error,અનિવાર્ય ચૂક,
 "Mar 23, 2022","23 માર્ચ, 2022",
 March,માર્ચ,
-Marketing Expenses,વિજ્ઞાપન  ખર્ચ,
+Marketing Expenses,વિજ્ઞાપન ખર્ચ,
 Material Issue,,
 Material Receipt,,
 Material Transfer,,
@@ -390,36 +396,36 @@ Meter,મિટર,
 Minimal,Minimal,
 Misc,વગેરે,
 Miscellaneous Expenses,પરચૂરણ ખર્ચ,
-Mo,,
+Mo,સોમ,
 Modified,સુધારેલું,
 Modified By,સંશોધિત પ્રમાણે,
 Monthly,માસિક,
 Months,મહિના,
 More Filters,વધુ તપાસો,
 Movement Type,સ્થળાંતર પ્રકાર,
-Moving Average,,
+Moving Average,ચાલક સરેરાંશ,
 Name,નામ,
-Navigate,શોધખોળ,
-Net Total,ચોખ્ખો સરવાળો,
-New ${0},નવો ${0},
+Navigate,સંચાલન,
+Net Total,કુલ સરવાળો,
+New ${0},નવુ ${0},
 New Account,નવું ખાતું,
 New Entry,નવી ખતવણી,
 New File,નવી ફાઈલ,
-No,ના ,
+No,ના,
 No Data to Import,આયાત કરવા માટે કોઈ ડેટા નથી,
 No Values to be Displayed,પ્રદર્શિત કરવા માટે કોઈ મૂલ્યો નથી,
 No entries found,કોઈ લેવડદેવડ મળ્યા નથી,
 No expenses in this period,આ સમયગાળામાં કોઈ ખર્ચ નથી,
-No filters selected,તપાસ ઊમેરાય  નથી,
+No filters selected,તપાસ ઊમેરાય નથી,
 No labels have been assigned.,કોઈ લેબલ સોંપવામાં આવ્યા નથી.,
 No results found,કોઈ પરિણામો મળ્યા નથી,
 No transactions yet,હજી સુધી કોઈ વ્યવહાર નથી,
-None,,
+None,કોઈ નહીં,
 Not Found,મળ્યા નથી,
 Not Saved,સંગ્રહ થયો નથી,
 Notes,નોંધ,
 November,નવેમ્બર,
-Number Series,સંખ્યા ક્રમાંકન,
+Number Series,ક્રમાંકન,
 Number of ${0},${0} ની સંખ્યા,
 October,ઓક્ટોબર,
 Office Equipments,કચેરી સાધન,
@@ -428,9 +434,9 @@ Office Rent,કચેરી ભાડા,
 Onboarding Complete,ઓનબોર્ડિંગ પૂર્ણ,
 Open Count,ખુલ્લી ગણતરી,
 Open Folder,ખુલ્લું ફોલ્ડર,
-Opening (Cr),ખૂલતી સિલક (જમા.),
-Opening (Dr),ખૂલતી સિલક (ઉધાર.),
-Opening Balance Equity,ખૂલતી  ઇક્વિટી,
+Opening (Cr),ખૂલતી સિલક (Cr),
+Opening (Dr),ખૂલતી સિલક (Dr),
+Opening Balance Equity,ખૂલતી ઇક્વિટી,
 Opening Balances,શરૂઆતી મૂડી,
 Opening Entry,શરૂઆતી ખતવણી,
 Orange,Orange,
@@ -441,16 +447,16 @@ Pad Zeros,દર્શાવા ખાતર શૂન્ય,
 Page,પાનાં,
 Paid,ચુકવેલ,
 Parent,પ્રધાન,
-Parent Account,પ્રધાન  ખાતું,
+Parent Account,પ્રધાન ખાતું,
 Party,પેઢી,
-Patch Run,,
+Patch Run,મરામતી ક્રિયા,
 Pay,ચૂકવણી,
 Payable,ચૂકવવાપાત્ર,
 Payment,પેમેન્ટ,
-Payment For,માટે  પેમેન્ટ,
+Payment For,માટે પેમેન્ટ,
 Payment Method,પેમેન્ટ પદ્ધતિ,
 Payment No,પેમેન્ટ ક્રમ,
-Payment Number Series,ચુકવણી ક્રમાંકન,
+Payment Number Series,પેમેન્ટ ક્રમાંકન,
 Payment Reference,પેમેન્ટ સંદર્ભ,
 Payment Type,પેમેન્ટનો પ્રકાર,
 Payment amount cannot be ${0}.,પેમેન્ટની રકમ ${0} હોઈ શકતી નથી.,
@@ -492,33 +498,33 @@ Purchase Invoice Number Series,ખરીદ ભરતિયું ક્રમ
 Purchase Invoice Terms,ખરીદી ભરતિયું શરતો,
 Purchase Invoices,ખરીદી ભરતિયા,
 Purchase Item Created,ખરીદ વસ્તુ નિર્માણ,
-Purchase Items,ખરીદ માલયાદી,
+Purchase Items,ખરીદ ચીજવસ્તુઓ,
 Purchase Payments,ખરીદી ચૂકવણીઓ,
 Purchase Receipt,ખરીદ પહોંચ,
 Purchase Receipt Item,ખરીદ પહોંચ વસ્તુ,
 Purchase Receipt Number Series,ખરીદ પહોંચ ક્રમાંકન,
-Purchase Receipt Terms,ખરીદ પહોંચ  શરતો,
+Purchase Receipt Terms,ખરીદ પહોંચ શરતો,
 Purchase Receipts,ખરીદ પહોંચ,
 Purchases,ખરીદી,
 Purple,Purple,
 Qty. ${0},માત્રા. ${0},
 Quantity,માત્રા,
 Quantity (${0}) has to be greater than zero,માત્રા (${0}) શૂન્ય થી વધારે હોવી જોઈએ,
-Quantity needs to be set,માત્રા ,
+Quantity needs to be set,માત્રા સૂચવવી જરૂરી છે,
 Quarterly,ત્રિમાસિક,
 Quarters,ત્રિમાસિક,
 Rate,ભાવ,
-Rate (${0}) cannot be less zero.,સંખ્યા (${0}) શૂન્ય થી ઓછી  હોઈ શકતી  નથી.,
+Rate (${0}) cannot be less zero.,સંખ્યા (${0}) શૂન્ય થી ઓછી હોઈ શકતી નથી.,
 Rate (${0}) has to be greater than zero,સંખ્યા (${0}) શૂન્ય થી વધારે હોવી જોઈએ,
 Rate can't be negative.,સંખ્યા ઋણમાં હોઈ શકે નથી.,
 Rate needs to be set,દર સુયોજિત કરવા જરૂરી છે,
-Receivable,મળવાપાત્ર ,
+Receivable,મળવાપાત્ર,
 Receive,સ્વીકાર,
 Recent Invoices,તાજેતરના Invoice,
 Red,Red,
-Ref Name,સંદર્ભ નામ ,
+Ref Name,સંદર્ભ નામ,
 Ref Type,સંદર્ભ પ્રકાર,
-Ref. / Cheque No.,સંદર્ભ. / ચેક  નંબર. ,
+Ref. / Cheque No.,સંદર્ભ. / ચેક નંબર.,
 Ref. Date,સંદર્ભ. તારીખ,
 Ref. Name,સંદર્ભ. નામ,
 Ref. Type,સંદર્ભ. પ્રકાર,
@@ -526,18 +532,18 @@ Reference,સંદર્ભ,
 Reference Date,સંદર્ભ તારીખ,
 Reference Number,સંદર્ભ ક્રમ,
 Reference Type,સંદર્ભ પ્રકાર,
-Reload App,એપ  પુનઃપ્રારંભ,
+Reload App,એપ પુનઃપ્રારંભ,
 Report,અહેવાલ,
 Report Error,ચૂક ઉલ્લેખ,
 Report Issue,ખામી ઉલ્લેખ,
 Reports,અહેવાલો,
-Required Fields not Assigned,નિર્દેશિત  કોઠા ફાળવાયા  નથી ,
+Required Fields not Assigned,નિર્દેશિત કોઠા ફાળવાયા નથી,
 Reset,Reset,
 Retained Earnings,જાળવેલ કમાણી,
 Reverse Chrg.,Reverse Chrg.,
 Reverted,Reverted,
 Reverts,Reverts,
-Review Accounts,ખાતા  નિરીક્ષણ,
+Review Accounts,ખાતા નિરીક્ષણ,
 "Review your chart of accounts, add any account or tax heads as needed","તમારા હિસાબી આલેખની સમીક્ષા કરો, જરૂર મુજબ કોઈપણ ખાતા અથવા કરવેરા ઉમેરો",
 Right Index,,
 Role,ભૂમિકા,
@@ -546,7 +552,7 @@ Round Off,પરચુરણ બાકાત,
 Round Off Account,પરચુરણ બાકાત ખાતું,
 Round Off Account Not Found,પરચુરણ બાકાત ખાતું હાજર નથી,
 Rounded Off,બાકાત,
-Sa,,
+Sa,શનિ,
 Salary,પગાર,
 Sales,વેચાણ,
 Sales Acc.,વેચાણ ખાતું,
@@ -555,9 +561,9 @@ Sales Invoice,વેચાણ ભરતિયું,
 Sales Invoice Item,વેચાણ ભરતિયું વસ્તુ,
 Sales Invoice Number Series,વેચાણ ભરતિયું ક્રમાંકન,
 Sales Invoice Terms,વેચાણ ભરતિયું શરતો,
-Sales Invoices,વેચાણ ભરતીયા ,
+Sales Invoices,વેચાણ ભરતીયા,
 Sales Item Created,વેચાણની વસ્તુ નિર્માણ,
-Sales Items,વેચાણ માલયાદી,
+Sales Items,વેચાણ ચીજવસ્તુઓ,
 Sales Payments,વેચાણ ચૂકવણીઓ,
 Save,સંઘરો,
 Save Template,નમૂનો સંઘરો,
@@ -565,7 +571,7 @@ Save as PDF,PDF રીતે સંઘરો,
 Save as PDF Successful,PDF રીતે સંગ્રહ સફળકારક,
 Saved,સંગ્રહિત,
 Saving,સંગ્રહ થાય છે,
-Schema Name or Name not passed to Open Quick Edit,,
+Schema Name or Name not passed to Open Quick Edit,સ્કીમા નામ અથવા નામ અપાયું નથી Quick Edit ખોલવા માટે,
 Search,શોધ,
 Secured Loans,સુરક્ષિત લોન,
 Securities and Deposits,સિક્યોરિટીઝ અને થાપણો,
@@ -584,8 +590,8 @@ Selected file,પસંદ કરેલી ફાઇલ,
 September,સેપ્ટેમ્બર,
 Service,સેવાઓ,
 Set Discount Amount,સુયોજિત વટાવ રકમ,
-Set Period,,
-Set Up,સુયોજિત  કરો,
+Set Period,સમયગાળો સુયોજિત કરો,
+Set Up,સુયોજિત કરો,
 Set Up Your Workspace,વ્યવસાય સુયોજિત કરો,
 Set an Import Type,આયાત પ્રકાર સહેજો,
 Set the display language.,પ્રદર્શન ભાષા સહેજો.,
@@ -598,7 +604,7 @@ Sets how many digits are shown after the decimal point.,દશાંશ બિ
 Sets the app-wide date display format.,એપ્લિકેશન-વ્યાપક તારીખ બંધારણ સ્થાપન કરે છે.,
 Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.,નાણાકીય ગણતરીઓ માટે વપરાયેલી આંતરિક ચોકસાઇ સ્થાપન કરે છે. મોટાભાગના ચલણો માટે 6 થી ઉપર પૂરતું હોવું જોઈએ.,
 Setting Up Instance,દાખલો સુયોજિત કરી રહ્યા છીએ,
-Setting up...,સુયોજિત થઈ રહ્યું છે,
+Setting up...,સુયોજિત થઈ રહ્યું છે...,
 Settings,પરિસ્થિતિ,
 Settings changes will be visible on reload,પરિસ્થિતિ ફેરફારો પુનઃપ્રારંભ પર દેખાશે,
 Setup,સ્થાપન,
@@ -615,7 +621,7 @@ Show Month/Year,મહિના/વર્ષ દર્શાવો,
 Single Value,એકમો મૂલ્ય,
 Skip Child Tables,બાળ કોષ્ટકો અવગણો,
 Skip Transactions,વ્યવહાર અવગણો,
-Smallest Currency Fraction Value,સૌથી ઓછી ચલણ મૂલ્ય,
+Smallest Currency Fraction Value,સૌથી ઓછુ ચલણ મૂલ્ય,
 Softwares,Softwares,
 Something has gone terribly wrong. Please check the console and raise an issue.,કંઈક ભયંકર રીતે ખોટું થયું છે. કૃપા કરીને કોનસોલ તપાસો અને કોઈ મુદ્દો ઉભો કરો.,
 Source of Funds (Liabilities),ભંડોળનો સ્રોત (દેવું),
@@ -632,12 +638,12 @@ Stock Entries,માલ લેવડદેવડ,
 Stock Expenses,માલ ખર્ચ,
 Stock In Hand,હાથ પર માલ,
 Stock In Hand Acc.,હાથ પર માલ ખાતું,
-Stock Ledger,માલ હિસાબ ,
+Stock Ledger,માલ હિસાબ,
 Stock Ledger Entry,માલ હિસાબ ખતવણી,
 Stock Liabilities,માલ દેવું,
 Stock Movement,માલ સંચાલન,
-Stock Movement Item,માલ  સંચાલન વસ્તુ,
-Stock Movement No.,માલ  સંચાલન ક્રમ,
+Stock Movement Item,માલ સંચાલન વસ્તુ,
+Stock Movement No.,માલ સંચાલન ક્રમ,
 Stock Movement Number Series,માલ સંચાલન ક્રમાંકન,
 Stock Movements,માલ સંચાલન,
 Stock Not Transferred,માલ સ્થળાંતર થયો નથી,
@@ -645,10 +651,10 @@ Stock Received But Not Billed,પ્રાપ્ત માલ બિનઃ બ
 Stock Received But Not Billed Acc.,પ્રાપ્ત માલ બિનઃ બિલ ખાતું,
 Stock Transfer Item,માલ સ્થળાંતર વસ્તુ,
 Stock has been transferred,માલ સ્થળાંતર થયો,
-Stock qty. ${0} out of ${1} left to transfer,માલની માત્રા. ${1}  માંથી  ${0} સ્થળાંતર માટે બાકી,
+Stock qty. ${0} out of ${1} left to transfer,માલની માત્રા. ${1} માંથી ${0} સ્થળાંતર માટે બાકી,
 StockTransfer,,
 Stores,દુકાન/સંગ્રહ,
-Su,,
+Su,રવિ,
 Submit,રજૂ કરો,
 Submit ${0},${0} રજૂ કરો,
 Submit Journal Entry?,આમનોંધ ખતવણી રજૂ કરો?,
@@ -657,7 +663,7 @@ Submit Sales Invoice?,વેચાણ ભરતિયું રજૂ કરો?
 Submit on Import,આયાત થતાં રજૂ કરો,
 Submitted,રજૂ,
 Submitting,રજૂ થાય છે,
-Subtotal,પેટા-સરવાળો ,
+Subtotal,પેટા-સરવાળો,
 Successfully created the following ${0} entries:,સફળતાપૂર્વક નીચેની ${0} લેવડદેવડ બનાવી:,
 Supplier,વિક્રેતા,
 Supplier Created,વિક્રેતા નિર્માણ,
@@ -667,8 +673,8 @@ System,પ્રણાલિ,
 System Settings,પ્રણાલિ પરિસ્થિતિ,
 System Setup,પ્રણાલિ સ્થાપન,
 Tax,કરવેરો,
-Tax Account,કરવેરા હિસાબ,
-Tax Assets,કરવેરા રોકાણ ,
+Tax Account,કરવેરા ખાતું,
+Tax Assets,કરવેરા રોકાણ,
 Tax Detail,કર વિગત,
 Tax ID,કર ID,
 Tax Invoice,,
@@ -682,7 +688,7 @@ Template,નમૂનો,
 Temporary,કામચલાઉ,
 Temporary Accounts,હંગામી ખાતાઓ,
 Temporary Opening,હંગામી આરંભ,
-Th,,
+Th,ગુરુ,
 The following ${0} entries were created: ${1},નીચેની ${0} લેવડદેવડ બનાવવામાં આવી હતી: ${1},
 This Month,આ મહિને,
 This Quarter,આ ત્રિમાસીક,
@@ -692,10 +698,10 @@ This action is permanent and will cancel the following payment: ${0},આ ક્
 This action is permanent and will cancel the following payments: ${0},આ ક્રિયા કાયમી છે અને નીચેની ચુકવણીઓ ફોક થશે: ${0},
 This action is permanent and will delete associated ledger entries.,આ ક્રિયા કાયમી છે અને સંકળાયેલ ખાતાવહી લેવડદેવડ છેકાશે.,
 This action is permanent.,આ ક્રિયા કાયમી છે.,
-Times New Roman,Times New Roman,
+Times New Roman,,
 To,પ્રત્યે,
 To Account,ખાતા પ્રત્યે,
-To Account and From Account can't be the same: ${0},થકી ખાતું  અને પ્રત્યે ખાતું  સરખા હોય શકે નહીં : ${0},
+To Account and From Account can't be the same: ${0},થકી ખાતું અને પ્રત્યે ખાતું સરખા હોય શકે નહીં : ${0},
 To Date,આ તારીખ સુધી,
 To Loc.,સ્થાન સુધી,
 To Year,વર્ષ સુધી,
@@ -719,11 +725,11 @@ Transfer Type,વ્યવહારનો પ્રકાર,
 Transfer will cause future entries to have negative stock.,સ્થળાંતર થી ભવિષ્ય ના લેવડદેવડો માં જથ્થો ઋણ માં જશે,
 Travel Expenses,મુસાફરી ખર્ચ,
 Trial Balance,કાચું સરવૈયું,
-Tu,,
+Tu,મંગળ,
 Type,પ્રકાર,
 Type to search...,શોધવા માટે વર્ણન કરો ...,
-UOM,UOM,
-Unit,એકમ,
+UOM,માપણી,
+Unit,,
 Unit Type,એકમ પ્રકાર,
 Unpaid,અણચુકવેલ,
 Unsecured Loans,અસુરક્ષિત લોન,
@@ -739,12 +745,12 @@ Version,Version,
 View,નિરીક્ષણ,
 View Purchases,ખરીદી જુઓ,
 View Sales,વેચાણ જુઓ,
-We,અમે,
+We,બુધ,
 Welcome to Frappe Books,Frappe Books પર આપનું સ્વાગત છે,
 Write Off,ખારીજ,
-Write Off Account,ખારીજ  ખાતું,
-Write Off Account ${0} does not exist. Please set Write Off Account in General Settings,ખારીજ ખાતું ${0}  અસ્તિત્વ માં નથી,ખારીજ ખાતું સામાન્ય વિગતો માં ઉમેરો,
-Write Off Account not set. Please set Write Off Account in General Settings,ખારીજ ખાતું અસ્તિત્વ માં નથી,ખારીજ ખાતું સામાન્ય વિગતો માં ઉમેરો,
+Write Off Account,ખારીજ ખાતું,
+Write Off Account ${0} does not exist. Please set Write Off Account in General Settings,ખારીજ ખાતું ${0} અસ્તિત્વ માં નથી. ખારીજ ખાતું સામાન્ય વિગતો માં ઉમેરો,
+Write Off Account not set. Please set Write Off Account in General Settings,ખારીજ ખાતું અસ્તિત્વ માં નથી. ખારીજ ખાતું સામાન્ય વિગતો માં ઉમેરો,
 Write Off Entry,ખારીજ ખાતું ખતવણી,
 Yearly,વાર્ષિક,
 Years,વર્ષ,
@@ -752,4 +758,4 @@ Yellow,Yellow,
 Yes,હા,
 Your Name,તમારું નામ,
 john@doe.com,john@doe.com,
-verify the imported data and click on,આયાત કરેલા ડેટાને ચકાસો અને ક્લિક કરો,
+verify the imported data and click on,આયાત કરેલા ડેટાને ચકાસો અને ક્લિક કરો,
\ No newline at end of file
diff --git a/utils/index.ts b/utils/index.ts
index 8926657b..c0ece896 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -6,7 +6,7 @@ export function getValueMapFromList<T, K extends keyof T, V extends keyof T>(
   key: K,
   valueKey: V,
   filterUndefined: boolean = true
-): Record<string, unknown> {
+): Record<string, T[V]> {
   if (filterUndefined) {
     list = list.filter(
       (f) =>
@@ -20,7 +20,7 @@ export function getValueMapFromList<T, K extends keyof T, V extends keyof T>(
     const value = f[valueKey];
     acc[keyValue] = value;
     return acc;
-  }, {} as Record<string, unknown>);
+  }, {} as Record<string, T[V]>);
 }
 
 export function getRandomString(): string {
diff --git a/utils/types.ts b/utils/types.ts
index d627bfd9..8bdfe203 100644
--- a/utils/types.ts
+++ b/utils/types.ts
@@ -43,4 +43,8 @@ export interface SelectFileReturn {
   success: boolean;
   data: Buffer;
   canceled: boolean;
-}
\ No newline at end of file
+}
+
+export type PropertyEnum<T extends Record<string, any>> = {
+  [key in keyof Required<T>]: key;
+};
diff --git a/yarn.lock b/yarn.lock
index 98329537..9983d6af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -982,6 +982,18 @@
     ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
+"@electron/asar@^3.2.1":
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.3.tgz#f598db50061ae5f90ad651f0255366b4e818000e"
+  integrity sha512-wmOfE6szYyqZhRIiLH+eyZEp+bGcJI0OD/SCvSUrfBE0jvauyGYO2ZhpWxmNCcDojKu5DYrsVqT5BOCZZ01XIg==
+  dependencies:
+    chromium-pickle-js "^0.2.0"
+    commander "^5.0.0"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
+  optionalDependencies:
+    "@types/glob" "^7.1.1"
+
 "@electron/get@^1.13.0":
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368"
@@ -998,15 +1010,55 @@
     global-agent "^3.0.0"
     global-tunnel-ng "^2.7.1"
 
-"@electron/universal@1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339"
-  integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ==
+"@electron/notarize@^1.2.3":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.3.tgz#38056a629e5a0b5fd56c975c4828c0f74285b644"
+  integrity sha512-9oRzT56rKh5bspk3KpAVF8lPKHYQrBnRwcgiOeR0hdilVEQmszDaAu0IPCPrwwzJN0ugNs0rRboTreHMt/6mBQ==
   dependencies:
+    debug "^4.1.1"
+    fs-extra "^9.0.1"
+
+"@electron/osx-sign@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.4.tgz#8e91442846471636ca0469426a82b253b9170151"
+  integrity sha512-xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g==
+  dependencies:
+    compare-version "^0.1.2"
+    debug "^4.3.4"
+    fs-extra "^10.0.0"
+    isbinaryfile "^4.0.8"
+    minimist "^1.2.6"
+    plist "^3.0.5"
+
+"@electron/rebuild@^3.2.10":
+  version "3.2.10"
+  resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.2.10.tgz#adc9443179709d4e4b93a68fac6a08b9a3b9e5e6"
+  integrity sha512-SUBM6Mwi3yZaDFQjZzfGKpYTtOp9m60glounwX6tfGeVc/ZOl4jbquktUcyy7gYSLDWFLtKkftkY2xgMJZLQgg==
+  dependencies:
+    "@malept/cross-spawn-promise" "^2.0.0"
+    chalk "^4.0.0"
+    debug "^4.1.1"
+    detect-libc "^2.0.1"
+    fs-extra "^10.0.0"
+    got "^11.7.0"
+    lzma-native "^8.0.5"
+    node-abi "^3.0.0"
+    node-api-version "^0.1.4"
+    node-gyp "^9.0.0"
+    ora "^5.1.0"
+    semver "^7.3.5"
+    tar "^6.0.5"
+    yargs "^17.0.1"
+
+"@electron/universal@1.3.4":
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz#bccd94b635d7c85eeed5eabba457eb4ed2be2777"
+  integrity sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg==
+  dependencies:
+    "@electron/asar" "^3.2.1"
     "@malept/cross-spawn-promise" "^1.1.0"
-    asar "^3.1.0"
     debug "^4.3.1"
-    dir-compare "^2.4.0"
+    dir-compare "^3.0.0"
     fs-extra "^9.0.1"
     minimatch "^3.0.4"
     plist "^3.0.4"
@@ -1650,10 +1702,10 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129"
   integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==
 
-"@types/yargs@^17.0.1":
-  version "17.0.5"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.5.tgz#1e7e59a88420872875842352b73618f5e77e835f"
-  integrity sha512-4HNq144yhaVjJs+ON6A07NEoi9Hh0Rhl/jI9Nt/l/YRjt+T6St/QK3meFARWZ8IgkzoD1LC0PdTdJenlQQi2WQ==
+"@types/yargs@^17.0.16":
+  version "17.0.22"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz#7dd37697691b5f17d020f3c63e7a45971ff71e9a"
+  integrity sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -2573,13 +2625,6 @@ alphanum-sort@^1.0.0:
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
-ansi-align@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59"
-  integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==
-  dependencies:
-    string-width "^4.1.0"
-
 ansi-colors@^3.0.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
@@ -2667,36 +2712,38 @@ app-builder-bin@4.0.0:
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
   integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
 
-app-builder-lib@23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.3.3.tgz#78b9dbb0bd8a69842461edd77a3226d0547c5939"
-  integrity sha512-m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ==
+app-builder-lib@24.0.0-alpha.12:
+  version "24.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.12.tgz#4a608439ea631ecc4ae96ea27976f4891b165ae7"
+  integrity sha512-SbbORFmqY6yFZcerucYZTdIiRZvqkfecpO9wo0qr6JYA4FU0eIjZ69rkerb0Uan2PuP0R3L9WGoVSqJ0okVdYg==
   dependencies:
     "7zip-bin" "~5.1.1"
     "@develar/schema-utils" "~2.6.5"
-    "@electron/universal" "1.2.1"
+    "@electron/notarize" "^1.2.3"
+    "@electron/osx-sign" "^1.0.4"
+    "@electron/rebuild" "^3.2.10"
+    "@electron/universal" "1.3.4"
     "@malept/flatpak-bundler" "^0.4.0"
     async-exit-hook "^2.0.1"
     bluebird-lst "^1.0.9"
-    builder-util "23.3.3"
-    builder-util-runtime "9.0.3"
+    builder-util "24.0.0-alpha.11"
+    builder-util-runtime "9.2.0-alpha.3"
     chromium-pickle-js "^0.2.0"
     debug "^4.3.4"
-    ejs "^3.1.7"
-    electron-osx-sign "^0.6.0"
-    electron-publish "23.3.3"
+    ejs "^3.1.8"
+    electron-publish "24.0.0-alpha.11"
     form-data "^4.0.0"
     fs-extra "^10.1.0"
     hosted-git-info "^4.1.0"
     is-ci "^3.0.0"
-    isbinaryfile "^4.0.10"
+    isbinaryfile "^5.0.0"
     js-yaml "^4.1.0"
     lazy-val "^1.0.5"
-    minimatch "^3.1.2"
-    read-config-file "6.2.0"
+    minimatch "^5.1.1"
+    read-config-file "6.3.2"
     sanitize-filename "^1.6.3"
-    semver "^7.3.7"
-    tar "^6.1.11"
+    semver "^7.3.8"
+    tar "^6.1.12"
     temp-file "^3.4.0"
 
 aproba@^1.0.3, aproba@^1.1.1:
@@ -2814,18 +2861,6 @@ arrify@^2.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
   integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
 
-asar@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473"
-  integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ==
-  dependencies:
-    chromium-pickle-js "^0.2.0"
-    commander "^5.0.0"
-    glob "^7.1.6"
-    minimatch "^3.0.4"
-  optionalDependencies:
-    "@types/glob" "^7.1.1"
-
 asn1.js@^5.2.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
@@ -3087,7 +3122,7 @@ bluebird-lst@^1.0.9:
   dependencies:
     bluebird "^3.5.5"
 
-bluebird@^3.1.1, bluebird@^3.5.0, bluebird@^3.5.5:
+bluebird@^3.1.1, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -3142,20 +3177,6 @@ boolean@^3.0.1:
   resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz#f51a2fb5838a99e06f9b6ec1edb674de67026435"
   integrity sha512-3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w==
 
-boxen@^5.0.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50"
-  integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==
-  dependencies:
-    ansi-align "^3.0.0"
-    camelcase "^6.2.0"
-    chalk "^4.1.0"
-    cli-boxes "^2.2.1"
-    string-width "^4.2.2"
-    type-fest "^0.20.2"
-    widest-line "^3.1.0"
-    wrap-ansi "^7.0.0"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -3282,33 +3303,15 @@ browserslist@^4.14.5:
     node-releases "^2.0.1"
     picocolors "^1.0.0"
 
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
 buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
-buffer-equal@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
-  integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74=
-
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+buffer-equal@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90"
+  integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==
 
 buffer-from@^1.0.0:
   version "1.1.2"
@@ -3360,23 +3363,31 @@ builder-util-runtime@9.0.3:
     debug "^4.3.4"
     sax "^1.2.4"
 
-builder-util@23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.3.3.tgz#449ee57ec1ffc7e59f7a3a8a1a33d25cf5e39e43"
-  integrity sha512-MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA==
+builder-util-runtime@9.2.0-alpha.3:
+  version "9.2.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.0-alpha.3.tgz#898a907a127eb2b1782b9231fb6931bad1e135ac"
+  integrity sha512-1pOggEqknxVyhdASumips0/RaMaXwSCQMzwhk2jeOGOotBQuOHQHVy25kH5OaeXSFx9L7PckZHXjwZauD72zRw==
+  dependencies:
+    debug "^4.3.4"
+    sax "^1.2.4"
+
+builder-util@24.0.0-alpha.11:
+  version "24.0.0-alpha.11"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.11.tgz#626f873477c959ceb2df8298fe762ccd232f95cd"
+  integrity sha512-ys8cVVrMLZjDbb8T2bgIewdwNQwrmISyWpeskUmB2YJKbH5p3WGD792xGbsDRkGjGMCbtAepHTinxkZhQKOfug==
   dependencies:
     "7zip-bin" "~5.1.1"
     "@types/debug" "^4.1.6"
     "@types/fs-extra" "^9.0.11"
     app-builder-bin "4.0.0"
     bluebird-lst "^1.0.9"
-    builder-util-runtime "9.0.3"
-    chalk "^4.1.1"
+    builder-util-runtime "9.2.0-alpha.3"
+    chalk "^4.1.2"
     cross-spawn "^7.0.3"
     debug "^4.3.4"
-    fs-extra "^10.0.0"
+    fs-extra "^10.1.0"
     http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.1"
     is-ci "^3.0.0"
     js-yaml "^4.1.0"
     source-map-support "^0.5.19"
@@ -3590,7 +3601,7 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.0.0, camelcase@^6.2.0:
+camelcase@^6.0.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
@@ -3737,11 +3748,6 @@ ci-info@^1.5.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
   integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
 
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
 ci-info@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6"
@@ -3782,11 +3788,6 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-cli-boxes@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
-  integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
-
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
@@ -3867,6 +3868,15 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
 clone-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
@@ -3964,11 +3974,6 @@ colorette@^1.2.2, colorette@^1.4.0:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
   integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
 
-colors@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
-  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
-
 combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -3981,13 +3986,6 @@ commander@2.17.x:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
   integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
-commander@2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
 commander@^2.12.1, commander@^2.18.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -4095,17 +4093,13 @@ config-chain@^1.1.11:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-configstore@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
-  integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
+config-file-ts@^0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.4.tgz#6c0741fbe118a7cf786c65f139030f0448a2cc99"
+  integrity sha512-cKSW0BfrSaAUnxpgvpXPLaaW/umg4bqg4k3GO1JqlRfpx+d5W0GDXznCMkWotJQek5Mmz1MJVChQnz3IVaeMZQ==
   dependencies:
-    dot-prop "^5.2.0"
-    graceful-fs "^4.1.2"
-    make-dir "^3.0.0"
-    unique-string "^2.0.0"
-    write-file-atomic "^3.0.0"
-    xdg-basedir "^4.0.0"
+    glob "^7.1.6"
+    typescript "^4.0.2"
 
 connect-history-api-fallback@^1.6.0:
   version "1.6.0"
@@ -4347,11 +4341,6 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-random-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
-  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
-
 css-color-names@0.0.4, css-color-names@^0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
@@ -4545,7 +4534,7 @@ debounce-fn@^4.0.0:
   dependencies:
     mimic-fn "^3.0.0"
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -4806,15 +4795,13 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-compare@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631"
-  integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA==
+dir-compare@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz#2c749f973b5c4b5d087f11edaae730db31788416"
+  integrity sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==
   dependencies:
-    buffer-equal "1.0.0"
-    colors "1.0.3"
-    commander "2.9.0"
-    minimatch "3.0.4"
+    buffer-equal "^1.0.0"
+    minimatch "^3.0.4"
 
 dir-glob@^2.0.0, dir-glob@^2.2.2:
   version "2.2.2"
@@ -4835,15 +4822,15 @@ dlv@^1.1.3:
   resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
   integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
 
-dmg-builder@23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.3.3.tgz#b37547f8403c3e9f7c60265a93d902f5b0c395ea"
-  integrity sha512-ECwAjt+ZWyOvddrkDx1xRD6IVUCZb5SV6vSMHZd+Va3G2sUXHrnglR1cGDKRF4oYRQm8SYVrpLZKbi8npyDcAQ==
+dmg-builder@24.0.0-alpha.12:
+  version "24.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.12.tgz#a506f3c90d65a6d1982e0238735f4317eab77836"
+  integrity sha512-AmcRnHMeGa3o45fxS3Z857gwvwMj+/dxM5Emnc12+/uK+hKLcfEZcSeNeU+pN2+Iquevs6BVoQ0MlCimE/BmAA==
   dependencies:
-    app-builder-lib "23.3.3"
-    builder-util "23.3.3"
-    builder-util-runtime "9.0.3"
-    fs-extra "^10.0.0"
+    app-builder-lib "24.0.0-alpha.12"
+    builder-util "24.0.0-alpha.11"
+    builder-util-runtime "9.2.0-alpha.3"
+    fs-extra "^10.1.0"
     iconv-lite "^0.6.2"
     js-yaml "^4.1.0"
   optionalDependencies:
@@ -5047,30 +5034,30 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-ejs@^3.1.7:
+ejs@^3.1.8:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
   integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
   dependencies:
     jake "^10.8.5"
 
-electron-builder@^23.0.3, electron-builder@^23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.3.3.tgz#88d4e584a99b9e36ca4e8432b1163a1ef877355f"
-  integrity sha512-mFYYdhoFPKevP6y5uaaF3dusmB2OtQ/HnwwpyOePeU7QDS0SEIAUokQsHUanAiJAZcBqtY7iyLBgX18QybdFFw==
+electron-builder@24.0.0-alpha.12, electron-builder@^23.0.3:
+  version "24.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.12.tgz#d5f08ae563293114d6caf2b3fa3744a686fbf76c"
+  integrity sha512-UvlN5tkxuaNBrYvBujzrtU/C6RWyZQQYrG9XWoLJKgFZMmLw9iq4pTPr17X/dCsL5p4Cwc2yICLBd3OTStZUtQ==
   dependencies:
-    "@types/yargs" "^17.0.1"
-    app-builder-lib "23.3.3"
-    builder-util "23.3.3"
-    builder-util-runtime "9.0.3"
-    chalk "^4.1.1"
-    dmg-builder "23.3.3"
-    fs-extra "^10.0.0"
+    "@types/yargs" "^17.0.16"
+    app-builder-lib "24.0.0-alpha.12"
+    builder-util "24.0.0-alpha.11"
+    builder-util-runtime "9.2.0-alpha.3"
+    chalk "^4.1.2"
+    dmg-builder "24.0.0-alpha.12"
+    fs-extra "^10.1.0"
     is-ci "^3.0.0"
     lazy-val "^1.0.5"
-    read-config-file "6.2.0"
-    update-notifier "^5.1.0"
-    yargs "^17.0.1"
+    read-config-file "6.3.2"
+    simple-update-notifier "^1.1.0"
+    yargs "^17.6.2"
 
 electron-devtools-installer@^3.2.0:
   version "3.2.0"
@@ -5082,36 +5069,16 @@ electron-devtools-installer@^3.2.0:
     tslib "^2.1.0"
     unzip-crx-3 "^0.2.0"
 
-electron-notarize@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.1.1.tgz#3ed274b36158c1beb1dbef14e7faf5927e028629"
-  integrity sha512-kufsnqh86CTX89AYNG3NCPoboqnku/+32RxeJ2+7A4Rbm4bbOx0Nc7XTy3/gAlBfpj9xPAxHfhZLOHgfi6cJVw==
-  dependencies:
-    debug "^4.1.1"
-    fs-extra "^9.0.1"
-
-electron-osx-sign@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8"
-  integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg==
-  dependencies:
-    bluebird "^3.5.0"
-    compare-version "^0.1.2"
-    debug "^2.6.8"
-    isbinaryfile "^3.0.2"
-    minimist "^1.2.0"
-    plist "^3.0.1"
-
-electron-publish@23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.3.3.tgz#c4125fbb00620acb854f6e994fd3ab3115662ddd"
-  integrity sha512-1dX17eE5xVXedTxjC+gjsP74oC0+sIHgqysp0ryTlF9+yfQUyXjBk6kcK+zhtBA2SsHMSglDtM+JPxDD/WpPTQ==
+electron-publish@24.0.0-alpha.11:
+  version "24.0.0-alpha.11"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.11.tgz#dae4b6880ee457cb4a92f40c975b52d3d49482e8"
+  integrity sha512-H7A3WknajVj+n7h/MchnlIU/fQByCp5HMzVCWaeilt5twsJ/3gZZFpOT54aS7YW+aTVF8V8OHuHfwyqqGwEKEw==
   dependencies:
     "@types/fs-extra" "^9.0.11"
-    builder-util "23.3.3"
-    builder-util-runtime "9.0.3"
-    chalk "^4.1.1"
-    fs-extra "^10.0.0"
+    builder-util "24.0.0-alpha.11"
+    builder-util-runtime "9.2.0-alpha.3"
+    chalk "^4.1.2"
+    fs-extra "^10.1.0"
     lazy-val "^1.0.5"
     mime "^2.5.2"
 
@@ -5163,7 +5130,7 @@ electron-updater@^5.2.1:
     semver "^7.3.5"
     typed-emitter "^2.1.0"
 
-electron@^18.3.7:
+electron@18.3.7:
   version "18.3.7"
   resolved "https://registry.yarnpkg.com/electron/-/electron-18.3.7.tgz#a22a23d63811d067c8e33abc5674122408319265"
   integrity sha512-SDvX0VYejR1xw9PrJyvnyiDcuIhdzFVaA1NaRN2LEWXr5R6mEFl8NVTM+i5dtxMm2SHP/FPnkvmsWZs6MHijqg==
@@ -5378,11 +5345,6 @@ escalade@^3.1.1:
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
-escape-goat@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675"
-  integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==
-
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -6437,13 +6399,6 @@ global-agent@^3.0.0:
     semver "^7.3.2"
     serialize-error "^7.0.1"
 
-global-dirs@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686"
-  integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==
-  dependencies:
-    ini "2.0.0"
-
 global-tunnel-ng@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
@@ -6583,11 +6538,6 @@ graceful-fs@^4.2.6:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
-
 gzip-size@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
@@ -6709,11 +6659,6 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has-yarn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
-  integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
-
 has@^1.0.0, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -6861,9 +6806,9 @@ htmlparser2@^6.1.0:
     entities "^2.0.0"
 
 http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
 
 http-deceiver@^1.2.7:
   version "1.2.7"
@@ -6957,7 +6902,7 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-https-proxy-agent@^5.0.0:
+https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
   integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
@@ -7039,7 +6984,7 @@ ignore@^5.1.4, ignore@^5.1.8, ignore@^5.2.0:
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
+  integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
 
 import-cwd@^2.0.0:
   version "2.1.0"
@@ -7071,11 +7016,6 @@ import-from@^2.1.0:
   dependencies:
     resolve-from "^3.0.0"
 
-import-lazy@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
-  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
-
 import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
@@ -7127,11 +7067,6 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
-  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
-
 ini@^1.3.4, ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
@@ -7287,13 +7222,6 @@ is-ci@^1.0.10:
   dependencies:
     ci-info "^1.5.0"
 
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
-
 is-ci@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
@@ -7429,14 +7357,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-installed-globally@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
-  integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==
-  dependencies:
-    global-dirs "^3.0.0"
-    is-path-inside "^3.0.2"
-
 is-interactive@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
@@ -7462,11 +7382,6 @@ is-negative-zero@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
-is-npm@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8"
-  integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==
-
 is-number-object@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
@@ -7515,11 +7430,6 @@ is-path-inside@^2.1.0:
   dependencies:
     path-is-inside "^1.0.2"
 
-is-path-inside@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
-  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
-
 is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -7607,7 +7517,7 @@ is-typed-array@^1.1.9:
     for-each "^0.3.3"
     has-tostringtag "^1.0.0"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -7661,33 +7571,26 @@ is-wsl@^2.1.1, is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
-is-yarn-global@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
-  integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
-
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 isarray@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
-isbinaryfile@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
-  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
-  dependencies:
-    buffer-alloc "^1.2.0"
-
-isbinaryfile@^4.0.10:
+isbinaryfile@^4.0.8:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3"
   integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
 
+isbinaryfile@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz#034b7e54989dab8986598cbcea41f66663c65234"
+  integrity sha512-UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -7907,14 +7810,14 @@ jsprim@^1.2.2:
     verror "1.10.0"
 
 jszip@^3.1.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
-  integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2"
+  integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==
   dependencies:
     lie "~3.3.0"
     pako "~1.0.2"
     readable-stream "~2.3.6"
-    set-immediate-shim "~1.0.1"
+    setimmediate "^1.0.5"
 
 keyv@^3.0.0:
   version "3.1.0"
@@ -7980,13 +7883,6 @@ knex@^2.4.0:
     tarn "^3.0.2"
     tildify "2.0.0"
 
-latest-version@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
-  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
-  dependencies:
-    package-json "^6.3.0"
-
 launch-editor-middleware@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/launch-editor-middleware/-/launch-editor-middleware-2.2.1.tgz#e14b07e6c7154b0a4b86a0fd345784e45804c157"
@@ -8289,7 +8185,7 @@ make-dir@^2.0.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
+make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
@@ -8547,14 +8443,14 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@3.0.4, minimatch@^3.0.4:
+minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -8568,6 +8464,13 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^5.1.1:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
@@ -8626,6 +8529,11 @@ minipass@^3.1.6:
   dependencies:
     yallist "^4.0.0"
 
+minipass@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.3.tgz#00bfbaf1e16e35e804f4aa31a7c1f6b8d9f0ee72"
+  integrity sha512-OW2r4sQ0sI+z5ckEt5c1Tri4xTgZwYDxpE54eqWlQloQRoWtXjqt9udJ5Z4dSv7wK+nfFI7FRXyCpBSft+gpFw==
+
 minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -9328,16 +9236,6 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-package-json@^6.3.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
-  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
-  dependencies:
-    got "^9.6.0"
-    registry-auth-token "^4.0.0"
-    registry-url "^5.0.0"
-    semver "^6.2.0"
-
 pako@~1.0.2, pako@~1.0.5:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
@@ -9590,7 +9488,7 @@ please-upgrade-node@^3.2.0:
   dependencies:
     semver-compare "^1.0.0"
 
-plist@^3.0.1, plist@^3.0.4:
+plist@^3.0.4:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987"
   integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==
@@ -9598,6 +9496,14 @@ plist@^3.0.1, plist@^3.0.4:
     base64-js "^1.5.1"
     xmlbuilder "^9.0.7"
 
+plist@^3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3"
+  integrity sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==
+  dependencies:
+    base64-js "^1.5.1"
+    xmlbuilder "^15.1.1"
+
 plur@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/plur/-/plur-1.0.0.tgz#db85c6814f5e5e5a3b49efc28d604fec62975156"
@@ -10234,13 +10140,6 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-pupa@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62"
-  integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==
-  dependencies:
-    escape-goat "^2.0.0"
-
 purgecss@^4.0.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-4.1.3.tgz#683f6a133c8c4de7aa82fe2746d1393b214918f7"
@@ -10339,7 +10238,7 @@ raw-loader@^4.0.2:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
-rc@^1.2.7, rc@^1.2.8:
+rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -10354,11 +10253,12 @@ re-emitter@1.1.3:
   resolved "https://registry.yarnpkg.com/re-emitter/-/re-emitter-1.1.3.tgz#fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"
   integrity sha512-bHJul9CWcocrS+w5e5QrKYXV9NkbSA9hxSEyhYuctwm6keY9NXR2Xt/4A0vbMP0QvuwyfEyb4bkowYXv1ziEbg==
 
-read-config-file@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade"
-  integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg==
+read-config-file@6.3.2:
+  version "6.3.2"
+  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz#556891aa6ffabced916ed57457cb192e61880411"
+  integrity sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q==
   dependencies:
+    config-file-ts "^0.2.4"
     dotenv "^9.0.2"
     dotenv-expand "^5.1.0"
     js-yaml "^4.1.0"
@@ -10507,20 +10407,6 @@ regexpu-core@^4.7.1:
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.0.0"
 
-registry-auth-token@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
-  integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
-  dependencies:
-    rc "^1.2.8"
-
-registry-url@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
-  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
-  dependencies:
-    rc "^1.2.8"
-
 regjsgen@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
@@ -10909,19 +10795,12 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
 
-semver-diff@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
-  integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==
-  dependencies:
-    semver "^6.3.0"
-
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.0.0:
+semver@7.0.0, semver@~7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
@@ -10938,10 +10817,10 @@ semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.3.7:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+semver@^7.3.8:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -11020,11 +10899,6 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-immediate-shim@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
-
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
@@ -11035,7 +10909,7 @@ set-value@^2.0.0, set-value@^2.0.1:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
-setimmediate@^1.0.4:
+setimmediate@^1.0.4, setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
   integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
@@ -11137,6 +11011,13 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
+simple-update-notifier@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82"
+  integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==
+  dependencies:
+    semver "~7.0.0"
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -11507,7 +11388,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -11894,6 +11775,18 @@ tar@^6.0.2, tar@^6.0.5, tar@^6.1.11, tar@^6.1.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
+tar@^6.1.12:
+  version "6.1.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b"
+  integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^4.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
 tarn@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/tarn/-/tarn-3.0.2.tgz#73b6140fbb881b71559c4f8bfde3d9a4b3d27693"
@@ -12325,18 +12218,16 @@ typed-emitter@^2.1.0:
   optionalDependencies:
     rxjs "^7.5.2"
 
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typescript@^4.0.2:
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+
 typescript@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
@@ -12441,13 +12332,6 @@ unique-slug@^3.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
-  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
-  dependencies:
-    crypto-random-string "^2.0.0"
-
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -12499,26 +12383,6 @@ upath@^1.1.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-update-notifier@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"
-  integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==
-  dependencies:
-    boxen "^5.0.0"
-    chalk "^4.1.0"
-    configstore "^5.0.1"
-    has-yarn "^2.1.0"
-    import-lazy "^2.1.0"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.4.0"
-    is-npm "^5.0.0"
-    is-yarn-global "^0.3.0"
-    latest-version "^5.1.0"
-    pupa "^2.1.1"
-    semver "^7.3.4"
-    semver-diff "^3.1.1"
-    xdg-basedir "^4.0.0"
-
 upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
@@ -12581,7 +12445,7 @@ utf8-byte-length@^1.0.1:
 util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 util.promisify@1.0.0:
   version "1.0.0"
@@ -13104,13 +12968,6 @@ wide-align@^1.1.0, wide-align@^1.1.5:
   dependencies:
     string-width "^1.0.2 || 2 || 3 || 4"
 
-widest-line@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
-  integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==
-  dependencies:
-    string-width "^4.0.0"
-
 word-wrap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -13162,16 +13019,6 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
-  dependencies:
-    imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
-
 ws@^6.0.0, ws@^6.2.1:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
@@ -13179,12 +13026,7 @@ ws@^6.0.0, ws@^6.2.1:
   dependencies:
     async-limiter "~1.0.0"
 
-xdg-basedir@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
-  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
-
-xmlbuilder@>=11.0.1:
+xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1:
   version "15.1.1"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"
   integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==
@@ -13247,7 +13089,7 @@ yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.0.0:
+yargs-parser@^21.0.0, yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
@@ -13307,6 +13149,19 @@ yargs@^17.5.1:
     y18n "^5.0.5"
     yargs-parser "^21.0.0"
 
+yargs@^17.6.2:
+  version "17.6.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541"
+  integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"