diff --git a/demo-shell/src/app/components/app-layout/app-layout.component.html b/demo-shell/src/app/components/app-layout/app-layout.component.html
index efaf339436..fe6c4bf361 100644
--- a/demo-shell/src/app/components/app-layout/app-layout.component.html
+++ b/demo-shell/src/app/components/app-layout/app-layout.component.html
@@ -12,7 +12,7 @@
         </mat-nav-list>
     </mat-sidenav>
 
-    <mat-toolbar color="primary" class="adf-app-layout-toolbar" md-no-ink>
+    <mat-toolbar color="primary" class="adf-app-layout-toolbar mat-elevation-z6">
         <adf-userinfo
             class="adf-app-layout-user-profile"
             [menuPositionX]="'before'"
diff --git a/demo-shell/src/app/components/app-layout/app-layout.component.scss b/demo-shell/src/app/components/app-layout/app-layout.component.scss
index 6558c5e9a1..bb3d0083ba 100644
--- a/demo-shell/src/app/components/app-layout/app-layout.component.scss
+++ b/demo-shell/src/app/components/app-layout/app-layout.component.scss
@@ -10,6 +10,10 @@
        }
    }
 
+   .adf-app-layout-toolbar {
+     position: relative;
+   }
+
   .adf-app-layout {
     display: block;
     min-width: $minimumAppWidth;
diff --git a/demo-shell/src/app/components/home/home.component.html b/demo-shell/src/app/components/home/home.component.html
index fc0702c5df..42f7292723 100644
--- a/demo-shell/src/app/components/home/home.component.html
+++ b/demo-shell/src/app/components/home/home.component.html
@@ -1,187 +1,11 @@
-<!-- DOCUMENT LIST-->
-<mat-card class="adf-home-card">
-        <mat-card-title class="adf-home-card-title adf-primary-background-color"  routerLink="/files">
-            <h2 >
-                <mat-icon>dvr</mat-icon>
-                <span class="adf-home-card__text">DocumentList - Content Services</span>
-            </h2>
-        </mat-card-title>
-    <mat-card-content>
-        Demonstrates multiple Alfresco Content Services components used together to display the files of your Content Services instance:
-        <ul class="adf-home-feature-list">
-            <li>
-                <mat-icon>brightness_1</mat-icon>
-                <span class="adf-home-feature-list__text">Communication with the Rest Api and core services</span>
-                <a href="https://www.npmjs.com/package/ng2-alfresco-core" target="_blank">ng2-alfresco-core</a>
-            </li>
-            <li>
-                <mat-icon>dvr</mat-icon>
-                <span class="adf-home-feature-list__text">Document List</span>
-                <a href="https://www.npmjs.com/package/ng2-alfresco-documentlist" target="_blank">ng2-alfresco-documentlist</a>
-            </li>
-            <li>
-                <mat-icon>file_upload</mat-icon>
-                <span class="adf-home-feature-list__text">Upload</span>
-                <a href="https://www.npmjs.com/package/ng2-alfresco-upload" target="_blank">ng2-alfresco-upload</a>
-            </li>
-            <li>
-                <mat-icon>view_module</mat-icon>
-                <span class="adf-home-feature-list__text">DataTable</span>
-                <a href="https://www.npmjs.com/package/ng2-alfresco-datatable" target="_blank">ng2-alfresco-datatable</a>
-            </li>
-        </ul>
-    </mat-card-content>
-</mat-card>
-
-
-<!-- Process Services-->
-<mat-card class="adf-home-card">
-        <mat-card-title class="adf-home-card-title adf-primary-background-color"  routerLink="/activiti">
-            <h2 >
-                <mat-icon>apps</mat-icon>
-                <span class="adf-home-card__text">Process Services</span>
-            </h2>
-        </mat-card-title>
-    <mat-card-content>
-        Demonstrates multiple Alfresco Process Services components used together to show your Process Services process and tasks:
-        <ul class="adf-home-feature-list">
-            <li>
-                <mat-icon>brightness_1</mat-icon>
-                <span class="adf-home-feature-list__text">Communication with the Rest Api and core services</span>
-                <a href="https://www.npmjs.com/package/ng2-alfresco-core" target="_blank">ng2-alfresco-core</a>
-            </li>
-            <li>
-                <mat-icon>view_module</mat-icon>
-                <span class="adf-home-feature-list__text">App List</span>
-                <a href="https://www.npmjs.com/package/ng2-activiti-tasklist" target="_blank">ng2-activiti-apps</a>
-            </li>
-            <li>
-                <mat-icon>view_headline</mat-icon>
-                <span class="adf-home-feature-list__text">Task List</span>
-                <a href="https://www.npmjs.com/package/ng2-activiti-tasklist" target="_blank">ng2-activiti-tasklist</a>
-            </li>
-            <li>
-                <mat-icon>view_headline</mat-icon>
-                <span class="adf-home-feature-list__text">Process List</span>
-                <a href="https://www.npmjs.com/package/ng2-activiti-processlist" target="_blank">ng2-activiti-processlist</a>
-            </li>
-            <li>
-                <mat-icon>view_quilt</mat-icon>
-                <span class="adf-home-feature-list__text">Form</span>
-                <a href="https://www.npmjs.com/package/ng2-activiti-form" target="_blank">ng2-activiti-form</a>
-            </li>
-            <li>
-                <mat-icon>pie_chart</mat-icon>
-                <span class="adf-home-feature-list__text">Analytics</span>
-                <a href="https://www.npmjs.com/package/ng2-activiti-analytics" target="_blank">ng2-activiti-analytics</a>,
-                <a href="https://www.npmjs.com/package/ng2-activiti-diagrams" target="_blank">ng2-activiti-diagrams</a>
-            </li>
-            <li>
-                <mat-icon>view_module</mat-icon>
-                <span class="adf-home-feature-list__text">DataTable</span>
-                <a href="https://www.npmjs.com/package/ng2-alfresco-datatable" target="_blank">ng2-alfresco-datatable</a>
-            </li>
-        </ul>
-    </mat-card-content>
-</mat-card>
-
-
-<!-- DATATABLE-->
-<mat-card class="adf-home-card">
-        <mat-card-title class="adf-home-card-title adf-primary-background-color"  routerLink="/datatable">
-            <h2 >
-                <mat-icon>view_module</mat-icon>
-                <span class="adf-home-card__text">DataTable - Content Services & Process Services</span>
-            </h2>
-        </mat-card-title>
-    <mat-card-content>
-        Basic table component:
-        <ul class="adf-home-feature-list">
-            <li>
-                <mat-icon>brightness_1</mat-icon>
-                <span class="adf-home-feature-list__text">Communication with the Rest Api and core services</span>
-                <a href="https://www.npmjs.com/package/ng2-alfresco-core" target="_blank">ng2-alfresco-core</a>
-            </li>
-        </ul>
-    </mat-card-content>
-</mat-card>
-
-<!-- UPLOADER-->
-<mat-card class="adf-home-card">
-        <mat-card-title class="adf-home-card-title adf-primary-background-color"  routerLink="/uploader">
-            <h2 >
-                <mat-icon>file_upload</mat-icon>
-                <span class="adf-home-card__text">Uploader - Content Services</span>
-            </h2>
-        </mat-card-title>
-    <mat-card-content>
-        Basic table uploader component for the Content Services & Process Services:
-        <ul class="adf-home-feature-list">
-            <li>
-                <mat-icon>brightness_1</mat-icon>
-                <span class="adf-home-feature-list__text">Communication with the Rest Api and core services</span>
-                <a href="https://www.npmjs.com/package/ng2-alfresco-core" target="_blank">ng2-alfresco-core</a>
-            </li>
-        </ul>
-    </mat-card-content>
-</mat-card>
-
-<!-- LOGIN-->
-<mat-card class="adf-home-card">
-        <mat-card-title class="adf-home-card-title adf-primary-background-color"  routerLink="/login">
-            <h2 >
-                <mat-icon>account_circle</mat-icon>
-                <span class="adf-home-card__text">Login - Content Services & Process Services</span>
-            </h2>
-        </mat-card-title>
-    <mat-card-content>
-        Login component for the Content Services and Process Services:
-        <ul class="adf-home-feature-list">
-            <li>
-                <mat-icon>brightness_1</mat-icon>
-                <span class="adf-home-feature-list__text">Communication with the Rest Api and core services</span>
-                <a href="https://www.npmjs.com/package/ng2-alfresco-core" target="_blank">ng2-alfresco-core</a>
-            </li>
-        </ul>
-    </mat-card-content>
-</mat-card>
-
-<!-- WEBSCRIPT-->
-<mat-card class="adf-home-card">
-    <mat-card-title class="adf-home-card-title adf-primary-background-color"  routerLink="/webscript">
-        <h2 >
-            <mat-icon>extension</mat-icon>
-            <span class="adf-home-card__text">Webscript - Content Services</span>
-        </h2>
-    </mat-card-title>
-    <mat-card-content>
-        Displays and creates webscripts in your Content Services instance:
-        <ul class="adf-home-feature-list">
-            <li>
-                <mat-icon>brightness_1</mat-icon>
-                <span class="adf-home-feature-list__text">Communication with the Rest Api and core services</span>
-                <a href="https://www.npmjs.com/package/ng2-alfresco-core" target="_blank">ng2-alfresco-core</a>
-            </li>
-        </ul>
-    </mat-card-content>
-</mat-card>
-
-<!-- TAG-->
-<mat-card class="adf-home-card">
-        <mat-card-title class="adf-home-card-title adf-primary-background-color"  routerLink="/tag">
-            <h2 >
-                <mat-icon>local_offer</mat-icon>
-                <span class="adf-home-card__text">Tag - Content Services</span>
-            </h2>
-        </mat-card-title>
-    <mat-card-content>
-        Displays and adds tags to the node of your Content Services instance:
-        <ul class="adf-home-feature-list">
-            <li>
-                <mat-icon>brightness_1</mat-icon>
-                <span class="adf-home-feature-list__text">Communication with Rest</span>
-                <a href="https://www.npmjs.com/package/ng2-alfresco-core" target="_blank">ng2-alfresco-core</a>
-            </li>
-        </ul>
-    </mat-card-content>
-</mat-card>
+<header class="adf-home-background adf-primary-background-color">
+    <div class="adf-home-section ad">
+        <div class="adf-home-headline">
+            <h1 class="mat-h1">ADF</h1>
+            <h2> Angular components for Alfresco</h2>
+        </div>
+        <div class="adf-home-start">
+            <a mat-raised-button class="adf-home-docs-button adf-primary-color" href="https://github.com/Alfresco/alfresco-ng2-components/tree/master/docs">DOCS</a>
+        </div>
+    </div>
+</header>
diff --git a/demo-shell/src/app/components/home/home.component.scss b/demo-shell/src/app/components/home/home.component.scss
index ef2f88a86c..9aee2a5db0 100644
--- a/demo-shell/src/app/components/home/home.component.scss
+++ b/demo-shell/src/app/components/home/home.component.scss
@@ -1,42 +1,28 @@
-.adf-home-card {
-    float: left;
-    margin: 10px 10px 10px 10px;
-    width: 290px;
-    display: block;
-    overflow-y: auto;
-    height: 400px;
+.adf-home-header-background {
+    overflow: hidden;
+}
+
+.adf-home-section {
+    text-align: center;
+    padding-top: 60px;
+}
+
+.adf-home-headline {
+    h1 {
+        font-size: 56px;
+        font-weight: 300;
+        line-height: 56px;
+        margin: 15px 5px;
+    }
 
     h2 {
-        line-height: 30px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-    }
-
-    .material-icons {
-        position: relative;
-        top: 6px;
+        font-size: 18px;
+        font-weight: 300;
+        line-height: 28px;
+        margin: 15px 0 25px 0;
     }
 }
 
-.adf-home-card-title {
-    padding: 24px;
-    cursor: pointer;
-    height: 55px;
-    margin: -63px -24px 18px -25px !important;
-}
-
-.adf-home-card__text {
-    font-size: 16px;
-    line-height: 18px;
-}
-
-.adf-home-feature-list {
-    list-style: none;
-    padding-left: 0;
-}
-
-span.home--feature-list__text:before {
-    content: '';
-    padding-left: 4px;
+.adf-home-docs-button {
+    margin: 30px;
 }
diff --git a/docs/theming.md b/docs/theming.md
index 500ca61c93..00e106d139 100644
--- a/docs/theming.md
+++ b/docs/theming.md
@@ -7,7 +7,7 @@ include all of the styles for core (styles common to all components), so you onl
 single css file for Angular Material in your app.
 
 You can include a theme file directly into your application from
-`ng2-alfresco-core/prebuilt-themes`
+`@alfresco/adf-core/prebuilt-themes`
 
 Available pre-built themes:
 * `adf-blue-orange.css`
@@ -38,21 +38,14 @@ When you want more customization than a pre-built theme offers, you can create y
 /*
  *  Include only packages that you are using (and core by default)
  */
-@import '~@angular/material/theming';
-@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 '~@alfresco/adf-content-services/theming';
+@import '~@alfresco/adf-process-services/theming';
+@import '~@alfresco/adf-insights/theming';
+@import '~@alfresco/adf-core/theming';
 
-@include mat-core();
+@import '~@angular/material/theming';
+
+@include mat-core($alfresco-typography);
 
 $primary: mat-palette($alfresco-accent-orange);
 $accent:  mat-palette($alfresco-accent-purple);
@@ -61,18 +54,10 @@ $theme:   mat-light-theme($primary, $accent, $warn);
 
 @include angular-material-theme($theme);
 
-@include alfresco-core-theme($theme);
-@include adf-analytics-theme($theme);
-@include adf-diagrams-theme($theme);
-@include adf-form-theme($theme);
-@include adf-processlist-theme($theme);
-@include adf-tasklist-theme($theme);
-@include alfresco-datatable-theme($theme);
-@include alfresco-documentlist-theme($theme);
-@include alfresco-login-theme($theme);
-//@include alfresco-upload-theme($theme);
-//@include alfresco-userinfo-theme($theme);
-
+@include adf-content-services-theme($theme);
+@include adf-process-services-theme($theme);
+@include adf-insights-theme($theme);
+@include adf-core-theme($theme);
 ```
 
 Notes: if you are using the Generator or the demo shell you need only to change the`/src/custom-style.scss` with your set of colors
@@ -84,9 +69,11 @@ You can create multiple themes for your application:
 #### Example of defining multiple themes
 
 ```scss
+@import '~@alfresco/adf-content-services/theming';
+@import '~@alfresco/adf-process-services/theming';
+@import '~@alfresco/adf-insights/theming';
+@import '~@alfresco/adf-core/theming';
 @import '~@angular/material/theming';
-@import '~ng2-alfresco-core/styles/theming';
-@import '~ng2-alfresco-core/styles/index';
 ...
 
 @include mat-core();
@@ -98,11 +85,11 @@ $warn:    mat-palette($alfresco-warn);
 $theme:   mat-light-theme($primary, $accent, $warn);
 $dark-theme:   mat-dark-theme($primary, $accent, $warn);
 
-@include alfresco-core-theme($theme);
+@include adf-core-theme($theme);
 ...like above
 
 .adf-dark-theme {
-    @include alfresco-core-theme($dark-theme);
+    @include adf-core-theme($dark-theme);
     ...like above
 }
 ```
diff --git a/lib/content-services/document-list/services/document-actions.service.spec.ts b/lib/content-services/document-list/services/document-actions.service.spec.ts
index 501353c0d1..f49fb7a620 100644
--- a/lib/content-services/document-list/services/document-actions.service.spec.ts
+++ b/lib/content-services/document-list/services/document-actions.service.spec.ts
@@ -162,6 +162,7 @@ describe('DocumentActionsService', () => {
 
     it('should execute download action and cleanup', () => {
         let file = new FileNode();
+        file.entry.name = 'test.png';
         let url = 'http://<address>';
 
         spyOn(contentService, 'getContentUrl').and.returnValue(url);
@@ -179,7 +180,7 @@ describe('DocumentActionsService', () => {
 
         expect(contentService.getContentUrl).toHaveBeenCalledWith(file);
         expect(document.createElement).toHaveBeenCalledWith('a');
-        expect(link.setAttribute).toHaveBeenCalledWith('download', 'download');
+        expect(link.setAttribute).toHaveBeenCalledWith('download', 'test.png');
         expect(document.body.appendChild).toHaveBeenCalledWith(link);
         expect(link.click).toHaveBeenCalled();
         expect(document.body.removeChild).toHaveBeenCalledWith(link);
diff --git a/lib/content-services/document-list/services/document-actions.service.ts b/lib/content-services/document-list/services/document-actions.service.ts
index 03b0f35bdc..ff6c000bf6 100644
--- a/lib/content-services/document-list/services/document-actions.service.ts
+++ b/lib/content-services/document-list/services/document-actions.service.ts
@@ -69,12 +69,12 @@ export class DocumentActionsService {
         this.handlers['delete'] = this.deleteNode.bind(this);
     }
 
-    private download(obj: any): Observable<boolean> {
-        if (this.canExecuteAction(obj) && this.contentService) {
+    private download(node: MinimalNodeEntity): Observable<boolean> {
+        if (this.canExecuteAction(node) && this.contentService) {
             let link = document.createElement('a');
             document.body.appendChild(link);
-            link.setAttribute('download', 'download');
-            link.href = this.contentService.getContentUrl(obj);
+            link.setAttribute('download', node.entry.name);
+            link.href = this.contentService.getContentUrl(node);
             link.click();
             document.body.removeChild(link);
             return Observable.of(true);
@@ -82,14 +82,14 @@ export class DocumentActionsService {
         return Observable.of(false);
     }
 
-    private copyNode(obj: MinimalNodeEntity, target?: any, permission?: string) {
-        const actionObservable = this.nodeActionsService.copyContent(obj.entry, permission);
+    private copyNode(node: MinimalNodeEntity, target?: any, permission?: string) {
+        const actionObservable = this.nodeActionsService.copyContent(node.entry, permission);
         this.prepareHandlers(actionObservable, 'content', 'copy', target, permission);
         return actionObservable;
     }
 
-    private moveNode(obj: MinimalNodeEntity, target?: any, permission?: string) {
-        const actionObservable = this.nodeActionsService.moveContent(obj.entry, permission);
+    private moveNode(node: MinimalNodeEntity, target?: any, permission?: string) {
+        const actionObservable = this.nodeActionsService.moveContent(node.entry, permission);
         this.prepareHandlers(actionObservable, 'content', 'move', target, permission);
         return actionObservable;
     }
@@ -106,17 +106,17 @@ export class DocumentActionsService {
         );
     }
 
-    private deleteNode(obj: any, target?: any, permission?: string): Observable<any> {
+    private deleteNode(node: any, target?: any, permission?: string): Observable<any> {
         let handlerObservable;
 
-        if (this.canExecuteAction(obj)) {
-            if (this.contentService.hasPermission(obj.entry, permission)) {
-                handlerObservable = this.documentListService.deleteNode(obj.entry.id);
+        if (this.canExecuteAction(node)) {
+            if (this.contentService.hasPermission(node.entry, permission)) {
+                handlerObservable = this.documentListService.deleteNode(node.entry.id);
                 handlerObservable.subscribe(() => {
                     if (target && typeof target.reload === 'function') {
                         target.reload();
                     }
-                    this.success.next(obj.entry.id);
+                    this.success.next(node.entry.id);
                 });
                 return handlerObservable;
             } else {