diff --git a/ngsw-config.json b/ngsw-config.json
index fa9410f347f620ee86a69d5c12b6ed4f3a07968d..1f2ae3661f31de763a01ae5348547fcd10c1199b 100644
--- a/ngsw-config.json
+++ b/ngsw-config.json
@@ -1,5 +1,17 @@
 {
   "index": "/index.html",
+  "dataGroups":
+  [
+    {
+      "name": "api",
+      "urls": ["/**"],
+      "cacheConfig": {
+        "maxSize": 500,
+        "maxAge": "7d",
+        "strategy": "performance"
+      }
+    }
+  ],
   "assetGroups": [
     {
       "name": "app",
@@ -7,9 +19,12 @@
       "resources": {
         "files": [
           "/favicon.ico",
-          "/index.html",
+          "/*.html",
           "/*.css",
           "/*.js"
+        ],
+        "urls": [
+          "https://fonts.googleapis.com/**"
         ]
       }
     }, {
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 839a91057f3f2b23faa401d5892870000200dc7e..a599b06efedd199fedb4e8be77f2d9875d154bf8 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,8 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { PageNotFoundComponent } from './components/shared/page-not-found/page-not-found.component';
-import { CreatorModule } from './components/creator/creator.module';
-import { ParticipantModule } from './components/participant/participant.module';
 import { HomePageComponent } from './components/home/home-page/home-page.component';
 
 const routes: Routes = [
@@ -17,11 +15,11 @@ const routes: Routes = [
   },
   {
     path: 'creator',
-    loadChildren: () => CreatorModule
+    loadChildren: './components/creator/creator.module#CreatorModule'
   },
   {
     path: 'participant',
-    loadChildren: () => ParticipantModule
+    loadChildren: './components/participant/participant.module#ParticipantModule'
   },
   {
     path: '**',
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 12073d6504bbd108d9a6fd1d2db1258a25b387bd..7d22920318dbfab57cc0c3eeeffa262efeb22efa 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -58,7 +58,7 @@ export function initializeApp(appConfig: AppConfig) {
     EssentialsModule,
     SharedModule,
     ThemeModule,
-    ServiceWorkerModule.register('ngsw-worker.js', { enabled: true }) // environment.production
+    ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production })
   ],
   providers: [
     AppConfig,
diff --git a/src/app/components/shared/_dialogs/present-comment/present-comment.component.ts b/src/app/components/shared/_dialogs/present-comment/present-comment.component.ts
index db98ecce3f438a190adff9d0ac4e9a8a86f6f084..35bc3e620de7adeb0bcb3b13abadb4db6118227d 100644
--- a/src/app/components/shared/_dialogs/present-comment/present-comment.component.ts
+++ b/src/app/components/shared/_dialogs/present-comment/present-comment.component.ts
@@ -24,7 +24,7 @@ export class PresentCommentComponent implements OnInit {
     this.dialogRef.close('close');
   }
 
-  private updateFontSize(event: any): void {
+  updateFontSize(event: any): void {
      document.getElementById('comment').style.fontSize = (event.value * 2.5) + 'em';
   }
 }
diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html
index a6146daeac83fdcca50b475c4917afea6f2bfb2b..a36915c6d4f59739a30f0f40a91dc75a28eea95c 100644
--- a/src/app/components/shared/comment/comment.component.html
+++ b/src/app/components/shared/comment/comment.component.html
@@ -1,4 +1,5 @@
-<mat-card id="comment-card" [ngClass]="{true : 'highlighted', false: ''}[comment.highlighted]" [@slide]>
+<mat-card id="comment-card" [ngClass]="{'highlighted': comment.highlighted,
+                                        '': !comment.highlighted}" [@slide]>
     <div fxLayout="column">
       <div fxLayout="row">
         <span class="fill-remaining-space"></span>
@@ -17,7 +18,8 @@
         <mat-icon [ngClass]="{true: 'favorite-icon', false: 'not-marked'}[comment.favorite]">favorite_border</mat-icon>
         </button>
         <button mat-icon-button [disabled]="isStudent" (click)="setRead(comment)" [matTooltip]="comment.read ? 'Mark  as unread' : 'Mark as read'">
-        <mat-icon class="icon" [ngClass]="{true: 'read-icon', false: 'not-marked'}[comment.read]">visibility</mat-icon>
+        <mat-icon class="icon" [ngClass]="{'read-icon': comment.read,
+                                            'not-marked' : !comment.read}">visibility</mat-icon>
         </button>
       </div>
       <div fxLayout="row">
diff --git a/src/index.html b/src/index.html
index 2b1a07751ead044770f91de2f5ccf1e20c72372f..e33f54078b0dc55598895e0d3395b616df110297 100644
--- a/src/index.html
+++ b/src/index.html
@@ -28,7 +28,7 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en">
   <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
   <link rel="manifest" href="manifest.webmanifest">
-  <meta name="theme-color" content="#4DB6AC">
+  <meta name="theme-color" content="#b2dfdb">
 </head>
 <body>
   <app-root></app-root>
diff --git a/src/manifest.webmanifest b/src/manifest.webmanifest
index d854eff0e44db20182bf1e9054f848daed87cb62..346ea67f7dd63d65386bcaa888bdc7912ac2c04e 100644
--- a/src/manifest.webmanifest
+++ b/src/manifest.webmanifest
@@ -1,8 +1,8 @@
 {
   "name": "ARSnova Lite",
   "short_name": "ARSnova",
-  "theme_color": "#4DB6AC",
-  "background_color": "#B2DFDB",
+  "theme_color": "#b2dfdb",
+  "background_color": "#b2dfdb",
   "display": "standalone",
   "scope": "/",
   "start_url": "/home",