diff --git a/demo-shell-ng2/app/components/about/about.component.ts b/demo-shell-ng2/app/components/about/about.component.ts
index a57700faa3..130b6f72e1 100644
--- a/demo-shell-ng2/app/components/about/about.component.ts
+++ b/demo-shell-ng2/app/components/about/about.component.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { DataSource } from '@angular/cdk/collections';
 import { Component, OnInit } from '@angular/core';
 import { Http } from '@angular/http';
 import { AlfrescoAuthenticationService, AppConfigService, BpmProductVersionModel, DiscoveryApiService, EcmProductVersionModel  } from 'ng2-alfresco-core';
diff --git a/demo-shell-ng2/app/components/settings/settings.component.ts b/demo-shell-ng2/app/components/settings/settings.component.ts
index d14bc7da23..a1c6e15132 100644
--- a/demo-shell-ng2/app/components/settings/settings.component.ts
+++ b/demo-shell-ng2/app/components/settings/settings.component.ts
@@ -47,7 +47,7 @@ export class SettingsComponent {
     }
 
     public onChangeECMHost(event: KeyboardEvent): void {
-        let value = (<HTMLInputElement>event.target).value.trim();
+        let value = (<HTMLInputElement> event.target).value.trim();
         if (value && this.isValidUrl(value)) {
             this.logService.info(`ECM host: ${value}`);
             this.ecmHostTmp = value;
@@ -57,7 +57,7 @@ export class SettingsComponent {
     }
 
     public onChangeBPMHost(event: KeyboardEvent): void {
-        let value = (<HTMLInputElement>event.target).value.trim();
+        let value = (<HTMLInputElement> event.target).value.trim();
         if (value && this.isValidUrl(value)) {
             this.logService.info(`BPM host: ${value}`);
             this.bpmHostTmp = value;
diff --git a/demo-shell-ng2/app/components/theme-picker/style-manager/style-manager.ts b/demo-shell-ng2/app/components/theme-picker/style-manager/style-manager.ts
index 229366b7ba..062220b4f9 100644
--- a/demo-shell-ng2/app/components/theme-picker/style-manager/style-manager.ts
+++ b/demo-shell-ng2/app/components/theme-picker/style-manager/style-manager.ts
@@ -1,4 +1,4 @@
-import {Injectable} from '@angular/core';
+import { Injectable } from '@angular/core';
 
 /**
  * Class for managing stylesheets. Stylesheets are loaded into named slots so that they can be
diff --git a/demo-shell-ng2/app/components/theme-picker/theme-picker.ts b/demo-shell-ng2/app/components/theme-picker/theme-picker.ts
index 97accd99a9..ab11546468 100644
--- a/demo-shell-ng2/app/components/theme-picker/theme-picker.ts
+++ b/demo-shell-ng2/app/components/theme-picker/theme-picker.ts
@@ -1,11 +1,11 @@
-import {CommonModule} from '@angular/common';
-import {ChangeDetectionStrategy, Component, NgModule} from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ChangeDetectionStrategy, Component, NgModule } from '@angular/core';
 import {
     MdButtonModule, MdGridListModule, MdIconModule, MdMenuModule,
     MdTooltipModule
 } from '@angular/material';
-import {StyleManager} from './style-manager/style-manager';
-import {DocsSiteTheme, ThemeStorage} from './theme-storage/theme-storage';
+import { StyleManager } from './style-manager/style-manager';
+import { DocsSiteTheme, ThemeStorage } from './theme-storage/theme-storage';
 
 @Component({
     selector: 'theme-picker',
diff --git a/demo-shell-ng2/app/components/theme-picker/theme-storage/theme-storage.ts b/demo-shell-ng2/app/components/theme-picker/theme-storage/theme-storage.ts
index 2e03c9bf8b..2aa3df6df8 100644
--- a/demo-shell-ng2/app/components/theme-picker/theme-storage/theme-storage.ts
+++ b/demo-shell-ng2/app/components/theme-picker/theme-storage/theme-storage.ts
@@ -1,4 +1,4 @@
-import {EventEmitter, Injectable} from '@angular/core';
+import { EventEmitter, Injectable } from '@angular/core';
 
 export interface DocsSiteTheme {
   href: string;
diff --git a/demo-shell-ng2/app/services/debug-app-config.service.ts b/demo-shell-ng2/app/services/debug-app-config.service.ts
index f254de7a90..715acb60e0 100644
--- a/demo-shell-ng2/app/services/debug-app-config.service.ts
+++ b/demo-shell-ng2/app/services/debug-app-config.service.ts
@@ -29,7 +29,7 @@ export class DebugAppConfigService extends AppConfigService {
     /** @override */
     get<T>(key: string): T {
         if (key === 'ecmHost' || key === 'bpmHost') {
-            return <T>(<any>this.storage.getItem(key) || super.get<T>(key));
+            return <T> (<any> this.storage.getItem(key) || super.get<T>(key));
         }
         return super.get<T>(key);
     }
diff --git a/demo-shell-ng2/tslint.json b/demo-shell-ng2/tslint.json
index 5193640828..879857c7d3 100644
--- a/demo-shell-ng2/tslint.json
+++ b/demo-shell-ng2/tslint.json
@@ -128,7 +128,10 @@
             "check-decl",
             "check-operator",
             "check-separator",
-            "check-type"
+            "check-typecast",
+            "check-type",
+            "check-typecast",
+            "check-module"
         ],
         "ordered-imports": true,
         "use-input-property-decorator": true,
@@ -136,10 +139,10 @@
         "use-host-property-decorator": false,
         "use-life-cycle-interface": true,
         "use-pipe-transform-interface": true,
-        "component-class-suffix": true,
-        "directive-class-suffix": true,
         "no-access-missing-member": false,
         "templates-use-public": true,
-        "invoke-injectable": true
+        "invoke-injectable": true,
+        "component-class-suffix": true,
+        "directive-class-suffix": true
     }
 }