diff --git a/package-lock.json b/package-lock.json
index 46fbd6b13..baaa3b95a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "bigcapital-client",
-  "version": "1.2.0",
+  "version": "1.5.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1043,6 +1043,28 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@blueprintjs-formik/core": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@blueprintjs-formik/core/-/core-0.1.5.tgz",
+      "integrity": "sha512-H0aXiNMYC8RwhWR1F2O77dcRcRITijUX5we51G4AK2Vmp1yXCmNb0piN9ftsjL5vVIvIsMKWg+dfbwREmB5VWg==",
+      "requires": {
+        "lodash.get": "^4.4.2",
+        "lodash.keyby": "^4.6.0",
+        "styled-components": "^5.3.3",
+        "web-vitals": "^2.1.4"
+      }
+    },
+    "@blueprintjs-formik/select": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@blueprintjs-formik/select/-/select-0.1.4.tgz",
+      "integrity": "sha512-eL9UruaKiGKxRBPDUf2VZ/s+U9efX1lsEqXEldTfXVDfjhrFCn1U7wsfyE5NdX2ccjk/z4jcjNauM0LCynJR1g==",
+      "requires": {
+        "lodash.get": "^4.4.2",
+        "lodash.keyby": "^4.6.0",
+        "styled-components": "^5.3.3",
+        "web-vitals": "^2.1.4"
+      }
+    },
     "@blueprintjs/colors": {
       "version": "4.0.0-alpha.0",
       "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.0-alpha.0.tgz",
@@ -6475,6 +6497,11 @@
         }
       }
     },
+    "filter-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
+      "integrity": "sha1-mzERErxsYSehbgFsbF1/GeCAXFs="
+    },
     "finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
@@ -9402,6 +9429,16 @@
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
       "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
     },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
+    },
+    "lodash.keyby": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.keyby/-/lodash.keyby-4.6.0.tgz",
+      "integrity": "sha1-f2oavak/0k4icopNNh7YvLpaQ1Q="
+    },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -12263,6 +12300,17 @@
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
       "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
     },
+    "query-string": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz",
+      "integrity": "sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==",
+      "requires": {
+        "decode-uri-component": "^0.2.0",
+        "filter-obj": "^1.1.0",
+        "split-on-first": "^1.0.0",
+        "strict-uri-encode": "^2.0.0"
+      }
+    },
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -12875,9 +12923,9 @@
       "integrity": "sha512-hfPF13zDLxPMpLKzIKCE8RZud9T/XrRTsaCIf8zXpWZIZ2juCl7qrGpo3AQw9eAetXV5DP7s2GDm+hht7qq5Dw=="
     },
     "react-table-sticky": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/react-table-sticky/-/react-table-sticky-1.1.2.tgz",
-      "integrity": "sha512-XnVB4Yf6r8L10YC0Ccu2GrY57IxVWofy19m7s8+q5xzZOudYvyADXsBj6+EenHOvBWTYSviLe8RfaLFIp1lC9w=="
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/react-table-sticky/-/react-table-sticky-1.1.3.tgz",
+      "integrity": "sha512-9hyjbveY1aDyo9wkyMOsmKIpQdFUaw2yG6/f8c5SPE4pOTuKm7L2zLnDa+AxpG+3315USulViaO4XSOkX1KdVA=="
     },
     "react-transition-group": {
       "version": "4.4.1",
@@ -14398,6 +14446,11 @@
         "wbuf": "^1.7.3"
       }
     },
+    "split-on-first": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
+      "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="
+    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -14629,6 +14682,11 @@
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
       "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
     },
+    "strict-uri-encode": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
+      "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY="
+    },
     "string-length": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz",
@@ -16340,6 +16398,11 @@
         "minimalistic-assert": "^1.0.0"
       }
     },
+    "web-vitals": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-2.1.4.tgz",
+      "integrity": "sha512-sVWcwhU5mX6crfI5Vd2dC4qchyTqxV8URinzt25XqVh+bHEPGH4C3NPrNionCP7Obx59wrYEbNlw4Z8sjALzZg=="
+    },
     "webidl-conversions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
diff --git a/package.json b/package.json
index d6f6f2028..5c8961291 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,8 @@
   "private": true,
   "dependencies": {
     "@babel/core": "7.8.4",
+    "@blueprintjs-formik/core": "^0.1.5",
+    "@blueprintjs-formik/select": "^0.1.4",
     "@blueprintjs/core": "^3.50.2",
     "@blueprintjs/datetime": "^3.23.12",
     "@blueprintjs/popover2": "^0.11.1",
@@ -31,7 +33,6 @@
     "babel-plugin-named-asset-import": "^0.3.6",
     "babel-preset-react-app": "^9.1.1",
     "basscss": "^8.0.2",
-    "blueprint-formik": "^0.1.4",
     "camelcase": "^5.3.1",
     "case-sensitive-paths-webpack-plugin": "2.3.0",
     "cross-env": "^7.0.2",
diff --git a/src/components/Forms/BlueprintFormik.js b/src/components/Forms/BlueprintFormik.js
index 7ea7fee9c..5c1c049d3 100644
--- a/src/components/Forms/BlueprintFormik.js
+++ b/src/components/Forms/BlueprintFormik.js
@@ -4,9 +4,9 @@ import {
   NumericInput,
   Checkbox,
   RadioGroup,
-  Select,
-  MultiSelect
-} from 'blueprint-formik';
+  Switch,
+} from '@blueprintjs-formik/core';
+import { Select, MultiSelect } from '@blueprintjs-formik/select';
 
 export {
   FormGroup as FFormGroup,
@@ -14,6 +14,7 @@ export {
   NumericInput as FNumericInput,
   Checkbox as FCheckbox,
   RadioGroup as FRadioGroup,
+  Switch as FSwitch,
   Select as FSelect,
-  MultiSelect as FMultiSelect
+  MultiSelect as FMultiSelect,
 };