diff --git a/src/Ombi/ClientApp/angular.json b/src/Ombi/ClientApp/angular.json
index 673e36ed6..5f5ce72b3 100644
--- a/src/Ombi/ClientApp/angular.json
+++ b/src/Ombi/ClientApp/angular.json
@@ -13,6 +13,7 @@
                 "build": {
                     "builder": "@angular-devkit/build-angular:browser",
                     "options": {
+            "aot": true,
                         "progress": true,
                         "extractCss": true,
                         "outputPath": "dist",
@@ -44,6 +45,12 @@
                     },
                     "configurations": {
                         "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
                             "fileReplacements": [{
                                 "replace": "src/environments/environment.ts",
                                 "with": "src/environments/environment.prod.ts"
@@ -59,6 +66,12 @@
                             "buildOptimizer": true
                         },
                         "hmr": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
                             "fileReplacements": [{
                                 "replace": "src/environments/environment.ts",
                                 "with": "src/environments/environment.hmr.ts"
diff --git a/src/Ombi/ClientApp/package.json b/src/Ombi/ClientApp/package.json
index 63ace623c..36d7fa050 100644
--- a/src/Ombi/ClientApp/package.json
+++ b/src/Ombi/ClientApp/package.json
@@ -1,78 +1,79 @@
 {
-    "name": "ombi",
-    "version": "3.0.0",
-    "scripts": {
-        "ng": "ng",
-        "start": "ng serve --port 3578 --configuration hmr",
-        "build": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod",
-        "lint": "ng lint"
-    },
-    "private": true,
-    "dependencies": {
-        "@angular/animations": "^8.0.0",
-        "@angular/cdk": "^8.0.0",
-        "@angular/common": "^8.0.0",
-        "@angular/compiler": "^8.0.0",
-        "@angular/core": "^8.0.0",
-        "@angular/forms": "^8.0.0",
-        "@angular/material": "^8.0.0",
-        "@angular/platform-browser": "^8.0.0",
-        "@angular/platform-browser-dynamic": "^8.0.0",
-        "@angular/platform-server": "^8.0.0",
-        "@angular/router": "^8.0.0",
-        "@angularclass/hmr": "^2.1.3",
-        "@aspnet/signalr": "^1.1.0",
-        "@auth0/angular-jwt": "^2.1.0",
-        "@fullcalendar/core": "^4.2.0",
-        "@fullcalendar/interaction": "^4.2.0",
-        "@ng-bootstrap/ng-bootstrap": "^4.0.1",
-        "@ngu/carousel": "^1.4.9-beta-2",
-        "@ngx-translate/core": "^11.0.1",
-        "@ngx-translate/http-loader": "^4.0.0",
-        "@types/jquery": "^3.3.29",
-        "@yellowspot/ng-truncate": "^1.4.0",
-        "angular-bootstrap-md": "^7.5.4",
-        "angular-router-loader": "^0.8.5",
-        "angularx-qrcode": "^2.1.0",
-        "bootstrap": "^4.2.1",
-        "chart.js": "2.5.0",
-        "core-js": "^2.5.4",
-        "eventemitter2": "^5.0.1",
-        "font-awesome": "^4.7.0",
-        "fullcalendar": "^4.0.0-alpha.4",
-        "hammerjs": "^2.0.8",
-        "jquery": "3.3.1",
-        "moment": "^2.23.0",
-        "ng2-cookies": "^1.0.12",
-        "ngx-clipboard": "^12.1.0",
-        "ngx-infinite-scroll": "^7.1.0",
-        "ngx-moment": "^3.0.1",
-        "ngx-order-pipe": "^2.0.1",
-        "please-wait": "^0.0.5",
-        "popper.js": "^1.14.3",
-        "primeicons": "^1.0.0",
-        "primeng": "^7.0.3",
-        "rxjs": "^6.5.2",
-        "spinkit": "^1.2.5",
-        "store": "^2.0.12",
-        "tslint-angular": "^1.1.2",
-        "zone.js": "^0.9.1"
-    },
-    "devDependencies": {
-        "@angular-devkit/build-angular": "^0.803.21",
-        "@angular/cli": "~8.3.21",
-        "@angular/compiler-cli": "^8.2.14",
-        "@angular/language-service": "^8.2.14",
-        "@types/jasmine": "~2.8.6",
-        "@types/jasminewd2": "~2.0.3",
-        "@types/node": "~8.9.4",
-        "codelyzer": "^4.5.0",
-        "typescript": "~3.4.5"
-    },
-    "optionalDependencies": {
-        "node-sass": "^4.12.0",
-        "protractor": "~5.4.0",
-        "ts-node": "~5.0.1",
-        "tslint": "^5.12.0"
-    }
+  "name": "ombi",
+  "version": "3.0.0",
+  "scripts": {
+    "ng": "ng",
+    "start": "ng serve --port 3578 --configuration hmr",
+    "build": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod",
+    "lint": "ng lint"
+  },
+  "private": true,
+  "dependencies": {
+    "@angular/animations": "^9.1.7",
+    "@angular/cdk": "^8.0.0",
+    "@angular/common": "^9.1.7",
+    "@angular/compiler": "^9.1.7",
+    "@angular/core": "^9.1.7",
+    "@angular/forms": "^9.1.7",
+    "@angular/material": "^8.0.0",
+    "@angular/platform-browser": "^9.1.7",
+    "@angular/platform-browser-dynamic": "^9.1.7",
+    "@angular/platform-server": "^9.1.7",
+    "@angular/router": "^9.1.7",
+    "@angularclass/hmr": "^2.1.3",
+    "@aspnet/signalr": "^1.1.0",
+    "@auth0/angular-jwt": "^2.1.0",
+    "@fullcalendar/core": "^4.2.0",
+    "@fullcalendar/interaction": "^4.2.0",
+    "@ng-bootstrap/ng-bootstrap": "^4.0.1",
+    "@ngu/carousel": "^1.4.9-beta-2",
+    "@ngx-translate/core": "^11.0.1",
+    "@ngx-translate/http-loader": "^4.0.0",
+    "@types/jquery": "^3.3.29",
+    "@yellowspot/ng-truncate": "^1.4.0",
+    "angular-bootstrap-md": "^7.5.4",
+    "angular-router-loader": "^0.8.5",
+    "angularx-qrcode": "^2.1.0",
+    "bootstrap": "^4.2.1",
+    "chart.js": "2.5.0",
+    "core-js": "^2.5.4",
+    "eventemitter2": "^5.0.1",
+    "font-awesome": "^4.7.0",
+    "fullcalendar": "^4.0.0-alpha.4",
+    "hammerjs": "^2.0.8",
+    "jquery": "3.3.1",
+    "moment": "^2.23.0",
+    "ng2-cookies": "^1.0.12",
+    "ngx-clipboard": "^12.1.0",
+    "ngx-infinite-scroll": "^7.1.0",
+    "ngx-moment": "^3.0.1",
+    "ngx-order-pipe": "^2.0.1",
+    "please-wait": "^0.0.5",
+    "popper.js": "^1.14.3",
+    "primeicons": "^1.0.0",
+    "primeng": "^7.0.3",
+    "rxjs": "^6.5.2",
+    "spinkit": "^1.2.5",
+    "store": "^2.0.12",
+    "tslib": "^1.10.0",
+    "tslint-angular": "^1.1.2",
+    "zone.js": "~0.10.2"
+  },
+  "devDependencies": {
+    "@angular-devkit/build-angular": "~0.901.6",
+    "@angular/cli": "~9.1.6",
+    "@angular/compiler-cli": "^9.1.7",
+    "@angular/language-service": "^9.1.7",
+    "@types/jasmine": "~2.8.6",
+    "@types/jasminewd2": "~2.0.3",
+    "@types/node": "^12.11.1",
+    "codelyzer": "^5.1.2",
+    "typescript": "~3.8.3"
+  },
+  "optionalDependencies": {
+    "node-sass": "^4.12.0",
+    "protractor": "~5.4.0",
+    "ts-node": "~5.0.1",
+    "tslint": "^5.12.0"
+  }
 }
diff --git a/src/Ombi/ClientApp/src/app/pipes/pipe.module.ts b/src/Ombi/ClientApp/src/app/pipes/pipe.module.ts
index 615157a5f..a947851b3 100644
--- a/src/Ombi/ClientApp/src/app/pipes/pipe.module.ts
+++ b/src/Ombi/ClientApp/src/app/pipes/pipe.module.ts
@@ -11,7 +11,7 @@ import { QualityPipe } from "./QualityPipe";
 })
 export class PipeModule {
 
-    public static forRoot(): ModuleWithProviders {
+    public static forRoot(): ModuleWithProviders<PipeModule> {
         return {
             ngModule: PipeModule,
             providers: [],
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts
index 7659b5161..c3df069df 100644
--- a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts
+++ b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts
@@ -35,8 +35,8 @@ export class MoviesGridComponent implements OnInit, AfterViewInit {
 
     @Output() public onOpenOptions = new EventEmitter<{ request: any, filter: any, onChange: any }>();
 
-    @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
-    @ViewChild(MatSort, { static: false }) sort: MatSort;
+    @ViewChild(MatPaginator) paginator: MatPaginator;
+    @ViewChild(MatSort) sort: MatSort;
 
     constructor(private requestService: RequestServiceV2, private ref: ChangeDetectorRef,
                 private auth: AuthService, private storageService: StorageService) {
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/tv-grid/tv-grid.component.ts b/src/Ombi/ClientApp/src/app/requests-list/components/tv-grid/tv-grid.component.ts
index 2726bdc91..30cb9c12e 100644
--- a/src/Ombi/ClientApp/src/app/requests-list/components/tv-grid/tv-grid.component.ts
+++ b/src/Ombi/ClientApp/src/app/requests-list/components/tv-grid/tv-grid.component.ts
@@ -34,8 +34,8 @@ export class TvGridComponent implements OnInit, AfterViewInit {
 
     @Output() public onOpenOptions = new EventEmitter<{request: any, filter: any, onChange: any}>();
 
-    @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator;
-    @ViewChild(MatSort, {static: false}) sort: MatSort;
+    @ViewChild(MatPaginator) paginator: MatPaginator;
+    @ViewChild(MatSort) sort: MatSort;
 
     constructor(private requestService: RequestServiceV2, private auth: AuthService,
                 private ref: ChangeDetectorRef, private storageService: StorageService) {
diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts
index 07d54f3d1..8c76b2ac6 100644
--- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts
+++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts
@@ -15,7 +15,7 @@ export class UserManagementComponent implements OnInit {
     public dataSource: MatTableDataSource<IUser>;
 
     public selection = new SelectionModel<IUser>(true, []);
-    @ViewChild(MatSort, {static: false}) public sort: MatSort;
+    @ViewChild(MatSort) public sort: MatSort;
     public users: IUser[];
     public checkAll = false;
     public emailSettings: IEmailNotificationSettings;
diff --git a/src/Ombi/ClientApp/src/app/vote/vote.component.ts b/src/Ombi/ClientApp/src/app/vote/vote.component.ts
index 44abb8774..ffab837cd 100644
--- a/src/Ombi/ClientApp/src/app/vote/vote.component.ts
+++ b/src/Ombi/ClientApp/src/app/vote/vote.component.ts
@@ -18,7 +18,7 @@ export class VoteComponent implements OnInit {
     public completedVotes: IVoteViewModel[];
     public VoteType = VoteType;
     public panelImage: string;
-    @ViewChild("op", {static: false}) public overlayPanel: OverlayPanel;
+    @ViewChild("op") public overlayPanel: OverlayPanel;
 
     constructor(private voteService: VoteService, private notificationSerivce: NotificationService) { }
 
diff --git a/src/Ombi/ClientApp/src/tsconfig.app.json b/src/Ombi/ClientApp/src/tsconfig.app.json
index 50086d3bc..62bc75321 100644
--- a/src/Ombi/ClientApp/src/tsconfig.app.json
+++ b/src/Ombi/ClientApp/src/tsconfig.app.json
@@ -1,22 +1,30 @@
-{
-  "compileOnSave": false,
-  "compilerOptions": {
+{
+  "compileOnSave": false,
+  "compilerOptions": {
     "baseUrl": "./",
-    "outDir": "./dist/out-tsc",
-    "sourceMap": true,
-    "declaration": false,
-    "moduleResolution": "node",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "target": "es5",
-    "types": ["node"],
-    "resolveJsonModule":true,
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2017",
-      "dom"
-    ]
-  }
-}
+    "module": "esnext",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es5",
+    "types": ["node"],
+    "resolveJsonModule":true,
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2017",
+      "dom"
+    ]
+  }
,
+  "files": [
+    "main.ts",
+    "polyfills.ts"
+  ],
+  "include": [
+    "src/**/*.d.ts"
+  ]
+}