diff --git a/ponyracer/README.md b/ponyracer/README.md
index 8fe149a..cca30ce 100644
--- a/ponyracer/README.md
+++ b/ponyracer/README.md
@@ -1,6 +1,6 @@
 # Ponyracer
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.1.0-next.3.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.1.0-next.4.
 
 ## Development server
 
diff --git a/ponyracer/package.json b/ponyracer/package.json
index caee4c5..9d0f9e7 100644
--- a/ponyracer/package.json
+++ b/ponyracer/package.json
@@ -11,24 +11,24 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~9.1.0-next.4",
-    "@angular/common": "~9.1.0-next.4",
-    "@angular/compiler": "~9.1.0-next.4",
-    "@angular/core": "~9.1.0-next.4",
-    "@angular/forms": "~9.1.0-next.4",
-    "@angular/platform-browser": "~9.1.0-next.4",
-    "@angular/platform-browser-dynamic": "~9.1.0-next.4",
-    "@angular/router": "~9.1.0-next.4",
+    "@angular/animations": "~9.1.0-next.5",
+    "@angular/common": "~9.1.0-next.5",
+    "@angular/compiler": "~9.1.0-next.5",
+    "@angular/core": "~9.1.0-next.5",
+    "@angular/forms": "~9.1.0-next.5",
+    "@angular/platform-browser": "~9.1.0-next.5",
+    "@angular/platform-browser-dynamic": "~9.1.0-next.5",
+    "@angular/router": "~9.1.0-next.5",
     "rxjs": "~6.5.4",
     "tslib": "^1.10.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.0-next.3",
-    "@angular-devkit/build-ng-packagr": "~0.901.0-next.3",
-    "@angular/cli": "~9.1.0-next.3",
-    "@angular/compiler-cli": "~9.1.0-next.4",
-    "@angular/language-service": "~9.1.0-next.4",
+    "@angular-devkit/build-angular": "~0.901.0-next.4",
+    "@angular-devkit/build-ng-packagr": "~0.901.0-next.4",
+    "@angular/cli": "~9.1.0-next.4",
+    "@angular/compiler-cli": "~9.1.0-next.5",
+    "@angular/language-service": "~9.1.0-next.5",
     "@types/node": "^12.11.1",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
@@ -43,7 +43,7 @@
     "ng-packagr": "^9.0.0",
     "protractor": "~5.4.3",
     "ts-node": "~8.3.0",
-    "tslint": "~5.18.0",
+    "tslint": "~6.1.0",
     "typescript": "~3.8.3"
   }
 }
diff --git a/ponyracer/projects/ponyracer-lib/README.md b/ponyracer/projects/ponyracer-lib/README.md
index 84ea667..7bcfd08 100644
--- a/ponyracer/projects/ponyracer-lib/README.md
+++ b/ponyracer/projects/ponyracer-lib/README.md
@@ -1,6 +1,6 @@
 # PonyracerLib
 
-This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.1.0-next.4.
+This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.1.0-next.5.
 
 ## Code scaffolding
 
diff --git a/ponyracer/projects/ponyracer-lib/package.json b/ponyracer/projects/ponyracer-lib/package.json
index 6e949b8..0d8cf57 100644
--- a/ponyracer/projects/ponyracer-lib/package.json
+++ b/ponyracer/projects/ponyracer-lib/package.json
@@ -2,8 +2,8 @@
   "name": "ponyracer-lib",
   "version": "0.0.1",
   "peerDependencies": {
-    "@angular/common": "^9.1.0-next.4",
-    "@angular/core": "^9.1.0-next.4",
+    "@angular/common": "^9.1.0-next.5",
+    "@angular/core": "^9.1.0-next.5",
     "tslib": "^1.10.0"
   }
 }
\ No newline at end of file
diff --git a/ponyracer/tslint.json b/ponyracer/tslint.json
index e770913..def88d1 100644
--- a/ponyracer/tslint.json
+++ b/ponyracer/tslint.json
@@ -4,22 +4,34 @@
     "codelyzer"
   ],
   "rules": {
+    "align": {
+      "options": [
+        "parameters",
+        "statements"
+      ]
+    },
     "array-type": false,
-    "arrow-parens": false,
+    "arrow-return-shorthand": true,
+    "curly": true,
     "deprecation": {
       "severity": "warning"
     },
+    "eofline": true,
     "import-blacklist": [
       true,
       "rxjs/Rx"
     ],
-    "interface-name": false,
+    "import-spacing": true,
+    "indent": {
+      "options": [
+        "spaces"
+      ]
+    },
     "max-classes-per-file": false,
     "max-line-length": [
       true,
       140
     ],
-    "member-access": false,
     "member-ordering": [
       true,
       {
@@ -31,7 +43,6 @@
         ]
       }
     ],
-    "no-consecutive-blank-lines": false,
     "no-console": [
       true,
       "debug",
@@ -53,13 +64,59 @@
       true,
       "as-needed"
     ],
-    "object-literal-sort-keys": false,
-    "ordered-imports": false,
     "quotemark": [
       true,
       "single"
     ],
-    "trailing-comma": false,
+    "semicolon": {
+      "options": [
+        "always"
+      ]
+    },
+    "space-before-function-paren": {
+      "options": {
+        "anonymous": "never",
+        "asyncArrow": "always",
+        "constructor": "never",
+        "method": "never",
+        "named": "never"
+      }
+    },
+    "typedef-whitespace": {
+      "options": [
+        {
+          "call-signature": "nospace",
+          "index-signature": "nospace",
+          "parameter": "nospace",
+          "property-declaration": "nospace",
+          "variable-declaration": "nospace"
+        },
+        {
+          "call-signature": "onespace",
+          "index-signature": "onespace",
+          "parameter": "onespace",
+          "property-declaration": "onespace",
+          "variable-declaration": "onespace"
+        }
+      ]
+    },
+    "variable-name": {
+      "options": [
+        "ban-keywords",
+        "check-format",
+        "allow-pascal-case"
+      ]
+    },
+    "whitespace": {
+      "options": [
+        "check-branch",
+        "check-decl",
+        "check-operator",
+        "check-separator",
+        "check-type",
+        "check-typecast"
+      ]
+    },
     "component-class-suffix": true,
     "contextual-lifecycle": true,
     "directive-class-suffix": true,