diff --git a/demo-shell/package.json b/demo-shell/package.json
index 46fd73bc61..63cd453c4b 100644
--- a/demo-shell/package.json
+++ b/demo-shell/package.json
@@ -60,18 +60,18 @@
   ],
   "private": true,
   "dependencies": {
-    "@angular/animations": "5.0.5",
-    "@angular/cdk": "5.0.0",
-    "@angular/common": "5.0.5",
-    "@angular/compiler": "5.0.5",
-    "@angular/core": "5.0.5",
-    "@angular/flex-layout": "2.0.0-beta.10",
-    "@angular/forms": "5.0.5",
-    "@angular/http": "5.0.5",
-    "@angular/material": "5.0.0",
-    "@angular/platform-browser": "5.0.5",
-    "@angular/platform-browser-dynamic": "5.0.5",
-    "@angular/router": "5.0.5",
+    "@angular/animations": "5.1.1",
+    "@angular/cdk": "5.0.1",
+    "@angular/common": "5.1.1",
+    "@angular/compiler": "5.1.1",
+    "@angular/core": "5.1.1",
+    "@angular/flex-layout": "2.0.0-beta.12",
+    "@angular/forms": "5.1.1",
+    "@angular/http": "5.1.1",
+    "@angular/material": "5.0.1",
+    "@angular/platform-browser": "5.1.1",
+    "@angular/platform-browser-dynamic": "5.1.1",
+    "@angular/router": "5.1.1",
     "@ngx-translate/core": "8.0.0",
     "alfresco-js-api": "2.0.0",
     "@alfresco/adf-content-services": "2.0.0",
@@ -97,8 +97,8 @@
   },
   "devDependencies": {
     "@angular/cli": "1.5.0",
-    "@angular/compiler-cli": "5.0.5",
-    "@angular/language-service": "5.0.5",
+    "@angular/compiler-cli": "5.1.1",
+    "@angular/language-service": "5.1.1",
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
diff --git a/demo-shell/src/app/components/about/about.component.html b/demo-shell/src/app/components/about/about.component.html
index 23b587f28d..77adea7267 100644
--- a/demo-shell/src/app/components/about/about.component.html
+++ b/demo-shell/src/app/components/about/about.component.html
@@ -1,7 +1,7 @@
 <div class="about-container">
     <h3>Server settings</h3>
     <mat-list>
-        <small>The values below are taken from the AppConfigService and loaded from the '{{ configFile }}' file.</small>
+        <small>The values below are taken from the AppConfigService </small>
         <mat-list-item>
             <h4 matLine> Alfresco Process Services URL: {{ bpmHost }}</h4>
         </mat-list-item>
diff --git a/demo-shell/src/app/components/about/about.component.ts b/demo-shell/src/app/components/about/about.component.ts
index 76a5ddd54e..0c0e26334e 100644
--- a/demo-shell/src/app/components/about/about.component.ts
+++ b/demo-shell/src/app/components/about/about.component.ts
@@ -39,7 +39,6 @@ export class AboutComponent implements OnInit {
     modules: ObjectDataTableAdapter;
     githubUrlCommitAlpha = 'https://github.com/Alfresco/alfresco-ng2-components/commits/';
 
-    configFile = 'app.config.json';
     ecmHost = '';
     bpmHost = '';
 
diff --git a/demo-shell/src/app/components/process-service/process-service.component.ts b/demo-shell/src/app/components/process-service/process-service.component.ts
index 0456dab069..fc4ff1d0c5 100644
--- a/demo-shell/src/app/components/process-service/process-service.component.ts
+++ b/demo-shell/src/app/components/process-service/process-service.component.ts
@@ -153,7 +153,7 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
                 private preferenceService: UserPreferencesService) {
         this.dataTasks = new ObjectDataTableAdapter();
         this.dataTasks.setSorting(new DataSorting('created', 'desc'));
-        this.supportedPages = this.preferenceService.getDifferentPageSizes();
+       // this.supportedPages = this.preferenceService.getDifferentPageSizes();
         this.taskPagination.maxItems = this.preferenceService.paginationSize;
 
         // Uncomment this line to replace all 'text' field editors with custom component
diff --git a/demo-shell/src/polyfills.ts b/demo-shell/src/polyfills.ts
index fdf0d3805b..1fbf2b074f 100644
--- a/demo-shell/src/polyfills.ts
+++ b/demo-shell/src/polyfills.ts
@@ -34,11 +34,10 @@ import 'core-js/es6/map';
 import 'core-js/es6/set';
 
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
- import 'classlist.js';  // Run `npm install --save classlist.js`.
+import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /** IE10 and IE11 requires the following to support `@angular/animation`. */
- import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
+import 'web-animations-js';  // Run `npm install --save web-animations-js`.
 
 /** Evergreen browsers require these. **/
 import 'core-js/es6/reflect';
@@ -47,18 +46,11 @@ import 'core-js/es6/array';
 import 'core-js/es7/array';
 
 
-/** ALL Firefox browsers require the following to support `@angular/animation`. **/
-import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
-
-
 /***************************************************************************************************
  * Zone JS is required by Angular itself.
  */
 import 'zone.js/dist/zone';  // Included with Angular CLI.
 
-
-
 /***************************************************************************************************
  * APPLICATION IMPORTS
  */
diff --git a/lib/content-services/package.json b/lib/content-services/package.json
index ade9d2981b..abca8a28a0 100644
--- a/lib/content-services/package.json
+++ b/lib/content-services/package.json
@@ -12,19 +12,19 @@
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
   "dependencies": {
-    "@angular/animations": "5.0.0",
-    "@angular/cdk": "5.0.0-rc0",
-    "@angular/common": "5.0.0",
-    "@angular/compiler": "5.0.0",
-    "@angular/core": "5.0.0",
-    "@angular/flex-layout": "2.0.0-beta.10",
-    "@angular/forms": "5.0.0",
-    "@angular/http": "5.0.0",
-    "@angular/material": "5.0.0-rc0",
-    "@angular/material-moment-adapter": "^5.0.0-rc0",
-    "@angular/platform-browser": "5.0.0",
-    "@angular/platform-browser-dynamic": "5.0.0",
-    "@angular/router": "5.0.0",
+    "@angular/animations": "5.1.1",
+    "@angular/cdk": "5.0.1",
+    "@angular/common": "5.1.1",
+    "@angular/compiler": "5.1.1",
+    "@angular/core": "5.1.1",
+    "@angular/flex-layout": "2.0.0-beta.12",
+    "@angular/forms": "5.1.1",
+    "@angular/http": "5.1.1",
+    "@angular/material": "5.0.1",
+    "@angular/material-moment-adapter": "5.0.0",
+    "@angular/platform-browser": "5.1.1",
+    "@angular/platform-browser-dynamic": "5.1.1",
+    "@angular/router": "5.1.1",
     "@ngx-translate/core": "8.0.0",
     "alfresco-js-api": "2.0.0",
     "@alfresco/adf-core": "2.0.0",
diff --git a/lib/core/package.json b/lib/core/package.json
index da645a7af6..d1a0394455 100644
--- a/lib/core/package.json
+++ b/lib/core/package.json
@@ -12,19 +12,19 @@
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
   "dependencies": {
-    "@angular/animations": "5.0.0",
-    "@angular/cdk": "5.0.0-rc0",
-    "@angular/common": "5.0.0",
-    "@angular/compiler": "5.0.0",
-    "@angular/core": "5.0.0",
-    "@angular/flex-layout": "2.0.0-beta.10",
-    "@angular/forms": "5.0.0",
-    "@angular/http": "5.0.0",
-    "@angular/material": "5.0.0-rc0",
-    "@angular/material-moment-adapter": "^5.0.0-rc0",
-    "@angular/platform-browser": "5.0.0",
-    "@angular/platform-browser-dynamic": "5.0.0",
-    "@angular/router": "5.0.0",
+    "@angular/animations": "5.1.1",
+    "@angular/cdk": "5.0.1",
+    "@angular/common": "5.1.1",
+    "@angular/compiler": "5.1.1",
+    "@angular/core": "5.1.1",
+    "@angular/flex-layout": "2.0.0-beta.12",
+    "@angular/forms": "5.1.1",
+    "@angular/http": "5.1.1",
+    "@angular/material": "5.0.1",
+    "@angular/material-moment-adapter": "5.0.0",
+    "@angular/platform-browser": "5.1.1",
+    "@angular/platform-browser-dynamic": "5.1.1",
+    "@angular/router": "5.1.1",
     "@ngx-translate/core": "8.0.0",
     "alfresco-js-api": "2.0.0",
     "chart.js": "2.5.0",
diff --git a/lib/insights/package.json b/lib/insights/package.json
index e4e2bf535f..84719b44a4 100644
--- a/lib/insights/package.json
+++ b/lib/insights/package.json
@@ -12,19 +12,19 @@
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
   "dependencies": {
-    "@angular/animations": "5.0.0",
-    "@angular/cdk": "5.0.0-rc0",
-    "@angular/common": "5.0.0",
-    "@angular/compiler": "5.0.0",
-    "@angular/core": "5.0.0",
-    "@angular/flex-layout": "2.0.0-beta.10",
-    "@angular/forms": "5.0.0",
-    "@angular/http": "5.0.0",
-    "@angular/material": "5.0.0-rc0",
-    "@angular/material-moment-adapter": "^5.0.0-rc0",
-    "@angular/platform-browser": "5.0.0",
-    "@angular/platform-browser-dynamic": "5.0.0",
-    "@angular/router": "5.0.0",
+    "@angular/animations": "5.1.1",
+    "@angular/cdk": "5.0.1",
+    "@angular/common": "5.1.1",
+    "@angular/compiler": "5.1.1",
+    "@angular/core": "5.1.1",
+    "@angular/flex-layout": "2.0.0-beta.12",
+    "@angular/forms": "5.1.1",
+    "@angular/http": "5.1.1",
+    "@angular/material": "5.0.1",
+    "@angular/material-moment-adapter": "5.0.0",
+    "@angular/platform-browser": "5.1.1",
+    "@angular/platform-browser-dynamic": "5.1.1",
+    "@angular/router": "5.1.1",
     "@ngx-translate/core": "8.0.0",
     "alfresco-js-api": "2.0.0",
     "@alfresco/adf-core": "2.0.0",
diff --git a/lib/package.json b/lib/package.json
index 8039991d99..e8295db3d7 100644
--- a/lib/package.json
+++ b/lib/package.json
@@ -49,19 +49,19 @@
     "process services"
   ],
   "dependencies": {
-    "@angular/animations": "5.0.5",
-    "@angular/cdk": "5.0.0",
-    "@angular/common": "5.0.5",
-    "@angular/compiler": "5.0.5",
-    "@angular/core": "5.0.5",
-    "@angular/flex-layout": "2.0.0-beta.10",
-    "@angular/forms": "5.0.5",
-    "@angular/http": "5.0.5",
-    "@angular/material": "5.0.0",
+    "@angular/animations": "5.1.1",
+    "@angular/cdk": "5.0.1",
+    "@angular/common": "5.1.1",
+    "@angular/compiler": "5.1.1",
+    "@angular/core": "5.1.1",
+    "@angular/flex-layout": "2.0.0-beta.12",
+    "@angular/forms": "5.1.1",
+    "@angular/http": "5.1.1",
+    "@angular/material": "5.0.1",
     "@angular/material-moment-adapter": "5.0.0",
-    "@angular/platform-browser": "5.0.5",
-    "@angular/platform-browser-dynamic": "5.0.5",
-    "@angular/router": "5.0.5",
+    "@angular/platform-browser": "5.1.1",
+    "@angular/platform-browser-dynamic": "5.1.1",
+    "@angular/router": "5.1.1",
     "@ngx-translate/core": "8.0.0",
     "alfresco-js-api": "2.0.0",
     "chart.js": "2.5.0",
@@ -80,7 +80,7 @@
     "zone.js": "0.8.14"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "5.0.5",
+    "@angular/compiler-cli": "5.1.1",
     "@types/hammerjs": "2.0.35",
     "@types/jasmine": "^2.5.35",
     "@types/node": "6.0.90",
diff --git a/lib/process-services/package.json b/lib/process-services/package.json
index 5ab70822a9..4e49e0a405 100644
--- a/lib/process-services/package.json
+++ b/lib/process-services/package.json
@@ -12,19 +12,19 @@
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
   "dependencies": {
-    "@angular/animations": "5.0.0",
-    "@angular/cdk": "5.0.0-rc0",
-    "@angular/common": "5.0.0",
-    "@angular/compiler": "5.0.0",
-    "@angular/core": "5.0.0",
-    "@angular/flex-layout": "2.0.0-beta.10",
-    "@angular/forms": "5.0.0",
-    "@angular/http": "5.0.0",
-    "@angular/material": "5.0.0-rc0",
-    "@angular/material-moment-adapter": "^5.0.0-rc0",
-    "@angular/platform-browser": "5.0.0",
-    "@angular/platform-browser-dynamic": "5.0.0",
-    "@angular/router": "5.0.0",
+    "@angular/animations": "5.1.1",
+    "@angular/cdk": "5.0.1",
+    "@angular/common": "5.1.1",
+    "@angular/compiler": "5.1.1",
+    "@angular/core": "5.1.1",
+    "@angular/flex-layout": "2.0.0-beta.12",
+    "@angular/forms": "5.1.1",
+    "@angular/http": "5.1.1",
+    "@angular/material": "5.0.1",
+    "@angular/material-moment-adapter": "5.0.0",
+    "@angular/platform-browser": "5.1.1",
+    "@angular/platform-browser-dynamic": "5.1.1",
+    "@angular/router": "5.1.1",
     "@ngx-translate/core": "8.0.0",
     "alfresco-js-api": "2.0.0",
     "@alfresco/adf-core": "2.0.0",