diff --git a/config.json b/config.json
index d7f41c2..f3ed329 100755
--- a/config.json
+++ b/config.json
@@ -1,7 +1,7 @@
 {
-   "secure_file_server": "http://192.168.178.129:3004/",
+   "secure_file_server": "https://sf.dev.hibas123.de",
    "auth_server": "https://auth.stamm.me",
    "client_id": "cf699b12-2014-4a61-bb7d-a7e38b197350",
    "permission": "5c1ed399dc361731340a49d4",
-   "callback_url": "http://localhost:8080"
+   "callback_url": "https://notes.dev.hibas123.de"
 }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 1ba2ce6..f006973 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,22 +1,22 @@
 {
    "name": "@hibas123/securenotes2",
-   "version": "1.0.0",
+   "version": "2.0.0-alpha.1",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
       "@babel/runtime": {
-         "version": "7.4.2",
-         "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
-         "integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
+         "version": "7.4.3",
+         "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz",
+         "integrity": "sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==",
          "dev": true,
          "requires": {
             "regenerator-runtime": "^0.13.2"
          }
       },
       "@hibas123/secure-file-wrapper": {
-         "version": "2.4.0",
-         "resolved": "https://registry.npmjs.org/@hibas123/secure-file-wrapper/-/secure-file-wrapper-2.4.0.tgz",
-         "integrity": "sha512-YNFsivgp/6XAooepaTicW21VKmAqso/5vR28V3RzRRcCPVfRWu9gsNPNTLpFRJ7wypyF5+nAb2U00VJmDypSTg==",
+         "version": "2.5.0",
+         "resolved": "https://registry.npmjs.org/@hibas123/secure-file-wrapper/-/secure-file-wrapper-2.5.0.tgz",
+         "integrity": "sha512-ZuAoZ4QsZZovV8rsS4hU0A3kfpj57+tc1O7gh+0P4CkmXQ8SzBtfpGIMtx6S6D0wkKqpXaBEcCQXPmueioMIfQ==",
          "requires": {
             "@hibas123/utils": "^2.0.0",
             "cross-fetch": "^3.0.1",
@@ -24,9 +24,9 @@
          },
          "dependencies": {
             "cross-fetch": {
-               "version": "3.0.1",
-               "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.1.tgz",
-               "integrity": "sha512-qWtpgBAF8ioqBOddRD+pHhrdzm/UWOArkrlIU7c08DlNbOxo5GfUbSY2vr90ZypWf0raW+HNN1F38pi5CEOjiQ==",
+               "version": "3.0.2",
+               "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.2.tgz",
+               "integrity": "sha512-a4Z0EJ5Nck6QtMy9ZqloLfpvu2uMV3sBfMCR+CgSBCZc6z5KR4bfEiD3dkepH8iZgJMXQpTqf8FjMmvu/GMFkg==",
                "requires": {
                   "node-fetch": "2.3.0",
                   "whatwg-fetch": "3.0.0"
@@ -35,9 +35,18 @@
          }
       },
       "@hibas123/utils": {
-         "version": "2.0.0",
-         "resolved": "https://registry.npmjs.org/@hibas123/utils/-/utils-2.0.0.tgz",
-         "integrity": "sha512-kczMJvwLGqUgnFamxtPJjb7V+C5tKHc3dtgKYaCQexbzwQ44VNlwTngYNK7izRA5HfD0N+abAGA0IoBMDmKDpg=="
+         "version": "2.0.5",
+         "resolved": "https://registry.npmjs.org/@hibas123/utils/-/utils-2.0.5.tgz",
+         "integrity": "sha512-LI1Xw0QArpm0JqCUmuxRG7dgmjvyLPmJehcNRqHrWuCwmDRoPFe0PwmZsp8/saz6pCL2A4u0utVHWG2PG4lSyg=="
+      },
+      "@types/jquery": {
+         "version": "3.3.29",
+         "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.29.tgz",
+         "integrity": "sha512-FhJvBninYD36v3k6c+bVk1DSZwh7B5Dpb/Pyk3HKVsiohn0nhbefZZ+3JXbWQhFyt0MxSl2jRDdGQPHeOHFXrQ==",
+         "dev": true,
+         "requires": {
+            "@types/sizzle": "*"
+         }
       },
       "@types/lodash": {
          "version": "4.14.122",
@@ -60,6 +69,21 @@
          "integrity": "sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==",
          "dev": true
       },
+      "@types/sizzle": {
+         "version": "2.3.2",
+         "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
+         "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==",
+         "dev": true
+      },
+      "@types/uikit": {
+         "version": "2.27.7",
+         "resolved": "https://registry.npmjs.org/@types/uikit/-/uikit-2.27.7.tgz",
+         "integrity": "sha512-XB81jPoaFxty9HMhhNb3lZP7nBLK/+Am7ubV6dvj5hmcTFsn835ULIV4Bl5sXASIyvoCjvEAxGxfA5GCPUkcAA==",
+         "dev": true,
+         "requires": {
+            "@types/jquery": "*"
+         }
+      },
       "@types/uuid": {
          "version": "3.4.4",
          "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
@@ -515,9 +539,9 @@
          "dev": true
       },
       "async-each": {
-         "version": "1.0.1",
-         "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-         "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+         "version": "1.0.3",
+         "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+         "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
          "dev": true
       },
       "async-foreach": {
@@ -724,9 +748,9 @@
          "dev": true
       },
       "binary-extensions": {
-         "version": "1.13.0",
-         "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.0.tgz",
-         "integrity": "sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==",
+         "version": "1.13.1",
+         "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+         "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
          "dev": true
       },
       "block-stream": {
@@ -1086,9 +1110,9 @@
          "dev": true
       },
       "chokidar": {
-         "version": "2.1.2",
-         "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz",
-         "integrity": "sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==",
+         "version": "2.1.5",
+         "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
+         "integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
          "dev": true,
          "requires": {
             "anymatch": "^2.0.0",
@@ -1102,7 +1126,7 @@
             "normalize-path": "^3.0.0",
             "path-is-absolute": "^1.0.0",
             "readdirp": "^2.2.1",
-            "upath": "^1.1.0"
+            "upath": "^1.1.1"
          }
       },
       "chownr": {
@@ -1318,24 +1342,24 @@
          },
          "dependencies": {
             "mime-db": {
-               "version": "1.38.0",
-               "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-               "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
+               "version": "1.39.0",
+               "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.39.0.tgz",
+               "integrity": "sha512-DTsrw/iWVvwHH+9Otxccdyy0Tgiil6TWK/xhfARJZF/QFhwOgZgOIvA2/VIGpM8U7Q8z5nDmdDWC6tuVMJNibw==",
                "dev": true
             }
          }
       },
       "compression": {
-         "version": "1.7.3",
-         "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
-         "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
+         "version": "1.7.4",
+         "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+         "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
          "dev": true,
          "requires": {
             "accepts": "~1.3.5",
             "bytes": "3.0.0",
-            "compressible": "~2.0.14",
+            "compressible": "~2.0.16",
             "debug": "2.6.9",
-            "on-headers": "~1.0.1",
+            "on-headers": "~1.0.2",
             "safe-buffer": "5.1.2",
             "vary": "~1.1.2"
          }
@@ -1496,22 +1520,6 @@
             "sha.js": "^2.4.8"
          }
       },
-      "cross-fetch": {
-         "version": "3.0.0",
-         "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.0.tgz",
-         "integrity": "sha512-P8HyKlMwT1ed9LqEWlJu+zfcxfn0KI4Nl4nxyvu1a8sg4vgtHdwhElZOgSNzoar44zQMdliZcve4QG/04AUi9Q==",
-         "requires": {
-            "node-fetch": "2.3.0",
-            "whatwg-fetch": "3.0.0"
-         },
-         "dependencies": {
-            "node-fetch": {
-               "version": "2.3.0",
-               "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz",
-               "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA=="
-            }
-         }
-      },
       "cross-spawn": {
          "version": "6.0.5",
          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -1544,11 +1552,6 @@
             "randomfill": "^1.0.3"
          }
       },
-      "crypto-js": {
-         "version": "3.1.9-1",
-         "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
-         "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg="
-      },
       "css-loader": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz",
@@ -1652,9 +1655,9 @@
          "dev": true
       },
       "default-gateway": {
-         "version": "4.1.2",
-         "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.1.2.tgz",
-         "integrity": "sha512-xhJUAp3u02JsBGovj0V6B6uYhKCUOmiNc8xGmReUwGu77NmvcpxPVB0pCielxMFumO7CmXBG02XjM8HB97k8Hw==",
+         "version": "4.2.0",
+         "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+         "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
          "dev": true,
          "requires": {
             "execa": "^1.0.0",
@@ -1730,17 +1733,17 @@
          "dev": true
       },
       "del": {
-         "version": "3.0.0",
-         "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-         "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+         "version": "4.1.0",
+         "resolved": "https://registry.npmjs.org/del/-/del-4.1.0.tgz",
+         "integrity": "sha512-C4kvKNlYrwXhKxz97BuohF8YoGgQ23Xm9lvoHmgT7JaPGprSEjk3+XFled74Yt/x0ZABUHg2D67covzAPUKx5Q==",
          "dev": true,
          "requires": {
             "globby": "^6.1.0",
-            "is-path-cwd": "^1.0.0",
-            "is-path-in-cwd": "^1.0.0",
-            "p-map": "^1.1.1",
-            "pify": "^3.0.0",
-            "rimraf": "^2.2.8"
+            "is-path-cwd": "^2.0.0",
+            "is-path-in-cwd": "^2.0.0",
+            "p-map": "^2.0.0",
+            "pify": "^4.0.1",
+            "rimraf": "^2.6.3"
          },
          "dependencies": {
             "globby": {
@@ -1763,6 +1766,12 @@
                      "dev": true
                   }
                }
+            },
+            "pify": {
+               "version": "4.0.1",
+               "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+               "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+               "dev": true
             }
          }
       },
@@ -2065,9 +2074,9 @@
          "dev": true
       },
       "eslint-scope": {
-         "version": "4.0.2",
-         "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.2.tgz",
-         "integrity": "sha512-5q1+B/ogmHl8+paxtOKx38Z8LtWkVGuNt3+GQNErqwLl6ViNp/gdJGMCjZNxZ8j/VYjDNZ2Fo+eQc1TAVPIzbg==",
+         "version": "4.0.3",
+         "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+         "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
          "dev": true,
          "requires": {
             "esrecurse": "^4.1.0",
@@ -2382,9 +2391,9 @@
          }
       },
       "feather-icons": {
-         "version": "4.19.0",
-         "resolved": "https://registry.npmjs.org/feather-icons/-/feather-icons-4.19.0.tgz",
-         "integrity": "sha512-eaY8A/Y2lLukjinbWYrCxMof7EiFUgEXqYLqInsNFJtxMoLZf0znhK+y93YMojsB/etKMzj8PISnI1+OADJ5Zw==",
+         "version": "4.21.0",
+         "resolved": "https://registry.npmjs.org/feather-icons/-/feather-icons-4.21.0.tgz",
+         "integrity": "sha512-5RgyUH0J9NCRG5Z+aL8kJduMM4J6IAKlGqSrnkWW6rpY5jC9MyE0NkvgsKOmnedAZN2ORmdXTndPIHFWaMCf6w==",
          "requires": {
             "classnames": "^2.2.5",
             "core-js": "^2.5.3"
@@ -2622,14 +2631,14 @@
          "dev": true
       },
       "fsevents": {
-         "version": "1.2.7",
-         "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz",
-         "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==",
+         "version": "1.2.8",
+         "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.8.tgz",
+         "integrity": "sha512-tPvHgPGB7m40CZ68xqFGkKuzN+RnpGmSV+hgeKxhRpbxdqKXUFJGC3yonBOLzQBcJyGpdZFDfCsdOC2KFsXzeA==",
          "dev": true,
          "optional": true,
          "requires": {
-            "nan": "^2.9.2",
-            "node-pre-gyp": "^0.10.0"
+            "nan": "^2.12.1",
+            "node-pre-gyp": "^0.12.0"
          },
          "dependencies": {
             "abbrev": {
@@ -2707,12 +2716,12 @@
                "optional": true
             },
             "debug": {
-               "version": "2.6.9",
+               "version": "4.1.1",
                "bundled": true,
                "dev": true,
                "optional": true,
                "requires": {
-                  "ms": "2.0.0"
+                  "ms": "^2.1.1"
                }
             },
             "deep-extend": {
@@ -2883,24 +2892,24 @@
                }
             },
             "ms": {
-               "version": "2.0.0",
+               "version": "2.1.1",
                "bundled": true,
                "dev": true,
                "optional": true
             },
             "needle": {
-               "version": "2.2.4",
+               "version": "2.3.0",
                "bundled": true,
                "dev": true,
                "optional": true,
                "requires": {
-                  "debug": "^2.1.2",
+                  "debug": "^4.1.0",
                   "iconv-lite": "^0.4.4",
                   "sax": "^1.2.4"
                }
             },
             "node-pre-gyp": {
-               "version": "0.10.3",
+               "version": "0.12.0",
                "bundled": true,
                "dev": true,
                "optional": true,
@@ -2928,13 +2937,13 @@
                }
             },
             "npm-bundled": {
-               "version": "1.0.5",
+               "version": "1.0.6",
                "bundled": true,
                "dev": true,
                "optional": true
             },
             "npm-packlist": {
-               "version": "1.2.0",
+               "version": "1.4.1",
                "bundled": true,
                "dev": true,
                "optional": true,
@@ -3073,7 +3082,7 @@
                "optional": true
             },
             "semver": {
-               "version": "5.6.0",
+               "version": "5.7.0",
                "bundled": true,
                "dev": true,
                "optional": true
@@ -3345,13 +3354,21 @@
          "dev": true
       },
       "gzip-size": {
-         "version": "5.0.0",
-         "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
-         "integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==",
+         "version": "5.1.0",
+         "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.0.tgz",
+         "integrity": "sha512-wfSnvypBDRW94v5W3ckvvz/zFUNdJ81VgOP6tE4bPpRUcc0wGqU+y0eZjJEvKxwubJFix6P84sE8M51YWLT7rQ==",
          "dev": true,
          "requires": {
             "duplexer": "^0.1.1",
-            "pify": "^3.0.0"
+            "pify": "^4.0.1"
+         },
+         "dependencies": {
+            "pify": {
+               "version": "4.0.1",
+               "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+               "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+               "dev": true
+            }
          }
       },
       "handle-thing": {
@@ -3510,9 +3527,9 @@
          }
       },
       "hoek": {
-         "version": "6.1.2",
-         "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz",
-         "integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==",
+         "version": "6.1.3",
+         "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.3.tgz",
+         "integrity": "sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==",
          "dev": true
       },
       "homedir-polyfill": {
@@ -3710,9 +3727,9 @@
          "integrity": "sha512-+FLa/0sTXqyux0o6C+i2lOR0VoS60LU/jzUo5xjfY6+7sEEgy4Gz1O7yFBXvjd7N0NyIGWIRg8DcQSLEG+VSPw=="
       },
       "ieee754": {
-         "version": "1.1.12",
-         "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-         "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+         "version": "1.1.13",
+         "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+         "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
          "dev": true
       },
       "iferr": {
@@ -3793,21 +3810,13 @@
          "dev": true
       },
       "internal-ip": {
-         "version": "4.2.0",
-         "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.2.0.tgz",
-         "integrity": "sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+         "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
          "dev": true,
          "requires": {
-            "default-gateway": "^4.0.1",
+            "default-gateway": "^4.2.0",
             "ipaddr.js": "^1.9.0"
-         },
-         "dependencies": {
-            "ipaddr.js": {
-               "version": "1.9.0",
-               "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
-               "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
-               "dev": true
-            }
          }
       },
       "interpret": {
@@ -3835,9 +3844,9 @@
          "dev": true
       },
       "ipaddr.js": {
-         "version": "1.8.0",
-         "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
-         "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=",
+         "version": "1.9.0",
+         "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+         "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
          "dev": true
       },
       "is-accessor-descriptor": {
@@ -3974,15 +3983,15 @@
          "dev": true
       },
       "is-path-cwd": {
-         "version": "1.0.0",
-         "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-         "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+         "version": "2.0.0",
+         "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.0.0.tgz",
+         "integrity": "sha512-m5dHHzpOXEiv18JEORttBO64UgTEypx99vCxQLjbBvGhOJxnTNglYoFXxwo6AbsQb79sqqycQEHv2hWkHZAijA==",
          "dev": true
       },
       "is-path-in-cwd": {
-         "version": "1.0.1",
-         "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-         "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+         "version": "2.0.0",
+         "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.0.0.tgz",
+         "integrity": "sha512-6Vz5Gc9s/sDA3JBVu0FzWufm8xaBsqy1zn8Q6gmvGP6nSDMw78aS4poBNeatWjaRpTpxxLn1WOndAiOlk+qY8A==",
          "dev": true,
          "requires": {
             "is-path-inside": "^1.0.0"
@@ -3997,6 +4006,12 @@
             "path-is-inside": "^1.0.1"
          }
       },
+      "is-plain-obj": {
+         "version": "1.1.0",
+         "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+         "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+         "dev": true
+      },
       "is-plain-object": {
          "version": "2.0.4",
          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -4610,21 +4625,17 @@
          "dev": true
       },
       "mini-css-extract-plugin": {
-         "version": "0.5.0",
-         "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
-         "integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
+         "version": "0.6.0",
+         "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz",
+         "integrity": "sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==",
          "dev": true,
          "requires": {
             "loader-utils": "^1.1.0",
+            "normalize-url": "^2.0.1",
             "schema-utils": "^1.0.0",
             "webpack-sources": "^1.1.0"
          }
       },
-      "mini.css": {
-         "version": "3.0.1",
-         "resolved": "https://registry.npmjs.org/mini.css/-/mini.css-3.0.1.tgz",
-         "integrity": "sha512-FmuuBL0wuyDO1UA66TkAo8w2RxxuHmNPaUqUHcYlHtM9CJkrscQaNAJ/ParEahYFwtZOSgfEA7flbMoSPkzrPA=="
-      },
       "minimalistic-assert": {
          "version": "1.0.1",
          "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -4981,6 +4992,17 @@
          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
          "dev": true
       },
+      "normalize-url": {
+         "version": "2.0.1",
+         "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
+         "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+         "dev": true,
+         "requires": {
+            "prepend-http": "^2.0.0",
+            "query-string": "^5.0.1",
+            "sort-keys": "^2.0.0"
+         }
+      },
       "npm-run-path": {
          "version": "2.0.2",
          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -5138,9 +5160,9 @@
          "dev": true
       },
       "opn": {
-         "version": "5.4.0",
-         "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
-         "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
+         "version": "5.5.0",
+         "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+         "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
          "dev": true,
          "requires": {
             "is-wsl": "^1.1.0"
@@ -5229,9 +5251,9 @@
          }
       },
       "p-map": {
-         "version": "1.2.0",
-         "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-         "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+         "version": "2.1.0",
+         "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+         "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
          "dev": true
       },
       "p-try": {
@@ -5296,9 +5318,9 @@
          "dev": true
       },
       "parseurl": {
-         "version": "1.3.2",
-         "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-         "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
+         "version": "1.3.3",
+         "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+         "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
          "dev": true
       },
       "pascalcase": {
@@ -5556,6 +5578,12 @@
             "loader-utils": "^1.1.0"
          }
       },
+      "prepend-http": {
+         "version": "2.0.0",
+         "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+         "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+         "dev": true
+      },
       "pretty-bytes": {
          "version": "5.1.0",
          "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.1.0.tgz",
@@ -5606,13 +5634,13 @@
          "dev": true
       },
       "proxy-addr": {
-         "version": "2.0.4",
-         "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
-         "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
+         "version": "2.0.5",
+         "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
+         "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
          "dev": true,
          "requires": {
             "forwarded": "~0.1.2",
-            "ipaddr.js": "1.8.0"
+            "ipaddr.js": "1.9.0"
          }
       },
       "prr": {
@@ -5698,6 +5726,17 @@
          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
          "dev": true
       },
+      "query-string": {
+         "version": "5.1.1",
+         "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+         "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+         "dev": true,
+         "requires": {
+            "decode-uri-component": "^0.2.0",
+            "object-assign": "^4.1.0",
+            "strict-uri-encode": "^1.0.0"
+         }
+      },
       "querystring": {
          "version": "0.2.0",
          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -5711,9 +5750,9 @@
          "dev": true
       },
       "querystringify": {
-         "version": "2.1.0",
-         "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
-         "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
+         "version": "2.1.1",
+         "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+         "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
          "dev": true
       },
       "randombytes": {
@@ -6233,8 +6272,20 @@
          "version": "git+https://git.stamm.me/OpenServer/OSSecureFileWrapper.git#7a8cc08d4a47745deff07622cc6b496b75186379",
          "from": "git+https://git.stamm.me/OpenServer/OSSecureFileWrapper.git",
          "requires": {
-            "cross-fetch": "^3.0.0",
+            "@hibas123/utils": "^2.0.0",
+            "cross-fetch": "^3.0.1",
             "uuid": "^3.3.2"
+         },
+         "dependencies": {
+            "cross-fetch": {
+               "version": "3.0.2",
+               "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.2.tgz",
+               "integrity": "sha512-a4Z0EJ5Nck6QtMy9ZqloLfpvu2uMV3sBfMCR+CgSBCZc6z5KR4bfEiD3dkepH8iZgJMXQpTqf8FjMmvu/GMFkg==",
+               "requires": {
+                  "node-fetch": "2.3.0",
+                  "whatwg-fetch": "3.0.0"
+               }
+            }
          }
       },
       "select-hose": {
@@ -6567,6 +6618,15 @@
             }
          }
       },
+      "sort-keys": {
+         "version": "2.0.0",
+         "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
+         "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
+         "dev": true,
+         "requires": {
+            "is-plain-obj": "^1.0.0"
+         }
+      },
       "source-list-map": {
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -6593,9 +6653,9 @@
          }
       },
       "source-map-support": {
-         "version": "0.5.10",
-         "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
-         "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
+         "version": "0.5.12",
+         "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+         "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
          "dev": true,
          "requires": {
             "buffer-from": "^1.0.0",
@@ -6708,9 +6768,9 @@
                "dev": true
             },
             "readable-stream": {
-               "version": "3.2.0",
-               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
-               "integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+               "version": "3.3.0",
+               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz",
+               "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==",
                "dev": true,
                "requires": {
                   "inherits": "^2.0.3",
@@ -6830,6 +6890,12 @@
          "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
          "dev": true
       },
+      "strict-uri-encode": {
+         "version": "1.1.0",
+         "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+         "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+         "dev": true
+      },
       "string-width": {
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -6927,16 +6993,22 @@
          "dev": true
       },
       "terser": {
-         "version": "3.16.1",
-         "resolved": "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz",
-         "integrity": "sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==",
+         "version": "3.17.0",
+         "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
+         "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
          "dev": true,
          "requires": {
-            "commander": "~2.17.1",
+            "commander": "^2.19.0",
             "source-map": "~0.6.1",
-            "source-map-support": "~0.5.9"
+            "source-map-support": "~0.5.10"
          },
          "dependencies": {
+            "commander": {
+               "version": "2.20.0",
+               "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+               "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+               "dev": true
+            },
             "source-map": {
                "version": "0.6.1",
                "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -7190,9 +7262,9 @@
          "dev": true
       },
       "typescript": {
-         "version": "3.3.4000",
-         "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.4000.tgz",
-         "integrity": "sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==",
+         "version": "3.4.3",
+         "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.3.tgz",
+         "integrity": "sha512-FFgHdPt4T/duxx6Ndf7hwgMZZjZpB+U0nMNGVCYPq0rEzWKjEDobm4J6yb3CS7naZ0yURFqdw9Gwc7UOh/P9oQ==",
          "dev": true
       },
       "ua-parser-js": {
@@ -7342,9 +7414,9 @@
          }
       },
       "upath": {
-         "version": "1.1.0",
-         "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-         "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+         "version": "1.1.2",
+         "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+         "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
          "dev": true
       },
       "upper-case": {
@@ -7387,9 +7459,9 @@
          }
       },
       "url-parse": {
-         "version": "1.4.4",
-         "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
-         "integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
+         "version": "1.4.6",
+         "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.6.tgz",
+         "integrity": "sha512-/B8AD9iQ01seoXmXf9z/MjLZQIdOoYl/+gvsQF6+mpnxaTfG9P7srYaiqaDMyKkR36XMXfhqSHss5MyFAO8lew==",
          "dev": true,
          "requires": {
             "querystringify": "^2.0.0",
@@ -7507,9 +7579,9 @@
          }
       },
       "webpack": {
-         "version": "4.29.6",
-         "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.6.tgz",
-         "integrity": "sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==",
+         "version": "4.30.0",
+         "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.30.0.tgz",
+         "integrity": "sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==",
          "dev": true,
          "requires": {
             "@webassemblyjs/ast": "1.8.5",
@@ -7547,9 +7619,9 @@
          }
       },
       "webpack-bundle-analyzer": {
-         "version": "3.1.0",
-         "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz",
-         "integrity": "sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA==",
+         "version": "3.3.2",
+         "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz",
+         "integrity": "sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==",
          "dev": true,
          "requires": {
             "acorn": "^6.0.7",
@@ -7594,9 +7666,9 @@
                }
             },
             "commander": {
-               "version": "2.19.0",
-               "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-               "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+               "version": "2.20.0",
+               "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+               "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
                "dev": true
             },
             "supports-color": {
@@ -7771,9 +7843,9 @@
          }
       },
       "webpack-dev-middleware": {
-         "version": "3.6.0",
-         "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.6.0.tgz",
-         "integrity": "sha512-oeXA3m+5gbYbDBGo4SvKpAHJJEGMoekUbHgo1RK7CP1sz7/WOSeu/dWJtSTk+rzDCLkPwQhGocgIq6lQqOyOwg==",
+         "version": "3.6.2",
+         "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz",
+         "integrity": "sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==",
          "dev": true,
          "requires": {
             "memory-fs": "^0.4.1",
@@ -7783,49 +7855,49 @@
          },
          "dependencies": {
             "mime": {
-               "version": "2.4.0",
-               "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-               "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+               "version": "2.4.2",
+               "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
+               "integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==",
                "dev": true
             }
          }
       },
       "webpack-dev-server": {
-         "version": "3.2.1",
-         "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz",
-         "integrity": "sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==",
+         "version": "3.3.1",
+         "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz",
+         "integrity": "sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==",
          "dev": true,
          "requires": {
             "ansi-html": "0.0.7",
             "bonjour": "^3.5.0",
-            "chokidar": "^2.0.0",
-            "compression": "^1.5.2",
-            "connect-history-api-fallback": "^1.3.0",
+            "chokidar": "^2.1.5",
+            "compression": "^1.7.4",
+            "connect-history-api-fallback": "^1.6.0",
             "debug": "^4.1.1",
-            "del": "^3.0.0",
-            "express": "^4.16.2",
-            "html-entities": "^1.2.0",
+            "del": "^4.1.0",
+            "express": "^4.16.4",
+            "html-entities": "^1.2.1",
             "http-proxy-middleware": "^0.19.1",
             "import-local": "^2.0.0",
             "internal-ip": "^4.2.0",
             "ip": "^1.1.5",
-            "killable": "^1.0.0",
-            "loglevel": "^1.4.1",
-            "opn": "^5.1.0",
-            "portfinder": "^1.0.9",
+            "killable": "^1.0.1",
+            "loglevel": "^1.6.1",
+            "opn": "^5.5.0",
+            "portfinder": "^1.0.20",
             "schema-utils": "^1.0.0",
-            "selfsigned": "^1.9.1",
-            "semver": "^5.6.0",
-            "serve-index": "^1.7.2",
+            "selfsigned": "^1.10.4",
+            "semver": "^6.0.0",
+            "serve-index": "^1.9.1",
             "sockjs": "0.3.19",
             "sockjs-client": "1.3.0",
             "spdy": "^4.0.0",
-            "strip-ansi": "^3.0.0",
+            "strip-ansi": "^3.0.1",
             "supports-color": "^6.1.0",
             "url": "^0.11.0",
-            "webpack-dev-middleware": "^3.5.1",
+            "webpack-dev-middleware": "^3.6.2",
             "webpack-log": "^2.0.0",
-            "yargs": "12.0.2"
+            "yargs": "12.0.5"
          },
          "dependencies": {
             "ansi-regex": {
@@ -7835,9 +7907,9 @@
                "dev": true
             },
             "camelcase": {
-               "version": "4.1.0",
-               "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-               "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+               "version": "5.3.1",
+               "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+               "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
                "dev": true
             },
             "cliui": {
@@ -7871,15 +7943,6 @@
                   "ms": "^2.1.1"
                }
             },
-            "decamelize": {
-               "version": "2.0.0",
-               "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
-               "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
-               "dev": true,
-               "requires": {
-                  "xregexp": "4.0.0"
-               }
-            },
             "invert-kv": {
                "version": "2.0.0",
                "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
@@ -7918,6 +7981,12 @@
                   "mem": "^4.0.0"
                }
             },
+            "semver": {
+               "version": "6.0.0",
+               "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
+               "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
+               "dev": true
+            },
             "string-width": {
                "version": "2.1.1",
                "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -7955,13 +8024,13 @@
                "dev": true
             },
             "yargs": {
-               "version": "12.0.2",
-               "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
-               "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
+               "version": "12.0.5",
+               "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+               "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
                "dev": true,
                "requires": {
                   "cliui": "^4.0.0",
-                  "decamelize": "^2.0.0",
+                  "decamelize": "^1.2.0",
                   "find-up": "^3.0.0",
                   "get-caller-file": "^1.0.1",
                   "os-locale": "^3.0.0",
@@ -7971,16 +8040,17 @@
                   "string-width": "^2.0.0",
                   "which-module": "^2.0.0",
                   "y18n": "^3.2.1 || ^4.0.0",
-                  "yargs-parser": "^10.1.0"
+                  "yargs-parser": "^11.1.1"
                }
             },
             "yargs-parser": {
-               "version": "10.1.0",
-               "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-               "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+               "version": "11.1.1",
+               "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+               "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
                "dev": true,
                "requires": {
-                  "camelcase": "^4.1.0"
+                  "camelcase": "^5.0.0",
+                  "decamelize": "^1.2.0"
                }
             }
          }
@@ -8071,27 +8141,27 @@
          }
       },
       "workbox-background-sync": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-4.1.1.tgz",
-         "integrity": "sha512-z8iKAx7f3cfQpGaRrrl2CpP4dGe+vHk05vJbzscwA7e1K8vyNl6zALBtIyyAvEZzMsofsiGEZqt2g/8CfyfQ5g==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-4.3.0.tgz",
+         "integrity": "sha512-rmDqz1k2mnG8wj68rBapoFP3iCKmdPeTdD0/GLtErDcaQsKnGlsFmjjJ7OuQbuBa+W0FfVWCE+s3VwqL0D/+DA==",
          "dev": true,
          "requires": {
-            "workbox-core": "^4.1.1"
+            "workbox-core": "^4.3.0"
          }
       },
       "workbox-broadcast-update": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-4.1.1.tgz",
-         "integrity": "sha512-gq83a8F6ESQobfltaxzoUTz0mEpTOsXHmy9Po9kKMT1UjXTWh/4NDF3HwQYaxJckOER9NITB3BuoXlXr3tI8aA==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-4.3.0.tgz",
+         "integrity": "sha512-YYdz+8FAVdy1ZTsXpapWyd5t2nH7KdBIQ9rFlsRMSGFS7LzcKfZy8Tka1W8byMNM1II5cxlFr7f6+3vLahzrCg==",
          "dev": true,
          "requires": {
-            "workbox-core": "^4.1.1"
+            "workbox-core": "^4.3.0"
          }
       },
       "workbox-build": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-4.1.1.tgz",
-         "integrity": "sha512-+QRtNFKDq7RlIpigsh26joUNoEN+c3pQ+yT8Rs29RtpM50S1nKggFUQY0HoRvN7tzvuzIgxCrx3osxOQ8hmj7Q==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-4.3.0.tgz",
+         "integrity": "sha512-D2fQa2Isp/BboJ8edYmvsTCrBrPWwVCYa7zMDysLViIaGVQTFMgazRXx8wZ2gZKud13M0maUR5Ln4wS5UiqAIA==",
          "dev": true,
          "requires": {
             "@babel/runtime": "^7.3.4",
@@ -8103,136 +8173,136 @@
             "pretty-bytes": "^5.1.0",
             "stringify-object": "^3.3.0",
             "strip-comments": "^1.0.2",
-            "workbox-background-sync": "^4.1.1",
-            "workbox-broadcast-update": "^4.1.1",
-            "workbox-cacheable-response": "^4.1.1",
-            "workbox-core": "^4.1.1",
-            "workbox-expiration": "^4.1.1",
-            "workbox-google-analytics": "^4.1.1",
-            "workbox-navigation-preload": "^4.1.1",
-            "workbox-precaching": "^4.1.1",
-            "workbox-range-requests": "^4.1.1",
-            "workbox-routing": "^4.1.1",
-            "workbox-strategies": "^4.1.1",
-            "workbox-streams": "^4.1.1",
-            "workbox-sw": "^4.1.1",
-            "workbox-window": "^4.1.1"
+            "workbox-background-sync": "^4.3.0",
+            "workbox-broadcast-update": "^4.3.0",
+            "workbox-cacheable-response": "^4.3.0",
+            "workbox-core": "^4.3.0",
+            "workbox-expiration": "^4.3.0",
+            "workbox-google-analytics": "^4.3.0",
+            "workbox-navigation-preload": "^4.3.0",
+            "workbox-precaching": "^4.3.0",
+            "workbox-range-requests": "^4.3.0",
+            "workbox-routing": "^4.3.0",
+            "workbox-strategies": "^4.3.0",
+            "workbox-streams": "^4.3.0",
+            "workbox-sw": "^4.3.0",
+            "workbox-window": "^4.3.0"
          }
       },
       "workbox-cacheable-response": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-4.1.1.tgz",
-         "integrity": "sha512-uc1zkeidJgAMXHvUbspKJt3NzXHAcb5D+7sX6HrCZIMneS4ZxMvdB86giIR3bveV4PaOssqIYVrWUJvIehK/NA==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-4.3.0.tgz",
+         "integrity": "sha512-GlnPS1WtEoPNFVPVW1Ss0CrNPlhB7FpMTh2XwpqdJKq7K/aDI8LKdFpRcZBZ2pfRpOf8b6AjAiDZr0hrJ9EFtQ==",
          "dev": true,
          "requires": {
-            "workbox-core": "^4.1.1"
+            "workbox-core": "^4.3.0"
          }
       },
       "workbox-core": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-4.1.1.tgz",
-         "integrity": "sha512-RbzMWnDW7UvfstwOs8ERDFTH6zr7akm4wIbIednFs1TnAvZbN3gpIBoEv53kaMr0uMYDSXI2KxaLmmz9WX1PXA==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-4.3.0.tgz",
+         "integrity": "sha512-k5j6yfyznkK7zHiYLbCsrJfYWUcJ9ZnFFzI4KSbr7D43rWwQkusHsPmOG3OT1YZseACtLRSnUUzb+Cg2arVXtw==",
          "dev": true
       },
       "workbox-expiration": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-4.1.1.tgz",
-         "integrity": "sha512-N/fbypqCbFrrKDhVnTyGXhkFTgjA8aRUydkxCpgJM1ajf7udQYD4XWTQxXosPJC2UVsa2/kPCBYFQOQ1Fu/2TA==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-4.3.0.tgz",
+         "integrity": "sha512-mcTWxsBHVkDBlIXOZ9uT3m0bAc7OJ3NTj1pTjWzwVZ6sqvT1I88ewIyppv44GO9JqnwE87lODpdEUIKp9V4lNA==",
          "dev": true,
          "requires": {
-            "workbox-core": "^4.1.1"
+            "workbox-core": "^4.3.0"
          }
       },
       "workbox-google-analytics": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-4.1.1.tgz",
-         "integrity": "sha512-ByZYHv61u4dFQXQAXZZ1bNgcJ45yA85C8OAlSDGwqOuv72dZoybG3EMtJo/0ChO6irxWI1pictF2pTW7JxcCkQ==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-4.3.0.tgz",
+         "integrity": "sha512-itAfcN/rVNf5WqAMW5/OA/pMkFxZjYuk2ZmOCIuy0fFJeQ4F0PfD3Y1DzX1JrKHPMIPeXvvZiAGY8+HRuJjy7w==",
          "dev": true,
          "requires": {
-            "workbox-background-sync": "^4.1.1",
-            "workbox-core": "^4.1.1",
-            "workbox-routing": "^4.1.1",
-            "workbox-strategies": "^4.1.1"
+            "workbox-background-sync": "^4.3.0",
+            "workbox-core": "^4.3.0",
+            "workbox-routing": "^4.3.0",
+            "workbox-strategies": "^4.3.0"
          }
       },
       "workbox-navigation-preload": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-4.1.1.tgz",
-         "integrity": "sha512-U+QEpcOgakBFZ6Aiv438DTvkZQX518qxfu280kEPZnFU88wIFBAK9V4MmJcoX60fk1INTD//YnfSxI0cLy1N+g==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-4.3.0.tgz",
+         "integrity": "sha512-1RoaOZD8mMTPjvTNG/FWSQZmfTlTP5FC7c6ZwKWWGoULcxPCmiqI8uWOnMg1/S+eAjYTtNfToW2pfvK4zi5ihA==",
          "dev": true,
          "requires": {
-            "workbox-core": "^4.1.1"
+            "workbox-core": "^4.3.0"
          }
       },
       "workbox-precaching": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-4.1.1.tgz",
-         "integrity": "sha512-GuoBH85MzVpzmF8c5Sql1i9HYdOqcpRDdNPLrIkWEfuvURO5M/jT+cGcyfFq35Xo7xRb4kE79H4hnF3EnCkFRw==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-4.3.0.tgz",
+         "integrity": "sha512-wEsF7+I1opRbyJysYWtn8c1liHqA3bvtaTk4FohE3ViZfn2MIEzORuk7G1kEBZEdJnGf7QcfVJ2tNFYv72yQZQ==",
          "dev": true,
          "requires": {
-            "workbox-core": "^4.1.1"
+            "workbox-core": "^4.3.0"
          }
       },
       "workbox-range-requests": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-4.1.1.tgz",
-         "integrity": "sha512-i9i7tRTcXveCJdi4lK7XstgHweTwkqEGR7GPauYIDGAZplWrxDOAOUDSvkH8ibOxEgO6f0VFhyYY6fPB6u+oSA==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-4.3.0.tgz",
+         "integrity": "sha512-2NskkW6Qmkm9YQPh7swODfB6u3yALqdUqxb0i/3tYp4OKEux50ju9B1OK/u3V/INJ6q2s/CwYmxwxJHhXi9Nfg==",
          "dev": true,
          "requires": {
-            "workbox-core": "^4.1.1"
+            "workbox-core": "^4.3.0"
          }
       },
       "workbox-routing": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-4.1.1.tgz",
-         "integrity": "sha512-slOb+2Nfn8V3fG/TtN0c0k4OOyuwLSnZUv+zyZeJafSU3MrQPC58bPeG7HOZZDwoQAsBG9VSukjRDFR0F1lXKg==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-4.3.0.tgz",
+         "integrity": "sha512-/lqWiZRjtyKi3If3J8jWHXJQIjaSLv8WKbGnriOcTxFEG7t+AJ79QYIxWXv0UQo4KFpjQRQUag+38T9spbV0IA==",
          "dev": true,
          "requires": {
-            "workbox-core": "^4.1.1"
+            "workbox-core": "^4.3.0"
          }
       },
       "workbox-strategies": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-4.1.1.tgz",
-         "integrity": "sha512-ejmRqmjwn9DYsl1QVZkRb1V/iaBzhsh3YwJelfXQk68JpB36WjwY9csFQ2gSvlLCCg3d4MVFFxKfmHVyVnhwAA==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-4.3.0.tgz",
+         "integrity": "sha512-yzhs07UZg7CR0thFFsUDI5hp+I0WoKd9IHSj4ckHoUAslyKLpmwGnOInsPeq2WQfXn7CkyinRjwUrwv3FMw1Gw==",
          "dev": true,
          "requires": {
-            "workbox-core": "^4.1.1"
+            "workbox-core": "^4.3.0"
          }
       },
       "workbox-streams": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-4.1.1.tgz",
-         "integrity": "sha512-6TKC4rrvnjbLpWtgHIYWjWS28h0SqSWogkJIKC1f/6MjJCmi2qM7PYJwXR0/t8lJVZj61ujVSulZ92XQmy3GhQ==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-4.3.0.tgz",
+         "integrity": "sha512-CIA9inxuFELQOO+/7+JpE50cBhpTWOYcLK7tQpriQ6PJod2tAMgo9X89vt9vLk1pN0PMd749MqurAz8FgLHHEg==",
          "dev": true,
          "requires": {
-            "workbox-core": "^4.1.1"
+            "workbox-core": "^4.3.0"
          }
       },
       "workbox-sw": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-4.1.1.tgz",
-         "integrity": "sha512-3nQFWFyG1W21x7TUVBsobrLoFDEy7ck/3nx2W1I3c+DhLCIu7B+IAnQVdefK+oRju5fIDWwOQ63fok8Uz7E/Gw==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-4.3.0.tgz",
+         "integrity": "sha512-d4INzCxFrHixUrhYV5z+6+zX1AKO3T77JY7l1ZKh15blW3Mz9u0FpJATzz3NWaI9X/cxgRyOsR8J7deu3XjlEg==",
          "dev": true
       },
       "workbox-webpack-plugin": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-4.1.1.tgz",
-         "integrity": "sha512-Fygc8qrh/IOeJeZ4NETs9arYtJEwcO0Yy7JRkX5DSOHCSkWHxOX1ryazAcK0ACyMJOQuU9zJVmx+mnn0zqYKtA==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-4.3.0.tgz",
+         "integrity": "sha512-E2upK36Use5IUTyGjxDFhpvLfJ3hMH6m/B5Abdp3wUhtV0Gc0o6YoouMRDVODF/Khnyyz5dd9Mz+S3j5uPsZJg==",
          "dev": true,
          "requires": {
             "@babel/runtime": "^7.0.0",
             "json-stable-stringify": "^1.0.1",
-            "workbox-build": "^4.1.1"
+            "workbox-build": "^4.3.0"
          }
       },
       "workbox-window": {
-         "version": "4.1.1",
-         "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-4.1.1.tgz",
-         "integrity": "sha512-KadE/DdNY1f6Va3MMOSigheLSgNxWHV/K/iDHnLMpo2EBGVpfwRCOuEwJNHlWA3G5WdpZlyTmtShf/5Mbb6dNg==",
+         "version": "4.3.0",
+         "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-4.3.0.tgz",
+         "integrity": "sha512-Lf5Da+4VdmUZSVhBFEcZSBWNHm9x7Zr2FUp1mgUZhrIwnkfL4qmjpG7TyAzaPm7QLc/O+yxDDC5cgEvMtE1fjQ==",
          "dev": true,
          "requires": {
-            "workbox-core": "^4.1.1"
+            "workbox-core": "^4.3.0"
          }
       },
       "worker-farm": {
@@ -8283,20 +8353,14 @@
          "dev": true
       },
       "ws": {
-         "version": "6.1.4",
-         "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
-         "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
+         "version": "6.2.1",
+         "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+         "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
          "dev": true,
          "requires": {
             "async-limiter": "~1.0.0"
          }
       },
-      "xregexp": {
-         "version": "4.0.0",
-         "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
-         "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
-         "dev": true
-      },
       "xtend": {
          "version": "4.0.1",
          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
diff --git a/package.json b/package.json
index 8ca0551..daff727 100755
--- a/package.json
+++ b/package.json
@@ -13,41 +13,40 @@
    "author": "Fabian Stamm <dev@fabianstamm.de>",
    "license": "MIT",
    "dependencies": {
-      "@hibas123/secure-file-wrapper": "^2.4.0",
-      "@hibas123/utils": "^2.0.0",
+      "@hibas123/secure-file-wrapper": "^2.5.0",
+      "@hibas123/utils": "^2.0.5",
       "aes-js": "^3.1.2",
-      "crypto-js": "^3.1.9-1",
-      "feather-icons": "^4.19.0",
-      "idb": "^3.0.2",
+      "feather-icons": "^4.21.0",
+      "idb": "3.0.2",
       "js-sha256": "^0.9.0",
       "js-sha512": "^0.8.0",
       "lodash.clonedeep": "^4.5.0",
-      "mini.css": "^3.0.1",
       "secure-file-wrapper": "git+https://git.stamm.me/OpenServer/OSSecureFileWrapper.git",
       "uikit": "^3.0.3",
       "uuid": "^3.3.2"
    },
    "devDependencies": {
       "@types/lodash.clonedeep": "^4.5.6",
+      "@types/uikit": "^2.27.7",
       "@types/uuid": "^3.4.4",
       "copy-webpack-plugin": "^5.0.2",
       "css-loader": "^2.1.1",
       "file-loader": "^3.0.1",
       "html-webpack-plugin": "^3.2.0",
-      "mini-css-extract-plugin": "^0.5.0",
+      "mini-css-extract-plugin": "^0.6.0",
       "node-sass": "^4.10.0",
       "preact": "^8.3.1",
       "preact-svg-loader": "^0.2.1",
       "sass-loader": "^7.1.0",
       "style-loader": "^0.23.1",
       "ts-loader": "^5.3.0",
-      "typescript": "^3.3.4000",
-      "webpack": "^4.29.6",
-      "webpack-bundle-analyzer": "^3.1.0",
+      "typescript": "^3.4.3",
+      "webpack": "^4.30.0",
+      "webpack-bundle-analyzer": "^3.3.2",
       "webpack-cli": "^3.3.0",
-      "webpack-dev-server": "^3.2.1",
+      "webpack-dev-server": "^3.3.1",
       "webpack-visualizer-plugin": "^0.1.11",
-      "workbox-webpack-plugin": "^4.1.1",
+      "workbox-webpack-plugin": "^4.3.0",
       "worker-loader": "^2.0.0"
    }
-}
\ No newline at end of file
+}
diff --git a/src/components/AddButton.tsx b/src/components/AddButton.tsx
index e8d5458..bd0b42d 100755
--- a/src/components/AddButton.tsx
+++ b/src/components/AddButton.tsx
@@ -2,5 +2,11 @@ import { h } from "preact";
 import "./add_button.scss";
 import Plus from "feather-icons/dist/icons/plus.svg";
 export default function AddButton({ onClick }: { onClick: () => void }) {
-   return <button title={"add button"} class="add_button_button circular primary shadowed" onClick={() => onClick()}><Plus width={undefined} height={undefined} /></button>
+   return <button
+      title={"add button"}
+      class="add-button-button uk-button-primary uk-border-circle def-shadow"
+      onClick={() => onClick()}
+   >
+      <Plus width={undefined} height={undefined} />
+   </button>
 }
\ No newline at end of file
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index 1ce28fe..9d946b5 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -56,7 +56,7 @@ export class Footer extends Component<{}, { synced: boolean, syncing: boolean }>
                 text = "not synced";
             }
         }
-        return <footer>
+        return <footer class="uk-background-default def-shadow">
             <span>
                 <span class={extrac} ><a onClick={() => this.onSyncClick()} ><Refresh style="height: 1em; width: 1em;"></Refresh></a></span>
                 <span style={"margin-left: 8px; color:" + color}>{text}</span>
diff --git a/src/components/Routing.tsx b/src/components/Routing.tsx
index c22b924..7dd24b4 100755
--- a/src/components/Routing.tsx
+++ b/src/components/Routing.tsx
@@ -26,7 +26,7 @@ export class Router extends Component<{}, { next?: JSX.Element, current: JSX.Ele
    render() {
       let overlay;
       if (this.state.next) {
-         overlay = <div class="transition_container transition_slidein" key={this.state.next.key} ref={(elm: HTMLDivElement) => {
+         overlay = <div class="transition_container transition_slidein uk-background-default" key={this.state.next.key} ref={(elm: HTMLDivElement) => {
             let lst = () => {
                if (this.state.next)
                   this.setState({ current: this.state.next, next: undefined }, () => {
@@ -43,7 +43,7 @@ export class Router extends Component<{}, { next?: JSX.Element, current: JSX.Ele
          </div>
       }
       return <div style="position: relative; overflow-x: hidden; width: 100vw; height: 100vh;">
-         <div class="transition_container" key={this.state.current.key} ref={elm => this.mounted = elm}>
+         <div class="transition_container uk-background-default" key={this.state.current.key} ref={elm => this.mounted = elm}>
             {this.state.current}
          </div>
          {overlay}
diff --git a/src/components/add_button.scss b/src/components/add_button.scss
index 3dd5ee3..05b0b12 100755
--- a/src/components/add_button.scss
+++ b/src/components/add_button.scss
@@ -1,15 +1,14 @@
-// .add_button_container {}
-.add_button_button {
+.add-button-button {
    position: fixed;
-   bottom: 2rem;
-   right: 2rem;
+   bottom: 2.5rem;
+   right: 1rem;
    width: 4rem;
    height: 4rem;
    padding: 0.75rem;
    z-index: 16;
-}
 
-.add_button_button>svg {
-   height: 2.5rem;
-   width: 2.5rem;
+   >svg {
+      height: 2.5rem;
+      width: 2.5rem;
+   }
 }
\ No newline at end of file
diff --git a/src/components/context.scss b/src/components/context.scss
new file mode 100644
index 0000000..7115dda
--- /dev/null
+++ b/src/components/context.scss
@@ -0,0 +1,18 @@
+@import "../vars.scss";
+
+.context-menu {
+    position: fixed;
+    z-index: 10;
+    display: flex;
+    flex-direction: column;
+    border: 1px $border_color solid;
+
+    > button {
+        margin: 0;
+        display: block;
+    }
+
+    > *:not(:last-child) { 
+        border-bottom: 1px $border_color solid;
+    }
+}
\ No newline at end of file
diff --git a/src/components/modals/context.tsx b/src/components/context.tsx
similarity index 63%
rename from src/components/modals/context.tsx
rename to src/components/context.tsx
index 8e1de53..c100afc 100644
--- a/src/components/modals/context.tsx
+++ b/src/components/context.tsx
@@ -2,7 +2,7 @@ import { h } from "preact";
 import "./context.scss";
 
 export default function ContextMenu({ children, event }: { children: JSX.Element | JSX.Element[], event: MouseEvent }) {
-    return <div style={{ position: "fixed", left: event.pageX, top: event.pageY, zIndex: 10 }} class="context_menu">
+    return <div style={{ left: event.pageX, top: event.pageY }} class="context-menu">
         {children}
     </div>
 }
\ No newline at end of file
diff --git a/src/components/footer.scss b/src/components/footer.scss
index 75e2477..952ebca 100644
--- a/src/components/footer.scss
+++ b/src/components/footer.scss
@@ -1,3 +1,5 @@
+@import "../vars.scss";
+
 .reloading { animation: turner 1s infinite linear }
 
 @keyframes turner{
@@ -14,6 +16,8 @@ footer {
  
     display: flex;
     justify-content: space-between;
+
+    // border-top: 1px solid $border-color;
     
-    padding: calc(0.9 * var(--universal-padding)) !important;
+    padding: 0.15em !important;
 }
\ No newline at end of file
diff --git a/src/components/modals/InputModal.tsx b/src/components/modals/InputModal.tsx
index 4a899f2..498d462 100755
--- a/src/components/modals/InputModal.tsx
+++ b/src/components/modals/InputModal.tsx
@@ -16,6 +16,10 @@ export class InputModal extends Modal<string> {
          this.rand = Math.random().toString();
       }
 
+      componentDidMount() {
+         this.input.focus();
+      }
+
       componentWillUnmount() {
          if (this.input)
             this.input.value = "";
@@ -23,23 +27,36 @@ export class InputModal extends Modal<string> {
 
       render() {
          return <Modal.BaseModal modal={this.props.modal}>
-            <fieldset style="border:none; min-inline-size:0;">
-               <label for={this.rand}>{this.props.modal.fieldname}</label>
-               <input style="min-width: 85%" autofocus ref={elm => {
-                  this.input = elm
-                  if (this.input)
-                     setTimeout(() => this.input.focus(), 0)
-               }} type={this.props.modal.type} id={this.rand} placeholder={this.props.modal.fieldname} onKeyDown={evt => {
-                  if (evt.keyCode === 13) {
-                     this.props.modal.result(this.input.value)
-                  }
-               }} />
-               <div style="text-align: right;">
-                  <button class="primary" style="display: inline-block;" onClick={() => {
+            <div class="uk-form-horizontal uk-margin-large">
+               <div class="uk-margin">
+                  <label class="uk-form-label" for={this.rand}>{this.props.modal.fieldname}</label>
+                  <div class="uk-form-controls">
+                     <input
+                        class="uk-input"
+                        id={this.rand}
+                        type={this.props.modal.type}
+                        placeholder={this.props.modal.fieldname}
+                        autofocus
+                        ref={elm => { this.input = elm; }}
+                        onKeyDown={evt => {
+                           if (evt.keyCode === 13) {
+                              this.props.modal.result(this.input.value)
+                           }
+                        }}
+                     />
+                  </div>
+               </div>
+               <div class="uk-margin" style="text-align: right;">
+                  <button class="uk-button uk-button-primary" style="display: inline-block;" onClick={() => {
                      this.props.modal.result(this.input.value);
                   }}>Enter</button>
                </div>
-            </fieldset>
+            </div>
+
+            {/* 
+            <fieldset style="border:none; min-inline-size:0;">
+
+            </fieldset> */}
          </Modal.BaseModal>
       }
    }
diff --git a/src/components/modals/LoadingModal.tsx b/src/components/modals/LoadingModal.tsx
index 970f877..7f7eba6 100755
--- a/src/components/modals/LoadingModal.tsx
+++ b/src/components/modals/LoadingModal.tsx
@@ -11,7 +11,11 @@ export default class LoadingModal extends Modal<undefined> {
 
    getComponent() {
       return <Modal.BaseModal modal={this}>
-         <div class="spinner primary" style="height: 80px; width: 80px; margin: 3rem auto;"></div>
+         <div style="display: flex; justify-content: center;">
+            <div style="margin: 3rem;" class="uk-spinner uk-icon">
+               <svg width="90" height="90" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg" data-svg="spinner"><circle fill="none" stroke="#000" cx="15" cy="15" r="14" style="stroke-width: 0.333333px;"></circle></svg>
+            </div>
+         </div>
       </Modal.BaseModal>
    }
 }
\ No newline at end of file
diff --git a/src/components/modals/Modal.tsx b/src/components/modals/Modal.tsx
index 86e4d28..cd5f2e1 100644
--- a/src/components/modals/Modal.tsx
+++ b/src/components/modals/Modal.tsx
@@ -13,6 +13,7 @@ export default abstract class Modal<T> {
    // Private
    private onResult: (result: T | null) => void;
    private closeOnResult: boolean;
+   private noClose: boolean = false;
 
    // Protected
    protected result(value: T | null) {
@@ -25,9 +26,10 @@ export default abstract class Modal<T> {
    //Public
    /**
     * This function shows the modal
-    * Do not cell when using getResult()
+    * Do not call when using getResult()
     */
-   public async show() {
+   public show(noClose = true) {
+      this.noClose = noClose;
       Modal.modalObservableServer.send({ modal: this, close: false });
    }
 
@@ -38,7 +40,7 @@ export default abstract class Modal<T> {
     */
    public async getResult(close = true) {
       this.closeOnResult = close;
-      this.show();
+      this.show(false);
       return new Promise<T | null>((yes) => this.onResult = yes);
    }
 
@@ -50,17 +52,11 @@ export default abstract class Modal<T> {
 
    public static BaseModal = class BaseModal<T> extends Component<{ modal: Modal<T> }, {}> {
       render() {
-         return <div class="modal_container" onClick={(evt) => {
+         return <div class="modal-container" onClick={(evt) => {
             let path = evt.composedPath();
             if (!path.find(e => {
-               let res = false;
                let s = (e as Element);
-               if (s) {
-                  if (s.classList) {
-                     res = s.classList.contains("card")
-                  }
-               }
-               return res;
+               return s.id === "ModalContent";
             })) {
                this.props.modal.result(null)
             }
@@ -69,12 +65,15 @@ export default abstract class Modal<T> {
                this.props.modal.result(null)
             }
          }}>
-            <div class="card" >
-               <div class="section" style="display:flex;justify-content:space-between;">
+            <div id="ModalContent" class="uk-card uk-card-body uk-card-body" >
+               <div class="modal-title uk-card-title" style="">
                   <h3>{this.props.modal.title}</h3>
-                  <h3>
-                     <CloseIcon onClick={() => this.props.modal.result(null)} width={undefined} height={undefined} style="height:calc(1rem * var(--heading-ratio) * var(--heading-ratio))" />
-                  </h3>
+                  {/* <div> */}
+                  {!this.props.modal.noClose ?
+                     <CloseIcon onClick={() => this.props.modal.result(null)} width={undefined} height={undefined} />
+                     : undefined
+                  }
+                  {/* </div> */}
                </div>
                {this.props.children}
             </div>
diff --git a/src/components/modals/YesNoModal.tsx b/src/components/modals/YesNoModal.tsx
index 7ccb5e0..edca432 100755
--- a/src/components/modals/YesNoModal.tsx
+++ b/src/components/modals/YesNoModal.tsx
@@ -28,16 +28,16 @@ export class YesNoModal extends Modal<boolean> {
 
       render() {
          return <Modal.BaseModal modal={this.props.modal}>
-            <fieldset style="border:none;min-inline-size:0;">
+            <div class="uk-margin-large">
                <div style="text-align: right;">
-                  <button class="primary" style="display: inline-block;" onClick={() => {
+                  <button class="uk-button uk-button-primary uk-margin-right" style="display: inline-block;" onClick={() => {
                      this.props.modal.result(false);
                   }}>No</button>
-                  <button class="primary" style="display: inline-block;" onClick={() => {
+                  <button class="uk-button uk-button-primary" style="display: inline-block;" onClick={() => {
                      this.props.modal.result(true);
                   }}>Yes</button>
                </div>
-            </fieldset>
+            </div>
          </Modal.BaseModal>
       }
    }
diff --git a/src/components/modals/context.scss b/src/components/modals/context.scss
deleted file mode 100644
index 263610c..0000000
--- a/src/components/modals/context.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-.context_menu {
-    button {
-        margin: 0;
-        display: block;
-    }
-}
\ No newline at end of file
diff --git a/src/components/modals/modal.scss b/src/components/modals/modal.scss
index b494f9a..7f9dc55 100755
--- a/src/components/modals/modal.scss
+++ b/src/components/modals/modal.scss
@@ -1,4 +1,4 @@
-.modal_container {
+.modal-container {
    position: fixed;
    top: 0;
    left: 0;
@@ -8,7 +8,7 @@
    z-index: 32;
 }
 
-.modal_container>.card {
+.modal-container>.uk-card {
    position: absolute;
    left: 0;
    right: 0;
@@ -16,4 +16,13 @@
    width: 80%;
    max-width: 800px;
    margin: auto;
+   background: white;
+}
+
+.modal-title {
+   display:flex; 
+   justify-content:space-between;
+   >svg {
+      height: 1em;
+   }
 }
\ No newline at end of file
diff --git a/src/components/routes/vault/Entry.tsx b/src/components/routes/vault/Entry.tsx
index 9206c07..96cdd9d 100755
--- a/src/components/routes/vault/Entry.tsx
+++ b/src/components/routes/vault/Entry.tsx
@@ -22,7 +22,7 @@ export default class EntryComponent extends Component<{ vault: Promise<IVault>,
 
    skip_save: boolean = false;
 
-   loading?: LoadingModal;
+   // loading?: LoadingModal;
 
    constructor(props) {
       super(props);
@@ -38,8 +38,8 @@ export default class EntryComponent extends Component<{ vault: Promise<IVault>,
    async componentWillMount() {
       try {
          this.skip_save = false;
-         this.loading = new LoadingModal();
-         this.loading.show();
+         // this.loading = new LoadingModal();
+         // this.loading.show();
 
          this.vault = await this.props.vault;
          let note: ViewNote;
@@ -66,8 +66,8 @@ export default class EntryComponent extends Component<{ vault: Promise<IVault>,
             }
             let [title] = this.text.split("\n", 1);
             this.setState({ title, changed })
-            if (this.loading)
-               this.loading.close();
+            // if (this.loading)
+            // this.loading.close();
          }
       } catch (err) {
          Notifications.sendError(err);
@@ -164,23 +164,28 @@ export default class EntryComponent extends Component<{ vault: Promise<IVault>,
       }
 
       return <div>
-         <header>
-            <div>
-               <a class="button header_icon_button" onClick={() => this.exitHandler()}><X height={undefined} width={undefined} /></a>
-               {this.state.changed ? <a class="button header_icon_button" onClick={() => save_handler()}><Save height={undefined} width={undefined} /></a> : undefined}
-            </div>
-            <h1 style="display:inline" class="button header_title">{this.state.title}</h1>
-            <a class="button header_icon_button" onClick={() => delete_handler()}><Trash height={undefined} width={undefined} /></a>
+         <header class="uk-background-primary">
+            {/* <div> */}
+            <a class="header-icon-button" onClick={() => this.exitHandler()}><X height={undefined} width={undefined} /></a>
+            {this.state.changed ? <a class="header-icon-button" style="margin-left: 0.5em;" onClick={() => save_handler()}><Save height={undefined} width={undefined} /></a> : undefined}
+            {/* </div> */}
+            <h3 style="display:inline" class="button header-title">{this.state.title}</h3>
+            <a class="header-icon-button" onClick={() => delete_handler()}><Trash height={undefined} width={undefined} /></a>
          </header>
-         <div class="container">
-            <div class="row">
-               <div class="col-sm-12 col-md-8 col-lg-6 col-md-offset-2 col-lg-offset-3">
-                  <textarea autofocus value={this.text} rows={this.rows} class="doc" style="width:100%;" onKeyDown={evt => this.textAreaKeyPress(evt)} onKeyUp={evt => this.textAreaChange(evt)} ref={elm => {
-                     if (elm)
-                        setTimeout(() => elm.focus(), 0)
-                  }} />
-               </div>
-            </div>
+         <div class="uk-container">
+            <textarea
+               autofocus
+               value={this.text}
+               rows={this.rows}
+               class="doc uk-textarea"
+               style="width:100%;"
+               onKeyDown={evt => this.textAreaKeyPress(evt)}
+               onKeyUp={evt => this.textAreaChange(evt)}
+               ref={elm => {
+                  if (elm)
+                     setTimeout(() => elm.focus(), 500)
+               }}
+            />
          </div>
       </div>
    }
diff --git a/src/components/routes/vault/EntryList.tsx b/src/components/routes/vault/EntryList.tsx
index e614a43..98cb067 100755
--- a/src/components/routes/vault/EntryList.tsx
+++ b/src/components/routes/vault/EntryList.tsx
@@ -3,23 +3,34 @@ import Notes, { IVault, BaseNote } from "../../../notes";
 import AddButton from "../../AddButton";
 import Navigation from "../../../navigation";
 import ArrowLeft from "feather-icons/dist/icons/arrow-left.svg"
-import ContextMenu from "../../modals/context";
+import Search from "feather-icons/dist/icons/search.svg"
+import ContextMenu from "../../context";
 import Notifications from "../../../notifications";
+import { Observable, Lock } from "@hibas123/utils";
+
 
 export default class EntryList extends Component<{ vault: Promise<IVault> }, { notes: BaseNote[], context: JSX.Element | undefined }> {
+   rawNotes: BaseNote[];
+
+   private searchObservableServer = new Observable<void>(1000);
+   private searchObservable = this.searchObservableServer.getPublicApi();
+
    constructor(props) {
       super(props)
+      console.log("Creating new Instance of EntryList")
       this.state = { notes: [], context: undefined }
       this.onDragOver = this.onDragOver.bind(this);
       this.onDrop = this.onDrop.bind(this);
       this.reloadNotes = this.reloadNotes.bind(this);
+      this.searchChanged = this.searchChanged.bind(this);
    }
    vault: IVault;
 
-   reloadNotes(s?: boolean) {
+   async reloadNotes(s?: boolean) {
       if (s)
          return;
-      return new Promise(yes => this.vault.getAllNotes().then(entries => this.setState({ notes: entries }, yes)));
+      this.rawNotes = await this.vault.getAllNotes();
+      await this.applySearch(true);
    }
 
    async componentWillMount() {
@@ -28,6 +39,7 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
       document.body.addEventListener("dragover", this.onDragOver);
       document.body.addEventListener("drop", this.onDrop);
       Notes.syncObservable.subscribe(this.reloadNotes);
+      this.searchObservable.subscribeCollect(() => this.applySearch());
    }
 
    componentWillUnmount() {
@@ -36,6 +48,11 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
       Notes.syncObservable.unsubscribe(this.reloadNotes);
    }
 
+   componentDidMount() {
+      console.log("ON Component Did mount", this.search);
+      this.searchInput.value = this.search;
+   }
+
    onDragOver(evt: DragEvent) {
       evt.preventDefault();
    }
@@ -60,7 +77,7 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
 
       let share;
       if ((window.navigator as any).share) {
-         share = <button onClick={() => shareNote()}>
+         share = <button class="uk-button" onClick={() => shareNote()}>
             share
          </button>
          let context = <ContextMenu event={evt} >
@@ -140,6 +157,74 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
       }
    }
 
+   searchLock = new Lock();
+   oldSearch = "";
+   async applySearch(force = false) {
+      const search = this.search.toLowerCase();
+      if (!force && search === this.oldSearch) {
+         return;
+      }
+
+      if (this.searchLock.locked)
+         return;
+      const lock = await this.searchLock.getLock();
+      console.time("SearchOP");
+
+      let notes: BaseNote[] = [];
+
+      if (search === "") {
+         notes = this.rawNotes;
+      } else {
+         const parts = search.split(" ");
+         const match = (note: BaseNote) => {
+            return parts.every(function (el) {
+               return note.preview.toLowerCase().indexOf(el) > -1;
+            });
+         }
+
+         let elements: BaseNote[];
+         if (!force && this.oldSearch && search.startsWith(this.oldSearch)) {
+            elements = [...this.state.notes];
+         } else {
+            elements = [...this.rawNotes];
+         }
+
+
+         await new Promise(yes => {
+            const idle = () => {
+               window.requestIdleCallback(deadline => {
+                  let invTR = deadline.timeRemaining() <= 0;
+                  while ((deadline.timeRemaining() > 0 || invTR) && elements.length > 0) {
+                     let element = elements.shift();
+                     if (match(element)) {
+                        notes.push(element);
+                     }
+                  }
+                  if (elements.length > 0)
+                     idle();
+                  else
+                     yes();
+               }, { timeout: 100 });
+            }
+            idle();
+         })
+         // notes = elements.filter(note => match(note));
+      }
+
+      await new Promise(yes => this.setState({ notes }, yes));
+      this.oldSearch = search;
+      lock.release();
+      console.timeEnd("SearchOP");
+   }
+
+   search = "";
+   searchChanged(evt: Event) {
+      let input = evt.target as HTMLInputElement;
+      this.search = input.value;
+      this.searchObservableServer.send();
+   }
+
+   searchInput: HTMLInputElement;
    render() {
       const open_entry = (id: string | null) => {
          Navigation.setPage("/vault", { id: this.vault.id }, { id, entry: "true" })
@@ -147,36 +232,37 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
 
       let elms = this.state.notes.map(note => {
          let [first, second] = note.preview.split("\n", 2);
-         return <div class="vault_vault" onContextMenu={evt => this.onContext(evt, note)} onClick={() => {
+         return <li class="vault-vault" onContextMenu={evt => this.onContext(evt, note)} onClick={() => {
             open_entry(note._id)
          }}>
-            <span>{first}</span><br />
-            <span>{second}</span>
-         </div>
+            <div>{first}</div>
+            <div>{second}</div>
+         </li>
       })
 
+
       return <div>
          {this.state.context}
-         <header>
-            <div>
-               <a class="button header_icon_button" onClick={() => history.back()}><ArrowLeft height={undefined} width={undefined} /></a>
-            </div>
-            <h1 style="display:inline" class="button header_title" onClick={() => Navigation.setPage("/")}>{this.vault ? this.vault.name : ""}</h1>
+         <header class="uk-background-primary">
+            {/* <div> */}
+            <a class="header-icon-button" onClick={() => history.back()}><ArrowLeft height={undefined} width={undefined} /></a>
+            {/* </div> */}
+            <h3 style="display:inline" class="header-title" onClick={() => Navigation.setPage("/")}>{this.vault ? this.vault.name : ""}</h3>
             <span></span>
             {/* <a class="button header_icon_button"><MoreVertival height={undefined} width={undefined} /></a> */}
          </header>
          <AddButton onClick={() => open_entry(null)} />
-         <div class="container">
-            <div class="row">
-               <div class="col-sm-12 col-md-8 col-lg-6 col-md-offset-2 col-lg-offset-3">
-                  <div class="card fluid">
-                     <div class="section">
-                        {elms}
-                     </div>
-                  </div>
-               </div>
+         <div class="uk-container">
+            <div style="display:flex;">
+               <input class="uk-input" type="text" onKeyUp={this.searchChanged} ref={elm => this.searchInput = elm} />
+               <button class="uk-button" style="padding: 0 10px;">
+                  <Search />
+               </button>
             </div>
+            <ul class="uk-list uk-list-divider">
+               {elms}
+            </ul>
          </div>
-      </div>
+      </div>;
    }
 }
\ No newline at end of file
diff --git a/src/components/routes/vault/vault.scss b/src/components/routes/vault/vault.scss
index 14d17bb..3f339b7 100755
--- a/src/components/routes/vault/vault.scss
+++ b/src/components/routes/vault/vault.scss
@@ -1,27 +1,43 @@
-.vault_vault>span:nth-of-type(1) {
-   font-size: 1.3rem;
-   margin-left: 0;
+
+
+.vault-vault {
+   width: 100%;
+   >div {
+      width: 100%;
+      font-size: 1rem;
+      margin-left: 1rem;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+   }
+
+   >div:nth-of-type(1) {
+      font-size: 1.3rem;
+      margin-left: 0;
+   }
+
+   >div:empty {
+      &::before{
+         content: " ";
+         white-space: pre;
+      }
+   }
 }
 
-.vault_vault>span {
-   font-size: 1rem;
-   margin-left: 1rem;
-}
+// .vault_vault {
+//    padding: 0.5rem;
+//    border-bottom: solid 1px var(--card-border-color);
+// }
 
-.vault_vault {
-   padding: 0.5rem;
-   border-bottom: solid 1px var(--card-border-color);
-}
+// .vault_vault:hover {
+//    background: var(--nav-hover-back-color);
+// }
 
-.vault_vault:hover {
-   background: var(--nav-hover-back-color);
-}
+// .vault_vault>svg {
+//    height: 2rem;
+//    margin-right: 1rem;
+// }
 
-.vault_vault>svg {
-   height: 2rem;
-   margin-right: 1rem;
-}
-
-.vault_vault:last-child {
-   border-bottom: none;
-}
\ No newline at end of file
+// .vault_vault:last-child {
+//    border-bottom: none;
+// }
\ No newline at end of file
diff --git a/src/components/routes/vaults/Vaults.tsx b/src/components/routes/vaults/Vaults.tsx
index 406fee4..964f7a4 100644
--- a/src/components/routes/vaults/Vaults.tsx
+++ b/src/components/routes/vaults/Vaults.tsx
@@ -8,7 +8,7 @@ import Navigation from "../../../navigation";
 import { InputModal } from "../../modals/InputModal";
 import { YesNoModal } from "../../modals/YesNoModal";
 import AddButton from "../../AddButton";
-import ContextMenu from "../../modals/context";
+import ContextMenu from "../../context";
 import Notifications from "../../../notifications";
 
 export interface VaultsProps {
@@ -134,7 +134,7 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
       }
       window.addEventListener("click", close);
 
-      let deleteb = <button onClick={async () => {
+      let deleteb = <button class="uk-button" onClick={async () => {
          let delete_modal = new YesNoModal("Delete Vault? Cannot be undone!");
          let result = await delete_modal.getResult();
          if (result) {
@@ -151,7 +151,7 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
 
       let delete_key;
       if (Notes.getVaultKey(vault.id)) {
-         delete_key = <button onClick={() => {
+         delete_key = <button class="uk-button" onClick={() => {
             Notes.forgetVaultKey(vault.id);
             Notifications.sendSuccess("Forgot key!")
          }}>
@@ -159,7 +159,7 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
          </button>;
       }
 
-      let exportb = <button onClick={async () => {
+      let exportb = <button class="uk-button" onClick={async () => {
          let key: Uint8Array;
          if (vault.encrypted) {
             await this.getKey(vault, false)
@@ -205,33 +205,27 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
 
    render() {
       let elms = this.state.vaults.map(vault => {
-         return <div class="vaults_vault" onClick={() => this.openVault(vault)} onContextMenu={(evt) => this.onContext(evt, vault)}>
+         return <li class="vaults_vault" onClick={() => this.openVault(vault)} onContextMenu={(evt) => this.onContext(evt, vault)}>
             {vault.encrypted ? <Lock height={undefined} width={undefined} /> : <Unlock height={undefined} width={undefined} />}
             <span>
                {vault.name}
             </span>
-         </div>
+         </li>
       })
 
       return <div style={{ marginTop: "-12px", paddingTop: "12px" }} >
-         {this.state.modal}
+         {/* {this.state.modal} */}
          {this.state.context}
-         <header>
+         <header class="uk-background-primary">
             <span></span>
-            <h1 style="display:inline" class="button header_title" onClick={() => Navigation.setPage("/")}>Your vaults:</h1>
+            <h3 style="display:inline" class="header_title" onClick={() => Navigation.setPage("/")}>Your vaults:</h3>
             <span></span>
          </header>
          <AddButton onClick={() => this.addButtonClick()} />
-         <div class="container">
-            <div class="row">
-               <div class="col-sm-12 col-md-8 col-lg-6 col-md-offset-2 col-lg-offset-3">
-                  <div class="card fluid">
-                     <div class="section">
-                        {elms}
-                     </div>
-                  </div>
-               </div>
-            </div>
+         <div class="uk-container">
+            <ul class="uk-list uk-list-divider">
+               {elms}
+            </ul>
          </div>
       </div>
    }
diff --git a/src/components/routes/vaults/vaults.scss b/src/components/routes/vaults/vaults.scss
index d20d516..2d70632 100755
--- a/src/components/routes/vaults/vaults.scss
+++ b/src/components/routes/vaults/vaults.scss
@@ -1,21 +1,23 @@
-.vaults_vault>span {
-   font-size: 2rem !important;
-}
+@import "../../../vars.scss";
 
 .vaults_vault {
    padding: 0.5rem;
-   border-bottom: solid 1px var(--card-border-color);
-}
+   margin-top: 0 !important;
 
-.vaults_vault:hover {
-   background: var(--nav-hover-back-color);
-}
+   // >span {
+   //    font-size: 2rem !important;
+   // }
 
-.vaults_vault>svg {
-   height: 2rem;
-   margin-right: 1rem;
-}
+   // &:not(:last-child) { 
+   //    border-bottom: 1px $border_color solid;
+   // }
 
-.vaults_vault:last-child {
-   border-bottom: none;
+   >svg {
+      height: 2rem;
+      margin-right: 1rem;
+   }
+
+   &:hover {
+      background: $hover-background;
+   }
 }
\ No newline at end of file
diff --git a/src/components/routing.scss b/src/components/routing.scss
index b58a3dc..1711cec 100755
--- a/src/components/routing.scss
+++ b/src/components/routing.scss
@@ -5,7 +5,6 @@
    height: 100%;
    width: 100%;
    overflow: auto;
-   background: var(--back-color);
    padding-bottom: 40px;
 }
 
diff --git a/src/index.scss b/src/index.scss
index b9d444c..9830d92 100755
--- a/src/index.scss
+++ b/src/index.scss
@@ -1,5 +1,5 @@
-@import url('https://fonts.googleapis.com/css?family=Roboto');
 @import "./vars.scss";
+
 * {
    margin: 0;
    padding: 0;
@@ -18,27 +18,47 @@ html {
    display: flex;
 }
 
-// .feather {
-//    width: 24px;
-//    height: 24px;
-//    stroke: currentColor;
-//    stroke-width: 2;
-//    stroke-linecap: round;
-//    stroke-linejoin: round;
-//    fill: none;
-// }
-.header_icon_button {
-   height: $header_icon_width;
-   width: $header_icon_width;
-}
-
-.header_title {
-   max-width: calc(100% - #{$header_icon_width} - #{$header_icon_width});
-   overflow: hidden;
-}
+$header-margin: .5em;
+$header-icon-size: calc(1.5rem * 1);
+// $header-icon-size: 100%;
 
 header {
    display: flex;
    justify-content: space-between;
-   margin-bottom: calc(1.5 * var(--universal-padding));
+   margin-bottom: $header-margin;
+   align-content: center;
+   padding: 0.75em;
+   border-bottom: solid $border-color 1px;
+
+   >* {
+      margin: 0;
+   }
+
+   >.header-title {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+      flex-grow: 1;
+      margin: 0 1em;
+   }
+
+   .header-icon-button {
+      display: block;
+      margin-top: auto;
+      margin-bottom: auto;
+      color: black;
+      min-width: $header-icon-size;
+
+      >svg {
+         height: $header-icon-size;
+         width: $header-icon-size;
+      }
+   }
+
+}
+
+.def-shadow {
+   box-shadow: 0px 5px 8px 2px rgba(66, 66, 66, 0.53);
 }
\ No newline at end of file
diff --git a/src/index.tsx b/src/index.tsx
index 8f9192f..0c4840d 100755
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,11 +1,46 @@
+declare global {
+   interface Window {
+      requestIdleCallback: (callback: (deadline: { didTimeout: boolean, timeRemaining: () => number }) => void, options?: { timeout: number }) => number | NodeJS.Timeout;
+      cancelIdleCallback: (id: number | NodeJS.Timeout) => void;
+      debug: any;
+   }
+}
+// declare const window: Window;
+
+window.requestIdleCallback =
+   window.requestIdleCallback ||
+   function (cb) {
+      var start = Date.now();
+      return setTimeout(function () {
+         console.log("Idle Timeout reached!");
+         cb({
+            didTimeout: false,
+            timeRemaining: function () {
+               return Math.max(0, 50 - (Date.now() - start));
+            }
+         });
+      }, 1);
+   };
+
+window.cancelIdleCallback =
+   window.cancelIdleCallback ||
+   function (id) {
+      clearTimeout(id as any);
+   };
+
+console.log(window.requestIdleCallback);
+
 window.debug = {};
 
+
+
+
 import { h, render } from 'preact';
 import App from './components/App';
 
 // import "mini.css/src/flavors/mini-dark.scss"
-import "mini.css/src/flavors/mini-default.scss"
-import "uikit";
+// import "mini.css/src/flavors/mini-default.scss"
+// import "uikit";
 import "uikit/dist/css/uikit.css"
 import "./index.scss"
 import Navigation from './navigation';
@@ -17,6 +52,7 @@ import DemoPage from './components/demo';
 import VaultPage from './components/routes/vault/Vault';
 import SharePage from './components/routes/share/Share';
 import Notifications from './notifications';
+
 console.log(Notes);
 
 (async () => {
diff --git a/src/notes.ts b/src/notes.ts
index 7e23056..ad7d5bc 100644
--- a/src/notes.ts
+++ b/src/notes.ts
@@ -40,7 +40,6 @@ import IDB from "./helper/indexeddb";
 import { Transaction } from "idb";
 import Notifications, { MessageType } from "./notifications";
 
-console.log(aesjs)
 const Encoder = new TextEncoder();
 const Decoder = new TextDecoder();
 
@@ -150,8 +149,12 @@ class NotesProvider {
    constructor(public readonly baseurl = "") {
       this._secureFile = new SecureFile(config.secure_file_server);
       this._secureFile.jwtObservable.subscribe(async (callback) => {
-         let jwt = await this.getJWT();
-         callback(jwt);
+         try {
+            let jwt = await this.getJWT();
+            callback(null, jwt);
+         } catch (err) {
+            callback(err, null);
+         }
       })
 
       let key = localStorage.getItem("enc_key");
diff --git a/src/vars.scss b/src/vars.scss
index 7d9864e..1e31a3f 100755
--- a/src/vars.scss
+++ b/src/vars.scss
@@ -1 +1,2 @@
-$header_icon_width: calc(3.1875rem + var(--universal-padding) / 2);
\ No newline at end of file
+$border-color: #AAAAAA;
+$hover-background: #DDDDDD;
\ No newline at end of file