diff --git a/angular.json b/angular.json
index de3c4a27..47ad5063 100644
--- a/angular.json
+++ b/angular.json
@@ -49,7 +49,14 @@
                             "aot": true,
                             "extractLicenses": true,
                             "vendorChunk": false,
-                            "buildOptimizer": true
+                            "buildOptimizer": true,
+                            "budgets": [
+                                {
+                                    "type": "initial",
+                                    "maximumWarning": "2mb",
+                                    "maximumError": "5mb"
+                                }
+                            ]
                         },
                         "ec": {
                             "sourceMap": true,
@@ -97,7 +104,7 @@
                         "tsConfig": "src/tsconfig.spec.json",
                         "karmaConfig": "src/karma.conf.js",
                         "styles": [
-                            "styles.scss"
+                            "src/styles.scss"
                         ],
                         "scripts": [],
                         "assets": [
@@ -125,12 +132,18 @@
         "fuse-e2e": {
             "root": "e2e/",
             "projectType": "application",
+            "prefix": "",
             "architect": {
                 "e2e": {
                     "builder": "@angular-devkit/build-angular:protractor",
                     "options": {
                         "protractorConfig": "e2e/protractor.conf.js",
                         "devServerTarget": "fuse:serve"
+                    },
+                    "configurations": {
+                        "production": {
+                            "devServerTarget": "fuse:serve:production"
+                        }
                     }
                 },
                 "lint": {
diff --git a/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts
index d3d496c5..10f75511 100644
--- a/e2e/src/app.e2e-spec.ts
+++ b/e2e/src/app.e2e-spec.ts
@@ -1,14 +1,14 @@
-import { Fuse2Page } from './app.po';
+import { FusePage } from './app.po';
 
-describe('Fuse2 App', () => {
-    let page: Fuse2Page;
+describe('Fuse App', () => {
+    let page: FusePage;
 
     beforeEach(() => {
-        page = new Fuse2Page();
+        page = new FusePage();
     });
 
     it('should display welcome message', () => {
         page.navigateTo();
-        expect(page.getParagraphText()).toEqual('Welcome to Fuse2!');
+        expect(page.getParagraphText()).toEqual('Welcome to Fuse!');
     });
 });
diff --git a/e2e/src/app.po.ts b/e2e/src/app.po.ts
index 99860d83..1881a519 100644
--- a/e2e/src/app.po.ts
+++ b/e2e/src/app.po.ts
@@ -1,11 +1,11 @@
 import { browser, by, element } from 'protractor';
 
-export class Fuse2Page {
+export class FusePage {
     navigateTo(): any {
         return browser.get('/');
     }
 
     getParagraphText(): any {
-        return element(by.css('app-root h1')).getText();
+        return element(by.css('app #main')).getText();
     }
 }
diff --git a/src/browserslist b/src/browserslist
index 8e09ab49..c6cb1d38 100644
--- a/src/browserslist
+++ b/src/browserslist
@@ -1,9 +1,11 @@
 # This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries
-# For IE 9-11 support, please uncomment the last line of the file and adjust as needed
+#
+# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
+
 > 0.5%
 last 2 versions
 Firefox ESR
 not dead
-# IE 9-11
\ No newline at end of file
+not IE 9-11
diff --git a/src/polyfills.ts b/src/polyfills.ts
index d1ccdb62..33059be9 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -11,7 +11,7 @@
  * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
  * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
  *
- * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ * Learn more in https://angular.io/guide/browser-support
  */
 
 /***************************************************************************************************
@@ -34,6 +34,11 @@ import 'core-js/es6/map';
 import 'core-js/es6/weak-map';
 import 'core-js/es6/set';
 
+/**
+ * If the application will be indexed by Google Search, the following is required.
+ * Googlebot uses a renderer based on Chrome 41.
+ * https://developers.google.com/search/docs/guides/rendering
+ **/
 import 'core-js/es7/array';
 
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
index e57578c8..9091cc32 100644
--- a/src/tsconfig.app.json
+++ b/src/tsconfig.app.json
@@ -5,7 +5,7 @@
         "module": "es2015"
     },
     "exclude": [
-        "src/test.ts",
+        "test.ts",
         "**/*.spec.ts"
     ]
 }
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
index bde4a15d..0a65d17b 100644
--- a/src/tsconfig.spec.json
+++ b/src/tsconfig.spec.json
@@ -2,7 +2,6 @@
     "extends": "../tsconfig.json",
     "compilerOptions": {
         "outDir": "../out-tsc/spec",
-        "module": "commonjs",
         "types": [
             "jasmine",
             "node"
diff --git a/tsconfig.json b/tsconfig.json
index 9adb5c46..0881f802 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,7 +18,7 @@
             "node_modules/@types"
         ],
         "lib": [
-            "es2017",
+            "es2018",
             "dom"
         ]
     }
diff --git a/tslint.json b/tslint.json
index eca56dcb..89d172ba 100644
--- a/tslint.json
+++ b/tslint.json
@@ -65,6 +65,7 @@
         ],
         "no-misused-new": true,
         "no-non-null-assertion": true,
+        "no-redundant-jsdoc": true,
         "no-shadowed-variable": true,
         "no-string-literal": false,
         "no-string-throw": true,