diff --git a/demo-shell-ng2/.angular-cli.json b/demo-shell-ng2/.angular-cli.json
index dceb51c347..e9b9ccad77 100644
--- a/demo-shell-ng2/.angular-cli.json
+++ b/demo-shell-ng2/.angular-cli.json
@@ -112,10 +112,14 @@
       "testTsconfig": "tsconfig.spec.json",
       "prefix": "app",
       "styles": [
-        "../node_modules/ng2-alfresco-core/prebuilt-themes/adf-blue-orange.css",
         "styles.css",
         "custom-style.scss"
       ],
+      "stylePreprocessorOptions": {
+        "includePaths": [
+          "../node_modules/"
+        ]
+      },
       "scripts": [
         "../node_modules/pdfjs-dist/build/pdf.js",
         "../node_modules/pdfjs-dist/web/compatibility.js",
@@ -319,10 +323,14 @@
       "testTsconfig": "tsconfig.spec.json",
       "prefix": "app-dev",
       "styles": [
-        "../node_modules/ng2-alfresco-core/prebuilt-themes/adf-blue-orange.css",
         "styles.css",
         "custom-style.scss"
       ],
+      "stylePreprocessorOptions": {
+      "includePaths": [
+        "../../ng2-components/"
+      ]
+      },
       "scripts": [
         "../node_modules/pdfjs-dist/build/pdf.js",
         "../node_modules/pdfjs-dist/web/compatibility.js",
diff --git a/demo-shell-ng2/src/custom-style.scss b/demo-shell-ng2/src/custom-style.scss
index 5f19cfb2ec..8e02e9202c 100644
--- a/demo-shell-ng2/src/custom-style.scss
+++ b/demo-shell-ng2/src/custom-style.scss
@@ -1,22 +1,21 @@
 @import './app/components/app-layout/app-layout.component.scss';
 
-@import '~ng2-alfresco-core/styles/theming';
-@import '~ng2-alfresco-core/styles/index';
-@import '~ng2-activiti-analytics/styles/index';
-@import '~ng2-activiti-diagrams/styles/index';
-@import '~ng2-activiti-form/styles/index';
-@import '~ng2-activiti-processlist/styles/index';
-@import '~ng2-activiti-tasklist/styles/index';
-@import '~ng2-alfresco-datatable/styles/index';
-@import '~ng2-alfresco-documentlist/styles/index';
-@import '~ng2-alfresco-login/styles/index';
-@import '~ng2-alfresco-upload/styles/index';
-@import '~ng2-alfresco-userinfo/styles/index';
-@import '~ng2-alfresco-search/styles/index';
+@import 'ng2-alfresco-core/styles/theming';
+@import 'ng2-alfresco-core/styles/index';
+@import 'ng2-activiti-analytics/styles/index';
+@import 'ng2-activiti-diagrams/styles/index';
+@import 'ng2-activiti-form/styles/index';
+@import 'ng2-activiti-processlist/styles/index';
+@import 'ng2-activiti-tasklist/styles/index';
+@import 'ng2-alfresco-datatable/styles/index';
+@import 'ng2-alfresco-documentlist/styles/index';
+@import 'ng2-alfresco-login/styles/index';
+@import 'ng2-alfresco-upload/styles/index';
+@import 'ng2-alfresco-userinfo/styles/index';
+@import 'ng2-alfresco-search/styles/index';
 
 @import '~@angular/material/theming';
 
-
 @include mat-core();
 
 $custom-typography: mat-typography-config(
diff --git a/demo-shell-ng2/src/styles.css b/demo-shell-ng2/src/styles.css
index c77e96ded4..7a2ccfcee0 100644
--- a/demo-shell-ng2/src/styles.css
+++ b/demo-shell-ng2/src/styles.css
@@ -1,5 +1,5 @@
 /* You can add global styles to this file, and also import other style files */
-@import "~@angular/material/prebuilt-themes/indigo-pink.css";
+/*@import "~@angular/material/prebuilt-themes/indigo-pink.css";*/
 
 .mat-form-field input.mat-input-element {
   line-height: normal;