From d6772bb3db967266879163de513c707b6a7d36b6 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Thu, 7 May 2020 17:57:23 +0200
Subject: [PATCH] Update linter rules and fix them

---
 client/.eslintrc.js                           |  44 +-
 client/src/App.vue                            |  17 +-
 client/src/components/AddContentButton.vue    |   6 +-
 client/src/components/AddContentElement.vue   |   6 +-
 client/src/components/AddWidget.vue           |  18 +-
 .../components/AssignmentWithSubmissions.vue  |  70 +--
 client/src/components/Chapter.vue             |  39 +-
 client/src/components/Checkbox.vue            |  13 +-
 client/src/components/ColorChooser.vue        |  27 +-
 client/src/components/ContentBlock.vue        |  68 ++-
 client/src/components/FullscreenImage.vue     |   9 +-
 .../src/components/FullscreenInfographic.vue  |   4 +-
 client/src/components/FullscreenVideo.vue     |  20 +-
 client/src/components/HeaderBar.vue           |  20 +-
 client/src/components/HelpfulTooltip.vue      |   4 +-
 client/src/components/LogoutWidget.vue        |   5 +-
 client/src/components/MobileHeader.vue        |  10 +-
 client/src/components/Modal.vue               |  19 +-
 client/src/components/ModalInput.vue          |  15 +-
 client/src/components/MoreOptionsWidget.vue   |  15 +-
 client/src/components/NewsTeaser.vue          |  12 +-
 client/src/components/Radiobutton.vue         |  13 +-
 client/src/components/SectionBlock.vue        |  29 +-
 client/src/components/SimpleFileUpload.vue    |  32 +-
 client/src/components/StudentSubmission.vue   |  36 +-
 .../components/StudentSubmissionDocument.vue  |  10 +-
 client/src/components/UserMetaWidget.vue      |  14 +-
 client/src/components/UserWidget.vue          |  13 +-
 client/src/components/WidgetFooter.vue        |   2 +-
 client/src/components/WidgetPopover.vue       |   7 +-
 .../book-navigation/BookNavigation.vue        |   9 +-
 .../book-navigation/BookTopicNavigation.vue   |  19 +-
 .../book-navigation/ContentNavigation.vue     |  30 +-
 .../book-navigation/MobileNavigation.vue      |  22 +-
 .../book-navigation/MobileSubnavigation.vue   |   6 +-
 .../book-navigation/SubNavigationItem.vue     |  21 +-
 .../content-block-form/ContentsForm.vue       |  97 ++--
 .../EditContentBlockWizard.vue                |  22 +-
 .../NewContentBlockWizard.vue                 |  28 +-
 .../content-blocks/ContentComponent.vue       |  16 +-
 .../content-blocks/ContentListBlock.vue       |  29 +-
 .../content-blocks/DocumentBlock.vue          |  14 +-
 .../content-blocks/GeniallyBlock.vue          |  21 +-
 .../components/content-blocks/ImageBlock.vue  |   6 +-
 .../content-blocks/ImageUrlBlock.vue          |   6 +-
 .../content-blocks/InfogramBlock.vue          |  53 +-
 .../components/content-blocks/Instruction.vue |  10 +-
 .../content-blocks/InstrumentWidget.vue       |  10 +-
 .../components/content-blocks/LinkBlock.vue   |  11 +-
 .../content-blocks/ModuleRoomSlug.vue         |   4 +-
 .../content-blocks/SectionTitleBlock.vue      |   4 +-
 .../components/content-blocks/Solution.vue    |  28 +-
 .../content-blocks/SubtitleBlock.vue          |   4 +-
 .../components/content-blocks/SurveyBlock.vue |   9 +-
 client/src/components/content-blocks/Task.vue |   4 +-
 .../components/content-blocks/TextBlock.vue   |   4 +-
 .../content-blocks/ThinglinkBlock.vue         |  25 +-
 .../components/content-blocks/VideoBlock.vue  |  12 +-
 .../content-blocks/assignment/Assignment.vue  |  73 +--
 .../assignment/FinalSubmission.vue            |  12 +-
 .../content-blocks/assignment/SpellCheck.vue  |   6 +-
 .../assignment/SubmissionForm.vue             |  33 +-
 .../assignment/SubmissionInput.vue            |  30 +-
 .../content-forms/AssignmentForm.vue          |  22 +-
 .../ContentBlockElementChooserWidget.vue      |  61 ++-
 .../components/content-forms/DocumentForm.vue |  33 +-
 .../components/content-forms/ImageForm.vue    |  21 +-
 .../src/components/content-forms/LinkForm.vue |  12 +-
 .../src/components/content-forms/TextForm.vue |  11 +-
 .../content-forms/TextFormWithHelpText.vue    |   8 +-
 .../components/content-forms/VideoForm.vue    |  31 +-
 client/src/components/icons/AddIcon.vue       |   5 +-
 client/src/components/icons/AddNoteIcon.vue   |   5 +-
 client/src/components/icons/AddPointer.vue    |   5 +-
 client/src/components/icons/BookmarkIcon.vue  |  17 +-
 client/src/components/icons/BulbIcon.vue      |  12 +-
 client/src/components/icons/Cards.vue         |  10 +-
 client/src/components/icons/ChevronDown.vue   |   4 +-
 client/src/components/icons/ChevronRight.vue  |   5 +-
 client/src/components/icons/ChevronUp.vue     |   4 +-
 client/src/components/icons/CircleIcon.vue    |   9 +-
 client/src/components/icons/ClosedEyeIcon.vue |   5 +-
 client/src/components/icons/Cross.vue         |   5 +-
 client/src/components/icons/DefaultAvatar.vue |  54 +-
 client/src/components/icons/DocumentIcon.vue  |   9 +-
 client/src/components/icons/EhbLogo.vue       |  97 +++-
 client/src/components/icons/Ellipses.vue      |  19 +-
 client/src/components/icons/EyeIcon.vue       |   5 +-
 client/src/components/icons/Group.vue         |   5 +-
 client/src/components/icons/Hamburger.vue     |   7 +-
 client/src/components/icons/HepLogo.vue       | 108 ++--
 client/src/components/icons/ImageIcon.vue     |   5 +-
 client/src/components/icons/InfoIcon.vue      |  10 +-
 client/src/components/icons/LinkIcon.vue      |   5 +-
 client/src/components/icons/LoadingIcon.vue   |   4 +-
 client/src/components/icons/Logo.vue          |  66 ++-
 client/src/components/icons/NoteIcon.vue      |   5 +-
 client/src/components/icons/PenIcon.vue       |   4 +-
 client/src/components/icons/Play.vue          |   8 +-
 .../src/components/icons/SpeechBubbleIcon.vue |   5 +-
 client/src/components/icons/TextIcon.vue      |   5 +-
 client/src/components/icons/Tick.vue          |   5 +-
 .../src/components/icons/TickCircleIcon.vue   |   4 +-
 client/src/components/icons/TrashIcon.vue     |   4 +-
 client/src/components/icons/UserIcon.vue      |   5 +-
 client/src/components/icons/VideoIcon.vue     |   5 +-
 .../illustrations/ContentsIllustration.vue    | 194 ++++---
 .../illustrations/PortfolioIllustration.vue   | 212 +++++---
 .../illustrations/RoomsIllustration.vue       | 511 +++++++++++-------
 client/src/components/inputs/BaseInput.vue    |  22 +-
 .../instruments/InstrumentFilter.vue          |  12 +-
 client/src/components/modules/Module.vue      |  61 ++-
 .../components/modules/ModuleNavigation.vue   |  83 +--
 .../src/components/modules/ModuleTeaser.vue   |  16 +-
 .../src/components/notes/BookmarkActions.vue  |  23 +-
 .../src/components/notes/EditNoteWizard.vue   |   5 +-
 client/src/components/notes/NewNoteWizard.vue |   5 +-
 client/src/components/notes/NoteForm.vue      |  25 +-
 .../objective-groups/NewObjectiveWizard.vue   |  27 +-
 .../components/objective-groups/Objective.vue |  32 +-
 .../objective-groups/ObjectiveForm.vue        |  17 +-
 .../objective-groups/ObjectiveGroup.vue       |  16 +-
 .../objective-groups/ObjectiveGroups.vue      |   5 +-
 client/src/components/page-form/PageForm.vue  |  10 +-
 .../components/page-form/PageFormInput.vue    |  29 +-
 .../src/components/portfolio/AddProject.vue   |   4 +-
 .../components/portfolio/AddProjectEntry.vue  |   4 +-
 .../src/components/portfolio/EditProject.vue  |   2 +-
 .../portfolio/EditProjectEntryWizard.vue      |   6 +-
 .../portfolio/NewProjectEntryWizard.vue       |  28 +-
 .../src/components/portfolio/OwnerWidget.vue  |   6 +-
 .../components/portfolio/ProjectActions.vue   |  22 +-
 .../src/components/portfolio/ProjectEntry.vue |  32 +-
 .../components/portfolio/ProjectEntryForm.vue |  47 +-
 .../src/components/portfolio/ProjectForm.vue  |  53 +-
 .../components/portfolio/ProjectWidget.vue    |  27 +-
 .../src/components/profile/ActivityEntry.vue  |  10 +-
 .../src/components/profile/ActivityFilter.vue |  13 +-
 client/src/components/profile/Avatar.vue      |  25 +-
 .../components/profile/AvatarUploadForm.vue   |  15 +-
 client/src/components/profile/ClassList.vue   |  82 +--
 .../components/profile/ContentBookmark.vue    |  12 +-
 .../components/profile/DeactivatePerson.vue   |  20 +-
 .../components/profile/InstrumentActivity.vue |  32 +-
 .../src/components/profile/ModuleActivity.vue |  67 ++-
 .../src/components/profile/PasswordChange.vue |  14 +-
 .../components/profile/PasswordChangeForm.vue |  91 ++--
 client/src/components/profile/Profile.vue     |  16 +-
 .../src/components/profile/ProfileSidebar.vue |  42 +-
 .../src/components/profile/ProfileWidget.vue  |   6 +-
 client/src/components/rooms/AddRoom.vue       |   2 +-
 .../components/rooms/AddRoomEntryButton.vue   |   7 +-
 client/src/components/rooms/EditRoom.vue      |   2 +-
 .../src/components/rooms/EntryCountWidget.vue |   4 +-
 client/src/components/rooms/RoomActions.vue   |  14 +-
 client/src/components/rooms/RoomEntry.vue     |  62 ++-
 client/src/components/rooms/RoomForm.vue      |  62 ++-
 .../src/components/rooms/RoomGroupWidget.vue  |   4 +-
 client/src/components/rooms/RoomWidget.vue    |  17 +-
 .../room-entries/EditRoomEntryWizard.vue      |   6 +-
 .../rooms/room-entries/NewRoomEntryWizard.vue |   6 +-
 .../school-class/ClassSelectionWidget.vue     |  80 +--
 .../components/school-class/CurrentClass.vue  |   4 +-
 .../components/school-class/EditClassName.vue |   7 +-
 .../school-class/EditClassNameWizard.vue      |  46 +-
 .../components/toggle-menu/ToggleEditing.vue  |   6 +-
 .../toggle-menu/ToggleSolutionsForModule.vue  |  19 +-
 client/src/components/videos/SrfEmbed.vue     |   8 +-
 client/src/components/videos/VimeoEmbed.vue   |   9 +-
 client/src/components/videos/YoutubeEmbed.vue |  11 +-
 .../visibility/VisibilityAction.vue           |  31 +-
 client/src/layouts/BlankLayout.vue            |   4 +-
 client/src/layouts/DefaultFooter.vue          |  14 +-
 client/src/layouts/DefaultLayout.vue          |  15 +-
 client/src/layouts/FullScreenLayout.vue       |  12 +-
 client/src/layouts/PublicLayout.vue           |   6 +-
 client/src/layouts/SimpleLayout.vue           |  10 +-
 client/src/pages/activity.vue                 |  11 +-
 client/src/pages/article.vue                  |  14 +-
 client/src/pages/book.vue                     |   2 +-
 client/src/pages/createClass.vue              |  22 +-
 client/src/pages/editProject.vue              |   4 +-
 client/src/pages/editRoom.vue                 |   4 +-
 client/src/pages/instrument.vue               |  20 +-
 client/src/pages/instrumentOverview.vue       |  28 +-
 client/src/pages/joinClass.vue                |  27 +-
 client/src/pages/login.vue                    | 249 ++++-----
 client/src/pages/module-base.vue              |   4 +-
 client/src/pages/module.vue                   |  69 +--
 client/src/pages/moduleRoom.vue               |  17 +-
 client/src/pages/myClass.vue                  |  15 +-
 client/src/pages/newProject.vue               |   4 +-
 client/src/pages/newRoom.vue                  |   2 +-
 client/src/pages/oldClasses.vue               |  23 +-
 client/src/pages/portfolio.vue                |   8 +-
 client/src/pages/profile.vue                  |   2 +-
 client/src/pages/project.vue                  |  57 +-
 client/src/pages/room.vue                     |  19 +-
 client/src/pages/rooms.vue                    |  34 +-
 client/src/pages/showCode.vue                 |   4 +-
 client/src/pages/start.vue                    |  46 +-
 client/src/pages/studentSubmission.vue        |  87 +--
 client/src/pages/styleguide.vue               |   2 +-
 client/src/pages/submissions.vue              |  21 +-
 client/src/pages/survey.vue                   |  12 +-
 client/src/pages/topic.vue                    |  48 +-
 206 files changed, 3279 insertions(+), 2029 deletions(-)

diff --git a/client/.eslintrc.js b/client/.eslintrc.js
index 0c86ffaa..92ad96bd 100644
--- a/client/.eslintrc.js
+++ b/client/.eslintrc.js
@@ -11,7 +11,8 @@ module.exports = {
   extends: [
     // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
     // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
-    'plugin:vue/essential',
+    'plugin:vue/strongly-recommended',
+    // 'plugin:vue/recommended',
     // https://github.com/standard/standard/blob/master/docs/RULES-en.md
     'standard'
   ],
@@ -29,5 +30,46 @@ module.exports = {
     'semi': 0,
     'space-before-function-paren': 'off',
     'comma-dangle': 'off',
+
+    // vue rules
+    'vue/require-prop-types': 'off', //todo: should we do this?
+    'vue/require-default-prop': 'off', //todo: should we do this?
+    'vue/attributes-order': ['error', {
+      'order': [
+        'OTHER_ATTR',
+        'DEFINITION',
+        'LIST_RENDERING',
+        'CONDITIONALS',
+        'RENDER_MODIFIERS',
+        'GLOBAL',
+        'UNIQUE',
+        'TWO_WAY_BINDING',
+        'OTHER_DIRECTIVES',
+        'EVENTS',
+        'CONTENT'
+      ]
+    }],
+    'vue/order-in-components': ['error', {
+      'order': [
+        'el',
+        'name',
+        'parent',
+        'functional',
+        ['delimiters', 'comments'],
+        ['props', 'propsData'],
+        'mixins',
+        ['components', 'directives', 'filters'],
+        'data',
+        'extends',
+        'inheritAttrs',
+        'model',
+        'computed',
+        'watch',
+        'LIFECYCLE_HOOKS',
+        'methods',
+        ['template', 'render'],
+        'renderError'
+      ]
+    }]
   }
 };
diff --git a/client/src/App.vue b/client/src/App.vue
index b1acde34..b6fe73f8 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -1,9 +1,16 @@
 <template>
-  <div :class="{'no-scroll': showModal || showMobileNavigation}" class="app" id="app">
-    <component :is="showModalDeprecated" v-if="showModalDeprecated"></component>
-    <component :is="showModal" v-if="showModal"></component>
-    <component :is="layout"></component>
-    <mobile-navigation v-if="showMobileNavigation"></mobile-navigation>
+  <div
+    :class="{'no-scroll': showModal || showMobileNavigation}"
+    class="app"
+    id="app">
+    <component
+      :is="showModalDeprecated"
+      v-if="showModalDeprecated"/>
+    <component
+      :is="showModal"
+      v-if="showModal"/>
+    <component :is="layout"/>
+    <mobile-navigation v-if="showMobileNavigation"/>
   </div>
 </template>
 
diff --git a/client/src/components/AddContentButton.vue b/client/src/components/AddContentButton.vue
index b93460f2..df53dc5a 100644
--- a/client/src/components/AddContentButton.vue
+++ b/client/src/components/AddContentButton.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="add-content">
-    <a class="add-content__button" v-on:click="addContent">
-      <add-pointer class="add-content__icon"></add-pointer>
+    <a
+      class="add-content__button"
+      @click="addContent">
+      <add-pointer class="add-content__icon"/>
     </a>
   </div>
 </template>
diff --git a/client/src/components/AddContentElement.vue b/client/src/components/AddContentElement.vue
index a1266a67..2f028056 100644
--- a/client/src/components/AddContentElement.vue
+++ b/client/src/components/AddContentElement.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="add-content-element" v-on:click="$emit('add-element', index)">
-    <add-icon class="add-content-element__icon"></add-icon>
+  <div
+    class="add-content-element"
+    @click="$emit('add-element', index)">
+    <add-icon class="add-content-element__icon"/>
   </div>
 </template>
 
diff --git a/client/src/components/AddWidget.vue b/client/src/components/AddWidget.vue
index c84a70b9..2c915aa9 100644
--- a/client/src/components/AddWidget.vue
+++ b/client/src/components/AddWidget.vue
@@ -1,7 +1,11 @@
 <template>
-  <component :is="component" v-bind="properties" class="add-widget" @click="$emit('click')"
-             :class="{ 'add-widget--reverse': reverse }">
-    <add-icon class="add-widget__add"></add-icon>
+  <component
+    :is="component"
+    v-bind="properties"
+    :class="{ 'add-widget--reverse': reverse }"
+    class="add-widget"
+    @click="$emit('click')">
+    <add-icon class="add-widget__add"/>
   </component>
 </template>
 
@@ -24,6 +28,10 @@
       }
     },
 
+    components: {
+      AddIcon
+    },
+
     computed: {
       component() {
         // only use the router link if the route prop is provided, otherwise render a normal anchor tag
@@ -36,10 +44,6 @@
         } : {}
       }
     },
-
-    components: {
-      AddIcon
-    }
   }
 </script>
 
diff --git a/client/src/components/AssignmentWithSubmissions.vue b/client/src/components/AssignmentWithSubmissions.vue
index f058086c..fbdaca90 100644
--- a/client/src/components/AssignmentWithSubmissions.vue
+++ b/client/src/components/AssignmentWithSubmissions.vue
@@ -1,33 +1,41 @@
 <template>
   <div class="assignment-with-submissions">
-    <p class="assignment-with-submissions__text">{{assignment.assignment}}</p>
+    <p class="assignment-with-submissions__text">{{ assignment.assignment }}</p>
 
     <div>
-      <a class="button button--primary submissions-page__back" @click="$emit('back')">Aufgabe im Modul anzeigen</a>
+      <a
+        class="button button--primary submissions-page__back"
+        @click="$emit('back')">Aufgabe im Modul anzeigen</a>
     </div>
 
-    <div class="assignment-with-submissions__solution" v-if="assignment.solution">
+    <div
+      class="assignment-with-submissions__solution"
+      v-if="assignment.solution">
       <h4 class="assignment-with-submissions__heading">Lösung</h4>
-      <p class="assignment-with-submissions__solution-text">{{assignment.solution}}</p>
+      <p class="assignment-with-submissions__solution-text">{{ assignment.solution }}</p>
     </div>
-    <p class="assignment-with-submissions__no-submissions" v-if="!assignment.submissions.length">Zu diesem Auftrag sind noch keine Ergebnisse vorhanden</p>
+    <p
+      class="assignment-with-submissions__no-submissions"
+      v-if="!assignment.submissions.length">Zu diesem Auftrag sind noch keine Ergebnisse vorhanden</p>
 
-    <div v-if="assignment.submissions.length" class="assignment-with-submissions__submissions submissions">
+    <div
+      class="assignment-with-submissions__submissions submissions"
+      v-if="assignment.submissions.length">
       <div class="submissions__header student-submission-row submission-header">
-          <p class="submission-header__title">Lernende</p>
-          <p class="submission-header__title">Ergebnisse</p>
-          <p class="submission-header__title">Feedback</p>
+        <p class="submission-header__title">Lernende</p>
+        <p class="submission-header__title">Ergebnisse</p>
+        <p class="submission-header__title">Feedback</p>
       </div>
-    <router-link
-      :to="submissionLink(submission)"
-      v-for="submission in submissions"
-      class="assignment-with-submissions__link"
-      :key="submission.id">
-      <student-submission class="assignment-with-submissions__submission"
-                          :submission="submission"
-      >
-      </student-submission>
-    </router-link>
+      <router-link
+        :to="submissionLink(submission)"
+        :key="submission.id"
+        class="assignment-with-submissions__link"
+        v-for="submission in submissions">
+        <student-submission
+          :submission="submission"
+          class="assignment-with-submissions__submission"
+        />
+      </router-link>
     </div>
 
   </div>
@@ -45,15 +53,9 @@
       StudentSubmission
     },
 
-    methods: {
-      submissionLink(submission) {
-        return `/submission/${submission.id}`
-      },
-      belongsToSchool(submission) {
-        if (this.currentFilter.id === '') {
-          return true;
-        }
-        return submission.student.schoolClasses.edges.some(edge => edge.node.id === this.currentFilter.id)
+    data() {
+      return {
+        me: {}
       }
     },
 
@@ -68,9 +70,15 @@
       },
     },
 
-    data() {
-      return {
-        me: {}
+    methods: {
+      submissionLink(submission) {
+        return `/submission/${submission.id}`
+      },
+      belongsToSchool(submission) {
+        if (this.currentFilter.id === '') {
+          return true;
+        }
+        return submission.student.schoolClasses.edges.some(edge => edge.node.id === this.currentFilter.id)
       }
     },
 
diff --git a/client/src/components/Chapter.vue b/client/src/components/Chapter.vue
index c7332d56..651b3f0a 100644
--- a/client/src/components/Chapter.vue
+++ b/client/src/components/Chapter.vue
@@ -1,25 +1,30 @@
 <template>
-  <div class="chapter" :data-scrollto="chapter.id">
-    <h3 :id="'chapter-' + index">{{chapter.title}}</h3>
+  <div
+    :data-scrollto="chapter.id"
+    class="chapter">
+    <h3 :id="'chapter-' + index">{{ chapter.title }}</h3>
 
     <bookmark-actions
+      :bookmarked="chapter.bookmark"
+      :note="note"
       class="chapter__bookmark-actions"
       @add-note="addNote"
       @edit-note="editNote"
-      :bookmarked="chapter.bookmark"
       @bookmark="bookmark(!chapter.bookmark)"
-      :note="note"
-    ></bookmark-actions>
+    />
     <p class="chapter__description">
-      {{chapter.description}}
+      {{ chapter.description }}
     </p>
 
-    <add-content-button :parent="chapter" v-if="editModule"></add-content-button>
+    <add-content-button
+      :parent="chapter"
+      v-if="editModule"/>
 
-    <content-block :contentBlock="contentBlock"
-                   :parent="chapter.id"
-                   :key="contentBlock.id" v-for="contentBlock in filteredContentBlocks">
-    </content-block>
+    <content-block
+      :content-block="contentBlock"
+      :parent="chapter.id"
+      :key="contentBlock.id"
+      v-for="contentBlock in filteredContentBlocks"/>
   </div>
 </template>
 
@@ -44,6 +49,12 @@
       AddContentButton
     },
 
+    data() {
+      return {
+        me: {}
+      }
+    },
+
     computed: {
       ...mapGetters(['editModule']),
       filteredContentBlocks() {
@@ -66,12 +77,6 @@
       }
     },
 
-    data() {
-      return {
-        me: {}
-      }
-    },
-
     methods: {
       bookmark(bookmarked) {
         const id = this.chapter.id;
diff --git a/client/src/components/Checkbox.vue b/client/src/components/Checkbox.vue
index 13e5bd9f..e177d87e 100644
--- a/client/src/components/Checkbox.vue
+++ b/client/src/components/Checkbox.vue
@@ -1,10 +1,11 @@
 <template>
-  <base-input :label="label"
-              :checked="checked"
-              :item="item"
-              v-on:input="passOn"
-              :type="'checkbox'"
-  ></base-input>
+  <base-input
+    :label="label"
+    :checked="checked"
+    :item="item"
+    :type="'checkbox'"
+    @input="passOn"
+  />
 </template>
 
 <script>
diff --git a/client/src/components/ColorChooser.vue b/client/src/components/ColorChooser.vue
index 4e7a092c..8f2b47dd 100644
--- a/client/src/components/ColorChooser.vue
+++ b/client/src/components/ColorChooser.vue
@@ -1,12 +1,17 @@
 <template>
   <div class="color-chooser">
-    <div v-for="(color, index) in colors"
-         :key="index"
-         class="color-chooser__color-wrapper"
-         @click="$emit('input', color.name)"
-         :class="{'color-chooser__color-wrapper--selected': selectedColor === color.name}">
-      <div class="color-chooser__color" :class="'color-chooser__color--' + color.name">
-        <tick class="color-chooser__selected-icon" v-if="selectedColor === color.name"></tick>
+    <div
+      :key="index"
+      :class="{'color-chooser__color-wrapper--selected': selectedColor === color.name}"
+      class="color-chooser__color-wrapper"
+      v-for="(color, index) in colors"
+      @click="$emit('input', color.name)">
+      <div
+        :class="'color-chooser__color--' + color.name"
+        class="color-chooser__color">
+        <tick
+          class="color-chooser__selected-icon"
+          v-if="selectedColor === color.name"/>
       </div>
     </div>
   </div>
@@ -18,6 +23,10 @@
   export default {
     props: ['selected-color'],
 
+    components: {
+      Tick
+    },
+
     data() {
       return {
         colors: [
@@ -36,10 +45,6 @@
         ]
       }
     },
-
-    components: {
-      Tick
-    }
   }
 </script>
 
diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue
index d0301771..e4d347c1 100644
--- a/client/src/components/ContentBlock.vue
+++ b/client/src/components/ContentBlock.vue
@@ -1,9 +1,17 @@
 <template>
-  <div class="content-block__container hideable-element" :class="{'hideable-element--hidden': hidden}">
-    <div class="content-block" :class="specialClass">
-      <div class="block-actions" v-if="canEditContentBlock && editModule">
-        <user-widget :show-menu="false" v-bind="me"
-                     class="block-actions__user-widget content-block__user-widget"></user-widget>
+  <div
+    :class="{'hideable-element--hidden': hidden}"
+    class="content-block__container hideable-element">
+    <div
+      :class="specialClass"
+      class="content-block">
+      <div
+        class="block-actions"
+        v-if="canEditContentBlock && editModule">
+        <user-widget
+          :show-menu="false"
+          v-bind="me"
+          class="block-actions__user-widget content-block__user-widget"/>
         <more-options-widget>
           <li class="popover-links__link"><a @click="deleteContentBlock(contentBlock)">Löschen</a></li>
           <li class="popover-links__link"><a @click="editContentBlock(contentBlock)">Bearbeiten</a></li>
@@ -11,26 +19,32 @@
       </div>
       <div class="content-block__visibility">
         <visibility-action
-          v-if="canEditModule"
-          :block="contentBlock"></visibility-action>
+          :block="contentBlock"
+          v-if="canEditModule"/>
       </div>
 
-      <h3 v-if="instrumentLabel !== ''" class="content-block__instrument-label">{{instrumentLabel}}</h3>
-      <h4 class="content-block__title" v-if="!contentBlock.indent">{{contentBlock.title}}</h4>
+      <h3
+        class="content-block__instrument-label"
+        v-if="instrumentLabel !== ''">{{ instrumentLabel }}</h3>
+      <h4
+        class="content-block__title"
+        v-if="!contentBlock.indent">{{ contentBlock.title }}</h4>
 
-      <content-component v-for="component in contentBlocksWithContentLists.contents"
-                         :key="component.id"
-                         :component="component"
-                         :root="root"
-                         :parent="contentBlock"
-                         :bookmarks="contentBlock.bookmarks"
-                         :notes="contentBlock.notes"
-      >
-      </content-component>
+      <content-component
+        :key="component.id"
+        :component="component"
+        :root="root"
+        :parent="contentBlock"
+        :bookmarks="contentBlock.bookmarks"
+        :notes="contentBlock.notes"
+        v-for="component in contentBlocksWithContentLists.contents"
+      />
 
     </div>
 
-    <add-content-button :after="contentBlock" v-if="canEditModule"></add-content-button>
+    <add-content-button
+      :after="contentBlock"
+      v-if="canEditModule"/>
 
   </div>
 
@@ -60,8 +74,8 @@
   };
 
   export default {
+    name: 'ContentBlock',
     props: ['contentBlock', 'parent'],
-    name: 'content-block',
 
     components: {
       ContentComponent,
@@ -71,6 +85,13 @@
       UserWidget
     },
 
+    data() {
+      return {
+        showVisibility: false,
+        me: {}
+      }
+    },
+
     computed: {
       ...mapGetters(['editModule']),
       canEditModule() {
@@ -154,7 +175,6 @@
         return this.contentBlock.root ? this.contentBlock.root : this.contentBlock.id;
       }
     },
-
     methods: {
       editContentBlock(contentBlock) {
         this.$store.dispatch('editContentBlock', contentBlock.id);
@@ -216,12 +236,6 @@
         return [...content.slice(0, listIndex), ...content[listIndex].contents[0].value, ...content.slice(listIndex + 1)];
       }
     },
-    data() {
-      return {
-        showVisibility: false,
-        me: {}
-      }
-    },
 
     apollo: {
       me: meQuery
diff --git a/client/src/components/FullscreenImage.vue b/client/src/components/FullscreenImage.vue
index dfb2b5e6..f7401bc3 100644
--- a/client/src/components/FullscreenImage.vue
+++ b/client/src/components/FullscreenImage.vue
@@ -1,6 +1,11 @@
 <template>
-  <modal class="fullscreen-image" :hide-header="true" :fullscreen="true">
-    <img class="fullscreen-image__image" :src="imageUrl">
+  <modal
+    :hide-header="true"
+    :fullscreen="true"
+    class="fullscreen-image">
+    <img
+      :src="imageUrl"
+      class="fullscreen-image__image">
   </modal>
 
 </template>
diff --git a/client/src/components/FullscreenInfographic.vue b/client/src/components/FullscreenInfographic.vue
index 7c951dc5..631dc507 100644
--- a/client/src/components/FullscreenInfographic.vue
+++ b/client/src/components/FullscreenInfographic.vue
@@ -1,6 +1,8 @@
 <template>
   <modal :fullscreen="true">
-    <component :is="type" :value="value"></component>
+    <component
+      :is="type"
+      :value="value"/>
   </modal>
 </template>
 
diff --git a/client/src/components/FullscreenVideo.vue b/client/src/components/FullscreenVideo.vue
index 82a474a4..248cec9c 100644
--- a/client/src/components/FullscreenVideo.vue
+++ b/client/src/components/FullscreenVideo.vue
@@ -1,11 +1,17 @@
 <template>
-  <modal class="fullscreen-video" :hide-header="true" :fullscreen="true">
-    <iframe :src="src"
-            width="2000"
-            height="1000"
-            class="fullscreen-video__embed"
-            frameborder="0" webkitallowfullscreen
-            mozallowfullscreen allowfullscreen></iframe>
+  <modal
+    :hide-header="true"
+    :fullscreen="true"
+    class="fullscreen-video">
+    <iframe
+      :src="src"
+      width="2000"
+      height="1000"
+      class="fullscreen-video__embed"
+      frameborder="0"
+      webkitallowfullscreen
+      mozallowfullscreen
+      allowfullscreen/>
   </modal>
 
 </template>
diff --git a/client/src/components/HeaderBar.vue b/client/src/components/HeaderBar.vue
index 95a61c01..2075da30 100644
--- a/client/src/components/HeaderBar.vue
+++ b/client/src/components/HeaderBar.vue
@@ -1,18 +1,24 @@
 <template>
   <header class="header-bar">
-    <content-navigation></content-navigation>
-    <router-link to="/" class="header-bar__logo" data-cy="home-link">
-      <logo class="header-bar__logo-icon"></logo>
+    <content-navigation/>
+    <router-link
+      to="/"
+      class="header-bar__logo"
+      data-cy="home-link">
+      <logo class="header-bar__logo-icon"/>
     </router-link>
     <div class="user-header">
-      <a class="user-header__sidebar-link" @click="openSidebar()">
+      <a
+        class="user-header__sidebar-link"
+        @click="openSidebar()">
         <current-class class="user-header__current-class"/>
       </a>
 
-      <user-widget data-cy="header-user-widget" v-bind="me"></user-widget>
+      <user-widget
+        v-bind="me"
+        data-cy="header-user-widget"/>
     </div>
-    <book-navigation v-if="showSubnavigation">
-    </book-navigation>
+    <book-navigation v-if="showSubnavigation"/>
   </header>
 </template>
 
diff --git a/client/src/components/HelpfulTooltip.vue b/client/src/components/HelpfulTooltip.vue
index d9fd0f77..c1b1a0e3 100644
--- a/client/src/components/HelpfulTooltip.vue
+++ b/client/src/components/HelpfulTooltip.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="helpful-tooltip">
-    <info-icon class="helpful-tooltip__icon"></info-icon>
+    <info-icon class="helpful-tooltip__icon"/>
     <div class="helpful-tooltip__tooltip">
       <div class="helpful-tooltip__text">
-        {{text}}
+        {{ text }}
       </div>
     </div>
   </div>
diff --git a/client/src/components/LogoutWidget.vue b/client/src/components/LogoutWidget.vue
index 45928c76..3255f15b 100644
--- a/client/src/components/LogoutWidget.vue
+++ b/client/src/components/LogoutWidget.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="logout-widget">
-    <a class="logout-widget__logout" data-cy="logout" @click="logout()">Logout</a>
+    <a
+      class="logout-widget__logout"
+      data-cy="logout"
+      @click="logout()">Logout</a>
   </div>
 </template>
 
diff --git a/client/src/components/MobileHeader.vue b/client/src/components/MobileHeader.vue
index 3774c112..4c9ef1c2 100644
--- a/client/src/components/MobileHeader.vue
+++ b/client/src/components/MobileHeader.vue
@@ -1,14 +1,16 @@
 <template>
   <div class="mobile-header">
     <a @click="showMobileNavigation">
-      <hamburger class="mobile-header__hamburger"></hamburger>
+      <hamburger class="mobile-header__hamburger"/>
     </a>
 
-    <router-link to="/" data-cy="mobile-home-link">
-      <logo></logo>
+    <router-link
+      to="/"
+      data-cy="mobile-home-link">
+      <logo/>
     </router-link>
 
-    <user-widget v-bind="me"></user-widget>
+    <user-widget v-bind="me"/>
   </div>
 </template>
 
diff --git a/client/src/components/Modal.vue b/client/src/components/Modal.vue
index f46b9431..82541022 100644
--- a/client/src/components/Modal.vue
+++ b/client/src/components/Modal.vue
@@ -1,20 +1,25 @@
 <template>
   <div class="modal__backdrop">
-    <div class="modal"
-         :class="{'modal--hide-header': hideHeader || fullscreen, 'modal--fullscreen': fullscreen, 'modal--small': small}">
+    <div
+      :class="{'modal--hide-header': hideHeader || fullscreen, 'modal--fullscreen': fullscreen, 'modal--small': small}"
+      class="modal">
       <div class="modal__header">
-        <slot name="header"></slot>
+        <slot name="header"/>
       </div>
       <div class="modal__body">
-        <slot></slot>
-        <div class="modal__close-button" @click="hideModal">
-          <cross class="modal__close-icon"></cross>
+        <slot/>
+        <div
+          class="modal__close-button"
+          @click="hideModal">
+          <cross class="modal__close-icon"/>
         </div>
       </div>
       <div class="modal__footer">
         <slot name="footer">
           <!--<a class="button button&#45;&#45;active">Speichern</a>-->
-          <a class="button" v-on:click="hideModal">Abbrechen</a>
+          <a
+            class="button"
+            @click="hideModal">Abbrechen</a>
         </slot>
       </div>
     </div>
diff --git a/client/src/components/ModalInput.vue b/client/src/components/ModalInput.vue
index 811ff88c..80c3423b 100644
--- a/client/src/components/ModalInput.vue
+++ b/client/src/components/ModalInput.vue
@@ -1,11 +1,14 @@
 <template>
   <div class="modal-input">
-    <input :placeholder="placeholder"
-           class="modal-input__inputfield skillbox-input"
-           :class="{'skillbox-input--error': error}"
-           :value="value"
-           v-on:input="$emit('input', $event.target.value)">
-    <div class="modal-input__error" v-if="error">
+    <input
+      :placeholder="placeholder"
+      :class="{'skillbox-input--error': error}"
+      :value="value"
+      class="modal-input__inputfield skillbox-input"
+      @input="$emit('input', $event.target.value)">
+    <div
+      class="modal-input__error"
+      v-if="error">
       Für Inhaltsblöcke muss zwingend ein Titel erfasst werden.
     </div>
   </div>
diff --git a/client/src/components/MoreOptionsWidget.vue b/client/src/components/MoreOptionsWidget.vue
index 9fcb68d2..b2d31125 100644
--- a/client/src/components/MoreOptionsWidget.vue
+++ b/client/src/components/MoreOptionsWidget.vue
@@ -1,12 +1,15 @@
 <template>
   <div class="more-options">
-    <a @click="showMenu = !showMenu" class="more-options__more-link">
-      <ellipses class="more-options__ellipses"></ellipses>
+    <a
+      class="more-options__more-link"
+      @click="showMenu = !showMenu">
+      <ellipses class="more-options__ellipses"/>
     </a>
-    <widget-popover @hide-me="showMenu = false"
-                    class="more-options__popover"
-                    v-if="showMenu">
-      <slot></slot>
+    <widget-popover
+      class="more-options__popover"
+      v-if="showMenu"
+      @hide-me="showMenu = false">
+      <slot/>
     </widget-popover>
   </div>
 </template>
diff --git a/client/src/components/NewsTeaser.vue b/client/src/components/NewsTeaser.vue
index 91584b25..7ae241e6 100644
--- a/client/src/components/NewsTeaser.vue
+++ b/client/src/components/NewsTeaser.vue
@@ -1,10 +1,16 @@
 <template>
   <div class="news-teaser">
     <h4 class="small-emph">
-      <a :href="url" target="_blank" class="teaser__title">{{title}}</a>
+      <a
+        :href="url"
+        target="_blank"
+        class="teaser__title">{{ title }}</a>
     </h4>
-    <a :href="url" target="_blank" class="teaser__date">
-      {{date}}
+    <a
+      :href="url"
+      target="_blank"
+      class="teaser__date">
+      {{ date }}
     </a>
   </div>
 </template>
diff --git a/client/src/components/Radiobutton.vue b/client/src/components/Radiobutton.vue
index 391d1f5b..3516cfa1 100644
--- a/client/src/components/Radiobutton.vue
+++ b/client/src/components/Radiobutton.vue
@@ -1,10 +1,11 @@
 <template>
-  <base-input :label="label"
-              :checked="checked"
-              :item="item"
-              v-on:input="passOn"
-              :type="'radiobutton'"
-  ></base-input>
+  <base-input
+    :label="label"
+    :checked="checked"
+    :item="item"
+    :type="'radiobutton'"
+    @input="passOn"
+  />
 </template>
 
 <script>
diff --git a/client/src/components/SectionBlock.vue b/client/src/components/SectionBlock.vue
index 34d72822..6b6c4ca3 100644
--- a/client/src/components/SectionBlock.vue
+++ b/client/src/components/SectionBlock.vue
@@ -1,20 +1,31 @@
 <template>
   <div class="section-block">
-    <div class="section-block__illustration" @click="navigate()" :class="{'section-block--navigatable': route}">
-      <slot></slot>
+    <div
+      :class="{'section-block--navigatable': route}"
+      class="section-block__illustration"
+      @click="navigate()">
+      <slot/>
     </div>
 
-    <div class="section-block__title block-title" @click="navigate()" :class="{'section-block--navigatable': route}">
-      <h2 class="block-title__title">{{title}}</h2>
-      <h3 class="block-title__subtitle small-emph">{{subtitle}}</h3>
+    <div
+      :class="{'section-block--navigatable': route}"
+      class="section-block__title block-title"
+      @click="navigate()">
+      <h2 class="block-title__title">{{ title }}</h2>
+      <h3 class="block-title__subtitle small-emph">{{ subtitle }}</h3>
     </div>
     <div class="section-block__content section-content">
       <div class="section-content__subsection subsection">
-        <a class="subsection__content button button--primary" v-if="route" @click="navigate()"
-           :class="{'section-block--navigatable': route}">
-          {{linkText}}
+        <a
+          :class="{'section-block--navigatable': route}"
+          class="subsection__content button button--primary"
+          v-if="route"
+          @click="navigate()">
+          {{ linkText }}
         </a>
-        <span class="subsection__content subsection__content--disabled" v-if="!route">Noch nicht verfügbar</span>
+        <span
+          class="subsection__content subsection__content--disabled"
+          v-if="!route">Noch nicht verfügbar</span>
       </div>
     </div>
   </div>
diff --git a/client/src/components/SimpleFileUpload.vue b/client/src/components/SimpleFileUpload.vue
index cfb319e6..911781f4 100644
--- a/client/src/components/SimpleFileUpload.vue
+++ b/client/src/components/SimpleFileUpload.vue
@@ -1,9 +1,17 @@
 <template>
   <div class="simple-file-upload">
-    <a class="simple-file-upload__link" @click="clickUploadCare" v-if="!value">
-      <document-icon class="simple-file-upload__icon"></document-icon>
+    <a
+      class="simple-file-upload__link"
+      v-if="!value"
+      @click="clickUploadCare">
+      <document-icon class="simple-file-upload__icon"/>
     </a>
-    <input type="hidden" ref="uploadcare-filedialog" role="uploadcare-uploader" name="file-upload" data-system-dialog/>
+    <input
+      type="hidden"
+      role="uploadcare-uploader"
+      name="file-upload"
+      data-system-dialog
+      ref="uploadcare-filedialog">
   </div>
 </template>
 
@@ -19,14 +27,6 @@
       DocumentIcon
     },
 
-    methods: {
-      clickUploadCare() {
-        // workaround for styling the uploadcare widget
-        let button = this.$el.querySelector('.uploadcare--widget__button');
-        button.click();
-      }
-    },
-
     mounted() {
       let widget = uploadcareWidget.Widget('[role=uploadcare-uploader]');
 
@@ -36,7 +36,15 @@
           this.$emit('link-change-url', urlWithFilename);
         });
       });
-    }
+    },
+
+    methods: {
+      clickUploadCare() {
+        // workaround for styling the uploadcare widget
+        let button = this.$el.querySelector('.uploadcare--widget__button');
+        button.click();
+      }
+    },
   }
 </script>
 
diff --git a/client/src/components/StudentSubmission.vue b/client/src/components/StudentSubmission.vue
index 48f24b08..f62e33da 100644
--- a/client/src/components/StudentSubmission.vue
+++ b/client/src/components/StudentSubmission.vue
@@ -1,16 +1,24 @@
 <template>
   <div class="student-submission student-submission-row">
     <div class="student-submission__student-name">
-      {{name}}
+      {{ name }}
     </div>
     <div class="student-submission__entry entry">
-      <p>{{submission.text | trimToLength(50)}}</p>
-      <p v-if="submission.document && submission.document.length > 0" class="entry__document">
-          <student-submission-document :document="submission.document" class="entry-document"></student-submission-document>
+      <p>{{ submission.text | trimToLength(50) }}</p>
+      <p
+        class="entry__document"
+        v-if="submission.document && submission.document.length > 0">
+        <student-submission-document
+          :document="submission.document"
+          class="entry-document"/>
       </p>
     </div>
-    <div class="student-submission__feedback entry" v-if="submission.submissionFeedback">
-      <p class="entry__text" :class="{'entry__text--final': submission.submissionFeedback.final}">{{submission.submissionFeedback.text | trimToLength(50)}}</p>
+    <div
+      class="student-submission__feedback entry"
+      v-if="submission.submissionFeedback">
+      <p
+        :class="{'entry__text--final': submission.submissionFeedback.final}"
+        class="entry__text">{{ submission.submissionFeedback.text | trimToLength(50) }}</p>
     </div>
   </div>
 </template>
@@ -23,13 +31,6 @@
     components: {
       StudentSubmissionDocument
     },
-
-    computed: {
-      name() {
-        return this.submission && this.submission.student
-          ? `${this.submission.student.firstName} ${this.submission.student.lastName}` : '';
-      },
-    },
     filters: {
       trimToLength: function(text, numberOfChars) {
         if (!text) {
@@ -44,7 +45,14 @@
         }
         return `${text.substring(0, index)}…`;
       }
-    }
+    },
+
+    computed: {
+      name() {
+        return this.submission && this.submission.student
+          ? `${this.submission.student.firstName} ${this.submission.student.lastName}` : '';
+      },
+    },
   }
 </script>
 
diff --git a/client/src/components/StudentSubmissionDocument.vue b/client/src/components/StudentSubmissionDocument.vue
index 03369967..1e7a2d19 100644
--- a/client/src/components/StudentSubmissionDocument.vue
+++ b/client/src/components/StudentSubmissionDocument.vue
@@ -1,8 +1,10 @@
 <template>
   <div class="submission-document">
-      <p v-if="document && document.length > 0" class="submission-document__content content">
-          <document-icon class="content__icon"></document-icon><span class="content__text">{{filename}}</span>
-      </p>
+    <p
+      class="submission-document__content content"
+      v-if="document && document.length > 0">
+      <document-icon class="content__icon"/><span class="content__text">{{ filename }}</span>
+    </p>
   </div>
 </template>
 
@@ -12,8 +14,8 @@
   import filenameFromUrl from '@/helpers/urls';
 
   export default {
+    name: 'StudentSubmissionDocument',
     props: ['document'],
-    name: 'student-submission-document',
     components: { DocumentIcon },
 
     computed: {
diff --git a/client/src/components/UserMetaWidget.vue b/client/src/components/UserMetaWidget.vue
index 65df569d..102aa146 100644
--- a/client/src/components/UserMetaWidget.vue
+++ b/client/src/components/UserMetaWidget.vue
@@ -1,11 +1,13 @@
 <template>
-    <div class="user-widget">
-      <div class="user-widget__avatar">
-        <avatar :avatar-url="avatarUrl" />
-      </div>
-      <span class="user-widget__name">{{firstName}} {{lastName}}</span>
-      <span class="user-widget__date" v-if="date">{{date}}</span>
+  <div class="user-widget">
+    <div class="user-widget__avatar">
+      <avatar :avatar-url="avatarUrl" />
     </div>
+    <span class="user-widget__name">{{ firstName }} {{ lastName }}</span>
+    <span
+      class="user-widget__date"
+      v-if="date">{{ date }}</span>
+  </div>
 </template>
 
 <script>
diff --git a/client/src/components/UserWidget.vue b/client/src/components/UserWidget.vue
index 5c6109b5..157763ef 100644
--- a/client/src/components/UserWidget.vue
+++ b/client/src/components/UserWidget.vue
@@ -1,7 +1,14 @@
 <template>
-  <div class="user-widget" :class="{'user-widget--is-profile': isProfile}">
-    <div class="user-widget__avatar" data-cy="user-widget-avatar" @click="openSidebar()">
-      <avatar :avatar-url="avatarUrl" :icon-highlighted="isProfile"/>
+  <div
+    :class="{'user-widget--is-profile': isProfile}"
+    class="user-widget">
+    <div
+      class="user-widget__avatar"
+      data-cy="user-widget-avatar"
+      @click="openSidebar()">
+      <avatar
+        :avatar-url="avatarUrl"
+        :icon-highlighted="isProfile"/>
     </div>
   </div>
 </template>
diff --git a/client/src/components/WidgetFooter.vue b/client/src/components/WidgetFooter.vue
index 5a454d0a..d94e7362 100644
--- a/client/src/components/WidgetFooter.vue
+++ b/client/src/components/WidgetFooter.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="widget-footer">
-    <slot></slot>
+    <slot/>
   </div>
 </template>
 
diff --git a/client/src/components/WidgetPopover.vue b/client/src/components/WidgetPopover.vue
index 42f50974..40d3a729 100644
--- a/client/src/components/WidgetPopover.vue
+++ b/client/src/components/WidgetPopover.vue
@@ -1,7 +1,10 @@
 <template>
-  <div class="widget-popover" v-click-outside="hidePopover" :class="{'widget-popover--mobile': mobile}">
+  <div
+    v-click-outside="hidePopover"
+    :class="{'widget-popover--mobile': mobile}"
+    class="widget-popover">
     <ul class="widget-popover__links popover-links">
-        <slot></slot>
+      <slot/>
     </ul>
   </div>
 </template>
diff --git a/client/src/components/book-navigation/BookNavigation.vue b/client/src/components/book-navigation/BookNavigation.vue
index 3d054695..37ce60dc 100644
--- a/client/src/components/book-navigation/BookNavigation.vue
+++ b/client/src/components/book-navigation/BookNavigation.vue
@@ -1,10 +1,13 @@
 <template>
   <aside class="sub-navigation">
     <sub-navigation-item title="Themen">
-      <book-topic-navigation></book-topic-navigation>
+      <book-topic-navigation/>
     </sub-navigation-item>
-    <router-link :to="{name: 'instrument-overview'}" activeClass="sub-navigation-item--active" class="sub-navigation-item">
-      <span  class="sub-navigation-item__title">Instrumente</span>
+    <router-link
+      :to="{name: 'instrument-overview'}"
+      active-class="sub-navigation-item--active"
+      class="sub-navigation-item">
+      <span class="sub-navigation-item__title">Instrumente</span>
     </router-link>
 
     <!--<sub-navigation-item title="News">-->
diff --git a/client/src/components/book-navigation/BookTopicNavigation.vue b/client/src/components/book-navigation/BookTopicNavigation.vue
index 83671191..10bc5cb1 100644
--- a/client/src/components/book-navigation/BookTopicNavigation.vue
+++ b/client/src/components/book-navigation/BookTopicNavigation.vue
@@ -1,14 +1,15 @@
 <template>
   <nav class="book-topics">
-    <router-link :to="{name: 'topic', params: {topicSlug: topic.slug}}"
-                 @click.native="hideMobileNavigation"
-                 tag="div"
-                 class="book-topics__topic book-subnavigation__item"
-                 :class="{'book-topics__topic--active': topic.active, 'book-subnavigation__item--mobile': mobile}"
-                 v-for="topic in topics"
-                 :key="topic.id">
-      {{topic.order}}.
-      {{topic.title}}
+    <router-link
+      :to="{name: 'topic', params: {topicSlug: topic.slug}}"
+      :class="{'book-topics__topic--active': topic.active, 'book-subnavigation__item--mobile': mobile}"
+      :key="topic.id"
+      tag="div"
+      class="book-topics__topic book-subnavigation__item"
+      v-for="topic in topics"
+      @click.native="hideMobileNavigation">
+      {{ topic.order }}.
+      {{ topic.title }}
     </router-link>
   </nav>
 </template>
diff --git a/client/src/components/book-navigation/ContentNavigation.vue b/client/src/components/book-navigation/ContentNavigation.vue
index 28ccf46e..7a46c226 100644
--- a/client/src/components/book-navigation/ContentNavigation.vue
+++ b/client/src/components/book-navigation/ContentNavigation.vue
@@ -1,25 +1,35 @@
 <template>
-  <nav class="top-navigation" :class="{'top-navigation--mobile': mobile}">
+  <nav
+    :class="{'top-navigation--mobile': mobile}"
+    class="top-navigation">
     <div class="top-navigation__item">
-      <router-link to="/book/topic/berufliche-grundbildung" active-class="top-navigation__link--active"
-                   :class="{'top-navigation__link--active': isActive('book')}"
-                   @click.native="hideMobileNavigation"
-                   class="top-navigation__link">Inhalte
+      <router-link
+        :class="{'top-navigation__link--active': isActive('book')}"
+        to="/book/topic/berufliche-grundbildung"
+        active-class="top-navigation__link--active"
+        class="top-navigation__link"
+        @click.native="hideMobileNavigation">Inhalte
       </router-link>
 
-      <mobile-subnavigation v-if="mobile"></mobile-subnavigation>
+      <mobile-subnavigation v-if="mobile"/>
 
     </div>
 
     <div class="top-navigation__item">
-      <router-link to="/rooms" active-class="top-navigation__link--active" @click.native="hideMobileNavigation"
-                   class="top-navigation__link">Räume
+      <router-link
+        to="/rooms"
+        active-class="top-navigation__link--active"
+        class="top-navigation__link"
+        @click.native="hideMobileNavigation">Räume
       </router-link>
     </div>
 
     <div class="top-navigation__item">
-      <router-link to="/portfolio" active-class="top-navigation__link--active" @click.native="hideMobileNavigation"
-                   class="top-navigation__link">Portfolio
+      <router-link
+        to="/portfolio"
+        active-class="top-navigation__link--active"
+        class="top-navigation__link"
+        @click.native="hideMobileNavigation">Portfolio
       </router-link>
     </div>
 
diff --git a/client/src/components/book-navigation/MobileNavigation.vue b/client/src/components/book-navigation/MobileNavigation.vue
index 245739a0..b5e20715 100644
--- a/client/src/components/book-navigation/MobileNavigation.vue
+++ b/client/src/components/book-navigation/MobileNavigation.vue
@@ -1,8 +1,12 @@
 <template>
   <div class="mobile-navigation">
-    <content-navigation class="mobile-navigation__main" :mobile="true"></content-navigation>
-    <div class="mobile-navigation__close-button" @click="hideMobileNavigation">
-      <cross class="mobile-navigation__close-icon"></cross>
+    <content-navigation
+      :mobile="true"
+      class="mobile-navigation__main"/>
+    <div
+      class="mobile-navigation__close-button"
+      @click="hideMobileNavigation">
+      <cross class="mobile-navigation__close-icon"/>
     </div>
   </div>
 </template>
@@ -19,6 +23,12 @@
       Cross
     },
 
+    data() {
+      return {
+        me: {}
+      }
+    },
+
     methods: {
       hideMobileNavigation() {
         this.$store.dispatch('showMobileNavigation', false);
@@ -28,12 +38,6 @@
     apollo: {
       me: meQuery
     },
-
-    data() {
-      return {
-        me: {}
-      }
-    }
   }
 </script>
 
diff --git a/client/src/components/book-navigation/MobileSubnavigation.vue b/client/src/components/book-navigation/MobileSubnavigation.vue
index b865c392..be1e87c7 100644
--- a/client/src/components/book-navigation/MobileSubnavigation.vue
+++ b/client/src/components/book-navigation/MobileSubnavigation.vue
@@ -2,11 +2,13 @@
   <div class="mobile-subnavigation">
     <div class="mobile-subnavigation__section">
       <h3 class="mobile-subnavigation__title">Themen</h3>
-      <book-topic-navigation :mobile="true"></book-topic-navigation>
+      <book-topic-navigation :mobile="true"/>
     </div>
 
     <div class="mobile-subnavigation__section">
-      <router-link :to="{name: 'instrument-overview'}" class="sub-navigation-item book-subnavigation">
+      <router-link
+        :to="{name: 'instrument-overview'}"
+        class="sub-navigation-item book-subnavigation">
         <span class="sub-navigation-item__title book-subnavigation__item--mobile book-subnavigation__item">
           Instrumente
         </span>
diff --git a/client/src/components/book-navigation/SubNavigationItem.vue b/client/src/components/book-navigation/SubNavigationItem.vue
index 78a70eb4..6ed73d32 100644
--- a/client/src/components/book-navigation/SubNavigationItem.vue
+++ b/client/src/components/book-navigation/SubNavigationItem.vue
@@ -1,12 +1,19 @@
 <template>
-  <div class="sub-navigation-item" :class="{ 'sub-navigation-item--active': show}" v-click-outside="close">
-    <div class="sub-navigation-item__title" @click="show = !show">
-      {{title}}
-      <chevron-down class="sub-navigation-item__icon sub-navigation-item__chevron-down"></chevron-down>
-      <chevron-up class="sub-navigation-item__icon sub-navigation-item__chevron-up"></chevron-up>
+  <div
+    :class="{ 'sub-navigation-item--active': show}"
+    v-click-outside="close"
+    class="sub-navigation-item">
+    <div
+      class="sub-navigation-item__title"
+      @click="show = !show">
+      {{ title }}
+      <chevron-down class="sub-navigation-item__icon sub-navigation-item__chevron-down"/>
+      <chevron-up class="sub-navigation-item__icon sub-navigation-item__chevron-up"/>
     </div>
-    <div class="sub-navigation-item__nav-items book-subnavigation" v-if="show">
-      <slot></slot>
+    <div
+      class="sub-navigation-item__nav-items book-subnavigation"
+      v-if="show">
+      <slot/>
     </div>
   </div>
 </template>
diff --git a/client/src/components/content-block-form/ContentsForm.vue b/client/src/components/content-block-form/ContentsForm.vue
index 4df224d3..cce21b0a 100644
--- a/client/src/components/content-block-form/ContentsForm.vue
+++ b/client/src/components/content-block-form/ContentsForm.vue
@@ -1,65 +1,80 @@
 <template>
   <modal>
     <template slot="header">
-      <modal-input v-on:input="updateTitle"
-                   :placeholder="titlePlaceholder"
-                   :value="localContentBlock.title"
-                   :error="error"
-                   data-cy="modal-title-input"
-      ></modal-input>
-      <checkbox v-if="taskSelection"
-                :checked="localContentBlock.isAssignment"
-                :item="localContentBlock"
-                :label="'Auftrag'"
-                @input="setContentBlockType"
-                class="contents-form__task"
-      ></checkbox>
+      <modal-input
+        :placeholder="titlePlaceholder"
+        :value="localContentBlock.title"
+        :error="error"
+        data-cy="modal-title-input"
+        @input="updateTitle"
+      />
+      <checkbox
+        :checked="localContentBlock.isAssignment"
+        :item="localContentBlock"
+        :label="'Auftrag'"
+        class="contents-form__task"
+        v-if="taskSelection"
+        @input="setContentBlockType"
+      />
     </template>
 
-    <add-content-element class="contents-form__add"
-                         v-on:add-element="addElement"
-                         :index="-1"
-    ></add-content-element>
-    <div v-for="(element, index) in localContentBlock.contents" :key="index" class="contents-form__element">
+    <add-content-element
+      :index="-1"
+      class="contents-form__add"
+      @add-element="addElement"
+    />
+    <div
+      :key="index"
+      class="contents-form__element"
+      v-for="(element, index) in localContentBlock.contents">
       <component
-        class="contents-form__element-component"
         :is="type(element)"
         :class="{'contents-form__chooser': type(element) === 'content-block-element-chooser-widget'}"
-        v-bind="element" :index="index"
-        v-on:change-type="changeType"
+        v-bind="element"
+        :index="index"
+        class="contents-form__element-component"
+        @change-type="changeType"
 
-        v-on:link-change-url="changeLinkUrl"
-        v-on:link-change-text="changeLinkText"
+        @link-change-url="changeLinkUrl"
+        @link-change-text="changeLinkText"
 
-        v-on:text-change-value="changeTextValue"
+        @text-change-value="changeTextValue"
 
-        v-on:document-change-url="changeDocumentUrl"
+        @document-change-url="changeDocumentUrl"
 
-        v-on:image-change-url="changeImageUrl"
+        @image-change-url="changeImageUrl"
 
-        v-on:video-change-url="changeVideoUrl"
+        @video-change-url="changeVideoUrl"
 
         @switch-to-document="switchToDocument"
 
-        v-on:assignment-change-title="changeAssignmentTitle"
-        v-on:assignment-change-assignment="changeAssignmentAssignment"
-      >
-      </component>
-      <a class="contents-form__remove icon-button" @click="removeElement(index)">
-        <trash-icon v-if="type(element) !== 'content-block-element-chooser-widget'"
-                    class="contents-form__trash-icon icon-button__icon"></trash-icon>
+        @assignment-change-title="changeAssignmentTitle"
+        @assignment-change-assignment="changeAssignmentAssignment"
+      />
+      <a
+        class="contents-form__remove icon-button"
+        @click="removeElement(index)">
+        <trash-icon
+          class="contents-form__trash-icon icon-button__icon"
+          v-if="type(element) !== 'content-block-element-chooser-widget'"/>
       </a>
 
-      <add-content-element class="contents-form__add"
-                           v-on:add-element="addElement"
-                           :index="index"
-      ></add-content-element>
+      <add-content-element
+        :index="index"
+        class="contents-form__add"
+        @add-element="addElement"
+      />
     </div>
 
     <div slot="footer">
-      <a class="button button--primary" data-cy="modal-save-button" :class="{'button--disabled': disableSave}"
-         v-on:click="save">Speichern</a>
-      <a class="button" v-on:click="$emit('hide')">Abbrechen</a>
+      <a
+        :class="{'button--disabled': disableSave}"
+        class="button button--primary"
+        data-cy="modal-save-button"
+        @click="save">Speichern</a>
+      <a
+        class="button"
+        @click="$emit('hide')">Abbrechen</a>
     </div>
   </modal>
 </template>
diff --git a/client/src/components/content-block-form/EditContentBlockWizard.vue b/client/src/components/content-block-form/EditContentBlockWizard.vue
index ebf81408..c96fbf1f 100644
--- a/client/src/components/content-block-form/EditContentBlockWizard.vue
+++ b/client/src/components/content-block-form/EditContentBlockWizard.vue
@@ -4,7 +4,7 @@
     :show-task-selection="true"
     @save="saveContentBlock"
     @hide="hideModal"
-  ></contents-form>
+  />
 </template>
 
 <script>
@@ -22,6 +22,16 @@
       ContentsForm
     },
 
+    data() {
+      return {
+        contentBlock: {}
+      }
+    },
+
+    created() {
+      // debugger;
+    },
+
     methods: {
       hideModal() {
         this.$store.dispatch('resetCurrentNoteBlock');
@@ -52,16 +62,6 @@
       }
     },
 
-    created() {
-      // debugger;
-    },
-
-    data() {
-      return {
-        contentBlock: {}
-      }
-    },
-
     apollo: {
       contentBlock() {
         return {
diff --git a/client/src/components/content-block-form/NewContentBlockWizard.vue b/client/src/components/content-block-form/NewContentBlockWizard.vue
index 9a37aa8d..c99409b3 100644
--- a/client/src/components/content-block-form/NewContentBlockWizard.vue
+++ b/client/src/components/content-block-form/NewContentBlockWizard.vue
@@ -2,10 +2,10 @@
   <contents-form
     :content-block="contentBlock"
     :show-task-selection="true"
+    :disable-save="saving"
     @save="saveContentBlock"
     @hide="hideModal"
-    :disable-save="saving"
-  ></contents-form>
+  />
 </template>
 
 <script>
@@ -20,6 +20,18 @@
       ContentsForm
     },
 
+    data() {
+      return {
+        contentBlock: {
+          title: '',
+          contents: [
+            {}
+          ]
+        },
+        saving: false
+      }
+    },
+
     methods: {
       hideModal() {
         this.$store.dispatch('resetContentBlockPosition');
@@ -52,17 +64,5 @@
         });
       }
     },
-
-    data() {
-      return {
-        contentBlock: {
-          title: '',
-          contents: [
-            {}
-          ]
-        },
-        saving: false
-      }
-    }
   }
 </script>
diff --git a/client/src/components/content-blocks/ContentComponent.vue b/client/src/components/content-blocks/ContentComponent.vue
index 1ab9f46f..abb4c7bc 100644
--- a/client/src/components/content-blocks/ContentComponent.vue
+++ b/client/src/components/content-blocks/ContentComponent.vue
@@ -1,20 +1,20 @@
 <template>
-  <div class="content-component"
-       :class="{'content-component--bookmarked': bookmarked}"
-       :data-scrollto="component.id">
+  <div
+    :class="{'content-component--bookmarked': bookmarked}"
+    :data-scrollto="component.id"
+    class="content-component">
     <bookmark-actions
+      :bookmarked="bookmarked"
+      :note="note"
       v-if="showBookmarkActions"
       @add-note="addNote(component.id)"
       @edit-note="editNote"
-      @bookmark="bookmarkContent(component.id, !bookmarked)"
-      :bookmarked="bookmarked"
-      :note="note"></bookmark-actions>
+      @bookmark="bookmarkContent(component.id, !bookmarked)"/>
     <component
       :is="component.type"
       v-bind="component"
       :parent="parent"
-    >
-    </component>
+    />
   </div>
 </template>
 
diff --git a/client/src/components/content-blocks/ContentListBlock.vue b/client/src/components/content-blocks/ContentListBlock.vue
index c1af491e..6b5dd388 100644
--- a/client/src/components/content-blocks/ContentListBlock.vue
+++ b/client/src/components/content-blocks/ContentListBlock.vue
@@ -2,14 +2,15 @@
   <div class="content-list-block__container">
     <div class="content-list-wrapper">
       <ol class="content-list">
-        <li class="content-list__item contentlist-item"
-            :key="contentBlock.id"
-            v-for="(contentBlock, index) in contentBlocks">
-          <p class="content-list__numbering">{{alphaIndex(index)}})</p>
+        <li
+          :key="contentBlock.id"
+          class="content-list__item contentlist-item"
+          v-for="(contentBlock, index) in contentBlocks">
+          <p class="content-list__numbering">{{ alphaIndex(index) }})</p>
           <content-block
-            :contentBlock="contentBlock"
+            :content-block="contentBlock"
             :parent="parent"
-          ></content-block>
+          />
         </li>
       </ol>
     </div>
@@ -22,20 +23,14 @@
   const lowerAsciiA = 97;
 
   export default {
+    name: 'ContentBlockList',
     props: ['contents', 'parent', 'startingIndex'],
-    name: 'content-block-list',
 
     components: {
       // https://vuejs.org/v2/guide/components-edge-cases.html#Circular-References-Between-Components
       ContentBlock: () => import('@/components/ContentBlock')
     },
 
-    methods: {
-      alphaIndex(index) {
-        return String.fromCharCode(lowerAsciiA + this.startingIndex + index);
-      }
-    },
-
     computed: {
       contentBlocks() {
         return this.contents.map(contentBlock => {
@@ -48,7 +43,13 @@
           })
         });
       }
-    }
+    },
+
+    methods: {
+      alphaIndex(index) {
+        return String.fromCharCode(lowerAsciiA + this.startingIndex + index);
+      }
+    },
 }
 </script>
 
diff --git a/client/src/components/content-blocks/DocumentBlock.vue b/client/src/components/content-blocks/DocumentBlock.vue
index 5948fa6f..f5230c06 100644
--- a/client/src/components/content-blocks/DocumentBlock.vue
+++ b/client/src/components/content-blocks/DocumentBlock.vue
@@ -1,9 +1,15 @@
 <template>
   <div class="document-block">
-    <document-icon class="document-block__icon"></document-icon>
-    <a :href="value.url" class="document-block__link" target="_blank">{{urlName}}</a>
-    <a v-if="showTrashIcon" class="document-block__remove" v-on:click="$emit('trash')">
-      <trash-icon class="document-block__trash-icon"></trash-icon>
+    <document-icon class="document-block__icon"/>
+    <a
+      :href="value.url"
+      class="document-block__link"
+      target="_blank">{{ urlName }}</a>
+    <a
+      class="document-block__remove"
+      v-if="showTrashIcon"
+      @click="$emit('trash')">
+      <trash-icon class="document-block__trash-icon"/>
     </a>
   </div>
 </template>
diff --git a/client/src/components/content-blocks/GeniallyBlock.vue b/client/src/components/content-blocks/GeniallyBlock.vue
index 5f375168..4559428d 100644
--- a/client/src/components/content-blocks/GeniallyBlock.vue
+++ b/client/src/components/content-blocks/GeniallyBlock.vue
@@ -1,16 +1,17 @@
 <template>
   <div class="genially-block">
     <div class="genially-block__wrapper">
-      <iframe class="genially-block__iframe"
-              frameborder="0"
-              width="800px"
-              height="600px"
-              :src="src"
-              type="text/html"
-              allowscriptaccess="always"
-              allowfullscreen="true"
-              scrolling="yes"
-              allownetworking="all"></iframe>
+      <iframe
+        :src="src"
+        class="genially-block__iframe"
+        frameborder="0"
+        width="800px"
+        height="600px"
+        type="text/html"
+        allowscriptaccess="always"
+        allowfullscreen="true"
+        scrolling="yes"
+        allownetworking="all"/>
     </div>
   </div>
 </template>
diff --git a/client/src/components/content-blocks/ImageBlock.vue b/client/src/components/content-blocks/ImageBlock.vue
index 748bf460..e327cc4f 100644
--- a/client/src/components/content-blocks/ImageBlock.vue
+++ b/client/src/components/content-blocks/ImageBlock.vue
@@ -1,5 +1,9 @@
 <template>
-  <img :src="value.path" alt="" class="image-block" @click="openFullscreen">
+  <img
+    :src="value.path"
+    alt=""
+    class="image-block"
+    @click="openFullscreen">
 </template>
 
 <script>
diff --git a/client/src/components/content-blocks/ImageUrlBlock.vue b/client/src/components/content-blocks/ImageUrlBlock.vue
index 3ae98bf5..a35664ec 100644
--- a/client/src/components/content-blocks/ImageUrlBlock.vue
+++ b/client/src/components/content-blocks/ImageUrlBlock.vue
@@ -1,5 +1,9 @@
 <template>
-  <img :src="value.url" alt="" class="image-block" @click="openFullscreen">
+  <img
+    :src="value.url"
+    alt=""
+    class="image-block"
+    @click="openFullscreen">
 </template>
 
 <script>
diff --git a/client/src/components/content-blocks/InfogramBlock.vue b/client/src/components/content-blocks/InfogramBlock.vue
index 4598825f..4bb5d68a 100644
--- a/client/src/components/content-blocks/InfogramBlock.vue
+++ b/client/src/components/content-blocks/InfogramBlock.vue
@@ -1,8 +1,13 @@
 <template>
   <div class="infogram-block">
-    <iframe class="infogram-block__iframe" :src="src"
-            :title="title"
-            :height="height" scrolling="no" frameborder="0" style="border:none;"></iframe>
+    <iframe
+      :src="src"
+      :title="title"
+      :height="height"
+      class="infogram-block__iframe"
+      scrolling="no"
+      frameborder="0"
+      style="border:none;"/>
   </div>
 </template>
 
@@ -10,6 +15,27 @@
   export default {
     props: ['value'],
 
+    data() {
+      return {
+        height: 0
+      }
+    },
+
+    computed: {
+      src() {
+        return `https://e.infogram.com/${this.id}?src=embed`;
+      },
+      href() {
+        return `https://infogram.com/${this.id}`
+      },
+      id() {
+        return this.value.id;
+      },
+      title() {
+        return this.value.title || 'Infografik'
+      }
+    },
+
     mounted() {
       // from https://developers.infogr.am/oembed/
       window.addEventListener('message', event => {
@@ -32,27 +58,6 @@
         });
       }
     },
-
-    computed: {
-      src() {
-        return `https://e.infogram.com/${this.id}?src=embed`;
-      },
-      href() {
-        return `https://infogram.com/${this.id}`
-      },
-      id() {
-        return this.value.id;
-      },
-      title() {
-        return this.value.title || 'Infografik'
-      }
-    },
-
-    data() {
-      return {
-        height: 0
-      }
-    }
   }
 </script>
 
diff --git a/client/src/components/content-blocks/Instruction.vue b/client/src/components/content-blocks/Instruction.vue
index fc1be675..21df5448 100644
--- a/client/src/components/content-blocks/Instruction.vue
+++ b/client/src/components/content-blocks/Instruction.vue
@@ -1,7 +1,11 @@
 <template>
-  <div class="instruction" v-if="me.isTeacher">
-    <bulb-icon class="instruction__icon"></bulb-icon>
-    <a class="instruction__link" :href="value.url">{{text}}</a>
+  <div
+    class="instruction"
+    v-if="me.isTeacher">
+    <bulb-icon class="instruction__icon"/>
+    <a
+      :href="value.url"
+      class="instruction__link">{{ text }}</a>
   </div>
 </template>
 
diff --git a/client/src/components/content-blocks/InstrumentWidget.vue b/client/src/components/content-blocks/InstrumentWidget.vue
index 38d0ade8..c86bbbd8 100644
--- a/client/src/components/content-blocks/InstrumentWidget.vue
+++ b/client/src/components/content-blocks/InstrumentWidget.vue
@@ -1,8 +1,12 @@
 <template>
   <div class="instrument-widget">
-    <div class="instrument-widget__description" v-html="value.description"></div>
-    <router-link class="instrument-widget__button button" tag="button"
-                 :to="{name: 'instrument', params: { slug: value.slug }}">Instrument anzeigen
+    <div
+      class="instrument-widget__description"
+      v-html="value.description"/>
+    <router-link
+      :to="{name: 'instrument', params: { slug: value.slug }}"
+      class="instrument-widget__button button"
+      tag="button">Instrument anzeigen
     </router-link>
   </div>
 </template>
diff --git a/client/src/components/content-blocks/LinkBlock.vue b/client/src/components/content-blocks/LinkBlock.vue
index e36655a7..fb02f815 100644
--- a/client/src/components/content-blocks/LinkBlock.vue
+++ b/client/src/components/content-blocks/LinkBlock.vue
@@ -1,7 +1,12 @@
 <template>
-  <div class="link-block" :class="{ 'link-block--no-margin': noMargin}">
-    <link-icon class="link-block__icon"></link-icon>
-    <a :href="href" class="link-block__link" target="_blank">{{value.text}}</a>
+  <div
+    :class="{ 'link-block--no-margin': noMargin}"
+    class="link-block">
+    <link-icon class="link-block__icon"/>
+    <a
+      :href="href"
+      class="link-block__link"
+      target="_blank">{{ value.text }}</a>
   </div>
 </template>
 
diff --git a/client/src/components/content-blocks/ModuleRoomSlug.vue b/client/src/components/content-blocks/ModuleRoomSlug.vue
index b5f2f686..579735b1 100644
--- a/client/src/components/content-blocks/ModuleRoomSlug.vue
+++ b/client/src/components/content-blocks/ModuleRoomSlug.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="module-slug">
-    <router-link class="button button--primary" :to="{name: 'moduleRoom', params: { slug: value.slug }}">Raum anzeigen
+    <router-link
+      :to="{name: 'moduleRoom', params: { slug: value.slug }}"
+      class="button button--primary">Raum anzeigen
     </router-link>
   </div>
 </template>
diff --git a/client/src/components/content-blocks/SectionTitleBlock.vue b/client/src/components/content-blocks/SectionTitleBlock.vue
index 3578ec0e..2ec4f58c 100644
--- a/client/src/components/content-blocks/SectionTitleBlock.vue
+++ b/client/src/components/content-blocks/SectionTitleBlock.vue
@@ -1,5 +1,7 @@
 <template>
-  <h4 class="section-title" v-html="value.text"></h4>
+  <h4
+    class="section-title"
+    v-html="value.text"/>
 </template>
 
 <script>
diff --git a/client/src/components/content-blocks/Solution.vue b/client/src/components/content-blocks/Solution.vue
index 1c54315f..69b5ad6e 100644
--- a/client/src/components/content-blocks/Solution.vue
+++ b/client/src/components/content-blocks/Solution.vue
@@ -1,12 +1,20 @@
 <template>
-  <div class="solution" data-cy="solution">
-    <a class="solution__toggle" data-cy="show-solution" @click="toggle">Lösung
+  <div
+    class="solution"
+    data-cy="solution">
+    <a
+      class="solution__toggle"
+      data-cy="show-solution"
+      @click="toggle">Lösung
       <template v-if="!visible">anzeigen</template>
       <template v-else>ausblenden</template>
     </a>
     <transition name="fade">
-      <p class="solution__text solution-text fade" data-cy="solution-text" v-if="visible" v-html="value.text">
-      </p>
+      <p
+        class="solution__text solution-text fade"
+        data-cy="solution-text"
+        v-if="visible"
+        v-html="value.text"/>
     </transition>
   </div>
 </template>
@@ -15,17 +23,17 @@
   export default {
     props: ['value'],
 
+    data() {
+      return {
+        visible: false
+      }
+    },
+
     methods: {
       toggle() {
         this.visible = !this.visible;
       }
     },
-
-    data() {
-      return {
-        visible: false
-      }
-    }
   }
 </script>
 
diff --git a/client/src/components/content-blocks/SubtitleBlock.vue b/client/src/components/content-blocks/SubtitleBlock.vue
index 766e7eee..595acd53 100644
--- a/client/src/components/content-blocks/SubtitleBlock.vue
+++ b/client/src/components/content-blocks/SubtitleBlock.vue
@@ -1,5 +1,7 @@
 <template>
-  <h5 class="subtitle" v-html="value.text"></h5>
+  <h5
+    class="subtitle"
+    v-html="value.text"/>
 </template>
 
 <script>
diff --git a/client/src/components/content-blocks/SurveyBlock.vue b/client/src/components/content-blocks/SurveyBlock.vue
index 736ae333..eb971a79 100644
--- a/client/src/components/content-blocks/SurveyBlock.vue
+++ b/client/src/components/content-blocks/SurveyBlock.vue
@@ -1,7 +1,10 @@
 <template>
-  <div class="survey-block" :data-scrollto="value.id">
-    <router-link class="button button--primary"
-                 :to="{name: 'survey', params: {id:value.id}}">Übung anzeigen
+  <div
+    :data-scrollto="value.id"
+    class="survey-block">
+    <router-link
+      :to="{name: 'survey', params: {id:value.id}}"
+      class="button button--primary">Übung anzeigen
     </router-link>
   </div>
 </template>
diff --git a/client/src/components/content-blocks/Task.vue b/client/src/components/content-blocks/Task.vue
index 4139ecd8..b65ea823 100644
--- a/client/src/components/content-blocks/Task.vue
+++ b/client/src/components/content-blocks/Task.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="task">
-    <div class="task__text" v-html="value.text"></div>
+    <div
+      class="task__text"
+      v-html="value.text"/>
   </div>
 </template>
 
diff --git a/client/src/components/content-blocks/TextBlock.vue b/client/src/components/content-blocks/TextBlock.vue
index 7e937489..3fca7c25 100644
--- a/client/src/components/content-blocks/TextBlock.vue
+++ b/client/src/components/content-blocks/TextBlock.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="text-block" v-html="value.text"></div>
+  <div
+    class="text-block"
+    v-html="value.text"/>
 </template>
 
 <script>
diff --git a/client/src/components/content-blocks/ThinglinkBlock.vue b/client/src/components/content-blocks/ThinglinkBlock.vue
index 9a1f2fba..2832d731 100644
--- a/client/src/components/content-blocks/ThinglinkBlock.vue
+++ b/client/src/components/content-blocks/ThinglinkBlock.vue
@@ -1,18 +1,19 @@
 <template>
   <div class="thinglink-block">
     <div class="thinglink-block__wrapper">
-      <iframe class="thinglink-block__iframe"
-              frameborder="0"
-              width="800px"
-              height="600px"
-              :src="src"
-              type="text/html"
-              webkitallowfullscreen
-              mozallowfullscreen
-              scrolling="no"
-              allowscriptaccess="always"
-              allowfullscreen="true"
-              allownetworking="all"></iframe>
+      <iframe
+        :src="src"
+        class="thinglink-block__iframe"
+        frameborder="0"
+        width="800px"
+        height="600px"
+        type="text/html"
+        webkitallowfullscreen
+        mozallowfullscreen
+        scrolling="no"
+        allowscriptaccess="always"
+        allowfullscreen="true"
+        allownetworking="all"/>
     </div>
   </div>
 </template>
diff --git a/client/src/components/content-blocks/VideoBlock.vue b/client/src/components/content-blocks/VideoBlock.vue
index bf6b3e19..8812073b 100644
--- a/client/src/components/content-blocks/VideoBlock.vue
+++ b/client/src/components/content-blocks/VideoBlock.vue
@@ -1,8 +1,14 @@
 <template>
   <div class="video-block">
-    <youtube-embed v-if="isYoutube" :url="value.url"></youtube-embed>
-    <vimeo-embed v-if="isVimeo" :url="value.url"></vimeo-embed>
-    <srf-embed v-if="isSrf" :url="value.url"></srf-embed>
+    <youtube-embed
+      :url="value.url"
+      v-if="isYoutube"/>
+    <vimeo-embed
+      :url="value.url"
+      v-if="isVimeo"/>
+    <srf-embed
+      :url="value.url"
+      v-if="isSrf"/>
 
   </div>
 </template>
diff --git a/client/src/components/content-blocks/assignment/Assignment.vue b/client/src/components/content-blocks/assignment/Assignment.vue
index ff8a029d..f90a6ce3 100644
--- a/client/src/components/content-blocks/assignment/Assignment.vue
+++ b/client/src/components/content-blocks/assignment/Assignment.vue
@@ -1,36 +1,45 @@
 <template>
-  <div class="assignment" :data-scrollto="value.id">
+  <div
+    :data-scrollto="value.id"
+    class="assignment">
     <p class="assignment__assignment-text">
-      {{assignment.assignment}}
+      {{ assignment.assignment }}
     </p>
 
-    <solution :value="solution" v-if="assignment.solution"></solution>
+    <solution
+      :value="solution"
+      v-if="assignment.solution"/>
 
     <template v-if="isStudent">
       <submission-form
+        :user-input="submission"
+        :spellcheck-loading="spellcheckLoading"
+        :saved="!unsaved"
+        :spellcheck="true"
+        placeholder="Ergebnis erfassen"
+        action="Ergebnis mit Lehrperson teilen"
+        shared-msg="Das Ergebnis wurde mit der Lehrperson geteilt."
         v-if="isStudent"
         @turnIn="turnIn"
         @saveInput="saveInput"
         @reopen="reopen"
         @changeDocumentUrl="changeDocumentUrl"
         @spellcheck="spellcheck"
-        :user-input="submission"
-        :spellcheck-loading="spellcheckLoading"
-        placeholder="Ergebnis erfassen"
-        action="Ergebnis mit Lehrperson teilen"
-        shared-msg="Das Ergebnis wurde mit der Lehrperson geteilt."
-        :saved="!unsaved"
-        :spellcheck="true"
-      >
-      </submission-form>
+      />
 
-      <spell-check :corrections="corrections" :text="submission.text"></spell-check>
+      <spell-check
+        :corrections="corrections"
+        :text="submission.text"/>
 
-      <p v-if="this.assignment.submission.submissionFeedback" class="assignment__feedback" v-html="feedbackText">
-      </p>
+      <p
+        class="assignment__feedback"
+        v-if="assignment.submission.submissionFeedback"
+        v-html="feedbackText"/>
     </template>
     <template v-if="!isStudent">
-      <router-link class="button button--primary" :to="{name: 'submissions', params: { id: assignment.id }}">Zu den
+      <router-link
+        :to="{name: 'submissions', params: { id: assignment.id }}"
+        class="button button--primary">Zu den
         Ergebnissen
       </router-link>
     </template>
@@ -60,6 +69,22 @@
       SpellCheck
     },
 
+    data() {
+      return {
+        assignment: {
+          submission: this.initialSubmission(),
+        },
+        me: {
+          permissions: []
+        },
+        inputType: 'text',
+        unsaved: false,
+        saving: 0,
+        corrections: '',
+        spellcheckLoading: false
+      }
+    },
+
     computed: {
       ...mapGetters(['scrollToAssignmentId']),
       final() {
@@ -220,22 +245,6 @@
       me: {
         query: ME_QUERY
       }
-    },
-
-    data() {
-      return {
-        assignment: {
-          submission: this.initialSubmission(),
-        },
-        me: {
-          permissions: []
-        },
-        inputType: 'text',
-        unsaved: false,
-        saving: 0,
-        corrections: '',
-        spellcheckLoading: false
-      }
     }
   }
 </script>
diff --git a/client/src/components/content-blocks/assignment/FinalSubmission.vue b/client/src/components/content-blocks/assignment/FinalSubmission.vue
index 3f255f9b..b08b6ebd 100644
--- a/client/src/components/content-blocks/assignment/FinalSubmission.vue
+++ b/client/src/components/content-blocks/assignment/FinalSubmission.vue
@@ -1,14 +1,16 @@
 <template>
   <div class="final-submission">
     <document-block
-      v-if="userInput.document"
       :value="{url: userInput.document}"
       class="final-submission__document"
-    ></document-block>
+      v-if="userInput.document"
+    />
     <div class="final-submission__explanation">
-      <info-icon class="final-submission__explanation-icon"></info-icon>
-      <span class="final-submission__explanation-text">{{sharedMsg}}</span>
-      <a class="final-submission__reopen" @click="$emit('reopen')">Bearbeiten</a>
+      <info-icon class="final-submission__explanation-icon"/>
+      <span class="final-submission__explanation-text">{{ sharedMsg }}</span>
+      <a
+        class="final-submission__reopen"
+        @click="$emit('reopen')">Bearbeiten</a>
     </div>
   </div>
 </template>
diff --git a/client/src/components/content-blocks/assignment/SpellCheck.vue b/client/src/components/content-blocks/assignment/SpellCheck.vue
index 31d59692..c0edbf9b 100644
--- a/client/src/components/content-blocks/assignment/SpellCheck.vue
+++ b/client/src/components/content-blocks/assignment/SpellCheck.vue
@@ -1,6 +1,8 @@
 <template>
-  <p class="spellcheck" v-if="corrections">
-    <span class="inline-title">Rechtschreibung:</span> <span v-html="highlightedText"></span>
+  <p
+    class="spellcheck"
+    v-if="corrections">
+    <span class="inline-title">Rechtschreibung:</span> <span v-html="highlightedText"/>
   </p>
 </template>
 
diff --git a/client/src/components/content-blocks/assignment/SubmissionForm.vue b/client/src/components/content-blocks/assignment/SubmissionForm.vue
index bb8bfd93..69f1f789 100644
--- a/client/src/components/content-blocks/assignment/SubmissionForm.vue
+++ b/client/src/components/content-blocks/assignment/SubmissionForm.vue
@@ -2,48 +2,51 @@
   <div class="feedback__submission submission-form-container">
     <div class="submission-form-container__inputs">
       <submission-input
-        @input="saveInput"
         :input-text="userInput.text"
         :saved="saved"
         :final="final"
         :placeholder="placeholder"
         :reopen="reopenSubmission"
-      ></submission-input>
+        @input="saveInput"
+      />
     </div>
 
-    <div class="submission-form-container__actions" v-if="!final">
-      <button class="submission-form-container__submit button button--primary button--white-bg"
-              @click="$emit('turnIn')"
-      >{{action}}
+    <div
+      class="submission-form-container__actions"
+      v-if="!final">
+      <button
+        class="submission-form-container__submit button button--primary button--white-bg"
+        @click="$emit('turnIn')"
+      >{{ action }}
       </button>
       <button
         class="submission-form-container__submit submission-form-container__spellcheck button button--primary button--white-bg"
         v-if="spellcheck"
         @click="$emit('spellcheck')"
-      >{{spellcheckText}}
+      >{{ spellcheckText }}
       </button>
       <div v-if="userInput.document">
         <document-block
           :value="{url: userInput.document}"
           show-trash-icon
-          v-on:trash="changeDocumentUrl('')"
-        ></document-block>
+          @trash="changeDocumentUrl('')"
+        />
       </div>
 
       <simple-file-upload
-        v-if="allowsDocuments"
-        v-on:link-change-url="changeDocumentUrl"
         :value="userInput.document"
         class="submission-form-container__document"
-      ></simple-file-upload>
-      <slot></slot>
+        v-if="allowsDocuments"
+        @link-change-url="changeDocumentUrl"
+      />
+      <slot/>
     </div>
 
     <final-submission
-      v-if="final"
       :user-input="userInput"
       :shared-msg="sharedMsg"
-      @reopen="$emit('reopen')"></final-submission>
+      v-if="final"
+      @reopen="$emit('reopen')"/>
   </div>
 </template>
 
diff --git a/client/src/components/content-blocks/assignment/SubmissionInput.vue b/client/src/components/content-blocks/assignment/SubmissionInput.vue
index a6978b05..4989f7a2 100644
--- a/client/src/components/content-blocks/assignment/SubmissionInput.vue
+++ b/client/src/components/content-blocks/assignment/SubmissionInput.vue
@@ -1,19 +1,23 @@
 <template>
   <div class="submission-form__text-answer submission-form">
-      <textarea
-        v-auto-grow
-        rows="1"
-        class="submission-form__textarea"
-        :placeholder="placeholder"
-        :readonly="final"
-        :value="inputText"
-        @input="$emit('input', $event.target.value)"
-      ></textarea>
-    <div class="submission-form__save-status submission-form__save-status--saved" v-if="saved">
-      <tick-circle-icon class="submission-form__save-status-icon"></tick-circle-icon>
+    <textarea
+      v-auto-grow
+      :placeholder="placeholder"
+      :readonly="final"
+      :value="inputText"
+      rows="1"
+      class="submission-form__textarea"
+      @input="$emit('input', $event.target.value)"
+    />
+    <div
+      class="submission-form__save-status submission-form__save-status--saved"
+      v-if="saved">
+      <tick-circle-icon class="submission-form__save-status-icon"/>
     </div>
-    <div class="submission-form__save-status submission-form__save-status--unsaved" v-if="!saved">
-      <loading-icon class="submission-form__save-status-icon submission-form__saving-icon"></loading-icon>
+    <div
+      class="submission-form__save-status submission-form__save-status--unsaved"
+      v-if="!saved">
+      <loading-icon class="submission-form__save-status-icon submission-form__saving-icon"/>
     </div>
   </div>
 </template>
diff --git a/client/src/components/content-forms/AssignmentForm.vue b/client/src/components/content-forms/AssignmentForm.vue
index d784e97d..6b0677e6 100644
--- a/client/src/components/content-forms/AssignmentForm.vue
+++ b/client/src/components/content-forms/AssignmentForm.vue
@@ -1,16 +1,18 @@
 <template>
   <div class="assignment-form">
-    <input class="assignment-form__title skillbox-input"
-           placeholder="Aufgabentitel"
-           :value="value.title"
-           v-on:input="$emit('assignment-change-title', $event.target.value, index)"
+    <input
+      :value="value.title"
+      class="assignment-form__title skillbox-input"
+      placeholder="Aufgabentitel"
+      @input="$emit('assignment-change-title', $event.target.value, index)"
     >
-    <textarea class="assignment-form__exercise-text skillbox-textarea"
-              placeholder="Aufgabe erfassen..."
-              :value="value.assignment"
-              v-on:input="$emit('assignment-change-assignment', $event.target.value, index)"
-    ></textarea>
-    <info-icon class="assignment-form__help-icon help-text__icon"></info-icon>
+    <textarea
+      :value="value.assignment"
+      class="assignment-form__exercise-text skillbox-textarea"
+      placeholder="Aufgabe erfassen..."
+      @input="$emit('assignment-change-assignment', $event.target.value, index)"
+    />
+    <info-icon class="assignment-form__help-icon help-text__icon"/>
     <p class="assignment-form__help-description help-text__description">
       Ein Eingabefeld für die Antwort wird automatisch hinzugefügt.
     </p>
diff --git a/client/src/components/content-forms/ContentBlockElementChooserWidget.vue b/client/src/components/content-forms/ContentBlockElementChooserWidget.vue
index 1287a698..4d756297 100644
--- a/client/src/components/content-forms/ContentBlockElementChooserWidget.vue
+++ b/client/src/components/content-forms/ContentBlockElementChooserWidget.vue
@@ -1,41 +1,48 @@
 <template>
-  <div class="content-block-element-chooser-widget"
-       :class="{'content-block-element-chooser-widget--no-assignment': this.hideAssignment}">
-    <div class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--link"
-         data-cy="choose-link-widget"
-         v-on:click="$emit('change-type', index, 'link_block')">
-      <link-icon class="content-block-element-chooser-widget__link-icon"></link-icon>
+  <div
+    :class="{'content-block-element-chooser-widget--no-assignment': this.hideAssignment}"
+    class="content-block-element-chooser-widget">
+    <div
+      class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--link"
+      data-cy="choose-link-widget"
+      @click="$emit('change-type', index, 'link_block')">
+      <link-icon class="content-block-element-chooser-widget__link-icon"/>
       <div class="content-block-element-chooser-widget__link-title">Link</div>
     </div>
-    <div class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--video"
-         data-cy="choose-video-widget"
-         v-on:click="$emit('change-type', index, 'video_block')">
-      <video-icon class="content-block-element-chooser-widget__link-icon"></video-icon>
+    <div
+      class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--video"
+      data-cy="choose-video-widget"
+      @click="$emit('change-type', index, 'video_block')">
+      <video-icon class="content-block-element-chooser-widget__link-icon"/>
       <div class="content-block-element-chooser-widget__link-title">Video</div>
     </div>
-    <div class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--image"
-         data-cy="choose-image-widget"
-         v-on:click="$emit('change-type', index, 'image_url_block')">
-      <image-icon class="content-block-element-chooser-widget__link-icon"></image-icon>
+    <div
+      class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--image"
+      data-cy="choose-image-widget"
+      @click="$emit('change-type', index, 'image_url_block')">
+      <image-icon class="content-block-element-chooser-widget__link-icon"/>
       <div class="content-block-element-chooser-widget__link-title">Bild</div>
     </div>
-    <div class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--text"
-         data-cy="choose-text-widget"
-         v-on:click="$emit('change-type', index, 'text_block')">
-      <text-icon class="content-block-element-chooser-widget__link-icon"></text-icon>
+    <div
+      class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--text"
+      data-cy="choose-text-widget"
+      @click="$emit('change-type', index, 'text_block')">
+      <text-icon class="content-block-element-chooser-widget__link-icon"/>
       <div class="content-block-element-chooser-widget__link-title">Text</div>
     </div>
-    <div class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--assignment"
-         data-cy="choose-assignment-widget"
-         v-on:click="$emit('change-type', index, 'assignment')"
-         v-if="!hideAssignment">
-      <speech-bubble-icon class="content-block-element-chooser-widget__link-icon"></speech-bubble-icon>
+    <div
+      class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--assignment"
+      data-cy="choose-assignment-widget"
+      v-if="!hideAssignment"
+      @click="$emit('change-type', index, 'assignment')">
+      <speech-bubble-icon class="content-block-element-chooser-widget__link-icon"/>
       <div class="content-block-element-chooser-widget__link-title">Aufgabe&nbsp;& Ergebnis</div>
     </div>
-    <div class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--document"
-         data-cy="choose-document-widget"
-         v-on:click="$emit('change-type', index, 'document_block')">
-      <document-icon class="content-block-element-chooser-widget__link-icon"></document-icon>
+    <div
+      class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--document"
+      data-cy="choose-document-widget"
+      @click="$emit('change-type', index, 'document_block')">
+      <document-icon class="content-block-element-chooser-widget__link-icon"/>
       <div class="content-block-element-chooser-widget__link-title">Dokument</div>
     </div>
   </div>
diff --git a/client/src/components/content-forms/DocumentForm.vue b/client/src/components/content-forms/DocumentForm.vue
index d09c36ae..5c9203ad 100644
--- a/client/src/components/content-forms/DocumentForm.vue
+++ b/client/src/components/content-forms/DocumentForm.vue
@@ -1,9 +1,18 @@
 <template>
-  <div class="document-form" ref="documentform">
-    <div v-if="!value.url" ref="uploadcare-panel"></div>
-    <div v-if="value.url" class="document-form__uploaded">
-      <document-icon class="document-form__icon"></document-icon>
-      <a :href="previewUrl" class="document-form__link" target="_blank">{{previewLink}}</a>
+  <div
+    class="document-form"
+    ref="documentform">
+    <div
+      v-if="!value.url"
+      ref="uploadcare-panel"/>
+    <div
+      class="document-form__uploaded"
+      v-if="value.url">
+      <document-icon class="document-form__icon"/>
+      <a
+        :href="previewUrl"
+        class="document-form__link"
+        target="_blank">{{ previewLink }}</a>
     </div>
   </div>
 </template>
@@ -20,12 +29,6 @@
       DocumentIcon
     },
 
-    mounted() {
-      uploadcare(this, url => {
-        this.$emit('link-change-url', url, this.index)
-      });
-    },
-
     computed: {
       previewUrl() {
         if (this.value && this.value.url) {
@@ -40,7 +43,13 @@
         }
         return '';
       }
-    }
+    },
+
+    mounted() {
+      uploadcare(this, url => {
+        this.$emit('link-change-url', url, this.index)
+      });
+    },
   }
 </script>
 
diff --git a/client/src/components/content-forms/ImageForm.vue b/client/src/components/content-forms/ImageForm.vue
index 259de7dd..ad8d6be0 100644
--- a/client/src/components/content-forms/ImageForm.vue
+++ b/client/src/components/content-forms/ImageForm.vue
@@ -1,13 +1,20 @@
 <template>
   <div class="image-form">
-    <div v-if="hadError" class="image-form__error">
+    <div
+      class="image-form__error"
+      v-if="hadError">
       Ups, das scheint kein Bild zu sein. Bitte versuche es nochmal mit einer anderen Datei, oder lade die Datei als <a
-      class="image-form__link" @click="switchToDocument">Dokument</a> hoch.
+        class="image-form__link"
+        @click="switchToDocument">Dokument</a> hoch.
     </div>
 
-    <div v-if="!value.url" ref="uploadcare-panel"></div>
+    <div
+      v-if="!value.url"
+      ref="uploadcare-panel"/>
     <div v-if="value.url && !hadError">
-      <img :src="previewUrl" @error="error">
+      <img
+        :src="previewUrl"
+        @error="error">
     </div>
   </div>
 </template>
@@ -17,9 +24,6 @@
 
   export default {
     props: ['value', 'index'],
-    mounted() {
-      this.mountUploadcare();
-    },
     data() {
       return {
         hadError: false,
@@ -36,6 +40,9 @@
         return null;
       }
     },
+    mounted() {
+      this.mountUploadcare();
+    },
     methods: {
       error(e) {
         this.hadError = true;
diff --git a/client/src/components/content-forms/LinkForm.vue b/client/src/components/content-forms/LinkForm.vue
index c8191897..7d423cdb 100644
--- a/client/src/components/content-forms/LinkForm.vue
+++ b/client/src/components/content-forms/LinkForm.vue
@@ -1,8 +1,16 @@
 <template>
   <div class="link-form">
-    <input placeholder="Name erfassen..." class="link-form__text skillbox-input" :value="value.text" v-on:input="$emit('link-change-text', $event.target.value, index)">
+    <input
+      :value="value.text"
+      placeholder="Name erfassen..."
+      class="link-form__text skillbox-input"
+      @input="$emit('link-change-text', $event.target.value, index)">
 
-    <input placeholder="URL einfügen..." class="link-form__url skillbox-input" :value="value.url" v-on:input="$emit('link-change-url', $event.target.value, index)">
+    <input
+      :value="value.url"
+      placeholder="URL einfügen..."
+      class="link-form__url skillbox-input"
+      @input="$emit('link-change-url', $event.target.value, index)">
   </div>
 </template>
 
diff --git a/client/src/components/content-forms/TextForm.vue b/client/src/components/content-forms/TextForm.vue
index 5e782429..3b7b06bd 100644
--- a/client/src/components/content-forms/TextForm.vue
+++ b/client/src/components/content-forms/TextForm.vue
@@ -1,10 +1,11 @@
 <template>
   <div class="text-form">
-    <textarea class="text-form__input skillbox-textarea"
-              data-cy="text-form-input"
-              placeholder="Text erfassen..."
-              :value="text"
-              v-on:input="$emit('text-change-value', $event.target.value, index)"></textarea>
+    <textarea
+      :value="text"
+      class="text-form__input skillbox-textarea"
+      data-cy="text-form-input"
+      placeholder="Text erfassen..."
+      @input="$emit('text-change-value', $event.target.value, index)"/>
   </div>
 </template>
 
diff --git a/client/src/components/content-forms/TextFormWithHelpText.vue b/client/src/components/content-forms/TextFormWithHelpText.vue
index 21818a2e..50eeb149 100644
--- a/client/src/components/content-forms/TextFormWithHelpText.vue
+++ b/client/src/components/content-forms/TextFormWithHelpText.vue
@@ -1,9 +1,11 @@
 <template>
   <div class="text-form-with-help-text">
-    <h3 class="text-form-with-help-text__heading"><span class="text-form-with-help-text__title">{{title}}</span>
-      <helpful-tooltip :text="helpText"></helpful-tooltip>
+    <h3 class="text-form-with-help-text__heading"><span class="text-form-with-help-text__title">{{ title }}</span>
+      <helpful-tooltip :text="helpText"/>
     </h3>
-    <text-form @text-change-value="$emit('change', $event)" :value="v"></text-form>
+    <text-form
+      :value="v"
+      @text-change-value="$emit('change', $event)"/>
   </div>
 </template>
 
diff --git a/client/src/components/content-forms/VideoForm.vue b/client/src/components/content-forms/VideoForm.vue
index f81548c1..1890d8ec 100644
--- a/client/src/components/content-forms/VideoForm.vue
+++ b/client/src/components/content-forms/VideoForm.vue
@@ -1,27 +1,36 @@
 <template>
   <div>
-    <div v-if="!isVimeo && !isYoutube && !isSrf" class="video-form">
-      <info-icon class="video-form__help-icon help-text__icon"></info-icon>
+    <div
+      class="video-form"
+      v-if="!isVimeo && !isYoutube && !isSrf">
+      <info-icon class="video-form__help-icon help-text__icon"/>
       <p class="video-form__help-description help-text__description">
-        Sie können Videos auf <a class="video-form__platform-link help-text__link" href="https://youtube.com/"
-                                 target="_blank">Youtube</a>
-        oder <a class="video-form__platform-link help-text__link" href="https://vimeo.com/" target="_blank">Vimeo</a>
+        Sie können Videos auf <a
+          class="video-form__platform-link help-text__link"
+          href="https://youtube.com/"
+          target="_blank">Youtube</a>
+        oder <a
+          class="video-form__platform-link help-text__link"
+          href="https://vimeo.com/"
+          target="_blank">Vimeo</a>
         hochladen und anschliessen einen Link hier einfügen.
       </p>
 
-      <input class="video-form__video-link skillbox-input"
-             placeholder="Bsp: https://www.youtube.com/watch?v=dQw4w9WgXcQ"
-             :value="value.url" v-on:input="$emit('video-change-url', $event.target.value, index)">
+      <input
+        :value="value.url"
+        class="video-form__video-link skillbox-input"
+        placeholder="Bsp: https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+        @input="$emit('video-change-url', $event.target.value, index)">
     </div>
 
     <div v-if="isYoutube">
-      <youtube-embed :url="value.url"></youtube-embed>
+      <youtube-embed :url="value.url"/>
     </div>
     <div v-if="isVimeo">
-      <vimeo-embed :url="value.url"></vimeo-embed>
+      <vimeo-embed :url="value.url"/>
     </div>
     <div v-if="isSrf">
-      <srf-embed :url="value.url"></srf-embed>
+      <srf-embed :url="value.url"/>
     </div>
 
   </div>
diff --git a/client/src/components/icons/AddIcon.vue b/client/src/components/icons/AddIcon.vue
index a5137e6f..e681b199 100644
--- a/client/src/components/icons/AddIcon.vue
+++ b/client/src/components/icons/AddIcon.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="6 6 88 88">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="6 6 88 88"
+    id="shape">
     <path
       d="M50,6.48A43.62,43.62,0,0,0,6.56,47.08S6.5,48.46,6.5,50s.06,2.83.06,2.92A43.52,43.52,0,1,0,50,6.48Zm0,82.15A38.62,38.62,0,1,1,88.6,50,38.67,38.67,0,0,1,50,88.62Z"/>
     <path
diff --git a/client/src/components/icons/AddNoteIcon.vue b/client/src/components/icons/AddNoteIcon.vue
index dd3b20f5..d084fe29 100644
--- a/client/src/components/icons/AddNoteIcon.vue
+++ b/client/src/components/icons/AddNoteIcon.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg class="add-note-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    class="add-note-icon"
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100">
     <path
       d="M81.5,88.39746H18.7627a2.49981,2.49981,0,0,1-2.5-2.5V35.35352L1.72559,20.71191A2.50054,2.50054,0,0,1,3.5,16.4502h78a2.49981,2.49981,0,0,1,2.5,2.5V85.89746A2.49981,2.49981,0,0,1,81.5,88.39746Zm-60.2373-5H79V21.4502H9.50488L20.53711,32.56152a2.5013,2.5013,0,0,1,.72559,1.76172Z"/>
     <path d="M64.9209,55.08447H36.18457a2.5,2.5,0,0,1,0-5H64.9209a2.5,2.5,0,0,1,0,5Z"/>
diff --git a/client/src/components/icons/AddPointer.vue b/client/src/components/icons/AddPointer.vue
index b878eccc..6a8c23ed 100644
--- a/client/src/components/icons/AddPointer.vue
+++ b/client/src/components/icons/AddPointer.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape">
     <path
       d="M61.74,13.24a36.43,36.43,0,0,0-22.06,7.35L2.52,48a2.5,2.5,0,0,0,0,4L39.66,79.39A36.76,36.76,0,1,0,61.74,13.24Zm0,68.52a31.5,31.5,0,0,1-19.09-6.38L8.21,50,42.66,24.6A31.76,31.76,0,1,1,61.74,81.76Z"/>
     <path
diff --git a/client/src/components/icons/BookmarkIcon.vue b/client/src/components/icons/BookmarkIcon.vue
index 991c84d0..841687da 100644
--- a/client/src/components/icons/BookmarkIcon.vue
+++ b/client/src/components/icons/BookmarkIcon.vue
@@ -1,11 +1,16 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" class="bookmark-icon">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    class="bookmark-icon">
     <g :class="{'bookmark-icon--bookmarked': bookmarked}">
-      <path class="bookmark-icon__background"
-            d="M51,67.32872a5.06849,5.06849,0,0,1,2.98875.97385L84,90V11H18V90L48.01333,68.30149A5.064,5.064,0,0,1,51,67.32872Z"
-            />
-      <path id="bookmark-icon__outline"
-            d="M84.5,93.07715a2.49662,2.49662,0,0,1-1.43359-.45215L51,70.17871,18.93359,92.625A2.49964,2.49964,0,0,1,15,90.57715V11.42285a2.49981,2.49981,0,0,1,2.5-2.5h67a2.49981,2.49981,0,0,1,2.5,2.5v79.1543a2.49947,2.49947,0,0,1-2.5,2.5ZM51,65.15527a4.8673,4.8673,0,0,1,2.80762.88574L82,85.77539V13.92285H20V85.77539L48.19434,66.04A4.863,4.863,0,0,1,51,65.15527Z"/>
+      <path
+        class="bookmark-icon__background"
+        d="M51,67.32872a5.06849,5.06849,0,0,1,2.98875.97385L84,90V11H18V90L48.01333,68.30149A5.064,5.064,0,0,1,51,67.32872Z"
+      />
+      <path
+        d="M84.5,93.07715a2.49662,2.49662,0,0,1-1.43359-.45215L51,70.17871,18.93359,92.625A2.49964,2.49964,0,0,1,15,90.57715V11.42285a2.49981,2.49981,0,0,1,2.5-2.5h67a2.49981,2.49981,0,0,1,2.5,2.5v79.1543a2.49947,2.49947,0,0,1-2.5,2.5ZM51,65.15527a4.8673,4.8673,0,0,1,2.80762.88574L82,85.77539V13.92285H20V85.77539L48.19434,66.04A4.863,4.863,0,0,1,51,65.15527Z"
+        id="bookmark-icon__outline"/>
     </g>
   </svg>
 </template>
diff --git a/client/src/components/icons/BulbIcon.vue b/client/src/components/icons/BulbIcon.vue
index edd73484..372cd331 100644
--- a/client/src/components/icons/BulbIcon.vue
+++ b/client/src/components/icons/BulbIcon.vue
@@ -1,7 +1,15 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="100"
+    height="100"
+    viewBox="0 0 100 100">
     <g id="shape">
-      <circle cx="50" cy="50" r="50" style="fill:#17a887"/>
+      <circle
+        cx="50"
+        cy="50"
+        r="50"
+        style="fill:#17a887"/>
       <path
         d="M57.96318,62.73515H41.99379A2.48236,2.48236,0,0,1,39.51288,60.34c-.06061-1.72061-.21515-2.61273-3.23576-5.60545a20.69086,20.69086,0,1,1,27.55152-.18485l-.27394.26848c-2.89273,2.86424-3.04424,3.76485-3.11091,5.52848A2.48231,2.48231,0,0,1,57.96318,62.73515ZM44.17652,57.7703H55.77409c.50667-2.1903,1.72788-3.94606,4.29636-6.48909l.317-.3103c.02364-.023.04727-.04545.07212-.06788a15.62483,15.62483,0,1,0-20.85788.14364c.03848.03333.07606.06848.11273.10424C42.38379,53.78848,43.65439,55.58424,44.17652,57.7703Z"
         style="fill:#fff"/>
diff --git a/client/src/components/icons/Cards.vue b/client/src/components/icons/Cards.vue
index 18e36296..8bf95d90 100644
--- a/client/src/components/icons/Cards.vue
+++ b/client/src/components/icons/Cards.vue
@@ -1,6 +1,10 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><title>cards</title>
-    <path id="Fill-1"
-          d="M30.89,21v9.67H17.44v9.67H4V79H69.11V69.34H82.56V59.67H96V21Zm3.77,3.77H92.23V55.89H82.56V30.65H34.67ZM21.22,34.43H78.78V65.57H69.11V40.33H21.22ZM7.77,44.1H65.34V75.24H7.77Z"/>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape"><title>cards</title>
+    <path
+      d="M30.89,21v9.67H17.44v9.67H4V79H69.11V69.34H82.56V59.67H96V21Zm3.77,3.77H92.23V55.89H82.56V30.65H34.67ZM21.22,34.43H78.78V65.57H69.11V40.33H21.22ZM7.77,44.1H65.34V75.24H7.77Z"
+      id="Fill-1"/>
   </svg>
 </template>
diff --git a/client/src/components/icons/ChevronDown.vue b/client/src/components/icons/ChevronDown.vue
index 5e15524d..117bdd8c 100644
--- a/client/src/components/icons/ChevronDown.vue
+++ b/client/src/components/icons/ChevronDown.vue
@@ -1,5 +1,7 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100">
     <path d="M50,74.07,6.86,30.93A2.93,2.93,0,0,1,11,26.79l39,39,39-39a2.93,2.93,0,1,1,4.15,4.15Z"/>
   </svg>
 </template>
diff --git a/client/src/components/icons/ChevronRight.vue b/client/src/components/icons/ChevronRight.vue
index 3b9a8885..54f88f72 100644
--- a/client/src/components/icons/ChevronRight.vue
+++ b/client/src/components/icons/ChevronRight.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape">
     <path d="M74.07,50,30.93,93.14A2.93,2.93,0,0,1,26.79,89l39-39-39-39a2.93,2.93,0,0,1,4.15-4.15Z"/>
   </svg>
 </template>
diff --git a/client/src/components/icons/ChevronUp.vue b/client/src/components/icons/ChevronUp.vue
index 21c76ead..aef5783d 100644
--- a/client/src/components/icons/ChevronUp.vue
+++ b/client/src/components/icons/ChevronUp.vue
@@ -1,5 +1,7 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100">
     <path d="M50,18.93,93.14,62.07A2.93,2.93,0,1,1,89,66.21l-39-39-39,39a2.93,2.93,0,1,1-4.15-4.15Z"/>
   </svg>
 </template>
diff --git a/client/src/components/icons/CircleIcon.vue b/client/src/components/icons/CircleIcon.vue
index 2cdf34ad..7942fcf3 100644
--- a/client/src/components/icons/CircleIcon.vue
+++ b/client/src/components/icons/CircleIcon.vue
@@ -1,5 +1,10 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
-    <circle r="25" cx="50" cy="50"></circle>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100">
+    <circle
+      r="25"
+      cx="50"
+      cy="50"/>
   </svg>
 </template>
diff --git a/client/src/components/icons/ClosedEyeIcon.vue b/client/src/components/icons/ClosedEyeIcon.vue
index edc6f8c5..967eacdf 100644
--- a/client/src/components/icons/ClosedEyeIcon.vue
+++ b/client/src/components/icons/ClosedEyeIcon.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape">
     <path
       d="M99.5,48.11a56.91,56.91,0,0,0-21-21.19L91.18,14.26a3.85,3.85,0,1,0-5.44-5.44L71.21,23.36A56.73,56.73,0,0,0,.5,48.11a3.84,3.84,0,0,0,0,3.79,56.92,56.92,0,0,0,21,21.19L8.82,85.74a3.85,3.85,0,1,0,5.44,5.44L28.79,76.64A56.66,56.66,0,0,0,50,80.79,57,57,0,0,0,99.5,51.89,3.84,3.84,0,0,0,99.5,48.11ZM8.32,50a49.09,49.09,0,0,1,56.9-20.66L27.15,67.42A49.25,49.25,0,0,1,8.32,50ZM50,73.09a49,49,0,0,1-15.22-2.43L72.85,32.59A49.25,49.25,0,0,1,91.68,50,49.27,49.27,0,0,1,50,73.09Z"/>
   </svg>
diff --git a/client/src/components/icons/Cross.vue b/client/src/components/icons/Cross.vue
index 042acf86..43422926 100644
--- a/client/src/components/icons/Cross.vue
+++ b/client/src/components/icons/Cross.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape">
     <path
       d="M53.91,50,87.19,16.73a2.77,2.77,0,1,0-3.91-3.91L50,46.09,16.73,12.81a2.77,2.77,0,1,0-3.91,3.91L46.09,50,12.81,83.27a2.77,2.77,0,1,0,3.91,3.91L50,53.91,83.27,87.19a2.77,2.77,0,0,0,3.91-3.91Z"/>
   </svg>
diff --git a/client/src/components/icons/DefaultAvatar.vue b/client/src/components/icons/DefaultAvatar.vue
index 2fbfcc8e..6b6f6bb9 100644
--- a/client/src/components/icons/DefaultAvatar.vue
+++ b/client/src/components/icons/DefaultAvatar.vue
@@ -1,28 +1,50 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 400 400">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    viewBox="0 0 400 400">
     <defs>
       <clipPath id="avatar-clip-path">
-        <circle class="cls-1" cx="200" cy="200" r="197"/>
+        <circle
+          class="cls-1"
+          cx="200"
+          cy="200"
+          r="197"/>
       </clipPath>
     </defs>
     <g id="bg">
-      <circle class="cls-2" cx="200" cy="200" r="197"/>
+      <circle
+        class="cls-2"
+        cx="200"
+        cy="200"
+        r="197"/>
     </g>
     <g id="objects">
       <g class="cls-3">
-        <path class="cls-4"
-              d="M380.03229,346.82485l-99.89952-29.68554-75.91247-7.58045h-2.40707l-78.31955,7.58045-103.526,30.44984s75.62737,95.55272,183.04906,95.55272S380.03229,346.82485,380.03229,346.82485Z"/>
-        <path class="cls-5"
-              d="M272.15765,65.53589a86.01591,86.01591,0,0,0-20.524-14.33295,103.61294,103.61294,0,0,0-49.8204-11.92284,103.61271,103.61271,0,0,0-49.8198,11.92255A86.01706,86.01706,0,0,0,131.4688,65.53589c-47.89186,45.957-59.684,136.053-53.17653,195.51559,22.30221,28.20465,70.43168,35.98046,103.97675,29.59277-1.699-28.98109-18.28465-55.36789-18.09824-84.40807,16.82179-9.95623,9.42329-59.11938,10.702-81.59916l26.94039-6.97556,26.9404,6.97556c1.27875,22.47978-6.11974,71.64293,10.70211,81.59916.18642,29.04018-16.39928,55.427-18.09824,84.40807,33.545,6.38769,81.67447-1.38812,103.97668-29.59277C331.84167,201.58886,320.04951,111.49293,272.15765,65.53589Z"/>
-        <path class="cls-6"
-              d="M237.057,266.23162H166.56944c0,34.9025-27.34,45.73431-43.07576,50.90769,15.73577,67.03868,142.10688,67.03868,156.63909,0C260.78642,311.96593,241.52987,305.94826,237.057,266.23162Z"/>
-        <ellipse class="cls-7" cx="202.35227" cy="179.47219" rx="79.23803" ry="97.02616"/>
-        <path class="cls-8"
-              d="M117.61519,154.166c10.8764-3.25836,22.30778,5.29762,25.51206,19.09451,3.20424,13.7965-3.02464,27.64251-13.90108,30.90087-10.87644,3.25678-22.30919-5.29877-25.51339-19.09389-3.20425-13.79708,3.026-27.64273,13.90241-30.90149Z"/>
-        <path class="cls-5"
-              d="M158.77973,88.35379c34.35007,53.44875,83.71361,66.59188,126.44529,82.83956C322.20435,145.19484,244.7734,11.96688,158.77973,88.35379Z"/>
-        <path class="cls-5"
-              d="M181.50651,94.88021c-10.83147,33.057-30.31262,48.8307-55.51284,58.59347C109.4863,115.38906,134.25941,72.625,181.50651,94.88021Z"/>
+        <path
+          class="cls-4"
+          d="M380.03229,346.82485l-99.89952-29.68554-75.91247-7.58045h-2.40707l-78.31955,7.58045-103.526,30.44984s75.62737,95.55272,183.04906,95.55272S380.03229,346.82485,380.03229,346.82485Z"/>
+        <path
+          class="cls-5"
+          d="M272.15765,65.53589a86.01591,86.01591,0,0,0-20.524-14.33295,103.61294,103.61294,0,0,0-49.8204-11.92284,103.61271,103.61271,0,0,0-49.8198,11.92255A86.01706,86.01706,0,0,0,131.4688,65.53589c-47.89186,45.957-59.684,136.053-53.17653,195.51559,22.30221,28.20465,70.43168,35.98046,103.97675,29.59277-1.699-28.98109-18.28465-55.36789-18.09824-84.40807,16.82179-9.95623,9.42329-59.11938,10.702-81.59916l26.94039-6.97556,26.9404,6.97556c1.27875,22.47978-6.11974,71.64293,10.70211,81.59916.18642,29.04018-16.39928,55.427-18.09824,84.40807,33.545,6.38769,81.67447-1.38812,103.97668-29.59277C331.84167,201.58886,320.04951,111.49293,272.15765,65.53589Z"/>
+        <path
+          class="cls-6"
+          d="M237.057,266.23162H166.56944c0,34.9025-27.34,45.73431-43.07576,50.90769,15.73577,67.03868,142.10688,67.03868,156.63909,0C260.78642,311.96593,241.52987,305.94826,237.057,266.23162Z"/>
+        <ellipse
+          class="cls-7"
+          cx="202.35227"
+          cy="179.47219"
+          rx="79.23803"
+          ry="97.02616"/>
+        <path
+          class="cls-8"
+          d="M117.61519,154.166c10.8764-3.25836,22.30778,5.29762,25.51206,19.09451,3.20424,13.7965-3.02464,27.64251-13.90108,30.90087-10.87644,3.25678-22.30919-5.29877-25.51339-19.09389-3.20425-13.79708,3.026-27.64273,13.90241-30.90149Z"/>
+        <path
+          class="cls-5"
+          d="M158.77973,88.35379c34.35007,53.44875,83.71361,66.59188,126.44529,82.83956C322.20435,145.19484,244.7734,11.96688,158.77973,88.35379Z"/>
+        <path
+          class="cls-5"
+          d="M181.50651,94.88021c-10.83147,33.057-30.31262,48.8307-55.51284,58.59347C109.4863,115.38906,134.25941,72.625,181.50651,94.88021Z"/>
       </g>
     </g>
   </svg>
diff --git a/client/src/components/icons/DocumentIcon.vue b/client/src/components/icons/DocumentIcon.vue
index 410a6867..0b93fbed 100644
--- a/client/src/components/icons/DocumentIcon.vue
+++ b/client/src/components/icons/DocumentIcon.vue
@@ -1,10 +1,15 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape">
     <path
       d="M22.64,5.3a8.38,8.38,0,0,0-8.37,8.37V86.33a8.38,8.38,0,0,0,8.37,8.37H77.36a8.38,8.38,0,0,0,8.37-8.37v-57L61.39,5.3ZM79.17,88.08a2.74,2.74,0,0,1-2.11.94H22.34a3,3,0,0,1-3-3V13.37a3,3,0,0,1,3-3H54V28.32a7.78,7.78,0,0,0,7.77,7.77H79.75V85.73A2.85,2.85,0,0,1,79.17,88.08ZM62.11,31a2.34,2.34,0,0,1-2.39-2.39V11.15L79.58,31Z"/>
     <path
       d="M61.81,36.1A7.78,7.78,0,0,1,54,28.32V10.38H22.34a3,3,0,0,0-3,3V86a3,3,0,0,0,3,3H77.06a2.74,2.74,0,0,0,2.11-.94,2.85,2.85,0,0,0,.59-2.35V36.1Z"
       style="fill:#fff"/>
-    <path d="M59.72,28.62A2.34,2.34,0,0,0,62.11,31H79.58L59.72,11.15Z" style="fill:#fff"/>
+    <path
+      d="M59.72,28.62A2.34,2.34,0,0,0,62.11,31H79.58L59.72,11.15Z"
+      style="fill:#fff"/>
   </svg>
 </template>
diff --git a/client/src/components/icons/EhbLogo.vue b/client/src/components/icons/EhbLogo.vue
index 1c01c0dc..1baf52fc 100644
--- a/client/src/components/icons/EhbLogo.vue
+++ b/client/src/components/icons/EhbLogo.vue
@@ -1,34 +1,81 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 79.6006 25.5117">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 79.6006 25.5117">
     <g id="bild_wortmarke">
       <path d="M42.6597,6.811h8.1616V9.2915H45.6001v2.6211H50.041v2.46H45.6001v3.0009h5.4214V19.854H42.6597Z"/>
       <path d="M54.9195,6.811h2.9404v5.0215h4.5005V6.811h2.9609V19.854H62.3604V14.4126H57.8599V19.854H54.9195Z"/>
       <path
         d="M69.6983,6.811h4.4609c2.7012,0,4.8018.7403,4.8018,3.2412a2.84374,2.84374,0,0,1-2.1807,2.8204v.08c1.8604.3399,2.8203,1.3204,2.8203,3.0606,0,2.6601-2.2402,3.8408-5.0605,3.8408H69.6983Zm4.3213,5.2618c1.4404,0,2.0605-.6202,2.0605-1.6006s-.6602-1.3809-2.041-1.3809H72.6397v2.9815Zm.2802,5.5009c1.5996,0,2.42-.6006,2.42-1.7802,0-1.1407-.7999-1.6407-2.42-1.6407H72.6397v3.4209Z"/>
-      <polygon class="cls-1" points="7.087 0 0 4.252 7.087 8.504 7.087 0"/>
-      <polygon class="cls-1" points="7.087 8.504 14.173 4.252 7.087 0 7.087 8.504"/>
-      <polygon class="cls-2" points="7.087 17.008 0 21.26 7.087 25.512 7.087 17.008"/>
-      <polygon class="cls-2" points="7.087 25.512 14.173 21.26 7.087 17.008 7.087 25.512"/>
-      <polygon class="cls-1" points="7.087 8.511 7.093 8.507 7.087 8.504 7.087 8.511"/>
-      <polygon class="cls-3" points="0 4.252 0 12.756 7.087 8.504 0 4.252"/>
-      <polygon class="cls-4" points="7.087 8.504 7.087 17.008 14.173 12.756 7.087 8.504"/>
-      <polygon class="cls-5" points="7.087 8.504 7.087 17.008 0 12.756 7.087 8.504"/>
-      <polygon class="cls-5" points="14.173 12.756 14.173 4.252 7.087 8.504 14.173 12.756"/>
-      <polygon class="cls-2" points="0 12.756 0 21.26 7.087 17.008 0 12.756"/>
-      <polygon class="cls-6" points="14.173 21.26 14.173 12.756 7.087 17.008 14.173 21.26"/>
-      <polygon class="cls-7" points="21.26 0 14.173 4.252 21.26 8.504 21.26 0"/>
-      <polygon class="cls-7" points="21.26 8.504 28.347 4.252 21.26 0 21.26 8.504"/>
-      <polygon class="cls-8" points="21.26 17.008 14.173 21.26 21.26 25.512 21.26 17.008"/>
-      <polygon class="cls-8" points="21.26 25.512 28.347 21.26 21.26 17.008 21.26 25.512"/>
-      <polygon class="cls-1" points="21.26 8.511 21.266 8.507 21.26 8.504 21.26 8.511"/>
-      <polygon class="cls-9" points="14.173 4.252 14.173 12.756 21.26 8.504 14.173 4.252"/>
-      <polygon class="cls-10" points="21.26 8.504 21.26 17.008 28.347 12.756 21.26 8.504"/>
-      <polygon class="cls-9" points="21.26 8.504 21.26 17.008 14.173 12.756 21.26 8.504"/>
-      <polygon class="cls-11" points="28.347 12.756 28.347 4.252 21.26 8.504 28.347 12.756"/>
-      <polygon class="cls-6" points="14.173 12.756 14.173 21.26 21.26 17.008 14.173 12.756"/>
-      <polygon class="cls-8" points="28.347 21.26 28.347 12.756 21.26 17.008 28.347 21.26"/>
-      <polyline class="cls-12"
-                points="26.794 11.486 26.794 14.04 23.815 14.04 23.815 17.02 21.26 17.02 21.26 14.04 18.28 14.04 18.28 11.486 21.26 11.486 21.26 8.506 23.814 8.506 23.815 11.486 26.794 11.486"/>
+      <polygon
+        class="cls-1"
+        points="7.087 0 0 4.252 7.087 8.504 7.087 0"/>
+      <polygon
+        class="cls-1"
+        points="7.087 8.504 14.173 4.252 7.087 0 7.087 8.504"/>
+      <polygon
+        class="cls-2"
+        points="7.087 17.008 0 21.26 7.087 25.512 7.087 17.008"/>
+      <polygon
+        class="cls-2"
+        points="7.087 25.512 14.173 21.26 7.087 17.008 7.087 25.512"/>
+      <polygon
+        class="cls-1"
+        points="7.087 8.511 7.093 8.507 7.087 8.504 7.087 8.511"/>
+      <polygon
+        class="cls-3"
+        points="0 4.252 0 12.756 7.087 8.504 0 4.252"/>
+      <polygon
+        class="cls-4"
+        points="7.087 8.504 7.087 17.008 14.173 12.756 7.087 8.504"/>
+      <polygon
+        class="cls-5"
+        points="7.087 8.504 7.087 17.008 0 12.756 7.087 8.504"/>
+      <polygon
+        class="cls-5"
+        points="14.173 12.756 14.173 4.252 7.087 8.504 14.173 12.756"/>
+      <polygon
+        class="cls-2"
+        points="0 12.756 0 21.26 7.087 17.008 0 12.756"/>
+      <polygon
+        class="cls-6"
+        points="14.173 21.26 14.173 12.756 7.087 17.008 14.173 21.26"/>
+      <polygon
+        class="cls-7"
+        points="21.26 0 14.173 4.252 21.26 8.504 21.26 0"/>
+      <polygon
+        class="cls-7"
+        points="21.26 8.504 28.347 4.252 21.26 0 21.26 8.504"/>
+      <polygon
+        class="cls-8"
+        points="21.26 17.008 14.173 21.26 21.26 25.512 21.26 17.008"/>
+      <polygon
+        class="cls-8"
+        points="21.26 25.512 28.347 21.26 21.26 17.008 21.26 25.512"/>
+      <polygon
+        class="cls-1"
+        points="21.26 8.511 21.266 8.507 21.26 8.504 21.26 8.511"/>
+      <polygon
+        class="cls-9"
+        points="14.173 4.252 14.173 12.756 21.26 8.504 14.173 4.252"/>
+      <polygon
+        class="cls-10"
+        points="21.26 8.504 21.26 17.008 28.347 12.756 21.26 8.504"/>
+      <polygon
+        class="cls-9"
+        points="21.26 8.504 21.26 17.008 14.173 12.756 21.26 8.504"/>
+      <polygon
+        class="cls-11"
+        points="28.347 12.756 28.347 4.252 21.26 8.504 28.347 12.756"/>
+      <polygon
+        class="cls-6"
+        points="14.173 12.756 14.173 21.26 21.26 17.008 14.173 12.756"/>
+      <polygon
+        class="cls-8"
+        points="28.347 21.26 28.347 12.756 21.26 17.008 28.347 21.26"/>
+      <polyline
+        class="cls-12"
+        points="26.794 11.486 26.794 14.04 23.815 14.04 23.815 17.02 21.26 17.02 21.26 14.04 18.28 14.04 18.28 11.486 21.26 11.486 21.26 8.506 23.814 8.506 23.815 11.486 26.794 11.486"/>
     </g>
   </svg>
 </template>
diff --git a/client/src/components/icons/Ellipses.vue b/client/src/components/icons/Ellipses.vue
index c4902bca..a08f19ac 100644
--- a/client/src/components/icons/Ellipses.vue
+++ b/client/src/components/icons/Ellipses.vue
@@ -1,7 +1,18 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
-    <circle cx="18.75" cy="50" r="5"/>
-    <circle cx="50" cy="50" r="5"/>
-    <circle cx="81.25" cy="50" r="5"/>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100">
+    <circle
+      cx="18.75"
+      cy="50"
+      r="5"/>
+    <circle
+      cx="50"
+      cy="50"
+      r="5"/>
+    <circle
+      cx="81.25"
+      cy="50"
+      r="5"/>
   </svg>
 </template>
diff --git a/client/src/components/icons/EyeIcon.vue b/client/src/components/icons/EyeIcon.vue
index 05e7cb03..0baaa12b 100644
--- a/client/src/components/icons/EyeIcon.vue
+++ b/client/src/components/icons/EyeIcon.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape">
     <path
       d="M99.5,48.11a56.85,56.85,0,0,0-99,0,3.84,3.84,0,0,0,0,3.79,56.85,56.85,0,0,0,99,0A3.84,3.84,0,0,0,99.5,48.11ZM50,30.75A12.31,12.31,0,1,1,37.69,43.06,12.32,12.32,0,0,1,50,30.75Zm0,42.34A49.28,49.28,0,0,1,8.32,50,49.3,49.3,0,0,1,35.75,29a20,20,0,1,0,28.5,0A49.3,49.3,0,0,1,91.68,50,49.28,49.28,0,0,1,50,73.09Z"/>
   </svg>
diff --git a/client/src/components/icons/Group.vue b/client/src/components/icons/Group.vue
index 85b8ffea..5959a530 100644
--- a/client/src/components/icons/Group.vue
+++ b/client/src/components/icons/Group.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape">
     <title>group</title>
     <path
       d="M84.56,47H71.69a15.5,15.5,0,0,0-7.63,2,15.85,15.85,0,0,0-5,4.46,15.61,15.61,0,0,0-2.62-.22H43.57a15.51,15.51,0,0,0-2.6.22A15.85,15.85,0,0,0,36,49a15.5,15.5,0,0,0-7.63-2H15.49A15.66,15.66,0,0,0-.1,62.55v8.73A1.77,1.77,0,0,0,1.66,73H28v4.49a1.76,1.76,0,0,0,1.76,1.76H70.28A1.76,1.76,0,0,0,72,77.52V73H98.34a1.77,1.77,0,0,0,1.76-1.76V62.55A15.66,15.66,0,0,0,84.56,47ZM72,64.5V64l-.17-.48a15.8,15.8,0,0,0-8.39-8.85A12.31,12.31,0,0,1,65.79,52a12,12,0,0,1,5.88-1.55H84.56A12.13,12.13,0,0,1,96.62,62.55v7H72V64.8ZM31.52,66.22l.26-1a12.12,12.12,0,0,1,11.47-8.33l.36-.18H56.46a12.15,12.15,0,0,1,12,10.51,3,3,0,0,0,.07.77v7.73h-37V66.22Zm5.83-11.68A15.68,15.68,0,0,0,28.12,67.3v2.2H3.43v-7A12.13,12.13,0,0,1,15.49,50.49H28.36A12,12,0,0,1,34.24,52,12.22,12.22,0,0,1,37.35,54.54Z"/>
diff --git a/client/src/components/icons/Hamburger.vue b/client/src/components/icons/Hamburger.vue
index 3b95aea5..52d99c71 100644
--- a/client/src/components/icons/Hamburger.vue
+++ b/client/src/components/icons/Hamburger.vue
@@ -1,5 +1,10 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="100"
+    height="100"
+    viewBox="0 0 100 100"
+    id="shape">
     <path d="M82,21H18a3,3,0,0,1,0-6H82a3,3,0,0,1,0,6Z"/>
     <path d="M82,85H18a3,3,0,0,1,0-6H82a3,3,0,0,1,0,6Z"/>
     <path d="M82,53H18a3,3,0,0,1,0-6H82a3,3,0,0,1,0,6Z"/>
diff --git a/client/src/components/icons/HepLogo.vue b/client/src/components/icons/HepLogo.vue
index 7bf58ca5..7d7c7b69 100644
--- a/client/src/components/icons/HepLogo.vue
+++ b/client/src/components/icons/HepLogo.vue
@@ -1,42 +1,74 @@
 <template>
-  <svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 147.39503 34.72434">
-    <circle class="cls-1" cx="17.36217" cy="17.36217" r="17.36217"/>
-    <path class="cls-1"
-          d="M52.4432,8.634a4.55121,4.55121,0,0,0-.89344-1.506,3.95842,3.95842,0,0,0-1.37354-.97187,4.42834,4.42834,0,0,0-1.7625-.34656,4.00352,4.00352,0,0,0-1.80914.40273,3.454,3.454,0,0,0-1.30783,1.14356h-.03922V2.59971H42.62491V17.82914h2.63262V10.86921a3.046,3.046,0,0,1,.17382-1.03228,2.49255,2.49255,0,0,1,.49812-.8468,2.33973,2.33973,0,0,1,.79169-.56277,2.52558,2.52558,0,0,1,1.03016-.20561,2.30456,2.30456,0,0,1,1.72223.68041,2.663,2.663,0,0,1,.66028,1.9236v7.00338h2.63262V10.60425A5.72892,5.72892,0,0,0,52.4432,8.634Z"/>
-    <path class="cls-1"
-          d="M65.73936,9.3865a5.357,5.357,0,0,0-1.081-1.8494A5.22188,5.22188,0,0,0,62.9096,6.278a5.72948,5.72948,0,0,0-2.37084-.46844,6.03155,6.03155,0,0,0-2.26911.41333,4.92935,4.92935,0,0,0-1.7625,1.19125,5.3972,5.3972,0,0,0-1.13508,1.91618,7.81512,7.81512,0,0,0-.40062,2.59977,7.81313,7.81313,0,0,0,.40062,2.59872A5.37548,5.37548,0,0,0,56.50715,16.445a4.91636,4.91636,0,0,0,1.7837,1.19338,6.37091,6.37091,0,0,0,2.33587.41121,6.1752,6.1752,0,0,0,1.95857-.29039,5.0312,5.0312,0,0,0,1.51557-.7917,4.95493,4.95493,0,0,0,1.09162-1.17005,5.74691,5.74691,0,0,0,.69-1.42442l.02013-.06041H63.05586l-.01378.01908a4.05,4.05,0,0,1-.95067.939,2.503,2.503,0,0,1-1.44243.3667,2.73105,2.73105,0,0,1-2.07515-.81289,3.29407,3.29407,0,0,1-.85635-2.07515h8.272l.00636-.03922c.01378-.089.02861-.19183.04345-.31053.01484-.1028.02968-.22151.04451-.354a4.07907,4.07907,0,0,0,.02332-.44725A6.72183,6.72183,0,0,0,65.73936,9.3865Zm-5.2006-1.16475a2.61117,2.61117,0,0,1,1.94373.71538,3.20654,3.20654,0,0,1,.87224,1.73071H57.7249a3.3678,3.3678,0,0,1,.94643-1.77416A2.62777,2.62777,0,0,1,60.53876,8.22175Z"/>
-    <path class="cls-1"
-          d="M79.14786,9.29748A5.456,5.456,0,0,0,78.0912,7.38236a4.5326,4.5326,0,0,0-1.61836-1.17112,5.23851,5.23851,0,0,0-2.072-.40167,4.12277,4.12277,0,0,0-2.06667.50342,4.59474,4.59474,0,0,0-1.37884,1.1531h-.05088l-.32431-1.4-.00741-.036h-2.1822V21.37068h2.63368v-4.8674h.03816a2.65765,2.65765,0,0,0,.45891.5066,3.83135,3.83135,0,0,0,.74824.514,4.59617,4.59617,0,0,0,.97081.38048,4.44481,4.44481,0,0,0,1.16051.1452,5.23834,5.23834,0,0,0,2.072-.40168,4.53245,4.53245,0,0,0,1.61836-1.17111,5.43932,5.43932,0,0,0,1.05666-1.91512,8.40143,8.40143,0,0,0,.37942-2.63157A8.41306,8.41306,0,0,0,79.14786,9.29748ZM73.95891,8.22175a2.87335,2.87335,0,0,1,1.14144.22786,2.62129,2.62129,0,0,1,.93266.68359,3.25549,3.25549,0,0,1,.63166,1.15522,5.2844,5.2844,0,0,1,.22892,1.64168,5.29386,5.29386,0,0,1-.22892,1.64169,3.25948,3.25948,0,0,1-.63166,1.15415,2.59368,2.59368,0,0,1-.93266.6836,2.97289,2.97289,0,0,1-2.28288,0,2.59373,2.59373,0,0,1-.93265-.6836,3.277,3.277,0,0,1-.63166-1.15521,5.28178,5.28178,0,0,1-.22893-1.64063,5.28409,5.28409,0,0,1,.22893-1.64168,3.27711,3.27711,0,0,1,.63166-1.15522,2.62134,2.62134,0,0,1,.93265-.68359A2.87342,2.87342,0,0,1,73.95891,8.22175Z"/>
-    <path class="cls-1"
-          d="M42.61643,23.24323h1.01v5.18046l3.29714-3.29714h1.27816L44.77,28.55829l3.63311,3.56634H47.125l-3.49851-3.43174v3.43174h-1.01Z"/>
-    <path class="cls-1"
-          d="M52.01023,32.25923a3.50763,3.50763,0,0,1-1.30571-.23529,2.72284,2.72284,0,0,1-1.01638-.69949,3.34743,3.34743,0,0,1-.66558-1.1372,5.14225,5.14225,0,0,1,0-3.12227,3.34743,3.34743,0,0,1,.66558-1.1372,2.723,2.723,0,0,1,1.01638-.69949,3.72016,3.72016,0,0,1,2.604,0,2.69623,2.69623,0,0,1,1.02274.69949,3.34936,3.34936,0,0,1,.66663,1.1372,5.16374,5.16374,0,0,1,0,3.12227,3.34936,3.34936,0,0,1-.66663,1.1372,2.69611,2.69611,0,0,1-1.02274.69949A3.52016,3.52016,0,0,1,52.01023,32.25923Zm0-.9422a2.21008,2.21008,0,0,0,.88814-.17487,1.92179,1.92179,0,0,0,.69949-.51826,2.489,2.489,0,0,0,.46421-.84044,4.05861,4.05861,0,0,0,0-2.31468,2.50459,2.50459,0,0,0-.46421-.84151,1.93408,1.93408,0,0,0-.69949-.51826,2.3428,2.3428,0,0,0-1.77628,0,1.94676,1.94676,0,0,0-.70055.51826,2.50476,2.50476,0,0,0-.46421.84151,4.08323,4.08323,0,0,0,0,2.31468,2.48917,2.48917,0,0,0,.46421.84044,1.93431,1.93431,0,0,0,.70055.51826A2.21008,2.21008,0,0,0,52.01023,31.317Z"/>
-    <path class="cls-1"
-          d="M56.86809,25.12655h.80759l.1346.94219h.06677a2.00568,2.00568,0,0,1,.83409-.84045,2.37269,2.37269,0,0,1,1.05029-.23528,2.14389,2.14389,0,0,1,1.18384.336,2.37008,2.37008,0,0,1,.83409.94219h.06783a2.25262,2.25262,0,0,1,.92841-.96869,2.69067,2.69067,0,0,1,1.29194-.30947,2.31173,2.31173,0,0,1,.94219.195,2.25742,2.25742,0,0,1,.77368.55853,2.62232,2.62232,0,0,1,.51826.88814,3.49864,3.49864,0,0,1,.18865,1.18384v4.3061h-1.01v-4.3061a1.9851,1.9851,0,0,0-.45042-1.4,1.52165,1.52165,0,0,0-1.1637-.48435,1.56955,1.56955,0,0,0-.66028.142,1.63624,1.63624,0,0,0-.53839.39638,1.8526,1.8526,0,0,0-.35611.5988,2.11158,2.11158,0,0,0-.12824.74719v4.3061h-1.009v-4.3061a1.98506,1.98506,0,0,0-.45043-1.4,1.52233,1.52233,0,0,0-1.16475-.48435,1.50178,1.50178,0,0,0-.63166.142,1.62552,1.62552,0,0,0-.5384.39638,2.07492,2.07492,0,0,0-.37094.5988,1.962,1.962,0,0,0-.141.74719v4.3061h-1.009Z"/>
-    <path class="cls-1"
-          d="M68.39055,25.12655h.80759l.1346.94219h.06677a2.34585,2.34585,0,0,1,.93583-.79381,3.313,3.313,0,0,1,2.56374-.04664,2.60919,2.60919,0,0,1,.95491.69949,3.36014,3.36014,0,0,1,.63272,1.1372,5.43759,5.43759,0,0,1,0,3.12227,3.36014,3.36014,0,0,1-.63272,1.1372,2.60908,2.60908,0,0,1-.95491.69949,3.06349,3.06349,0,0,1-1.21139.23529,2.92848,2.92848,0,0,1-1.31949-.27556,2.53882,2.53882,0,0,1-.90086-.7334h-.06783v3.02508h-1.009ZM71.55309,31.317a1.96128,1.96128,0,0,0,1.56114-.68571,2.99146,2.99146,0,0,0,.59138-2.0052,2.99149,2.99149,0,0,0-.59138-2.00521,2.11774,2.11774,0,0,0-3.12227,0,2.98588,2.98588,0,0,0-.59245,2.00521,2.98585,2.98585,0,0,0,.59245,2.0052A1.95829,1.95829,0,0,0,71.55309,31.317Z"/>
-    <path class="cls-1"
-          d="M79.36143,32.25923a3.5076,3.5076,0,0,1-1.30571-.23529,2.72284,2.72284,0,0,1-1.01638-.69949,3.34727,3.34727,0,0,1-.66558-1.1372,4.60854,4.60854,0,0,1-.2427-1.56113A4.6949,4.6949,0,0,1,76.3674,27.065a3.25231,3.25231,0,0,1,.65922-1.1372,2.73334,2.73334,0,0,1,1.0026-.69949A3.32709,3.32709,0,0,1,79.2936,24.993a3.047,3.047,0,0,1,1.4.302,3.11509,3.11509,0,0,1,.98882.7811,3.1694,3.1694,0,0,1,.585,1.04923,3.49088,3.49088,0,0,1,.18865,1.09693,2.59583,2.59583,0,0,1-.01271.2692c-.00954.08055-.018.15262-.02756.21515-.00848.07206-.018.13459-.0265.18865H77.14108a2.58155,2.58155,0,0,0,.67935,1.81655,2.13015,2.13015,0,0,0,1.541.60516,1.9818,1.9818,0,0,0,1.81655-1.009h1.07679a2.79418,2.79418,0,0,1-1.11706,1.46045A3.22194,3.22194,0,0,1,79.36143,32.25923Zm2.08575-4.23934a2.3453,2.3453,0,0,0-.69949-1.54735,2.23134,2.23134,0,0,0-2.90712,0,2.33547,2.33547,0,0,0-.69949,1.54735Z"/>
-    <path class="cls-1"
-          d="M84.99393,31.63392a1.70429,1.70429,0,0,1-.49176-1.258V26.06874H83.42538v-.94219h1.07679l.1346-1.88332h.87542v1.88332h1.81655v.94219H85.51219V30.3759a.77962.77962,0,0,0,.80653.80654h1.01v.94219H86.25195A1.70186,1.70186,0,0,1,84.99393,31.63392Z"/>
-    <path class="cls-1"
-          d="M91.58563,32.25923a3.50769,3.50769,0,0,1-1.30572-.23529,2.723,2.723,0,0,1-1.01638-.69949,3.34741,3.34741,0,0,1-.66557-1.1372,4.6083,4.6083,0,0,1-.2427-1.56113A4.6949,4.6949,0,0,1,88.5916,27.065a3.25231,3.25231,0,0,1,.65922-1.1372,2.73334,2.73334,0,0,1,1.0026-.69949A3.32709,3.32709,0,0,1,91.5178,24.993a3.047,3.047,0,0,1,1.4.302,3.11509,3.11509,0,0,1,.98882.7811,3.1694,3.1694,0,0,1,.585,1.04923,3.49088,3.49088,0,0,1,.18865,1.09693,2.59288,2.59288,0,0,1-.01272.2692c-.00953.08055-.018.15262-.02755.21515-.00848.07206-.018.13459-.0265.18865H89.36528a2.58155,2.58155,0,0,0,.67935,1.81655,2.13015,2.13015,0,0,0,1.541.60516,1.9818,1.9818,0,0,0,1.81655-1.009H94.479a2.79418,2.79418,0,0,1-1.11706,1.46045A3.22194,3.22194,0,0,1,91.58563,32.25923Zm2.08575-4.23934a2.3453,2.3453,0,0,0-.69949-1.54735,2.23134,2.23134,0,0,0-2.90712,0,2.33547,2.33547,0,0,0-.69949,1.54735Z"/>
-    <path class="cls-1"
-          d="M96.3745,25.12655h.8076l.13459.94219h.06677a1.9014,1.9014,0,0,1,.90828-.84045,2.84328,2.84328,0,0,1,1.11071-.23528,2.68728,2.68728,0,0,1,1.02909.195,2.43164,2.43164,0,0,1,.83409.55853,2.53811,2.53811,0,0,1,.55854.88814,3.27437,3.27437,0,0,1,.20242,1.18384v4.3061h-1.009v-4.3061a1.88054,1.88054,0,0,0-.49176-1.4,1.71981,1.71981,0,0,0-1.258-.48435,1.8029,1.8029,0,0,0-.74718.15474,2.014,2.014,0,0,0-.59881.41121,1.815,1.815,0,0,0-.39744.59881,1.88894,1.88894,0,0,0-.141.71963v4.3061h-1.009Z"/>
-    <path class="cls-1"
-          d="M104.7764,31.63392a1.7043,1.7043,0,0,1-.49177-1.258V26.06874h-1.07679v-.94219h1.07679l.1346-1.88332h.87542v1.88332h1.81656v.94219h-1.81656V30.3759a.77964.77964,0,0,0,.80654.80654h1.01v.94219h-1.07679A1.70184,1.70184,0,0,1,104.7764,31.63392Z"/>
-    <path class="cls-1"
-          d="M115.14105,32.25923a3.0872,3.0872,0,0,1-1.35234-.28192,2.34409,2.34409,0,0,1-.93478-.79487h-.06783l-.1346.94219h-.80759v-8.8814h1.01V26.002h.06677a2.54267,2.54267,0,0,1,.90192-.7334,2.91289,2.91289,0,0,1,1.31843-.27556,3.05625,3.05625,0,0,1,1.21139.23528,2.61284,2.61284,0,0,1,.956.69949,3.37627,3.37627,0,0,1,.63166,1.1372,5.43736,5.43736,0,0,1,0,3.12227,3.37627,3.37627,0,0,1-.63166,1.1372,2.61273,2.61273,0,0,1-.956.69949A3.05608,3.05608,0,0,1,115.14105,32.25923Zm-.1346-.9422a1.95833,1.95833,0,0,0,1.56114-.68571,2.98585,2.98585,0,0,0,.59245-2.0052,2.98588,2.98588,0,0,0-.59245-2.00521,2.11774,2.11774,0,0,0-3.12227,0,2.99144,2.99144,0,0,0-.59139,2.00521,2.99141,2.99141,0,0,0,.59139,2.0052A1.96127,1.96127,0,0,0,115.00645,31.317Z"/>
-    <path class="cls-1"
-          d="M120.392,24.19429a.69831.69831,0,0,1-.50448-.20136.66738.66738,0,0,1-.20878-.49813.69925.69925,0,0,1,.20242-.50448.68231.68231,0,0,1,.51084-.20878.66738.66738,0,0,1,.49813.20878.69925.69925,0,0,1,.20242.50448.68177.68177,0,0,1-.20242.49071A.66349.66349,0,0,1,120.392,24.19429Zm-.51084.93226h1.009v6.99808h-1.009Z"/>
-    <path class="cls-1" d="M123.03591,23.24323h1.01v8.8814h-1.01Z"/>
-    <path class="cls-1"
-          d="M128.79071,32.25923a3.05086,3.05086,0,0,1-1.21033-.23529,2.604,2.604,0,0,1-.956-.69949,3.36014,3.36014,0,0,1-.63272-1.1372,5.43759,5.43759,0,0,1,0-3.12227,3.36014,3.36014,0,0,1,.63272-1.1372,2.6041,2.6041,0,0,1,.956-.69949,3.051,3.051,0,0,1,1.21033-.23528,2.91444,2.91444,0,0,1,1.31949.27556,2.53874,2.53874,0,0,1,.90086.7334h.06783V23.24323h1.009v8.8814h-.80759l-.1346-.94219h-.06677a2.34,2.34,0,0,1-.93583.79487A3.084,3.084,0,0,1,128.79071,32.25923Zm.1346-.9422a1.95829,1.95829,0,0,0,1.56113-.68571,2.98585,2.98585,0,0,0,.59245-2.0052,2.98588,2.98588,0,0,0-.59245-2.00521,2.11772,2.11772,0,0,0-3.12226,0,2.99144,2.99144,0,0,0-.59139,2.00521,2.99141,2.99141,0,0,0,.59139,2.0052A1.96124,1.96124,0,0,0,128.92531,31.317Z"/>
-    <path class="cls-1"
-          d="M137.11233,32.25923a3.50763,3.50763,0,0,1-1.30571-.23529,2.72284,2.72284,0,0,1-1.01638-.69949,3.34743,3.34743,0,0,1-.66558-1.1372,4.60854,4.60854,0,0,1-.2427-1.56113,4.6949,4.6949,0,0,1,.23634-1.56114,3.25231,3.25231,0,0,1,.65922-1.1372,2.73334,2.73334,0,0,1,1.0026-.69949,3.32709,3.32709,0,0,1,1.26438-.23528,3.047,3.047,0,0,1,1.4.302,3.11524,3.11524,0,0,1,.98883.7811,3.16955,3.16955,0,0,1,.585,1.04923,3.49088,3.49088,0,0,1,.18865,1.09693,2.59583,2.59583,0,0,1-.01271.2692c-.00954.08055-.018.15262-.02756.21515-.00848.07206-.018.13459-.0265.18865H134.892a2.58155,2.58155,0,0,0,.67935,1.81655,2.13015,2.13015,0,0,0,1.541.60516,1.9818,1.9818,0,0,0,1.81655-1.009h1.0768a2.79424,2.79424,0,0,1-1.11707,1.46045A3.22194,3.22194,0,0,1,137.11233,32.25923Zm2.08575-4.23934a2.3453,2.3453,0,0,0-.69949-1.54735,2.23134,2.23134,0,0,0-2.90712,0,2.33547,2.33547,0,0,0-.69949,1.54735Z"/>
-    <path class="cls-1"
-          d="M141.74294,25.12655h.80759l.1346.94219h.06677a1.90132,1.90132,0,0,1,.90828-.84045,2.84327,2.84327,0,0,1,1.1107-.23528,2.68734,2.68734,0,0,1,1.0291.195,2.43174,2.43174,0,0,1,.83409.55853,2.53823,2.53823,0,0,1,.55853.88814,3.27415,3.27415,0,0,1,.20243,1.18384v4.3061h-1.009v-4.3061a1.88054,1.88054,0,0,0-.49177-1.4,1.71979,1.71979,0,0,0-1.258-.48435,1.8029,1.8029,0,0,0-.74718.15474,2.01427,2.01427,0,0,0-.59881.41121,1.81485,1.81485,0,0,0-.39743.59881,1.88875,1.88875,0,0,0-.141.71963v4.3061h-1.009Z"/>
-    <rect class="cls-1" x="42.62491" y="2.59971" width="2.63263" height="15.22942"/>
+  <svg
+    data-name="Ebene 1"
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 147.39503 34.72434"
+    id="Ebene_1">
+    <circle
+      class="cls-1"
+      cx="17.36217"
+      cy="17.36217"
+      r="17.36217"/>
+    <path
+      class="cls-1"
+      d="M52.4432,8.634a4.55121,4.55121,0,0,0-.89344-1.506,3.95842,3.95842,0,0,0-1.37354-.97187,4.42834,4.42834,0,0,0-1.7625-.34656,4.00352,4.00352,0,0,0-1.80914.40273,3.454,3.454,0,0,0-1.30783,1.14356h-.03922V2.59971H42.62491V17.82914h2.63262V10.86921a3.046,3.046,0,0,1,.17382-1.03228,2.49255,2.49255,0,0,1,.49812-.8468,2.33973,2.33973,0,0,1,.79169-.56277,2.52558,2.52558,0,0,1,1.03016-.20561,2.30456,2.30456,0,0,1,1.72223.68041,2.663,2.663,0,0,1,.66028,1.9236v7.00338h2.63262V10.60425A5.72892,5.72892,0,0,0,52.4432,8.634Z"/>
+    <path
+      class="cls-1"
+      d="M65.73936,9.3865a5.357,5.357,0,0,0-1.081-1.8494A5.22188,5.22188,0,0,0,62.9096,6.278a5.72948,5.72948,0,0,0-2.37084-.46844,6.03155,6.03155,0,0,0-2.26911.41333,4.92935,4.92935,0,0,0-1.7625,1.19125,5.3972,5.3972,0,0,0-1.13508,1.91618,7.81512,7.81512,0,0,0-.40062,2.59977,7.81313,7.81313,0,0,0,.40062,2.59872A5.37548,5.37548,0,0,0,56.50715,16.445a4.91636,4.91636,0,0,0,1.7837,1.19338,6.37091,6.37091,0,0,0,2.33587.41121,6.1752,6.1752,0,0,0,1.95857-.29039,5.0312,5.0312,0,0,0,1.51557-.7917,4.95493,4.95493,0,0,0,1.09162-1.17005,5.74691,5.74691,0,0,0,.69-1.42442l.02013-.06041H63.05586l-.01378.01908a4.05,4.05,0,0,1-.95067.939,2.503,2.503,0,0,1-1.44243.3667,2.73105,2.73105,0,0,1-2.07515-.81289,3.29407,3.29407,0,0,1-.85635-2.07515h8.272l.00636-.03922c.01378-.089.02861-.19183.04345-.31053.01484-.1028.02968-.22151.04451-.354a4.07907,4.07907,0,0,0,.02332-.44725A6.72183,6.72183,0,0,0,65.73936,9.3865Zm-5.2006-1.16475a2.61117,2.61117,0,0,1,1.94373.71538,3.20654,3.20654,0,0,1,.87224,1.73071H57.7249a3.3678,3.3678,0,0,1,.94643-1.77416A2.62777,2.62777,0,0,1,60.53876,8.22175Z"/>
+    <path
+      class="cls-1"
+      d="M79.14786,9.29748A5.456,5.456,0,0,0,78.0912,7.38236a4.5326,4.5326,0,0,0-1.61836-1.17112,5.23851,5.23851,0,0,0-2.072-.40167,4.12277,4.12277,0,0,0-2.06667.50342,4.59474,4.59474,0,0,0-1.37884,1.1531h-.05088l-.32431-1.4-.00741-.036h-2.1822V21.37068h2.63368v-4.8674h.03816a2.65765,2.65765,0,0,0,.45891.5066,3.83135,3.83135,0,0,0,.74824.514,4.59617,4.59617,0,0,0,.97081.38048,4.44481,4.44481,0,0,0,1.16051.1452,5.23834,5.23834,0,0,0,2.072-.40168,4.53245,4.53245,0,0,0,1.61836-1.17111,5.43932,5.43932,0,0,0,1.05666-1.91512,8.40143,8.40143,0,0,0,.37942-2.63157A8.41306,8.41306,0,0,0,79.14786,9.29748ZM73.95891,8.22175a2.87335,2.87335,0,0,1,1.14144.22786,2.62129,2.62129,0,0,1,.93266.68359,3.25549,3.25549,0,0,1,.63166,1.15522,5.2844,5.2844,0,0,1,.22892,1.64168,5.29386,5.29386,0,0,1-.22892,1.64169,3.25948,3.25948,0,0,1-.63166,1.15415,2.59368,2.59368,0,0,1-.93266.6836,2.97289,2.97289,0,0,1-2.28288,0,2.59373,2.59373,0,0,1-.93265-.6836,3.277,3.277,0,0,1-.63166-1.15521,5.28178,5.28178,0,0,1-.22893-1.64063,5.28409,5.28409,0,0,1,.22893-1.64168,3.27711,3.27711,0,0,1,.63166-1.15522,2.62134,2.62134,0,0,1,.93265-.68359A2.87342,2.87342,0,0,1,73.95891,8.22175Z"/>
+    <path
+      class="cls-1"
+      d="M42.61643,23.24323h1.01v5.18046l3.29714-3.29714h1.27816L44.77,28.55829l3.63311,3.56634H47.125l-3.49851-3.43174v3.43174h-1.01Z"/>
+    <path
+      class="cls-1"
+      d="M52.01023,32.25923a3.50763,3.50763,0,0,1-1.30571-.23529,2.72284,2.72284,0,0,1-1.01638-.69949,3.34743,3.34743,0,0,1-.66558-1.1372,5.14225,5.14225,0,0,1,0-3.12227,3.34743,3.34743,0,0,1,.66558-1.1372,2.723,2.723,0,0,1,1.01638-.69949,3.72016,3.72016,0,0,1,2.604,0,2.69623,2.69623,0,0,1,1.02274.69949,3.34936,3.34936,0,0,1,.66663,1.1372,5.16374,5.16374,0,0,1,0,3.12227,3.34936,3.34936,0,0,1-.66663,1.1372,2.69611,2.69611,0,0,1-1.02274.69949A3.52016,3.52016,0,0,1,52.01023,32.25923Zm0-.9422a2.21008,2.21008,0,0,0,.88814-.17487,1.92179,1.92179,0,0,0,.69949-.51826,2.489,2.489,0,0,0,.46421-.84044,4.05861,4.05861,0,0,0,0-2.31468,2.50459,2.50459,0,0,0-.46421-.84151,1.93408,1.93408,0,0,0-.69949-.51826,2.3428,2.3428,0,0,0-1.77628,0,1.94676,1.94676,0,0,0-.70055.51826,2.50476,2.50476,0,0,0-.46421.84151,4.08323,4.08323,0,0,0,0,2.31468,2.48917,2.48917,0,0,0,.46421.84044,1.93431,1.93431,0,0,0,.70055.51826A2.21008,2.21008,0,0,0,52.01023,31.317Z"/>
+    <path
+      class="cls-1"
+      d="M56.86809,25.12655h.80759l.1346.94219h.06677a2.00568,2.00568,0,0,1,.83409-.84045,2.37269,2.37269,0,0,1,1.05029-.23528,2.14389,2.14389,0,0,1,1.18384.336,2.37008,2.37008,0,0,1,.83409.94219h.06783a2.25262,2.25262,0,0,1,.92841-.96869,2.69067,2.69067,0,0,1,1.29194-.30947,2.31173,2.31173,0,0,1,.94219.195,2.25742,2.25742,0,0,1,.77368.55853,2.62232,2.62232,0,0,1,.51826.88814,3.49864,3.49864,0,0,1,.18865,1.18384v4.3061h-1.01v-4.3061a1.9851,1.9851,0,0,0-.45042-1.4,1.52165,1.52165,0,0,0-1.1637-.48435,1.56955,1.56955,0,0,0-.66028.142,1.63624,1.63624,0,0,0-.53839.39638,1.8526,1.8526,0,0,0-.35611.5988,2.11158,2.11158,0,0,0-.12824.74719v4.3061h-1.009v-4.3061a1.98506,1.98506,0,0,0-.45043-1.4,1.52233,1.52233,0,0,0-1.16475-.48435,1.50178,1.50178,0,0,0-.63166.142,1.62552,1.62552,0,0,0-.5384.39638,2.07492,2.07492,0,0,0-.37094.5988,1.962,1.962,0,0,0-.141.74719v4.3061h-1.009Z"/>
+    <path
+      class="cls-1"
+      d="M68.39055,25.12655h.80759l.1346.94219h.06677a2.34585,2.34585,0,0,1,.93583-.79381,3.313,3.313,0,0,1,2.56374-.04664,2.60919,2.60919,0,0,1,.95491.69949,3.36014,3.36014,0,0,1,.63272,1.1372,5.43759,5.43759,0,0,1,0,3.12227,3.36014,3.36014,0,0,1-.63272,1.1372,2.60908,2.60908,0,0,1-.95491.69949,3.06349,3.06349,0,0,1-1.21139.23529,2.92848,2.92848,0,0,1-1.31949-.27556,2.53882,2.53882,0,0,1-.90086-.7334h-.06783v3.02508h-1.009ZM71.55309,31.317a1.96128,1.96128,0,0,0,1.56114-.68571,2.99146,2.99146,0,0,0,.59138-2.0052,2.99149,2.99149,0,0,0-.59138-2.00521,2.11774,2.11774,0,0,0-3.12227,0,2.98588,2.98588,0,0,0-.59245,2.00521,2.98585,2.98585,0,0,0,.59245,2.0052A1.95829,1.95829,0,0,0,71.55309,31.317Z"/>
+    <path
+      class="cls-1"
+      d="M79.36143,32.25923a3.5076,3.5076,0,0,1-1.30571-.23529,2.72284,2.72284,0,0,1-1.01638-.69949,3.34727,3.34727,0,0,1-.66558-1.1372,4.60854,4.60854,0,0,1-.2427-1.56113A4.6949,4.6949,0,0,1,76.3674,27.065a3.25231,3.25231,0,0,1,.65922-1.1372,2.73334,2.73334,0,0,1,1.0026-.69949A3.32709,3.32709,0,0,1,79.2936,24.993a3.047,3.047,0,0,1,1.4.302,3.11509,3.11509,0,0,1,.98882.7811,3.1694,3.1694,0,0,1,.585,1.04923,3.49088,3.49088,0,0,1,.18865,1.09693,2.59583,2.59583,0,0,1-.01271.2692c-.00954.08055-.018.15262-.02756.21515-.00848.07206-.018.13459-.0265.18865H77.14108a2.58155,2.58155,0,0,0,.67935,1.81655,2.13015,2.13015,0,0,0,1.541.60516,1.9818,1.9818,0,0,0,1.81655-1.009h1.07679a2.79418,2.79418,0,0,1-1.11706,1.46045A3.22194,3.22194,0,0,1,79.36143,32.25923Zm2.08575-4.23934a2.3453,2.3453,0,0,0-.69949-1.54735,2.23134,2.23134,0,0,0-2.90712,0,2.33547,2.33547,0,0,0-.69949,1.54735Z"/>
+    <path
+      class="cls-1"
+      d="M84.99393,31.63392a1.70429,1.70429,0,0,1-.49176-1.258V26.06874H83.42538v-.94219h1.07679l.1346-1.88332h.87542v1.88332h1.81655v.94219H85.51219V30.3759a.77962.77962,0,0,0,.80653.80654h1.01v.94219H86.25195A1.70186,1.70186,0,0,1,84.99393,31.63392Z"/>
+    <path
+      class="cls-1"
+      d="M91.58563,32.25923a3.50769,3.50769,0,0,1-1.30572-.23529,2.723,2.723,0,0,1-1.01638-.69949,3.34741,3.34741,0,0,1-.66557-1.1372,4.6083,4.6083,0,0,1-.2427-1.56113A4.6949,4.6949,0,0,1,88.5916,27.065a3.25231,3.25231,0,0,1,.65922-1.1372,2.73334,2.73334,0,0,1,1.0026-.69949A3.32709,3.32709,0,0,1,91.5178,24.993a3.047,3.047,0,0,1,1.4.302,3.11509,3.11509,0,0,1,.98882.7811,3.1694,3.1694,0,0,1,.585,1.04923,3.49088,3.49088,0,0,1,.18865,1.09693,2.59288,2.59288,0,0,1-.01272.2692c-.00953.08055-.018.15262-.02755.21515-.00848.07206-.018.13459-.0265.18865H89.36528a2.58155,2.58155,0,0,0,.67935,1.81655,2.13015,2.13015,0,0,0,1.541.60516,1.9818,1.9818,0,0,0,1.81655-1.009H94.479a2.79418,2.79418,0,0,1-1.11706,1.46045A3.22194,3.22194,0,0,1,91.58563,32.25923Zm2.08575-4.23934a2.3453,2.3453,0,0,0-.69949-1.54735,2.23134,2.23134,0,0,0-2.90712,0,2.33547,2.33547,0,0,0-.69949,1.54735Z"/>
+    <path
+      class="cls-1"
+      d="M96.3745,25.12655h.8076l.13459.94219h.06677a1.9014,1.9014,0,0,1,.90828-.84045,2.84328,2.84328,0,0,1,1.11071-.23528,2.68728,2.68728,0,0,1,1.02909.195,2.43164,2.43164,0,0,1,.83409.55853,2.53811,2.53811,0,0,1,.55854.88814,3.27437,3.27437,0,0,1,.20242,1.18384v4.3061h-1.009v-4.3061a1.88054,1.88054,0,0,0-.49176-1.4,1.71981,1.71981,0,0,0-1.258-.48435,1.8029,1.8029,0,0,0-.74718.15474,2.014,2.014,0,0,0-.59881.41121,1.815,1.815,0,0,0-.39744.59881,1.88894,1.88894,0,0,0-.141.71963v4.3061h-1.009Z"/>
+    <path
+      class="cls-1"
+      d="M104.7764,31.63392a1.7043,1.7043,0,0,1-.49177-1.258V26.06874h-1.07679v-.94219h1.07679l.1346-1.88332h.87542v1.88332h1.81656v.94219h-1.81656V30.3759a.77964.77964,0,0,0,.80654.80654h1.01v.94219h-1.07679A1.70184,1.70184,0,0,1,104.7764,31.63392Z"/>
+    <path
+      class="cls-1"
+      d="M115.14105,32.25923a3.0872,3.0872,0,0,1-1.35234-.28192,2.34409,2.34409,0,0,1-.93478-.79487h-.06783l-.1346.94219h-.80759v-8.8814h1.01V26.002h.06677a2.54267,2.54267,0,0,1,.90192-.7334,2.91289,2.91289,0,0,1,1.31843-.27556,3.05625,3.05625,0,0,1,1.21139.23528,2.61284,2.61284,0,0,1,.956.69949,3.37627,3.37627,0,0,1,.63166,1.1372,5.43736,5.43736,0,0,1,0,3.12227,3.37627,3.37627,0,0,1-.63166,1.1372,2.61273,2.61273,0,0,1-.956.69949A3.05608,3.05608,0,0,1,115.14105,32.25923Zm-.1346-.9422a1.95833,1.95833,0,0,0,1.56114-.68571,2.98585,2.98585,0,0,0,.59245-2.0052,2.98588,2.98588,0,0,0-.59245-2.00521,2.11774,2.11774,0,0,0-3.12227,0,2.99144,2.99144,0,0,0-.59139,2.00521,2.99141,2.99141,0,0,0,.59139,2.0052A1.96127,1.96127,0,0,0,115.00645,31.317Z"/>
+    <path
+      class="cls-1"
+      d="M120.392,24.19429a.69831.69831,0,0,1-.50448-.20136.66738.66738,0,0,1-.20878-.49813.69925.69925,0,0,1,.20242-.50448.68231.68231,0,0,1,.51084-.20878.66738.66738,0,0,1,.49813.20878.69925.69925,0,0,1,.20242.50448.68177.68177,0,0,1-.20242.49071A.66349.66349,0,0,1,120.392,24.19429Zm-.51084.93226h1.009v6.99808h-1.009Z"/>
+    <path
+      class="cls-1"
+      d="M123.03591,23.24323h1.01v8.8814h-1.01Z"/>
+    <path
+      class="cls-1"
+      d="M128.79071,32.25923a3.05086,3.05086,0,0,1-1.21033-.23529,2.604,2.604,0,0,1-.956-.69949,3.36014,3.36014,0,0,1-.63272-1.1372,5.43759,5.43759,0,0,1,0-3.12227,3.36014,3.36014,0,0,1,.63272-1.1372,2.6041,2.6041,0,0,1,.956-.69949,3.051,3.051,0,0,1,1.21033-.23528,2.91444,2.91444,0,0,1,1.31949.27556,2.53874,2.53874,0,0,1,.90086.7334h.06783V23.24323h1.009v8.8814h-.80759l-.1346-.94219h-.06677a2.34,2.34,0,0,1-.93583.79487A3.084,3.084,0,0,1,128.79071,32.25923Zm.1346-.9422a1.95829,1.95829,0,0,0,1.56113-.68571,2.98585,2.98585,0,0,0,.59245-2.0052,2.98588,2.98588,0,0,0-.59245-2.00521,2.11772,2.11772,0,0,0-3.12226,0,2.99144,2.99144,0,0,0-.59139,2.00521,2.99141,2.99141,0,0,0,.59139,2.0052A1.96124,1.96124,0,0,0,128.92531,31.317Z"/>
+    <path
+      class="cls-1"
+      d="M137.11233,32.25923a3.50763,3.50763,0,0,1-1.30571-.23529,2.72284,2.72284,0,0,1-1.01638-.69949,3.34743,3.34743,0,0,1-.66558-1.1372,4.60854,4.60854,0,0,1-.2427-1.56113,4.6949,4.6949,0,0,1,.23634-1.56114,3.25231,3.25231,0,0,1,.65922-1.1372,2.73334,2.73334,0,0,1,1.0026-.69949,3.32709,3.32709,0,0,1,1.26438-.23528,3.047,3.047,0,0,1,1.4.302,3.11524,3.11524,0,0,1,.98883.7811,3.16955,3.16955,0,0,1,.585,1.04923,3.49088,3.49088,0,0,1,.18865,1.09693,2.59583,2.59583,0,0,1-.01271.2692c-.00954.08055-.018.15262-.02756.21515-.00848.07206-.018.13459-.0265.18865H134.892a2.58155,2.58155,0,0,0,.67935,1.81655,2.13015,2.13015,0,0,0,1.541.60516,1.9818,1.9818,0,0,0,1.81655-1.009h1.0768a2.79424,2.79424,0,0,1-1.11707,1.46045A3.22194,3.22194,0,0,1,137.11233,32.25923Zm2.08575-4.23934a2.3453,2.3453,0,0,0-.69949-1.54735,2.23134,2.23134,0,0,0-2.90712,0,2.33547,2.33547,0,0,0-.69949,1.54735Z"/>
+    <path
+      class="cls-1"
+      d="M141.74294,25.12655h.80759l.1346.94219h.06677a1.90132,1.90132,0,0,1,.90828-.84045,2.84327,2.84327,0,0,1,1.1107-.23528,2.68734,2.68734,0,0,1,1.0291.195,2.43174,2.43174,0,0,1,.83409.55853,2.53823,2.53823,0,0,1,.55853.88814,3.27415,3.27415,0,0,1,.20243,1.18384v4.3061h-1.009v-4.3061a1.88054,1.88054,0,0,0-.49177-1.4,1.71979,1.71979,0,0,0-1.258-.48435,1.8029,1.8029,0,0,0-.74718.15474,2.01427,2.01427,0,0,0-.59881.41121,1.81485,1.81485,0,0,0-.39743.59881,1.88875,1.88875,0,0,0-.141.71963v4.3061h-1.009Z"/>
+    <rect
+      class="cls-1"
+      x="42.62491"
+      y="2.59971"
+      width="2.63263"
+      height="15.22942"/>
   </svg>
 </template>
 
diff --git a/client/src/components/icons/ImageIcon.vue b/client/src/components/icons/ImageIcon.vue
index 7867dbdb..85f194c7 100644
--- a/client/src/components/icons/ImageIcon.vue
+++ b/client/src/components/icons/ImageIcon.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><title>image</title>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape"><title>image</title>
     <path
       d="M93,14.2H7a2,2,0,0,0-2,2v67.5a2,2,0,0,0,2,2H93a2,2,0,0,0,2-2V16.25A2,2,0,0,0,93,14.2ZM42.27,54.37,57.73,69.83a2.09,2.09,0,0,0,2.89,0,2,2,0,0,0,0-2.89l-7-7L67,45.24,90,68.38a2,2,0,0,0,.87.46V81.7H12.18ZM65.36,41,50.7,57l-6.9-6.9A2.05,2.05,0,0,0,41,50L9.09,79V18.3H90.91V63.47L68.26,40.82a2,2,0,0,0-1.47-.53A2.06,2.06,0,0,0,65.36,41Z"/>
     <path
diff --git a/client/src/components/icons/InfoIcon.vue b/client/src/components/icons/InfoIcon.vue
index 25a238c2..b6689aa1 100644
--- a/client/src/components/icons/InfoIcon.vue
+++ b/client/src/components/icons/InfoIcon.vue
@@ -1,8 +1,14 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape">
     <path
       d="M50,6.48A43.62,43.62,0,0,0,6.56,47.08S6.5,48.46,6.5,50s.06,2.83.06,2.92A43.52,43.52,0,1,0,50,6.48Zm0,82.15A38.62,38.62,0,1,1,88.6,50,38.67,38.67,0,0,1,50,88.62Z"/>
     <path d="M50,46.17a2.45,2.45,0,0,0-2.45,2.45V72.49a2.45,2.45,0,1,0,4.9,0V48.62A2.45,2.45,0,0,0,50,46.17Z"/>
-    <circle cx="50" cy="30.56" r="3.5"/>
+    <circle
+      cx="50"
+      cy="30.56"
+      r="3.5"/>
   </svg>
 </template>
diff --git a/client/src/components/icons/LinkIcon.vue b/client/src/components/icons/LinkIcon.vue
index 512278a5..2a8d23f8 100644
--- a/client/src/components/icons/LinkIcon.vue
+++ b/client/src/components/icons/LinkIcon.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><title>link</title>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape"><title>link</title>
     <path
       d="M85.13,14.88a19.12,19.12,0,0,0-27,0l-9.61,9.61a2.68,2.68,0,0,0,3.79,3.8l9.61-9.61A13.73,13.73,0,0,1,81.33,38.08L63.4,56A13.75,13.75,0,0,1,44,56a2.68,2.68,0,0,0-3.79,3.8,19.12,19.12,0,0,0,27,0L85.13,41.88a19.14,19.14,0,0,0,0-27Z"/>
     <path
diff --git a/client/src/components/icons/LoadingIcon.vue b/client/src/components/icons/LoadingIcon.vue
index 7b07d9e9..f7738222 100644
--- a/client/src/components/icons/LoadingIcon.vue
+++ b/client/src/components/icons/LoadingIcon.vue
@@ -1,5 +1,7 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100">
     <path
       d="M91,47.5A2.5,2.5,0,0,0,88.5,50,38.5,38.5,0,1,1,50,11.5,38.09,38.09,0,0,1,76,21.64H62.13a2.45,2.45,0,0,0,0,4.9H84.31V4.36a2.45,2.45,0,1,0-4.9,0V18A43,43,0,0,0,50,6.5,43.5,43.5,0,1,0,93.5,50,2.5,2.5,0,0,0,91,47.5Z"/>
   </svg>
diff --git a/client/src/components/icons/Logo.vue b/client/src/components/icons/Logo.vue
index 7af5b00a..d95953e0 100644
--- a/client/src/components/icons/Logo.vue
+++ b/client/src/components/icons/Logo.vue
@@ -1,24 +1,50 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 965 159" class="logo">
-    <path class="cls-1"
-          d="M187.19877,158.76991a44.9261,44.9261,0,0,1-14.89082-2.35518,49.72607,49.72607,0,0,1-13.37134-7.29346l-2.20323-1.67142,16.1064-25.831,2.73505,2.43115a16.48614,16.48614,0,0,0,4.55841,3.03894,12.27557,12.27557,0,0,0,4.40646.83572c3.03894,0,4.93828-1.06363,6.15386-3.57076l.83571-1.67141L156.27756,39.94731H194.3403l15.57457,43.53283,13.21939-43.53283h37.07507l-36.08742,93.21951c-3.41881,8.585-8.28111,15.11873-14.435,19.29728h0C203.60906,156.64265,196.0117,158.76991,187.19877,158.76991Zm-22.26024-12.9155a42.27771,42.27771,0,0,0,9.42072,4.78634,41.3796,41.3796,0,0,0,12.9155,2.05128c7.59735,0,13.97912-1.74739,19.06936-5.24217h0c5.09023-3.49479,9.1928-9.04084,12.15576-16.48625l32.7446-84.86243h-23.5518l-17.246,56.98015L190.08578,46.10118H165.62229l32.66862,76.8852-2.20323,4.17854c-2.20323,4.48243-6.22984,6.9136-11.62394,6.9136a18.75655,18.75655,0,0,1-6.76164-1.29155,22.3379,22.3379,0,0,1-3.49479-1.89934Z"/>
-    <path class="cls-1"
-          d="M142.0705,55.218a29.671,29.671,0,0,0-11.472-12.23174h0a35.49322,35.49322,0,0,0-35.09977.83571A30.81285,30.81285,0,0,0,86.23,53.09073a29.93237,29.93237,0,0,0-8.8889-9.11682A32.47292,32.47292,0,0,0,59.03143,38.8077a33.62833,33.62833,0,0,0-16.25834,3.95063,32.37806,32.37806,0,0,0-6.15385,4.40646V40.02328H0v88.20527H36.61924V84.54377c0-4.0266.91168-7.14151,2.887-9.57267a9.08143,9.08143,0,0,1,7.06555-3.41881,7.19568,7.19568,0,0,1,5.92593,2.58309c1.59545,1.82336,2.35519,4.40647,2.35519,7.67333v46.34386H91.47214V84.54377c0-4.0266.91168-7.21749,2.811-9.57267a8.59712,8.59712,0,0,1,6.9136-3.34284,7.1957,7.1957,0,0,1,5.92594,2.5831c1.59545,1.82336,2.35518,4.40647,2.35518,7.67333v46.34386h36.61924V73.14774A40.46686,40.46686,0,0,0,142.0705,55.218Zm-2.20323,66.85671H115.55574v-40.266c0-4.71036-1.29155-8.661-3.79867-11.624a13.29891,13.29891,0,0,0-10.6363-4.71035h0a14.71867,14.71867,0,0,0-11.69992,5.698c-2.73505,3.49479-4.10256,7.97722-4.10256,13.37135v37.53093H61.00676v-40.266c0-4.71036-1.29155-8.661-3.79868-11.62395a13.29886,13.29886,0,0,0-10.63629-4.71036h0a14.874,14.874,0,0,0-11.69993,5.622c-2.811,3.49478-4.25451,7.97722-4.25451,13.37134v37.53092H6.30582V46.0252H30.61735V59.85238H34.568l1.67141-2.65907a26.852,26.852,0,0,1,9.57267-9.11683A27.91925,27.91925,0,0,1,59.10742,44.8856a26.47638,26.47638,0,0,1,14.89082,4.17854A23.86631,23.86631,0,0,1,83.267,60.76407l.37987.91168h4.93828L88.889,60.916A27.95184,27.95184,0,0,1,126.0401,47.54467c.53181.22792.98766.53181,1.51947.75974a22.60065,22.60065,0,0,1,9.04085,9.64863,32.40876,32.40876,0,0,1,3.26686,15.04276Z"/>
-    <path class="cls-1"
-          d="M360.27637,63.88867h-.00049c-8.79639-5.28613-20.01465-7.7207-29.91211-9.86816-12.25732-2.66016-22.84229-4.95606-22.84229-11.85254,0-4.76172,3.2959-10.4375,18.99707-10.4375,10.56348,0,21.68165,3.09668,33.04541,9.20215l.33692.18066,10.70361-25.7959-.2622-.15234c-11.499-6.666-27.40967-10.48926-43.65284-10.48926-16.82812,0-30.69433,3.96973-40.10058,11.48047a34.38057,34.38057,0,0,0-13.31055,27.72363c0,12.0918,4.93555,20.9834,15.08936,27.18262,8.73877,5.333,19.92431,7.832,29.793,10.03711,12.4795,2.78711,23.24659,5.19141,23.24659,12.42187,0,6.24414-6.44922,9.41016-19.168,9.41016a75.23455,75.23455,0,0,1-39.35205-11.75293l-.34033-.22559-11.40967,25.627.23437.16406c11.54395,8.04395,31.44336,13.24219,50.6958,13.24219,16.77,0,30.63672-4.00684,40.10108-11.58789A34.60313,34.60313,0,0,0,375.479,90.95312C375.479,78.88672,370.50635,70.03418,360.27637,63.88867Z"/>
-    <path class="cls-1"
-          d="M452.96851,77.98757l37.01587-38.16839H451.21527L421.62593,68.64681V7.84824H389.22977V128.48585h32.39616V106.62707l7.86292-8.003,23.88936,29.86182H492.7151Z"/>
-    <rect class="cls-1" x="500.00637" y="39.81918" width="32.39617" height="88.66666"/>
-    <rect class="cls-1" x="551.47678" y="7.84824" width="32.39617" height="120.63761"/>
-    <rect class="cls-1" x="602.9472" y="7.84824" width="32.39617" height="120.63761"/>
-    <path class="cls-1"
-          d="M709.94,38.3811c-9.53615,0-17.30258,2.56053-23.12619,7.61709v-38.15H654.41762V128.48585h30.9576v-7.05418c5.79209,5.70967,13.85913,8.49275,24.56476,8.49275a42.82556,42.82556,0,0,0,30.79226-12.38954c8.33566-8.422,12.74155-20.02118,12.74155-33.54237,0-13.44264-4.40686-24.96622-12.74445-33.32515C732.82666,42.74481,721.89218,38.3811,709.94,38.3811Zm-6.39428,65.38143c-10.45545,0-17.211-7.76012-17.211-19.77,0-11.81546,6.7555-19.44953,17.211-19.44953,10.45593,0,17.21191,7.63407,17.21191,19.44953C720.75761,96.00241,714.00163,103.76253,703.5457,103.76253Z"/>
-    <path class="cls-1"
-          d="M847.31484,51.174c-9.04355-8.24935-21.78266-12.79294-35.87065-12.79294-28.92944,0-49.92712,19.18237-49.92712,45.61141,0,26.61474,20.99768,45.93191,49.92712,45.93191,14.08605,0,26.82614-4.58,35.87307-12.89573,9.06342-8.3308,14.055-20.06336,14.055-33.03618C861.37228,71.09873,856.37971,59.44326,847.31484,51.174Zm-35.87065,52.58849c-10.45544,0-17.211-7.76012-17.211-19.77,0-11.81546,6.75551-19.44953,17.211-19.44953,10.45593,0,17.21192,7.63407,17.21192,19.44953C828.65611,96.00241,821.90012,103.76253,811.44419,103.76253Z"/>
-    <polygon class="cls-1"
-             points="931.16 83.038 963.901 39.819 929.221 39.819 913.766 60.992 898.929 39.819 862.189 39.819 894.901 84.143 861.194 128.486 896.678 128.486 912.761 106.526 927.762 128.486 965 128.486 931.16 83.038"/>
-    <path class="cls-1"
-          d="M527.91913,4.4834a15.80713,15.80713,0,0,1,4.4834,11.64237,15.92237,15.92237,0,0,1-4.4834,11.64238c-2.96486,3.03714-6.86973,4.4834-11.64236,4.4834a16.09319,16.09319,0,0,1-11.7147-4.4834,15.5782,15.5782,0,0,1-4.5557-11.64238,15.69049,15.69049,0,0,1,4.5557-11.64237A16.09313,16.09313,0,0,1,516.27677,0C521.1217,0,524.95427,1.44626,527.91913,4.4834Z"/>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 965 159"
+    class="logo">
+    <path
+      class="cls-1"
+      d="M187.19877,158.76991a44.9261,44.9261,0,0,1-14.89082-2.35518,49.72607,49.72607,0,0,1-13.37134-7.29346l-2.20323-1.67142,16.1064-25.831,2.73505,2.43115a16.48614,16.48614,0,0,0,4.55841,3.03894,12.27557,12.27557,0,0,0,4.40646.83572c3.03894,0,4.93828-1.06363,6.15386-3.57076l.83571-1.67141L156.27756,39.94731H194.3403l15.57457,43.53283,13.21939-43.53283h37.07507l-36.08742,93.21951c-3.41881,8.585-8.28111,15.11873-14.435,19.29728h0C203.60906,156.64265,196.0117,158.76991,187.19877,158.76991Zm-22.26024-12.9155a42.27771,42.27771,0,0,0,9.42072,4.78634,41.3796,41.3796,0,0,0,12.9155,2.05128c7.59735,0,13.97912-1.74739,19.06936-5.24217h0c5.09023-3.49479,9.1928-9.04084,12.15576-16.48625l32.7446-84.86243h-23.5518l-17.246,56.98015L190.08578,46.10118H165.62229l32.66862,76.8852-2.20323,4.17854c-2.20323,4.48243-6.22984,6.9136-11.62394,6.9136a18.75655,18.75655,0,0,1-6.76164-1.29155,22.3379,22.3379,0,0,1-3.49479-1.89934Z"/>
+    <path
+      class="cls-1"
+      d="M142.0705,55.218a29.671,29.671,0,0,0-11.472-12.23174h0a35.49322,35.49322,0,0,0-35.09977.83571A30.81285,30.81285,0,0,0,86.23,53.09073a29.93237,29.93237,0,0,0-8.8889-9.11682A32.47292,32.47292,0,0,0,59.03143,38.8077a33.62833,33.62833,0,0,0-16.25834,3.95063,32.37806,32.37806,0,0,0-6.15385,4.40646V40.02328H0v88.20527H36.61924V84.54377c0-4.0266.91168-7.14151,2.887-9.57267a9.08143,9.08143,0,0,1,7.06555-3.41881,7.19568,7.19568,0,0,1,5.92593,2.58309c1.59545,1.82336,2.35519,4.40647,2.35519,7.67333v46.34386H91.47214V84.54377c0-4.0266.91168-7.21749,2.811-9.57267a8.59712,8.59712,0,0,1,6.9136-3.34284,7.1957,7.1957,0,0,1,5.92594,2.5831c1.59545,1.82336,2.35518,4.40647,2.35518,7.67333v46.34386h36.61924V73.14774A40.46686,40.46686,0,0,0,142.0705,55.218Zm-2.20323,66.85671H115.55574v-40.266c0-4.71036-1.29155-8.661-3.79867-11.624a13.29891,13.29891,0,0,0-10.6363-4.71035h0a14.71867,14.71867,0,0,0-11.69992,5.698c-2.73505,3.49479-4.10256,7.97722-4.10256,13.37135v37.53093H61.00676v-40.266c0-4.71036-1.29155-8.661-3.79868-11.62395a13.29886,13.29886,0,0,0-10.63629-4.71036h0a14.874,14.874,0,0,0-11.69993,5.622c-2.811,3.49478-4.25451,7.97722-4.25451,13.37134v37.53092H6.30582V46.0252H30.61735V59.85238H34.568l1.67141-2.65907a26.852,26.852,0,0,1,9.57267-9.11683A27.91925,27.91925,0,0,1,59.10742,44.8856a26.47638,26.47638,0,0,1,14.89082,4.17854A23.86631,23.86631,0,0,1,83.267,60.76407l.37987.91168h4.93828L88.889,60.916A27.95184,27.95184,0,0,1,126.0401,47.54467c.53181.22792.98766.53181,1.51947.75974a22.60065,22.60065,0,0,1,9.04085,9.64863,32.40876,32.40876,0,0,1,3.26686,15.04276Z"/>
+    <path
+      class="cls-1"
+      d="M360.27637,63.88867h-.00049c-8.79639-5.28613-20.01465-7.7207-29.91211-9.86816-12.25732-2.66016-22.84229-4.95606-22.84229-11.85254,0-4.76172,3.2959-10.4375,18.99707-10.4375,10.56348,0,21.68165,3.09668,33.04541,9.20215l.33692.18066,10.70361-25.7959-.2622-.15234c-11.499-6.666-27.40967-10.48926-43.65284-10.48926-16.82812,0-30.69433,3.96973-40.10058,11.48047a34.38057,34.38057,0,0,0-13.31055,27.72363c0,12.0918,4.93555,20.9834,15.08936,27.18262,8.73877,5.333,19.92431,7.832,29.793,10.03711,12.4795,2.78711,23.24659,5.19141,23.24659,12.42187,0,6.24414-6.44922,9.41016-19.168,9.41016a75.23455,75.23455,0,0,1-39.35205-11.75293l-.34033-.22559-11.40967,25.627.23437.16406c11.54395,8.04395,31.44336,13.24219,50.6958,13.24219,16.77,0,30.63672-4.00684,40.10108-11.58789A34.60313,34.60313,0,0,0,375.479,90.95312C375.479,78.88672,370.50635,70.03418,360.27637,63.88867Z"/>
+    <path
+      class="cls-1"
+      d="M452.96851,77.98757l37.01587-38.16839H451.21527L421.62593,68.64681V7.84824H389.22977V128.48585h32.39616V106.62707l7.86292-8.003,23.88936,29.86182H492.7151Z"/>
+    <rect
+      class="cls-1"
+      x="500.00637"
+      y="39.81918"
+      width="32.39617"
+      height="88.66666"/>
+    <rect
+      class="cls-1"
+      x="551.47678"
+      y="7.84824"
+      width="32.39617"
+      height="120.63761"/>
+    <rect
+      class="cls-1"
+      x="602.9472"
+      y="7.84824"
+      width="32.39617"
+      height="120.63761"/>
+    <path
+      class="cls-1"
+      d="M709.94,38.3811c-9.53615,0-17.30258,2.56053-23.12619,7.61709v-38.15H654.41762V128.48585h30.9576v-7.05418c5.79209,5.70967,13.85913,8.49275,24.56476,8.49275a42.82556,42.82556,0,0,0,30.79226-12.38954c8.33566-8.422,12.74155-20.02118,12.74155-33.54237,0-13.44264-4.40686-24.96622-12.74445-33.32515C732.82666,42.74481,721.89218,38.3811,709.94,38.3811Zm-6.39428,65.38143c-10.45545,0-17.211-7.76012-17.211-19.77,0-11.81546,6.7555-19.44953,17.211-19.44953,10.45593,0,17.21191,7.63407,17.21191,19.44953C720.75761,96.00241,714.00163,103.76253,703.5457,103.76253Z"/>
+    <path
+      class="cls-1"
+      d="M847.31484,51.174c-9.04355-8.24935-21.78266-12.79294-35.87065-12.79294-28.92944,0-49.92712,19.18237-49.92712,45.61141,0,26.61474,20.99768,45.93191,49.92712,45.93191,14.08605,0,26.82614-4.58,35.87307-12.89573,9.06342-8.3308,14.055-20.06336,14.055-33.03618C861.37228,71.09873,856.37971,59.44326,847.31484,51.174Zm-35.87065,52.58849c-10.45544,0-17.211-7.76012-17.211-19.77,0-11.81546,6.75551-19.44953,17.211-19.44953,10.45593,0,17.21192,7.63407,17.21192,19.44953C828.65611,96.00241,821.90012,103.76253,811.44419,103.76253Z"/>
+    <polygon
+      class="cls-1"
+      points="931.16 83.038 963.901 39.819 929.221 39.819 913.766 60.992 898.929 39.819 862.189 39.819 894.901 84.143 861.194 128.486 896.678 128.486 912.761 106.526 927.762 128.486 965 128.486 931.16 83.038"/>
+    <path
+      class="cls-1"
+      d="M527.91913,4.4834a15.80713,15.80713,0,0,1,4.4834,11.64237,15.92237,15.92237,0,0,1-4.4834,11.64238c-2.96486,3.03714-6.86973,4.4834-11.64236,4.4834a16.09319,16.09319,0,0,1-11.7147-4.4834,15.5782,15.5782,0,0,1-4.5557-11.64238,15.69049,15.69049,0,0,1,4.5557-11.64237A16.09313,16.09313,0,0,1,516.27677,0C521.1217,0,524.95427,1.44626,527.91913,4.4834Z"/>
   </svg>
 </template>
 
diff --git a/client/src/components/icons/NoteIcon.vue b/client/src/components/icons/NoteIcon.vue
index dd139bcf..c90afea7 100644
--- a/client/src/components/icons/NoteIcon.vue
+++ b/client/src/components/icons/NoteIcon.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg class="note-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    class="note-icon"
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100">
     <path
       d="M81.5,88.39746H18.7627a2.49981,2.49981,0,0,1-2.5-2.5V35.35352L1.72559,20.71191A2.50054,2.50054,0,0,1,3.5,16.4502h78a2.49981,2.49981,0,0,1,2.5,2.5V85.89746A2.49981,2.49981,0,0,1,81.5,88.39746Zm-60.2373-5H79V21.4502H9.50488L20.53711,32.56152a2.5013,2.5013,0,0,1,.72559,1.76172Z"/>
     <path d="M61.9209,40.92676H39.18457a2.5,2.5,0,0,1,0-5H61.9209a2.5,2.5,0,0,1,0,5Z"/>
diff --git a/client/src/components/icons/PenIcon.vue b/client/src/components/icons/PenIcon.vue
index 0409eced..0f3b896a 100644
--- a/client/src/components/icons/PenIcon.vue
+++ b/client/src/components/icons/PenIcon.vue
@@ -1,5 +1,7 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100">
     <path
       d="M39,85.69l.12.12L86.83,38.12a7.42,7.42,0,0,0,0-10.49L72.38,13.17a7.42,7.42,0,0,0-10.49,0L14.19,60.87l.12.12L11,89ZM65.86,17.15a1.8,1.8,0,0,1,2.54,0L82.85,31.6a1.8,1.8,0,0,1,0,2.54l-3.69,3.69-17-17ZM58.2,24.81l17,17L39.13,77.86l-17-17ZM19.38,66.05,33.95,80.62l-16.53,2Z"/>
   </svg>
diff --git a/client/src/components/icons/Play.vue b/client/src/components/icons/Play.vue
index ff5356bd..8829f83a 100644
--- a/client/src/components/icons/Play.vue
+++ b/client/src/components/icons/Play.vue
@@ -1,5 +1,9 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
-    <path d="M50,0a50,50,0,1,0,50,50A50,50,0,0,0,50,0ZM38,74V26L70,50Z" style="fill:#17a887"/>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100">
+    <path
+      d="M50,0a50,50,0,1,0,50,50A50,50,0,0,0,50,0ZM38,74V26L70,50Z"
+      style="fill:#17a887"/>
   </svg>
 </template>
diff --git a/client/src/components/icons/SpeechBubbleIcon.vue b/client/src/components/icons/SpeechBubbleIcon.vue
index cd46beeb..83698327 100644
--- a/client/src/components/icons/SpeechBubbleIcon.vue
+++ b/client/src/components/icons/SpeechBubbleIcon.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><title>q-a</title>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape"><title>q-a</title>
     <path
       d="M88.09,10h-38A12,12,0,0,0,38,21.88V33.11H12a12.07,12.07,0,0,0-12,12v22.4A12,12,0,0,0,12,79.39H47l10.87,10a2.5,2.5,0,0,0,1.67.67,2.38,2.38,0,0,0,1-.2A2.44,2.44,0,0,0,62,87.58V56.25H88.09a11.92,11.92,0,0,0,11.91-12V21.88A11.87,11.87,0,0,0,88.09,10ZM57,82l-7.41-6.83a2.49,2.49,0,0,0-1.65-.7H12A7,7,0,0,1,5,67.51V45.11a7.1,7.1,0,0,1,7.09-7H38V64.35a2.54,2.54,0,0,0,4.23,1.83l9.1-8.29L52,57.3c.49-.45,1-.92,1.21-1.05s.71,0,1.16,0H57ZM95,44.28a7,7,0,0,1-6.95,7H54.47c-3-.06-3.55.27-5.83,2.37-.19.17-.45.37-.68.58l-5,4.5V21.88a7.06,7.06,0,0,1,7.13-7h38a6.91,6.91,0,0,1,6.95,7Z"
       style="fill-rule:evenodd"/>
diff --git a/client/src/components/icons/TextIcon.vue b/client/src/components/icons/TextIcon.vue
index 1e7f53d4..3c194ecc 100644
--- a/client/src/components/icons/TextIcon.vue
+++ b/client/src/components/icons/TextIcon.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><title>text</title>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape"><title>text</title>
     <path
       d="M94.86,40.16a2.5,2.5,0,0,0-2.5,2.5v6.6a19.35,19.35,0,0,0-16.08-9.1c-11,0-19.92,9.95-19.92,22.17S65.29,84.5,76.28,84.5a19.35,19.35,0,0,0,16.08-9.1V82a2.5,2.5,0,0,0,5,0V42.66A2.5,2.5,0,0,0,94.86,40.16ZM76.28,79.5c-8.23,0-14.92-7.7-14.92-17.17s6.69-17.17,14.92-17.17S91.2,52.86,91.2,62.33,84.51,79.5,76.28,79.5Z"/>
     <path
diff --git a/client/src/components/icons/Tick.vue b/client/src/components/icons/Tick.vue
index e89a99ec..2144248a 100644
--- a/client/src/components/icons/Tick.vue
+++ b/client/src/components/icons/Tick.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape">
     <polygon points="41.46 77.72 10 46.26 16.89 39.37 41.46 63.93 83.11 22.28 90 29.18 41.46 77.72"/>
   </svg>
 </template>
diff --git a/client/src/components/icons/TickCircleIcon.vue b/client/src/components/icons/TickCircleIcon.vue
index 9a82f612..d4ce6b87 100644
--- a/client/src/components/icons/TickCircleIcon.vue
+++ b/client/src/components/icons/TickCircleIcon.vue
@@ -1,5 +1,7 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100">
     <path
       d="M50,6.48A43.62,43.62,0,0,0,6.56,47.08S6.5,48.46,6.5,50s.06,2.83.06,2.92A43.52,43.52,0,1,0,50,6.48Zm0,82.15A38.62,38.62,0,1,1,88.6,50,38.67,38.67,0,0,1,50,88.62Z"/>
     <path d="M69.27,41a2.45,2.45,0,1,0-3.46-3.46L45,58.3,34.2,47.49A2.45,2.45,0,0,0,30.73,51L45,65.23Z"/>
diff --git a/client/src/components/icons/TrashIcon.vue b/client/src/components/icons/TrashIcon.vue
index 2a39af12..7a9d6185 100644
--- a/client/src/components/icons/TrashIcon.vue
+++ b/client/src/components/icons/TrashIcon.vue
@@ -1,5 +1,7 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100">
     <path
       d="M78,81.62A8.37,8.37,0,0,1,69.64,90H30.36A8.37,8.37,0,0,1,22,81.62V23H78V81.62ZM36.2,14.92A4.91,4.91,0,0,1,41.1,10H58.9a4.91,4.91,0,0,1,4.9,4.9V18H36.2ZM87.5,18H68.79V14.92A9.9,9.9,0,0,0,58.9,5H41.1a9.9,9.9,0,0,0-9.89,9.89V18H12.5a2.5,2.5,0,1,0,0,5H17V81.62A13.37,13.37,0,0,0,30.36,95H69.64A13.37,13.37,0,0,0,83,81.62V23H87.5a2.5,2.5,0,0,0,0-5Z"/>
     <path d="M50,81a2.49,2.49,0,0,0,2.5-2.5V34.41a2.5,2.5,0,0,0-5,0V78.52A2.5,2.5,0,0,0,50,81Z"/>
diff --git a/client/src/components/icons/UserIcon.vue b/client/src/components/icons/UserIcon.vue
index 7209e65c..067003f2 100644
--- a/client/src/components/icons/UserIcon.vue
+++ b/client/src/components/icons/UserIcon.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" data-cy="user-icon">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    data-cy="user-icon">
     <path
       d="M50,0A50.12,50.12,0,0,0,.07,46.65S0,48.23,0,50s.07,3.25.07,3.36A50,50,0,1,0,50,0ZM24.14,86V79.84A15.18,15.18,0,0,1,39.31,64.67H60.69A15.18,15.18,0,0,1,75.86,79.84V86a44.27,44.27,0,0,1-51.72,0Zm57.47-5V79.84A20.94,20.94,0,0,0,60.69,58.93H39.31A20.94,20.94,0,0,0,18.39,79.84v1.31a44.4,44.4,0,1,1,63.22-.06Z"/>
     <path
diff --git a/client/src/components/icons/VideoIcon.vue b/client/src/components/icons/VideoIcon.vue
index 8b362d65..cea0f9c8 100644
--- a/client/src/components/icons/VideoIcon.vue
+++ b/client/src/components/icons/VideoIcon.vue
@@ -1,5 +1,8 @@
 <template>
-  <svg id="shape" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><title>video</title>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 100 100"
+    id="shape"><title>video</title>
     <path
       d="M70.79,83.87H29.21C7.12,83.87,2.8,74.31,2.8,57.79V42.21c0-8.62,0-14.84,3.63-19.45s10.31-6.63,22.78-6.63H70.79c12.18,0,18.67,1.8,22.39,6.22h0c3.74,4.45,4,10.75,4,19.86V57.79c0,10.54-1.76,16.72-5.89,20.67S81.35,83.87,70.79,83.87ZM29.21,20.53c-10.81,0-16.59,1.48-19.33,4.95s-2.68,9-2.68,16.73V57.79c0,15,3.18,21.68,22,21.68H70.79c9.31,0,14.37-1.21,17.48-4.19S92.8,67,92.8,57.79V42.21c0-8.14-.21-13.72-3-17s-8.43-4.65-19-4.65Zm13.34,44a5.1,5.1,0,0,1-5.1-5.1V39.77a5.1,5.1,0,0,1,7.45-4.53L63.79,45a5.1,5.1,0,0,1,0,9.05L44.92,64A5.13,5.13,0,0,1,42.55,64.55Zm0-25.48a.7.7,0,0,0-.7.7V59.45a.7.7,0,0,0,1,.62L61.76,50.2a.7.7,0,0,0,0-1.25L42.88,39.15A.7.7,0,0,0,42.55,39.07Z"/>
   </svg>
diff --git a/client/src/components/illustrations/ContentsIllustration.vue b/client/src/components/illustrations/ContentsIllustration.vue
index ccb4846a..f74c34c9 100644
--- a/client/src/components/illustrations/ContentsIllustration.vue
+++ b/client/src/components/illustrations/ContentsIllustration.vue
@@ -1,85 +1,135 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-       viewBox="0 0 1300 1000">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    viewBox="0 0 1300 1000">
     <defs>
-      <linearGradient id="linear-gradient" x1="650" y1="925.92" x2="650" y2="675.35" gradientUnits="userSpaceOnUse">
-        <stop offset="0" stop-color="#fff"/>
-        <stop offset="1" stop-color="#e6f4f9"/>
+      <linearGradient
+        x1="650"
+        y1="925.92"
+        x2="650"
+        y2="675.35"
+        gradientUnits="userSpaceOnUse"
+        id="linear-gradient">
+        <stop
+          offset="0"
+          stop-color="#fff"/>
+        <stop
+          offset="1"
+          stop-color="#e6f4f9"/>
       </linearGradient>
       <clipPath id="clip-path">
-        <path class="cls-1"
-              d="M598.84,214.41c-17.75,16.45-21.26,18.9-34.86,31.5,28.39,30.64,51.27,29.23,51.27,29.23L628,258.26"/>
+        <path
+          class="cls-1"
+          d="M598.84,214.41c-17.75,16.45-21.26,18.9-34.86,31.5,28.39,30.64,51.27,29.23,51.27,29.23L628,258.26"/>
       </clipPath>
     </defs>
 
-    <g id="Layer_2" data-name="Layer 2">
+    <g
+      data-name="Layer 2"
+      id="Layer_2">
       <g>
-        <path class="cls-2"
-              d="M637.85,931c194.66-5.37,366.85-49.73,457-266.31,92-221.07-26.53-502.83-248.46-498.07-308.78,6.62-218.49,235-457.6,264-197.68,23.91-252.9,229.73-190.71,354.06C272.14,932.7,537.12,933.75,637.85,931Z"/>
-        <path class="cls-3" d="M1040.66,929H360.92a1.65,1.65,0,1,1,0-3.29h679.74a1.65,1.65,0,1,1,0,3.29Z"/>
-        <path class="cls-4"
-              d="M717.71,854.21H405.56a13.3,13.3,0,0,0-13.3,13.31v45.42a13.3,13.3,0,0,0,13.3,13.31H717.71v-72Z"/>
-        <path class="cls-5"
-              d="M717.71,867.41H512.54a7.39,7.39,0,0,0-7.38,7.38v30.88a7.38,7.38,0,0,0,7.38,7.37H717.71V867.41Z"/>
-        <path class="cls-6"
-              d="M774.16,782.16H462a13.31,13.31,0,0,0-13.31,13.31V840.9A13.31,13.31,0,0,0,462,854.21H774.16V782.16Z"/>
-        <path class="cls-5"
-              d="M774.16,795.37H569a7.37,7.37,0,0,0-7.37,7.38v30.87A7.37,7.37,0,0,0,569,841H774.16V795.37Z"/>
-        <path class="cls-7"
-              d="M745,710.12H432.88a13.31,13.31,0,0,0-13.31,13.31v45.43a13.3,13.3,0,0,0,13.31,13.3H745v-72Z"/>
-        <path class="cls-5"
-              d="M745,723.33H539.85a7.37,7.37,0,0,0-7.37,7.38v30.87a7.37,7.37,0,0,0,7.37,7.38H745V723.33Z"/>
-        <path class="cls-8"
-              d="M774.16,638.08H462a13.31,13.31,0,0,0-13.31,13.31v45.42A13.31,13.31,0,0,0,462,710.12H774.16v-72Z"/>
-        <path class="cls-5"
-              d="M774.16,651.29H569a7.37,7.37,0,0,0-7.37,7.37v30.88a7.38,7.38,0,0,0,7.37,7.38H774.16V651.29Z"/>
-        <path class="cls-9"
-              d="M748.22,394.38c8.7-4.77,17.54-10.12,26.94-13.37,5.6-1.92,11.51-2.21,17.18-3.75,15.74-4.3,27.6-17.59,35.82-31.15,2.5-4.11,7.57-16.87,7.57-16.87l-69,19.72-37.33,10.67,18.77,34.75Z"/>
-        <path class="cls-10"
-              d="M638.87,416.81,600,310.31S526.27,339.08,566.91,450c18.3,50,70.69,61.5,103.06,36.75C711.45,455,759.42,393,759.42,393l-31.23-38.05-89.32,61.88Z"/>
-        <path class="cls-11"
-              d="M614.53,273.25s27.54,55.24,38.78,146.85c5.51,44.86,0,123.23,0,123.23H453.93s8.45-107.84,20.21-162.47c11.55-53.62,18.74-95.61,97.19-138.54,18.18,15.49,43.2,30.93,43.2,30.93Z"/>
-        <polygon class="cls-8"
-                 points="865.31 882.98 865.07 849.94 912.86 849.94 915.96 881.25 865.31 882.98 865.31 882.98"/>
-        <path class="cls-12"
-              d="M875.91,543.33c11.83,0,24.46,4.29,30.53,14.43,19.56,32.7,16.63,300.39,16.63,300.39H856.46L831.13,639.5H658A55.46,55.46,0,0,1,602.52,584v-40.7Z"/>
-        <path class="cls-7"
-              d="M865.31,883s-3.08,15.77-5.5,28.11a12.13,12.13,0,0,0,11.87,14.45l15.85,0L990,925.8A13.58,13.58,0,0,0,993,899L916,881.25,865.31,883Z"/>
-        <path class="cls-13"
-              d="M924.63,911.07a1.49,1.49,0,0,1-.76-.2,1.58,1.58,0,0,1-.64-2.16c1.2-2.21,2.38-4.42,3.57-6.63,3.13-5.85,6.36-11.89,9.81-17.74a1.59,1.59,0,1,1,2.74,1.62c-3.41,5.79-6.63,11.8-9.74,17.62q-1.79,3.33-3.58,6.65A1.59,1.59,0,0,1,924.63,911.07Zm-16.85-2.73a1.55,1.55,0,0,1-.69-.16,1.6,1.6,0,0,1-.74-2.13,145,145,0,0,1,16.21-26,1.58,1.58,0,0,1,2.24-.27,1.6,1.6,0,0,1,.27,2.24,140.84,140.84,0,0,0-15.85,25.44A1.61,1.61,0,0,1,907.78,908.34Z"/>
-        <path class="cls-14"
-              d="M681.81,491.93C692,494.19,702.49,497,713,497.52c6.23.3,12.32-1.15,18.52-1.26,17.21-.29,33,9.69,45.17,21,3.7,3.43,12.44,14.86,12.44,14.86l-75.64.35-41,.19,9.32-40.73Z"/>
-        <path class="cls-6"
-              d="M515.81,308.89c-7.65,23.23-19.1,77.35-24.38,132.91C486.09,498.05,503.78,531,546,537.7c54.06,8.64,135.8,0,135.8,0L688,485.81,576.49,462.54s18.64-141.23,16.73-160.48c-3.16-31.91-59-49.24-77.41,6.83Z"/>
-        <polygon class="cls-8"
-                 points="649.17 882.98 658.94 848.47 706.73 848.47 699.91 881.19 649.17 882.98 649.17 882.98"/>
-        <path class="cls-7"
-              d="M649.25,882.59s-3.19,15.75-5.69,28.07a12.12,12.12,0,0,0,11.77,14.53l15.85.14,102.43.91a13.58,13.58,0,0,0,3.26-26.79l-77-18.26-50.66,1.4Z"/>
-        <path class="cls-13"
-              d="M708.38,911.07a1.49,1.49,0,0,1-.76-.2,1.58,1.58,0,0,1-.63-2.16c1.21-2.19,2.4-4.39,3.6-6.59,3.17-5.83,6.45-11.86,9.94-17.69a1.6,1.6,0,0,1,2.74,1.64c-3.46,5.77-6.72,11.77-9.88,17.58q-1.8,3.3-3.61,6.6A1.58,1.58,0,0,1,708.38,911.07Zm-16.82-2.84a1.56,1.56,0,0,1-.7-.16,1.59,1.59,0,0,1-.72-2.14A144.19,144.19,0,0,1,706.52,880a1.59,1.59,0,1,1,2.49,2,142,142,0,0,0-16,25.34A1.59,1.59,0,0,1,691.56,908.23Z"/>
-        <path class="cls-4"
-              d="M759.77,543.33a39.5,39.5,0,0,1,38.75,47.18L714.8,858.15H648.2L682.54,639.5H509.4A55.48,55.48,0,0,1,453.93,584v-40.7Z"/>
-        <path class="cls-7"
-              d="M938.24,435.19a6.9,6.9,0,0,0-6.9-6.9H801.72a6.9,6.9,0,0,0-6.9,6.9V543.33H931.34a6.9,6.9,0,0,0,6.9-6.89V435.19Z"/>
-        <path class="cls-13"
-              d="M872.47,502c-7.48,0-13.56-7.28-13.56-16.23s6.08-16.22,13.56-16.22S886,476.87,886,485.81,880,502,872.47,502Zm0-29.28c-5.73,0-10.39,5.86-10.39,13.05s4.66,13.05,10.39,13.05,10.39-5.85,10.39-13.05S878.2,472.76,872.47,472.76Z"/>
-        <path class="cls-7" d="M696.25,537.7a5.63,5.63,0,0,1,5.63-5.62H835.11v11.25H701.88a5.63,5.63,0,0,1-5.63-5.62Z"/>
-        <path class="cls-14"
-              d="M598.84,214.41c-17.75,16.45-21.26,18.9-34.86,31.5,28.39,30.64,51.27,29.23,51.27,29.23L628,258.26"/>
+        <path
+          class="cls-2"
+          d="M637.85,931c194.66-5.37,366.85-49.73,457-266.31,92-221.07-26.53-502.83-248.46-498.07-308.78,6.62-218.49,235-457.6,264-197.68,23.91-252.9,229.73-190.71,354.06C272.14,932.7,537.12,933.75,637.85,931Z"/>
+        <path
+          class="cls-3"
+          d="M1040.66,929H360.92a1.65,1.65,0,1,1,0-3.29h679.74a1.65,1.65,0,1,1,0,3.29Z"/>
+        <path
+          class="cls-4"
+          d="M717.71,854.21H405.56a13.3,13.3,0,0,0-13.3,13.31v45.42a13.3,13.3,0,0,0,13.3,13.31H717.71v-72Z"/>
+        <path
+          class="cls-5"
+          d="M717.71,867.41H512.54a7.39,7.39,0,0,0-7.38,7.38v30.88a7.38,7.38,0,0,0,7.38,7.37H717.71V867.41Z"/>
+        <path
+          class="cls-6"
+          d="M774.16,782.16H462a13.31,13.31,0,0,0-13.31,13.31V840.9A13.31,13.31,0,0,0,462,854.21H774.16V782.16Z"/>
+        <path
+          class="cls-5"
+          d="M774.16,795.37H569a7.37,7.37,0,0,0-7.37,7.38v30.87A7.37,7.37,0,0,0,569,841H774.16V795.37Z"/>
+        <path
+          class="cls-7"
+          d="M745,710.12H432.88a13.31,13.31,0,0,0-13.31,13.31v45.43a13.3,13.3,0,0,0,13.31,13.3H745v-72Z"/>
+        <path
+          class="cls-5"
+          d="M745,723.33H539.85a7.37,7.37,0,0,0-7.37,7.38v30.87a7.37,7.37,0,0,0,7.37,7.38H745V723.33Z"/>
+        <path
+          class="cls-8"
+          d="M774.16,638.08H462a13.31,13.31,0,0,0-13.31,13.31v45.42A13.31,13.31,0,0,0,462,710.12H774.16v-72Z"/>
+        <path
+          class="cls-5"
+          d="M774.16,651.29H569a7.37,7.37,0,0,0-7.37,7.37v30.88a7.38,7.38,0,0,0,7.37,7.38H774.16V651.29Z"/>
+        <path
+          class="cls-9"
+          d="M748.22,394.38c8.7-4.77,17.54-10.12,26.94-13.37,5.6-1.92,11.51-2.21,17.18-3.75,15.74-4.3,27.6-17.59,35.82-31.15,2.5-4.11,7.57-16.87,7.57-16.87l-69,19.72-37.33,10.67,18.77,34.75Z"/>
+        <path
+          class="cls-10"
+          d="M638.87,416.81,600,310.31S526.27,339.08,566.91,450c18.3,50,70.69,61.5,103.06,36.75C711.45,455,759.42,393,759.42,393l-31.23-38.05-89.32,61.88Z"/>
+        <path
+          class="cls-11"
+          d="M614.53,273.25s27.54,55.24,38.78,146.85c5.51,44.86,0,123.23,0,123.23H453.93s8.45-107.84,20.21-162.47c11.55-53.62,18.74-95.61,97.19-138.54,18.18,15.49,43.2,30.93,43.2,30.93Z"/>
+        <polygon
+          class="cls-8"
+          points="865.31 882.98 865.07 849.94 912.86 849.94 915.96 881.25 865.31 882.98 865.31 882.98"/>
+        <path
+          class="cls-12"
+          d="M875.91,543.33c11.83,0,24.46,4.29,30.53,14.43,19.56,32.7,16.63,300.39,16.63,300.39H856.46L831.13,639.5H658A55.46,55.46,0,0,1,602.52,584v-40.7Z"/>
+        <path
+          class="cls-7"
+          d="M865.31,883s-3.08,15.77-5.5,28.11a12.13,12.13,0,0,0,11.87,14.45l15.85,0L990,925.8A13.58,13.58,0,0,0,993,899L916,881.25,865.31,883Z"/>
+        <path
+          class="cls-13"
+          d="M924.63,911.07a1.49,1.49,0,0,1-.76-.2,1.58,1.58,0,0,1-.64-2.16c1.2-2.21,2.38-4.42,3.57-6.63,3.13-5.85,6.36-11.89,9.81-17.74a1.59,1.59,0,1,1,2.74,1.62c-3.41,5.79-6.63,11.8-9.74,17.62q-1.79,3.33-3.58,6.65A1.59,1.59,0,0,1,924.63,911.07Zm-16.85-2.73a1.55,1.55,0,0,1-.69-.16,1.6,1.6,0,0,1-.74-2.13,145,145,0,0,1,16.21-26,1.58,1.58,0,0,1,2.24-.27,1.6,1.6,0,0,1,.27,2.24,140.84,140.84,0,0,0-15.85,25.44A1.61,1.61,0,0,1,907.78,908.34Z"/>
+        <path
+          class="cls-14"
+          d="M681.81,491.93C692,494.19,702.49,497,713,497.52c6.23.3,12.32-1.15,18.52-1.26,17.21-.29,33,9.69,45.17,21,3.7,3.43,12.44,14.86,12.44,14.86l-75.64.35-41,.19,9.32-40.73Z"/>
+        <path
+          class="cls-6"
+          d="M515.81,308.89c-7.65,23.23-19.1,77.35-24.38,132.91C486.09,498.05,503.78,531,546,537.7c54.06,8.64,135.8,0,135.8,0L688,485.81,576.49,462.54s18.64-141.23,16.73-160.48c-3.16-31.91-59-49.24-77.41,6.83Z"/>
+        <polygon
+          class="cls-8"
+          points="649.17 882.98 658.94 848.47 706.73 848.47 699.91 881.19 649.17 882.98 649.17 882.98"/>
+        <path
+          class="cls-7"
+          d="M649.25,882.59s-3.19,15.75-5.69,28.07a12.12,12.12,0,0,0,11.77,14.53l15.85.14,102.43.91a13.58,13.58,0,0,0,3.26-26.79l-77-18.26-50.66,1.4Z"/>
+        <path
+          class="cls-13"
+          d="M708.38,911.07a1.49,1.49,0,0,1-.76-.2,1.58,1.58,0,0,1-.63-2.16c1.21-2.19,2.4-4.39,3.6-6.59,3.17-5.83,6.45-11.86,9.94-17.69a1.6,1.6,0,0,1,2.74,1.64c-3.46,5.77-6.72,11.77-9.88,17.58q-1.8,3.3-3.61,6.6A1.58,1.58,0,0,1,708.38,911.07Zm-16.82-2.84a1.56,1.56,0,0,1-.7-.16,1.59,1.59,0,0,1-.72-2.14A144.19,144.19,0,0,1,706.52,880a1.59,1.59,0,1,1,2.49,2,142,142,0,0,0-16,25.34A1.59,1.59,0,0,1,691.56,908.23Z"/>
+        <path
+          class="cls-4"
+          d="M759.77,543.33a39.5,39.5,0,0,1,38.75,47.18L714.8,858.15H648.2L682.54,639.5H509.4A55.48,55.48,0,0,1,453.93,584v-40.7Z"/>
+        <path
+          class="cls-7"
+          d="M938.24,435.19a6.9,6.9,0,0,0-6.9-6.9H801.72a6.9,6.9,0,0,0-6.9,6.9V543.33H931.34a6.9,6.9,0,0,0,6.9-6.89V435.19Z"/>
+        <path
+          class="cls-13"
+          d="M872.47,502c-7.48,0-13.56-7.28-13.56-16.23s6.08-16.22,13.56-16.22S886,476.87,886,485.81,880,502,872.47,502Zm0-29.28c-5.73,0-10.39,5.86-10.39,13.05s4.66,13.05,10.39,13.05,10.39-5.85,10.39-13.05S878.2,472.76,872.47,472.76Z"/>
+        <path
+          class="cls-7"
+          d="M696.25,537.7a5.63,5.63,0,0,1,5.63-5.62H835.11v11.25H701.88a5.63,5.63,0,0,1-5.63-5.62Z"/>
+        <path
+          class="cls-14"
+          d="M598.84,214.41c-17.75,16.45-21.26,18.9-34.86,31.5,28.39,30.64,51.27,29.23,51.27,29.23L628,258.26"/>
         <g class="cls-15">
-          <path class="cls-9"
-                d="M597.37,217.15c-1.57,19.15,8.17,55.5,24.32,62.63,17.72,7.83,18.46-7.45,21-19.72,3.44-16.37-1.06-37.15-13.84-48.51-7.86-7-31.52,5.6-31.52,5.6Z"/>
+          <path
+            class="cls-9"
+            d="M597.37,217.15c-1.57,19.15,8.17,55.5,24.32,62.63,17.72,7.83,18.46-7.45,21-19.72,3.44-16.37-1.06-37.15-13.84-48.51-7.86-7-31.52,5.6-31.52,5.6Z"/>
         </g>
-        <path class="cls-14"
-              d="M680.61,199.45a45.34,45.34,0,1,0-88.24-20.88l-5.67,24a45.33,45.33,0,0,0,88.23,20.87l5.68-24Z"/>
-        <path class="cls-16"
-              d="M626.71,167.5c9.7,12.85,29.72,22.21,49.13,17.94,20.86-4.58,29.83-19.71,28.36-33.87-2.08-20-18.51-13.66-31.36-19.67-9.32-4.35-14-16.62-23.59-20.89-20-8.91-37.2,7.24-41.35,19.34-12-4.14-34.3,1.84-35.77,25.91-.62,10.13,10,19.67,3.62,31.05-8.34,15,0,25.79,11.24,37.32,3.39-1.13,7-4.24,11.08-9.84-5.74-4.13-11.56-20.66-4.79-28,7.83-8.43,17.58.15,21.6,15.27,9.4-8.06,15.25-16.45,11.83-34.6Z"/>
-        <path class="cls-6"
-              d="M779.11,309.1a37.89,37.89,0,0,1-11.22,2.5c-5.21.34-11.1,3-15.08,10.22s-4.26,20,5.35,30.15c6,6.28,14.75,8.11,21.77,4.31a38,38,0,0,1,12.83-4.19c10.38-1.43,16.48-10.53,14.86-23.17-.93-7.2-5.24-18.74-15.7-21.36-4.31-1.08-9.13.12-12.81,1.54Z"/>
-        <path class="cls-17"
-              d="M774.24,315.63H774a1.65,1.65,0,0,1-1.43-1.84c.82-6.68,2.14-13.67,6.22-19.52a1.65,1.65,0,0,1,2.7,1.88c-3.67,5.26-4.89,11.78-5.66,18A1.64,1.64,0,0,1,774.24,315.63Z"/>
-        <path class="cls-7"
-              d="M773.08,312.55l-6.77-10.93a16.42,16.42,0,0,1-2.36-8.45,18.37,18.37,0,0,1,.56-4.67,10.06,10.06,0,0,1,3.81,1.24,11.21,11.21,0,0,1,2.76,2.18c5.37,6,2.76,13.58,2,20.63Z"/>
+        <path
+          class="cls-14"
+          d="M680.61,199.45a45.34,45.34,0,1,0-88.24-20.88l-5.67,24a45.33,45.33,0,0,0,88.23,20.87l5.68-24Z"/>
+        <path
+          class="cls-16"
+          d="M626.71,167.5c9.7,12.85,29.72,22.21,49.13,17.94,20.86-4.58,29.83-19.71,28.36-33.87-2.08-20-18.51-13.66-31.36-19.67-9.32-4.35-14-16.62-23.59-20.89-20-8.91-37.2,7.24-41.35,19.34-12-4.14-34.3,1.84-35.77,25.91-.62,10.13,10,19.67,3.62,31.05-8.34,15,0,25.79,11.24,37.32,3.39-1.13,7-4.24,11.08-9.84-5.74-4.13-11.56-20.66-4.79-28,7.83-8.43,17.58.15,21.6,15.27,9.4-8.06,15.25-16.45,11.83-34.6Z"/>
+        <path
+          class="cls-6"
+          d="M779.11,309.1a37.89,37.89,0,0,1-11.22,2.5c-5.21.34-11.1,3-15.08,10.22s-4.26,20,5.35,30.15c6,6.28,14.75,8.11,21.77,4.31a38,38,0,0,1,12.83-4.19c10.38-1.43,16.48-10.53,14.86-23.17-.93-7.2-5.24-18.74-15.7-21.36-4.31-1.08-9.13.12-12.81,1.54Z"/>
+        <path
+          class="cls-17"
+          d="M774.24,315.63H774a1.65,1.65,0,0,1-1.43-1.84c.82-6.68,2.14-13.67,6.22-19.52a1.65,1.65,0,0,1,2.7,1.88c-3.67,5.26-4.89,11.78-5.66,18A1.64,1.64,0,0,1,774.24,315.63Z"/>
+        <path
+          class="cls-7"
+          d="M773.08,312.55l-6.77-10.93a16.42,16.42,0,0,1-2.36-8.45,18.37,18.37,0,0,1,.56-4.67,10.06,10.06,0,0,1,3.81,1.24,11.21,11.21,0,0,1,2.76,2.18c5.37,6,2.76,13.58,2,20.63Z"/>
       </g>
     </g>
   </svg>
diff --git a/client/src/components/illustrations/PortfolioIllustration.vue b/client/src/components/illustrations/PortfolioIllustration.vue
index 908dcf61..499ceeec 100644
--- a/client/src/components/illustrations/PortfolioIllustration.vue
+++ b/client/src/components/illustrations/PortfolioIllustration.vue
@@ -1,99 +1,157 @@
 <template>
-  <svg data-name="Layer 3" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-       viewBox="0 0 1300 1000">
+  <svg
+    data-name="Layer 3"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    viewBox="0 0 1300 1000">
     <defs>
-      <linearGradient id="linear-gradient" x1="648.63" y1="914.96" x2="650.25" y2="661.89"
-                      gradientUnits="userSpaceOnUse">
-        <stop offset="0" stop-color="#fff"/>
-        <stop offset="1" stop-color="#e6f4f9"/>
+      <linearGradient
+        x1="648.63"
+        y1="914.96"
+        x2="650.25"
+        y2="661.89"
+        gradientUnits="userSpaceOnUse"
+        id="linear-gradient">
+        <stop
+          offset="0"
+          stop-color="#fff"/>
+        <stop
+          offset="1"
+          stop-color="#e6f4f9"/>
       </linearGradient>
       <clipPath id="clip-path">
-        <path class="cls-1"
-              d="M552.93,613.53c19.44-21.78,95.58-122.32,148.77-36.74,23.48,37.78-96.62,125.71-96.62,125.71L480.8,795.74l-42.48-50.63s93.6-108.05,114.61-131.58Z"/>
+        <path
+          class="cls-1"
+          d="M552.93,613.53c19.44-21.78,95.58-122.32,148.77-36.74,23.48,37.78-96.62,125.71-96.62,125.71L480.8,795.74l-42.48-50.63s93.6-108.05,114.61-131.58Z"/>
       </clipPath>
       <clipPath id="clip-path-2">
-        <path class="cls-1"
-              d="M785.41,281.24C832.6,300.71,893.14,449.35,907.46,495,872.75,524.61,801,539.31,755,528.65c1.54-12.94-2.67-140.18-3-163.09-.22-13.4-2.5-22.56-2.16-36"/>
+        <path
+          class="cls-1"
+          d="M785.41,281.24C832.6,300.71,893.14,449.35,907.46,495,872.75,524.61,801,539.31,755,528.65c1.54-12.94-2.67-140.18-3-163.09-.22-13.4-2.5-22.56-2.16-36"/>
       </clipPath>
       <clipPath id="clip-path-3">
-        <path class="cls-1"
-              d="M768.87,234.17c-.39,16.74,7.78,33.11,16.5,46.94-11.1,19.08-21.15,30.22-35.61,48.54a244.74,244.74,0,0,0-14.84-50.95"/>
+        <path
+          class="cls-1"
+          d="M768.87,234.17c-.39,16.74,7.78,33.11,16.5,46.94-11.1,19.08-21.15,30.22-35.61,48.54a244.74,244.74,0,0,0-14.84-50.95"/>
       </clipPath>
     </defs>
     <g>
-      <path class="cls-2"
-            d="M740.58,193c-122.46-29.16-246.52,11.93-303,129.5-18.87,39.33-27.2,84.88-54.42,119.86-44.34,57-122.63,65.94-160,130.07C204.37,604.86,197,643,199.43,680.25c8.74,133,146.75,200.68,261.44,224.11,57.83,11.82,120.62,12,179.52,15.08,15.72.82,31.5,1.69,47.3,2.47,116.13,5.7,233.37,5.9,334.2-62.21,22.95-15.51,47.53-33,61-57.89,58-107-37.35-181.91-86.23-264.79-59.91-101.59-41.94-244.94-161-304.83C807.24,217.86,740.58,193,740.58,193Z"/>
-      <polygon class="cls-3"
-               points="548.83 466.84 535.22 466.84 535.22 923.51 548.83 923.51 548.83 466.84 548.83 466.84"/>
-      <polygon class="cls-3"
-               points="408.65 466.84 395.04 466.84 395.04 923.51 408.65 923.51 408.65 466.84 408.65 466.84"/>
-      <polygon class="cls-3"
-               points="877.65 662.03 864.04 662.03 864.04 931.56 877.65 931.56 877.65 662.03 877.65 662.03"/>
-      <polygon class="cls-3"
-               points="713.24 653.98 699.63 653.98 699.63 923.51 713.24 923.51 713.24 653.98 713.24 653.98"/>
-      <path class="cls-3"
-            d="M926.68,662a8.06,8.06,0,0,0-8-8H674.55a8.06,8.06,0,0,0-8,8h0a8.06,8.06,0,0,0,8,8.05H918.63a8.06,8.06,0,0,0,8-8.05Z"/>
-      <path class="cls-3"
-            d="M619.44,458.79a8.06,8.06,0,0,0-8-8.05H337a8,8,0,0,0-8,8.05h0a8,8,0,0,0,8,8H611.4a8,8,0,0,0,8-8Z"/>
-      <path class="cls-4" d="M1025.85,928.91h0l-717-.69a1.57,1.57,0,0,1,0-3.13h0l717,.69a1.57,1.57,0,0,1,0,3.13Z"/>
-      <path class="cls-5" d="M611.77,445.17a5.58,5.58,0,0,0-5.57-5.58h-132v11.15h132a5.57,5.57,0,0,0,5.57-5.57Z"/>
-      <path class="cls-5"
-            d="M422.38,323.09a5.58,5.58,0,0,0-2.78,7.38L474,450.74l10.16-4.59-17.5-38.69s-28.53-63-36.92-81.59a5.59,5.59,0,0,0-7.38-2.78Z"/>
-      <path class="cls-6"
-            d="M600,401.49a27.21,27.21,0,0,1-23.36,1.12c-.17-.07.05,5.62,0,5.71-.23,3.85-1.82,10.5-6.52,11.14s-7.43-9-8.05-11.8c-.26-1.18-.48-2.37-.67-3.57-.26-1.64-.34-2.88-.36-2.58-.27,2.78-.39,5.54-.89,8.3a23.76,23.76,0,0,1-1.36,5,11.87,11.87,0,0,1-1.51,2.72c-5.06,6.66-8.65-3.62-9.26-7.71-.13-.88.11-5.16-.46-5.63s-.68,1.52-1,2.27a38.88,38.88,0,0,1-2,3.71c-1.85,3-8.28,10.51-12.64,8.11-3.56-1.95-.17-13.19.53-15.93,3.4-13.41,7.38-32.19,19-41.25,15.06-11.76,41.77-5.06,58.31-1.09,29.13,7,97.44,36.67,97.44,36.67L688.47,446.7s-74.9-38.09-88.44-45.21Z"/>
-      <path class="cls-7" d="M691,389l-24.87,60.9,94.48,38.57a32.89,32.89,0,1,0,24.87-60.9L691,389Z"/>
-      <path class="cls-7"
-            d="M838.94,373.54a32.89,32.89,0,1,0-61.86-22.36l-34.7,96a32.89,32.89,0,0,0,61.86,22.36l34.7-96Z"/>
-      <polygon class="cls-8"
-               points="507.75 766.87 470.26 722.92 427.28 769.07 401.87 796.36 430.76 825.47 507.75 766.87 507.75 766.87"/>
-      <path class="cls-9"
-            d="M552.93,613.53c19.44-21.78,95.58-122.32,148.77-36.74,23.48,37.78-96.62,125.71-96.62,125.71L480.8,795.74l-42.48-50.63s93.6-108.05,114.61-131.58Z"/>
+      <path
+        class="cls-2"
+        d="M740.58,193c-122.46-29.16-246.52,11.93-303,129.5-18.87,39.33-27.2,84.88-54.42,119.86-44.34,57-122.63,65.94-160,130.07C204.37,604.86,197,643,199.43,680.25c8.74,133,146.75,200.68,261.44,224.11,57.83,11.82,120.62,12,179.52,15.08,15.72.82,31.5,1.69,47.3,2.47,116.13,5.7,233.37,5.9,334.2-62.21,22.95-15.51,47.53-33,61-57.89,58-107-37.35-181.91-86.23-264.79-59.91-101.59-41.94-244.94-161-304.83C807.24,217.86,740.58,193,740.58,193Z"/>
+      <polygon
+        class="cls-3"
+        points="548.83 466.84 535.22 466.84 535.22 923.51 548.83 923.51 548.83 466.84 548.83 466.84"/>
+      <polygon
+        class="cls-3"
+        points="408.65 466.84 395.04 466.84 395.04 923.51 408.65 923.51 408.65 466.84 408.65 466.84"/>
+      <polygon
+        class="cls-3"
+        points="877.65 662.03 864.04 662.03 864.04 931.56 877.65 931.56 877.65 662.03 877.65 662.03"/>
+      <polygon
+        class="cls-3"
+        points="713.24 653.98 699.63 653.98 699.63 923.51 713.24 923.51 713.24 653.98 713.24 653.98"/>
+      <path
+        class="cls-3"
+        d="M926.68,662a8.06,8.06,0,0,0-8-8H674.55a8.06,8.06,0,0,0-8,8h0a8.06,8.06,0,0,0,8,8.05H918.63a8.06,8.06,0,0,0,8-8.05Z"/>
+      <path
+        class="cls-3"
+        d="M619.44,458.79a8.06,8.06,0,0,0-8-8.05H337a8,8,0,0,0-8,8.05h0a8,8,0,0,0,8,8H611.4a8,8,0,0,0,8-8Z"/>
+      <path
+        class="cls-4"
+        d="M1025.85,928.91h0l-717-.69a1.57,1.57,0,0,1,0-3.13h0l717,.69a1.57,1.57,0,0,1,0,3.13Z"/>
+      <path
+        class="cls-5"
+        d="M611.77,445.17a5.58,5.58,0,0,0-5.57-5.58h-132v11.15h132a5.57,5.57,0,0,0,5.57-5.57Z"/>
+      <path
+        class="cls-5"
+        d="M422.38,323.09a5.58,5.58,0,0,0-2.78,7.38L474,450.74l10.16-4.59-17.5-38.69s-28.53-63-36.92-81.59a5.59,5.59,0,0,0-7.38-2.78Z"/>
+      <path
+        class="cls-6"
+        d="M600,401.49a27.21,27.21,0,0,1-23.36,1.12c-.17-.07.05,5.62,0,5.71-.23,3.85-1.82,10.5-6.52,11.14s-7.43-9-8.05-11.8c-.26-1.18-.48-2.37-.67-3.57-.26-1.64-.34-2.88-.36-2.58-.27,2.78-.39,5.54-.89,8.3a23.76,23.76,0,0,1-1.36,5,11.87,11.87,0,0,1-1.51,2.72c-5.06,6.66-8.65-3.62-9.26-7.71-.13-.88.11-5.16-.46-5.63s-.68,1.52-1,2.27a38.88,38.88,0,0,1-2,3.71c-1.85,3-8.28,10.51-12.64,8.11-3.56-1.95-.17-13.19.53-15.93,3.4-13.41,7.38-32.19,19-41.25,15.06-11.76,41.77-5.06,58.31-1.09,29.13,7,97.44,36.67,97.44,36.67L688.47,446.7s-74.9-38.09-88.44-45.21Z"/>
+      <path
+        class="cls-7"
+        d="M691,389l-24.87,60.9,94.48,38.57a32.89,32.89,0,1,0,24.87-60.9L691,389Z"/>
+      <path
+        class="cls-7"
+        d="M838.94,373.54a32.89,32.89,0,1,0-61.86-22.36l-34.7,96a32.89,32.89,0,0,0,61.86,22.36l34.7-96Z"/>
+      <polygon
+        class="cls-8"
+        points="507.75 766.87 470.26 722.92 427.28 769.07 401.87 796.36 430.76 825.47 507.75 766.87 507.75 766.87"/>
+      <path
+        class="cls-9"
+        d="M552.93,613.53c19.44-21.78,95.58-122.32,148.77-36.74,23.48,37.78-96.62,125.71-96.62,125.71L480.8,795.74l-42.48-50.63s93.6-108.05,114.61-131.58Z"/>
       <g class="cls-10">
-        <path class="cls-11"
-              d="M571.65,591.51c-6.91,35.4-11.36,72.51-8.84,108.57.29,4.16,3,32.48,6.38,35,2.75,2.07,8.3.5,11-.6,24-9.88,38.66-39.78,44.75-63.45a101.39,101.39,0,0,0,1.73-43.43c-3.57-19-25.37-66.16-51.29-41.79"/>
+        <path
+          class="cls-11"
+          d="M571.65,591.51c-6.91,35.4-11.36,72.51-8.84,108.57.29,4.16,3,32.48,6.38,35,2.75,2.07,8.3.5,11-.6,24-9.88,38.66-39.78,44.75-63.45a101.39,101.39,0,0,0,1.73-43.43c-3.57-19-25.37-66.16-51.29-41.79"/>
       </g>
-      <path class="cls-12"
-            d="M431.19,825.75l-10.82,23.1a11.95,11.95,0,0,1-19,3.63l-72.74-68.55a13.38,13.38,0,0,1,16-21.26l57.28,33.69,29.32,29.39Z"/>
+      <path
+        class="cls-12"
+        d="M431.19,825.75l-10.82,23.1a11.95,11.95,0,0,1-19,3.63l-72.74-68.55a13.38,13.38,0,0,1,16-21.26l57.28,33.69,29.32,29.39Z"/>
       <g>
-        <path class="cls-5" d="M391.16,786.63c-.35,7.93-1,15.8-1.94,23.68"/>
-        <path class="cls-13"
-              d="M389.22,811.88H389a1.57,1.57,0,0,1-1.36-1.75c.94-7.66,1.57-15.36,1.93-23.55a1.59,1.59,0,0,1,1.64-1.5,1.56,1.56,0,0,1,1.5,1.63c-.37,8.28-1,16.06-2,23.8A1.56,1.56,0,0,1,389.22,811.88Z"/>
+        <path
+          class="cls-5"
+          d="M391.16,786.63c-.35,7.93-1,15.8-1.94,23.68"/>
+        <path
+          class="cls-13"
+          d="M389.22,811.88H389a1.57,1.57,0,0,1-1.36-1.75c.94-7.66,1.57-15.36,1.93-23.55a1.59,1.59,0,0,1,1.64-1.5,1.56,1.56,0,0,1,1.5,1.63c-.37,8.28-1,16.06-2,23.8A1.56,1.56,0,0,1,389.22,811.88Z"/>
       </g>
-      <path class="cls-13"
-            d="M376.13,803.17a2,2,0,0,1-.34,0,1.57,1.57,0,0,1-1.19-1.88c1.12-5,1.92-10.28,2.69-15.34q.45-3,.93-5.93a1.57,1.57,0,0,1,3.1.5c-.32,2-.62,3.93-.92,5.9-.78,5.11-1.59,10.4-2.74,15.55A1.56,1.56,0,0,1,376.13,803.17Z"/>
-      <polygon class="cls-8"
-               points="690.07 788.78 633.2 798.9 660.19 884.83 701.7 884.83 697.12 847.01 690.07 788.78 690.07 788.78"/>
-      <path class="cls-14"
-            d="M755,528.65l126.36-28.23L907.46,495c4.23,8.49,8.57,22.48,12.76,31,32,65.17-15.47,129.6-59.6,128H684.82l15.4,156.72-68.65,16.14S589.85,684.45,581.69,654c-7.39-27.63-21.78-111.64,31-116.65S755,528.65,755,528.65Z"/>
-      <path class="cls-5"
-            d="M701.7,884.83l8.71,24a11.94,11.94,0,0,1-10.85,16l-11.83.36-88.07,2.72a13.38,13.38,0,0,1-3.78-26.32l64.31-16.75Z"/>
-      <path class="cls-13"
-            d="M638.59,914.33a1.57,1.57,0,0,1-1.36-.79q-1.74-3-3.47-6c-3-5.32-6.2-10.82-9.52-16.1a1.57,1.57,0,0,1,2.66-1.68c3.35,5.34,6.52,10.87,9.58,16.22,1.15,2,2.3,4,3.47,6a1.57,1.57,0,0,1-.57,2.14A1.52,1.52,0,0,1,638.59,914.33Zm14.28-2.57a1.58,1.58,0,0,1-1.4-.84,131,131,0,0,0-15.36-23.16,1.57,1.57,0,0,1,2.42-2,134.41,134.41,0,0,1,15.72,23.71,1.57,1.57,0,0,1-1.38,2.3Z"/>
-      <path class="cls-15"
-            d="M785.41,281.24C832.6,300.71,893.14,449.35,907.46,495,872.75,524.61,801,539.31,755,528.65c1.54-12.94-2.67-140.18-3-163.09-.22-13.4-2.5-22.56-2.16-36"/>
+      <path
+        class="cls-13"
+        d="M376.13,803.17a2,2,0,0,1-.34,0,1.57,1.57,0,0,1-1.19-1.88c1.12-5,1.92-10.28,2.69-15.34q.45-3,.93-5.93a1.57,1.57,0,0,1,3.1.5c-.32,2-.62,3.93-.92,5.9-.78,5.11-1.59,10.4-2.74,15.55A1.56,1.56,0,0,1,376.13,803.17Z"/>
+      <polygon
+        class="cls-8"
+        points="690.07 788.78 633.2 798.9 660.19 884.83 701.7 884.83 697.12 847.01 690.07 788.78 690.07 788.78"/>
+      <path
+        class="cls-14"
+        d="M755,528.65l126.36-28.23L907.46,495c4.23,8.49,8.57,22.48,12.76,31,32,65.17-15.47,129.6-59.6,128H684.82l15.4,156.72-68.65,16.14S589.85,684.45,581.69,654c-7.39-27.63-21.78-111.64,31-116.65S755,528.65,755,528.65Z"/>
+      <path
+        class="cls-5"
+        d="M701.7,884.83l8.71,24a11.94,11.94,0,0,1-10.85,16l-11.83.36-88.07,2.72a13.38,13.38,0,0,1-3.78-26.32l64.31-16.75Z"/>
+      <path
+        class="cls-13"
+        d="M638.59,914.33a1.57,1.57,0,0,1-1.36-.79q-1.74-3-3.47-6c-3-5.32-6.2-10.82-9.52-16.1a1.57,1.57,0,0,1,2.66-1.68c3.35,5.34,6.52,10.87,9.58,16.22,1.15,2,2.3,4,3.47,6a1.57,1.57,0,0,1-.57,2.14A1.52,1.52,0,0,1,638.59,914.33Zm14.28-2.57a1.58,1.58,0,0,1-1.4-.84,131,131,0,0,0-15.36-23.16,1.57,1.57,0,0,1,2.42-2,134.41,134.41,0,0,1,15.72,23.71,1.57,1.57,0,0,1-1.38,2.3Z"/>
+      <path
+        class="cls-15"
+        d="M785.41,281.24C832.6,300.71,893.14,449.35,907.46,495,872.75,524.61,801,539.31,755,528.65c1.54-12.94-2.67-140.18-3-163.09-.22-13.4-2.5-22.56-2.16-36"/>
       <g class="cls-16">
-        <path class="cls-7" d="M755.9,422.61c-9.79,33.52-5.79,71.86-.91,106,28.33-4,33-19.67,63.31-150.74"/>
+        <path
+          class="cls-7"
+          d="M755.9,422.61c-9.79,33.52-5.79,71.86-.91,106,28.33-4,33-19.67,63.31-150.74"/>
       </g>
-      <path class="cls-17"
-            d="M768.87,234.17c-.39,16.74,7.78,33.11,16.5,46.94-11.1,19.08-21.15,30.22-35.61,48.54a244.74,244.74,0,0,0-14.84-50.95"/>
+      <path
+        class="cls-17"
+        d="M768.87,234.17c-.39,16.74,7.78,33.11,16.5,46.94-11.1,19.08-21.15,30.22-35.61,48.54a244.74,244.74,0,0,0-14.84-50.95"/>
       <g class="cls-18">
-        <path class="cls-6"
-              d="M759.3,263.48a101.88,101.88,0,0,1-6.19,18.3,55.33,55.33,0,0,1-6,10.45c-2.13,2.9-4.57,7-7.51,9.2-.35.26-.79-.37-1.18-.56a12,12,0,0,1-3.46-3,60.44,60.44,0,0,1-6.59-10.2c-1-1.8-2.26-3.64-2.28-5.76,0-3.28,1.86-6.3,3.68-8.89a51.71,51.71,0,0,1,9.35-9.94c1.23-1,2.54-1.94,3.85-2.85,4.18-2.9,13.46-8.19,18.41-4"/>
+        <path
+          class="cls-6"
+          d="M759.3,263.48a101.88,101.88,0,0,1-6.19,18.3,55.33,55.33,0,0,1-6,10.45c-2.13,2.9-4.57,7-7.51,9.2-.35.26-.79-.37-1.18-.56a12,12,0,0,1-3.46-3,60.44,60.44,0,0,1-6.59-10.2c-1-1.8-2.26-3.64-2.28-5.76,0-3.28,1.86-6.3,3.68-8.89a51.71,51.71,0,0,1,9.35-9.94c1.23-1,2.54-1.94,3.85-2.85,4.18-2.9,13.46-8.19,18.41-4"/>
       </g>
-      <path class="cls-17"
-            d="M679.93,198.82a97.76,97.76,0,0,0-1.16,28.92c.55,5.31,2.39,10.75,2.32,16.07-.05,4.53-1.37,8.95-2.13,13.38-.27,1.59-1.17,3.88-.59,5.43,1.59,4.21,7.7,2.47,10.6.9a40.69,40.69,0,0,0,6.71,9.44,40.1,40.1,0,0,0,10.21,8c26.9,13.5,56.48-13.25,62.92-38.34a47.8,47.8,0,0,0-16.11-49.18c-6.58-5.4-14.61-8.42-22.57-11.17-18.1-6.23-37.32-6.56-47.19,11.84"/>
-      <path class="cls-8"
-            d="M678.81,213.89c8.65,7.31,26.46,11,41.08,9.82,5.33-.41,20.13-7.58,23.7-5.46,4.88,2.9,6.29,9.64,7.18,14.76,2.21,12.79-.32,26.05,0,39,.29,13.07,14.09,12.26,22.91,7.85a64.89,64.89,0,0,0,11.85-7.46c5.37-4.33,9.9-9.72,14.4-14.94,6.67-7.74,12.32-15.77,13.72-26.14,5.4-39.77-29.83-58.06-56.62-72-16.59-8.62-40.61-8.46-59.06.09-21.75,10.08-33.64,42.23-19.13,54.51Z"/>
-      <path class="cls-8" d="M759.55,127a20.76,20.76,0,1,1-20.75,20.75A20.76,20.76,0,0,1,759.55,127Z"/>
-      <path class="cls-17"
-            d="M735.38,218c4.87-7.4,13.84-10.1,20-6s7.27,13.38,2.4,20.78-13.84,10.11-20,6-7.27-13.39-2.4-20.79Z"/>
-      <path class="cls-13"
-            d="M752.21,253.65a11.83,11.83,0,0,1-3.64-.58,11.44,11.44,0,0,1-8.15-12.25A13.91,13.91,0,0,1,752,228.06a1.55,1.55,0,0,1,1.8,1.3,1.58,1.58,0,0,1-1.3,1.8,10.78,10.78,0,0,0-8.94,9.91,8.31,8.31,0,0,0,6,9c4.56,1.49,8.37-1.12,10.24-3.82s3-7,.08-10.67a1.57,1.57,0,1,1,2.46-2c3.26,4.12,3.27,9.78,0,14.43A12.45,12.45,0,0,1,752.21,253.65Z"/>
-      <path class="cls-17"
-            d="M577.43,417a27.21,27.21,0,0,1-23.36,1.12c-.17-.07,0,5.62,0,5.71-.23,3.85-1.82,10.5-6.52,11.14s-7.43-9-8.05-11.8c-.27-1.18-.48-2.37-.67-3.57-.26-1.64-.34-2.88-.37-2.58-.26,2.78-.38,5.54-.88,8.3a23.76,23.76,0,0,1-1.36,5,11.87,11.87,0,0,1-1.51,2.72c-5.06,6.66-8.65-3.62-9.26-7.71-.13-.88.1-5.16-.46-5.63s-.68,1.52-1,2.27a40.13,40.13,0,0,1-2,3.71c-1.85,3-8.28,10.51-12.64,8.11-3.57-2-.17-13.19.53-15.93,3.4-13.41,7.38-32.19,19-41.25,15.06-11.76,41.77-5.06,58.3-1.09,29.14,7,97.45,36.67,97.45,36.67l-18.74,50.05S591,424.15,577.43,417Z"/>
-      <path class="cls-15"
-            d="M816.34,389.08a32.89,32.89,0,0,0-61.87-22.36l-34.69,96a32.89,32.89,0,0,0,61.86,22.36l34.7-96Z"/>
-      <path class="cls-15" d="M668.35,404.55l-24.87,60.91L738,504a32.89,32.89,0,0,0,24.87-60.9l-94.48-38.58Z"/>
+      <path
+        class="cls-17"
+        d="M679.93,198.82a97.76,97.76,0,0,0-1.16,28.92c.55,5.31,2.39,10.75,2.32,16.07-.05,4.53-1.37,8.95-2.13,13.38-.27,1.59-1.17,3.88-.59,5.43,1.59,4.21,7.7,2.47,10.6.9a40.69,40.69,0,0,0,6.71,9.44,40.1,40.1,0,0,0,10.21,8c26.9,13.5,56.48-13.25,62.92-38.34a47.8,47.8,0,0,0-16.11-49.18c-6.58-5.4-14.61-8.42-22.57-11.17-18.1-6.23-37.32-6.56-47.19,11.84"/>
+      <path
+        class="cls-8"
+        d="M678.81,213.89c8.65,7.31,26.46,11,41.08,9.82,5.33-.41,20.13-7.58,23.7-5.46,4.88,2.9,6.29,9.64,7.18,14.76,2.21,12.79-.32,26.05,0,39,.29,13.07,14.09,12.26,22.91,7.85a64.89,64.89,0,0,0,11.85-7.46c5.37-4.33,9.9-9.72,14.4-14.94,6.67-7.74,12.32-15.77,13.72-26.14,5.4-39.77-29.83-58.06-56.62-72-16.59-8.62-40.61-8.46-59.06.09-21.75,10.08-33.64,42.23-19.13,54.51Z"/>
+      <path
+        class="cls-8"
+        d="M759.55,127a20.76,20.76,0,1,1-20.75,20.75A20.76,20.76,0,0,1,759.55,127Z"/>
+      <path
+        class="cls-17"
+        d="M735.38,218c4.87-7.4,13.84-10.1,20-6s7.27,13.38,2.4,20.78-13.84,10.11-20,6-7.27-13.39-2.4-20.79Z"/>
+      <path
+        class="cls-13"
+        d="M752.21,253.65a11.83,11.83,0,0,1-3.64-.58,11.44,11.44,0,0,1-8.15-12.25A13.91,13.91,0,0,1,752,228.06a1.55,1.55,0,0,1,1.8,1.3,1.58,1.58,0,0,1-1.3,1.8,10.78,10.78,0,0,0-8.94,9.91,8.31,8.31,0,0,0,6,9c4.56,1.49,8.37-1.12,10.24-3.82s3-7,.08-10.67a1.57,1.57,0,1,1,2.46-2c3.26,4.12,3.27,9.78,0,14.43A12.45,12.45,0,0,1,752.21,253.65Z"/>
+      <path
+        class="cls-17"
+        d="M577.43,417a27.21,27.21,0,0,1-23.36,1.12c-.17-.07,0,5.62,0,5.71-.23,3.85-1.82,10.5-6.52,11.14s-7.43-9-8.05-11.8c-.27-1.18-.48-2.37-.67-3.57-.26-1.64-.34-2.88-.37-2.58-.26,2.78-.38,5.54-.88,8.3a23.76,23.76,0,0,1-1.36,5,11.87,11.87,0,0,1-1.51,2.72c-5.06,6.66-8.65-3.62-9.26-7.71-.13-.88.1-5.16-.46-5.63s-.68,1.52-1,2.27a40.13,40.13,0,0,1-2,3.71c-1.85,3-8.28,10.51-12.64,8.11-3.57-2-.17-13.19.53-15.93,3.4-13.41,7.38-32.19,19-41.25,15.06-11.76,41.77-5.06,58.3-1.09,29.14,7,97.45,36.67,97.45,36.67l-18.74,50.05S591,424.15,577.43,417Z"/>
+      <path
+        class="cls-15"
+        d="M816.34,389.08a32.89,32.89,0,0,0-61.87-22.36l-34.69,96a32.89,32.89,0,0,0,61.86,22.36l34.7-96Z"/>
+      <path
+        class="cls-15"
+        d="M668.35,404.55l-24.87,60.91L738,504a32.89,32.89,0,0,0,24.87-60.9l-94.48-38.58Z"/>
     </g>
   </svg>
 </template>
diff --git a/client/src/components/illustrations/RoomsIllustration.vue b/client/src/components/illustrations/RoomsIllustration.vue
index 4679ef0b..ed657ebf 100644
--- a/client/src/components/illustrations/RoomsIllustration.vue
+++ b/client/src/components/illustrations/RoomsIllustration.vue
@@ -1,221 +1,338 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1300 1000">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    viewBox="0 0 1300 1000">
     <defs>
-      <linearGradient id="linear-gradient" x1="652.08" y1="903.59" x2="649.68" y2="622.95"
-                      gradientUnits="userSpaceOnUse">
-        <stop offset="0" stop-color="#fff"/>
-        <stop offset="1" stop-color="#e6f4f9"/>
+      <linearGradient
+        x1="652.08"
+        y1="903.59"
+        x2="649.68"
+        y2="622.95"
+        gradientUnits="userSpaceOnUse"
+        id="linear-gradient">
+        <stop
+          offset="0"
+          stop-color="#fff"/>
+        <stop
+          offset="1"
+          stop-color="#e6f4f9"/>
       </linearGradient>
       <clipPath id="clip-path">
-        <path class="cls-1"
-              d="M337.58,308.64c54.26,15.82,63.74,48.4,65,95.5.93,35.07-8.51,70.85-15.66,105-7.8,37.25-11.48,55.61-14.28,93.57-53.8,1.51-209.88,2.16-230.21,0,.84-61.3,21.53-154.56,44.65-211.87,11.94-29.57,27.85-61.77,58-76.32,3-1.45,24.57-15.62,27.55-16.65,29.11-10,38.47,11.67,64.94,10.8Z"/>
+        <path
+          class="cls-1"
+          d="M337.58,308.64c54.26,15.82,63.74,48.4,65,95.5.93,35.07-8.51,70.85-15.66,105-7.8,37.25-11.48,55.61-14.28,93.57-53.8,1.51-209.88,2.16-230.21,0,.84-61.3,21.53-154.56,44.65-211.87,11.94-29.57,27.85-61.77,58-76.32,3-1.45,24.57-15.62,27.55-16.65,29.11-10,38.47,11.67,64.94,10.8Z"/>
       </clipPath>
       <clipPath id="clip-path-2">
-        <path class="cls-1"
-              d="M272.63,297.84c40.48,20.62,61,23.45,71.63,12.91-.59-13.44-1.26-17.42-1.62-24.34L296.39,252.6S281.78,279.88,272.63,297.84Z"/>
+        <path
+          class="cls-1"
+          d="M272.63,297.84c40.48,20.62,61,23.45,71.63,12.91-.59-13.44-1.26-17.42-1.62-24.34L296.39,252.6S281.78,279.88,272.63,297.84Z"/>
       </clipPath>
       <clipPath id="clip-path-3">
-        <path class="cls-1"
-              d="M1032.8,291.63c4.25,15.09,12.29,39.06,18.54,53.42-17.14,9.37-34.75,14-52.61,10.16-.17-11.93-2-23.66-3.72-35.42"/>
+        <path
+          class="cls-1"
+          d="M1032.8,291.63c4.25,15.09,12.29,39.06,18.54,53.42-17.14,9.37-34.75,14-52.61,10.16-.17-11.93-2-23.66-3.72-35.42"/>
       </clipPath>
     </defs>
-    <g id="Layer_1" data-name="Layer 1">
+    <g
+      data-name="Layer 1"
+      id="Layer_1">
       <g>
-        <path class="cls-3"
-              d="M631.89,920.78C516.32,923.07,267.45,919.49,154,843.4,32.83,762.08,50.28,599.09,111.31,472.87,173,345.24,282.63,301.84,392,230.6,506,156.39,572.89,81,713.52,71.47,882.92,60,984.71,194,1079.38,318.81,1194,470,1323.4,676.43,1155.73,843.4c-119.46,119-328.16,73.49-523.84,77.38Z"/>
-        <path class="cls-4"
-              d="M893.78,154.71A27.69,27.69,0,0,0,866.08,127H524.4a27.69,27.69,0,0,0-27.7,27.69V408.59a27.69,27.69,0,0,0,27.7,27.69H866.08a27.69,27.69,0,0,0,27.7-27.69V154.71Z"/>
-        <path class="cls-5"
-              d="M624.4,214.33a10.22,10.22,0,0,0-10.22-10.21H537.24A10.22,10.22,0,0,0,527,214.33v57.1a10.23,10.23,0,0,0,10.22,10.22h76.94a10.23,10.23,0,0,0,10.22-10.22v-57.1Z"/>
-        <path class="cls-6"
-              d="M815.92,167.88a9.1,9.1,0,0,0-9.09-9.09H583.66a9.1,9.1,0,1,0,0,18.19H806.83a9.11,9.11,0,0,0,9.09-9.1Z"/>
-        <path class="cls-5"
-              d="M624.4,318.47a10.23,10.23,0,0,0-10.22-10.22H537.24A10.23,10.23,0,0,0,527,318.47v57.1a10.23,10.23,0,0,0,10.22,10.22h76.94a10.23,10.23,0,0,0,10.22-10.22v-57.1Z"/>
-        <path class="cls-5"
-              d="M740.25,214.33A10.22,10.22,0,0,0,730,204.12H653.09a10.22,10.22,0,0,0-10.22,10.21v57.1a10.23,10.23,0,0,0,10.22,10.22H730a10.23,10.23,0,0,0,10.22-10.22v-57.1Z"/>
-        <path class="cls-5"
-              d="M740.25,318.47A10.23,10.23,0,0,0,730,308.25H653.09a10.23,10.23,0,0,0-10.22,10.22v57.1a10.23,10.23,0,0,0,10.22,10.22H730a10.23,10.23,0,0,0,10.22-10.22v-57.1Z"/>
-        <path class="cls-5"
-              d="M856.1,214.33a10.22,10.22,0,0,0-10.22-10.21H768.94a10.21,10.21,0,0,0-10.21,10.21v57.1a10.22,10.22,0,0,0,10.21,10.22h76.94a10.23,10.23,0,0,0,10.22-10.22v-57.1Z"/>
-        <path class="cls-7"
-              d="M374.55,509.41c.74-29,47.71-21.08,74.84-9.72,41.89,17.54,128.48,58.25,150.12,58.68,9,.18,21.92-.67,30.51,1.65,15.79,4.26,32.1,13.26,39.3,28.34,0,0-89.2.2-119.73-.92a861.52,861.52,0,0,1-131.73-15.5c-30.36-5.86-44.55-13.7-43.31-62.53Z"/>
-        <polygon class="cls-7"
-                 points="416.08 422.95 449.16 513.23 381.11 532.95 368.99 432.15 416.08 422.95 416.08 422.95"/>
-        <path class="cls-8"
-              d="M290.75,308.25c48-.43,76.14,14.94,93.76,36.7,18.3,22.61,25.29,52.13,31.57,78-28.4,10.92-49.71,19.24-78.45,30.17-6.39-16.79-19.4-50.18-26.16-66.81"/>
-        <polygon class="cls-9"
-                 points="254.19 890.42 292.57 821.4 348.59 860.4 330.4 890.42 254.19 890.42 254.19 890.42"/>
-        <path class="cls-10"
-              d="M396.22,929.25a28.19,28.19,0,0,0-21.3-27.6L330.4,890.42H254.19L232.12,930H396.21s0-.25,0-.7Z"/>
-        <path class="cls-11"
-              d="M368.63,651.61s104.43,25.84,89.61,49.72c-15.31,24.66-98.8,164.54-98.8,164.54H254.19L368.33,651.64l.3,0Z"/>
-        <path class="cls-4"
-              d="M430,714.36a8.83,8.83,0,0,0-8.84-8.83H153.21a8.83,8.83,0,0,0-8.83,8.83h0a8.83,8.83,0,0,0,8.83,8.83H421.12a8.83,8.83,0,0,0,8.84-8.83Z"/>
-        <polygon class="cls-9"
-                 points="471.21 893.07 454.39 860.69 538.13 860.69 553.22 888.39 471.21 893.07 471.21 893.07"/>
-        <path class="cls-10"
-              d="M631.52,928.24a28.18,28.18,0,0,0-20.33-27.07l-60.6-17.6L514,887.94l-42.82,5.13L488.94,930H631.52v-1.71Z"/>
-        <path class="cls-12"
-              d="M220.65,705.89C151.89,705,138.92,641.22,142.93,602c16.26.22,190.31,0,224.69,0,52.31,0,71.35,20.13,83,48.7,10.32,25.22,100.7,210,100.7,210L459.41,875.2l-98.25-169,.15-.27Z"/>
-        <path class="cls-9"
-              d="M337.58,308.64c54.26,15.82,63.74,48.4,65,95.5.93,35.07-8.51,70.85-15.66,105-7.8,37.25-11.48,55.61-14.28,93.57-53.8,1.51-209.88,2.16-230.21,0,.84-61.3,21.53-154.56,44.65-211.87,11.94-29.57,27.85-61.77,58-76.32,3-1.45,24.57-15.62,27.55-16.65,29.11-10,38.47,11.67,64.94,10.8Z"/>
+        <path
+          class="cls-3"
+          d="M631.89,920.78C516.32,923.07,267.45,919.49,154,843.4,32.83,762.08,50.28,599.09,111.31,472.87,173,345.24,282.63,301.84,392,230.6,506,156.39,572.89,81,713.52,71.47,882.92,60,984.71,194,1079.38,318.81,1194,470,1323.4,676.43,1155.73,843.4c-119.46,119-328.16,73.49-523.84,77.38Z"/>
+        <path
+          class="cls-4"
+          d="M893.78,154.71A27.69,27.69,0,0,0,866.08,127H524.4a27.69,27.69,0,0,0-27.7,27.69V408.59a27.69,27.69,0,0,0,27.7,27.69H866.08a27.69,27.69,0,0,0,27.7-27.69V154.71Z"/>
+        <path
+          class="cls-5"
+          d="M624.4,214.33a10.22,10.22,0,0,0-10.22-10.21H537.24A10.22,10.22,0,0,0,527,214.33v57.1a10.23,10.23,0,0,0,10.22,10.22h76.94a10.23,10.23,0,0,0,10.22-10.22v-57.1Z"/>
+        <path
+          class="cls-6"
+          d="M815.92,167.88a9.1,9.1,0,0,0-9.09-9.09H583.66a9.1,9.1,0,1,0,0,18.19H806.83a9.11,9.11,0,0,0,9.09-9.1Z"/>
+        <path
+          class="cls-5"
+          d="M624.4,318.47a10.23,10.23,0,0,0-10.22-10.22H537.24A10.23,10.23,0,0,0,527,318.47v57.1a10.23,10.23,0,0,0,10.22,10.22h76.94a10.23,10.23,0,0,0,10.22-10.22v-57.1Z"/>
+        <path
+          class="cls-5"
+          d="M740.25,214.33A10.22,10.22,0,0,0,730,204.12H653.09a10.22,10.22,0,0,0-10.22,10.21v57.1a10.23,10.23,0,0,0,10.22,10.22H730a10.23,10.23,0,0,0,10.22-10.22v-57.1Z"/>
+        <path
+          class="cls-5"
+          d="M740.25,318.47A10.23,10.23,0,0,0,730,308.25H653.09a10.23,10.23,0,0,0-10.22,10.22v57.1a10.23,10.23,0,0,0,10.22,10.22H730a10.23,10.23,0,0,0,10.22-10.22v-57.1Z"/>
+        <path
+          class="cls-5"
+          d="M856.1,214.33a10.22,10.22,0,0,0-10.22-10.21H768.94a10.21,10.21,0,0,0-10.21,10.21v57.1a10.22,10.22,0,0,0,10.21,10.22h76.94a10.23,10.23,0,0,0,10.22-10.22v-57.1Z"/>
+        <path
+          class="cls-7"
+          d="M374.55,509.41c.74-29,47.71-21.08,74.84-9.72,41.89,17.54,128.48,58.25,150.12,58.68,9,.18,21.92-.67,30.51,1.65,15.79,4.26,32.1,13.26,39.3,28.34,0,0-89.2.2-119.73-.92a861.52,861.52,0,0,1-131.73-15.5c-30.36-5.86-44.55-13.7-43.31-62.53Z"/>
+        <polygon
+          class="cls-7"
+          points="416.08 422.95 449.16 513.23 381.11 532.95 368.99 432.15 416.08 422.95 416.08 422.95"/>
+        <path
+          class="cls-8"
+          d="M290.75,308.25c48-.43,76.14,14.94,93.76,36.7,18.3,22.61,25.29,52.13,31.57,78-28.4,10.92-49.71,19.24-78.45,30.17-6.39-16.79-19.4-50.18-26.16-66.81"/>
+        <polygon
+          class="cls-9"
+          points="254.19 890.42 292.57 821.4 348.59 860.4 330.4 890.42 254.19 890.42 254.19 890.42"/>
+        <path
+          class="cls-10"
+          d="M396.22,929.25a28.19,28.19,0,0,0-21.3-27.6L330.4,890.42H254.19L232.12,930H396.21s0-.25,0-.7Z"/>
+        <path
+          class="cls-11"
+          d="M368.63,651.61s104.43,25.84,89.61,49.72c-15.31,24.66-98.8,164.54-98.8,164.54H254.19L368.33,651.64l.3,0Z"/>
+        <path
+          class="cls-4"
+          d="M430,714.36a8.83,8.83,0,0,0-8.84-8.83H153.21a8.83,8.83,0,0,0-8.83,8.83h0a8.83,8.83,0,0,0,8.83,8.83H421.12a8.83,8.83,0,0,0,8.84-8.83Z"/>
+        <polygon
+          class="cls-9"
+          points="471.21 893.07 454.39 860.69 538.13 860.69 553.22 888.39 471.21 893.07 471.21 893.07"/>
+        <path
+          class="cls-10"
+          d="M631.52,928.24a28.18,28.18,0,0,0-20.33-27.07l-60.6-17.6L514,887.94l-42.82,5.13L488.94,930H631.52v-1.71Z"/>
+        <path
+          class="cls-12"
+          d="M220.65,705.89C151.89,705,138.92,641.22,142.93,602c16.26.22,190.31,0,224.69,0,52.31,0,71.35,20.13,83,48.7,10.32,25.22,100.7,210,100.7,210L459.41,875.2l-98.25-169,.15-.27Z"/>
+        <path
+          class="cls-9"
+          d="M337.58,308.64c54.26,15.82,63.74,48.4,65,95.5.93,35.07-8.51,70.85-15.66,105-7.8,37.25-11.48,55.61-14.28,93.57-53.8,1.51-209.88,2.16-230.21,0,.84-61.3,21.53-154.56,44.65-211.87,11.94-29.57,27.85-61.77,58-76.32,3-1.45,24.57-15.62,27.55-16.65,29.11-10,38.47,11.67,64.94,10.8Z"/>
         <g class="cls-13">
-          <path class="cls-8"
-                d="M252.15,365.56s-30.84,198.27-79.46,199.62C171,502.45,165.28,462.94,204.05,413c24.73-31.85,43.21-47.93,48.1-47.47Z"/>
+          <path
+            class="cls-8"
+            d="M252.15,365.56s-30.84,198.27-79.46,199.62C171,502.45,165.28,462.94,204.05,413c24.73-31.85,43.21-47.93,48.1-47.47Z"/>
         </g>
-        <path class="cls-14"
-              d="M296.39,252.6c-11.95,23.46-14.61,27.28-23.76,45.24,40.48,20.62,61,23.45,71.63,12.91-.59-13.44-1.26-17.42-1.62-24.34"/>
+        <path
+          class="cls-14"
+          d="M296.39,252.6c-11.95,23.46-14.61,27.28-23.76,45.24,40.48,20.62,61,23.45,71.63,12.91-.59-13.44-1.26-17.42-1.62-24.34"/>
         <g class="cls-15">
-          <path class="cls-7"
-                d="M295.91,256c5.6,20.14,29.19,53.58,48.35,54.8,21,1.33,16-14.54,14.07-28-2.64-18-15-37.52-32.34-44.31C315.34,234.22,295.91,256,295.91,256Z"/>
+          <path
+            class="cls-7"
+            d="M295.91,256c5.6,20.14,29.19,53.58,48.35,54.8,21,1.33,16-14.54,14.07-28-2.64-18-15-37.52-32.34-44.31C315.34,234.22,295.91,256,295.91,256Z"/>
         </g>
-        <path class="cls-14"
-              d="M348.21,185c26.06,3.29,44.1,30.76,40.25,61.31S360.32,299,334.25,295.74,290.14,265,294,234.44s28.15-52.68,54.22-49.4Z"/>
-        <path class="cls-16"
-              d="M316.1,204.92c10.9-9.81,20.26-3.23,24.87-1,8.1,3.94,14.54,10.58,23.36,13.13,13.81,4,28.16-7.3,28.07-21.55a31.36,31.36,0,0,0-1.69-9.29,25.86,25.86,0,0,0-28.4-17.53c-8.41,1.27-18.31-5.3-41.49-4.62-21.35.62-52.42,32.27-35,67.69,6,12.25,15.59,6.84,18.79,11.5,1.06,1.54,2.09,3.08,3.08,4.66l1.07,1.72c.17.26.36,1.06.51.79,1.81-3.29.91-8.9.6-12.46-1-11.92-3.28-24.46,6.26-33.05Z"/>
-        <path class="cls-14"
-              d="M294.65,224.84c7.79-1.87,15.78,3.59,17.84,12.17S309.9,254.08,302.11,256s-15.77-3.59-17.83-12.17,2.59-17.08,10.37-18.94Z"/>
-        <path class="cls-14"
-              d="M132.13,509.37c.74-29,5.88-62.43,20.39-110.12,26.73,8.14,54.46,12.55,81.27,20.33-6.38,17.1-12.24,34.36-17.85,51.71q-4.58,14.16-9,28.37c41.88,17.53,128.47,58.24,150.11,58.68,9,.18,21.93-.68,30.51,1.64,15.8,4.26,32.11,13.26,39.3,28.34,0,0-89.2.21-119.73-.91A862.93,862.93,0,0,1,175.44,571.9c-30.36-5.86-44.55-13.7-43.31-62.53Z"/>
-        <path class="cls-9"
-              d="M272.63,297.84c-97.95-.58-112.81,64.27-125,115.08,28.43,10.84,49.77,19.09,78.55,29.93,6.33-16.81,19.24-50.23,26-66.89"/>
-        <path class="cls-17"
-              d="M338.68,917.67a1.59,1.59,0,0,1-1.35-2.42q2.63-4.25,5.21-8.51c2.76-4.54,5.62-9.24,8.52-13.82a1.59,1.59,0,1,1,2.68,1.7c-2.88,4.56-5.73,9.24-8.49,13.77q-2.6,4.27-5.22,8.53A1.6,1.6,0,0,1,338.68,917.67Zm-14.54-3a1.52,1.52,0,0,1-.91-.29,1.58,1.58,0,0,1-.39-2.21c1.61-2.31,3.2-4.63,4.8-7,3.7-5.41,7.53-11,11.65-16.29a1.59,1.59,0,1,1,2.5,2c-4.05,5.21-7.85,10.77-11.53,16.14-1.6,2.33-3.2,4.67-4.82,7A1.59,1.59,0,0,1,324.14,914.68Zm233.41-4.34a1.57,1.57,0,0,1-.92-.29,1.6,1.6,0,0,1-.37-2.22c5.68-8,10.55-14.58,15.84-20.94a1.59,1.59,0,1,1,2.44,2c-5.23,6.27-10,12.83-15.7,20.74A1.55,1.55,0,0,1,557.55,910.34Zm-12.86-8.07a1.6,1.6,0,0,1-1-.36,1.58,1.58,0,0,1-.22-2.23,107.34,107.34,0,0,1,16.11-16,1.59,1.59,0,0,1,2,2.48,103.89,103.89,0,0,0-15.64,15.54A1.6,1.6,0,0,1,544.69,902.27ZM339.32,388.64a1.58,1.58,0,0,1-1.58-1.47c-.95-12.63-7-55.38-9.48-68.87a1.59,1.59,0,0,1,3.13-.56c2.44,13.54,8.56,56.49,9.52,69.19a1.6,1.6,0,0,1-1.47,1.71Zm-20.09-15a7.63,7.63,0,1,1,7.63-7.63A7.64,7.64,0,0,1,319.23,373.62Zm0-12.08a4.45,4.45,0,1,0,4.45,4.45A4.46,4.46,0,0,0,319.23,361.54ZM317,345.91a7.63,7.63,0,1,1,7.63-7.63A7.64,7.64,0,0,1,317,345.91Zm0-12.08a4.46,4.46,0,1,0,4.46,4.45A4.46,4.46,0,0,0,317,333.83Z"/>
-        <path class="cls-11"
-              d="M1019.73,353.12s-81.68-8-91.49,56.58c-3.75,24.64-8.68,55.4-13.91,89.94-3.41,22.54-7,46.69-10.38,71.8C902.55,581.7,984.47,542,984.47,542l19.58-143.58,15.68-45.31Z"/>
-        <path class="cls-18"
-              d="M873.85,441.91c-6.38-9.81-12.21-20-18.53-29.82-3.19-5-6.26-11.08-11.25-14.47-11-7.5-32.42-1.92-45.29-4.06-22-3.66-33.11-20.12-34.52-17.75-5.31,8.95-8.61,39.69,34.52,52.95,7,2.16,16.65.94,22.77,5.38,12.88,9.37,13.62,29.07,18.1,43"/>
-        <path class="cls-11"
-              d="M921.76,500.34l-47-61.57-43.11,28.64s22.67,128.44,81.86,128.86,62.2-50.08,62.2-50.08l-53.92-45.85Z"/>
-        <path class="cls-16"
-              d="M935.82,795.92l26.87,82.37-45.26,53.27H818.56l4.5-5.87A76.84,76.84,0,0,1,861.6,899l18.61-5.67,15.18-19.85-15.18-42.92,55.61-34.59Z"/>
-        <path class="cls-19"
-              d="M975.38,590.74c-114.07-2.41-164.17-4.77-189.94,31.68-30.59,43.28-.73,82.77,10.6,103.77,21.93,40.65,68.7,109.7,68.7,109.7h98s-42.84-119.5-58.85-156.13l71.54-89Z"/>
-        <path class="cls-4"
-              d="M1149.66,706a8.84,8.84,0,0,0-8.84-8.83H872.91a8.84,8.84,0,0,0-8.83,8.83h0a8.83,8.83,0,0,0,8.83,8.83h267.91a8.83,8.83,0,0,0,8.84-8.83Z"/>
-        <path class="cls-16"
-              d="M830.89,851.5,797,930.62H648.73l.58-1.36a41.56,41.56,0,0,1,24.27-23l73.65-26.41L763.9,843.1l67,8.4Z"/>
-        <path class="cls-20"
-              d="M1154.21,576.05s-134.05,14.74-174.1,14.18c-67.29-1-104.81-3.82-137.09,50.57C804.93,705,739.9,853.68,739.9,853.68L840.11,856,943.74,697.4s92.94-.37,129.16,0c50.6.52,77.43-29.6,81.31-61.37,2.07-17,.39-43,0-60Z"/>
-        <path class="cls-10"
-              d="M1031.19,207.45c11.18,5.28,24,16,28,34.08,3.6,16.09,1.53,31.71-4.69,41.3-7.65,11.81-19.75,23.41-32.61,13.52-3.29-2.53-21.17-40.66-11.71-54.82,6-8.93,21-34.08,21-34.08Z"/>
-        <path class="cls-18"
-              d="M1032.8,291.63c4.25,15.09,12.29,39.06,18.54,53.42-17.14,9.37-34.75,14-52.61,10.16-.17-11.93-2-23.66-3.72-35.42"/>
+        <path
+          class="cls-14"
+          d="M348.21,185c26.06,3.29,44.1,30.76,40.25,61.31S360.32,299,334.25,295.74,290.14,265,294,234.44s28.15-52.68,54.22-49.4Z"/>
+        <path
+          class="cls-16"
+          d="M316.1,204.92c10.9-9.81,20.26-3.23,24.87-1,8.1,3.94,14.54,10.58,23.36,13.13,13.81,4,28.16-7.3,28.07-21.55a31.36,31.36,0,0,0-1.69-9.29,25.86,25.86,0,0,0-28.4-17.53c-8.41,1.27-18.31-5.3-41.49-4.62-21.35.62-52.42,32.27-35,67.69,6,12.25,15.59,6.84,18.79,11.5,1.06,1.54,2.09,3.08,3.08,4.66l1.07,1.72c.17.26.36,1.06.51.79,1.81-3.29.91-8.9.6-12.46-1-11.92-3.28-24.46,6.26-33.05Z"/>
+        <path
+          class="cls-14"
+          d="M294.65,224.84c7.79-1.87,15.78,3.59,17.84,12.17S309.9,254.08,302.11,256s-15.77-3.59-17.83-12.17,2.59-17.08,10.37-18.94Z"/>
+        <path
+          class="cls-14"
+          d="M132.13,509.37c.74-29,5.88-62.43,20.39-110.12,26.73,8.14,54.46,12.55,81.27,20.33-6.38,17.1-12.24,34.36-17.85,51.71q-4.58,14.16-9,28.37c41.88,17.53,128.47,58.24,150.11,58.68,9,.18,21.93-.68,30.51,1.64,15.8,4.26,32.11,13.26,39.3,28.34,0,0-89.2.21-119.73-.91A862.93,862.93,0,0,1,175.44,571.9c-30.36-5.86-44.55-13.7-43.31-62.53Z"/>
+        <path
+          class="cls-9"
+          d="M272.63,297.84c-97.95-.58-112.81,64.27-125,115.08,28.43,10.84,49.77,19.09,78.55,29.93,6.33-16.81,19.24-50.23,26-66.89"/>
+        <path
+          class="cls-17"
+          d="M338.68,917.67a1.59,1.59,0,0,1-1.35-2.42q2.63-4.25,5.21-8.51c2.76-4.54,5.62-9.24,8.52-13.82a1.59,1.59,0,1,1,2.68,1.7c-2.88,4.56-5.73,9.24-8.49,13.77q-2.6,4.27-5.22,8.53A1.6,1.6,0,0,1,338.68,917.67Zm-14.54-3a1.52,1.52,0,0,1-.91-.29,1.58,1.58,0,0,1-.39-2.21c1.61-2.31,3.2-4.63,4.8-7,3.7-5.41,7.53-11,11.65-16.29a1.59,1.59,0,1,1,2.5,2c-4.05,5.21-7.85,10.77-11.53,16.14-1.6,2.33-3.2,4.67-4.82,7A1.59,1.59,0,0,1,324.14,914.68Zm233.41-4.34a1.57,1.57,0,0,1-.92-.29,1.6,1.6,0,0,1-.37-2.22c5.68-8,10.55-14.58,15.84-20.94a1.59,1.59,0,1,1,2.44,2c-5.23,6.27-10,12.83-15.7,20.74A1.55,1.55,0,0,1,557.55,910.34Zm-12.86-8.07a1.6,1.6,0,0,1-1-.36,1.58,1.58,0,0,1-.22-2.23,107.34,107.34,0,0,1,16.11-16,1.59,1.59,0,0,1,2,2.48,103.89,103.89,0,0,0-15.64,15.54A1.6,1.6,0,0,1,544.69,902.27ZM339.32,388.64a1.58,1.58,0,0,1-1.58-1.47c-.95-12.63-7-55.38-9.48-68.87a1.59,1.59,0,0,1,3.13-.56c2.44,13.54,8.56,56.49,9.52,69.19a1.6,1.6,0,0,1-1.47,1.71Zm-20.09-15a7.63,7.63,0,1,1,7.63-7.63A7.64,7.64,0,0,1,319.23,373.62Zm0-12.08a4.45,4.45,0,1,0,4.45,4.45A4.46,4.46,0,0,0,319.23,361.54ZM317,345.91a7.63,7.63,0,1,1,7.63-7.63A7.64,7.64,0,0,1,317,345.91Zm0-12.08a4.46,4.46,0,1,0,4.46,4.45A4.46,4.46,0,0,0,317,333.83Z"/>
+        <path
+          class="cls-11"
+          d="M1019.73,353.12s-81.68-8-91.49,56.58c-3.75,24.64-8.68,55.4-13.91,89.94-3.41,22.54-7,46.69-10.38,71.8C902.55,581.7,984.47,542,984.47,542l19.58-143.58,15.68-45.31Z"/>
+        <path
+          class="cls-18"
+          d="M873.85,441.91c-6.38-9.81-12.21-20-18.53-29.82-3.19-5-6.26-11.08-11.25-14.47-11-7.5-32.42-1.92-45.29-4.06-22-3.66-33.11-20.12-34.52-17.75-5.31,8.95-8.61,39.69,34.52,52.95,7,2.16,16.65.94,22.77,5.38,12.88,9.37,13.62,29.07,18.1,43"/>
+        <path
+          class="cls-11"
+          d="M921.76,500.34l-47-61.57-43.11,28.64s22.67,128.44,81.86,128.86,62.2-50.08,62.2-50.08l-53.92-45.85Z"/>
+        <path
+          class="cls-16"
+          d="M935.82,795.92l26.87,82.37-45.26,53.27H818.56l4.5-5.87A76.84,76.84,0,0,1,861.6,899l18.61-5.67,15.18-19.85-15.18-42.92,55.61-34.59Z"/>
+        <path
+          class="cls-19"
+          d="M975.38,590.74c-114.07-2.41-164.17-4.77-189.94,31.68-30.59,43.28-.73,82.77,10.6,103.77,21.93,40.65,68.7,109.7,68.7,109.7h98s-42.84-119.5-58.85-156.13l71.54-89Z"/>
+        <path
+          class="cls-4"
+          d="M1149.66,706a8.84,8.84,0,0,0-8.84-8.83H872.91a8.84,8.84,0,0,0-8.83,8.83h0a8.83,8.83,0,0,0,8.83,8.83h267.91a8.83,8.83,0,0,0,8.84-8.83Z"/>
+        <path
+          class="cls-16"
+          d="M830.89,851.5,797,930.62H648.73l.58-1.36a41.56,41.56,0,0,1,24.27-23l73.65-26.41L763.9,843.1l67,8.4Z"/>
+        <path
+          class="cls-20"
+          d="M1154.21,576.05s-134.05,14.74-174.1,14.18c-67.29-1-104.81-3.82-137.09,50.57C804.93,705,739.9,853.68,739.9,853.68L840.11,856,943.74,697.4s92.94-.37,129.16,0c50.6.52,77.43-29.6,81.31-61.37,2.07-17,.39-43,0-60Z"/>
+        <path
+          class="cls-10"
+          d="M1031.19,207.45c11.18,5.28,24,16,28,34.08,3.6,16.09,1.53,31.71-4.69,41.3-7.65,11.81-19.75,23.41-32.61,13.52-3.29-2.53-21.17-40.66-11.71-54.82,6-8.93,21-34.08,21-34.08Z"/>
+        <path
+          class="cls-18"
+          d="M1032.8,291.63c4.25,15.09,12.29,39.06,18.54,53.42-17.14,9.37-34.75,14-52.61,10.16-.17-11.93-2-23.66-3.72-35.42"/>
         <g class="cls-21">
-          <path class="cls-22"
-                d="M991.86,340.34c14.78-2.65,31.34-13.42,39.48-35.73,4.79-13.12-11.42-8.05-15.49-6.06-31.93,15.67-24,41.79-24,41.79Z"/>
+          <path
+            class="cls-22"
+            d="M991.86,340.34c14.78-2.65,31.34-13.42,39.48-35.73,4.79-13.12-11.42-8.05-15.49-6.06-31.93,15.67-24,41.79-24,41.79Z"/>
         </g>
-        <path class="cls-18"
-              d="M981.38,216.75c26.07-2.52,57.29,6.93,61.42,52.63,2.52,28-24.56,56.46-50.63,59S951,306.46,948.31,278.51s7-59.24,33.07-61.76Z"/>
-        <path class="cls-10"
-              d="M967.07,204.94c-26.78,9.49-37.72,44.41-14.75,56.84,32,17.33,66.22-7.78,66.22-7.78s2,10.72,7.5,18.46c2.8,4,5.81,4.63,8.54,3.27,3.8-1.9,6.94-7.76,8.38-14,14.4-61.87-48.22-66.64-75.89-56.84Z"/>
-        <path class="cls-10" d="M1024.3,167a24.67,24.67,0,1,1-24.67,24.67A24.68,24.68,0,0,1,1024.3,167Z"/>
-        <path class="cls-18"
-              d="M1044.46,258.59c6.5,3.1,8.8,11.84,5.14,19.5s-11.91,11.36-18.41,8.25-8.81-11.85-5.15-19.51,11.92-11.35,18.42-8.24Z"/>
-        <path class="cls-12"
-              d="M997.5,338.56l46.33-14.07,7.51,20.56h0c14.13,2.59,103.23,174.89,102.27,193.23-.68,13-1.57,28.52-10,39.23-7.44,9.46-172.17,4.5-172.17,4.5s.43-39.84,1.32-55.7c2.13-37.74-33-107.42,25.92-171.1l-1.23-16.65Z"/>
-        <path class="cls-18"
-              d="M1022.18,543.25c-11,2.6-22.42,5.79-33.8,6.48-6.77.41-13.42-1.1-20.16-1.14-18.72-.09-35.76,10.95-48.86,23.41-4,3.77-13.33,16.32-13.33,16.32l126.8-.89-10.65-44.18Z"/>
-        <path class="cls-11"
-              d="M1081.18,379.16c2.59,42.88,9,87.39,21.1,128.69,3,10.27,7.93,35.27,21.1,37.73,18.32,3.43,21.75-31.35,21-42-2.76-38.79-63.2-124.45-63.2-124.45Z"/>
-        <path class="cls-12"
-              d="M1051.19,344.48s78.66-23.43,100.62,38c13.85,38.79,33.74,85.88,54.4,146.65a39.06,39.06,0,0,1-1.93,29.83c-4.58,9.29-14.76,15.86-46,21.34-65,11.42-128.22,7.08-128.22,7.08l-8.21-51.88,99.69-19.87-8.38-23.47L1075.24,386l-24-41.47Z"/>
-        <path class="cls-23"
-              d="M997.16,353.63c-3.14,10.91-4.84,25.58-.76,36.56,4.35,11.69,16.52,15,26.7,7.92,16.87-11.77,23.09-34.7,29.17-53.59M748.94,872.33c8.62,5.12,17.8,9.42,26.11,15.06m-21.32-27c9,3.95,18.22,7.54,27.08,11.81m103.9-21.76a150.68,150.68,0,0,1,30.44-7.51m-25.34,21.53c10.52-4,19.9-6.63,29.89-9.84"/>
-        <path class="cls-11"
-              d="M1019.73,353.12s-81.68-8-91.49,56.58c-3.75,24.64-8.68,55.4-13.91,89.94-3.41,22.54-7,46.69-10.38,71.8C902.55,581.7,984.47,542,984.47,542l19.58-143.58,15.68-45.31Z"/>
-        <path class="cls-18"
-              d="M873.85,441.91c-6.38-9.81-12.21-20-18.53-29.82-3.19-5-6.26-11.08-11.25-14.47-11-7.5-32.42-1.92-45.29-4.06-22-3.66-33.11-20.12-34.52-17.75-5.31,8.95-8.61,39.69,34.52,52.95,7,2.16,16.65.94,22.77,5.38,12.88,9.37,13.62,29.07,18.1,43"/>
-        <path class="cls-11"
-              d="M921.76,500.34l-47-61.57-43.11,28.64s22.67,128.44,81.86,128.86,62.2-50.08,62.2-50.08l-53.92-45.85Z"/>
-        <path class="cls-16"
-              d="M935.82,795.92l26.87,82.37-45.26,53.27H818.56l4.5-5.87A76.84,76.84,0,0,1,861.6,899l18.61-5.67,15.18-19.85-15.18-42.92,55.61-34.59Z"/>
-        <path class="cls-19"
-              d="M975.38,590.74c-114.07-2.41-164.17-4.77-189.94,31.68-30.59,43.28-.73,82.77,10.6,103.77,21.93,40.65,68.7,109.7,68.7,109.7h98s-42.84-119.5-58.85-156.13l71.54-89Z"/>
-        <path class="cls-4"
-              d="M1149.66,706a8.84,8.84,0,0,0-8.84-8.83H872.91a8.84,8.84,0,0,0-8.83,8.83h0a8.83,8.83,0,0,0,8.83,8.83h267.91a8.83,8.83,0,0,0,8.84-8.83Z"/>
-        <path class="cls-16"
-              d="M830.89,851.5,797,930.62H648.73l.58-1.36a41.56,41.56,0,0,1,24.27-23l73.65-26.41L763.9,843.1l67,8.4Z"/>
-        <path class="cls-20"
-              d="M1154.21,576.05s-134.05,14.74-174.1,14.18c-67.29-1-104.81-3.82-137.09,50.57C804.93,705,739.9,853.68,739.9,853.68L840.11,856,943.74,697.4s92.94-.37,129.16,0c50.6.52,77.43-29.6,81.31-61.37,2.07-17,.39-43,0-60Z"/>
-        <path class="cls-10"
-              d="M1031.19,207.45c11.18,5.28,24,16,28,34.08,3.6,16.09,1.53,31.71-4.69,41.3-7.65,11.81-19.75,23.41-32.61,13.52-3.29-2.53-21.17-40.66-11.71-54.82,6-8.93,21-34.08,21-34.08Z"/>
-        <path class="cls-18"
-              d="M1032.8,291.63c4.25,15.09,12.29,39.06,18.54,53.42-17.14,9.37-34.75,14-52.61,10.16-.17-11.93-2-23.66-3.72-35.42"/>
+        <path
+          class="cls-18"
+          d="M981.38,216.75c26.07-2.52,57.29,6.93,61.42,52.63,2.52,28-24.56,56.46-50.63,59S951,306.46,948.31,278.51s7-59.24,33.07-61.76Z"/>
+        <path
+          class="cls-10"
+          d="M967.07,204.94c-26.78,9.49-37.72,44.41-14.75,56.84,32,17.33,66.22-7.78,66.22-7.78s2,10.72,7.5,18.46c2.8,4,5.81,4.63,8.54,3.27,3.8-1.9,6.94-7.76,8.38-14,14.4-61.87-48.22-66.64-75.89-56.84Z"/>
+        <path
+          class="cls-10"
+          d="M1024.3,167a24.67,24.67,0,1,1-24.67,24.67A24.68,24.68,0,0,1,1024.3,167Z"/>
+        <path
+          class="cls-18"
+          d="M1044.46,258.59c6.5,3.1,8.8,11.84,5.14,19.5s-11.91,11.36-18.41,8.25-8.81-11.85-5.15-19.51,11.92-11.35,18.42-8.24Z"/>
+        <path
+          class="cls-12"
+          d="M997.5,338.56l46.33-14.07,7.51,20.56h0c14.13,2.59,103.23,174.89,102.27,193.23-.68,13-1.57,28.52-10,39.23-7.44,9.46-172.17,4.5-172.17,4.5s.43-39.84,1.32-55.7c2.13-37.74-33-107.42,25.92-171.1l-1.23-16.65Z"/>
+        <path
+          class="cls-18"
+          d="M1022.18,543.25c-11,2.6-22.42,5.79-33.8,6.48-6.77.41-13.42-1.1-20.16-1.14-18.72-.09-35.76,10.95-48.86,23.41-4,3.77-13.33,16.32-13.33,16.32l126.8-.89-10.65-44.18Z"/>
+        <path
+          class="cls-11"
+          d="M1081.18,379.16c2.59,42.88,9,87.39,21.1,128.69,3,10.27,7.93,35.27,21.1,37.73,18.32,3.43,21.75-31.35,21-42-2.76-38.79-63.2-124.45-63.2-124.45Z"/>
+        <path
+          class="cls-12"
+          d="M1051.19,344.48s78.66-23.43,100.62,38c13.85,38.79,33.74,85.88,54.4,146.65a39.06,39.06,0,0,1-1.93,29.83c-4.58,9.29-14.76,15.86-46,21.34-65,11.42-128.22,7.08-128.22,7.08l-8.21-51.88,99.69-19.87-8.38-23.47L1075.24,386l-24-41.47Z"/>
+        <path
+          class="cls-23"
+          d="M997.16,353.63c-3.14,10.91-4.84,25.58-.76,36.56,4.35,11.69,16.52,15,26.7,7.92,16.87-11.77,23.09-34.7,29.17-53.59M748.94,872.33c8.62,5.12,17.8,9.42,26.11,15.06m-21.32-27c9,3.95,18.22,7.54,27.08,11.81m103.9-21.76a150.68,150.68,0,0,1,30.44-7.51m-25.34,21.53c10.52-4,19.9-6.63,29.89-9.84"/>
+        <path
+          class="cls-11"
+          d="M1019.73,353.12s-81.68-8-91.49,56.58c-3.75,24.64-8.68,55.4-13.91,89.94-3.41,22.54-7,46.69-10.38,71.8C902.55,581.7,984.47,542,984.47,542l19.58-143.58,15.68-45.31Z"/>
+        <path
+          class="cls-18"
+          d="M873.85,441.91c-6.38-9.81-12.21-20-18.53-29.82-3.19-5-6.26-11.08-11.25-14.47-11-7.5-32.42-1.92-45.29-4.06-22-3.66-33.11-20.12-34.52-17.75-5.31,8.95-8.61,39.69,34.52,52.95,7,2.16,16.65.94,22.77,5.38,12.88,9.37,13.62,29.07,18.1,43"/>
+        <path
+          class="cls-11"
+          d="M921.76,500.34l-47-61.57-43.11,28.64s22.67,128.44,81.86,128.86,62.2-50.08,62.2-50.08l-53.92-45.85Z"/>
+        <path
+          class="cls-16"
+          d="M935.82,795.92l26.87,82.37-45.26,53.27H818.56l4.5-5.87A76.84,76.84,0,0,1,861.6,899l18.61-5.67,15.18-19.85-15.18-42.92,55.61-34.59Z"/>
+        <path
+          class="cls-19"
+          d="M975.38,590.74c-114.07-2.41-164.17-4.77-189.94,31.68-30.59,43.28-.73,82.77,10.6,103.77,21.93,40.65,68.7,109.7,68.7,109.7h98s-42.84-119.5-58.85-156.13l71.54-89Z"/>
+        <path
+          class="cls-4"
+          d="M1149.66,706a8.84,8.84,0,0,0-8.84-8.83H872.91a8.84,8.84,0,0,0-8.83,8.83h0a8.83,8.83,0,0,0,8.83,8.83h267.91a8.83,8.83,0,0,0,8.84-8.83Z"/>
+        <path
+          class="cls-16"
+          d="M830.89,851.5,797,930.62H648.73l.58-1.36a41.56,41.56,0,0,1,24.27-23l73.65-26.41L763.9,843.1l67,8.4Z"/>
+        <path
+          class="cls-20"
+          d="M1154.21,576.05s-134.05,14.74-174.1,14.18c-67.29-1-104.81-3.82-137.09,50.57C804.93,705,739.9,853.68,739.9,853.68L840.11,856,943.74,697.4s92.94-.37,129.16,0c50.6.52,77.43-29.6,81.31-61.37,2.07-17,.39-43,0-60Z"/>
+        <path
+          class="cls-10"
+          d="M1031.19,207.45c11.18,5.28,24,16,28,34.08,3.6,16.09,1.53,31.71-4.69,41.3-7.65,11.81-19.75,23.41-32.61,13.52-3.29-2.53-21.17-40.66-11.71-54.82,6-8.93,21-34.08,21-34.08Z"/>
+        <path
+          class="cls-18"
+          d="M1032.8,291.63c4.25,15.09,12.29,39.06,18.54,53.42-17.14,9.37-34.75,14-52.61,10.16-.17-11.93-2-23.66-3.72-35.42"/>
         <g class="cls-21">
-          <path class="cls-22"
-                d="M991.86,340.34c14.78-2.65,31.34-13.42,39.48-35.73,4.79-13.12-11.42-8.05-15.49-6.06-31.93,15.67-24,41.79-24,41.79Z"/>
+          <path
+            class="cls-22"
+            d="M991.86,340.34c14.78-2.65,31.34-13.42,39.48-35.73,4.79-13.12-11.42-8.05-15.49-6.06-31.93,15.67-24,41.79-24,41.79Z"/>
         </g>
-        <path class="cls-18"
-              d="M981.38,216.75c26.07-2.52,57.29,6.93,61.42,52.63,2.52,28-24.56,56.46-50.63,59S951,306.46,948.31,278.51s7-59.24,33.07-61.76Z"/>
-        <path class="cls-10"
-              d="M967.07,204.94c-26.78,9.49-37.72,44.41-14.75,56.84,32,17.33,66.22-7.78,66.22-7.78s2,10.72,7.5,18.46c2.8,4,5.81,4.63,8.54,3.27,3.8-1.9,6.94-7.76,8.38-14,14.4-61.87-48.22-66.64-75.89-56.84Z"/>
-        <path class="cls-10" d="M1024.3,167a24.67,24.67,0,1,1-24.67,24.67A24.68,24.68,0,0,1,1024.3,167Z"/>
-        <path class="cls-18"
-              d="M1044.46,258.59c6.5,3.1,8.8,11.84,5.14,19.5s-11.91,11.36-18.41,8.25-8.81-11.85-5.15-19.51,11.92-11.35,18.42-8.24Z"/>
-        <path class="cls-12"
-              d="M997.5,338.56l46.33-14.07,7.51,20.56h0c14.13,2.59,103.23,174.89,102.27,193.23-.68,13-1.57,28.52-10,39.23-7.44,9.46-172.17,4.5-172.17,4.5s.43-39.84,1.32-55.7c2.13-37.74-33-107.42,25.92-171.1l-1.23-16.65Z"/>
-        <path class="cls-18"
-              d="M1022.18,543.25c-11,2.6-22.42,5.79-33.8,6.48-6.77.41-13.42-1.1-20.16-1.14-18.72-.09-35.76,10.95-48.86,23.41-4,3.77-13.33,16.32-13.33,16.32l126.8-.89-10.65-44.18Z"/>
-        <path class="cls-11"
-              d="M1081.18,379.16c2.59,42.88,9,87.39,21.1,128.69,3,10.27,7.93,35.27,21.1,37.73,18.32,3.43,21.75-31.35,21-42-2.76-38.79-63.2-124.45-63.2-124.45Z"/>
-        <path class="cls-12"
-              d="M1051.19,344.48s78.66-23.43,100.62,38c13.85,38.79,33.74,85.88,54.4,146.65a39.06,39.06,0,0,1-1.93,29.83c-4.58,9.29-14.76,15.86-46,21.34-65,11.42-128.22,7.08-128.22,7.08l-8.21-51.88,99.69-19.87-8.38-23.47L1075.24,386l-24-41.47Z"/>
-        <path class="cls-23"
-              d="M997.16,353.63c-3.14,10.91-4.84,25.58-.76,36.56,4.35,11.69,16.52,15,26.7,7.92,16.87-11.77,23.09-34.7,29.17-53.59M748.94,872.33c8.62,5.12,17.8,9.42,26.11,15.06m-21.32-27c9,3.95,18.22,7.54,27.08,11.81m103.9-21.76a150.68,150.68,0,0,1,30.44-7.51m-25.34,21.53c10.52-4,19.9-6.63,29.89-9.84"/>
-        <path class="cls-11"
-              d="M1019.73,353.12s-81.68-8-91.49,56.58c-3.75,24.64-8.68,55.4-13.91,89.94-3.41,22.54-7,46.69-10.38,71.8C902.55,581.7,984.47,542,984.47,542l19.58-143.58,15.68-45.31Z"/>
-        <path class="cls-18"
-              d="M873.85,441.91c-6.38-9.81-12.21-20-18.53-29.82-3.19-5-6.26-11.08-11.25-14.47-11-7.5-32.42-1.92-45.29-4.06-22-3.66-33.11-20.12-34.52-17.75-5.31,8.95-8.61,39.69,34.52,52.95,7,2.16,16.65.94,22.77,5.38,12.88,9.37,13.62,29.07,18.1,43"/>
-        <path class="cls-11"
-              d="M921.76,500.34l-47-61.57-43.11,28.64s22.67,128.44,81.86,128.86,62.2-50.08,62.2-50.08l-53.92-45.85Z"/>
-        <path class="cls-16"
-              d="M935.82,795.92l26.87,82.37-45.26,53.27H818.56l4.5-5.87A76.84,76.84,0,0,1,861.6,899l18.61-5.67,15.18-19.85-15.18-42.92,55.61-34.59Z"/>
-        <path class="cls-19"
-              d="M975.38,590.74c-114.07-2.41-164.17-4.77-189.94,31.68-30.59,43.28-.73,82.77,10.6,103.77,21.93,40.65,68.7,109.7,68.7,109.7h98s-42.84-119.5-58.85-156.13l71.54-89Z"/>
-        <path class="cls-4"
-              d="M1149.66,706a8.84,8.84,0,0,0-8.84-8.83H872.91a8.84,8.84,0,0,0-8.83,8.83h0a8.83,8.83,0,0,0,8.83,8.83h267.91a8.83,8.83,0,0,0,8.84-8.83Z"/>
-        <path class="cls-16"
-              d="M830.89,851.5,797,930.62H648.73l.58-1.36a41.56,41.56,0,0,1,24.27-23l73.65-26.41L763.9,843.1l67,8.4Z"/>
-        <path class="cls-20"
-              d="M1154.21,576.05s-134.05,14.74-174.1,14.18c-67.29-1-104.81-3.82-137.09,50.57C804.93,705,739.9,853.68,739.9,853.68L840.11,856,943.74,697.4s92.94-.37,129.16,0c50.6.52,77.43-29.6,81.31-61.37,2.07-17,.39-43,0-60Z"/>
-        <path class="cls-10"
-              d="M1031.19,207.45c11.18,5.28,24,16,28,34.08,3.6,16.09,1.53,31.71-4.69,41.3-7.65,11.81-19.75,23.41-32.61,13.52-3.29-2.53-21.17-40.66-11.71-54.82,6-8.93,21-34.08,21-34.08Z"/>
-        <path class="cls-18"
-              d="M1032.8,291.63c4.25,15.09,12.29,39.06,18.54,53.42-17.14,9.37-34.75,14-52.61,10.16-.17-11.93-2-23.66-3.72-35.42"/>
+        <path
+          class="cls-18"
+          d="M981.38,216.75c26.07-2.52,57.29,6.93,61.42,52.63,2.52,28-24.56,56.46-50.63,59S951,306.46,948.31,278.51s7-59.24,33.07-61.76Z"/>
+        <path
+          class="cls-10"
+          d="M967.07,204.94c-26.78,9.49-37.72,44.41-14.75,56.84,32,17.33,66.22-7.78,66.22-7.78s2,10.72,7.5,18.46c2.8,4,5.81,4.63,8.54,3.27,3.8-1.9,6.94-7.76,8.38-14,14.4-61.87-48.22-66.64-75.89-56.84Z"/>
+        <path
+          class="cls-10"
+          d="M1024.3,167a24.67,24.67,0,1,1-24.67,24.67A24.68,24.68,0,0,1,1024.3,167Z"/>
+        <path
+          class="cls-18"
+          d="M1044.46,258.59c6.5,3.1,8.8,11.84,5.14,19.5s-11.91,11.36-18.41,8.25-8.81-11.85-5.15-19.51,11.92-11.35,18.42-8.24Z"/>
+        <path
+          class="cls-12"
+          d="M997.5,338.56l46.33-14.07,7.51,20.56h0c14.13,2.59,103.23,174.89,102.27,193.23-.68,13-1.57,28.52-10,39.23-7.44,9.46-172.17,4.5-172.17,4.5s.43-39.84,1.32-55.7c2.13-37.74-33-107.42,25.92-171.1l-1.23-16.65Z"/>
+        <path
+          class="cls-18"
+          d="M1022.18,543.25c-11,2.6-22.42,5.79-33.8,6.48-6.77.41-13.42-1.1-20.16-1.14-18.72-.09-35.76,10.95-48.86,23.41-4,3.77-13.33,16.32-13.33,16.32l126.8-.89-10.65-44.18Z"/>
+        <path
+          class="cls-11"
+          d="M1081.18,379.16c2.59,42.88,9,87.39,21.1,128.69,3,10.27,7.93,35.27,21.1,37.73,18.32,3.43,21.75-31.35,21-42-2.76-38.79-63.2-124.45-63.2-124.45Z"/>
+        <path
+          class="cls-12"
+          d="M1051.19,344.48s78.66-23.43,100.62,38c13.85,38.79,33.74,85.88,54.4,146.65a39.06,39.06,0,0,1-1.93,29.83c-4.58,9.29-14.76,15.86-46,21.34-65,11.42-128.22,7.08-128.22,7.08l-8.21-51.88,99.69-19.87-8.38-23.47L1075.24,386l-24-41.47Z"/>
+        <path
+          class="cls-23"
+          d="M997.16,353.63c-3.14,10.91-4.84,25.58-.76,36.56,4.35,11.69,16.52,15,26.7,7.92,16.87-11.77,23.09-34.7,29.17-53.59M748.94,872.33c8.62,5.12,17.8,9.42,26.11,15.06m-21.32-27c9,3.95,18.22,7.54,27.08,11.81m103.9-21.76a150.68,150.68,0,0,1,30.44-7.51m-25.34,21.53c10.52-4,19.9-6.63,29.89-9.84"/>
+        <path
+          class="cls-11"
+          d="M1019.73,353.12s-81.68-8-91.49,56.58c-3.75,24.64-8.68,55.4-13.91,89.94-3.41,22.54-7,46.69-10.38,71.8C902.55,581.7,984.47,542,984.47,542l19.58-143.58,15.68-45.31Z"/>
+        <path
+          class="cls-18"
+          d="M873.85,441.91c-6.38-9.81-12.21-20-18.53-29.82-3.19-5-6.26-11.08-11.25-14.47-11-7.5-32.42-1.92-45.29-4.06-22-3.66-33.11-20.12-34.52-17.75-5.31,8.95-8.61,39.69,34.52,52.95,7,2.16,16.65.94,22.77,5.38,12.88,9.37,13.62,29.07,18.1,43"/>
+        <path
+          class="cls-11"
+          d="M921.76,500.34l-47-61.57-43.11,28.64s22.67,128.44,81.86,128.86,62.2-50.08,62.2-50.08l-53.92-45.85Z"/>
+        <path
+          class="cls-16"
+          d="M935.82,795.92l26.87,82.37-45.26,53.27H818.56l4.5-5.87A76.84,76.84,0,0,1,861.6,899l18.61-5.67,15.18-19.85-15.18-42.92,55.61-34.59Z"/>
+        <path
+          class="cls-19"
+          d="M975.38,590.74c-114.07-2.41-164.17-4.77-189.94,31.68-30.59,43.28-.73,82.77,10.6,103.77,21.93,40.65,68.7,109.7,68.7,109.7h98s-42.84-119.5-58.85-156.13l71.54-89Z"/>
+        <path
+          class="cls-4"
+          d="M1149.66,706a8.84,8.84,0,0,0-8.84-8.83H872.91a8.84,8.84,0,0,0-8.83,8.83h0a8.83,8.83,0,0,0,8.83,8.83h267.91a8.83,8.83,0,0,0,8.84-8.83Z"/>
+        <path
+          class="cls-16"
+          d="M830.89,851.5,797,930.62H648.73l.58-1.36a41.56,41.56,0,0,1,24.27-23l73.65-26.41L763.9,843.1l67,8.4Z"/>
+        <path
+          class="cls-20"
+          d="M1154.21,576.05s-134.05,14.74-174.1,14.18c-67.29-1-104.81-3.82-137.09,50.57C804.93,705,739.9,853.68,739.9,853.68L840.11,856,943.74,697.4s92.94-.37,129.16,0c50.6.52,77.43-29.6,81.31-61.37,2.07-17,.39-43,0-60Z"/>
+        <path
+          class="cls-10"
+          d="M1031.19,207.45c11.18,5.28,24,16,28,34.08,3.6,16.09,1.53,31.71-4.69,41.3-7.65,11.81-19.75,23.41-32.61,13.52-3.29-2.53-21.17-40.66-11.71-54.82,6-8.93,21-34.08,21-34.08Z"/>
+        <path
+          class="cls-18"
+          d="M1032.8,291.63c4.25,15.09,12.29,39.06,18.54,53.42-17.14,9.37-34.75,14-52.61,10.16-.17-11.93-2-23.66-3.72-35.42"/>
         <g class="cls-21">
-          <path class="cls-22"
-                d="M991.86,340.34c14.78-2.65,31.34-13.42,39.48-35.73,4.79-13.12-11.42-8.05-15.49-6.06-31.93,15.67-24,41.79-24,41.79Z"/>
+          <path
+            class="cls-22"
+            d="M991.86,340.34c14.78-2.65,31.34-13.42,39.48-35.73,4.79-13.12-11.42-8.05-15.49-6.06-31.93,15.67-24,41.79-24,41.79Z"/>
         </g>
-        <path class="cls-18"
-              d="M981.38,216.75c26.07-2.52,57.29,6.93,61.42,52.63,2.52,28-24.56,56.46-50.63,59S951,306.46,948.31,278.51s7-59.24,33.07-61.76Z"/>
-        <path class="cls-10"
-              d="M967.07,204.94c-26.78,9.49-37.72,44.41-14.75,56.84,32,17.33,66.22-7.78,66.22-7.78s2,10.72,7.5,18.46c2.8,4,5.81,4.63,8.54,3.27,3.8-1.9,6.94-7.76,8.38-14,14.4-61.87-48.22-66.64-75.89-56.84Z"/>
-        <path class="cls-10" d="M1024.3,167a24.67,24.67,0,1,1-24.67,24.67A24.68,24.68,0,0,1,1024.3,167Z"/>
-        <path class="cls-18"
-              d="M1044.46,258.59c6.5,3.1,8.8,11.84,5.14,19.5s-11.91,11.36-18.41,8.25-8.81-11.85-5.15-19.51,11.92-11.35,18.42-8.24Z"/>
-        <path class="cls-12"
-              d="M997.5,338.56l46.33-14.07,7.51,20.56h0c14.13,2.59,103.23,174.89,102.27,193.23-.68,13-1.57,28.52-10,39.23-7.44,9.46-172.17,4.5-172.17,4.5s.43-39.84,1.32-55.7c2.13-37.74-33-107.42,25.92-171.1l-1.23-16.65Z"/>
-        <path class="cls-18"
-              d="M1022.18,543.25c-11,2.6-22.42,5.79-33.8,6.48-6.77.41-13.42-1.1-20.16-1.14-18.72-.09-35.76,10.95-48.86,23.41-4,3.77-13.33,16.32-13.33,16.32l126.8-.89-10.65-44.18Z"/>
-        <path class="cls-11"
-              d="M1081.18,379.16c2.59,42.88,9,87.39,21.1,128.69,3,10.27,7.93,35.27,21.1,37.73,18.32,3.43,21.75-31.35,21-42-2.76-38.79-63.2-124.45-63.2-124.45Z"/>
-        <path class="cls-12"
-              d="M1051.19,344.48s78.66-23.43,100.62,38c13.85,38.79,33.74,85.88,54.4,146.65a39.06,39.06,0,0,1-1.93,29.83c-4.58,9.29-14.76,15.86-46,21.34-65,11.42-128.22,7.08-128.22,7.08l-8.21-51.88,99.69-19.87-8.38-23.47L1075.24,386l-24-41.47Z"/>
-        <path class="cls-17"
-              d="M775.05,889a1.6,1.6,0,0,1-.89-.27c-5.07-3.45-10.59-6.45-15.93-9.36-3.34-1.81-6.78-3.69-10.1-5.66a1.59,1.59,0,1,1,1.62-2.73c3.27,1.94,6.69,3.8,10,5.6,5.4,3,11,6,16.19,9.52a1.59,1.59,0,0,1-.89,2.9Zm5.76-15.24a1.58,1.58,0,0,1-.69-.16c-5.77-2.78-11.82-5.33-17.66-7.79-3.07-1.29-6.26-2.63-9.37-4a1.59,1.59,0,1,1,1.28-2.91c3.09,1.35,6.26,2.69,9.32,4,5.88,2.47,12,5,17.81,7.85a1.59,1.59,0,0,1-.69,3Zm109-7.74a1.59,1.59,0,0,1-.56-3.07c7.6-2.92,14.75-5.13,21.66-7.27,2.74-.85,5.5-1.7,8.3-2.61a1.59,1.59,0,0,1,1,3c-2.82.9-5.59,1.76-8.34,2.61-6.87,2.13-14,4.33-21.47,7.2A1.65,1.65,0,0,1,889.81,866Zm-5.1-14a1.59,1.59,0,0,1-.56-3.07,150.77,150.77,0,0,1,30.76-7.6,1.58,1.58,0,0,1,1.81,1.33,1.6,1.6,0,0,1-1.33,1.81,148,148,0,0,0-30.12,7.43A1.58,1.58,0,0,1,884.71,852ZM1012,403.4a17.36,17.36,0,0,1-5.21-.78c-5.43-1.7-9.64-5.91-11.86-11.87-5.28-14.2-.78-32.33.72-37.56a1.59,1.59,0,0,1,3,.88c-1.43,5-5.73,22.29-.79,35.57,1.86,5,5.36,8.55,9.83,9.95s9.88.42,14.47-2.78c15.17-10.59,21.57-30.73,27.21-48.5l1.36-4.28a1.59,1.59,0,0,1,3,1c-.45,1.4-.9,2.83-1.36,4.27-5.79,18.25-12.35,38.93-28.42,50.14A21.08,21.08,0,0,1,1012,403.4Z"/>
-        <path class="cls-4"
-              d="M1100.7,596.27a8.83,8.83,0,0,0-8.83-8.84H198.66a8.83,8.83,0,0,0-8.83,8.84h0a8.83,8.83,0,0,0,8.83,8.83h893.21a8.83,8.83,0,0,0,8.83-8.83Z"/>
-        <polygon class="cls-4" points="962.74 594 947.8 594 947.8 929.95 962.74 929.95 962.74 594 962.74 594"/>
-        <polygon class="cls-4"
-                 points="338.31 596.58 323.38 596.58 323.38 926.15 338.31 926.15 338.31 596.58 338.31 596.58"/>
-        <path class="cls-10"
-              d="M740.5,469.22a6.9,6.9,0,0,0-6.89-6.9H559.73a6.9,6.9,0,0,0-6.89,6.9V587.43H733.61a6.9,6.9,0,0,0,6.89-6.89V469.22Z"/>
-        <path class="cls-17"
-              d="M648.73,542.38a17.51,17.51,0,1,1,17.51-17.5A17.52,17.52,0,0,1,648.73,542.38Zm0-31.83a14.33,14.33,0,1,0,14.33,14.33A14.35,14.35,0,0,0,648.73,510.55Z"/>
-        <path class="cls-10"
-              d="M477.33,581.31a6.13,6.13,0,0,1,6.12-6.12h144.9v12.24H483.45a6.12,6.12,0,0,1-6.12-6.12Z"/>
-        <path class="cls-24" d="M1103.56,933.21H193.9a1.65,1.65,0,0,1,0-3.29h909.66a1.65,1.65,0,1,1,0,3.29Z"/>
+        <path
+          class="cls-18"
+          d="M981.38,216.75c26.07-2.52,57.29,6.93,61.42,52.63,2.52,28-24.56,56.46-50.63,59S951,306.46,948.31,278.51s7-59.24,33.07-61.76Z"/>
+        <path
+          class="cls-10"
+          d="M967.07,204.94c-26.78,9.49-37.72,44.41-14.75,56.84,32,17.33,66.22-7.78,66.22-7.78s2,10.72,7.5,18.46c2.8,4,5.81,4.63,8.54,3.27,3.8-1.9,6.94-7.76,8.38-14,14.4-61.87-48.22-66.64-75.89-56.84Z"/>
+        <path
+          class="cls-10"
+          d="M1024.3,167a24.67,24.67,0,1,1-24.67,24.67A24.68,24.68,0,0,1,1024.3,167Z"/>
+        <path
+          class="cls-18"
+          d="M1044.46,258.59c6.5,3.1,8.8,11.84,5.14,19.5s-11.91,11.36-18.41,8.25-8.81-11.85-5.15-19.51,11.92-11.35,18.42-8.24Z"/>
+        <path
+          class="cls-12"
+          d="M997.5,338.56l46.33-14.07,7.51,20.56h0c14.13,2.59,103.23,174.89,102.27,193.23-.68,13-1.57,28.52-10,39.23-7.44,9.46-172.17,4.5-172.17,4.5s.43-39.84,1.32-55.7c2.13-37.74-33-107.42,25.92-171.1l-1.23-16.65Z"/>
+        <path
+          class="cls-18"
+          d="M1022.18,543.25c-11,2.6-22.42,5.79-33.8,6.48-6.77.41-13.42-1.1-20.16-1.14-18.72-.09-35.76,10.95-48.86,23.41-4,3.77-13.33,16.32-13.33,16.32l126.8-.89-10.65-44.18Z"/>
+        <path
+          class="cls-11"
+          d="M1081.18,379.16c2.59,42.88,9,87.39,21.1,128.69,3,10.27,7.93,35.27,21.1,37.73,18.32,3.43,21.75-31.35,21-42-2.76-38.79-63.2-124.45-63.2-124.45Z"/>
+        <path
+          class="cls-12"
+          d="M1051.19,344.48s78.66-23.43,100.62,38c13.85,38.79,33.74,85.88,54.4,146.65a39.06,39.06,0,0,1-1.93,29.83c-4.58,9.29-14.76,15.86-46,21.34-65,11.42-128.22,7.08-128.22,7.08l-8.21-51.88,99.69-19.87-8.38-23.47L1075.24,386l-24-41.47Z"/>
+        <path
+          class="cls-17"
+          d="M775.05,889a1.6,1.6,0,0,1-.89-.27c-5.07-3.45-10.59-6.45-15.93-9.36-3.34-1.81-6.78-3.69-10.1-5.66a1.59,1.59,0,1,1,1.62-2.73c3.27,1.94,6.69,3.8,10,5.6,5.4,3,11,6,16.19,9.52a1.59,1.59,0,0,1-.89,2.9Zm5.76-15.24a1.58,1.58,0,0,1-.69-.16c-5.77-2.78-11.82-5.33-17.66-7.79-3.07-1.29-6.26-2.63-9.37-4a1.59,1.59,0,1,1,1.28-2.91c3.09,1.35,6.26,2.69,9.32,4,5.88,2.47,12,5,17.81,7.85a1.59,1.59,0,0,1-.69,3Zm109-7.74a1.59,1.59,0,0,1-.56-3.07c7.6-2.92,14.75-5.13,21.66-7.27,2.74-.85,5.5-1.7,8.3-2.61a1.59,1.59,0,0,1,1,3c-2.82.9-5.59,1.76-8.34,2.61-6.87,2.13-14,4.33-21.47,7.2A1.65,1.65,0,0,1,889.81,866Zm-5.1-14a1.59,1.59,0,0,1-.56-3.07,150.77,150.77,0,0,1,30.76-7.6,1.58,1.58,0,0,1,1.81,1.33,1.6,1.6,0,0,1-1.33,1.81,148,148,0,0,0-30.12,7.43A1.58,1.58,0,0,1,884.71,852ZM1012,403.4a17.36,17.36,0,0,1-5.21-.78c-5.43-1.7-9.64-5.91-11.86-11.87-5.28-14.2-.78-32.33.72-37.56a1.59,1.59,0,0,1,3,.88c-1.43,5-5.73,22.29-.79,35.57,1.86,5,5.36,8.55,9.83,9.95s9.88.42,14.47-2.78c15.17-10.59,21.57-30.73,27.21-48.5l1.36-4.28a1.59,1.59,0,0,1,3,1c-.45,1.4-.9,2.83-1.36,4.27-5.79,18.25-12.35,38.93-28.42,50.14A21.08,21.08,0,0,1,1012,403.4Z"/>
+        <path
+          class="cls-4"
+          d="M1100.7,596.27a8.83,8.83,0,0,0-8.83-8.84H198.66a8.83,8.83,0,0,0-8.83,8.84h0a8.83,8.83,0,0,0,8.83,8.83h893.21a8.83,8.83,0,0,0,8.83-8.83Z"/>
+        <polygon
+          class="cls-4"
+          points="962.74 594 947.8 594 947.8 929.95 962.74 929.95 962.74 594 962.74 594"/>
+        <polygon
+          class="cls-4"
+          points="338.31 596.58 323.38 596.58 323.38 926.15 338.31 926.15 338.31 596.58 338.31 596.58"/>
+        <path
+          class="cls-10"
+          d="M740.5,469.22a6.9,6.9,0,0,0-6.89-6.9H559.73a6.9,6.9,0,0,0-6.89,6.9V587.43H733.61a6.9,6.9,0,0,0,6.89-6.89V469.22Z"/>
+        <path
+          class="cls-17"
+          d="M648.73,542.38a17.51,17.51,0,1,1,17.51-17.5A17.52,17.52,0,0,1,648.73,542.38Zm0-31.83a14.33,14.33,0,1,0,14.33,14.33A14.35,14.35,0,0,0,648.73,510.55Z"/>
+        <path
+          class="cls-10"
+          d="M477.33,581.31a6.13,6.13,0,0,1,6.12-6.12h144.9v12.24H483.45a6.12,6.12,0,0,1-6.12-6.12Z"/>
+        <path
+          class="cls-24"
+          d="M1103.56,933.21H193.9a1.65,1.65,0,0,1,0-3.29h909.66a1.65,1.65,0,1,1,0,3.29Z"/>
       </g>
     </g>
   </svg>
diff --git a/client/src/components/inputs/BaseInput.vue b/client/src/components/inputs/BaseInput.vue
index 1c231125..57e30c36 100644
--- a/client/src/components/inputs/BaseInput.vue
+++ b/client/src/components/inputs/BaseInput.vue
@@ -1,16 +1,18 @@
 <template>
   <label class="base-input-container">
-    <input type="checkbox"
-           class="base-input-container__input"
-           :checked="checked"
-           @input.prevent="$emit('input', $event.target.checked, item)"
-           >
-    <span class="base-input-container__icon checkbox"
-          :class="{'base-input-container__checkbox': type==='checkbox', 'base-input-container__radiobutton': type === 'radiobutton'}">
-        <tick v-if="type === 'checkbox'"></tick>
-        <circle-icon v-if="type === 'radiobutton'"></circle-icon>
+    <input
+      :checked="checked"
+      type="checkbox"
+      class="base-input-container__input"
+      @input.prevent="$emit('input', $event.target.checked, item)"
+    >
+    <span
+      :class="{'base-input-container__checkbox': type==='checkbox', 'base-input-container__radiobutton': type === 'radiobutton'}"
+      class="base-input-container__icon checkbox">
+      <tick v-if="type === 'checkbox'"/>
+      <circle-icon v-if="type === 'radiobutton'"/>
     </span>
-    <span class="base-input-container__label">{{label}}</span>
+    <span class="base-input-container__label">{{ label }}</span>
   </label>
 </template>
 
diff --git a/client/src/components/instruments/InstrumentFilter.vue b/client/src/components/instruments/InstrumentFilter.vue
index 03916d2b..acc9b3a9 100644
--- a/client/src/components/instruments/InstrumentFilter.vue
+++ b/client/src/components/instruments/InstrumentFilter.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="instrument-filter">
     <checkbox
-      class="instrument-filter__checkbox"
-      v-for="(type, i) in types"
       :checked="type.enabled"
       :class="`instrument-filter__checkbox--${type.cls}`"
       :label="type.label"
       :key="i"
+      class="instrument-filter__checkbox"
+      v-for="(type, i) in types"
       @input="change($event, i)"
     />
   </div>
@@ -16,6 +16,10 @@
   import Checkbox from '@/components/Checkbox';
 
   export default {
+
+    components: {
+      Checkbox
+    },
     data() {
       return {
         filter: [],
@@ -60,10 +64,6 @@
         )
       }
     },
-
-    components: {
-      Checkbox
-    }
   }
 </script>
 
diff --git a/client/src/components/modules/Module.vue b/client/src/components/modules/Module.vue
index 8c3f5eb2..89549c76 100644
--- a/client/src/components/modules/Module.vue
+++ b/client/src/components/modules/Module.vue
@@ -1,29 +1,40 @@
 <template>
   <div class="module">
-    <h2 class="module__meta-title" id="meta-title">{{module.metaTitle}}</h2>
-    <h1 class="module__title" data-cy="module-title">{{module.title}}</h1>
+    <h2
+      class="module__meta-title"
+      id="meta-title">{{ module.metaTitle }}</h2>
+    <h1
+      class="module__title"
+      data-cy="module-title">{{ module.title }}</h1>
     <img
       :src="module.heroImage"
-      alt="" class="module__hero">
+      alt=""
+      class="module__hero">
 
     <div class="module__intro-wrapper">
       <bookmark-actions
+        :bookmarked="module.bookmark"
+        :note="note"
         class="module__bookmark-actions"
         @add-note="addNote"
         @edit-note="editNote"
-        :bookmarked="module.bookmark"
-        :note="note"
-        @bookmark="bookmark(!module.bookmark)"></bookmark-actions>
-      <div class="module__intro" v-html="module.intro"></div>
+        @bookmark="bookmark(!module.bookmark)"/>
+      <div
+        class="module__intro"
+        v-html="module.intro"/>
     </div>
 
     <h3 id="objectives">Lernziele</h3>
 
-    <objective-groups :groups="languageCommunicationObjectiveGroups"></objective-groups>
+    <objective-groups :groups="languageCommunicationObjectiveGroups"/>
 
-    <objective-groups :groups="societyObjectiveGroups"></objective-groups>
+    <objective-groups :groups="societyObjectiveGroups"/>
 
-    <chapter :chapter="chapter" :index="index" v-for="(chapter, index) in module.chapters" :key="chapter.id"></chapter>
+    <chapter
+      :chapter="chapter"
+      :index="index"
+      :key="chapter.id"
+      v-for="(chapter, index) in module.chapters"/>
 
   </div>
 </template>
@@ -43,11 +54,6 @@
   import BookmarkActions from '@/components/notes/BookmarkActions';
 
   export default {
-    components: {
-      BookmarkActions,
-      ObjectiveGroups,
-      Chapter
-    },
 
     props: {
       module: {
@@ -59,9 +65,18 @@
         default: false
       }
     },
+    components: {
+      BookmarkActions,
+      ObjectiveGroups,
+      Chapter
+    },
 
-    created() {
-      this.updateLastVisitedModule(this.module.id)
+    data() {
+      return {
+        me: {
+          permissions: []
+        }
+      }
     },
 
     computed: {
@@ -86,6 +101,10 @@
       }
     },
 
+    created() {
+      this.updateLastVisitedModule(this.module.id)
+    },
+
     methods: {
       updateLastVisitedModule(moduleId) {
         this.$apollo.mutate({
@@ -186,14 +205,6 @@
         query: ME_QUERY,
       }
     },
-
-    data() {
-      return {
-        me: {
-          permissions: []
-        }
-      }
-    }
   }
 </script>
 
diff --git a/client/src/components/modules/ModuleNavigation.vue b/client/src/components/modules/ModuleNavigation.vue
index b3758e3a..76fbc1ba 100644
--- a/client/src/components/modules/ModuleNavigation.vue
+++ b/client/src/components/modules/ModuleNavigation.vue
@@ -1,45 +1,64 @@
 <template>
-  <nav class="module-navigation sub-navigation" v-if="canManageContent">
+  <nav
+    class="module-navigation sub-navigation"
+    v-if="canManageContent">
     <div class="sub-navigation-item">
-      <router-link class="sub-navigation-item__title" :to="moduleContentLink">Modul</router-link>
+      <router-link
+        :to="moduleContentLink"
+        class="sub-navigation-item__title">Modul</router-link>
     </div>
     <sub-navigation-item title="Ergebnisse">
       <router-link
         :to="submissionsLink(assignment)"
-        v-for="assignment in assignments"
         :key="assignment.id"
         class="module-navigation__anchor sub-navigation-item__link"
         exact-active-class="module-navigation__anchor--active"
-      >{{assignment.value.assignment}}
+        v-for="assignment in assignments"
+      >{{ assignment.value.assignment }}
       </router-link>
     </sub-navigation-item>
-    <div class="module-navigation__module-content" v-if="false"> <!-- Do not display this for now, might be used later again though -->
+    <div
+      class="module-navigation__module-content"
+      v-if="false"> <!-- Do not display this for now, might be used later again though -->
       <router-link
-        tag="h3"
         :to="moduleContentLink"
+        tag="h3"
         class="module-navigation__heading"
-      >Inhalte: {{module.metaTitle}}
+      >Inhalte: {{ module.metaTitle }}
       </router-link>
-      <div class="module-navigation__anchors" v-if="onModulePage">
-        <a href="#" v-scroll-to="'#meta-title'" class="module-navigation__anchor">Einleitung</a>
-        <a href="#" v-scroll-to="'#objectives'" class="module-navigation__anchor">Lernziele</a>
+      <div
+        class="module-navigation__anchors"
+        v-if="onModulePage">
+        <a
+          v-scroll-to="'#meta-title'"
+          href="#"
+          class="module-navigation__anchor">Einleitung</a>
+        <a
+          v-scroll-to="'#objectives'"
+          href="#"
+          class="module-navigation__anchor">Lernziele</a>
 
-        <a href="#" class="module-navigation__anchor"
-           v-scroll-to="chapterId(index)"
-           v-for="(chapter, index) in module.chapters"
-           :key="chapter.id">{{chapter.title}}</a>
-        <a href="#" v-scroll-to="'#objectives-confirm'" class="module-navigation__anchor">Lernzielkontrolle</a>
+        <a
+          v-scroll-to="chapterId(index)"
+          :key="chapter.id"
+          href="#"
+          class="module-navigation__anchor"
+          v-for="(chapter, index) in module.chapters">{{ chapter.title }}</a>
+        <a
+          v-scroll-to="'#objectives-confirm'"
+          href="#"
+          class="module-navigation__anchor">Lernzielkontrolle</a>
       </div>
     </div>
 
     <div class="module-navigation__toggle-menu">
-      <toggle-editing v-if="onModulePage"></toggle-editing>
+      <toggle-editing v-if="onModulePage"/>
       <toggle-solutions-for-module
-      v-if="onModulePage && module.id"
-      :slug="module.slug"
-      :enabled="module.solutionsEnabled"
-      class="module-navigation__solution-toggle"
-      data-cy="toggle-enable-solutions"></toggle-solutions-for-module>
+        :slug="module.slug"
+        :enabled="module.solutionsEnabled"
+        class="module-navigation__solution-toggle"
+        data-cy="toggle-enable-solutions"
+        v-if="onModulePage && module.id"/>
     </div>
   </nav>
 
@@ -67,6 +86,17 @@
       ToggleEditing
     },
 
+    data() {
+      return {
+        module: {
+          assignments: []
+        },
+        me: {
+          permissions: []
+        }
+      }
+    },
+
     computed: {
       onModulePage() {
         return this.$route.name === 'module';
@@ -88,17 +118,6 @@
       }
     },
 
-    data() {
-      return {
-        module: {
-          assignments: []
-        },
-        me: {
-          permissions: []
-        }
-      }
-    },
-
     methods: {
       chapterId(index) {
         return `#chapter-${index}`
diff --git a/client/src/components/modules/ModuleTeaser.vue b/client/src/components/modules/ModuleTeaser.vue
index fb0f23d3..886c4075 100644
--- a/client/src/components/modules/ModuleTeaser.vue
+++ b/client/src/components/modules/ModuleTeaser.vue
@@ -1,11 +1,15 @@
 <template>
-  <router-link :to="moduleLink" tag="div" class="module-teaser">
-    <div class="module-teaser__image" :style="{backgroundImage: 'url('+heroImage+')'}">
-    </div>
+  <router-link
+    :to="moduleLink"
+    tag="div"
+    class="module-teaser">
+    <div
+      :style="{backgroundImage: 'url('+heroImage+')'}"
+      class="module-teaser__image"/>
     <div class="module-teaser__body">
-      <h3 class="module-teaser__meta-title">{{metaTitle}}</h3>
-      <h3 class="module-teaser__title">{{title}}</h3>
-      <p class="module-teaser__description">{{teaser}}</p>
+      <h3 class="module-teaser__meta-title">{{ metaTitle }}</h3>
+      <h3 class="module-teaser__title">{{ title }}</h3>
+      <p class="module-teaser__description">{{ teaser }}</p>
     </div>
   </router-link>
 </template>
diff --git a/client/src/components/notes/BookmarkActions.vue b/client/src/components/notes/BookmarkActions.vue
index cb6c7c11..f3dde1da 100644
--- a/client/src/components/notes/BookmarkActions.vue
+++ b/client/src/components/notes/BookmarkActions.vue
@@ -1,14 +1,23 @@
 <template>
   <div class="bookmark-actions">
-    <a class="bookmark-actions__action bookmark-actions__bookmark" @click="$emit('bookmark')"
-       :class="{'bookmark-actions__action--bookmarked': bookmarked}">
-      <bookmark-icon :bookmarked="bookmarked"></bookmark-icon>
+    <a
+      :class="{'bookmark-actions__action--bookmarked': bookmarked}"
+      class="bookmark-actions__action bookmark-actions__bookmark"
+      @click="$emit('bookmark')">
+      <bookmark-icon :bookmarked="bookmarked"/>
     </a>
-    <a class="bookmark-actions__action bookmark-actions__add-note" v-if="bookmarked && !note" @click="$emit('add-note')">
-      <add-note-icon></add-note-icon>
+    <a
+      class="bookmark-actions__action bookmark-actions__add-note"
+      v-if="bookmarked && !note"
+      @click="$emit('add-note')">
+      <add-note-icon/>
     </a>
-    <a :data-scrollto="note.id" class="bookmark-actions__action bookmark-actions__edit-note bookmark-actions__action--noted" @click="$emit('edit-note')"  v-if="note">
-      <note-icon></note-icon>
+    <a
+      :data-scrollto="note.id"
+      class="bookmark-actions__action bookmark-actions__edit-note bookmark-actions__action--noted"
+      v-if="note"
+      @click="$emit('edit-note')">
+      <note-icon/>
     </a>
   </div>
 </template>
diff --git a/client/src/components/notes/EditNoteWizard.vue b/client/src/components/notes/EditNoteWizard.vue
index 05b41280..68f70e6d 100644
--- a/client/src/components/notes/EditNoteWizard.vue
+++ b/client/src/components/notes/EditNoteWizard.vue
@@ -1,5 +1,8 @@
 <template>
-  <note-form @save="editNote" @hide="hide" :note="currentNote"></note-form>
+  <note-form
+    :note="currentNote"
+    @save="editNote"
+    @hide="hide"/>
 </template>
 
 <script>
diff --git a/client/src/components/notes/NewNoteWizard.vue b/client/src/components/notes/NewNoteWizard.vue
index eda0331f..e089b280 100644
--- a/client/src/components/notes/NewNoteWizard.vue
+++ b/client/src/components/notes/NewNoteWizard.vue
@@ -1,5 +1,8 @@
 <template>
-  <note-form @save="addNote" @hide="hide" :note="note"></note-form>
+  <note-form
+    :note="note"
+    @save="addNote"
+    @hide="hide"/>
 </template>
 
 <script>
diff --git a/client/src/components/notes/NoteForm.vue b/client/src/components/notes/NoteForm.vue
index 1e4d877d..f860f550 100644
--- a/client/src/components/notes/NoteForm.vue
+++ b/client/src/components/notes/NoteForm.vue
@@ -1,14 +1,21 @@
 <template>
-  <modal :hide-header="true" :small="true">
-    <modal-input v-on:input="localNote.text = $event"
-                 placeholder="Notiz erfassen"
-                 data-cy="bookmark-note"
-                 :value="localNote.text"
-    ></modal-input>
+  <modal
+    :hide-header="true"
+    :small="true">
+    <modal-input
+      :value="localNote.text"
+      placeholder="Notiz erfassen"
+      data-cy="bookmark-note"
+      @input="localNote.text = $event"
+    />
     <div slot="footer">
-      <a class="button button--primary" data-cy="modal-save-button"
-         @click="$emit('save', localNote)">Speichern</a>
-      <a class="button" @click="$emit('hide')">Abbrechen</a>
+      <a
+        class="button button--primary"
+        data-cy="modal-save-button"
+        @click="$emit('save', localNote)">Speichern</a>
+      <a
+        class="button"
+        @click="$emit('hide')">Abbrechen</a>
     </div>
 
   </modal>
diff --git a/client/src/components/objective-groups/NewObjectiveWizard.vue b/client/src/components/objective-groups/NewObjectiveWizard.vue
index e79d9236..9347f44d 100644
--- a/client/src/components/objective-groups/NewObjectiveWizard.vue
+++ b/client/src/components/objective-groups/NewObjectiveWizard.vue
@@ -4,12 +4,17 @@
       :placeholder="'Lernziel'"
       :value="text"
       @input="text = $event"
-    ></modal-input>
+    />
 
     <div slot="footer">
-      <a class="button button--primary" data-cy="modal-save-button" :class="{'button--disabled': disableSave}"
-         v-on:click="save(text)">Speichern</a>
-      <a class="button" v-on:click="hide()">Abbrechen</a>
+      <a
+        :class="{'button--disabled': disableSave}"
+        class="button button--primary"
+        data-cy="modal-save-button"
+        @click="save(text)">Speichern</a>
+      <a
+        class="button"
+        @click="hide()">Abbrechen</a>
     </div>
   </modal>
 </template>
@@ -29,6 +34,13 @@
       ModalInput
     },
 
+    data() {
+      return {
+        text: '',
+        saving: false
+      }
+    },
+
     computed: {
       ...mapGetters({
         objectiveGroup: 'currentObjectiveGroup'
@@ -38,13 +50,6 @@
       }
     },
 
-    data() {
-      return {
-        text: '',
-        saving: false
-      }
-    },
-
     methods: {
       save(entry) {
         this.saving = true;
diff --git a/client/src/components/objective-groups/Objective.vue b/client/src/components/objective-groups/Objective.vue
index 4b4690fe..003bd051 100644
--- a/client/src/components/objective-groups/Objective.vue
+++ b/client/src/components/objective-groups/Objective.vue
@@ -1,16 +1,24 @@
 <template>
-  <li class="objective hideable-element" :class="{'hideable-element--hidden': hidden}" v-if="editModule || !hidden">
+  <li
+    :class="{'hideable-element--hidden': hidden}"
+    class="objective hideable-element"
+    v-if="editModule || !hidden">
     <visibility-action
-      v-if="editModule"
-      :block="objective"></visibility-action>
-    <div class="block-actions" v-if="editModule && canEdit">
-      <user-widget class="block-actions__user-widget objective__user-widget" :show-menu="false" v-bind="me"></user-widget>
+      :block="objective"
+      v-if="editModule"/>
+    <div
+      class="block-actions"
+      v-if="editModule && canEdit">
+      <user-widget
+        :show-menu="false"
+        v-bind="me"
+        class="block-actions__user-widget objective__user-widget"/>
       <more-options-widget>
         <div class="popover-links__link"><a @click="deleteObjective(objective)">Löschen</a></div>
       </more-options-widget>
     </div>
     <div>
-      {{objective.text}}
+      {{ objective.text }}
     </div>
 
   </li>
@@ -36,6 +44,12 @@
       UserWidget
     },
 
+    data() {
+      return {
+        me: {}
+      }
+    },
+
     computed: {
       ...mapGetters(['editModule']),
       hidden() {
@@ -81,12 +95,6 @@
     apollo: {
       me: meQuery
     },
-
-    data() {
-      return {
-        me: {}
-      }
-    }
   }
 </script>
 
diff --git a/client/src/components/objective-groups/ObjectiveForm.vue b/client/src/components/objective-groups/ObjectiveForm.vue
index a2e94d15..2153904c 100644
--- a/client/src/components/objective-groups/ObjectiveForm.vue
+++ b/client/src/components/objective-groups/ObjectiveForm.vue
@@ -1,12 +1,15 @@
 <template>
   <div class="objective-form">
-    <modal-input class="objective-form__input"
-                 placeholder="Lernziel erfassen..."
-                 :value="objective.text"
-                 @input="$emit('input', $event)"
-    ></modal-input>
-    <a class="icon-button" @click="$emit('delete')">
-      <trash-icon class="icon-button__icon"></trash-icon>
+    <modal-input
+      :value="objective.text"
+      class="objective-form__input"
+      placeholder="Lernziel erfassen..."
+      @input="$emit('input', $event)"
+    />
+    <a
+      class="icon-button"
+      @click="$emit('delete')">
+      <trash-icon class="icon-button__icon"/>
     </a>
   </div>
 
diff --git a/client/src/components/objective-groups/ObjectiveGroup.vue b/client/src/components/objective-groups/ObjectiveGroup.vue
index 0c4aa01b..ca01f0bc 100644
--- a/client/src/components/objective-groups/ObjectiveGroup.vue
+++ b/client/src/components/objective-groups/ObjectiveGroup.vue
@@ -1,15 +1,19 @@
 <template>
   <div class="objective-group">
 
-    <h4>{{group.displayTitle}}</h4>
+    <h4>{{ group.displayTitle }}</h4>
 
     <ul class="objective-group__objective-list">
-      <objective class="objective-group__objective" v-for="objective in group.objectives" :key="objective.id"
-                 :objective="objective" :school-class="currentFilter">
-      </objective>
+      <objective
+        :key="objective.id"
+        :objective="objective"
+        :school-class="currentFilter"
+        class="objective-group__objective"
+        v-for="objective in group.objectives"/>
     </ul>
-    <add-content-button :parent="group" v-if="editModule">
-    </add-content-button>
+    <add-content-button
+      :parent="group"
+      v-if="editModule"/>
   </div>
 
 </template>
diff --git a/client/src/components/objective-groups/ObjectiveGroups.vue b/client/src/components/objective-groups/ObjectiveGroups.vue
index fd7b4593..8d192aa6 100644
--- a/client/src/components/objective-groups/ObjectiveGroups.vue
+++ b/client/src/components/objective-groups/ObjectiveGroups.vue
@@ -1,6 +1,9 @@
 <template>
   <div>
-    <objective-group v-for="group in objectiveGroups" :key="group.id" :group="group"></objective-group>
+    <objective-group
+      :key="group.id"
+      :group="group"
+      v-for="group in objectiveGroups"/>
   </div>
 </template>
 
diff --git a/client/src/components/page-form/PageForm.vue b/client/src/components/page-form/PageForm.vue
index 6f3ba56d..dc54ba41 100644
--- a/client/src/components/page-form/PageForm.vue
+++ b/client/src/components/page-form/PageForm.vue
@@ -1,12 +1,14 @@
 <template>
   <div class="page-form__page">
-    <form class="page-form" @submit.prevent="$emit('save')">
+    <form
+      class="page-form"
+      @submit.prevent="$emit('save')">
       <div class="page-form__content">
-        <h1 class="page-form__heading">{{title}}</h1>
-        <slot></slot>
+        <h1 class="page-form__heading">{{ title }}</h1>
+        <slot/>
       </div>
       <div class="page-form__footer">
-        <slot name="footer"></slot>
+        <slot name="footer"/>
       </div>
     </form>
 
diff --git a/client/src/components/page-form/PageFormInput.vue b/client/src/components/page-form/PageFormInput.vue
index 664235ee..5f7ac85c 100644
--- a/client/src/components/page-form/PageFormInput.vue
+++ b/client/src/components/page-form/PageFormInput.vue
@@ -1,10 +1,15 @@
 <template>
   <div class="page-form-input">
-    <label class="page-form-input__label" :for="id">{{label}}</label>
-    <component :is="type" :class="classes"
-               :value.prop="value"
-               :data-cy="cyId"
-               :id="id" @input="$emit('input', $event.target.value)"></component>
+    <label
+      :for="id"
+      class="page-form-input__label">{{ label }}</label>
+    <component
+      :is="type"
+      :class="classes"
+      :value.prop="value"
+      :data-cy="cyId"
+      :id="id"
+      @input="$emit('input', $event.target.value)"/>
   </div>
 </template>
 
@@ -23,8 +28,10 @@
       }
     },
 
-    created() {
-      this.id = this._uid;
+    data() {
+      return {
+        id: null
+      }
     },
 
     computed: {
@@ -36,11 +43,9 @@
       }
     },
 
-    data() {
-      return {
-        id: null
-      }
-    }
+    created() {
+      this.id = this._uid;
+    },
   }
 </script>
 
diff --git a/client/src/components/portfolio/AddProject.vue b/client/src/components/portfolio/AddProject.vue
index 63f9affb..6178ecf4 100644
--- a/client/src/components/portfolio/AddProject.vue
+++ b/client/src/components/portfolio/AddProject.vue
@@ -1,5 +1,7 @@
 <template>
-  <add-widget route="/new-project" data-cy="add-project-button"></add-widget>
+  <add-widget
+    route="/new-project"
+    data-cy="add-project-button"/>
 </template>
 
 <script>
diff --git a/client/src/components/portfolio/AddProjectEntry.vue b/client/src/components/portfolio/AddProjectEntry.vue
index 2b90422a..afa21a19 100644
--- a/client/src/components/portfolio/AddProjectEntry.vue
+++ b/client/src/components/portfolio/AddProjectEntry.vue
@@ -1,5 +1,7 @@
 <template>
-  <add-widget :reverse="true" @click="addProjectEntry"></add-widget>
+  <add-widget
+    :reverse="true"
+    @click="addProjectEntry"/>
 </template>
 
 <script>
diff --git a/client/src/components/portfolio/EditProject.vue b/client/src/components/portfolio/EditProject.vue
index 343c7a53..6f9c0aaa 100644
--- a/client/src/components/portfolio/EditProject.vue
+++ b/client/src/components/portfolio/EditProject.vue
@@ -2,7 +2,7 @@
   <project-form
     :project="project"
     @save="updateProject"
-  ></project-form>
+  />
 </template>
 
 <script>
diff --git a/client/src/components/portfolio/EditProjectEntryWizard.vue b/client/src/components/portfolio/EditProjectEntryWizard.vue
index 6677c4cf..17673efc 100644
--- a/client/src/components/portfolio/EditProjectEntryWizard.vue
+++ b/client/src/components/portfolio/EditProjectEntryWizard.vue
@@ -1,6 +1,8 @@
 <template>
-  <project-entry-form :project-entry="projectEntry" @save="saveEntry" @hide="hideModal">
-  </project-entry-form>
+  <project-entry-form
+    :project-entry="projectEntry"
+    @save="saveEntry"
+    @hide="hideModal"/>
 </template>
 
 <script>
diff --git a/client/src/components/portfolio/NewProjectEntryWizard.vue b/client/src/components/portfolio/NewProjectEntryWizard.vue
index a15632f4..cad2c193 100644
--- a/client/src/components/portfolio/NewProjectEntryWizard.vue
+++ b/client/src/components/portfolio/NewProjectEntryWizard.vue
@@ -1,6 +1,8 @@
 <template>
-  <project-entry-form @save="save" @hide="hideModal" :project-entry="projectEntry">
-  </project-entry-form>
+  <project-entry-form
+    :project-entry="projectEntry"
+    @save="save"
+    @hide="hideModal"/>
 </template>
 
 <script>
@@ -14,6 +16,17 @@
       ProjectEntryForm
     },
 
+    data() {
+      return {
+        projectEntry: {
+          activity: '',
+          reflection: '',
+          nextSteps: '',
+          documentUrl: ''
+        }
+      }
+    },
+
     computed: {
       project() {
         return this.$store.state.parentProject;
@@ -55,16 +68,5 @@
         this.$store.dispatch('hideModal');
       }
     },
-
-    data() {
-      return {
-        projectEntry: {
-          activity: '',
-          reflection: '',
-          nextSteps: '',
-          documentUrl: ''
-        }
-      }
-    }
   }
 </script>
diff --git a/client/src/components/portfolio/OwnerWidget.vue b/client/src/components/portfolio/OwnerWidget.vue
index aab47e6d..adad9e95 100644
--- a/client/src/components/portfolio/OwnerWidget.vue
+++ b/client/src/components/portfolio/OwnerWidget.vue
@@ -1,8 +1,10 @@
 <template>
   <div class="owner-widget">
-    <avatar class="owner-widget__avatar" :avatarUrl="owner.avatarUrl" />
+    <avatar
+      :avatar-url="owner.avatarUrl"
+      class="owner-widget__avatar" />
     <span>
-        {{name}}
+      {{ name }}
     </span>
   </div>
 </template>
diff --git a/client/src/components/portfolio/ProjectActions.vue b/client/src/components/portfolio/ProjectActions.vue
index 8f4ad201..d2ee9e7d 100644
--- a/client/src/components/portfolio/ProjectActions.vue
+++ b/client/src/components/portfolio/ProjectActions.vue
@@ -1,16 +1,22 @@
 <template>
   <div class="project-actions">
-    <a @click="toggleMenu"
-       class="project-actions__more-link">
-      <ellipses></ellipses>
+    <a
+      class="project-actions__more-link"
+      @click="toggleMenu">
+      <ellipses/>
     </a>
-    <widget-popover v-if="showMenu"
-                    @hide-me="showMenu = false"
-                    class="project-actions__popover">
+    <widget-popover
+      class="project-actions__popover"
+      v-if="showMenu"
+      @hide-me="showMenu = false">
       <li class="popover-links__link"><a @click="deleteProject(id)">Projekt löschen</a></li>
       <li class="popover-links__link"><a @click="editProject(id)">Projekt bearbeiten</a></li>
-      <li v-if="!final" class="popover-links__link"><a @click="updateShareState(id, true)">Projekt teilen</a></li>
-      <li v-if="final" class="popover-links__link"><a @click="updateShareState(id, false)">Projekt nicht mehr teilen</a>
+      <li
+        class="popover-links__link"
+        v-if="!final"><a @click="updateShareState(id, true)">Projekt teilen</a></li>
+      <li
+        class="popover-links__link"
+        v-if="final"><a @click="updateShareState(id, false)">Projekt nicht mehr teilen</a>
       </li>
     </widget-popover>
   </div>
diff --git a/client/src/components/portfolio/ProjectEntry.vue b/client/src/components/portfolio/ProjectEntry.vue
index 3efab961..5e4edee2 100644
--- a/client/src/components/portfolio/ProjectEntry.vue
+++ b/client/src/components/portfolio/ProjectEntry.vue
@@ -1,31 +1,41 @@
 <template>
   <div class="project-entry">
-    <more-options-widget class="project-entry__more" data-cy="project-entry-more">
-      <li class="popover-links__link"><a @click="editProjectEntry()" data-cy="edit-project-entry">Eintrag bearbeiten</a>
+    <more-options-widget
+      class="project-entry__more"
+      data-cy="project-entry-more">
+      <li class="popover-links__link"><a
+        data-cy="edit-project-entry"
+        @click="editProjectEntry()">Eintrag bearbeiten</a>
       </li>
-      <li class="popover-links__link"><a @click="deleteProjectEntry()" data-cy="delete-project-entry">Eintrag löschen</a>
+      <li class="popover-links__link"><a
+        data-cy="delete-project-entry"
+        @click="deleteProjectEntry()">Eintrag löschen</a>
       </li>
     </more-options-widget>
 
     <h3 class="project-entry__heading">Tätigkeit</h3>
-    <p class="project-entry__paragraph" data-cy="project-entry-activity">
-      {{activity}}
+    <p
+      class="project-entry__paragraph"
+      data-cy="project-entry-activity">
+      {{ activity }}
     </p>
     <h3 class="project-entry__heading">Reflexion</h3>
     <p class="project-entry__paragraph">
-      {{reflection}}
+      {{ reflection }}
     </p>
     <h3 class="project-entry__heading">
       Nächste Schritte
     </h3>
     <p class="project-entry__paragraph">
-      {{nextSteps}}
+      {{ nextSteps }}
     </p>
-    <p class="project-entry__paragraph" v-if="documentUrl">
-      <document-block :value="{url: documentUrl}"></document-block>
+    <p
+      class="project-entry__paragraph"
+      v-if="documentUrl">
+      <document-block :value="{url: documentUrl}"/>
     </p>
     <div class="project-entry__date">
-      {{created | date }}
+      {{ created | date }}
     </div>
   </div>
 </template>
@@ -38,11 +48,11 @@
   import PROJECT_QUERY from '@/graphql/gql/projectQuery.gql';
 
   export default {
+    props: ['activity', 'reflection', 'nextSteps', 'documentUrl', 'created', 'id'],
     components: {
       DocumentBlock,
       MoreOptionsWidget
     },
-    props: ['activity', 'reflection', 'nextSteps', 'documentUrl', 'created', 'id'],
 
     methods: {
       editProjectEntry() {
diff --git a/client/src/components/portfolio/ProjectEntryForm.vue b/client/src/components/portfolio/ProjectEntryForm.vue
index 297245d0..3314ee56 100644
--- a/client/src/components/portfolio/ProjectEntryForm.vue
+++ b/client/src/components/portfolio/ProjectEntryForm.vue
@@ -1,26 +1,37 @@
 <template>
   <modal :hide-header="true">
     <div class="project-entry-modal">
-      <text-form-with-help-text title="Tätigkeit" :value="localProjectEntry.activity"
-                                @change="localProjectEntry.activity = $event"
-                                data-cy="activity-input"
-                                help-text="Was? Wie? Mittel?">
-      </text-form-with-help-text>
-      <text-form-with-help-text title="Reflexion" :value="localProjectEntry.reflection"
-                                @change="localProjectEntry.reflection = $event"
-                                data-cy="reflection-input"
-                                help-text="Nachdenken über die eigene Tätigkeit und das eigene Handeln. Was ging gut? Was hatte ich für Schwierigkeiten? Was habe ich gelernt?">
-      </text-form-with-help-text>
-      <text-form-with-help-text title="Nächste Schritte" :value="localProjectEntry.nextSteps"
-                                @change="localProjectEntry.nextSteps = $event"
-                                data-cy="next-steps-input"
-                                help-text="Wie geht es weiter? Wer macht was?">
-      </text-form-with-help-text>
-      <document-form :value="document" :index="0" @link-change-url="setDocumentUrl"></document-form>
+      <text-form-with-help-text
+        :value="localProjectEntry.activity"
+        title="Tätigkeit"
+        data-cy="activity-input"
+        help-text="Was? Wie? Mittel?"
+        @change="localProjectEntry.activity = $event"/>
+      <text-form-with-help-text
+        :value="localProjectEntry.reflection"
+        title="Reflexion"
+        data-cy="reflection-input"
+        help-text="Nachdenken über die eigene Tätigkeit und das eigene Handeln. Was ging gut? Was hatte ich für Schwierigkeiten? Was habe ich gelernt?"
+        @change="localProjectEntry.reflection = $event"/>
+      <text-form-with-help-text
+        :value="localProjectEntry.nextSteps"
+        title="Nächste Schritte"
+        data-cy="next-steps-input"
+        help-text="Wie geht es weiter? Wer macht was?"
+        @change="localProjectEntry.nextSteps = $event"/>
+      <document-form
+        :value="document"
+        :index="0"
+        @link-change-url="setDocumentUrl"/>
     </div>
     <div slot="footer">
-      <a class="button button--primary" data-cy="modal-save-button" v-on:click="$emit('save', localProjectEntry)">Speichern</a>
-      <a class="button" v-on:click="$emit('hide')">Abbrechen</a>
+      <a
+        class="button button--primary"
+        data-cy="modal-save-button"
+        @click="$emit('save', localProjectEntry)">Speichern</a>
+      <a
+        class="button"
+        @click="$emit('hide')">Abbrechen</a>
     </div>
   </modal>
 </template>
diff --git a/client/src/components/portfolio/ProjectForm.vue b/client/src/components/portfolio/ProjectForm.vue
index 5167ecaf..cab45849 100644
--- a/client/src/components/portfolio/ProjectForm.vue
+++ b/client/src/components/portfolio/ProjectForm.vue
@@ -1,22 +1,35 @@
 <template>
-  <page-form @save="$emit('save', localProject)" title="Neues Projekt">
-    <page-form-input label="Titel" v-model="localProject.title"></page-form-input>
-    <page-form-input label="Beschreibung" type="textarea" v-model="localProject.description"></page-form-input>
-    <page-form-input label="Ziele" type="textarea" v-model="localProject.objectives"></page-form-input>
+  <page-form
+    title="Neues Projekt"
+    @save="$emit('save', localProject)">
+    <page-form-input
+      v-model="localProject.title"
+      label="Titel"/>
+    <page-form-input
+      v-model="localProject.description"
+      label="Beschreibung"
+      type="textarea"/>
+    <page-form-input
+      v-model="localProject.objectives"
+      label="Ziele"
+      type="textarea"/>
     <color-chooser
       :selected-color="localProject.appearance"
-      v-on:input="updateColor"
-    ></color-chooser>
+      @input="updateColor"
+    />
     <template slot="footer">
       <button
+        :class="{'button--disabled': !formValid}"
+        :disabled="!formValid"
         type="submit"
         class="button button--primary"
         data-cy="save-project-button"
-        :class="{'button--disabled': !formValid}"
-        :disabled="!formValid"
       >Speichern
       </button>
-      <router-link to="/portfolio" tag="button" class="button">Abbrechen</router-link>
+      <router-link
+        to="/portfolio"
+        tag="button"
+        class="button">Abbrechen</router-link>
     </template>
   </page-form>
 </template>
@@ -35,22 +48,15 @@
       ColorChooser
     },
 
-    computed: {
-      formValid() {
-        return this.localProject.title && this.localProject.description && this.localProject.objectives;
-      }
-    },
-
     data() {
       return {
         localProject: Object.assign({}, this.project),
       }
     },
 
-    methods: {
-      updateColor(newColor) {
-        this.localProject.appearance = newColor;
-        this.$store.dispatch('setSpecialContainerClass', newColor);
+    computed: {
+      formValid() {
+        return this.localProject.title && this.localProject.description && this.localProject.objectives;
       }
     },
 
@@ -60,6 +66,13 @@
 
     beforeDestroy() {
       this.$store.dispatch('setSpecialContainerClass', '');
-    }
+    },
+
+    methods: {
+      updateColor(newColor) {
+        this.localProject.appearance = newColor;
+        this.$store.dispatch('setSpecialContainerClass', newColor);
+      }
+    },
   }
 </script>
diff --git a/client/src/components/portfolio/ProjectWidget.vue b/client/src/components/portfolio/ProjectWidget.vue
index df9493ad..dac76e49 100644
--- a/client/src/components/portfolio/ProjectWidget.vue
+++ b/client/src/components/portfolio/ProjectWidget.vue
@@ -1,14 +1,25 @@
 <template>
-  <div class="project-widget" :class="widgetClass">
-    <router-link :to="{name: 'project', params: {slug: slug}}" tag="div" class="project-widget__content"
-                 data-cy="project-link">
-      <h3 class="project-widget__title">{{title}}</h3>
+  <div
+    :class="widgetClass"
+    class="project-widget">
+    <router-link
+      :to="{name: 'project', params: {slug: slug}}"
+      tag="div"
+      class="project-widget__content"
+      data-cy="project-link">
+      <h3 class="project-widget__title">{{ title }}</h3>
 
-      <entry-count-widget :entry-count="entriesCount"></entry-count-widget>
-      <owner-widget class="project-widget__owner" :owner="student"></owner-widget>
+      <entry-count-widget :entry-count="entriesCount"/>
+      <owner-widget
+        :owner="student"
+        class="project-widget__owner"/>
     </router-link>
-    <widget-footer v-if="isOwner" class="project-widget__footer">
-      <project-actions :id="id" :final="final"></project-actions>
+    <widget-footer
+      class="project-widget__footer"
+      v-if="isOwner">
+      <project-actions
+        :id="id"
+        :final="final"/>
     </widget-footer>
   </div>
 </template>
diff --git a/client/src/components/profile/ActivityEntry.vue b/client/src/components/profile/ActivityEntry.vue
index cbf27894..157613f0 100644
--- a/client/src/components/profile/ActivityEntry.vue
+++ b/client/src/components/profile/ActivityEntry.vue
@@ -1,12 +1,14 @@
 <template>
   <div class="activity-entry">
     <div class="activity-entry__content">
-      <h3 class="activity-entry__title">{{title}}</h3>
-      <slot></slot>
+      <h3 class="activity-entry__title">{{ title }}</h3>
+      <slot/>
     </div>
 
-    <div class="activity-entry__link" @click="$emit('link')">
-      <chevron-right class="activity-entry__icon"></chevron-right>
+    <div
+      class="activity-entry__link"
+      @click="$emit('link')">
+      <chevron-right class="activity-entry__icon"/>
     </div>
   </div>
 </template>
diff --git a/client/src/components/profile/ActivityFilter.vue b/client/src/components/profile/ActivityFilter.vue
index 06932132..38a5b055 100644
--- a/client/src/components/profile/ActivityFilter.vue
+++ b/client/src/components/profile/ActivityFilter.vue
@@ -1,11 +1,12 @@
 <template>
   <div class="activity-filter">
-    <a class="activity-filter__link"
-       :class="{'activity-filter__link--active': filter === entry.tag}"
-       @click="$emit('change-filter', entry.tag)"
-       v-for="(entry, i) in filters"
-       :key="i"
-    >{{entry.label}}</a>
+    <a
+      :class="{'activity-filter__link--active': filter === entry.tag}"
+      :key="i"
+      class="activity-filter__link"
+      v-for="(entry, i) in filters"
+      @click="$emit('change-filter', entry.tag)"
+    >{{ entry.label }}</a>
   </div>
 </template>
 
diff --git a/client/src/components/profile/Avatar.vue b/client/src/components/profile/Avatar.vue
index 2f7d2fac..b8595f8a 100644
--- a/client/src/components/profile/Avatar.vue
+++ b/client/src/components/profile/Avatar.vue
@@ -1,18 +1,29 @@
 <template>
   <div class="avatar">
     <transition name="fade">
-      <default-avatar v-show="!isAvatarLoaded" class="avatar__placeholder"
-                      :class="{'avatar__placeholder--highlighted': iconHighlighted}"></default-avatar>
+      <default-avatar
+        :class="{'avatar__placeholder--highlighted': iconHighlighted}"
+        class="avatar__placeholder"
+        v-show="!isAvatarLoaded"/>
     </transition>
     <transition name="show">
-      <div v-show="isAvatarLoaded" class="avatar__image" ref="avatarImage"
-           :style="{'background-image': `url(${this.avatarUrl})`}"></div>
+      <div
+        :style="{'background-image': `url(${this.avatarUrl})`}"
+        class="avatar__image"
+        v-show="isAvatarLoaded"
+        ref="avatarImage"/>
     </transition>
-    <img class="avatar__fake-image" :src="avatarUrl" ref="fakeImage"/>
+    <img
+      :src="avatarUrl"
+      class="avatar__fake-image"
+      ref="fakeImage">
 
-    <div class="avatar__edit" v-if="editable" @click="closeSidebar">
+    <div
+      class="avatar__edit"
+      v-if="editable"
+      @click="closeSidebar">
       <router-link :to="{name: 'profile'}">
-        <pen-icon></pen-icon>
+        <pen-icon/>
       </router-link>
     </div>
   </div>
diff --git a/client/src/components/profile/AvatarUploadForm.vue b/client/src/components/profile/AvatarUploadForm.vue
index 070a949c..6860690c 100644
--- a/client/src/components/profile/AvatarUploadForm.vue
+++ b/client/src/components/profile/AvatarUploadForm.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="avatar-upload">
-    <image-form :value="value" index="0" @link-change-url="changeLinkUrl" />
+    <image-form
+      :value="value"
+      index="0"
+      @link-change-url="changeLinkUrl" />
   </div>
 </template>
 
@@ -12,11 +15,6 @@
     components: {
       ImageForm
     },
-    methods: {
-      changeLinkUrl(value, index) {
-        this.$emit('avatarUpdate', value);
-      }
-    },
     data() {
       return {
         value: {
@@ -24,6 +22,11 @@
         }
       }
     },
+    methods: {
+      changeLinkUrl(value, index) {
+        this.$emit('avatarUpdate', value);
+      }
+    },
   }
 </script>
 
diff --git a/client/src/components/profile/ClassList.vue b/client/src/components/profile/ClassList.vue
index 374a3212..6a8faa42 100644
--- a/client/src/components/profile/ClassList.vue
+++ b/client/src/components/profile/ClassList.vue
@@ -1,42 +1,48 @@
 <template>
   <div class="school-class">
-    <h2 class="school-class__heading"><span class="school-class__name" data-cy="school-class-name">{{name}}</span>
-      <edit-class-name v-if="teacher" @edit="editClassName"></edit-class-name>
+    <h2 class="school-class__heading"><span
+      class="school-class__name"
+      data-cy="school-class-name">{{ name }}</span>
+      <edit-class-name
+        v-if="teacher"
+        @edit="editClassName"/>
     </h2>
     <div class="school-class__members school-class-members">
-      <ul class="school-class-members__list simple-list simple-list--active" data-cy="active-class-members-list">
+      <ul
+        class="school-class-members__list simple-list simple-list--active"
+        data-cy="active-class-members-list">
         <li
+          :key="member.id"
           class="simple-list__item member-item"
           data-cy="school-class-member"
-          v-for="member in activeMembers"
-          :key="member.id">
-          <span class="member-item__name">{{fullName(member)}}</span>
-          <span class="member-item__role">{{role(member)}}</span>
-<!--          <a-->
-<!--            class="member-item__action simple-list__action"-->
-<!--            data-cy="remove-from-class"-->
-<!--            v-if="teacher"-->
-<!--            @click="$emit('remove', member)">Deaktivieren</a>-->
+          v-for="member in activeMembers">
+          <span class="member-item__name">{{ fullName(member) }}</span>
+          <span class="member-item__role">{{ role(member) }}</span>
+          <!--          <a-->
+          <!--            class="member-item__action simple-list__action"-->
+          <!--            data-cy="remove-from-class"-->
+          <!--            v-if="teacher"-->
+          <!--            @click="$emit('remove', member)">Deaktivieren</a>-->
         </li>
       </ul>
-<!--      <template v-if="inactiveMembers.length">-->
-<!--        <h3 class="school-class__inactive-heading">Deaktivierte Personen</h3>-->
-<!--        <ul data-cy="inactive-class-members-list" class="simple-list simple-list&#45;&#45;inactive">-->
-<!--          <li-->
-<!--            class="simple-list__item member-item"-->
-<!--            data-cy="school-class-member"-->
-<!--            v-for="member in inactiveMembers"-->
-<!--            :key="member.id">-->
-<!--            <span class="member-item__name">{{fullName(member)}}</span>-->
-<!--            <span class="member-item__role">{{role(member)}}</span>-->
-<!--            <a-->
-<!--              class="member-item__action simple-list__action"-->
-<!--              data-cy="add-to-class"-->
-<!--              v-if="teacher"-->
-<!--              @click="$emit('add', member)">Aktivieren</a>-->
-<!--          </li>-->
-<!--        </ul>-->
-<!--      </template>-->
+      <!--      <template v-if="inactiveMembers.length">-->
+      <!--        <h3 class="school-class__inactive-heading">Deaktivierte Personen</h3>-->
+      <!--        <ul data-cy="inactive-class-members-list" class="simple-list simple-list&#45;&#45;inactive">-->
+      <!--          <li-->
+      <!--            class="simple-list__item member-item"-->
+      <!--            data-cy="school-class-member"-->
+      <!--            v-for="member in inactiveMembers"-->
+      <!--            :key="member.id">-->
+      <!--            <span class="member-item__name">{{fullName(member)}}</span>-->
+      <!--            <span class="member-item__role">{{role(member)}}</span>-->
+      <!--            <a-->
+      <!--              class="member-item__action simple-list__action"-->
+      <!--              data-cy="add-to-class"-->
+      <!--              v-if="teacher"-->
+      <!--              @click="$emit('add', member)">Aktivieren</a>-->
+      <!--          </li>-->
+      <!--        </ul>-->
+      <!--      </template>-->
 
     </div>
   </div>
@@ -51,6 +57,14 @@
     components: {
       EditClassName
     },
+    computed: {
+      activeMembers() {
+        return this.members.filter(member => member.active)
+      },
+      inactiveMembers() {
+        return this.members.filter(member => !member.active)
+      }
+    },
 
     methods: {
       fullName(member) {
@@ -63,14 +77,6 @@
         this.$store.dispatch('editClassName');
       }
     },
-    computed: {
-      activeMembers() {
-        return this.members.filter(member => member.active)
-      },
-      inactiveMembers() {
-        return this.members.filter(member => !member.active)
-      }
-    }
   }
 </script>
 
diff --git a/client/src/components/profile/ContentBookmark.vue b/client/src/components/profile/ContentBookmark.vue
index 978670c2..cceb8ce0 100644
--- a/client/src/components/profile/ContentBookmark.vue
+++ b/client/src/components/profile/ContentBookmark.vue
@@ -1,11 +1,15 @@
 <template>
   <div class="content-bookmark module-activity-entry">
-    <div v-html="text" v-if="content.type === 'text_block'"></div>
+    <div
+      v-if="content.type === 'text_block'"
+      v-html="text"/>
     <div v-else-if="content.type === 'link_block'">
-      <link-block :value="content.value" :no-margin="true"></link-block>
+      <link-block
+        :value="content.value"
+        :no-margin="true"/>
     </div>
     <p v-else>
-      {{type}}
+      {{ type }}
     </p>
   </div>
 </template>
@@ -14,8 +18,8 @@
   import LinkBlock from '@/components/content-blocks/LinkBlock';
 
   export default {
-    components: {LinkBlock},
     props: ['bookmark'],
+    components: {LinkBlock},
     computed: {
       content() {
         return this.bookmark.contentBlock
diff --git a/client/src/components/profile/DeactivatePerson.vue b/client/src/components/profile/DeactivatePerson.vue
index 486bf49b..f2402d19 100644
--- a/client/src/components/profile/DeactivatePerson.vue
+++ b/client/src/components/profile/DeactivatePerson.vue
@@ -1,5 +1,8 @@
 <template>
-  <modal class="deactivate-user" :hide-header="true" :small="true">
+  <modal
+    :hide-header="true"
+    :small="true"
+    class="deactivate-user">
     <h3 class="deactivate-user__heading">
       <template v-if="myself">
         Mich
@@ -11,13 +14,13 @@
     </h3>
     <p class="deactivate-user__text deactivate-user__paragraph">
       <template v-if="myself">
-        Möchten Sie die Klasse <strong class="deactivate-user__text--strong">{{schoolClass}}</strong> verlassen?
+        Möchten Sie die Klasse <strong class="deactivate-user__text--strong">{{ schoolClass }}</strong> verlassen?
       </template>
       <template v-else>
         Möchten Sie <strong
-        class="deactivate-user__text--strong">{{name}}</strong> in der
+        class="deactivate-user__text--strong">{{ name }}</strong> in der
         Klasse
-        <strong class="deactivate-user__text--strong">{{schoolClass}}</strong> deaktivieren?
+        <strong class="deactivate-user__text--strong">{{ schoolClass }}</strong> deaktivieren?
       </template>
     </p>
     <ul class="deactivate-user__list">
@@ -49,8 +52,13 @@
       </li>
     </ul>
     <div slot="footer">
-      <a class="button button--primary" data-cy="modal-save-button" v-on:click="confirm">Speichern</a>
-      <a class="button" v-on:click="cancel">Abbrechen</a>
+      <a
+        class="button button--primary"
+        data-cy="modal-save-button"
+        @click="confirm">Speichern</a>
+      <a
+        class="button"
+        @click="cancel">Abbrechen</a>
     </div>
   </modal>
 </template>
diff --git a/client/src/components/profile/InstrumentActivity.vue b/client/src/components/profile/InstrumentActivity.vue
index 640b9fd4..ce8f23bd 100644
--- a/client/src/components/profile/InstrumentActivity.vue
+++ b/client/src/components/profile/InstrumentActivity.vue
@@ -1,19 +1,25 @@
 <template>
-  <div class="instrument-activity" v-if="!empty">
-    <h3 class="instrument-activity__module-name">{{type}}</h3>
-    <h2 class="instrument-activity__title">{{instrument.title}}</h2>
+  <div
+    class="instrument-activity"
+    v-if="!empty">
+    <h3 class="instrument-activity__module-name">{{ type }}</h3>
+    <h2 class="instrument-activity__title">{{ instrument.title }}</h2>
     <div class="instrument-activity__tasks activity-tasks">
-      <activity-entry title="Lesezeichen" class="instrument-activity__entry"
-                      v-for="bookmark in bookmarks"
-                      :key="bookmark.id"
-                      @link="goTo(bookmark.uuid)">
-        <content-bookmark :bookmark="bookmark"></content-bookmark>
+      <activity-entry
+        :key="bookmark.id"
+        title="Lesezeichen"
+        class="instrument-activity__entry"
+        v-for="bookmark in bookmarks"
+        @link="goTo(bookmark.uuid)">
+        <content-bookmark :bookmark="bookmark"/>
       </activity-entry>
-      <activity-entry title="Notiz" class="instrument-activity__entry"
-                      v-for="note in notes"
-                      :key="note.id"
-                      @link="goTo(note.id)">
-        {{note.text}}
+      <activity-entry
+        :key="note.id"
+        title="Notiz"
+        class="instrument-activity__entry"
+        v-for="note in notes"
+        @link="goTo(note.id)">
+        {{ note.text }}
       </activity-entry>
     </div>
   </div>
diff --git a/client/src/components/profile/ModuleActivity.vue b/client/src/components/profile/ModuleActivity.vue
index b65a77c5..3bd26f23 100644
--- a/client/src/components/profile/ModuleActivity.vue
+++ b/client/src/components/profile/ModuleActivity.vue
@@ -1,37 +1,50 @@
 <template>
-  <div class="module-activity" v-if="!empty">
-    <h3 class="module-activity__module-name">{{module.topic.title}}</h3>
-    <h2 class="module-activity__title">{{module.metaTitle}} - {{module.title}}</h2>
+  <div
+    class="module-activity"
+    v-if="!empty">
+    <h3 class="module-activity__module-name">{{ module.topic.title }}</h3>
+    <h2 class="module-activity__title">{{ module.metaTitle }} - {{ module.title }}</h2>
     <div class="module-activity__tasks activity-tasks">
-      <activity-entry title="Aufgabe & Ergebnis" class="module-activity__entry"
-                      v-for="submission in submissions"
-                      :key="submission.id"
-                      @link="goTo(submission.assignment.id)">
-        {{submission.text}}
+      <activity-entry
+        :key="submission.id"
+        title="Aufgabe & Ergebnis"
+        class="module-activity__entry"
+        v-for="submission in submissions"
+        @link="goTo(submission.assignment.id)">
+        {{ submission.text }}
       </activity-entry>
-      <activity-entry title="Übung" class="module-activity__entry"
-                      v-for="answer in answers"
-                      :key="answer.id"
-                      @link="goTo(answer.survey.id)">
-        {{answer.survey.title}}
+      <activity-entry
+        :key="answer.id"
+        title="Übung"
+        class="module-activity__entry"
+        v-for="answer in answers"
+        @link="goTo(answer.survey.id)">
+        {{ answer.survey.title }}
       </activity-entry>
-      <activity-entry title="Lesezeichen" class="module-activity__entry"
-                      v-for="bookmark in contentBookmarks"
-                      :key="bookmark.id"
-                      @link="goTo(bookmark.uuid)">
-        <content-bookmark :bookmark="bookmark"></content-bookmark>
+      <activity-entry
+        :key="bookmark.id"
+        title="Lesezeichen"
+        class="module-activity__entry"
+        v-for="bookmark in contentBookmarks"
+        @link="goTo(bookmark.uuid)">
+        <content-bookmark :bookmark="bookmark"/>
       </activity-entry>
-      <activity-entry title="Lesezeichen" class="module-activity__entry"
-                      v-for="bookmark in chapterBookmarks"
-                      :key="bookmark.id"
-                      @link="goTo(bookmark.chapter.id)">
-        {{bookmark.chapter.description}}
+      <activity-entry
+        :key="bookmark.id"
+        title="Lesezeichen"
+        class="module-activity__entry"
+        v-for="bookmark in chapterBookmarks"
+        @link="goTo(bookmark.chapter.id)">
+        {{ bookmark.chapter.description }}
       </activity-entry>
-      <activity-entry title="Notiz" class="module-activity__entry"
+      <activity-entry
+        :key="note.id"
+        title="Notiz"
 
-                      v-for="note in notes" :key="note.id"
-                      @link="goTo(note.id)">
-        {{note.text}}
+        class="module-activity__entry"
+        v-for="note in notes"
+        @link="goTo(note.id)">
+        {{ note.text }}
       </activity-entry>
     </div>
   </div>
diff --git a/client/src/components/profile/PasswordChange.vue b/client/src/components/profile/PasswordChange.vue
index 1ea94ee5..c98863f6 100644
--- a/client/src/components/profile/PasswordChange.vue
+++ b/client/src/components/profile/PasswordChange.vue
@@ -2,13 +2,17 @@
   <!-- Not currently in use, but keeping the file in case it's needed again -->
   <div class="password-reset">
     <h2 class="password-reset__header">Passwort ändern</h2>
-    <div v-if="showSuccess" class="success-message">
-      <p class="success-message__msg" data-cy="password-change-success">Dein Password wurde erfolgreich geändert.</p>
+    <div
+      class="success-message"
+      v-if="showSuccess">
+      <p
+        class="success-message__msg"
+        data-cy="password-change-success">Dein Password wurde erfolgreich geändert.</p>
     </div>
     <password-change-form
-      @passwordSubmited="resetPassword"
-      :oldPasswordErrors="oldPasswordErrors"
-      :newPasswordErrors="newPasswordErrors"/>
+      :old-password-errors="oldPasswordErrors"
+      :new-password-errors="newPasswordErrors"
+      @passwordSubmited="resetPassword"/>
   </div>
 </template>
 
diff --git a/client/src/components/profile/PasswordChangeForm.vue b/client/src/components/profile/PasswordChangeForm.vue
index 6d298048..ff5c7b2f 100644
--- a/client/src/components/profile/PasswordChangeForm.vue
+++ b/client/src/components/profile/PasswordChangeForm.vue
@@ -1,38 +1,63 @@
 <template>
   <div class="pw-change">
-    <form class="pw-change__form change-form" novalidate @submit.prevent="validateBeforeSubmit">
+    <form
+      class="pw-change__form change-form"
+      novalidate
+      @submit.prevent="validateBeforeSubmit">
       <div class="change-form__field skillboxform-input">
-        <label for="old-pw" class="skillboxform-input__label">Aktuelles Passwort</label>
-        <input id="old-pw"
-               name="oldPassword"
-               type="text"
-               v-model="oldPassword"
-               v-validate="'required'"
-               :class="{ 'skillboxform-input__input--error': errors.has('oldPassword') }"
-               class="change-form__old skillbox-input skillboxform-input__input"
-               autocomplete="off"
-               data-vv-as="Altes Passwort"
-               data-cy="old-password">
-        <small v-if="errors.has('oldPassword') && submitted" class="skillboxform-input__error" data-cy="old-password-local-errors">{{ errors.first('oldPassword') }}</small>
-        <small v-for="error in oldPasswordErrors" :key="error" class=" skillboxform-input__error" data-cy="old-password-remote-errors">{{ error }}</small>
+        <label
+          for="old-pw"
+          class="skillboxform-input__label">Aktuelles Passwort</label>
+        <input
+          v-model="oldPassword"
+          v-validate="'required'"
+          :class="{ 'skillboxform-input__input--error': errors.has('oldPassword') }"
+          name="oldPassword"
+          type="text"
+          class="change-form__old skillbox-input skillboxform-input__input"
+          autocomplete="off"
+          data-vv-as="Altes Passwort"
+          data-cy="old-password"
+          id="old-pw">
+        <small
+          class="skillboxform-input__error"
+          data-cy="old-password-local-errors"
+          v-if="errors.has('oldPassword') && submitted">{{ errors.first('oldPassword') }}</small>
+        <small
+          :key="error"
+          class=" skillboxform-input__error"
+          data-cy="old-password-remote-errors"
+          v-for="error in oldPasswordErrors">{{ error }}</small>
       </div>
       <div class="change-form__field skillboxform-input">
-        <label for="new-pw" class="skillboxform-input__label">Neues Passwort</label>
-        <input id="new-pw"
-               name="newPassword"
-               type="text"
-               v-model="newPassword"
-               data-vv-as="Neues Passwort"
-               v-validate="'required|min:8|strongPassword'"
-               :class="{ 'skillboxform-input__input--error': errors.has('newPassword') }"
-               class="change-form__new skillbox-input skillboxform-input__input"
-               autocomplete="off"
-               data-cy="new-password">
-        <small v-if="errors.has('newPassword') && submitted" class=" skillboxform-input__error" data-cy="new-password-local-errors">{{ errors.first('newPassword') }}</small>
-        <small v-for="error in newPasswordErrors" :key="error" class=" skillboxform-input__error" data-cy="new-password-remote-errors">{{ error }}</small>
+        <label
+          for="new-pw"
+          class="skillboxform-input__label">Neues Passwort</label>
+        <input
+          v-model="newPassword"
+          v-validate="'required|min:8|strongPassword'"
+          :class="{ 'skillboxform-input__input--error': errors.has('newPassword') }"
+          name="newPassword"
+          type="text"
+          data-vv-as="Neues Passwort"
+          class="change-form__new skillbox-input skillboxform-input__input"
+          autocomplete="off"
+          data-cy="new-password"
+          id="new-pw">
+        <small
+          class=" skillboxform-input__error"
+          data-cy="new-password-local-errors"
+          v-if="errors.has('newPassword') && submitted">{{ errors.first('newPassword') }}</small>
+        <small
+          :key="error"
+          class=" skillboxform-input__error"
+          data-cy="new-password-remote-errors"
+          v-for="error in newPasswordErrors">{{ error }}</small>
         <p class="skillboxform-input__hint">Das Passwort muss mindestens 8 Zeichen lang sein und Grossbuchstaben, Zahlen und Sonderzeichen beinhalten.</p>
       </div>
-      <button class="button button--primary change-form__submit" data-cy="change-password-button">Speichern</button>
+      <button
+        class="button button--primary change-form__submit"
+        data-cy="change-password-button">Speichern</button>
     </form>
   </div>
 </template>
@@ -45,6 +70,11 @@
       newPassword: '',
       submitted: false
     }),
+    mounted() {
+    this.$root.$on('reset-password-form', () => {
+      this.resetForm();
+    })
+  },
     methods: {
       validateBeforeSubmit () {
         this.$validator.validate().then((result) => {
@@ -64,11 +94,6 @@
         this.$validator.reset();
       }
     },
-    mounted() {
-    this.$root.$on('reset-password-form', () => {
-      this.resetForm();
-    })
-  }
   }
 </script>
 
diff --git a/client/src/components/profile/Profile.vue b/client/src/components/profile/Profile.vue
index 658682fe..0bf34f8a 100644
--- a/client/src/components/profile/Profile.vue
+++ b/client/src/components/profile/Profile.vue
@@ -1,15 +1,21 @@
 <template>
   <div class="profile">
     <h1 class="profile__header">Profilbild</h1>
-    <div class="profile-avatar" v-if="me.avatarUrl" >
+    <div
+      class="profile-avatar"
+      v-if="me.avatarUrl" >
       <div class="profile-avatar__image">
-        <avatar :avatarUrl="me.avatarUrl" />
+        <avatar :avatar-url="me.avatarUrl" />
       </div>
-      <a class="profile-avatar__remove icon-button" @click="deleteAvatar()">
-        <trash-icon class="profile-avatar__remove-icon icon-button__icon"></trash-icon>
+      <a
+        class="profile-avatar__remove icon-button"
+        @click="deleteAvatar()">
+        <trash-icon class="profile-avatar__remove-icon icon-button__icon"/>
       </a>
     </div>
-    <avatar-upload-form v-else @avatarUpdate="updateAvatar"/>
+    <avatar-upload-form
+      v-else
+      @avatarUpdate="updateAvatar"/>
   </div>
 </template>
 
diff --git a/client/src/components/profile/ProfileSidebar.vue b/client/src/components/profile/ProfileSidebar.vue
index b8f43c77..a31e2095 100644
--- a/client/src/components/profile/ProfileSidebar.vue
+++ b/client/src/components/profile/ProfileSidebar.vue
@@ -1,26 +1,42 @@
 <template>
-  <div class="profile-sidebar" v-if="sidebar.open" v-click-outside="closeSidebar">
-    <a class="profile-sidebar__close-link" @click="closeSidebar">
-      <cross class="profile-sidebar__close-icon"></cross>
+  <div
+    v-click-outside="closeSidebar"
+    class="profile-sidebar"
+    v-if="sidebar.open">
+    <a
+      class="profile-sidebar__close-link"
+      @click="closeSidebar">
+      <cross class="profile-sidebar__close-icon"/>
     </a>
-    <profile-widget class="profile-sidebar__item"></profile-widget>
-    <div class="profile-sidebar__item" @click="closeSidebar">
-      <router-link to="/me/activity" class="profile-sidebar__link">Meine Aktivitäten</router-link>
+    <profile-widget class="profile-sidebar__item"/>
+    <div
+      class="profile-sidebar__item"
+      @click="closeSidebar">
+      <router-link
+        to="/me/activity"
+        class="profile-sidebar__link">Meine Aktivitäten</router-link>
     </div>
     <div class="profile-sidebar__item">
       <h3 class="profile-sidebar__subtitle">Klasse</h3>
-      <class-selection-widget></class-selection-widget>
+      <class-selection-widget/>
       <div @click="closeSidebar">
-        <router-link :to="{name: 'my-class'}" class="profile-sidebar__link">Klassenliste anzeigen</router-link>
+        <router-link
+          :to="{name: 'my-class'}"
+          class="profile-sidebar__link">Klassenliste anzeigen</router-link>
       </div>
     </div>
-    <div class="profile-sidebar__item" @click="closeSidebar">
-      <router-link :to="{name:'join-class'}" data-cy="join-class-link" class="profile-sidebar__link">Zugangscode
+    <div
+      class="profile-sidebar__item"
+      @click="closeSidebar">
+      <router-link
+        :to="{name:'join-class'}"
+        data-cy="join-class-link"
+        class="profile-sidebar__link">Zugangscode
         eingeben
       </router-link>
     </div>
     <div class="profile-sidebar__item">
-      <logout-widget></logout-widget>
+      <logout-widget/>
     </div>
 
     <p class="profile-sidebar__support">
@@ -39,14 +55,14 @@
   import LogoutWidget from '@/components/LogoutWidget';
 
   export default {
+
+    mixins: [sidebarMixin],
     components: {
       LogoutWidget,
       ClassSelectionWidget,
       ProfileWidget,
       Cross
     },
-
-    mixins: [sidebarMixin],
   }
 </script>
 
diff --git a/client/src/components/profile/ProfileWidget.vue b/client/src/components/profile/ProfileWidget.vue
index 65bc2d53..30edecc2 100644
--- a/client/src/components/profile/ProfileWidget.vue
+++ b/client/src/components/profile/ProfileWidget.vue
@@ -1,9 +1,11 @@
 <template>
   <div class="profile-widget">
     <div class="profile-widget__avatar">
-      <avatar :avatar-url="me.avatarUrl" :editable="true"></avatar>
+      <avatar
+        :avatar-url="me.avatarUrl"
+        :editable="true"/>
     </div>
-    <h3 class="profile-widget__name">{{me.firstName}} {{me.lastName}}</h3>
+    <h3 class="profile-widget__name">{{ me.firstName }} {{ me.lastName }}</h3>
   </div>
 </template>
 
diff --git a/client/src/components/rooms/AddRoom.vue b/client/src/components/rooms/AddRoom.vue
index 1263f526..fcb66d6e 100644
--- a/client/src/components/rooms/AddRoom.vue
+++ b/client/src/components/rooms/AddRoom.vue
@@ -1,5 +1,5 @@
 <template>
-  <add-widget route="/new-room"></add-widget>
+  <add-widget route="/new-room"/>
 </template>
 
 <script>
diff --git a/client/src/components/rooms/AddRoomEntryButton.vue b/client/src/components/rooms/AddRoomEntryButton.vue
index 494289df..9dd263ce 100644
--- a/client/src/components/rooms/AddRoomEntryButton.vue
+++ b/client/src/components/rooms/AddRoomEntryButton.vue
@@ -1,6 +1,9 @@
 <template>
-  <div class="add-room-entry-button" data-cy="add-room-entry-button" @click="addRoomEntry">
-    <add-icon class="add-room-entry-button__icon"></add-icon>
+  <div
+    class="add-room-entry-button"
+    data-cy="add-room-entry-button"
+    @click="addRoomEntry">
+    <add-icon class="add-room-entry-button__icon"/>
   </div>
 </template>
 
diff --git a/client/src/components/rooms/EditRoom.vue b/client/src/components/rooms/EditRoom.vue
index 65bad866..107fc387 100644
--- a/client/src/components/rooms/EditRoom.vue
+++ b/client/src/components/rooms/EditRoom.vue
@@ -2,7 +2,7 @@
   <room-form
     :room="room"
     @save="updateRoom"
-  ></room-form>
+  />
 </template>
 
 <script>
diff --git a/client/src/components/rooms/EntryCountWidget.vue b/client/src/components/rooms/EntryCountWidget.vue
index a925e2b2..7aad07d7 100644
--- a/client/src/components/rooms/EntryCountWidget.vue
+++ b/client/src/components/rooms/EntryCountWidget.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="entry-count-widget">
-    <cards></cards>
-    <span>{{entryCount}} {{entryCount === 1 ? 'Beitrag' : 'Beiträge'}}</span>
+    <cards/>
+    <span>{{ entryCount }} {{ entryCount === 1 ? 'Beitrag' : 'Beiträge' }}</span>
   </div>
 </template>
 
diff --git a/client/src/components/rooms/RoomActions.vue b/client/src/components/rooms/RoomActions.vue
index 09bf7e90..cb5127c4 100644
--- a/client/src/components/rooms/RoomActions.vue
+++ b/client/src/components/rooms/RoomActions.vue
@@ -1,12 +1,14 @@
 <template>
   <div class="room-actions">
-    <a @click="toggleMenu"
-       class="room-actions__more-link">
-      <ellipses></ellipses>
+    <a
+      class="room-actions__more-link"
+      @click="toggleMenu">
+      <ellipses/>
     </a>
-    <widget-popover v-if="showMenu"
-                    @hide-me="showMenu = false"
-                    class="room-actions__popover">
+    <widget-popover
+      class="room-actions__popover"
+      v-if="showMenu"
+      @hide-me="showMenu = false">
       <li class="popover-links__link"><a @click="deleteRoom()">Raum löschen</a></li>
       <li class="popover-links__link"><a @click="editRoom()">Raum bearbeiten</a></li>
     </widget-popover>
diff --git a/client/src/components/rooms/RoomEntry.vue b/client/src/components/rooms/RoomEntry.vue
index d9249475..fcc07338 100644
--- a/client/src/components/rooms/RoomEntry.vue
+++ b/client/src/components/rooms/RoomEntry.vue
@@ -1,19 +1,31 @@
 <template>
   <div class="room-entry">
-    <more-options-widget class="room-entry__more" v-if="myEntry">
+    <more-options-widget
+      class="room-entry__more"
+      v-if="myEntry">
       <li class="popover-links__link"><a @click="deleteRoomEntry(id)">Eintrag löschen</a></li>
       <li class="popover-links__link"><a @click="editRoomEntry(id)">Eintrag bearbeiten</a></li>
     </more-options-widget>
-    <router-link :to="{name: 'article', params: { slug: slug }}" tag="div" class="room-entry__router-link">
-      <div class="room-entry__header" v-if="image">
-        <img class="room-entry__image" :src="image" :alt="title">
+    <router-link
+      :to="{name: 'article', params: { slug: slug }}"
+      tag="div"
+      class="room-entry__router-link">
+      <div
+        class="room-entry__header"
+        v-if="image">
+        <img
+          :src="image"
+          :alt="title"
+          class="room-entry__image">
       </div>
       <div class="room-entry__content">
-        <h2 class="room-entry__title">{{title}}</h2>
-        <p class="room-entry__teaser" v-html="teaser">
-
-        </p>
-        <user-meta-widget class="room-entry__author" v-bind="author"></user-meta-widget>
+        <h2 class="room-entry__title">{{ title }}</h2>
+        <p
+          class="room-entry__teaser"
+          v-html="teaser"/>
+        <user-meta-widget
+          v-bind="author"
+          class="room-entry__author"/>
       </div>
     </router-link>
   </div>
@@ -37,6 +49,22 @@
       UserMetaWidget
     },
 
+    computed: {
+      image() {
+        if (this.contents) {
+          let found = this.contents.find(c => c.type === 'image_url_block');
+          return found ? found.value.url : '';
+        }
+        return '';
+      },
+      teaser() {
+        return teaser(this.contents);
+      },
+      myEntry() {
+        return this.author.id === this.me.id;
+      }
+    },
+
     methods: {
       deleteRoomEntry(id) {
         this.$apollo.mutate({
@@ -64,22 +92,6 @@
       }
     },
 
-    computed: {
-      image() {
-        if (this.contents) {
-          let found = this.contents.find(c => c.type === 'image_url_block');
-          return found ? found.value.url : '';
-        }
-        return '';
-      },
-      teaser() {
-        return teaser(this.contents);
-      },
-      myEntry() {
-        return this.author.id === this.me.id;
-      }
-    },
-
     apollo: {
       me() {
         return {
diff --git a/client/src/components/rooms/RoomForm.vue b/client/src/components/rooms/RoomForm.vue
index e4f8265b..2dcfda4b 100644
--- a/client/src/components/rooms/RoomForm.vue
+++ b/client/src/components/rooms/RoomForm.vue
@@ -1,39 +1,53 @@
 <template>
-  <page-form class="room-form" @save="$emit('save', localRoom)" title="Neues Board">
-    <page-form-input v-model="localRoom.title" label="Titel">
-    </page-form-input>
+  <page-form
+    class="room-form"
+    title="Neues Board"
+    @save="$emit('save', localRoom)">
+    <page-form-input
+      v-model="localRoom.title"
+      label="Titel"/>
 
-    <page-form-input v-model="localRoom.description" label="Beschreibung" type="textarea">
-    </page-form-input>
+    <page-form-input
+      v-model="localRoom.description"
+      label="Beschreibung"
+      type="textarea"/>
 
-    <label class="room-form__property-heading" for="room-class">Klasse</label>
+    <label
+      class="room-form__property-heading"
+      for="room-class">Klasse</label>
     <select
+      v-model="localRoom.schoolClass"
       class="skillbox-input room-form__input"
       id="room-class"
-      v-model="localRoom.schoolClass"
     >
-      <option :value="{}" disabled hidden>Klasse wählen</option>
       <option
-        v-for="schoolClass in schoolClasses"
+        :value="{}"
+        disabled
+        hidden>Klasse wählen</option>
+      <option
         :key="schoolClass.id"
-        v-bind:value="schoolClass"
-      >{{schoolClass.name}}
+        :value="schoolClass"
+        v-for="schoolClass in schoolClasses"
+      >{{ schoolClass.name }}
       </option>
     </select>
     <h2 class="room-form__property-heading">Farbe</h2>
     <color-chooser
       :selected-color="localRoom.appearance"
-      v-on:input="updateColor"
-    ></color-chooser>
+      @input="updateColor"
+    />
     <template slot="footer">
       <button
-        type="submit"
-        class="button button--primary room-form__save-button"
         :class="{'button--disabled': noClassSelected}"
         :disabled="noClassSelected"
+        type="submit"
+        class="button button--primary room-form__save-button"
       >Speichern
       </button>
-      <router-link to="/rooms" tag="button" class="button">Abbrechen</router-link>
+      <router-link
+        to="/rooms"
+        tag="button"
+        class="button">Abbrechen</router-link>
     </template>
   </page-form>
 </template>
@@ -70,6 +84,14 @@
       }
     },
 
+    created() {
+      this.$store.dispatch('setSpecialContainerClass', this.localRoom.appearance);
+    },
+
+    beforeDestroy() {
+      this.$store.dispatch('setSpecialContainerClass', '');
+    },
+
     methods: {
       updateColor(newColor) {
         this.localRoom.appearance = newColor;
@@ -82,14 +104,6 @@
         query: ME_QUERY,
       }
     },
-
-    created() {
-      this.$store.dispatch('setSpecialContainerClass', this.localRoom.appearance);
-    },
-
-    beforeDestroy() {
-      this.$store.dispatch('setSpecialContainerClass', '');
-    }
   }
 </script>
 
diff --git a/client/src/components/rooms/RoomGroupWidget.vue b/client/src/components/rooms/RoomGroupWidget.vue
index 57b4d744..18f438d0 100644
--- a/client/src/components/rooms/RoomGroupWidget.vue
+++ b/client/src/components/rooms/RoomGroupWidget.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="room-group-widget">
-    <group></group>
+    <group/>
     <span>
-        {{name}}
+      {{ name }}
     </span>
   </div>
 </template>
diff --git a/client/src/components/rooms/RoomWidget.vue b/client/src/components/rooms/RoomWidget.vue
index 7fab1336..7ba73ac8 100644
--- a/client/src/components/rooms/RoomWidget.vue
+++ b/client/src/components/rooms/RoomWidget.vue
@@ -1,12 +1,17 @@
 <template>
-  <div class="room-widget" :class="roomClass">
-    <router-link :to="{name: 'room', params: {slug: slug}}" tag="div" class="room-widget__content">
-      <h2 class="room-widget__title">{{title}}</h2>
-      <room-group-widget v-bind="schoolClass"></room-group-widget>
-      <entry-count-widget :entryCount="entryCount"></entry-count-widget>
+  <div
+    :class="roomClass"
+    class="room-widget">
+    <router-link
+      :to="{name: 'room', params: {slug: slug}}"
+      tag="div"
+      class="room-widget__content">
+      <h2 class="room-widget__title">{{ title }}</h2>
+      <room-group-widget v-bind="schoolClass"/>
+      <entry-count-widget :entry-count="entryCount"/>
     </router-link>
     <widget-footer v-if="canEditRoom">
-      <room-actions :id="this.id"></room-actions>
+      <room-actions :id="this.id"/>
     </widget-footer>
   </div>
 </template>
diff --git a/client/src/components/rooms/room-entries/EditRoomEntryWizard.vue b/client/src/components/rooms/room-entries/EditRoomEntryWizard.vue
index b0b65fda..6fe2aac6 100644
--- a/client/src/components/rooms/room-entries/EditRoomEntryWizard.vue
+++ b/client/src/components/rooms/room-entries/EditRoomEntryWizard.vue
@@ -1,12 +1,12 @@
 <template>
   <contents-form
-    v-if="entry.id"
     :content-block="entry"
     :show-task-selection="false"
-    @save="saveEntry"
     block-type="RoomEntry"
+    v-if="entry.id"
+    @save="saveEntry"
     @hide="hideModal"
-  ></contents-form>
+  />
 </template>
 
 <script>
diff --git a/client/src/components/rooms/room-entries/NewRoomEntryWizard.vue b/client/src/components/rooms/room-entries/NewRoomEntryWizard.vue
index 3be92a2f..2c9cc618 100644
--- a/client/src/components/rooms/room-entries/NewRoomEntryWizard.vue
+++ b/client/src/components/rooms/room-entries/NewRoomEntryWizard.vue
@@ -2,11 +2,11 @@
   <contents-form
     :content-block="entry"
     :show-task-selection="false"
-    @save="saveEntry"
-    block-type="RoomEntry"
     :disable-save="saving"
+    block-type="RoomEntry"
+    @save="saveEntry"
     @hide="hideModal"
-  ></contents-form>
+  />
 </template>
 
 <script>
diff --git a/client/src/components/school-class/ClassSelectionWidget.vue b/client/src/components/school-class/ClassSelectionWidget.vue
index 5972ef91..841b6003 100644
--- a/client/src/components/school-class/ClassSelectionWidget.vue
+++ b/client/src/components/school-class/ClassSelectionWidget.vue
@@ -1,26 +1,38 @@
 <template>
-  <div class="class-selection" v-if="currentClassSelection">
-    <div data-cy="class-selection" class="class-selection__selected-class selected-class"
-         @click="showPopover = !showPopover">
-      <current-class class="selected-class__text"></current-class>
-      <chevron-down class="selected-class__dropdown-icon"></chevron-down>
+  <div
+    class="class-selection"
+    v-if="currentClassSelection">
+    <div
+      data-cy="class-selection"
+      class="class-selection__selected-class selected-class"
+      @click="showPopover = !showPopover">
+      <current-class class="selected-class__text"/>
+      <chevron-down class="selected-class__dropdown-icon"/>
     </div>
-    <widget-popover v-if="showPopover"
-                    @hide-me="showPopover = false"
-                    :mobile="mobile"
-                    class="class-selection__popover">
-      <li data-cy="class-selection-entry" class="popover-links__link popover-links__link--large"
-          v-for="schoolClass in me.schoolClasses"
-          :key="schoolClass.id"
-          :label="schoolClass.name"
-          :item="schoolClass"
-          @click="updateSelectedClassAndHidePopover(schoolClass)">
-        {{schoolClass.name}}
+    <widget-popover
+      :mobile="mobile"
+      class="class-selection__popover"
+      v-if="showPopover"
+      @hide-me="showPopover = false">
+      <li
+        :key="schoolClass.id"
+        :label="schoolClass.name"
+        :item="schoolClass"
+        data-cy="class-selection-entry"
+        class="popover-links__link popover-links__link--large"
+        v-for="schoolClass in me.schoolClasses"
+        @click="updateSelectedClassAndHidePopover(schoolClass)">
+        {{ schoolClass.name }}
       </li>
-      <li class="popover-links__link popover-links__link--large popover-links__divider"
-          v-if="me.isTeacher"
-          data-cy="create-class-link" @click="closeSidebar">
-        <router-link tag="span" class="popover-links__link-with-icon" :to="{name: 'create-class'}">
+      <li
+        class="popover-links__link popover-links__link--large popover-links__divider"
+        data-cy="create-class-link"
+        v-if="me.isTeacher"
+        @click="closeSidebar">
+        <router-link
+          :to="{name: 'create-class'}"
+          tag="span"
+          class="popover-links__link-with-icon">
           <add-icon class="popover-links__icon"/>
           <span>Klasse erfassen</span>
         </router-link>
@@ -43,12 +55,6 @@
   import meMixin from '@/mixins/me';
 
   export default {
-    components: {
-      WidgetPopover,
-      ChevronDown,
-      CurrentClass,
-      AddIcon
-    },
 
     props: {
       mobile: {
@@ -58,6 +64,12 @@
     },
 
     mixins: [updateSelectedClassMixin, sidebarMixin, meMixin],
+    components: {
+      WidgetPopover,
+      ChevronDown,
+      CurrentClass,
+      AddIcon
+    },
 
     data() {
       return {
@@ -65,14 +77,6 @@
       }
     },
 
-    methods: {
-      updateSelectedClassAndHidePopover(selectedClass) {
-        this.updateSelectedClass(selectedClass);
-        this.showPopover = false;
-        this.closeSidebar();
-      }
-    },
-
     computed: {
       currentClassSelection() {
         let currentClass = this.me.schoolClasses.find(schoolClass => {
@@ -82,6 +86,14 @@
       }
     },
 
+    methods: {
+      updateSelectedClassAndHidePopover(selectedClass) {
+        this.updateSelectedClass(selectedClass);
+        this.showPopover = false;
+        this.closeSidebar();
+      }
+    },
+
   }
 </script>
 
diff --git a/client/src/components/school-class/CurrentClass.vue b/client/src/components/school-class/CurrentClass.vue
index 19fb2099..c1cc9d3b 100644
--- a/client/src/components/school-class/CurrentClass.vue
+++ b/client/src/components/school-class/CurrentClass.vue
@@ -1,5 +1,7 @@
 <template>
-  <span class="current-class" data-cy="current-class-name">{{currentClassName}}</span>
+  <span
+    class="current-class"
+    data-cy="current-class-name">{{ currentClassName }}</span>
 </template>
 
 <script>
diff --git a/client/src/components/school-class/EditClassName.vue b/client/src/components/school-class/EditClassName.vue
index 82be02ff..c3afa402 100644
--- a/client/src/components/school-class/EditClassName.vue
+++ b/client/src/components/school-class/EditClassName.vue
@@ -1,6 +1,9 @@
 <template>
-  <a class="edit-class-name" @click="$emit('edit')" data-cy="edit-class-name-link">
-    <pen-icon class="edit-class-name__icon"></pen-icon>
+  <a
+    class="edit-class-name"
+    data-cy="edit-class-name-link"
+    @click="$emit('edit')">
+    <pen-icon class="edit-class-name__icon"/>
   </a>
 </template>
 
diff --git a/client/src/components/school-class/EditClassNameWizard.vue b/client/src/components/school-class/EditClassNameWizard.vue
index 8bf6c222..be18e0c7 100644
--- a/client/src/components/school-class/EditClassNameWizard.vue
+++ b/client/src/components/school-class/EditClassNameWizard.vue
@@ -1,15 +1,23 @@
 <template>
-  <modal :hide-header="false" :small="true" title="Hello">
+  <modal
+    :hide-header="false"
+    :small="true"
+    title="Hello">
     <h4 slot="header">Klasse bearbeiten</h4>
-    <modal-input v-on:input="name = $event"
-                 placeholder="Klassenname"
-                 data-cy="edit-class-name-input"
-                 :value="name"
-    ></modal-input>
+    <modal-input
+      :value="name"
+      placeholder="Klassenname"
+      data-cy="edit-class-name-input"
+      @input="name = $event"
+    />
     <div slot="footer">
-      <a class="button button--primary" data-cy="modal-save-button"
-         @click="save">Speichern</a>
-      <a class="button" @click="hide">Abbrechen</a>
+      <a
+        class="button button--primary"
+        data-cy="modal-save-button"
+        @click="save">Speichern</a>
+      <a
+        class="button"
+        @click="hide">Abbrechen</a>
     </div>
 
   </modal>
@@ -28,6 +36,16 @@
       ModalInput
     },
 
+    data() {
+      return {
+        name: ''
+      }
+    },
+
+    mounted() {
+      this.name = this.schoolClass ? this.schoolClass.name : '';
+    },
+
     methods: {
       save() {
         this.$apollo.mutate({
@@ -60,15 +78,5 @@
         }
       }
     },
-
-    mounted() {
-      this.name = this.schoolClass ? this.schoolClass.name : '';
-    },
-
-    data() {
-      return {
-        name: ''
-      }
-    }
   }
 </script>
diff --git a/client/src/components/toggle-menu/ToggleEditing.vue b/client/src/components/toggle-menu/ToggleEditing.vue
index f6de1cd6..dc662265 100644
--- a/client/src/components/toggle-menu/ToggleEditing.vue
+++ b/client/src/components/toggle-menu/ToggleEditing.vue
@@ -1,5 +1,9 @@
 <template>
-  <checkbox class="toggle-editing" label="Modul anpassen" :checked="checked" @input="toggle"></checkbox>
+  <checkbox
+    :checked="checked"
+    class="toggle-editing"
+    label="Modul anpassen"
+    @input="toggle"/>
 </template>
 
 <script>
diff --git a/client/src/components/toggle-menu/ToggleSolutionsForModule.vue b/client/src/components/toggle-menu/ToggleSolutionsForModule.vue
index 1ac371a3..c36a7ed3 100644
--- a/client/src/components/toggle-menu/ToggleSolutionsForModule.vue
+++ b/client/src/components/toggle-menu/ToggleSolutionsForModule.vue
@@ -1,6 +1,9 @@
 <template>
-  <checkbox v-if="canToggleSolutions" label="Lösungen für Lernende anzeigen" :checked="enabled"
-            @input="toggleSolutions"></checkbox>
+  <checkbox
+    :checked="enabled"
+    label="Lösungen für Lernende anzeigen"
+    v-if="canToggleSolutions"
+    @input="toggleSolutions"/>
 </template>
 
 <script>
@@ -21,12 +24,6 @@
       me: meQuery
     },
 
-    computed: {
-      canToggleSolutions() {
-        return this.me.permissions.includes('users.can_manage_school_class_content')
-      }
-    },
-
     data() {
       return {
         me: {
@@ -35,6 +32,12 @@
       }
     },
 
+    computed: {
+      canToggleSolutions() {
+        return this.me.permissions.includes('users.can_manage_school_class_content')
+      }
+    },
+
     methods: {
       toggleSolutions(enabled) {
         const slug = this.slug;
diff --git a/client/src/components/videos/SrfEmbed.vue b/client/src/components/videos/SrfEmbed.vue
index 9190622d..dd7f6c1a 100644
--- a/client/src/components/videos/SrfEmbed.vue
+++ b/client/src/components/videos/SrfEmbed.vue
@@ -1,7 +1,9 @@
 <template>
-  <iframe class="srf-embed"
-          :src='`https://tp.srgssr.ch/p/srf/embed?urn=urn:srf:video:${videoId}`'
-          allowfullscreen frameborder='0'></iframe>
+  <iframe
+    :src='`https://tp.srgssr.ch/p/srf/embed?urn=urn:srf:video:${videoId}`'
+    class="srf-embed"
+    allowfullscreen
+    frameborder='0'/>
 </template>
 
 <script>
diff --git a/client/src/components/videos/VimeoEmbed.vue b/client/src/components/videos/VimeoEmbed.vue
index 5b5a9694..302fa688 100644
--- a/client/src/components/videos/VimeoEmbed.vue
+++ b/client/src/components/videos/VimeoEmbed.vue
@@ -1,6 +1,11 @@
 <template>
-  <iframe class="vimeo-embed" :src="`https://player.vimeo.com/video/${videoId}`" frameborder="0"
-          webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+  <iframe
+    :src="`https://player.vimeo.com/video/${videoId}`"
+    class="vimeo-embed"
+    frameborder="0"
+    webkitallowfullscreen
+    mozallowfullscreen
+    allowfullscreen/>
 </template>
 
 <script>
diff --git a/client/src/components/videos/YoutubeEmbed.vue b/client/src/components/videos/YoutubeEmbed.vue
index 4a24d1c1..b066efc7 100644
--- a/client/src/components/videos/YoutubeEmbed.vue
+++ b/client/src/components/videos/YoutubeEmbed.vue
@@ -1,8 +1,11 @@
 <template>
-  <iframe class="youtube-embed" id="ytplayer" type="text/html"
-          rel="0"
-          :src="`https://www.youtube.com/embed/${videoId}`"
-          frameborder="0"></iframe>
+  <iframe
+    :src="`https://www.youtube.com/embed/${videoId}`"
+    class="youtube-embed"
+    type="text/html"
+    rel="0"
+    frameborder="0"
+    id="ytplayer"/>
 </template>
 
 <script>
diff --git a/client/src/components/visibility/VisibilityAction.vue b/client/src/components/visibility/VisibilityAction.vue
index 4d956387..4755abd0 100644
--- a/client/src/components/visibility/VisibilityAction.vue
+++ b/client/src/components/visibility/VisibilityAction.vue
@@ -1,8 +1,15 @@
 <template>
   <div class="visibility-action">
-    <a @click="toggleVisibility()" v-if="canManageContent" class="visibility-action__action-button">
-      <closed-eye-icon v-if="hidden" class="visibility-action__action-icon action-icon"></closed-eye-icon>
-      <eye-icon v-else class="visibility-action__action-icon action-icon"></eye-icon>
+    <a
+      class="visibility-action__action-button"
+      v-if="canManageContent"
+      @click="toggleVisibility()">
+      <closed-eye-icon
+        class="visibility-action__action-icon action-icon"
+        v-if="hidden"/>
+      <eye-icon
+        class="visibility-action__action-icon action-icon"
+        v-else/>
     </a>
   </div>
 </template>
@@ -23,6 +30,15 @@
       ClosedEyeIcon
     },
 
+    data() {
+      return {
+        showVisibility: false,
+        me: {
+          permissions: []
+        }
+      }
+    },
+
     computed: {
       canManageContent() {
         return this.me.permissions.includes('users.can_manage_school_class_content');
@@ -88,15 +104,6 @@
         query: ME_QUERY,
       },
     },
-
-    data() {
-      return {
-        showVisibility: false,
-        me: {
-          permissions: []
-        }
-      }
-    }
   }
 </script>
 
diff --git a/client/src/layouts/BlankLayout.vue b/client/src/layouts/BlankLayout.vue
index 932df5d7..a050d6f9 100644
--- a/client/src/layouts/BlankLayout.vue
+++ b/client/src/layouts/BlankLayout.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="blank-layout">
-    <profile-sidebar></profile-sidebar>
-    <router-view></router-view>
+    <profile-sidebar/>
+    <router-view/>
   </div>
 </template>
 
diff --git a/client/src/layouts/DefaultFooter.vue b/client/src/layouts/DefaultFooter.vue
index 6a18129d..04839d31 100644
--- a/client/src/layouts/DefaultFooter.vue
+++ b/client/src/layouts/DefaultFooter.vue
@@ -10,13 +10,15 @@
           </p>
         </div>
 
-        <a href="https://www.hep-verlag.ch/" target="_blank">
-          <hep-logo class="default-footer__logo-hep">
-          </hep-logo>
+        <a
+          href="https://www.hep-verlag.ch/"
+          target="_blank">
+          <hep-logo class="default-footer__logo-hep"/>
         </a>
-        <a href="https://www.ehb.swiss/" target="_blank">
-          <ehb-logo class="default-footer__logo-ehb">
-          </ehb-logo>
+        <a
+          href="https://www.ehb.swiss/"
+          target="_blank">
+          <ehb-logo class="default-footer__logo-ehb"/>
         </a>
 
       </div>
diff --git a/client/src/layouts/DefaultLayout.vue b/client/src/layouts/DefaultLayout.vue
index 3603a6cd..2400094a 100644
--- a/client/src/layouts/DefaultLayout.vue
+++ b/client/src/layouts/DefaultLayout.vue
@@ -1,15 +1,16 @@
 <template>
-  <div class="container skillbox layout" :class="specialContainerClass">
-    <profile-sidebar></profile-sidebar>
-    <header-bar class="header layout__header">
-    </header-bar>
+  <div
+    :class="specialContainerClass"
+    class="container skillbox layout">
+    <profile-sidebar/>
+    <header-bar class="header layout__header"/>
 
     <mobile-header
       class="header layout__header layout__header--mobile"
-    ></mobile-header>
+    />
 
-    <router-view class="layout__content"></router-view>
-    <default-footer class="layout__footer"></default-footer>
+    <router-view class="layout__content"/>
+    <default-footer class="layout__footer"/>
   </div>
 </template>
 
diff --git a/client/src/layouts/FullScreenLayout.vue b/client/src/layouts/FullScreenLayout.vue
index 5a3ea3fa..beff442f 100644
--- a/client/src/layouts/FullScreenLayout.vue
+++ b/client/src/layouts/FullScreenLayout.vue
@@ -1,10 +1,14 @@
 <template>
-  <div class="container layout layout--fullscreen" :class="specialContainerClass">
-    <div class="close-button" v-on:click="back">
-      <cross class="close-button__icon"></cross>
+  <div
+    :class="specialContainerClass"
+    class="container layout layout--fullscreen">
+    <div
+      class="close-button"
+      @click="back">
+      <cross class="close-button__icon"/>
     </div>
 
-    <router-view class="layout__content"></router-view>
+    <router-view class="layout__content"/>
   </div>
 </template>
 
diff --git a/client/src/layouts/PublicLayout.vue b/client/src/layouts/PublicLayout.vue
index a2b2c82c..723ef650 100644
--- a/client/src/layouts/PublicLayout.vue
+++ b/client/src/layouts/PublicLayout.vue
@@ -3,14 +3,14 @@
     <div class="public__logo">
       <logo></logo>
     </div>
-    <router-view class="public__content"></router-view>
+    <router-view class="public__content layout__content"></router-view>
     <default-footer class="skillbox__footer public__footer footer"></default-footer>
   </div>
 </template>
 <script>
 
-import Logo from '@/components/icons/Logo';
-import DefaultFooter from '@/layouts/DefaultFooter';
+  import Logo from '@/components/icons/Logo';
+  import DefaultFooter from '@/layouts/DefaultFooter';
 
   export default {
     components: {
diff --git a/client/src/layouts/SimpleLayout.vue b/client/src/layouts/SimpleLayout.vue
index 73535a98..7cf00234 100644
--- a/client/src/layouts/SimpleLayout.vue
+++ b/client/src/layouts/SimpleLayout.vue
@@ -1,10 +1,12 @@
 <template>
   <div class="skillbox layout layout--simple">
-    <div class="close-button" v-on:click="back">
-      <cross class="close-button__icon"></cross>
+    <div
+      class="close-button"
+      @click="back">
+      <cross class="close-button__icon"/>
     </div>
-    <router-view></router-view>
-    <simple-footer class="layout__footer"></simple-footer>
+    <router-view/>
+    <simple-footer class="layout__footer"/>
   </div>
 </template>
 
diff --git a/client/src/pages/activity.vue b/client/src/pages/activity.vue
index ca488882..35312996 100644
--- a/client/src/pages/activity.vue
+++ b/client/src/pages/activity.vue
@@ -4,21 +4,20 @@
     <activity-filter
       :filter="filter"
       @change-filter="filter = $event"
-    ></activity-filter>
+    />
     <div class="modules">
       <module-activity
-        v-for="(module, id) in modules"
         :filter="filter"
         :module="module"
         :key="id"
-        class="activity"></module-activity>
+        class="activity"
+        v-for="(module, id) in modules"/>
     </div>
     <instrument-activity
-      v-for="(instrument, id) in instruments"
       :key="id"
       :filter="filter"
-      :instrument="instrument">
-    </instrument-activity>
+      :instrument="instrument"
+      v-for="(instrument, id) in instruments"/>
 
   </div>
 </template>
diff --git a/client/src/pages/article.vue b/client/src/pages/article.vue
index 490c278e..3b9c4d6d 100644
--- a/client/src/pages/article.vue
+++ b/client/src/pages/article.vue
@@ -2,17 +2,17 @@
   <div class="article">
     <div class="article__header">
       <div class="article__meta">
-        <user-meta-widget v-bind="roomEntry.author"></user-meta-widget>
+        <user-meta-widget v-bind="roomEntry.author"/>
       </div>
-      <h1 class="article__title">{{roomEntry.title}}</h1>
+      <h1 class="article__title">{{ roomEntry.title }}</h1>
     </div>
     <div class="article__content">
 
-      <component v-for="component in roomEntry.contents"
-                 :key="component.id"
-                 :is="component.type"
-                 v-bind="component">
-      </component>
+      <component
+        :key="component.id"
+        :is="component.type"
+        v-bind="component"
+        v-for="component in roomEntry.contents"/>
     </div>
   </div>
 </template>
diff --git a/client/src/pages/book.vue b/client/src/pages/book.vue
index a7ac5f32..eb510523 100644
--- a/client/src/pages/book.vue
+++ b/client/src/pages/book.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="book">
     <main class="book__content">
-      <router-view :key="$route.fullPath"></router-view>
+      <router-view :key="$route.fullPath"/>
     </main>
 
   </div>
diff --git a/client/src/pages/createClass.vue b/client/src/pages/createClass.vue
index 89f5f18c..a681e4eb 100644
--- a/client/src/pages/createClass.vue
+++ b/client/src/pages/createClass.vue
@@ -4,26 +4,34 @@
 
     <div>
       <div class="skillboxform-input">
-        <label for="class-name" class="skillboxform-input__label">Name</label>
+        <label
+          for="class-name"
+          class="skillboxform-input__label">Name</label>
         <input
-          id="class-name"
-          class="skillbox-input skillboxform-input__input"
           :class="{'skillboxform-input__input--error': error}"
-          data-cy="input-class-name"
           :value="name"
+          class="skillbox-input skillboxform-input__input"
+          data-cy="input-class-name"
+          id="class-name"
           @input="updateName">
         <small
-          v-if="error"
           class="skillboxform-input__error"
           data-cy="email-local-errors"
+          v-if="error"
         >{{ error }}
         </small>
       </div>
 
       <div>
-        <a class="button button--primary button--big" data-cy="create-class" @click="createClass(name)">Klasse
+        <a
+          class="button button--primary button--big"
+          data-cy="create-class"
+          @click="createClass(name)">Klasse
           erfassen</a>
-        <a class="button button--big" data-cy="create-class-cancel" @click="cancel">Abbrechen</a>
+        <a
+          class="button button--big"
+          data-cy="create-class-cancel"
+          @click="cancel">Abbrechen</a>
       </div>
 
     </div>
diff --git a/client/src/pages/editProject.vue b/client/src/pages/editProject.vue
index 3eeb50fc..19b9e390 100644
--- a/client/src/pages/editProject.vue
+++ b/client/src/pages/editProject.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="edit-project-page">
-    <edit-project :project="project" v-if="this.project.id"></edit-project>
+    <edit-project
+      :project="project"
+      v-if="this.project.id"/>
   </div>
 </template>
 
diff --git a/client/src/pages/editRoom.vue b/client/src/pages/editRoom.vue
index 91509c48..cacacc03 100644
--- a/client/src/pages/editRoom.vue
+++ b/client/src/pages/editRoom.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="edit-room-page">
-    <edit-room :room="room" v-if="this.room.id"></edit-room>
+    <edit-room
+      :room="room"
+      v-if="this.room.id"/>
   </div>
 </template>
 
diff --git a/client/src/pages/instrument.vue b/client/src/pages/instrument.vue
index 0f15022c..e5939adf 100644
--- a/client/src/pages/instrument.vue
+++ b/client/src/pages/instrument.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="instrument">
-    <h1 class="instrument__title">{{instrument.title}}</h1>
+    <h1 class="instrument__title">{{ instrument.title }}</h1>
 
-    <content-component v-for="component in instrument.contents"
-                       :key="component.id"
-                       :component="component"
-                       :root="instrument.slug"
-                       :parent="instrument"
-                       :bookmarks="instrument.bookmarks"
-                       :notes="instrument.notes"
-    >
-    </content-component>
+    <content-component
+      :key="component.id"
+      :component="component"
+      :root="instrument.slug"
+      :parent="instrument"
+      :bookmarks="instrument.bookmarks"
+      :notes="instrument.notes"
+      v-for="component in instrument.contents"
+    />
 
   </div>
 </template>
diff --git a/client/src/pages/instrumentOverview.vue b/client/src/pages/instrumentOverview.vue
index 4957052c..da861d68 100644
--- a/client/src/pages/instrumentOverview.vue
+++ b/client/src/pages/instrumentOverview.vue
@@ -5,17 +5,17 @@
         Instrumente
       </h1>
     </div>
-    <instrument-filter @filter="updateFilter" class="instrument-overview__filter">
-
-    </instrument-filter>
+    <instrument-filter
+      class="instrument-overview__filter"
+      @filter="updateFilter"/>
     <div class="instrument-overview__list">
       <router-link
+        :to="{name: 'instrument', params: {slug: instrument.slug}}"
+        :key="instrument.id"
         class="instrument-overview__list-item"
         tag="div"
-        :to="{name: 'instrument', params: {slug: instrument.slug}}"
-        v-for="instrument in filteredInstruments"
-        :key="instrument.id">
-        {{instrument.title}}
+        v-for="instrument in filteredInstruments">
+        {{ instrument.title }}
       </router-link>
     </div>
   </div>
@@ -39,6 +39,13 @@
       }
     },
 
+    data() {
+      return {
+        instruments: [],
+        filter: []
+      }
+    },
+
     computed: {
       filteredInstruments() {
         return this.instruments.filter(instrument => this.filter.includes(instrument.type) || !this.filter.length);
@@ -50,13 +57,6 @@
         this.filter = filter
       }
     },
-
-    data() {
-      return {
-        instruments: [],
-        filter: []
-      }
-    }
   }
 </script>
 
diff --git a/client/src/pages/joinClass.vue b/client/src/pages/joinClass.vue
index a7709cbb..51c8278d 100644
--- a/client/src/pages/joinClass.vue
+++ b/client/src/pages/joinClass.vue
@@ -3,25 +3,34 @@
     <h1 data-cy="join-class-title">Zugangscode eingeben</h1>
     <div>
       <div class="skillboxform-input">
-        <label for="join-code" class="skillboxform-input__label">Zugangscode</label>
+        <label
+          for="join-code"
+          class="skillboxform-input__label">Zugangscode</label>
         <input
-          id="join-code"
-          class="skillbox-input skillboxform-input__input"
           :class="{'skillboxform-input__input--error': error}"
-          data-cy="input-class-code"
           :value="code"
+          class="skillbox-input skillboxform-input__input"
+          data-cy="input-class-code"
+          id="join-code"
           @input="updateCode">
         <small
-          v-if="error"
           class="skillboxform-input__error"
           data-cy="email-local-errors"
+          v-if="error"
         >{{ error }}
         </small>
       </div>
 
       <div>
-        <a class="button button--primary button--big" data-cy="join-class" @click="joinClass(code)">Klasse beitreten</a>
-        <button class="button button--big" data-cy="join-class-cancel" @click="logout">Abmelden</button>
+        <a
+          class="button button--primary button--big"
+          data-cy="join-class"
+          @click="joinClass(code)">Klasse beitreten</a>
+        <button
+          class="button button--big"
+          data-cy="join-class-cancel"
+          @click="logout">Abmelden
+        </button>
       </div>
 
     </div>
@@ -79,7 +88,9 @@
         this.$apollo.mutate({
           mutation: LOGOUT_MUTATION,
         }).then(({data}) => {
-          if (data.logout.success) { location.replace('/') }
+          if (data.logout.success) {
+            location.replace('/')
+          }
         });
       }
     }
diff --git a/client/src/pages/login.vue b/client/src/pages/login.vue
index f9fb8dbd..149ceb32 100644
--- a/client/src/pages/login.vue
+++ b/client/src/pages/login.vue
@@ -1,20 +1,22 @@
 <template>
   <div class="login public-page">
     <header class="info-header">
-      <p class="info-header__text small-emph">Super wir haben für <span class="info-header__emph">{{helloEmail.email}}</span> ein Hep Konto gefunden</p>
+      <p class="info-header__text small-emph">Super wir haben für <span
+        class="info-header__emph">{{helloEmail.email}}</span> ein Hep Konto gefunden</p>
       <h1 class="login__title public-page__title" data-cy="login-title">Bitte geben Sie das passende Passwort ein</h1>
     </header>
     <form class="login__form login-form" novalidate @submit.prevent="validateBeforeSubmit">
       <div class="change-form__field skillboxform-input">
-        <label for="pw" class="skillboxform-input__label">Passwort</label>
+        <label
+          for="password"
+          class="skillboxform-input__label">Passwort</label>
         <input
-          id="pw"
-          name="password"
-          type="password"
-          data-vv-as="Passwort"
           v-model="password"
           v-validate="'required'"
           :class="{ 'skillboxform-input__input--error': errors.has('password') }"
+          name="password"
+          type="password"
+          data-vv-as="Passwort"
           class="change-form__new skillbox-input skillboxform-input__input"
           autocomplete="off"
           data-cy="password-input"
@@ -29,7 +31,8 @@
       </div>
       <div class="actions">
         <button class="button button--primary button--big actions__submit" data-cy="login-button">Anmelden</button>
-        <router-link class="button button--big actions__submit back-button" :to="{name: 'hello'}">Abbrechen</router-link>
+        <router-link class="button button--big actions__submit back-button" :to="{name: 'hello'}">Abbrechen
+        </router-link>
         <router-link class="actions__reset text-link" :to="{name: 'forgotPassword'}">Passwort vergessen?</router-link>
       </div>
     </form>
@@ -38,135 +41,137 @@
 
 <script>
 
-import HELLO_EMAIL from '@/graphql/gql/local/helloEmail.gql';
-import LOGIN_MUTATION from '@/graphql/gql/mutations/login.gql';
-import {login} from '@/hep-client/index';
+  import HELLO_EMAIL from '@/graphql/gql/local/helloEmail.gql';
+  import LOGIN_MUTATION from '@/graphql/gql/mutations/login.gql';
+  import {login} from '@/hep-client/index';
 
-export default {
-  components: {},
+  export default {
+    components: {},
 
-  methods: {
-    validateBeforeSubmit() {
-      this.$validator.validate().then(result => {
-        this.submitted = true;
-        if (result) {
-          login(this.helloEmail.email, this.password)
-            .then((response) => {
-              if (response.status === 200) {
-                this.mySkillboxLogin(response.data);
-              } else {
-                this.passwordErrors = ['Es ist ein Fehler aufgetreten. Bitte versuchen Sie nochmals.'];
+    data() {
+      return {
+        password: '',
+        passwordErrors: [],
+        submitted: false
+      };
+    },
+
+    methods: {
+      validateBeforeSubmit() {
+        this.$validator.validate().then(result => {
+          this.submitted = true;
+          if (result) {
+            login(this.helloEmail.email, this.password)
+              .then((response) => {
+                if (response.status === 200) {
+                  this.mySkillboxLogin(response.data);
+                } else {
+                  this.passwordErrors = ['Es ist ein Fehler aufgetreten. Bitte versuchen Sie nochmals.'];
+                }
+              })
+              .catch((error) => {
+                if (error.response.data.message && error.response.data.message === 'Sie haben sich nicht korrekt eingeloggt oder Ihr Konto ist vor\u00fcbergehend deaktiviert.') {
+                  this.passwordErrors = ['Sie haben sich nicht korrekt eingeloggt oder Ihr Konto ist vorübergehend deaktiviert.'];
+                } else {
+                  this.passwordErrors = ['Es ist ein Fehler aufgetreten. Bitte versuchen Sie nochmals.'];
+                }
+              });
+          }
+        });
+      },
+      mySkillboxLogin(token) {
+        const that = this;
+        this.$apollo.mutate({
+          client: 'publicClient',
+          mutation: LOGIN_MUTATION,
+          variables: {
+            input: {
+              tokenInput: token
+            }
+          },
+          update(
+            store,
+            {
+              data: {
+                login
               }
-            })
-          .catch((error) => {
-            if (error.response.data.message && error.response.data.message === 'Sie haben sich nicht korrekt eingeloggt oder Ihr Konto ist vor\u00fcbergehend deaktiviert.') {
-              this.passwordErrors = ['Sie haben sich nicht korrekt eingeloggt oder Ihr Konto ist vorübergehend deaktiviert.'];
-            } else {
-              this.passwordErrors = ['Es ist ein Fehler aufgetreten. Bitte versuchen Sie nochmals.'];
+            }
+          ) {
+            try {
+              if (login.success) {
+                if (login.message === 'no_valid_license') {
+                  that.$router.push({name: 'licenseActivation'})
+                } else {
+                  const redirectUrl = that.$route.query.redirect ? that.$route.query.redirect : '/';
+                  that.$router.push(redirectUrl);
+                }
+              }
+            } catch (e) {
+              that.passwordErrors = ['Es ist ein Fehler aufgetreten. Bitte versuchen Sie nochmals.'];
+            }
+          }
+        })
+          .catch(errors => {
+            const firstError = errors.graphQLErrors[0];
+            switch (firstError.message) {
+              case 'invalid_credentials':
+                that.passwordErrors = ['Die E-Mail oder das Passwort ist falsch. Bitte versuchen Sie nochmals.'];
+                break;
+              case 'email_not_verified':
+                that.passwordErrors = ['Bitte verifiziere zuerst deine E-Mail.'];
+                break;
+              case 'no_valid_license':
+                this.$router.push({name: 'licenseActivation'})
+                break;
             }
           });
-        }
-      });
+      },
+      resetForm() {
+        this.password = '';
+        this.submitted = false;
+        this.$validator.reset();
+      },
     },
-    mySkillboxLogin(token) {
-      const that = this;
-      this.$apollo.mutate({
-        client: 'publicClient',
-        mutation: LOGIN_MUTATION,
-        variables: {
-          input: {
-            tokenInput: token
-          }
-        },
-        update(
-          store,
-          {
-            data: {
-              login
-            }
-          }
-        ) {
-          try {
-            if (login.success) {
-              if (login.message === 'no_valid_license') {
-                that.$router.push({name: 'licenseActivation'})
-              } else {
-                const redirectUrl = that.$route.query.redirect ? that.$route.query.redirect : '/';
-                that.$router.push(redirectUrl);
-              }
-            }
-          } catch (e) {
-            that.passwordErrors = ['Es ist ein Fehler aufgetreten. Bitte versuchen Sie nochmals.'];
-          }
-        }
-      })
-      .catch(errors => {
-        const firstError = errors.graphQLErrors[0];
-        switch (firstError.message) {
-          case 'invalid_credentials':
-            that.passwordErrors = ['Die E-Mail oder das Passwort ist falsch. Bitte versuchen Sie nochmals.'];
-            break;
-          case 'email_not_verified':
-            that.passwordErrors = ['Bitte verifiziere zuerst deine E-Mail.'];
-            break;
-          case 'no_valid_license':
-            this.$router.push({name: 'licenseActivation'})
-            break;
-        }
-      });
-    },
-    resetForm() {
-      this.password = '';
-      this.submitted = false;
-      this.$validator.reset();
-    },
-  },
 
-  data() {
-    return {
-      password: '',
-      passwordErrors: [],
-      submitted: false
-    };
-  },
-
-  apollo: {
-    helloEmail: {
-      query: HELLO_EMAIL,
-      result({data: {helloEmail}}) {
-        if (helloEmail.email === '') {
-          this.$router.push({name: 'hello'});
+    apollo: {
+      helloEmail: {
+        query: HELLO_EMAIL,
+        result({data: {helloEmail}}) {
+          if (helloEmail.email === '') {
+            this.$router.push({name: 'hello'});
+          }
         }
-      }
+      },
     },
-  },
-};
+
+  };
 </script>
 
 <style scoped lang="scss">
-@import "@/styles/_variables.scss";
-@import "@/styles/_mixins.scss";
+  @import "@/styles/_variables.scss";
+  @import "@/styles/_mixins.scss";
 
-.text-link {
-  font-family: $sans-serif-font-family;
-  color: $color-brand;
-}
-
-.actions {
-  display: flex;
-  &__reset {
-    display: inline-block;
-    margin-left: auto;
-    line-height: 19px;;
-    display: inline-block;
-    padding: $small-spacing;
+  .text-link {
+    font-family: $sans-serif-font-family;
+    color: $color-brand;
   }
-}
 
-.back-button {
-  font-size: 1rem;
-  line-height: normal;
-  margin-left: $medium-spacing;
-}
+  .actions {
+    display: flex;
+
+    &__reset {
+      display: inline-block;
+      margin-left: auto;
+      line-height: 19px;;
+      display: inline-block;
+      padding: $small-spacing;
+    }
+  }
+
+  .back-button {
+    font-size: 1rem;
+    line-height: normal;
+    margin-left: $medium-spacing;
+  }
 
 </style>
diff --git a/client/src/pages/module-base.vue b/client/src/pages/module-base.vue
index faf0777a..bdbe5966 100644
--- a/client/src/pages/module-base.vue
+++ b/client/src/pages/module-base.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="module-page">
-    <module-navigation></module-navigation>
-    <router-view></router-view>
+    <module-navigation/>
+    <router-view/>
   </div>
 </template>
 
diff --git a/client/src/pages/module.vue b/client/src/pages/module.vue
index 2c30be23..a7c98cbe 100644
--- a/client/src/pages/module.vue
+++ b/client/src/pages/module.vue
@@ -1,5 +1,8 @@
 <template>
-  <module :module="module" v-if="module.id" :edit="editModule"></module>
+  <module
+    :module="module"
+    :edit="editModule"
+    v-if="module.id"/>
 </template>
 
 <script>
@@ -17,34 +20,10 @@
       Module
     },
 
-    methods: {
-      ...mapActions(['scrollToAssignmentReady', 'scrollingToAssignment']),
-      scrollTo() {
-        if (this.scrollPosition && this.scrollPosition.scrollTo) {
-          let options = {
-            container: 'body',
-            easing: 'ease',
-            offset: -60,
-            onStart: (element) => {
-            },
-            onDone: (element) => {
-            },
-            onCancel: function () {
-              // scrolling has been interrupted
-            },
-            x: false,
-            y: true
-          };
-          setTimeout(() => {
-            this.$scrollTo(`[data-scrollto="${this.scrollPosition.scrollTo}"]`, 1000, options);
-            this.$apollo.mutate({
-              mutation: SCROLL_TO_MUTATION,
-              variables: {
-                scrollTo: ''
-              }
-            })
-          }, 250); // unfortunately this timeout is needed as it is hard to tell when everything is rendered
-        }
+    data() {
+      return {
+        module: {},
+        assignments: []
       }
     },
 
@@ -80,10 +59,34 @@
       },
     },
 
-    data() {
-      return {
-        module: {},
-        assignments: []
+    methods: {
+      ...mapActions(['scrollToAssignmentReady', 'scrollingToAssignment']),
+      scrollTo() {
+        if (this.scrollPosition && this.scrollPosition.scrollTo) {
+          let options = {
+            container: 'body',
+            easing: 'ease',
+            offset: -60,
+            onStart: (element) => {
+            },
+            onDone: (element) => {
+            },
+            onCancel: function () {
+              // scrolling has been interrupted
+            },
+            x: false,
+            y: true
+          };
+          setTimeout(() => {
+            this.$scrollTo(`[data-scrollto="${this.scrollPosition.scrollTo}"]`, 1000, options);
+            this.$apollo.mutate({
+              mutation: SCROLL_TO_MUTATION,
+              variables: {
+                scrollTo: ''
+              }
+            })
+          }, 250); // unfortunately this timeout is needed as it is hard to tell when everything is rendered
+        }
       }
     },
   }
diff --git a/client/src/pages/moduleRoom.vue b/client/src/pages/moduleRoom.vue
index 3cf533b2..5194b4ab 100644
--- a/client/src/pages/moduleRoom.vue
+++ b/client/src/pages/moduleRoom.vue
@@ -1,23 +1,28 @@
 <template>
   <div class="room">
     <div class="room__header">
-      <h1 class="room__title">{{room.title}}</h1>
+      <h1 class="room__title">{{ room.title }}</h1>
       <p class="room__intro">
-        {{room.description}}
+        {{ room.description }}
       </p>
       <div class="room__meta">
-        <room-group-widget v-bind="room.schoolClass"></room-group-widget>
-        <entry-count-widget :entry-count="roomEntryCount"></entry-count-widget>
+        <room-group-widget v-bind="room.schoolClass"/>
+        <entry-count-widget :entry-count="roomEntryCount"/>
       </div>
     </div>
     <div class="room__content">
-      <add-room-entry-button :parent="room" v-if="room.id">
+      <add-room-entry-button
+        :parent="room"
+        v-if="room.id">
         <!--
         the v-if is there for the case where the room hasn't loaded yet, but there is already an attempt to create
         a new room entry. mainly happens during cypress testing, but could also happen on a very slow connection
         -->
       </add-room-entry-button>
-      <room-entry v-for="entry in room.roomEntries" v-bind="entry" :key="entry.id"></room-entry>
+      <room-entry
+        v-bind="entry"
+        :key="entry.id"
+        v-for="entry in room.roomEntries"/>
     </div>
   </div>
 </template>
diff --git a/client/src/pages/myClass.vue b/client/src/pages/myClass.vue
index 41265b6e..d2865d52 100644
--- a/client/src/pages/myClass.vue
+++ b/client/src/pages/myClass.vue
@@ -1,19 +1,22 @@
 <template>
   <div class="my-class">
-    <h1 class="my-class__header" data-cy="class-list-title">Klassenliste</h1>
-    <router-link class="my-class__code-link button button--primary"
-                 v-if="me.isTeacher"
-                 :to="{name: 'show-code'}">Zugangscode anzeigen
+    <h1
+      class="my-class__header"
+      data-cy="class-list-title">Klassenliste</h1>
+    <router-link
+      :to="{name: 'show-code'}"
+      class="my-class__code-link button button--primary"
+      v-if="me.isTeacher">Zugangscode anzeigen
     </router-link>
     <class-list
-      class="my-class__class"
       :name="me.selectedClass.name"
       :members="me.selectedClass.members"
       :teacher="me.isTeacher"
       :id="me.selectedClass.id"
+      class="my-class__class"
       @remove="remove"
       @add="add"
-    ></class-list>
+    />
   </div>
 </template>
 
diff --git a/client/src/pages/newProject.vue b/client/src/pages/newProject.vue
index 7b8a9e16..6e7d00fe 100644
--- a/client/src/pages/newProject.vue
+++ b/client/src/pages/newProject.vue
@@ -1,8 +1,8 @@
 <template>
   <project-form
-    @save="saveProject"
     :project="project"
-  ></project-form>
+    @save="saveProject"
+  />
 </template>
 
 <script>
diff --git a/client/src/pages/newRoom.vue b/client/src/pages/newRoom.vue
index 410feda5..88948694 100644
--- a/client/src/pages/newRoom.vue
+++ b/client/src/pages/newRoom.vue
@@ -2,7 +2,7 @@
   <room-form
     :room="room"
     @save="addRoom"
-  ></room-form>
+  />
 </template>
 
 <script>
diff --git a/client/src/pages/oldClasses.vue b/client/src/pages/oldClasses.vue
index 9235c052..1296406f 100644
--- a/client/src/pages/oldClasses.vue
+++ b/client/src/pages/oldClasses.vue
@@ -2,9 +2,14 @@
   <div class="old-classes">
     <h1 class="old-classes__title">Alte Klassen</h1>
     <ul class="old-classes__list simple-list">
-      <li class="simple-list__item" v-for="schoolClass in me.oldClasses" :key="schoolClass.id" data-cy="old-class-item"><span
-        class="old-classes__class-name">{{schoolClass.name}}</span> <a
-        class="simple-list__action" @click="updateSelectedClassAndGoToClassList(schoolClass)">Anzeigen</a>
+      <li
+        :key="schoolClass.id"
+        class="simple-list__item"
+        data-cy="old-class-item"
+        v-for="schoolClass in me.oldClasses"><span
+          class="old-classes__class-name">{{ schoolClass.name }}</span> <a
+            class="simple-list__action"
+            @click="updateSelectedClassAndGoToClassList(schoolClass)">Anzeigen</a>
       </li>
     </ul>
   </div>
@@ -18,6 +23,12 @@
   export default {
     mixins: [updateSelectedClassMixin],
 
+    data: () => ({
+      me: {
+        oldClasses: []
+      }
+    }),
+
     methods: {
       updateSelectedClassAndGoToClassList(selectedClass) {
         this.updateSelectedClass(selectedClass).then(() => {
@@ -35,12 +46,6 @@
         }
       }
     },
-
-    data: () => ({
-      me: {
-        oldClasses: []
-      }
-    })
   }
 </script>
 
diff --git a/client/src/pages/portfolio.vue b/client/src/pages/portfolio.vue
index 8b796d3f..9ab8ec65 100644
--- a/client/src/pages/portfolio.vue
+++ b/client/src/pages/portfolio.vue
@@ -1,15 +1,15 @@
 <template>
   <div class="portfolio__page">
     <div class="portfolio">
-      <add-project class="portfolio__add-project"></add-project>
+      <add-project class="portfolio__add-project"/>
 
       <project-widget
-        v-for="project in projects"
         v-bind="project"
-        :userId="userId"
+        :user-id="userId"
         :key="project.id"
         class="portfolio__project"
-      ></project-widget>
+        v-for="project in projects"
+      />
     </div>
   </div>
 </template>
diff --git a/client/src/pages/profile.vue b/client/src/pages/profile.vue
index 0bcf16a2..0cafec58 100644
--- a/client/src/pages/profile.vue
+++ b/client/src/pages/profile.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="profile">
-    <router-view></router-view>
+    <router-view/>
   </div>
 </template>
 
diff --git a/client/src/pages/project.vue b/client/src/pages/project.vue
index 03b960c2..f77036bc 100644
--- a/client/src/pages/project.vue
+++ b/client/src/pages/project.vue
@@ -1,27 +1,38 @@
 <template>
-  <div class="project" :class="specialContainerClass">
+  <div
+    :class="specialContainerClass"
+    class="project">
     <div class="project__header">
-      <h1 class="project__title">{{project.title}}</h1>
+      <h1 class="project__title">{{ project.title }}</h1>
       <p class="project__description">
-        {{project.description}}
+        {{ project.description }}
       </p>
 
       <h2 class="project__objectives-title">Ziele</h2>
       <ul class="project__objectives">
-        <li class="project__objective" :key="index" v-for="(objective, index) in objectives">{{objective}}</li>
+        <li
+          :key="index"
+          class="project__objective"
+          v-for="(objective, index) in objectives">{{ objective }}</li>
       </ul>
 
       <div class="project__meta">
-        <project-actions :id="this.project.id"></project-actions>
-        <owner-widget :owner="this.project.student"></owner-widget>
-        <entry-count-widget :entry-count="projectEntryCount"></entry-count-widget>
+        <project-actions :id="this.project.id"/>
+        <owner-widget :owner="this.project.student"/>
+        <entry-count-widget :entry-count="projectEntryCount"/>
       </div>
 
     </div>
     <div class="project__content">
-      <add-project-entry v-if="isOwner" class="project__add-entry" data-cy="add-project-entry"
-                         :project="project.id"></add-project-entry>
-      <project-entry v-bind="entry" v-for="(entry, index) in project.entries" :key="index"></project-entry>
+      <add-project-entry
+        :project="project.id"
+        class="project__add-entry"
+        data-cy="add-project-entry"
+        v-if="isOwner"/>
+      <project-entry
+        v-bind="entry"
+        :key="index"
+        v-for="(entry, index) in project.entries"/>
     </div>
   </div>
 </template>
@@ -47,6 +58,19 @@
       OwnerWidget
     },
 
+    data() {
+      return {
+        project: {
+          student: {
+            id: ' '
+          }
+        },
+        me: {
+          id: ''
+        }
+      }
+    },
+
     computed: {
       objectives() {
         return this.project.objectives ? this.project.objectives.split('\n') : [];
@@ -83,19 +107,6 @@
       }
     },
 
-    data() {
-      return {
-        project: {
-          student: {
-            id: ' '
-          }
-        },
-        me: {
-          id: ''
-        }
-      }
-    },
-
     created() {
     },
 
diff --git a/client/src/pages/room.vue b/client/src/pages/room.vue
index b138e680..ca01c34b 100644
--- a/client/src/pages/room.vue
+++ b/client/src/pages/room.vue
@@ -1,24 +1,29 @@
 <template>
   <div class="room">
     <div class="room__header">
-      <h1 class="room__title">{{room.title}}</h1>
+      <h1 class="room__title">{{ room.title }}</h1>
       <p class="room__intro">
-        {{room.description}}
+        {{ room.description }}
       </p>
       <div class="room__meta">
-        <room-actions :id="this.room.id"></room-actions>
-        <room-group-widget v-bind="room.schoolClass"></room-group-widget>
-        <entry-count-widget :entry-count="roomEntryCount"></entry-count-widget>
+        <room-actions :id="this.room.id"/>
+        <room-group-widget v-bind="room.schoolClass"/>
+        <entry-count-widget :entry-count="roomEntryCount"/>
       </div>
     </div>
     <div class="room__content">
-      <add-room-entry-button :parent="room" v-if="room.id">
+      <add-room-entry-button
+        :parent="room"
+        v-if="room.id">
         <!--
         the v-if is there for the case where the room hasn't loaded yet, but there is already an attempt to create
         a new room entry. mainly happens during cypress testing, but could also happen on a very slow connection
         -->
       </add-room-entry-button>
-      <room-entry v-for="entry in room.roomEntries" v-bind="entry" :key="entry.id"></room-entry>
+      <room-entry
+        v-bind="entry"
+        :key="entry.id"
+        v-for="entry in room.roomEntries"/>
     </div>
   </div>
 </template>
diff --git a/client/src/pages/rooms.vue b/client/src/pages/rooms.vue
index 61479564..dc7b6ce7 100644
--- a/client/src/pages/rooms.vue
+++ b/client/src/pages/rooms.vue
@@ -1,7 +1,13 @@
 <template>
   <div class="rooms-page">
-    <room-widget v-for="room in filteredRooms" v-bind="room" :key="room.name"></room-widget>
-    <add-room class="rooms-page__add-room" v-if="canAddRoom" data-cy="add-room"></add-room>
+    <room-widget
+      v-bind="room"
+      :key="room.name"
+      v-for="room in filteredRooms"/>
+    <add-room
+      class="rooms-page__add-room"
+      data-cy="add-room"
+      v-if="canAddRoom"/>
   </div>
 </template>
 
@@ -18,6 +24,18 @@
       AddRoom
     },
 
+    data() {
+      return {
+        rooms: [],
+        me: {
+          selectedClass: {
+            id: ''
+          },
+          permissions: []
+        }
+      }
+    },
+
     computed: {
       filteredRooms() {
         return this.rooms.filter(room => this.visibleFor(room, this.currentFilter));
@@ -48,18 +66,6 @@
         query: ME_QUERY,
       },
     },
-
-    data() {
-      return {
-        rooms: [],
-        me: {
-          selectedClass: {
-            id: ''
-          },
-          permissions: []
-        }
-      }
-    }
   }
 </script>
 
diff --git a/client/src/pages/showCode.vue b/client/src/pages/showCode.vue
index 907d0742..13654979 100644
--- a/client/src/pages/showCode.vue
+++ b/client/src/pages/showCode.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="show-code">
-    <h2 class="show-code__title">Zugangscode Klasse {{me.selectedClass.name}}</h2>
-    <h1 class="show-code__code">{{me.selectedClass.code}}</h1>
+    <h2 class="show-code__title">Zugangscode Klasse {{ me.selectedClass.name }}</h2>
+    <h1 class="show-code__code">{{ me.selectedClass.code }}</h1>
   </div>
 </template>
 
diff --git a/client/src/pages/start.vue b/client/src/pages/start.vue
index 3f00ccf9..5d02ac50 100644
--- a/client/src/pages/start.vue
+++ b/client/src/pages/start.vue
@@ -1,20 +1,20 @@
 <template>
   <div class="start-page">
-    <header-bar class="start-page__header"></header-bar>
+    <header-bar class="start-page__header"/>
 
-    <mobile-header class="start-page__header start-page__header--mobile"></mobile-header>
+    <mobile-header class="start-page__header start-page__header--mobile"/>
 
     <div class="start-page__sections start-sections">
 
       <section-block
+        :link-text="moduleText"
+        :route="moduleRoute"
         class="start-sections__section"
         title="Inhalte"
         subtitle="Neues Wissen erwerben"
         data-cy="current-module-link"
-        :link-text="moduleText"
-        :route="moduleRoute"
       >
-        <contents-illustration></contents-illustration>
+        <contents-illustration/>
       </section-block>
       <section-block
         class="start-sections__section"
@@ -24,7 +24,7 @@
         link-text="Alle Räume anzeigen"
         route="/rooms"
       >
-        <rooms-illustration></rooms-illustration>
+        <rooms-illustration/>
       </section-block>
       <section-block
         class="start-sections__section"
@@ -33,19 +33,25 @@
         link-text="Portfolio anzeigen"
         route="/portfolio"
       >
-        <portfolio-illustration></portfolio-illustration>
+        <portfolio-illustration/>
       </section-block>
     </div>
     <div class="start-page__news news">
       <h2 class="news__title">News</h2>
-      <news-teaser date="11. März 2020" title="Brexit"
-                   url="https://myskillbox-abu-news.webflow.io/brexit"></news-teaser>
-      <news-teaser date="20. Dezember 2019" title="Blockchain"
-                   url="https://myskillbox-abu-news.webflow.io/blockchain"></news-teaser>
-      <news-teaser date="9. September 2019" title="Klima – was sonst?"
-                   url="https://myskillbox-abu-news.webflow.io/klima"></news-teaser>
+      <news-teaser
+        date="11. März 2020"
+        title="Brexit"
+        url="https://myskillbox-abu-news.webflow.io/brexit"/>
+      <news-teaser
+        date="20. Dezember 2019"
+        title="Blockchain"
+        url="https://myskillbox-abu-news.webflow.io/blockchain"/>
+      <news-teaser
+        date="9. September 2019"
+        title="Klima – was sonst?"
+        url="https://myskillbox-abu-news.webflow.io/klima"/>
       <!--<news-teaser date="31. Oktober 2018" title="Sommerzeit - Festivalzeit"-->
-                   <!--url="https://abunews.webflow.io/"></news-teaser>-->
+      <!--url="https://abunews.webflow.io/"></news-teaser>-->
       <div class="news__more">Mehr...</div>
     </div>
   </div>
@@ -73,6 +79,12 @@
       RoomsIllustration
     },
 
+    data() {
+      return {
+        me: {}
+      }
+    },
+
     computed: {
       moduleRoute() {
         if (this.me.lastModule && this.me.lastModule.slug) {
@@ -91,12 +103,6 @@
     apollo: {
       me: meQuery
     },
-
-    data() {
-      return {
-        me: {}
-      }
-    }
   }
 </script>
 
diff --git a/client/src/pages/studentSubmission.vue b/client/src/pages/studentSubmission.vue
index c1b2c358..1aece1c8 100644
--- a/client/src/pages/studentSubmission.vue
+++ b/client/src/pages/studentSubmission.vue
@@ -2,35 +2,42 @@
   <div class="submission-page">
     <div class="submission-page__header submission-header">
       <h2>Aufgabe</h2>
-      <p>{{studentSubmission.assignment.assignment}}</p>
+      <p>{{ studentSubmission.assignment.assignment }}</p>
     </div>
     <div class="submission-page__content submission-content">
-      <h2>Ergebnis von {{fullName}}</h2>
-      <p v-html="text"></p>
-      <p v-if="studentSubmission.document && studentSubmission.document.length > 0"
-         class="article-content__document">
-        <a :href="studentSubmission.document" class="entry-document__link link" target="_blank">
-          <student-submission-document :document="studentSubmission.document"></student-submission-document>
+      <h2>Ergebnis von {{ fullName }}</h2>
+      <p v-html="text"/>
+      <p
+        class="article-content__document"
+        v-if="studentSubmission.document && studentSubmission.document.length > 0">
+        <a
+          :href="studentSubmission.document"
+          class="entry-document__link link"
+          target="_blank">
+          <student-submission-document :document="studentSubmission.document"/>
         </a>
       </p>
     </div>
     <div class="submission-page__feedback feedback">
       <submission-form
+        :user-input="feedback"
+        :saved="!unsaved"
+        placeholder="Feedback erfassen"
+        action="Feedback teilen"
+        shared-msg="Dieses Feedback wurde geteilt."
         v-if="studentSubmission"
         @turnIn="turnIn"
         @saveInput="saveInput"
         @reopen="reopen"
-        :user-input="feedback"
-        placholder="Feedback erfassen"
-        action="Feedback teilen"
-        shared-msg="Dieses Feedback wurde geteilt."
-        :saved="!unsaved"
       >
-        <div v-if="!final" class="feedback-submission__emojis emojis">
-            <span v-for="(emoji, index) in emojis"
-                  :key="index"
-                  @click="addEmoji(emoji)"
-                  class="emojis__emoji">{{emoji}}</span>
+        <div
+          class="feedback-submission__emojis emojis"
+          v-if="!final">
+          <span
+            :key="index"
+            class="emojis__emoji"
+            v-for="(emoji, index) in emojis"
+            @click="addEmoji(emoji)">{{ emoji }}</span>
         </div>
       </submission-form>
     </div>
@@ -53,6 +60,29 @@
       SubmissionForm
     },
 
+    data() {
+      return {
+        studentSubmission: {
+          assignment: {
+            title: ''
+          },
+          student: {
+            firstName: '',
+            lastName: ''
+          },
+          text: '',
+          document: '',
+          submissionFeedback: {
+            text: '',
+            final: false
+          }
+        },
+        unsaved: false,
+        saving: 0,
+        emojis: ['👍', '👎', '🙂', '😐', '😕', '🙁', '😮', '😉', '🙄', '❕', '❔', '🧐', '🤩', '🤗', '🤬', '🤢']
+      }
+    },
+
     computed: {
       final() {
         return !!this.studentSubmission && this.studentSubmission.final;
@@ -181,29 +211,6 @@
         })
       }
     },
-
-    data() {
-      return {
-        studentSubmission: {
-          assignment: {
-            title: ''
-          },
-          student: {
-            firstName: '',
-            lastName: ''
-          },
-          text: '',
-          document: '',
-          submissionFeedback: {
-            text: '',
-            final: false
-          }
-        },
-        unsaved: false,
-        saving: 0,
-        emojis: ['👍', '👎', '🙂', '😐', '😕', '🙁', '😮', '😉', '🙄', '❕', '❔', '🧐', '🤩', '🤗', '🤬', '🤢']
-      }
-    }
   }
 </script>
 
diff --git a/client/src/pages/styleguide.vue b/client/src/pages/styleguide.vue
index cdef142f..8764645b 100644
--- a/client/src/pages/styleguide.vue
+++ b/client/src/pages/styleguide.vue
@@ -10,7 +10,7 @@
     <p class="style-guide__small-text">Text Small -  16px Regular - 400</p>
     <h2 class="style-guide__meta-title">Meta Title - 42px Book</h2>
     <p class="style-guide__lead-paragraph">Lead paragraph - 26px<br>
-Vor wenigen Monaten haben Sie Ihren ersten Lohn bekommen – ein befriedigendes Gefühl, für seine Arbeit Geld zu erhalten.</p>
+      Vor wenigen Monaten haben Sie Ihren ersten Lohn bekommen – ein befriedigendes Gefühl, für seine Arbeit Geld zu erhalten.</p>
   </div>
 </template>
 
diff --git a/client/src/pages/submissions.vue b/client/src/pages/submissions.vue
index 0652b23a..4593bf28 100644
--- a/client/src/pages/submissions.vue
+++ b/client/src/pages/submissions.vue
@@ -1,9 +1,10 @@
 <template>
   <div class="submissions-page">
     <h2 class="submissions-page__heading">Aufgabe</h2>
-    <assignment-with-submissions v-if="!$apollo.queries.assignment.loading"
-                                 :assignment="assignment"
-                                 @back="back"></assignment-with-submissions>
+    <assignment-with-submissions
+      :assignment="assignment"
+      v-if="!$apollo.queries.assignment.loading"
+      @back="back"/>
   </div>
 
 </template>
@@ -33,19 +34,19 @@
       },
     },
 
-    methods: {
-      back() {
-        this.$router.go(-1);
-      }
-    },
-
     data() {
       return {
         assignment: {
           submissions: []
         }
       }
-    }
+    },
+
+    methods: {
+      back() {
+        this.$router.go(-1);
+      }
+    },
   }
 </script>
 
diff --git a/client/src/pages/survey.vue b/client/src/pages/survey.vue
index a02d8590..91028b5f 100644
--- a/client/src/pages/survey.vue
+++ b/client/src/pages/survey.vue
@@ -1,11 +1,15 @@
 <template>
   <div class="survey-page">
-    <h1 class="survey-page__title">{{title}}</h1>
-    <survey :survey='survey'></survey>
+    <h1 class="survey-page__title">{{ title }}</h1>
+    <survey :survey='survey'/>
 
-    <solution :value="solution" v-if="showSolution"></solution>
+    <solution
+      :value="solution"
+      v-if="showSolution"/>
     <div v-if="surveyComplete">
-      <a class="button button--primary" @click="reopen">Übung bearbeiten</a>
+      <a
+        class="button button--primary"
+        @click="reopen">Übung bearbeiten</a>
     </div>
   </div>
 </template>
diff --git a/client/src/pages/topic.vue b/client/src/pages/topic.vue
index 0aeace11..a1aae218 100644
--- a/client/src/pages/topic.vue
+++ b/client/src/pages/topic.vue
@@ -1,22 +1,32 @@
 <template>
   <div class="topic">
-    <h1 class="topic__title">{{topic.title}}</h1>
+    <h1 class="topic__title">{{ topic.title }}</h1>
     <p class="topic__teaser">
-      {{topic.teaser}}
+      {{ topic.teaser }}
     </p>
     <div class="topic__links">
-      <div v-if="topic.vimeoId" class="topic__video-link topic__link" @click="openVideo">
-        <play-icon class="topic__video-link-icon topic__link-icon"></play-icon>
+      <div
+        class="topic__video-link topic__link"
+        v-if="topic.vimeoId"
+        @click="openVideo">
+        <play-icon class="topic__video-link-icon topic__link-icon"/>
         <span class="topic__link-description">Video schauen</span>
       </div>
-      <a target="_blank" :href="topic.instructions" v-if="me.isTeacher && topic.instructions" class="topic__instruction-link topic__link">
-        <bulb-icon class="topic__instruction-icon topic__link-icon"></bulb-icon>
+      <a
+        :href="topic.instructions"
+        target="_blank"
+        class="topic__instruction-link topic__link"
+        v-if="me.isTeacher && topic.instructions">
+        <bulb-icon class="topic__instruction-icon topic__link-icon"/>
         <span class="topic__link-description">Anweisungen zum Thema anzeigen</span>
       </a>
 
     </div>
     <div class="topic__modules">
-      <module-teaser v-for="module in modules" :key="module.id" v-bind="module"></module-teaser>
+      <module-teaser
+        :key="module.id"
+        v-bind="module"
+        v-for="module in modules"/>
     </div>
   </div>
 </template>
@@ -29,14 +39,14 @@
   import me from '@/mixins/me';
 
   export default {
+
+    mixins: [me],
     components: {
       ModuleTeaser,
       PlayIcon,
       BulbIcon
     },
 
-    mixins: [me],
-
     apollo: {
       topic() {
         return {
@@ -51,6 +61,16 @@
       }
     },
 
+    data() {
+      return {
+        topic: {
+          modules: {
+            edges: []
+          }
+        }
+      }
+    },
+
     computed: {
       modules() {
         return this.topic.modules;
@@ -62,16 +82,6 @@
         this.$store.dispatch('showFullscreenVideo', this.topic.vimeoId);
       }
     },
-
-    data() {
-      return {
-        topic: {
-          modules: {
-            edges: []
-          }
-        }
-      }
-    }
   }
 </script>