diff --git a/ng2-components/ng2-activiti-analytics/config/webpack.common.js b/ng2-components/ng2-activiti-analytics/config/webpack.common.js
index eabc6b5f9b..874cdbecfd 100644
--- a/ng2-components/ng2-activiti-analytics/config/webpack.common.js
+++ b/ng2-components/ng2-activiti-analytics/config/webpack.common.js
@@ -43,7 +43,8 @@ module.exports = {
                 loader: 'tslint-loader',
                 options: {
                     emitErrors: true,
-                    failOnHint: true
+                    failOnHint: true,
+                    fix: true
                 },
                 exclude: [/node_modules/, /bundles/, /dist/, /demo/]
             },
@@ -63,8 +64,17 @@ module.exports = {
                 exclude: [/node_modules/, /bundles/, /dist/, /demo/]
             },
             {
-                test: /\.component.scss$/,
-                use: ['to-string-loader', 'raw-loader', 'sass-loader'],
+                test: /\.scss$/,
+                use: [{
+                    loader: "to-string-loader"
+                }, {
+                    loader: "raw-loader"
+                }, {
+                    loader: "sass-loader",
+                    options: {
+                        includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
+                    }
+                }],
                 exclude: [/node_modules/, /bundles/, /dist/, /demo/]
             },
             {
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html
index 8201575569..419e7e6b48 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html
@@ -88,7 +88,7 @@
                         <div class="mdl-dialog__content">
                             <div *ngIf="isSaveAction()" id="save-title-submessage" class="export-message">{{'DIALOG.SAVE_MESSAGE' | translate}}</div>
                             <div class="mdl-textfield mdl-js-textfield save-export-input">
-                                <label id="report-name-label" [attr.for]="repname">Report Name</label>
+                                <label id="report-name-label" [attr.for]="reportName">Report Name</label>
                                 <input class="mdl-textfield__input"
                                        type="text"
                                        id="repName"
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts
index 0b1b158b6f..ad5bf4b711 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts
@@ -94,13 +94,16 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On
 
     reportForm: FormGroup;
 
+    action: string;
+
+    isEditable: boolean = false;
+
+    reportName: string;
+
     private dropDownSub;
     private reportParamsSub;
     private paramOpts;
-    private isEditable: boolean = false;
-    private action: string;
     private reportParamQuery: ReportQuery;
-    private reportName: string;
     private hideParameters: boolean = true;
     private formValidState: boolean = false;
 
diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/checkbox/checkbox.widget.html b/ng2-components/ng2-activiti-analytics/src/components/widgets/checkbox/checkbox.widget.html
index 4d02c9a7da..29060d3bf6 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/widgets/checkbox/checkbox.widget.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/checkbox/checkbox.widget.html
@@ -6,4 +6,4 @@
            [(ngModel)]="field.value"
            (ngModelChange)="changeValue(field)">
     <span class="mdl-checkbox__label">{{field.nameKey | translate}}</span>
-</label>
\ No newline at end of file
+</label>
diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/checkbox/checkbox.widget.ts b/ng2-components/ng2-activiti-analytics/src/components/widgets/checkbox/checkbox.widget.ts
index db6d9f48d1..651eaaa6b6 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/widgets/checkbox/checkbox.widget.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/checkbox/checkbox.widget.ts
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+/* tslint:disable:no-access-missing-member */
 import { Component, ElementRef, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { WidgetComponent } from './../widget.component';
@@ -23,7 +24,7 @@ import { WidgetComponent } from './../widget.component';
     selector: 'checkbox-widget',
     templateUrl: './checkbox.widget.html'
 })
-export class CheckboxWidget extends WidgetComponent {
+export class CheckboxWidgetComponent extends WidgetComponent {
 
     @Input()
     field: any;
diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html
index e6b3c60e37..1533982dc2 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html
@@ -45,4 +45,4 @@
     <p>FormGroup status : {{dateRange && dateRange.errors | json }}</p>
     <p>FormGroup start status : {{dateRange && dateRange.controls.startDate && dateRange.controls.startDate.errors | json }}</p>
     <p>FormGroup end status: {{dateRange && dateRange.controls.endDate.errors | json }}</p>
-</div>
\ No newline at end of file
+</div>
diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.ts b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.ts
index a2a5b4826b..501fe4c229 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core';
+/* tslint:disable::no-access-missing-member */
+import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
 import { AbstractControl, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
 import * as moment from 'moment';
 import { WidgetComponent } from './../widget.component';
@@ -34,7 +35,7 @@ declare let mdDateTimePicker: any;
     templateUrl: './date-range.widget.html',
     styleUrls: ['./date-range.widget.css']
 })
-export class DateRangeWidget extends WidgetComponent {
+export class DateRangeWidgetComponent extends WidgetComponent implements OnInit, OnDestroy {
 
     public static FORMAT_DATE_ACTIVITI: string =  'YYYY-MM-DD';
 
@@ -97,7 +98,7 @@ export class DateRangeWidget extends WidgetComponent {
             future: moment().add(100, 'years')
         };
 
-        settings.init = moment(date, DateRangeWidget.FORMAT_DATE_ACTIVITI);
+        settings.init = moment(date, DateRangeWidgetComponent.FORMAT_DATE_ACTIVITI);
 
         this.dialogStart = new mdDateTimePicker.default(settings);
         this.dialogStart.trigger = this.startElement.nativeElement;
@@ -145,7 +146,7 @@ export class DateRangeWidget extends WidgetComponent {
             future: moment().add(100, 'years')
         };
 
-        settings.init = moment(date, DateRangeWidget.FORMAT_DATE_ACTIVITI);
+        settings.init = moment(date, DateRangeWidgetComponent.FORMAT_DATE_ACTIVITI);
 
         this.dialogEnd = new mdDateTimePicker.default(settings);
         this.dialogEnd.trigger = this.endElement.nativeElement;
@@ -157,7 +158,7 @@ export class DateRangeWidget extends WidgetComponent {
     }
 
     onOkStart(inputEl: HTMLInputElement) {
-        let date = this.dialogStart.time.format(DateRangeWidget.FORMAT_DATE_ACTIVITI);
+        let date = this.dialogStart.time.format(DateRangeWidgetComponent.FORMAT_DATE_ACTIVITI);
         this.dateRange.patchValue({
             startDate: date
         });
@@ -168,7 +169,7 @@ export class DateRangeWidget extends WidgetComponent {
     }
 
     onOkEnd(inputEl: HTMLInputElement) {
-        let date = this.dialogEnd.time.format(DateRangeWidget.FORMAT_DATE_ACTIVITI);
+        let date = this.dialogEnd.time.format(DateRangeWidgetComponent.FORMAT_DATE_ACTIVITI);
         this.dateRange.patchValue({
             endDate: date
         });
@@ -188,14 +189,14 @@ export class DateRangeWidget extends WidgetComponent {
     }
 
     public convertToMomentDateWithTime(date: string) {
-        return moment(date, DateRangeWidget.FORMAT_DATE_ACTIVITI, true).format(DateRangeWidget.FORMAT_DATE_ACTIVITI) + 'T00:00:00.000Z';
+        return moment(date, DateRangeWidgetComponent.FORMAT_DATE_ACTIVITI, true).format(DateRangeWidgetComponent.FORMAT_DATE_ACTIVITI) + 'T00:00:00.000Z';
     }
 
     private convertToMomentDate(date: string) {
         if (date) {
-            return moment(date).format(DateRangeWidget.FORMAT_DATE_ACTIVITI);
+            return moment(date).format(DateRangeWidgetComponent.FORMAT_DATE_ACTIVITI);
         } else {
-            return moment().format(DateRangeWidget.FORMAT_DATE_ACTIVITI);
+            return moment().format(DateRangeWidgetComponent.FORMAT_DATE_ACTIVITI);
         }
     }
 
diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/dropdown/dropdown.widget.html b/ng2-components/ng2-activiti-analytics/src/components/widgets/dropdown/dropdown.widget.html
index 25d819965c..688b591560 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/widgets/dropdown/dropdown.widget.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/dropdown/dropdown.widget.html
@@ -5,4 +5,4 @@
         <option *ngIf="showDefaultOption" value="null">{{defaultOptionText}}</option>
         <option *ngFor="let opt of field.options" [value]="opt.id">{{opt.label}}</option>
     </select>
-</div>
\ No newline at end of file
+</div>
diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/dropdown/dropdown.widget.ts b/ng2-components/ng2-activiti-analytics/src/components/widgets/dropdown/dropdown.widget.ts
index 0008d23960..6798f9ce4e 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/widgets/dropdown/dropdown.widget.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/dropdown/dropdown.widget.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+/* tslint:disable::no-access-missing-member */
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { WidgetComponent } from './../widget.component';
 
@@ -24,7 +25,7 @@ import { WidgetComponent } from './../widget.component';
     templateUrl: './dropdown.widget.html',
     styleUrls: ['./dropdown.widget.css']
 })
-export class DropdownWidget extends WidgetComponent {
+export class DropdownWidgetComponent extends WidgetComponent implements OnInit {
 
     @Input()
     field: any;
diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/duration/duration.widget.ts b/ng2-components/ng2-activiti-analytics/src/components/widgets/duration/duration.widget.ts
index c0696d467f..a83182ec16 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/widgets/duration/duration.widget.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/duration/duration.widget.ts
@@ -15,17 +15,18 @@
  * limitations under the License.
  */
 
+/* tslint:disable::no-access-missing-member */
 import { Component, ElementRef, Input, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ParameterValueModel, ReportParameterDetailsModel } from './../../../models/report.model';
-import { NumberWidget } from './../number/number.widget';
+import { NumberWidgetComponent } from './../number/number.widget';
 
 @Component({
     selector: 'duration-widget',
     templateUrl: './duration.widget.html',
     styleUrls: ['./duration.widget.css']
 })
-export class DurationWidget extends NumberWidget implements OnInit {
+export class DurationWidgetComponent extends NumberWidgetComponent implements OnInit {
 
     @Input()
     field: any;
diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/index.ts b/ng2-components/ng2-activiti-analytics/src/components/widgets/index.ts
index a86c0f55f2..82144563a6 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/widgets/index.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/index.ts
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-import { CheckboxWidget } from './checkbox/checkbox.widget';
-import { DateRangeWidget } from './date-range/date-range.widget';
-import { DropdownWidget } from './dropdown/dropdown.widget';
-import { DurationWidget } from './duration/duration.widget';
-import { NumberWidget } from './number/number.widget';
+import { CheckboxWidgetComponent } from './checkbox/checkbox.widget';
+import { DateRangeWidgetComponent } from './date-range/date-range.widget';
+import { DropdownWidgetComponent } from './dropdown/dropdown.widget';
+import { DurationWidgetComponent } from './duration/duration.widget';
+import { NumberWidgetComponent } from './number/number.widget';
 
 // primitives
 export * from './dropdown/dropdown.widget';
@@ -29,9 +29,9 @@ export * from './checkbox/checkbox.widget';
 export * from './date-range/date-range.widget';
 
 export const WIDGET_DIRECTIVES: any[] = [
-    DropdownWidget,
-    NumberWidget,
-    DurationWidget,
-    CheckboxWidget,
-    DateRangeWidget
+    DropdownWidgetComponent,
+    NumberWidgetComponent,
+    DurationWidgetComponent,
+    CheckboxWidgetComponent,
+    DateRangeWidgetComponent
 ];
diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.html b/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.html
index 8219909603..33c2a3bb18 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.html
@@ -7,4 +7,4 @@
            [(ngModel)]="field.value"
            (ngModelChange)="changeValue(field)">
     <label class="mdl-textfield__label" [attr.for]="field.id">{{field.nameKey | translate}}</label>
-</div>
\ No newline at end of file
+</div>
diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.ts b/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.ts
index c6f1e2fe22..cb3e92ffc1 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, Input } from '@angular/core';
+/* tslint:disable::no-access-missing-member */
+import { Component, ElementRef, Input, OnInit } from '@angular/core';
 import { FormGroup, Validators } from '@angular/forms';
 import { WidgetComponent } from './../widget.component';
 
@@ -24,7 +25,7 @@ import { WidgetComponent } from './../widget.component';
     templateUrl: './number.widget.html',
     styleUrls: ['./number.widget.css']
 })
-export class NumberWidget extends WidgetComponent {
+export class NumberWidgetComponent extends WidgetComponent implements OnInit {
 
     @Input()
     field: any;
diff --git a/ng2-components/ng2-activiti-analytics/tslint.json b/ng2-components/ng2-activiti-analytics/tslint.json
index 611a015c7e..b9260b027b 100644
--- a/ng2-components/ng2-activiti-analytics/tslint.json
+++ b/ng2-components/ng2-activiti-analytics/tslint.json
@@ -1,4 +1,7 @@
 {
+    "rulesDirectory": [
+        "node_modules/codelyzer"
+    ],
     "rules": {
         "align": [
             true,
@@ -105,14 +108,50 @@
             "allow-leading-underscore",
             "ban-keywords"
         ],
+        "callable-types": true,
+        "import-blacklist": [
+            true,
+            "rxjs"
+        ],
+        "import-spacing": true,
+        "interface-over-type-literal": true,
+        "member-access": false,
+        "no-empty-interface": true,
+        "no-string-literal": false,
+        "no-string-throw": true,
+        "prefer-const": false,
+        "typeof-compare": true,
+        "unified-signatures": true,
         "whitespace": [
             true,
             "check-branch",
+            "check-decl",
             "check-operator",
             "check-separator",
-            "check-type",
-            "check-module",
-            "check-decl"
-        ]
+            "check-type"
+        ],
+        "directive-selector": [
+            true,
+            "attribute",
+            "app",
+            "camelCase"
+        ],
+        "component-selector": [
+            true,
+            "element",
+            "app",
+            "kebab-case"
+        ],
+        "ordered-imports": true,
+        "use-input-property-decorator": true,
+        "use-output-property-decorator": true,
+        "use-host-property-decorator": true,
+        "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
     }
 }
diff --git a/ng2-components/ng2-activiti-diagrams/config/webpack.common.js b/ng2-components/ng2-activiti-diagrams/config/webpack.common.js
index 756c9e91cb..b4807df592 100644
--- a/ng2-components/ng2-activiti-diagrams/config/webpack.common.js
+++ b/ng2-components/ng2-activiti-diagrams/config/webpack.common.js
@@ -42,7 +42,8 @@ module.exports = {
                 loader: 'tslint-loader',
                 options: {
                     emitErrors: true,
-                    failOnHint: true
+                    failOnHint: true,
+                    fix: true
                 },
                 exclude: [/node_modules/, /bundles/, /dist/, /demo/]
             },
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-alfresco-publish-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-alfresco-publish-task.component.ts
index 746fa30de8..87671fac9d 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-alfresco-publish-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-alfresco-publish-task.component.ts
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 @Component({
     selector: 'adf-diagram-publish-task, diagram-alfresco-publish-task',
     templateUrl: './diagram-alfresco-publish-task.component.html'
 })
-export class DiagramAlfrescoPublishTaskComponent {
+export class DiagramAlfrescoPublishTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-box-publish-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-box-publish-task.component.ts
index c9a4e26db8..60678b31dd 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-box-publish-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-box-publish-task.component.ts
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 @Component({
     selector: 'diagram-box-publish-task',
     templateUrl: './diagram-box-publish-task.component.html'
 })
-export class DiagramBoxPublishTaskComponent {
+export class DiagramBoxPublishTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-business-rule-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-business-rule-task.component.ts
index aac47c115e..3408b0d4b9 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-business-rule-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-business-rule-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-business-rule-task',
     templateUrl: './diagram-business-rule-task.component.html'
 })
-export class DiagramBusinessRuleTaskComponent {
+export class DiagramBusinessRuleTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-camel-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-camel-task.component.ts
index e452a45fa1..7c366f6583 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-camel-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-camel-task.component.ts
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 @Component({
     selector: 'diagram-camel-task',
     templateUrl: './diagram-camel-task.component.html'
 })
-export class DiagramCamelTaskComponent {
+export class DiagramCamelTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-container-service-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-container-service-task.component.ts
index 6ee7cf8e76..4ce1ed6623 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-container-service-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-container-service-task.component.ts
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 @Component({
     selector: 'diagram-container-service-task',
     templateUrl: './diagram-container-service-task.component.html'
 })
-export class DiagramContainerServiceTaskComponent {
+export class DiagramContainerServiceTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-google-drive-publish-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-google-drive-publish-task.component.ts
index 519e646ff6..c2fa251bd4 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-google-drive-publish-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-google-drive-publish-task.component.ts
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 @Component({
     selector: 'diagram-google-drive-publish-task',
     templateUrl: './diagram-google-drive-publish-task.component.html'
 })
-export class DiagramGoogleDrivePublishTaskComponent {
+export class DiagramGoogleDrivePublishTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-manual-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-manual-task.component.ts
index aaae12a041..a72716410c 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-manual-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-manual-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-manual-task',
     templateUrl: './diagram-manual-task.component.html'
 })
-export class DiagramManualTaskComponent {
+export class DiagramManualTaskComponent implements OnInit {
     @Input()
     data: any;
 
@@ -30,7 +30,8 @@ export class DiagramManualTaskComponent {
     onError = new EventEmitter();
 
     constructor(public elementRef: ElementRef,
-                private diagramColorService: DiagramColorService) {}
+                private diagramColorService: DiagramColorService) {
+    }
 
     ngOnInit() {
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-mule-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-mule-task.component.ts
index 58d135a178..5e650de7d0 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-mule-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-mule-task.component.ts
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 @Component({
     selector: 'diagram-mule-task',
     templateUrl: './diagram-mule-task.component.html'
 })
-export class DiagramMuleTaskComponent {
+export class DiagramMuleTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-receive-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-receive-task.component.ts
index 2a455ef597..e5791b056c 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-receive-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-receive-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-receive-task',
     templateUrl: './diagram-receive-task.component.html'
 })
-export class DiagramReceiveTaskComponent {
+export class DiagramReceiveTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-rest-call-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-rest-call-task.component.ts
index 3da907c8c6..b74333f7df 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-rest-call-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-rest-call-task.component.ts
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 @Component({
     selector: 'diagram-rest-call-task',
     templateUrl: './diagram-rest-call-task.component.html'
 })
-export class DiagramRestCallTaskComponent {
+export class DiagramRestCallTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-script-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-script-task.component.ts
index a84424fc09..9bf38b01d2 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-script-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-script-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-script-task',
     templateUrl: './diagram-script-task.component.html'
 })
-export class DiagramScriptTaskComponent {
+export class DiagramScriptTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-send-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-send-task.component.ts
index 7cb5f024ad..fc9be00f95 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-send-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-send-task.component.ts
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 @Component({
     selector: 'diagram-send-task',
     templateUrl: './diagram-send-task.component.html'
 })
-export class DiagramSendTaskComponent {
+export class DiagramSendTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-service-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-service-task.component.ts
index 7470fb50bd..7f48b0d969 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-service-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-service-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-service-task',
     templateUrl: './diagram-service-task.component.html'
 })
-export class DiagramServiceTaskComponent {
+export class DiagramServiceTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-task.component.ts
index 48ea7ba7c2..2d50158d55 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-task',
     templateUrl: './diagram-task.component.html'
 })
-export class DiagramTaskComponent {
+export class DiagramTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-user-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-user-task.component.ts
index 4ad0c75707..0e25800a64 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-user-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-user-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-user-task',
     templateUrl: './diagram-user-task.component.html'
 })
-export class DiagramUserTaskComponent {
+export class DiagramUserTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-boundary-event.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-boundary-event.component.ts
index 569fdd24ff..920b4c1bd1 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-boundary-event.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-boundary-event.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-boundary-event',
     templateUrl: './diagram-boundary-event.component.html'
 })
-export class DiagramBoundaryEventComponent {
+export class DiagramBoundaryEventComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-throw-event.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-throw-event.component.ts
index d754102c43..9971975b1c 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-throw-event.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-throw-event.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-throw-event',
     templateUrl: './diagram-throw-event.component.html'
 })
-export class DiagramThrowEventComponent {
+export class DiagramThrowEventComponent implements OnInit {
     @Input()
     data: any;
 
@@ -38,7 +38,8 @@ export class DiagramThrowEventComponent {
     circleRadiusOuter: number;
 
     constructor(public elementRef: ElementRef,
-                private diagramColorService: DiagramColorService) {}
+                private diagramColorService: DiagramColorService) {
+    }
 
     ngOnInit() {
         this.center.x = this.data.x + (this.data.width / 2);
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/diagram-sequence-flow.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/diagram-sequence-flow.component.ts
index e4a68bece3..e09f3b903a 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/diagram-sequence-flow.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/diagram-sequence-flow.component.ts
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 @Component({
     selector: 'diagram-sequence-flow',
     templateUrl: './diagram-sequence-flow.component.html'
 })
-export class DiagramSequenceFlowComponent {
+export class DiagramSequenceFlowComponent implements OnInit {
     @Input()
     flow: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts
index db54a75062..1fbe4176db 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output, SimpleChanges } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
 import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { DiagramElementModel, DiagramModel } from '../models/diagram.model';
 import { DiagramColorService } from '../services/diagram-color.service';
@@ -27,7 +27,7 @@ import { RaphaelService } from './raphael/raphael.service';
     styleUrls: ['./diagram.component.css'],
     templateUrl: './diagram.component.html'
 })
-export class DiagramComponent {
+export class DiagramComponent implements OnChanges {
     @Input()
     processDefinitionId: any;
 
@@ -58,7 +58,7 @@ export class DiagramComponent {
     PADDING_WIDTH: number = 60;
     PADDING_HEIGHT: number = 60;
 
-    private diagram: DiagramModel;
+    diagram: DiagramModel;
 
     constructor(private elementRef: ElementRef,
                 private translateService: AlfrescoTranslationService,
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-end-event.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-end-event.component.ts
index 9196b26a83..edeaf41253 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-end-event.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-end-event.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-end-event',
     templateUrl: './diagram-end-event.component.html'
 })
-export class DiagramEndEventComponent {
+export class DiagramEndEventComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-event.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-event.component.ts
index 3668c5a468..3da5f60496 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-event.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-event.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-event',
     templateUrl: './diagram-event.component.html'
 })
-export class DiagramEventComponent {
+export class DiagramEventComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-start-event.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-start-event.component.ts
index 5e022d28b4..0baf595970 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-start-event.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-start-event.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-start-event',
     templateUrl: './diagram-start-event.component.html'
 })
-export class DiagramStartEventComponent {
+export class DiagramStartEventComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-event-gateway.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-event-gateway.component.ts
index 46011bd4bd..ca9e5bd0ef 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-event-gateway.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-event-gateway.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-event-gateway',
     templateUrl: './diagram-event-gateway.component.html'
 })
-export class DiagramEventGatewayComponent {
+export class DiagramEventGatewayComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-exclusive-gateway.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-exclusive-gateway.component.ts
index d021264bac..accab75456 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-exclusive-gateway.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-exclusive-gateway.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-exclusive-gateway',
     templateUrl: './diagram-exclusive-gateway.component.html'
 })
-export class DiagramExclusiveGatewayComponent {
+export class DiagramExclusiveGatewayComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-gateway.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-gateway.component.ts
index 20adfabc70..542daa0d07 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-gateway.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-gateway.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-gateway',
     templateUrl: './diagram-gateway.component.html'
 })
-export class DiagramGatewayComponent {
+export class DiagramGatewayComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-inclusive-gateway.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-inclusive-gateway.component.ts
index 0f86abeb62..9c226fcffe 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-inclusive-gateway.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-inclusive-gateway.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-inclusive-gateway',
     templateUrl: './diagram-inclusive-gateway.component.html'
 })
-export class DiagramInclusiveGatewayComponent {
+export class DiagramInclusiveGatewayComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-parallel-gateway.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-parallel-gateway.component.ts
index 68b4a86805..0563ffd368 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-parallel-gateway.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-parallel-gateway.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-parallel-gateway',
     templateUrl: './diagram-parallel-gateway.component.html'
 })
-export class DiagramParallelGatewayComponent {
+export class DiagramParallelGatewayComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-container-icon-event.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-container-icon-event.component.ts
index f2d37d989b..b9213e3ca2 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-container-icon-event.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-container-icon-event.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-container-icon-event',
     templateUrl: './diagram-container-icon-event.component.html'
 })
-export class DiagramContainerIconEventTaskComponent {
+export class DiagramContainerIconEventTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-alfresco-publish-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-alfresco-publish-task.component.ts
index dba16420a0..9f6b6bbe15 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-alfresco-publish-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-alfresco-publish-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'adf-diagram-icon-publish-task, diagram-icon-alfresco-publish-task',
     templateUrl: './diagram-icon-alfresco-publish-task.component.html'
 })
-export class DiagramIconAlfrescoPublishTaskComponent {
+export class DiagramIconAlfrescoPublishTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-box-publish-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-box-publish-task.component.ts
index fa0f41af5f..70bd1e9f79 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-box-publish-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-box-publish-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-box-publish-task',
     templateUrl: './diagram-icon-box-publish-task.component.html'
 })
-export class DiagramIconBoxPublishTaskComponent {
+export class DiagramIconBoxPublishTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-business-rule-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-business-rule-task.component.ts
index 9f154e2ae7..f4037199b3 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-business-rule-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-business-rule-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-business-rule-task',
     templateUrl: './diagram-icon-business-rule-task.component.html'
 })
-export class DiagramIconBusinessRuleTaskComponent {
+export class DiagramIconBusinessRuleTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-camel-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-camel-task.component.ts
index df2d16557e..1261c865b7 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-camel-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-camel-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-camel-task',
     templateUrl: './diagram-icon-camel-task.component.html'
 })
-export class DiagramIconCamelTaskComponent {
+export class DiagramIconCamelTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-error.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-error.component.ts
index 41fa14a608..8158f3f0d4 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-error.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-error.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-error',
     templateUrl: './diagram-icon-error.component.html'
 })
-export class DiagramIconErrorComponent {
+export class DiagramIconErrorComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-google-drive-publish-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-google-drive-publish-task.component.ts
index e4bfba5cc9..9d30e25099 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-google-drive-publish-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-google-drive-publish-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-google-drive-publish-task',
     templateUrl: './diagram-icon-google-drive-publish-task.component.html'
 })
-export class DiagramIconGoogleDrivePublishTaskComponent {
+export class DiagramIconGoogleDrivePublishTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-manual-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-manual-task.component.ts
index a10db3a92c..0419486925 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-manual-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-manual-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-manual-task',
     templateUrl: './diagram-icon-manual-task.component.html'
 })
-export class DiagramIconManualTaskComponent {
+export class DiagramIconManualTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-message.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-message.component.ts
index 18057b7bfa..61c06678e5 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-message.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-message.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-message',
     templateUrl: './diagram-icon-message.component.html'
 })
-export class DiagramIconMessageComponent {
+export class DiagramIconMessageComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-mule-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-mule-task.component.ts
index 71fbddf7c3..e423a8a2ca 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-mule-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-mule-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-mule-task',
     templateUrl: './diagram-icon-mule-task.component.html'
 })
-export class DiagramIconMuleTaskComponent {
+export class DiagramIconMuleTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-receive-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-receive-task.component.ts
index 71724ec33f..c87bf449e0 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-receive-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-receive-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-receive-task',
     templateUrl: './diagram-icon-receive-task.component.html'
 })
-export class DiagramIconReceiveTaskComponent {
+export class DiagramIconReceiveTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-rest-call-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-rest-call-task.component.ts
index 1ccf0f4c5b..846de502ed 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-rest-call-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-rest-call-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-rest-call-task',
     templateUrl: './diagram-icon-rest-call-task.component.html'
 })
-export class DiagramIconRestCallTaskComponent {
+export class DiagramIconRestCallTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-script-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-script-task.component.ts
index 9a6b42359f..0928ce0edd 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-script-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-script-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-script-task',
     templateUrl: './diagram-icon-script-task.component.html'
 })
-export class DiagramIconScriptTaskComponent {
+export class DiagramIconScriptTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-send-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-send-task.component.ts
index a661f91197..939c9652a0 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-send-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-send-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-send-task',
     templateUrl: './diagram-icon-send-task.component.html'
 })
-export class DiagramIconSendTaskComponent {
+export class DiagramIconSendTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-service-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-service-task.component.ts
index 2a58d70978..f5f6b70697 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-service-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-service-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-service-task',
     templateUrl: './diagram-icon-service-task.component.html'
 })
-export class DiagramIconServiceTaskComponent {
+export class DiagramIconServiceTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-signal.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-signal.component.ts
index eedf941da4..7b5752e29a 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-signal.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-signal.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-signal',
     templateUrl: './diagram-icon-signal.component.html'
 })
-export class DiagramIconSignalComponent {
+export class DiagramIconSignalComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-timer.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-timer.component.ts
index 0ca8f4e1a6..649583abf2 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-timer.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-timer.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-timer',
     templateUrl: './diagram-icon-timer.component.html'
 })
-export class DiagramIconTimerComponent {
+export class DiagramIconTimerComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-user-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-user-task.component.ts
index 8e16234423..bd2a8a9a6f 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-user-task.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-user-task.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-icon-user-task',
     templateUrl: './diagram-icon-user-task.component.html'
 })
-export class DiagramIconUserTaskComponent {
+export class DiagramIconUserTaskComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/index.ts b/ng2-components/ng2-activiti-diagrams/src/components/index.ts
index 16e28b4ff3..7d6b6c2209 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/index.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/index.ts
@@ -25,7 +25,7 @@ import { DIAGRAM_ICONS_DIRECTIVES } from './icons/index';
 import { DIAGRAM_INTERMEDIATE_EVENTS_DIRECTIVES } from './intermediate-catching-events/index';
 import { DIAGRAM_STRUCTURAL_DIRECTIVES } from './structural/index';
 import { DIAGRAM_SWIMLANES_DIRECTIVES } from './swimlanes/index';
-import { DiagramTooltip } from './tooltip/index';
+import { DiagramTooltipComponent } from './tooltip/index';
 
 import { DiagramColorService } from '../services/diagram-color.service';
 import { DiagramsService } from '../services/diagrams.service';
@@ -52,7 +52,7 @@ export const DIAGRAM_DIRECTIVES: any[] = [
     DIAGRAM_INTERMEDIATE_EVENTS_DIRECTIVES,
     DIAGRAM_STRUCTURAL_DIRECTIVES,
     DIAGRAM_SWIMLANES_DIRECTIVES,
-    DiagramTooltip
+    DiagramTooltipComponent
 ];
 
 export const DIAGRAM_PROVIDERS: any[] = [
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/intermediate-catching-events/diagram-intermediate-catching-event.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/intermediate-catching-events/diagram-intermediate-catching-event.component.ts
index 787ccb2534..9271745ea0 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/intermediate-catching-events/diagram-intermediate-catching-event.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/intermediate-catching-events/diagram-intermediate-catching-event.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-intermediate-catching-event',
     templateUrl: './diagram-intermediate-catching-event.component.html'
 })
-export class DiagramIntermediateCatchingEventComponent {
+export class DiagramIntermediateCatchingEventComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael.service.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael.service.ts
index 21314b8e54..bb5d852365 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael.service.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael.service.ts
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable , OnDestroy} from '@angular/core';
 
 declare let Raphael: any;
 
 @Injectable()
-export class RaphaelService {
+export class RaphaelService implements OnDestroy {
 
     paper: any;
     width: number = 300;
@@ -53,7 +53,7 @@ export class RaphaelService {
         return paper;
     }
 
-    private ngOnDestroy(): any {
+    public ngOnDestroy(): any {
         if (this.paper) {
             this.paper.clear();
             this.paper = void 0;
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-event-subprocess.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-event-subprocess.component.ts
index 80a59a6f07..518c71dbce 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-event-subprocess.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-event-subprocess.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output} from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-event-subprocess',
     templateUrl: './diagram-event-subprocess.component.html'
 })
-export class DiagramEventSubprocessComponent {
+export class DiagramEventSubprocessComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-subprocess.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-subprocess.component.ts
index 87aa9733e7..33bba3c534 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-subprocess.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-subprocess.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-subprocess',
     templateUrl: './diagram-subprocess.component.html'
 })
-export class DiagramSubprocessComponent {
+export class DiagramSubprocessComponent implements OnInit {
     @Input()
     data: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lane.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lane.component.ts
index 0cfd113ce8..fd424d0b44 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lane.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lane.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-lane',
     templateUrl: './diagram-lane.component.html'
 })
-export class DiagramLaneComponent {
+export class DiagramLaneComponent implements OnInit {
     @Input()
     lane: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lanes.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lanes.component.ts
index b6f9493bf0..b4072bf3f9 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lanes.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lanes.component.ts
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 @Component({
     selector: 'diagram-lanes',
     templateUrl: './diagram-lanes.component.html'
 })
-export class DiagramLanesComponent {
+export class DiagramLanesComponent implements OnInit {
     @Input()
     lanes: any [];
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pool.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pool.component.ts
index c0d976e399..38161c1ba3 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pool.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pool.component.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DiagramColorService } from '../../services/diagram-color.service';
 
 @Component({
     selector: 'diagram-pool',
     templateUrl: './diagram-pool.component.html'
 })
-export class DiagramPoolComponent {
+export class DiagramPoolComponent implements OnInit {
     @Input()
     pool: any;
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pools.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pools.component.ts
index 88b11bf382..b1a58f48b2 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pools.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pools.component.ts
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { Component, ElementRef, EventEmitter, Input, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 @Component({
     selector: 'diagram-pools',
     templateUrl: './diagram-pools.component.html'
 })
-export class DiagramPoolsComponent {
+export class DiagramPoolsComponent implements OnInit {
     @Input()
     pools: any [];
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.spec.ts b/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.spec.ts
index aff2c5ab2b..f7be08d6f6 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.spec.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.spec.ts
@@ -18,7 +18,7 @@
 import { Component } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { DiagramTooltip } from './diagram-tooltip.component';
+import { DiagramTooltipComponent } from './diagram-tooltip.component';
 
 @Component({
     template: `
@@ -31,23 +31,23 @@ class TestHostComponent {
     };
 }
 
-describe('DiagramTooltip', () => {
+describe('DiagramTooltipComponent', () => {
 
     describe('Template', () => {
 
-        let fixture: ComponentFixture<DiagramTooltip>;
-        let component: DiagramTooltip;
+        let fixture: ComponentFixture<DiagramTooltipComponent>;
+        let component: DiagramTooltipComponent;
         let data;
 
         beforeEach(async(() => {
             TestBed.configureTestingModule({
-                declarations: [ DiagramTooltip ],
+                declarations: [ DiagramTooltipComponent ],
                 providers: []
             }).compileComponents();
         }));
 
         beforeEach(() => {
-            fixture = TestBed.createComponent(DiagramTooltip);
+            fixture = TestBed.createComponent(DiagramTooltipComponent);
             component = fixture.componentInstance;
             data = {
                 type: 'awesome-diagram-element',
@@ -117,7 +117,7 @@ describe('DiagramTooltip', () => {
 
         beforeEach(async(() => {
             TestBed.configureTestingModule({
-                declarations: [ DiagramTooltip, TestHostComponent ]
+                declarations: [ DiagramTooltipComponent, TestHostComponent ]
             }).compileComponents();
         }));
 
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.ts
index 73f61d8ae3..8a7ba01d34 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.ts
@@ -24,7 +24,7 @@ const IS_ACTIVE_CLASS = 'is-active';
     templateUrl: './diagram-tooltip.component.html',
     styleUrls: ['./diagram-tooltip.component.scss']
 })
-export class DiagramTooltip implements AfterViewInit, OnDestroy {
+export class DiagramTooltipComponent implements AfterViewInit, OnDestroy {
 
     private tooltipElement: any;
     private targetElement: any;
diff --git a/ng2-components/ng2-activiti-diagrams/tslint.json b/ng2-components/ng2-activiti-diagrams/tslint.json
index 611a015c7e..b9260b027b 100644
--- a/ng2-components/ng2-activiti-diagrams/tslint.json
+++ b/ng2-components/ng2-activiti-diagrams/tslint.json
@@ -1,4 +1,7 @@
 {
+    "rulesDirectory": [
+        "node_modules/codelyzer"
+    ],
     "rules": {
         "align": [
             true,
@@ -105,14 +108,50 @@
             "allow-leading-underscore",
             "ban-keywords"
         ],
+        "callable-types": true,
+        "import-blacklist": [
+            true,
+            "rxjs"
+        ],
+        "import-spacing": true,
+        "interface-over-type-literal": true,
+        "member-access": false,
+        "no-empty-interface": true,
+        "no-string-literal": false,
+        "no-string-throw": true,
+        "prefer-const": false,
+        "typeof-compare": true,
+        "unified-signatures": true,
         "whitespace": [
             true,
             "check-branch",
+            "check-decl",
             "check-operator",
             "check-separator",
-            "check-type",
-            "check-module",
-            "check-decl"
-        ]
+            "check-type"
+        ],
+        "directive-selector": [
+            true,
+            "attribute",
+            "app",
+            "camelCase"
+        ],
+        "component-selector": [
+            true,
+            "element",
+            "app",
+            "kebab-case"
+        ],
+        "ordered-imports": true,
+        "use-input-property-decorator": true,
+        "use-output-property-decorator": true,
+        "use-host-property-decorator": true,
+        "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
     }
 }
diff --git a/ng2-components/ng2-alfresco-core/tslint.json b/ng2-components/ng2-alfresco-core/tslint.json
index e01943f8f3..b9260b027b 100644
--- a/ng2-components/ng2-alfresco-core/tslint.json
+++ b/ng2-components/ng2-alfresco-core/tslint.json
@@ -150,7 +150,7 @@
         "use-pipe-transform-interface": true,
         "component-class-suffix": true,
         "directive-class-suffix": true,
-        "no-access-missing-member": true,
+        "no-access-missing-member": false,
         "templates-use-public": true,
         "invoke-injectable": true
     }
diff --git a/ng2-components/ng2-alfresco-datatable/tslint.json b/ng2-components/ng2-alfresco-datatable/tslint.json
index e01943f8f3..b9260b027b 100644
--- a/ng2-components/ng2-alfresco-datatable/tslint.json
+++ b/ng2-components/ng2-alfresco-datatable/tslint.json
@@ -150,7 +150,7 @@
         "use-pipe-transform-interface": true,
         "component-class-suffix": true,
         "directive-class-suffix": true,
-        "no-access-missing-member": true,
+        "no-access-missing-member": false,
         "templates-use-public": true,
         "invoke-injectable": true
     }
diff --git a/ng2-components/ng2-alfresco-documentlist/tslint.json b/ng2-components/ng2-alfresco-documentlist/tslint.json
index e01943f8f3..b9260b027b 100644
--- a/ng2-components/ng2-alfresco-documentlist/tslint.json
+++ b/ng2-components/ng2-alfresco-documentlist/tslint.json
@@ -150,7 +150,7 @@
         "use-pipe-transform-interface": true,
         "component-class-suffix": true,
         "directive-class-suffix": true,
-        "no-access-missing-member": true,
+        "no-access-missing-member": false,
         "templates-use-public": true,
         "invoke-injectable": true
     }
diff --git a/ng2-components/ng2-alfresco-login/tslint.json b/ng2-components/ng2-alfresco-login/tslint.json
index e01943f8f3..b9260b027b 100644
--- a/ng2-components/ng2-alfresco-login/tslint.json
+++ b/ng2-components/ng2-alfresco-login/tslint.json
@@ -150,7 +150,7 @@
         "use-pipe-transform-interface": true,
         "component-class-suffix": true,
         "directive-class-suffix": true,
-        "no-access-missing-member": true,
+        "no-access-missing-member": false,
         "templates-use-public": true,
         "invoke-injectable": true
     }
diff --git a/ng2-components/ng2-alfresco-search/tslint.json b/ng2-components/ng2-alfresco-search/tslint.json
index e01943f8f3..b9260b027b 100644
--- a/ng2-components/ng2-alfresco-search/tslint.json
+++ b/ng2-components/ng2-alfresco-search/tslint.json
@@ -150,7 +150,7 @@
         "use-pipe-transform-interface": true,
         "component-class-suffix": true,
         "directive-class-suffix": true,
-        "no-access-missing-member": true,
+        "no-access-missing-member": false,
         "templates-use-public": true,
         "invoke-injectable": true
     }
diff --git a/ng2-components/ng2-alfresco-tag/tslint.json b/ng2-components/ng2-alfresco-tag/tslint.json
index e01943f8f3..b9260b027b 100644
--- a/ng2-components/ng2-alfresco-tag/tslint.json
+++ b/ng2-components/ng2-alfresco-tag/tslint.json
@@ -150,7 +150,7 @@
         "use-pipe-transform-interface": true,
         "component-class-suffix": true,
         "directive-class-suffix": true,
-        "no-access-missing-member": true,
+        "no-access-missing-member": false,
         "templates-use-public": true,
         "invoke-injectable": true
     }
diff --git a/ng2-components/ng2-alfresco-upload/config/webpack.common.js b/ng2-components/ng2-alfresco-upload/config/webpack.common.js
index f7635417cd..f90fe35645 100644
--- a/ng2-components/ng2-alfresco-upload/config/webpack.common.js
+++ b/ng2-components/ng2-alfresco-upload/config/webpack.common.js
@@ -42,7 +42,8 @@ module.exports = {
                 loader: 'tslint-loader',
                 options: {
                     emitErrors: true,
-                    failOnHint: true
+                    failOnHint: true,
+                    fix: true
                 },
                 exclude: [/node_modules/, /bundles/, /dist/, /demo/]
             },
diff --git a/ng2-components/ng2-alfresco-upload/src/assets/translation.service.mock.ts b/ng2-components/ng2-alfresco-upload/src/assets/translation.service.mock.ts
index 3ddf9a9050..4a4bce9d47 100644
--- a/ng2-components/ng2-alfresco-upload/src/assets/translation.service.mock.ts
+++ b/ng2-components/ng2-alfresco-upload/src/assets/translation.service.mock.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import { Observable } from 'rxjs/Rx';
 import { EventEmitter } from '@angular/core';
+import { Observable } from 'rxjs/Rx';
 
 export interface LangChangeEvent {
     lang: string;
diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts
index 0a12e6d38e..443d0eaa31 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts
@@ -16,13 +16,13 @@
  */
 
 import { DebugElement } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MdProgressSpinnerModule } from '@angular/material';
-import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { CoreModule } from 'ng2-alfresco-core';
-import { FileUploadingDialogComponent } from './file-uploading-dialog.component';
-import { FileUploadingListComponent } from './file-uploading-list.component';
 import { FileModel, FileUploadStatus } from 'ng2-alfresco-core';
 import { FileUploadCompleteEvent, FileUploadEvent, UploadService } from 'ng2-alfresco-core';
+import { FileUploadingDialogComponent } from './file-uploading-dialog.component';
+import { FileUploadingListComponent } from './file-uploading-list.component';
 
 describe('FileUploadingDialogComponent', () => {
 
diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts
index f97cc91688..039509f9d9 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts
@@ -32,10 +32,10 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy {
     totalCompleted: number = 0;
     totalCompletedMsg: string = 'FILE_UPLOAD.MESSAGES.SINGLE_COMPLETED';
     isDialogMinimized: boolean = false;
+    showCloseButton: boolean = false;
 
     private listSubscription: any;
     private counterSubscription: any;
-    private showCloseButton: boolean = false;
 
     constructor(translateService: AlfrescoTranslationService, private uploadService: UploadService) {
         if (translateService) {
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts
index 6246d59fb7..7a337a24ce 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts
@@ -16,11 +16,11 @@
  */
 
 import { DebugElement, SimpleChange } from '@angular/core';
-import { ComponentFixture, TestBed, async } from '@angular/core/testing';
-import { UploadButtonComponent } from './upload-button.component';
-import { CoreModule, AlfrescoTranslationService, AlfrescoContentService, UploadService } from 'ng2-alfresco-core';
-import { TranslationMock } from '../assets/translation.service.mock';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { AlfrescoContentService, AlfrescoTranslationService, CoreModule, UploadService } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Rx';
+import { TranslationMock } from '../assets/translation.service.mock';
+import { UploadButtonComponent } from './upload-button.component';
 
 describe('UploadButtonComponent', () => {
 
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts
index d44a019f82..6af0d4d385 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { DebugElement } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { AlfrescoTranslationService, CoreModule, FileModel, LogService, LogServiceMock, UploadService } from 'ng2-alfresco-core';
 
-import { UploadDragAreaComponent } from './upload-drag-area.component';
-import { FileDraggableDirective } from '../directives/file-draggable.directive';
 import { TranslationMock } from '../assets/translation.service.mock';
+import { FileDraggableDirective } from '../directives/file-draggable.directive';
+import { UploadDragAreaComponent } from './upload-drag-area.component';
 
 let fakeShareDataRow = {
     obj: {
diff --git a/ng2-components/ng2-alfresco-upload/tslint.json b/ng2-components/ng2-alfresco-upload/tslint.json
index 611a015c7e..b9260b027b 100644
--- a/ng2-components/ng2-alfresco-upload/tslint.json
+++ b/ng2-components/ng2-alfresco-upload/tslint.json
@@ -1,4 +1,7 @@
 {
+    "rulesDirectory": [
+        "node_modules/codelyzer"
+    ],
     "rules": {
         "align": [
             true,
@@ -105,14 +108,50 @@
             "allow-leading-underscore",
             "ban-keywords"
         ],
+        "callable-types": true,
+        "import-blacklist": [
+            true,
+            "rxjs"
+        ],
+        "import-spacing": true,
+        "interface-over-type-literal": true,
+        "member-access": false,
+        "no-empty-interface": true,
+        "no-string-literal": false,
+        "no-string-throw": true,
+        "prefer-const": false,
+        "typeof-compare": true,
+        "unified-signatures": true,
         "whitespace": [
             true,
             "check-branch",
+            "check-decl",
             "check-operator",
             "check-separator",
-            "check-type",
-            "check-module",
-            "check-decl"
-        ]
+            "check-type"
+        ],
+        "directive-selector": [
+            true,
+            "attribute",
+            "app",
+            "camelCase"
+        ],
+        "component-selector": [
+            true,
+            "element",
+            "app",
+            "kebab-case"
+        ],
+        "ordered-imports": true,
+        "use-input-property-decorator": true,
+        "use-output-property-decorator": true,
+        "use-host-property-decorator": true,
+        "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
     }
 }
diff --git a/ng2-components/ng2-alfresco-userinfo/tslint.json b/ng2-components/ng2-alfresco-userinfo/tslint.json
index e01943f8f3..b9260b027b 100644
--- a/ng2-components/ng2-alfresco-userinfo/tslint.json
+++ b/ng2-components/ng2-alfresco-userinfo/tslint.json
@@ -150,7 +150,7 @@
         "use-pipe-transform-interface": true,
         "component-class-suffix": true,
         "directive-class-suffix": true,
-        "no-access-missing-member": true,
+        "no-access-missing-member": false,
         "templates-use-public": true,
         "invoke-injectable": true
     }
diff --git a/ng2-components/ng2-alfresco-viewer/tslint.json b/ng2-components/ng2-alfresco-viewer/tslint.json
index e01943f8f3..b9260b027b 100644
--- a/ng2-components/ng2-alfresco-viewer/tslint.json
+++ b/ng2-components/ng2-alfresco-viewer/tslint.json
@@ -150,7 +150,7 @@
         "use-pipe-transform-interface": true,
         "component-class-suffix": true,
         "directive-class-suffix": true,
-        "no-access-missing-member": true,
+        "no-access-missing-member": false,
         "templates-use-public": true,
         "invoke-injectable": true
     }
diff --git a/ng2-components/ng2-alfresco-webscript/tslint.json b/ng2-components/ng2-alfresco-webscript/tslint.json
index e01943f8f3..b9260b027b 100644
--- a/ng2-components/ng2-alfresco-webscript/tslint.json
+++ b/ng2-components/ng2-alfresco-webscript/tslint.json
@@ -150,7 +150,7 @@
         "use-pipe-transform-interface": true,
         "component-class-suffix": true,
         "directive-class-suffix": true,
-        "no-access-missing-member": true,
+        "no-access-missing-member": false,
         "templates-use-public": true,
         "invoke-injectable": true
     }