11 files changed, 325 insertions, 304 deletions

diff --git a/package-lock.json b/package-lock.json
index 9fd39c234..31652cb82 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -57,6 +57,13 @@
         "ms": "^2.1.1",
         "resetable": "^1.0.3",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        }
       }
     },
     "@adonisjs/bodyparser": {
@@ -243,6 +250,11 @@
             "jsonfile": "^4.0.0",
             "universalify": "^0.1.0"
           }
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
         }
       }
     },
@@ -257,6 +269,13 @@
         "node-csp": "^1.0.1",
         "node-guard": "^1.0.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        }
       }
     },
     "@adonisjs/validator": {
@@ -7009,9 +7028,9 @@
       }
     },
     "@types/uuid": {
-      "version": "3.4.9",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.9.tgz",
-      "integrity": "sha512-XDwyIlt/47l2kWLTzw/mtrpLdB+GPSskR2n/PIcPn+VYhVO77rGhRncIR5GPU0KRzXuqkDO+J5qqrG0Y8P6jzQ==",
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.1.tgz",
+      "integrity": "sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg==",
       "dev": true
     },
     "@types/validator": {
@@ -7094,13 +7113,13 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz",
-      "integrity": "sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==",
+      "version": "4.31.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.2.tgz",
+      "integrity": "sha512-w63SCQ4bIwWN/+3FxzpnWrDjQRXVEGiTt9tJTRptRXeFvdZc/wLiz3FQUwNQ2CVoRGI6KUWMNUj/pk63noUfcA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "4.30.0",
-        "@typescript-eslint/scope-manager": "4.30.0",
+        "@typescript-eslint/experimental-utils": "4.31.2",
+        "@typescript-eslint/scope-manager": "4.31.2",
         "debug": "^4.3.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.1.0",
@@ -7109,43 +7128,43 @@
       },
       "dependencies": {
         "@typescript-eslint/experimental-utils": {
-          "version": "4.30.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz",
-          "integrity": "sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==",
+          "version": "4.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.2.tgz",
+          "integrity": "sha512-3tm2T4nyA970yQ6R3JZV9l0yilE2FedYg8dcXrTar34zC9r6JB7WyBQbpIVongKPlhEMjhQ01qkwrzWy38Bk1Q==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.7",
-            "@typescript-eslint/scope-manager": "4.30.0",
-            "@typescript-eslint/types": "4.30.0",
-            "@typescript-eslint/typescript-estree": "4.30.0",
+            "@typescript-eslint/scope-manager": "4.31.2",
+            "@typescript-eslint/types": "4.31.2",
+            "@typescript-eslint/typescript-estree": "4.31.2",
             "eslint-scope": "^5.1.1",
             "eslint-utils": "^3.0.0"
           }
         },
         "@typescript-eslint/scope-manager": {
-          "version": "4.30.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz",
-          "integrity": "sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==",
+          "version": "4.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.2.tgz",
+          "integrity": "sha512-2JGwudpFoR/3Czq6mPpE8zBPYdHWFGL6lUNIGolbKQeSNv4EAiHaR5GVDQaLA0FwgcdcMtRk+SBJbFGL7+La5w==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.30.0",
-            "@typescript-eslint/visitor-keys": "4.30.0"
+            "@typescript-eslint/types": "4.31.2",
+            "@typescript-eslint/visitor-keys": "4.31.2"
           }
         },
         "@typescript-eslint/types": {
-          "version": "4.30.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz",
-          "integrity": "sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==",
+          "version": "4.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.2.tgz",
+          "integrity": "sha512-kWiTTBCTKEdBGrZKwFvOlGNcAsKGJSBc8xLvSjSppFO88AqGxGNYtF36EuEYG6XZ9vT0xX8RNiHbQUKglbSi1w==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "4.30.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz",
-          "integrity": "sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==",
+          "version": "4.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.2.tgz",
+          "integrity": "sha512-ieBq8U9at6PvaC7/Z6oe8D3czeW5d//Fo1xkF/s9394VR0bg/UaMYPdARiWyKX+lLEjY3w/FNZJxitMsiWv+wA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.30.0",
-            "@typescript-eslint/visitor-keys": "4.30.0",
+            "@typescript-eslint/types": "4.31.2",
+            "@typescript-eslint/visitor-keys": "4.31.2",
             "debug": "^4.3.1",
             "globby": "^11.0.3",
             "is-glob": "^4.0.1",
@@ -7154,12 +7173,12 @@
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "4.30.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz",
-          "integrity": "sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==",
+          "version": "4.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.2.tgz",
+          "integrity": "sha512-PrBId7EQq2Nibns7dd/ch6S6/M4/iwLM9McbgeEbCXfxdwRUNxJ4UNreJ6Gh3fI2GNKNrWnQxKL7oCPmngKBug==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.30.0",
+            "@typescript-eslint/types": "4.31.2",
             "eslint-visitor-keys": "^2.0.0"
           }
         },
@@ -7189,41 +7208,41 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.1.tgz",
-      "integrity": "sha512-3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg==",
+      "version": "4.31.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.2.tgz",
+      "integrity": "sha512-EcdO0E7M/sv23S/rLvenHkb58l3XhuSZzKf6DBvLgHqOYdL6YFMYVtreGFWirxaU2mS1GYDby3Lyxco7X5+Vjw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "4.29.1",
-        "@typescript-eslint/types": "4.29.1",
-        "@typescript-eslint/typescript-estree": "4.29.1",
+        "@typescript-eslint/scope-manager": "4.31.2",
+        "@typescript-eslint/types": "4.31.2",
+        "@typescript-eslint/typescript-estree": "4.31.2",
         "debug": "^4.3.1"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "4.29.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz",
-          "integrity": "sha512-Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A==",
+          "version": "4.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.2.tgz",
+          "integrity": "sha512-2JGwudpFoR/3Czq6mPpE8zBPYdHWFGL6lUNIGolbKQeSNv4EAiHaR5GVDQaLA0FwgcdcMtRk+SBJbFGL7+La5w==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.29.1",
-            "@typescript-eslint/visitor-keys": "4.29.1"
+            "@typescript-eslint/types": "4.31.2",
+            "@typescript-eslint/visitor-keys": "4.31.2"
           }
         },
         "@typescript-eslint/types": {
-          "version": "4.29.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.1.tgz",
-          "integrity": "sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA==",
+          "version": "4.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.2.tgz",
+          "integrity": "sha512-kWiTTBCTKEdBGrZKwFvOlGNcAsKGJSBc8xLvSjSppFO88AqGxGNYtF36EuEYG6XZ9vT0xX8RNiHbQUKglbSi1w==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "4.29.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz",
-          "integrity": "sha512-lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw==",
+          "version": "4.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.2.tgz",
+          "integrity": "sha512-ieBq8U9at6PvaC7/Z6oe8D3czeW5d//Fo1xkF/s9394VR0bg/UaMYPdARiWyKX+lLEjY3w/FNZJxitMsiWv+wA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.29.1",
-            "@typescript-eslint/visitor-keys": "4.29.1",
+            "@typescript-eslint/types": "4.31.2",
+            "@typescript-eslint/visitor-keys": "4.31.2",
             "debug": "^4.3.1",
             "globby": "^11.0.3",
             "is-glob": "^4.0.1",
@@ -7232,12 +7251,12 @@
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "4.29.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz",
-          "integrity": "sha512-zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag==",
+          "version": "4.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.2.tgz",
+          "integrity": "sha512-PrBId7EQq2Nibns7dd/ch6S6/M4/iwLM9McbgeEbCXfxdwRUNxJ4UNreJ6Gh3fI2GNKNrWnQxKL7oCPmngKBug==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.29.1",
+            "@typescript-eslint/types": "4.31.2",
             "eslint-visitor-keys": "^2.0.0"
           }
         },
@@ -12100,24 +12119,6 @@
         "uid-safe": "2.1.5"
       }
     },
-    "css": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.5.2",
-        "urix": "^0.1.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
     "css-select": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
@@ -14132,15 +14133,10 @@
       }
     },
     "eslint-config-airbnb-typescript": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-12.3.1.tgz",
-      "integrity": "sha512-ql/Pe6/hppYuRp4m3iPaHJqkBB7dgeEmGPQ6X0UNmrQOfTF+dXw29/ZjU2kQ6RDoLxaxOA+Xqv07Vbef6oVTWw==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/parser": "^4.4.1",
-        "eslint-config-airbnb": "^18.2.0",
-        "eslint-config-airbnb-base": "^14.2.0"
-      }
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-14.0.0.tgz",
+      "integrity": "sha512-d2Nit2ByZARGRYK6tgSNl3nnmGZPyvsgbsKFcmm+nAhvT8VjVpifG5jI4tzObUUPb0sWw0E1oO/0pSpBD/pIuQ==",
+      "dev": true
     },
     "eslint-config-prettier": {
       "version": "8.3.0",
@@ -14428,9 +14424,9 @@
       }
     },
     "eslint-plugin-prettier": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz",
-      "integrity": "sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
+      "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
       "dev": true,
       "requires": {
         "prettier-linter-helpers": "^1.0.0"
@@ -20215,6 +20211,12 @@
             "punycode": "^2.1.1",
             "universalify": "^0.1.2"
           }
+        },
+        "ws": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+          "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
+          "dev": true
         }
       }
     },
@@ -20609,6 +20611,11 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
         }
       }
     },
@@ -21408,11 +21415,6 @@
         "object-visit": "^1.0.0"
       }
     },
-    "marked": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
-      "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="
-    },
     "matchdep": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
@@ -22651,23 +22653,6 @@
         "lower-case": "^1.1.1"
       }
     },
-    "node-abi": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz",
-      "integrity": "sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==",
-      "dev": true,
-      "requires": {
-        "semver": "^5.4.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        }
-      }
-    },
     "node-addon-api": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.0.0.tgz",
@@ -22935,10 +22920,34 @@
             "glob": "^7.1.3"
           }
         },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        },
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
+        "tar": {
+          "version": "4.4.19",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+          "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
+          "requires": {
+            "chownr": "^1.1.4",
+            "fs-minipass": "^1.2.7",
+            "minipass": "^2.9.0",
+            "minizlib": "^1.3.3",
+            "mkdirp": "^0.5.5",
+            "safe-buffer": "^5.2.1",
+            "yallist": "^3.1.1"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
         }
       }
     },
@@ -23121,6 +23130,21 @@
               "requires": {
                 "glob": "^7.1.3"
               }
+            },
+            "tar": {
+              "version": "4.4.19",
+              "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+              "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
+              "dev": true,
+              "requires": {
+                "chownr": "^1.1.4",
+                "fs-minipass": "^1.2.7",
+                "minipass": "^2.9.0",
+                "minizlib": "^1.3.3",
+                "mkdirp": "^0.5.5",
+                "safe-buffer": "^5.2.1",
+                "yallist": "^3.1.1"
+              }
             }
           }
         },
@@ -23140,11 +23164,23 @@
           "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
           "dev": true
         },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        },
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
         }
       }
     },
@@ -26263,6 +26299,11 @@
           "version": "6.5.2",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
           "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
         }
       }
     },
@@ -28168,28 +28209,57 @@
       "dev": true
     },
     "tar": {
-      "version": "4.4.18",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.18.tgz",
-      "integrity": "sha512-ZuOtqqmkV9RE1+4odd+MhBpibmCxNP6PJhH/h2OqNuotTX7/XHPZQJv2pKvWMplFH9SIZZhitehh6vBH6LO8Pg==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "requires": {
-        "chownr": "^1.1.4",
-        "fs-minipass": "^1.2.7",
-        "minipass": "^2.9.0",
-        "minizlib": "^1.3.3",
-        "mkdirp": "^0.5.5",
-        "safe-buffer": "^5.2.1",
-        "yallist": "^3.1.1"
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^3.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
       },
       "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        "chownr": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+          "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
+        },
+        "fs-minipass": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+          "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+          "requires": {
+            "minipass": "^3.0.0"
+          }
+        },
+        "minipass": {
+          "version": "3.1.5",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
+          "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+          "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+          "requires": {
+            "minipass": "^3.0.0",
+            "yallist": "^4.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
         },
         "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
@@ -28247,6 +28317,12 @@
           "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
           "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=",
           "dev": true
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "dev": true
         }
       }
     },
@@ -28258,6 +28334,14 @@
       "requires": {
         "temp-dir": "^2.0.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "dev": true
+        }
       }
     },
     "terminal-link": {
@@ -29616,9 +29700,9 @@
       "dev": true
     },
     "uuid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
     },
     "v8-compile-cache": {
       "version": "2.3.0",
@@ -29673,9 +29757,9 @@
       }
     },
     "validator": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-11.0.0.tgz",
-      "integrity": "sha512-+wnGLYqaKV2++nUv60uGzUJyJQwYVOin6pn1tgEiFCeCQO60yeu3Og9/yPccbBX574kxIcEJicogkzx6s6eyag=="
+      "version": "13.6.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.6.0.tgz",
+      "integrity": "sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg=="
     },
     "value-or-function": {
       "version": "3.0.0",
@@ -30649,6 +30733,12 @@
           "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
           "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
           "dev": true
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "dev": true
         }
       }
     },
@@ -31069,9 +31159,9 @@
       }
     },
     "ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.2.tgz",
+      "integrity": "sha512-Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw=="
     },
     "xdg-basedir": {
       "version": "4.0.0",
diff --git a/package.json b/package.json
index bcbad8c79..fa4be8274 100644
--- a/package.json
+++ b/package.json
@@ -70,13 +70,11 @@
     "@meetfranz/theme": "file:packages/theme",
     "@meetfranz/ui": "file:packages/ui",
     "@sentry/electron": "2.5.3",
-    "atob": "2.1.2",
     "auto-launch": "5.0.5",
     "btoa": "1.2.1",
     "classnames": "2.3.1",
     "cld": "2.7.0",
     "color": "4.0.1",
-    "css": "2.2.4",
     "csstype": "3.0.8",
     "darkreader": "4.9.34",
     "dbus-next": "0.9.2",
@@ -95,7 +93,6 @@
     "lodash": "4.17.21",
     "macos-notification-state": "1.3.6",
     "macos-version": "5.2.1",
-    "marked": "0.7.0",
     "mime-types": "2.1.32",
     "minimist": "1.2.5",
     "mobx": "5.15.0",
@@ -127,12 +124,12 @@
     "route-parser": "0.0.5",
     "semver": "7.3.5",
     "sqlite3": "5.0.0",
-    "tar": "4.4.18",
+    "tar": "6.1.11",
     "tslib": "2.3.1",
     "useragent-generator": "1.1.1-amkt-22079-finish.0",
-    "uuid": "3.3.3",
-    "validator": "11.0.0",
-    "ws": "7.4.6"
+    "uuid": "8.3.2",
+    "validator": "13.6.0",
+    "ws": "8.2.2"
   },
   "devDependencies": {
     "@babel/cli": "7.14.8",
@@ -163,10 +160,10 @@
     "@types/react-dom": "16.9.13",
     "@types/route-parser": "0.1.3",
     "@types/tar": "4.0.5",
-    "@types/uuid": "3.4.9",
+    "@types/uuid": "8.3.1",
     "@types/validator": "13.6.3",
-    "@typescript-eslint/eslint-plugin": "4.30.0",
-    "@typescript-eslint/parser": "4.29.1",
+    "@typescript-eslint/eslint-plugin": "4.31.2",
+    "@typescript-eslint/parser": "4.31.2",
     "all-contributors-cli": "6.20.0",
     "babel-plugin-formatjs": "10.3.8",
     "commitizen": "4.2.4",
@@ -180,12 +177,12 @@
     "electron-notarize": "1.1.0",
     "eslint": "7.32.0",
     "eslint-config-airbnb": "18.2.1",
-    "eslint-config-airbnb-typescript": "12.3.1",
+    "eslint-config-airbnb-typescript": "14.0.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-import": "2.24.2",
     "eslint-plugin-jest": "24.4.0",
     "eslint-plugin-jsx-a11y": "6.4.1",
-    "eslint-plugin-prettier": "3.4.0",
+    "eslint-plugin-prettier": "4.0.0",
     "eslint-plugin-react": "7.25.1",
     "eslint-plugin-react-hooks": "4.2.0",
     "eslint-plugin-unicorn": "36.0.0",
@@ -208,7 +205,6 @@
     "kebab-case": "1.0.1",
     "lerna": "4.0.0",
     "mocha": "9.1.1",
-    "node-abi": "2.30.0",
     "prettier": "2.3.2",
     "preval-build-info": "1.0.3",
     "rimraf": "3.0.2",
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index ae463617d..133473b68 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -2,7 +2,7 @@ const Service = use('App/Models/Service');
 const { validateAll } = use('Validator');
 const Env = use('Env');
 
-const uuid = require('uuid/v4');
+const { v4: uuid } = require('uuid');
 const path = require('path');
 const fs = require('fs-extra');
 const { LOCAL_HOSTNAME, DEFAULT_SERVICE_ORDER } = require('../../../../config');
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js
index 7b71aac14..747606da7 100644
--- a/src/internal-server/app/Controllers/Http/UserController.js
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -5,7 +5,7 @@ const { validateAll } = use('Validator');
 
 const btoa = require('btoa');
 const fetch = require('node-fetch');
-const uuid = require('uuid/v4');
+const { v4: uuid } = require('uuid');
 const crypto = require('crypto');
 const {
   DEFAULT_APP_SETTINGS,
diff --git a/src/internal-server/app/Controllers/Http/WorkspaceController.js b/src/internal-server/app/Controllers/Http/WorkspaceController.js
index 773312a0b..9d461135e 100644
--- a/src/internal-server/app/Controllers/Http/WorkspaceController.js
+++ b/src/internal-server/app/Controllers/Http/WorkspaceController.js
@@ -1,16 +1,11 @@
 const Workspace = use('App/Models/Workspace');
-const {
-  validateAll,
-} = use('Validator');
+const { validateAll } = use('Validator');
 
-const uuid = require('uuid/v4');
+const { v4: uuid } = require('uuid');
 
 class WorkspaceController {
   // Create a new workspace for user
-  async create({
-    request,
-    response,
-  }) {
+  async create({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       name: 'required',
@@ -29,10 +24,13 @@ class WorkspaceController {
     let workspaceId;
     do {
       workspaceId = uuid();
-    } while ((await Workspace.query().where('workspaceId', workspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+    } while (
+      (await Workspace.query().where('workspaceId', workspaceId).fetch()).rows
+        .length > 0
+    ); // eslint-disable-line no-await-in-loop
 
     const order = (await Workspace.all()).rows.length;
-    const name = data.name;
+    const { name } = data;
     delete data.name;
 
     await Workspace.create({
@@ -52,11 +50,7 @@ class WorkspaceController {
     });
   }
 
-  async edit({
-    request,
-    response,
-    params,
-  }) {
+  async edit({ request, response, params }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       name: 'required',
@@ -71,20 +65,19 @@ class WorkspaceController {
     }
 
     const data = request.all();
-    const {
-      id,
-    } = params;
+    const { id } = params;
 
     // Update data in database
-    await (Workspace.query()
-      .where('workspaceId', id)).update({
-      name: data.name,
-      services: JSON.stringify(data.services),
-    });
+    await Workspace.query()
+      .where('workspaceId', id)
+      .update({
+        name: data.name,
+        services: JSON.stringify(data.services),
+      });
 
     // Get updated row
-    const workspace = (await Workspace.query()
-      .where('workspaceId', id).fetch()).rows[0];
+    const workspace = (await Workspace.query().where('workspaceId', id).fetch())
+      .rows[0];
 
     return response.send({
       id: workspace.workspaceId,
@@ -113,13 +106,10 @@ class WorkspaceController {
       });
     }
 
-    const {
-      id,
-    } = params;
+    const { id } = params;
 
     // Update data in database
-    await (Workspace.query()
-      .where('workspaceId', id)).delete();
+    await Workspace.query().where('workspaceId', id).delete();
 
     return response.send({
       message: 'Successfully deleted workspace',
@@ -127,9 +117,7 @@ class WorkspaceController {
   }
 
   // List all workspaces a user has created
-  async list({
-    response,
-  }) {
+  async list({ response }) {
     const workspaces = (await Workspace.all()).rows;
     // Convert to array with all data Franz wants
     let workspacesArray = [];
@@ -138,7 +126,10 @@ class WorkspaceController {
         id: workspace.workspaceId,
         name: workspace.name,
         order: workspace.order,
-        services: typeof workspace.services === 'string' ? JSON.parse(workspace.services) : workspace.services,
+        services:
+          typeof workspace.services === 'string'
+            ? JSON.parse(workspace.services)
+            : workspace.services,
         userId: 1,
       }));
     }
diff --git a/src/webview/notifications.js b/src/webview/notifications.js
index 205a3220c..22960d818 100644
--- a/src/webview/notifications.js
+++ b/src/webview/notifications.js
@@ -1,22 +1,26 @@
 import { ipcRenderer } from 'electron';
-import uuidV1 from 'uuid/v1';
+
+import { v1 as uuidV1 } from 'uuid';
 
 const debug = require('debug')('Ferdi:Notifications');
 
 export class NotificationsHandler {
-  onNotify = (data) => data;
+  onNotify = data => data;
 
   displayNotification(title, options) {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
       debug('New notification', title, options);
 
       const notificationId = uuidV1();
 
-      ipcRenderer.sendToHost('notification', this.onNotify({
-        title,
-        options,
-        notificationId,
-      }));
+      ipcRenderer.sendToHost(
+        'notification',
+        this.onNotify({
+          title,
+          options,
+          notificationId,
+        }),
+      );
 
       ipcRenderer.once(`notification-onclick:${notificationId}`, () => {
         resolve();
diff --git a/tsconfig.json b/tsconfig.json
index c01c40f68..2d9889286 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,7 +10,7 @@
     "jsx": "react",
     "typeRoots": ["@types", "node_modules/@types"],
     "moduleResolution": "node",
-    "types": ["node"],
+    "types": ["node", "mocha"],
     "sourceMap": true,
     "skipLibCheck": true,
     "noImplicitAny": false, // TODO: Need to switch
diff --git a/uidev/src/stories/input.stories.tsx b/uidev/src/stories/input.stories.tsx
index 889539266..c92ebb36a 100644
--- a/uidev/src/stories/input.stories.tsx
+++ b/uidev/src/stories/input.stories.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import uuid from 'uuid/v4';
 
 import { Input } from '@meetfranz/forms';
+import { v4 as uuid } from 'uuid';
 import { storiesOf } from '../stores/stories';
 
 const defaultProps = () => {
@@ -10,7 +10,8 @@ const defaultProps = () => {
     label: 'Label',
     id: `test-${id}`,
     name: `test-${id}`,
-    onChange: (e: React.ChangeEvent<HTMLInputElement>) => console.log('changed event', e),
+    onChange: (e: React.ChangeEvent<HTMLInputElement>) =>
+      console.log('changed event', e),
   };
 };
 
@@ -21,44 +22,23 @@ const defaultPasswordProps = () => {
     id: `test-${id}`,
     name: `test-${id}`,
     type: 'password',
-    onChange: (e: React.ChangeEvent<HTMLInputElement>) => console.log('changed event', e),
+    onChange: (e: React.ChangeEvent<HTMLInputElement>) =>
+      console.log('changed event', e),
   };
 };
 
 storiesOf('Input')
   .add('Basic', () => (
-    <Input
-      {...defaultProps()}
-      placeholder="Placeholder text"
-    />
-  ))
-  .add('Without Label', () => (
-    <Input
-      {...defaultProps()}
-      showLabel={false}
-    />
-  ))
-  .add('Disabled', () => (
-    <Input {...defaultProps()} disabled />
-  ))
-  .add('With prefix', () => (
-    <Input
-      {...defaultProps()}
-      prefix="https://"
-    />
+    <Input {...defaultProps()} placeholder="Placeholder text" />
   ))
+  .add('Without Label', () => <Input {...defaultProps()} showLabel={false} />)
+  .add('Disabled', () => <Input {...defaultProps()} disabled />)
+  .add('With prefix', () => <Input {...defaultProps()} prefix="https://" />)
   .add('With suffix', () => (
-    <Input
-      {...defaultProps()}
-      suffix=".meetfranz.com"
-    />
+    <Input {...defaultProps()} suffix=".meetfranz.com" />
   ))
   .add('With pre-suffix', () => (
-    <Input
-      {...defaultProps()}
-      prefix="https://"
-      suffix=".meetfranz.com"
-    />
+    <Input {...defaultProps()} prefix="https://" suffix=".meetfranz.com" />
   ))
   .add('With error', () => (
     <Input
@@ -68,32 +48,16 @@ storiesOf('Input')
     />
   ))
   .add('Type number with min & max', () => (
-    <Input
-      {...defaultProps()}
-      type="number"
-      min={1}
-      max={10}
-    />
+    <Input {...defaultProps()} type="number" min={1} max={10} />
   ));
 
 storiesOf('Password')
-  .add('Basic', () => (
-    <Input
-      {...defaultPasswordProps()}
-    />
-  ))
+  .add('Basic', () => <Input {...defaultPasswordProps()} />)
   .add('Show password toggle', () => (
-    <Input
-      {...defaultPasswordProps()}
-      showPasswordToggle
-    />
+    <Input {...defaultPasswordProps()} showPasswordToggle />
   ))
   .add('Score password', () => (
-    <Input
-      {...defaultPasswordProps()}
-      showPasswordToggle
-      scorePassword
-    />
+    <Input {...defaultPasswordProps()} showPasswordToggle scorePassword />
   ))
   .add('Score password with error', () => (
     <Input
diff --git a/uidev/src/stories/select.stories.tsx b/uidev/src/stories/select.stories.tsx
index 51ec6ed88..93e072cd9 100644
--- a/uidev/src/stories/select.stories.tsx
+++ b/uidev/src/stories/select.stories.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 
 import { Select } from '@meetfranz/forms';
 import { storiesOf } from '../stores/stories';
@@ -282,35 +282,18 @@ const defaultProps = () => {
     },
     actionText: 'Select country',
     // defaultValue: 'AT',
-    onChange: (e: React.ChangeEvent<HTMLInputElement>) => console.log('changed event', e),
+    onChange: (e: React.ChangeEvent<HTMLInputElement>) =>
+      console.log('changed event', e),
   };
 };
 
 storiesOf('Select')
-  .add('Basic', () => (
-    <Select
-      {...defaultProps()}
-    />
-  ))
+  .add('Basic', () => <Select {...defaultProps()} />)
   .add('With preselection', () => (
-    <Select
-      {...defaultProps()}
-      defaultValue="AT"
-    />
-  ))
-  .add('With search', () => (
-    <Select
-      {...defaultProps()}
-      showSearch
-    />
-  ))
-  .add('Disabled', () => (
-    <Select
-      {...defaultProps()}
-      showSearch
-      disabled
-    />
+    <Select {...defaultProps()} defaultValue="AT" />
   ))
+  .add('With search', () => <Select {...defaultProps()} showSearch />)
+  .add('Disabled', () => <Select {...defaultProps()} showSearch disabled />)
   .add('With error', () => (
     <Select
       {...defaultProps()}
diff --git a/uidev/src/stories/textarea.stories.tsx b/uidev/src/stories/textarea.stories.tsx
index 1ab21820b..09b9fef70 100644
--- a/uidev/src/stories/textarea.stories.tsx
+++ b/uidev/src/stories/textarea.stories.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 
 import { Textarea } from '@meetfranz/forms';
 import { storiesOf } from '../stores/stories';
@@ -11,7 +11,8 @@ const defaultProps = () => {
     id: `test-${id}`,
     name: `test-${id}`,
     rows: 5,
-    onChange: (e: React.ChangeEvent<HTMLInputElement>) => console.log('changed event', e),
+    onChange: (e: React.ChangeEvent<HTMLInputElement>) =>
+      console.log('changed event', e),
   };
 };
 
@@ -22,22 +23,8 @@ storiesOf('Textarea')
       // placeholder="Placeholder text"
     />
   ))
-  .add('10 rows', () => (
-    <Textarea
-      {...defaultProps()}
-      rows={10}
-    />
-  ))
+  .add('10 rows', () => <Textarea {...defaultProps()} rows={10} />)
   .add('With error', () => (
-    <Textarea
-      {...defaultProps()}
-      error="This is a generic error message."
-    />
+    <Textarea {...defaultProps()} error="This is a generic error message." />
   ))
-  .add('Disabled', () => (
-    <Textarea
-      {...defaultProps()}
-      rows={2}
-      disabled
-    />
-  ));
+  .add('Disabled', () => <Textarea {...defaultProps()} rows={2} disabled />);
diff --git a/uidev/src/stories/toggle.stories.tsx b/uidev/src/stories/toggle.stories.tsx
index af6b282bc..f54e67596 100644
--- a/uidev/src/stories/toggle.stories.tsx
+++ b/uidev/src/stories/toggle.stories.tsx
@@ -1,7 +1,7 @@
 import { observable } from 'mobx';
 import { observer } from 'mobx-react';
 import React from 'react';
-import uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 
 import { Toggle } from '@meetfranz/forms';
 import { storiesOf } from '../stores/stories';
@@ -16,14 +16,17 @@ interface IStoreArgs {
   error?: string;
 }
 
-const createStore = (args?: IStoreArgs) => observable({ id: `element-${uuid()}`,
+const createStore = (args?: IStoreArgs) =>
+  observable({
+    id: `element-${uuid()}`,
     name: 'toggle',
     label: 'Label',
     value: true,
     checked: false,
     disabled: false,
     error: '',
-...args });
+    ...args,
+  });
 
 const WithStoreToggle = observer(({ store }: { store: any }) => (
   <>
@@ -35,37 +38,40 @@ const WithStoreToggle = observer(({ store }: { store: any }) => (
       name={store.name}
       disabled={store.disabled}
       error={store.error}
-      onChange={() => store.checked = !store.checked}
+      onChange={() => (store.checked = !store.checked)}
     />
   </>
 ));
 
 storiesOf('Toggle')
-  .add('Basic', () => (
-    <WithStoreToggle store={createStore()} />
-  ))
+  .add('Basic', () => <WithStoreToggle store={createStore()} />)
   .add('Checked', () => (
-    <WithStoreToggle store={createStore({
-      checked: true,
-    })}
+    <WithStoreToggle
+      store={createStore({
+        checked: true,
+      })}
     />
   ))
   .add('Disabled', () => (
-    <WithStoreToggle store={createStore({
-      checked: true,
-      disabled: true,
-    })}
+    <WithStoreToggle
+      store={createStore({
+        checked: true,
+        disabled: true,
+      })}
     />
   ))
   .add('Long label', () => (
-    <WithStoreToggle store={createStore({
-      label: 'Hello world, this is an insanely long label for this toggle. We need to make sure that it will be displayed correctly.',
-    })}
+    <WithStoreToggle
+      store={createStore({
+        label:
+          'Hello world, this is an insanely long label for this toggle. We need to make sure that it will be displayed correctly.',
+      })}
     />
   ))
   .add('With error', () => (
-    <WithStoreToggle store={createStore({
-      error: 'Something went wrong',
-    })}
+    <WithStoreToggle
+      store={createStore({
+        error: 'Something went wrong',
+      })}
     />
   ));