diff --git a/package-lock.json b/package-lock.json
index 4329a409..a0b03064 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1317,13 +1317,37 @@
       }
     },
     "@craco/craco": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/@craco/craco/-/craco-5.9.0.tgz",
-      "integrity": "sha512-2Q8gIB4W0/nPiUxr9iAKUhGsFlXYN0/wngUdK1VWtfV2NtBv+yllNn2AjieaLbttgpQinuOYmDU65vocC0NMDg==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@craco/craco/-/craco-6.1.2.tgz",
+      "integrity": "sha512-GlQZn+g+yNlaDvIL5m6mcCoBGyFDwO4kkNx3fNFf98wuldkdWyBFoQbtOFOIb4gvkTh4VntOOxtJEoZfKs7XXw==",
       "requires": {
         "cross-spawn": "^7.0.0",
         "lodash": "^4.17.15",
+        "semver": "^7.3.2",
         "webpack-merge": "^4.2.2"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        }
       }
     },
     "@csstools/convert-colors": {
@@ -2129,9 +2153,9 @@
       }
     },
     "@testing-library/dom": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.29.0.tgz",
-      "integrity": "sha512-0hhuJSmw/zLc6ewR9cVm84TehuTd7tbqBX9pRNSp8znJ9gTmSgesdbiGZtt8R6dL+2rgaPFp9Yjr7IU1HWm49w==",
+      "version": "7.31.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.31.0.tgz",
+      "integrity": "sha512-0X7ACg4YvTRDFMIuTOEj6B4NpN7i3F/4j5igOcTI5NC5J+N4TribNdErCHOZF1LBWhhcyfwxelVwvoYNMUXTOA==",
       "requires": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -2144,9 +2168,9 @@
       },
       "dependencies": {
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
@@ -2170,18 +2194,18 @@
       }
     },
     "@testing-library/react": {
-      "version": "10.4.9",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-10.4.9.tgz",
-      "integrity": "sha512-pHZKkqUy0tmiD81afs8xfiuseXfU/N7rAX3iKjeZYje86t9VaB0LrxYVa+OOsvkrveX5jCK3IjajVn2MbePvqA==",
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz",
+      "integrity": "sha512-tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA==",
       "requires": {
-        "@babel/runtime": "^7.10.3",
-        "@testing-library/dom": "^7.22.3"
+        "@babel/runtime": "^7.12.5",
+        "@testing-library/dom": "^7.28.1"
       }
     },
     "@testing-library/user-event": {
-      "version": "13.1.8",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.1.8.tgz",
-      "integrity": "sha512-M04HgOlJvxILf5xyrkJaEQfFOtcvhy3usLldQIEg9zgFIYQofSmFGVfFlS7BWowqlBGLrItwGMlPXCoBgoHSiw==",
+      "version": "13.1.9",
+      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.1.9.tgz",
+      "integrity": "sha512-NZr0zL2TMOs2qk+dNlqrAdbaRW5dAmYwd1yuQ4r7HpkVEOj0MWuUjDWwKhcLd/atdBy8ZSMHSKp+kXSQe47ezg==",
       "requires": {
         "@babel/runtime": "^7.12.5"
       }
@@ -2192,9 +2216,9 @@
       "integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="
     },
     "@types/aria-query": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.0.tgz",
-      "integrity": "sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A=="
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.1.tgz",
+      "integrity": "sha512-S6oPal772qJZHoRZLFc/XoZW2gFvwXusYUmXPXkgxJLuEk2vOt7jc4Yo6z/vtI0EBkbPBVrJJ0B+prLIKiWqHg=="
     },
     "@types/babel__core": {
       "version": "7.1.13",
@@ -2233,14 +2257,6 @@
         "@babel/types": "^7.3.0"
       }
     },
-    "@types/classnames": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.0.tgz",
-      "integrity": "sha512-3GsbOoDYteFShlrBTKzI2Eii4vPg/jAf7LXRIn0WQePKlmhpkV0KoTMuawA7gZJkrbPrZGwv9IEAfIWaOaQK8w==",
-      "requires": {
-        "classnames": "*"
-      }
-    },
     "@types/eslint": {
       "version": "7.2.7",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.7.tgz",
@@ -2331,15 +2347,20 @@
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4="
     },
+    "@types/lodash": {
+      "version": "4.14.170",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.170.tgz",
+      "integrity": "sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q=="
+    },
     "@types/minimatch": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
       "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
     },
     "@types/node": {
-      "version": "15.0.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.1.tgz",
-      "integrity": "sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA=="
+      "version": "15.6.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.6.1.tgz",
+      "integrity": "sha512-7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA=="
     },
     "@types/normalize-package-data": {
       "version": "2.4.0",
@@ -2367,9 +2388,9 @@
       "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="
     },
     "@types/react": {
-      "version": "17.0.4",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.4.tgz",
-      "integrity": "sha512-onz2BqScSFMoTRdJUZUDD/7xrusM8hBA2Fktk2qgaTYPCgPvWnDEgkrOs8hhPUf2jfcIXkJ5yK6VfYormJS3Jw==",
+      "version": "17.0.7",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.7.tgz",
+      "integrity": "sha512-lBc3fY20hRFQ/pXQT2XdtmpJeXZnRH8N+WPnEzEfPTzuKmaJTA7k/xGWHBaPvKceKpbf0ZnMlLWY/0sFZ5rfkw==",
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -2385,9 +2406,9 @@
       }
     },
     "@types/react-dom": {
-      "version": "17.0.3",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.3.tgz",
-      "integrity": "sha512-4NnJbCeWE+8YBzupn/YrJxZ8VnjcJq5iR1laqQ1vkpQgBiA7bwk0Rp24fxsdNinzJY2U+HHS4dJJDPdoMjdJ7w==",
+      "version": "17.0.5",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.5.tgz",
+      "integrity": "sha512-ikqukEhH4H9gr4iJCmQVNzTB307kROe3XFfHAOTxOXPOw7lAoEXnM5KWTkzeANGL5Ce6ABfiMl/zJBYNi7ObmQ==",
       "requires": {
         "@types/react": "*"
       }
@@ -3922,19 +3943,11 @@
       }
     },
     "blizzapi": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/blizzapi/-/blizzapi-1.3.3.tgz",
-      "integrity": "sha512-Pqh6WdnKBiIyWYr3MeptfZwZpfbo30hL7HddTJN3dwZJ2Itm69WyHsuM+TaahklI+KddzZ0Uz1zPv3Kd6WSwfA==",
-      "requires": {
-        "axios": "^0.21.0"
-      }
-    },
-    "block-stream": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/blizzapi/-/blizzapi-2.0.2.tgz",
+      "integrity": "sha512-l3oZ4DzFTGe55vTQAY5kAy01TH3tgRR7mY4bahMC5YwQZM3jAAKvIWjm5oSggfWGgZthkf4v3zkjLsKgjf8bjA==",
       "requires": {
-        "inherits": "~2.0.0"
+        "axios": "^0.21.1"
       }
     },
     "bluebird": {
@@ -5900,6 +5913,11 @@
       "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
     },
+    "env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
+    },
     "errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
@@ -7378,9 +7396,9 @@
       }
     },
     "formik": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/formik/-/formik-2.2.6.tgz",
-      "integrity": "sha512-Kxk2zQRafy56zhLmrzcbryUpMBvT0tal5IvcifK5+4YNGelKsnrODFJ0sZQRMQboblWNym4lAW3bt+tf2vApSA==",
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/formik/-/formik-2.2.8.tgz",
+      "integrity": "sha512-hDjQyTGO0ivptzCRHEyeTvfvgFVSzLeW2ptAgSk5U2jkf8pvSNtXe6oExo1RmrbKF1Bs7dmPv4P5g2JAgYnvlw==",
       "requires": {
         "deepmerge": "^2.1.1",
         "hoist-non-react-statics": "^3.3.0",
@@ -7496,17 +7514,6 @@
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "optional": true
     },
-    "fstream": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
-      }
-    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -8367,11 +8374,6 @@
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
     },
-    "in-publish": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
-      "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ=="
-    },
     "indent-string": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
@@ -10419,9 +10421,9 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash-es": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.20.tgz",
-      "integrity": "sha512-JD1COMZsq8maT6mnuz1UMV0jvYD0E0aUsSOdrr1/nAG3dhqQXwRRgeW0cSqH1U43INKcqxaiVIQNOUDld7gRDA=="
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
     },
     "lodash._reinterpolate": {
       "version": "3.0.0",
@@ -10972,6 +10974,11 @@
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
       "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
     },
+    "nanoclone": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz",
+      "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="
+    },
     "nanoid": {
       "version": "3.1.22",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz",
@@ -11055,36 +11062,50 @@
       "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
     },
     "node-gyp": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
-      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
+      "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
       "requires": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": "^2.87.0",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
+        "env-paths": "^2.2.0",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.3",
+        "nopt": "^5.0.0",
+        "npmlog": "^4.1.2",
+        "request": "^2.88.2",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.2",
+        "tar": "^6.0.2",
+        "which": "^2.0.2"
       },
       "dependencies": {
-        "semver": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
         },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
           "requires": {
-            "isexe": "^2.0.0"
+            "glob": "^7.1.3"
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "requires": {
+            "lru-cache": "^6.0.0"
           }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
@@ -11211,22 +11232,21 @@
       "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg=="
     },
     "node-sass": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
-      "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-5.0.0.tgz",
+      "integrity": "sha512-opNgmlu83ZCF792U281Ry7tak9IbVC+AKnXGovcQ8LG8wFaJv6cLnRlc6DIHlmNxWEexB5bZxi9SZ9JyUuOYjw==",
       "requires": {
         "async-foreach": "^0.1.3",
         "chalk": "^1.1.1",
-        "cross-spawn": "^3.0.0",
+        "cross-spawn": "^7.0.3",
         "gaze": "^1.0.0",
         "get-stdin": "^4.0.1",
         "glob": "^7.0.3",
-        "in-publish": "^2.0.0",
         "lodash": "^4.17.15",
         "meow": "^3.7.0",
         "mkdirp": "^0.5.1",
         "nan": "^2.13.2",
-        "node-gyp": "^3.8.0",
+        "node-gyp": "^7.1.0",
         "npmlog": "^4.0.0",
         "request": "^2.88.0",
         "sass-graph": "2.2.5",
@@ -11256,15 +11276,6 @@
             "supports-color": "^2.0.0"
           }
         },
-        "cross-spawn": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
-          "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "which": "^1.2.9"
-          }
-        },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -11277,21 +11288,13 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
         }
       }
     },
     "nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
       "requires": {
         "abbrev": "1"
       }
@@ -11613,30 +11616,11 @@
       "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
       "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
     },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
-    },
     "os-shim": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz",
       "integrity": "sha1-a2LDeRz3kJ6jXtRuF2WLtBfLORc="
     },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
-    },
-    "osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
     "p-each-series": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
@@ -13225,9 +13209,9 @@
       "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
     },
     "query-string": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz",
-      "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.0.0.tgz",
+      "integrity": "sha512-Iy7moLybliR5ZgrK/1R3vjrXq03S13Vz4Rbm5Jg3EFq1LUmQppto0qtXz4vqZ386MSRjZgnTSZ9QC+NZOSd/XA==",
       "requires": {
         "decode-uri-component": "^0.2.0",
         "filter-obj": "^1.1.0",
@@ -13309,13 +13293,12 @@
       }
     },
     "react": {
-      "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
-      "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
+      "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
       "requires": {
         "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2"
+        "object-assign": "^4.1.1"
       }
     },
     "react-app-polyfill": {
@@ -13505,25 +13488,13 @@
       }
     },
     "react-dom": {
-      "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
-      "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
+      "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "scheduler": "^0.19.1"
-      },
-      "dependencies": {
-        "scheduler": {
-          "version": "0.19.1",
-          "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
-          "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
-          "requires": {
-            "loose-envify": "^1.1.0",
-            "object-assign": "^4.1.1"
-          }
-        }
+        "scheduler": "^0.20.2"
       }
     },
     "react-error-overlay": {
@@ -13718,9 +13689,9 @@
       }
     },
     "react-timeago": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/react-timeago/-/react-timeago-4.4.0.tgz",
-      "integrity": "sha512-Zj8RchTqZEH27LAANemzMR2RpotbP2aMd+UIajfYMZ9KW4dMcViUVKzC7YmqfiqlFfz8B0bjDw2xUBjmcxDngA=="
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/react-timeago/-/react-timeago-6.1.1.tgz",
+      "integrity": "sha512-44zsWw2J/4AiZ/eVviygDthcDvCSuVyR/PLVF/g7OIUGq8rnEOwa3A+pHPmHt9WJ5fhHumwTY+Go+RkzEaIHvQ=="
     },
     "react-twitch-ext-onauthorized": {
       "version": "2.0.3",
@@ -13728,6 +13699,18 @@
       "integrity": "sha512-Qx8tUSYxjfEsPawVXr+d8n1C4cVBqM4TmdeT8dMWe6fPNgJVP91uTje+5dAkzsB4d5BI8VdjZXXZ6MpfsT9M2w==",
       "requires": {
         "react": "^16.13.1"
+      },
+      "dependencies": {
+        "react": {
+          "version": "16.14.0",
+          "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
+          "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
+          "requires": {
+            "loose-envify": "^1.1.0",
+            "object-assign": "^4.1.1",
+            "prop-types": "^15.6.2"
+          }
+        }
       }
     },
     "read-pkg": {
@@ -14580,6 +14563,15 @@
         "xmlchars": "^2.2.0"
       }
     },
+    "scheduler": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
+      "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      }
+    },
     "schema-utils": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
@@ -15200,11 +15192,11 @@
       "integrity": "sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA=="
     },
     "starcraft2-api": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/starcraft2-api/-/starcraft2-api-1.5.1.tgz",
-      "integrity": "sha512-au+yOcvq3XA/HMkraeHSdpQCUBZwfgj2i31DAmrY5zJw6wmj5tj9tbutNVpwB+0GYNrAH3GDFSojYSKNJbjPng==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/starcraft2-api/-/starcraft2-api-2.0.0.tgz",
+      "integrity": "sha512-nPd6BQYFscqWRjgYKKCTxRbY+XahIfQFJeMyHHD1LyncsIdG82kwRQBjUxf2W93L9voDPhRnZX5ybmvixQ6yAA==",
       "requires": {
-        "blizzapi": "^1.3.3"
+        "blizzapi": "^2.0.1"
       }
     },
     "static-extend": {
@@ -15678,13 +15670,28 @@
       "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
     },
     "tar": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
+      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
       "requires": {
-        "block-stream": "*",
-        "fstream": "^1.0.12",
-        "inherits": "2"
+        "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": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        }
       }
     },
     "tar-stream": {
@@ -16154,9 +16161,9 @@
       }
     },
     "typeface-lato": {
-      "version": "0.0.75",
-      "resolved": "https://registry.npmjs.org/typeface-lato/-/typeface-lato-0.0.75.tgz",
-      "integrity": "sha512-iA5uJD4PSTyIE4BDiSOexQeXkDkiJuX4Hu3wh3saJ06EB2TvJayab1Lbbmqq2je/LQv7KCQZHZmC0k4hedd8sw=="
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/typeface-lato/-/typeface-lato-1.1.13.tgz",
+      "integrity": "sha512-sTn5k3+fagGOi8FQfN2MPeUiTdvG0Z3LVqCaQdsg2sYa0fzNteFZussizdwiPxF45OoFN3zdU/ci+PtjolNSPQ=="
     },
     "typescript": {
       "version": "4.2.4",
@@ -17839,13 +17846,15 @@
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
     },
     "yup": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/yup/-/yup-0.31.1.tgz",
-      "integrity": "sha512-Lf6648jDYOWR75IlWkVfwesPyW6oj+50NpxlKvsQlpPsB8eI+ndI7b4S1VrwbmeV9hIZDu1MzrlIL4W+gK1jPw==",
+      "version": "0.32.9",
+      "resolved": "https://registry.npmjs.org/yup/-/yup-0.32.9.tgz",
+      "integrity": "sha512-Ci1qN+i2H0XpY7syDQ0k5zKQ/DoxO0LzPg8PAR/X4Mpj6DqaeCoIYEEjDJwhArh3Fa7GWbQQVDZKeXYlSH4JMg==",
       "requires": {
         "@babel/runtime": "^7.10.5",
+        "@types/lodash": "^4.14.165",
         "lodash": "^4.17.20",
-        "lodash-es": "^4.17.11",
+        "lodash-es": "^4.17.15",
+        "nanoclone": "^0.2.1",
         "property-expr": "^2.0.4",
         "toposort": "^2.0.2"
       }
diff --git a/package.json b/package.json
index d541ab8e..c5a15882 100644
--- a/package.json
+++ b/package.json
@@ -4,41 +4,40 @@
   "private": true,
   "homepage": "./",
   "dependencies": {
-    "@craco/craco": "5.9.0",
+    "@craco/craco": "6.1.2",
     "@testing-library/jest-dom": "5.12.0",
-    "@testing-library/react": "10.4.9",
-    "@testing-library/user-event": "13.1.8",
-    "@types/classnames": "2.3.0",
+    "@testing-library/react": "11.2.7",
+    "@testing-library/user-event": "13.1.9",
     "@types/jest": "26.0.23",
-    "@types/node": "^15.0.1",
-    "@types/react": "17.0.3",
+    "@types/node": "^15.6.1",
+    "@types/react": "17.0.7",
     "@types/react-beautiful-dnd": "13.0.0",
-    "@types/react-dom": "17.0.3",
+    "@types/react-dom": "17.0.5",
     "@types/react-router-dom": "5.1.7",
     "@types/react-tabs": "2.3.2",
     "@types/react-timeago": "4.1.2",
     "@types/yup": "0.29.11",
     "bestzip": "2.2.0",
     "classnames": "2.3.1",
-    "formik": "2.2.6",
+    "formik": "2.2.8",
     "jest-fetch-mock": "3.0.3",
-    "node-sass": "4.14.1",
+    "node-sass": "5.0.0",
     "pre-commit": "1.2.2",
-    "query-string": "6.14.1",
-    "react": "16.14.0",
+    "query-string": "7.0.0",
+    "react": "17.0.2",
     "react-beautiful-dnd": "13.1.0",
-    "react-dom": "16.14.0",
+    "react-dom": "17.0.2",
     "react-router-dom": "5.2.0",
     "react-scripts": "4.0.3",
     "react-stroller": "1.8.0",
     "react-tabs": "3.2.2",
-    "react-timeago": "4.4.0",
+    "react-timeago": "6.1.1",
     "react-twitch-ext-onauthorized": "2.0.3",
-    "starcraft2-api": "1.5.1",
+    "starcraft2-api": "2.0.0",
     "swr": "0.5.6",
-    "typeface-lato": "0.0.75",
+    "typeface-lato": "1.1.13",
     "typescript": "4.2.4",
-    "yup": "0.31.1"
+    "yup": "0.32.9"
   },
   "scripts": {
     "start": "craco start",
diff --git a/src/components/ConfigFormPanel/ConfigFormPanel.tsx b/src/components/ConfigFormPanel/ConfigFormPanel.tsx
index 8b9b75d0..605006b8 100644
--- a/src/components/ConfigFormPanel/ConfigFormPanel.tsx
+++ b/src/components/ConfigFormPanel/ConfigFormPanel.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Schema } from 'yup';
+import { SchemaOf } from 'yup';
 import { ConfigFormValues } from 'helpers/submitConfig/submitConfig';
 import { FormikHelpers, FormikValues } from 'formik';
 import classnames from 'classnames/bind';
@@ -19,7 +19,7 @@ const cx = classnames.bind(styles);
 
 interface ConfigFormPanelProps {
   initialValues: ConfigData;
-  validationSchema: ({ profiles: Schema<ConfigData> });
+  validationSchema: ({ profiles: SchemaOf<ConfigData> });
   maxProfiles: number;
   onSubmit: (values: ConfigFormValues, actions: FormikHelpers<FormikValues>) => Promise<void>;
 }
diff --git a/src/components/FormikWrapper/FormikWrapper.tsx b/src/components/FormikWrapper/FormikWrapper.tsx
index d9f98170..2ff22d00 100644
--- a/src/components/FormikWrapper/FormikWrapper.tsx
+++ b/src/components/FormikWrapper/FormikWrapper.tsx
@@ -1,6 +1,7 @@
 import React, { ReactElement } from 'react';
 import { Formik, FormikProps, FormikHelpers, FormikValues } from 'formik';
 import * as Yup from 'yup';
+import { ObjectShape } from 'yup/lib/object';
 
 interface FormStateProviderProps {
   initialValues: FormikValues,
@@ -30,7 +31,7 @@ const FormikWrapper = ({
       onSubmit(values, actions);
       actions.resetForm(values);
     }}
-    validationSchema={Yup.object().shape(validationSchema)}
+    validationSchema={Yup.object().shape(validationSchema as ObjectShape)}
   >
     {formikBag => children(formikBag)}
   </Formik>
diff --git a/src/helpers/addUniqueProfileListValidationMethod/__snapshots__/addUniqueProfileListValidationMethod.test.tsx.snap b/src/helpers/addUniqueProfileListValidationMethod/__snapshots__/addUniqueProfileListValidationMethod.test.tsx.snap
index a207d00e..6841e69b 100644
--- a/src/helpers/addUniqueProfileListValidationMethod/__snapshots__/addUniqueProfileListValidationMethod.test.tsx.snap
+++ b/src/helpers/addUniqueProfileListValidationMethod/__snapshots__/addUniqueProfileListValidationMethod.test.tsx.snap
@@ -2,76 +2,58 @@
 
 exports[`adds validation method correctly 1`] = `
 ArraySchema {
-  "_blacklist": RefSet {
+  "_blacklist": ReferenceSet {
     "list": Set {},
     "refs": Map {},
   },
-  "_conditions": Array [],
-  "_deps": Array [],
-  "_exclusive": Object {
-    "unique": false,
-  },
-  "_mutate": undefined,
-  "_options": Object {
-    "abortEarly": true,
-    "recursive": true,
-  },
-  "_subType": StringSchema {
-    "_blacklist": RefSet {
-      "list": Set {},
-      "refs": Map {},
-    },
-    "_conditions": Array [],
-    "_deps": Array [],
-    "_exclusive": Object {},
-    "_mutate": undefined,
-    "_options": Object {
-      "abortEarly": true,
-      "recursive": true,
-    },
-    "_type": "string",
-    "_typeError": [Function],
-    "_whitelist": RefSet {
-      "list": Set {},
-      "refs": Map {},
-    },
-    "tests": Array [],
-    "transforms": Array [
-      [Function],
-    ],
-    "type": "string",
-  },
-  "_type": "array",
+  "_blacklistError": undefined,
   "_typeError": [Function],
-  "_whitelist": RefSet {
+  "_whitelist": ReferenceSet {
     "list": Set {},
     "refs": Map {},
   },
+  "_whitelistError": undefined,
+  "conditions": Array [],
+  "deps": Array [],
+  "exclusiveTests": Object {
+    "unique": false,
+  },
   "innerType": StringSchema {
-    "_blacklist": RefSet {
+    "_blacklist": ReferenceSet {
       "list": Set {},
       "refs": Map {},
     },
-    "_conditions": Array [],
-    "_deps": Array [],
-    "_exclusive": Object {},
     "_mutate": undefined,
-    "_options": Object {
-      "abortEarly": true,
-      "recursive": true,
-    },
-    "_type": "string",
     "_typeError": [Function],
-    "_whitelist": RefSet {
+    "_whitelist": ReferenceSet {
       "list": Set {},
       "refs": Map {},
     },
+    "conditions": Array [],
+    "deps": Array [],
+    "exclusiveTests": Object {},
+    "spec": Object {
+      "abortEarly": true,
+      "nullable": false,
+      "presence": "optional",
+      "recursive": true,
+      "strict": false,
+      "strip": false,
+    },
     "tests": Array [],
     "transforms": Array [
       [Function],
     ],
     "type": "string",
   },
+  "spec": Object {
+    "abortEarly": true,
+    "nullable": false,
+    "presence": "optional",
+    "recursive": true,
+    "strict": false,
+    "strip": false,
+  },
   "tests": Array [
     [Function],
   ],
diff --git a/src/helpers/addValidationMethod/__snapshots__/addValidationMethod.test.tsx.snap b/src/helpers/addValidationMethod/__snapshots__/addValidationMethod.test.tsx.snap
index a191e8f4..372744dd 100644
--- a/src/helpers/addValidationMethod/__snapshots__/addValidationMethod.test.tsx.snap
+++ b/src/helpers/addValidationMethod/__snapshots__/addValidationMethod.test.tsx.snap
@@ -2,8 +2,15 @@
 
 exports[`adds validation method correctly 1`] = `
 Object {
+  "ArraySchema": [Function],
+  "BaseSchema": [Function],
+  "BooleanSchema": [Function],
+  "DateSchema": [Function],
+  "MixedSchema": [Function],
+  "NumberSchema": [Function],
+  "ObjectSchema": [Function],
+  "StringSchema": [Function],
   "ValidationError": [Function],
-  "__esModule": true,
   "addMethod": [Function],
   "array": [Function],
   "bool": [Function],
diff --git a/src/helpers/addValidationSchema/__snapshots__/addValidationSchema.test.tsx.snap b/src/helpers/addValidationSchema/__snapshots__/addValidationSchema.test.tsx.snap
index 02bc14d5..7d49bd0c 100644
--- a/src/helpers/addValidationSchema/__snapshots__/addValidationSchema.test.tsx.snap
+++ b/src/helpers/addValidationSchema/__snapshots__/addValidationSchema.test.tsx.snap
@@ -3,81 +3,48 @@
 exports[`returns valid validation schema 1`] = `
 Object {
   "profiles": ArraySchema {
-    "_blacklist": RefSet {
+    "_blacklist": ReferenceSet {
       "list": Set {},
       "refs": Map {},
     },
-    "_conditions": Array [],
-    "_deps": Array [],
-    "_exclusive": Object {
-      "unique": false,
+    "_blacklistError": undefined,
+    "_typeError": [Function],
+    "_whitelist": ReferenceSet {
+      "list": Set {},
+      "refs": Map {},
     },
-    "_mutate": undefined,
-    "_options": Object {
-      "abortEarly": true,
-      "recursive": true,
+    "_whitelistError": undefined,
+    "conditions": Array [],
+    "deps": Array [],
+    "exclusiveTests": Object {
+      "unique": false,
     },
-    "_subType": StringSchema {
-      "_blacklist": RefSet {
+    "innerType": StringSchema {
+      "_blacklist": ReferenceSet {
         "list": Set {},
         "refs": Map {},
       },
-      "_conditions": Array [],
-      "_default": "",
-      "_deps": Array [],
-      "_exclusive": Object {
-        "matches": false,
-        "min": true,
-      },
-      "_mutate": undefined,
-      "_options": Object {
-        "abortEarly": true,
-        "recursive": true,
-      },
-      "_type": "string",
+      "_blacklistError": undefined,
       "_typeError": [Function],
-      "_whitelist": RefSet {
+      "_whitelist": ReferenceSet {
         "list": Set {},
         "refs": Map {},
       },
-      "tests": Array [
-        [Function],
-        [Function],
-      ],
-      "transforms": Array [
-        [Function],
-        [Function],
-      ],
-      "type": "string",
-    },
-    "_type": "array",
-    "_typeError": [Function],
-    "_whitelist": RefSet {
-      "list": Set {},
-      "refs": Map {},
-    },
-    "innerType": StringSchema {
-      "_blacklist": RefSet {
-        "list": Set {},
-        "refs": Map {},
-      },
-      "_conditions": Array [],
-      "_default": "",
-      "_deps": Array [],
-      "_exclusive": Object {
+      "_whitelistError": undefined,
+      "conditions": Array [],
+      "deps": Array [],
+      "exclusiveTests": Object {
         "matches": false,
         "min": true,
       },
-      "_mutate": undefined,
-      "_options": Object {
+      "spec": Object {
         "abortEarly": true,
+        "default": "",
+        "nullable": false,
+        "presence": "optional",
         "recursive": true,
-      },
-      "_type": "string",
-      "_typeError": [Function],
-      "_whitelist": RefSet {
-        "list": Set {},
-        "refs": Map {},
+        "strict": false,
+        "strip": false,
       },
       "tests": Array [
         [Function],
@@ -89,6 +56,14 @@ Object {
       ],
       "type": "string",
     },
+    "spec": Object {
+      "abortEarly": true,
+      "nullable": false,
+      "presence": "optional",
+      "recursive": true,
+      "strict": false,
+      "strip": false,
+    },
     "tests": Array [
       [Function],
     ],
diff --git a/src/helpers/addValidationSchema/addValidationSchema.tsx b/src/helpers/addValidationSchema/addValidationSchema.tsx
index 9e4750ea..4ca2553b 100644
--- a/src/helpers/addValidationSchema/addValidationSchema.tsx
+++ b/src/helpers/addValidationSchema/addValidationSchema.tsx
@@ -1,5 +1,5 @@
 import { YupInstance } from 'yup';
-import StarCraft2API from 'starcraft2-api';
+import { StarCraft2API } from 'starcraft2-api';
 import isProfileListUnique from 'helpers/isProfileListUnique/isProfileListUnique';
 
 const addValidationSchema = (yup: YupInstance) => ({
diff --git a/src/helpers/constructProfileUrls/constructProfileUrls.tsx b/src/helpers/constructProfileUrls/constructProfileUrls.tsx
index 2cf0d6ef..48162d10 100644
--- a/src/helpers/constructProfileUrls/constructProfileUrls.tsx
+++ b/src/helpers/constructProfileUrls/constructProfileUrls.tsx
@@ -1,4 +1,7 @@
-import StarCraft2API, { PlayerObject }  from 'starcraft2-api';
+import {
+  StarCraft2API,
+  PlayerObject,
+} from 'starcraft2-api';
 
 const constructProfileUrls = (profiles: PlayerObject[]) =>
   profiles.map((profile: PlayerObject) =>
diff --git a/src/helpers/getValidatorInstance/__snapshots__/getValidatorInstance.test.tsx.snap b/src/helpers/getValidatorInstance/__snapshots__/getValidatorInstance.test.tsx.snap
index 461500d8..c98c3dda 100644
--- a/src/helpers/getValidatorInstance/__snapshots__/getValidatorInstance.test.tsx.snap
+++ b/src/helpers/getValidatorInstance/__snapshots__/getValidatorInstance.test.tsx.snap
@@ -2,8 +2,15 @@
 
 exports[`returns Yup-compatible validator instance 1`] = `
 Object {
+  "ArraySchema": [Function],
+  "BaseSchema": [Function],
+  "BooleanSchema": [Function],
+  "DateSchema": [Function],
+  "MixedSchema": [Function],
+  "NumberSchema": [Function],
+  "ObjectSchema": [Function],
+  "StringSchema": [Function],
   "ValidationError": [Function],
-  "__esModule": true,
   "addMethod": [Function],
   "array": [Function],
   "bool": [Function],
diff --git a/src/helpers/stringifyProfiles/stringifyProfiles.tsx b/src/helpers/stringifyProfiles/stringifyProfiles.tsx
index 99598acf..bb51e50e 100644
--- a/src/helpers/stringifyProfiles/stringifyProfiles.tsx
+++ b/src/helpers/stringifyProfiles/stringifyProfiles.tsx
@@ -1,4 +1,4 @@
-import StarCraft2API from 'starcraft2-api';
+import { StarCraft2API } from 'starcraft2-api';
 
 const stringifyProfiles = (urls: string[], includeLocale = false) =>
   urls.map((profileUrl: string) =>
diff --git a/src/helpers/unpackProfileUrls/unpackProfileUrls.tsx b/src/helpers/unpackProfileUrls/unpackProfileUrls.tsx
index 3445145f..695b006e 100644
--- a/src/helpers/unpackProfileUrls/unpackProfileUrls.tsx
+++ b/src/helpers/unpackProfileUrls/unpackProfileUrls.tsx
@@ -1,4 +1,4 @@
-import StarCraft2API from 'starcraft2-api';
+import { StarCraft2API } from 'starcraft2-api';
 
 const unpackProfileUrls = (urls: string[], includeLocale = false) =>
   urls.map((profileUrl: string) =>
diff --git a/src/yupAddons.d.ts b/src/yupAddons.d.ts
index 3fb40dd7..2eb0d762 100644
--- a/src/yupAddons.d.ts
+++ b/src/yupAddons.d.ts
@@ -1,7 +1,7 @@
 import * as Yup from 'yup';
 
 declare module 'yup' {
-  export interface NotRequiredArraySchema {
+  export interface ArraySchema {
     unique(message?: TestOptionsMessage, mapperFn: Function): Yup.Schema<any>;
   }
 
diff --git a/tsconfig.json b/tsconfig.json
index ab891bce..c7f553f5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,7 +18,7 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react",
+    "jsx": "react-jsx",
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
     "removeComments": true