diff --git a/.cfignore b/.cfignore
new file mode 100644
index 0000000000..5e82883bbe
--- /dev/null
+++ b/.cfignore
@@ -0,0 +1 @@
+node_modules/.cache
\ No newline at end of file
diff --git a/Staticfile b/Staticfile
new file mode 100644
index 0000000000..223b526fea
--- /dev/null
+++ b/Staticfile
@@ -0,0 +1 @@
+root: dist
\ No newline at end of file
diff --git a/manifest.yml b/manifest.yml
new file mode 100644
index 0000000000..566ad30ad4
--- /dev/null
+++ b/manifest.yml
@@ -0,0 +1,5 @@
+---
+applications:
+    - name: carbon-tutorial-angular-erikzurvalec
+      memory: 64M
+      buildpack: https://github.com/cloudfoundry/staticfile-buildpack.git
diff --git a/package-lock.json b/package-lock.json
index bbaf95fbc5..11563dd16d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2763,7 +2763,7 @@
 		"builtins": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-			"integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
+			"integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==",
 			"dev": true
 		},
 		"bytes": {
@@ -3558,7 +3558,7 @@
 		"debuglog": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
-			"integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
+			"integrity": "sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==",
 			"dev": true
 		},
 		"decamelize": {
@@ -4019,7 +4019,7 @@
 		"err-code": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
-			"integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=",
+			"integrity": "sha512-CJAN+O0/yA1CKfRn9SXOGctSpEM7DCon/r/5r2eXFMY2zCCJBasFhcM5I+1kh3Ap11FsQCX+vGHceNPvpWKhoA==",
 			"dev": true
 		},
 		"errno": {
@@ -5246,7 +5246,7 @@
 		"humanize-ms": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-			"integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
+			"integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
 			"dev": true,
 			"requires": {
 				"ms": "^2.0.0"
@@ -6111,7 +6111,7 @@
 		"jsonparse": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-			"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+			"integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
 			"dev": true
 		},
 		"jsprim": {
@@ -8780,7 +8780,7 @@
 		"promise-retry": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz",
-			"integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
+			"integrity": "sha512-StEy2osPr28o17bIW776GtwO6+Q+M9zPiZkYfosciUUMYqjhU/ffwRAH0zN2+uvGyUsn8/YICIHRzLbPacpZGw==",
 			"dev": true,
 			"requires": {
 				"err-code": "^1.0.0",
@@ -8790,7 +8790,7 @@
 				"retry": {
 					"version": "0.10.1",
 					"resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
-					"integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
+					"integrity": "sha512-ZXUSQYTHdl3uS7IuCehYfMzKyIDBNoAuUblvy5oGO5UJSUTmStUUVPXbA9Qxd173Bgre53yCQczQuHgRWAdvJQ==",
 					"dev": true
 				}
 			}
@@ -11377,7 +11377,7 @@
 		"util-promisify": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz",
-			"integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
+			"integrity": "sha512-K+5eQPYs14b3+E+hmE2J6gCZ4JmMl9DbYS6BeP2CHq6WMuNxErxf5B/n0fz85L8zUuoO6rIzNNmIQDu/j+1OcA==",
 			"dev": true,
 			"requires": {
 				"object.getownpropertydescriptors": "^2.0.3"
@@ -11408,7 +11408,7 @@
 		"validate-npm-package-name": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-			"integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+			"integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==",
 			"dev": true,
 			"requires": {
 				"builtins": "^1.0.3"
diff --git a/package.json b/package.json
index f508cc279e..8934f16759 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
 		"test": "ng test",
 		"test:once": "ng test --watch=false",
 		"lint": "ng lint",
-		"e2e": "ng e2e"
+		"e2e": "ng e2e",
+		"deploy": "rm -rf ./dist && ng build --prod --aot && cf push -f manifest.yml"
 	},
 	"engines": {
 		"node": ">= 10.9"
diff --git a/src/styles.scss b/src/styles.scss
index e6089cac78..56c5e9260f 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,13 +1,16 @@
-$feature-flags: (
-	grid-columns-16: true,
-);
+// Feature flags
+$css--font-face: true;
+$css--plex: true;
 
-// To change the theme uncomment the below import and which ever carbon theme you want to use
-// @import '~carbon-components/scss/globals/scss/vendor/@carbon/elements/scss/themes/theme-maps';
-// $carbon--theme: $carbon--theme--g100;
-// $carbon--theme: $carbon--theme--g90;
-// $carbon--theme: $carbon--theme--g10;
+// Global styles
+@import "~carbon-components/scss/globals/scss/css--font-face";
+@import "~carbon-components/scss/globals/grid/grid";
 
-@import "~carbon-components/scss/globals/scss/styles";
-
-@import './assets/scss/carbon-overrides.scss';
+// Carbon components
+@import "~carbon-components/scss/components/breadcrumb/breadcrumb";
+@import "~carbon-components/scss/components/button/button";
+@import "~carbon-components/scss/components/data-table/data-table";
+@import "~carbon-components/scss/components/link/link";
+@import "~carbon-components/scss/components/pagination/pagination";
+@import "~carbon-components/scss/components/tabs/tabs";
+@import "~carbon-components/scss/components/ui-shell/ui-shell";