diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/form.scss b/ng2-components/ng2-activiti-form/src/components/widgets/form.scss
index f36f1dbcf1..7b9d5d346a 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/form.scss
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/form.scss
@@ -1,5 +1,4 @@
 @import './hyperlink/hyperlink.widget';
-@import '~ng2-alfresco-core/styles/colors';
 
 @mixin mat-form-theme($theme) {
     $primary: map-get($theme, primary);
diff --git a/ng2-components/ng2-alfresco-core/.npmignore b/ng2-components/ng2-alfresco-core/.npmignore
index a30cc5773b..0c52e99b0b 100644
--- a/ng2-components/ng2-alfresco-core/.npmignore
+++ b/ng2-components/ng2-alfresco-core/.npmignore
@@ -17,3 +17,4 @@ fonts/
 /gulpfile.ts
 /.npmignore
 /.happypack
+/prebuilt-themes/
diff --git a/ng2-components/ng2-alfresco-core/README.md b/ng2-components/ng2-alfresco-core/README.md
index 716a4bd9a1..e8850e15e5 100644
--- a/ng2-components/ng2-alfresco-core/README.md
+++ b/ng2-components/ng2-alfresco-core/README.md
@@ -30,6 +30,7 @@ Contains a variety of components, directives and services used throughout ADF
       - [1. Define the model for the custom type](#1-define-the-model-for-the-custom-type)
       - [2. Define the component for the custom type](#2-define-the-component-for-the-custom-type)
       - [3. Add you custom component to your module's entryComponents list](#3-add-you-custom-component-to-your-modules-entrycomponents-list)
+- [Logout directive](#logout-directive)
 - [Node Permission directive](#node-permission-directive)
   * [Basic Usage](#basic-usage-3)
     + [Properties](#properties-3)
diff --git a/ng2-components/ng2-alfresco-core/config/webpack.style.js b/ng2-components/ng2-alfresco-core/config/webpack.style.js
index a8312b80bc..7997804c9b 100644
--- a/ng2-components/ng2-alfresco-core/config/webpack.style.js
+++ b/ng2-components/ng2-alfresco-core/config/webpack.style.js
@@ -1,7 +1,7 @@
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
 const path = require('path');
 
-const extractScss = new ExtractTextPlugin('./ng2-alfresco-core/prebuilt-themes/[name].css');
+const extractScss = new ExtractTextPlugin('./prebuilt-themes/[name].css');
 
 module.exports = {
 
diff --git a/ng2-components/ng2-alfresco-core/styles/_variables.scss b/ng2-components/ng2-alfresco-core/styles/_variables.scss
index a4963579ec..f783a374ac 100644
--- a/ng2-components/ng2-alfresco-core/styles/_variables.scss
+++ b/ng2-components/ng2-alfresco-core/styles/_variables.scss
@@ -1,4 +1,4 @@
-@import 'colors';
+@import './colors';
 
 /* ANIMATION */
 $animation-curve-fast-out-slow-in: cubic-bezier(0.4, 0, 0.2, 1) !default;
diff --git a/ng2-components/package.json b/ng2-components/package.json
index 4144a2b6d0..5a68b39279 100644
--- a/ng2-components/package.json
+++ b/ng2-components/package.json
@@ -9,10 +9,10 @@
     "rimraf": "rimraf",
     "build": "npm run pkg-build && npm run toc && npm run markdownlint && npm run webpack -- --config config/webpack.build.js --progress --profile --bail && npm run build-style",
     "test": "node node_modules/karma/bin/karma start --reporters mocha,coverage --single-run --component .",
+    "build-style": "npm run webpack -- --config config/webpack.style.js --progress --profile --bail",
     "test-browser": "node node_modules/karma/bin/karma start karma.conf.js --reporters kjhtml",
     "coverage": "",
     "prepublishOnly": "npm run build",
-    "build-style": "npm run webpack -- --config config/webpack.style.js --progress --profile --bail",
     "pkg-build": "package-json-merge ng2-alfresco-core/package.json ng2-alfresco-datatable/package.json ng2-activiti-diagrams/package.json ng2-activiti-analytics/package.json ng2-activiti-form/package.json ng2-activiti-tasklist/package.json ng2-activiti-processlist/package.json ng2-alfresco-documentlist/package.json ng2-alfresco-login/package.json ng2-alfresco-search/package.json ng2-alfresco-tag/package.json ng2-alfresco-upload/package.json ng2-alfresco-viewer/package.json ng2-alfresco-webscript/package.json ng2-alfresco-webscript/package.json ng2-alfresco-userinfo/package.json ng2-alfresco-social/package.json package-base.json  > package.json",
     "toc": "markdown-toc -i ng2-alfresco-core/README.md && markdown-toc -i ng2-alfresco-datatable/README.md && markdown-toc -i ng2-activiti-diagrams/README.md && markdown-toc -i ng2-activiti-analytics/README.md && markdown-toc -i ng2-activiti-form/README.md && markdown-toc -i ng2-activiti-tasklist/README.md && markdown-toc -i ng2-activiti-processlist/README.md && markdown-toc -i ng2-alfresco-documentlist/README.md && markdown-toc -i ng2-alfresco-login/README.md && markdown-toc -i ng2-alfresco-search/README.md && markdown-toc -i ng2-alfresco-tag/README.md && markdown-toc -i ng2-alfresco-upload/README.md && markdown-toc -i ng2-alfresco-viewer/README.md && markdown-toc -i ng2-alfresco-webscript/README.md && markdown-toc -i ng2-alfresco-webscript/README.md && markdown-toc -i ng2-alfresco-userinfo/README.md && markdown-toc -i ng2-alfresco-social/README.md && markdown-toc -i README.md",
     "markdownlint": "markdownlint ng2-alfresco-core/README.md && markdownlint ng2-alfresco-datatable/README.md && markdownlint ng2-activiti-diagrams/README.md && markdownlint ng2-activiti-analytics/README.md && markdownlint ng2-activiti-form/README.md && markdownlint ng2-activiti-tasklist/README.md && markdownlint ng2-activiti-processlist/README.md && markdownlint ng2-alfresco-documentlist/README.md && markdownlint ng2-alfresco-login/README.md && markdownlint ng2-alfresco-search/README.md && markdownlint ng2-alfresco-tag/README.md && markdownlint ng2-alfresco-upload/README.md && markdownlint ng2-alfresco-viewer/README.md && markdownlint ng2-alfresco-webscript/README.md && markdownlint ng2-alfresco-webscript/README.md && markdownlint ng2-alfresco-userinfo/README.md && markdownlint ng2-alfresco-social/README.md && markdownlint README.md",