diff --git a/.vscode/settings.json b/.vscode/settings.json
index b4f4f4d5c..5e62875a9 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,9 +4,6 @@
   "typescript.preferences.quoteStyle": "single",
   "typescript.preferences.importModuleSpecifier": "relative",
   "editor.formatOnSave": true,
-  "[html]": {
-    "editor.formatOnSave": false
-  },
   "[json]": {
     "editor.formatOnSave": false
   }
diff --git a/package-lock.json b/package-lock.json
index ca2fe319f..b2db557dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12486,9 +12486,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.14.2.tgz",
-      "integrity": "sha512-McHPg0n1pIke+A/4VcaS2en+pTNjy4xF+Uuq86u/5dyDO59/TtFZtQ708QIRkEZ3qwKz3GVkVa6mpxK/CpB8Rg==",
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.15.1.tgz",
+      "integrity": "sha512-4rgV2hyc/5Pk0XHH4VjJWHRgVjgRbpMfLQjREAhHBtyW1UvTFkjJEsueGYNYYZd9mn97K+1qv0EBwm11zoaSgA==",
       "dev": true
     },
     "process": {
diff --git a/package.json b/package.json
index 628e452b1..3283f96a9 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
     "ng-packagr": "^4.4.0",
-    "prettier": "^1.14.2",
+    "prettier": "^1.15.1",
     "protractor": "^5.4.0",
     "rimraf": "2.6.2",
     "rxjs-tslint-rules": "^4.8.0",
diff --git a/src/app/components/common/dynamic-column/dynamic-column.component.ts b/src/app/components/common/dynamic-column/dynamic-column.component.ts
index 913d4895f..4ad17fae5 100644
--- a/src/app/components/common/dynamic-column/dynamic-column.component.ts
+++ b/src/app/components/common/dynamic-column/dynamic-column.component.ts
@@ -41,7 +41,9 @@ import { ExtensionService } from '@alfresco/adf-extensions';
 
 @Component({
   selector: 'app-dynamic-column',
-  template: `<ng-container #content></ng-container>`,
+  template: `
+    <ng-container #content></ng-container>
+  `,
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: { class: 'app-dynamic-column' },
diff --git a/src/app/components/common/library-name-column/library-name-column.component.ts b/src/app/components/common/library-name-column/library-name-column.component.ts
index e057d0ba9..8ebf3d3e4 100644
--- a/src/app/components/common/library-name-column/library-name-column.component.ts
+++ b/src/app/components/common/library-name-column/library-name-column.component.ts
@@ -37,9 +37,7 @@ import { ShareDataRow } from '@alfresco/adf-content-services';
 @Component({
   selector: 'app-library-name-column',
   template: `
-    <span
-      title="{{ displayTooltip }}"
-      (click)="onClick()">
+    <span title="{{ displayTooltip }}" (click)="onClick()">
       {{ displayText }}
     </span>
   `,
diff --git a/src/app/components/common/location-link/location-link.component.ts b/src/app/components/common/location-link/location-link.component.ts
index 56085f7eb..e7bba312a 100644
--- a/src/app/components/common/location-link/location-link.component.ts
+++ b/src/app/components/common/location-link/location-link.component.ts
@@ -42,10 +42,10 @@ import { ContentApiService } from '../../../services/content-api.service';
 @Component({
   selector: 'aca-location-link',
   template: `
-        <a href="" [title]="nodeLocation$ | async" (click)="goToLocation()">
-            {{ displayText | async }}
-        </a>
-    `,
+    <a href="" [title]="nodeLocation$ | async" (click)="goToLocation()">
+      {{ displayText | async }}
+    </a>
+  `,
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
   host: { class: 'aca-location-link adf-location-cell' }
diff --git a/src/app/components/common/name-column/name-column.component.ts b/src/app/components/common/name-column/name-column.component.ts
index 8a47af70e..9f328689e 100644
--- a/src/app/components/common/name-column/name-column.component.ts
+++ b/src/app/components/common/name-column/name-column.component.ts
@@ -36,9 +36,7 @@ import { MinimalNodeEntity } from 'alfresco-js-api';
 @Component({
   selector: 'app-name-column',
   template: `
-    <span
-      title="{{ node | adfNodeNameTooltip }}"
-      (click)="onClick()">
+    <span title="{{ node | adfNodeNameTooltip }}" (click)="onClick()">
       {{ displayText }}
     </span>
   `,
diff --git a/src/app/components/common/trashcan-name-column/trashcan-name-column.component.ts b/src/app/components/common/trashcan-name-column/trashcan-name-column.component.ts
index 270306977..f3d88295a 100644
--- a/src/app/components/common/trashcan-name-column/trashcan-name-column.component.ts
+++ b/src/app/components/common/trashcan-name-column/trashcan-name-column.component.ts
@@ -35,10 +35,7 @@ import { MinimalNodeEntity } from 'alfresco-js-api';
 @Component({
   selector: 'app-trashcan-name-column',
   template: `
-    <span
-      title="{{ node | adfNodeNameTooltip }}">
-      {{ displayText }}
-    </span>
+    <span title="{{ node | adfNodeNameTooltip }}">{{ displayText }}</span>
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
diff --git a/src/app/components/info-drawer/comments-tab/comments-tab.component.ts b/src/app/components/info-drawer/comments-tab/comments-tab.component.ts
index a02e5a19d..91273d28b 100644
--- a/src/app/components/info-drawer/comments-tab/comments-tab.component.ts
+++ b/src/app/components/info-drawer/comments-tab/comments-tab.component.ts
@@ -30,8 +30,11 @@ import { NodePermissionService } from '../../../services/node-permission.service
 @Component({
   selector: 'app-comments-tab',
   template: `
-        <adf-comments [readOnly]="!canUpdateNode" [nodeId]="node?.id"></adf-comments>
-    `
+    <adf-comments
+      [readOnly]="!canUpdateNode"
+      [nodeId]="node?.id"
+    ></adf-comments>
+  `
 })
 export class CommentsTabComponent {
   @Input()
diff --git a/src/app/components/info-drawer/metadata-tab/metadata-tab.component.ts b/src/app/components/info-drawer/metadata-tab/metadata-tab.component.ts
index d0b46c012..f12818ec6 100644
--- a/src/app/components/info-drawer/metadata-tab/metadata-tab.component.ts
+++ b/src/app/components/info-drawer/metadata-tab/metadata-tab.component.ts
@@ -36,9 +36,10 @@ import { AppConfigService } from '@alfresco/adf-core';
       [readOnly]="!canUpdateNode"
       [displayEmpty]="canUpdateNode"
       [preset]="'custom'"
-      [node]="node">
+      [node]="node"
+    >
     </adf-content-metadata-card>
-    `,
+  `,
   encapsulation: ViewEncapsulation.None,
   host: { class: 'app-metadata-tab' }
 })
diff --git a/src/app/components/info-drawer/versions-tab/versions-tab.component.ts b/src/app/components/info-drawer/versions-tab/versions-tab.component.ts
index 1a7faddb1..c610cd271 100644
--- a/src/app/components/info-drawer/versions-tab/versions-tab.component.ts
+++ b/src/app/components/info-drawer/versions-tab/versions-tab.component.ts
@@ -29,21 +29,26 @@ import { MinimalNodeEntryEntity } from 'alfresco-js-api';
 @Component({
   selector: 'app-versions-tab',
   template: `
-        <ng-container *ngIf="isFileSelected;else empty">
-            <adf-version-manager
-                [showComments]="'adf-version-manager.allowComments' | adfAppConfig:true"
-                [allowDownload]="'adf-version-manager.allowDownload' | adfAppConfig:true"
-                [node]="node">
-            </adf-version-manager>
-        </ng-container>
+    <ng-container *ngIf="isFileSelected; else: empty">
+      <adf-version-manager
+        [showComments]="
+          'adf-version-manager.allowComments' | adfAppConfig: true
+        "
+        [allowDownload]="
+          'adf-version-manager.allowDownload' | adfAppConfig: true
+        "
+        [node]="node"
+      >
+      </adf-version-manager>
+    </ng-container>
 
-        <ng-template #empty>
-            <div class="adf-manage-versions-empty">
-                <mat-icon class="adf-manage-versions-empty-icon">face</mat-icon>
-                {{ 'VERSION.SELECTION.EMPTY' | translate }}
-            </div>
-        </ng-template>
-    `
+    <ng-template #empty>
+      <div class="adf-manage-versions-empty">
+        <mat-icon class="adf-manage-versions-empty-icon">face</mat-icon>
+        {{ 'VERSION.SELECTION.EMPTY' | translate }}
+      </div>
+    </ng-template>
+  `
 })
 export class VersionsTabComponent implements OnInit, OnChanges {
   @Input()
diff --git a/src/app/components/layout/page-layout/page-layout-content.component.ts b/src/app/components/layout/page-layout/page-layout-content.component.ts
index b4b1f3696..ad6eac255 100644
--- a/src/app/components/layout/page-layout/page-layout-content.component.ts
+++ b/src/app/components/layout/page-layout/page-layout-content.component.ts
@@ -33,7 +33,9 @@ import {
 
 @Component({
   selector: 'app-page-layout-content',
-  template: `<ng-content></ng-content>`,
+  template: `
+    <ng-content></ng-content>
+  `,
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: { class: 'app-page-layout-content' }
diff --git a/src/app/components/layout/page-layout/page-layout-error.component.ts b/src/app/components/layout/page-layout/page-layout-error.component.ts
index a3a6178f0..48f626a97 100644
--- a/src/app/components/layout/page-layout/page-layout-error.component.ts
+++ b/src/app/components/layout/page-layout/page-layout-error.component.ts
@@ -31,7 +31,9 @@ import {
 
 @Component({
   selector: 'app-page-layout-error',
-  template: `<ng-content></ng-content>`,
+  template: `
+    <ng-content></ng-content>
+  `,
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: { class: 'app-page-layout-error' }
diff --git a/src/app/components/preview/preview-extension.component.ts b/src/app/components/preview/preview-extension.component.ts
index e4a72df48..5e2f07c82 100644
--- a/src/app/components/preview/preview-extension.component.ts
+++ b/src/app/components/preview/preview-extension.component.ts
@@ -39,7 +39,9 @@ import { MinimalNodeEntryEntity } from 'alfresco-js-api';
 
 @Component({
   selector: 'app-preview-extension',
-  template: `<div #content></div>`
+  template: `
+    <div #content></div>
+  `
 })
 export class PreviewExtensionComponent implements OnInit, OnChanges, OnDestroy {
   @ViewChild('content', { read: ViewContainerRef })
diff --git a/src/app/components/toolbar/document-display-mode/document-display-mode.component.ts b/src/app/components/toolbar/document-display-mode/document-display-mode.component.ts
index d9c2f748e..c0af458d4 100644
--- a/src/app/components/toolbar/document-display-mode/document-display-mode.component.ts
+++ b/src/app/components/toolbar/document-display-mode/document-display-mode.component.ts
@@ -33,10 +33,7 @@ import { ToggleDocumentDisplayMode } from '../../../store/actions';
 @Component({
   selector: 'app-document-display-mode',
   template: `
-    <button
-      mat-icon-button
-      color="primary"
-      (click)="onClick()">
+    <button mat-icon-button color="primary" (click)="onClick()">
       <mat-icon *ngIf="(displayMode$ | async) === 'list'">view_comfy</mat-icon>
       <mat-icon *ngIf="(displayMode$ | async) === 'gallery'">list</mat-icon>
     </button>
diff --git a/src/app/components/toolbar/toggle-favorite/toggle-favorite.component.ts b/src/app/components/toolbar/toggle-favorite/toggle-favorite.component.ts
index 55a547ced..47f047e4d 100644
--- a/src/app/components/toolbar/toggle-favorite/toggle-favorite.component.ts
+++ b/src/app/components/toolbar/toggle-favorite/toggle-favorite.component.ts
@@ -35,15 +35,16 @@ import { ContentManagementService } from '../../../services/content-management.s
   selector: 'app-toggle-favorite',
   template: `
     <button
-        mat-menu-item
-        #favorites="adfFavorite"
-        (toggle)="onToggleEvent()"
-        [adf-node-favorite]="(selection$ | async).nodes">
-        <mat-icon *ngIf="favorites.hasFavorites()">star</mat-icon>
-        <mat-icon *ngIf="!favorites.hasFavorites()">star_border</mat-icon>
-        <span>{{ 'APP.ACTIONS.FAVORITE' | translate }}</span>
+      mat-menu-item
+      #favorites="adfFavorite"
+      (toggle)="onToggleEvent()"
+      [adf-node-favorite]="(selection$ | async).nodes"
+    >
+      <mat-icon *ngIf="favorites.hasFavorites()">star</mat-icon>
+      <mat-icon *ngIf="!favorites.hasFavorites()">star_border</mat-icon>
+      <span>{{ 'APP.ACTIONS.FAVORITE' | translate }}</span>
     </button>
-    `,
+  `,
   encapsulation: ViewEncapsulation.None,
   host: { class: 'app-toggle-favorite' }
 })
diff --git a/src/app/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts b/src/app/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts
index 4d9f609ec..144c8f0e1 100644
--- a/src/app/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts
+++ b/src/app/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts
@@ -33,14 +33,15 @@ import { ToggleInfoDrawerAction } from '../../../store/actions';
 @Component({
   selector: 'app-toggle-info-drawer',
   template: `
-        <button
-            mat-icon-button
-            [color]="(infoDrawerOpened$ | async) ? 'accent' : 'primary'"
-            [attr.title]="'APP.ACTIONS.DETAILS' | translate"
-            (click)="onClick()">
-            <mat-icon>info_outline</mat-icon>
-        </button>
-    `,
+    <button
+      mat-icon-button
+      [color]="(infoDrawerOpened$ | async) ? 'accent' : 'primary'"
+      [attr.title]="'APP.ACTIONS.DETAILS' | translate"
+      (click)="onClick()"
+    >
+      <mat-icon>info_outline</mat-icon>
+    </button>
+  `,
   encapsulation: ViewEncapsulation.None,
   host: { class: 'app-toggle-info-drawer' }
 })