diff --git a/package-lock.json b/package-lock.json
index b539d2c..c5347fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,30 +54,30 @@
             }
         },
         "@babel/compat-data": {
-            "version": "7.9.0",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz",
-            "integrity": "sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==",
+            "version": "7.9.6",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.6.tgz",
+            "integrity": "sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==",
             "dev": true,
             "requires": {
-                "browserslist": "^4.9.1",
+                "browserslist": "^4.11.1",
                 "invariant": "^2.2.4",
                 "semver": "^5.5.0"
             }
         },
         "@babel/core": {
-            "version": "7.9.0",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz",
-            "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==",
+            "version": "7.9.6",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
+            "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.8.3",
-                "@babel/generator": "^7.9.0",
+                "@babel/generator": "^7.9.6",
                 "@babel/helper-module-transforms": "^7.9.0",
-                "@babel/helpers": "^7.9.0",
-                "@babel/parser": "^7.9.0",
+                "@babel/helpers": "^7.9.6",
+                "@babel/parser": "^7.9.6",
                 "@babel/template": "^7.8.6",
-                "@babel/traverse": "^7.9.0",
-                "@babel/types": "^7.9.0",
+                "@babel/traverse": "^7.9.6",
+                "@babel/types": "^7.9.6",
                 "convert-source-map": "^1.7.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.1",
@@ -88,6 +88,17 @@
                 "source-map": "^0.5.0"
             },
             "dependencies": {
+                "@babel/types": {
+                    "version": "7.9.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+                    "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.9.5",
+                        "lodash": "^4.17.13",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                },
                 "debug": {
                     "version": "4.1.1",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -106,15 +117,28 @@
             }
         },
         "@babel/generator": {
-            "version": "7.9.5",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
-            "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
+            "version": "7.9.6",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
+            "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.9.5",
+                "@babel/types": "^7.9.6",
                 "jsesc": "^2.5.1",
                 "lodash": "^4.17.13",
                 "source-map": "^0.5.0"
+            },
+            "dependencies": {
+                "@babel/types": {
+                    "version": "7.9.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+                    "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.9.5",
+                        "lodash": "^4.17.13",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/helper-annotate-as-pure": {
@@ -158,13 +182,13 @@
             }
         },
         "@babel/helper-compilation-targets": {
-            "version": "7.8.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz",
-            "integrity": "sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==",
+            "version": "7.9.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz",
+            "integrity": "sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==",
             "dev": true,
             "requires": {
-                "@babel/compat-data": "^7.8.6",
-                "browserslist": "^4.9.1",
+                "@babel/compat-data": "^7.9.6",
+                "browserslist": "^4.11.1",
                 "invariant": "^2.2.4",
                 "levenary": "^1.1.1",
                 "semver": "^5.5.0"
@@ -302,15 +326,28 @@
             }
         },
         "@babel/helper-replace-supers": {
-            "version": "7.8.6",
-            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
-            "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
+            "version": "7.9.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz",
+            "integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==",
             "dev": true,
             "requires": {
                 "@babel/helper-member-expression-to-functions": "^7.8.3",
                 "@babel/helper-optimise-call-expression": "^7.8.3",
-                "@babel/traverse": "^7.8.6",
-                "@babel/types": "^7.8.6"
+                "@babel/traverse": "^7.9.6",
+                "@babel/types": "^7.9.6"
+            },
+            "dependencies": {
+                "@babel/types": {
+                    "version": "7.9.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+                    "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.9.5",
+                        "lodash": "^4.17.13",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/helper-simple-access": {
@@ -351,14 +388,27 @@
             }
         },
         "@babel/helpers": {
-            "version": "7.9.2",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz",
-            "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==",
+            "version": "7.9.6",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz",
+            "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==",
             "dev": true,
             "requires": {
                 "@babel/template": "^7.8.3",
-                "@babel/traverse": "^7.9.0",
-                "@babel/types": "^7.9.0"
+                "@babel/traverse": "^7.9.6",
+                "@babel/types": "^7.9.6"
+            },
+            "dependencies": {
+                "@babel/types": {
+                    "version": "7.9.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+                    "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.9.5",
+                        "lodash": "^4.17.13",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/highlight": {
@@ -373,9 +423,9 @@
             }
         },
         "@babel/parser": {
-            "version": "7.9.4",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-            "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
+            "version": "7.9.6",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz",
+            "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==",
             "dev": true
         },
         "@babel/plugin-proposal-async-generator-functions": {
@@ -430,9 +480,9 @@
             }
         },
         "@babel/plugin-proposal-object-rest-spread": {
-            "version": "7.9.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz",
-            "integrity": "sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==",
+            "version": "7.9.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz",
+            "integrity": "sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.8.3",
@@ -700,38 +750,38 @@
             }
         },
         "@babel/plugin-transform-modules-amd": {
-            "version": "7.9.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz",
-            "integrity": "sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==",
+            "version": "7.9.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz",
+            "integrity": "sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==",
             "dev": true,
             "requires": {
                 "@babel/helper-module-transforms": "^7.9.0",
                 "@babel/helper-plugin-utils": "^7.8.3",
-                "babel-plugin-dynamic-import-node": "^2.3.0"
+                "babel-plugin-dynamic-import-node": "^2.3.3"
             }
         },
         "@babel/plugin-transform-modules-commonjs": {
-            "version": "7.9.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz",
-            "integrity": "sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==",
+            "version": "7.9.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz",
+            "integrity": "sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==",
             "dev": true,
             "requires": {
                 "@babel/helper-module-transforms": "^7.9.0",
                 "@babel/helper-plugin-utils": "^7.8.3",
                 "@babel/helper-simple-access": "^7.8.3",
-                "babel-plugin-dynamic-import-node": "^2.3.0"
+                "babel-plugin-dynamic-import-node": "^2.3.3"
             }
         },
         "@babel/plugin-transform-modules-systemjs": {
-            "version": "7.9.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz",
-            "integrity": "sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==",
+            "version": "7.9.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz",
+            "integrity": "sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==",
             "dev": true,
             "requires": {
                 "@babel/helper-hoist-variables": "^7.8.3",
                 "@babel/helper-module-transforms": "^7.9.0",
                 "@babel/helper-plugin-utils": "^7.8.3",
-                "babel-plugin-dynamic-import-node": "^2.3.0"
+                "babel-plugin-dynamic-import-node": "^2.3.3"
             }
         },
         "@babel/plugin-transform-modules-umd": {
@@ -919,13 +969,13 @@
             }
         },
         "@babel/preset-env": {
-            "version": "7.9.5",
-            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.5.tgz",
-            "integrity": "sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ==",
+            "version": "7.9.6",
+            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz",
+            "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==",
             "dev": true,
             "requires": {
-                "@babel/compat-data": "^7.9.0",
-                "@babel/helper-compilation-targets": "^7.8.7",
+                "@babel/compat-data": "^7.9.6",
+                "@babel/helper-compilation-targets": "^7.9.6",
                 "@babel/helper-module-imports": "^7.8.3",
                 "@babel/helper-plugin-utils": "^7.8.3",
                 "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
@@ -933,7 +983,7 @@
                 "@babel/plugin-proposal-json-strings": "^7.8.3",
                 "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
                 "@babel/plugin-proposal-numeric-separator": "^7.8.3",
-                "@babel/plugin-proposal-object-rest-spread": "^7.9.5",
+                "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
                 "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
                 "@babel/plugin-proposal-optional-chaining": "^7.9.0",
                 "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
@@ -960,9 +1010,9 @@
                 "@babel/plugin-transform-function-name": "^7.8.3",
                 "@babel/plugin-transform-literals": "^7.8.3",
                 "@babel/plugin-transform-member-expression-literals": "^7.8.3",
-                "@babel/plugin-transform-modules-amd": "^7.9.0",
-                "@babel/plugin-transform-modules-commonjs": "^7.9.0",
-                "@babel/plugin-transform-modules-systemjs": "^7.9.0",
+                "@babel/plugin-transform-modules-amd": "^7.9.6",
+                "@babel/plugin-transform-modules-commonjs": "^7.9.6",
+                "@babel/plugin-transform-modules-systemjs": "^7.9.6",
                 "@babel/plugin-transform-modules-umd": "^7.9.0",
                 "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
                 "@babel/plugin-transform-new-target": "^7.8.3",
@@ -978,12 +1028,25 @@
                 "@babel/plugin-transform-typeof-symbol": "^7.8.4",
                 "@babel/plugin-transform-unicode-regex": "^7.8.3",
                 "@babel/preset-modules": "^0.1.3",
-                "@babel/types": "^7.9.5",
-                "browserslist": "^4.9.1",
+                "@babel/types": "^7.9.6",
+                "browserslist": "^4.11.1",
                 "core-js-compat": "^3.6.2",
                 "invariant": "^2.2.2",
                 "levenary": "^1.1.1",
                 "semver": "^5.5.0"
+            },
+            "dependencies": {
+                "@babel/types": {
+                    "version": "7.9.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+                    "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.9.5",
+                        "lodash": "^4.17.13",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/preset-modules": {
@@ -1022,9 +1085,9 @@
             }
         },
         "@babel/runtime-corejs3": {
-            "version": "7.8.7",
-            "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz",
-            "integrity": "sha512-sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q==",
+            "version": "7.9.6",
+            "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz",
+            "integrity": "sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA==",
             "dev": true,
             "requires": {
                 "core-js-pure": "^3.0.0",
@@ -1043,22 +1106,33 @@
             }
         },
         "@babel/traverse": {
-            "version": "7.9.5",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
-            "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
+            "version": "7.9.6",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz",
+            "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.8.3",
-                "@babel/generator": "^7.9.5",
+                "@babel/generator": "^7.9.6",
                 "@babel/helper-function-name": "^7.9.5",
                 "@babel/helper-split-export-declaration": "^7.8.3",
-                "@babel/parser": "^7.9.0",
-                "@babel/types": "^7.9.5",
+                "@babel/parser": "^7.9.6",
+                "@babel/types": "^7.9.6",
                 "debug": "^4.1.0",
                 "globals": "^11.1.0",
                 "lodash": "^4.17.13"
             },
             "dependencies": {
+                "@babel/types": {
+                    "version": "7.9.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+                    "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.9.5",
+                        "lodash": "^4.17.13",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                },
                 "debug": {
                     "version": "4.1.1",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -1455,9 +1529,9 @@
             }
         },
         "@scarf/scarf": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-0.1.7.tgz",
-            "integrity": "sha512-XUBa8nl9J1XGyyA+wul1ko5v5ioNU1s/pUPODnPzJ4+uUOwwYZm197KQoxxzOAsypldlFGnAlQ8nkjTjoQV9GQ=="
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.0.5.tgz",
+            "integrity": "sha512-9WKaGVpQH905Aqkk+BczFEeLQxS07rl04afFRPUG9IcSlOwmo5EVVuuNu0d4M9LMYucObvK0LoAe+5HfMW2QhQ=="
         },
         "@sindresorhus/is": {
             "version": "0.7.0",
@@ -1527,15 +1601,15 @@
             }
         },
         "@types/history": {
-            "version": "4.7.5",
-            "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.5.tgz",
-            "integrity": "sha512-wLD/Aq2VggCJXSjxEwrMafIP51Z+13H78nXIX0ABEuIGhmB5sNGbR113MOKo+yfw+RDo1ZU3DM6yfnnRF/+ouw==",
+            "version": "4.7.6",
+            "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.6.tgz",
+            "integrity": "sha512-GRTZLeLJ8ia00ZH8mxMO8t0aC9M1N9bN461Z2eaRurJo6Fpa+utgCwLzI4jQHcrdzuzp5WPN9jRwpsCQ1VhJ5w==",
             "dev": true
         },
         "@types/html-minifier-terser": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.0.0.tgz",
-            "integrity": "sha512-q95SP4FdkmF0CwO0F2q0H6ZgudsApaY/yCtAQNRn1gduef5fGpyEphzy0YCq/N0UFvDSnLg5V8jFK/YGXlDiCw==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz",
+            "integrity": "sha512-iYCgjm1dGPRuo12+BStjd1HiVQqhlRhWDOQigNxn023HcjnhsiFz9pc6CzJj4HwDCSQca9bxTL4PxJDbkdm3PA==",
             "dev": true
         },
         "@types/json-schema": {
@@ -1572,9 +1646,9 @@
             "dev": true
         },
         "@types/node": {
-            "version": "13.13.2",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.2.tgz",
-            "integrity": "sha512-LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A==",
+            "version": "14.0.6",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.6.tgz",
+            "integrity": "sha512-FbNmu4F67d3oZMWBV6Y4MaPER+0EpE9eIYf2yaHhCWovc1dlXCZkqGX4NLHfVVr6umt20TNBdRzrNJIzIKfdbw==",
             "dev": true
         },
         "@types/normalize-package-data": {
@@ -1603,9 +1677,9 @@
             "optional": true
         },
         "@types/react": {
-            "version": "16.9.34",
-            "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.34.tgz",
-            "integrity": "sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==",
+            "version": "16.9.35",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.35.tgz",
+            "integrity": "sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ==",
             "dev": true,
             "requires": {
                 "@types/prop-types": "*",
@@ -1613,18 +1687,18 @@
             }
         },
         "@types/react-dom": {
-            "version": "16.9.6",
-            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.6.tgz",
-            "integrity": "sha512-S6ihtlPMDotrlCJE9ST1fRmYrQNNwfgL61UB4I1W7M6kPulUKx9fXAleW5zpdIjUQ4fTaaog8uERezjsGUj9HQ==",
+            "version": "16.9.8",
+            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.8.tgz",
+            "integrity": "sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==",
             "dev": true,
             "requires": {
                 "@types/react": "*"
             }
         },
         "@types/react-router": {
-            "version": "5.1.5",
-            "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.5.tgz",
-            "integrity": "sha512-RZPdCtZympi6X7EkGyaU7ISiAujDYTWgqMF9owE3P6efITw27IWQykcti0BvA5h4Mu1LLl5rxrpO3r8kHyUZ/Q==",
+            "version": "5.1.7",
+            "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.7.tgz",
+            "integrity": "sha512-2ouP76VQafKjtuc0ShpwUebhHwJo0G6rhahW9Pb8au3tQTjYXd2jta4wv6U2tGLR/I42yuG00+UXjNYY0dTzbg==",
             "dev": true,
             "requires": {
                 "@types/history": "*",
@@ -1632,9 +1706,9 @@
             }
         },
         "@types/react-router-dom": {
-            "version": "5.1.4",
-            "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.1.4.tgz",
-            "integrity": "sha512-LO0z5qqSfWdYtCNsRm8/OMnnkv52hwADJKrAfpKIyfHclORllcgAMGypEA7ajHm38+jOonKLx8nPygNAAZGxtg==",
+            "version": "5.1.5",
+            "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.1.5.tgz",
+            "integrity": "sha512-ArBM4B1g3BWLGbaGvwBGO75GNFbLDUthrDojV2vHLih/Tq8M+tgvY1DSwkuNrPSwdp/GUL93WSEpTZs8nVyJLw==",
             "dev": true,
             "requires": {
                 "@types/history": "*",
@@ -1643,9 +1717,9 @@
             }
         },
         "@types/react-table": {
-            "version": "7.0.16",
-            "resolved": "https://registry.npmjs.org/@types/react-table/-/react-table-7.0.16.tgz",
-            "integrity": "sha512-SDFRUnWWN16rL/N1bpV4GKp4EAoulmrHbHoWCNUldrqVBYI9m9o+sYqNPP2E5NVUW7HQJf15rHKFN13F6v49Uw==",
+            "version": "7.0.18",
+            "resolved": "https://registry.npmjs.org/@types/react-table/-/react-table-7.0.18.tgz",
+            "integrity": "sha512-O4iKmVYVQz+6Nl9LsLtWQz9Unsmq0UySJrh5hpV5d+wrf15skhB0dqI9ocCNovJpcYxGjHrn3VbeSyAcaxHZtA==",
             "dev": true,
             "requires": {
                 "@types/react": "*"
@@ -1669,6 +1743,15 @@
                 "@types/react": "*"
             }
         },
+        "@types/recoil": {
+            "version": "0.0.0",
+            "resolved": "https://registry.npmjs.org/@types/recoil/-/recoil-0.0.0.tgz",
+            "integrity": "sha512-i00Sidw/UDe6jxCJrY5HotFfKIMIbKHGf5chJw7AsxdHe7G8m/ot71AcnbLOS1rLTtnXnENQcf8upKYsGJNvyA==",
+            "dev": true,
+            "requires": {
+                "@types/react": "*"
+            }
+        },
         "@types/source-list-map": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
@@ -1682,9 +1765,9 @@
             "dev": true
         },
         "@types/uglify-js": {
-            "version": "3.9.0",
-            "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.0.tgz",
-            "integrity": "sha512-3ZcoyPYHVOCcLpnfZwD47KFLr8W/mpUcgjpf1M4Q78TMJIw7KMAHSjiCLJp1z3ZrBR9pTLbe191O0TldFK5zcw==",
+            "version": "3.9.2",
+            "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.2.tgz",
+            "integrity": "sha512-d6dIfpPbF+8B7WiCi2ELY7m0w1joD8cRW4ms88Emdb2w062NeEpbNCeWwVCgzLRpVG+5e74VFSg4rgJ2xXjEiQ==",
             "dev": true,
             "requires": {
                 "source-map": "^0.6.1"
@@ -1705,9 +1788,9 @@
             "dev": true
         },
         "@types/webpack": {
-            "version": "4.41.12",
-            "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.12.tgz",
-            "integrity": "sha512-BpCtM4NnBen6W+KEhrL9jKuZCXVtiH6+0b6cxdvNt2EwU949Al334PjQSl2BeAyvAX9mgoNNG21wvjP3xZJJ5w==",
+            "version": "4.41.13",
+            "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.13.tgz",
+            "integrity": "sha512-RYmIHOWSxnTTa765N6jJBVE45pd2SYNblEYshVDduLw6RhocazNmRzE5/ytvBD8IkDMH6DI+bcrqxh8NILimBA==",
             "dev": true,
             "requires": {
                 "@types/anymatch": "*",
@@ -2272,9 +2355,9 @@
             }
         },
         "arrify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-            "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+            "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
             "dev": true
         },
         "asn1.js": {
@@ -2348,12 +2431,6 @@
             "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
             "dev": true
         },
-        "at-least-node": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-            "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-            "dev": true
-        },
         "atob": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
@@ -2361,18 +2438,52 @@
             "dev": true
         },
         "autoprefixer": {
-            "version": "9.7.6",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.6.tgz",
-            "integrity": "sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==",
+            "version": "9.8.0",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
+            "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
             "dev": true,
             "requires": {
-                "browserslist": "^4.11.1",
-                "caniuse-lite": "^1.0.30001039",
+                "browserslist": "^4.12.0",
+                "caniuse-lite": "^1.0.30001061",
                 "chalk": "^2.4.2",
                 "normalize-range": "^0.1.2",
                 "num2fraction": "^1.2.2",
-                "postcss": "^7.0.27",
-                "postcss-value-parser": "^4.0.3"
+                "postcss": "^7.0.30",
+                "postcss-value-parser": "^4.1.0"
+            },
+            "dependencies": {
+                "postcss": {
+                    "version": "7.0.30",
+                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.30.tgz",
+                    "integrity": "sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==",
+                    "dev": true,
+                    "requires": {
+                        "chalk": "^2.4.2",
+                        "source-map": "^0.6.1",
+                        "supports-color": "^6.1.0"
+                    }
+                },
+                "postcss-value-parser": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+                    "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+                    "dev": true
+                },
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                },
+                "supports-color": {
+                    "version": "6.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+                    "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^3.0.0"
+                    }
+                }
             }
         },
         "awesome-typescript-loader": {
@@ -3453,9 +3564,9 @@
             }
         },
         "caniuse-lite": {
-            "version": "1.0.30001046",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz",
-            "integrity": "sha512-CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g==",
+            "version": "1.0.30001064",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001064.tgz",
+            "integrity": "sha512-hdBcQMFvJIrOhkpAZiRXz04Cmetwc9NekeuNl0qZfHOugxOhJKxsjF1RmISMPFjIF4PPx1reliIzbfN42EiQ5A==",
             "dev": true
         },
         "caw": {
@@ -3519,9 +3630,9 @@
             "dev": true
         },
         "chokidar": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz",
-            "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==",
+            "version": "3.4.0",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
+            "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
             "dev": true,
             "requires": {
                 "anymatch": "~3.1.1",
@@ -3531,7 +3642,7 @@
                 "is-binary-path": "~2.1.0",
                 "is-glob": "~4.0.1",
                 "normalize-path": "~3.0.0",
-                "readdirp": "~3.3.0"
+                "readdirp": "~3.4.0"
             },
             "dependencies": {
                 "anymatch": {
@@ -3600,12 +3711,12 @@
                     "dev": true
                 },
                 "readdirp": {
-                    "version": "3.3.0",
-                    "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz",
-                    "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==",
+                    "version": "3.4.0",
+                    "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+                    "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
                     "dev": true,
                     "requires": {
-                        "picomatch": "^2.0.7"
+                        "picomatch": "^2.2.1"
                     }
                 },
                 "to-regex-range": {
@@ -3788,12 +3899,6 @@
                 "q": "^1.1.2"
             }
         },
-        "code-point-at": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-            "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-            "dev": true
-        },
         "collapse-white-space": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
@@ -4019,9 +4124,9 @@
             }
         },
         "core-js-pure": {
-            "version": "3.6.4",
-            "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.4.tgz",
-            "integrity": "sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==",
+            "version": "3.6.5",
+            "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz",
+            "integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==",
             "dev": true
         },
         "core-util-is": {
@@ -4290,9 +4395,9 @@
             }
         },
         "dayjs": {
-            "version": "1.8.25",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.25.tgz",
-            "integrity": "sha512-Pk36juDfQQGDCgr0Lqd1kw15w3OS6xt21JaLPE3lCfsEf8KrERGwDNwvK1tRjrjqFC0uZBJncT4smZQ4F+uV5g=="
+            "version": "1.8.28",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.28.tgz",
+            "integrity": "sha512-ccnYgKC0/hPSGXxj7Ju6AV/BP4HUkXC2u15mikXT5mX9YorEaoi1bEKOmAqdkJHN4EEkmAf97SpH66Try5Mbeg=="
         },
         "debug": {
             "version": "3.1.0",
@@ -4897,9 +5002,9 @@
             "dev": true
         },
         "electron-to-chromium": {
-            "version": "1.3.416",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.416.tgz",
-            "integrity": "sha512-fmSrpOQC1dEXzsznzAMXbhQLkpAr21WtaUfRXnIbh8kblZIaMwSL6A8u2RZHAzZliSoSOM3FzS2z/j8tVqrAAw==",
+            "version": "1.3.451",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.451.tgz",
+            "integrity": "sha512-2fvco0F2bBIgqzO8GRP0Jt/91pdrf9KfZ5FsmkYkjERmIJG585cFeFZV4+CO6oTmU3HmCTgfcZuEa7kW8VUh3A==",
             "dev": true
         },
         "elliptic": {
@@ -5173,18 +5278,39 @@
             }
         },
         "eslint-loader": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-4.0.0.tgz",
-            "integrity": "sha512-QoaFRdh3oXt5i2uonSjO8dDnncsG05w7qvA7yYMvGDne8zAEk9R+R1rsfunp3OKVdO5mAJelf1x2Z1kYp664kA==",
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-4.0.2.tgz",
+            "integrity": "sha512-EDpXor6lsjtTzZpLUn7KmXs02+nIjGcgees9BYjNkWra3jVq5vVa8IoCKgzT2M7dNNeoMBtaSG83Bd40N3poLw==",
             "dev": true,
             "requires": {
-                "fs-extra": "^9.0.0",
-                "loader-fs-cache": "^1.0.3",
+                "find-cache-dir": "^3.3.1",
+                "fs-extra": "^8.1.0",
                 "loader-utils": "^2.0.0",
                 "object-hash": "^2.0.3",
                 "schema-utils": "^2.6.5"
             },
             "dependencies": {
+                "find-cache-dir": {
+                    "version": "3.3.1",
+                    "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+                    "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+                    "dev": true,
+                    "requires": {
+                        "commondir": "^1.0.1",
+                        "make-dir": "^3.0.2",
+                        "pkg-dir": "^4.1.0"
+                    }
+                },
+                "find-up": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+                    "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+                    "dev": true,
+                    "requires": {
+                        "locate-path": "^5.0.0",
+                        "path-exists": "^4.0.0"
+                    }
+                },
                 "loader-utils": {
                     "version": "2.0.0",
                     "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
@@ -5195,6 +5321,54 @@
                         "emojis-list": "^3.0.0",
                         "json5": "^2.1.2"
                     }
+                },
+                "locate-path": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+                    "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+                    "dev": true,
+                    "requires": {
+                        "p-locate": "^4.1.0"
+                    }
+                },
+                "make-dir": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+                    "dev": true,
+                    "requires": {
+                        "semver": "^6.0.0"
+                    }
+                },
+                "p-locate": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+                    "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+                    "dev": true,
+                    "requires": {
+                        "p-limit": "^2.2.0"
+                    }
+                },
+                "path-exists": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+                    "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+                    "dev": true
+                },
+                "pkg-dir": {
+                    "version": "4.2.0",
+                    "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+                    "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+                    "dev": true,
+                    "requires": {
+                        "find-up": "^4.0.0"
+                    }
+                },
+                "semver": {
+                    "version": "6.3.0",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+                    "dev": true
                 }
             }
         },
@@ -5383,9 +5557,9 @@
             "dev": true
         },
         "eslint-plugin-react": {
-            "version": "7.19.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz",
-            "integrity": "sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ==",
+            "version": "7.20.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz",
+            "integrity": "sha512-rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA==",
             "dev": true,
             "requires": {
                 "array-includes": "^3.1.1",
@@ -5397,7 +5571,6 @@
                 "object.values": "^1.1.1",
                 "prop-types": "^15.7.2",
                 "resolve": "^1.15.1",
-                "semver": "^6.3.0",
                 "string.prototype.matchall": "^4.0.2",
                 "xregexp": "^4.3.0"
             },
@@ -5410,12 +5583,6 @@
                     "requires": {
                         "esutils": "^2.0.2"
                     }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
                 }
             }
         },
@@ -5504,9 +5671,9 @@
             "dev": true
         },
         "eventemitter3": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
-            "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg=="
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
+            "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ=="
         },
         "events": {
             "version": "3.1.0",
@@ -6238,15 +6405,14 @@
             "optional": true
         },
         "fs-extra": {
-            "version": "9.0.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
-            "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+            "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
             "dev": true,
             "requires": {
-                "at-least-node": "^1.0.0",
                 "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^1.0.0"
+                "jsonfile": "^4.0.0",
+                "universalify": "^0.1.0"
             }
         },
         "fs-minipass": {
@@ -7087,11 +7253,6 @@
             "dev": true,
             "optional": true
         },
-        "gud": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
-            "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
-        },
         "handle-thing": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
@@ -7286,15 +7447,15 @@
             "optional": true
         },
         "html-entities": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-            "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
+            "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==",
             "dev": true
         },
         "html-minifier-terser": {
-            "version": "5.0.5",
-            "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.0.5.tgz",
-            "integrity": "sha512-cBSFFghQh/uHcfSiL42KxxIRMF7A144+3E44xdlctIjxEmkEfCvouxNyFH2wysXk1fCGBPwtcr3hDWlGTfkDew==",
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
+            "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==",
             "dev": true,
             "requires": {
                 "camel-case": "^4.1.1",
@@ -7313,9 +7474,9 @@
             "dev": true
         },
         "html-webpack-plugin": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.2.0.tgz",
-            "integrity": "sha512-zL7LYTuq/fcJX6vV6tmmvFR508Bd9e6kvVGbS76YAjZ2CPVRzsjkvDYs/SshPevpolSdTWgaDV39D6k6oQoVFw==",
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz",
+            "integrity": "sha512-C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w==",
             "dev": true,
             "requires": {
                 "@types/html-minifier-terser": "^5.0.0",
@@ -7396,16 +7557,10 @@
                 }
             }
         },
-        "http-parser-js": {
-            "version": "0.4.10",
-            "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
-            "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
-            "dev": true
-        },
         "http-proxy": {
-            "version": "1.18.0",
-            "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
-            "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
+            "version": "1.18.1",
+            "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+            "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
             "dev": true,
             "requires": {
                 "eventemitter3": "^4.0.0",
@@ -7662,9 +7817,9 @@
             }
         },
         "immer": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/immer/-/immer-6.0.3.tgz",
-            "integrity": "sha512-12VvNrfSrXZdm/BJgi/KDW2soq5freVSf3I1+4CLunUM8mAGx2/0Njy0xBVzi5zewQZiwM7z1/1T+8VaI7NkmQ=="
+            "version": "6.0.9",
+            "resolved": "https://registry.npmjs.org/immer/-/immer-6.0.9.tgz",
+            "integrity": "sha512-SyCYnAuiRf67Lvk0VkwFvwtDoEiCMjeamnHvRfnVDyc7re1/rQrNxuL+jJ7lA3WvdC4uznrvbmm+clJ9+XXatg=="
         },
         "import-cwd": {
             "version": "2.1.0",
@@ -8463,13 +8618,12 @@
             }
         },
         "jsonfile": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
-            "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+            "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
             "dev": true,
             "requires": {
-                "graceful-fs": "^4.1.6",
-                "universalify": "^1.0.0"
+                "graceful-fs": "^4.1.6"
             }
         },
         "jsx-ast-utils": {
@@ -8511,9 +8665,9 @@
             "dev": true
         },
         "known-css-properties": {
-            "version": "0.18.0",
-            "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.18.0.tgz",
-            "integrity": "sha512-69AgJ1rQa7VvUsd2kpvVq+VeObDuo3zrj0CzM5Slmf6yduQFAI2kXPDQJR2IE/u6MSAUOJrwSzjg5vlz8qcMiw==",
+            "version": "0.19.0",
+            "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.19.0.tgz",
+            "integrity": "sha512-eYboRV94Vco725nKMlpkn3nV2+96p9c3gKXRsYqAJSswSENvBhN7n5L+uDhY58xQa0UukWsDMTGELzmD8Q+wTA==",
             "dev": true
         },
         "lcid": {
@@ -8600,57 +8754,6 @@
                 }
             }
         },
-        "loader-fs-cache": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz",
-            "integrity": "sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==",
-            "dev": true,
-            "requires": {
-                "find-cache-dir": "^0.1.1",
-                "mkdirp": "^0.5.1"
-            },
-            "dependencies": {
-                "find-cache-dir": {
-                    "version": "0.1.1",
-                    "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
-                    "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
-                    "dev": true,
-                    "requires": {
-                        "commondir": "^1.0.1",
-                        "mkdirp": "^0.5.1",
-                        "pkg-dir": "^1.0.0"
-                    }
-                },
-                "find-up": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-                    "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-                    "dev": true,
-                    "requires": {
-                        "path-exists": "^2.0.0",
-                        "pinkie-promise": "^2.0.0"
-                    }
-                },
-                "path-exists": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-                    "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-                    "dev": true,
-                    "requires": {
-                        "pinkie-promise": "^2.0.0"
-                    }
-                },
-                "pkg-dir": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
-                    "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-                    "dev": true,
-                    "requires": {
-                        "find-up": "^1.0.0"
-                    }
-                }
-            }
-        },
         "loader-runner": {
             "version": "2.4.0",
             "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
@@ -8734,9 +8837,9 @@
             }
         },
         "loglevel": {
-            "version": "1.6.7",
-            "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz",
-            "integrity": "sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==",
+            "version": "1.6.8",
+            "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz",
+            "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==",
             "dev": true
         },
         "loglevelnext": {
@@ -9125,12 +9228,20 @@
             "dev": true
         },
         "mime-types": {
-            "version": "2.1.26",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
-            "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
+            "version": "2.1.27",
+            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+            "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
             "dev": true,
             "requires": {
-                "mime-db": "1.43.0"
+                "mime-db": "1.44.0"
+            },
+            "dependencies": {
+                "mime-db": {
+                    "version": "1.44.0",
+                    "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+                    "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+                    "dev": true
+                }
             }
         },
         "mimic-fn": {
@@ -9162,13 +9273,12 @@
             "dev": true
         },
         "mini-create-react-context": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz",
-            "integrity": "sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw==",
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz",
+            "integrity": "sha512-b0TytUgFSbgFJGzJqXPKCFCBWigAjpjo+Fl7Vf7ZbKRDptszpppKxXH6DRXEABZ/gcEQczeb0iZ7JvL8e8jjCA==",
             "requires": {
-                "@babel/runtime": "^7.4.0",
-                "gud": "^1.0.0",
-                "tiny-warning": "^1.0.2"
+                "@babel/runtime": "^7.5.5",
+                "tiny-warning": "^1.0.3"
             }
         },
         "mini-css-extract-plugin": {
@@ -9246,13 +9356,22 @@
             "dev": true
         },
         "minimist-options": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.0.2.tgz",
-            "integrity": "sha512-seq4hpWkYSUh1y7NXxzucwAN9yVlBc3Upgdjz8vLCP97jG8kaOmzYrVH/m7tQ1NYD1wdtZbSLfdy4zFmRWuc/w==",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+            "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
             "dev": true,
             "requires": {
                 "arrify": "^1.0.1",
-                "is-plain-obj": "^1.1.0"
+                "is-plain-obj": "^1.1.0",
+                "kind-of": "^6.0.3"
+            },
+            "dependencies": {
+                "arrify": {
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+                    "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+                    "dev": true
+                }
             }
         },
         "minipass": {
@@ -9529,9 +9648,9 @@
             }
         },
         "node-releases": {
-            "version": "1.1.53",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz",
-            "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==",
+            "version": "1.1.56",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.56.tgz",
+            "integrity": "sha512-EVo605FhWLygH8a64TjgpjyHYOihkxECwX1bHHr8tETJKWEiWS2YJjPbvsX2jFjnjTNEgBCmk9mLjKG1Mf11cw==",
             "dev": true
         },
         "normalize-package-data": {
@@ -9639,12 +9758,6 @@
             "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
             "dev": true
         },
-        "number-is-nan": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-            "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-            "dev": true
-        },
         "object-assign": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -9694,10 +9807,35 @@
             "dev": true
         },
         "object-is": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz",
-            "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==",
-            "dev": true
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
+            "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
+            "dev": true,
+            "requires": {
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.17.5"
+            },
+            "dependencies": {
+                "es-abstract": {
+                    "version": "1.17.5",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+                    "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
+                    "dev": true,
+                    "requires": {
+                        "es-to-primitive": "^1.2.1",
+                        "function-bind": "^1.1.1",
+                        "has": "^1.0.3",
+                        "has-symbols": "^1.0.1",
+                        "is-callable": "^1.1.5",
+                        "is-regex": "^1.0.5",
+                        "object-inspect": "^1.7.0",
+                        "object-keys": "^1.1.1",
+                        "object.assign": "^4.1.0",
+                        "string.prototype.trimleft": "^2.1.1",
+                        "string.prototype.trimright": "^2.1.1"
+                    }
+                }
+            }
         },
         "object-keys": {
             "version": "1.1.1",
@@ -9727,15 +9865,35 @@
             }
         },
         "object.entries": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.1.tgz",
-            "integrity": "sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==",
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz",
+            "integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==",
             "dev": true,
             "requires": {
                 "define-properties": "^1.1.3",
-                "es-abstract": "^1.17.0-next.1",
-                "function-bind": "^1.1.1",
+                "es-abstract": "^1.17.5",
                 "has": "^1.0.3"
+            },
+            "dependencies": {
+                "es-abstract": {
+                    "version": "1.17.5",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+                    "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
+                    "dev": true,
+                    "requires": {
+                        "es-to-primitive": "^1.2.1",
+                        "function-bind": "^1.1.1",
+                        "has": "^1.0.3",
+                        "has-symbols": "^1.0.1",
+                        "is-callable": "^1.1.5",
+                        "is-regex": "^1.0.5",
+                        "object-inspect": "^1.7.0",
+                        "object-keys": "^1.1.1",
+                        "object.assign": "^4.1.0",
+                        "string.prototype.trimleft": "^2.1.1",
+                        "string.prototype.trimright": "^2.1.1"
+                    }
+                }
             }
         },
         "object.fromentries": {
@@ -10469,9 +10627,9 @@
             }
         },
         "portfinder": {
-            "version": "1.0.25",
-            "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
-            "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==",
+            "version": "1.0.26",
+            "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz",
+            "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==",
             "dev": true,
             "requires": {
                 "async": "^2.6.2",
@@ -10668,12 +10826,12 @@
             }
         },
         "postcss-scss": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.0.0.tgz",
-            "integrity": "sha512-um9zdGKaDZirMm+kZFKKVsnKPF7zF7qBAtIfTSnZXD1jZ0JNZIxdB6TxQOjCnlSzLRInVl2v3YdBh/M881C4ug==",
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
+            "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
             "dev": true,
             "requires": {
-                "postcss": "^7.0.0"
+                "postcss": "^7.0.6"
             }
         },
         "postcss-selector-parser": {
@@ -10971,9 +11129,9 @@
             }
         },
         "react-hot-loader": {
-            "version": "4.12.20",
-            "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.20.tgz",
-            "integrity": "sha512-lPlv1HVizi0lsi+UFACBJaydtRYILWkfHAC/lyCs6ZlAxlOZRQIfYHDqiGaRvL/GF7zyti+Qn9XpnDAUvdFA4A==",
+            "version": "4.12.21",
+            "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.21.tgz",
+            "integrity": "sha512-Ynxa6ROfWUeKWsTHxsrL2KMzujxJVPjs385lmB2t5cHUxdoRPGind9F00tOkdc1l5WBleOF4XEAMILY1KPIIDA==",
             "dev": true,
             "requires": {
                 "fast-levenshtein": "^2.0.6",
@@ -11006,15 +11164,15 @@
             "dev": true
         },
         "react-router": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.1.2.tgz",
-            "integrity": "sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A==",
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz",
+            "integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==",
             "requires": {
                 "@babel/runtime": "^7.1.2",
                 "history": "^4.9.0",
                 "hoist-non-react-statics": "^3.1.0",
                 "loose-envify": "^1.3.1",
-                "mini-create-react-context": "^0.3.0",
+                "mini-create-react-context": "^0.4.0",
                 "path-to-regexp": "^1.7.0",
                 "prop-types": "^15.6.2",
                 "react-is": "^16.6.0",
@@ -11023,25 +11181,25 @@
             }
         },
         "react-router-dom": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.1.2.tgz",
-            "integrity": "sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew==",
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
+            "integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
             "requires": {
                 "@babel/runtime": "^7.1.2",
                 "history": "^4.9.0",
                 "loose-envify": "^1.3.1",
                 "prop-types": "^15.6.2",
-                "react-router": "5.1.2",
+                "react-router": "5.2.0",
                 "tiny-invariant": "^1.0.2",
                 "tiny-warning": "^1.0.0"
             }
         },
         "react-table": {
-            "version": "7.0.4",
-            "resolved": "https://registry.npmjs.org/react-table/-/react-table-7.0.4.tgz",
-            "integrity": "sha512-Uqpj+VnUIvsNWNtNFD1z2i7OCHdlhoJtQt0DWx3XOkZnvDyI/eCghK8YBfA9mY4TW7vEgCDLaRCcREC/fmcx6Q==",
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/react-table/-/react-table-7.1.0.tgz",
+            "integrity": "sha512-AZpgW0Xpo6Z7jxXZIBovzCGoYVkuBwATsJh7X4+JXwq9JtDaorOmxWC9gKx5Hui4d+n+I99enyyJS+LRtKydxA==",
             "requires": {
-                "@scarf/scarf": "^0.1.5"
+                "@scarf/scarf": "^1.0.4"
             }
         },
         "react-virtualized-auto-sizer": {
@@ -11158,6 +11316,11 @@
                 "readable-stream": "^2.0.2"
             }
         },
+        "recoil": {
+            "version": "0.0.7",
+            "resolved": "https://registry.npmjs.org/recoil/-/recoil-0.0.7.tgz",
+            "integrity": "sha512-U/0kniHLk131hKhAX35QGdghVf3+PSkLcFIFoNBNy+yv62qCLm3TE5c3v4x4WYzuKgw1fxU3GGhKHAUYdyRnTQ=="
+        },
         "redent": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
@@ -11598,9 +11761,9 @@
             "dev": true
         },
         "sass": {
-            "version": "1.26.5",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.5.tgz",
-            "integrity": "sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q==",
+            "version": "1.26.7",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.7.tgz",
+            "integrity": "sha512-xgNazdkr6yvgHEfNaOjKtZzhDZmKYMCmoRKMPrTDo7YvjaITIzU2DDYsIUuN/atAg7/JOxPeCQHH7TtCo5Tq2g==",
             "dev": true,
             "requires": {
                 "chokidar": ">=2.0.0 <4.0.0"
@@ -12072,13 +12235,14 @@
             }
         },
         "sockjs": {
-            "version": "0.3.19",
-            "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
-            "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+            "version": "0.3.20",
+            "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
+            "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
             "dev": true,
             "requires": {
                 "faye-websocket": "^0.10.0",
-                "uuid": "^3.0.1"
+                "uuid": "^3.4.0",
+                "websocket-driver": "0.6.5"
             }
         },
         "sockjs-client": {
@@ -12222,9 +12386,9 @@
             "dev": true
         },
         "spdy": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz",
-            "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+            "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
             "dev": true,
             "requires": {
                 "debug": "^4.1.0",
@@ -12534,9 +12698,9 @@
             }
         },
         "stringify-entities": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.0.tgz",
-            "integrity": "sha512-h7NJJIssprqlyjHT2eQt2W1F+MCcNmwPGlKb0bWEdET/3N44QN3QbUF/ueKCgAssyKRZ3Br9rQ7FcXjHr0qLHw==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.1.tgz",
+            "integrity": "sha512-Lsk3ISA2++eJYqBMPKcr/8eby1I6L0gP0NlxF8Zja6c05yr/yCYyb2c9PwXjd08Ib3If1vn1rbs1H5ZtVuOfvQ==",
             "dev": true,
             "requires": {
                 "character-entities-html4": "^1.0.0",
@@ -12612,9 +12776,9 @@
             }
         },
         "style-loader": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.0.tgz",
-            "integrity": "sha512-HC8WcGnjwNrKji7HSBqFOhGNUSt7UDU/jHxT6bA83Gk+JWJBmgitWlGihc0V1w6ZvwlzcX5LJOsofZzSP7b1tQ==",
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
+            "integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==",
             "dev": true,
             "requires": {
                 "loader-utils": "^2.0.0",
@@ -12651,9 +12815,9 @@
             "dev": true
         },
         "stylelint": {
-            "version": "13.3.3",
-            "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.3.3.tgz",
-            "integrity": "sha512-j8Oio2T1YNiJc6iXDaPYd74Jg4zOa1bByNm/g9/Nvnq4tDPsIjMi46jhRZyPPktGPwjJ5FwcmCqIRlH6PVP8mA==",
+            "version": "13.5.0",
+            "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.5.0.tgz",
+            "integrity": "sha512-+Jy7ieKAWKTf2tmcAE7jgScxH39Urb87i0bjK/enScFaGWWaFn4kAPwepGOSk2b7CLUDVt/O6kwA0x0p/V7moQ==",
             "dev": true,
             "requires": {
                 "@stylelint/postcss-css-in-js": "^0.37.1",
@@ -12665,7 +12829,7 @@
                 "debug": "^4.1.1",
                 "execall": "^2.0.0",
                 "file-entry-cache": "^5.0.1",
-                "get-stdin": "^7.0.0",
+                "get-stdin": "^8.0.0",
                 "global-modules": "^2.0.0",
                 "globby": "^11.0.0",
                 "globjoin": "^0.1.4",
@@ -12673,15 +12837,15 @@
                 "ignore": "^5.1.4",
                 "import-lazy": "^4.0.0",
                 "imurmurhash": "^0.1.4",
-                "known-css-properties": "^0.18.0",
+                "known-css-properties": "^0.19.0",
                 "leven": "^3.1.0",
                 "lodash": "^4.17.15",
-                "log-symbols": "^3.0.0",
+                "log-symbols": "^4.0.0",
                 "mathml-tag-names": "^2.1.3",
-                "meow": "^6.1.0",
+                "meow": "^7.0.1",
                 "micromatch": "^4.0.2",
                 "normalize-selector": "^0.2.0",
-                "postcss": "^7.0.27",
+                "postcss": "^7.0.30",
                 "postcss-html": "^0.36.0",
                 "postcss-less": "^3.1.4",
                 "postcss-media-query-parser": "^0.2.3",
@@ -12692,7 +12856,7 @@
                 "postcss-scss": "^2.0.0",
                 "postcss-selector-parser": "^6.0.2",
                 "postcss-syntax": "^0.36.2",
-                "postcss-value-parser": "^4.0.3",
+                "postcss-value-parser": "^4.1.0",
                 "resolve-from": "^5.0.0",
                 "slash": "^3.0.0",
                 "specificity": "^0.4.1",
@@ -12725,6 +12889,12 @@
                         "fill-range": "^7.0.1"
                     }
                 },
+                "camelcase": {
+                    "version": "6.0.0",
+                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
+                    "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
+                    "dev": true
+                },
                 "camelcase-keys": {
                     "version": "6.2.2",
                     "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
@@ -12734,6 +12904,14 @@
                         "camelcase": "^5.3.1",
                         "map-obj": "^4.0.0",
                         "quick-lru": "^4.0.1"
+                    },
+                    "dependencies": {
+                        "camelcase": {
+                            "version": "5.3.1",
+                            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+                            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+                            "dev": true
+                        }
                     }
                 },
                 "chalk": {
@@ -12803,9 +12981,9 @@
                     }
                 },
                 "get-stdin": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz",
-                    "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==",
+                    "version": "8.0.0",
+                    "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+                    "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
                     "dev": true
                 },
                 "globby": {
@@ -12829,9 +13007,9 @@
                     "dev": true
                 },
                 "ignore": {
-                    "version": "5.1.4",
-                    "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
-                    "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==",
+                    "version": "5.1.6",
+                    "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.6.tgz",
+                    "integrity": "sha512-cgXgkypZBcCnOgSihyeqbo6gjIaIyDqPQB7Ra4vhE9m6kigdGoQDMHjviFhRZo3IMlRy6yElosoviMs5YxZXUA==",
                     "dev": true
                 },
                 "import-lazy": {
@@ -12862,64 +13040,12 @@
                     }
                 },
                 "log-symbols": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-                    "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+                    "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
                     "dev": true,
                     "requires": {
-                        "chalk": "^2.4.2"
-                    },
-                    "dependencies": {
-                        "ansi-styles": {
-                            "version": "3.2.1",
-                            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                            "dev": true,
-                            "requires": {
-                                "color-convert": "^1.9.0"
-                            }
-                        },
-                        "chalk": {
-                            "version": "2.4.2",
-                            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-                            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-                            "dev": true,
-                            "requires": {
-                                "ansi-styles": "^3.2.1",
-                                "escape-string-regexp": "^1.0.5",
-                                "supports-color": "^5.3.0"
-                            }
-                        },
-                        "color-convert": {
-                            "version": "1.9.3",
-                            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-                            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-                            "dev": true,
-                            "requires": {
-                                "color-name": "1.1.3"
-                            }
-                        },
-                        "color-name": {
-                            "version": "1.1.3",
-                            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-                            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-                            "dev": true
-                        },
-                        "has-flag": {
-                            "version": "3.0.0",
-                            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-                            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-                            "dev": true
-                        },
-                        "supports-color": {
-                            "version": "5.5.0",
-                            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                            "dev": true,
-                            "requires": {
-                                "has-flag": "^3.0.0"
-                            }
-                        }
+                        "chalk": "^4.0.0"
                     }
                 },
                 "map-obj": {
@@ -12929,22 +13055,24 @@
                     "dev": true
                 },
                 "meow": {
-                    "version": "6.1.0",
-                    "resolved": "https://registry.npmjs.org/meow/-/meow-6.1.0.tgz",
-                    "integrity": "sha512-iIAoeI01v6pmSfObAAWFoITAA4GgiT45m4SmJgoxtZfvI0fyZwhV4d0lTwiUXvAKIPlma05Feb2Xngl52Mj5Cg==",
+                    "version": "7.0.1",
+                    "resolved": "https://registry.npmjs.org/meow/-/meow-7.0.1.tgz",
+                    "integrity": "sha512-tBKIQqVrAHqwit0vfuFPY3LlzJYkEOFyKa3bPgxzNl6q/RtN8KQ+ALYEASYuFayzSAsjlhXj/JZ10rH85Q6TUw==",
                     "dev": true,
                     "requires": {
                         "@types/minimist": "^1.2.0",
-                        "camelcase-keys": "^6.1.1",
+                        "arrify": "^2.0.1",
+                        "camelcase": "^6.0.0",
+                        "camelcase-keys": "^6.2.2",
                         "decamelize-keys": "^1.1.0",
-                        "hard-rejection": "^2.0.0",
-                        "minimist-options": "^4.0.1",
+                        "hard-rejection": "^2.1.0",
+                        "minimist-options": "^4.0.2",
                         "normalize-package-data": "^2.5.0",
-                        "read-pkg-up": "^7.0.0",
+                        "read-pkg-up": "^7.0.1",
                         "redent": "^3.0.0",
                         "trim-newlines": "^3.0.0",
-                        "type-fest": "^0.8.1",
-                        "yargs-parser": "^18.1.1"
+                        "type-fest": "^0.13.1",
+                        "yargs-parser": "^18.1.3"
                     }
                 },
                 "micromatch": {
@@ -12996,6 +13124,86 @@
                     "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
                     "dev": true
                 },
+                "postcss": {
+                    "version": "7.0.30",
+                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.30.tgz",
+                    "integrity": "sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==",
+                    "dev": true,
+                    "requires": {
+                        "chalk": "^2.4.2",
+                        "source-map": "^0.6.1",
+                        "supports-color": "^6.1.0"
+                    },
+                    "dependencies": {
+                        "ansi-styles": {
+                            "version": "3.2.1",
+                            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+                            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+                            "dev": true,
+                            "requires": {
+                                "color-convert": "^1.9.0"
+                            }
+                        },
+                        "chalk": {
+                            "version": "2.4.2",
+                            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+                            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+                            "dev": true,
+                            "requires": {
+                                "ansi-styles": "^3.2.1",
+                                "escape-string-regexp": "^1.0.5",
+                                "supports-color": "^5.3.0"
+                            },
+                            "dependencies": {
+                                "supports-color": {
+                                    "version": "5.5.0",
+                                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+                                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+                                    "dev": true,
+                                    "requires": {
+                                        "has-flag": "^3.0.0"
+                                    }
+                                }
+                            }
+                        },
+                        "color-convert": {
+                            "version": "1.9.3",
+                            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+                            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+                            "dev": true,
+                            "requires": {
+                                "color-name": "1.1.3"
+                            }
+                        },
+                        "color-name": {
+                            "version": "1.1.3",
+                            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+                            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+                            "dev": true
+                        },
+                        "has-flag": {
+                            "version": "3.0.0",
+                            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+                            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+                            "dev": true
+                        },
+                        "supports-color": {
+                            "version": "6.1.0",
+                            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+                            "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+                            "dev": true,
+                            "requires": {
+                                "has-flag": "^3.0.0"
+                            }
+                        }
+                    }
+                },
+                "postcss-value-parser": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+                    "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+                    "dev": true
+                },
                 "read-pkg": {
                     "version": "5.2.0",
                     "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
@@ -13025,6 +13233,14 @@
                         "find-up": "^4.1.0",
                         "read-pkg": "^5.2.0",
                         "type-fest": "^0.8.1"
+                    },
+                    "dependencies": {
+                        "type-fest": {
+                            "version": "0.8.1",
+                            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+                            "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+                            "dev": true
+                        }
                     }
                 },
                 "redent": {
@@ -13049,6 +13265,12 @@
                     "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
                     "dev": true
                 },
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                },
                 "strip-ansi": {
                     "version": "6.0.0",
                     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -13090,6 +13312,12 @@
                     "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz",
                     "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==",
                     "dev": true
+                },
+                "type-fest": {
+                    "version": "0.13.1",
+                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+                    "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+                    "dev": true
                 }
             }
         },
@@ -13250,9 +13478,9 @@
             }
         },
         "swr": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/swr/-/swr-0.2.0.tgz",
-            "integrity": "sha512-8IZCdM0deUPhDiqOmyaj0BsnNjav1fu83nD0d07PEAzOHOn+lxcJOxwXeDBShwF6qCeZ8u8ab+a2yXkjD8yT3A==",
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/swr/-/swr-0.2.2.tgz",
+            "integrity": "sha512-D/z+PTUchZhoUA0tNC8TNJivf7Hc61WPxbUdXPi+VxRloddWYNP1ZicaEgyAph42ZnKl1L7twcZr4q6d0UMXcg==",
             "requires": {
                 "fast-deep-equal": "2.0.1"
             }
@@ -13708,9 +13936,9 @@
             }
         },
         "typescript": {
-            "version": "3.8.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
-            "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
+            "version": "3.9.3",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz",
+            "integrity": "sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==",
             "dev": true
         },
         "unbzip2-stream": {
@@ -13881,9 +14109,9 @@
             }
         },
         "universalify": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-            "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+            "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
             "dev": true
         },
         "unpipe": {
@@ -13945,11 +14173,6 @@
                 }
             }
         },
-        "unstated-next": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/unstated-next/-/unstated-next-1.1.0.tgz",
-            "integrity": "sha512-AAn47ZncPvgBGOvMcn8tSRxsrqwf2VdAPxLASTuLJvZt4rhKfDvUkmYZLGfclImSfTVMv7tF4ynaVxin0JjDCA=="
-        },
         "upath": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
@@ -14115,9 +14338,9 @@
             "dev": true
         },
         "vfile": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.1.0.tgz",
-            "integrity": "sha512-BaTPalregj++64xbGK6uIlsurN3BCRNM/P2Pg8HezlGzKd1O9PrwIac6bd9Pdx2uTb0QHoioZ+rXKolbVXEgJg==",
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.1.1.tgz",
+            "integrity": "sha512-lRjkpyDGjVlBA7cDQhQ+gNcvB1BGaTHYuSOcY3S7OhDmBtnzX95FhtZZDecSTDm6aajFymyve6S5DN4ZHGezdQ==",
             "dev": true,
             "requires": {
                 "@types/unist": "^2.0.0",
@@ -14158,14 +14381,136 @@
             "dev": true
         },
         "watchpack": {
-            "version": "1.6.1",
-            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz",
-            "integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==",
+            "version": "1.7.2",
+            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
+            "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
             "dev": true,
             "requires": {
-                "chokidar": "^2.1.8",
+                "chokidar": "^3.4.0",
                 "graceful-fs": "^4.1.2",
-                "neo-async": "^2.5.0"
+                "neo-async": "^2.5.0",
+                "watchpack-chokidar2": "^2.0.0"
+            },
+            "dependencies": {
+                "anymatch": {
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+                    "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "normalize-path": "^3.0.0",
+                        "picomatch": "^2.0.4"
+                    }
+                },
+                "binary-extensions": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
+                    "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+                    "dev": true,
+                    "optional": true
+                },
+                "braces": {
+                    "version": "3.0.2",
+                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "fill-range": "^7.0.1"
+                    }
+                },
+                "chokidar": {
+                    "version": "3.4.0",
+                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
+                    "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "anymatch": "~3.1.1",
+                        "braces": "~3.0.2",
+                        "fsevents": "~2.1.2",
+                        "glob-parent": "~5.1.0",
+                        "is-binary-path": "~2.1.0",
+                        "is-glob": "~4.0.1",
+                        "normalize-path": "~3.0.0",
+                        "readdirp": "~3.4.0"
+                    }
+                },
+                "fill-range": {
+                    "version": "7.0.1",
+                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "to-regex-range": "^5.0.1"
+                    }
+                },
+                "fsevents": {
+                    "version": "2.1.3",
+                    "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+                    "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+                    "dev": true,
+                    "optional": true
+                },
+                "glob-parent": {
+                    "version": "5.1.1",
+                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+                    "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-glob": "^4.0.1"
+                    }
+                },
+                "is-binary-path": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+                    "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "binary-extensions": "^2.0.0"
+                    }
+                },
+                "is-number": {
+                    "version": "7.0.0",
+                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+                    "dev": true,
+                    "optional": true
+                },
+                "readdirp": {
+                    "version": "3.4.0",
+                    "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+                    "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "picomatch": "^2.2.1"
+                    }
+                },
+                "to-regex-range": {
+                    "version": "5.0.1",
+                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-number": "^7.0.0"
+                    }
+                }
+            }
+        },
+        "watchpack-chokidar2": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
+            "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "chokidar": "^2.1.8"
             },
             "dependencies": {
                 "chokidar": {
@@ -14173,6 +14518,7 @@
                     "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
                     "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "anymatch": "^2.0.0",
                         "async-each": "^1.0.1",
@@ -14467,9 +14813,9 @@
             }
         },
         "webpack-dev-server": {
-            "version": "3.10.3",
-            "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz",
-            "integrity": "sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==",
+            "version": "3.11.0",
+            "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
+            "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
             "dev": true,
             "requires": {
                 "ansi-html": "0.0.7",
@@ -14480,31 +14826,31 @@
                 "debug": "^4.1.1",
                 "del": "^4.1.1",
                 "express": "^4.17.1",
-                "html-entities": "^1.2.1",
+                "html-entities": "^1.3.1",
                 "http-proxy-middleware": "0.19.1",
                 "import-local": "^2.0.0",
                 "internal-ip": "^4.3.0",
                 "ip": "^1.1.5",
                 "is-absolute-url": "^3.0.3",
                 "killable": "^1.0.1",
-                "loglevel": "^1.6.6",
+                "loglevel": "^1.6.8",
                 "opn": "^5.5.0",
                 "p-retry": "^3.0.1",
-                "portfinder": "^1.0.25",
+                "portfinder": "^1.0.26",
                 "schema-utils": "^1.0.0",
                 "selfsigned": "^1.10.7",
                 "semver": "^6.3.0",
                 "serve-index": "^1.9.1",
-                "sockjs": "0.3.19",
+                "sockjs": "0.3.20",
                 "sockjs-client": "1.4.0",
-                "spdy": "^4.0.1",
+                "spdy": "^4.0.2",
                 "strip-ansi": "^3.0.1",
                 "supports-color": "^6.1.0",
                 "url": "^0.11.0",
                 "webpack-dev-middleware": "^3.7.2",
                 "webpack-log": "^2.0.0",
                 "ws": "^6.2.1",
-                "yargs": "12.0.5"
+                "yargs": "^13.3.2"
             },
             "dependencies": {
                 "ansi-regex": {
@@ -14533,34 +14879,6 @@
                         "upath": "^1.1.1"
                     }
                 },
-                "cliui": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-                    "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-                    "dev": true,
-                    "requires": {
-                        "string-width": "^2.1.1",
-                        "strip-ansi": "^4.0.0",
-                        "wrap-ansi": "^2.0.0"
-                    },
-                    "dependencies": {
-                        "ansi-regex": {
-                            "version": "3.0.0",
-                            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-                            "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-                            "dev": true
-                        },
-                        "strip-ansi": {
-                            "version": "4.0.0",
-                            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-                            "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-                            "dev": true,
-                            "requires": {
-                                "ansi-regex": "^3.0.0"
-                            }
-                        }
-                    }
-                },
                 "debug": {
                     "version": "4.1.1",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -14570,10 +14888,10 @@
                         "ms": "^2.1.1"
                     }
                 },
-                "get-caller-file": {
-                    "version": "1.0.3",
-                    "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-                    "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+                "emoji-regex": {
+                    "version": "7.0.3",
+                    "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+                    "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
                     "dev": true
                 },
                 "is-fullwidth-code-point": {
@@ -14588,12 +14906,6 @@
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 },
-                "require-main-filename": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-                    "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-                    "dev": true
-                },
                 "schema-utils": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -14612,28 +14924,29 @@
                     "dev": true
                 },
                 "string-width": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-                    "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+                    "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
                     "dev": true,
                     "requires": {
+                        "emoji-regex": "^7.0.1",
                         "is-fullwidth-code-point": "^2.0.0",
-                        "strip-ansi": "^4.0.0"
+                        "strip-ansi": "^5.1.0"
                     },
                     "dependencies": {
                         "ansi-regex": {
-                            "version": "3.0.0",
-                            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-                            "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+                            "version": "4.1.0",
+                            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+                            "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
                             "dev": true
                         },
                         "strip-ansi": {
-                            "version": "4.0.0",
-                            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-                            "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+                            "version": "5.2.0",
+                            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+                            "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
                             "dev": true,
                             "requires": {
-                                "ansi-regex": "^3.0.0"
+                                "ansi-regex": "^4.1.0"
                             }
                         }
                     }
@@ -14666,62 +14979,28 @@
                         "uuid": "^3.3.2"
                     }
                 },
-                "wrap-ansi": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-                    "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-                    "dev": true,
-                    "requires": {
-                        "string-width": "^1.0.1",
-                        "strip-ansi": "^3.0.1"
-                    },
-                    "dependencies": {
-                        "is-fullwidth-code-point": {
-                            "version": "1.0.0",
-                            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-                            "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-                            "dev": true,
-                            "requires": {
-                                "number-is-nan": "^1.0.0"
-                            }
-                        },
-                        "string-width": {
-                            "version": "1.0.2",
-                            "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-                            "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-                            "dev": true,
-                            "requires": {
-                                "code-point-at": "^1.0.0",
-                                "is-fullwidth-code-point": "^1.0.0",
-                                "strip-ansi": "^3.0.0"
-                            }
-                        }
-                    }
-                },
                 "yargs": {
-                    "version": "12.0.5",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-                    "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+                    "version": "13.3.2",
+                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+                    "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
                     "dev": true,
                     "requires": {
-                        "cliui": "^4.0.0",
-                        "decamelize": "^1.2.0",
+                        "cliui": "^5.0.0",
                         "find-up": "^3.0.0",
-                        "get-caller-file": "^1.0.1",
-                        "os-locale": "^3.0.0",
+                        "get-caller-file": "^2.0.1",
                         "require-directory": "^2.1.1",
-                        "require-main-filename": "^1.0.1",
+                        "require-main-filename": "^2.0.0",
                         "set-blocking": "^2.0.0",
-                        "string-width": "^2.0.0",
+                        "string-width": "^3.0.0",
                         "which-module": "^2.0.0",
-                        "y18n": "^3.2.1 || ^4.0.0",
-                        "yargs-parser": "^11.1.1"
+                        "y18n": "^4.0.0",
+                        "yargs-parser": "^13.1.2"
                     }
                 },
                 "yargs-parser": {
-                    "version": "11.1.1",
-                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-                    "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+                    "version": "13.1.2",
+                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+                    "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
                     "dev": true,
                     "requires": {
                         "camelcase": "^5.0.0",
@@ -14781,13 +15060,11 @@
             }
         },
         "websocket-driver": {
-            "version": "0.7.3",
-            "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
-            "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
+            "version": "0.6.5",
+            "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+            "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
             "dev": true,
             "requires": {
-                "http-parser-js": ">=0.4.0 <0.4.11",
-                "safe-buffer": ">=5.1.0",
                 "websocket-extensions": ">=0.1.1"
             }
         },
@@ -14980,24 +15257,10 @@
             "optional": true
         },
         "yaml": {
-            "version": "1.9.2",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.9.2.tgz",
-            "integrity": "sha512-HPT7cGGI0DuRcsO51qC1j9O16Dh1mZ2bnXwsi0jrSpsLz0WxOLSLXfkABVl6bZO629py3CU+OMJtpNHDLB97kg==",
-            "dev": true,
-            "requires": {
-                "@babel/runtime": "^7.9.2"
-            },
-            "dependencies": {
-                "@babel/runtime": {
-                    "version": "7.9.2",
-                    "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
-                    "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
-                    "dev": true,
-                    "requires": {
-                        "regenerator-runtime": "^0.13.4"
-                    }
-                }
-            }
+            "version": "1.10.0",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz",
+            "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==",
+            "dev": true
         },
         "yargs": {
             "version": "13.2.4",
diff --git a/package.json b/package.json
index df7d75d..750bd36 100644
--- a/package.json
+++ b/package.json
@@ -29,71 +29,72 @@
     },
     "devDependencies": {
         "@babel/cli": "^7.8.4",
-        "@babel/core": "^7.9.0",
-        "@babel/preset-env": "^7.9.5",
+        "@babel/core": "^7.9.6",
+        "@babel/preset-env": "^7.9.6",
         "@babel/preset-react": "^7.9.4",
         "@hot-loader/react-dom": "^16.13.0",
         "@types/classnames": "^2.2.10",
         "@types/lodash-es": "^4.17.3",
-        "@types/node": "^13.13.2",
-        "@types/react": "^16.9.34",
-        "@types/react-dom": "^16.9.6",
-        "@types/react-router-dom": "^5.1.4",
-        "@types/react-table": "^7.0.16",
+        "@types/node": "^14.0.6",
+        "@types/react": "^16.9.35",
+        "@types/react-dom": "^16.9.8",
+        "@types/react-router-dom": "^5.1.5",
+        "@types/react-table": "^7.0.18",
         "@types/react-virtualized-auto-sizer": "^1.0.0",
         "@types/react-window": "^1.8.2",
+        "@types/recoil": "0.0.0",
         "@typescript-eslint/eslint-plugin": "^2.29.0",
         "@typescript-eslint/parser": "^2.29.0",
-        "autoprefixer": "^9.7.6",
+        "autoprefixer": "^9.8.0",
         "awesome-typescript-loader": "^5.2.1",
         "babel-loader": "^8.1.0",
         "babel-preset-minify": "^0.5.1",
         "css-loader": "^3.5.3",
         "eslint": "^6.8.0",
         "eslint-config-standard": "^14.1.1",
-        "eslint-loader": "^4.0.0",
+        "eslint-loader": "^4.0.2",
         "eslint-plugin-import": "^2.20.2",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^4.2.1",
-        "eslint-plugin-react": "^7.19.0",
+        "eslint-plugin-react": "^7.20.0",
         "eslint-plugin-standard": "^4.0.1",
         "file-loader": "^6.0.0",
-        "html-webpack-plugin": "^4.2.0",
+        "html-webpack-plugin": "^4.3.0",
         "image-webpack-loader": "^6.0.0",
         "mini-css-extract-plugin": "^0.9.0",
         "offline-plugin": "^5.0.7",
         "postcss-loader": "^3.0.0",
-        "react-hot-loader": "^4.12.20",
-        "sass": "^1.26.5",
+        "react-hot-loader": "^4.12.21",
+        "sass": "^1.26.7",
         "sass-loader": "^8.0.2",
-        "style-loader": "^1.2.0",
-        "stylelint": "^13.3.3",
+        "style-loader": "^1.2.1",
+        "stylelint": "^13.5.0",
         "stylelint-config-standard": "^20.0.0",
         "stylelint-webpack-plugin": "^1.2.3",
         "terser-webpack-plugin": "^2.3.5",
-        "typescript": "^3.8.3",
+        "typescript": "^3.9.3",
         "webpack": "^4.43.0",
         "webpack-cli": "^3.3.11",
         "webpack-dev-middleware": "^3.7.2",
-        "webpack-dev-server": "^3.10.3",
+        "webpack-dev-server": "^3.11.0",
         "webpack-merge": "^4.2.2",
         "webpack-pwa-manifest": "^4.2.0"
     },
     "dependencies": {
         "axios": "^0.19.2",
         "classnames": "^2.2.6",
-        "dayjs": "^1.8.25",
-        "eventemitter3": "^4.0.0",
-        "immer": "^6.0.3",
+        "dayjs": "^1.8.28",
+        "eventemitter3": "^4.0.4",
+        "immer": "^6.0.9",
         "lodash-es": "^4.17.15",
         "react": "^16.13.1",
         "react-dom": "^16.13.1",
-        "react-router-dom": "^5.1.2",
-        "react-table": "^7.0.4",
+        "react-router-dom": "^5.2.0",
+        "react-table": "^7.1.0",
         "react-virtualized-auto-sizer": "^1.0.2",
         "react-window": "^1.8.5",
-        "swr": "^0.2.0",
-        "unstated-next": "^1.1.0",
+        "recoil": "0.0.7",
+        "swr": "^0.2.2",
         "use-immer": "^0.4.0"
     }
 }
diff --git a/src/components/Tags/index.tsx b/src/components/Tags/index.tsx
index 0ba41da..7f6bdbe 100644
--- a/src/components/Tags/index.tsx
+++ b/src/components/Tags/index.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useRef, useLayoutEffect } from 'react'
-import { containers } from '@stores'
+import { useI18n } from '@stores'
 import { BaseComponentProps } from '@models'
 import { noop } from '@lib/helper'
 import classnames from 'classnames'
@@ -8,16 +8,16 @@ import './style.scss'
 interface TagsProps extends BaseComponentProps {
     data: string[]
     onClick: (name: string) => void
-    shouldError?: (name: string) => boolean
+    errSet?: Set<string>
     select: string
     rowHeight: number
     canClick: boolean
 }
 
 export function Tags (props: TagsProps) {
-    const { className, data, onClick, select, canClick, shouldError, rowHeight: rawHeight } = props
+    const { className, data, onClick, select, canClick, errSet, rowHeight: rawHeight } = props
 
-    const { useTranslation } = containers.useI18n()
+    const { useTranslation } = useI18n()
     const { t } = useTranslation('Proxies')
     const [expand, setExpand] = useState(false)
     const [showExtend, setShowExtend] = useState(false)
@@ -36,7 +36,7 @@ export function Tags (props: TagsProps) {
 
     const tags = data
         .map(t => {
-            const tagClass = classnames({ 'tags-selected': select === t, 'can-click': canClick, error: shouldError && shouldError(t) })
+            const tagClass = classnames({ 'tags-selected': select === t, 'can-click': canClick, error: errSet?.has(t) })
             return (
                 <li className={tagClass} key={t} onClick={() => handleClick(t)}>
                     { t }
diff --git a/src/containers/Connections/index.tsx b/src/containers/Connections/index.tsx
index 6ef7342..58c7daa 100644
--- a/src/containers/Connections/index.tsx
+++ b/src/containers/Connections/index.tsx
@@ -2,7 +2,7 @@ import React, { useMemo, useLayoutEffect } from 'react'
 import { useBlockLayout, useResizeColumns, useTable } from 'react-table'
 import classnames from 'classnames'
 import { Header, Card, Checkbox, Modal, Icon } from '@components'
-import { containers } from '@stores'
+import { useI18n } from '@stores'
 import * as API from '@lib/request'
 import { StreamReader } from '@lib/streamer'
 import { useObject, useVisible } from '@lib/hook'
@@ -62,7 +62,7 @@ function formatSpeed (upload: number, download: number) {
 }
 
 export default function Connections () {
-    const { useTranslation, lang } = containers.useI18n()
+    const { useTranslation, lang } = useI18n()
     const t = useMemo(() => useTranslation('Connections').t, [useTranslation])
 
     // total
diff --git a/src/containers/ExternalControllerDrawer/index.tsx b/src/containers/ExternalControllerDrawer/index.tsx
index 317fdb4..5e50c81 100644
--- a/src/containers/ExternalControllerDrawer/index.tsx
+++ b/src/containers/ExternalControllerDrawer/index.tsx
@@ -1,14 +1,14 @@
 import React, { useEffect } from 'react'
 import { useObject } from '@lib/hook'
 import { Modal, Input, Row, Col, Alert } from '@components'
-import { containers } from '@stores'
+import { useI18n, useAPIInfo, useIdentity } from '@stores'
 import './style.scss'
 
 export default function ExternalController () {
-    const { useTranslation } = containers.useI18n()
+    const { useTranslation } = useI18n()
     const { t } = useTranslation('Settings')
-    const { data: info, update, fetch } = containers.useAPIInfo()
-    const { unauthorized: { hide, visible } } = containers.useData()
+    const { data: info, update, fetch } = useAPIInfo()
+    const { identity, set: setIdentity } = useIdentity()
     const [value, set] = useObject({
         hostname: '',
         port: '',
@@ -30,10 +30,10 @@ export default function ExternalController () {
 
     return (
         <Modal
-            show={visible}
+            show={!identity}
             title={t('externalControllerSetting.title')}
             bodyClassName="external-controller"
-            onClose={hide}
+            onClose={() => setIdentity(true)}
             onOk={handleOk}
         >
             <Alert type="info" inside={true}>
diff --git a/src/containers/Logs/index.tsx b/src/containers/Logs/index.tsx
index b3f70ef..a72cefb 100644
--- a/src/containers/Logs/index.tsx
+++ b/src/containers/Logs/index.tsx
@@ -1,6 +1,6 @@
 import React, { useLayoutEffect, useEffect, useRef, useState } from 'react'
 import dayjs from 'dayjs'
-import { containers } from '@stores'
+import { useI18n } from '@stores'
 import { Card, Header } from '@components'
 import { getLogsStreamReader } from '@lib/request'
 import { StreamReader } from '@lib/streamer'
@@ -11,7 +11,7 @@ export default function Logs () {
     const listRef = useRef<HTMLUListElement>()
     const logsRef = useRef<Log[]>([])
     const [logs, setLogs] = useState<Log[]>([])
-    const { useTranslation } = containers.useI18n()
+    const { useTranslation } = useI18n()
     const { t } = useTranslation('Logs')
 
     useLayoutEffect(() => {
diff --git a/src/containers/Proxies/components/Group/index.tsx b/src/containers/Proxies/components/Group/index.tsx
index 9e82f0e..ea32a10 100644
--- a/src/containers/Proxies/components/Group/index.tsx
+++ b/src/containers/Proxies/components/Group/index.tsx
@@ -1,5 +1,6 @@
-import * as React from 'react'
-import { containers } from '@stores'
+import React, { useMemo } from 'react'
+import { useRecoilValue } from 'recoil'
+import { useProxy, useConfig, proxyMapping } from '@stores'
 import { changeProxySelected, Group as IGroup, getConnections, closeConnection } from '@lib/request'
 import { Tags, Tag } from '@components'
 import './style.scss'
@@ -9,13 +10,14 @@ interface GroupProps {
 }
 
 export function Group (props: GroupProps) {
-    const { fetch, data: Data } = containers.useData()
-    const { data: Config } = containers.useConfig()
+    const { update } = useProxy()
+    const proxyMap = useRecoilValue(proxyMapping)
+    const { data: Config } = useConfig()
     const { config } = props
 
     async function handleChangeProxySelected (name: string) {
         await changeProxySelected(props.config.name, name)
-        await fetch()
+        await update()
         if (Config.breakConnections) {
             const list: string[] = []
             const snapshot = await getConnections()
@@ -31,14 +33,17 @@ export function Group (props: GroupProps) {
         }
     }
 
-    function shouldError (name: string) {
-        const history = Data.proxyMap.get(name)?.history
-        if (history?.length) {
-            return !history.slice(-1)[0].delay
+    const errSet = useMemo(() => {
+        const set = new Set<string>()
+        for (const proxy of config.all) {
+            const history = proxyMap.get(proxy)?.history
+            if (history?.length && history.slice(-1)[0].delay !== 0) {
+                set.add(proxy)
+            }
         }
 
-        return false
-    }
+        return set
+    }, [proxyMap])
 
     const canClick = config.type === 'Selector'
     return (
@@ -52,7 +57,7 @@ export function Group (props: GroupProps) {
                     className="proxy-group-tags"
                     data={config.all}
                     onClick={handleChangeProxySelected}
-                    shouldError={shouldError}
+                    errSet={errSet}
                     select={config.now}
                     canClick={canClick}
                     rowHeight={30} />
diff --git a/src/containers/Proxies/components/Provider/index.tsx b/src/containers/Proxies/components/Provider/index.tsx
index 17a5336..82945b7 100644
--- a/src/containers/Proxies/components/Provider/index.tsx
+++ b/src/containers/Proxies/components/Provider/index.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { useMemo } from 'react'
 import { Card, Tag, Icon, Loading } from '@components'
-import { containers } from '@stores'
+import { useI18n, useProxyProviders } from '@stores'
 import { fromNow } from '@lib/date'
 import { Provider as IProvider, Proxy as IProxy, updateProvider, healthCheckProvider } from '@lib/request'
 import { useVisible } from '@lib/hook'
@@ -14,22 +14,22 @@ interface ProvidersProps {
 }
 
 export function Provider (props: ProvidersProps) {
-    const { fetch } = containers.useData()
-    const { useTranslation, lang } = containers.useI18n()
-    const { provider } = props
+    const { update } = useProxyProviders()
+    const { useTranslation, lang } = useI18n()
 
+    const { provider } = props
     const { t } = useTranslation('Proxies')
 
     const { visible, hide, show } = useVisible()
 
     function handleHealthChech () {
         show()
-        healthCheckProvider(provider.name).then(() => fetch()).finally(() => hide())
+        healthCheckProvider(provider.name).then(() => update()).finally(() => hide())
     }
 
     function handleUpdate () {
         show()
-        updateProvider(provider.name).then(() => fetch()).finally(() => hide())
+        updateProvider(provider.name).then(() => update()).finally(() => hide())
     }
 
     const proxies = useMemo(() => {
diff --git a/src/containers/Proxies/components/Proxy/index.tsx b/src/containers/Proxies/components/Proxy/index.tsx
index a4afb3d..b17dbf8 100644
--- a/src/containers/Proxies/components/Proxy/index.tsx
+++ b/src/containers/Proxies/components/Proxy/index.tsx
@@ -1,7 +1,7 @@
-import React, { useState, useMemo, useLayoutEffect, useEffect } from 'react'
+import React, { useMemo, useLayoutEffect } from 'react'
 import classnames from 'classnames'
 import { BaseComponentProps } from '@models'
-import { containers } from '@stores'
+import { useProxy } from '@stores'
 import { getProxyDelay, Proxy as IProxy } from '@lib/request'
 import EE, { Action } from '@lib/event'
 import { isClashX, jsBridge } from '@lib/jsBridge'
@@ -14,8 +14,8 @@ interface ProxyProps extends BaseComponentProps {
 
 const TagColors = {
     '#909399': 0,
-    '#00c520': 150,
-    '#ff9a28': 500,
+    '#00c520': 260,
+    '#ff9a28': 600,
     '#ff3e5e': Infinity
 }
 
@@ -31,20 +31,24 @@ async function getDelay (name: string) {
 
 export function Proxy (props: ProxyProps) {
     const { config, className } = props
-    const [delay, setDelay] = useState(0)
-    const { updateDelay } = containers.useData()
+    const { set } = useProxy()
 
     async function speedTest () {
         const [delay, err] = await to(getDelay(config.name))
 
         const validDelay = err ? 0 : delay
-        setDelay(validDelay)
-        updateDelay(config.name, validDelay)
+        set(draft => {
+            const proxy = draft.proxies.find(p => p.name === proxy)
+            if (proxy) {
+                proxy.history.push({ time: Date.now().toString(), delay: validDelay })
+            }
+        })
     }
 
-    useEffect(() => {
-        setDelay(config.history && config.history.length ? config.history.slice(-1)[0].delay : 0)
-    }, [config])
+    const delay = useMemo(
+        () => config.history?.length ? config.history.slice(-1)[0].delay : 0,
+        [config]
+    )
 
     useLayoutEffect(() => {
         EE.subscribe(Action.SPEED_NOTIFY, speedTest)
diff --git a/src/containers/Proxies/index.tsx b/src/containers/Proxies/index.tsx
index af2a3c7..f4d1f85 100644
--- a/src/containers/Proxies/index.tsx
+++ b/src/containers/Proxies/index.tsx
@@ -3,7 +3,7 @@ import useSWR from 'swr'
 import EE from '@lib/event'
 import { useRound } from '@lib/hook'
 import { Card, Header, Icon, Checkbox } from '@components'
-import { containers } from '@stores'
+import { useI18n, useConfig, useProxy, useProxyProviders } from '@stores'
 import * as API from '@lib/request'
 
 import { Proxy, Group, Provider } from './components'
@@ -27,12 +27,68 @@ export function compareDesc (a: API.Proxy, b: API.Proxy) {
     return (lastDelayB || Number.MAX_SAFE_INTEGER) - (lastDelayA || Number.MAX_SAFE_INTEGER)
 }
 
-export default function Proxies () {
-    const { data, fetch } = containers.useData()
-    const { useTranslation } = containers.useI18n()
-    const { data: config, set: setConfig } = containers.useConfig()
+function ProxyGroups () {
+    const { groups } = useProxy()
+    const { data: config, set: setConfig } = useConfig()
+    const { useTranslation } = useI18n()
+    const { t } = useTranslation('Proxies')
+
+    return <>
+        {
+            groups.length !== 0 &&
+            <div className="proxies-container">
+                <Header title={t('groupTitle')}>
+                    <Checkbox
+                        className="connections-filter"
+                        checked={config.breakConnections}
+                        onChange={value => setConfig('breakConnections', value)}>
+                        {t('breakConnectionsText')}
+                    </Checkbox>
+                </Header>
+                <Card className="proxies-group-card">
+                    <ul className="proxies-group-list">
+                        {
+                            groups.map(p => (
+                                <li className="proxies-group-item" key={p.name}>
+                                    <Group config={p} />
+                                </li>
+                            ))
+                        }
+                    </ul>
+                </Card>
+            </div>
+        }
+    </>
+}
+
+function ProxyProviders () {
+    const { providers } = useProxyProviders()
+    const { useTranslation } = useI18n()
+    const { t } = useTranslation('Proxies')
+
+    return <>
+        {
+            providers.length !== 0 &&
+            <div className="proxies-container">
+                <Header title={t('providerTitle')} />
+                <ul className="proxies-providers-list">
+                    {
+                        providers.map(p => (
+                            <li className="proxies-providers-item" key={p.name}>
+                                <Provider provider={p} />
+                            </li>
+                        ))
+                    }
+                </ul>
+            </div>
+        }
+    </>
+}
+
+function Proxies () {
+    const { proxies } = useProxy()
+    const { useTranslation } = useI18n()
     const { t } = useTranslation('Proxies')
-    useSWR('data', fetch)
 
     function handleNotitySpeedTest () {
         EE.notifySpeedTest()
@@ -41,78 +97,53 @@ export default function Proxies () {
     const { current: sort, next } = useRound(
         [sortType.Asc, sortType.Desc, sortType.None]
     )
-    const proxies = useMemo(() => {
+    const sortedProxies = useMemo(() => {
         switch (sort) {
         case sortType.Desc:
-            return data.proxy.slice().sort((a, b) => compareDesc(a, b))
+            return proxies.slice().sort((a, b) => compareDesc(a, b))
         case sortType.Asc:
-            return data.proxy.slice().sort((a, b) => -1 * compareDesc(a, b))
+            return proxies.slice().sort((a, b) => -1 * compareDesc(a, b))
         default:
-            return data.proxy.slice()
+            return proxies.slice()
         }
-    }, [sort, data])
+    }, [sort, proxies])
     const handleSort = next
 
+    return <>
+        {
+            sortedProxies.length !== 0 &&
+            <div className="proxies-container">
+                <Header title={t('title')}>
+                    <Icon className="proxies-action-icon" type={sortMap[sort]} onClick={handleSort} size={20} />
+                    <Icon className="proxies-action-icon" type="speed" size={20} />
+                    <span className="proxies-speed-test" onClick={handleNotitySpeedTest}>{t('speedTestText')}</span>
+                </Header>
+                <ul className="proxies-list">
+                    {
+                        sortedProxies.map(p => (
+                            <li key={p.name}>
+                                <Proxy config={p} />
+                            </li>
+                        ))
+                    }
+                </ul>
+            </div>
+        }
+    </>
+}
+
+export default function ProxyContainer () {
+    const { update: updateProxy } = useProxy()
+    const { update: updateProvider } = useProxyProviders()
+
+    useSWR('proxies', updateProxy)
+    useSWR('providers', updateProvider)
+
     return (
         <div className="page">
-            {
-                data.proxyGroup.length !== 0 &&
-                <div className="proxies-container">
-                    <Header title={t('groupTitle')}>
-                        <Checkbox
-                            className="connections-filter"
-                            checked={config.breakConnections}
-                            onChange={value => setConfig('breakConnections', value)}>
-                            {t('breakConnectionsText')}
-                        </Checkbox>
-                    </Header>
-                    <Card className="proxies-group-card">
-                        <ul className="proxies-group-list">
-                            {
-                                data.proxyGroup.map(p => (
-                                    <li className="proxies-group-item" key={p.name}>
-                                        <Group config={p} />
-                                    </li>
-                                ))
-                            }
-                        </ul>
-                    </Card>
-                </div>
-            }
-            {
-                data.proxyProviders.length !== 0 &&
-                <div className="proxies-container">
-                    <Header title={t('providerTitle')} />
-                    <ul className="proxies-providers-list">
-                        {
-                            data.proxyProviders.map(p => (
-                                <li className="proxies-providers-item" key={p.name}>
-                                    <Provider provider={p} />
-                                </li>
-                            ))
-                        }
-                    </ul>
-                </div>
-            }
-            {
-                proxies.length !== 0 &&
-                <div className="proxies-container">
-                    <Header title={t('title')}>
-                        <Icon className="proxies-action-icon" type={sortMap[sort]} onClick={handleSort} size={20} />
-                        <Icon className="proxies-action-icon" type="speed" size={20} />
-                        <span className="proxies-speed-test" onClick={handleNotitySpeedTest}>{t('speedTestText')}</span>
-                    </Header>
-                    <ul className="proxies-list">
-                        {
-                            proxies.map(p => (
-                                <li key={p.name}>
-                                    <Proxy config={p} />
-                                </li>
-                            ))
-                        }
-                    </ul>
-                </div>
-            }
+            <ProxyGroups />
+            <ProxyProviders />
+            <Proxies />
         </div>
     )
 }
diff --git a/src/containers/Rules/index.tsx b/src/containers/Rules/index.tsx
index cd36289..48d6eee 100644
--- a/src/containers/Rules/index.tsx
+++ b/src/containers/Rules/index.tsx
@@ -1,19 +1,17 @@
-import React, { useEffect } from 'react'
+import React from 'react'
 import { Header, Card, Row, Col } from '@components'
-import { containers } from '@stores'
+import { useI18n, useRule } from '@stores'
 import { FixedSizeList as List } from 'react-window'
 import AutoSizer from 'react-virtualized-auto-sizer'
+import useSWR from 'swr'
 import './style.scss'
 
 export default function Rules () {
-    const { data, fetch } = containers.useData()
-    const { useTranslation } = containers.useI18n()
+    const { rules, update } = useRule()
+    const { useTranslation } = useI18n()
     const { t } = useTranslation('Rules')
-    const { rules } = data
 
-    useEffect(() => {
-        fetch()
-    }, [])
+    useSWR('rules', update)
 
     function renderRuleItem ({ index, style }: { index: number, style: React.CSSProperties }) {
         const rule = rules[index]
diff --git a/src/containers/Settings/index.tsx b/src/containers/Settings/index.tsx
index 25613d1..53b51c8 100644
--- a/src/containers/Settings/index.tsx
+++ b/src/containers/Settings/index.tsx
@@ -1,9 +1,8 @@
 import React, { useEffect } from 'react'
 import { Header, Card, Row, Col, Switch, ButtonSelect, ButtonSelectOptions, Input, Icon } from '@components'
-import { containers } from '@stores'
+import { useI18n, useClashXData, useAPIInfo, useGeneral, useIdentity } from '@stores'
 import { updateConfig } from '@lib/request'
 import { useObject } from '@lib/hook'
-import { to } from '@lib/helper'
 import { isClashX, jsBridge } from '@lib/jsBridge'
 import { Lang } from '@i18n'
 import './style.scss'
@@ -11,10 +10,11 @@ import './style.scss'
 const languageOptions: ButtonSelectOptions[] = [{ label: '中文', value: 'zh_CN' }, { label: 'English', value: 'en_US' }]
 
 export default function Settings () {
-    const { data: clashXData, fetch: fetchClashXData } = containers.useClashXData()
-    const { data, fetch, unauthorized: { show } } = containers.useData()
-    const { data: apiInfo } = containers.useAPIInfo()
-    const { useTranslation, setLang, lang } = containers.useI18n()
+    const { data: clashXData, update: fetchClashXData } = useClashXData()
+    const { general, update: fetchGeneral } = useGeneral()
+    const { set: setIdentity } = useIdentity()
+    const { data: apiInfo } = useAPIInfo()
+    const { useTranslation, setLang, lang } = useI18n()
     const { t } = useTranslation('Settings')
     const [info, set] = useObject({
         socks5ProxyPort: 7891,
@@ -23,22 +23,20 @@ export default function Settings () {
     })
 
     useEffect(() => {
-        fetch()
+        fetchGeneral()
         if (isClashX()) {
             fetchClashXData().then(() => set('isClashX', true))
         }
     }, [])
 
     useEffect(() => {
-        set('socks5ProxyPort', data.general.socksPort)
-        set('httpProxyPort', data.general.port)
-    }, [data])
+        set('socks5ProxyPort', general.socksPort)
+        set('httpProxyPort', general.port)
+    }, [general])
 
     async function handleProxyModeChange (mode: string) {
-        const [, err] = await to(updateConfig({ mode }))
-        if (!err) {
-            fetch()
-        }
+        await updateConfig({ mode })
+        await fetchGeneral()
     }
 
     async function handleStartAtLoginChange (state: boolean) {
@@ -56,26 +54,18 @@ export default function Settings () {
     }
 
     async function handleHttpPortSave () {
-        const [, err] = await to(updateConfig({ port: info.httpProxyPort }))
-        if (!err) {
-            await fetch()
-            set('httpProxyPort', data.general.port)
-        }
+        await updateConfig({ port: info.httpProxyPort })
+        await fetchGeneral()
     }
 
     async function handleSocksPortSave () {
-        const [, err] = await to(updateConfig({ 'socks-port': info.socks5ProxyPort }))
-        if (!err) {
-            await fetch()
-            set('socks5ProxyPort', data.general.socksPort)
-        }
+        await updateConfig({ 'socks-port': info.socks5ProxyPort })
+        await fetchGeneral()
     }
 
     async function handleAllowLanChange (state: boolean) {
-        const [, err] = await to(updateConfig({ 'allow-lan': state }))
-        if (!err) {
-            await fetch()
-        }
+        await updateConfig({ 'allow-lan': state })
+        await fetchGeneral()
     }
 
     const {
@@ -83,7 +73,7 @@ export default function Settings () {
         port: externalControllerPort
     } = apiInfo
 
-    const { allowLan, mode } = data.general
+    const { allowLan, mode } = general
     const {
         startAtLogin,
         systemProxy
@@ -189,7 +179,7 @@ export default function Settings () {
                             <span className="label">{t('labels.externalController')}</span>
                         </Col>
                         <Col className="external-controller" span={10}>
-                            <span className="modify-btn" onClick={show}>
+                            <span className="modify-btn" onClick={() => setIdentity(false)}>
                                 {`${externalControllerHost}:${externalControllerPort}`}
                             </span>
                         </Col>
diff --git a/src/containers/Sidebar/index.tsx b/src/containers/Sidebar/index.tsx
index 3bf0eb9..e37fb3f 100644
--- a/src/containers/Sidebar/index.tsx
+++ b/src/containers/Sidebar/index.tsx
@@ -1,10 +1,11 @@
 import * as React from 'react'
 import { NavLink } from 'react-router-dom'
 import classnames from 'classnames'
-import { containers } from '@stores'
+import { useI18n, useVersion } from '@stores'
 
 import './style.scss'
 import logo from '@assets/logo.png'
+import useSWR from 'swr'
 
 interface SidebarProps {
     routes: {
@@ -17,9 +18,12 @@ interface SidebarProps {
 
 export default function Sidebar (props: SidebarProps) {
     const { routes } = props
-    const { useTranslation } = containers.useI18n()
+    const { useTranslation } = useI18n()
+    const { version, premium, update } = useVersion()
     const { t } = useTranslation('SideBar')
 
+    useSWR('version', update)
+
     const navlinks = routes.map(
         ({ path, name, exact, noMobile }) => (
             <li className={classnames('item', { 'no-mobile': noMobile })} key={name}>
@@ -34,6 +38,11 @@ export default function Sidebar (props: SidebarProps) {
             <ul className="sidebar-menu">
                 { navlinks }
             </ul>
+            <div className="sidebar-version">
+                <span className="sidebar-version-label">Clash { t('Version') }</span>
+                <span className="sidebar-version-text">{ version }</span>
+                { premium && <span className="sidebar-version-label">Premium</span> }
+            </div>
         </div>
     )
 }
diff --git a/src/containers/Sidebar/style.scss b/src/containers/Sidebar/style.scss
index 2c9a6fa..0f11eea 100644
--- a/src/containers/Sidebar/style.scss
+++ b/src/containers/Sidebar/style.scss
@@ -3,6 +3,7 @@
 .sidebar {
     position: fixed;
     top: 0;
+    bottom: 0;
     left: 0;
     display: flex;
     flex-direction: column;
@@ -21,6 +22,7 @@
 .sidebar-menu {
     display: flex;
     flex-direction: column;
+    flex: 1;
     margin-top: 12px;
 
     .item {
@@ -52,6 +54,26 @@
     }
 }
 
+.sidebar-version {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding-bottom: 20px;
+}
+
+.sidebar-version-label {
+    font-size: 14px;
+    color: $color-primary-dark;
+    text-shadow: 0 2px 6px rgba($color: $color-primary-dark, $alpha: 0.4);
+}
+
+.sidebar-version-text {
+    text-align: center;
+    font-size: 14px;
+    margin: 8px 0;
+    color: $color-primary-darken;
+}
+
 @media (max-width: 768px) {
     .sidebar {
         width: 100%;
diff --git a/src/i18n/en_US.ts b/src/i18n/en_US.ts
index 9e8004c..6ed55ef 100644
--- a/src/i18n/en_US.ts
+++ b/src/i18n/en_US.ts
@@ -5,7 +5,8 @@ export default {
         Logs: 'Logs',
         Rules: 'Rules',
         Settings: 'Setting',
-        Connections: 'Connections'
+        Connections: 'Connections',
+        Version: 'Version'
     },
     Settings: {
         title: 'Settings',
diff --git a/src/i18n/index.ts b/src/i18n/index.ts
index ee81cfd..e5e075b 100644
--- a/src/i18n/index.ts
+++ b/src/i18n/index.ts
@@ -1,13 +1,11 @@
 /* eslint-disable camelcase */
 /* eslint-disable @typescript-eslint/camelcase */
-import { useState, useCallback } from 'react'
-import get from 'lodash/get'
 import { getLocalStorageItem, setLocalStorageItem } from '@lib/helper'
 
 import en_US from './en_US'
 import zh_CN from './zh_CN'
 
-const Language = {
+export const Language = {
     en_US,
     zh_CN
 }
@@ -16,7 +14,7 @@ export type Lang = keyof typeof Language
 
 const languageKey = 'language'
 
-const locales = Object.keys(Language)
+export const locales = Object.keys(Language)
 
 function getNavigatorLanguage (): string[] {
     const found: string[] = []
@@ -34,7 +32,7 @@ function getNavigatorLanguage (): string[] {
     return found
 }
 
-function getLanguage (): Lang {
+export function getLanguage (): Lang {
     const localLanguage = getLocalStorageItem(languageKey)
     if (localLanguage && locales.includes(localLanguage)) {
         return localLanguage as Lang
@@ -52,23 +50,6 @@ function getLanguage (): Lang {
     return 'en_US'
 }
 
-export function useI18n () {
-    const [lang, set] = useState(getLanguage())
-
-    function setLang (lang: Lang) {
-        set(lang)
-        setLocalStorageItem(languageKey, lang)
-    }
-
-    const useTranslation = useCallback(
-        function (namespace: string) {
-            function t (path: string) {
-                return get(Language[lang][namespace], path) as string
-            }
-            return { t }
-        },
-        [lang]
-    )
-
-    return { lang, locales, setLang, useTranslation }
+export function setLanguage (lang: Lang) {
+    setLocalStorageItem(languageKey, lang)
 }
diff --git a/src/i18n/zh_CN.ts b/src/i18n/zh_CN.ts
index e0ed898..15f4b9b 100644
--- a/src/i18n/zh_CN.ts
+++ b/src/i18n/zh_CN.ts
@@ -5,7 +5,8 @@ export default {
         Logs: '日志',
         Rules: '规则',
         Settings: '设置',
-        Connections: '连接'
+        Connections: '连接',
+        Version: '版本'
     },
     Settings: {
         title: '设置',
diff --git a/src/lib/helper.ts b/src/lib/helper.ts
index 6809020..302b377 100644
--- a/src/lib/helper.ts
+++ b/src/lib/helper.ts
@@ -26,8 +26,6 @@ export async function to <T, E = Error> (promise: Promise<T>): Promise<[T, E]> {
     }
 }
 
-export type Partial<T> = { [P in keyof T]?: T[P] }
-
 export function partition<T> (arr: T[], fn: (T) => boolean): [T[], T[]] {
     const left: T[] = []
     const right: T[] = []
diff --git a/src/lib/hook.ts b/src/lib/hook.ts
index 6bef9f2..e0dca88 100644
--- a/src/lib/hook.ts
+++ b/src/lib/hook.ts
@@ -1,6 +1,5 @@
 import { Draft } from 'immer'
 import { useImmer } from 'use-immer'
-import { createContainer } from 'unstated-next'
 import { useRef, useEffect, useState, useMemo } from 'react'
 
 import { noop } from '@lib/helper'
@@ -54,26 +53,6 @@ export function useInterval (callback: () => void, delay: number) {
     )
 }
 
-type containerFn<Value, State = void> = (initialState?: State) => Value
-
-export function composeContainer<T, C extends containerFn<T>, U extends { [key: string]: C }, K extends keyof U> (mapping: U) {
-    function Global () {
-        return Object.keys(mapping).reduce((obj, key) => {
-            obj[key as K] = mapping[key]()
-            return obj
-        }, {} as { [K in keyof U]: T })
-    }
-
-    const allContainer = createContainer(Global)
-    return {
-        Provider: allContainer.Provider,
-        containers: Object.keys(mapping).reduce((obj, key) => {
-            obj[key as K] = (() => allContainer.useContainer()[key]) as U[K]
-            return obj
-        }, {} as { [K in keyof U]: U[K] })
-    }
-}
-
 export function useRound<T> (list: T[], defidx = 0) {
     if (list.length < 2) {
         throw new Error('List requires at least two elements')
diff --git a/src/lib/recoil.ts b/src/lib/recoil.ts
new file mode 100644
index 0000000..709408d
--- /dev/null
+++ b/src/lib/recoil.ts
@@ -0,0 +1,33 @@
+import { useRecoilState, RecoilState } from 'recoil'
+import produce, { Draft } from 'immer'
+import { useCallback } from 'react'
+
+export function useRecoilObjectWithImmer<T> (value: RecoilState<T>) {
+    const [copy, rawSet] = useRecoilState(value)
+
+    function set<K extends keyof Draft<T>> (key: K, value: Draft<T>[K]): void
+    function set<K extends keyof Draft<T>> (data: Partial<T>): void
+    function set<K extends keyof Draft<T>> (f: (draft: Draft<T>) => void | T): void
+    function set<K extends keyof Draft<T>> (data: any, value?: Draft<T>[K]): void {
+        if (typeof data === 'string') {
+            rawSet(produce(copy, (draft: Draft<T>) => {
+                const key = data as K
+                const v = value
+                draft[key] = v
+            }))
+        } else if (typeof data === 'function') {
+            const fn = data as (draft: Draft<T>) => void | T
+            rawSet(produce(copy, fn) as T)
+        } else if (typeof data === 'object') {
+            rawSet(produce(copy, (draft: Draft<T>) => {
+                const obj = data as Draft<T>
+                for (const key of Object.keys(obj)) {
+                    const k = key as keyof Draft<T>
+                    draft[k] = obj[k]
+                }
+            }))
+        }
+    }
+
+    return [copy, useCallback(set, [copy])] as [T, typeof set]
+}
diff --git a/src/lib/request.ts b/src/lib/request.ts
index 9a8b3e8..3b53358 100644
--- a/src/lib/request.ts
+++ b/src/lib/request.ts
@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { Partial, getLocalStorageItem, to } from '@lib/helper'
+import { getLocalStorageItem, to } from '@lib/helper'
 import { isClashX, jsBridge } from '@lib/jsBridge'
 import { createAsyncSingleton } from '@lib/asyncSingleton'
 import { Log } from '@models/Log'
@@ -181,7 +181,7 @@ export async function getProxy (name: string) {
 
 export async function getVersion () {
     const req = await getInstance()
-    return req.get<{ version: string }>('version')
+    return req.get<{ version: string, premium?: boolean }>('version')
 }
 
 export async function getProxyDelay (name: string) {
diff --git a/src/models/Config.ts b/src/models/Config.ts
index c50fd14..e7cd863 100644
--- a/src/models/Config.ts
+++ b/src/models/Config.ts
@@ -64,17 +64,6 @@ export interface Config {
 
 }
 
-export interface ClashXData {
-    startAtLogin: boolean
-    systemProxy: boolean
-}
-
-export interface APIInfo {
-    hostname: string
-    port: string
-    secret?: string
-}
-
 export interface Data {
     version?: string
 
diff --git a/src/render.tsx b/src/render.tsx
index 9731e6e..dea1f05 100644
--- a/src/render.tsx
+++ b/src/render.tsx
@@ -1,17 +1,17 @@
 import * as React from 'react'
 import { render } from 'react-dom'
 import { HashRouter } from 'react-router-dom'
-import { Provider as Global } from '@stores'
+import { RecoilRoot } from 'recoil'
 import App from '@containers/App'
 
 export default function renderApp () {
     const rootEl = document.getElementById('root')
     const AppInstance = (
-        <Global>
+        <RecoilRoot>
             <HashRouter>
                 <App />
             </HashRouter>
-        </Global>
+        </RecoilRoot>
     )
 
     render(AppInstance, rootEl)
diff --git a/src/stores/HookStore.ts b/src/stores/HookStore.ts
deleted file mode 100644
index cf362b5..0000000
--- a/src/stores/HookStore.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import * as Models from '@models'
-import * as API from '@lib/request'
-import { useObject, composeContainer, useVisible } from '@lib/hook'
-import { jsBridge } from '@lib/jsBridge'
-import { setLocalStorageItem, partition, to } from '@lib/helper'
-import { useI18n } from '@i18n'
-import { AxiosError } from 'axios'
-
-function useData () {
-    const [data, set] = useObject<Models.Data>({
-        version: '',
-        general: {},
-        proxy: [],
-        proxyGroup: [],
-        proxyProviders: [],
-        rules: [],
-        proxyMap: new Map<string, API.Proxy>()
-    })
-
-    const { visible, show, hide } = useVisible()
-
-    async function fetch () {
-        const [resp, err] = await to(Promise.all([API.getConfig(), API.getProxies(), API.getRules(), API.getProxyProviders()]))
-        const rErr = err as AxiosError
-        if (rErr && (!rErr.response || rErr.response.status === 401)) {
-            show()
-        }
-
-        const [{ data: general }, rawProxies, rules, proxyProviders] = resp
-
-        set('general', {
-            port: general.port,
-            socksPort: general['socks-port'],
-            redirPort: general['redir-port'],
-            mode: general.mode,
-            logLevel: general['log-level'],
-            allowLan: general['allow-lan']
-        })
-
-        const policyGroup = new Set(['Selector', 'URLTest', 'Fallback', 'LoadBalance'])
-        const unUsedProxy = new Set(['DIRECT', 'REJECT', 'GLOBAL'])
-        const proxyList = rawProxies.data.proxies.GLOBAL as API.Group
-        // fix missing name
-        proxyList.name = 'GLOBAL'
-        const proxies = proxyList.all
-            .filter(key => !unUsedProxy.has(key))
-            .map(key => ({ ...rawProxies.data.proxies[key], name: key }))
-        const [proxy, groups] = partition(proxies, proxy => !policyGroup.has(proxy.type))
-
-        const providers = Object.keys(proxyProviders.data.providers)
-            .map<API.Provider>(name => proxyProviders.data.providers[name])
-            .filter(pd => pd.name !== 'default')
-            .filter(pd => pd.vehicleType !== 'Compatible')
-
-        const proxyMap = new Map<string, API.Proxy>()
-        for (const p of proxy) {
-            proxyMap.set(p.name, p as API.Proxy)
-        }
-
-        for (const provider of providers) {
-            for (const p of provider.proxies) {
-                proxyMap.set(p.name, p as API.Proxy)
-            }
-        }
-
-        set({
-            proxy: proxy as API.Proxy[],
-            proxyGroup: general.mode === 'Global' ? [proxyList] : groups as API.Group[],
-            proxyProviders: providers,
-            rules: rules.data.rules,
-            proxyMap
-        })
-
-        const [version, vErr] = await to(API.getVersion())
-        if (vErr) {
-            return
-        }
-
-        set('version', version.data.version)
-    }
-
-    function updateDelay (proxy: string, delay: number) {
-        set(draft => {
-            const p = draft.proxy.find(p => p.name === proxy)
-            if (p) {
-                p.history.push({ time: Date.now().toString(), delay })
-            }
-        })
-    }
-
-    return { data, fetch, unauthorized: { visible, show, hide }, updateDelay }
-}
-
-function useAPIInfo () {
-    const [data, set] = useObject<Models.APIInfo>({
-        hostname: '127.0.0.1',
-        port: '9090',
-        secret: ''
-    })
-
-    async function fetch () {
-        const info = await API.getExternalControllerConfig()
-        set({ ...info })
-    }
-
-    async function update (info: Models.APIInfo) {
-        const { hostname, port, secret } = info
-        setLocalStorageItem('externalControllerAddr', hostname)
-        setLocalStorageItem('externalControllerPort', port)
-        setLocalStorageItem('secret', secret)
-        window.location.reload()
-    }
-
-    return { data, fetch, update }
-}
-
-function useConfig () {
-    const [data, set] = useObject({
-        breakConnections: false
-    })
-
-    return { data, set }
-}
-
-function useClashXData () {
-    const [data, set] = useObject<Models.ClashXData>({
-        startAtLogin: false,
-        systemProxy: false
-    })
-
-    async function fetch () {
-        const startAtLogin = await jsBridge.getStartAtLogin()
-        const systemProxy = await jsBridge.isSystemProxySet()
-
-        set({ startAtLogin, systemProxy })
-    }
-
-    return { data, fetch }
-}
-
-const { Provider, containers } = composeContainer({
-    useData,
-    useAPIInfo,
-    useClashXData,
-    useI18n,
-    useConfig
-})
-
-export { Provider, containers }
diff --git a/src/stores/index.ts b/src/stores/index.ts
index 81bcfaa..a280c8c 100644
--- a/src/stores/index.ts
+++ b/src/stores/index.ts
@@ -1 +1 @@
-export * from './HookStore'
+export * from './recoil'
diff --git a/src/stores/recoil.ts b/src/stores/recoil.ts
new file mode 100644
index 0000000..25bb52b
--- /dev/null
+++ b/src/stores/recoil.ts
@@ -0,0 +1,271 @@
+import { atom, useRecoilState, selector } from 'recoil'
+import get from 'lodash/get'
+import { useCallback } from 'react'
+import { AxiosError } from 'axios'
+
+import { getLanguage, setLanguage, Lang, locales, Language } from '@i18n'
+import { useRecoilObjectWithImmer } from '@lib/recoil'
+import * as API from '@lib/request'
+import { setLocalStorageItem, partition, to } from '@lib/helper'
+import { jsBridge } from '@lib/jsBridge'
+import * as Models from '@models'
+
+const identity = atom({
+    key: 'identity',
+    default: true
+})
+
+type AsyncFunction<A, O> = (...args: A[]) => Promise<O>
+
+export function useIdentity () {
+    const [id, set] = useRecoilState(identity)
+
+    function wrapFetcher<A, O> (fn: AsyncFunction<A, O>) {
+        return async function (...args: A[]) {
+            const [resp, err] = await to(fn(...args))
+            const rErr = err as AxiosError
+            if (rErr && (!rErr.response || rErr.response.status === 401)) {
+                set(false)
+                throw err
+            }
+            set(true)
+            return resp
+        }
+    }
+
+    return { identity: id, wrapFetcher, set }
+}
+
+const language = atom({
+    key: 'i18n',
+    default: getLanguage()
+})
+
+export function useI18n () {
+    const [lang, set] = useRecoilState(language)
+
+    function setLang (lang: Lang) {
+        set(lang)
+        setLanguage(lang)
+    }
+
+    const useTranslation = useCallback(
+        function (namespace: string) {
+            function t (path: string) {
+                return get(Language[lang][namespace], path) as string
+            }
+            return { t }
+        },
+        [lang]
+    )
+
+    return { lang, locales, setLang, useTranslation }
+}
+
+export const config = atom({
+    key: 'config',
+    default: {
+        breakConnections: false
+    }
+})
+
+export function useConfig () {
+    const [data, set] = useRecoilObjectWithImmer(config)
+
+    return { data, set }
+}
+
+export const proxyProvider = atom({
+    key: 'proxyProvider',
+    default: [] as API.Provider[]
+})
+
+export function useProxyProviders () {
+    const [data, set] = useRecoilState(proxyProvider)
+
+    async function update () {
+        const proxyProviders = await API.getProxyProviders()
+
+        const providers = Object.keys(proxyProviders.data.providers)
+            .map<API.Provider>(name => proxyProviders.data.providers[name])
+            .filter(pd => pd.name !== 'default')
+            .filter(pd => pd.vehicleType !== 'Compatible')
+
+        set(providers)
+    }
+
+    return { providers: data, update }
+}
+
+export const general = atom({
+    key: 'general',
+    default: {} as Models.Data['general']
+})
+
+export function useGeneral () {
+    const [data, set] = useRecoilState(general)
+
+    async function update () {
+        const resp = await API.getConfig()
+        const data = resp.data
+        set({
+            port: data.port,
+            socksPort: data['socks-port'],
+            redirPort: data['redir-port'],
+            mode: data.mode,
+            logLevel: data['log-level'],
+            allowLan: data['allow-lan']
+        })
+    }
+
+    return { general: data, update }
+}
+
+export const proxies = atom({
+    key: 'proxies',
+    default: {
+        proxies: [] as API.Proxy[],
+        groups: [] as API.Group[],
+        global: {} as API.Group
+    }
+})
+
+export function useProxy () {
+    const [data, set] = useRecoilObjectWithImmer(proxies)
+
+    async function update () {
+        const allProxies = await API.getProxies()
+
+        const global = allProxies.data.proxies.GLOBAL as API.Group
+        // fix missing name
+        global.name = 'GLOBAL'
+
+        const policyGroup = new Set(['Selector', 'URLTest', 'Fallback', 'LoadBalance'])
+        const unUsedProxy = new Set(['DIRECT', 'REJECT', 'GLOBAL'])
+        const proxies = global.all
+            .filter(key => !unUsedProxy.has(key))
+            .map(key => ({ ...allProxies.data.proxies[key], name: key }))
+        const [proxy, groups] = partition(proxies, proxy => !policyGroup.has(proxy.type))
+
+        set({ proxies: proxy as API.Proxy[], groups: groups as API.Group[], global: global })
+    }
+
+    return {
+        proxies: data.proxies,
+        groups: data.groups,
+        global: data.global,
+        update,
+        set
+    }
+}
+
+export const proxyMapping = selector({
+    key: 'proxyMapping',
+    get: ({ get }) => {
+        const ps = get(proxies)
+        const providers = get(proxyProvider)
+        const proxyMap = new Map<string, API.Proxy>()
+        for (const p of ps.proxies) {
+            proxyMap.set(p.name, p as API.Proxy)
+        }
+
+        for (const provider of providers) {
+            for (const p of provider.proxies) {
+                proxyMap.set(p.name, p as API.Proxy)
+            }
+        }
+
+        return proxyMap
+    }
+})
+
+export const version = atom({
+    key: 'version',
+    default: {
+        version: '',
+        premium: false
+    }
+})
+
+export function useVersion () {
+    const [data, set] = useRecoilState(version)
+    const { set: setIdentity } = useIdentity()
+
+    async function update () {
+        const [resp, err] = await to(API.getVersion())
+        setIdentity(!err)
+
+        set(
+            err
+                ? { version: '', premium: false }
+                : { version: resp.data.version, premium: !!resp.data.premium }
+        )
+    }
+
+    return { version: data.version, premium: data.premium, update }
+}
+
+export const clashxData = atom({
+    key: 'clashxData',
+    default: {
+        startAtLogin: false,
+        systemProxy: false
+    }
+})
+
+export function useClashXData () {
+    const [data, set] = useRecoilState(clashxData)
+
+    async function update () {
+        const startAtLogin = await jsBridge.getStartAtLogin()
+        const systemProxy = await jsBridge.isSystemProxySet()
+
+        set({ startAtLogin, systemProxy })
+    }
+
+    return { data, update }
+}
+
+export const apiData = atom({
+    key: 'apiData',
+    default: {
+        hostname: '127.0.0.1',
+        port: '9090',
+        secret: ''
+    }
+})
+
+export function useAPIInfo () {
+    const [data, set] = useRecoilState(apiData)
+
+    async function fetch () {
+        const info = await API.getExternalControllerConfig()
+        set({ ...info })
+    }
+
+    async function update (info: typeof data) {
+        const { hostname, port, secret } = info
+        setLocalStorageItem('externalControllerAddr', hostname)
+        setLocalStorageItem('externalControllerPort', port)
+        setLocalStorageItem('secret', secret)
+        window.location.reload()
+    }
+
+    return { data, fetch, update }
+}
+
+export const rules = atom({
+    key: 'rules',
+    default: [] as API.Rule[]
+})
+
+export function useRule () {
+    const [data, set] = useRecoilObjectWithImmer(rules)
+
+    async function update () {
+        const resp = await API.getRules()
+        set(resp.data.rules)
+    }
+
+    return { rules: data, update }
+}