From a195fafa6b4557f29a86879c92e6c504948176b3 Mon Sep 17 00:00:00 2001
From: smuddyx <smuddyx@gmail.com>
Date: Fri, 21 May 2021 20:17:26 +0200
Subject: [PATCH] update tslint -> eslint

---
 .eslintrc.json                                |   59 +
 .prettierrc                                   |   26 +
 angular.json                                  |   15 +-
 e2e/src/app.e2e-spec.ts                       |   16 +-
 package-lock.json                             | 1143 ++++++++++++++---
 package.json                                  |   15 +-
 src/app/animations.ts                         |   45 +-
 src/app/app-routing.module.ts                 |   30 +-
 src/app/app.component.html                    |    8 +-
 src/app/app.component.spec.ts                 |   21 +-
 src/app/app.component.ts                      |   18 +-
 src/app/app.module.ts                         |   17 +-
 src/app/modules/brand/brand.component.spec.ts |   13 +-
 src/app/modules/brand/brand.component.ts      |   14 +-
 src/app/modules/brand/brand.module.ts         |   14 +-
 .../brand/new-user/new-user.component.html    |    9 +-
 .../brand/new-user/new-user.component.spec.ts |   13 +-
 .../brand/new-user/new-user.component.ts      |    4 +-
 src/app/modules/guest/guest.component.html    |    9 +-
 src/app/modules/guest/guest.component.spec.ts |   13 +-
 src/app/modules/guest/guest.component.ts      |   16 +-
 src/app/modules/guest/guest.module.ts         |   17 +-
 .../monitor/legal/legal.component.html        |   16 +-
 .../monitor/legal/legal.component.spec.ts     |   13 +-
 .../monitor/legal/legal.component.ts          |    2 +-
 .../monitor/logo/logo.component.html          |   17 +-
 .../monitor/logo/logo.component.spec.ts       |   13 +-
 .../monitor/logo/logo.component.ts            |   14 +-
 .../monitor/monitor.component.html            |   37 +-
 .../monitor/monitor.component.spec.ts         |   13 +-
 .../presentation/monitor/monitor.component.ts |   46 +-
 .../presentation-routing.module.ts            |   14 +-
 .../presentation/presentation.module.ts       |   12 +-
 .../presentation/remote/remote.component.html |   67 +-
 .../remote/remote.component.spec.ts           |   13 +-
 .../presentation/remote/remote.component.ts   |   48 +-
 .../services/presentation.service.spec.ts     |    4 +-
 .../services/presentation.service.ts          |    8 +-
 .../list/list-item/list-item.component.html   |    4 +-
 .../list-item/list-item.component.spec.ts     |   13 +-
 .../list/list-item/list-item.component.ts     |    2 +-
 .../modules/shows/list/list.component.html    |   27 +-
 .../modules/shows/list/list.component.spec.ts |   13 +-
 src/app/modules/shows/list/list.component.ts  |    5 +-
 src/app/modules/shows/new/new.component.html  |   11 +-
 .../modules/shows/new/new.component.spec.ts   |   13 +-
 src/app/modules/shows/new/new.component.ts    |    6 +-
 .../shows/services/docx.service.spec.ts       |    4 +-
 .../modules/shows/services/docx.service.ts    |   73 +-
 .../shows/services/show-data.service.spec.ts  |    6 +-
 .../shows/services/show-data.service.ts       |    8 +-
 .../services/show-song-data.service.spec.ts   |    4 +-
 .../shows/services/show-song-data.service.ts  |   11 +-
 .../shows/services/show-song.service.spec.ts  |    4 +-
 .../shows/services/show-song.service.ts       |   12 +-
 .../shows/services/show.service.spec.ts       |   29 +-
 .../modules/shows/services/show.service.ts    |   23 +-
 src/app/modules/shows/services/show.ts        |    2 -
 .../modules/shows/show/show.component.html    |   73 +-
 .../modules/shows/show/show.component.spec.ts |   13 +-
 src/app/modules/shows/show/show.component.ts  |   41 +-
 .../shows/show/song/song.component.html       |   47 +-
 .../shows/show/song/song.component.spec.ts    |   13 +-
 .../modules/shows/show/song/song.component.ts |   46 +-
 src/app/modules/shows/shows-routing.module.ts |   14 +-
 src/app/modules/shows/shows.module.ts         |    6 +-
 .../songs/services/file-data.service.spec.ts  |    6 +-
 .../songs/services/file-data.service.ts       |    9 +-
 .../songs/services/file.service.spec.ts       |    4 +-
 .../modules/songs/services/file.service.ts    |   13 +-
 src/app/modules/songs/services/fileBase.ts    |    3 +-
 src/app/modules/songs/services/key.helper.ts  |  231 ++--
 .../songs/services/song-data.service.spec.ts  |   42 +-
 .../songs/services/song-data.service.ts       |    7 +-
 .../songs/services/song.service.spec.ts       |   39 +-
 .../modules/songs/services/song.service.ts    |   74 +-
 .../services/text-rendering.service.spec.ts   |   87 +-
 .../songs/services/text-rendering.service.ts  |   38 +-
 .../songs/services/transpose.service.spec.ts  |    4 +-
 .../songs/services/transpose.service.ts       |   25 +-
 .../songs/services/upload.service.spec.ts     |    6 +-
 .../modules/songs/services/upload.service.ts  |   22 +-
 src/app/modules/songs/services/upload.ts      |   15 +-
 .../song-list/filter/filter.component.html    |   22 +-
 .../song-list/filter/filter.component.spec.ts |   13 +-
 .../song-list/filter/filter.component.ts      |   56 +-
 .../list-item/list-item.component.html        |   38 +-
 .../list-item/list-item.component.spec.ts     |   13 +-
 .../list-item/list-item.component.ts          |   13 +-
 .../songs/song-list/song-list.component.html  |    6 +-
 .../song-list/song-list.component.spec.ts     |   29 +-
 .../songs/song-list/song-list.component.ts    |   15 +-
 .../songs/song-list/song-list.module.ts       |    6 +-
 .../edit/edit-file/edit-file.component.html   |   23 +-
 .../edit-file/edit-file.component.spec.ts     |   13 +-
 .../edit/edit-file/edit-file.component.ts     |   28 +-
 .../edit/edit-file/file/file.component.html   |    2 +-
 .../edit-file/file/file.component.spec.ts     |   13 +-
 .../edit/edit-file/file/file.component.ts     |   10 +-
 .../songs/song/edit/edit-song.guard.spec.ts   |    4 +-
 .../songs/song/edit/edit-song.guard.ts        |    9 +-
 .../edit/edit-song/edit-song.component.html   |  101 +-
 .../edit-song/edit-song.component.spec.ts     |   13 +-
 .../edit/edit-song/edit-song.component.ts     |   72 +-
 .../save-dialog/save-dialog.component.html    |    4 +-
 .../save-dialog/save-dialog.component.spec.ts |   13 +-
 .../save-dialog/save-dialog.component.ts      |   14 +-
 .../songs/song/edit/edit.component.spec.ts    |   13 +-
 .../modules/songs/song/edit/edit.component.ts |    2 +-
 .../modules/songs/song/edit/edit.module.ts    |    7 +-
 .../songs/song/edit/edit.service.spec.ts      |    6 +-
 .../modules/songs/song/edit/edit.service.ts   |    6 +-
 .../song/edit/history/history.component.html  |    4 +-
 .../edit/history/history.component.spec.ts    |   13 +-
 .../song/edit/history/history.component.ts    |   25 +-
 .../songs/song/file/file.component.html       |    4 +-
 .../songs/song/file/file.component.spec.ts    |   13 +-
 .../modules/songs/song/file/file.component.ts |   20 +-
 .../modules/songs/song/new/new.component.html |    6 +-
 .../songs/song/new/new.component.spec.ts      |   13 +-
 .../modules/songs/song/new/new.component.ts   |   29 +-
 src/app/modules/songs/song/new/new.module.ts  |   15 +-
 .../modules/songs/song/song.component.html    |   79 +-
 .../modules/songs/song/song.component.spec.ts |   20 +-
 src/app/modules/songs/song/song.component.ts  |   16 +-
 src/app/modules/songs/song/song.module.ts     |    6 +-
 src/app/modules/songs/songs-routing.module.ts |   16 +-
 src/app/modules/songs/songs.module.ts         |   12 +-
 src/app/modules/user/info/info.component.html |   24 +-
 .../modules/user/info/info.component.spec.ts  |   13 +-
 src/app/modules/user/info/info.component.ts   |    8 +-
 src/app/modules/user/info/role.pipe.spec.ts   |    2 +-
 src/app/modules/user/info/role.pipe.ts        |    8 +-
 .../user/info/users/user/user.component.html  |   22 +-
 .../info/users/user/user.component.spec.ts    |   13 +-
 .../user/info/users/user/user.component.ts    |   16 +-
 .../user/info/users/users.component.html      |    2 +-
 .../user/info/users/users.component.spec.ts   |   13 +-
 .../user/info/users/users.component.ts        |    4 +-
 .../user/login/auth-message.pipe.spec.ts      |    2 +-
 .../modules/user/login/auth-message.pipe.ts   |    8 +-
 .../modules/user/login/login.component.html   |   56 +-
 .../user/login/login.component.spec.ts        |   13 +-
 src/app/modules/user/login/login.component.ts |   18 +-
 .../user/logout/logout.component.spec.ts      |   13 +-
 .../modules/user/logout/logout.component.ts   |    7 +-
 src/app/modules/user/new/new.component.html   |   10 +-
 .../modules/user/new/new.component.spec.ts    |   13 +-
 src/app/modules/user/new/new.component.ts     |   14 +-
 .../password-send.component.html              |    4 +-
 .../password-send.component.spec.ts           |   13 +-
 .../password-send/password-send.component.ts  |   14 +-
 .../user/password/password.component.html     |   14 +-
 .../user/password/password.component.spec.ts  |   13 +-
 .../user/password/password.component.ts       |   21 +-
 src/app/modules/user/user-routing.module.ts   |   20 +-
 src/app/modules/user/user.module.ts           |    8 +-
 src/app/services/config.service.spec.ts       |    4 +-
 src/app/services/config.service.ts            |    5 +-
 src/app/services/db.service.spec.ts           |    6 +-
 src/app/services/db.service.ts                |   12 +-
 src/app/services/delay.ts                     |    2 +-
 .../services/global-settings.service.spec.ts  |    4 +-
 src/app/services/global-settings.service.ts   |    8 +-
 src/app/services/scroll.service.spec.ts       |    4 +-
 src/app/services/scroll.service.ts            |   16 +-
 src/app/services/user/owner.directive.ts      |   23 +-
 src/app/services/user/owner.module.ts         |    7 +-
 src/app/services/user/role.directive.ts       |   15 +-
 src/app/services/user/role.module.ts          |    7 +-
 .../user/user-name/user-name.component.html   |    2 +-
 .../user-name/user-name.component.spec.ts     |   13 +-
 .../user/user-name/user-name.component.ts     |   11 +-
 .../user/user-name/user-name.module.ts        |    5 +-
 src/app/services/user/user.service.spec.ts    |    6 +-
 src/app/services/user/user.service.ts         |   57 +-
 .../add-song/add-song.component.html          |    8 +-
 .../add-song/add-song.component.spec.ts       |   13 +-
 .../components/add-song/add-song.component.ts |   12 +-
 .../components/add-song/add-song.module.ts    |   16 +-
 .../application-frame.module.ts               |   22 +-
 .../navigation/brand/brand.component.html     |   16 +-
 .../navigation/brand/brand.component.spec.ts  |   13 +-
 .../navigation/brand/brand.component.ts       |   14 +-
 .../navigation/filter/filter.component.html   |    6 +-
 .../filter/filter.component.spec.ts           |   13 +-
 .../navigation/filter/filter.component.ts     |   11 +-
 .../navigation/link/link.component.html       |    3 +-
 .../navigation/link/link.component.spec.ts    |   13 +-
 .../navigation/link/link.component.ts         |    2 +-
 .../navigation/navigation.component.html      |   27 +-
 .../navigation/navigation.component.spec.ts   |   13 +-
 .../navigation/navigation.component.ts        |   11 +-
 .../button-row/button-row.component.spec.ts   |   13 +-
 .../button-row/button-row.component.ts        |   14 +-
 .../button-row/button-row.module.ts           |    8 +-
 .../components/button/button.component.html   |    4 +-
 .../button/button.component.spec.ts           |   13 +-
 .../components/button/button.component.ts     |    5 +-
 .../components/button/button.module.ts        |   14 +-
 .../components/card/card.component.html       |    9 +-
 .../components/card/card.component.spec.ts    |   13 +-
 .../components/card/card.component.ts         |    8 +-
 .../components/card/card.module.ts            |   11 +-
 .../list-header/list-header.component.html    |    7 +-
 .../list-header/list-header.component.spec.ts |   13 +-
 .../list-header/list-header.component.ts      |   17 +-
 .../list-header/list-header.module.ts         |   15 +-
 .../components/logo/logo.component.html       |   69 +-
 .../components/logo/logo.component.spec.ts    |   13 +-
 .../components/logo/logo.component.ts         |   14 +-
 .../components/logo/logo.module.ts            |   12 +-
 .../menu-button/menu-button.component.spec.ts |   13 +-
 .../menu-button/menu-button.component.ts      |    2 +-
 .../menu-button/menu-button.module.ts         |   14 +-
 .../components/song-text/animation.ts         |   25 +-
 .../song-text/song-text.component.html        |   69 +-
 .../song-text/song-text.component.spec.ts     |   13 +-
 .../song-text/song-text.component.ts          |   32 +-
 .../components/song-text/song-text.module.ts  |   10 +-
 .../autofocus/autofocus.directive.ts          |   12 +-
 .../directives/autofocus/autofocus.module.ts  |   12 +-
 .../widget-modules/guards/role.guard.spec.ts  |    4 +-
 src/app/widget-modules/guards/role.guard.ts   |   14 +-
 .../key-translator/key-translator.module.ts   |   12 +-
 .../pipes/key-translator/key.pipe.spec.ts     |    2 +-
 .../pipes/key-translator/key.pipe.ts          |    6 +-
 .../legal-owner-translator.module.ts          |   12 +-
 .../legal-owner.pipe.spec.ts                  |    2 +-
 .../legal-owner.pipe.ts                       |    6 +-
 .../legal-type-translator.module.ts           |   12 +-
 .../legal-type.pipe.spec.ts                   |    2 +-
 .../legal-type-translator/legal-type.pipe.ts  |    6 +-
 .../section-type-translator.module.ts         |   12 +-
 .../section-type.pipe.spec.ts                 |    2 +-
 .../section-type.pipe.ts                      |    6 +-
 .../show-type-translater.module.ts            |   12 +-
 .../show-type.pipe.spec.ts                    |    2 +-
 .../show-type-translater/show-type.pipe.ts    |   19 +-
 .../song-type-translater.module.ts            |   12 +-
 .../song-type.pipe.spec.ts                    |    2 +-
 .../song-type-translater/song-type.pipe.ts    |    6 +-
 .../status-translater.module.ts               |   12 +-
 .../status-translater/status.pipe.spec.ts     |    2 +-
 .../pipes/status-translater/status.pipe.ts    |    6 +-
 src/environments/environment.prod.ts          |    2 +-
 src/environments/environment.ts               |    2 +-
 src/index.html                                |    3 +-
 src/main.ts                                   |    3 +-
 src/polyfills.ts                              |    1 -
 src/test.ts                                   |    8 +-
 tslint.json                                   |  155 ---
 252 files changed, 3080 insertions(+), 2420 deletions(-)
 create mode 100644 .eslintrc.json
 create mode 100644 .prettierrc
 delete mode 100644 tslint.json

diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..be7ad60
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,59 @@
+{
+  "root": true,
+  "ignorePatterns": [
+    "projects/**/*"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "tsconfig.json",
+          "e2e/tsconfig.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "extends": [
+        "plugin:@angular-eslint/recommended",
+        "plugin:@angular-eslint/template/process-inline-templates",
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@typescript-eslint/recommended-requiring-type-checking",
+        "plugin:prettier/recommended"
+      ],
+      "rules": {
+        "@typescript-eslint/explicit-member-accessibility": "error",
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "prefix": "app",
+            "style": "kebab-case",
+            "type": "element"
+          }
+        ],
+        "@typescript-eslint/unbound-method": [
+          "off"
+        ],
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "prefix": "app",
+            "style": "camelCase",
+            "type": "attribute"
+          }
+        ]
+      }
+    },
+    {
+      "files": [
+        "*.html"
+      ],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended"
+      ],
+      "rules": {}
+    }
+  ]
+}
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000..a1bafcd
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,26 @@
+{
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "quoteProps": "as-needed",
+  "trailingComma": "es5",
+  "bracketSpacing": false,
+  "arrowParens": "avoid",
+  "jsxBracketSameLine": false,
+  "printWidth": 200,
+  "overrides": [
+    {
+      "files": "*.component.html",
+      "options": {
+        "parser": "angular"
+      }
+    },
+    {
+      "files": "*.html",
+      "options": {
+        "parser": "html"
+      }
+    }
+  ]
+}
diff --git a/angular.json b/angular.json
index c780e89..125040b 100644
--- a/angular.json
+++ b/angular.json
@@ -116,15 +116,11 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
             ]
           }
         },
@@ -145,6 +141,7 @@
   },
   "defaultProject": "wgenerator",
   "cli": {
-    "analytics": "4047dcd7-89f4-402f-958e-e365a5505c55"
+    "analytics": "4047dcd7-89f4-402f-958e-e365a5505c55",
+    "defaultCollection": "@angular-eslint/schematics"
   }
 }
diff --git a/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts
index 9800f38..9129c61 100644
--- a/e2e/src/app.e2e-spec.ts
+++ b/e2e/src/app.e2e-spec.ts
@@ -1,5 +1,5 @@
-import { AppPage } from './app.po';
-import { browser, logging } from 'protractor';
+import {AppPage} from './app.po';
+import {browser, logging} from 'protractor';
 
 describe('workspace-project App', () => {
   let page: AppPage;
@@ -9,15 +9,17 @@ describe('workspace-project App', () => {
   });
 
   it('should display welcome message', () => {
-    page.navigateTo();
-    expect(page.getTitleText()).toEqual('wgenerator app is running!');
+    void page.navigateTo();
+    void expect(page.getTitleText()).toEqual('wgenerator app is running!');
   });
 
   afterEach(async () => {
     // Assert that there are no errors emitted from the browser
     const logs = await browser.manage().logs().get(logging.Type.BROWSER);
-    expect(logs).not.toContain(jasmine.objectContaining({
-      level: logging.Level.SEVERE,
-    } as logging.Entry));
+    void expect(logs).not.toContain(
+      jasmine.objectContaining({
+        level: logging.Level.SEVERE,
+      } as logging.Entry)
+    );
   });
 });
diff --git a/package-lock.json b/package-lock.json
index 6828091..64e9095 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -515,6 +515,98 @@
         }
       }
     },
+    "@angular-eslint/builder": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-12.0.0.tgz",
+      "integrity": "sha512-gvvXQDXXi0gsWZ25KyMqF/1b3AaX+CJbpVgTPqxJdEx4euvmG/m3993ynmpf+Kc+F+aI2O9W4TUbDbbLWoCjIA==",
+      "dev": true
+    },
+    "@angular-eslint/eslint-plugin": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-12.0.0.tgz",
+      "integrity": "sha512-osdJdMu8bYFv9WGhC04AwRcbeKq4sxCQnShV7NiF0xkgNG9KqDaStytVhPjJFn2Ja1QhfiTGlcFFk4D/9aruog==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/experimental-utils": "4.23.0"
+      }
+    },
+    "@angular-eslint/eslint-plugin-template": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-12.0.0.tgz",
+      "integrity": "sha512-RF8PwN2A3U4ihd7sKYUM8wgPj46M30reziLl8CPPhN3H5Hn46nksmKmHRbPNakH2gW0Ba7NIxy+ocqUy0fQpcQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/experimental-utils": "4.23.0",
+        "aria-query": "^4.2.2",
+        "axobject-query": "^2.2.0"
+      },
+      "dependencies": {
+        "aria-query": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+          "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.10.2",
+            "@babel/runtime-corejs3": "^7.10.2"
+          }
+        },
+        "axobject-query": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
+          "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
+          "dev": true
+        }
+      }
+    },
+    "@angular-eslint/schematics": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-12.0.0.tgz",
+      "integrity": "sha512-AwYEVuAQLJfyIF5vxBL98a67ecF9U25pQSIg0xCY6DeDpIaGdORr4yg2rGYy8fTlzDQo6BctKZQOTiVX3Y3uew==",
+      "dev": true,
+      "requires": {
+        "@angular-eslint/eslint-plugin": "12.0.0",
+        "@angular-eslint/eslint-plugin-template": "12.0.0",
+        "ignore": "5.1.8",
+        "strip-json-comments": "3.1.1",
+        "tmp": "0.2.1"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
+        "tmp": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+          "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+          "dev": true,
+          "requires": {
+            "rimraf": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@angular-eslint/template-parser": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-12.0.0.tgz",
+      "integrity": "sha512-gl5ansA2a8LY6TEjhe0k8NiQJJdEQPjjqpysO1Rpt3NWUYQkFMt+1+AnUyokHB1TU3/11dHRUjVWXj+pMtTIAA==",
+      "dev": true,
+      "requires": {
+        "eslint-scope": "^5.1.0"
+      }
+    },
     "@angular/animations": {
       "version": "12.0.1",
       "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-12.0.1.tgz",
@@ -3233,6 +3325,16 @@
         "regenerator-runtime": "^0.13.4"
       }
     },
+    "@babel/runtime-corejs3": {
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz",
+      "integrity": "sha512-0R0HTZWHLk6G8jIk0FtoX+AatCtKnswS98VhXwGImFc759PJRp4Tru0PQYZofyijTFUr+gT8Mu7sgXVJLQ0ceg==",
+      "dev": true,
+      "requires": {
+        "core-js-pure": "^3.0.0",
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
     "@babel/types": {
       "version": "7.9.5",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
@@ -3256,6 +3358,70 @@
       "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==",
       "dev": true
     },
+    "@eslint/eslintrc": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.1.tgz",
+      "integrity": "sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "globals": {
+          "version": "12.4.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+          "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.8.1"
+          }
+        },
+        "ignore": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "dev": true
+        },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
+        }
+      }
+    },
     "@firebase/analytics": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.6.0.tgz",
@@ -4137,6 +4303,159 @@
         }
       }
     },
+    "@typescript-eslint/eslint-plugin": {
+      "version": "4.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.23.0.tgz",
+      "integrity": "sha512-tGK1y3KIvdsQEEgq6xNn1DjiFJtl+wn8JJQiETtCbdQxw1vzjXyAaIkEmO2l6Nq24iy3uZBMFQjZ6ECf1QdgGw==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/experimental-utils": "4.23.0",
+        "@typescript-eslint/scope-manager": "4.23.0",
+        "debug": "^4.1.1",
+        "functional-red-black-tree": "^1.0.1",
+        "lodash": "^4.17.15",
+        "regexpp": "^3.0.0",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        },
+        "tsutils": {
+          "version": "3.21.0",
+          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+          "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.8.1"
+          }
+        }
+      }
+    },
+    "@typescript-eslint/experimental-utils": {
+      "version": "4.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.23.0.tgz",
+      "integrity": "sha512-WAFNiTDnQfrF3Z2fQ05nmCgPsO5o790vOhmWKXbbYQTO9erE1/YsFot5/LnOUizLzU2eeuz6+U/81KV5/hFTGA==",
+      "dev": true,
+      "requires": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.23.0",
+        "@typescript-eslint/types": "4.23.0",
+        "@typescript-eslint/typescript-estree": "4.23.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      }
+    },
+    "@typescript-eslint/parser": {
+      "version": "4.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.23.0.tgz",
+      "integrity": "sha512-wsvjksHBMOqySy/Pi2Q6UuIuHYbgAMwLczRl4YanEPKW5KVxI9ZzDYh3B5DtcZPQTGRWFJrfcbJ6L01Leybwug==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/scope-manager": "4.23.0",
+        "@typescript-eslint/types": "4.23.0",
+        "@typescript-eslint/typescript-estree": "4.23.0",
+        "debug": "^4.1.1"
+      }
+    },
+    "@typescript-eslint/scope-manager": {
+      "version": "4.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.23.0.tgz",
+      "integrity": "sha512-ZZ21PCFxPhI3n0wuqEJK9omkw51wi2bmeKJvlRZPH5YFkcawKOuRMQMnI8mH6Vo0/DoHSeZJnHiIx84LmVQY+w==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "4.23.0",
+        "@typescript-eslint/visitor-keys": "4.23.0"
+      }
+    },
+    "@typescript-eslint/types": {
+      "version": "4.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.23.0.tgz",
+      "integrity": "sha512-oqkNWyG2SLS7uTWLZf6Sr7Dm02gA5yxiz1RP87tvsmDsguVATdpVguHr4HoGOcFOpCvx9vtCSCyQUGfzq28YCw==",
+      "dev": true
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "4.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.23.0.tgz",
+      "integrity": "sha512-5Sty6zPEVZF5fbvrZczfmLCOcby3sfrSPu30qKoY1U3mca5/jvU5cwsPb/CO6Q3ByRjixTMIVsDkqwIxCf/dMw==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "4.23.0",
+        "@typescript-eslint/visitor-keys": "4.23.0",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        },
+        "tsutils": {
+          "version": "3.21.0",
+          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+          "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.8.1"
+          }
+        }
+      }
+    },
+    "@typescript-eslint/visitor-keys": {
+      "version": "4.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.23.0.tgz",
+      "integrity": "sha512-5PNe5cmX9pSifit0H+nPoQBXdbNzi5tOEec+3riK+ku4e3er37pKxMKDH5Ct5Y4fhWxcD4spnlYjxi9vXbSpwg==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "4.23.0",
+        "eslint-visitor-keys": "^2.0.0"
+      }
+    },
     "@webassemblyjs/ast": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz",
@@ -4348,6 +4667,12 @@
       "integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==",
       "dev": true
     },
+    "acorn-jsx": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
+      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+      "dev": true
+    },
     "adjust-sourcemap-loader": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
@@ -4526,12 +4851,6 @@
         "picomatch": "^2.0.4"
       }
     },
-    "app-root-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz",
-      "integrity": "sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==",
-      "dev": true
-    },
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
@@ -4603,16 +4922,6 @@
         "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",
@@ -4694,10 +5003,10 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": 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=",
+    "astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true
     },
     "async": {
@@ -4830,15 +5139,6 @@
         }
       }
     },
-    "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-loader": {
       "version": "8.2.2",
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
@@ -5306,12 +5606,6 @@
       "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
       "dev": true
     },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-      "dev": true
-    },
     "builtins": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
@@ -5707,66 +6001,6 @@
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
       "dev": true
     },
-    "codelyzer": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-6.0.2.tgz",
-      "integrity": "sha512-v3+E0Ucu2xWJMOJ2fA/q9pDT/hlxHftHGPUay1/1cTgyPV5JTHFdO9hqo837Sx2s9vKBMTt5gO+lhF95PO6J+g==",
-      "dev": true,
-      "requires": {
-        "@angular/compiler": "9.0.0",
-        "@angular/core": "9.0.0",
-        "app-root-path": "^3.0.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",
-        "rxjs": "^6.5.3",
-        "semver-dsl": "^1.0.1",
-        "source-map": "^0.5.7",
-        "sprintf-js": "^1.1.2",
-        "tslib": "^1.10.0",
-        "zone.js": "~0.10.3"
-      },
-      "dependencies": {
-        "@angular/compiler": {
-          "version": "9.0.0",
-          "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.0.0.tgz",
-          "integrity": "sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ==",
-          "dev": true
-        },
-        "@angular/core": {
-          "version": "9.0.0",
-          "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.0.0.tgz",
-          "integrity": "sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "sprintf-js": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-          "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-          "dev": true
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
-        },
-        "zone.js": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
-          "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==",
-          "dev": true
-        }
-      }
-    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -6138,6 +6372,12 @@
         }
       }
     },
+    "core-js-pure": {
+      "version": "3.12.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.12.1.tgz",
+      "integrity": "sha512-1cch+qads4JnDSWsvc7d6nzlKAippwjUlf6vykkTLW53VSV+NkE6muGBToAjEA8pG90cSfcud3JgVmW2ds5TaQ==",
+      "dev": true
+    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -6684,16 +6924,6 @@
         "nth-check": "^2.0.0"
       }
     },
-    "css-selector-tokenizer": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz",
-      "integrity": "sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==",
-      "dev": true,
-      "requires": {
-        "cssesc": "^3.0.0",
-        "fastparse": "^1.1.2"
-      }
-    },
     "css-tree": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
@@ -6718,15 +6948,6 @@
       "integrity": "sha512-teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A==",
       "dev": true
     },
-    "cssauron": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
-      "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=",
-      "dev": true,
-      "requires": {
-        "through": "X.X.X"
-      }
-    },
     "cssdb": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz",
@@ -6871,12 +7092,6 @@
         "type": "^1.0.1"
       }
     },
-    "damerau-levenshtein": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
-      "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
-      "dev": true
-    },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -7163,6 +7378,15 @@
         "buffer-indexof": "^1.0.0"
       }
     },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
     "docx": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/docx/-/docx-6.0.3.tgz",
@@ -7457,6 +7681,15 @@
         }
       }
     },
+    "enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^4.1.1"
+      }
+    },
     "ent": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
@@ -7582,6 +7815,265 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "dev": true
     },
+    "eslint": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.26.0.tgz",
+      "integrity": "sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.1",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash": "^4.17.21",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.4",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.12.11",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+          "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          },
+          "dependencies": {
+            "chalk": {
+              "version": "2.4.2",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+              }
+            }
+          }
+        },
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "4.3.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+              "dev": true,
+              "requires": {
+                "color-convert": "^2.0.1"
+              }
+            },
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "globals": {
+          "version": "13.8.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz",
+          "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "ignore": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "eslint-config-prettier": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
+      "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
+      "dev": true
+    },
+    "eslint-plugin-prettier": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz",
+      "integrity": "sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==",
+      "dev": true,
+      "requires": {
+        "prettier-linter-helpers": "^1.0.0"
+      }
+    },
     "eslint-scope": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -7592,12 +8084,77 @@
         "estraverse": "^4.1.1"
       }
     },
+    "eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true
+    },
+    "espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dev": true,
+      "requires": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "dev": true
+        },
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
+      }
+    },
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true
     },
+    "esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.1.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        }
+      }
+    },
     "esrecurse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -7973,6 +8530,12 @@
       "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
       "dev": true
     },
+    "fast-diff": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
+      "dev": true
+    },
     "fast-glob": {
       "version": "3.2.5",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
@@ -7993,6 +8556,12 @@
       "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
       "dev": true
     },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
     "fast-text-encoding": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.1.tgz",
@@ -8016,12 +8585,6 @@
         }
       }
     },
-    "fastparse": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
-      "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
-      "dev": true
-    },
     "fastq": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
@@ -8048,6 +8611,15 @@
         "escape-string-regexp": "^1.0.5"
       }
     },
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^3.0.4"
+      }
+    },
     "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@@ -8497,6 +9069,33 @@
         }
       }
     },
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "requires": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "dependencies": {
+        "flatted": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
+          "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
     "flatted": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
@@ -8622,6 +9221,12 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
     "fuzzy": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz",
@@ -10466,6 +11071,12 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -10943,6 +11554,16 @@
         "klona": "^2.0.4"
       }
     },
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      }
+    },
     "license-webpack-plugin": {
       "version": "2.3.17",
       "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.3.17.tgz",
@@ -11037,6 +11658,12 @@
       "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
       "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
     },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
     "lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
@@ -11153,6 +11780,12 @@
       "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=",
       "dev": true
     },
+    "lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "dev": true
+    },
     "lodash.union": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
@@ -11865,6 +12498,12 @@
         }
       }
     },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
     "needle": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz",
@@ -12419,6 +13058,20 @@
         }
       }
     },
+    "optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "requires": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      }
+    },
     "ora": {
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.0.tgz",
@@ -14509,12 +15162,33 @@
         "uniq": "^1.0.1"
       }
     },
+    "prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true
+    },
     "prepend-http": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
       "dev": true
     },
+    "prettier": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz",
+      "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==",
+      "dev": true
+    },
+    "prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "dev": true,
+      "requires": {
+        "fast-diff": "^1.1.2"
+      }
+    },
     "pretty-bytes": {
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
@@ -15164,6 +15838,12 @@
         "define-properties": "^1.1.3"
       }
     },
+    "regexpp": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
+      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+      "dev": true
+    },
     "registry-auth-token": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
@@ -15679,23 +16359,6 @@
         }
       }
     },
-    "semver-dsl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz",
-      "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=",
-      "dev": true,
-      "requires": {
-        "semver": "^5.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        }
-      }
-    },
     "send": {
       "version": "0.17.1",
       "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
@@ -15901,6 +16564,49 @@
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true
     },
+    "slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        }
+      }
+    },
     "smart-buffer": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
@@ -16867,6 +17573,78 @@
       "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==",
       "dev": true
     },
+    "table": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
+      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "dev": true,
+      "requires": {
+        "ajv": "^8.0.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "8.5.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz",
+          "integrity": "sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        }
+      }
+    },
     "tapable": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
@@ -17264,64 +18042,6 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
       "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
     },
-    "tslint": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz",
-      "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "builtin-modules": "^1.1.1",
-        "chalk": "^2.3.0",
-        "commander": "^2.12.1",
-        "diff": "^4.0.1",
-        "glob": "^7.1.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.3",
-        "resolve": "^1.3.2",
-        "semver": "^5.3.0",
-        "tslib": "^1.13.0",
-        "tsutils": "^2.29.0"
-      },
-      "dependencies": {
-        "diff": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-          "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
-        }
-      }
-    },
-    "tsutils": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.8.1"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
-        }
-      }
-    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -17343,6 +18063,15 @@
       "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
       "dev": true
     },
+    "type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1"
+      }
+    },
     "type-fest": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
@@ -17748,6 +18477,12 @@
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "dev": true
     },
+    "v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
     "valid-url": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
@@ -18454,6 +19189,12 @@
         }
       }
     },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
     "wrap-ansi": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
diff --git a/package.json b/package.json
index 619cadf..625e49c 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "scripts": {
     "start": "ng serve --aot",
     "build": "ng build",
-    "deploy": "ng build --prod && firebase deploy",
+    "deploy": "npm i && ng build --prod && firebase deploy",
     "test": "ng test",
     "lint": "ng lint --fix",
     "postinstall": "ngcc"
@@ -39,13 +39,22 @@
   "devDependencies": {
     "@angular-devkit/architect": "0.1200.1",
     "@angular-devkit/build-angular": "~12.0.1",
+    "@angular-eslint/builder": "12.0.0",
+    "@angular-eslint/eslint-plugin": "12.0.0",
+    "@angular-eslint/eslint-plugin-template": "12.0.0",
+    "@angular-eslint/schematics": "12.0.0",
+    "@angular-eslint/template-parser": "12.0.0",
     "@angular/cli": "~12.0.1",
     "@angular/compiler-cli": "~12.0.1",
     "@angular/language-service": "~12.0.1",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.12.36",
-    "codelyzer": "^6.0.0",
+    "@typescript-eslint/eslint-plugin": "4.23.0",
+    "@typescript-eslint/parser": "4.23.0",
+    "eslint": "^7.26.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^3.4.0",
     "firebase-tools": "^7.12.0",
     "fuzzy": "^0.1.3",
     "inquirer": "^6.2.2",
@@ -57,10 +66,10 @@
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
+    "prettier": "^2.3.0",
     "protractor": "~7.0.0",
     "swiper": "^6.6.2",
     "ts-node": "~7.0.0",
-    "tslint": "~6.1.0",
     "typescript": "~4.2.4"
   }
 }
diff --git a/src/app/animations.ts b/src/app/animations.ts
index 618905d..3b64ebd 100644
--- a/src/app/animations.ts
+++ b/src/app/animations.ts
@@ -3,23 +3,20 @@ import {animate, query, state, style, transition, trigger} from '@angular/animat
 export const fade = [
   // the fade-in/fade-out animation.
   trigger('fade', [
-
     // the "in" style determines the "resting" state of the element when it is visible.
     state('in', style({opacity: 1, transform: 'translateY(0px)'})),
 
     // fade in when created. this could also be written as transition('void => *')
-    transition(':enter', [
-      style({opacity: 0, transform: 'translateY(-10px)'}),
-      animate(200)
-    ]),
-  ])
+    transition(':enter', [style({opacity: 0, transform: 'translateY(-10px)'}), animate(200)]),
+  ]),
 ];
 
-export const fader =
-  trigger('fader', [
-    transition('* <=> *', [
-      // Set a default  style for enter and leave
-      query(':enter, :leave', [
+export const fader = trigger('fader', [
+  transition('* <=> *', [
+    // Set a default  style for enter and leave
+    query(
+      ':enter, :leave',
+      [
         style({
           position: 'absolute',
           left: 0,
@@ -27,10 +24,22 @@ export const fader =
           opacity: 0,
           transform: 'scale(1) translateY(-10px)',
         }),
-      ], {optional: true}),
-      // Animate the new page in
-      query(':enter', [
-        animate('200ms ease', style({opacity: 1, transform: 'scale(1) translateY(0)'})),
-      ], {optional: true}),
-    ]),
-  ]);
+      ],
+      {optional: true}
+    ),
+    // Animate the new page in
+    query(
+      ':enter',
+      [
+        animate(
+          '200ms ease',
+          style({
+            opacity: 1,
+            transform: 'scale(1) translateY(0)',
+          })
+        ),
+      ],
+      {optional: true}
+    ),
+  ]),
+]);
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index b267dcf..e73e6aa 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -7,7 +7,7 @@ const routes: Routes = [
   {
     path: '',
     redirectTo: 'songs',
-    pathMatch: 'full'
+    pathMatch: 'full',
   },
   {
     path: 'songs',
@@ -15,8 +15,8 @@ const routes: Routes = [
     canActivate: [AngularFireAuthGuard, RoleGuard],
     data: {
       authGuardPipe: () => redirectUnauthorizedTo(['user', 'login']),
-      requiredRoles: ['user']
-    }
+      requiredRoles: ['user'],
+    },
   },
   {
     path: 'shows',
@@ -24,8 +24,8 @@ const routes: Routes = [
     canActivate: [AngularFireAuthGuard, RoleGuard],
     data: {
       authGuardPipe: () => redirectUnauthorizedTo(['user', 'login']),
-      requiredRoles: ['leader']
-    }
+      requiredRoles: ['leader'],
+    },
   },
   {
     path: 'presentation',
@@ -33,12 +33,12 @@ const routes: Routes = [
     canActivate: [AngularFireAuthGuard, RoleGuard],
     data: {
       authGuardPipe: () => redirectUnauthorizedTo(['user', 'login']),
-      requiredRoles: ['presenter']
-    }
+      requiredRoles: ['presenter'],
+    },
   },
   {
     path: 'user',
-    loadChildren: () => import('./modules/user/user.module').then(m => m.UserModule)
+    loadChildren: () => import('./modules/user/user.module').then(m => m.UserModule),
   },
   {
     path: 'brand',
@@ -47,12 +47,16 @@ const routes: Routes = [
   {
     path: 'guest',
     loadChildren: () => import('./modules/guest/guest.module').then(m => m.GuestModule),
-  }
+  },
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules, relativeLinkResolution: 'legacy' })],
-  exports: [RouterModule]
+  imports: [
+    RouterModule.forRoot(routes, {
+      preloadingStrategy: PreloadAllModules,
+      relativeLinkResolution: 'legacy',
+    }),
+  ],
+  exports: [RouterModule],
 })
-export class AppRoutingModule {
-}
+export class AppRoutingModule {}
diff --git a/src/app/app.component.html b/src/app/app.component.html
index dae8e7c..9ea7490 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,6 +1,10 @@
 <app-navigation></app-navigation>
-<perfect-scrollbar #scrollbar (psScrollY)="onScoll($event)" [perfectScrollbar]
-                   class="scroll" style="max-height: calc(100vh); width: 100%; overflow: hidden;"
+<perfect-scrollbar
+  #scrollbar
+  (psScrollY)="onScoll($event)"
+  [perfectScrollbar]
+  class="scroll"
+  style="max-height: calc(100vh); width: 100%; overflow: hidden"
 >
   <div [@fader]="o.isActivated ? o.activatedRoute : ''" class="content">
     <router-outlet #o="outlet"></router-outlet>
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index bbd6193..18cbb95 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -3,20 +3,17 @@ import {RouterTestingModule} from '@angular/router/testing';
 import {AppComponent} from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        RouterTestingModule
-      ],
-      declarations: [
-        AppComponent
-      ],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        imports: [RouterTestingModule],
+        declarations: [AppComponent],
+      }).compileComponents();
+    })
+  );
 
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
+    void expect(fixture.debugElement.componentInstance).toBeTruthy();
   });
 });
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 5b8ca96..ff0513c 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -7,30 +7,24 @@ import {PerfectScrollbarComponent} from 'ngx-perfect-scrollbar';
   selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.less'],
-  animations: [fader]
+  animations: [fader],
 })
 export class AppComponent implements OnInit {
+  @ViewChild('scrollbar', {static: false}) public scrollbar: PerfectScrollbarComponent;
 
-  @ViewChild('scrollbar', {static: false}) scrollbar: PerfectScrollbarComponent;
-
-  constructor(private scrollService: ScrollService) {
+  public constructor(private scrollService: ScrollService) {
     scrollService.restoreScrollPosition$.subscribe(pos => {
-      if (this.scrollbar && pos) {
-        // this.scrollbar.scrollTo(pos, 0);
-        this.scrollbar.directiveRef.scrollTo(0, pos, 300);
-        // debugger;
-      }
+      if (this.scrollbar && pos) this.scrollbar.directiveRef.scrollTo(0, pos, 300);
     });
   }
 
-  public static hideLoader = () => document.querySelector('#load-bg').classList.add('hidden');
+  public static hideLoader: () => void = () => document.querySelector('#load-bg').classList.add('hidden');
 
   public ngOnInit(): void {
     setTimeout(() => AppComponent.hideLoader(), 800);
-
   }
 
-  onScoll($event: { srcElement: { scrollTop: number } }) {
+  public onScoll($event: {srcElement: {scrollTop: number}}): void {
     this.scrollService.saveScrollPosition($event.srcElement.scrollTop);
   }
 }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index d2bc0b2..78e0fdf 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -18,14 +18,14 @@ import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
 import {PerfectScrollbarModule} from 'ngx-perfect-scrollbar';
 
 @NgModule({
-  declarations: [
-    AppComponent
-  ],
+  declarations: [AppComponent],
   imports: [
     BrowserModule,
     BrowserAnimationsModule,
     AppRoutingModule,
-    ServiceWorkerModule.register('ngsw-worker.js', {enabled: environment.production}),
+    ServiceWorkerModule.register('ngsw-worker.js', {
+      enabled: environment.production,
+    }),
     BrowserAnimationsModule,
 
     ApplicationFrameModule,
@@ -38,13 +38,8 @@ import {PerfectScrollbarModule} from 'ngx-perfect-scrollbar';
     AngularFireAuthGuardModule,
     FontAwesomeModule,
     PerfectScrollbarModule,
-
-  ],
-  providers: [
-    {provide: MAT_DATE_LOCALE, useValue: 'de-DE'},
   ],
+  providers: [{provide: MAT_DATE_LOCALE, useValue: 'de-DE'}],
   bootstrap: [AppComponent],
-
 })
-export class AppModule {
-}
+export class AppModule {}
diff --git a/src/app/modules/brand/brand.component.spec.ts b/src/app/modules/brand/brand.component.spec.ts
index 25bc972..141adc0 100644
--- a/src/app/modules/brand/brand.component.spec.ts
+++ b/src/app/modules/brand/brand.component.spec.ts
@@ -6,12 +6,13 @@ describe('BrandComponent', () => {
   let component: BrandComponent;
   let fixture: ComponentFixture<BrandComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [BrandComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [BrandComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(BrandComponent);
@@ -20,6 +21,6 @@ describe('BrandComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/brand/brand.component.ts b/src/app/modules/brand/brand.component.ts
index c7f3e34..603d0b1 100644
--- a/src/app/modules/brand/brand.component.ts
+++ b/src/app/modules/brand/brand.component.ts
@@ -1,16 +1,8 @@
-import {Component, OnInit} from '@angular/core';
+import {Component} from '@angular/core';
 
 @Component({
   selector: 'app-brand',
   templateUrl: './brand.component.html',
-  styleUrls: ['./brand.component.less']
+  styleUrls: ['./brand.component.less'],
 })
-export class BrandComponent implements OnInit {
-
-  constructor() {
-  }
-
-  ngOnInit(): void {
-  }
-
-}
+export class BrandComponent {}
diff --git a/src/app/modules/brand/brand.module.ts b/src/app/modules/brand/brand.module.ts
index 4b9c96d..644f393 100644
--- a/src/app/modules/brand/brand.module.ts
+++ b/src/app/modules/brand/brand.module.ts
@@ -5,26 +5,20 @@ import {RouterModule, Routes} from '@angular/router';
 import {LogoModule} from '../../widget-modules/components/logo/logo.module';
 import {NewUserComponent} from './new-user/new-user.component';
 
-
 const routes: Routes = [
   {
     path: '',
     pathMatch: 'full',
-    component: BrandComponent
+    component: BrandComponent,
   },
   {
     path: 'new-user',
-    component: NewUserComponent
+    component: NewUserComponent,
   },
 ];
 
 @NgModule({
   declarations: [BrandComponent, NewUserComponent],
-  imports: [
-    CommonModule,
-    RouterModule.forChild(routes),
-    LogoModule
-  ]
+  imports: [CommonModule, RouterModule.forChild(routes), LogoModule],
 })
-export class BrandModule {
-}
+export class BrandModule {}
diff --git a/src/app/modules/brand/new-user/new-user.component.html b/src/app/modules/brand/new-user/new-user.component.html
index 1bd0913..842a330 100644
--- a/src/app/modules/brand/new-user/new-user.component.html
+++ b/src/app/modules/brand/new-user/new-user.component.html
@@ -1,8 +1,11 @@
 <div class="frame">
   <app-brand class="brand"></app-brand>
-  <div *ngIf="user$|async as user" class="text">
+  <div *ngIf="user$ | async as user" class="text">
     <div class="welcome">WILLKOMMEN</div>
-    <div class="name">{{user.name}}</div>
-    <div class="roles">Es wurden noch keine Berechtigungen zugeteilt, bitte wende Dich an den Administrator!</div>
+    <div class="name">{{ user.name }}</div>
+    <div class="roles">
+      Es wurden noch keine Berechtigungen zugeteilt, bitte wende Dich an den
+      Administrator!
+    </div>
   </div>
 </div>
diff --git a/src/app/modules/brand/new-user/new-user.component.spec.ts b/src/app/modules/brand/new-user/new-user.component.spec.ts
index 238a5ca..dfb17e4 100644
--- a/src/app/modules/brand/new-user/new-user.component.spec.ts
+++ b/src/app/modules/brand/new-user/new-user.component.spec.ts
@@ -6,12 +6,13 @@ describe('NewUserComponent', () => {
   let component: NewUserComponent;
   let fixture: ComponentFixture<NewUserComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [NewUserComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [NewUserComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(NewUserComponent);
@@ -20,6 +21,6 @@ describe('NewUserComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/brand/new-user/new-user.component.ts b/src/app/modules/brand/new-user/new-user.component.ts
index cef247a..39ceb1c 100644
--- a/src/app/modules/brand/new-user/new-user.component.ts
+++ b/src/app/modules/brand/new-user/new-user.component.ts
@@ -6,12 +6,12 @@ import {User} from '../../../services/user/user';
 @Component({
   selector: 'app-new-user',
   templateUrl: './new-user.component.html',
-  styleUrls: ['./new-user.component.less']
+  styleUrls: ['./new-user.component.less'],
 })
 export class NewUserComponent {
   public user$: Observable<User>;
 
-  constructor(private userService: UserService) {
+  public constructor(private userService: UserService) {
     this.user$ = userService.user$;
   }
 }
diff --git a/src/app/modules/guest/guest.component.html b/src/app/modules/guest/guest.component.html
index eef822d..246bb38 100644
--- a/src/app/modules/guest/guest.component.html
+++ b/src/app/modules/guest/guest.component.html
@@ -1,8 +1,11 @@
-<div *ngIf="songs$|async as songs" class="view">
+<div *ngIf="songs$ | async as songs" class="view">
   <swiper>
     <div *ngFor="let song of songs" class="song">
-      <app-song-text [showSwitch]="false" [text]="song|async"
-                     chordMode="hide"></app-song-text>
+      <app-song-text
+        [showSwitch]="false"
+        [text]="song | async"
+        chordMode="hide"
+      ></app-song-text>
     </div>
   </swiper>
 </div>
diff --git a/src/app/modules/guest/guest.component.spec.ts b/src/app/modules/guest/guest.component.spec.ts
index 190bd11..d2cdcb3 100644
--- a/src/app/modules/guest/guest.component.spec.ts
+++ b/src/app/modules/guest/guest.component.spec.ts
@@ -6,12 +6,13 @@ describe('GuestComponent', () => {
   let component: GuestComponent;
   let fixture: ComponentFixture<GuestComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [GuestComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [GuestComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(GuestComponent);
@@ -20,6 +21,6 @@ describe('GuestComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/guest/guest.component.ts b/src/app/modules/guest/guest.component.ts
index 1071d83..09ea42e 100644
--- a/src/app/modules/guest/guest.component.ts
+++ b/src/app/modules/guest/guest.component.ts
@@ -8,28 +8,18 @@ import {ShowSongService} from '../shows/services/show-song.service';
 @Component({
   selector: 'app-guest',
   templateUrl: './guest.component.html',
-  styleUrls: ['./guest.component.less']
+  styleUrls: ['./guest.component.less'],
 })
 export class GuestComponent implements OnInit {
   public songs$: Observable<Observable<string>[]>;
 
-
-  constructor(
-    private songService: SongService,
-    private globalSettingsService: GlobalSettingsService,
-    private showSongService: ShowSongService,
-  ) {
-  }
+  public constructor(private songService: SongService, private globalSettingsService: GlobalSettingsService, private showSongService: ShowSongService) {}
 
   public ngOnInit(): void {
     this.songs$ = this.globalSettingsService.get$.pipe(
       map(_ => _.currentShow),
       switchMap(_ => this.showSongService.list$(_)),
-      map(_ => _
-        .sort((x, y) => x.order - y.order)
-        .map(showSong => this.songService.read$(showSong.songId).pipe(map(song => song.text)))
-      )
+      map(_ => _.sort((x, y) => x.order - y.order).map(showSong => this.songService.read$(showSong.songId).pipe(map(song => song.text))))
     );
   }
-
 }
diff --git a/src/app/modules/guest/guest.module.ts b/src/app/modules/guest/guest.module.ts
index 8c72e14..6c75e79 100644
--- a/src/app/modules/guest/guest.module.ts
+++ b/src/app/modules/guest/guest.module.ts
@@ -13,23 +13,16 @@ const DEFAULT_SWIPER_CONFIG: SwiperConfigInterface = {
   scrollbar: false,
   navigation: true,
   pagination: false,
-
 };
 
 @NgModule({
   declarations: [GuestComponent],
-  imports: [
-    CommonModule,
-    RouterModule.forChild([{path: '', component: GuestComponent}]),
-    SwiperModule,
-    SongTextModule
-  ],
+  imports: [CommonModule, RouterModule.forChild([{path: '', component: GuestComponent}]), SwiperModule, SongTextModule],
   providers: [
     {
       provide: SWIPER_CONFIG,
-      useValue: DEFAULT_SWIPER_CONFIG
-    }
-  ]
+      useValue: DEFAULT_SWIPER_CONFIG,
+    },
+  ],
 })
-export class GuestModule {
-}
+export class GuestModule {}
diff --git a/src/app/modules/presentation/monitor/legal/legal.component.html b/src/app/modules/presentation/monitor/legal/legal.component.html
index 0294809..7e6073f 100644
--- a/src/app/modules/presentation/monitor/legal/legal.component.html
+++ b/src/app/modules/presentation/monitor/legal/legal.component.html
@@ -1,10 +1,12 @@
-<p *ngIf="song.artist">{{song.artist}}</p>
-<p *ngIf="song.label">{{song.label}}</p>
-<p *ngIf="song.termsOfUse" class="terms-of-use">{{song.termsOfUse}}</p>
-<p *ngIf="song.origin">{{song.origin}}</p>
+<p *ngIf="song.artist">{{ song.artist }}</p>
+<p *ngIf="song.label">{{ song.label }}</p>
+<p *ngIf="song.termsOfUse" class="terms-of-use">{{ song.termsOfUse }}</p>
+<p *ngIf="song.origin">{{ song.origin }}</p>
 
 <div *ngIf="song.legalOwnerId">
-  <p *ngIf="song.legalOwner==='CCLI' && config">CCLI-Liednummer {{song.legalOwnerId}},
-    CCLI-Lizenznummer {{config.ccliLicenseId}}</p>
-  <p *ngIf="song.legalOwner!=='CCLI'">Liednummer {{song.legalOwnerId}}</p>
+  <p *ngIf="song.legalOwner === 'CCLI' && config">
+    CCLI-Liednummer {{ song.legalOwnerId }}, CCLI-Lizenznummer
+    {{ config.ccliLicenseId }}
+  </p>
+  <p *ngIf="song.legalOwner !== 'CCLI'">Liednummer {{ song.legalOwnerId }}</p>
 </div>
diff --git a/src/app/modules/presentation/monitor/legal/legal.component.spec.ts b/src/app/modules/presentation/monitor/legal/legal.component.spec.ts
index de9a9b6..28d35dc 100644
--- a/src/app/modules/presentation/monitor/legal/legal.component.spec.ts
+++ b/src/app/modules/presentation/monitor/legal/legal.component.spec.ts
@@ -6,12 +6,13 @@ describe('LegalComponent', () => {
   let component: LegalComponent;
   let fixture: ComponentFixture<LegalComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [LegalComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [LegalComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(LegalComponent);
@@ -20,6 +21,6 @@ describe('LegalComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/presentation/monitor/legal/legal.component.ts b/src/app/modules/presentation/monitor/legal/legal.component.ts
index dfe4687..18cb8ec 100644
--- a/src/app/modules/presentation/monitor/legal/legal.component.ts
+++ b/src/app/modules/presentation/monitor/legal/legal.component.ts
@@ -5,7 +5,7 @@ import {Config} from '../../../../services/config';
 @Component({
   selector: 'app-legal',
   templateUrl: './legal.component.html',
-  styleUrls: ['./legal.component.less']
+  styleUrls: ['./legal.component.less'],
 })
 export class LegalComponent {
   @Input() public song: Song;
diff --git a/src/app/modules/presentation/monitor/logo/logo.component.html b/src/app/modules/presentation/monitor/logo/logo.component.html
index 9e61870..c525e69 100644
--- a/src/app/modules/presentation/monitor/logo/logo.component.html
+++ b/src/app/modules/presentation/monitor/logo/logo.component.html
@@ -1,18 +1,23 @@
 <svg
   height="1024"
   id="svg8"
-
-  version="1.1"
   viewBox="0 0 270.93333 270.93334"
   width="1024"
   xmlns="http://www.w3.org/2000/svg"
 >
-  <g
-    id="layer1">
+  <g id="layer1">
     <path
       d="M 511.29688 0.75390625 A 511.24675 511.24675 0 0 0 419.16406 9.2539062 L 419.16406 49.929688 L 419.16406 73.990234 L 419.16406 81.289062 L 419.16406 96.902344 L 419.16406 103.85352 L 419.16406 119.875 L 419.16406 126.48047 L 419.16406 142.91602 L 419.16406 149.17578 L 419.16406 166.04883 L 419.16406 171.96289 L 419.16406 189.2832 L 419.16406 194.85742 L 419.16406 212.64648 L 419.16406 217.88281 L 419.16406 236.17383 L 419.16406 241.07422 L 419.16406 259.90625 L 419.16406 264.47656 L 419.16406 274.64258 L 395.60352 274.64258 L 386.17578 274.64258 L 351.74805 274.64258 L 343.59375 274.64258 L 315.06055 274.64258 L 307.32422 274.64258 L 282.08789 274.64258 L 274.45898 274.64258 L 251.41406 274.64258 L 243.74219 274.64258 L 222.30859 274.64258 L 214.50586 274.64258 L 194.3418 274.64258 L 186.35742 274.64258 L 167.23242 274.64258 L 159.03125 274.64258 L 158.44727 274.64258 L 158.44727 275.51367 L 158.44727 287.93945 L 158.44727 318.6543 L 158.44727 332.43164 L 158.44727 371.13867 L 158.44727 388.47461 L 158.44727 454.54297 L 158.44727 460.3125 L 163.33008 460.3125 L 180.19727 460.3125 L 185.61523 460.3125 L 202.87305 460.3125 L 207.93945 460.3125 L 225.5957 460.3125 L 230.3125 460.3125 L 248.375 460.3125 L 252.74023 460.3125 L 271.22852 460.3125 L 275.24414 460.3125 L 294.17773 460.3125 L 297.84961 460.3125 L 317.26172 460.3125 L 320.58398 460.3125 L 355.35156 460.3125 L 419.16406 460.3125 L 419.16406 648.35352 L 419.16406 687.19336 L 419.16406 690.81836 L 419.16406 711.78516 L 419.16406 715.71289 L 419.16406 735.8418 L 419.16406 740.08984 L 419.16406 759.52344 L 419.16406 764.09375 L 419.16406 782.92578 L 419.16406 787.82617 L 419.16406 806.11914 L 419.16406 811.35156 L 419.16406 829.14258 L 419.16406 834.7168 L 419.16406 852.0332 L 419.16406 857.95117 L 419.16406 874.82227 L 419.16406 881.08203 L 419.16406 897.52148 L 419.16406 904.12695 L 419.16406 920.14648 L 419.16406 927.09766 L 419.16406 942.70898 L 419.16406 950.00977 L 419.16406 974.07227 L 419.16406 1014.7441 A 511.24675 511.24675 0 0 0 512 1023.2461 A 511.24675 511.24675 0 0 0 604.83594 1014.7461 L 604.83594 974.07227 L 604.83594 950.00977 L 604.83594 942.71094 L 604.83594 927.09961 L 604.83594 920.14648 L 604.83594 904.125 L 604.83594 897.51953 L 604.83594 881.08203 L 604.83594 874.82422 L 604.83594 857.95312 L 604.83594 852.03516 L 604.83594 834.7168 L 604.83594 829.14258 L 604.83594 811.35352 L 604.83594 806.11719 L 604.83594 787.82617 L 604.83594 782.92578 L 604.83594 764.09375 L 604.83594 759.52344 L 604.83594 740.08789 L 604.83594 735.8418 L 604.83594 715.71289 L 604.83594 711.7832 L 604.83594 690.81836 L 604.83594 687.19531 L 604.83594 648.35156 L 604.83594 460.3125 L 668.65039 460.3125 L 703.41602 460.3125 L 706.73828 460.3125 L 726.15039 460.3125 L 729.82031 460.3125 L 748.75391 460.3125 L 752.77148 460.3125 L 771.25781 460.3125 L 775.62305 460.3125 L 793.68555 460.3125 L 798.4043 460.3125 L 816.05859 460.3125 L 821.12695 460.3125 L 838.38281 460.3125 L 843.80273 460.3125 L 860.66992 460.3125 L 865.55273 460.3125 L 865.55273 454.54688 L 865.55273 388.47266 L 865.55273 371.14062 L 865.55273 332.43164 L 865.55273 318.6543 L 865.55273 287.93945 L 865.55273 275.51562 L 865.55273 274.64258 L 864.9668 274.64258 L 856.76562 274.64258 L 837.64258 274.64258 L 829.6582 274.64258 L 809.49219 274.64258 L 801.68945 274.64258 L 780.25586 274.64258 L 772.58203 274.64258 L 749.54297 274.64258 L 741.91211 274.64258 L 716.67383 274.64258 L 708.94141 274.64258 L 680.40234 274.64258 L 672.25195 274.64258 L 637.82422 274.64258 L 628.39648 274.64258 L 604.83594 274.64258 L 604.83594 264.47656 L 604.83594 259.90625 L 604.83594 241.07422 L 604.83594 236.17383 L 604.83594 217.88086 L 604.83594 212.64844 L 604.83594 194.85742 L 604.83594 189.2832 L 604.83594 171.9668 L 604.83594 166.04883 L 604.83594 149.17773 L 604.83594 142.91797 L 604.83594 126.47852 L 604.83594 119.87305 L 604.83594 103.85352 L 604.83594 96.902344 L 604.83594 81.291016 L 604.83594 73.990234 L 604.83594 49.929688 L 604.83594 9.2558594 A 511.24675 511.24675 0 0 0 512 0.75390625 A 511.24675 511.24675 0 0 0 511.29688 0.75390625 z M 386.52148 16.392578 A 511.24675 511.24675 0 0 0 0.75390625 512 A 511.24675 511.24675 0 0 0 386.52148 1007.6074 L 386.52148 966.29492 A 471.30561 471.30561 0 0 1 40.695312 512 A 471.30561 471.30561 0 0 1 386.52148 57.707031 L 386.52148 16.392578 z M 637.47852 16.392578 L 637.47852 57.707031 A 471.30561 471.30561 0 0 1 983.30664 512 A 471.30561 471.30561 0 0 1 637.47852 966.29688 L 637.47852 1007.6074 A 511.24675 511.24675 0 0 0 1023.2461 512 A 511.24675 511.24675 0 0 0 637.47852 16.392578 z M 386.52148 82.203125 A 447.74037 447.74037 0 0 0 154.56445 242.35156 L 163.54688 242.35156 A 440.60061 440.60061 0 0 1 386.52148 89.644531 L 386.52148 82.203125 z M 637.47852 82.203125 L 637.47852 89.646484 A 440.60061 440.60061 0 0 1 860.45117 242.35156 L 869.43555 242.35156 A 447.74037 447.74037 0 0 0 637.47852 82.203125 z M 386.52148 105.57812 A 425.35335 425.35335 0 0 0 183.03906 242.35156 L 191.85547 242.35156 A 418.57057 418.57057 0 0 1 386.52148 112.67969 L 386.52148 105.57812 z M 637.47852 105.57812 L 637.47852 112.67969 A 418.57057 418.57057 0 0 1 832.14258 242.35156 L 840.95898 242.35156 A 425.35335 425.35335 0 0 0 637.47852 105.57812 z M 637.47852 129.06836 L 637.47852 135.83594 A 396.54052 396.54052 0 0 1 802.74805 242.35156 L 811.45117 242.35156 A 402.96629 402.96629 0 0 0 637.47852 129.06836 z M 386.52148 129.07031 A 402.96629 402.96629 0 0 0 212.55078 242.35156 L 221.25195 242.35156 A 396.54052 396.54052 0 0 1 386.52148 135.83594 L 386.52148 129.07031 z M 386.52148 152.69922 A 380.57927 380.57927 0 0 0 243.42969 242.35156 L 252.0957 242.35156 A 374.51048 374.51048 0 0 1 386.52148 159.13477 L 386.52148 152.69922 z M 637.47852 152.70312 L 637.47852 159.13477 A 374.51048 374.51048 0 0 1 771.90039 242.35156 L 780.56836 242.35156 A 380.57927 380.57927 0 0 0 637.47852 152.70312 z M 386.52148 176.50781 A 358.19224 358.19224 0 0 0 276.22461 242.35156 L 284.99219 242.35156 A 352.48043 352.48043 0 0 1 386.52148 182.60938 L 386.52148 176.50781 z M 637.47852 176.50781 L 637.47852 182.61328 A 352.48043 352.48043 0 0 1 739.00391 242.35156 L 747.77344 242.35156 A 358.19224 358.19224 0 0 0 637.47852 176.50781 z M 637.47852 200.51953 L 637.47852 206.30078 A 330.45039 330.45039 0 0 1 703.01758 242.35156 L 712.13672 242.35156 A 335.80521 335.80521 0 0 0 637.47852 200.51953 z M 386.52148 200.52148 A 335.80521 335.80521 0 0 0 311.86719 242.35156 L 320.98438 242.35156 A 330.45039 330.45039 0 0 1 386.52148 206.29883 L 386.52148 200.52148 z M 386.52148 224.79688 A 313.41818 313.41818 0 0 0 352.25 242.35156 L 362.29102 242.35156 A 308.42035 308.42035 0 0 1 386.52148 230.25781 L 386.52148 224.79688 z M 637.47852 224.79883 L 637.47852 230.25586 A 308.42035 308.42035 0 0 1 661.71484 242.35156 L 671.74609 242.35156 A 313.41818 313.41818 0 0 0 637.47852 224.79883 z M 129.07422 279.96875 A 447.74037 447.74037 0 0 0 64.259766 512 A 447.74037 447.74037 0 0 0 386.52148 941.79688 L 386.52148 934.35352 A 440.60061 440.60061 0 0 1 71.398438 512 A 440.60061 440.60061 0 0 1 129.07422 294.0625 L 129.07422 279.96875 z M 894.92578 279.96875 L 894.92578 294.0625 A 440.60061 440.60061 0 0 1 952.60156 512 A 440.60061 440.60061 0 0 1 637.47852 934.35547 L 637.47852 941.79688 A 447.74037 447.74037 0 0 0 959.74023 512 A 447.74037 447.74037 0 0 0 894.92578 279.96875 z M 129.07422 326.81445 A 425.35335 425.35335 0 0 0 86.646484 512 A 425.35335 425.35335 0 0 0 386.52148 918.42383 L 386.52148 911.32031 A 418.57057 418.57057 0 0 1 93.427734 512 A 418.57057 418.57057 0 0 1 129.07422 342.97266 L 129.07422 326.81445 z M 894.92578 326.82031 L 894.92578 342.9707 A 418.57057 418.57057 0 0 1 930.57227 512 A 418.57057 418.57057 0 0 1 637.47852 911.32031 L 637.47852 918.42383 A 425.35335 425.35335 0 0 0 937.35352 512 A 425.35335 425.35335 0 0 0 894.92578 326.82031 z M 129.07422 386.50195 A 402.96629 402.96629 0 0 0 109.0332 512 A 402.96629 402.96629 0 0 0 386.52148 894.93164 L 386.52148 888.16406 A 396.54052 396.54052 0 0 1 115.45898 512 A 396.54052 396.54052 0 0 1 129.07422 408.98828 L 129.07422 386.50195 z M 894.92578 386.50586 L 894.92578 408.98438 A 396.54052 396.54052 0 0 1 908.54102 512 A 396.54052 396.54052 0 0 1 637.47852 888.16211 L 637.47852 894.92969 A 402.96629 402.96629 0 0 0 914.9668 512 A 402.96629 402.96629 0 0 0 894.92578 386.50586 z M 131.91406 492.60547 A 380.57927 380.57927 0 0 0 131.41992 512 A 380.57927 380.57927 0 0 0 386.52148 871.29688 L 386.52148 864.86523 A 374.51048 374.51048 0 0 1 137.48828 512 A 374.51048 374.51048 0 0 1 137.99219 492.60547 L 131.91406 492.60547 z M 154.33398 492.60547 A 358.19224 358.19224 0 0 0 153.80859 512 A 358.19224 358.19224 0 0 0 386.52148 847.49219 L 386.52148 841.38672 A 352.48043 352.48043 0 0 1 159.51953 512 A 352.48043 352.48043 0 0 1 160.05469 492.60547 L 154.33398 492.60547 z M 176.75586 492.60547 A 335.80521 335.80521 0 0 0 176.19531 512 A 335.80521 335.80521 0 0 0 386.52148 823.47852 L 386.52148 817.69922 A 330.45039 330.45039 0 0 1 181.54883 512 A 330.45039 330.45039 0 0 1 182.11914 492.60547 L 176.75586 492.60547 z M 199.18359 492.60547 A 313.41818 313.41818 0 0 0 198.58203 512 A 313.41818 313.41818 0 0 0 386.52148 799.20312 L 386.52148 793.74414 A 308.42035 308.42035 0 0 1 203.57812 512 A 308.42035 308.42035 0 0 1 204.18945 492.60547 L 199.18359 492.60547 z M 221.61523 492.60547 A 291.03115 291.03115 0 0 0 220.96875 512 A 291.03115 291.03115 0 0 0 386.52148 774.58984 L 386.52148 769.4375 A 286.39031 286.39031 0 0 1 225.60938 512 A 286.39031 286.39031 0 0 1 226.26758 492.60547 L 221.61523 492.60547 z M 244.05859 492.60547 A 268.64412 268.64412 0 0 0 243.35547 512 A 268.64412 268.64412 0 0 0 386.52148 749.53906 L 386.52148 744.68359 A 264.36038 264.36038 0 0 1 247.63867 512 A 264.36038 264.36038 0 0 1 248.35156 492.60547 L 244.05859 492.60547 z M 266.50781 492.60547 A 246.25722 246.25722 0 0 0 265.74219 512 A 246.25722 246.25722 0 0 0 386.52148 723.89258 L 386.52148 719.31445 A 242.33035 242.33035 0 0 1 269.66797 512 A 242.33035 242.33035 0 0 1 270.44531 492.60547 L 266.50781 492.60547 z M 288.9707 492.60547 A 223.8702 223.8702 0 0 0 288.12891 512 A 223.8702 223.8702 0 0 0 386.52148 697.39844 L 386.52148 693.07227 A 220.30032 220.30032 0 0 1 291.69922 512 A 220.30032 220.30032 0 0 1 292.55469 492.60547 L 288.9707 492.60547 z M 311.45312 492.60547 A 201.48318 201.48318 0 0 0 310.51758 512 A 201.48318 201.48318 0 0 0 386.52148 669.63672 L 386.52148 665.51367 A 198.27029 198.27029 0 0 1 313.72852 512 A 198.27029 198.27029 0 0 1 314.67969 492.60547 L 311.45312 492.60547 z M 348.1875 492.60547 A 164.95698 164.95698 0 0 0 347.04297 512 A 164.95698 164.95698 0 0 0 386.52148 619.08008 L 386.52148 492.60547 L 348.1875 492.60547 z M 637.47852 492.60547 L 637.47852 619.07617 A 164.95698 164.95698 0 0 0 676.95703 512 A 164.95698 164.95698 0 0 0 675.8125 492.60547 L 637.47852 492.60547 z M 709.32031 492.60547 A 198.27029 198.27029 0 0 1 710.27148 512 A 198.27029 198.27029 0 0 1 637.47852 665.51367 L 637.47852 669.63672 A 201.48318 201.48318 0 0 0 713.48242 512 A 201.48318 201.48318 0 0 0 712.54688 492.60547 L 709.32031 492.60547 z M 731.44336 492.60547 A 220.30032 220.30032 0 0 1 732.30078 512 A 220.30032 220.30032 0 0 1 637.47852 693.07031 L 637.47852 697.39844 A 223.8702 223.8702 0 0 0 735.86914 512 A 223.8702 223.8702 0 0 0 735.02734 492.60547 L 731.44336 492.60547 z M 753.55273 492.60547 A 242.33035 242.33035 0 0 1 754.33008 512 A 242.33035 242.33035 0 0 1 637.47852 719.3125 L 637.47852 723.89062 A 246.25722 246.25722 0 0 0 758.25781 512 A 246.25722 246.25722 0 0 0 757.49219 492.60547 L 753.55273 492.60547 z M 775.64844 492.60547 A 264.36038 264.36038 0 0 1 776.36133 512 A 264.36038 264.36038 0 0 1 637.47852 744.68359 L 637.47852 749.53906 A 268.64412 268.64412 0 0 0 780.64453 512 A 268.64412 268.64412 0 0 0 779.94336 492.60547 L 775.64844 492.60547 z M 797.73242 492.60547 A 286.39031 286.39031 0 0 1 798.39062 512 A 286.39031 286.39031 0 0 1 637.47852 769.4375 L 637.47852 774.58984 A 291.03115 291.03115 0 0 0 803.03125 512 A 291.03115 291.03115 0 0 0 802.38281 492.60547 L 797.73242 492.60547 z M 819.81055 492.60547 A 308.42035 308.42035 0 0 1 820.42188 512 A 308.42035 308.42035 0 0 1 637.47852 793.74219 L 637.47852 799.20312 A 313.41818 313.41818 0 0 0 825.41797 512 A 313.41818 313.41818 0 0 0 824.81641 492.60547 L 819.81055 492.60547 z M 841.88086 492.60547 A 330.45039 330.45039 0 0 1 842.45117 512 A 330.45039 330.45039 0 0 1 637.47852 817.69922 L 637.47852 823.47852 A 335.80521 335.80521 0 0 0 847.80469 512 A 335.80521 335.80521 0 0 0 847.24219 492.60547 L 841.88086 492.60547 z M 863.94531 492.60547 A 352.48043 352.48043 0 0 1 864.48047 512 A 352.48043 352.48043 0 0 1 637.47852 841.38867 L 637.47852 847.49414 A 358.19224 358.19224 0 0 0 870.19141 512 A 358.19224 358.19224 0 0 0 869.66406 492.60547 L 863.94531 492.60547 z M 886.00977 492.60547 A 374.51048 374.51048 0 0 1 886.51172 512 A 374.51048 374.51048 0 0 1 637.47852 864.86719 L 637.47852 871.29883 A 380.57927 380.57927 0 0 0 892.58008 512 A 380.57927 380.57927 0 0 0 892.08398 492.60547 L 886.00977 492.60547 z "
       id="path851"
-      style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-      transform="scale(0.26458333)"/>
+      style="
+        fill: #ffffff;
+        fill-opacity: 1;
+        stroke: none;
+        stroke-width: 1;
+        stroke-miterlimit: 4;
+        stroke-dasharray: none;
+      "
+      transform="scale(0.26458333)"
+    />
   </g>
 </svg>
diff --git a/src/app/modules/presentation/monitor/logo/logo.component.spec.ts b/src/app/modules/presentation/monitor/logo/logo.component.spec.ts
index 9d60ac5..8d51724 100644
--- a/src/app/modules/presentation/monitor/logo/logo.component.spec.ts
+++ b/src/app/modules/presentation/monitor/logo/logo.component.spec.ts
@@ -6,12 +6,13 @@ describe('LogoComponent', () => {
   let component: LogoComponent;
   let fixture: ComponentFixture<LogoComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [LogoComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [LogoComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(LogoComponent);
@@ -20,6 +21,6 @@ describe('LogoComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/presentation/monitor/logo/logo.component.ts b/src/app/modules/presentation/monitor/logo/logo.component.ts
index 3ba3256..e96f1f2 100644
--- a/src/app/modules/presentation/monitor/logo/logo.component.ts
+++ b/src/app/modules/presentation/monitor/logo/logo.component.ts
@@ -1,16 +1,8 @@
-import {Component, OnInit} from '@angular/core';
+import {Component} from '@angular/core';
 
 @Component({
   selector: 'app-logo',
   templateUrl: './logo.component.html',
-  styleUrls: ['./logo.component.less']
+  styleUrls: ['./logo.component.less'],
 })
-export class LogoComponent implements OnInit {
-
-  constructor() {
-  }
-
-  ngOnInit(): void {
-  }
-
-}
+export class LogoComponent {}
diff --git a/src/app/modules/presentation/monitor/monitor.component.html b/src/app/modules/presentation/monitor/monitor.component.html
index 9592c50..f917fb2 100644
--- a/src/app/modules/presentation/monitor/monitor.component.html
+++ b/src/app/modules/presentation/monitor/monitor.component.html
@@ -1,20 +1,31 @@
 <div *ngIf="song" [style.font-size.px]="zoom" class="fullscreen background">
-
-
-  <div @songSwitch [class.blur]="songId==='title'" [class.hide]="songId!=='title' && songId!=='empty'"
-       class="start fullscreen logo">
+  <div
+    @songSwitch
+    [class.blur]="songId === 'title'"
+    [class.hide]="songId !== 'title' && songId !== 'empty'"
+    class="start fullscreen logo"
+  >
     <app-logo></app-logo>
   </div>
 
-  <div *ngIf="songId==='title'" @songSwitch class="start fullscreen">
-    <div>{{showType|showType}}</div>
-    <div class="date">{{date|date:'dd.MM.yyyy'}}</div>
+  <div *ngIf="songId === 'title'" @songSwitch class="start fullscreen">
+    <div>{{ showType | showType }}</div>
+    <div class="date">{{ date | date: "dd.MM.yyyy" }}</div>
   </div>
 
-  <app-song-text *ngIf="songId!=='title' && songId!=='empty'" @songSwitch [fullscreen]="true" [index]="index"
-                 [showSwitch]="false" [text]="song.text"
-                 chordMode="hide"></app-song-text>
-  <app-legal *ngIf="songId!=='title' && songId!=='empty'" @songSwitch [config]="config$|async"
-             [song]="song"></app-legal>
-
+  <app-song-text
+    *ngIf="songId !== 'title' && songId !== 'empty'"
+    @songSwitch
+    [fullscreen]="true"
+    [index]="index"
+    [showSwitch]="false"
+    [text]="song.text"
+    chordMode="hide"
+  ></app-song-text>
+  <app-legal
+    *ngIf="songId !== 'title' && songId !== 'empty'"
+    @songSwitch
+    [config]="config$ | async"
+    [song]="song"
+  ></app-legal>
 </div>
diff --git a/src/app/modules/presentation/monitor/monitor.component.spec.ts b/src/app/modules/presentation/monitor/monitor.component.spec.ts
index a70c9db..c2b3232 100644
--- a/src/app/modules/presentation/monitor/monitor.component.spec.ts
+++ b/src/app/modules/presentation/monitor/monitor.component.spec.ts
@@ -6,12 +6,13 @@ describe('MonitorComponent', () => {
   let component: MonitorComponent;
   let fixture: ComponentFixture<MonitorComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [MonitorComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [MonitorComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(MonitorComponent);
@@ -20,6 +21,6 @@ describe('MonitorComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/presentation/monitor/monitor.component.ts b/src/app/modules/presentation/monitor/monitor.component.ts
index e017d85..bfa7219 100644
--- a/src/app/modules/presentation/monitor/monitor.component.ts
+++ b/src/app/modules/presentation/monitor/monitor.component.ts
@@ -8,14 +8,14 @@ import {Config} from '../../../services/config';
 import {Observable} from 'rxjs';
 import {ConfigService} from '../../../services/config.service';
 import {songSwitch} from '../../../widget-modules/components/song-text/animation';
-import {Section} from '../../songs/services/section';
 import {TextRenderingService} from '../../songs/services/text-rendering.service';
+import {Show} from '../../shows/services/show';
 
 @Component({
   selector: 'app-monitor',
   templateUrl: './monitor.component.html',
   styleUrls: ['./monitor.component.less'],
-  animations: [songSwitch]
+  animations: [songSwitch],
 })
 export class MonitorComponent implements OnInit {
   public song: Song;
@@ -25,35 +25,37 @@ export class MonitorComponent implements OnInit {
   public index: number;
   public showType: string;
   public date: Date;
-  private sections: Section[];
   public config$: Observable<Config>;
 
-  constructor(
+  // private sections: Section[];
+
+  public constructor(
     private showService: ShowService,
     private songService: SongService,
     private textRenderingService: TextRenderingService,
     private globalSettingsService: GlobalSettingsService,
-    private configService: ConfigService,
+    private configService: ConfigService
   ) {
     this.config$ = configService.get$;
   }
 
-  ngOnInit(): void {
-    this.globalSettingsService.get$.pipe(
-      map(_ => _.currentShow),
-      distinctUntilChanged(),
-      tap(_ => this.currentShowId = _),
-      switchMap(_ => this.showService.read$(_)),
-      tap(_ => this.showType = _.showType),
-      tap(_ => this.date = _.date.toDate()),
-      tap(_ => this.songId = _.presentationSongId),
-      tap(_ => this.index = _.presentationSection),
-      tap(_ => this.zoom = _.presentationZoom ?? 30),
-      switchMap(_ => this.songService.read$(_.presentationSongId))
-    ).subscribe((_: Song) => {
-      this.song = _;
-      this.sections = this.textRenderingService.parse(_.text, null);
-    });
+  public ngOnInit(): void {
+    this.globalSettingsService.get$
+      .pipe(
+        map(_ => _.currentShow),
+        distinctUntilChanged(),
+        tap(_ => (this.currentShowId = _)),
+        switchMap(_ => this.showService.read$(_)),
+        tap(_ => (this.showType = _.showType)),
+        tap(_ => (this.date = _.date.toDate())),
+        tap(_ => (this.songId = _.presentationSongId)),
+        tap(_ => (this.index = _.presentationSection)),
+        tap(_ => (this.zoom = _.presentationZoom ?? 30)),
+        switchMap((_: Show) => this.songService.read$(_.presentationSongId))
+      )
+      .subscribe((_: Song) => {
+        this.song = _;
+        // this.sections = this.textRenderingService.parse(_.text, null);
+      });
   }
-
 }
diff --git a/src/app/modules/presentation/presentation-routing.module.ts b/src/app/modules/presentation/presentation-routing.module.ts
index 2db193e..fe096c7 100644
--- a/src/app/modules/presentation/presentation-routing.module.ts
+++ b/src/app/modules/presentation/presentation-routing.module.ts
@@ -3,26 +3,24 @@ import {RouterModule, Routes} from '@angular/router';
 import {RemoteComponent} from './remote/remote.component';
 import {MonitorComponent} from './monitor/monitor.component';
 
-
 const routes: Routes = [
   {
     path: '',
     pathMatch: 'full',
-    redirectTo: 'remote'
+    redirectTo: 'remote',
   },
   {
     path: 'remote',
-    component: RemoteComponent
+    component: RemoteComponent,
   },
   {
     path: 'monitor',
-    component: MonitorComponent
-  }
+    component: MonitorComponent,
+  },
 ];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
-export class PresentationRoutingModule {
-}
+export class PresentationRoutingModule {}
diff --git a/src/app/modules/presentation/presentation.module.ts b/src/app/modules/presentation/presentation.module.ts
index 2b95080..56c9bdd 100644
--- a/src/app/modules/presentation/presentation.module.ts
+++ b/src/app/modules/presentation/presentation.module.ts
@@ -18,12 +18,9 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {AddSongModule} from '../../widget-modules/components/add-song/add-song.module';
 import {LogoComponent} from './monitor/logo/logo.component';
 
-
 @NgModule({
   declarations: [MonitorComponent, RemoteComponent, LegalComponent, LogoComponent],
-  exports: [
-    RemoteComponent
-  ],
+  exports: [RemoteComponent],
   imports: [
     CommonModule,
     PresentationRoutingModule,
@@ -38,8 +35,7 @@ import {LogoComponent} from './monitor/logo/logo.component';
     MatSliderModule,
     FormsModule,
     AddSongModule,
-    ReactiveFormsModule
-  ]
+    ReactiveFormsModule,
+  ],
 })
-export class PresentationModule {
-}
+export class PresentationModule {}
diff --git a/src/app/modules/presentation/remote/remote.component.html b/src/app/modules/presentation/remote/remote.component.html
index 8b2a797..195257e 100644
--- a/src/app/modules/presentation/remote/remote.component.html
+++ b/src/app/modules/presentation/remote/remote.component.html
@@ -1,41 +1,60 @@
-<div *ngIf="shows$|async as shows">
+<div *ngIf="shows$ | async as shows">
   <app-card>
+    <p *ngIf="!shows.length" @fade>
+      Es ist derzeit keine Veranstaltung vorhanden
+    </p>
 
-    <p *ngIf="!shows.length" @fade>Es ist derzeit keine Veranstaltung vorhanden</p>
-
-    <mat-form-field *ngIf="shows.length>0" @fade appearance="outline">
+    <mat-form-field *ngIf="shows.length > 0" @fade appearance="outline">
       <mat-label>Veranstaltung</mat-label>
       <mat-select [formControl]="showControl">
         <mat-option *ngFor="let show of shows" [value]="show.id">
-          {{show.showType|showType}}, {{show.date.toDate()|date:'dd.MM.yyyy'}}
+          {{ show.showType | showType }},
+          {{ show.date.toDate() | date: "dd.MM.yyyy" }}
         </mat-option>
       </mat-select>
     </mat-form-field>
 
     <ng-container *ngIf="!progress">
       <div *ngIf="show" class="song-parts padding-bottom">
-        <div (click)="onSectionClick('title', -1)"
-             [class.active]="show.presentationSongId==='title'"
-             class="song-part">
+        <div
+          (click)="onSectionClick('title', -1)"
+          [class.active]="show.presentationSongId === 'title'"
+          class="song-part"
+        >
           <div class="head">Veranstaltung</div>
         </div>
-        <div (click)="onSectionClick('empty', -1)"
-             [class.active]="show.presentationSongId==='empty'"
-             class="song-part">
+        <div
+          (click)="onSectionClick('empty', -1)"
+          [class.active]="show.presentationSongId === 'empty'"
+          class="song-part"
+        >
           <div class="head">Leer</div>
         </div>
       </div>
 
       <div *ngFor="let song of presentationSongs" @fade class="song">
-        <div [class.active]="show.presentationSongId===song.id" class="title song-part">
-          <div (click)="onSectionClick(song.id, -1)" class="head">{{song.title}}</div>
+        <div
+          [class.active]="show.presentationSongId === song.id"
+          class="title song-part"
+        >
+          <div (click)="onSectionClick(song.id, -1)" class="head">
+            {{ song.title }}
+          </div>
         </div>
         <div *ngIf="show" class="song-parts">
-          <div (click)="onSectionClick(song.id, i)" *ngFor="let section of song.sections; index as i"
-               [class.active]="show.presentationSongId===song.id && show.presentationSection===i"
-               class="song-part">
-            <div class="head">{{section.type|sectionType}} {{section.number + 1}}</div>
-            <div class="fragment">{{getFirstLine(section)}}</div>
+          <div
+            (click)="onSectionClick(song.id, i)"
+            *ngFor="let section of song.sections; index as i"
+            [class.active]="
+              show.presentationSongId === song.id &&
+              show.presentationSection === i
+            "
+            class="song-part"
+          >
+            <div class="head">
+              {{ section.type | sectionType }} {{ section.number + 1 }}
+            </div>
+            <div class="fragment">{{ getFirstLine(section) }}</div>
           </div>
         </div>
       </div>
@@ -56,11 +75,13 @@
         </mat-slider>
       </div>
 
-
-      <app-add-song *ngIf="show" [addedLive]="true" [showId]="currentShowId" [showSongs]="showSongs"
-                    [songs]="songs"></app-add-song>
+      <app-add-song
+        *ngIf="show"
+        [addedLive]="true"
+        [showId]="currentShowId"
+        [showSongs]="showSongs"
+        [songs]="songs"
+      ></app-add-song>
     </ng-container>
   </app-card>
-
-
 </div>
diff --git a/src/app/modules/presentation/remote/remote.component.spec.ts b/src/app/modules/presentation/remote/remote.component.spec.ts
index edcb8fd..ed048d6 100644
--- a/src/app/modules/presentation/remote/remote.component.spec.ts
+++ b/src/app/modules/presentation/remote/remote.component.spec.ts
@@ -6,12 +6,13 @@ describe('RemoteComponent', () => {
   let component: RemoteComponent;
   let fixture: ComponentFixture<RemoteComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [RemoteComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [RemoteComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(RemoteComponent);
@@ -20,6 +21,6 @@ describe('RemoteComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/presentation/remote/remote.component.ts b/src/app/modules/presentation/remote/remote.component.ts
index 9a2187d..f16dbe3 100644
--- a/src/app/modules/presentation/remote/remote.component.ts
+++ b/src/app/modules/presentation/remote/remote.component.ts
@@ -25,7 +25,7 @@ export interface PresentationSong {
   selector: 'app-remote',
   templateUrl: './remote.component.html',
   styleUrls: ['./remote.component.less'],
-  animations: [fade]
+  animations: [fade],
 })
 export class RemoteComponent {
   public shows$: Observable<Show[]>;
@@ -39,24 +39,26 @@ export class RemoteComponent {
   public faDesktop = faDesktop;
   public showControl = new FormControl();
 
-  constructor(
+  public constructor(
     private showService: ShowService,
     private showSongService: ShowSongService,
     private songService: SongService,
     private textRenderingService: TextRenderingService,
-    private globalSettingsService: GlobalSettingsService,
+    private globalSettingsService: GlobalSettingsService
   ) {
     this.shows$ = showService.list$(true);
-    songService.list$().subscribe(_ => this.songs = _);
+    songService.list$().subscribe(_ => (this.songs = _));
 
-    globalSettingsService.get$.pipe(
-      map(_ => _.currentShow),
-      distinctUntilChanged()
-    ).subscribe(_ => {
-      this.showControl.setValue(_, {emitEvent: false});
-      this.onShowChanged(_, false);
-    });
-    this.showControl.valueChanges.subscribe(value => this.onShowChanged(value));
+    globalSettingsService.get$
+      .pipe(
+        map(_ => _.currentShow),
+        distinctUntilChanged()
+      )
+      .subscribe(_ => {
+        this.showControl.setValue(_, {emitEvent: false});
+        void this.onShowChanged(_, false);
+      });
+    this.showControl.valueChanges.subscribe((value: string) => void this.onShowChanged(value));
   }
 
   public async onShowChanged(change: string, updateShow = true): Promise<void> {
@@ -68,16 +70,14 @@ export class RemoteComponent {
       await this.showService.update$(change, {presentationSongId: 'title'});
     }
     this.currentShowId = change;
-    this.showService.read$(change).subscribe(_ => this.show = _);
+    this.showService.read$(change).subscribe(_ => (this.show = _));
     this.showSongService.list$(change).subscribe(_ => {
       this.showSongs = _;
-      this.presentationSongs = _
-        .map(song => this.songs.filter(f => f.id == song.songId)[0])
-        .map(song => ({
-          id: song.id,
-          title: song.title,
-          sections: this.textRenderingService.parse(song.text, null)
-        }));
+      this.presentationSongs = _.map(song => this.songs.filter(f => f.id === song.songId)[0]).map(song => ({
+        id: song.id,
+        title: song.title,
+        sections: this.textRenderingService.parse(song.text, null),
+      }));
     });
     await delay(500);
     this.progress = false;
@@ -90,13 +90,11 @@ export class RemoteComponent {
   public async onSectionClick(id: string, index: number): Promise<void> {
     await this.showService.update$(this.currentShowId, {
       presentationSongId: id,
-      presentationSection: index
+      presentationSection: index,
     });
   }
 
-  public async onZoom(zoom: number) {
-    await this.showService.update$(this.currentShowId, {
-      presentationZoom: zoom,
-    });
+  public async onZoom(zoom: number): Promise<void> {
+    await this.showService.update$(this.currentShowId, {presentationZoom: zoom});
   }
 }
diff --git a/src/app/modules/presentation/services/presentation.service.spec.ts b/src/app/modules/presentation/services/presentation.service.spec.ts
index 3f91b19..d64978f 100644
--- a/src/app/modules/presentation/services/presentation.service.spec.ts
+++ b/src/app/modules/presentation/services/presentation.service.spec.ts
@@ -6,11 +6,11 @@ describe('PresentationService', () => {
   let service: PresentationService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    void TestBed.configureTestingModule({});
     service = TestBed.inject(PresentationService);
   });
 
   it('should be created', () => {
-    expect(service).toBeTruthy();
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/modules/presentation/services/presentation.service.ts b/src/app/modules/presentation/services/presentation.service.ts
index a650b4e..da24451 100644
--- a/src/app/modules/presentation/services/presentation.service.ts
+++ b/src/app/modules/presentation/services/presentation.service.ts
@@ -1,10 +1,6 @@
 import {Injectable} from '@angular/core';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
-export class PresentationService {
-
-  constructor() {
-  }
-}
+export class PresentationService {}
diff --git a/src/app/modules/shows/list/list-item/list-item.component.html b/src/app/modules/shows/list/list-item/list-item.component.html
index 763efef..ffa634b 100644
--- a/src/app/modules/shows/list/list-item/list-item.component.html
+++ b/src/app/modules/shows/list/list-item/list-item.component.html
@@ -1,4 +1,4 @@
 <div class="list-item">
-  <div>{{show.date.toDate()|date:'dd.MM.yyyy'}}</div>
-  <div>{{show.showType|showType}}</div>
+  <div>{{ show.date.toDate() | date: "dd.MM.yyyy" }}</div>
+  <div>{{ show.showType | showType }}</div>
 </div>
diff --git a/src/app/modules/shows/list/list-item/list-item.component.spec.ts b/src/app/modules/shows/list/list-item/list-item.component.spec.ts
index 7a279f8..236b19e 100644
--- a/src/app/modules/shows/list/list-item/list-item.component.spec.ts
+++ b/src/app/modules/shows/list/list-item/list-item.component.spec.ts
@@ -6,12 +6,13 @@ describe('ListItemComponent', () => {
   let component: ListItemComponent;
   let fixture: ComponentFixture<ListItemComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ListItemComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [ListItemComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ListItemComponent);
@@ -20,6 +21,6 @@ describe('ListItemComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/shows/list/list-item/list-item.component.ts b/src/app/modules/shows/list/list-item/list-item.component.ts
index 26a0299..466ae9a 100644
--- a/src/app/modules/shows/list/list-item/list-item.component.ts
+++ b/src/app/modules/shows/list/list-item/list-item.component.ts
@@ -4,7 +4,7 @@ import {Show} from '../../services/show';
 @Component({
   selector: 'app-list-item',
   templateUrl: './list-item.component.html',
-  styleUrls: ['./list-item.component.less']
+  styleUrls: ['./list-item.component.less'],
 })
 export class ListItemComponent {
   @Input() public show: Show;
diff --git a/src/app/modules/shows/list/list.component.html b/src/app/modules/shows/list/list.component.html
index fa8e5a6..77b3df1 100644
--- a/src/app/modules/shows/list/list.component.html
+++ b/src/app/modules/shows/list/list.component.html
@@ -2,15 +2,32 @@
   <app-list-header></app-list-header>
 
   <ng-container *ngIf="shows$ | async as shows">
-    <app-card *ngIf="getPrivateSongs(shows).length>0" [@fade] [padding]="false" heading="meine Veranstaltungen">
-      <app-list-item *ngFor="let show of getPrivateSongs(shows)" [routerLink]="show.id" [show]="show"></app-list-item>
+    <app-card
+      *ngIf="getPrivateSongs(shows).length > 0"
+      [@fade]
+      [padding]="false"
+      heading="meine Veranstaltungen"
+    >
+      <app-list-item
+        *ngFor="let show of getPrivateSongs(shows)"
+        [routerLink]="show.id"
+        [show]="show"
+      ></app-list-item>
     </app-card>
   </ng-container>
 
   <ng-container *ngIf="shows$ | async as shows">
-    <app-card *ngIf="getPublicShows(shows).length>0" [@fade] [padding]="false"
-              heading="veröffentlichte Veranstaltungen">
-      <app-list-item *ngFor="let show of getPublicShows(shows)" [routerLink]="show.id" [show]="show"></app-list-item>
+    <app-card
+      *ngIf="getPublicShows(shows).length > 0"
+      [@fade]
+      [padding]="false"
+      heading="veröffentlichte Veranstaltungen"
+    >
+      <app-list-item
+        *ngFor="let show of getPublicShows(shows)"
+        [routerLink]="show.id"
+        [show]="show"
+      ></app-list-item>
     </app-card>
   </ng-container>
 </div>
diff --git a/src/app/modules/shows/list/list.component.spec.ts b/src/app/modules/shows/list/list.component.spec.ts
index 6a2ca7c..38bbd56 100644
--- a/src/app/modules/shows/list/list.component.spec.ts
+++ b/src/app/modules/shows/list/list.component.spec.ts
@@ -6,12 +6,13 @@ describe('ListComponent', () => {
   let component: ListComponent;
   let fixture: ComponentFixture<ListComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ListComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [ListComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ListComponent);
@@ -20,6 +21,6 @@ describe('ListComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/shows/list/list.component.ts b/src/app/modules/shows/list/list.component.ts
index f0f8521..1cd3500 100644
--- a/src/app/modules/shows/list/list.component.ts
+++ b/src/app/modules/shows/list/list.component.ts
@@ -8,12 +8,12 @@ import {ShowService} from '../services/show.service';
   selector: 'app-list',
   templateUrl: './list.component.html',
   styleUrls: ['./list.component.less'],
-  animations: [fade]
+  animations: [fade],
 })
 export class ListComponent {
   public shows$: Observable<Show[]>;
 
-  constructor(showService: ShowService) {
+  public constructor(showService: ShowService) {
     this.shows$ = showService.list$();
   }
 
@@ -24,5 +24,4 @@ export class ListComponent {
   public getPrivateSongs(songs: Show[]): Show[] {
     return songs.filter(_ => !_.published);
   }
-
 }
diff --git a/src/app/modules/shows/new/new.component.html b/src/app/modules/shows/new/new.component.html
index 5069ec1..3d7ee0e 100644
--- a/src/app/modules/shows/new/new.component.html
+++ b/src/app/modules/shows/new/new.component.html
@@ -1,21 +1,24 @@
 <div>
   <app-card closeLink="/shows" heading="Neue Veranstaltung">
-
     <div [formGroup]="form" class="split">
       <mat-form-field appearance="outline">
         <mat-label>Art der Veranstaltung</mat-label>
         <mat-select formControlName="showType">
           <mat-optgroup label="öffentlich">
-            <mat-option *ngFor="let key of showTypePublic" [value]="key">{{key|showType}}</mat-option>
+            <mat-option *ngFor="let key of showTypePublic" [value]="key">{{
+              key | showType
+              }}</mat-option>
           </mat-optgroup>
           <mat-optgroup label="privat">
-            <mat-option *ngFor="let key of showTypePrivate" [value]="key">{{key|showType}}</mat-option>
+            <mat-option *ngFor="let key of showTypePrivate" [value]="key">{{
+              key | showType
+              }}</mat-option>
           </mat-optgroup>
         </mat-select>
       </mat-form-field>
       <mat-form-field appearance="outline">
         <mat-label>Datum</mat-label>
-        <input [matDatepicker]="picker" formControlName="date" matInput>
+        <input [matDatepicker]="picker" formControlName="date" matInput/>
         <mat-datepicker-toggle [for]="picker" matSuffix></mat-datepicker-toggle>
         <mat-datepicker #picker touchUi></mat-datepicker>
       </mat-form-field>
diff --git a/src/app/modules/shows/new/new.component.spec.ts b/src/app/modules/shows/new/new.component.spec.ts
index 22a386c..2756000 100644
--- a/src/app/modules/shows/new/new.component.spec.ts
+++ b/src/app/modules/shows/new/new.component.spec.ts
@@ -6,12 +6,13 @@ describe('NewComponent', () => {
   let component: NewComponent;
   let fixture: ComponentFixture<NewComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [NewComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [NewComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(NewComponent);
@@ -20,6 +21,6 @@ describe('NewComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/shows/new/new.component.ts b/src/app/modules/shows/new/new.component.ts
index a9b7168..e52a6d7 100644
--- a/src/app/modules/shows/new/new.component.ts
+++ b/src/app/modules/shows/new/new.component.ts
@@ -10,7 +10,7 @@ import {faSave} from '@fortawesome/free-solid-svg-icons/faSave';
 @Component({
   selector: 'app-new',
   templateUrl: './new.component.html',
-  styleUrls: ['./new.component.less']
+  styleUrls: ['./new.component.less'],
 })
 export class NewComponent implements OnInit {
   public shows$: Observable<Show[]>;
@@ -19,7 +19,7 @@ export class NewComponent implements OnInit {
   public form: FormGroup;
   public faSave = faSave;
 
-  constructor(private showService: ShowService, showDataService: ShowDataService, private router: Router) {
+  public constructor(private showService: ShowService, showDataService: ShowDataService, private router: Router) {
     this.shows$ = showDataService.list$();
   }
 
@@ -30,7 +30,7 @@ export class NewComponent implements OnInit {
     });
   }
 
-  public async onSave() {
+  public async onSave(): Promise<void> {
     this.form.markAllAsTouched();
     if (!this.form.valid) {
       return;
diff --git a/src/app/modules/shows/services/docx.service.spec.ts b/src/app/modules/shows/services/docx.service.spec.ts
index fff3b05..1903309 100644
--- a/src/app/modules/shows/services/docx.service.spec.ts
+++ b/src/app/modules/shows/services/docx.service.spec.ts
@@ -6,11 +6,11 @@ describe('DocxService', () => {
   let service: DocxService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    void TestBed.configureTestingModule({});
     service = TestBed.inject(DocxService);
   });
 
   it('should be created', () => {
-    expect(service).toBeTruthy();
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/modules/shows/services/docx.service.ts b/src/app/modules/shows/services/docx.service.ts
index 108a9ac..3f850f7 100644
--- a/src/app/modules/shows/services/docx.service.ts
+++ b/src/app/modules/shows/services/docx.service.ts
@@ -24,29 +24,24 @@ export interface DownloadOptions {
 }
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class DocxService {
-
-  constructor(
+  public constructor(
     private showService: ShowService,
     private showSongService: ShowSongService,
     private songService: SongService,
     private textRenderingService: TextRenderingService,
     private userService: UserService,
-    private configService: ConfigService,
-  ) {
-  }
+    private configService: ConfigService
+  ) {}
 
-  public async create(showId: string, options: DownloadOptions = {}): Promise<any> {
+  public async create(showId: string, options: DownloadOptions = {}): Promise<void> {
     const {show, songs, user, config} = await this.prepareData(showId);
     const type = new ShowTypePipe().transform(show.showType);
     const title = `${type} ${show.date.toDate().toLocaleDateString()}`;
 
-    const paragraphs = [
-      ...this.renderTitle(title),
-      ...this.renderSongs(songs, options, config),
-    ];
+    const paragraphs = [...this.renderTitle(title), ...this.renderSongs(songs, options, config)];
 
     const sections: ISectionOptions[] = [
       {
@@ -56,11 +51,10 @@ export class DocxService {
           },
         },
         children: paragraphs,
-      }
-    ]
+      },
+    ];
     const document = this.prepareNewDocument(type, user.name, options, sections);
 
-
     const blob = await Packer.toBlob(document);
 
     // saveAs from FileSaver will download the file
@@ -72,7 +66,7 @@ export class DocxService {
       creator: name,
       title: type,
       description: '... mit Beschreibung',
-      sections: sections,
+      sections,
       styles: {
         paragraphStyles: [
           {
@@ -83,7 +77,8 @@ export class DocxService {
             quickFormat: true,
             run: options?.chordMode === 'hide' ? {} : {font: 'courier new'},
             paragraph: {indent: {left: 0}},
-          }, {
+          },
+          {
             id: 'licence',
             name: 'Lizenz',
             basedOn: 'Normal',
@@ -92,13 +87,13 @@ export class DocxService {
             run: {size: 15, color: 'grey'},
             paragraph: {indent: {left: 0}},
           },
-        ]
-      }
+        ],
+      },
     });
   }
 
-  private renderSongs(songs: { showSong: ShowSong; song: Song; sections: Section[] }[], options: DownloadOptions, config: Config): Paragraph[] {
-    return songs.reduce((p, song) => [...p, ...this.renderSong(song.showSong, song.song, song.sections, options, config)], []);
+  private renderSongs(songs: {showSong: ShowSong; song: Song; sections: Section[]}[], options: DownloadOptions, config: Config): Paragraph[] {
+    return songs.reduce((p: Paragraph[], song) => [...p, ...this.renderSong(song.showSong, song.song, song.sections, options, config)], []);
   }
 
   private renderSong(showSong: ShowSong, song: Song, sections: Section[], options: DownloadOptions, config: Config): Paragraph[] {
@@ -106,15 +101,11 @@ export class DocxService {
     const copyright = this.renderCopyright(song, options, config);
     const songText = this.renderSongText(sections, options?.chordMode ?? showSong.chordMode);
 
-    return [
-      songTitle,
-      copyright,
-      ...songText
-    ].filter(_ => _);
+    return [songTitle, copyright, ...songText].filter(_ => _);
   }
 
-  private renderSongText(sections: Section[], chordMode: ChordMode) {
-    return sections.reduce((p, section) => [...p, ...this.renderSection(section, chordMode)], []);
+  private renderSongText(sections: Section[], chordMode: ChordMode): Paragraph[] {
+    return sections.reduce((p: Paragraph[], section) => [...p, ...this.renderSection(section, chordMode)], []);
   }
 
   private renderSongTitle(song: Song): Paragraph {
@@ -137,9 +128,7 @@ export class DocxService {
     const artist = song.artist ? song.artist + ', ' : '';
     const termsOfUse = song.termsOfUse ? song.termsOfUse + ', ' : '';
     const origin = song.origin ? song.origin + ', ' : '';
-    const licence = song.legalOwner === 'CCLI'
-      ? 'CCLI-Liednummer: ' + song.legalOwnerId + ', CCLI-Lizenz: ' + config.ccliLicenseId
-      : 'CCLI-Liednummer: ' + song.legalOwnerId;
+    const licence = song.legalOwner === 'CCLI' ? 'CCLI-Liednummer: ' + song.legalOwnerId + ', CCLI-Lizenz: ' + config.ccliLicenseId : 'CCLI-Liednummer: ' + song.legalOwnerId;
 
     return new Paragraph({
       text: artist + label + termsOfUse + origin + licence,
@@ -147,7 +136,6 @@ export class DocxService {
     });
   }
 
-
   private renderSection(section: Section, chordMode: ChordMode): Paragraph[] {
     return section.lines
       .filter(line => {
@@ -171,13 +159,11 @@ export class DocxService {
     return new Paragraph({
       text: line.text,
       style: 'songtext',
-      spacing
+      spacing,
     });
-
   }
 
   private renderTitle(type: string): Paragraph[] {
-
     const songTitle = new Paragraph({
       text: type,
       heading: HeadingLevel.HEADING_1,
@@ -187,34 +173,39 @@ export class DocxService {
     return [songTitle];
   }
 
-  private async prepareData(showId: string): Promise<{ songs: ({ showSong: ShowSong, song: Song, sections: Section[] })[]; show: Show, user: User, config: Config }> {
+  private async prepareData(showId: string): Promise<{
+    songs: {showSong: ShowSong; song: Song; sections: Section[]}[];
+    show: Show;
+    user: User;
+    config: Config;
+  }> {
     const show = await this.showService.read$(showId).pipe(first()).toPromise();
     const user = await this.userService.getUserbyId(show.owner);
     const config = await this.configService.get();
 
     const showSongs = await this.showSongService.list(showId);
-    const songsAsync = await showSongs.map(async showSong => {
+    const songsAsync = showSongs.map(async showSong => {
       const song = await this.songService.read(showSong.songId);
       const sections = this.textRenderingService.parse(song.text, {
         baseKey: showSong.keyOriginal,
-        targetKey: showSong.key
+        targetKey: showSong.key,
       });
       return {
         showSong,
         song,
-        sections
+        sections,
       };
     });
     const songs = await Promise.all(songsAsync);
     return {songs, show, user, config};
   }
 
-  private saveAs(blob, fileName) {
-    const a = document.createElement('a') as any;
+  private saveAs(blob: Blob, fileName: string) {
+    const a = document.createElement('a');
 
     document.body.appendChild(a);
     a.setAttribute('target', '_self');
-    a.style = 'display: none';
+    a.style.display = 'none';
 
     const url = window.URL.createObjectURL(blob);
     a.href = url;
diff --git a/src/app/modules/shows/services/show-data.service.spec.ts b/src/app/modules/shows/services/show-data.service.spec.ts
index 674c248..ae25ab6 100644
--- a/src/app/modules/shows/services/show-data.service.spec.ts
+++ b/src/app/modules/shows/services/show-data.service.spec.ts
@@ -3,10 +3,10 @@ import {TestBed} from '@angular/core/testing';
 import {ShowDataService} from './show-data.service';
 
 describe('ShowDataService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
+  beforeEach(() => void TestBed.configureTestingModule({}));
 
   it('should be created', () => {
-    const service: ShowDataService = TestBed.get(ShowDataService);
-    expect(service).toBeTruthy();
+    const service: ShowDataService = TestBed.inject(ShowDataService);
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/modules/shows/services/show-data.service.ts b/src/app/modules/shows/services/show-data.service.ts
index aafd935..2d507a5 100644
--- a/src/app/modules/shows/services/show-data.service.ts
+++ b/src/app/modules/shows/services/show-data.service.ts
@@ -2,17 +2,17 @@ import {Injectable} from '@angular/core';
 import {Observable} from 'rxjs';
 import {DbService} from '../../../services/db.service';
 import {Show} from './show';
+import {QueryFn} from '@angular/fire/firestore/interfaces';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ShowDataService {
   private collection = 'shows';
 
-  constructor(private dbService: DbService) {
-  }
+  public constructor(private dbService: DbService) {}
 
-  public list$ = (queryFn?): Observable<Show[]> => this.dbService.col$(this.collection, queryFn);
+  public list$ = (queryFn?: QueryFn): Observable<Show[]> => this.dbService.col$(this.collection, queryFn);
   public read$ = (showId: string): Observable<Show | undefined> => this.dbService.doc$(`${this.collection}/${showId}`);
   public update = async (showId: string, data: Partial<Show>): Promise<void> => await this.dbService.doc(`${this.collection}/${showId}`).update(data);
   public add = async (data: Partial<Show>): Promise<string> => (await this.dbService.col(this.collection).add(data)).id;
diff --git a/src/app/modules/shows/services/show-song-data.service.spec.ts b/src/app/modules/shows/services/show-song-data.service.spec.ts
index 75940ab..3278549 100644
--- a/src/app/modules/shows/services/show-song-data.service.spec.ts
+++ b/src/app/modules/shows/services/show-song-data.service.spec.ts
@@ -6,11 +6,11 @@ describe('ShowSongDataService', () => {
   let service: ShowSongDataService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    void TestBed.configureTestingModule({});
     service = TestBed.inject(ShowSongDataService);
   });
 
   it('should be created', () => {
-    expect(service).toBeTruthy();
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/modules/shows/services/show-song-data.service.ts b/src/app/modules/shows/services/show-song-data.service.ts
index b2ce0d9..7f9887f 100644
--- a/src/app/modules/shows/services/show-song-data.service.ts
+++ b/src/app/modules/shows/services/show-song-data.service.ts
@@ -2,20 +2,21 @@ import {Injectable} from '@angular/core';
 import {DbService} from '../../../services/db.service';
 import {Observable} from 'rxjs';
 import {ShowSong} from './show-song';
+import {QueryFn} from '@angular/fire/firestore/interfaces';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ShowSongDataService {
   private collection = 'shows';
   private subCollection = 'songs';
 
-  constructor(private dbService: DbService) {
-  }
+  public constructor(private dbService: DbService) {}
 
-  public list$ = (showId: string, queryFn?): Observable<ShowSong[]> => this.dbService.col$(`${this.collection}/${showId}/${this.subCollection}`, queryFn);
+  public list$ = (showId: string, queryFn?: QueryFn): Observable<ShowSong[]> => this.dbService.col$(`${this.collection}/${showId}/${this.subCollection}`, queryFn);
   public read$ = (showId: string, songId: string): Observable<ShowSong | undefined> => this.dbService.doc$(`${this.collection}/${showId}/${this.subCollection}/${songId}`);
-  public update$ = async (showId: string, songId: string, data: Partial<ShowSong>): Promise<void> => await this.dbService.doc(`${this.collection}/${showId}/${this.subCollection}/${songId}`).update(data);
+  public update$ = async (showId: string, songId: string, data: Partial<ShowSong>): Promise<void> =>
+    await this.dbService.doc(`${this.collection}/${showId}/${this.subCollection}/${songId}`).update(data);
   public delete = async (showId: string, songId: string): Promise<void> => await this.dbService.doc(`${this.collection}/${showId}/${this.subCollection}/${songId}`).delete();
   public add = async (showId: string, data: Partial<ShowSong>): Promise<string> => (await this.dbService.col(`${this.collection}/${showId}/${this.subCollection}`).add(data)).id;
 }
diff --git a/src/app/modules/shows/services/show-song.service.spec.ts b/src/app/modules/shows/services/show-song.service.spec.ts
index c42050c..1c23ca3 100644
--- a/src/app/modules/shows/services/show-song.service.spec.ts
+++ b/src/app/modules/shows/services/show-song.service.spec.ts
@@ -6,11 +6,11 @@ describe('ShowSongService', () => {
   let service: ShowSongService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    void TestBed.configureTestingModule({});
     service = TestBed.inject(ShowSongService);
   });
 
   it('should be created', () => {
-    expect(service).toBeTruthy();
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/modules/shows/services/show-song.service.ts b/src/app/modules/shows/services/show-song.service.ts
index 52a1188..65695fd 100644
--- a/src/app/modules/shows/services/show-song.service.ts
+++ b/src/app/modules/shows/services/show-song.service.ts
@@ -7,16 +7,10 @@ import {first, take} from 'rxjs/operators';
 import {UserService} from '../../../services/user/user.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ShowSongService {
-
-  constructor(
-    private showSongDataService: ShowSongDataService,
-    private songDataService: SongDataService,
-    private userService: UserService,
-  ) {
-  }
+  public constructor(private showSongDataService: ShowSongDataService, private songDataService: SongDataService, private userService: UserService) {}
 
   public async new$(showId: string, songId: string, order: number, addedLive = false): Promise<string> {
     const song = await this.songDataService.read$(songId).pipe(take(1)).toPromise();
@@ -27,7 +21,7 @@ export class ShowSongService {
       key: song.key,
       keyOriginal: song.key,
       chordMode: user.chordMode,
-      addedLive
+      addedLive,
     };
     return await this.showSongDataService.add(showId, data);
   }
diff --git a/src/app/modules/shows/services/show.service.spec.ts b/src/app/modules/shows/services/show.service.spec.ts
index 0aaf3e3..9b4825e 100644
--- a/src/app/modules/shows/services/show.service.spec.ts
+++ b/src/app/modules/shows/services/show.service.spec.ts
@@ -5,33 +5,40 @@ import {ShowDataService} from './show-data.service';
 
 describe('ShowService', () => {
   const mockShowDataService = {add: Promise.resolve(null)};
-  beforeEach(() => TestBed.configureTestingModule({
-    providers: [
-      {provide: ShowDataService, useValue: mockShowDataService}
-    ]
-  }));
+  beforeEach(
+    () =>
+      void TestBed.configureTestingModule({
+        providers: [{provide: ShowDataService, useValue: mockShowDataService}],
+      })
+  );
 
   ShowService.SHOW_TYPE_PUBLIC.forEach(type => {
     it('should calc public flag for ' + type, async () => {
-      const service: ShowService = TestBed.get(ShowService);
+      const service: ShowService = TestBed.inject(ShowService);
       const addSpy = spyOn(TestBed.inject(ShowDataService), 'add').and.returnValue(Promise.resolve('id'));
 
       const id = await service.new$({showType: type});
 
-      expect(id).toBe('id');
-      expect(addSpy).toHaveBeenCalledWith({showType: type, public: true});
+      void expect(id).toBe('id');
+      void expect(addSpy).toHaveBeenCalledWith({
+        showType: type,
+        public: true,
+      });
     });
   });
 
   ShowService.SHOW_TYPE_PRIVATE.forEach(type => {
     it('should calc private flag for ' + type, async () => {
-      const service: ShowService = TestBed.get(ShowService);
+      const service: ShowService = TestBed.inject(ShowService);
       const addSpy = spyOn(TestBed.inject(ShowDataService), 'add').and.returnValue(Promise.resolve('id'));
 
       const id = await service.new$({showType: type});
 
-      expect(id).toBe('id');
-      expect(addSpy).toHaveBeenCalledWith({showType: type, public: false});
+      void expect(id).toBe('id');
+      void expect(addSpy).toHaveBeenCalledWith({
+        showType: type,
+        public: false,
+      });
     });
   });
 });
diff --git a/src/app/modules/shows/services/show.service.ts b/src/app/modules/shows/services/show.service.ts
index 2680771..ba0ff79 100644
--- a/src/app/modules/shows/services/show.service.ts
+++ b/src/app/modules/shows/services/show.service.ts
@@ -7,31 +7,28 @@ import {map, switchMap} from 'rxjs/operators';
 import {User} from '../../../services/user/user';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ShowService {
-
   public static SHOW_TYPE = ['service-worship', 'service-praise', 'home-group-big', 'home-group', 'prayer-group', 'teens-group', 'kids-group', 'misc-public', 'misc-private'];
   public static SHOW_TYPE_PUBLIC = ['service-worship', 'service-praise', 'home-group-big', 'teens-group', 'kids-group', 'misc-public'];
-  public static SHOW_TYPE_PRIVATE = ['home-group', 'prayer-group', 'misc-private',];
+  public static SHOW_TYPE_PRIVATE = ['home-group', 'prayer-group', 'misc-private'];
   private user: User;
 
-  constructor(private showDataService: ShowDataService, private userService: UserService) {
-    userService.user$.subscribe(_ => this.user = _);
+  public constructor(private showDataService: ShowDataService, private userService: UserService) {
+    userService.user$.subscribe(_ => (this.user = _));
   }
 
   public read$ = (showId: string): Observable<Show> => this.showDataService.read$(showId);
 
-  public list$(publishedOnly: boolean = false): Observable<Show[]> {
-
+  public list$(publishedOnly = false): Observable<Show[]> {
     return this.userService.user$.pipe(
-      switchMap(_ => this.showDataService.list$(), (user: User, shows: Show[]) => ({user, shows})),
-      map(_ => _.shows
-        .filter(_ => !_.archived)
-        .filter(show => show.published || (show.owner === _.user.id && !publishedOnly))
-      )
+      switchMap(
+        () => this.showDataService.list$(),
+        (user: User, shows: Show[]) => ({user, shows})
+      ),
+      map(s => s.shows.filter(_ => !_.archived).filter(show => show.published || (show.owner === s.user.id && !publishedOnly)))
     );
-
   }
 
   public update$ = async (showId: string, data: Partial<Show>): Promise<void> => this.showDataService.update(showId, data);
diff --git a/src/app/modules/shows/services/show.ts b/src/app/modules/shows/services/show.ts
index abc7ecb..c977660 100644
--- a/src/app/modules/shows/services/show.ts
+++ b/src/app/modules/shows/services/show.ts
@@ -14,6 +14,4 @@ export interface Show {
   presentationSongId: string;
   presentationSection: number;
   presentationZoom: number;
-
 }
-
diff --git a/src/app/modules/shows/show/show.component.html b/src/app/modules/shows/show/show.component.html
index ccc0ddc..df38b52 100644
--- a/src/app/modules/shows/show/show.component.html
+++ b/src/app/modules/shows/show/show.component.html
@@ -1,49 +1,82 @@
-<div *ngIf="(show$|async) as show">
+<div *ngIf="show$ | async as show">
   <app-card
     closeLink="../"
-    heading="{{show.showType|showType}}, {{show.date.toDate()|date:'dd.MM.yyyy'}} - {{getStatus(show)}}">
-    <i *ngIf="show.public">öffentliche Veranstaltung von
+    heading="{{ show.showType | showType }}, {{
+      show.date.toDate() | date: 'dd.MM.yyyy'
+    }} - {{ getStatus(show) }}"
+  >
+    <i *ngIf="show.public"
+    >öffentliche Veranstaltung von
       <app-user-name [userId]="show.owner"></app-user-name>
     </i>
-    <i *ngIf="!show.public">geschlossene Veranstaltung von
+    <i *ngIf="!show.public"
+    >geschlossene Veranstaltung von
       <app-user-name [userId]="show.owner"></app-user-name>
     </i>
     <p *ngIf="!show.published">
       <mat-checkbox [(ngModel)]="showText">Text anzeigen</mat-checkbox>
     </p>
     <div *ngIf="showSongs && songs" class="song-list">
-      <app-song *ngFor="let song of showSongs" [showId]="showId"
-                [showSong]="song"
-                [showSongs]="showSongs"
-                [showText]="showText"
-                [show]="show"
-                [song]="getSong(song.songId)"
-                class="song-row"
+      <app-song
+        *ngFor="let song of showSongs"
+        [Song]="getSong(song.songId)"
+        [showId]="showId"
+        [showSong]="song"
+        [showSongs]="showSongs"
+        [showText]="showText"
+        [show]="show"
+        class="song-row"
       ></app-song>
     </div>
 
-    <app-add-song *ngIf="songs && !show.published" [showId]="showId" [showSongs]="showSongs"
-                  [songs]="songs"></app-add-song>
+    <app-add-song
+      *ngIf="songs && !show.published"
+      [showId]="showId"
+      [showSongs]="showSongs"
+      [songs]="songs"
+    ></app-add-song>
 
     <app-button-row>
       <ng-container *appOwner="show.owner">
-        <app-button (click)="onArchive(true)" *ngIf="!show.archived" [icon]="faBox">
+        <app-button
+          (click)="onArchive(true)"
+          *ngIf="!show.archived"
+          [icon]="faBox"
+        >
           Archivieren
         </app-button>
-        <app-button (click)="onArchive(false)" *ngIf="show.archived" [icon]="faBoxOpen">
+        <app-button
+          (click)="onArchive(false)"
+          *ngIf="show.archived"
+          [icon]="faBoxOpen"
+        >
           Wiederherstellen
         </app-button>
-        <app-button (click)="onPublish(true)" *ngIf="!show.published" [icon]="faPublish">
+        <app-button
+          (click)="onPublish(true)"
+          *ngIf="!show.published"
+          [icon]="faPublish"
+        >
           Veröffentlichen
         </app-button>
-        <app-button (click)="onPublish(false)" *ngIf="show.published" [icon]="faUnpublish">
+        <app-button
+          (click)="onPublish(false)"
+          *ngIf="show.published"
+          [icon]="faUnpublish"
+        >
           Veröffentlichung zurückziehen
         </app-button>
       </ng-container>
-      <app-button [icon]="faDownload" [matMenuTriggerFor]="menu">Herunterladen</app-button>
+      <app-button [icon]="faDownload" [matMenuTriggerFor]="menu"
+      >Herunterladen
+      </app-button>
       <mat-menu #menu="matMenu">
-        <app-button (click)="onDownload()" [icon]="faUser">Ablauf für Lobpreisleiter</app-button>
-        <app-button (click)="onDownloadHandout()" [icon]="faUsers">Handout mit Copyright Infos</app-button>
+        <app-button (click)="onDownload()" [icon]="faUser"
+        >Ablauf für Lobpreisleiter
+        </app-button>
+        <app-button (click)="onDownloadHandout()" [icon]="faUsers"
+        >Handout mit Copyright Infos
+        </app-button>
       </mat-menu>
     </app-button-row>
   </app-card>
diff --git a/src/app/modules/shows/show/show.component.spec.ts b/src/app/modules/shows/show/show.component.spec.ts
index 90c284c..7d8c352 100644
--- a/src/app/modules/shows/show/show.component.spec.ts
+++ b/src/app/modules/shows/show/show.component.spec.ts
@@ -6,12 +6,13 @@ describe('ShowComponent', () => {
   let component: ShowComponent;
   let fixture: ComponentFixture<ShowComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ShowComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [ShowComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ShowComponent);
@@ -20,6 +21,6 @@ describe('ShowComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/shows/show/show.component.ts b/src/app/modules/shows/show/show.component.ts
index 91cc0cb..e508dc5 100644
--- a/src/app/modules/shows/show/show.component.ts
+++ b/src/app/modules/shows/show/show.component.ts
@@ -20,7 +20,7 @@ import {faUsers} from '@fortawesome/free-solid-svg-icons/faUsers';
 @Component({
   selector: 'app-show',
   templateUrl: './show.component.html',
-  styleUrls: ['./show.component.less']
+  styleUrls: ['./show.component.less'],
 })
 export class ShowComponent implements OnInit {
   public show$: Observable<Show>;
@@ -37,29 +37,31 @@ export class ShowComponent implements OnInit {
   public faUser = faUser;
   public faUsers = faUsers;
 
-  constructor(
+  public constructor(
     private activatedRoute: ActivatedRoute,
     private showService: ShowService,
     private songService: SongService,
     private showSongService: ShowSongService,
-    private docxService: DocxService,
-  ) {
-  }
+    private docxService: DocxService
+  ) {}
 
-  ngOnInit(): void {
+  public ngOnInit(): void {
     this.show$ = this.activatedRoute.params.pipe(
-      map(param => param.showId),
-      tap(_ => this.showId = _),
-      switchMap(showId => this.showService.read$(showId))
+      map((param: {showId: string}) => param.showId),
+      tap((_: string) => (this.showId = _)),
+      switchMap((showId: string) => this.showService.read$(showId))
     );
-    this.activatedRoute.params.pipe(
-      map(param => param.showId),
-      switchMap(showId => this.showSongService.list$(showId)),
-      filter(_ => !!_)
-    ).subscribe(_ => this.showSongs = _);
-    this.songService.list$().pipe(
-      filter(_ => !!_)
-    ).subscribe(_ => this.songs = _);
+    this.activatedRoute.params
+      .pipe(
+        map((param: {showId: string}) => param.showId),
+        switchMap(showId => this.showSongService.list$(showId)),
+        filter(_ => !!_)
+      )
+      .subscribe(_ => (this.showSongs = _));
+    this.songService
+      .list$()
+      .pipe(filter(_ => !!_))
+      .subscribe(_ => (this.songs = _));
   }
 
   public getSong(songId: string): Song {
@@ -90,6 +92,9 @@ export class ShowComponent implements OnInit {
   }
 
   public async onDownloadHandout(): Promise<void> {
-    await this.docxService.create(this.showId, {chordMode: 'hide', copyright: true});
+    await this.docxService.create(this.showId, {
+      chordMode: 'hide',
+      copyright: true,
+    });
   }
 }
diff --git a/src/app/modules/shows/show/song/song.component.html b/src/app/modules/shows/show/song/song.component.html
index ca51ee5..a02cb09 100644
--- a/src/app/modules/shows/show/song/song.component.html
+++ b/src/app/modules/shows/show/song/song.component.html
@@ -1,21 +1,42 @@
-<div *ngIf="_song">
-  <div *ngIf="show.published" class="title published">{{_song.title}}</div>
+<div *ngIf="iSong">
+  <div *ngIf="show.published" class="title published">{{ iSong.title }}</div>
 
   <div *ngIf="!show.published" class="song">
-    <app-menu-button (click)="reorder(true)" [icon]="faUp" class="btn-up btn-icon"></app-menu-button>
-    <app-menu-button (click)="reorder(false)" [icon]="faDown" class="btn-down btn-icon"></app-menu-button>
-    <span class="title">{{_song.title}}</span>
+    <app-menu-button
+      (click)="reorder(true)"
+      [icon]="faUp"
+      class="btn-up btn-icon"
+    ></app-menu-button>
+    <app-menu-button
+      (click)="reorder(false)"
+      [icon]="faDown"
+      class="btn-down btn-icon"
+    ></app-menu-button>
+    <span class="title">{{ iSong.title }}</span>
     <span class="keys">
-    <span *ngIf="showSong.keyOriginal!==showSong.key">{{showSong.keyOriginal}}&nbsp;→&nbsp;</span>
-    <mat-form-field *ngIf="keys" appearance="standard">
+      <span *ngIf="showSong.keyOriginal !== showSong.key"
+      >{{ showSong.keyOriginal }}&nbsp;→&nbsp;</span
+      >
+      <mat-form-field *ngIf="keys" appearance="standard">
         <mat-select [formControl]="keyFormControl">
-          <mat-option *ngFor="let key of keys" [value]="key">{{key}}</mat-option>
+          <mat-option *ngFor="let key of keys" [value]="key">{{
+            key
+            }}</mat-option>
         </mat-select>
       </mat-form-field>
-  </span>
-    <app-menu-button (click)="onDelete()" [icon]="faDelete" class="btn-delete btn-icon"></app-menu-button>
+    </span>
+    <app-menu-button
+      (click)="onDelete()"
+      [icon]="faDelete"
+      class="btn-delete btn-icon"
+    ></app-menu-button>
   </div>
-  <app-song-text (chordModeChanged)="onChordModeChanged($event)" *ngIf="showText || show.published"
-                 [chordMode]="showSong.chordMode" [transpose]="{baseKey: showSong.keyOriginal, targetKey: showSong.key}"
-                 [showSwitch]="!show.published" [text]="_song.text"></app-song-text>
+  <app-song-text
+    (chordModeChanged)="onChordModeChanged($event)"
+    *ngIf="showText || show.published"
+    [chordMode]="showSong.chordMode"
+    [showSwitch]="!show.published"
+    [text]="iSong.text"
+    [transpose]="{ baseKey: showSong.keyOriginal, targetKey: showSong.key }"
+  ></app-song-text>
 </div>
diff --git a/src/app/modules/shows/show/song/song.component.spec.ts b/src/app/modules/shows/show/song/song.component.spec.ts
index 8cd963b..816be2a 100644
--- a/src/app/modules/shows/show/song/song.component.spec.ts
+++ b/src/app/modules/shows/show/song/song.component.spec.ts
@@ -6,12 +6,13 @@ describe('SongComponent', () => {
   let component: SongComponent;
   let fixture: ComponentFixture<SongComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [SongComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [SongComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(SongComponent);
@@ -20,6 +21,6 @@ describe('SongComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/shows/show/song/song.component.ts b/src/app/modules/shows/show/song/song.component.ts
index 7862f8c..3fa9255 100644
--- a/src/app/modules/shows/show/song/song.component.ts
+++ b/src/app/modules/shows/show/song/song.component.ts
@@ -13,7 +13,7 @@ import {Show} from '../../services/show';
 @Component({
   selector: 'app-song',
   templateUrl: './song.component.html',
-  styleUrls: ['./song.component.less']
+  styleUrls: ['./song.component.less'],
 })
 export class SongComponent implements OnInit {
   @Input() public show: Show;
@@ -22,30 +22,25 @@ export class SongComponent implements OnInit {
   @Input() public showId: string;
   @Input() public showText: boolean;
 
-
   public keys: string[];
   public faDelete = faTrash;
   public faUp = faCaretUp;
   public faDown = faCaretDown;
   public keyFormControl: FormControl;
+  public iSong: Song;
 
-  constructor(
-    private showSongService: ShowSongService,
-  ) {
-  }
-
-  public _song: Song;
+  public constructor(private showSongService: ShowSongService) {}
 
   @Input()
-  public set song(song: Song) {
-    this._song = song;
-    this.keys = !!song ? getScale(song.key) : [];
+  public set Song(song: Song) {
+    this.iSong = song;
+    this.keys = song ? getScale(song.key) : [];
   }
 
   public ngOnInit(): void {
     this.keyFormControl = new FormControl(this.showSong.key);
-    this.keyFormControl.valueChanges.subscribe(async value => {
-      await this.showSongService.update$(this.showId, this.showSong.id, {key: value});
+    this.keyFormControl.valueChanges.subscribe((value: string) => {
+      void this.showSongService.update$(this.showId, this.showSong.id, {key: value});
     });
   }
 
@@ -53,7 +48,6 @@ export class SongComponent implements OnInit {
     await this.showSongService.delete$(this.showId, this.showSong.id);
   }
 
-
   public async reorder(up: boolean): Promise<void> {
     if (up) {
       await this.reorderUp();
@@ -63,7 +57,7 @@ export class SongComponent implements OnInit {
   }
 
   public async reorderUp(): Promise<void> {
-    const index = this.showSongs.findIndex(_ => _.songId === this._song.id);
+    const index = this.showSongs.findIndex(_ => _.songId === this.iSong.id);
     if (index === 0) {
       return;
     }
@@ -71,12 +65,16 @@ export class SongComponent implements OnInit {
     const song = this.showSongs[index];
     const toggleSong = this.showSongs[index - 1];
 
-    await this.showSongService.update$(this.showId, song.id, {order: toggleSong.order});
-    await this.showSongService.update$(this.showId, toggleSong.id, {order: song.order});
+    await this.showSongService.update$(this.showId, song.id, {
+      order: toggleSong.order,
+    });
+    await this.showSongService.update$(this.showId, toggleSong.id, {
+      order: song.order,
+    });
   }
 
   public async reorderDown(): Promise<void> {
-    const index = this.showSongs.findIndex(_ => _.songId === this._song.id);
+    const index = this.showSongs.findIndex(_ => _.songId === this.iSong.id);
     if (index === this.showSongs.length - 1) {
       return;
     }
@@ -84,11 +82,17 @@ export class SongComponent implements OnInit {
     const song = this.showSongs[index];
     const toggleSong = this.showSongs[index + 1];
 
-    await this.showSongService.update$(this.showId, song.id, {order: toggleSong.order});
-    await this.showSongService.update$(this.showId, toggleSong.id, {order: song.order});
+    await this.showSongService.update$(this.showId, song.id, {
+      order: toggleSong.order,
+    });
+    await this.showSongService.update$(this.showId, toggleSong.id, {
+      order: song.order,
+    });
   }
 
   public async onChordModeChanged(value: ChordMode): Promise<void> {
-    await this.showSongService.update$(this.showId, this.showSong.id, {chordMode: value});
+    await this.showSongService.update$(this.showId, this.showSong.id, {
+      chordMode: value,
+    });
   }
 }
diff --git a/src/app/modules/shows/shows-routing.module.ts b/src/app/modules/shows/shows-routing.module.ts
index 720c566..661ad86 100644
--- a/src/app/modules/shows/shows-routing.module.ts
+++ b/src/app/modules/shows/shows-routing.module.ts
@@ -4,26 +4,24 @@ import {NewComponent} from './new/new.component';
 import {ListComponent} from './list/list.component';
 import {ShowComponent} from './show/show.component';
 
-
 const routes: Routes = [
   {
     path: '',
     pathMatch: 'full',
-    component: ListComponent
+    component: ListComponent,
   },
   {
     path: 'new',
-    component: NewComponent
+    component: NewComponent,
   },
   {
     path: ':showId',
-    component: ShowComponent
-  }
+    component: ShowComponent,
+  },
 ];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
-export class ShowsRoutingModule {
-}
+export class ShowsRoutingModule {}
diff --git a/src/app/modules/shows/shows.module.ts b/src/app/modules/shows/shows.module.ts
index da539b0..f65692c 100644
--- a/src/app/modules/shows/shows.module.ts
+++ b/src/app/modules/shows/shows.module.ts
@@ -29,7 +29,6 @@ import {OwnerModule} from '../../services/user/owner.module';
 import {UserNameModule} from '../../services/user/user-name/user-name.module';
 import {MatMenuModule} from '@angular/material/menu';
 
-
 @NgModule({
   declarations: [NewComponent, ListComponent, ListItemComponent, ShowComponent, SongComponent],
   imports: [
@@ -57,7 +56,6 @@ import {MatMenuModule} from '@angular/material/menu';
     OwnerModule,
     UserNameModule,
     MatMenuModule,
-  ]
+  ],
 })
-export class ShowsModule {
-}
+export class ShowsModule {}
diff --git a/src/app/modules/songs/services/file-data.service.spec.ts b/src/app/modules/songs/services/file-data.service.spec.ts
index 3c6ca8b..03516e5 100644
--- a/src/app/modules/songs/services/file-data.service.spec.ts
+++ b/src/app/modules/songs/services/file-data.service.spec.ts
@@ -3,10 +3,10 @@ import {TestBed} from '@angular/core/testing';
 import {FileDataService} from './file-data.service';
 
 describe('FileDataService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
+  beforeEach(() => void TestBed.configureTestingModule({}));
 
   it('should be created', () => {
-    const service: FileDataService = TestBed.get(FileDataService);
-    expect(service).toBeTruthy();
+    const service: FileDataService = TestBed.inject(FileDataService);
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/services/file-data.service.ts b/src/app/modules/songs/services/file-data.service.ts
index bcb8486..7c4b2c2 100644
--- a/src/app/modules/songs/services/file-data.service.ts
+++ b/src/app/modules/songs/services/file-data.service.ts
@@ -5,12 +5,10 @@ import {FileServer} from './fileServer';
 import {DbService} from '../../../services/db.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class FileDataService {
-
-  constructor(private db: DbService) {
-  }
+  public constructor(private db: DbService) {}
 
   public async set(songId: string, file: FileServer): Promise<string> {
     const songRef = this.db.doc('songs/' + songId);
@@ -27,8 +25,5 @@ export class FileDataService {
   public read$(songId: string): Observable<File[]> {
     const songRef = this.db.doc('songs/' + songId);
     return songRef.collection<File>('files').valueChanges({idField: 'id'});
-
   }
-
-
 }
diff --git a/src/app/modules/songs/services/file.service.spec.ts b/src/app/modules/songs/services/file.service.spec.ts
index cc88625..a75c9e0 100644
--- a/src/app/modules/songs/services/file.service.spec.ts
+++ b/src/app/modules/songs/services/file.service.spec.ts
@@ -6,11 +6,11 @@ describe('FileService', () => {
   let service: FileService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    void TestBed.configureTestingModule({});
     service = TestBed.inject(FileService);
   });
 
   it('should be created', () => {
-    expect(service).toBeTruthy();
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/services/file.service.ts b/src/app/modules/songs/services/file.service.ts
index dab9a92..57a7c35 100644
--- a/src/app/modules/songs/services/file.service.ts
+++ b/src/app/modules/songs/services/file.service.ts
@@ -4,22 +4,17 @@ import {Observable} from 'rxjs';
 import {FileDataService} from './file-data.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class FileService {
-
-  constructor(
-    private storage: AngularFireStorage,
-    private fileDataService: FileDataService
-  ) {
-  }
+  public constructor(private storage: AngularFireStorage, private fileDataService: FileDataService) {}
 
   public getDownloadUrl(path: string): Observable<string> {
     const ref = this.storage.ref(path);
-    return ref.getDownloadURL();
+    return ref.getDownloadURL() as Observable<string>;
   }
 
-  public async delete(path: string, songId: string, fileId: string) {
+  public async delete(path: string, songId: string, fileId: string): Promise<void> {
     const ref = this.storage.ref(path);
     await ref.delete().toPromise();
     await this.fileDataService.delete(songId, fileId);
diff --git a/src/app/modules/songs/services/fileBase.ts b/src/app/modules/songs/services/fileBase.ts
index 2423848..ed0341d 100644
--- a/src/app/modules/songs/services/fileBase.ts
+++ b/src/app/modules/songs/services/fileBase.ts
@@ -1,5 +1,4 @@
 export class FileBase {
-
   protected basePath = '/attachments';
-  protected directory = (songId: string) => `${this.basePath}/${songId}`;
+  protected directory: (songId: string) => string = (songId: string) => `${this.basePath}/${songId}`;
 }
diff --git a/src/app/modules/songs/services/key.helper.ts b/src/app/modules/songs/services/key.helper.ts
index 009ed66..86264e7 100644
--- a/src/app/modules/songs/services/key.helper.ts
+++ b/src/app/modules/songs/services/key.helper.ts
@@ -1,133 +1,156 @@
-export const KEYS = [
-  'C#', 'C', 'Db', 'D#', 'D', 'Eb', 'E', 'F#', 'F', 'Gb', 'G#', 'G', 'Ab', 'A#', 'A', 'B', 'H',
-  'c#', 'c', 'db', 'd#', 'd', 'eb', 'e', 'f#', 'f', 'gb', 'g#', 'g', 'ab', 'a#', 'a', 'b', 'h'
-];
-export const KEYS_MAJOR_FLAT = [
-  'C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'H',
-];
-export const KEYS_MAJOR_B = [
-  'C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'B', 'H',
-];
-export const KEYS_MINOR_FLAT = [
-  'c', 'c#', 'd', 'd#', 'e', 'f', 'f#', 'g', 'g#', 'a', 'a#', 'h',
-];
-export const KEYS_MINOR_B = [
-  'c', 'db', 'd', 'eb', 'e', 'f', 'gb', 'g', 'ab', 'a', 'b', 'h',
+export const KEYS: string[] = [
+  'C#',
+  'C',
+  'Db',
+  'D#',
+  'D',
+  'Eb',
+  'E',
+  'F#',
+  'F',
+  'Gb',
+  'G#',
+  'G',
+  'Ab',
+  'A#',
+  'A',
+  'B',
+  'H',
+  'c#',
+  'c',
+  'db',
+  'd#',
+  'd',
+  'eb',
+  'e',
+  'f#',
+  'f',
+  'gb',
+  'g#',
+  'g',
+  'ab',
+  'a#',
+  'a',
+  'b',
+  'h',
 ];
+export const KEYS_MAJOR_FLAT: string[] = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'H'];
+export const KEYS_MAJOR_B: string[] = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'B', 'H'];
+export const KEYS_MINOR_FLAT: string[] = ['c', 'c#', 'd', 'd#', 'e', 'f', 'f#', 'g', 'g#', 'a', 'a#', 'h'];
+export const KEYS_MINOR_B: string[] = ['c', 'db', 'd', 'eb', 'e', 'f', 'gb', 'g', 'ab', 'a', 'b', 'h'];
 
-export type scale = 'b' | 'flat'
+export type scale = 'b' | 'flat';
 
-const scaleTypeAssignment: { [key: string]: string[][] } = {
-  'C': [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
+const scaleTypeAssignment: {[key: string]: string[][]} = {
+  C: [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
   'C#': [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
-  'Db': [KEYS_MAJOR_B, KEYS_MINOR_B],
-  'D': [KEYS_MAJOR_B, KEYS_MINOR_B],
+  Db: [KEYS_MAJOR_B, KEYS_MINOR_B],
+  D: [KEYS_MAJOR_B, KEYS_MINOR_B],
   'D#': [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
-  'Eb': [KEYS_MAJOR_B, KEYS_MINOR_B],
-  'E': [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
-  'F': [KEYS_MAJOR_B, KEYS_MINOR_B],
+  Eb: [KEYS_MAJOR_B, KEYS_MINOR_B],
+  E: [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
+  F: [KEYS_MAJOR_B, KEYS_MINOR_B],
   'F#': [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
-  'Gb': [KEYS_MAJOR_B, KEYS_MINOR_B],
-  'G': [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
+  Gb: [KEYS_MAJOR_B, KEYS_MINOR_B],
+  G: [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
   'G#': [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
-  'Ab': [KEYS_MAJOR_B, KEYS_MINOR_B],
-  'A': [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
+  Ab: [KEYS_MAJOR_B, KEYS_MINOR_B],
+  A: [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
   'A#': [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
-  'B': [KEYS_MAJOR_B, KEYS_MINOR_B],
-  'H': [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
-  'c': [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
+  B: [KEYS_MAJOR_B, KEYS_MINOR_B],
+  H: [KEYS_MAJOR_FLAT, KEYS_MINOR_FLAT],
+  c: [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
   'c#': [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
-  'db': [KEYS_MINOR_B, KEYS_MAJOR_B],
-  'd': [KEYS_MINOR_B, KEYS_MAJOR_B],
+  db: [KEYS_MINOR_B, KEYS_MAJOR_B],
+  d: [KEYS_MINOR_B, KEYS_MAJOR_B],
   'd#': [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
-  'eb': [KEYS_MINOR_B, KEYS_MAJOR_B],
-  'e': [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
-  'f': [KEYS_MINOR_B, KEYS_MAJOR_B],
+  eb: [KEYS_MINOR_B, KEYS_MAJOR_B],
+  e: [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
+  f: [KEYS_MINOR_B, KEYS_MAJOR_B],
   'f#': [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
-  'gb': [KEYS_MINOR_B, KEYS_MAJOR_B],
-  'g': [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
+  gb: [KEYS_MINOR_B, KEYS_MAJOR_B],
+  g: [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
   'g#': [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
-  'ab': [KEYS_MINOR_B, KEYS_MAJOR_B],
-  'a': [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
+  ab: [KEYS_MINOR_B, KEYS_MAJOR_B],
+  a: [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
   'a#': [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
-  'b': [KEYS_MINOR_B, KEYS_MAJOR_B],
-  'h': [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
-}
-
-const scaleAssignment = {
-  'C': KEYS_MAJOR_FLAT,
-  'C#': KEYS_MAJOR_FLAT,
-  'Db': KEYS_MAJOR_B,
-  'D': KEYS_MAJOR_B,
-  'D#': KEYS_MAJOR_FLAT,
-  'Eb': KEYS_MAJOR_B,
-  'E': KEYS_MAJOR_FLAT,
-  'F': KEYS_MAJOR_B,
-  'F#': KEYS_MAJOR_FLAT,
-  'Gb': KEYS_MAJOR_B,
-  'G': KEYS_MAJOR_FLAT,
-  'G#': KEYS_MAJOR_FLAT,
-  'Ab': KEYS_MAJOR_B,
-  'A': KEYS_MAJOR_FLAT,
-  'A#': KEYS_MAJOR_FLAT,
-  'B': KEYS_MAJOR_B,
-  'H': KEYS_MAJOR_FLAT,
-  'c': KEYS_MINOR_FLAT,
-  'c#': KEYS_MINOR_FLAT,
-  'db': KEYS_MINOR_B,
-  'd': KEYS_MINOR_B,
-  'd#': KEYS_MINOR_FLAT,
-  'eb': KEYS_MINOR_B,
-  'e': KEYS_MINOR_FLAT,
-  'f': KEYS_MINOR_B,
-  'f#': KEYS_MINOR_FLAT,
-  'gb': KEYS_MINOR_B,
-  'g': KEYS_MINOR_FLAT,
-  'g#': KEYS_MINOR_FLAT,
-  'ab': KEYS_MINOR_B,
-  'a': KEYS_MINOR_FLAT,
-  'a#': KEYS_MINOR_FLAT,
-  'b': KEYS_MINOR_B,
-  'h': KEYS_MINOR_FLAT,
+  b: [KEYS_MINOR_B, KEYS_MAJOR_B],
+  h: [KEYS_MINOR_FLAT, KEYS_MAJOR_FLAT],
 };
 
-export const scaleMapping = {
-  'C': 'C',
+const scaleAssignment: {[key: string]: string[]} = {
+  C: KEYS_MAJOR_FLAT,
+  'C#': KEYS_MAJOR_FLAT,
+  Db: KEYS_MAJOR_B,
+  D: KEYS_MAJOR_B,
+  'D#': KEYS_MAJOR_FLAT,
+  Eb: KEYS_MAJOR_B,
+  E: KEYS_MAJOR_FLAT,
+  F: KEYS_MAJOR_B,
+  'F#': KEYS_MAJOR_FLAT,
+  Gb: KEYS_MAJOR_B,
+  G: KEYS_MAJOR_FLAT,
+  'G#': KEYS_MAJOR_FLAT,
+  Ab: KEYS_MAJOR_B,
+  A: KEYS_MAJOR_FLAT,
+  'A#': KEYS_MAJOR_FLAT,
+  B: KEYS_MAJOR_B,
+  H: KEYS_MAJOR_FLAT,
+  c: KEYS_MINOR_FLAT,
+  'c#': KEYS_MINOR_FLAT,
+  db: KEYS_MINOR_B,
+  d: KEYS_MINOR_B,
+  'd#': KEYS_MINOR_FLAT,
+  eb: KEYS_MINOR_B,
+  e: KEYS_MINOR_FLAT,
+  f: KEYS_MINOR_B,
+  'f#': KEYS_MINOR_FLAT,
+  gb: KEYS_MINOR_B,
+  g: KEYS_MINOR_FLAT,
+  'g#': KEYS_MINOR_FLAT,
+  ab: KEYS_MINOR_B,
+  a: KEYS_MINOR_FLAT,
+  'a#': KEYS_MINOR_FLAT,
+  b: KEYS_MINOR_B,
+  h: KEYS_MINOR_FLAT,
+};
+
+export const scaleMapping: {[key: string]: string} = {
+  C: 'C',
   'C#': 'C♯',
-  'Db': 'D♭',
-  'D': 'D',
+  Db: 'D♭',
+  D: 'D',
   'D#': 'D♯',
-  'Eb': 'E♭',
-  'E': 'E',
-  'F': 'F',
+  Eb: 'E♭',
+  E: 'E',
+  F: 'F',
   'F#': 'F♯',
-  'Gb': 'D♭',
-  'G': 'G',
+  Gb: 'D♭',
+  G: 'G',
   'G#': 'G♯',
-  'Ab': 'A♭',
-  'A': 'A',
+  Ab: 'A♭',
+  A: 'A',
   'A#': 'A♯',
-  'B': 'B',
-  'H': 'H',
-  'c': 'c',
+  B: 'B',
+  H: 'H',
+  c: 'c',
   'c#': 'c♯',
-  'db': 'd♭',
-  'd': 'd',
+  db: 'd♭',
+  d: 'd',
   'd#': 'd♯',
-  'eb': 'e♭',
-  'e': 'e',
-  'f': 'f',
+  eb: 'e♭',
+  e: 'e',
+  f: 'f',
   'f#': 'f♯',
-  'gb': 'g♭',
-  'g': 'g',
+  gb: 'g♭',
+  g: 'g',
   'g#': 'g♯',
-  'ab': 'a♭',
-  'a': 'a',
+  ab: 'a♭',
+  a: 'a',
   'a#': 'a♯',
-  'b': 'b',
-  'h': 'h',
+  b: 'b',
+  h: 'h',
 };
 
 export const getScale = (key: string): string[] => scaleAssignment[key];
 export const getScaleType = (key: string): string[][] => scaleTypeAssignment[key];
-
diff --git a/src/app/modules/songs/services/song-data.service.spec.ts b/src/app/modules/songs/services/song-data.service.spec.ts
index dc4299c..f5ee25f 100644
--- a/src/app/modules/songs/services/song-data.service.spec.ts
+++ b/src/app/modules/songs/services/song-data.service.spec.ts
@@ -5,37 +5,35 @@ import {AngularFirestore} from '@angular/fire/firestore';
 import {of} from 'rxjs';
 
 describe('SongDataService', () => {
-
-  const songs = [
-    {title: 'title1'}
-  ];
+  const songs = [{title: 'title1'}];
 
   const angularFirestoreCollection = {
-    valueChanges: () => of(songs)
+    valueChanges: () => of(songs),
   };
 
   const mockAngularFirestore = {
-    collection: () => angularFirestoreCollection
+    collection: () => angularFirestoreCollection,
   };
 
-  beforeEach(() => TestBed.configureTestingModule({
-    providers: [
-      {provide: AngularFirestore, useValue: mockAngularFirestore}
-    ]
-  }));
+  beforeEach(
+    () =>
+      void TestBed.configureTestingModule({
+        providers: [{provide: AngularFirestore, useValue: mockAngularFirestore}],
+      })
+  );
 
   it('should be created', () => {
-    const service: SongDataService = TestBed.get(SongDataService);
-    expect(service).toBeTruthy();
+    const service: SongDataService = TestBed.inject(SongDataService);
+    void expect(service).toBeTruthy();
   });
 
-  it('should list songs', waitForAsync(() => {
-    const service: SongDataService = TestBed.get(SongDataService);
-    service.list$().subscribe(s => {
-        expect(s).toEqual([
-          {title: 'title1'}
-        ] as any);
-      }
-    );
-  }));
+  it(
+    'should list songs',
+    waitForAsync(() => {
+      const service: SongDataService = TestBed.inject(SongDataService);
+      service.list$().subscribe(s => {
+        void expect(s[0].title).toEqual('title1');
+      });
+    })
+  );
 });
diff --git a/src/app/modules/songs/services/song-data.service.ts b/src/app/modules/songs/services/song-data.service.ts
index 086c0e9..9c65bf7 100644
--- a/src/app/modules/songs/services/song-data.service.ts
+++ b/src/app/modules/songs/services/song-data.service.ts
@@ -4,19 +4,16 @@ import {Observable} from 'rxjs';
 import {DbService} from '../../../services/db.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class SongDataService {
   private collection = 'songs';
 
-  constructor(private dbService: DbService) {
-  }
+  public constructor(private dbService: DbService) {}
 
   public list$ = (): Observable<Song[]> => this.dbService.col$(this.collection);
   public read$ = (songId: string): Observable<Song | undefined> => this.dbService.doc$(this.collection + '/' + songId);
   public update$ = async (songId: string, data: Partial<Song>): Promise<void> => await this.dbService.doc(this.collection + '/' + songId).update(data);
   public add = async (data: Partial<Song>): Promise<string> => (await this.dbService.col(this.collection).add(data)).id;
   public delete = async (songId: string): Promise<void> => await this.dbService.doc(this.collection + '/' + songId).delete();
-
 }
-
diff --git a/src/app/modules/songs/services/song.service.spec.ts b/src/app/modules/songs/services/song.service.spec.ts
index 88efaa7..22b6203 100644
--- a/src/app/modules/songs/services/song.service.spec.ts
+++ b/src/app/modules/songs/services/song.service.spec.ts
@@ -5,32 +5,31 @@ import {SongDataService} from './song-data.service';
 import {of} from 'rxjs';
 
 describe('SongService', () => {
-
-  const songs = [
-    {title: 'title1'}
-  ];
+  const songs = [{title: 'title1'}];
 
   const mockSongDataService = {
-    list: () => of(songs)
+    list: () => of(songs),
   };
 
-  beforeEach(() => TestBed.configureTestingModule({
-    providers: [
-      {provide: SongDataService, useValue: mockSongDataService}
-    ]
-  }));
+  beforeEach(
+    () =>
+      void TestBed.configureTestingModule({
+        providers: [{provide: SongDataService, useValue: mockSongDataService}],
+      })
+  );
 
   it('should be created', () => {
-    const service: SongService = TestBed.get(SongService);
-    expect(service).toBeTruthy();
+    const service: SongService = TestBed.inject(SongService);
+    void expect(service).toBeTruthy();
   });
 
-  it('should list songs', waitForAsync(() => {
-    const service: SongService = TestBed.get(SongService);
-    service.list$().subscribe(s => {
-      expect(s).toEqual([
-        {title: 'title1'}
-      ] as any);
-    });
-  }));
+  it(
+    'should list songs',
+    waitForAsync(() => {
+      const service: SongService = TestBed.inject(SongService);
+      service.list$().subscribe(s => {
+        void expect(s[0].title).toEqual('title1');
+      });
+    })
+  );
 });
diff --git a/src/app/modules/songs/services/song.service.ts b/src/app/modules/songs/services/song.service.ts
index 278a3d1..d2e66c7 100644
--- a/src/app/modules/songs/services/song.service.ts
+++ b/src/app/modules/songs/services/song.service.ts
@@ -2,31 +2,30 @@ import {Injectable} from '@angular/core';
 import {Observable} from 'rxjs';
 import {Song} from './song';
 import {SongDataService} from './song-data.service';
-import {first, tap} from 'rxjs/operators';
+import {first} from 'rxjs/operators';
 import {UserService} from '../../../services/user/user.service';
 import * as firebase from 'firebase';
 import Timestamp = firebase.firestore.Timestamp;
 
-declare var importCCLI: any;
+// declare let importCCLI: any;
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class SongService {
-
   public static TYPES = ['Praise', 'Worship'];
   public static STATUS = ['draft', 'set', 'final'];
 
   public static LEGAL_OWNER = ['CCLI', 'other'];
   public static LEGAL_TYPE = ['open', 'allowed'];
 
-  private list: Song[];
+  // private list: Song[];
 
-  constructor(private songDataService: SongDataService, private userService: UserService) {
-    importCCLI = (songs: Song[]) => this.updateFromCLI(songs);
+  public constructor(private songDataService: SongDataService, private userService: UserService) {
+    // importCCLI = (songs: Song[]) => this.updateFromCLI(songs);
   }
 
-  public list$ = (): Observable<Song[]> => this.songDataService.list$().pipe(tap(_ => this.list = _));
+  public list$ = (): Observable<Song[]> => this.songDataService.list$(); //.pipe(tap(_ => (this.list = _)));
   public read$ = (songId: string): Observable<Song | undefined> => this.songDataService.read$(songId);
   public read = (songId: string): Promise<Song | undefined> => this.read$(songId).pipe(first()).toPromise();
 
@@ -38,38 +37,41 @@ export class SongService {
     await this.songDataService.update$(songId, {...data, edits});
   }
 
-  public async new(number: number, title: string): Promise<string> {
-    return await this.songDataService.add({number, title, status: 'draft', legalType: 'open'});
+  public async new(songNumber: number, title: string): Promise<string> {
+    return await this.songDataService.add({
+      number: songNumber,
+      title,
+      status: 'draft',
+      legalType: 'open',
+    });
   }
 
   public async delete(songId: string): Promise<void> {
     await this.songDataService.delete(songId);
   }
 
-// https://www.csvjson.com/csv2json
-  private async updateFromCLI(songs: Song[]) {
-    const mapped = songs.map(_ => ({
-      number: _.number,
-      legalType: _.legalType === 'ja' ? 'allowed' : 'open',
-      legalOwner: _.legalOwner === 'ja' ? 'CCLI' : 'other',
-      title: _.title,
-      legalOwnerId: _.legalOwnerId,
-      origin: _.origin,
-      artist: _.artist,
-      comment: _.comment
-    }));
-    const promises = this.list.map(async _ => {
-      // tslint:disable-next-line:triple-equals
-      const mappedSongs = mapped.filter(f => f.number == _.number);
-      if (mappedSongs.length === 1) {
-        const mappedSong = mappedSongs[0];
-        const id = _.id;
-        return await this.update$(id, mappedSong);
-      }
-    });
-
-    await Promise.all(promises);
-  }
-
-
+  // https://www.csvjson.com/csv2json
+  // private async updateFromCLI(songs: Song[]) {
+  // 	const mapped = songs.map(_ => ({
+  // 		number: _.number,
+  // 		legalType: _.legalType === 'ja' ? 'allowed' : 'open',
+  // 		legalOwner: _.legalOwner === 'ja' ? 'CCLI' : 'other',
+  // 		title: _.title,
+  // 		legalOwnerId: _.legalOwnerId,
+  // 		origin: _.origin,
+  // 		artist: _.artist,
+  // 		comment: _.comment,
+  // 	}));
+  // 	const promises = this.list.map(async _ => {
+  // 		// eslint-disable-next-line eqeqeq
+  // 		const mappedSongs = mapped.filter(f => f.number == _.number);
+  // 		if (mappedSongs.length === 1) {
+  // 			const mappedSong = mappedSongs[0];
+  // 			const id = _.id;
+  // 			return await this.update$(id, mappedSong);
+  // 		}
+  // 	});
+  //
+  // 	await Promise.all(promises);
+  // }
 }
diff --git a/src/app/modules/songs/services/text-rendering.service.spec.ts b/src/app/modules/songs/services/text-rendering.service.spec.ts
index 6e3df32..6f28483 100644
--- a/src/app/modules/songs/services/text-rendering.service.spec.ts
+++ b/src/app/modules/songs/services/text-rendering.service.spec.ts
@@ -1,6 +1,7 @@
 import {TestBed} from '@angular/core/testing';
-
-import {LineType, SectionType, TextRenderingService} from './text-rendering.service';
+import {TextRenderingService} from './text-rendering.service';
+import {LineType} from './line-type';
+import {SectionType} from './section-type';
 
 describe('TextRenderingService', () => {
   const testText = `Strophe
@@ -23,60 +24,59 @@ Bridge
 Cool bridge without any chords
 `;
 
-
-  beforeEach(() => TestBed.configureTestingModule({}));
+  beforeEach(() => void TestBed.configureTestingModule({}));
 
   it('should be created', () => {
-    const service: TextRenderingService = TestBed.get(TextRenderingService);
-    expect(service).toBeTruthy();
+    const service: TextRenderingService = TestBed.inject(TextRenderingService);
+    void expect(service).toBeTruthy();
   });
 
   it('should parse section types', () => {
-    const service: TextRenderingService = TestBed.get(TextRenderingService);
+    const service: TextRenderingService = TestBed.inject(TextRenderingService);
     const sections = service.parse(testText, null);
-    expect(sections[0].type).toBe(SectionType.Verse);
-    expect(sections[0].number).toBe(0);
-    expect(sections[1].type).toBe(SectionType.Verse);
-    expect(sections[1].number).toBe(1);
-    expect(sections[2].type).toBe(SectionType.Chorus);
-    expect(sections[2].number).toBe(0);
-    expect(sections[3].type).toBe(SectionType.Bridge);
-    expect(sections[3].number).toBe(0);
+    void expect(sections[0].type).toBe(SectionType.Verse);
+    void expect(sections[0].number).toBe(0);
+    void expect(sections[1].type).toBe(SectionType.Verse);
+    void expect(sections[1].number).toBe(1);
+    void expect(sections[2].type).toBe(SectionType.Chorus);
+    void expect(sections[2].number).toBe(0);
+    void expect(sections[3].type).toBe(SectionType.Bridge);
+    void expect(sections[3].number).toBe(0);
   });
 
   it('should parse text lines', () => {
-    const service: TextRenderingService = TestBed.get(TextRenderingService);
+    const service: TextRenderingService = TestBed.inject(TextRenderingService);
     const sections = service.parse(testText, null);
-    expect(sections[0].lines[1].type).toBe(LineType.text);
-    expect(sections[0].lines[1].text).toBe('Text Line 1-1');
-    expect(sections[0].lines[3].type).toBe(LineType.text);
-    expect(sections[0].lines[3].text).toBe('Text Line 2-1');
-    expect(sections[1].lines[1].type).toBe(LineType.text);
-    expect(sections[1].lines[1].text).toBe('Text Line 1-2');
-    expect(sections[1].lines[3].type).toBe(LineType.text);
-    expect(sections[1].lines[3].text).toBe('Text Line 2-2');
-    expect(sections[2].lines[1].type).toBe(LineType.text);
-    expect(sections[2].lines[1].text).toBe('and the chorus');
-    expect(sections[3].lines[0].type).toBe(LineType.text);
-    expect(sections[3].lines[0].text).toBe('Cool bridge without any chords');
+    void expect(sections[0].lines[1].type).toBe(LineType.text);
+    void expect(sections[0].lines[1].text).toBe('Text Line 1-1');
+    void expect(sections[0].lines[3].type).toBe(LineType.text);
+    void expect(sections[0].lines[3].text).toBe('Text Line 2-1');
+    void expect(sections[1].lines[1].type).toBe(LineType.text);
+    void expect(sections[1].lines[1].text).toBe('Text Line 1-2');
+    void expect(sections[1].lines[3].type).toBe(LineType.text);
+    void expect(sections[1].lines[3].text).toBe('Text Line 2-2');
+    void expect(sections[2].lines[1].type).toBe(LineType.text);
+    void expect(sections[2].lines[1].text).toBe('and the chorus');
+    void expect(sections[3].lines[0].type).toBe(LineType.text);
+    void expect(sections[3].lines[0].text).toBe('Cool bridge without any chords');
   });
 
   it('should parse chord lines', () => {
     const service: TextRenderingService = TestBed.inject(TextRenderingService);
     const sections = service.parse(testText, null);
-    expect(sections[0].lines[0].type).toBe(LineType.chord);
-    expect(sections[0].lines[0].text).toBe('C D E F G A H');
-    expect(sections[0].lines[2].type).toBe(LineType.chord);
-    expect(sections[0].lines[2].text).toBe(' a d e f g a h c b');
-    expect(sections[1].lines[0].type).toBe(LineType.chord);
-    expect(sections[1].lines[0].text).toBe('C D E F G A H');
-    expect(sections[1].lines[2].type).toBe(LineType.chord);
-    expect(sections[1].lines[2].text).toBe(' a d e f g a h c b');
-    expect(sections[2].lines[0].type).toBe(LineType.chord);
-    expect(sections[2].lines[0].text).toBe('c c# db c7   cmaj7    c/e');
+    void expect(sections[0].lines[0].type).toBe(LineType.chord);
+    void expect(sections[0].lines[0].text).toBe('C D E F G A H');
+    void expect(sections[0].lines[2].type).toBe(LineType.chord);
+    void expect(sections[0].lines[2].text).toBe(' a d e f g a h c b');
+    void expect(sections[1].lines[0].type).toBe(LineType.chord);
+    void expect(sections[1].lines[0].text).toBe('C D E F G A H');
+    void expect(sections[1].lines[2].type).toBe(LineType.chord);
+    void expect(sections[1].lines[2].text).toBe(' a d e f g a h c b');
+    void expect(sections[2].lines[0].type).toBe(LineType.chord);
+    void expect(sections[2].lines[0].text).toBe('c c# db c7   cmaj7    c/e');
 
     // c c# db c7   cmaj7    c/e
-    expect(sections[2].lines[0].chords).toEqual([
+    void expect(sections[2].lines[0].chords).toEqual([
       {chord: 'c', length: 1, position: 0},
       {chord: 'c#', length: 2, position: 2},
       {chord: 'db', length: 2, position: 5},
@@ -92,10 +92,9 @@ Cool bridge without any chords
 g#       F#         E          g#       F#          E
 text`;
     const sections = service.parse(text, null);
-    expect(sections[0].lines[0].type).toBe(LineType.chord);
-    expect(sections[0].lines[0].text).toBe('g#       F#         E          g#       F#          E');
-    expect(sections[0].lines[1].type).toBe(LineType.text);
-    expect(sections[0].lines[1].text).toBe('text');
-
+    void expect(sections[0].lines[0].type).toBe(LineType.chord);
+    void expect(sections[0].lines[0].text).toBe('g#       F#         E          g#       F#          E');
+    void expect(sections[0].lines[1].type).toBe(LineType.text);
+    void expect(sections[0].lines[1].text).toBe('text');
   });
 });
diff --git a/src/app/modules/songs/services/text-rendering.service.ts b/src/app/modules/songs/services/text-rendering.service.ts
index 365ad68..b4ca903 100644
--- a/src/app/modules/songs/services/text-rendering.service.ts
+++ b/src/app/modules/songs/services/text-rendering.service.ts
@@ -8,13 +8,12 @@ import {Chord} from './chord';
 import {Line} from './line';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class TextRenderingService {
   private regexSection = /(Strophe|Refrain|Bridge)/;
 
-  constructor(private transposeService: TransposeService) {
-  }
+  public constructor(private transposeService: TransposeService) {}
 
   public parse(text: string, transpose: TransposeMode): Section[] {
     if (!text) {
@@ -28,12 +27,15 @@ export class TextRenderingService {
     };
     return arrayOfLines.reduce((array, line) => {
       const type = this.getSectionTypeOfLine(line);
-      if (line.match(this.regexSection)) {
-        return [...array, {
-          type,
-          number: indices[type]++,
-          lines: []
-        }];
+      if (this.regexSection.exec(line)) {
+        return [
+          ...array,
+          {
+            type,
+            number: indices[type]++,
+            lines: [],
+          },
+        ];
       }
       array[array.length - 1].lines.push(this.getLineOfLineText(line, transpose));
       return array;
@@ -49,36 +51,35 @@ export class TextRenderingService {
     const type = hasMatches ? LineType.chord : LineType.text;
 
     const line = {type, text, chords: hasMatches ? cords : undefined};
-    return transpose
-      ? this.transposeService.transpose(line, transpose.baseKey, transpose.targetKey)
-      : this.transposeService.renderChords(line);
+    return transpose ? this.transposeService.transpose(line, transpose.baseKey, transpose.targetKey) : this.transposeService.renderChords(line);
   }
 
   private getSectionTypeOfLine(line: string): SectionType {
     if (!line) {
       return null;
     }
-    const match = line.match(this.regexSection);
+    const match = this.regexSection.exec(line);
     if (!match || match.length < 2) {
       return null;
     }
     const typeString = match[1];
     switch (typeString) {
-      case  'Strophe':
+      case 'Strophe':
         return SectionType.Verse;
-      case  'Refrain':
+      case 'Refrain':
         return SectionType.Chorus;
-      case  'Bridge':
+      case 'Bridge':
         return SectionType.Bridge;
     }
   }
 
   private readChords(chordLine: string): Chord[] {
-    let match;
+    let match: string[];
     const chords: Chord[] = [];
 
     // https://regex101.com/r/68jMB8/5
-    const regex = /(C#|C|Db|D#|D|Eb|E|F#|F|Gb|G#|G|Ab|A#|A|B|H|c#|c|db|d#|d|eb|e|f#|f|gb|g#|g|ab|a#|a|b|h)(\/(C#|C|Db|D#|D|Eb|E|F#|F|Gb|G#|G|Ab|A#|A|B|H|c#|c|db|d#|d|eb|e|f#|f|gb|g#|g|ab|a#|a|b|h))?(\d+|maj7)?/mg;
+    const regex =
+      /(C#|C|Db|D#|D|Eb|E|F#|F|Gb|G#|G|Ab|A#|A|B|H|c#|c|db|d#|d|eb|e|f#|f|gb|g#|g|ab|a#|a|b|h)(\/(C#|C|Db|D#|D|Eb|E|F#|F|Gb|G#|G|Ab|A#|A|B|H|c#|c|db|d#|d|eb|e|f#|f|gb|g#|g|ab|a#|a|b|h))?(\d+|maj7)?/gm;
 
     while ((match = regex.exec(chordLine)) !== null) {
       const chord: Chord = {
@@ -101,5 +102,4 @@ export class TextRenderingService {
     const isChrod = chordCount * 1.2 > lineCount;
     return isChrod ? chords : [];
   }
-
 }
diff --git a/src/app/modules/songs/services/transpose.service.spec.ts b/src/app/modules/songs/services/transpose.service.spec.ts
index 1616e46..8b3ad06 100644
--- a/src/app/modules/songs/services/transpose.service.spec.ts
+++ b/src/app/modules/songs/services/transpose.service.spec.ts
@@ -6,7 +6,7 @@ describe('TransposeService', () => {
   let service: TransposeService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    void TestBed.configureTestingModule({});
     service = TestBed.inject(TransposeService);
   });
 
@@ -15,6 +15,6 @@ describe('TransposeService', () => {
     const map = service.getMap('D', distance);
 
     console.log(map);
-    expect(service).toBeTruthy();
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/services/transpose.service.ts b/src/app/modules/songs/services/transpose.service.ts
index 74817bd..818ba25 100644
--- a/src/app/modules/songs/services/transpose.service.ts
+++ b/src/app/modules/songs/services/transpose.service.ts
@@ -4,11 +4,12 @@ import {LineType} from './line-type';
 import {Chord} from './chord';
 import {Line} from './line';
 
+type TransposeMap = {[key: string]: string};
+
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class TransposeService {
-
   public transpose(line: Line, baseKey: string, targetKey: string): Line {
     if (line.type !== LineType.chord) {
       return line;
@@ -33,13 +34,10 @@ export class TransposeService {
 
   public getDistance(baseKey: string, targetKey: string): number {
     const scale = getScaleType(baseKey);
-    return scale ? (
-      (scale[0].indexOf(targetKey) - scale[0].indexOf(baseKey)) ??
-      (scale[1].indexOf(targetKey) - scale[1].indexOf(baseKey))
-    ) % 12 : 0;
+    return scale ? (scale[0].indexOf(targetKey) - scale[0].indexOf(baseKey) ?? scale[1].indexOf(targetKey) - scale[1].indexOf(baseKey)) % 12 : 0;
   }
 
-  public getMap(baseKey: string, difference: number) {
+  public getMap(baseKey: string, difference: number): TransposeMap | null {
     const scale = getScaleType(baseKey);
     if (!scale) {
       return null;
@@ -59,10 +57,14 @@ export class TransposeService {
     return map;
   }
 
-  private transposeChord(chord: Chord, map: {}): Chord {
+  private transposeChord(chord: Chord, map: TransposeMap): Chord {
     const translatedChord = map[chord.chord];
     const translatedSlashChord = chord.slashChord ? map[chord.slashChord] : null;
-    return {...chord, chord: translatedChord, slashChord: translatedSlashChord};
+    return {
+      ...chord,
+      chord: translatedChord,
+      slashChord: translatedSlashChord,
+    };
   }
 
   private renderLine(chords: Chord[]): string {
@@ -83,9 +85,6 @@ export class TransposeService {
   }
 
   private renderChord(chord: Chord) {
-    return (
-      scaleMapping[chord.chord] +
-      (chord.add ? chord.add : '') +
-      (chord.slashChord ? '/' + scaleMapping[chord.slashChord] : ''));
+    return scaleMapping[chord.chord] + (chord.add ? chord.add : '') + (chord.slashChord ? '/' + scaleMapping[chord.slashChord] : '');
   }
 }
diff --git a/src/app/modules/songs/services/upload.service.spec.ts b/src/app/modules/songs/services/upload.service.spec.ts
index 087c665..11d88b0 100644
--- a/src/app/modules/songs/services/upload.service.spec.ts
+++ b/src/app/modules/songs/services/upload.service.spec.ts
@@ -3,10 +3,10 @@ import {TestBed} from '@angular/core/testing';
 import {UploadService} from './upload.service';
 
 describe('UploadServiceService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
+  beforeEach(() => void TestBed.configureTestingModule({}));
 
   it('should be created', () => {
-    const service: UploadService = TestBed.get(UploadService);
-    expect(service).toBeTruthy();
+    const service: UploadService = TestBed.inject(UploadService);
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/services/upload.service.ts b/src/app/modules/songs/services/upload.service.ts
index 6626cfb..59d4da7 100644
--- a/src/app/modules/songs/services/upload.service.ts
+++ b/src/app/modules/songs/services/upload.service.ts
@@ -6,17 +6,15 @@ import {finalize} from 'rxjs/operators';
 import {FileBase} from './fileBase';
 import {FileServer} from './fileServer';
 
-
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class UploadService extends FileBase {
-
-  constructor(private fileDataService: FileDataService, private angularFireStorage: AngularFireStorage) {
+  public constructor(private fileDataService: FileDataService, private angularFireStorage: AngularFireStorage) {
     super();
   }
 
-  public async pushUpload(songId: string, upload: Upload) {
+  public pushUpload(songId: string, upload: Upload): void {
     const directory = this.directory(songId);
     const filePath = `${directory}/${upload.file.name}`;
     upload.path = directory;
@@ -24,20 +22,18 @@ export class UploadService extends FileBase {
     const ref = this.angularFireStorage.ref(filePath);
     const task = ref.put(upload.file);
 
-    task.percentageChanges().subscribe(percent => upload.progress = percent);
-    task.snapshotChanges().pipe(
-      finalize(() => {
-        this.saveFileData(songId, upload);
-      })
-    ).subscribe();
-
+    task.percentageChanges().subscribe(percent => (upload.progress = percent));
+    task
+      .snapshotChanges()
+      .pipe(finalize(() => void this.saveFileData(songId, upload)))
+      .subscribe();
   }
 
   private async saveFileData(songId: string, upload: Upload) {
     const file: FileServer = {
       name: upload.file.name,
       path: upload.path,
-      createdAt: new Date()
+      createdAt: new Date(),
     };
     await this.fileDataService.set(songId, file);
   }
diff --git a/src/app/modules/songs/services/upload.ts b/src/app/modules/songs/services/upload.ts
index eef7279..771258f 100644
--- a/src/app/modules/songs/services/upload.ts
+++ b/src/app/modules/songs/services/upload.ts
@@ -1,13 +1,12 @@
 export class Upload {
+  public $key: string;
+  public file: File;
+  public name: string;
+  public path: string;
+  public progress: number;
+  public createdAt: Date = new Date();
 
-  $key: string;
-  file: Upload;
-  name: string;
-  path: string;
-  progress: number;
-  createdAt: Date = new Date();
-
-  constructor(file: Upload) {
+  public constructor(file: File) {
     this.file = file;
   }
 }
diff --git a/src/app/modules/songs/song-list/filter/filter.component.html b/src/app/modules/songs/song-list/filter/filter.component.html
index 7cbdba7..d2be6b3 100644
--- a/src/app/modules/songs/song-list/filter/filter.component.html
+++ b/src/app/modules/songs/song-list/filter/filter.component.html
@@ -1,8 +1,7 @@
 <div [formGroup]="filterFormGroup">
-
   <mat-form-field appearance="outline">
     <mat-label>Titel oder Text</mat-label>
-    <input formControlName="q" matInput>
+    <input formControlName="q" matInput/>
   </mat-form-field>
 
   <div class="third">
@@ -10,16 +9,19 @@
       <mat-label>Typ</mat-label>
       <mat-select formControlName="type">
         <mat-option [value]="null">- kein Filter -</mat-option>
-        <mat-option *ngFor="let type of types" [value]="type">{{type | songType}}</mat-option>
+        <mat-option *ngFor="let type of types" [value]="type">{{
+          type | songType
+          }}</mat-option>
       </mat-select>
     </mat-form-field>
 
-
     <mat-form-field appearance="outline">
       <mat-label>Tonart</mat-label>
       <mat-select formControlName="key">
         <mat-option [value]="null">- kein Filter -</mat-option>
-        <mat-option *ngFor="let key of keys" [value]="key">{{key|key}}</mat-option>
+        <mat-option *ngFor="let key of keys" [value]="key">{{
+          key | key
+          }}</mat-option>
       </mat-select>
     </mat-form-field>
 
@@ -27,7 +29,9 @@
       <mat-label>Rechtlicher Status</mat-label>
       <mat-select formControlName="legalType">
         <mat-option [value]="null">- kein Filter -</mat-option>
-        <mat-option *ngFor="let key of legalType" [value]="key">{{key|legalType}}</mat-option>
+        <mat-option *ngFor="let key of legalType" [value]="key">{{
+          key | legalType
+          }}</mat-option>
       </mat-select>
     </mat-form-field>
 
@@ -35,10 +39,12 @@
       <mat-label>Attribute</mat-label>
       <mat-select formControlName="flag">
         <mat-option [value]="null">- kein Filter -</mat-option>
-        <mat-option *ngFor="let flag of getFlags()" [value]="flag">{{flag}}</mat-option>
+        <mat-option *ngFor="let flag of getFlags()" [value]="flag">{{
+          flag
+          }}</mat-option>
       </mat-select>
     </mat-form-field>
   </div>
 
-  <i>Anzahl der Suchergebnisse: {{songs.length}}</i>
+  <i>Anzahl der Suchergebnisse: {{ songs.length }}</i>
 </div>
diff --git a/src/app/modules/songs/song-list/filter/filter.component.spec.ts b/src/app/modules/songs/song-list/filter/filter.component.spec.ts
index ba07836..a8f8006 100644
--- a/src/app/modules/songs/song-list/filter/filter.component.spec.ts
+++ b/src/app/modules/songs/song-list/filter/filter.component.spec.ts
@@ -6,12 +6,13 @@ describe('FilterComponent', () => {
   let component: FilterComponent;
   let fixture: ComponentFixture<FilterComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [FilterComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [FilterComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(FilterComponent);
@@ -20,6 +21,6 @@ describe('FilterComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/song-list/filter/filter.component.ts b/src/app/modules/songs/song-list/filter/filter.component.ts
index 1055704..cc3acf7 100644
--- a/src/app/modules/songs/song-list/filter/filter.component.ts
+++ b/src/app/modules/songs/song-list/filter/filter.component.ts
@@ -1,4 +1,4 @@
-import {Component, Input, OnInit} from '@angular/core';
+import {Component, Input} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {FormBuilder, FormGroup} from '@angular/forms';
 import {SongService} from '../../services/song.service';
@@ -9,18 +9,17 @@ import {KEYS} from '../../services/key.helper';
 @Component({
   selector: 'app-filter',
   templateUrl: './filter.component.html',
-  styleUrls: ['./filter.component.less']
+  styleUrls: ['./filter.component.less'],
 })
-export class FilterComponent implements OnInit {
-
+export class FilterComponent {
   public filterFormGroup: FormGroup;
-  @Input() route: string;
-  @Input() songs: Song[];
+  @Input() public route: string;
+  @Input() public songs: Song[];
   public types = SongService.TYPES;
   public legalType = SongService.LEGAL_TYPE;
   public keys = KEYS;
 
-  constructor(private router: Router, activatedRoute: ActivatedRoute, fb: FormBuilder) {
+  public constructor(private router: Router, activatedRoute: ActivatedRoute, fb: FormBuilder) {
     this.filterFormGroup = fb.group({
       q: '',
       type: '',
@@ -30,32 +29,18 @@ export class FilterComponent implements OnInit {
     });
 
     activatedRoute.queryParams.subscribe((filterValues: FilterValues) => {
-      if (filterValues.q) {
-        this.filterFormGroup.controls.q.setValue(filterValues.q);
-      }
-      if (filterValues.type) {
-        this.filterFormGroup.controls.type.setValue(filterValues.type);
-      }
-      if (filterValues.key) {
-        this.filterFormGroup.controls.key.setValue(filterValues.key);
-      }
-      if (filterValues.legalType) {
-        this.filterFormGroup.controls.legalType.setValue(filterValues.legalType);
-      }
-      if (filterValues.flag) {
-        this.filterFormGroup.controls.flag.setValue(filterValues.flag);
-      }
+      if (filterValues.q) this.filterFormGroup.controls.q.setValue(filterValues.q);
+      if (filterValues.type) this.filterFormGroup.controls.type.setValue(filterValues.type);
+      if (filterValues.key) this.filterFormGroup.controls.key.setValue(filterValues.key);
+      if (filterValues.legalType) this.filterFormGroup.controls.legalType.setValue(filterValues.legalType);
+      if (filterValues.flag) this.filterFormGroup.controls.flag.setValue(filterValues.flag);
     });
 
-    this.filterFormGroup.controls.q.valueChanges.subscribe(_ => this.filerValueChanged('q', _));
-    this.filterFormGroup.controls.key.valueChanges.subscribe(_ => this.filerValueChanged('key', _));
-    this.filterFormGroup.controls.type.valueChanges.subscribe(_ => this.filerValueChanged('type', _));
-    this.filterFormGroup.controls.legalType.valueChanges.subscribe(_ => this.filerValueChanged('legalType', _));
-    this.filterFormGroup.controls.flag.valueChanges.subscribe(_ => this.filerValueChanged('flag', _));
-
-  }
-
-  ngOnInit(): void {
+    this.filterFormGroup.controls.q.valueChanges.subscribe(_ => void this.filerValueChanged('q', _));
+    this.filterFormGroup.controls.key.valueChanges.subscribe(_ => void this.filerValueChanged('key', _));
+    this.filterFormGroup.controls.type.valueChanges.subscribe(_ => void this.filerValueChanged('type', _));
+    this.filterFormGroup.controls.legalType.valueChanges.subscribe(_ => void this.filerValueChanged('legalType', _));
+    this.filterFormGroup.controls.flag.valueChanges.subscribe(_ => void this.filerValueChanged('flag', _));
   }
 
   public getFlags(): string[] {
@@ -66,13 +51,14 @@ export class FilterComponent implements OnInit {
       .reduce((pn, u) => [...pn, ...u], [])
       .filter(_ => !!_);
 
-    const uqFlags = flags.filter((n, i) => flags.indexOf(n) === i);
-
-    return uqFlags;
+    return flags.filter((n, i) => flags.indexOf(n) === i);
   }
 
   private async filerValueChanged(key: string, value: string): Promise<void> {
-    const route = this.router.createUrlTree([this.route], {queryParams: {[key]: value}, queryParamsHandling: 'merge'});
+    const route = this.router.createUrlTree([this.route], {
+      queryParams: {[key]: value},
+      queryParamsHandling: 'merge',
+    });
     await this.router.navigateByUrl(route);
   }
 }
diff --git a/src/app/modules/songs/song-list/list-item/list-item.component.html b/src/app/modules/songs/song-list/list-item/list-item.component.html
index a8a82a9..8631a64 100644
--- a/src/app/modules/songs/song-list/list-item/list-item.component.html
+++ b/src/app/modules/songs/song-list/list-item/list-item.component.html
@@ -1,22 +1,40 @@
 <div class="list-item">
-  <div class="number">{{song.number}}</div>
-  <div>{{song.title}}</div>
+  <div class="number">{{ song.number }}</div>
+  <div>{{ song.title }}</div>
   <div>
     <ng-container *appRole="['contributor']">
-      <span *ngIf="song.status==='draft' || !song.status" class="warning" matTooltip="Entwurf"
-            matTooltipPosition="before">
+      <span
+        *ngIf="song.status === 'draft' || !song.status"
+        class="warning"
+        matTooltip="Entwurf"
+        matTooltipPosition="before"
+      >
         <fa-icon [icon]="faDraft"></fa-icon> &nbsp;
       </span>
-      <span *ngIf="song.status==='set'" class="neutral" matTooltip="Entwurf" matTooltipPosition="before">
+      <span
+        *ngIf="song.status === 'set'"
+        class="neutral"
+        matTooltip="Entwurf"
+        matTooltipPosition="before"
+      >
         <fa-icon [icon]="faDraft"></fa-icon> &nbsp;
       </span>
-      <span *ngIf="song.status==='final'" class="success" matTooltip="Final" matTooltipPosition="before">
+      <span
+        *ngIf="song.status === 'final'"
+        class="success"
+        matTooltip="Final"
+        matTooltipPosition="before"
+      >
         <fa-icon [icon]="faFinal"></fa-icon> &nbsp;
       </span>
     </ng-container>
-    <span *ngIf="song.legalType==='open'" class="warning" matTooltip="rechtlicher Status ist ungeklärt"
-          matTooltipPosition="before"><fa-icon [icon]="faLegal"></fa-icon> &nbsp;</span>
+    <span
+      *ngIf="song.legalType === 'open'"
+      class="warning"
+      matTooltip="rechtlicher Status ist ungeklärt"
+      matTooltipPosition="before"
+    ><fa-icon [icon]="faLegal"></fa-icon> &nbsp;</span
+    >
   </div>
-  <div>{{song.key}}</div>
-
+  <div>{{ song.key }}</div>
 </div>
diff --git a/src/app/modules/songs/song-list/list-item/list-item.component.spec.ts b/src/app/modules/songs/song-list/list-item/list-item.component.spec.ts
index 7a279f8..236b19e 100644
--- a/src/app/modules/songs/song-list/list-item/list-item.component.spec.ts
+++ b/src/app/modules/songs/song-list/list-item/list-item.component.spec.ts
@@ -6,12 +6,13 @@ describe('ListItemComponent', () => {
   let component: ListItemComponent;
   let fixture: ComponentFixture<ListItemComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ListItemComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [ListItemComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ListItemComponent);
@@ -20,6 +21,6 @@ describe('ListItemComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/song-list/list-item/list-item.component.ts b/src/app/modules/songs/song-list/list-item/list-item.component.ts
index 3aba02c..aa12f27 100644
--- a/src/app/modules/songs/song-list/list-item/list-item.component.ts
+++ b/src/app/modules/songs/song-list/list-item/list-item.component.ts
@@ -1,4 +1,4 @@
-import {Component, Input, OnInit} from '@angular/core';
+import {Component, Input} from '@angular/core';
 import {Song} from '../../services/song';
 import {faBalanceScaleRight} from '@fortawesome/free-solid-svg-icons/faBalanceScaleRight';
 import {faPencilRuler} from '@fortawesome/free-solid-svg-icons/faPencilRuler';
@@ -7,18 +7,11 @@ import {faCheck} from '@fortawesome/free-solid-svg-icons/faCheck';
 @Component({
   selector: 'app-list-item',
   templateUrl: './list-item.component.html',
-  styleUrls: ['./list-item.component.less']
+  styleUrls: ['./list-item.component.less'],
 })
-export class ListItemComponent implements OnInit {
+export class ListItemComponent {
   @Input() public song: Song;
   public faLegal = faBalanceScaleRight;
   public faDraft = faPencilRuler;
   public faFinal = faCheck;
-
-  constructor() {
-  }
-
-  ngOnInit() {
-  }
-
 }
diff --git a/src/app/modules/songs/song-list/song-list.component.html b/src/app/modules/songs/song-list/song-list.component.html
index b0308d4..d1d4841 100644
--- a/src/app/modules/songs/song-list/song-list.component.html
+++ b/src/app/modules/songs/song-list/song-list.component.html
@@ -4,6 +4,10 @@
   </app-list-header>
 
   <app-card [padding]="false">
-    <app-list-item *ngFor="let song of songs" [routerLink]="song.id" [song]="song"></app-list-item>
+    <app-list-item
+      *ngFor="let song of songs"
+      [routerLink]="song.id"
+      [song]="song"
+    ></app-list-item>
   </app-card>
 </div>
diff --git a/src/app/modules/songs/song-list/song-list.component.spec.ts b/src/app/modules/songs/song-list/song-list.component.spec.ts
index 55899f1..1358b77 100644
--- a/src/app/modules/songs/song-list/song-list.component.spec.ts
+++ b/src/app/modules/songs/song-list/song-list.component.spec.ts
@@ -9,24 +9,21 @@ describe('SongListComponent', () => {
   let component: SongListComponent;
   let fixture: ComponentFixture<SongListComponent>;
 
-  const songs = [
-    {title: 'title1'}
-  ];
+  const songs = [{title: 'title1'}];
 
   const mockSongService = {
-    list: () => of(songs)
+    list: () => of(songs),
   };
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [SongListComponent],
-      providers: [
-        {provide: SongService, useValue: mockSongService}
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [SongListComponent],
+        providers: [{provide: SongService, useValue: mockSongService}],
+        schemas: [NO_ERRORS_SCHEMA],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(SongListComponent);
@@ -35,13 +32,11 @@ describe('SongListComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 
   it('should read songs from SongService', fakeAsync(() => {
     tick();
-    expect(component.songs$).toEqual([
-      {title: 'title1'}
-    ] as any);
+    void expect(component.songs$).toEqual([{title: 'title1'}]);
   }));
 });
diff --git a/src/app/modules/songs/song-list/song-list.component.ts b/src/app/modules/songs/song-list/song-list.component.ts
index aa35254..93fa4b4 100644
--- a/src/app/modules/songs/song-list/song-list.component.ts
+++ b/src/app/modules/songs/song-list/song-list.component.ts
@@ -13,28 +13,21 @@ import {ScrollService} from '../../../services/scroll.service';
   selector: 'app-songs',
   templateUrl: './song-list.component.html',
   styleUrls: ['./song-list.component.less'],
-  animations: [fade]
+  animations: [fade],
 })
 export class SongListComponent implements OnInit, OnDestroy {
-
   public songs$: Observable<Song[]>;
   public anyFilterActive = false;
 
-  constructor(
-    private songService: SongService,
-    private activatedRoute: ActivatedRoute,
-    private scrollService: ScrollService) {
-  }
+  public constructor(private songService: SongService, private activatedRoute: ActivatedRoute, private scrollService: ScrollService) {}
 
-  ngOnInit() {
+  public ngOnInit(): void {
     const filter$ = this.activatedRoute.queryParams.pipe(
       debounceTime(300),
       map(_ => _ as FilterValues)
     );
 
-    const songs$ = this.songService.list$().pipe(
-      map(songs => songs.sort((a, b) => a.number - b.number)),
-    );
+    const songs$ = this.songService.list$().pipe(map(songs => songs.sort((a, b) => a.number - b.number)));
 
     this.songs$ = combineLatest([filter$, songs$]).pipe(
       map(_ => {
diff --git a/src/app/modules/songs/song-list/song-list.module.ts b/src/app/modules/songs/song-list/song-list.module.ts
index aacf720..566fc09 100644
--- a/src/app/modules/songs/song-list/song-list.module.ts
+++ b/src/app/modules/songs/song-list/song-list.module.ts
@@ -17,7 +17,6 @@ import {MatTooltipModule} from '@angular/material/tooltip';
 import {RoleModule} from '../../../services/user/role.module';
 import {KeyTranslatorModule} from '../../../widget-modules/pipes/key-translator/key-translator.module';
 
-
 @NgModule({
   declarations: [SongListComponent, ListItemComponent, FilterComponent],
   exports: [SongListComponent],
@@ -37,7 +36,6 @@ import {KeyTranslatorModule} from '../../../widget-modules/pipes/key-translator/
     MatTooltipModule,
     RoleModule,
     KeyTranslatorModule,
-  ]
+  ],
 })
-export class SongListModule {
-}
+export class SongListModule {}
diff --git a/src/app/modules/songs/song/edit/edit-file/edit-file.component.html b/src/app/modules/songs/song/edit/edit-file/edit-file.component.html
index dfc2981..563ace7 100644
--- a/src/app/modules/songs/song/edit/edit-file/edit-file.component.html
+++ b/src/app/modules/songs/song/edit/edit-file/edit-file.component.html
@@ -1,26 +1,29 @@
 <app-card heading="Angehängte Dateien">
-
-
   <div *ngIf="currentUpload">
     <div class="progress">
-      <div [ngStyle]="{ 'width': currentUpload?.progress + '%' }" class="progress-bar progress-bar-animated"></div>
+      <div
+        [ngStyle]="{ width: currentUpload?.progress + '%' }"
+        class="progress-bar progress-bar-animated"
+      ></div>
     </div>
-    Progress: {{currentUpload?.name}} | {{currentUpload?.progress}}% Complete
+    Progress: {{ currentUpload?.name }} | {{ currentUpload?.progress }}%
+    Complete
   </div>
   <div class="upload">
     <label>
-      <input (change)="detectFiles($event)" type="file">
+      <input (change)="detectFiles($event)" type="file"/>
     </label>
 
-    <button (click)="uploadSingle()"
-            [disabled]="!selectedFiles"
-            mat-icon-button>
+    <button
+      (click)="uploadSingle()"
+      [disabled]="!selectedFiles"
+      mat-icon-button
+    >
       <mat-icon>cloud_upload</mat-icon>
     </button>
   </div>
 
-  <p *ngFor="let file of (files$|async)">
+  <p *ngFor="let file of files$ | async">
     <app-file [file]="file" [songId]="songId"></app-file>
   </p>
 </app-card>
-
diff --git a/src/app/modules/songs/song/edit/edit-file/edit-file.component.spec.ts b/src/app/modules/songs/song/edit/edit-file/edit-file.component.spec.ts
index 492a87f..2efd50b 100644
--- a/src/app/modules/songs/song/edit/edit-file/edit-file.component.spec.ts
+++ b/src/app/modules/songs/song/edit/edit-file/edit-file.component.spec.ts
@@ -6,12 +6,13 @@ describe('EditFileComponent', () => {
   let component: EditFileComponent;
   let fixture: ComponentFixture<EditFileComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [EditFileComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [EditFileComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(EditFileComponent);
@@ -20,6 +21,6 @@ describe('EditFileComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/song/edit/edit-file/edit-file.component.ts b/src/app/modules/songs/song/edit/edit-file/edit-file.component.ts
index 3814406..c45b37d 100644
--- a/src/app/modules/songs/song/edit/edit-file/edit-file.component.ts
+++ b/src/app/modules/songs/song/edit/edit-file/edit-file.component.ts
@@ -10,41 +10,33 @@ import {File} from '../../../services/file';
 @Component({
   selector: 'app-edit-file',
   templateUrl: './edit-file.component.html',
-  styleUrls: ['./edit-file.component.less']
+  styleUrls: ['./edit-file.component.less'],
 })
 export class EditFileComponent {
-
   public selectedFiles: FileList;
   public currentUpload: Upload;
   public songId: string;
   public files$: Observable<File[]>;
 
-
-  constructor(
-    private activatedRoute: ActivatedRoute,
-    private uploadService: UploadService,
-    private fileService: FileDataService,
-  ) {
-    this.activatedRoute.params.pipe(
-      map(param => param.songId),
-    ).subscribe(songId => {
+  public constructor(private activatedRoute: ActivatedRoute, private uploadService: UploadService, private fileService: FileDataService) {
+    this.activatedRoute.params.pipe(map((param: {songId: string}) => param.songId)).subscribe(songId => {
       this.songId = songId;
     });
 
     this.files$ = this.activatedRoute.params.pipe(
-      map(param => param.songId),
+      map((param: {songId: string}) => param.songId),
       switchMap(songId => this.fileService.read$(songId))
     );
   }
 
-  detectFiles(event) {
-    this.selectedFiles = event.target.files;
+  public detectFiles(event: Event): void {
+    const target = event.target as HTMLInputElement;
+    this.selectedFiles = target.files;
   }
 
-  public async uploadSingle() {
+  public uploadSingle(): void {
     const file = this.selectedFiles.item(0);
-    this.currentUpload = new Upload(file as any);
-    await this.uploadService.pushUpload(this.songId, this.currentUpload);
+    this.currentUpload = new Upload(file);
+    this.uploadService.pushUpload(this.songId, this.currentUpload);
   }
-
 }
diff --git a/src/app/modules/songs/song/edit/edit-file/file/file.component.html b/src/app/modules/songs/song/edit/edit-file/file/file.component.html
index cffaf84..c26aa9b 100644
--- a/src/app/modules/songs/song/edit/edit-file/file/file.component.html
+++ b/src/app/modules/songs/song/edit/edit-file/file/file.component.html
@@ -2,4 +2,4 @@
   <fa-icon [icon]="faTrash"></fa-icon>
 </button>
 
-<a [href]="url$|async" target="_blank">{{name}}</a>
+<a [href]="url$ | async" target="_blank">{{ name }}</a>
diff --git a/src/app/modules/songs/song/edit/edit-file/file/file.component.spec.ts b/src/app/modules/songs/song/edit/edit-file/file/file.component.spec.ts
index 7518d85..c105148 100644
--- a/src/app/modules/songs/song/edit/edit-file/file/file.component.spec.ts
+++ b/src/app/modules/songs/song/edit/edit-file/file/file.component.spec.ts
@@ -6,12 +6,13 @@ describe('FileComponent', () => {
   let component: FileComponent;
   let fixture: ComponentFixture<FileComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [FileComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [FileComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(FileComponent);
@@ -20,6 +21,6 @@ describe('FileComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/song/edit/edit-file/file/file.component.ts b/src/app/modules/songs/song/edit/edit-file/file/file.component.ts
index 24dc809..2cab6b7 100644
--- a/src/app/modules/songs/song/edit/edit-file/file/file.component.ts
+++ b/src/app/modules/songs/song/edit/edit-file/file/file.component.ts
@@ -7,20 +7,20 @@ import {FileService} from '../../../../services/file.service';
 @Component({
   selector: 'app-file',
   templateUrl: './file.component.html',
-  styleUrls: ['./file.component.less']
+  styleUrls: ['./file.component.less'],
 })
 export class FileComponent {
   public url$: Observable<string>;
   public name: string;
   public faTrash = faTrashAlt;
-  @Input() songId: string;
+  @Input() public songId: string;
   private fileId: string;
   private path: string;
 
-  constructor(private fileService: FileService) {
-  }
+  public constructor(private fileService: FileService) {}
 
-  @Input() set file(file: File) {
+  @Input()
+  public set file(file: File) {
     this.url$ = this.fileService.getDownloadUrl(file.path + '/' + file.name);
     this.name = file.name;
     this.fileId = file.id;
diff --git a/src/app/modules/songs/song/edit/edit-song.guard.spec.ts b/src/app/modules/songs/song/edit/edit-song.guard.spec.ts
index 8dfe6e0..c703463 100644
--- a/src/app/modules/songs/song/edit/edit-song.guard.spec.ts
+++ b/src/app/modules/songs/song/edit/edit-song.guard.spec.ts
@@ -6,11 +6,11 @@ describe('EditSongGuard', () => {
   let guard: EditSongGuard;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    void TestBed.configureTestingModule({});
     guard = TestBed.inject(EditSongGuard);
   });
 
   it('should be created', () => {
-    expect(guard).toBeTruthy();
+    void expect(guard).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/song/edit/edit-song.guard.ts b/src/app/modules/songs/song/edit/edit-song.guard.ts
index 4517861..3d5126c 100644
--- a/src/app/modules/songs/song/edit/edit-song.guard.ts
+++ b/src/app/modules/songs/song/edit/edit-song.guard.ts
@@ -4,16 +4,15 @@ import {Observable} from 'rxjs';
 import {EditComponent} from './edit.component';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class EditSongGuard implements CanDeactivate<unknown> {
-  canDeactivate(
+  public canDeactivate(
     component: EditComponent,
     currentRoute: ActivatedRouteSnapshot,
     currentState: RouterStateSnapshot,
-    nextState?: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
-
+    nextState?: RouterStateSnapshot
+  ): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
     return component.editSongComponent.askForSave(nextState);
   }
-
 }
diff --git a/src/app/modules/songs/song/edit/edit-song/edit-song.component.html b/src/app/modules/songs/song/edit/edit-song/edit-song.component.html
index 1b3b75c..64c1d31 100644
--- a/src/app/modules/songs/song/edit/edit-song/edit-song.component.html
+++ b/src/app/modules/songs/song/edit/edit-song/edit-song.component.html
@@ -1,48 +1,58 @@
 <app-card *ngIf="song" [heading]="song.number + ' bearbeiten'" closeLink="../">
-
   <form [formGroup]="form" class="form">
     <mat-form-field appearance="outline">
       <mat-label>Titel</mat-label>
-      <input formControlName="title" matInput>
+      <input formControlName="title" matInput/>
     </mat-form-field>
 
     <div class="fourth">
       <mat-form-field appearance="outline">
         <mat-label>Typ</mat-label>
         <mat-select formControlName="type">
-          <mat-option *ngFor="let type of types" [value]="type">{{type | songType}}</mat-option>
+          <mat-option *ngFor="let type of types" [value]="type">{{
+            type | songType
+            }}</mat-option>
         </mat-select>
       </mat-form-field>
       <mat-form-field appearance="outline">
         <mat-label>Tonart</mat-label>
         <mat-select formControlName="key">
-          <mat-option *ngFor="let key of keys" [value]="key">{{key|key}}</mat-option>
+          <mat-option *ngFor="let key of keys" [value]="key">{{
+            key | key
+            }}</mat-option>
         </mat-select>
       </mat-form-field>
       <mat-form-field appearance="outline">
         <mat-label>Tempo</mat-label>
-        <input formControlName="tempo" matInput>
+        <input formControlName="tempo" matInput/>
       </mat-form-field>
       <mat-form-field appearance="outline">
         <mat-label>Status</mat-label>
         <mat-select formControlName="status">
-          <mat-option *ngFor="let status of status" [value]="status">{{status | status}}</mat-option>
+          <mat-option *ngFor="let status of status" [value]="status">{{
+            status | status
+            }}</mat-option>
         </mat-select>
       </mat-form-field>
     </div>
 
     <mat-form-field appearance="outline">
       <mat-label>Songtext</mat-label>
-      <textarea (focus)="songtextFocus=true" (focusout)="songtextFocus=false" [mat-autosize]="true"
-                formControlName="text" matInput></textarea>
+      <textarea
+        (focus)="songtextFocus = true"
+        (focusout)="songtextFocus = false"
+        [mat-autosize]="true"
+        formControlName="text"
+        matInput
+      ></textarea>
     </mat-form-field>
     <div *ngIf="songtextFocus" class="song-text-help">
       <h3>Vorschau</h3>
       <app-song-text [text]="form.value.text" chordMode="show"></app-song-text>
       <h3>Hinweise zur Bearbeitung</h3>
       <h4>Aufbau</h4>
-      Der Liedtext wird hintereinander weg geschrieben. Dabei werden Strophen, Refrain und Bridge jeweils durch
-      eine zusätzliche Zeile Markiert. z.B.
+      Der Liedtext wird hintereinander weg geschrieben. Dabei werden Strophen,
+      Refrain und Bridge jeweils durch eine zusätzliche Zeile Markiert. z.B.
       <pre>
         Strophe
         Text der ersten Strophe
@@ -54,9 +64,10 @@
         Und hier der Refrain
       </pre>
       <h3>Akkorde</h3>
-      Die Akktorde werden jeweils in der Zeile über dem jeweiligen Liedtext geschrieben.
-      Sie werden jeweils durch Leerzeichen an die entsprechende Position gebracht.
-      Bitte keine Tabulatoren verwenden! Folgende Schreibweisen sind erlaubt:
+      Die Akktorde werden jeweils in der Zeile über dem jeweiligen Liedtext
+      geschrieben. Sie werden jeweils durch Leerzeichen an die entsprechende
+      Position gebracht. Bitte keine Tabulatoren verwenden! Folgende
+      Schreibweisen sind erlaubt:
       <pre>
         Dur: C  D  E
         Moll: c  d  e
@@ -76,21 +87,31 @@
 
     <mat-form-field appearance="outline">
       <mat-label>Kommentar</mat-label>
-      <textarea [mat-autosize]="true" formControlName="comment" matInput></textarea>
+      <textarea
+        [mat-autosize]="true"
+        formControlName="comment"
+        matInput
+      ></textarea>
     </mat-form-field>
 
     <mat-form-field appearance="outline">
       <mat-chip-list #chipList>
-        <mat-chip (removed)="removeFlag(flag)" *ngFor="let flag of flags"
-                  [removable]="true" [selectable]="false">
-          {{flag}}&nbsp;
+        <mat-chip
+          (removed)="removeFlag(flag)"
+          *ngFor="let flag of flags"
+          [removable]="true"
+          [selectable]="false"
+        >
+          {{ flag }}&nbsp;
           <fa-icon (click)="removeFlag(flag)" [icon]="faRemove"></fa-icon>
         </mat-chip>
-        <input (matChipInputTokenEnd)="addFlag($event)"
-               [matChipInputAddOnBlur]="true"
-               [matChipInputFor]="chipList"
-               [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-               placeholder="Attribute">
+        <input
+          (matChipInputTokenEnd)="addFlag($event)"
+          [matChipInputAddOnBlur]="true"
+          [matChipInputFor]="chipList"
+          [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+          placeholder="Attribute"
+        />
       </mat-chip-list>
     </mat-form-field>
 
@@ -98,54 +119,62 @@
       <mat-form-field appearance="outline">
         <mat-label>Rechtlicher Status</mat-label>
         <mat-select formControlName="legalType">
-          <mat-option *ngFor="let key of legalType" [value]="key">{{key|legalType}}</mat-option>
+          <mat-option *ngFor="let key of legalType" [value]="key">{{
+            key | legalType
+            }}</mat-option>
         </mat-select>
       </mat-form-field>
 
       <mat-form-field appearance="outline">
         <mat-label>Rechteinhaber</mat-label>
         <mat-select formControlName="legalOwner">
-          <mat-option *ngFor="let key of legalOwner" [value]="key">{{key|legalOwner}}</mat-option>
+          <mat-option *ngFor="let key of legalOwner" [value]="key">{{
+            key | legalOwner
+            }}</mat-option>
         </mat-select>
       </mat-form-field>
 
       <mat-form-field appearance="outline">
         <mat-label>Rechteinhaber ID (z.B. CCLI Liednummer)</mat-label>
-        <input formControlName="legalOwnerId" matInput>
-        <a *ngIf="form.value.legalOwner==='CCLI'" class="link-ccli"
-           href="https://songselect.ccli.com/Songs/{{form.value.legalOwnerId}}"
-           matSuffix
-           matTooltip="CCLI Link: https://songselect.ccli.com/Songs/{{form.value.legalOwnerId}}"
-           matTooltipPosition="before" target="_blank">
+        <input formControlName="legalOwnerId" matInput/>
+        <a
+          *ngIf="form.value.legalOwner === 'CCLI'"
+          class="link-ccli"
+          href="https://songselect.ccli.com/Songs/{{ form.value.legalOwnerId }}"
+          matSuffix
+          matTooltip="CCLI Link: https://songselect.ccli.com/Songs/{{
+            form.value.legalOwnerId
+          }}"
+          matTooltipPosition="before"
+          target="_blank"
+        >
           <fa-icon [icon]="faLink"></fa-icon>
         </a>
       </mat-form-field>
 
       <mat-form-field appearance="outline">
         <mat-label>Künstler</mat-label>
-        <input formControlName="artist" matInput>
+        <input formControlName="artist" matInput/>
       </mat-form-field>
 
       <mat-form-field appearance="outline">
         <mat-label>Verlag</mat-label>
-        <input formControlName="label" matInput>
+        <input formControlName="label" matInput/>
       </mat-form-field>
 
       <mat-form-field appearance="outline">
         <mat-label>Nutzungsbedingungen</mat-label>
-        <input formControlName="termsOfUse" matInput>
+        <input formControlName="termsOfUse" matInput/>
       </mat-form-field>
 
       <mat-form-field appearance="outline">
         <mat-label>abweichende Quelle</mat-label>
-        <input formControlName="origin" matInput>
+        <input formControlName="origin" matInput/>
       </mat-form-field>
     </div>
-
   </form>
 
   <app-button-row>
     <app-button (click)="onSave()" [icon]="faSave">Speichern</app-button>
   </app-button-row>
 </app-card>
-
diff --git a/src/app/modules/songs/song/edit/edit-song/edit-song.component.spec.ts b/src/app/modules/songs/song/edit/edit-song/edit-song.component.spec.ts
index c8219cf..2b141a2 100644
--- a/src/app/modules/songs/song/edit/edit-song/edit-song.component.spec.ts
+++ b/src/app/modules/songs/song/edit/edit-song/edit-song.component.spec.ts
@@ -6,12 +6,13 @@ describe('EditSongComponent', () => {
   let component: EditSongComponent;
   let fixture: ComponentFixture<EditSongComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [EditSongComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [EditSongComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(EditSongComponent);
@@ -20,6 +21,6 @@ describe('EditSongComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/song/edit/edit-song/edit-song.component.ts b/src/app/modules/songs/song/edit/edit-song/edit-song.component.ts
index eff4f6e..c1688b8 100644
--- a/src/app/modules/songs/song/edit/edit-song/edit-song.component.ts
+++ b/src/app/modules/songs/song/edit/edit-song/edit-song.component.ts
@@ -17,7 +17,7 @@ import {SaveDialogComponent} from './save-dialog/save-dialog.component';
 @Component({
   selector: 'app-edit-song',
   templateUrl: './edit-song.component.html',
-  styleUrls: ['./edit-song.component.less']
+  styleUrls: ['./edit-song.component.less'],
 })
 export class EditSongComponent implements OnInit {
   public song: Song;
@@ -28,36 +28,31 @@ export class EditSongComponent implements OnInit {
   public legalOwner = SongService.LEGAL_OWNER;
   public legalType = SongService.LEGAL_TYPE;
   public flags: string[] = [];
-  readonly separatorKeysCodes: number[] = [ENTER, COMMA];
+  public readonly separatorKeysCodes: number[] = [ENTER, COMMA];
   public faRemove = faTimesCircle;
   public faSave = faSave;
   public faLink = faExternalLinkAlt;
   public songtextFocus = false;
 
-  constructor(
-    private activatedRoute: ActivatedRoute,
-    private songService: SongService,
-    private editService: EditService,
-    private router: Router,
-    public dialog: MatDialog
-  ) {
-  }
+  public constructor(private activatedRoute: ActivatedRoute, private songService: SongService, private editService: EditService, private router: Router, public dialog: MatDialog) {}
 
   public ngOnInit(): void {
-    this.activatedRoute.params.pipe(
-      map(param => param.songId),
-      switchMap(songId => this.songService.read$(songId)),
-      first()
-    ).subscribe(song => {
-      this.song = song;
-      this.form = this.editService.createSongForm(song);
-      this.form.controls.flags.valueChanges.subscribe(_ => this.onFlagsChanged(_));
-      this.onFlagsChanged(this.form.controls.flags.value);
-    });
+    this.activatedRoute.params
+      .pipe(
+        map((param: {songId: string}) => param.songId),
+        switchMap(songId => this.songService.read$(songId)),
+        first()
+      )
+      .subscribe(song => {
+        this.song = song;
+        this.form = this.editService.createSongForm(song);
+        this.form.controls.flags.valueChanges.subscribe(_ => this.onFlagsChanged(_));
+        this.onFlagsChanged(this.form.controls.flags.value);
+      });
   }
 
   public async onSave(): Promise<void> {
-    const data = this.form.value;
+    const data = this.form.value as Partial<Song>;
     await this.songService.update$(this.song.id, data);
     this.form.markAsPristine();
     await this.router.navigateByUrl('songs/' + this.song.id);
@@ -83,6 +78,22 @@ export class EditSongComponent implements OnInit {
     }
   }
 
+  public askForSave(nextState?: RouterStateSnapshot): boolean {
+    if (!this.form.dirty) {
+      return true;
+    }
+
+    const dialogRef = this.dialog.open(SaveDialogComponent, {
+      width: '350px',
+    });
+
+    dialogRef.afterClosed().subscribe((save: boolean) => {
+      void this.onSaveDialogAfterClosed(save, nextState.url).then();
+    });
+
+    return false;
+  }
+
   private onFlagsChanged(flagArray: string): void {
     if (!flagArray) {
       this.flags = [];
@@ -92,30 +103,13 @@ export class EditSongComponent implements OnInit {
     this.flags = flagArray.split(';').filter(_ => !!_);
   }
 
-  public askForSave(nextState?: RouterStateSnapshot): boolean {
-    if (!this.form.dirty) {
-      return true;
-    }
-
-    const dialogRef = this.dialog.open(SaveDialogComponent, {
-      width: '350px'
-    });
-
-    dialogRef.afterClosed().subscribe((save: boolean) => {
-      this.onSaveDialogAfterClosed(save, nextState.url).then();
-    });
-
-    return false;
-  }
-
   private async onSaveDialogAfterClosed(save: boolean, url: string) {
     if (save) {
-      const data = this.form.value;
+      const data = this.form.value as Partial<Song>;
       await this.songService.update$(this.song.id, data);
     }
 
     this.form.markAsPristine();
     await this.router.navigateByUrl(url);
   }
-
 }
diff --git a/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.html b/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.html
index 9cf61ba..a512b12 100644
--- a/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.html
+++ b/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.html
@@ -4,5 +4,7 @@
 </div>
 <div mat-dialog-actions>
   <button [mat-dialog-close]="false" mat-button>Änderungen verwerfen</button>
-  <button [mat-dialog-close]="true" cdkFocusInitial mat-button>Speichern</button>
+  <button [mat-dialog-close]="true" cdkFocusInitial mat-button>
+    Speichern
+  </button>
 </div>
diff --git a/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.spec.ts b/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.spec.ts
index c306c0c..42affc3 100644
--- a/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.spec.ts
+++ b/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.spec.ts
@@ -6,12 +6,13 @@ describe('SaveDialogComponent', () => {
   let component: SaveDialogComponent;
   let fixture: ComponentFixture<SaveDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [SaveDialogComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [SaveDialogComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(SaveDialogComponent);
@@ -20,6 +21,6 @@ describe('SaveDialogComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.ts b/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.ts
index b8c6db1..81fa8de 100644
--- a/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.ts
+++ b/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.ts
@@ -1,16 +1,8 @@
-import {Component, OnInit} from '@angular/core';
+import {Component} from '@angular/core';
 
 @Component({
   selector: 'app-save-dialog',
   templateUrl: './save-dialog.component.html',
-  styleUrls: ['./save-dialog.component.less']
+  styleUrls: ['./save-dialog.component.less'],
 })
-export class SaveDialogComponent implements OnInit {
-
-  constructor() {
-  }
-
-  ngOnInit(): void {
-  }
-
-}
+export class SaveDialogComponent {}
diff --git a/src/app/modules/songs/song/edit/edit.component.spec.ts b/src/app/modules/songs/song/edit/edit.component.spec.ts
index 0389a29..0a12f00 100644
--- a/src/app/modules/songs/song/edit/edit.component.spec.ts
+++ b/src/app/modules/songs/song/edit/edit.component.spec.ts
@@ -6,12 +6,13 @@ describe('EditComponent', () => {
   let component: EditComponent;
   let fixture: ComponentFixture<EditComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [EditComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [EditComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(EditComponent);
@@ -20,6 +21,6 @@ describe('EditComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/song/edit/edit.component.ts b/src/app/modules/songs/song/edit/edit.component.ts
index c443790..70d9760 100644
--- a/src/app/modules/songs/song/edit/edit.component.ts
+++ b/src/app/modules/songs/song/edit/edit.component.ts
@@ -4,7 +4,7 @@ import {EditSongComponent} from './edit-song/edit-song.component';
 @Component({
   selector: 'app-edit',
   templateUrl: './edit.component.html',
-  styleUrls: ['./edit.component.less']
+  styleUrls: ['./edit.component.less'],
 })
 export class EditComponent {
   @ViewChild(EditSongComponent) public editSongComponent: EditSongComponent;
diff --git a/src/app/modules/songs/song/edit/edit.module.ts b/src/app/modules/songs/song/edit/edit.module.ts
index b31c89a..64e54f6 100644
--- a/src/app/modules/songs/song/edit/edit.module.ts
+++ b/src/app/modules/songs/song/edit/edit.module.ts
@@ -27,7 +27,6 @@ import {MatDialogModule} from '@angular/material/dialog';
 import {HistoryComponent} from './history/history.component';
 import {SongTextModule} from '../../../../widget-modules/components/song-text/song-text.module';
 
-
 @NgModule({
   declarations: [EditComponent, EditSongComponent, EditFileComponent, FileComponent, SaveDialogComponent, HistoryComponent],
   exports: [EditComponent],
@@ -56,8 +55,6 @@ import {SongTextModule} from '../../../../widget-modules/components/song-text/so
     MatTooltipModule,
     MatDialogModule,
     SongTextModule,
-
-  ]
+  ],
 })
-export class EditModule {
-}
+export class EditModule {}
diff --git a/src/app/modules/songs/song/edit/edit.service.spec.ts b/src/app/modules/songs/song/edit/edit.service.spec.ts
index 15a05e1..496b658 100644
--- a/src/app/modules/songs/song/edit/edit.service.spec.ts
+++ b/src/app/modules/songs/song/edit/edit.service.spec.ts
@@ -3,10 +3,10 @@ import {TestBed} from '@angular/core/testing';
 import {EditService} from './edit.service';
 
 describe('EditService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
+  beforeEach(() => void TestBed.configureTestingModule({}));
 
   it('should be created', () => {
-    const service: EditService = TestBed.get(EditService);
-    expect(service).toBeTruthy();
+    const service: EditService = TestBed.inject(EditService);
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/song/edit/edit.service.ts b/src/app/modules/songs/song/edit/edit.service.ts
index 95c16aa..31dc933 100644
--- a/src/app/modules/songs/song/edit/edit.service.ts
+++ b/src/app/modules/songs/song/edit/edit.service.ts
@@ -3,13 +3,9 @@ import {Song} from '../../services/song';
 import {FormControl, FormGroup} from '@angular/forms';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class EditService {
-
-  constructor() {
-  }
-
   public createSongForm(song: Song): FormGroup {
     return new FormGroup({
       text: new FormControl(song.text),
diff --git a/src/app/modules/songs/song/edit/history/history.component.html b/src/app/modules/songs/song/edit/history/history.component.html
index 318cfc5..bb44447 100644
--- a/src/app/modules/songs/song/edit/history/history.component.html
+++ b/src/app/modules/songs/song/edit/history/history.component.html
@@ -1,6 +1,6 @@
 <app-card *ngIf="song && song.edits" heading="letzte Änderungen">
   <div *ngFor="let edit of song.edits" class="list">
-    <div>{{edit.username}}</div>
-    <div>{{edit.timestamp.toDate()|date:'dd.MM.yyyy'}}</div>
+    <div>{{ edit.username }}</div>
+    <div>{{ edit.timestamp.toDate() | date: "dd.MM.yyyy" }}</div>
   </div>
 </app-card>
diff --git a/src/app/modules/songs/song/edit/history/history.component.spec.ts b/src/app/modules/songs/song/edit/history/history.component.spec.ts
index b00f179..ad53a54 100644
--- a/src/app/modules/songs/song/edit/history/history.component.spec.ts
+++ b/src/app/modules/songs/song/edit/history/history.component.spec.ts
@@ -6,12 +6,13 @@ describe('HistoryComponent', () => {
   let component: HistoryComponent;
   let fixture: ComponentFixture<HistoryComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [HistoryComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [HistoryComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(HistoryComponent);
@@ -20,6 +21,6 @@ describe('HistoryComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/song/edit/history/history.component.ts b/src/app/modules/songs/song/edit/history/history.component.ts
index 00032d3..3d2ef52 100644
--- a/src/app/modules/songs/song/edit/history/history.component.ts
+++ b/src/app/modules/songs/song/edit/history/history.component.ts
@@ -7,25 +7,22 @@ import {Song} from '../../../services/song';
 @Component({
   selector: 'app-history',
   templateUrl: './history.component.html',
-  styleUrls: ['./history.component.less']
+  styleUrls: ['./history.component.less'],
 })
 export class HistoryComponent implements OnInit {
   public song: Song;
 
-  constructor(
-    private activatedRoute: ActivatedRoute,
-    private songService: SongService,
-  ) {
-  }
-
+  public constructor(private activatedRoute: ActivatedRoute, private songService: SongService) {}
 
   public ngOnInit(): void {
-    this.activatedRoute.params.pipe(
-      map(param => param.songId),
-      switchMap(songId => this.songService.read$(songId)),
-      first()
-    ).subscribe(song => {
-      this.song = song;
-    });
+    this.activatedRoute.params
+      .pipe(
+        map((param: {songId: string}) => param.songId),
+        switchMap(songId => this.songService.read$(songId)),
+        first()
+      )
+      .subscribe(song => {
+        this.song = song;
+      });
   }
 }
diff --git a/src/app/modules/songs/song/file/file.component.html b/src/app/modules/songs/song/file/file.component.html
index a02880b..6cc5af5 100644
--- a/src/app/modules/songs/song/file/file.component.html
+++ b/src/app/modules/songs/song/file/file.component.html
@@ -1,3 +1,3 @@
-<a [href]="url$|async" target="_blank">
-  {{name}}
+<a [href]="url$ | async" target="_blank">
+  {{ name }}
 </a>
diff --git a/src/app/modules/songs/song/file/file.component.spec.ts b/src/app/modules/songs/song/file/file.component.spec.ts
index 7518d85..c105148 100644
--- a/src/app/modules/songs/song/file/file.component.spec.ts
+++ b/src/app/modules/songs/song/file/file.component.spec.ts
@@ -6,12 +6,13 @@ describe('FileComponent', () => {
   let component: FileComponent;
   let fixture: ComponentFixture<FileComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [FileComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [FileComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(FileComponent);
@@ -20,6 +21,6 @@ describe('FileComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/song/file/file.component.ts b/src/app/modules/songs/song/file/file.component.ts
index 836b927..36b1736 100644
--- a/src/app/modules/songs/song/file/file.component.ts
+++ b/src/app/modules/songs/song/file/file.component.ts
@@ -1,4 +1,4 @@
-import {Component, Input, OnInit} from '@angular/core';
+import {Component, Input} from '@angular/core';
 import {File} from '../../services/file';
 import {AngularFireStorage} from '@angular/fire/storage';
 import {Observable} from 'rxjs';
@@ -6,24 +6,18 @@ import {Observable} from 'rxjs';
 @Component({
   selector: 'app-file',
   templateUrl: './file.component.html',
-  styleUrls: ['./file.component.less']
+  styleUrls: ['./file.component.less'],
 })
-export class FileComponent implements OnInit {
+export class FileComponent {
   public url$: Observable<string>;
   public name: string;
 
-  constructor(private storage: AngularFireStorage) {
-  }
-
-  @Input() set file(file: File) {
+  public constructor(private storage: AngularFireStorage) {}
 
+  @Input()
+  public set file(file: File) {
     const ref = this.storage.ref(file.path + '/' + file.name);
-    this.url$ = ref.getDownloadURL();
+    this.url$ = ref.getDownloadURL() as Observable<string>;
     this.name = file.name;
-
   }
-
-  ngOnInit(): void {
-  }
-
 }
diff --git a/src/app/modules/songs/song/new/new.component.html b/src/app/modules/songs/song/new/new.component.html
index 64a4542..ea11cb1 100644
--- a/src/app/modules/songs/song/new/new.component.html
+++ b/src/app/modules/songs/song/new/new.component.html
@@ -1,13 +1,12 @@
 <app-card closeLink="../" heading="Neues Lied">
-
   <div [formGroup]="form" class="split">
     <mat-form-field appearance="outline">
       <mat-label>Nummer</mat-label>
-      <input formControlName="number" matInput>
+      <input formControlName="number" matInput/>
     </mat-form-field>
     <mat-form-field appearance="outline">
       <mat-label>Titel</mat-label>
-      <input autofocus formControlName="title" matInput>
+      <input autofocus formControlName="title" matInput/>
     </mat-form-field>
   </div>
 
@@ -15,4 +14,3 @@
     <app-button (click)="onSave()" [icon]="faSave">Anlegen</app-button>
   </app-button-row>
 </app-card>
-
diff --git a/src/app/modules/songs/song/new/new.component.spec.ts b/src/app/modules/songs/song/new/new.component.spec.ts
index 22a386c..2756000 100644
--- a/src/app/modules/songs/song/new/new.component.spec.ts
+++ b/src/app/modules/songs/song/new/new.component.spec.ts
@@ -6,12 +6,13 @@ describe('NewComponent', () => {
   let component: NewComponent;
   let fixture: ComponentFixture<NewComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [NewComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [NewComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(NewComponent);
@@ -20,6 +21,6 @@ describe('NewComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/songs/song/new/new.component.ts b/src/app/modules/songs/song/new/new.component.ts
index c907a09..e42438c 100644
--- a/src/app/modules/songs/song/new/new.component.ts
+++ b/src/app/modules/songs/song/new/new.component.ts
@@ -10,14 +10,13 @@ import {Router} from '@angular/router';
 @Component({
   selector: 'app-new',
   templateUrl: './new.component.html',
-  styleUrls: ['./new.component.less']
+  styleUrls: ['./new.component.less'],
 })
 export class NewComponent implements OnInit {
   public faSave = faSave;
   public form: FormGroup;
 
-  constructor(private songService: SongService, private router: Router) {
-  }
+  public constructor(private songService: SongService, private router: Router) {}
 
   public ngOnInit(): void {
     this.form = new FormGroup({
@@ -25,23 +24,27 @@ export class NewComponent implements OnInit {
       title: new FormControl(null, Validators.required),
     });
 
-    this.songService.list$().pipe(autoComplete(this)).subscribe(songs => {
-      const freeSongnumber = this.getFreeSongNumber(songs);
-      this.form.controls.number.setValue(freeSongnumber);
-    });
+    this.songService
+      .list$()
+      .pipe(autoComplete(this))
+      .subscribe(songs => {
+        const freeSongnumber = this.getFreeSongNumber(songs);
+        this.form.controls.number.setValue(freeSongnumber);
+      });
   }
 
   public async onSave(): Promise<void> {
-    const number = this.form.value.number;
-    const title = this.form.value.title;
-    const newSongId = await this.songService.new(number, title);
+    const value = this.form.value as {number: number; title: string};
+    const songNumber = value.number;
+    const title = value.title;
+    const newSongId = await this.songService.new(songNumber, title);
     await this.router.navigateByUrl('/songs/' + newSongId + '/edit');
   }
 
-  private getFreeSongNumber(songs: Song[]): Number {
-    const numbers = songs.map(_ => _.number);
+  private getFreeSongNumber(songs: Song[]): number {
+    const songNumber = songs.map(_ => _.number);
     for (let i = 1; i < Number.MAX_SAFE_INTEGER; i++) {
-      if (!numbers.some(_ => _ === i)) {
+      if (!songNumber.some(_ => _ === i)) {
         return i;
       }
     }
diff --git a/src/app/modules/songs/song/new/new.module.ts b/src/app/modules/songs/song/new/new.module.ts
index a553066..7cebdf3 100644
--- a/src/app/modules/songs/song/new/new.module.ts
+++ b/src/app/modules/songs/song/new/new.module.ts
@@ -9,19 +9,8 @@ import {ButtonRowModule} from '../../../../widget-modules/components/button-row/
 import {ButtonModule} from '../../../../widget-modules/components/button/button.module';
 import {AutofocusModule} from '../../../../widget-modules/directives/autofocus/autofocus.module';
 
-
 @NgModule({
   declarations: [NewComponent],
-  imports: [
-    CommonModule,
-    CardModule,
-    ReactiveFormsModule,
-    MatFormFieldModule,
-    MatInputModule,
-    ButtonRowModule,
-    ButtonModule,
-    AutofocusModule
-  ]
+  imports: [CommonModule, CardModule, ReactiveFormsModule, MatFormFieldModule, MatInputModule, ButtonRowModule, ButtonModule, AutofocusModule],
 })
-export class NewModule {
-}
+export class NewModule {}
diff --git a/src/app/modules/songs/song/song.component.html b/src/app/modules/songs/song/song.component.html
index 689ada4..22fcf38 100644
--- a/src/app/modules/songs/song/song.component.html
+++ b/src/app/modules/songs/song/song.component.html
@@ -1,47 +1,74 @@
 <div class="split">
-  <app-card *ngIf="song$ | async as song" [heading]="song.number + ' - ' + song.title" closeLink="../">
+  <app-card
+    *ngIf="song$ | async as song"
+    [heading]="song.number + ' - ' + song.title"
+    closeLink="../"
+  >
     <div class="song">
       <div>
         <div *appRole="['leader', 'contributor']" class="detail">
-          <div>Typ: {{song.type | songType}}</div>
-          <div>Tonart: {{song.key}}</div>
-          <div>Tempo: {{song.tempo}}</div>
-          <div>Status: {{(song.status|status) || 'entwurf'}}</div>
-          <div *ngIf="song.legalOwner">Rechteinhaber: {{song.legalOwner|legalOwner}}</div>
-          <div *ngIf="song.legalOwnerId && song.legalOwner==='CCLI'">
-            <a href="https://songselect.ccli.com/Songs/{{song.legalOwnerId}}" target="_blank">
-              CCLI Nummer: {{song.legalOwnerId}}
+          <div>Typ: {{ song.type | songType }}</div>
+          <div>Tonart: {{ song.key }}</div>
+          <div>Tempo: {{ song.tempo }}</div>
+          <div>Status: {{ (song.status | status) || "entwurf" }}</div>
+          <div *ngIf="song.legalOwner">
+            Rechteinhaber: {{ song.legalOwner | legalOwner }}
+          </div>
+          <div *ngIf="song.legalOwnerId && song.legalOwner === 'CCLI'">
+            <a
+              href="https://songselect.ccli.com/Songs/{{ song.legalOwnerId }}"
+              target="_blank"
+            >
+              CCLI Nummer: {{ song.legalOwnerId }}
             </a>
           </div>
-          <div *ngIf="song.legalOwnerId && song.legalOwner!=='CCLI'">Rechteinhaber ID: {{song.legalOwnerId}}</div>
-          <div *ngIf="song.artist">Künstler: {{song.artist}}</div>
-          <div *ngIf="song.label">Verlag: {{song.label}}</div>
-          <div *ngIf="song.origin">Quelle: {{song.origin}}</div>
-          <div *ngIf="song.origin">Quelle: {{song.origin}}</div>
+          <div *ngIf="song.legalOwnerId && song.legalOwner !== 'CCLI'">
+            Rechteinhaber ID: {{ song.legalOwnerId }}
+          </div>
+          <div *ngIf="song.artist">Künstler: {{ song.artist }}</div>
+          <div *ngIf="song.label">Verlag: {{ song.label }}</div>
+          <div *ngIf="song.origin">Quelle: {{ song.origin }}</div>
+          <div *ngIf="song.origin">Quelle: {{ song.origin }}</div>
         </div>
       </div>
 
       <!-- <div class="text">{{song.text}}</div>-->
-      <app-song-text *ngIf="user$|async as user" [chordMode]="user.chordMode" [showSwitch]="true"
-                     [text]="song.text"></app-song-text>
+      <app-song-text
+        *ngIf="user$ | async as user"
+        [chordMode]="user.chordMode"
+        [showSwitch]="true"
+        [text]="song.text"
+      ></app-song-text>
 
-      <mat-chip-list *appRole="['leader', 'contributor']" aria-label="Attribute">
-        <mat-chip *ngFor="let flag of getFlags(song.flags)">{{flag}}</mat-chip>
+      <mat-chip-list
+        *appRole="['leader', 'contributor']"
+        aria-label="Attribute"
+      >
+        <mat-chip *ngFor="let flag of getFlags(song.flags)">{{
+          flag
+          }}</mat-chip>
       </mat-chip-list>
 
-      <div *appRole="['leader', 'contributor']" class="text">{{song.comment}}</div>
-
+      <div *appRole="['leader', 'contributor']" class="text">
+        {{ song.comment }}
+      </div>
     </div>
 
     <app-button-row>
-      <app-button (click)="onDelete(song.id)" *appRole="['admin']" [icon]="faDelete">Löschen</app-button>
-      <app-button *appRole="['contributor']" [icon]="faEdit" routerLink="edit">Bearbeiten</app-button>
+      <app-button
+        (click)="onDelete(song.id)"
+        *appRole="['admin']"
+        [icon]="faDelete"
+      >Löschen
+      </app-button>
+      <app-button *appRole="['contributor']" [icon]="faEdit" routerLink="edit"
+      >Bearbeiten
+      </app-button>
     </app-button-row>
-
   </app-card>
-  <ng-container *ngIf="(files$|async) as files">
-    <app-card *ngIf="files.length>0" heading="Anhänge">
-      <p *ngFor="let file of (files$|async)">
+  <ng-container *ngIf="files$ | async as files">
+    <app-card *ngIf="files.length > 0" heading="Anhänge">
+      <p *ngFor="let file of files$ | async">
         <app-file [file]="file"></app-file>
       </p>
     </app-card>
diff --git a/src/app/modules/songs/song/song.component.spec.ts b/src/app/modules/songs/song/song.component.spec.ts
index b75072b..97d3b27 100644
--- a/src/app/modules/songs/song/song.component.spec.ts
+++ b/src/app/modules/songs/song/song.component.spec.ts
@@ -9,18 +9,17 @@ describe('SongComponent', () => {
   let fixture: ComponentFixture<SongComponent>;
 
   const mockActivatedRoute = {
-    params: of({songId: '4711'})
+    params: of({songId: '4711'}),
   };
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [SongComponent],
-      providers: [
-        {provide: ActivatedRoute, useValue: mockActivatedRoute}
-      ]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [SongComponent],
+        providers: [{provide: ActivatedRoute, useValue: mockActivatedRoute}],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(SongComponent);
@@ -29,7 +28,6 @@ describe('SongComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
-
 });
diff --git a/src/app/modules/songs/song/song.component.ts b/src/app/modules/songs/song/song.component.ts
index 327d34f..0c8b4b4 100644
--- a/src/app/modules/songs/song/song.component.ts
+++ b/src/app/modules/songs/song/song.component.ts
@@ -14,7 +14,7 @@ import {faTrash} from '@fortawesome/free-solid-svg-icons/faTrash';
 @Component({
   selector: 'app-song',
   templateUrl: './song.component.html',
-  styleUrls: ['./song.component.less']
+  styleUrls: ['./song.component.less'],
 })
 export class SongComponent implements OnInit {
   public song$: Observable<Song>;
@@ -23,24 +23,18 @@ export class SongComponent implements OnInit {
   public faEdit = faEdit;
   public faDelete = faTrash;
 
-  constructor(
-    private activatedRoute: ActivatedRoute,
-    private songService: SongService,
-    private fileService: FileDataService,
-    private userService: UserService,
-    private router: Router,
-  ) {
+  public constructor(private activatedRoute: ActivatedRoute, private songService: SongService, private fileService: FileDataService, private userService: UserService, private router: Router) {
     this.user$ = userService.user$;
   }
 
   public ngOnInit(): void {
     this.song$ = this.activatedRoute.params.pipe(
-      map(param => param.songId),
+      map((param: {songId: string}) => param.songId),
       switchMap(songId => this.songService.read$(songId))
     );
 
     this.files$ = this.activatedRoute.params.pipe(
-      map(param => param.songId),
+      map((param: {songId: string}) => param.songId),
       switchMap(songId => this.fileService.read$(songId))
     );
   }
@@ -50,7 +44,7 @@ export class SongComponent implements OnInit {
       return [];
     }
     return flags.split(';').filter(_ => !!_);
-  }
+  };
 
   public async onDelete(songId: string): Promise<void> {
     await this.songService.delete(songId);
diff --git a/src/app/modules/songs/song/song.module.ts b/src/app/modules/songs/song/song.module.ts
index 3c10b30..bc390bd 100644
--- a/src/app/modules/songs/song/song.module.ts
+++ b/src/app/modules/songs/song/song.module.ts
@@ -14,7 +14,6 @@ import {StatusTranslaterModule} from '../../../widget-modules/pipes/status-trans
 import {ButtonModule} from '../../../widget-modules/components/button/button.module';
 import {FileComponent} from './file/file.component';
 
-
 @NgModule({
   declarations: [SongComponent, FileComponent],
   exports: [SongComponent],
@@ -32,7 +31,6 @@ import {FileComponent} from './file/file.component';
     RoleModule,
     StatusTranslaterModule,
     ButtonModule,
-  ]
+  ],
 })
-export class SongModule {
-}
+export class SongModule {}
diff --git a/src/app/modules/songs/songs-routing.module.ts b/src/app/modules/songs/songs-routing.module.ts
index 3a79a44..30dc1cf 100644
--- a/src/app/modules/songs/songs-routing.module.ts
+++ b/src/app/modules/songs/songs-routing.module.ts
@@ -6,31 +6,29 @@ import {EditComponent} from './song/edit/edit.component';
 import {NewComponent} from './song/new/new.component';
 import {EditSongGuard} from './song/edit/edit-song.guard';
 
-
 const routes: Routes = [
   {
     path: '',
     component: SongListComponent,
-    pathMatch: 'full'
+    pathMatch: 'full',
   },
   {
     path: 'new',
-    component: NewComponent
+    component: NewComponent,
   },
   {
     path: ':songId/edit',
     component: EditComponent,
-    canDeactivate: [EditSongGuard]
+    canDeactivate: [EditSongGuard],
   },
   {
     path: ':songId',
-    component: SongComponent
-  }
+    component: SongComponent,
+  },
 ];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
-export class SongsRoutingModule {
-}
+export class SongsRoutingModule {}
diff --git a/src/app/modules/songs/songs.module.ts b/src/app/modules/songs/songs.module.ts
index bbcb972..a508261 100644
--- a/src/app/modules/songs/songs.module.ts
+++ b/src/app/modules/songs/songs.module.ts
@@ -9,14 +9,6 @@ import {NewModule} from './song/new/new.module';
 
 @NgModule({
   declarations: [],
-  imports: [
-    CommonModule,
-    SongsRoutingModule,
-    SongListModule,
-    SongModule,
-    EditModule,
-    NewModule,
-  ]
+  imports: [CommonModule, SongsRoutingModule, SongListModule, SongModule, EditModule, NewModule],
 })
-export class SongsModule {
-}
+export class SongsModule {}
diff --git a/src/app/modules/user/info/info.component.html b/src/app/modules/user/info/info.component.html
index 542fb91..2c0d376 100644
--- a/src/app/modules/user/info/info.component.html
+++ b/src/app/modules/user/info/info.component.html
@@ -1,18 +1,29 @@
-<app-card *ngIf="user$|async as user" heading="Hallo {{user.name}}">
+<app-card *ngIf="user$ | async as user" heading="Hallo {{ user.name }}">
   <p>
-    <span *ngIf="getUserRoles(user.role).length===0" class="warn">Es wurden noch keine Berechtigungen zugeteilt, bitte wende Dich an den Administrator!</span>
-    <span>{{transdormUserRoles(user.role)}}</span>
+    <span *ngIf="getUserRoles(user.role).length === 0" class="warn"
+    >Es wurden noch keine Berechtigungen zugeteilt, bitte wende Dich an den
+      Administrator!</span
+    >
+    <span>{{ transdormUserRoles(user.role) }}</span>
   </p>
 
   <mat-form-field appearance="outline">
     <mat-label>bevorzugte Anzeige der Akkorde</mat-label>
-    <mat-select (ngModelChange)="onChordModeChanged(user.id, $event)" [ngModel]="user.chordMode">
+    <mat-select
+      (ngModelChange)="onChordModeChanged(user.id, $event)"
+      [ngModel]="user.chordMode"
+    >
       <mat-option [value]="null"></mat-option>
       <mat-option value="hide">nur den Liedtext anzeigen</mat-option>
-      <mat-option value="onlyFirst">in Strophen die Akkorde nur für die erste anzeigen</mat-option>
+      <mat-option value="onlyFirst"
+      >in Strophen die Akkorde nur für die erste anzeigen
+      </mat-option>
       <mat-option value="show">alle anzeigen</mat-option>
     </mat-select>
-    <mat-hint>Das ist nur die Voreinstellung, die Anzeige kann für jedes Lied geändert werden.</mat-hint>
+    <mat-hint
+    >Das ist nur die Voreinstellung, die Anzeige kann für jedes Lied geändert
+      werden.
+    </mat-hint>
   </mat-form-field>
 
   <app-button-row>
@@ -20,5 +31,4 @@
   </app-button-row>
 </app-card>
 
-
 <app-users *appRole="['admin']"></app-users>
diff --git a/src/app/modules/user/info/info.component.spec.ts b/src/app/modules/user/info/info.component.spec.ts
index 5d9b6b3..7f25f3c 100644
--- a/src/app/modules/user/info/info.component.spec.ts
+++ b/src/app/modules/user/info/info.component.spec.ts
@@ -6,12 +6,13 @@ describe('InfoComponent', () => {
   let component: InfoComponent;
   let fixture: ComponentFixture<InfoComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [InfoComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [InfoComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(InfoComponent);
@@ -20,6 +21,6 @@ describe('InfoComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/user/info/info.component.ts b/src/app/modules/user/info/info.component.ts
index 6549f82..db9ae53 100644
--- a/src/app/modules/user/info/info.component.ts
+++ b/src/app/modules/user/info/info.component.ts
@@ -8,16 +8,15 @@ import {faSignOutAlt} from '@fortawesome/free-solid-svg-icons/faSignOutAlt';
 @Component({
   selector: 'app-info',
   templateUrl: './info.component.html',
-  styleUrls: ['./info.component.less']
+  styleUrls: ['./info.component.less'],
 })
 export class InfoComponent implements OnInit {
   public user$: Observable<User>;
   public faSignOut = faSignOutAlt;
 
-  constructor(private userService: UserService) {
-  }
+  public constructor(private userService: UserService) {}
 
-  ngOnInit() {
+  public ngOnInit(): void {
     this.user$ = this.userService.user$;
   }
 
@@ -27,5 +26,4 @@ export class InfoComponent implements OnInit {
 
   public getUserRoles = (roles: string): string[] => roles?.split(';') ?? [];
   public transdormUserRoles = (roles: string): string => this.getUserRoles(roles).join(', ');
-
 }
diff --git a/src/app/modules/user/info/role.pipe.spec.ts b/src/app/modules/user/info/role.pipe.spec.ts
index 65acaa2..7505aab 100644
--- a/src/app/modules/user/info/role.pipe.spec.ts
+++ b/src/app/modules/user/info/role.pipe.spec.ts
@@ -3,6 +3,6 @@ import {RolePipe} from './role.pipe';
 describe('RolePipe', () => {
   it('create an instance', () => {
     const pipe = new RolePipe();
-    expect(pipe).toBeTruthy();
+    void expect(pipe).toBeTruthy();
   });
 });
diff --git a/src/app/modules/user/info/role.pipe.ts b/src/app/modules/user/info/role.pipe.ts
index 13e9688..80c9c4e 100644
--- a/src/app/modules/user/info/role.pipe.ts
+++ b/src/app/modules/user/info/role.pipe.ts
@@ -1,12 +1,10 @@
 import {Pipe, PipeTransform} from '@angular/core';
 
-
 @Pipe({
-  name: 'role'
+  name: 'role',
 })
 export class RolePipe implements PipeTransform {
-
-  transform(role: string): string {
+  public transform(role: string): string {
     switch (role) {
       case 'contributor':
         return 'Mitarbeiter';
@@ -20,8 +18,6 @@ export class RolePipe implements PipeTransform {
         return 'Lobpreisleiter';
       case 'presenter':
         return 'Präsentator';
-
     }
   }
-
 }
diff --git a/src/app/modules/user/info/users/user/user.component.html b/src/app/modules/user/info/users/user/user.component.html
index 2ef5efa..7b64d79 100644
--- a/src/app/modules/user/info/users/user/user.component.html
+++ b/src/app/modules/user/info/users/user/user.component.html
@@ -1,22 +1,30 @@
 <div *ngIf="edit" class="users">
   <mat-form-field appearance="outline">
     <mat-label>Name</mat-label>
-    <input (change)="onNameChanged(id, $event)" [ngModel]="name" matInput>
+    <input (change)="onNameChanged(id, $event)" [ngModel]="name" matInput/>
   </mat-form-field>
 
   <mat-form-field appearance="outline">
     <mat-label>Rolle</mat-label>
-    <mat-select (ngModelChange)="onRoleChanged(id, $event)" [ngModel]="roles" multiple>
-      <mat-option *ngFor="let role of ROLE_TYPES" [value]="role">{{role | role}}</mat-option>
+    <mat-select
+      (ngModelChange)="onRoleChanged(id, $event)"
+      [ngModel]="roles"
+      multiple
+    >
+      <mat-option *ngFor="let role of ROLE_TYPES" [value]="role">{{
+        role | role
+        }}</mat-option>
     </mat-select>
   </mat-form-field>
 
-  <button (click)="edit=false" mat-icon-button>
+  <button (click)="edit = false" mat-icon-button>
     <fa-icon [icon]="faClose"></fa-icon>
   </button>
 </div>
 
-<div (click)="edit=true" *ngIf="!edit" class="users list-item">
-  <span>{{name}}</span>
-  <span><span *ngFor="let role of roles">{{role|role}}, </span></span>
+<div (click)="edit = true" *ngIf="!edit" class="users list-item">
+  <span>{{ name }}</span>
+  <span
+  ><span *ngFor="let role of roles">{{ role | role }}, </span></span
+  >
 </div>
diff --git a/src/app/modules/user/info/users/user/user.component.spec.ts b/src/app/modules/user/info/users/user/user.component.spec.ts
index 52165bf..28b8c8e 100644
--- a/src/app/modules/user/info/users/user/user.component.spec.ts
+++ b/src/app/modules/user/info/users/user/user.component.spec.ts
@@ -6,12 +6,13 @@ describe('UserComponent', () => {
   let component: UserComponent;
   let fixture: ComponentFixture<UserComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [UserComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [UserComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(UserComponent);
@@ -20,6 +21,6 @@ describe('UserComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/user/info/users/user/user.component.ts b/src/app/modules/user/info/users/user/user.component.ts
index 80b40bf..003a9ab 100644
--- a/src/app/modules/user/info/users/user/user.component.ts
+++ b/src/app/modules/user/info/users/user/user.component.ts
@@ -7,7 +7,7 @@ import {faTimes} from '@fortawesome/free-solid-svg-icons/faTimes';
 @Component({
   selector: 'app-user',
   templateUrl: './user.component.html',
-  styleUrls: ['./user.component.less']
+  styleUrls: ['./user.component.less'],
 })
 export class UserComponent {
   public id: string;
@@ -17,10 +17,10 @@ export class UserComponent {
   public edit = false;
   public faClose = faTimes;
 
-  constructor(private userService: UserService) {
-  }
+  public constructor(private userService: UserService) {}
 
-  @Input() set user(value: User) {
+  @Input()
+  public set user(value: User) {
     this.id = value.id;
     this.name = value.name;
     this.roles = this.getRoleArray(value.role);
@@ -31,12 +31,12 @@ export class UserComponent {
     await this.userService.update$(id, {role});
   }
 
-  public async onNameChanged(id: string, name: any): Promise<void> {
-    await this.userService.update$(id, {name: name.target.value});
+  public async onNameChanged(id: string, name: Event): Promise<void> {
+    const target = name.target as HTMLInputElement;
+    await this.userService.update$(id, {name: target.value});
   }
 
-  public getRoleArray(role): string[] {
+  public getRoleArray(role: string): string[] {
     return role ? role.split(';') : [];
   }
-
 }
diff --git a/src/app/modules/user/info/users/users.component.html b/src/app/modules/user/info/users/users.component.html
index 53beace..cc56766 100644
--- a/src/app/modules/user/info/users/users.component.html
+++ b/src/app/modules/user/info/users/users.component.html
@@ -1,3 +1,3 @@
 <app-card heading="registrierte Benutzer">
-  <app-user *ngFor="let user of users$|async" [user]="user"></app-user>
+  <app-user *ngFor="let user of users$ | async" [user]="user"></app-user>
 </app-card>
diff --git a/src/app/modules/user/info/users/users.component.spec.ts b/src/app/modules/user/info/users/users.component.spec.ts
index 87a3508..3047559 100644
--- a/src/app/modules/user/info/users/users.component.spec.ts
+++ b/src/app/modules/user/info/users/users.component.spec.ts
@@ -6,12 +6,13 @@ describe('UsersComponent', () => {
   let component: UsersComponent;
   let fixture: ComponentFixture<UsersComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [UsersComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [UsersComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(UsersComponent);
@@ -20,6 +21,6 @@ describe('UsersComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/user/info/users/users.component.ts b/src/app/modules/user/info/users/users.component.ts
index 1d478dc..7438036 100644
--- a/src/app/modules/user/info/users/users.component.ts
+++ b/src/app/modules/user/info/users/users.component.ts
@@ -6,12 +6,12 @@ import {User} from '../../../../services/user/user';
 @Component({
   selector: 'app-users',
   templateUrl: './users.component.html',
-  styleUrls: ['./users.component.less']
+  styleUrls: ['./users.component.less'],
 })
 export class UsersComponent {
   public users$: Observable<User[]>;
 
-  constructor(private userService: UserService) {
+  public constructor(private userService: UserService) {
     this.users$ = userService.list$();
   }
 }
diff --git a/src/app/modules/user/login/auth-message.pipe.spec.ts b/src/app/modules/user/login/auth-message.pipe.spec.ts
index 09981a7..86be436 100644
--- a/src/app/modules/user/login/auth-message.pipe.spec.ts
+++ b/src/app/modules/user/login/auth-message.pipe.spec.ts
@@ -3,6 +3,6 @@ import {AuthMessagePipe} from './auth-message.pipe';
 describe('AuthMessagePipe', () => {
   it('create an instance', () => {
     const pipe = new AuthMessagePipe();
-    expect(pipe).toBeTruthy();
+    void expect(pipe).toBeTruthy();
   });
 });
diff --git a/src/app/modules/user/login/auth-message.pipe.ts b/src/app/modules/user/login/auth-message.pipe.ts
index 3bc1f46..95a3afc 100644
--- a/src/app/modules/user/login/auth-message.pipe.ts
+++ b/src/app/modules/user/login/auth-message.pipe.ts
@@ -1,19 +1,17 @@
 import {Pipe, PipeTransform} from '@angular/core';
 
 @Pipe({
-  name: 'authMessage'
+  name: 'authMessage',
 })
 export class AuthMessagePipe implements PipeTransform {
-
-  transform(code: string): string {
+  public transform(code: string): string {
     switch (code) {
       case 'auth/user-not-found':
         return 'Benutzer wurde nicht gefunden';
       case 'auth/wrong-password':
         return 'Passwort ist falsch';
-      default :
+      default:
         return code;
     }
   }
-
 }
diff --git a/src/app/modules/user/login/login.component.html b/src/app/modules/user/login/login.component.html
index 9b0d6a8..50f1e5c 100644
--- a/src/app/modules/user/login/login.component.html
+++ b/src/app/modules/user/login/login.component.html
@@ -1,44 +1,40 @@
-<!--<app-card>
-  <div [formGroup]="form" class="form">
-    <mat-form-field appearance="outline">
-      <mat-label>E-Mail Addresse</mat-label>
-      <input (keyup.enter)="onLogin()" formControlName="user" matInput>
-    </mat-form-field>
-
-    <mat-form-field appearance="outline">
-      <mat-label>Passwort</mat-label>
-      <input (keyup.enter)="onLogin()" formControlName="pass" matInput type="password">
-    </mat-form-field>
-    <app-button-row>
-      <app-button (click)="onLogin()" [icon]="faSignIn">Anmelden</app-button>
-      <app-button [icon]="faNewPassword" routerLink="/user/password">Passwort zurücksetzen</app-button>
-      <app-button [icon]="faNewUser" routerLink="/user/new">neuen Benutzer anlegen</app-button>
-      <p *ngIf="errorMessage" class="error">{{errorMessage|authMessage}}</p>
-    </app-button-row>
-
-  </div>
-
-</app-card>-->
-
 <div class="frame">
   <app-logo></app-logo>
   <div class="login">
     <div [formGroup]="form" class="form">
       <mat-form-field appearance="outline">
         <mat-label>E-Mail Addresse</mat-label>
-        <input (keyup.enter)="onLogin()" formControlName="user" matInput>
+        <input (keyup.enter)="onLogin()" formControlName="user" matInput/>
       </mat-form-field>
 
       <mat-form-field appearance="outline">
         <mat-label>Passwort</mat-label>
-        <input (keyup.enter)="onLogin()" formControlName="pass" matInput type="password">
+        <input
+          (keyup.enter)="onLogin()"
+          formControlName="pass"
+          matInput
+          type="password"
+        />
       </mat-form-field>
-      <p *ngIf="errorMessage" class="error">{{errorMessage|authMessage}}</p>
-      <button (click)="onLogin()" class="btn-login" color="primary" mat-stroked-button>Anmelden</button>
-      <button class="btn-password" mat-stroked-button routerLink="/user/password">Passwort zurücksetzen</button>
-      <button class="btn-user" mat-stroked-button routerLink="/user/new">neuen Benutzer anlegen</button>
-
-
+      <p *ngIf="errorMessage" class="error">{{ errorMessage | authMessage }}</p>
+      <button
+        (click)="onLogin()"
+        class="btn-login"
+        color="primary"
+        mat-stroked-button
+      >
+        Anmelden
+      </button>
+      <button
+        class="btn-password"
+        mat-stroked-button
+        routerLink="/user/password"
+      >
+        Passwort zurücksetzen
+      </button>
+      <button class="btn-user" mat-stroked-button routerLink="/user/new">
+        neuen Benutzer anlegen
+      </button>
     </div>
   </div>
 </div>
diff --git a/src/app/modules/user/login/login.component.spec.ts b/src/app/modules/user/login/login.component.spec.ts
index beaad1e..a0f9993 100644
--- a/src/app/modules/user/login/login.component.spec.ts
+++ b/src/app/modules/user/login/login.component.spec.ts
@@ -6,12 +6,13 @@ describe('LoginComponent', () => {
   let component: LoginComponent;
   let fixture: ComponentFixture<LoginComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [LoginComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [LoginComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(LoginComponent);
@@ -20,6 +21,6 @@ describe('LoginComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/user/login/login.component.ts b/src/app/modules/user/login/login.component.ts
index 9ca8ddc..04d5cd6 100644
--- a/src/app/modules/user/login/login.component.ts
+++ b/src/app/modules/user/login/login.component.ts
@@ -3,39 +3,37 @@ import {FormControl, FormGroup, Validators} from '@angular/forms';
 import {Router} from '@angular/router';
 import {UserService} from '../../../services/user/user.service';
 import {faSignInAlt} from '@fortawesome/free-solid-svg-icons/faSignInAlt';
-import {faWindowRestore} from '@fortawesome/free-solid-svg-icons/faWindowRestore';
 import {faUserPlus} from '@fortawesome/free-solid-svg-icons/faUserPlus';
 
 @Component({
   selector: 'app-login',
   templateUrl: './login.component.html',
-  styleUrls: ['./login.component.less']
+  styleUrls: ['./login.component.less'],
 })
 export class LoginComponent implements OnInit {
   public form: FormGroup;
   public errorMessage: string;
   public faSignIn = faSignInAlt;
-  public faNewPassword = faWindowRestore;
   public faNewUser = faUserPlus;
 
-  constructor(private userService: UserService, private router: Router) {
-  }
+  public constructor(private userService: UserService, private router: Router) {}
 
-  ngOnInit() {
+  public ngOnInit(): void {
     this.form = new FormGroup({
       user: new FormControl(null, [Validators.required, Validators.email]),
       pass: new FormControl(null, [Validators.required]),
     });
   }
 
-  public async onLogin() {
+  public async onLogin(): Promise<void> {
     this.form.updateValueAndValidity();
     if (this.form.valid) {
       try {
-        await this.userService.login(this.form.value.user, this.form.value.pass);
+        const value = this.form.value as {user: string; pass: string};
+        await this.userService.login(value.user, value.pass);
         await this.router.navigateByUrl('/');
-      } catch (ex) {
-        this.errorMessage = ex.code;
+      } catch ({code}) {
+        this.errorMessage = code as string;
       }
     }
   }
diff --git a/src/app/modules/user/logout/logout.component.spec.ts b/src/app/modules/user/logout/logout.component.spec.ts
index 3cf8c2d..dfd15cb 100644
--- a/src/app/modules/user/logout/logout.component.spec.ts
+++ b/src/app/modules/user/logout/logout.component.spec.ts
@@ -6,12 +6,13 @@ describe('LogoutComponent', () => {
   let component: LogoutComponent;
   let fixture: ComponentFixture<LogoutComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [LogoutComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [LogoutComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(LogoutComponent);
@@ -20,6 +21,6 @@ describe('LogoutComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/user/logout/logout.component.ts b/src/app/modules/user/logout/logout.component.ts
index b02e6c7..2cbe3cf 100644
--- a/src/app/modules/user/logout/logout.component.ts
+++ b/src/app/modules/user/logout/logout.component.ts
@@ -5,13 +5,12 @@ import {UserService} from '../../../services/user/user.service';
 @Component({
   selector: 'app-logout',
   templateUrl: './logout.component.html',
-  styleUrls: ['./logout.component.less']
+  styleUrls: ['./logout.component.less'],
 })
 export class LogoutComponent implements AfterViewInit {
-  constructor(private userService: UserService, private router: Router) {
-  }
+  public constructor(private userService: UserService, private router: Router) {}
 
-  public async ngAfterViewInit() {
+  public async ngAfterViewInit(): Promise<void> {
     await this.userService.logout();
     await this.router.navigateByUrl('/');
   }
diff --git a/src/app/modules/user/new/new.component.html b/src/app/modules/user/new/new.component.html
index 41985ed..faa3da5 100644
--- a/src/app/modules/user/new/new.component.html
+++ b/src/app/modules/user/new/new.component.html
@@ -1,18 +1,20 @@
 <app-card [formGroup]="form" closeLink="../" heading="neuen Benutzer anlegen">
   <mat-form-field appearance="outline">
     <mat-label>Name</mat-label>
-    <input formControlName="name" matInput>
+    <input formControlName="name" matInput/>
   </mat-form-field>
   <mat-form-field appearance="outline">
     <mat-label>E-Mail Adresse</mat-label>
-    <input formControlName="email" matInput>
+    <input formControlName="email" matInput/>
   </mat-form-field>
   <mat-form-field appearance="outline">
     <mat-label>Passwort</mat-label>
-    <input formControlName="password" matInput type="password">
+    <input formControlName="password" matInput type="password"/>
   </mat-form-field>
 
   <app-button-row>
-    <app-button (click)="onCreate()" [icon]="faNewUser">Benutzer anlegen</app-button>
+    <app-button (click)="onCreate()" [icon]="faNewUser"
+    >Benutzer anlegen
+    </app-button>
   </app-button-row>
 </app-card>
diff --git a/src/app/modules/user/new/new.component.spec.ts b/src/app/modules/user/new/new.component.spec.ts
index 22a386c..2756000 100644
--- a/src/app/modules/user/new/new.component.spec.ts
+++ b/src/app/modules/user/new/new.component.spec.ts
@@ -6,12 +6,13 @@ describe('NewComponent', () => {
   let component: NewComponent;
   let fixture: ComponentFixture<NewComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [NewComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [NewComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(NewComponent);
@@ -20,6 +21,6 @@ describe('NewComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/user/new/new.component.ts b/src/app/modules/user/new/new.component.ts
index 749a746..bd1145c 100644
--- a/src/app/modules/user/new/new.component.ts
+++ b/src/app/modules/user/new/new.component.ts
@@ -6,16 +6,15 @@ import {faUserPlus} from '@fortawesome/free-solid-svg-icons/faUserPlus';
 @Component({
   selector: 'app-new',
   templateUrl: './new.component.html',
-  styleUrls: ['./new.component.less']
+  styleUrls: ['./new.component.less'],
 })
 export class NewComponent implements OnInit {
   public form: FormGroup;
   public faNewUser = faUserPlus;
 
-  constructor(private fb: FormBuilder, private userService: UserService) {
-  }
+  public constructor(private fb: FormBuilder, private userService: UserService) {}
 
-  ngOnInit(): void {
+  public ngOnInit(): void {
     this.form = this.fb.group({
       email: new FormControl(null, [Validators.required, Validators.email]),
       name: new FormControl(null, [Validators.required]),
@@ -27,7 +26,12 @@ export class NewComponent implements OnInit {
     this.form.updateValueAndValidity();
     if (this.form.valid) {
       try {
-        await this.userService.createNewUser(this.form.value.email, this.form.value.name, this.form.value.password);
+        const value = this.form.value as {
+          email: string;
+          name: string;
+          password: string;
+        };
+        await this.userService.createNewUser(value.email, value.name, value.password);
       } catch (ex) {
         console.error(ex);
       }
diff --git a/src/app/modules/user/password-send/password-send.component.html b/src/app/modules/user/password-send/password-send.component.html
index 3a80618..51c8411 100644
--- a/src/app/modules/user/password-send/password-send.component.html
+++ b/src/app/modules/user/password-send/password-send.component.html
@@ -1,4 +1,4 @@
 <app-card>
-  Eine E-Mail mit dem neuen Passwort wurde gesendet.
-  Darin ist der link enthalten, über den das neue Passwort eingegeben werden kann.
+  Eine E-Mail mit dem neuen Passwort wurde gesendet. Darin ist der link
+  enthalten, über den das neue Passwort eingegeben werden kann.
 </app-card>
diff --git a/src/app/modules/user/password-send/password-send.component.spec.ts b/src/app/modules/user/password-send/password-send.component.spec.ts
index 33a55c8..bf01786 100644
--- a/src/app/modules/user/password-send/password-send.component.spec.ts
+++ b/src/app/modules/user/password-send/password-send.component.spec.ts
@@ -6,12 +6,13 @@ describe('PasswordSendComponent', () => {
   let component: PasswordSendComponent;
   let fixture: ComponentFixture<PasswordSendComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [PasswordSendComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [PasswordSendComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(PasswordSendComponent);
@@ -20,6 +21,6 @@ describe('PasswordSendComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/user/password-send/password-send.component.ts b/src/app/modules/user/password-send/password-send.component.ts
index 8742a6c..475f737 100644
--- a/src/app/modules/user/password-send/password-send.component.ts
+++ b/src/app/modules/user/password-send/password-send.component.ts
@@ -1,16 +1,8 @@
-import {Component, OnInit} from '@angular/core';
+import {Component} from '@angular/core';
 
 @Component({
   selector: 'app-password-send',
   templateUrl: './password-send.component.html',
-  styleUrls: ['./password-send.component.less']
+  styleUrls: ['./password-send.component.less'],
 })
-export class PasswordSendComponent implements OnInit {
-
-  constructor() {
-  }
-
-  ngOnInit(): void {
-  }
-
-}
+export class PasswordSendComponent {}
diff --git a/src/app/modules/user/password/password.component.html b/src/app/modules/user/password/password.component.html
index 01129ab..bc77401 100644
--- a/src/app/modules/user/password/password.component.html
+++ b/src/app/modules/user/password/password.component.html
@@ -2,14 +2,18 @@
   <div [formGroup]="form" class="form">
     <mat-form-field appearance="outline">
       <mat-label>E-Mail Addresse</mat-label>
-      <input (keyup.enter)="onResetPassword()" formControlName="user" matInput>
+      <input
+        (keyup.enter)="onResetPassword()"
+        formControlName="user"
+        matInput
+      />
     </mat-form-field>
 
     <app-button-row>
-      <app-button (click)="onResetPassword()" [icon]="faNewPassword">neues Passwort anfordern</app-button>
-      <p *ngIf="errorMessage" class="error">{{errorMessage|authMessage}}</p>
+      <app-button (click)="onResetPassword()" [icon]="faNewPassword"
+      >neues Passwort anfordern
+      </app-button>
+      <p *ngIf="errorMessage" class="error">{{ errorMessage | authMessage }}</p>
     </app-button-row>
-
   </div>
-
 </app-card>
diff --git a/src/app/modules/user/password/password.component.spec.ts b/src/app/modules/user/password/password.component.spec.ts
index fc5218c..fcfed91 100644
--- a/src/app/modules/user/password/password.component.spec.ts
+++ b/src/app/modules/user/password/password.component.spec.ts
@@ -6,12 +6,13 @@ describe('PasswordComponent', () => {
   let component: PasswordComponent;
   let fixture: ComponentFixture<PasswordComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [PasswordComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [PasswordComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(PasswordComponent);
@@ -20,6 +21,6 @@ describe('PasswordComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/modules/user/password/password.component.ts b/src/app/modules/user/password/password.component.ts
index 4be802d..13a141a 100644
--- a/src/app/modules/user/password/password.component.ts
+++ b/src/app/modules/user/password/password.component.ts
@@ -1,5 +1,5 @@
 import {Component, OnInit} from '@angular/core';
-import {FormControl, FormGroup, Validators} from '@angular/forms';
+import {AbstractControl, FormControl, FormGroup, Validators} from '@angular/forms';
 import {Router} from '@angular/router';
 import {UserService} from '../../../services/user/user.service';
 import {faWindowRestore} from '@fortawesome/free-solid-svg-icons/faWindowRestore';
@@ -7,32 +7,33 @@ import {faWindowRestore} from '@fortawesome/free-solid-svg-icons/faWindowRestore
 @Component({
   selector: 'app-password',
   templateUrl: './password.component.html',
-  styleUrls: ['./password.component.less']
+  styleUrls: ['./password.component.less'],
 })
 export class PasswordComponent implements OnInit {
   public form: FormGroup;
   public errorMessage: string;
   public faNewPassword = faWindowRestore;
 
-  constructor(public userService: UserService, private router: Router) {
-  }
+  public constructor(public userService: UserService, private router: Router) {}
 
   public ngOnInit(): void {
+    const required = (c: AbstractControl) => Validators.required(c);
+    const email = Validators.email;
     this.form = new FormGroup({
-      user: new FormControl(null, [Validators.required, Validators.email])
+      user: new FormControl(null, [required, email]),
     });
   }
 
-  public async onResetPassword() {
+  public async onResetPassword(): Promise<void> {
     this.form.updateValueAndValidity();
     if (this.form.valid) {
       try {
-        await this.userService.changePassword(this.form.value.user);
+        const value = this.form.value as {user: string};
+        await this.userService.changePassword(value.user);
         await this.router.navigateByUrl('/user/password-send');
-      } catch (ex) {
-        this.errorMessage = ex.code;
+      } catch ({code}) {
+        this.errorMessage = code as string;
       }
     }
   }
-
 }
diff --git a/src/app/modules/user/user-routing.module.ts b/src/app/modules/user/user-routing.module.ts
index 47bfa4f..ef08b9c 100644
--- a/src/app/modules/user/user-routing.module.ts
+++ b/src/app/modules/user/user-routing.module.ts
@@ -8,44 +8,42 @@ import {PasswordComponent} from './password/password.component';
 import {PasswordSendComponent} from './password-send/password-send.component';
 import {NewComponent} from './new/new.component';
 
-
 const routes: Routes = [
   {
     path: '',
     redirectTo: 'info',
-    pathMatch: 'full'
+    pathMatch: 'full',
   },
   {
     path: 'login',
-    component: LoginComponent
+    component: LoginComponent,
   },
   {
     path: 'logout',
-    component: LogoutComponent
+    component: LogoutComponent,
   },
   {
     path: 'password',
-    component: PasswordComponent
+    component: PasswordComponent,
   },
   {
     path: 'new',
-    component: NewComponent
+    component: NewComponent,
   },
   {
     path: 'password-send',
-    component: PasswordSendComponent
+    component: PasswordSendComponent,
   },
   {
     path: 'info',
     component: InfoComponent,
     canActivate: [AngularFireAuthGuard],
-    data: {authGuardPipe: () => redirectUnauthorizedTo(['user', 'login'])}
+    data: {authGuardPipe: () => redirectUnauthorizedTo(['user', 'login'])},
   },
 ];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
-export class UserRoutingModule {
-}
+export class UserRoutingModule {}
diff --git a/src/app/modules/user/user.module.ts b/src/app/modules/user/user.module.ts
index 79f35ec..e572c88 100644
--- a/src/app/modules/user/user.module.ts
+++ b/src/app/modules/user/user.module.ts
@@ -23,7 +23,6 @@ import {ButtonModule} from '../../widget-modules/components/button/button.module
 import {LogoModule} from '../../widget-modules/components/logo/logo.module';
 import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
 
-
 @NgModule({
   declarations: [LoginComponent, AuthMessagePipe, InfoComponent, LogoutComponent, RolePipe, PasswordComponent, PasswordSendComponent, UsersComponent, UserComponent, NewComponent],
   imports: [
@@ -41,9 +40,6 @@ import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
     ButtonModule,
     LogoModule,
     FontAwesomeModule,
-
-
-  ]
+  ],
 })
-export class UserModule {
-}
+export class UserModule {}
diff --git a/src/app/services/config.service.spec.ts b/src/app/services/config.service.spec.ts
index 2264bb7..ae1c2f1 100644
--- a/src/app/services/config.service.spec.ts
+++ b/src/app/services/config.service.spec.ts
@@ -6,11 +6,11 @@ describe('ConfigService', () => {
   let service: ConfigService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    void TestBed.configureTestingModule({});
     service = TestBed.inject(ConfigService);
   });
 
   it('should be created', () => {
-    expect(service).toBeTruthy();
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/services/config.service.ts b/src/app/services/config.service.ts
index 0a9a0ce..7c8e31d 100644
--- a/src/app/services/config.service.ts
+++ b/src/app/services/config.service.ts
@@ -5,11 +5,10 @@ import {Config} from './config';
 import {first} from 'rxjs/operators';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ConfigService {
-  constructor(private db: DbService) {
-  }
+  public constructor(private db: DbService) {}
 
   public get get$(): Observable<Config> {
     return this.db.doc$<Config>('global/config');
diff --git a/src/app/services/db.service.spec.ts b/src/app/services/db.service.spec.ts
index e7412cf..741beb2 100644
--- a/src/app/services/db.service.spec.ts
+++ b/src/app/services/db.service.spec.ts
@@ -3,10 +3,10 @@ import {TestBed} from '@angular/core/testing';
 import {DbService} from './db.service';
 
 describe('DbService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
+  beforeEach(() => void TestBed.configureTestingModule({}));
 
   it('should be created', () => {
-    const service: DbService = TestBed.get(DbService);
-    expect(service).toBeTruthy();
+    const service: DbService = TestBed.inject(DbService);
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/services/db.service.ts b/src/app/services/db.service.ts
index ba574e5..a684c37 100644
--- a/src/app/services/db.service.ts
+++ b/src/app/services/db.service.ts
@@ -1,19 +1,18 @@
 import {Injectable} from '@angular/core';
 import {AngularFirestore, AngularFirestoreCollection, AngularFirestoreDocument} from '@angular/fire/firestore';
 import {Observable} from 'rxjs';
+import {QueryFn} from '@angular/fire/firestore/interfaces';
 
 type CollectionPredicate<T> = string | AngularFirestoreCollection<T>;
 type DocumentPredicate<T> = string | AngularFirestoreDocument<T>;
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class DbService {
+  public constructor(private afs: AngularFirestore) {}
 
-  constructor(private afs: AngularFirestore) {
-  }
-
-  public col<T>(ref: CollectionPredicate<T>, queryFn?): AngularFirestoreCollection<T> {
+  public col<T>(ref: CollectionPredicate<T>, queryFn?: QueryFn): AngularFirestoreCollection<T> {
     return typeof ref === 'string' ? this.afs.collection<T>(ref, queryFn) : ref;
   }
 
@@ -23,10 +22,9 @@ export class DbService {
 
   public doc$<T>(ref: DocumentPredicate<T>): Observable<T> {
     return this.doc(ref).valueChanges({idField: 'id'});
-
   }
 
-  public col$<T>(ref: CollectionPredicate<T>, queryFn?): Observable<T[]> {
+  public col$<T>(ref: CollectionPredicate<T>, queryFn?: QueryFn): Observable<T[]> {
     return this.col(ref, queryFn).valueChanges({idField: 'id'});
   }
 }
diff --git a/src/app/services/delay.ts b/src/app/services/delay.ts
index c345e6c..0ab9dab 100644
--- a/src/app/services/delay.ts
+++ b/src/app/services/delay.ts
@@ -1 +1 @@
-export const delay = (ms: number): Promise<any> => new Promise(resolve => setTimeout(resolve, ms));
+export const delay = (ms: number): Promise<void> => new Promise(resolve => setTimeout(resolve, ms));
diff --git a/src/app/services/global-settings.service.spec.ts b/src/app/services/global-settings.service.spec.ts
index d99e398..d2a7c94 100644
--- a/src/app/services/global-settings.service.spec.ts
+++ b/src/app/services/global-settings.service.spec.ts
@@ -6,11 +6,11 @@ describe('GlobalSettingsService', () => {
   let service: GlobalSettingsService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    void TestBed.configureTestingModule({});
     service = TestBed.inject(GlobalSettingsService);
   });
 
   it('should be created', () => {
-    expect(service).toBeTruthy();
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/services/global-settings.service.ts b/src/app/services/global-settings.service.ts
index 8a23015..04f5189 100644
--- a/src/app/services/global-settings.service.ts
+++ b/src/app/services/global-settings.service.ts
@@ -4,18 +4,16 @@ import {GlobalSettings} from './global-settings';
 import {Observable} from 'rxjs';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class GlobalSettingsService {
-  constructor(private db: DbService) {
-  }
+  public constructor(private db: DbService) {}
 
   public get get$(): Observable<GlobalSettings> {
     return this.db.doc$<GlobalSettings>('global/static');
   }
 
-  public async set(data: Partial<GlobalSettings>) {
+  public async set(data: Partial<GlobalSettings>): Promise<void> {
     await this.db.doc<GlobalSettings>('global/static').update(data);
   }
-
 }
diff --git a/src/app/services/scroll.service.spec.ts b/src/app/services/scroll.service.spec.ts
index d372776..76f52b6 100644
--- a/src/app/services/scroll.service.spec.ts
+++ b/src/app/services/scroll.service.spec.ts
@@ -6,11 +6,11 @@ describe('ScrollService', () => {
   let service: ScrollService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    void TestBed.configureTestingModule({});
     service = TestBed.inject(ScrollService);
   });
 
   it('should be created', () => {
-    expect(service).toBeTruthy();
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/services/scroll.service.ts b/src/app/services/scroll.service.ts
index 748928c..56dc702 100644
--- a/src/app/services/scroll.service.ts
+++ b/src/app/services/scroll.service.ts
@@ -2,24 +2,24 @@ import {Injectable} from '@angular/core';
 import {BehaviorSubject} from 'rxjs';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ScrollService {
   private scrollPosition: number;
-  private scrollSlots = {};
-  private _restoreScrollPosition$ = new BehaviorSubject<number>(0);
-  public restoreScrollPosition$ = this._restoreScrollPosition$.asObservable();
+  private scrollSlots: {[key: string]: number} = {};
+  private iRestoreScrollPosition$ = new BehaviorSubject<number>(0);
+  public restoreScrollPosition$ = this.iRestoreScrollPosition$.asObservable();
 
-  public saveScrollPosition(pos: number) {
+  public saveScrollPosition(pos: number): void {
     this.scrollPosition = pos;
   }
 
-  public storeScrollPositionFor(slot: string) {
+  public storeScrollPositionFor(slot: string): void {
     this.scrollSlots[slot] = this.scrollPosition;
   }
 
-  public restoreScrollPositionFor(slot: string) {
+  public restoreScrollPositionFor(slot: string): void {
     const pos = this.scrollSlots[slot];
-    this._restoreScrollPosition$.next(pos);
+    this.iRestoreScrollPosition$.next(pos);
   }
 }
diff --git a/src/app/services/user/owner.directive.ts b/src/app/services/user/owner.directive.ts
index 3efd99d..4372c30 100644
--- a/src/app/services/user/owner.directive.ts
+++ b/src/app/services/user/owner.directive.ts
@@ -2,27 +2,21 @@ import {Directive, ElementRef, Input, OnInit, TemplateRef, ViewContainerRef} fro
 import {UserService} from './user.service';
 
 @Directive({
-  selector: '[appOwner]'
+  selector: '[appOwner]',
 })
 export class OwnerDirective implements OnInit {
   private currentUserId: string;
 
-  private _appOwner: string;
+  private iAppOwner: string;
 
-  @Input() set appOwner(value: string) {
-    this._appOwner = value;
+  public constructor(private element: ElementRef, private templateRef: TemplateRef<unknown>, private viewContainer: ViewContainerRef, private userService: UserService) {}
+
+  @Input()
+  public set appOwner(value: string) {
+    this.iAppOwner = value;
     this.updateView();
   }
 
-  constructor(
-    private element: ElementRef,
-    private templateRef: TemplateRef<any>,
-    private viewContainer: ViewContainerRef,
-    private userService: UserService
-  ) {
-
-  }
-
   public ngOnInit(): void {
     this.userService.userId$.subscribe(user => {
       this.currentUserId = user;
@@ -33,9 +27,8 @@ export class OwnerDirective implements OnInit {
 
   private updateView() {
     this.viewContainer.clear();
-    if (this.currentUserId === this._appOwner) {
+    if (this.currentUserId === this.iAppOwner) {
       this.viewContainer.createEmbeddedView(this.templateRef);
     }
   }
-
 }
diff --git a/src/app/services/user/owner.module.ts b/src/app/services/user/owner.module.ts
index 3d764dc..116d532 100644
--- a/src/app/services/user/owner.module.ts
+++ b/src/app/services/user/owner.module.ts
@@ -5,9 +5,6 @@ import {CommonModule} from '@angular/common';
 @NgModule({
   declarations: [OwnerDirective],
   exports: [OwnerDirective],
-  imports: [
-    CommonModule
-  ]
+  imports: [CommonModule],
 })
-export class OwnerModule {
-}
+export class OwnerModule {}
diff --git a/src/app/services/user/role.directive.ts b/src/app/services/user/role.directive.ts
index 4aacf13..07d2ec4 100644
--- a/src/app/services/user/role.directive.ts
+++ b/src/app/services/user/role.directive.ts
@@ -4,21 +4,14 @@ import {UserService} from './user.service';
 import {User} from './user';
 
 @Directive({
-  selector: '[appRole]'
+  selector: '[appRole]',
 })
 export class RoleDirective implements OnInit {
-  @Input() appRole: roles[] = [];
+  @Input() public appRole: roles[] = [];
   private currentUser: User;
   private loggedIn: boolean;
 
-  constructor(
-    private element: ElementRef,
-    private templateRef: TemplateRef<any>,
-    private viewContainer: ViewContainerRef,
-    private userService: UserService
-  ) {
-
-  }
+  public constructor(private element: ElementRef, private templateRef: TemplateRef<unknown>, private viewContainer: ViewContainerRef, private userService: UserService) {}
 
   public ngOnInit(): void {
     this.userService.user$.subscribe(user => {
@@ -53,6 +46,4 @@ export class RoleDirective implements OnInit {
 
     return false;
   }
-
-
 }
diff --git a/src/app/services/user/role.module.ts b/src/app/services/user/role.module.ts
index db0b9f7..73500f3 100644
--- a/src/app/services/user/role.module.ts
+++ b/src/app/services/user/role.module.ts
@@ -5,9 +5,6 @@ import {RoleDirective} from './role.directive';
 @NgModule({
   declarations: [RoleDirective],
   exports: [RoleDirective],
-  imports: [
-    CommonModule
-  ]
+  imports: [CommonModule],
 })
-export class RoleModule {
-}
+export class RoleModule {}
diff --git a/src/app/services/user/user-name/user-name.component.html b/src/app/services/user/user-name/user-name.component.html
index 0014401..8faa666 100644
--- a/src/app/services/user/user-name/user-name.component.html
+++ b/src/app/services/user/user-name/user-name.component.html
@@ -1 +1 @@
-{{name$|async}}
+{{ name$ | async }}
diff --git a/src/app/services/user/user-name/user-name.component.spec.ts b/src/app/services/user/user-name/user-name.component.spec.ts
index 27b1e5f..f7d8270 100644
--- a/src/app/services/user/user-name/user-name.component.spec.ts
+++ b/src/app/services/user/user-name/user-name.component.spec.ts
@@ -6,12 +6,13 @@ describe('UserNameComponent', () => {
   let component: UserNameComponent;
   let fixture: ComponentFixture<UserNameComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [UserNameComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [UserNameComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(UserNameComponent);
@@ -20,6 +21,6 @@ describe('UserNameComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/services/user/user-name/user-name.component.ts b/src/app/services/user/user-name/user-name.component.ts
index 15156a6..e49d31a 100644
--- a/src/app/services/user/user-name/user-name.component.ts
+++ b/src/app/services/user/user-name/user-name.component.ts
@@ -6,18 +6,15 @@ import {Observable} from 'rxjs';
 @Component({
   selector: 'app-user-name',
   templateUrl: './user-name.component.html',
-  styleUrls: ['./user-name.component.less']
+  styleUrls: ['./user-name.component.less'],
 })
 export class UserNameComponent {
   public name$: Observable<string>;
 
-  constructor(
-    private userService: UserService
-  ) {
-  }
+  public constructor(private userService: UserService) {}
 
-  @Input() set userId(id: string) {
+  @Input()
+  public set userId(id: string) {
     this.name$ = this.userService.getUserbyId$(id).pipe(map(_ => _.name));
   }
-
 }
diff --git a/src/app/services/user/user-name/user-name.module.ts b/src/app/services/user/user-name/user-name.module.ts
index 18cd0e3..d312229 100644
--- a/src/app/services/user/user-name/user-name.module.ts
+++ b/src/app/services/user/user-name/user-name.module.ts
@@ -5,7 +5,6 @@ import {UserNameComponent} from './user-name.component';
 @NgModule({
   declarations: [UserNameComponent],
   exports: [UserNameComponent],
-  imports: [CommonModule]
+  imports: [CommonModule],
 })
-export class UserNameModule {
-}
+export class UserNameModule {}
diff --git a/src/app/services/user/user.service.spec.ts b/src/app/services/user/user.service.spec.ts
index e927575..f97391f 100644
--- a/src/app/services/user/user.service.spec.ts
+++ b/src/app/services/user/user.service.spec.ts
@@ -3,10 +3,10 @@ import {TestBed} from '@angular/core/testing';
 import {UserService} from './user.service';
 
 describe('UserService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
+  beforeEach(() => void TestBed.configureTestingModule({}));
 
   it('should be created', () => {
-    const service: UserService = TestBed.get(UserService);
-    expect(service).toBeTruthy();
+    const service: UserService = TestBed.inject(UserService);
+    void expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/services/user/user.service.ts b/src/app/services/user/user.service.ts
index eba5714..067e38b 100644
--- a/src/app/services/user/user.service.ts
+++ b/src/app/services/user/user.service.ts
@@ -8,27 +8,28 @@ import {environment} from '../../../environments/environment';
 import {Router} from '@angular/router';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class UserService {
-  constructor(private afAuth: AngularFireAuth, private db: DbService, private router: Router) {
-    this.afAuth.authState.pipe(
-      filter(_ => !!_),
-      tap(auth => this._userId$.next(auth.uid)),
-      switchMap(auth => this.readUser$(auth.uid)),
-    ).subscribe(_ => this._user$.next(_));
-  }
+  private iUserId$ = new BehaviorSubject<string>(null);
+  private iUser$ = new BehaviorSubject<User>(null);
 
-  private _userId$ = new BehaviorSubject<string>(null);
+  public constructor(private afAuth: AngularFireAuth, private db: DbService, private router: Router) {
+    this.afAuth.authState
+      .pipe(
+        filter(_ => !!_),
+        tap(auth => this.iUserId$.next(auth.uid)),
+        switchMap(auth => this.readUser$(auth.uid))
+      )
+      .subscribe(_ => this.iUser$.next(_));
+  }
 
   public get userId$(): Observable<string> {
-    return this._userId$.asObservable();
+    return this.iUserId$.asObservable();
   }
 
-  private _user$ = new BehaviorSubject<User>(null);
-
   public get user$(): Observable<User> {
-    return this._user$.pipe(filter(_ => !!_));
+    return this.iUser$.pipe(filter(_ => !!_));
   }
 
   public async currentUser(): Promise<User> {
@@ -43,44 +44,42 @@ export class UserService {
     return this.db.doc$<User>('users/' + userId);
   }
 
-  public async login(user: string, password: string): Promise<any> {
+  public async login(user: string, password: string): Promise<string> {
     const aUser = await this.afAuth.signInWithEmailAndPassword(user, password);
     const dUser = await this.readUser(aUser.user.uid);
-    this._user$.next(dUser);
-    this._userId$.next(aUser.user.uid);
+    this.iUser$.next(dUser);
+    this.iUserId$.next(aUser.user.uid);
+    return aUser.user.uid;
   }
 
-  public loggedIn$ = () => this.afAuth.authState;
+  public loggedIn$: () => Observable<firebase.User | null> = () => this.afAuth.authState;
 
-  public list$ = (): Observable<User[]> => this.db.col$('users');
+  public list$: () => Observable<User[]> = (): Observable<User[]> => this.db.col$('users');
 
-  public async logout(): Promise<any> {
+  public async logout(): Promise<void> {
     await this.afAuth.signOut();
-    this._user$.next(null);
-    this._userId$.next(null);
+    this.iUser$.next(null);
+    this.iUserId$.next(null);
   }
 
   public async update$(uid: string, data: Partial<User>): Promise<void> {
     await this.db.doc<User>('users/' + uid).update(data);
   }
 
-  public async changePassword(user: string): Promise<any> {
+  public async changePassword(user: string): Promise<void> {
     const url = environment.url;
     await this.afAuth.sendPasswordResetEmail(user, {url});
   }
 
-  public async createNewUser(user: string, name: string, password: string): Promise<any> {
+  public async createNewUser(user: string, name: string, password: string): Promise<void> {
     const aUser = await this.afAuth.createUserWithEmailAndPassword(user, password);
     const userId = aUser.user.uid;
     await this.db.doc('users/' + userId).set({name, chordMode: 'onlyFirst'});
     const dUser = await this.readUser(aUser.user.uid);
-    this._user$.next(dUser);
+    this.iUser$.next(dUser);
     await this.router.navigateByUrl('/brand/new-user');
   }
 
-  private readUser$ = (uid) => this.db.doc$<User>('users/' + uid);
-
-  private async readUser(uid): Promise<User> {
-    return await this.readUser$(uid).pipe(first()).toPromise();
-  }
+  private readUser$ = (uid: string) => this.db.doc$<User>('users/' + uid);
+  private readUser = async (uid: string): Promise<User> => await this.readUser$(uid).pipe(first()).toPromise();
 }
diff --git a/src/app/widget-modules/components/add-song/add-song.component.html b/src/app/widget-modules/components/add-song/add-song.component.html
index def72e6..220d8bd 100644
--- a/src/app/widget-modules/components/add-song/add-song.component.html
+++ b/src/app/widget-modules/components/add-song/add-song.component.html
@@ -3,9 +3,13 @@
     <mat-label>Lied hinzufügen...</mat-label>
     <mat-select (selectionChange)="onAddSongSelectionChanged($event)">
       <mat-option>
-        <ngx-mat-select-search [formControl]="filteredSongsControl"></ngx-mat-select-search>
+        <ngx-mat-select-search
+          [formControl]="filteredSongsControl"
+        ></ngx-mat-select-search>
       </mat-option>
-      <mat-option *ngFor="let song of filteredSongs()" [value]="song.id">{{song.title}}</mat-option>
+      <mat-option *ngFor="let song of filteredSongs()" [value]="song.id">{{
+        song.title
+        }}</mat-option>
     </mat-select>
   </mat-form-field>
 </div>
diff --git a/src/app/widget-modules/components/add-song/add-song.component.spec.ts b/src/app/widget-modules/components/add-song/add-song.component.spec.ts
index dc41b7b..f239d51 100644
--- a/src/app/widget-modules/components/add-song/add-song.component.spec.ts
+++ b/src/app/widget-modules/components/add-song/add-song.component.spec.ts
@@ -6,12 +6,13 @@ describe('AddSongComponent', () => {
   let component: AddSongComponent;
   let fixture: ComponentFixture<AddSongComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [AddSongComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [AddSongComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(AddSongComponent);
@@ -20,6 +21,6 @@ describe('AddSongComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/components/add-song/add-song.component.ts b/src/app/widget-modules/components/add-song/add-song.component.ts
index 757a9dc..1a8a8f4 100644
--- a/src/app/widget-modules/components/add-song/add-song.component.ts
+++ b/src/app/widget-modules/components/add-song/add-song.component.ts
@@ -9,7 +9,7 @@ import {ShowSongService} from '../../../modules/shows/services/show-song.service
 @Component({
   selector: 'app-add-song',
   templateUrl: './add-song.component.html',
-  styleUrls: ['./add-song.component.less']
+  styleUrls: ['./add-song.component.less'],
 })
 export class AddSongComponent {
   @Input() public songs: Song[];
@@ -18,10 +18,9 @@ export class AddSongComponent {
   @Input() public addedLive = false;
   public filteredSongsControl = new FormControl();
 
-  constructor(private showSongService: ShowSongService) {
-  }
+  public constructor(private showSongService: ShowSongService) {}
 
-  filteredSongs() {
+  public filteredSongs(): Song[] {
     const songs = this.songs
       .filter(_ => !!_)
       .filter(_ => !!_.title)
@@ -37,14 +36,13 @@ export class AddSongComponent {
         return 0;
       });
 
-    const filterValue = this.filteredSongsControl.value;
+    const filterValue = this.filteredSongsControl.value as string;
     return filterValue ? songs.filter(_ => filterSong(_, filterValue)) : songs;
   }
 
-  public async onAddSongSelectionChanged(event: MatSelectChange) {
+  public async onAddSongSelectionChanged(event: MatSelectChange): Promise<void> {
     const order = this.showSongs.reduce((oa, u) => Math.max(oa, u.order), 0) + 1;
     await this.showSongService.new$(this.showId, event.value, order, this.addedLive);
     event.source.value = null;
   }
-
 }
diff --git a/src/app/widget-modules/components/add-song/add-song.module.ts b/src/app/widget-modules/components/add-song/add-song.module.ts
index 62a167a..5b5984f 100644
--- a/src/app/widget-modules/components/add-song/add-song.module.ts
+++ b/src/app/widget-modules/components/add-song/add-song.module.ts
@@ -6,19 +6,9 @@ import {MatSelectModule} from '@angular/material/select';
 import {NgxMatSelectSearchModule} from 'ngx-mat-select-search';
 import {ReactiveFormsModule} from '@angular/forms';
 
-
 @NgModule({
   declarations: [AddSongComponent],
-  exports: [
-    AddSongComponent
-  ],
-  imports: [
-    CommonModule,
-    MatFormFieldModule,
-    MatSelectModule,
-    NgxMatSelectSearchModule,
-    ReactiveFormsModule
-  ]
+  exports: [AddSongComponent],
+  imports: [CommonModule, MatFormFieldModule, MatSelectModule, NgxMatSelectSearchModule, ReactiveFormsModule],
 })
-export class AddSongModule {
-}
+export class AddSongModule {}
diff --git a/src/app/widget-modules/components/application-frame/application-frame.module.ts b/src/app/widget-modules/components/application-frame/application-frame.module.ts
index 3301a7a..db3477b 100644
--- a/src/app/widget-modules/components/application-frame/application-frame.module.ts
+++ b/src/app/widget-modules/components/application-frame/application-frame.module.ts
@@ -10,22 +10,8 @@ import {RoleModule} from '../../../services/user/role.module';
 import {BrandComponent} from './navigation/brand/brand.component';
 
 @NgModule({
-  declarations: [
-    NavigationComponent,
-    FilterComponent,
-    LinkComponent,
-    BrandComponent
-  ],
-  imports: [
-    CommonModule,
-    RouterModule,
-    FontAwesomeModule,
-    FormsModule,
-    RoleModule
-  ],
-  exports: [
-    NavigationComponent
-  ]
+  declarations: [NavigationComponent, FilterComponent, LinkComponent, BrandComponent],
+  imports: [CommonModule, RouterModule, FontAwesomeModule, FormsModule, RoleModule],
+  exports: [NavigationComponent],
 })
-export class ApplicationFrameModule {
-}
+export class ApplicationFrameModule {}
diff --git a/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.html b/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.html
index da9a16e..fae16ca 100644
--- a/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.html
+++ b/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.html
@@ -2,18 +2,24 @@
   <svg
     height="30"
     id="svg8"
-    version="1.1"
     viewBox="0 0 270.93333 270.93334"
     width="30"
     xmlns="http://www.w3.org/2000/svg"
   >
-    <g
-      id="layer1">
+    <g id="layer1">
       <path
         d="M 511.29688 0.75390625 A 511.24675 511.24675 0 0 0 419.16406 9.2539062 L 419.16406 49.929688 L 419.16406 73.990234 L 419.16406 81.289062 L 419.16406 96.902344 L 419.16406 103.85352 L 419.16406 119.875 L 419.16406 126.48047 L 419.16406 142.91602 L 419.16406 149.17578 L 419.16406 166.04883 L 419.16406 171.96289 L 419.16406 189.2832 L 419.16406 194.85742 L 419.16406 212.64648 L 419.16406 217.88281 L 419.16406 236.17383 L 419.16406 241.07422 L 419.16406 259.90625 L 419.16406 264.47656 L 419.16406 274.64258 L 395.60352 274.64258 L 386.17578 274.64258 L 351.74805 274.64258 L 343.59375 274.64258 L 315.06055 274.64258 L 307.32422 274.64258 L 282.08789 274.64258 L 274.45898 274.64258 L 251.41406 274.64258 L 243.74219 274.64258 L 222.30859 274.64258 L 214.50586 274.64258 L 194.3418 274.64258 L 186.35742 274.64258 L 167.23242 274.64258 L 159.03125 274.64258 L 158.44727 274.64258 L 158.44727 275.51367 L 158.44727 287.93945 L 158.44727 318.6543 L 158.44727 332.43164 L 158.44727 371.13867 L 158.44727 388.47461 L 158.44727 454.54297 L 158.44727 460.3125 L 163.33008 460.3125 L 180.19727 460.3125 L 185.61523 460.3125 L 202.87305 460.3125 L 207.93945 460.3125 L 225.5957 460.3125 L 230.3125 460.3125 L 248.375 460.3125 L 252.74023 460.3125 L 271.22852 460.3125 L 275.24414 460.3125 L 294.17773 460.3125 L 297.84961 460.3125 L 317.26172 460.3125 L 320.58398 460.3125 L 355.35156 460.3125 L 419.16406 460.3125 L 419.16406 648.35352 L 419.16406 687.19336 L 419.16406 690.81836 L 419.16406 711.78516 L 419.16406 715.71289 L 419.16406 735.8418 L 419.16406 740.08984 L 419.16406 759.52344 L 419.16406 764.09375 L 419.16406 782.92578 L 419.16406 787.82617 L 419.16406 806.11914 L 419.16406 811.35156 L 419.16406 829.14258 L 419.16406 834.7168 L 419.16406 852.0332 L 419.16406 857.95117 L 419.16406 874.82227 L 419.16406 881.08203 L 419.16406 897.52148 L 419.16406 904.12695 L 419.16406 920.14648 L 419.16406 927.09766 L 419.16406 942.70898 L 419.16406 950.00977 L 419.16406 974.07227 L 419.16406 1014.7441 A 511.24675 511.24675 0 0 0 512 1023.2461 A 511.24675 511.24675 0 0 0 604.83594 1014.7461 L 604.83594 974.07227 L 604.83594 950.00977 L 604.83594 942.71094 L 604.83594 927.09961 L 604.83594 920.14648 L 604.83594 904.125 L 604.83594 897.51953 L 604.83594 881.08203 L 604.83594 874.82422 L 604.83594 857.95312 L 604.83594 852.03516 L 604.83594 834.7168 L 604.83594 829.14258 L 604.83594 811.35352 L 604.83594 806.11719 L 604.83594 787.82617 L 604.83594 782.92578 L 604.83594 764.09375 L 604.83594 759.52344 L 604.83594 740.08789 L 604.83594 735.8418 L 604.83594 715.71289 L 604.83594 711.7832 L 604.83594 690.81836 L 604.83594 687.19531 L 604.83594 648.35156 L 604.83594 460.3125 L 668.65039 460.3125 L 703.41602 460.3125 L 706.73828 460.3125 L 726.15039 460.3125 L 729.82031 460.3125 L 748.75391 460.3125 L 752.77148 460.3125 L 771.25781 460.3125 L 775.62305 460.3125 L 793.68555 460.3125 L 798.4043 460.3125 L 816.05859 460.3125 L 821.12695 460.3125 L 838.38281 460.3125 L 843.80273 460.3125 L 860.66992 460.3125 L 865.55273 460.3125 L 865.55273 454.54688 L 865.55273 388.47266 L 865.55273 371.14062 L 865.55273 332.43164 L 865.55273 318.6543 L 865.55273 287.93945 L 865.55273 275.51562 L 865.55273 274.64258 L 864.9668 274.64258 L 856.76562 274.64258 L 837.64258 274.64258 L 829.6582 274.64258 L 809.49219 274.64258 L 801.68945 274.64258 L 780.25586 274.64258 L 772.58203 274.64258 L 749.54297 274.64258 L 741.91211 274.64258 L 716.67383 274.64258 L 708.94141 274.64258 L 680.40234 274.64258 L 672.25195 274.64258 L 637.82422 274.64258 L 628.39648 274.64258 L 604.83594 274.64258 L 604.83594 264.47656 L 604.83594 259.90625 L 604.83594 241.07422 L 604.83594 236.17383 L 604.83594 217.88086 L 604.83594 212.64844 L 604.83594 194.85742 L 604.83594 189.2832 L 604.83594 171.9668 L 604.83594 166.04883 L 604.83594 149.17773 L 604.83594 142.91797 L 604.83594 126.47852 L 604.83594 119.87305 L 604.83594 103.85352 L 604.83594 96.902344 L 604.83594 81.291016 L 604.83594 73.990234 L 604.83594 49.929688 L 604.83594 9.2558594 A 511.24675 511.24675 0 0 0 512 0.75390625 A 511.24675 511.24675 0 0 0 511.29688 0.75390625 z M 386.52148 16.392578 A 511.24675 511.24675 0 0 0 0.75390625 512 A 511.24675 511.24675 0 0 0 386.52148 1007.6074 L 386.52148 966.29492 A 471.30561 471.30561 0 0 1 40.695312 512 A 471.30561 471.30561 0 0 1 386.52148 57.707031 L 386.52148 16.392578 z M 637.47852 16.392578 L 637.47852 57.707031 A 471.30561 471.30561 0 0 1 983.30664 512 A 471.30561 471.30561 0 0 1 637.47852 966.29688 L 637.47852 1007.6074 A 511.24675 511.24675 0 0 0 1023.2461 512 A 511.24675 511.24675 0 0 0 637.47852 16.392578 z M 386.52148 82.203125 A 447.74037 447.74037 0 0 0 154.56445 242.35156 L 163.54688 242.35156 A 440.60061 440.60061 0 0 1 386.52148 89.644531 L 386.52148 82.203125 z M 637.47852 82.203125 L 637.47852 89.646484 A 440.60061 440.60061 0 0 1 860.45117 242.35156 L 869.43555 242.35156 A 447.74037 447.74037 0 0 0 637.47852 82.203125 z M 386.52148 105.57812 A 425.35335 425.35335 0 0 0 183.03906 242.35156 L 191.85547 242.35156 A 418.57057 418.57057 0 0 1 386.52148 112.67969 L 386.52148 105.57812 z M 637.47852 105.57812 L 637.47852 112.67969 A 418.57057 418.57057 0 0 1 832.14258 242.35156 L 840.95898 242.35156 A 425.35335 425.35335 0 0 0 637.47852 105.57812 z M 637.47852 129.06836 L 637.47852 135.83594 A 396.54052 396.54052 0 0 1 802.74805 242.35156 L 811.45117 242.35156 A 402.96629 402.96629 0 0 0 637.47852 129.06836 z M 386.52148 129.07031 A 402.96629 402.96629 0 0 0 212.55078 242.35156 L 221.25195 242.35156 A 396.54052 396.54052 0 0 1 386.52148 135.83594 L 386.52148 129.07031 z M 386.52148 152.69922 A 380.57927 380.57927 0 0 0 243.42969 242.35156 L 252.0957 242.35156 A 374.51048 374.51048 0 0 1 386.52148 159.13477 L 386.52148 152.69922 z M 637.47852 152.70312 L 637.47852 159.13477 A 374.51048 374.51048 0 0 1 771.90039 242.35156 L 780.56836 242.35156 A 380.57927 380.57927 0 0 0 637.47852 152.70312 z M 386.52148 176.50781 A 358.19224 358.19224 0 0 0 276.22461 242.35156 L 284.99219 242.35156 A 352.48043 352.48043 0 0 1 386.52148 182.60938 L 386.52148 176.50781 z M 637.47852 176.50781 L 637.47852 182.61328 A 352.48043 352.48043 0 0 1 739.00391 242.35156 L 747.77344 242.35156 A 358.19224 358.19224 0 0 0 637.47852 176.50781 z M 637.47852 200.51953 L 637.47852 206.30078 A 330.45039 330.45039 0 0 1 703.01758 242.35156 L 712.13672 242.35156 A 335.80521 335.80521 0 0 0 637.47852 200.51953 z M 386.52148 200.52148 A 335.80521 335.80521 0 0 0 311.86719 242.35156 L 320.98438 242.35156 A 330.45039 330.45039 0 0 1 386.52148 206.29883 L 386.52148 200.52148 z M 386.52148 224.79688 A 313.41818 313.41818 0 0 0 352.25 242.35156 L 362.29102 242.35156 A 308.42035 308.42035 0 0 1 386.52148 230.25781 L 386.52148 224.79688 z M 637.47852 224.79883 L 637.47852 230.25586 A 308.42035 308.42035 0 0 1 661.71484 242.35156 L 671.74609 242.35156 A 313.41818 313.41818 0 0 0 637.47852 224.79883 z M 129.07422 279.96875 A 447.74037 447.74037 0 0 0 64.259766 512 A 447.74037 447.74037 0 0 0 386.52148 941.79688 L 386.52148 934.35352 A 440.60061 440.60061 0 0 1 71.398438 512 A 440.60061 440.60061 0 0 1 129.07422 294.0625 L 129.07422 279.96875 z M 894.92578 279.96875 L 894.92578 294.0625 A 440.60061 440.60061 0 0 1 952.60156 512 A 440.60061 440.60061 0 0 1 637.47852 934.35547 L 637.47852 941.79688 A 447.74037 447.74037 0 0 0 959.74023 512 A 447.74037 447.74037 0 0 0 894.92578 279.96875 z M 129.07422 326.81445 A 425.35335 425.35335 0 0 0 86.646484 512 A 425.35335 425.35335 0 0 0 386.52148 918.42383 L 386.52148 911.32031 A 418.57057 418.57057 0 0 1 93.427734 512 A 418.57057 418.57057 0 0 1 129.07422 342.97266 L 129.07422 326.81445 z M 894.92578 326.82031 L 894.92578 342.9707 A 418.57057 418.57057 0 0 1 930.57227 512 A 418.57057 418.57057 0 0 1 637.47852 911.32031 L 637.47852 918.42383 A 425.35335 425.35335 0 0 0 937.35352 512 A 425.35335 425.35335 0 0 0 894.92578 326.82031 z M 129.07422 386.50195 A 402.96629 402.96629 0 0 0 109.0332 512 A 402.96629 402.96629 0 0 0 386.52148 894.93164 L 386.52148 888.16406 A 396.54052 396.54052 0 0 1 115.45898 512 A 396.54052 396.54052 0 0 1 129.07422 408.98828 L 129.07422 386.50195 z M 894.92578 386.50586 L 894.92578 408.98438 A 396.54052 396.54052 0 0 1 908.54102 512 A 396.54052 396.54052 0 0 1 637.47852 888.16211 L 637.47852 894.92969 A 402.96629 402.96629 0 0 0 914.9668 512 A 402.96629 402.96629 0 0 0 894.92578 386.50586 z M 131.91406 492.60547 A 380.57927 380.57927 0 0 0 131.41992 512 A 380.57927 380.57927 0 0 0 386.52148 871.29688 L 386.52148 864.86523 A 374.51048 374.51048 0 0 1 137.48828 512 A 374.51048 374.51048 0 0 1 137.99219 492.60547 L 131.91406 492.60547 z M 154.33398 492.60547 A 358.19224 358.19224 0 0 0 153.80859 512 A 358.19224 358.19224 0 0 0 386.52148 847.49219 L 386.52148 841.38672 A 352.48043 352.48043 0 0 1 159.51953 512 A 352.48043 352.48043 0 0 1 160.05469 492.60547 L 154.33398 492.60547 z M 176.75586 492.60547 A 335.80521 335.80521 0 0 0 176.19531 512 A 335.80521 335.80521 0 0 0 386.52148 823.47852 L 386.52148 817.69922 A 330.45039 330.45039 0 0 1 181.54883 512 A 330.45039 330.45039 0 0 1 182.11914 492.60547 L 176.75586 492.60547 z M 199.18359 492.60547 A 313.41818 313.41818 0 0 0 198.58203 512 A 313.41818 313.41818 0 0 0 386.52148 799.20312 L 386.52148 793.74414 A 308.42035 308.42035 0 0 1 203.57812 512 A 308.42035 308.42035 0 0 1 204.18945 492.60547 L 199.18359 492.60547 z M 221.61523 492.60547 A 291.03115 291.03115 0 0 0 220.96875 512 A 291.03115 291.03115 0 0 0 386.52148 774.58984 L 386.52148 769.4375 A 286.39031 286.39031 0 0 1 225.60938 512 A 286.39031 286.39031 0 0 1 226.26758 492.60547 L 221.61523 492.60547 z M 244.05859 492.60547 A 268.64412 268.64412 0 0 0 243.35547 512 A 268.64412 268.64412 0 0 0 386.52148 749.53906 L 386.52148 744.68359 A 264.36038 264.36038 0 0 1 247.63867 512 A 264.36038 264.36038 0 0 1 248.35156 492.60547 L 244.05859 492.60547 z M 266.50781 492.60547 A 246.25722 246.25722 0 0 0 265.74219 512 A 246.25722 246.25722 0 0 0 386.52148 723.89258 L 386.52148 719.31445 A 242.33035 242.33035 0 0 1 269.66797 512 A 242.33035 242.33035 0 0 1 270.44531 492.60547 L 266.50781 492.60547 z M 288.9707 492.60547 A 223.8702 223.8702 0 0 0 288.12891 512 A 223.8702 223.8702 0 0 0 386.52148 697.39844 L 386.52148 693.07227 A 220.30032 220.30032 0 0 1 291.69922 512 A 220.30032 220.30032 0 0 1 292.55469 492.60547 L 288.9707 492.60547 z M 311.45312 492.60547 A 201.48318 201.48318 0 0 0 310.51758 512 A 201.48318 201.48318 0 0 0 386.52148 669.63672 L 386.52148 665.51367 A 198.27029 198.27029 0 0 1 313.72852 512 A 198.27029 198.27029 0 0 1 314.67969 492.60547 L 311.45312 492.60547 z M 348.1875 492.60547 A 164.95698 164.95698 0 0 0 347.04297 512 A 164.95698 164.95698 0 0 0 386.52148 619.08008 L 386.52148 492.60547 L 348.1875 492.60547 z M 637.47852 492.60547 L 637.47852 619.07617 A 164.95698 164.95698 0 0 0 676.95703 512 A 164.95698 164.95698 0 0 0 675.8125 492.60547 L 637.47852 492.60547 z M 709.32031 492.60547 A 198.27029 198.27029 0 0 1 710.27148 512 A 198.27029 198.27029 0 0 1 637.47852 665.51367 L 637.47852 669.63672 A 201.48318 201.48318 0 0 0 713.48242 512 A 201.48318 201.48318 0 0 0 712.54688 492.60547 L 709.32031 492.60547 z M 731.44336 492.60547 A 220.30032 220.30032 0 0 1 732.30078 512 A 220.30032 220.30032 0 0 1 637.47852 693.07031 L 637.47852 697.39844 A 223.8702 223.8702 0 0 0 735.86914 512 A 223.8702 223.8702 0 0 0 735.02734 492.60547 L 731.44336 492.60547 z M 753.55273 492.60547 A 242.33035 242.33035 0 0 1 754.33008 512 A 242.33035 242.33035 0 0 1 637.47852 719.3125 L 637.47852 723.89062 A 246.25722 246.25722 0 0 0 758.25781 512 A 246.25722 246.25722 0 0 0 757.49219 492.60547 L 753.55273 492.60547 z M 775.64844 492.60547 A 264.36038 264.36038 0 0 1 776.36133 512 A 264.36038 264.36038 0 0 1 637.47852 744.68359 L 637.47852 749.53906 A 268.64412 268.64412 0 0 0 780.64453 512 A 268.64412 268.64412 0 0 0 779.94336 492.60547 L 775.64844 492.60547 z M 797.73242 492.60547 A 286.39031 286.39031 0 0 1 798.39062 512 A 286.39031 286.39031 0 0 1 637.47852 769.4375 L 637.47852 774.58984 A 291.03115 291.03115 0 0 0 803.03125 512 A 291.03115 291.03115 0 0 0 802.38281 492.60547 L 797.73242 492.60547 z M 819.81055 492.60547 A 308.42035 308.42035 0 0 1 820.42188 512 A 308.42035 308.42035 0 0 1 637.47852 793.74219 L 637.47852 799.20312 A 313.41818 313.41818 0 0 0 825.41797 512 A 313.41818 313.41818 0 0 0 824.81641 492.60547 L 819.81055 492.60547 z M 841.88086 492.60547 A 330.45039 330.45039 0 0 1 842.45117 512 A 330.45039 330.45039 0 0 1 637.47852 817.69922 L 637.47852 823.47852 A 335.80521 335.80521 0 0 0 847.80469 512 A 335.80521 335.80521 0 0 0 847.24219 492.60547 L 841.88086 492.60547 z M 863.94531 492.60547 A 352.48043 352.48043 0 0 1 864.48047 512 A 352.48043 352.48043 0 0 1 637.47852 841.38867 L 637.47852 847.49414 A 358.19224 358.19224 0 0 0 870.19141 512 A 358.19224 358.19224 0 0 0 869.66406 492.60547 L 863.94531 492.60547 z M 886.00977 492.60547 A 374.51048 374.51048 0 0 1 886.51172 512 A 374.51048 374.51048 0 0 1 637.47852 864.86719 L 637.47852 871.29883 A 380.57927 380.57927 0 0 0 892.58008 512 A 380.57927 380.57927 0 0 0 892.08398 492.60547 L 886.00977 492.60547 z "
         id="path851"
-        style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-        transform="scale(0.26458333)"/>
+        style="
+          fill: #ffffff;
+          fill-opacity: 1;
+          stroke: none;
+          stroke-width: 1;
+          stroke-miterlimit: 4;
+          stroke-dasharray: none;
+        "
+        transform="scale(0.26458333)"
+      />
     </g>
   </svg>
 </div>
diff --git a/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.spec.ts b/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.spec.ts
index 25bc972..141adc0 100644
--- a/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.spec.ts
+++ b/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.spec.ts
@@ -6,12 +6,13 @@ describe('BrandComponent', () => {
   let component: BrandComponent;
   let fixture: ComponentFixture<BrandComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [BrandComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [BrandComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(BrandComponent);
@@ -20,6 +21,6 @@ describe('BrandComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.ts b/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.ts
index c7f3e34..603d0b1 100644
--- a/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.ts
+++ b/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.ts
@@ -1,16 +1,8 @@
-import {Component, OnInit} from '@angular/core';
+import {Component} from '@angular/core';
 
 @Component({
   selector: 'app-brand',
   templateUrl: './brand.component.html',
-  styleUrls: ['./brand.component.less']
+  styleUrls: ['./brand.component.less'],
 })
-export class BrandComponent implements OnInit {
-
-  constructor() {
-  }
-
-  ngOnInit(): void {
-  }
-
-}
+export class BrandComponent {}
diff --git a/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.html b/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.html
index dfbadb5..a86c948 100644
--- a/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.html
+++ b/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.html
@@ -1 +1,5 @@
-<input (ngModelChange)="valueChange($event)" [ngModel]="value" placeholder="Suche">
+<input
+  (ngModelChange)="valueChange($event)"
+  [ngModel]="value"
+  placeholder="Suche"
+/>
diff --git a/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.spec.ts b/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.spec.ts
index ba07836..a8f8006 100644
--- a/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.spec.ts
+++ b/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.spec.ts
@@ -6,12 +6,13 @@ describe('FilterComponent', () => {
   let component: FilterComponent;
   let fixture: ComponentFixture<FilterComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [FilterComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [FilterComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(FilterComponent);
@@ -20,6 +21,6 @@ describe('FilterComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.ts b/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.ts
index 9ffb2b4..277c127 100644
--- a/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.ts
+++ b/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.ts
@@ -4,13 +4,13 @@ import {ActivatedRoute, Router} from '@angular/router';
 @Component({
   selector: 'app-filter',
   templateUrl: './filter.component.html',
-  styleUrls: ['./filter.component.less']
+  styleUrls: ['./filter.component.less'],
 })
 export class FilterComponent {
   public value: string;
 
-  constructor(private router: Router, activatedRoute: ActivatedRoute) {
-    activatedRoute.queryParams.subscribe(_ => {
+  public constructor(private router: Router, activatedRoute: ActivatedRoute) {
+    activatedRoute.queryParams.subscribe((_: {q: string}) => {
       if (_.q) {
         this.value = _.q;
       }
@@ -18,7 +18,10 @@ export class FilterComponent {
   }
 
   public async valueChange(text: string): Promise<void> {
-    const route = this.router.createUrlTree(['songs'], {queryParams: {q: text}, queryParamsHandling: 'merge'});
+    const route = this.router.createUrlTree(['songs'], {
+      queryParams: {q: text},
+      queryParamsHandling: 'merge',
+    });
     await this.router.navigateByUrl(route);
   }
 }
diff --git a/src/app/widget-modules/components/application-frame/navigation/link/link.component.html b/src/app/widget-modules/components/application-frame/navigation/link/link.component.html
index de7fc30..57a3a89 100644
--- a/src/app/widget-modules/components/application-frame/navigation/link/link.component.html
+++ b/src/app/widget-modules/components/application-frame/navigation/link/link.component.html
@@ -1,3 +1,4 @@
 <a [routerLink]="link" href="#" routerLinkActive="active">
   <fa-icon [icon]="icon"></fa-icon>
-  <span class="link-text">&nbsp;&nbsp;{{text}}</span></a>
+  <span class="link-text">&nbsp;&nbsp;{{ text }}</span></a
+>
diff --git a/src/app/widget-modules/components/application-frame/navigation/link/link.component.spec.ts b/src/app/widget-modules/components/application-frame/navigation/link/link.component.spec.ts
index 199cf4f..5682ffa 100644
--- a/src/app/widget-modules/components/application-frame/navigation/link/link.component.spec.ts
+++ b/src/app/widget-modules/components/application-frame/navigation/link/link.component.spec.ts
@@ -6,12 +6,13 @@ describe('LinkComponent', () => {
   let component: LinkComponent;
   let fixture: ComponentFixture<LinkComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [LinkComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [LinkComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(LinkComponent);
@@ -20,6 +21,6 @@ describe('LinkComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/components/application-frame/navigation/link/link.component.ts b/src/app/widget-modules/components/application-frame/navigation/link/link.component.ts
index 869c1d1..835aac0 100644
--- a/src/app/widget-modules/components/application-frame/navigation/link/link.component.ts
+++ b/src/app/widget-modules/components/application-frame/navigation/link/link.component.ts
@@ -4,7 +4,7 @@ import {IconProp} from '@fortawesome/fontawesome-svg-core';
 @Component({
   selector: 'app-link',
   templateUrl: './link.component.html',
-  styleUrls: ['./link.component.less']
+  styleUrls: ['./link.component.less'],
 })
 export class LinkComponent {
   @Input() public text: string;
diff --git a/src/app/widget-modules/components/application-frame/navigation/navigation.component.html b/src/app/widget-modules/components/application-frame/navigation/navigation.component.html
index 0af6155..7666a26 100644
--- a/src/app/widget-modules/components/application-frame/navigation/navigation.component.html
+++ b/src/app/widget-modules/components/application-frame/navigation/navigation.component.html
@@ -1,14 +1,27 @@
-<nav [class.hidden]="(windowScroll$|async)>60" class="head">
+<nav [class.hidden]="(windowScroll$ | async) > 60" class="head">
   <div class="links">
     <app-brand routerLink="/brand"></app-brand>
-    <app-link *appRole="['user','presenter', 'leader']" [icon]="faSongs" link="/songs" text="Lieder"></app-link>
-    <app-link *appRole="['leader']" [icon]="faShows" link="/shows" text="Veranstaltungen"></app-link>
-    <app-link *appRole="['presenter']" [icon]="faPresentation" link="/presentation" text="Präsentation"></app-link>
+    <app-link
+      *appRole="['user', 'presenter', 'leader']"
+      [icon]="faSongs"
+      link="/songs"
+      text="Lieder"
+    ></app-link>
+    <app-link
+      *appRole="['leader']"
+      [icon]="faShows"
+      link="/shows"
+      text="Veranstaltungen"
+    ></app-link>
+    <app-link
+      *appRole="['presenter']"
+      [icon]="faPresentation"
+      link="/presentation"
+      text="Präsentation"
+    ></app-link>
     <app-link [icon]="faUser" link="/user" text="Benutzer"></app-link>
   </div>
-  <div *appRole="['user','presenter', 'leader']" class="actions">
+  <div *appRole="['user', 'presenter', 'leader']" class="actions">
     <app-filter></app-filter>
   </div>
 </nav>
-
-
diff --git a/src/app/widget-modules/components/application-frame/navigation/navigation.component.spec.ts b/src/app/widget-modules/components/application-frame/navigation/navigation.component.spec.ts
index 745b5b6..916d755 100644
--- a/src/app/widget-modules/components/application-frame/navigation/navigation.component.spec.ts
+++ b/src/app/widget-modules/components/application-frame/navigation/navigation.component.spec.ts
@@ -6,12 +6,13 @@ describe('NavigationComponent', () => {
   let component: NavigationComponent;
   let fixture: ComponentFixture<NavigationComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [NavigationComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [NavigationComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(NavigationComponent);
@@ -20,6 +21,6 @@ describe('NavigationComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/components/application-frame/navigation/navigation.component.ts b/src/app/widget-modules/components/application-frame/navigation/navigation.component.ts
index 70b8ac7..abe1adb 100644
--- a/src/app/widget-modules/components/application-frame/navigation/navigation.component.ts
+++ b/src/app/widget-modules/components/application-frame/navigation/navigation.component.ts
@@ -9,15 +9,18 @@ import {faChalkboard} from '@fortawesome/free-solid-svg-icons/faChalkboard';
 @Component({
   selector: 'app-navigation',
   templateUrl: './navigation.component.html',
-  styleUrls: ['./navigation.component.less']
+  styleUrls: ['./navigation.component.less'],
 })
 export class NavigationComponent {
-
   public faSongs = faMusic;
   public faShows = faPersonBooth;
   public faUser = faUserCog;
   public faPresentation = faChalkboard;
 
-  public readonly windowScroll$ = fromEvent(window, 'scroll').pipe(map(x => window.scrollY), startWith(0), distinctUntilChanged(), shareReplay(1));
-
+  public readonly windowScroll$ = fromEvent(window, 'scroll').pipe(
+    map(() => window.scrollY),
+    startWith(0),
+    distinctUntilChanged(),
+    shareReplay(1)
+  );
 }
diff --git a/src/app/widget-modules/components/button-row/button-row.component.spec.ts b/src/app/widget-modules/components/button-row/button-row.component.spec.ts
index 9272f3d..e2d6ecc 100644
--- a/src/app/widget-modules/components/button-row/button-row.component.spec.ts
+++ b/src/app/widget-modules/components/button-row/button-row.component.spec.ts
@@ -6,12 +6,13 @@ describe('ButtonRowComponent', () => {
   let component: ButtonRowComponent;
   let fixture: ComponentFixture<ButtonRowComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ButtonRowComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [ButtonRowComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ButtonRowComponent);
@@ -20,6 +21,6 @@ describe('ButtonRowComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/components/button-row/button-row.component.ts b/src/app/widget-modules/components/button-row/button-row.component.ts
index 4ddaaec..a0628ae 100644
--- a/src/app/widget-modules/components/button-row/button-row.component.ts
+++ b/src/app/widget-modules/components/button-row/button-row.component.ts
@@ -1,16 +1,8 @@
-import {Component, OnInit} from '@angular/core';
+import {Component} from '@angular/core';
 
 @Component({
   selector: 'app-button-row',
   templateUrl: './button-row.component.html',
-  styleUrls: ['./button-row.component.less']
+  styleUrls: ['./button-row.component.less'],
 })
-export class ButtonRowComponent implements OnInit {
-
-  constructor() {
-  }
-
-  ngOnInit() {
-  }
-
-}
+export class ButtonRowComponent {}
diff --git a/src/app/widget-modules/components/button-row/button-row.module.ts b/src/app/widget-modules/components/button-row/button-row.module.ts
index fc7cca8..66f2f96 100644
--- a/src/app/widget-modules/components/button-row/button-row.module.ts
+++ b/src/app/widget-modules/components/button-row/button-row.module.ts
@@ -2,13 +2,9 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {ButtonRowComponent} from './button-row.component';
 
-
 @NgModule({
   declarations: [ButtonRowComponent],
   exports: [ButtonRowComponent],
-  imports: [
-    CommonModule
-  ]
+  imports: [CommonModule],
 })
-export class ButtonRowModule {
-}
+export class ButtonRowModule {}
diff --git a/src/app/widget-modules/components/button/button.component.html b/src/app/widget-modules/components/button/button.component.html
index eaad9ec..42ea449 100644
--- a/src/app/widget-modules/components/button/button.component.html
+++ b/src/app/widget-modules/components/button/button.component.html
@@ -1,5 +1,7 @@
 <button mat-button>
-  <span *ngIf="icon"><fa-icon [icon]="icon"></fa-icon><span class="content">&nbsp;</span></span>
+  <span *ngIf="icon"
+  ><fa-icon [icon]="icon"></fa-icon><span class="content">&nbsp;</span></span
+  >
   <span class="button-content">
     <ng-content></ng-content>
   </span>
diff --git a/src/app/widget-modules/components/button/button.component.spec.ts b/src/app/widget-modules/components/button/button.component.spec.ts
index adbefe1..63fe747 100644
--- a/src/app/widget-modules/components/button/button.component.spec.ts
+++ b/src/app/widget-modules/components/button/button.component.spec.ts
@@ -6,12 +6,13 @@ describe('ButtonComponent', () => {
   let component: ButtonComponent;
   let fixture: ComponentFixture<ButtonComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ButtonComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [ButtonComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ButtonComponent);
@@ -20,6 +21,6 @@ describe('ButtonComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/components/button/button.component.ts b/src/app/widget-modules/components/button/button.component.ts
index 5a95381..639b87b 100644
--- a/src/app/widget-modules/components/button/button.component.ts
+++ b/src/app/widget-modules/components/button/button.component.ts
@@ -4,9 +4,8 @@ import {IconProp} from '@fortawesome/fontawesome-svg-core';
 @Component({
   selector: 'app-button',
   templateUrl: './button.component.html',
-  styleUrls: ['./button.component.less']
+  styleUrls: ['./button.component.less'],
 })
 export class ButtonComponent {
-  @Input() icon: IconProp;
-
+  @Input() public icon: IconProp;
 }
diff --git a/src/app/widget-modules/components/button/button.module.ts b/src/app/widget-modules/components/button/button.module.ts
index 647955a..5383313 100644
--- a/src/app/widget-modules/components/button/button.module.ts
+++ b/src/app/widget-modules/components/button/button.module.ts
@@ -4,17 +4,9 @@ import {ButtonComponent} from './button.component';
 import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
 import {MatButtonModule} from '@angular/material/button';
 
-
 @NgModule({
   declarations: [ButtonComponent],
-  exports: [
-    ButtonComponent
-  ],
-  imports: [
-    CommonModule,
-    FontAwesomeModule,
-    MatButtonModule
-  ]
+  exports: [ButtonComponent],
+  imports: [CommonModule, FontAwesomeModule, MatButtonModule],
 })
-export class ButtonModule {
-}
+export class ButtonModule {}
diff --git a/src/app/widget-modules/components/card/card.component.html b/src/app/widget-modules/components/card/card.component.html
index 1165e57..c1a4cc7 100644
--- a/src/app/widget-modules/components/card/card.component.html
+++ b/src/app/widget-modules/components/card/card.component.html
@@ -1,7 +1,12 @@
 <div [class.padding]="padding" class="card">
-  <button *ngIf="closeLink" [routerLink]="closeLink" class="btn-close" mat-icon-button>
+  <button
+    *ngIf="closeLink"
+    [routerLink]="closeLink"
+    class="btn-close"
+    mat-icon-button
+  >
     <fa-icon [icon]="faClose"></fa-icon>
   </button>
-  <div *ngIf="heading" class="heading">{{heading}}</div>
+  <div *ngIf="heading" class="heading">{{ heading }}</div>
   <ng-content></ng-content>
 </div>
diff --git a/src/app/widget-modules/components/card/card.component.spec.ts b/src/app/widget-modules/components/card/card.component.spec.ts
index eecccd4..9b2907d 100644
--- a/src/app/widget-modules/components/card/card.component.spec.ts
+++ b/src/app/widget-modules/components/card/card.component.spec.ts
@@ -6,12 +6,13 @@ describe('CardComponent', () => {
   let component: CardComponent;
   let fixture: ComponentFixture<CardComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [CardComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [CardComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(CardComponent);
@@ -20,6 +21,6 @@ describe('CardComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/components/card/card.component.ts b/src/app/widget-modules/components/card/card.component.ts
index 46c9fb4..8e886c3 100644
--- a/src/app/widget-modules/components/card/card.component.ts
+++ b/src/app/widget-modules/components/card/card.component.ts
@@ -4,12 +4,12 @@ import {faTimes} from '@fortawesome/free-solid-svg-icons/faTimes';
 @Component({
   selector: 'app-card',
   templateUrl: './card.component.html',
-  styleUrls: ['./card.component.less']
+  styleUrls: ['./card.component.less'],
 })
 export class CardComponent {
-  @Input() padding = true;
-  @Input() heading: string;
-  @Input() closeLink: string;
+  @Input() public padding = true;
+  @Input() public heading: string;
+  @Input() public closeLink: string;
 
   public faClose = faTimes;
 }
diff --git a/src/app/widget-modules/components/card/card.module.ts b/src/app/widget-modules/components/card/card.module.ts
index 5a187c0..60da707 100644
--- a/src/app/widget-modules/components/card/card.module.ts
+++ b/src/app/widget-modules/components/card/card.module.ts
@@ -5,16 +5,9 @@ import {MatButtonModule} from '@angular/material/button';
 import {RouterModule} from '@angular/router';
 import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
 
-
 @NgModule({
   declarations: [CardComponent],
   exports: [CardComponent],
-  imports: [
-    CommonModule,
-    MatButtonModule,
-    RouterModule,
-    FontAwesomeModule
-  ]
+  imports: [CommonModule, MatButtonModule, RouterModule, FontAwesomeModule],
 })
-export class CardModule {
-}
+export class CardModule {}
diff --git a/src/app/widget-modules/components/list-header/list-header.component.html b/src/app/widget-modules/components/list-header/list-header.component.html
index beab8bf..d3385df 100644
--- a/src/app/widget-modules/components/list-header/list-header.component.html
+++ b/src/app/widget-modules/components/list-header/list-header.component.html
@@ -1,6 +1,9 @@
 <div class="header">
-
-  <button (click)="onFilterClick()" [class.filter-active]="anyFilterActive" mat-icon-button>
+  <button
+    (click)="onFilterClick()"
+    [class.filter-active]="anyFilterActive"
+    mat-icon-button
+  >
     <fa-icon [icon]="faFilter"></fa-icon>
   </button>
   <button mat-icon-button routerLink="new">
diff --git a/src/app/widget-modules/components/list-header/list-header.component.spec.ts b/src/app/widget-modules/components/list-header/list-header.component.spec.ts
index 5f8e880..68f9b4c 100644
--- a/src/app/widget-modules/components/list-header/list-header.component.spec.ts
+++ b/src/app/widget-modules/components/list-header/list-header.component.spec.ts
@@ -6,12 +6,13 @@ describe('ListHeaderComponent', () => {
   let component: ListHeaderComponent;
   let fixture: ComponentFixture<ListHeaderComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ListHeaderComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [ListHeaderComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ListHeaderComponent);
@@ -20,6 +21,6 @@ describe('ListHeaderComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/components/list-header/list-header.component.ts b/src/app/widget-modules/components/list-header/list-header.component.ts
index 23228e7..b5be8a5 100644
--- a/src/app/widget-modules/components/list-header/list-header.component.ts
+++ b/src/app/widget-modules/components/list-header/list-header.component.ts
@@ -1,4 +1,4 @@
-import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
+import {Component, EventEmitter, Input, Output} from '@angular/core';
 import {faFilter} from '@fortawesome/free-solid-svg-icons/faFilter';
 import {faPlus} from '@fortawesome/free-solid-svg-icons/faPlus';
 import {fade} from '../../../animations';
@@ -7,21 +7,14 @@ import {fade} from '../../../animations';
   selector: 'app-list-header',
   templateUrl: './list-header.component.html',
   styleUrls: ['./list-header.component.less'],
-  animations: [fade]
+  animations: [fade],
 })
-export class ListHeaderComponent implements OnInit {
-
+export class ListHeaderComponent {
   public faNew = faPlus;
   public faFilter = faFilter;
   public filterVisible = false;
-  @Output() filterVisibleChanged = new EventEmitter<boolean>();
-  @Input() anyFilterActive = false;
-
-  constructor() {
-  }
-
-  ngOnInit() {
-  }
+  @Output() public filterVisibleChanged = new EventEmitter<boolean>();
+  @Input() public anyFilterActive = false;
 
   public onFilterClick(): void {
     this.filterVisible = !this.filterVisible || this.anyFilterActive;
diff --git a/src/app/widget-modules/components/list-header/list-header.module.ts b/src/app/widget-modules/components/list-header/list-header.module.ts
index 78b6b28..38d9e8f 100644
--- a/src/app/widget-modules/components/list-header/list-header.module.ts
+++ b/src/app/widget-modules/components/list-header/list-header.module.ts
@@ -8,16 +8,7 @@ import {CardModule} from '../card/card.module';
 
 @NgModule({
   declarations: [ListHeaderComponent],
-  exports: [
-    ListHeaderComponent
-  ],
-  imports: [
-    CommonModule,
-    FontAwesomeModule,
-    MatButtonModule,
-    RouterModule,
-    CardModule,
-  ]
+  exports: [ListHeaderComponent],
+  imports: [CommonModule, FontAwesomeModule, MatButtonModule, RouterModule, CardModule],
 })
-export class ListHeaderModule {
-}
+export class ListHeaderModule {}
diff --git a/src/app/widget-modules/components/logo/logo.component.html b/src/app/widget-modules/components/logo/logo.component.html
index 7951efb..026e2d5 100644
--- a/src/app/widget-modules/components/logo/logo.component.html
+++ b/src/app/widget-modules/components/logo/logo.component.html
@@ -1,49 +1,74 @@
-<svg height="1024" version="1.1" viewBox="0 0 270.93 270.93" width="1024" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-  </defs>
+<svg
+  height="1024"
+  viewBox="0 0 270.93 270.93"
+  width="1024"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <defs></defs>
   <g fill="#fff">
     <path
       d="m118.58 41.295a87.206 87.206 0 0 0-15.716 1.4499v45.269h-44.472v31.671h44.472v94.573a87.206 87.206 0 0 0 15.836 1.4502 87.206 87.206 0 0 0 15.836-1.4499v-94.573h44.472v-31.671h-44.472v-45.269a87.206 87.206 0 0 0-15.836-1.4502 87.206 87.206 0 0 0-0.11995 0zm-21.284 2.6676a87.206 87.206 0 0 0-65.803 84.539 87.206 87.206 0 0 0 65.803 84.539v-7.0469a80.393 80.393 0 0 1-58.99-77.492 80.393 80.393 0 0 1 58.99-77.491zm42.807 0v7.0473a80.393 80.393 0 0 1 58.99 77.491 80.393 80.393 0 0 1-58.99 77.492v7.0466a87.206 87.206 0 0 0 65.803-84.539 87.206 87.206 0 0 0-65.803-84.539zm-42.807 11.226a76.374 76.374 0 0 0-39.566 27.317h1.5322a75.156 75.156 0 0 1 38.034-26.048zm42.807 0v1.2697a75.156 75.156 0 0 1 38.034 26.048h1.5325a76.374 76.374 0 0 0-39.566-27.317zm-42.807 3.9872a72.555 72.555 0 0 0-34.709 23.33h1.5039a71.398 71.398 0 0 1 33.205-22.119zm42.807 0v1.2114a71.398 71.398 0 0 1 33.205 22.119h1.5039a72.555 72.555 0 0 0-34.709-23.33zm0 4.0069v1.1544a67.64 67.64 0 0 1 28.191 18.169h1.4846a68.736 68.736 0 0 0-29.676-19.323zm-42.807 3.33e-4a68.736 68.736 0 0 0-29.675 19.323h1.4842a67.64 67.64 0 0 1 28.191-18.169zm0 4.0305a64.918 64.918 0 0 0-24.408 15.293h1.4782a63.883 63.883 0 0 1 22.93-14.195zm42.807 6.66e-4v1.0971a63.883 63.883 0 0 1 22.929 14.195h1.4786a64.918 64.918 0 0 0-24.408-15.292zm-42.807 4.0605a61.099 61.099 0 0 0-18.814 11.231h1.4955a60.125 60.125 0 0 1 17.318-10.191zm42.807 0v1.0414a60.125 60.125 0 0 1 17.318 10.19h1.4959a61.099 61.099 0 0 0-18.814-11.231zm0 4.0958v0.98614a56.367 56.367 0 0 1 11.179 6.1494h1.5555a57.28 57.28 0 0 0-12.735-7.1355zm-42.807 3.32e-4a57.28 57.28 0 0 0-12.734 7.1352h1.5552a56.367 56.367 0 0 1 11.179-6.1497zm0 4.1408a53.462 53.462 0 0 0-5.8459 2.9944h1.7128a52.609 52.609 0 0 1 4.1331-2.0629zm42.807 3.33e-4v0.93084a52.609 52.609 0 0 1 4.1341 2.0632h1.7111a53.462 53.462 0 0 0-5.8452-2.9941zm-86.722 9.4107a76.374 76.374 0 0 0-11.056 39.579 76.374 76.374 0 0 0 54.97 73.313v-1.2697a75.156 75.156 0 0 1-53.752-72.043 75.156 75.156 0 0 1 9.8381-37.175zm130.64 0v2.4041a75.156 75.156 0 0 1 9.8381 37.175 75.156 75.156 0 0 1-53.752 72.044v1.2693a76.374 76.374 0 0 0 54.97-73.313 76.374 76.374 0 0 0-11.056-39.579zm-130.64 7.9908a72.555 72.555 0 0 0-7.2372 31.588 72.555 72.555 0 0 0 51.151 69.326v-1.2117a71.398 71.398 0 0 1-49.995-68.114 71.398 71.398 0 0 1 6.0804-28.832zm130.64 9.96e-4v2.7549a71.398 71.398 0 0 1 6.0804 28.832 71.398 71.398 0 0 1-49.995 68.114v1.2117a72.555 72.555 0 0 0 51.151-69.326 72.555 72.555 0 0 0-7.2372-31.587zm-130.64 10.18a68.736 68.736 0 0 0-3.4185 21.407 68.736 68.736 0 0 0 47.333 65.319v-1.1544a67.64 67.64 0 0 1-46.237-64.165 67.64 67.64 0 0 1 2.3224-17.571zm130.64 6.6e-4v3.8343a67.64 67.64 0 0 1 2.3224 17.572 67.64 67.64 0 0 1-46.237 64.164v1.1544a68.736 68.736 0 0 0 47.333-65.319 68.736 68.736 0 0 0-3.4185-21.406zm-130.15 18.098a64.918 64.918 0 0 0-0.08429 3.3082 64.918 64.918 0 0 0 43.514 61.287v-1.0971a63.883 63.883 0 0 1-42.479-60.19 63.883 63.883 0 0 1 0.08596-3.3082zm3.8243 0a61.099 61.099 0 0 0-0.08962 3.3082 61.099 61.099 0 0 0 39.695 57.227v-1.0414a60.125 60.125 0 0 1-38.721-56.185 60.125 60.125 0 0 1 0.09129-3.3082zm3.8246 0a57.28 57.28 0 0 0-0.09562 3.3082 57.28 57.28 0 0 0 35.877 53.131v-0.98581a56.367 56.367 0 0 1-34.963-52.145 56.367 56.367 0 0 1 0.09728-3.3082zm3.8256 0a53.462 53.462 0 0 0-0.10261 3.3082 53.462 53.462 0 0 0 32.058 48.99v-0.93117a52.609 52.609 0 0 1-31.206-48.059 52.609 52.609 0 0 1 0.10428-3.3082zm3.8263 0a49.643 49.643 0 0 0-0.11027 3.3082 49.643 49.643 0 0 0 28.239 44.792v-0.87887a48.851 48.851 0 0 1-27.448-43.913 48.851 48.851 0 0 1 0.11227-3.3082zm3.8283 0a45.824 45.824 0 0 0-0.11994 3.3082 45.824 45.824 0 0 0 24.421 40.518v-0.82823a45.094 45.094 0 0 1-23.69-39.69 45.094 45.094 0 0 1 0.1216-3.3082zm3.8293 0a42.006 42.006 0 0 0-0.13059 3.3082 42.006 42.006 0 0 0 20.602 36.144v-0.78093a41.336 41.336 0 0 1-19.932-35.363 41.336 41.336 0 0 1 0.1326-3.3082zm3.8316 0a38.187 38.187 0 0 0-0.14359 3.3082 38.187 38.187 0 0 0 16.783 31.625v-0.73793a37.578 37.578 0 0 1-16.174-30.887 37.578 37.578 0 0 1 0.14592-3.3082zm3.835 0a34.368 34.368 0 0 0-0.15958 3.3082 34.368 34.368 0 0 0 12.964 26.889v-0.70329a33.82 33.82 0 0 1-12.417-26.186 33.82 33.82 0 0 1 0.16225-3.3082zm6.266 0a28.138 28.138 0 0 0-0.19522 3.3082 28.138 28.138 0 0 0 6.7341 18.265v-21.574zm49.346 0v21.573a28.138 28.138 0 0 0 6.7341-18.265 28.138 28.138 0 0 0-0.19523-3.3082zm12.254 0a33.82 33.82 0 0 1 0.16225 3.3082 33.82 33.82 0 0 1-12.417 26.186v0.70329a34.368 34.368 0 0 0 12.964-26.889 34.368 34.368 0 0 0-0.15959-3.3082zm3.7737 0a37.578 37.578 0 0 1 0.14625 3.3082 37.578 37.578 0 0 1-16.174 30.886v0.73826a38.187 38.187 0 0 0 16.783-31.625 38.187 38.187 0 0 0-0.14359-3.3082zm3.7713 0a41.336 41.336 0 0 1 0.13259 3.3082 41.336 41.336 0 0 1-19.932 35.363v0.78092a42.006 42.006 0 0 0 20.602-36.143 42.006 42.006 0 0 0-0.1306-3.3082zm3.769 0a45.094 45.094 0 0 1 0.1216 3.3082 45.094 45.094 0 0 1-23.69 39.69v0.82823a45.824 45.824 0 0 0 24.421-40.518 45.824 45.824 0 0 0-0.1196-3.3082zm3.767 0a48.851 48.851 0 0 1 0.11228 3.3082 48.851 48.851 0 0 1-27.448 43.913v0.87887a49.643 49.643 0 0 0 28.239-44.792 49.643 49.643 0 0 0-0.1106-3.3082zm3.766 0a52.609 52.609 0 0 1 0.10428 3.3082 52.609 52.609 0 0 1-31.206 48.058v0.93151a53.462 53.462 0 0 0 32.058-48.99 53.462 53.462 0 0 0-0.10257-3.3082zm3.7647 0a56.367 56.367 0 0 1 0.0973 3.3082 56.367 56.367 0 0 1-34.963 52.145v0.98581a57.28 57.28 0 0 0 35.877-53.131 57.28 57.28 0 0 0-0.0959-3.3082zm3.7637 0a60.125 60.125 0 0 1 0.0913 3.3082 60.125 60.125 0 0 1-38.721 56.186v1.0414a61.099 61.099 0 0 0 39.695-57.227 61.099 61.099 0 0 0-0.0899-3.3082zm3.7637 0a63.883 63.883 0 0 1 0.0856 3.3082 63.883 63.883 0 0 1-42.479 60.191v1.0971a64.918 64.918 0 0 0 43.514-61.288 64.918 64.918 0 0 0-0.0846-3.3082z"
     />
     <path
       d="m116.87 10.157-1.8882 4.7801-1.1823 4.7845-4.4402 0.29048-1.7967-4.5884-2.4969-4.4939-3.6268 0.47781-1.2476 4.9864-0.54906 4.8977-4.3633 0.86861-2.3806-4.3153-3.0618-4.1295-3.5339 0.94706-0.58683 5.1069 0.09583 4.9268-4.2121 1.4307-2.9239-3.9681-3.5745-3.6937-3.3799 1.4002 0.08404 5.1388 0.73936 4.8731-3.9914 1.9681-3.4163-3.5528-4.0248-3.1955-3.1693 1.8287 0.75527 5.0851 1.3683 4.7336-3.6995 2.4722-3.8506-3.0749-4.4083-2.6435-2.9035 2.2281 1.4118 4.9413 1.9739 4.5158-3.345 2.934-4.218-2.5462-4.7162-2.0466-2.5869 2.5883 2.0451 4.7147 2.5462 4.2195-2.934 3.345-4.5143-1.9739-4.9428-1.4118-2.2281 2.902 2.6435 4.4083 3.0763 3.8505-2.4721 3.6995-4.7351-1.3668-5.0837-0.75527-1.8301 3.1679 3.1969 4.0262 3.5513 3.4163-1.9681 3.9899-4.8716-0.73787-5.1403-0.08569-1.4002 3.3814 3.6951 3.5745 3.9667 2.9224-1.4307 4.2136-4.9268-0.09583-5.1069 0.58683-0.94699 3.5338 4.1294 3.0619 4.3153 2.3806-0.86853 4.3633-4.8963 0.54756-4.9864 1.2476-0.47788 3.6283 4.4925 2.4968 4.5899 1.7968-0.29196 4.4388-4.783 1.1838-4.7816 1.8882v3.6588l4.7816 1.8883 4.783 1.1823 0.29196 4.4402-4.5899 1.7967-4.4925 2.4954 0.47788 3.6283 4.9864 1.2476 4.8963 0.54905 0.86853 4.3632-4.3153 2.3806-4.1294 3.0618 0.94699 3.5338 5.1069 0.58686 4.9268-0.0958 1.4307 4.2122-3.9667 2.9239-3.6951 3.5745 1.4002 3.3799 5.1403-0.0857 4.8716-0.73787 1.9681 3.9914-3.5513 3.4162-3.1969 4.0249 1.8301 3.1693 5.0837-0.75535 4.7351-1.3682 2.4721 3.6994-3.0763 3.8505-2.6435 4.4083 2.2281 2.9035 4.9428-1.4133 4.5143-1.9739 2.934 3.345-2.5462 4.2195-2.0451 4.7162 2.5869 2.5868 4.7162-2.0451 4.218-2.5463 3.345 2.9326-1.9739 4.5158-1.4118 4.9428 2.9035 2.2281 4.4083-2.645 3.8506-3.0749 3.6995 2.4722-1.3683 4.7336-0.75527 5.0851 3.1693 1.8301 4.0248-3.1969 3.4163-3.5513 3.9914 1.9681-0.73936 4.8717-0.08404 5.1403 3.3799 1.4002 3.5745-3.6952 2.9239-3.9666 4.2121 1.4292-0.09583 4.9283 0.58683 5.1069 3.5339 0.94699 3.0618-4.1309 2.3806-4.3139 4.3633 0.8686 0.54906 4.8963 1.2476 4.9864 3.6268 0.47787 2.4969-4.494 1.7967-4.5884 4.4402 0.29189 1.1823 4.7831 1.8882 4.7816h3.6588l1.8882-4.7816 1.1823-4.7831 4.4402-0.29189 1.7967 4.5884 2.4969 4.494 3.6268-0.47787 1.2491-4.9864 0.54757-4.8963 4.3633-0.8686 2.3806 4.3139 3.0619 4.1309 3.5338-0.94699 0.58682-5.1069-0.0958-4.9283 4.2136-1.4292 2.9224 3.9666 3.5745 3.6952 3.3799-1.4002-0.0843-5.1403-0.73787-4.8717 3.9899-1.9681 3.4163 3.5513 4.0262 3.1969 3.1679-1.8301-0.75528-5.0851-1.3668-4.7336 3.6995-2.4722 3.8505 3.0749 4.4083 2.645 2.902-2.2281-1.4118-4.9428-1.9739-4.5158 3.345-2.9326 4.2194 2.5463 4.7148 2.0451 2.5883-2.5868-2.0465-4.7162-2.5462-4.2195 2.934-3.345 4.5157 1.9739 4.9414 1.4133 2.2281-2.9035-2.6435-4.4083-3.0749-3.8505 2.4707-3.6994 4.7351 1.3682 5.0837 0.75535 1.8301-3.1693-3.1969-4.0249-3.5513-3.4162 1.9681-3.9914 4.8716 0.73787 5.1403 0.0857 1.4002-3.3799-3.6951-3.5745-3.9668-2.9239 1.4307-4.2122 4.9268 0.0958 5.107-0.58686 0.94698-3.5338-4.1294-3.0618-4.3153-2.3806 0.86852-4.3632 4.8978-0.54905 4.9864-1.2476 0.47781-3.6283-4.4939-2.4954-4.5884-1.7967 0.29058-4.4402 4.7845-1.1823 4.7801-1.8883v-3.6588l-4.7801-1.8882-4.7845-1.1838-0.29058-4.4388 4.5884-1.7968 4.4939-2.4968-0.47781-3.6283-4.9864-1.2476-4.8978-0.54757-0.86852-4.3633 4.3153-2.3806 4.1294-3.0619-0.94698-3.5338-5.107-0.58683-4.9268 0.09583-1.4307-4.2136 3.9668-2.9224 3.6951-3.5745-1.4002-3.3814-5.1403 0.08569-4.8716 0.73787-1.9681-3.9899 3.5513-3.4163 3.1969-4.0262-1.8301-3.1679-5.0837 0.75527-4.7351 1.3668-2.4707-3.6995 3.0749-3.8505 2.6435-4.4083-2.2281-2.902-4.9414 1.4118-4.5157 1.9739-2.934-3.345 2.5462-4.2195 2.0465-4.7147-2.5883-2.5883-4.7148 2.0466-4.2194 2.5462-3.345-2.934 1.9739-4.5158 1.4118-4.9413-2.902-2.2281-4.4083 2.6435-3.8505 3.0749-3.6995-2.4722 1.3668-4.7336 0.75528-5.0851-3.1679-1.8287-4.0262 3.1955-3.4163 3.5528-3.9899-1.9681 0.73787-4.8731 0.0843-5.1388-3.3799-1.4002-3.5745 3.6937-2.9224 3.9681-4.2136-1.4307 0.0958-4.9268-0.58682-5.1069-3.5338-0.94706-3.0619 4.1295-2.3806 4.3153-4.3633-0.86861-0.54757-4.8977-1.2491-4.9864-3.6268-0.47781-2.4969 4.4939-1.7967 4.5884-4.4402-0.29048-1.1823-4.7845-1.8882-4.7801zm1.8301 21.667a96.677 96.677 0 0 1 96.677 96.677 96.677 96.677 0 0 1-96.677 96.677 96.677 96.677 0 0 1-96.677-96.677 96.677 96.677 0 0 1 96.677-96.677z"
-      id="gear-lg"/>
-    <g aria-label="WORSHIP GENERATOR" transform="matrix(.92405 0 0 1.164 -6.4481 5.9862)">
+      id="gear-lg"
+    />
+    <g
+      aria-label="WORSHIP GENERATOR"
+      transform="matrix(.92405 0 0 1.164 -6.4481 5.9862)"
+    >
       <path
-        d="m26.155 213.81q-1.5697 4.1147-2.9258 8.0808-1.3468 3.9568-1.4118 4.1333h-1.2911q-0.04644-0.17647-1.0031-2.9537-0.9474-2.7865-2.5078-6.9291h-0.01858q-1.3654 3.4274-2.5171 6.5575-1.1425 3.1209-1.2168 3.3252h-1.3189q-0.07431-0.26936-1.1982-3.641-1.1146-3.3809-2.9815-8.4523l1.5233-0.59445q0.037153 0.13004 1.0867 3.2695 1.0496 3.1394 2.4057 7.0498h0.01858q1.4304-3.6038 2.4893-6.604 1.0682-3.0001 1.1146-3.1394h1.4397q0.03715 0.15791 1.1239 3.3995 1.096 3.2416 2.2199 6.3439h0.01858q1.4861-4.059 2.5078-7.1148 1.0217-3.0558 1.0589-3.2045z"/>
+        d="m26.155 213.81q-1.5697 4.1147-2.9258 8.0808-1.3468 3.9568-1.4118 4.1333h-1.2911q-0.04644-0.17647-1.0031-2.9537-0.9474-2.7865-2.5078-6.9291h-0.01858q-1.3654 3.4274-2.5171 6.5575-1.1425 3.1209-1.2168 3.3252h-1.3189q-0.07431-0.26936-1.1982-3.641-1.1146-3.3809-2.9815-8.4523l1.5233-0.59445q0.037153 0.13004 1.0867 3.2695 1.0496 3.1394 2.4057 7.0498h0.01858q1.4304-3.6038 2.4893-6.604 1.0682-3.0001 1.1146-3.1394h1.4397q0.03715 0.15791 1.1239 3.3995 1.096 3.2416 2.2199 6.3439h0.01858q1.4861-4.059 2.5078-7.1148 1.0217-3.0558 1.0589-3.2045z"
+      />
       <path
-        d="m39.994 219.76q0 1.5047-0.52014 2.7679-0.51086 1.2539-1.3375 2.0713-0.91954 0.91025-1.9505 1.3282-1.031 0.40869-2.2106 0.40869-1.1517 0-2.1735-0.39011-1.0217-0.3994-1.8391-1.1796-0.90096-0.84524-1.4583-2.127-0.54801-1.2911-0.54801-2.8979 0-1.4304 0.43655-2.6007 0.43655-1.1796 1.3096-2.1177 0.80808-0.8731 1.9227-1.3468 1.1146-0.48299 2.3499-0.48299 1.2539 0 2.3221 0.45512 1.0682 0.44584 1.8484 1.2446 0.91025 0.92883 1.3747 2.192 0.4737 1.2539 0.4737 2.675zm-1.5883 0.14862q0-1.2075-0.40868-2.3685-0.3994-1.1703-1.2261-1.9598-0.5573-0.53872-1.2539-0.83595-0.68733-0.29722-1.5419-0.29722-0.83594 0-1.5604 0.30651-0.7152 0.29722-1.3004 0.88239-0.74306 0.74306-1.161 1.8391-0.40868 1.096-0.40868 2.2849 0 1.3375 0.41797 2.3964 0.42726 1.0589 1.1982 1.7926 0.52943 0.51085 1.2539 0.82666 0.72449 0.30651 1.5511 0.30651t1.5419-0.29723q0.72449-0.30651 1.3096-0.87309 0.69662-0.66876 1.1425-1.6998 0.44584-1.0403 0.44584-2.3035z"/>
+        d="m39.994 219.76q0 1.5047-0.52014 2.7679-0.51086 1.2539-1.3375 2.0713-0.91954 0.91025-1.9505 1.3282-1.031 0.40869-2.2106 0.40869-1.1517 0-2.1735-0.39011-1.0217-0.3994-1.8391-1.1796-0.90096-0.84524-1.4583-2.127-0.54801-1.2911-0.54801-2.8979 0-1.4304 0.43655-2.6007 0.43655-1.1796 1.3096-2.1177 0.80808-0.8731 1.9227-1.3468 1.1146-0.48299 2.3499-0.48299 1.2539 0 2.3221 0.45512 1.0682 0.44584 1.8484 1.2446 0.91025 0.92883 1.3747 2.192 0.4737 1.2539 0.4737 2.675zm-1.5883 0.14862q0-1.2075-0.40868-2.3685-0.3994-1.1703-1.2261-1.9598-0.5573-0.53872-1.2539-0.83595-0.68733-0.29722-1.5419-0.29722-0.83594 0-1.5604 0.30651-0.7152 0.29722-1.3004 0.88239-0.74306 0.74306-1.161 1.8391-0.40868 1.096-0.40868 2.2849 0 1.3375 0.41797 2.3964 0.42726 1.0589 1.1982 1.7926 0.52943 0.51085 1.2539 0.82666 0.72449 0.30651 1.5511 0.30651t1.5419-0.29723q0.72449-0.30651 1.3096-0.87309 0.69662-0.66876 1.1425-1.6998 0.44584-1.0403 0.44584-2.3035z"
+      />
       <path
-        d="m52.961 225.23-1.161 0.95669q-0.20434-0.21363-1.449-1.6069-1.2446-1.4025-3.8361-4.3655l0.0093-0.0836q0.35295-0.0929 0.93812-0.39939 0.58516-0.3158 0.98456-0.67805 0.34367-0.3158 0.59445-0.78021 0.26007-0.46442 0.26007-1.2446 0-0.7152-0.38082-1.226-0.37153-0.52015-1.031-0.76164-0.53872-0.20435-1.1332-0.2415-0.59445-0.0464-1.096-0.0464-0.33438 0-0.51086 9e-3 -0.17648 0-0.26007 0-0.01858 1.7648-0.02786 3.1116 0 1.3468 0 1.9041 0 1.2725 0.0093 3.4552 0.01858 2.1828 0.02786 2.74h-1.5326q0.0093-0.55729 0.02786-2.1549 0.01858-1.6069 0.01858-3.994 0-0.46441 0-1.7183t-0.04644-4.5698q0.09288 0 0.92883-0.0186 0.83594-0.0186 1.5419-0.0186 0.80808 0 1.5697 0.0929t1.4861 0.3994q0.91954 0.39011 1.4583 1.1518 0.53872 0.75235 0.53872 1.7741 0 1.3189-0.81737 2.2013-0.80808 0.8731-1.5326 1.3004v0.0464q1.2725 1.4861 2.7865 3.0651 1.5233 1.579 1.6347 1.6998z"/>
+        d="m52.961 225.23-1.161 0.95669q-0.20434-0.21363-1.449-1.6069-1.2446-1.4025-3.8361-4.3655l0.0093-0.0836q0.35295-0.0929 0.93812-0.39939 0.58516-0.3158 0.98456-0.67805 0.34367-0.3158 0.59445-0.78021 0.26007-0.46442 0.26007-1.2446 0-0.7152-0.38082-1.226-0.37153-0.52015-1.031-0.76164-0.53872-0.20435-1.1332-0.2415-0.59445-0.0464-1.096-0.0464-0.33438 0-0.51086 9e-3 -0.17648 0-0.26007 0-0.01858 1.7648-0.02786 3.1116 0 1.3468 0 1.9041 0 1.2725 0.0093 3.4552 0.01858 2.1828 0.02786 2.74h-1.5326q0.0093-0.55729 0.02786-2.1549 0.01858-1.6069 0.01858-3.994 0-0.46441 0-1.7183t-0.04644-4.5698q0.09288 0 0.92883-0.0186 0.83594-0.0186 1.5419-0.0186 0.80808 0 1.5697 0.0929t1.4861 0.3994q0.91954 0.39011 1.4583 1.1518 0.53872 0.75235 0.53872 1.7741 0 1.3189-0.81737 2.2013-0.80808 0.8731-1.5326 1.3004v0.0464q1.2725 1.4861 2.7865 3.0651 1.5233 1.579 1.6347 1.6998z"
+      />
       <path
-        d="m61.371 222.47q0 0.95669-0.45513 1.6812-0.44584 0.7152-1.2075 1.161-0.69662 0.40868-1.5976 0.62231-0.90096 0.20434-1.997 0.20434-0.59445 0-1.2353-0.0371-0.6316-0.0372-0.73377-0.0464l-0.07431-1.3375q0.13004 0.0186 0.72449 0.0743 0.59445 0.0464 1.4025 0.0464 0.49228 0 1.2725-0.13003 0.78022-0.13004 1.1982-0.33438 0.54801-0.26936 0.83594-0.65018 0.29722-0.38082 0.29722-0.96598 0-0.62232-0.29722-1.0496-0.28794-0.43655-0.96598-0.83594-0.43655-0.26007-1.1332-0.58516t-1.2539-0.66876q-0.9474-0.57587-1.3561-1.2539-0.3994-0.68733-0.3994-1.5233 0-0.85452 0.36224-1.4768 0.37153-0.63161 0.95669-1.0774 0.59445-0.44584 1.449-0.66876 0.86381-0.22292 1.9134-0.22292 0.57587 0 1.161 0.0371 0.59445 0.0279 0.67804 0.0372l0.13004 1.3468q-0.08359-9e-3 -0.67804-0.065-0.59445-0.0557-1.4675-0.0557-0.52014 0-1.0774 0.12075-0.54801 0.11146-0.96598 0.35295-0.37153 0.21363-0.6316 0.59445t-0.26007 0.89168q0 0.45512 0.26936 0.88238 0.27865 0.41798 1.031 0.86381 0.38082 0.23221 1.0031 0.53872 0.6316 0.29723 1.2353 0.65018 0.92883 0.54801 1.3932 1.2632 0.4737 0.70591 0.4737 1.6162z"/>
+        d="m61.371 222.47q0 0.95669-0.45513 1.6812-0.44584 0.7152-1.2075 1.161-0.69662 0.40868-1.5976 0.62231-0.90096 0.20434-1.997 0.20434-0.59445 0-1.2353-0.0371-0.6316-0.0372-0.73377-0.0464l-0.07431-1.3375q0.13004 0.0186 0.72449 0.0743 0.59445 0.0464 1.4025 0.0464 0.49228 0 1.2725-0.13003 0.78022-0.13004 1.1982-0.33438 0.54801-0.26936 0.83594-0.65018 0.29722-0.38082 0.29722-0.96598 0-0.62232-0.29722-1.0496-0.28794-0.43655-0.96598-0.83594-0.43655-0.26007-1.1332-0.58516t-1.2539-0.66876q-0.9474-0.57587-1.3561-1.2539-0.3994-0.68733-0.3994-1.5233 0-0.85452 0.36224-1.4768 0.37153-0.63161 0.95669-1.0774 0.59445-0.44584 1.449-0.66876 0.86381-0.22292 1.9134-0.22292 0.57587 0 1.161 0.0371 0.59445 0.0279 0.67804 0.0372l0.13004 1.3468q-0.08359-9e-3 -0.67804-0.065-0.59445-0.0557-1.4675-0.0557-0.52014 0-1.0774 0.12075-0.54801 0.11146-0.96598 0.35295-0.37153 0.21363-0.6316 0.59445t-0.26007 0.89168q0 0.45512 0.26936 0.88238 0.27865 0.41798 1.031 0.86381 0.38082 0.23221 1.0031 0.53872 0.6316 0.29723 1.2353 0.65018 0.92883 0.54801 1.3932 1.2632 0.4737 0.70591 0.4737 1.6162z"
+      />
       <path
-        d="m75.253 225.97h-1.5326q0.0093-0.55729 0.01858-2.0527 0.01858-1.5047 0.01858-3.7432-0.13932 0-1.6533 0-1.514-9e-3 -2.2756-9e-3 -0.91954 0-2.2106 9e-3 -1.2818 0-1.3932 0 0 2.5821 0.0093 3.9104 0.01858 1.3282 0.02786 1.8855h-1.5326q0.0093-0.55729 0.02787-1.9784 0.01858-1.4211 0.01858-4.802 0-1.0217-0.01858-2.4893-0.0093-1.4676-0.02787-3.1673h1.5326q0 1.4118-0.01858 2.7772-0.01858 1.3561-0.01858 2.5821 0.11146 0 1.2075 9e-3 1.1053 0 2.4057 0 1.0031 0 2.415 0 1.4118-9e-3 1.5047-9e-3 0-1.226-0.01858-2.5821t-0.01858-2.7772h1.5326q-0.01858 1.4025-0.03715 3.2416-0.0093 1.8391-0.0093 3.0001 0 2.7308 0.01858 4.189 0.01858 1.449 0.02786 2.0063z"/>
+        d="m75.253 225.97h-1.5326q0.0093-0.55729 0.01858-2.0527 0.01858-1.5047 0.01858-3.7432-0.13932 0-1.6533 0-1.514-9e-3 -2.2756-9e-3 -0.91954 0-2.2106 9e-3 -1.2818 0-1.3932 0 0 2.5821 0.0093 3.9104 0.01858 1.3282 0.02786 1.8855h-1.5326q0.0093-0.55729 0.02787-1.9784 0.01858-1.4211 0.01858-4.802 0-1.0217-0.01858-2.4893-0.0093-1.4676-0.02787-3.1673h1.5326q0 1.4118-0.01858 2.7772-0.01858 1.3561-0.01858 2.5821 0.11146 0 1.2075 9e-3 1.1053 0 2.4057 0 1.0031 0 2.415 0 1.4118-9e-3 1.5047-9e-3 0-1.226-0.01858-2.5821t-0.01858-2.7772h1.5326q-0.01858 1.4025-0.03715 3.2416-0.0093 1.8391-0.0093 3.0001 0 2.7308 0.01858 4.189 0.01858 1.449 0.02786 2.0063z"
+      />
       <path
-        d="m81.142 225.97h-1.5326q0.0093-0.55729 0.02787-1.9877 0.01858-1.4304 0.01858-4.1054 0-1.0589-0.0093-2.7772-0.0093-1.7183-0.03715-3.5667h1.5326q-0.01858 1.3282-0.03715 3.093-0.0093 1.7555-0.0093 2.8701 0 2.8236 0.01858 4.3748 0.01858 1.5419 0.02786 2.0992z"/>
+        d="m81.142 225.97h-1.5326q0.0093-0.55729 0.02787-1.9877 0.01858-1.4304 0.01858-4.1054 0-1.0589-0.0093-2.7772-0.0093-1.7183-0.03715-3.5667h1.5326q-0.01858 1.3282-0.03715 3.093-0.0093 1.7555-0.0093 2.8701 0 2.8236 0.01858 4.3748 0.01858 1.5419 0.02786 2.0992z"
+      />
       <path
-        d="m93.281 217.79q0 1.3561-0.88239 2.4521-0.8731 1.096-2.3406 1.4861-0.6316 0.16719-1.384 0.24149-0.74306 0.0743-1.6626 0.0743l0.01858 3.9289h-1.5326q0.0093-0.55729 0.02786-2.062 0.01858-1.514 0.01858-4.672 0-1.0031-0.0093-2.4614t-0.03715-3.2416q0.3994-9e-3 0.78022-9e-3 0.39011 0 0.6316 0 1.6069 0 2.7308 0.20434 1.1332 0.20434 1.9041 0.69662 0.84523 0.52943 1.2911 1.384 0.44584 0.84524 0.44584 1.9784zm-1.5883 0q0-0.9567-0.43655-1.6254-0.43655-0.67805-1.3375-1.0682-0.5573-0.2415-1.2075-0.29723-0.65018-0.065-1.3375-0.065-0.08359 0-0.16719 0-0.08359 0-0.17648 0 0 0.10217-0.01858 1.3932-0.01858 1.2911-0.01858 2.0434 0 0.68733 0 1.6254 0.0093 0.93811 0.0093 1.0682 0.0836 0 0.19505 0 0.11146 0 0.17648 0 0.62232 0 1.3189-0.0836 0.70591-0.0836 1.2075-0.30651 0.8731-0.37153 1.3282-1.031 0.46441-0.65947 0.46441-1.6533z"/>
+        d="m93.281 217.79q0 1.3561-0.88239 2.4521-0.8731 1.096-2.3406 1.4861-0.6316 0.16719-1.384 0.24149-0.74306 0.0743-1.6626 0.0743l0.01858 3.9289h-1.5326q0.0093-0.55729 0.02786-2.062 0.01858-1.514 0.01858-4.672 0-1.0031-0.0093-2.4614t-0.03715-3.2416q0.3994-9e-3 0.78022-9e-3 0.39011 0 0.6316 0 1.6069 0 2.7308 0.20434 1.1332 0.20434 1.9041 0.69662 0.84523 0.52943 1.2911 1.384 0.44584 0.84524 0.44584 1.9784zm-1.5883 0q0-0.9567-0.43655-1.6254-0.43655-0.67805-1.3375-1.0682-0.5573-0.2415-1.2075-0.29723-0.65018-0.065-1.3375-0.065-0.08359 0-0.16719 0-0.08359 0-0.17648 0 0 0.10217-0.01858 1.3932-0.01858 1.2911-0.01858 2.0434 0 0.68733 0 1.6254 0.0093 0.93811 0.0093 1.0682 0.0836 0 0.19505 0 0.11146 0 0.17648 0 0.62232 0 1.3189-0.0836 0.70591-0.0836 1.2075-0.30651 0.8731-0.37153 1.3282-1.031 0.46441-0.65947 0.46441-1.6533z"
+      />
       <path
-        d="m110.19 219.58q-0.0186 0.66875-0.0371 1.5697-0.0186 0.89167-0.0186 1.4768 0 0.93812 0.0186 2.0992 0.0186 1.1518 0.0186 1.2818-0.0836 9e-3 -0.5573 0.0371-0.4737 0.0371-0.91954 0.0371-2.2106 0-3.9104-0.4737-1.6905-0.4737-2.9351-1.6533-0.77093-0.72449-1.2446-1.7926-0.46442-1.0774-0.46442-2.4521 0-1.6905 0.89168-3.0187 0.90096-1.3375 2.4707-2.1549 1.0682-0.5573 2.4242-0.83595 1.3654-0.28793 2.8422-0.28793 0.2322 0 0.42726 9e-3 0.20434 0 0.36224 0l0.11146 1.3375q-0.0371 0-0.29722 0-0.26008-9e-3 -0.41798-9e-3 -1.4211 0-2.6007 0.2415-1.1796 0.24149-2.062 0.7059-1.1982 0.63161-1.8855 1.7183-0.67805 1.0867-0.67805 2.3128 0 1.5511 0.70591 2.5728 0.7152 1.0124 1.8391 1.5883 1.0031 0.51085 2.1177 0.72448 1.1239 0.20435 2.3128 0.20435 0-0.14862-9e-3 -1.4397-9e-3 -1.3004-0.0371-3.7989z"/>
+        d="m110.19 219.58q-0.0186 0.66875-0.0371 1.5697-0.0186 0.89167-0.0186 1.4768 0 0.93812 0.0186 2.0992 0.0186 1.1518 0.0186 1.2818-0.0836 9e-3 -0.5573 0.0371-0.4737 0.0371-0.91954 0.0371-2.2106 0-3.9104-0.4737-1.6905-0.4737-2.9351-1.6533-0.77093-0.72449-1.2446-1.7926-0.46442-1.0774-0.46442-2.4521 0-1.6905 0.89168-3.0187 0.90096-1.3375 2.4707-2.1549 1.0682-0.5573 2.4242-0.83595 1.3654-0.28793 2.8422-0.28793 0.2322 0 0.42726 9e-3 0.20434 0 0.36224 0l0.11146 1.3375q-0.0371 0-0.29722 0-0.26008-9e-3 -0.41798-9e-3 -1.4211 0-2.6007 0.2415-1.1796 0.24149-2.062 0.7059-1.1982 0.63161-1.8855 1.7183-0.67805 1.0867-0.67805 2.3128 0 1.5511 0.70591 2.5728 0.7152 1.0124 1.8391 1.5883 1.0031 0.51085 2.1177 0.72448 1.1239 0.20435 2.3128 0.20435 0-0.14862-9e-3 -1.4397-9e-3 -1.3004-0.0371-3.7989z"
+      />
       <path
-        d="m122.01 225.95q-0.0836 0-1.2354-9e-3 -1.1517-9e-3 -2.8515-9e-3 -1.1796 0-2.1642 9e-3 -0.97527 9e-3 -1.6533 9e-3 0.0186-0.53872 0.0279-2.3314 0.0186-1.7926 0.0186-3.706 0-1.0496-9e-3 -2.7772t-0.0371-3.576q0.65947 0 1.644 9e-3 0.99385 9e-3 2.0434 9e-3 1.7741 0 2.8886-9e-3t1.2075-9e-3v1.2911q-0.0929 0-1.1703-9e-3 -1.0682-0.0186-2.6657-0.0186-0.69662 0-1.3654 9e-3 -0.66876 0-1.0589 0 0 1.0496-0.0186 2.0992-0.0186 1.0403-0.0186 1.9691 0.41798 0 0.98456 9e-3 0.57587 0 1.0217 0 1.6347 0 2.9165-9e-3 1.2911-0.0186 1.3747-0.0186v1.2818q-0.0743 0-1.5326-9e-3 -1.4583-0.0186-2.6657-0.0186-0.44583 0-1.0682 9e-3 -0.61302 0-1.031 0 0 1.7555 9e-3 2.7865 9e-3 1.031 0.0186 1.7276 0.54801 9e-3 1.3282 0.0186 0.78022 0 1.6812 0 1.384 0 2.3221-9e-3 0.94741-9e-3 1.0589-9e-3z"/>
+        d="m122.01 225.95q-0.0836 0-1.2354-9e-3 -1.1517-9e-3 -2.8515-9e-3 -1.1796 0-2.1642 9e-3 -0.97527 9e-3 -1.6533 9e-3 0.0186-0.53872 0.0279-2.3314 0.0186-1.7926 0.0186-3.706 0-1.0496-9e-3 -2.7772t-0.0371-3.576q0.65947 0 1.644 9e-3 0.99385 9e-3 2.0434 9e-3 1.7741 0 2.8886-9e-3t1.2075-9e-3v1.2911q-0.0929 0-1.1703-9e-3 -1.0682-0.0186-2.6657-0.0186-0.69662 0-1.3654 9e-3 -0.66876 0-1.0589 0 0 1.0496-0.0186 2.0992-0.0186 1.0403-0.0186 1.9691 0.41798 0 0.98456 9e-3 0.57587 0 1.0217 0 1.6347 0 2.9165-9e-3 1.2911-0.0186 1.3747-0.0186v1.2818q-0.0743 0-1.5326-9e-3 -1.4583-0.0186-2.6657-0.0186-0.44583 0-1.0682 9e-3 -0.61302 0-1.031 0 0 1.7555 9e-3 2.7865 9e-3 1.031 0.0186 1.7276 0.54801 9e-3 1.3282 0.0186 0.78022 0 1.6812 0 1.384 0 2.3221-9e-3 0.94741-9e-3 1.0589-9e-3z"
+      />
       <path
-        d="m136.29 213.53q-0.0186 1.4583-0.0371 3.3345-9e-3 1.8762-9e-3 2.7029 0 2.6379 0.0186 4.1983 0.0186 1.5511 0.0186 1.6533l-1.2354 0.60373q-2.8051-3.7896-5.2479-6.8362-2.4335-3.0558-2.8144-3.5296l-0.0186 9e-3q0 2.4893 0.0279 6.121 0.0372 3.6224 0.0464 4.1797h-1.449q9e-3 -0.2322 0.0279-1.6533 0.0186-1.4211 0.0186-3.9568 0-1.0124-9e-3 -2.6843-9e-3 -1.6812-0.0372-3.5574l1.4118-0.66876q0.16719 0.21363 2.8422 3.6131 2.6843 3.3995 5.0528 6.316l0.0186-9e-3q0-1.4304-0.0371-4.8113-0.0372-3.3902-0.0372-5.025z"/>
+        d="m136.29 213.53q-0.0186 1.4583-0.0371 3.3345-9e-3 1.8762-9e-3 2.7029 0 2.6379 0.0186 4.1983 0.0186 1.5511 0.0186 1.6533l-1.2354 0.60373q-2.8051-3.7896-5.2479-6.8362-2.4335-3.0558-2.8144-3.5296l-0.0186 9e-3q0 2.4893 0.0279 6.121 0.0372 3.6224 0.0464 4.1797h-1.449q9e-3 -0.2322 0.0279-1.6533 0.0186-1.4211 0.0186-3.9568 0-1.0124-9e-3 -2.6843-9e-3 -1.6812-0.0372-3.5574l1.4118-0.66876q0.16719 0.21363 2.8422 3.6131 2.6843 3.3995 5.0528 6.316l0.0186-9e-3q0-1.4304-0.0371-4.8113-0.0372-3.3902-0.0372-5.025z"
+      />
       <path
-        d="m148.54 225.95q-0.0836 0-1.2353-9e-3t-2.8515-9e-3q-1.1796 0-2.1642 9e-3 -0.97527 9e-3 -1.6533 9e-3 0.0186-0.53872 0.0279-2.3314 0.0186-1.7926 0.0186-3.706 0-1.0496-9e-3 -2.7772t-0.0371-3.576q0.65946 0 1.644 9e-3 0.99385 9e-3 2.0434 9e-3 1.7741 0 2.8887-9e-3t1.2075-9e-3v1.2911q-0.0929 0-1.1703-9e-3 -1.0682-0.0186-2.6657-0.0186-0.69663 0-1.3654 9e-3 -0.66876 0-1.0589 0 0 1.0496-0.0186 2.0992-0.0186 1.0403-0.0186 1.9691 0.41797 0 0.98456 9e-3 0.57587 0 1.0217 0 1.6347 0 2.9165-9e-3 1.2911-0.0186 1.3747-0.0186v1.2818q-0.0743 0-1.5326-9e-3 -1.4583-0.0186-2.6657-0.0186-0.44583 0-1.0682 9e-3 -0.61303 0-1.031 0 0 1.7555 9e-3 2.7865 9e-3 1.031 0.0186 1.7276 0.548 9e-3 1.3282 0.0186 0.78022 0 1.6812 0 1.384 0 2.3221-9e-3 0.9474-9e-3 1.0589-9e-3z"/>
+        d="m148.54 225.95q-0.0836 0-1.2353-9e-3t-2.8515-9e-3q-1.1796 0-2.1642 9e-3 -0.97527 9e-3 -1.6533 9e-3 0.0186-0.53872 0.0279-2.3314 0.0186-1.7926 0.0186-3.706 0-1.0496-9e-3 -2.7772t-0.0371-3.576q0.65946 0 1.644 9e-3 0.99385 9e-3 2.0434 9e-3 1.7741 0 2.8887-9e-3t1.2075-9e-3v1.2911q-0.0929 0-1.1703-9e-3 -1.0682-0.0186-2.6657-0.0186-0.69663 0-1.3654 9e-3 -0.66876 0-1.0589 0 0 1.0496-0.0186 2.0992-0.0186 1.0403-0.0186 1.9691 0.41797 0 0.98456 9e-3 0.57587 0 1.0217 0 1.6347 0 2.9165-9e-3 1.2911-0.0186 1.3747-0.0186v1.2818q-0.0743 0-1.5326-9e-3 -1.4583-0.0186-2.6657-0.0186-0.44583 0-1.0682 9e-3 -0.61303 0-1.031 0 0 1.7555 9e-3 2.7865 9e-3 1.031 0.0186 1.7276 0.548 9e-3 1.3282 0.0186 0.78022 0 1.6812 0 1.384 0 2.3221-9e-3 0.9474-9e-3 1.0589-9e-3z"
+      />
       <path
-        d="m161.71 225.23-1.161 0.95669q-0.20434-0.21363-1.449-1.6069-1.2446-1.4025-3.8361-4.3655l9e-3 -0.0836q0.35295-0.0929 0.93811-0.39939 0.58517-0.3158 0.98456-0.67805 0.34367-0.3158 0.59445-0.78021 0.26007-0.46442 0.26007-1.2446 0-0.7152-0.38082-1.226-0.37153-0.52015-1.031-0.76164-0.53872-0.20435-1.1332-0.2415-0.59445-0.0464-1.096-0.0464-0.33438 0-0.51086 9e-3 -0.17647 0-0.26007 0-0.0186 1.7648-0.0279 3.1116 0 1.3468 0 1.9041 0 1.2725 9e-3 3.4552 0.0186 2.1828 0.0279 2.74h-1.5326q9e-3 -0.55729 0.0279-2.1549 0.0186-1.6069 0.0186-3.994 0-0.46441 0-1.7183t-0.0464-4.5698q0.0929 0 0.92883-0.0186 0.83595-0.0186 1.5419-0.0186 0.80808 0 1.5697 0.0929 0.76164 0.0929 1.4861 0.3994 0.91954 0.39011 1.4583 1.1518 0.53872 0.75235 0.53872 1.7741 0 1.3189-0.81737 2.2013-0.80808 0.8731-1.5326 1.3004v0.0464q1.2725 1.4861 2.7865 3.0651 1.5233 1.579 1.6347 1.6998z"/>
+        d="m161.71 225.23-1.161 0.95669q-0.20434-0.21363-1.449-1.6069-1.2446-1.4025-3.8361-4.3655l9e-3 -0.0836q0.35295-0.0929 0.93811-0.39939 0.58517-0.3158 0.98456-0.67805 0.34367-0.3158 0.59445-0.78021 0.26007-0.46442 0.26007-1.2446 0-0.7152-0.38082-1.226-0.37153-0.52015-1.031-0.76164-0.53872-0.20435-1.1332-0.2415-0.59445-0.0464-1.096-0.0464-0.33438 0-0.51086 9e-3 -0.17647 0-0.26007 0-0.0186 1.7648-0.0279 3.1116 0 1.3468 0 1.9041 0 1.2725 9e-3 3.4552 0.0186 2.1828 0.0279 2.74h-1.5326q9e-3 -0.55729 0.0279-2.1549 0.0186-1.6069 0.0186-3.994 0-0.46441 0-1.7183t-0.0464-4.5698q0.0929 0 0.92883-0.0186 0.83595-0.0186 1.5419-0.0186 0.80808 0 1.5697 0.0929 0.76164 0.0929 1.4861 0.3994 0.91954 0.39011 1.4583 1.1518 0.53872 0.75235 0.53872 1.7741 0 1.3189-0.81737 2.2013-0.80808 0.8731-1.5326 1.3004v0.0464q1.2725 1.4861 2.7865 3.0651 1.5233 1.579 1.6347 1.6998z"
+      />
       <path
-        d="m174.36 225.48-1.449 0.74307q-0.0372-0.10217-0.58517-1.384-0.53872-1.2818-1.4304-3.2973h-5.5544q-0.97527 2.1642-1.5047 3.3531-0.52943 1.1889-0.58516 1.3282l-1.2446-0.66876q0.2415-0.48299 1.9877-4.254 1.7555-3.7803 3.641-7.9415h1.2075q1.8576 4.1612 3.6503 8.0622 1.7926 3.9011 1.867 4.059zm-3.994-5.1271q-0.50157-1.1332-1.0589-2.3685-0.55729-1.2353-1.1703-2.5821h-0.0371q-0.47371 1.0217-1.1425 2.5171-0.66876 1.4861-1.1053 2.4335l9e-3 9e-3h4.4955z"/>
+        d="m174.36 225.48-1.449 0.74307q-0.0372-0.10217-0.58517-1.384-0.53872-1.2818-1.4304-3.2973h-5.5544q-0.97527 2.1642-1.5047 3.3531-0.52943 1.1889-0.58516 1.3282l-1.2446-0.66876q0.2415-0.48299 1.9877-4.254 1.7555-3.7803 3.641-7.9415h1.2075q1.8576 4.1612 3.6503 8.0622 1.7926 3.9011 1.867 4.059zm-3.994-5.1271q-0.50157-1.1332-1.0589-2.3685-0.55729-1.2353-1.1703-2.5821h-0.0371q-0.47371 1.0217-1.1425 2.5171-0.66876 1.4861-1.1053 2.4335l9e-3 9e-3h4.4955z"
+      />
       <path
-        d="m184.16 214.85q-0.14862 0-1.2446-9e-3 -1.096-9e-3 -3.3159-9e-3 -0.0186 1.9041-0.0279 2.8887-9e-3 0.98456-9e-3 2.6843 0 1.6347 9e-3 3.3252 0.0186 1.6812 0.0279 2.2385h-1.5326q0.0186-0.55729 0.0279-2.2756 0.0186-1.7183 0.0186-3.3624 0-1.6162 0-2.5636 0-0.95669-0.0279-2.9351-1.9784-9e-3 -3.2137 9e-3 -1.2261 9e-3 -1.3468 9e-3v-1.2911q0.9567 0 2.3221 9e-3 1.3747 9e-3 2.9258 9e-3 2.2478 0 3.7525-9e-3 1.514-9e-3 1.6347-9e-3z"/>
+        d="m184.16 214.85q-0.14862 0-1.2446-9e-3 -1.096-9e-3 -3.3159-9e-3 -0.0186 1.9041-0.0279 2.8887-9e-3 0.98456-9e-3 2.6843 0 1.6347 9e-3 3.3252 0.0186 1.6812 0.0279 2.2385h-1.5326q0.0186-0.55729 0.0279-2.2756 0.0186-1.7183 0.0186-3.3624 0-1.6162 0-2.5636 0-0.95669-0.0279-2.9351-1.9784-9e-3 -3.2137 9e-3 -1.2261 9e-3 -1.3468 9e-3v-1.2911q0.9567 0 2.3221 9e-3 1.3747 9e-3 2.9258 9e-3 2.2478 0 3.7525-9e-3 1.514-9e-3 1.6347-9e-3z"
+      />
       <path
-        d="m196.89 219.76q0 1.5047-0.52014 2.7679-0.51086 1.2539-1.3375 2.0713-0.91954 0.91025-1.9505 1.3282-1.031 0.40869-2.2106 0.40869-1.1517 0-2.1735-0.39011-1.0217-0.3994-1.8391-1.1796-0.90097-0.84524-1.4583-2.127-0.54801-1.2911-0.54801-2.8979 0-1.4304 0.43655-2.6007 0.43654-1.1796 1.3096-2.1177 0.80808-0.8731 1.9227-1.3468 1.1146-0.48299 2.3499-0.48299 1.2539 0 2.3221 0.45512 1.0682 0.44584 1.8484 1.2446 0.91025 0.92883 1.3747 2.192 0.4737 1.2539 0.4737 2.675zm-1.5883 0.14862q0-1.2075-0.40868-2.3685-0.3994-1.1703-1.226-1.9598-0.5573-0.53872-1.2539-0.83595-0.68734-0.29722-1.5419-0.29722-0.83594 0-1.5604 0.30651-0.7152 0.29722-1.3004 0.88239-0.74306 0.74306-1.161 1.8391-0.40869 1.096-0.40869 2.2849 0 1.3375 0.41798 2.3964 0.42726 1.0589 1.1982 1.7926 0.52944 0.51085 1.2539 0.82666 0.72449 0.30651 1.5511 0.30651 0.82666 0 1.5419-0.29723 0.72449-0.30651 1.3096-0.87309 0.69662-0.66876 1.1425-1.6998 0.44583-1.0403 0.44583-2.3035z"/>
+        d="m196.89 219.76q0 1.5047-0.52014 2.7679-0.51086 1.2539-1.3375 2.0713-0.91954 0.91025-1.9505 1.3282-1.031 0.40869-2.2106 0.40869-1.1517 0-2.1735-0.39011-1.0217-0.3994-1.8391-1.1796-0.90097-0.84524-1.4583-2.127-0.54801-1.2911-0.54801-2.8979 0-1.4304 0.43655-2.6007 0.43654-1.1796 1.3096-2.1177 0.80808-0.8731 1.9227-1.3468 1.1146-0.48299 2.3499-0.48299 1.2539 0 2.3221 0.45512 1.0682 0.44584 1.8484 1.2446 0.91025 0.92883 1.3747 2.192 0.4737 1.2539 0.4737 2.675zm-1.5883 0.14862q0-1.2075-0.40868-2.3685-0.3994-1.1703-1.226-1.9598-0.5573-0.53872-1.2539-0.83595-0.68734-0.29722-1.5419-0.29722-0.83594 0-1.5604 0.30651-0.7152 0.29722-1.3004 0.88239-0.74306 0.74306-1.161 1.8391-0.40869 1.096-0.40869 2.2849 0 1.3375 0.41798 2.3964 0.42726 1.0589 1.1982 1.7926 0.52944 0.51085 1.2539 0.82666 0.72449 0.30651 1.5511 0.30651 0.82666 0 1.5419-0.29723 0.72449-0.30651 1.3096-0.87309 0.69662-0.66876 1.1425-1.6998 0.44583-1.0403 0.44583-2.3035z"
+      />
       <path
-        d="m209.86 225.23-1.161 0.95669q-0.20434-0.21363-1.449-1.6069-1.2446-1.4025-3.8361-4.3655l9e-3 -0.0836q0.35295-0.0929 0.93812-0.39939 0.58516-0.3158 0.98455-0.67805 0.34367-0.3158 0.59445-0.78021 0.26008-0.46442 0.26008-1.2446 0-0.7152-0.38082-1.226-0.37154-0.52015-1.031-0.76164-0.53872-0.20435-1.1332-0.2415-0.59445-0.0464-1.096-0.0464-0.33438 0-0.51086 9e-3 -0.17647 0-0.26007 0-0.0186 1.7648-0.0279 3.1116 0 1.3468 0 1.9041 0 1.2725 9e-3 3.4552 0.0186 2.1828 0.0279 2.74h-1.5326q9e-3 -0.55729 0.0279-2.1549 0.0186-1.6069 0.0186-3.994 0-0.46441 0-1.7183t-0.0464-4.5698q0.0929 0 0.92883-0.0186 0.83595-0.0186 1.5419-0.0186 0.80808 0 1.5697 0.0929t1.4861 0.3994q0.91954 0.39011 1.4583 1.1518 0.53872 0.75235 0.53872 1.7741 0 1.3189-0.81737 2.2013-0.80808 0.8731-1.5326 1.3004v0.0464q1.2725 1.4861 2.7865 3.0651 1.5233 1.579 1.6347 1.6998z"/>
+        d="m209.86 225.23-1.161 0.95669q-0.20434-0.21363-1.449-1.6069-1.2446-1.4025-3.8361-4.3655l9e-3 -0.0836q0.35295-0.0929 0.93812-0.39939 0.58516-0.3158 0.98455-0.67805 0.34367-0.3158 0.59445-0.78021 0.26008-0.46442 0.26008-1.2446 0-0.7152-0.38082-1.226-0.37154-0.52015-1.031-0.76164-0.53872-0.20435-1.1332-0.2415-0.59445-0.0464-1.096-0.0464-0.33438 0-0.51086 9e-3 -0.17647 0-0.26007 0-0.0186 1.7648-0.0279 3.1116 0 1.3468 0 1.9041 0 1.2725 9e-3 3.4552 0.0186 2.1828 0.0279 2.74h-1.5326q9e-3 -0.55729 0.0279-2.1549 0.0186-1.6069 0.0186-3.994 0-0.46441 0-1.7183t-0.0464-4.5698q0.0929 0 0.92883-0.0186 0.83595-0.0186 1.5419-0.0186 0.80808 0 1.5697 0.0929t1.4861 0.3994q0.91954 0.39011 1.4583 1.1518 0.53872 0.75235 0.53872 1.7741 0 1.3189-0.81737 2.2013-0.80808 0.8731-1.5326 1.3004v0.0464q1.2725 1.4861 2.7865 3.0651 1.5233 1.579 1.6347 1.6998z"
+      />
     </g>
     <path
       d="m228.61 189.89-1.9896 4.5506-0.28253 2.1685 0.25721 2.2664-5.034 1.0015-0.62967-2.1928-1.0911-1.895-3.5794-3.4428-2.7102 1.1227-0.097 4.9654 0.5687 2.1115 1.1054 1.9956-4.2677 2.8518-1.4209-1.7851-1.7331-1.3333-4.6246-1.811-2.0746 2.0746 1.811 4.6246 1.3333 1.7331 1.7851 1.4209-2.8518 4.2677-1.9956-1.1054-2.1116-0.56836-4.9654 0.0967-1.1227 2.7102 3.4428 3.5798 1.895 1.0908 2.1928 0.62968-1.0015 5.034-2.2668-0.2572-2.1682 0.28251-4.5506 1.9896v2.9338l4.5506 1.9896 2.1682 0.28251 2.2668-0.25719 1.0015 5.034-2.1928 0.62966-1.895 1.0908-3.4428 3.5798 1.1227 2.7102 4.9654 0.0967 2.1116-0.5687 1.9956-1.1051 2.8518 4.2677-1.7851 1.4206-1.3333 1.7334-1.811 4.6246 2.0746 2.0742 4.6246-1.8107 1.7331-1.3336 1.4209-1.7847 4.2677 2.8515-1.1054 1.9959-0.5687 2.1116 0.097 4.9654 2.7102 1.1227 3.5794-3.4428 1.0911-1.8953 0.62967-2.1925 5.034 1.0015-0.25721 2.2664 0.28253 2.1685 1.9896 4.5506h2.9338l1.9896-4.5506 0.28253-2.1685-0.25755-2.2664 5.0343-1.0015 0.62967 2.1925 1.0907 1.8953 3.5798 3.4428 2.7102-1.1227 0.0967-4.9654-0.56869-2.1116-1.1051-1.9959 4.2678-2.8515 1.4206 1.7847 1.7334 1.3336 4.6245 1.8107 2.0742-2.0742-1.8107-4.6246-1.3336-1.7334-1.7847-1.4206 2.8515-4.2677 1.9956 1.1051 2.1116 0.5687 4.9657-0.0967 1.1227-2.7102-3.4428-3.5798-1.8953-1.0908-2.1925-0.62966 1.0011-5.034 2.2668 0.25719 2.1685-0.28251 4.5506-1.9896v-2.9338l-4.5506-1.9896-2.1685-0.28251-2.2668 0.2572-1.0011-5.034 2.1925-0.62968 1.8953-1.0908 3.4428-3.5798-1.1227-2.7102-4.9657-0.0967-2.1116 0.56836-1.9956 1.1054-2.8515-4.2677 1.7847-1.4209 1.3336-1.7331 1.8107-4.6246-2.0742-2.0746-4.6245 1.811-1.7334 1.3333-1.4206 1.7851-4.2678-2.8518 1.1051-1.9956 0.56869-2.1115-0.0967-4.9654-2.7102-1.1227-3.5798 3.4428-1.0907 1.895-0.62967 2.1928-5.0343-1.0015 0.25755-2.2664-0.28253-2.1685-1.9896-4.5506zm1.4452 18.872a20.772 20.772 0 0 1 0.0217 0 20.772 20.772 0 0 1 20.772 20.772 20.772 20.772 0 0 1-20.772 20.772 20.772 20.772 0 0 1-20.772-20.772 20.772 20.772 0 0 1 20.75-20.772z"
-      id="gear-sm"/>
+      id="gear-sm"
+    />
   </g>
 </svg>
diff --git a/src/app/widget-modules/components/logo/logo.component.spec.ts b/src/app/widget-modules/components/logo/logo.component.spec.ts
index 9d60ac5..8d51724 100644
--- a/src/app/widget-modules/components/logo/logo.component.spec.ts
+++ b/src/app/widget-modules/components/logo/logo.component.spec.ts
@@ -6,12 +6,13 @@ describe('LogoComponent', () => {
   let component: LogoComponent;
   let fixture: ComponentFixture<LogoComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [LogoComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [LogoComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(LogoComponent);
@@ -20,6 +21,6 @@ describe('LogoComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/components/logo/logo.component.ts b/src/app/widget-modules/components/logo/logo.component.ts
index 3ba3256..e96f1f2 100644
--- a/src/app/widget-modules/components/logo/logo.component.ts
+++ b/src/app/widget-modules/components/logo/logo.component.ts
@@ -1,16 +1,8 @@
-import {Component, OnInit} from '@angular/core';
+import {Component} from '@angular/core';
 
 @Component({
   selector: 'app-logo',
   templateUrl: './logo.component.html',
-  styleUrls: ['./logo.component.less']
+  styleUrls: ['./logo.component.less'],
 })
-export class LogoComponent implements OnInit {
-
-  constructor() {
-  }
-
-  ngOnInit(): void {
-  }
-
-}
+export class LogoComponent {}
diff --git a/src/app/widget-modules/components/logo/logo.module.ts b/src/app/widget-modules/components/logo/logo.module.ts
index dbfd8c0..fd61710 100644
--- a/src/app/widget-modules/components/logo/logo.module.ts
+++ b/src/app/widget-modules/components/logo/logo.module.ts
@@ -2,15 +2,9 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {LogoComponent} from './logo.component';
 
-
 @NgModule({
   declarations: [LogoComponent],
-  exports: [
-    LogoComponent
-  ],
-  imports: [
-    CommonModule
-  ]
+  exports: [LogoComponent],
+  imports: [CommonModule],
 })
-export class LogoModule {
-}
+export class LogoModule {}
diff --git a/src/app/widget-modules/components/menu-button/menu-button.component.spec.ts b/src/app/widget-modules/components/menu-button/menu-button.component.spec.ts
index 403aa98..6952b5a 100644
--- a/src/app/widget-modules/components/menu-button/menu-button.component.spec.ts
+++ b/src/app/widget-modules/components/menu-button/menu-button.component.spec.ts
@@ -6,12 +6,13 @@ describe('MenuButtonComponent', () => {
   let component: MenuButtonComponent;
   let fixture: ComponentFixture<MenuButtonComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [MenuButtonComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [MenuButtonComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(MenuButtonComponent);
@@ -20,6 +21,6 @@ describe('MenuButtonComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/components/menu-button/menu-button.component.ts b/src/app/widget-modules/components/menu-button/menu-button.component.ts
index 8e46495..90dfebf 100644
--- a/src/app/widget-modules/components/menu-button/menu-button.component.ts
+++ b/src/app/widget-modules/components/menu-button/menu-button.component.ts
@@ -4,7 +4,7 @@ import {IconProp} from '@fortawesome/fontawesome-svg-core';
 @Component({
   selector: 'app-menu-button',
   templateUrl: './menu-button.component.html',
-  styleUrls: ['./menu-button.component.less']
+  styleUrls: ['./menu-button.component.less'],
 })
 export class MenuButtonComponent {
   @Input() public icon: IconProp;
diff --git a/src/app/widget-modules/components/menu-button/menu-button.module.ts b/src/app/widget-modules/components/menu-button/menu-button.module.ts
index f69e3e3..84c37f7 100644
--- a/src/app/widget-modules/components/menu-button/menu-button.module.ts
+++ b/src/app/widget-modules/components/menu-button/menu-button.module.ts
@@ -4,17 +4,9 @@ import {MenuButtonComponent} from './menu-button.component';
 import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
 import {MatButtonModule} from '@angular/material/button';
 
-
 @NgModule({
   declarations: [MenuButtonComponent],
-  exports: [
-    MenuButtonComponent
-  ],
-  imports: [
-    CommonModule,
-    FontAwesomeModule,
-    MatButtonModule
-  ]
+  exports: [MenuButtonComponent],
+  imports: [CommonModule, FontAwesomeModule, MatButtonModule],
 })
-export class MenuButtonModule {
-}
+export class MenuButtonModule {}
diff --git a/src/app/widget-modules/components/song-text/animation.ts b/src/app/widget-modules/components/song-text/animation.ts
index 6edcd7b..c98714d 100644
--- a/src/app/widget-modules/components/song-text/animation.ts
+++ b/src/app/widget-modules/components/song-text/animation.ts
@@ -1,20 +1,13 @@
 import {animate, state, style, transition, trigger} from '@angular/animations';
 
-export const songSwitch =     // the fade-in/fade-out animation.
-  trigger('songSwitch', [
+export const songSwitch = trigger('songSwitch', [
+  // the fade-in/fade-out animation.
+  // the "in" style determines the "resting" state of the element when it is visible.
+  state('in', style({opacity: 1})),
 
-    // the "in" style determines the "resting" state of the element when it is visible.
-    state('in', style({opacity: 1})),
+  // fade in when created. this could also be written as transition('void => *')
+  transition(':enter', [style({opacity: 0}), animate(1200, style({opacity: 0})), animate(1200, style({opacity: 1}))]),
 
-    // fade in when created. this could also be written as transition('void => *')
-    transition(':enter', [
-      style({opacity: 0}),
-      animate(1200, style({opacity: 0})),
-      animate(1200, style({opacity: 1})),
-    ]),
-
-    // fade out when destroyed. this could also be written as transition('void => *')
-    transition(':leave',
-      animate(1200, style({opacity: 0}))
-    )
-  ]);
+  // fade out when destroyed. this could also be written as transition('void => *')
+  transition(':leave', animate(1200, style({opacity: 0}))),
+]);
diff --git a/src/app/widget-modules/components/song-text/song-text.component.html b/src/app/widget-modules/components/song-text/song-text.component.html
index 901383c..c9f1daf 100644
--- a/src/app/widget-modules/components/song-text/song-text.component.html
+++ b/src/app/widget-modules/components/song-text/song-text.component.html
@@ -1,33 +1,70 @@
-<div (click)="onClick()" *ngIf="sections && !fullscreen" [class.chords]="_chordMode!=='hide'"
-     class="song-text">
-
-  <button (click)="onChordClick()" *ngIf="showSwitch" class="menu" mat-icon-button>
+<div
+  (click)="onClick()"
+  *ngIf="sections && !fullscreen"
+  [class.chords]="iChordMode !== 'hide'"
+  class="song-text"
+>
+  <button
+    (click)="onChordClick()"
+    *ngIf="showSwitch"
+    class="menu"
+    mat-icon-button
+  >
     <fa-icon [icon]="faLines"></fa-icon>
   </button>
 
-
   <div [class.offset]="fullscreen" [style.top.px]="offset + 50">
-    <div #section *ngFor="let section of sections; let i = index" [class.chorus]="section.type===1" class="section">
-      <div *ngFor="let line of getLines(section)" [class.chord]="line.type===0" [class.disabled]="checkDisabled(i)"
-           class="line">{{line.text}}</div>
+    <div
+      #section
+      *ngFor="let section of sections; let i = index"
+      [class.chorus]="section.type === 1"
+      class="section"
+    >
+      <div
+        *ngFor="let line of getLines(section)"
+        [class.chord]="line.type === 0"
+        [class.disabled]="checkDisabled(i)"
+        class="line"
+      >
+        {{ line.text }}
+      </div>
     </div>
   </div>
 
   <ng-content></ng-content>
 </div>
 
-<div (click)="onClick()" *ngIf="sections && fullscreen" [@songSwitch]="sections" [class.chords]="_chordMode!=='hide'"
-     class="song-text">
-
-  <button (click)="onChordClick()" *ngIf="showSwitch" class="menu" mat-icon-button>
+<div
+  (click)="onClick()"
+  *ngIf="sections && fullscreen"
+  [@songSwitch]="sections"
+  [class.chords]="iChordMode !== 'hide'"
+  class="song-text"
+>
+  <button
+    (click)="onChordClick()"
+    *ngIf="showSwitch"
+    class="menu"
+    mat-icon-button
+  >
     <fa-icon [icon]="faLines"></fa-icon>
   </button>
 
-
   <div [class.offset]="fullscreen" [style.top.px]="offset + 50">
-    <div #section *ngFor="let section of sections; let i = index" [class.chorus]="section.type===1" class="section">
-      <div *ngFor="let line of getLines(section)" [class.chord]="line.type===0" [class.disabled]="checkDisabled(i)"
-           class="line">{{line.text}}</div>
+    <div
+      #section
+      *ngFor="let section of sections; let i = index"
+      [class.chorus]="section.type === 1"
+      class="section"
+    >
+      <div
+        *ngFor="let line of getLines(section)"
+        [class.chord]="line.type === 0"
+        [class.disabled]="checkDisabled(i)"
+        class="line"
+      >
+        {{ line.text }}
+      </div>
     </div>
   </div>
 
diff --git a/src/app/widget-modules/components/song-text/song-text.component.spec.ts b/src/app/widget-modules/components/song-text/song-text.component.spec.ts
index 3e3f688..1f4a729 100644
--- a/src/app/widget-modules/components/song-text/song-text.component.spec.ts
+++ b/src/app/widget-modules/components/song-text/song-text.component.spec.ts
@@ -6,12 +6,13 @@ describe('SongTextComponent', () => {
   let component: SongTextComponent;
   let fixture: ComponentFixture<SongTextComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [SongTextComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [SongTextComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(SongTextComponent);
@@ -20,6 +21,6 @@ describe('SongTextComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/components/song-text/song-text.component.ts b/src/app/widget-modules/components/song-text/song-text.component.ts
index 1f5cdb8..f0594be 100644
--- a/src/app/widget-modules/components/song-text/song-text.component.ts
+++ b/src/app/widget-modules/components/song-text/song-text.component.ts
@@ -23,18 +23,16 @@ export class SongTextComponent implements OnInit {
   @Input() public showSwitch = false;
   @Input() public transpose: TransposeMode = null;
   @Output() public chordModeChanged = new EventEmitter<ChordMode>();
-  @ViewChildren('section') viewSections: QueryList<ElementRef>;
+  @ViewChildren('section') public viewSections: QueryList<ElementRef<HTMLElement>>;
   public faLines = faGripLines;
   public offset = 0;
+  public iChordMode: ChordMode = 'hide';
 
-  constructor(private textRenderingService: TextRenderingService, private elRef: ElementRef) {
-  }
-
-  public _chordMode: ChordMode = 'hide';
+  public constructor(private textRenderingService: TextRenderingService, private elRef: ElementRef<HTMLElement>) {}
 
   @Input()
   public set chordMode(value: ChordMode) {
-    this._chordMode = value ?? 'hide';
+    this.iChordMode = value ?? 'hide';
   }
 
   @Input()
@@ -42,23 +40,20 @@ export class SongTextComponent implements OnInit {
     this.sections = null;
     this.offset = 0;
     if (this.fullscreen) {
-      setTimeout(() =>
-        this.sections = this.textRenderingService.parse(value, this.transpose).sort((a, b) => a.type - b.type), 100);
+      setTimeout(() => (this.sections = this.textRenderingService.parse(value, this.transpose).sort((a, b) => a.type - b.type)), 100);
     } else {
       this.sections = this.textRenderingService.parse(value, this.transpose).sort((a, b) => a.type - b.type);
     }
   }
 
-
   public ngOnInit(): void {
     setInterval(() => {
-        if (!this.fullscreen || this.index === -1 || !this.viewSections.toArray()[this.index]) {
-          this.offset = 0;
-          return;
-        }
-        this.offset = -this.viewSections.toArray()[this.index].nativeElement.offsetTop;
+      if (!this.fullscreen || this.index === -1 || !this.viewSections.toArray()[this.index]) {
+        this.offset = 0;
+        return;
       }
-      , 100);
+      this.offset = -this.viewSections.toArray()[this.index].nativeElement.offsetTop;
+    }, 100);
   }
 
   public getLines(section: Section): Line[] {
@@ -67,7 +62,7 @@ export class SongTextComponent implements OnInit {
         return true;
       }
 
-      switch (this._chordMode) {
+      switch (this.iChordMode) {
         case 'show':
           return true;
         case 'hide':
@@ -86,7 +81,8 @@ export class SongTextComponent implements OnInit {
   }
 
   public onClick(): void {
-    scrollTo(0, this.elRef.nativeElement.offsetTop - 20);
+    const nativeElement = this.elRef.nativeElement;
+    scrollTo(0, nativeElement.offsetTop - 20);
   }
 
   public checkDisabled(i: number): boolean {
@@ -94,7 +90,7 @@ export class SongTextComponent implements OnInit {
   }
 
   private getNextChordMode(): ChordMode {
-    switch (this._chordMode) {
+    switch (this.iChordMode) {
       case 'show':
         return 'hide';
       case 'hide':
diff --git a/src/app/widget-modules/components/song-text/song-text.module.ts b/src/app/widget-modules/components/song-text/song-text.module.ts
index 0f3522d..ed8fd46 100644
--- a/src/app/widget-modules/components/song-text/song-text.module.ts
+++ b/src/app/widget-modules/components/song-text/song-text.module.ts
@@ -4,15 +4,9 @@ import {SongTextComponent} from './song-text.component';
 import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
 import {MatButtonModule} from '@angular/material/button';
 
-
 @NgModule({
   declarations: [SongTextComponent],
   exports: [SongTextComponent],
-  imports: [
-    CommonModule,
-    FontAwesomeModule,
-    MatButtonModule
-  ]
+  imports: [CommonModule, FontAwesomeModule, MatButtonModule],
 })
-export class SongTextModule {
-}
+export class SongTextModule {}
diff --git a/src/app/widget-modules/directives/autofocus/autofocus.directive.ts b/src/app/widget-modules/directives/autofocus/autofocus.directive.ts
index 1187b22..1efe65f 100644
--- a/src/app/widget-modules/directives/autofocus/autofocus.directive.ts
+++ b/src/app/widget-modules/directives/autofocus/autofocus.directive.ts
@@ -1,15 +1,15 @@
-import {Directive, ElementRef, Input} from '@angular/core';
+import {Directive, ElementRef, Input, OnInit} from '@angular/core';
 
 @Directive({
-  selector: '[autofocus]'
+  selector: '[appAutofocus]',
 })
-export class AutofocusDirective {
+export class AutofocusDirective implements OnInit {
   private focus = true;
 
-  constructor(private el: ElementRef) {
-  }
+  public constructor(private el: ElementRef<HTMLElement>) {}
 
-  @Input() set autofocus(condition: boolean) {
+  @Input()
+  public set autofocus(condition: boolean) {
     this.focus = condition !== false;
   }
 
diff --git a/src/app/widget-modules/directives/autofocus/autofocus.module.ts b/src/app/widget-modules/directives/autofocus/autofocus.module.ts
index bac861f..e3507d4 100644
--- a/src/app/widget-modules/directives/autofocus/autofocus.module.ts
+++ b/src/app/widget-modules/directives/autofocus/autofocus.module.ts
@@ -2,15 +2,9 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {AutofocusDirective} from './autofocus.directive';
 
-
 @NgModule({
   declarations: [AutofocusDirective],
-  exports: [
-    AutofocusDirective
-  ],
-  imports: [
-    CommonModule
-  ]
+  exports: [AutofocusDirective],
+  imports: [CommonModule],
 })
-export class AutofocusModule {
-}
+export class AutofocusModule {}
diff --git a/src/app/widget-modules/guards/role.guard.spec.ts b/src/app/widget-modules/guards/role.guard.spec.ts
index ccd33ba..94ae0c2 100644
--- a/src/app/widget-modules/guards/role.guard.spec.ts
+++ b/src/app/widget-modules/guards/role.guard.spec.ts
@@ -6,11 +6,11 @@ describe('RoleGuard', () => {
   let guard: RoleGuard;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    void TestBed.configureTestingModule({});
     guard = TestBed.inject(RoleGuard);
   });
 
   it('should be created', () => {
-    expect(guard).toBeTruthy();
+    void expect(guard).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/guards/role.guard.ts b/src/app/widget-modules/guards/role.guard.ts
index cde0bad..e3ddd06 100644
--- a/src/app/widget-modules/guards/role.guard.ts
+++ b/src/app/widget-modules/guards/role.guard.ts
@@ -1,20 +1,17 @@
 import {Injectable} from '@angular/core';
-import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree} from '@angular/router';
+import {ActivatedRouteSnapshot, CanActivate, Router, UrlTree} from '@angular/router';
 import {Observable} from 'rxjs';
 import {UserService} from '../../services/user/user.service';
 import {map} from 'rxjs/operators';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class RoleGuard implements CanActivate {
-  constructor(private userService: UserService, private router: Router) {
-  }
+  public constructor(private userService: UserService, private router: Router) {}
 
-  canActivate(
-    next: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot): Observable<boolean | UrlTree> {
-    const requiredRoles = next.data.requiredRoles;
+  public canActivate(next: ActivatedRouteSnapshot): Observable<boolean | UrlTree> {
+    const requiredRoles = next.data.requiredRoles as string[];
     if (!requiredRoles) {
       throw new Error('requiredRoles is not defined!');
     }
@@ -47,5 +44,4 @@ export class RoleGuard implements CanActivate {
 
     return ['brand', 'new-user'];
   }
-
 }
diff --git a/src/app/widget-modules/pipes/key-translator/key-translator.module.ts b/src/app/widget-modules/pipes/key-translator/key-translator.module.ts
index 48574c0..9e02a76 100644
--- a/src/app/widget-modules/pipes/key-translator/key-translator.module.ts
+++ b/src/app/widget-modules/pipes/key-translator/key-translator.module.ts
@@ -2,15 +2,9 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {KeyPipe} from './key.pipe';
 
-
 @NgModule({
   declarations: [KeyPipe],
-  exports: [
-    KeyPipe
-  ],
-  imports: [
-    CommonModule
-  ]
+  exports: [KeyPipe],
+  imports: [CommonModule],
 })
-export class KeyTranslatorModule {
-}
+export class KeyTranslatorModule {}
diff --git a/src/app/widget-modules/pipes/key-translator/key.pipe.spec.ts b/src/app/widget-modules/pipes/key-translator/key.pipe.spec.ts
index 3363244..9bed77e 100644
--- a/src/app/widget-modules/pipes/key-translator/key.pipe.spec.ts
+++ b/src/app/widget-modules/pipes/key-translator/key.pipe.spec.ts
@@ -3,6 +3,6 @@ import {KeyPipe} from './key.pipe';
 describe('KeyPipe', () => {
   it('create an instance', () => {
     const pipe = new KeyPipe();
-    expect(pipe).toBeTruthy();
+    void expect(pipe).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/pipes/key-translator/key.pipe.ts b/src/app/widget-modules/pipes/key-translator/key.pipe.ts
index 491ca3f..7c810d2 100644
--- a/src/app/widget-modules/pipes/key-translator/key.pipe.ts
+++ b/src/app/widget-modules/pipes/key-translator/key.pipe.ts
@@ -2,12 +2,10 @@ import {Pipe, PipeTransform} from '@angular/core';
 import {scaleMapping} from '../../../modules/songs/services/key.helper';
 
 @Pipe({
-  name: 'key'
+  name: 'key',
 })
 export class KeyPipe implements PipeTransform {
-
-  transform(key: string): string {
+  public transform(key: string): string {
     return scaleMapping[key];
   }
-
 }
diff --git a/src/app/widget-modules/pipes/legal-owner-translator/legal-owner-translator.module.ts b/src/app/widget-modules/pipes/legal-owner-translator/legal-owner-translator.module.ts
index 7210404..3a0c44f 100644
--- a/src/app/widget-modules/pipes/legal-owner-translator/legal-owner-translator.module.ts
+++ b/src/app/widget-modules/pipes/legal-owner-translator/legal-owner-translator.module.ts
@@ -2,15 +2,9 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {LegalOwnerPipe} from './legal-owner.pipe';
 
-
 @NgModule({
   declarations: [LegalOwnerPipe],
-  exports: [
-    LegalOwnerPipe
-  ],
-  imports: [
-    CommonModule
-  ]
+  exports: [LegalOwnerPipe],
+  imports: [CommonModule],
 })
-export class LegalOwnerTranslatorModule {
-}
+export class LegalOwnerTranslatorModule {}
diff --git a/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.spec.ts b/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.spec.ts
index 339df2b..2d38943 100644
--- a/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.spec.ts
+++ b/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.spec.ts
@@ -3,6 +3,6 @@ import {LegalOwnerPipe} from './legal-owner.pipe';
 describe('LegalOwnerPipe', () => {
   it('create an instance', () => {
     const pipe = new LegalOwnerPipe();
-    expect(pipe).toBeTruthy();
+    void expect(pipe).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.ts b/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.ts
index fa65639..9738e04 100644
--- a/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.ts
+++ b/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.ts
@@ -1,11 +1,10 @@
 import {Pipe, PipeTransform} from '@angular/core';
 
 @Pipe({
-  name: 'legalOwner'
+  name: 'legalOwner',
 })
 export class LegalOwnerPipe implements PipeTransform {
-
-  transform(legalOwnerKey: string): string {
+  public transform(legalOwnerKey: string): string {
     switch (legalOwnerKey) {
       case 'CCLI':
         return 'CCLI';
@@ -15,5 +14,4 @@ export class LegalOwnerPipe implements PipeTransform {
         return '';
     }
   }
-
 }
diff --git a/src/app/widget-modules/pipes/legal-type-translator/legal-type-translator.module.ts b/src/app/widget-modules/pipes/legal-type-translator/legal-type-translator.module.ts
index 7c06661..360b21e 100644
--- a/src/app/widget-modules/pipes/legal-type-translator/legal-type-translator.module.ts
+++ b/src/app/widget-modules/pipes/legal-type-translator/legal-type-translator.module.ts
@@ -2,15 +2,9 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {LegalTypePipe} from './legal-type.pipe';
 
-
 @NgModule({
   declarations: [LegalTypePipe],
-  exports: [
-    LegalTypePipe
-  ],
-  imports: [
-    CommonModule
-  ]
+  exports: [LegalTypePipe],
+  imports: [CommonModule],
 })
-export class LegalTypeTranslatorModule {
-}
+export class LegalTypeTranslatorModule {}
diff --git a/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.spec.ts b/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.spec.ts
index 11a444b..13ad9da 100644
--- a/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.spec.ts
+++ b/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.spec.ts
@@ -3,6 +3,6 @@ import {LegalTypePipe} from './legal-type.pipe';
 describe('LegalTypePipe', () => {
   it('create an instance', () => {
     const pipe = new LegalTypePipe();
-    expect(pipe).toBeTruthy();
+    void expect(pipe).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.ts b/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.ts
index 1f2264b..c723c45 100644
--- a/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.ts
+++ b/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.ts
@@ -1,11 +1,10 @@
 import {Pipe, PipeTransform} from '@angular/core';
 
 @Pipe({
-  name: 'legalType'
+  name: 'legalType',
 })
 export class LegalTypePipe implements PipeTransform {
-
-  transform(legalTypeKey: string): string {
+  public transform(legalTypeKey: string): string {
     switch (legalTypeKey) {
       case 'open':
         return 'Klärung erforderlich ';
@@ -15,5 +14,4 @@ export class LegalTypePipe implements PipeTransform {
         return '';
     }
   }
-
 }
diff --git a/src/app/widget-modules/pipes/section-type-translator/section-type-translator.module.ts b/src/app/widget-modules/pipes/section-type-translator/section-type-translator.module.ts
index 8d90e14..885891c 100644
--- a/src/app/widget-modules/pipes/section-type-translator/section-type-translator.module.ts
+++ b/src/app/widget-modules/pipes/section-type-translator/section-type-translator.module.ts
@@ -2,15 +2,9 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {SectionTypePipe} from './section-type.pipe';
 
-
 @NgModule({
   declarations: [SectionTypePipe],
-  exports: [
-    SectionTypePipe
-  ],
-  imports: [
-    CommonModule
-  ]
+  exports: [SectionTypePipe],
+  imports: [CommonModule],
 })
-export class SectionTypeTranslatorModule {
-}
+export class SectionTypeTranslatorModule {}
diff --git a/src/app/widget-modules/pipes/section-type-translator/section-type.pipe.spec.ts b/src/app/widget-modules/pipes/section-type-translator/section-type.pipe.spec.ts
index aa712bf..8110021 100644
--- a/src/app/widget-modules/pipes/section-type-translator/section-type.pipe.spec.ts
+++ b/src/app/widget-modules/pipes/section-type-translator/section-type.pipe.spec.ts
@@ -3,6 +3,6 @@ import {SectionTypePipe} from './section-type.pipe';
 describe('SectionTypePipe', () => {
   it('create an instance', () => {
     const pipe = new SectionTypePipe();
-    expect(pipe).toBeTruthy();
+    void expect(pipe).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/pipes/section-type-translator/section-type.pipe.ts b/src/app/widget-modules/pipes/section-type-translator/section-type.pipe.ts
index 56a8780..b6a43fa 100644
--- a/src/app/widget-modules/pipes/section-type-translator/section-type.pipe.ts
+++ b/src/app/widget-modules/pipes/section-type-translator/section-type.pipe.ts
@@ -2,11 +2,10 @@ import {Pipe, PipeTransform} from '@angular/core';
 import {SectionType} from '../../../modules/songs/services/section-type';
 
 @Pipe({
-  name: 'sectionType'
+  name: 'sectionType',
 })
 export class SectionTypePipe implements PipeTransform {
-
-  transform(value: SectionType): string {
+  public transform(value: SectionType): string {
     switch (value) {
       case SectionType.Verse:
         return 'Strophe';
@@ -16,5 +15,4 @@ export class SectionTypePipe implements PipeTransform {
         return 'Bridge';
     }
   }
-
 }
diff --git a/src/app/widget-modules/pipes/show-type-translater/show-type-translater.module.ts b/src/app/widget-modules/pipes/show-type-translater/show-type-translater.module.ts
index 3281a76..ee4c891 100644
--- a/src/app/widget-modules/pipes/show-type-translater/show-type-translater.module.ts
+++ b/src/app/widget-modules/pipes/show-type-translater/show-type-translater.module.ts
@@ -2,15 +2,9 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {ShowTypePipe} from './show-type.pipe';
 
-
 @NgModule({
   declarations: [ShowTypePipe],
-  exports: [
-    ShowTypePipe
-  ],
-  imports: [
-    CommonModule
-  ]
+  exports: [ShowTypePipe],
+  imports: [CommonModule],
 })
-export class ShowTypeTranslaterModule {
-}
+export class ShowTypeTranslaterModule {}
diff --git a/src/app/widget-modules/pipes/show-type-translater/show-type.pipe.spec.ts b/src/app/widget-modules/pipes/show-type-translater/show-type.pipe.spec.ts
index e0cef7b..0e0506a 100644
--- a/src/app/widget-modules/pipes/show-type-translater/show-type.pipe.spec.ts
+++ b/src/app/widget-modules/pipes/show-type-translater/show-type.pipe.spec.ts
@@ -3,6 +3,6 @@ import {ShowTypePipe} from './show-type.pipe';
 describe('ShowTypePipe', () => {
   it('create an instance', () => {
     const pipe = new ShowTypePipe();
-    expect(pipe).toBeTruthy();
+    void expect(pipe).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/pipes/show-type-translater/show-type.pipe.ts b/src/app/widget-modules/pipes/show-type-translater/show-type.pipe.ts
index e332f0d..2fb9882 100644
--- a/src/app/widget-modules/pipes/show-type-translater/show-type.pipe.ts
+++ b/src/app/widget-modules/pipes/show-type-translater/show-type.pipe.ts
@@ -1,13 +1,12 @@
 import {Pipe, PipeTransform} from '@angular/core';
 
 @Pipe({
-  name: 'showType'
+  name: 'showType',
 })
 export class ShowTypePipe implements PipeTransform {
-
-  transform(type: string): string {
+  public transform(type: string): string {
     switch (type) {
-      case  'service-worship':
+      case 'service-worship':
         return 'Gottesdienst Anbetung';
       case 'service-praise':
         return 'Gottesdienst Lobpreis';
@@ -15,18 +14,16 @@ export class ShowTypePipe implements PipeTransform {
         return 'großer Hauskreis';
       case 'home-group':
         return 'Hauskreis';
-      case  'prayer-group':
+      case 'prayer-group':
         return 'Gebetskreis';
-      case  'teens-group':
+      case 'teens-group':
         return 'Teeniekreis';
-      case  'kids-group':
+      case 'kids-group':
         return 'Kinderkreis';
-      case  'misc-public':
+      case 'misc-public':
         return 'sonstige öffentliche Veranstaltung';
-      case  'misc-private':
+      case 'misc-private':
         return 'sonstige private Veranstaltung';
     }
-
   }
-
 }
diff --git a/src/app/widget-modules/pipes/song-type-translater/song-type-translater.module.ts b/src/app/widget-modules/pipes/song-type-translater/song-type-translater.module.ts
index 0315466..c9c0f33 100644
--- a/src/app/widget-modules/pipes/song-type-translater/song-type-translater.module.ts
+++ b/src/app/widget-modules/pipes/song-type-translater/song-type-translater.module.ts
@@ -2,15 +2,9 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {SongTypePipe} from './song-type.pipe';
 
-
 @NgModule({
   declarations: [SongTypePipe],
-  exports: [
-    SongTypePipe
-  ],
-  imports: [
-    CommonModule
-  ]
+  exports: [SongTypePipe],
+  imports: [CommonModule],
 })
-export class SongTypeTranslaterModule {
-}
+export class SongTypeTranslaterModule {}
diff --git a/src/app/widget-modules/pipes/song-type-translater/song-type.pipe.spec.ts b/src/app/widget-modules/pipes/song-type-translater/song-type.pipe.spec.ts
index 4d7f672..2e2fdd3 100644
--- a/src/app/widget-modules/pipes/song-type-translater/song-type.pipe.spec.ts
+++ b/src/app/widget-modules/pipes/song-type-translater/song-type.pipe.spec.ts
@@ -3,6 +3,6 @@ import {SongTypePipe} from './song-type.pipe';
 describe('SongTypePipe', () => {
   it('create an instance', () => {
     const pipe = new SongTypePipe();
-    expect(pipe).toBeTruthy();
+    void expect(pipe).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/pipes/song-type-translater/song-type.pipe.ts b/src/app/widget-modules/pipes/song-type-translater/song-type.pipe.ts
index 716caae..d655001 100644
--- a/src/app/widget-modules/pipes/song-type-translater/song-type.pipe.ts
+++ b/src/app/widget-modules/pipes/song-type-translater/song-type.pipe.ts
@@ -1,11 +1,10 @@
 import {Pipe, PipeTransform} from '@angular/core';
 
 @Pipe({
-  name: 'songType'
+  name: 'songType',
 })
 export class SongTypePipe implements PipeTransform {
-
-  transform(songTypeKey: string): string {
+  public transform(songTypeKey: string): string {
     switch (songTypeKey) {
       case 'Worship':
         return 'Anbetung';
@@ -15,5 +14,4 @@ export class SongTypePipe implements PipeTransform {
         return '';
     }
   }
-
 }
diff --git a/src/app/widget-modules/pipes/status-translater/status-translater.module.ts b/src/app/widget-modules/pipes/status-translater/status-translater.module.ts
index 2a141e4..d0a4f0b 100644
--- a/src/app/widget-modules/pipes/status-translater/status-translater.module.ts
+++ b/src/app/widget-modules/pipes/status-translater/status-translater.module.ts
@@ -2,15 +2,9 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {StatusPipe} from './status.pipe';
 
-
 @NgModule({
   declarations: [StatusPipe],
-  exports: [
-    StatusPipe
-  ],
-  imports: [
-    CommonModule
-  ]
+  exports: [StatusPipe],
+  imports: [CommonModule],
 })
-export class StatusTranslaterModule {
-}
+export class StatusTranslaterModule {}
diff --git a/src/app/widget-modules/pipes/status-translater/status.pipe.spec.ts b/src/app/widget-modules/pipes/status-translater/status.pipe.spec.ts
index f74cb17..ec39489 100644
--- a/src/app/widget-modules/pipes/status-translater/status.pipe.spec.ts
+++ b/src/app/widget-modules/pipes/status-translater/status.pipe.spec.ts
@@ -3,6 +3,6 @@ import {StatusPipe} from './status.pipe';
 describe('StatusPipe', () => {
   it('create an instance', () => {
     const pipe = new StatusPipe();
-    expect(pipe).toBeTruthy();
+    void expect(pipe).toBeTruthy();
   });
 });
diff --git a/src/app/widget-modules/pipes/status-translater/status.pipe.ts b/src/app/widget-modules/pipes/status-translater/status.pipe.ts
index 1f8ce7f..54791c5 100644
--- a/src/app/widget-modules/pipes/status-translater/status.pipe.ts
+++ b/src/app/widget-modules/pipes/status-translater/status.pipe.ts
@@ -1,11 +1,10 @@
 import {Pipe, PipeTransform} from '@angular/core';
 
 @Pipe({
-  name: 'status'
+  name: 'status',
 })
 export class StatusPipe implements PipeTransform {
-
-  transform(songTypeKey: string): string {
+  public transform(songTypeKey: string): string {
     switch (songTypeKey) {
       case 'draft':
         return 'Entwurf';
@@ -17,5 +16,4 @@ export class StatusPipe implements PipeTransform {
         return '';
     }
   }
-
 }
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index d759bc5..38e60e7 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -3,5 +3,5 @@ import {firebase} from './firebase';
 export const environment = {
   production: true,
   url: 'https://worshipgenerator.web.app',
-  firebase
+  firebase,
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 8a5eaa9..4e075a4 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -7,7 +7,7 @@ import {firebase} from './firebase';
 export const environment = {
   production: false,
   url: 'https://worshipgenerator.web.app',
-  firebase
+  firebase,
 };
 
 /*
diff --git a/src/index.html b/src/index.html
index 1b0e3c1..39df3c6 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <html lang="de">
 <head>
   <meta charset="utf-8">
@@ -21,7 +20,7 @@
 
   <style>
     #load-bg {
-      background: #222;
+      background-color: #222;
       position: fixed;
       top: 0;
       left: 0;
diff --git a/src/main.ts b/src/main.ts
index 484b5f3..947bb03 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,5 +8,6 @@ if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule)
+platformBrowserDynamic()
+  .bootstrapModule(AppModule)
   .catch(err => console.error(err));
diff --git a/src/polyfills.ts b/src/polyfills.ts
index d1ecfd1..3eb385e 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -57,7 +57,6 @@
  */
 import 'zone.js'; // Included with Angular CLI.
 
-
 /***************************************************************************************************
  * APPLICATION IMPORTS
  */
diff --git a/src/test.ts b/src/test.ts
index f282ad2..00dd164 100644
--- a/src/test.ts
+++ b/src/test.ts
@@ -4,13 +4,11 @@ import 'zone.js/testing';
 import {getTestBed} from '@angular/core/testing';
 import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
 
-declare const require: any;
+type req = {keys: () => {map: (context: req) => void}};
+declare const require: {context: (a: string, b: boolean, c: RegExp) => req};
 
 // First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
-);
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);
 // And load the modules.
diff --git a/tslint.json b/tslint.json
deleted file mode 100644
index 6ccb655..0000000
--- a/tslint.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-  "extends": "tslint:recommended",
-  "rules": {
-    "align": {
-      "options": [
-        "parameters",
-        "statements"
-      ]
-    },
-    "array-type": false,
-    "arrow-parens": false,
-    "arrow-return-shorthand": true,
-    "deprecation": {
-      "severity": "warning"
-    },
-    "component-class-suffix": true,
-    "contextual-lifecycle": true,
-    "curly": true,
-    "directive-class-suffix": true,
-    "directive-selector": [
-      true,
-      "attribute",
-      "app",
-      "camelCase"
-    ],
-    "component-selector": [
-      true,
-      "element",
-      "app",
-      "kebab-case"
-    ],
-    "eofline": true,
-    "import-blacklist": [
-      true,
-      "rxjs/Rx"
-    ],
-    "import-spacing": true,
-    "indent": {
-      "options": [
-        "spaces"
-      ]
-    },
-    "interface-name": false,
-    "max-classes-per-file": false,
-    "max-line-length": [
-      true,
-      140
-    ],
-    "member-access": false,
-    "member-ordering": [
-      true,
-      {
-        "order": [
-          "static-field",
-          "instance-field",
-          "static-method",
-          "instance-method"
-        ]
-      }
-    ],
-    "no-consecutive-blank-lines": false,
-    "no-console": [
-      true,
-      "debug",
-      "info",
-      "time",
-      "timeEnd",
-      "trace"
-    ],
-    "no-empty": false,
-    "no-inferrable-types": [
-      true,
-      "ignore-params"
-    ],
-    "no-non-null-assertion": true,
-    "no-redundant-jsdoc": true,
-    "no-switch-case-fall-through": true,
-    "no-var-requires": false,
-    "object-literal-key-quotes": [
-      true,
-      "as-needed"
-    ],
-    "object-literal-sort-keys": false,
-    "ordered-imports": false,
-    "quotemark": [
-      true,
-      "single"
-    ],
-    "trailing-comma": false,
-    "no-conflicting-lifecycle": true,
-    "no-host-metadata-property": true,
-    "no-input-rename": true,
-    "no-inputs-metadata-property": true,
-    "no-output-native": true,
-    "no-output-on-prefix": true,
-    "no-output-rename": true,
-    "semicolon": {
-      "options": [
-        "always"
-      ]
-    },
-    "space-before-function-paren": {
-      "options": {
-        "anonymous": "never",
-        "asyncArrow": "always",
-        "constructor": "never",
-        "method": "never",
-        "named": "never"
-      }
-    },
-    "no-outputs-metadata-property": true,
-    "template-banana-in-box": true,
-    "template-no-negated-async": true,
-    "typedef-whitespace": {
-      "options": [
-        {
-          "call-signature": "nospace",
-          "index-signature": "nospace",
-          "parameter": "nospace",
-          "property-declaration": "nospace",
-          "variable-declaration": "nospace"
-        },
-        {
-          "call-signature": "onespace",
-          "index-signature": "onespace",
-          "parameter": "onespace",
-          "property-declaration": "onespace",
-          "variable-declaration": "onespace"
-        }
-      ]
-    },
-    "use-lifecycle-interface": true,
-    "use-pipe-transform-interface": true,
-    "variable-name": {
-      "options": [
-        "ban-keywords",
-        "check-format",
-        "allow-pascal-case"
-      ]
-    },
-    "whitespace": {
-      "options": [
-        "check-branch",
-        "check-decl",
-        "check-operator",
-        "check-separator",
-        "check-type",
-        "check-typecast"
-      ]
-    }
-  },
-  "rulesDirectory": [
-    "codelyzer"
-  ]
-}
\ No newline at end of file