diff --git a/lib/content-services/document-list/components/document-list.component.html b/lib/content-services/document-list/components/document-list.component.html
index a2526e8c01..f006522f5d 100644
--- a/lib/content-services/document-list/components/document-list.component.html
+++ b/lib/content-services/document-list/components/document-list.component.html
@@ -31,9 +31,8 @@
                     <div class="adf-empty-folder-this-space-is-empty">{{'ADF-DOCUMENT-LIST.EMPTY.HEADER' | translate}}</div>
                     <div fxHide.lt-md="true" class="adf-empty-folder-drag-drop">{{ 'ADF-DATATABLE.EMPTY.DRAG-AND-DROP.TITLE' | translate }}</div>
                     <div fxHide.lt-md="true" class="adf-empty-folder-any-files-here-to-add">{{ 'ADF-DATATABLE.EMPTY.DRAG-AND-DROP.SUBTITLE' | translate }}</div>
-                    <img class="adf-empty-folder-image" [src]="emptyFolderImageUrl">
+                    <img [alt]="'ADF-DATATABLE.EMPTY.DRAG-AND-DROP.TITLE' | translate" class="adf-empty-folder-image" [src]="emptyFolderImageUrl">
                 </div>
-                <!-- <div adf-empty-list-header class="adf-empty-list-header"> {{'ADF-DOCUMENT-LIST.EMPTY.HEADER' | translate}} </div> -->
             </adf-empty-list>
             <ng-content select="adf-custom-empty-content-template, empty-folder-content"></ng-content>
         </ng-template>
diff --git a/lib/content-services/search/components/search-control.component.html b/lib/content-services/search/components/search-control.component.html
index 6ff83bab2f..317075412f 100644
--- a/lib/content-services/search/components/search-control.component.html
+++ b/lib/content-services/search/components/search-control.component.html
@@ -50,7 +50,7 @@
                 (touchend)="elementClicked(item)">
                 <!-- This is a comment -->
                 <mat-icon mat-list-icon>
-                    <img [src]="getMimeTypeIcon(item)"/>
+                    <img [alt]="getMimeType(item)" [src]="getMimeTypeIcon(item)"/>
                 </mat-icon>
                 <h4 mat-line id="result_name_{{idx}}"
                     *ngIf="highlight; else elseBlock"
diff --git a/lib/content-services/search/components/search-control.component.ts b/lib/content-services/search/components/search-control.component.ts
index e0602c00bb..eefd255197 100644
--- a/lib/content-services/search/components/search-control.component.ts
+++ b/lib/content-services/search/components/search-control.component.ts
@@ -174,14 +174,21 @@ export class SearchControlComponent implements OnInit, OnDestroy {
     getMimeTypeIcon(node: NodeEntry): string {
         let mimeType;
 
+        mimeType = this.getMimeType(node);
+
+        return this.thumbnailService.getMimeTypeIcon(mimeType);
+    }
+
+    private getMimeType(node: NodeEntry) {
+        let mimeType;
+
         if (node.entry.content && node.entry.content.mimeType) {
             mimeType = node.entry.content.mimeType;
         }
         if (node.entry.isFolder) {
             mimeType = 'folder';
         }
-
-        return this.thumbnailService.getMimeTypeIcon(mimeType);
+        return mimeType;
     }
 
     isSearchBarActive() {
diff --git a/lib/core/about/about.component.html b/lib/core/about/about.component.html
index a120358b73..00b92447c9 100644
--- a/lib/core/about/about.component.html
+++ b/lib/core/about/about.component.html
@@ -63,24 +63,24 @@
     <h3>{{ 'ABOUT.VERSIONS.TITLE' | translate }}</h3>
     <div *ngIf="bpmVersion">
         <h3>{{ 'ABOUT.VERSIONS.PROCESS_SERVICE' | translate }}</h3>
-        <label> {{ 'ABOUT.VERSIONS.LABELS.EDITION' | translate }} </label> {{ bpmVersion.edition }}
+        <div> {{ 'ABOUT.VERSIONS.divS.EDITION' | translate }} </div> {{ bpmVersion.edition }}
         <p></p>
-        <label> {{ 'ABOUT.VERSIONS.LABELS.VERSION' | translate }} </label> {{ bpmVersion.majorVersion }}.{{
+        <div> {{ 'ABOUT.VERSIONS.divS.VERSION' | translate }} </div> {{ bpmVersion.majorVersion }}.{{
         bpmVersion.minorVersion }}.{{ bpmVersion.revisionVersion }}
     </div>
     <div *ngIf="ecmVersion">
         <h3>{{ 'ABOUT.VERSIONS.CONTENT_SERVICE' | translate }}</h3>
-        <label>{{ 'ABOUT.VERSIONS.LABELS.EDITION' | translate }}</label> {{ ecmVersion.edition }}
+        <div>{{ 'ABOUT.VERSIONS.divS.EDITION' | translate }}</div> {{ ecmVersion.edition }}
         <p></p>
-        <label> {{ 'ABOUT.VERSIONS.LABELS.VERSION' | translate }} </label> {{ ecmVersion.version.display }}
+        <div> {{ 'ABOUT.VERSIONS.divS.VERSION' | translate }} </div> {{ ecmVersion.version.display }}
         <p></p>
-        <h4>{{ 'ABOUT.VERSIONS.LABELS.LICENSE' | translate }}</h4>
+        <h4>{{ 'ABOUT.VERSIONS.divS.LICENSE' | translate }}</h4>
         <adf-datatable [data]="license"></adf-datatable>
 
-        <h4> {{ 'ABOUT.VERSIONS.LABELS.STATUS' | translate }}</h4>
+        <h4> {{ 'ABOUT.VERSIONS.divS.STATUS' | translate }}</h4>
         <adf-datatable [data]="status"></adf-datatable>
 
-        <h4>{{ 'ABOUT.VERSIONS.LABELS.MODULES' | translate }}</h4>
+        <h4>{{ 'ABOUT.VERSIONS.divS.MODULES' | translate }}</h4>
 
         <adf-datatable [data]="modules"></adf-datatable>
     </div>
diff --git a/lib/core/comments/comment-list.component.html b/lib/core/comments/comment-list.component.html
index 777f880841..5128af5947 100644
--- a/lib/core/comments/comment-list.component.html
+++ b/lib/core/comments/comment-list.component.html
@@ -11,10 +11,9 @@
                 {{getUserShortName(comment.createdBy)}}
             </div>
             <div>
-                <img *ngIf="isPictureDefined(comment.createdBy)"
+                <img [alt]="comment.createdBy" *ngIf="isPictureDefined(comment.createdBy)"
                       class="adf-people-img"
-                     [src]="getUserImage(comment.createdBy)"
-                />
+                     [src]="getUserImage(comment.createdBy)" />
             </div>
         </div>
         <div class="adf-comment-contents">
diff --git a/lib/core/form/components/widgets/people/people.widget.html b/lib/core/form/components/widgets/people/people.widget.html
index 6a7f67c1a6..355fb77b60 100644
--- a/lib/core/form/components/widgets/people/people.widget.html
+++ b/lib/core/form/components/widgets/people/people.widget.html
@@ -22,7 +22,7 @@
                     <div [outerHTML]="user | usernameInitials:'adf-people-widget-pic'"></div>
                     <div *ngIf="user.pictureId" class="adf-people-widget-image-row">
                         <img id="adf-people-widget-pic-{{i}}" class="adf-people-widget-image"
-                             [src]="peopleProcessService.getUserImage(user)"/>
+                             [alt]="getDisplayName(user)" [src]="peopleProcessService.getUserImage(user)"/>
                     </div>
                     <span class="adf-people-label-name">{{getDisplayName(user)}}</span>
                 </div>
diff --git a/lib/core/login/components/login.component.html b/lib/core/login/components/login.component.html
index 4e9ee9bb99..1434e7ffc8 100644
--- a/lib/core/login/components/login.component.html
+++ b/lib/core/login/components/login.component.html
@@ -44,7 +44,7 @@
                                            id="username"
                                            data-automation-id="username"
                                            (blur)="trimUsername($event)"
-                                           tabindex="1">
+                                           tabindex="-1">
                                 </mat-form-field>
 
                                 <span class="adf-login-validation" for="username" *ngIf="formError['username']">
@@ -60,13 +60,13 @@
                                            [formControl]="form.controls['password']"
                                            id="password"
                                            data-automation-id="password"
-                                           tabindex="2">
+                                           tabindex="-2">
                                     <mat-icon *ngIf="isPasswordShow" matSuffix class="adf-login-password-icon"
-                                              data-automation-id="hide_password" (click)="toggleShowPassword()" (keyup.enter)="toggleShowPassword()" tabindex="3">
+                                              data-automation-id="hide_password" (click)="toggleShowPassword()" (keyup.enter)="toggleShowPassword()" tabindex="-3">
                                         visibility
                                     </mat-icon>
                                     <mat-icon *ngIf="!isPasswordShow" matSuffix class="adf-login-password-icon"
-                                              data-automation-id="show_password" (click)="toggleShowPassword()" (keyup.enter)="toggleShowPassword()" tabindex="3">
+                                              data-automation-id="show_password" (click)="toggleShowPassword()" (keyup.enter)="toggleShowPassword()" tabindex="-3">
                                         visibility_off
                                     </mat-icon>
                                 </mat-form-field>
@@ -80,7 +80,7 @@
                             <ng-content></ng-content>
 
                             <br>
-                            <button type="submit" id="login-button" tabindex="4"
+                            <button type="submit" id="login-button" tabindex="-4"
                                     class="adf-login-button"
                                     mat-raised-button color="primary"
                                     [class.adf-isChecking]="actualLoginStep === LoginSteps.Checking"
@@ -115,7 +115,7 @@
                         </div>
 
                         <div *ngIf="implicitFlow">
-                            <button type="button" (click)="implicitLogin()" id="login-button-sso" tabindex="1"
+                            <button type="button" (click)="implicitLogin()" id="login-button-sso" tabindex="-1"
                                     class="adf-login-button"
                                     mat-raised-button color="primary"
                                     data-automation-id="login-button-sso">
diff --git a/lib/core/settings/host-settings.component.html b/lib/core/settings/host-settings.component.html
index bb2f4114c1..06e08ee8f9 100644
--- a/lib/core/settings/host-settings.component.html
+++ b/lib/core/settings/host-settings.component.html
@@ -27,7 +27,7 @@
                 <mat-card-content>
                     <mat-form-field class="adf-full-width" floatLabel="{{'CORE.HOST_SETTINGS.CS-HOST' | translate }}">
                         <mat-label>{{'CORE.HOST_SETTINGS.CS-HOST' | translate }}</mat-label>
-                        <input matInput [formControl]="ecmHost" data-automation-id="ecmHost" type="text" tabindex="2"
+                        <input matInput [formControl]="ecmHost" data-automation-id="ecmHost" type="text"
                                id="ecmHost" placeholder="http(s)://host|ip:port(/path)">
                         <mat-error *ngIf="ecmHost.hasError('pattern')">
                             {{ 'CORE.HOST_SETTINGS.NOT_VALID'| translate }}
@@ -44,7 +44,7 @@
                 <mat-card-content>
                     <mat-form-field class="adf-full-width" floatLabel="{{'CORE.HOST_SETTINGS.BP-HOST' | translate }}">
                         <mat-label>{{'CORE.HOST_SETTINGS.BP-HOST' | translate }}</mat-label>
-                        <input matInput [formControl]="bpmHost" data-automation-id="bpmHost" type="text" tabindex="2"
+                        <input matInput [formControl]="bpmHost" data-automation-id="bpmHost" type="text"
                                id="bpmHost" placeholder="http(s)://host|ip:port(/path)">
                         <mat-error *ngIf="bpmHost.hasError('pattern')">
                             {{ 'CORE.HOST_SETTINGS.NOT_VALID'| translate }}
@@ -134,7 +134,7 @@
                 <button mat-button (click)="onCancel()" color="primary">
                     {{'CORE.HOST_SETTINGS.BACK' | translate }}
                 </button>
-                <button type="submit" id="host-button" tabindex="4" class="adf-login-button" mat-raised-button
+                <button type="submit" id="host-button" class="adf-login-button" mat-raised-button
                         color="primary" data-automation-id="host-button"
                         [disabled]="!form.valid">
                     {{'CORE.HOST_SETTINGS.APPLY' | translate }}
diff --git a/lib/core/viewer/components/pdfViewer-thumb.component.html b/lib/core/viewer/components/pdfViewer-thumb.component.html
index 564a5b2008..b355eabce3 100644
--- a/lib/core/viewer/components/pdfViewer-thumb.component.html
+++ b/lib/core/viewer/components/pdfViewer-thumb.component.html
@@ -1,4 +1,4 @@
 <ng-container *ngIf="image$ | async as image">
-    <img [src]="image"
+    <img [src]="image" [alt]="'ADF_VIEWER.SIDEBAR.THUMBNAILS.PAGE' | translate: { pageNum: page.id }"
         title="{{ 'ADF_VIEWER.SIDEBAR.THUMBNAILS.PAGE' | translate: { pageNum: page.id } }}">
 </ng-container>
diff --git a/lib/core/viewer/components/viewer.component.html b/lib/core/viewer/components/viewer.component.html
index 9a0513af79..009caaf978 100644
--- a/lib/core/viewer/components/viewer.component.html
+++ b/lib/core/viewer/components/viewer.component.html
@@ -40,7 +40,7 @@
                         (click)="onNavigateBeforeClick()">
                         <mat-icon>navigate_before</mat-icon>
                     </button>
-                    <img class="adf-viewer__mimeicon" [src]="mimeType | adfMimeTypeIcon" data-automation-id="adf-file-thumbnail">
+                    <img class="adf-viewer__mimeicon" [alt]="mimeType | adfMimeTypeIcon" [src]="mimeType | adfMimeTypeIcon" data-automation-id="adf-file-thumbnail">
                     <span class="adf-viewer__display-name" id="adf-viewer-display-name">{{ fileTitle }}</span>
                     <button
                         *ngIf="allowNavigate && canNavigateNext"
diff --git a/lib/insights/analytics-process/components/widgets/date-range/date-range.widget.html b/lib/insights/analytics-process/components/widgets/date-range/date-range.widget.html
index d9d4b5123f..7571ae251b 100644
--- a/lib/insights/analytics-process/components/widgets/date-range/date-range.widget.html
+++ b/lib/insights/analytics-process/components/widgets/date-range/date-range.widget.html
@@ -1,5 +1,5 @@
-<label>{{field.nameKey | translate}}</label><br>
-<div [formGroup]="dateRange">
+<label for="adf-dateRange" >{{field.nameKey | translate}}</label><br>
+<div id="adf-dateRange" [formGroup]="dateRange">
     <small *ngIf="isStartDateGreaterThanEndDate()" class="adf-date-range-analytics-text-danger">
        {{'DATE-WIDGET.MESSAGES.START-LESS-THAN-END-DATE' | translate}}
     </small>
diff --git a/lib/process-services/content-widget/attach-file-widget.component.html b/lib/process-services/content-widget/attach-file-widget.component.html
index 2a42f1e16a..38f9607e00 100644
--- a/lib/process-services/content-widget/attach-file-widget.component.html
+++ b/lib/process-services/content-widget/attach-file-widget.component.html
@@ -40,7 +40,7 @@
                         (click)="openSelectDialogFromFileSource()">
                         {{field.params?.fileSource?.name}}
                         <mat-icon>
-                            <img class="adf-attach-widget__image-logo" src="../assets/images/alfresco-flower.svg">
+                            <img alt="alfresco" class="adf-attach-widget__image-logo" src="../assets/images/alfresco-flower.svg">
                         </mat-icon>
                 </button>
                 <div *ngIf="!isDefinedSourceFolder()">
@@ -49,7 +49,7 @@
                            (click)="openSelectDialog(repo)">
                             {{repo.name}}
                             <mat-icon>
-                                <img class="adf-attach-widget__image-logo" src="../assets/images/alfresco-flower.svg">
+                                <img alt="alfresco" class="adf-attach-widget__image-logo" src="../assets/images/alfresco-flower.svg">
                             </mat-icon>
                     </button>
                 </div>
diff --git a/lib/process-services/people/components/people-search-field/people-search-field.component.html b/lib/process-services/people/components/people-search-field/people-search-field.component.html
index 211e67b70d..19378a98eb 100644
--- a/lib/process-services/people/components/people-search-field/people-search-field.component.html
+++ b/lib/process-services/people/components/people-search-field/people-search-field.component.html
@@ -17,7 +17,7 @@
                             <div *ngIf="!entry.row.obj.pictureId" class="adf-people-pic">
                                 {{getInitialUserName(entry.row.obj.firstName, entry.row.obj.lastName)}}</div>
                             <div>
-                                <img *ngIf="entry.row.obj.pictureId" class="adf-people-img"
+                                <img [alt]="getDisplayUser(entry.row.obj.firstName, entry.row.obj.lastName, ' ')" *ngIf="entry.row.obj.pictureId" class="adf-people-img"
                                     [src]="peopleProcessService.getUserImage(entry.row.obj)"/>
                             </div>
                     </ng-template>
@@ -30,4 +30,4 @@
             </data-columns>
         </adf-people-list>
     </div>
-</ng-container>
\ No newline at end of file
+</ng-container>
diff --git a/lib/process-services/people/components/people/people.component.html b/lib/process-services/people/components/people/people.component.html
index a25bf78859..5ce9ff6d49 100644
--- a/lib/process-services/people/components/people/people.component.html
+++ b/lib/process-services/people/components/people/people.component.html
@@ -33,7 +33,7 @@
                                 <div *ngIf="!entry.row.obj.pictureId" class="adf-people-search-people-pic">
                                     {{getInitialUserName(entry.row.obj.firstName, entry.row.obj.lastName)}}</div>
                                 <div>
-                                    <img *ngIf="entry.row.obj.pictureId" class="adf-people-img"
+                                    <img [alt]="getDisplayUser(entry.row.obj.firstName, entry.row.obj.lastName, ' ')" *ngIf="entry.row.obj.pictureId" class="adf-people-img"
                                         [src]="peopleProcessService.getUserImage(entry.row.obj)"/>
                                 </div>
                             </ng-template>
diff --git a/lib/tslint.json b/lib/tslint.json
index 1bd18ddc42..ae261ecbde 100644
--- a/lib/tslint.json
+++ b/lib/tslint.json
@@ -2,5 +2,10 @@
   "extends": "../tslint.json",
   "rules": {
     "adf-license-banner": [true, "lib/+(core|content-services|process-services|process-services-cloud|insights|extensions)/**/*.ts", "./license-community.txt"]
-  }
+  },
+  "template-accessibility-alt-text": true,
+  "template-accessibility-label-for": true,
+  "template-accessibility-tabindex-no-positive": true,
+  "template-accessibility-table-scope": true,
+  "template-accessibility-valid-aria": true
 }
diff --git a/package-lock.json b/package-lock.json
index 8f2858e17e..0ad5d80389 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,61 +1,61 @@
 {
   "name": "alfresco-components",
-  "version": "3.1.0-beta5",
+  "version": "3.2.0-beta1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@alfresco/adf-content-services": {
-      "version": "3.1.0-beta5",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.1.0-beta5.tgz",
-      "integrity": "sha512-XgfeNPbbSAORj/D8FUOTHHDM0AxSv8dfSyEk14Hfkz+XGjSKJI53rNBjzfNXBf/IFIBfBgaPS9tXeWcIBqJ7EA==",
+      "version": "3.2.0-beta1",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.2.0-beta1.tgz",
+      "integrity": "sha512-IDMvGc9gFMkBuIuvP9pM7WhpWGXTbKGl/Wy/v8ZQUQJKqI+/frDBJLCer1oct22Mw2H+pq9NzAAmHqGOiqh3cw==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@alfresco/adf-core": {
-      "version": "3.1.0-beta5",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.1.0-beta5.tgz",
-      "integrity": "sha512-gmkxDUUt4WcT7XJ5a7MUvPVmOeweHXCPcIHX6WErSA/o+bI43FRu6wV7pBLaJ35UAR3MopCxHjW0zD2MTT1ENA==",
+      "version": "3.2.0-beta1",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.2.0-beta1.tgz",
+      "integrity": "sha512-tWdC2ht65MTcPBn2ILqRTy9T8MbXv5hzJIxzEOqoOSLf1pbuyGBN2dI6vWPzmtbZeLTMJg6B5DMeyHykxJHYkQ==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@alfresco/adf-extensions": {
-      "version": "3.1.0-beta5",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.1.0-beta5.tgz",
-      "integrity": "sha512-AvUNFxN1knwh8T3C92NmrnDvFb8xKU0El+PqO3XkMSS+Dh7NgE7bH1yQTmrUcFeF7dDR/KMrO+EVmdGPxvkYAA==",
+      "version": "3.2.0-beta1",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.2.0-beta1.tgz",
+      "integrity": "sha512-hkgQ97t/jZYTv1COhjt3RVONF8HmXM9Uo7/fvDDbGoac+hc2nJbQCWKdIwysZwkglHHbBRZSj/DVwppbKuNroQ==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@alfresco/adf-insights": {
-      "version": "3.1.0-beta5",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-insights/-/adf-insights-3.1.0-beta5.tgz",
-      "integrity": "sha512-zrf7eCtFU6QLqg1MK6tvBC+LrEQWAry5FflpCkwvmxCa7ulPyY0wJRExQI9QygdAA3vYRUOOlA4l8PTpjmhnKw==",
+      "version": "3.2.0-beta1",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-insights/-/adf-insights-3.2.0-beta1.tgz",
+      "integrity": "sha512-9bXFrCCzYbD1/mB7KIwrFKqLBx5UCEZ0+V3+MIpbJRprOU5iTlvzim1uNFbvJX8TNoHi2trEADo+0uSo7F+Zog==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@alfresco/adf-process-services": {
-      "version": "3.1.0-beta5",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-3.1.0-beta5.tgz",
-      "integrity": "sha512-koK55IE6sxcqMuSZs2jhaOqJFo0l8t/MO74C+v5MkA0ORxYtoswq2V3tRFLdAQinPWORAyzdtWNseDcyWKoDAA==",
+      "version": "3.2.0-beta1",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-3.2.0-beta1.tgz",
+      "integrity": "sha512-ljFWeaUn12x5MYBIBk1fEMqtFZJWZk32ivpuxpVMjiKrL55ryxrzSnc6SNddJMpcm1l6wXdO+ljygSUr3yhcDA==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@alfresco/adf-process-services-cloud": {
-      "version": "3.1.0-beta5",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services-cloud/-/adf-process-services-cloud-3.1.0-beta5.tgz",
-      "integrity": "sha512-ZuKQK4WL/Ere+ofvYQOb/QevIoHJVXL2LA4Gyo1K3f3zIaZXgaoWKqeDv/fQvqacQybUoc1Mo9iOytjC4DCJgA==",
+      "version": "3.2.0-beta1",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services-cloud/-/adf-process-services-cloud-3.2.0-beta1.tgz",
+      "integrity": "sha512-yV1V4UzEgaqvbiqFo/m8/bMeiTzWHV9PodaqV9T7j1tDkrf+QFpvWIf/eXpXRtTOqdFZbt2ojcZLEd7drOgM4g==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@alfresco/adf-testing": {
-      "version": "3.1.0-beta5",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-3.1.0-beta5.tgz",
-      "integrity": "sha512-Ylzak+r3b5yjsffDtlzxFBkwR84Se4n0mKCObYIzLsTxLNuEXagx44qlDG0S2w7lfjZgDKNQ4sQaenNxqZZ2Hg==",
+      "version": "3.2.0-beta1",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-3.2.0-beta1.tgz",
+      "integrity": "sha512-EL9hmTsCqSNXe4EK0lIw1XUy1utL0ooNltsafr4nsAUI5sFNUbWC/UZynmBv9fLvTGIe4Fd3ubDZgnBNBUNtSw==",
       "requires": {
         "tslib": "^1.9.0"
       }
@@ -2081,6 +2081,16 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "aria-query": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+      "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+      "dev": true,
+      "requires": {
+        "ast-types-flow": "0.0.7",
+        "commander": "^2.11.0"
+      }
+    },
     "arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -2251,6 +2261,12 @@
       "dev": true,
       "optional": true
     },
+    "ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
+      "dev": true
+    },
     "astral-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
@@ -2337,6 +2353,15 @@
         "is-buffer": "^1.1.5"
       }
     },
+    "axobject-query": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
+      "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
+      "dev": true,
+      "requires": {
+        "ast-types-flow": "0.0.7"
+      }
+    },
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -2824,7 +2849,6 @@
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
-      "optional": true,
       "requires": {
         "hoek": "2.x.x"
       }
@@ -3488,8 +3512,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-1.0.0.tgz",
       "integrity": "sha512-EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "buffer-xor": {
       "version": "1.0.3",
@@ -4035,25 +4058,39 @@
       "dev": true
     },
     "codelyzer": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.5.0.tgz",
-      "integrity": "sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==",
+      "version": "5.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.0.0-beta.2.tgz",
+      "integrity": "sha512-cH5vxszkzhAg92pvuKXFuoDgKIqX3a5hIPv545pfuPc2GKDXuiWACPteny29k3/FGaw9eub1iUlyLVkPpETtsg==",
       "dev": true,
       "requires": {
         "app-root-path": "^2.1.0",
-        "css-selector-tokenizer": "^0.7.0",
+        "aria-query": "^3.0.0",
+        "axobject-query": "^2.0.2",
+        "css-selector-tokenizer": "^0.7.1",
         "cssauron": "^1.4.0",
+        "damerau-levenshtein": "^1.0.4",
         "semver-dsl": "^1.0.1",
         "source-map": "^0.5.7",
-        "sprintf-js": "^1.1.1"
+        "sprintf-js": "^1.1.2"
       },
       "dependencies": {
         "app-root-path": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.1.0.tgz",
-          "integrity": "sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=",
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
+          "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
           "dev": true
         },
+        "css-selector-tokenizer": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz",
+          "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
+          "dev": true,
+          "requires": {
+            "cssesc": "^0.1.0",
+            "fastparse": "^1.1.1",
+            "regexpu-core": "^1.0.0"
+          }
+        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -4939,6 +4976,12 @@
         "es5-ext": "~0.10.2"
       }
     },
+    "damerau-levenshtein": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz",
+      "integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=",
+      "dev": true
+    },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -6716,8 +6759,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6738,14 +6780,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -6760,20 +6800,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -6890,8 +6927,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6903,7 +6939,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -6918,7 +6953,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -6926,14 +6960,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -6952,7 +6984,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -7033,8 +7064,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -7046,7 +7076,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -7132,8 +7161,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -7169,7 +7197,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -7189,7 +7216,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -7233,14 +7259,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -8007,8 +8031,7 @@
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "homedir-polyfill": {
       "version": "1.0.3",
@@ -8171,7 +8194,6 @@
       "resolved": "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz",
       "integrity": "sha1-rQFScUOi6Hc8+uapb1hla7UqNLI=",
       "dev": true,
-      "optional": true,
       "requires": {
         "httpreq": ">=0.4.22",
         "underscore": "~1.7.0"
@@ -8181,8 +8203,7 @@
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/httpreq/-/httpreq-0.4.24.tgz",
       "integrity": "sha1-QzX/2CzZaWaKOUZckprGHWOTYn8=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "https-browserify": {
       "version": "1.0.0",
@@ -9077,8 +9098,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
       "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-redirect": {
       "version": "1.0.0",
@@ -10011,15 +10031,13 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz",
       "integrity": "sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "libmime": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz",
       "integrity": "sha1-UaGp50SOy9Ms2lRCFnW7IbwJPaY=",
       "dev": true,
-      "optional": true,
       "requires": {
         "iconv-lite": "0.4.15",
         "libbase64": "0.1.0",
@@ -10030,8 +10048,7 @@
           "version": "0.4.15",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
           "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -10039,8 +10056,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz",
       "integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "license-checker": {
       "version": "25.0.1",
@@ -12102,15 +12118,13 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz",
       "integrity": "sha1-ecSQihwPXzdbc/6IjamCj23JY6Q=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "nodemailer-shared": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz",
       "integrity": "sha1-z1mU4v0mjQD1zw+nZ6CBae2wfsA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "nodemailer-fetch": "1.6.0"
       }
@@ -12143,8 +12157,7 @@
       "version": "0.1.10",
       "resolved": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz",
       "integrity": "sha1-WG24EB2zDLRDjrVGc3pBqtDPE9U=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "nopt": {
       "version": "3.0.6",
@@ -15735,7 +15748,6 @@
       "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.12.0.tgz",
       "integrity": "sha1-1275EnyyPCJZ7bHoNJwujV4tdME=",
       "dev": true,
-      "optional": true,
       "requires": {
         "httpntlm": "1.6.1",
         "nodemailer-shared": "1.1.0"
@@ -17793,8 +17805,7 @@
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
       "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "unherit": {
       "version": "1.1.1",
diff --git a/package.json b/package.json
index 37f2f8c4a3..5c28fa5dca 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,7 @@
     "ajv-cli": "^3.0.0",
     "bundlesize": "^0.15.3",
     "chalk": "^2.3.2",
-    "codelyzer": "^4.5.0",
+    "codelyzer": "5.0.0-beta.2",
     "commander": "^2.15.1",
     "concurrently": "^3.5.1",
     "cspell": "^3.1.3",
diff --git a/tslint.json b/tslint.json
index 87615cb6ca..b1affcc921 100644
--- a/tslint.json
+++ b/tslint.json
@@ -159,7 +159,10 @@
     ],
     "directive-selector": [
       true,
-      ["element", "attribute"],
+      [
+        "element",
+        "attribute"
+      ],
       "adf",
       "kebab-case"
     ],
@@ -172,11 +175,11 @@
     "arrow-parens": true,
     "no-input-prefix": true,
     "ordered-imports": false,
-    "template-conditional-complexity": [true, 2],
-    "banana-in-box": true,
+    "template-conditional-complexity": [
+      true,
+      2
+    ],
     "contextual-life-cycle": true,
-    "use-input-property-decorator": true,
-    "use-output-property-decorator": true,
     "use-host-property-decorator": false,
     "use-life-cycle-interface": true,
     "use-pipe-transform-interface": true,