diff --git a/package.json b/package.json
index 2b672973e..5a9c3b20b 100644
--- a/package.json
+++ b/package.json
@@ -56,20 +56,12 @@
     "@ngx-share/core": "^7.1.2",
     "angular2-cookie-law": "^7.0.1",
     "axios": "^0.19.0",
-    "compression": "^1.7.4",
-    "core-js": "^3.1.4",
     "dom-to-image": "^2.6.0",
-    "domino": "^2.1.3",
-    "edit-json-file": "^1.2.1",
     "firebase": "^6.3.3",
     "firebaseui": "^4.1.0",
-    "fs": "0.0.1-security",
     "google-libphonenumber": "^3.2.2",
     "hammerjs": "^2.0.8",
-    "jasmine-marbles": "^0.6.0",
-    "lodash": "^4.17.11",
     "lodash.clonedeep": "^4.5.0",
-    "lodash.template": "^4.5.0",
     "nativescript-angular": "8.0.2",
     "nativescript-appversion": "^1.4.1",
     "nativescript-camera": "^4.4.1",
@@ -81,7 +73,6 @@
     "nativescript-geolocation": "^5.1.0",
     "nativescript-imagecropper": "^1.0.5",
     "nativescript-imagepicker": "^6.2.0",
-    "nativescript-loading-indicator": "^2.5.2",
     "nativescript-plugin-firebase": "9.0.4",
     "nativescript-screenshot": "0.0.2",
     "nativescript-social-share": "^1.5.1",
@@ -96,13 +87,11 @@
     "ngx-lazy-load-images": "^1.3.1",
     "ngx-papaparse": "^3.0.2",
     "ngx-swiper-wrapper": "^8.0.1",
-    "node-sass": "^4.12.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^6.5.2",
     "stream": "0.0.2",
     "tns-core-modules": "^6.0.3",
     "tns-platform-declarations": "^6.0.3",
-    "uglifyjs-webpack-plugin": "^2.1.3",
     "zone.js": "0.9.1"
   },
   "devDependencies": {
@@ -118,11 +107,15 @@
     "@types/node": "^12.0.0",
     "axios": "^0.19.0",
     "codelyzer": "5.0.1",
+    "compression": "^1.7.4",
+    "core-js": "^3.1.4",
     "cp": "^0.2.0",
     "cpx": "^1.5.0",
+    "domino": "^2.1.3",
     "highlightjs": "^9.12.0",
     "husky": "^3.0.1",
     "jasmine-core": "3.4.0",
+    "jasmine-marbles": "^0.6.0",
     "jasmine-spec-reporter": "4.2.1",
     "jest": "^24.8.0",
     "jest-preset-angular": "^7.1.0",
@@ -135,11 +128,13 @@
     "karma-jasmine": "2.0.1",
     "karma-jasmine-html-reporter": "1.4.2",
     "katex": "^0.10.2",
+    "lodash": "^4.17.11",
     "lodash.template": "^4.5.0",
     "mathquill": "^0.10.1-a",
     "nativescript-dev-webpack": "1.0.1",
     "nativescript-pager": "^9.5.4",
     "ng-katex": "^1.2.1",
+    "node-sass": "^4.12.0",
     "protractor": "^5.4.2",
     "rimraf": "^2.6.3",
     "shelljs": "^0.8.3",
diff --git a/projects/shared-library/tsconfig.lib.json b/projects/shared-library/tsconfig.lib.json
index 3a2b0b989..0eee5ffec 100644
--- a/projects/shared-library/tsconfig.lib.json
+++ b/projects/shared-library/tsconfig.lib.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
-    "module": "es2015",
+    "module": "esnext",
     "moduleResolution": "node",
     "declaration": true,
     "sourceMap": true,
diff --git a/projects/trivia-admin/src/app/routing/app.route.ts b/projects/trivia-admin/src/app/routing/app.route.ts
index 33de9dbea..a2a4cd4ae 100644
--- a/projects/trivia-admin/src/app/routing/app.route.ts
+++ b/projects/trivia-admin/src/app/routing/app.route.ts
@@ -18,7 +18,7 @@ export const routes: Routes = [
   },
   {
     path: 'admin',
-    loadChildren: '../admin/admin.module#AdminModule',
+    loadChildren: () => import('../admin/admin.module').then(m => m.AdminModule),
     canActivate: [AuthGuard],
     canLoad: [AdminLoadGuard]
   }
diff --git a/projects/trivia-admin/tsconfig.app.json b/projects/trivia-admin/tsconfig.app.json
index 0fa1f64c4..d279ac251 100644
--- a/projects/trivia-admin/tsconfig.app.json
+++ b/projects/trivia-admin/tsconfig.app.json
@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/app",
-    "module": "es2015",
+    "module": "esnext",
     "types": []
   },
   "exclude": [
diff --git a/projects/trivia-editor/src/app/app.module.ts b/projects/trivia-editor/src/app/app.module.ts
index cc0ec95fd..b9fe53022 100644
--- a/projects/trivia-editor/src/app/app.module.ts
+++ b/projects/trivia-editor/src/app/app.module.ts
@@ -37,7 +37,7 @@ import { NgQuillTexModule } from 'ng-quill-tex';
       maxAge: 20
     }),
 
-    StoreRouterConnectingModule,
+    StoreRouterConnectingModule.forRoot(),
 
     //rwa modules
     CoreModule,
diff --git a/projects/trivia/src/app/routing/app.route.ts b/projects/trivia/src/app/routing/app.route.ts
index 25badcbf7..1291c1503 100644
--- a/projects/trivia/src/app/routing/app.route.ts
+++ b/projects/trivia/src/app/routing/app.route.ts
@@ -10,7 +10,7 @@ export const routes: Routes = [
   },
   {
     path: 'dashboard',
-    loadChildren: '../dashboard/dashboard.module#DashboardModule',
+    loadChildren: () => import('../dashboard/dashboard.module').then(m => m.DashboardModule),
   },
   {
     path: 'privacy-policy',
@@ -22,18 +22,18 @@ export const routes: Routes = [
   },
   {
     path: 'user',
-    loadChildren: '../user/user.module#UserModule',
+    loadChildren: () => import('../user/user.module').then(m => m.UserModule),
     resolve: { "categories": CategoriesResolver, "tags": TagsResolver }
   },
   {
     path: 'game-play',
-    loadChildren: '../game-play/game-play.module#GamePlayModule',
+    loadChildren: () => import('../game-play/game-play.module').then(m => m.GamePlayModule),
     canActivate: [AuthGuard],
     resolve: { "categories": CategoriesResolver, "tags": TagsResolver }
   },
   {
     path: 'bulk',
-    loadChildren: '../bulk/bulk.module#BulkModule',
+    loadChildren: () => import('../bulk/bulk.module').then(m => m.BulkModule),
     canActivate: [AuthGuard],
     canLoad: [BulkLoadGuard]
   },
diff --git a/projects/trivia/tsconfig.app.json b/projects/trivia/tsconfig.app.json
index 050962915..6dfae946c 100644
--- a/projects/trivia/tsconfig.app.json
+++ b/projects/trivia/tsconfig.app.json
@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/app",
-    "module": "es2015",
+    "module": "esnext",
     "types": []
   },
   "exclude": [
diff --git a/tsconfig.aot.json b/tsconfig.aot.json
index c5bf16a97..12d20f465 100644
--- a/tsconfig.aot.json
+++ b/tsconfig.aot.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "es2015",
+    "module": "esnext",
     "moduleResolution": "node",
     "baseUrl": "./",
     "paths": {
diff --git a/tsconfig.esm.json b/tsconfig.esm.json
index 95f2ecee0..6e64d1da8 100644
--- a/tsconfig.esm.json
+++ b/tsconfig.esm.json
@@ -1,7 +1,7 @@
 {
     "extends": "./tsconfig",
     "compilerOptions": {
-        "module": "es2015",
+        "module": "esnext",
         "moduleResolution": "node"
     }
 }
diff --git a/tsconfig.json b/tsconfig.json
index 8401fbc08..cb62d7d2a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,46 +1,53 @@
 {
-    "compileOnSave": false,
-    "compilerOptions": {
-        "baseUrl": ".",
-        "outDir": "./dist/out-tsc",
-        "declaration": false,
-        "module": "es2015",
-        "moduleResolution": "node",
-        "emitDecoratorMetadata": true,
-        "experimentalDecorators": true,
-        "target": "es5",
-        "typeRoots": [
-            "node_modules/@types"
-        ],
-        "types": [
-            "node",
-            "jest"
-        ],
-        "lib": [
-            "es2017",
-            "dom",
-            "es6",
-            "es2015.iterable"
-        ],
-        "paths": {
-            "shared-library/*": [
-                "./projects/shared-library/src/lib/*"
-            ],
-            "core-js/es7/reflect": [
-                "node_modules/core-js/proposals/reflect-metadata"
-            ],
-            "core-js/es6/*": [
-                "node_modules/core-js/es/*"
-            ],
-            "~/*": [
-                "projects/trivia/src/*"
-            ]
-        }
-    },
-    "exclude": [
-        "**/*.tns.ts",
-        "**/*.android.ts",
-        "**/*.ios.ts",
-        "app/main.aot.ts"
-    ]
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": ".",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "downlevelIteration": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "target": "es2015",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "types": [
+      "node",
+      "jest"
+    ],
+    "lib": [
+      "es2018",
+      "dom",
+      "es6",
+      "es2015.iterable"
+    ],
+    "paths": {
+      "shared-library/*": [
+          "./projects/shared-library/src/lib/*"
+      ],
+      "core-js/es7/reflect": [
+          "node_modules/core-js/proposals/reflect-metadata"
+      ],
+      "core-js/es6/*": [
+          "node_modules/core-js/es/*"
+      ],
+      "~/*": [
+          "projects/trivia/src/*"
+      ]
+    }
+  },
+  "angularCompilerOptions": {
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true
+  },
+  "exclude": [
+    "**/*.tns.ts",
+    "**/*.android.ts",
+    "**/*.ios.ts",
+    "app/main.aot.ts"
+]
 }
\ No newline at end of file
diff --git a/tsconfig.tns.json b/tsconfig.tns.json
index 7020e95e7..2afa2a41d 100644
--- a/tsconfig.tns.json
+++ b/tsconfig.tns.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "es2015",
+    "module": "esnext",
     "moduleResolution": "node",
     "experimentalDecorators": true,
     "baseUrl": "./",