diff --git a/demo-shell-ng2/.angular-cli.json b/demo-shell-ng2/.angular-cli.json
index ce1cc48990..b44dc30450 100644
--- a/demo-shell-ng2/.angular-cli.json
+++ b/demo-shell-ng2/.angular-cli.json
@@ -101,7 +101,8 @@
           "glob": "**/*",
           "input": "../node_modules/ng2-activiti-tasklist/bundles/assets",
           "output": "./assets/"
-        }
+        },
+        { "glob": "pdf.worker.js", "input": "../node_modules/pdfjs-dist/build", "output": "./" }
       ],
       "index": "index.html",
       "main": "main.ts",
@@ -230,7 +231,89 @@
           "glob": "**/*",
           "input": "../../ng2-components/ng2-activiti-tasklist/bundles/assets",
           "output": "./assets/"
-        }
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-alfresco-core/src/i18n",
+          "output": "./assets/ng2-alfresco-core/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-alfresco-login/src/i18n",
+          "output": "./assets/ng2-alfresco-login/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-alfresco-userinfo/src/i18n",
+          "output": "./assets/ng2-alfresco-userinfo/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-alfresco-upload/src/i18n",
+          "output": "./assets/ng2-alfresco-upload/i18n"
+        },
+
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-alfresco-search/src/i18n",
+          "output": "./assets/ng2-alfresco-search/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-alfresco-datatable/src/i18n",
+          "output": "./assets/ng2-alfresco-datatable/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-alfresco-documentlist/src/i18n",
+          "output": "./assets/ng2-alfresco-documentlist/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-alfresco-viewer/src/i18n",
+          "output": "./assets/ng2-alfresco-viewer/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-alfresco-social/src/i18n",
+          "output": "./assets/ng2-alfresco-social/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-alfresco-tag/src/i18n",
+          "output": "./assets/ng2-alfresco-tag/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-alfresco-webscript/src/i18n",
+          "output": "./assets/ng2-alfresco-webscript/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-activiti-analytics/src/i18n",
+          "output": "./assets/ng2-activiti-analytics/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-activiti-diagrams/src/i18n",
+          "output": "./assets/ng2-activiti-diagrams/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-activiti-form/src/i18n",
+          "output": "./assets/ng2-activiti-form/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-activiti-processlist/src/i18n",
+          "output": "./assets/ng2-activiti-processlist/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../../ng2-components/ng2-activiti-tasklist/src/i18n",
+          "output": "./assets/ng2-activiti-tasklist/i18n"
+        },
+        { "glob": "pdf.worker.js", "input": "../node_modules/pdfjs-dist/build", "output": "./" }
       ],
       "index": "index.html",
       "main": "main.ts",
@@ -287,6 +370,9 @@
   "defaults": {
     "styleExt": "scss",
     "component": {
+    },
+    "serve": {
+      "port": 3000
     }
   }
 }
diff --git a/demo-shell-ng2/src/app/components/activiti/activiti.component.html b/demo-shell-ng2/src/app/components/activiti/activiti.component.html
index 77ee2b7961..570447f948 100644
--- a/demo-shell-ng2/src/app/components/activiti/activiti.component.html
+++ b/demo-shell-ng2/src/app/components/activiti/activiti.component.html
@@ -1,10 +1,10 @@
 <mat-tab-group [(selectedIndex)]="activeTab">
     <mat-tab id="tasks-header" href="#tasks" label="{{'PS-TAB.TASKS-TAB' | translate}}">
         <div class="page-content">
-            <div class="activiti-demo-grid" fxLayout="row" fxLayout.lt-lg="column" fxLayoutAlign="stretch">
-                <div class="activiti-demo-grid-item activiti-demo-tasks-menu" fxFlex.gt-md="225px">
-                    <div class="activiti-demo-list-buttons">
-                        <button color="primary" mat-raised-button data-automation-id="btn-start-task" class="activiti-demo-list-buttons-start" (click)="navigateStartTask()">
+            <div class="activiti-grid" fxLayout="row" fxLayout.lt-lg="column" fxLayoutAlign="stretch">
+                <div class="activiti-grid-item activiti-tasks-menu" fxFlex.gt-md="225px">
+                    <div class="activiti-list-buttons">
+                        <button color="primary" mat-raised-button data-automation-id="btn-start-task" class="activiti-list-buttons-start" (click)="navigateStartTask()">
                             <mat-icon>add</mat-icon>
                             <span>{{'PS-TAB.START-TASK' | translate}}</span>
                         </button>
@@ -23,7 +23,7 @@
                         </adf-accordion-group>
                     </adf-accordion>
                 </div>
-                <div class="activiti-demo-grid-item activiti-demo-tasks-list" fxFlex.gt-md="335px" [ngClass.gt-md]="{'small-pagination': true}"
+                <div class="activiti-grid-item activiti-tasks-list" fxFlex.gt-md="335px" [ngClass.gt-md]="{'small-pagination': true}"
                      *ngIf="taskFilter && !isStartTaskMode()">
                     <adf-tasklist
                         [appId]="taskFilter?.appId"
@@ -59,7 +59,7 @@
                         [supportedPageSizes]="[2, 4, 6, 8, 10, 12]">
                     </adf-pagination>
                 </div>
-                <div class="activiti-demo-grid-item activiti-demo-tasks-details" *ngIf="!isStartTaskMode()" fxFlex.gt-md="1 1 auto">
+                <div class="activiti-grid-item activiti-tasks-details" *ngIf="!isStartTaskMode()" fxFlex.gt-md="1 1 auto">
                     <adf-task-details #activitidetails
                                            [debugMode]="true"
                                            [taskId]="currentTaskId"
@@ -90,7 +90,7 @@
                         </mat-card-content>
                     </mat-card>
                 </div>
-                <div class="activiti-demo-grid-item activiti-demo-tasks-start" *ngIf="isStartTaskMode()" fxFlex.gt-md="1 1 auto">
+                <div class="activiti-grid-item activiti-tasks-start" *ngIf="isStartTaskMode()" fxFlex.gt-md="1 1 auto">
                     <adf-start-task
                         [appId]="appId"
                         (success)="onStartTaskSuccess($event)"
@@ -103,13 +103,13 @@
     <mat-tab id="processes-header" href="#processes"
             label="{{'PS-TAB.PROCESSES-TAB' | translate}}">
         <div class="page-content">
-            <div class="activiti-demo-grid" fxLayout="row" fxLayout.lt-lg="column" fxLayoutAlign="stretch">
-                <div class="activiti-demo-grid-item activiti-demo-processes-menu" fxFlex.gt-md="225px">
-                    <div class="activiti-demo-list-buttons">
+            <div class="activiti-grid" fxLayout="row" fxLayout.lt-lg="column" fxLayoutAlign="stretch">
+                <div class="activiti-grid-item activiti-processes-menu" fxFlex.gt-md="225px">
+                    <div class="activiti-list-buttons">
                         <button
                             color="primary"
                             mat-raised-button
-                            class="activiti-demo-list-buttons-start"
+                            class="activiti-list-buttons-start"
                             data-automation-id="btn-start-process"
                             (click)="navigateStartProcess()">
                             <mat-icon>add</mat-icon>
@@ -128,7 +128,7 @@
                         </adf-accordion-group>
                     </adf-accordion>
                 </div>
-                <div class="activiti-demo-grid-item activiti-demo-processes-list activiti-demo-list" fxFlex.gt-md="335px" [ngClass.gt-md]="{'small-pagination': true}"
+                <div class="activiti-grid-item activiti-processes-list activiti-list" fxFlex.gt-md="335px" [ngClass.gt-md]="{'small-pagination': true}"
                      *ngIf="processFilter && !isStartProcessMode()">
                     <adf-process-instance-list
                         *ngIf="processFilter?.hasFilter()" [appId]="processFilter.appId"
@@ -149,7 +149,7 @@
 
                     </adf-process-instance-list>
                 </div>
-                <div class="activiti-demo-grid-item activiti-demo-processes-details" *ngIf="!isStartProcessMode()" fxFlex.gt-md="1 1 auto">
+                <div class="activiti-grid-item activiti-processes-details" *ngIf="!isStartProcessMode()" fxFlex.gt-md="1 1 auto">
                     <adf-process-instance-details
                         [processInstanceId]="currentProcessInstanceId"
                         (processCancelled)="processCancelled()"
@@ -177,7 +177,7 @@
                         </mat-card-content>
                     </mat-card>
                 </div>
-                <div class="activiti-demo-grid-item activiti-demo-processes-start" fxFlex.gt-md="1 1 auto"
+                <div class="activiti-grid-item activiti-processes-start" fxFlex.gt-md="1 1 auto"
                      *ngIf="isStartProcessMode()">
                     <adf-start-process
                         [appId]="appId"
@@ -190,8 +190,8 @@
     </mat-tab>
     <mat-tab id="report-header" href="#report"
             label="{{'PS-TAB.REPORTS-TAB' | translate}}">
-        <div class="activiti-demo-grid" fxLayout="row" fxLayout.lt-lg="column" fxLayoutAlign="stretch">
-            <div class="activiti-demo-grid-item activiti-demo-reports-menu" fxFlex.gt-md="300px">
+        <div class="activiti-grid" fxLayout="row" fxLayout.lt-lg="column" fxLayoutAlign="stretch">
+            <div class="activiti-grid-item activiti-reports-menu" fxFlex.gt-md="300px">
                 <span><h5>Report List</h5></span>
                 <hr>
                 <analytics-report-list
@@ -201,7 +201,7 @@
                     #analyticsreportlist>
                 </analytics-report-list>
             </div>
-            <div class="activiti-demo-grid-item activiti-demo-reports-details" fxFlex.gt-md="1 1 auto">
+            <div class="activiti-grid-item activiti-reports-details" fxFlex.gt-md="1 1 auto">
                 <adf-analytics
                     *ngIf="report"
                     [appId]="appId"
diff --git a/demo-shell-ng2/src/app/components/activiti/activiti.component.scss b/demo-shell-ng2/src/app/components/activiti/activiti.component.scss
index 3b297a204a..d6dd7bebde 100644
--- a/demo-shell-ng2/src/app/components/activiti/activiti.component.scss
+++ b/demo-shell-ng2/src/app/components/activiti/activiti.component.scss
@@ -5,24 +5,24 @@
     font-size: 18px;
 }
 
-.activiti-demo-grid {
+.activiti-grid {
 
-    .activiti-demo-grid-item {
+    .activiti-grid-item {
         margin: 4px;
         box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.12);
         padding: 10px;
     }
 
-    .activiti-demo-list-buttons {
+    .activiti-list-buttons {
         margin-bottom: 24px;
     }
 
-    .activiti-demo-list-buttons-start {
+    .activiti-list-buttons-start {
         width: 100%;
     }
 
-    .activiti-demo-tasks-list.small-pagination,
-    .activiti-demo-processes-list.small-pagination {
+    .activiti-tasks-list.small-pagination,
+    .activiti-processes-list.small-pagination {
         .adf-pagination {
 
             flex-wrap: wrap;
@@ -68,7 +68,7 @@
         }
     }
 
-    .activiti-demo-list {
+    .activiti-list {
         .adf-data-table {
             border: none;
         }
diff --git a/demo-shell-ng2/src/app/components/activiti/activiti.component.ts b/demo-shell-ng2/src/app/components/activiti/activiti.component.ts
index 57a40db3a0..885d6ababb 100644
--- a/demo-shell-ng2/src/app/components/activiti/activiti.component.ts
+++ b/demo-shell-ng2/src/app/components/activiti/activiti.component.ts
@@ -56,7 +56,7 @@ const currentProcessIdNew = '__NEW__';
 const currentTaskIdNew = '__NEW__';
 
 @Component({
-    selector: 'adf-activiti-demo',
+    selector: 'adf-activiti',
     templateUrl: './activiti.component.html',
     styleUrls: ['./activiti.component.scss'],
     encapsulation: ViewEncapsulation.None
diff --git a/demo-shell-ng2/src/app/components/datatable/datatable.component.ts b/demo-shell-ng2/src/app/components/datatable/datatable.component.ts
index 9f6649aa81..a279401ae1 100644
--- a/demo-shell-ng2/src/app/components/datatable/datatable.component.ts
+++ b/demo-shell-ng2/src/app/components/datatable/datatable.component.ts
@@ -21,7 +21,7 @@ import { DataCellEvent, DataRowActionEvent, DataSorting, ObjectDataColumn, Objec
 import { Observable } from 'rxjs/Rx';
 
 @Component({
-    selector: 'datatable-demo',
+    selector: 'datatable',
     templateUrl: './datatable.component.html',
     styleUrls: ['./datatable.component.css']
 })
diff --git a/demo-shell-ng2/src/app/components/files/custom-sources.component.ts b/demo-shell-ng2/src/app/components/files/custom-sources.component.ts
index 52ceef4d15..b1ac07fc3d 100644
--- a/demo-shell-ng2/src/app/components/files/custom-sources.component.ts
+++ b/demo-shell-ng2/src/app/components/files/custom-sources.component.ts
@@ -19,7 +19,7 @@ import { Component, Input, ViewChild } from '@angular/core';
 import { DocumentListComponent } from 'ng2-alfresco-documentlist';
 
 @Component({
-    selector: 'adf-custom-sources-demo',
+    selector: 'adf-custom-sources',
     templateUrl: 'custom-sources.component.html'
 })
 export class CustomSourcesComponent {
diff --git a/demo-shell-ng2/src/app/components/files/files.component.html b/demo-shell-ng2/src/app/components/files/files.component.html
index c1e3b86349..6fd083fd5e 100644
--- a/demo-shell-ng2/src/app/components/files/files.component.html
+++ b/demo-shell-ng2/src/app/components/files/files.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-    <div class="adf-demo-site-container-style" id="demo-container">
+    <div class="adf-site-container-style" id="site-container">
         <adf-sites-dropdown (change)="getSiteContent($event)">
         </adf-sites-dropdown>
     </div>
diff --git a/demo-shell-ng2/src/app/components/files/files.component.scss b/demo-shell-ng2/src/app/components/files/files.component.scss
index 443d29b227..9870b204bc 100644
--- a/demo-shell-ng2/src/app/components/files/files.component.scss
+++ b/demo-shell-ng2/src/app/components/files/files.component.scss
@@ -52,7 +52,7 @@ adf-document-list ::ng-deep adf-datatable tr.is-selected .image-table-cell::befo
     background: #00bcd4;
 }
 
-.adf-demo-site-container-style {
+.adf-site-container-style {
     margin-top: 10px;
     margin-bottom: 10px;
     width: 100%;
@@ -81,7 +81,7 @@ adf-document-list ::ng-deep adf-datatable tr.is-selected .image-table-cell::befo
         }
     }
 
-    .adf-demo-site-container-style {
+    .adf-site-container-style {
         width: 100%;
         display: block;
 
diff --git a/demo-shell-ng2/src/app/components/form/form-list.component.ts b/demo-shell-ng2/src/app/components/form/form-list.component.ts
index 57c90149df..54a7054528 100644
--- a/demo-shell-ng2/src/app/components/form/form-list.component.ts
+++ b/demo-shell-ng2/src/app/components/form/form-list.component.ts
@@ -20,7 +20,7 @@ import { ActivitiForm, FormModel, FormService } from 'ng2-activiti-form';
 import { LogService } from 'ng2-alfresco-core';
 
 @Component({
-    selector: 'form-list-demo',
+    selector: 'form-list',
     templateUrl: 'form-list.component.html',
     styleUrls: ['form-list.component.scss']
 })
diff --git a/demo-shell-ng2/src/app/components/form/form.component.ts b/demo-shell-ng2/src/app/components/form/form.component.ts
index bd40257c2e..006e5bf6b2 100644
--- a/demo-shell-ng2/src/app/components/form/form.component.ts
+++ b/demo-shell-ng2/src/app/components/form/form.component.ts
@@ -22,7 +22,7 @@ import { InMemoryFormService } from '../../services/in-memory-form.service';
 import { DemoForm } from './demo-form';
 
 @Component({
-    selector: 'form-demo',
+    selector: 'form',
     templateUrl: 'form.component.html',
     styleUrls: [ 'form.component.css' ],
     providers: [
diff --git a/demo-shell-ng2/src/app/components/login/login.component.ts b/demo-shell-ng2/src/app/components/login/login.component.ts
index 07a54d533f..b2d9ba9a60 100644
--- a/demo-shell-ng2/src/app/components/login/login.component.ts
+++ b/demo-shell-ng2/src/app/components/login/login.component.ts
@@ -21,7 +21,7 @@ import { Router } from '@angular/router';
 import { LogService, StorageService } from 'ng2-alfresco-core';
 
 @Component({
-    selector: 'login-demo',
+    selector: 'login',
     templateUrl: './login.component.html',
     styleUrls: ['./login.component.css']
 })
diff --git a/demo-shell-ng2/src/app/components/social/social.component.ts b/demo-shell-ng2/src/app/components/social/social.component.ts
index 683a212d5b..b68b31a663 100644
--- a/demo-shell-ng2/src/app/components/social/social.component.ts
+++ b/demo-shell-ng2/src/app/components/social/social.component.ts
@@ -18,7 +18,7 @@
 import { Component } from '@angular/core';
 
 @Component({
-    selector: 'alfresco-social-demo',
+    selector: 'alfresco-social',
     templateUrl: 'social.component.html',
     styleUrls: ['social.component.scss']
 })
diff --git a/demo-shell-ng2/src/app/components/tag/tag.component.ts b/demo-shell-ng2/src/app/components/tag/tag.component.ts
index e80e075858..f6f524bc89 100644
--- a/demo-shell-ng2/src/app/components/tag/tag.component.ts
+++ b/demo-shell-ng2/src/app/components/tag/tag.component.ts
@@ -18,7 +18,7 @@
 import { Component } from '@angular/core';
 
 @Component({
-    selector: 'alfresco-tag-demo',
+    selector: 'alfresco-tag',
     templateUrl: 'tag.component.html',
     styleUrls: ['tag.component.scss']
 })
diff --git a/demo-shell-ng2/src/app/components/webscript/webscript.component.ts b/demo-shell-ng2/src/app/components/webscript/webscript.component.ts
index 88bc04013e..55f8f3ed8c 100644
--- a/demo-shell-ng2/src/app/components/webscript/webscript.component.ts
+++ b/demo-shell-ng2/src/app/components/webscript/webscript.component.ts
@@ -19,7 +19,7 @@ import { Component } from '@angular/core';
 import { LogService } from 'ng2-alfresco-core';
 
 @Component({
-    selector: 'alfresco-webscript-demo',
+    selector: 'alfresco-webscript',
     templateUrl: 'webscript.component.html'
 })
 export class WebscriptComponent {