diff --git a/.github/workflows/cleanup-registry.yml b/.github/workflows/cleanup-registry.yml
index da476d12a..32b82f8df 100644
--- a/.github/workflows/cleanup-registry.yml
+++ b/.github/workflows/cleanup-registry.yml
@@ -5,20 +5,14 @@ on:
     - cron: '0 0 * * 1' # https://crontab.guru/#0_0_*_*_1
   workflow_dispatch:
 
-env:
-  IMAGE_NAMES: amber-ui
-
 jobs:
   cleanup:
     name: Cleanup
     runs-on: ubuntu-latest
     steps:
-      - name: Delete old versions
-        uses: snok/container-retention-policy@f617f1ca161a52bce48417eedd76924e71d0b4d9 # v2.1.0
+      - name: Delete untagged images
+        uses: actions/delete-package-versions@0d39a63126868f5eefaa47169615edd3c0f61e20 # v4.1.1
         with:
-          image-names: ${{ env.IMAGE_NAMES }}
-          cut-off: 2 days ago UTC
-          account-type: org
-          org-name: ${{ github.repository_owner }}
-          skip-tags: latest,staging
-          token: ${{ secrets.GH_PAT }}
+          package-name: ${{ github.event.repository.name }}
+          package-type: container
+          delete-only-untagged-versions: true
diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml
index bb0653006..97682581a 100644
--- a/.github/workflows/continuous-delivery.yml
+++ b/.github/workflows/continuous-delivery.yml
@@ -41,7 +41,7 @@ jobs:
       stage: ${{ steps.get_metadata.outputs.stage }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Get metadata
         id: get_metadata
@@ -85,8 +85,8 @@ jobs:
           fi
 
       - name: Checkout code
-        if: fromJSON(needs.metadata.outputs.has_diff) || github.event.inputs.ignore_metadata_diff
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        if: fromJSON(needs.metadata.outputs.has_diff)
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Run merge
         if: fromJSON(needs.metadata.outputs.has_diff) || github.event.inputs.ignore_metadata_diff
@@ -111,6 +111,8 @@ jobs:
     uses: csvalpha/amber-ui/.github/workflows/continuous-integration.yml@staging
     with:
       sha: ${{ needs.merge.outputs.sha }}
+    secrets:
+      codecov_token: ${{ secrets.CODECOV_TOKEN }}
 
   publish_image:
     name: Publish Image
@@ -141,7 +143,7 @@ jobs:
           fi
 
       - name: Checkout code
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ needs.merge.outputs.sha }}
 
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 71a22b9a7..e58335c31 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -11,6 +11,10 @@ on:
         description: The commit SHA to run the workflow on
         required: false
         type: string
+    secrets:
+      codecov_token:
+        description: Codecov token
+        required: true
 
 jobs:
   build:
@@ -18,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.sha }}
 
@@ -35,7 +39,7 @@ jobs:
     needs: build
     steps:
       - name: Checkout code
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.sha }}
 
@@ -70,6 +74,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
+      - name: Checkout code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          ref: ${{ inputs.sha }}
+
       - name: Load test image
         uses: guidojw/actions/load-docker-image@abb0ee8d1336edf73383f2e5a09abd3a22f25b13 # v1.3.3
         with:
@@ -77,4 +86,20 @@ jobs:
 
       - name: Test
         run: |
-          docker run -e CI=true -t app yarn test:ember
+          mkdir coverage
+          docker run -e CI=true -e COVERAGE=true -v "$(pwd)"'/coverage:/opt/app/coverage' app yarn test:ember
+
+      - name: Upload coverage report to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Upload coverage report artifact
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        with:
+          name: coverage
+          path: coverage/
+          if-no-files-found: error
diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml
index c9be26317..6b8d1c89b 100644
--- a/.github/workflows/publish-image.yml
+++ b/.github/workflows/publish-image.yml
@@ -55,7 +55,7 @@ jobs:
     needs: metadata
     steps:
       - name: Checkout code
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.sha }}
           fetch-depth: 0
@@ -64,7 +64,7 @@ jobs:
         uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2.5.0
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # tag=v2.1.0
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
           registry: ${{ vars.DOCKER_REGISTRY_URL }}
           username: ${{ github.repository_owner }}
@@ -72,7 +72,7 @@ jobs:
 
       - name: Build and push image
         id: build_push_image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4.0.0
+        uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
         with:
           push: true
           context: .
diff --git a/README.md b/README.md
index 33c94fb5f..a2300eb69 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 [![Continuous Integration](https://github.com/csvalpha/amber-ui/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/csvalpha/amber-ui/actions/workflows/continuous-integration.yml)
 [![Continuous Delivery](https://github.com/csvalpha/amber-ui/actions/workflows/continuous-delivery.yml/badge.svg)](https://github.com/csvalpha/amber-ui/actions/workflows/continuous-delivery.yml)
+[![codecov](https://codecov.io/gh/csvalpha/amber-ui/graph/badge.svg?token=GMTXV28YQF)](https://codecov.io/gh/csvalpha/amber-ui)
 
 ## Prerequisites
 
diff --git a/app/abilities/photo-tag.js b/app/abilities/photo-tag.js
new file mode 100644
index 000000000..11f00a498
--- /dev/null
+++ b/app/abilities/photo-tag.js
@@ -0,0 +1,36 @@
+import { Ability } from 'ember-can';
+import { isNone } from '@ember/utils';
+
+export default class PhotoTag extends Ability {
+  get canShow() {
+    return this.session.hasPermission('photo-tag.read');
+  }
+
+  get canCreate() {
+    return this.session.hasPermission('photo-tag.create');
+  }
+
+  get canDestroy() {
+    return (
+      this.session.hasPermission('photo-tag.destroy') ||
+      this.isTagOwner(this.model) ||
+      this.isTagged(this.model)
+    );
+  }
+
+  isTagOwner(photoTag) {
+    const { currentUser } = this.session;
+    return (
+      !isNone(currentUser) &&
+      photoTag.get('author.id') === currentUser.get('id')
+    );
+  }
+
+  isTagged(photoTag) {
+    const { currentUser } = this.session;
+    return (
+      !isNone(currentUser) &&
+      photoTag.get('taggedUser.id') === currentUser.get('id')
+    );
+  }
+}
diff --git a/app/abilities/photo.js b/app/abilities/photo.js
index 141478220..92ee0cff6 100644
--- a/app/abilities/photo.js
+++ b/app/abilities/photo.js
@@ -11,4 +11,8 @@ export default class Photo extends Ability {
       this.model.photoAlbum.get('publiclyVisible')
     );
   }
+
+  get canShowPhotoTags() {
+    return this.session.hasPermission('photo-tag.read');
+  }
 }
diff --git a/app/abilities/quickpost-message.js b/app/abilities/quickpost-message.js
deleted file mode 100644
index 5d6cdb029..000000000
--- a/app/abilities/quickpost-message.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Ability } from 'ember-can';
-
-export default class QuickpostMessage extends Ability {
-  get canShow() {
-    return this.session.hasPermission('quickpost-message.read');
-  }
-
-  get canDestroy() {
-    return this.session.hasPermission('quickpost-message.destroy');
-  }
-}
diff --git a/app/abilities/room-advert.js b/app/abilities/room-advert.js
new file mode 100644
index 000000000..d54caeaf6
--- /dev/null
+++ b/app/abilities/room-advert.js
@@ -0,0 +1,31 @@
+import { isNone } from '@ember/utils';
+import { Ability } from 'ember-can';
+
+export default class RoomAdvert extends Ability {
+  get canCreate() {
+    return this.session.hasPermission('room-advert.create');
+  }
+
+  get canShow() {
+    return this.session.hasPermission('room-advert.read');
+  }
+
+  get canDestroy() {
+    return (
+      this.session.hasPermission('room-advert.destroy') ||
+      this.isRoomAdvertOwner(this.model)
+    );
+  }
+
+  get canEdit() {
+    return (
+      this.session.hasPermission('room-advert.update') ||
+      this.isRoomAdvertOwner(this.model)
+    );
+  }
+
+  isRoomAdvertOwner(roomAdvert) {
+    const { currentUser } = this.session;
+    return !isNone(currentUser) && roomAdvert.isOwner(currentUser);
+  }
+}
diff --git a/app/adapters/application.js b/app/adapters/application.js
index d605adac7..b3b5ec88b 100644
--- a/app/adapters/application.js
+++ b/app/adapters/application.js
@@ -15,6 +15,7 @@ export default class ApplicationAdapter extends JSONAPIAdapter {
     let headers = {};
     if (this.session.isAuthenticated) {
       headers.Authorization = `Bearer ${this.session.data.authenticated.access_token}`;
+      document.documentElement.classList.add('authenticated');
     }
 
     return headers;
diff --git a/app/components/advertisement-tool.js b/app/components/advertisement-tool.js
index 33462fd0a..953b4a57f 100644
--- a/app/components/advertisement-tool.js
+++ b/app/components/advertisement-tool.js
@@ -21,110 +21,100 @@ export default Component.extend({
     {
       title: 'Qorting.nl',
       link: 'https://qorting.nl/',
-      image: 'advertisements/qorting.png',
+      image: 'advertisements/Qorting.png',
       full: true,
     },
     {
       title: 'Sponsorkliks',
       link: 'https://www.sponsorkliks.com/products/shops.php?club=4509',
-      image: 'advertisements/sponsorkliks.png',
+      image: 'advertisements/SponsorKliks.png',
       full: true,
     },
     {
-      title: 'StudentenWegwijzer',
-      link: 'https://www.studentenwegwijzer.nl/enschede/studentenverenigingen/alpha/',
-      image: 'advertisements/studenten-wegwijzer.png',
-      full: true,
-    },
-    {
-      title: 'InShared',
-      link: 'https://www.inshared.nl/',
-      image: 'advertisements/inshared.png',
+      title: 'BeBo Parket',
+      link: 'https://www.beboparket.nl/',
+      image: 'advertisements/BeBo.png',
     },
     {
-      title: 'Led24',
-      link: 'https://www.led24.nl/led-verlichting/led-tl-buis/',
-      image: 'advertisements/led24.png',
+      title: 'Boeketcadeau',
+      link: 'https://www.boeketcadeau.nl/',
+      image: 'advertisements/BoeketCadeau.png',
     },
     {
-      title: 'Noppies',
-      link: 'https://www.noppies.com/',
-      image: 'advertisements/noppies.png',
+      title: 'Baktotaal',
+      link: 'https://www.baktotaal.nl/',
+      image: 'advertisements/Baktotaal.png',
     },
     {
-      title: 'Rotimshop',
-      link: 'https://www.rotimshop.nl/',
-      image: 'advertisements/rotim.png',
+      title: 'Comfort Producten',
+      link: 'https://www.comfort-producten.nl/nl/',
+      image: 'advertisements/ComfortProducts.png',
     },
     {
-      title: 'Sans Online',
-      link: 'https://www.sans-online.nl/herenkleding/jassen/',
-      image: 'advertisements/sans.png',
+      title: 'Huurzone',
+      link: 'https://www.huurzone.nl/aanbod/nederland.html',
+      image: 'advertisements/Huurzone.png',
     },
     {
-      title: 'Sliponline',
-      link: 'https://www.sliponline.nl/kinderen/kinder-nachtkleding/kinder-pyjama/',
-      image: 'advertisements/sliponline.png',
+      title: 'Inshared',
+      link: 'https://www.inshared.nl/',
+      image: 'advertisements/Inshared.png',
     },
     {
-      title: 'Stellingstunt',
-      link: 'https://www.stellingstunt.nl/',
-      image: 'advertisements/stellingstunt.png',
+      title: 'Ledlampenkopen.nu',
+      link: 'https://www.ledlampenkopen.nu/',
+      image: 'advertisements/LedlampenKopen.png',
     },
     {
-      title: 'Baktotaal Bouwhuis',
-      link: 'https://www.bouwhuis.com/',
-      image: 'advertisements/bouwhuis.png',
+      title: 'Parcel Pro',
+      link: 'https://parcelpro.nl/',
+      image: 'advertisements/ParcelPro.png',
     },
     {
-      title: 'Shops United',
-      link: 'https://shops-united.nl/',
-      image: 'advertisements/shops-united.png',
+      title: 'Bierglazen bedrukken met logo',
+      alt: 'Bierglazen bedrukken met logo',
+      link: 'https://www.rikegroup.com/glazen-bedrukken/bierglazen-bedrukken',
+      image: 'advertisements/Rike_2022.png',
     },
     {
-      title: 'Urbansofa',
-      link: 'https://www.urbansofa.nl/',
-      image: 'advertisements/urbansofa.png',
+      title: 'Rotimshop',
+      link: 'https://www.rotimshop.nl/',
+      image: 'advertisements/RotimShop.png',
     },
     {
-      title: 'Prefixbroker',
-      link: 'https://www.prefixbroker.com/',
-      image: 'advertisements/prefixbroker.png',
+      title: 'Shops United',
+      link: 'https://shops-united.nl/',
+      image: 'advertisements/ShopsUnited.png',
     },
     {
-      title: 'Van Eyck Shutters',
-      link: 'https://www.vaneyckshutters.com/',
-      image: 'advertisements/van-eyck.png',
+      title: 'Sleiderink',
+      link: 'https://www.sleiderink.nl/',
+      image: 'advertisements/Sleiderink.png',
     },
     {
-      title: 'Verzekering.nl',
-      link: 'https://www.verzekering.nl/',
-      image: 'advertisements/verzekering.png',
+      title: 'Sliponline',
+      link: 'https://www.sliponline.nl/kinderen/kinder-nachtkleding/kinder-pyjama/',
+      image: 'advertisements/SlipOnline.png',
     },
     {
-      title: 'Zantman Kliniek',
-      link: 'https://www.zantmankliniek.nl/',
-      image: 'advertisements/zantman.png',
+      title: 'Stellingstunt',
+      link: 'https://www.stellingstunt.nl/',
+      image: 'advertisements/StellingStunt.png',
     },
     {
-      title: 'Bierglazen bedrukken met logo',
-      alt: 'Bierglazen bedrukken met logo',
-      link: 'https://www.rikegroup.com/glazen-bedrukken/bierglazen-bedrukken',
-      image: 'advertisements/rike.png',
+      title: 'Traffic Today',
+      link: 'https://www.traffictoday.nl/',
+      image: 'advertisements/TrafficToday.jpg',
     },
     {
-      links: [
-        {
-          link: 'https://www.huurzone.nl/aanbod/nederland.html',
-          title: 'huurwoningen',
-        },
-      ],
+      title: 'Verzekering',
+      link: 'https://www.verzekering.nl/',
+      image: 'advertisements/VerzekeringNL.png',
     },
     {
-      title: 'Top 5 Beste Kopen',
-      alt: 'Vergelijk de beste producten',
-      link: 'https://www.top5bestekopen.nl',
-      image: 'advertisements/trendiq.jpg',
+      title: 'Visser & Visser',
+      link: 'https://www.visserenvisser.nl/',
+      image: 'advertisements/Visser&Visser.png',
     },
   ],
 });
diff --git a/app/components/cards/article-card.hbs b/app/components/cards/article-card.hbs
index a126dae8c..8558b4fd7 100644
--- a/app/components/cards/article-card.hbs
+++ b/app/components/cards/article-card.hbs
@@ -102,7 +102,7 @@
       </span>
       {{#if useMaxHeight}}
         <LinkTo @route='articles.article' @model={{article.id}} itemprop='url'>
-          <span class='float-md-end'> {{t 'tag.button.readMore'}} </span>
+          <span class='float-md-end'><i>{{t 'tag.button.readMore'}}</i></span>
         </LinkTo>
       {{/if}}
     </div>
diff --git a/app/components/cards/photo-album-card.hbs b/app/components/cards/photo-album-card.hbs
index d205ca647..5d54d979c 100644
--- a/app/components/cards/photo-album-card.hbs
+++ b/app/components/cards/photo-album-card.hbs
@@ -5,11 +5,18 @@
       src='{{album.albumMediumUrl}}'
       class='card-img-rounded'
     />
+    
     <div class='card-title-bar gradient-overlay-rounded'>
       <div class='card-titles'>
         <h2 class='card-title'>{{album.title}}</h2>
         <h3 class='card-subtitle'>{{moment-format album.date 'DD-MM-YYYY'}}</h3>
       </div>
+      {{#if album.amountOfTaggedPhotos}}
+        <span class='album-tag-counter badge bg-info bottom-0 end-0'>
+          <FaIcon @icon='tag' />
+          {{album.amountOfTaggedPhotos}}/{{album.amountOfPhotos}}
+        </span>
+      {{/if}}
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/components/cards/public-room-advert-card.hbs b/app/components/cards/public-room-advert-card.hbs
new file mode 100644
index 000000000..664c90042
--- /dev/null
+++ b/app/components/cards/public-room-advert-card.hbs
@@ -0,0 +1,76 @@
+<div class='col-md-12 room-advert-card {{if @collapsed "collapsed mb-5 col-xl-10 mx-xl-auto"}}' {{on "click" (fn this.open @roomAdvert)}}>
+  <div class='d-flex justify-content-center'>
+    <div class='card mb-0 w-100 {{if @collapsed "mx-lg-5"}}'>
+      {{#if (not @collapsed)}}
+        <div class="advert-modal-header card-header card-header--overlay">
+          <img class="card-img-top" src="{{@roomAdvert.coverPhotoUrl}}">
+          <div class="card-title-bar gradient-overlay">
+            <h1 class="card-title title ms-3 mb-2">{{@roomAdvert.houseName}}</h1>
+          </div>
+        </div>
+      {{/if}}
+      <div class='card-body m-4 fs-5'>
+        <div class="row">
+          <div class="pe-4 col-12 col-md-6 mb-3">
+            {{#if @collapsed}}
+              <div class="width-fit-content">
+                <h2 class="text-secondary me-5">{{@roomAdvert.houseName}}</h2>
+                <hr class="border border-secondary bg-secondary border-3 opacity-100 mt-0" />
+              </div>
+            {{/if}}
+            <table>
+              {{#if @roomAdvert.location}}
+                <tr>
+                  <th class="pe-3 text-secondary">{{t 'component.public.roomForum.location'}}</th>
+                  <td>
+                    <a
+                      href='https://maps.google.com/?q={{@roomAdvert.location}}'
+                      target='_blank'
+                    >
+                      {{@roomAdvert.location}}
+                    </a>
+                  </td>
+                </tr>
+              {{/if}}
+              {{#if @roomAdvert.availableFrom}}
+                <tr>
+                  <th class="pe-3 text-secondary">{{t 'component.public.roomForum.availableFrom'}}</th>
+                  <td>{{moment-format @roomAdvert.availableFrom 'DD-M-YYYY'}}</td>
+                </tr>
+              {{/if}}
+              <tr>
+                <th class="pe-3 text-secondary">{{t 'component.public.roomForum.contact'}}</th>
+                <td>
+                  {{#if (is-phone @roomAdvert.contact)}}
+                    <a href='tel:{{@roomAdvert.contact}}'>{{@roomAdvert.contact}}</a>
+                  {{else if (is-email @roomAdvert.contact)}}
+                    <a href='mailto:{{@roomAdvert.contact}}'>{{@roomAdvert.contact}}</a>
+                  {{else if (is-url @roomAdvert.contact)}}
+                    <a href='{{@roomAdvert.contact}}' target='_blank'>{{@roomAdvert.contact}}</a>
+                  {{else}}
+                    {{@roomAdvert.contact}}
+                  {{/if}}
+                </td>
+              </tr>
+            </table>
+          </div>
+          {{#if (and @roomAdvert.coverPhotoUrl @collapsed)}}
+            <img src={{@roomAdvert.coverPhotoUrl}} class='col-12 col-md-6 mb-3 object-fit-cover'/>
+          {{/if}}
+        </div>
+        <p class='card-text description overflow-hidden mb-1' data-test-room-advert-description>
+          {{markdown-to-html
+            @roomAdvert.descriptionCamofied
+            extensions='youtubeEmbed bootstrapTable'
+          }}
+          <div class="{{if @collapsed "fade-to-white-background"}}"></div>
+        </p>
+        {{#if @collapsed}}
+          <button class="btn btn-secondary float-end fw-bold mt-1" type="button" {{on "click" (fn this.open @roomAdvert)}}>
+            Lees meer...
+          </button>
+        {{/if}}
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/components/cards/public-room-advert-card.js b/app/components/cards/public-room-advert-card.js
new file mode 100644
index 000000000..c75c19361
--- /dev/null
+++ b/app/components/cards/public-room-advert-card.js
@@ -0,0 +1,11 @@
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+
+export default class PublicRoomAdvertCardComponent extends Component {
+  @action
+  open(advert) {
+    if (this.args.open) {
+      this.args.open(advert);
+    }
+  }
+}
diff --git a/app/components/cards/room-advert-card.hbs b/app/components/cards/room-advert-card.hbs
new file mode 100644
index 000000000..bd6024dab
--- /dev/null
+++ b/app/components/cards/room-advert-card.hbs
@@ -0,0 +1,72 @@
+<div class='card'>
+  <div class='card-header card-header--overlay'>
+    <img class='card-img-top' src={{@roomAdvert.coverPhotoUrlOrDefault}} />
+
+    <div class='card-title-bar gradient-overlay'>
+
+      <div class='card-titles'>
+        <h2 class='card-title' data-test-room-advert-house-name>
+          {{@roomAdvert.houseName}}
+        </h2>
+        <h3 class='card-subtitle'>
+          <span class='subtitle-author' data-test-room-advert-author>
+            <LinkTo
+              @route='users.user'
+              @model={{@roomAdvert.author.id}}
+              class='link-to card-subtitle-link'
+            >
+              {{@roomAdvert.author.fullName}}
+            </LinkTo>
+          </span>
+        </h3>
+      </div>
+    </div>
+  </div>
+
+  <div class='row card-subheader-row ms-0 me-0'>
+    {{#if @roomAdvert.location}}
+      <div class='col-12 col-md-6 card-subheader-item align-items-center p-3'>
+        <b>Locatie: </b>
+        <a
+          href='https://maps.google.com/?q={{@roomAdvert.location}}'
+          target='_blank'
+        >
+          {{@roomAdvert.location}}
+        </a>
+      </div>
+    {{/if}}
+
+    {{#if @roomAdvert.availableFrom}}
+      <div class='col-12 col-md-6 card-subheader-item align-items-center p-3'>
+        <b>Beschikbaar vanaf: </b>
+        {{moment-format @roomAdvert.availableFrom 'DD-M-YYYY'}}
+      </div>
+    {{/if}}
+  </div>
+
+  <div class='card-body'>
+    <p class='card-text' data-test-room-advert-description>
+      {{markdown-to-html
+        @roomAdvert.descriptionCamofied
+        extensions='youtubeEmbed bootstrapTable'
+      }}
+    </p>
+  </div>
+
+  {{#if @roomAdvert.contact}}
+    <div class='row card-sub-bottom-row ms-0 me-0'>
+      <div class='col-12 card-sub-item align-items-center p-3'>
+        <b>Contact: </b>
+        {{#if (is-phone @roomAdvert.contact)}}
+          <a href='tel:{{@roomAdvert.contact}}'>{{@roomAdvert.contact}}</a>
+        {{else if (is-email @roomAdvert.contact)}}
+          <a href='mailto:{{@roomAdvert.contact}}'>{{@roomAdvert.contact}}</a>
+        {{else if (is-url @roomAdvert.contact)}}
+          <a href='{{@roomAdvert.contact}}' target='_blank'>{{@roomAdvert.contact}}</a>
+        {{else}}
+          {{@roomAdvert.contact}}
+        {{/if}}
+      </div>
+    </div>
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/app/components/forms/room-advert-form.hbs b/app/components/forms/room-advert-form.hbs
new file mode 100644
index 000000000..7c9139f01
--- /dev/null
+++ b/app/components/forms/room-advert-form.hbs
@@ -0,0 +1,81 @@
+<div class='card'>
+  <div class='card-header'>
+    <h5>{{if @model.isNew 'Kamer advertentie aanmaken' 'Kamer advertentie wijzigen'}}</h5>
+  </div>
+  <div class='card-body'>
+    <form {{action @onSubmit on='submit'}}>
+      <ModelForm::TextInput
+        @model={{@model}}
+        @property='houseName'
+        @label='Huisnaam'
+        @required={{true}}
+        @maxlength={{50}}
+      />
+      <ModelForm::FileInput
+        @model={{@model}}
+        @property='coverPhoto'
+        @label='Coverfoto'
+        @loadedCallback={{@onCoverPhotoLoaded}}
+      />
+      <ModelForm::TextInput
+        @model={{@model}}
+        @property='contact'
+        @label='Contact (e-mailadres, telefoonnummer of link)'
+        @required={{true}}
+        @maxlength={{50}}
+      />
+      <ModelForm::TextInput
+        @model={{@model}}
+        @property='location'
+        @label='Locatie'
+        @maxlength={{100}}
+      />
+      <ModelForm::DateInput
+        @model={{@model}}
+        @property='availableFrom'
+        @label='Beschikbaar vanaf'
+        @required={{true}}
+      />
+      <ModelForm::CheckboxInput
+        @model={{@model}}
+        @property='publiclyVisible'
+        @label='Zichtbaar voor externen'
+      />
+
+      {{#if @model.publiclyVisible}}
+        <div class="row">
+          <div class="col-sm-10 offset-sm-2">
+            <div class='alert alert-warning' role='alert'>
+              Een publieke kamer advertentie is ook zichtbaar voor niet-leden. Houd hier
+              rekening mee in je advertentie.
+              <br />
+              Plaats je een coverfoto met mensen er op? Zorg dan wel dat je
+              toestemming van deze mensen hebt.
+            </div>
+          </div>
+        </div>
+      {{/if}}
+
+      <ModelForm::MdInput
+        @model={{@model}}
+        @property='description'
+        @label='Beschrijving'
+        @required={{true}}
+        @inputIdentifier='article-form-content'
+      />
+
+      <ModelForm::FormActions
+        @errors={{@model.errors}}
+        @errorMessage={{@errorMessage}}
+      >
+        <button
+          {{on 'click' @onCancel}}
+          type="button"
+          class='btn btn-default'
+        >
+          Annuleren
+        </button>
+      </ModelForm::FormActions>
+    </form>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/components/header-nav.hbs b/app/components/header-nav.hbs
index cc2df8113..4740e450e 100644
--- a/app/components/header-nav.hbs
+++ b/app/components/header-nav.hbs
@@ -1,49 +1,51 @@
-<nav class='navbar pb-0 pt-0 {{if (not session.isAuthenticated) "public"}}' aria-label='breadcrumb'>
+<nav class='header-nav navbar pb-0 pt-0 {{if (not this.session.isAuthenticated) "public"}}' aria-label='breadcrumb'>
   <div class="container-fluid d-flex justify-content-between">
     <span
-      class='{{if session.isAuthenticated "half-toggle" "pe-2"}} left-sidebar-toggle d-block d-md-none link'
-      {{action 'toggleLeftSidebar'}}
+      class='{{if this.session.isAuthenticated "half-toggle" "pe-2"}} left-sidebar-toggle d-block d-md-none link'
+      {{on 'click' this.toggleLeftSidebar}}
     >
       ☰
     </span>
 
-    {{#if session.isAuthenticated }}
-      <span {{action 'handleLogoAction'}} class='navbar-brand'>
+    {{#if this.session.isAuthenticated }}
+      <span {{on 'click' this.handleLogoAction}} class='navbar-brand'>
         <div class='header-logo'> </div>
       </span>
     {{else}}
       <div class='public-header-logo'> </div>
     {{/if}}
 
-    <div class='d-flex col ps-0 pe-0 navbar-contents-holder {{if (not session.isAuthenticated) "public"}}'>
+    <div class='d-flex col ps-0 pe-0 navbar-contents-holder {{if (not this.session.isAuthenticated) "public"}}'>
       <div class='navbar-overflow-wrapper'>
         <div class='navbar-nav col d-flex flex-row'>
-          {{#if session.isAuthenticated}}
+          {{#if this.session.isAuthenticated}}
             <Breadcrumbs @routeInfos={{@routeInfos}} />
-          {{else if media.isMobile}}
-          {{else if (not media.isMobile)}}
+          {{else if (not this.media.isMobile)}}
             <LinkTo @route='index' class="page-actions-buttons">
-              <BsButton @type="primary" class="public-navbar-button {{if (eq router.currentRouteName 'index') 'selected'}}">Home</BsButton>
+              <BsButton @type="primary" class="public-navbar-button {{if (eq this.router.currentRouteName 'index') 'selected'}}">Home</BsButton>
             </LinkTo>
-            <BsDropdown class="position-static" as |dd| {{did-insert (action 'setStaticPages')}}>
+            <BsDropdown class="position-static" as |dd| {{did-insert this.setStaticPages}}>
               <dd.button @type="primary" class="public-navbar-button {{if this.onAboutUsPage 'selected'}}">
                 {{t "component.headerNav.aboutUs"}}
               </dd.button>
               <dd.menu class="public-about-us-dropdown" @renderInPlace={{true}} as |ddm|>
-                {{#each-in staticPages as |id title|}}
+                {{#each-in this.staticPages as |id title|}}
                   <ddm.item>
                     <ddm.linkTo @route='static-pages.static-page' @model={{id}} class="btn btn-primary">
                       {{title}}
                     </ddm.linkTo>
                   </ddm.item>
                 {{/each-in}}
+                <LinkTo @route='public.room-forum' class="dropdown-item btn btn-primary">
+                  {{t 'mixin.menuItems.roomForum'}}
+                </LinkTo>
               </dd.menu>
             </BsDropdown>
             <LinkTo @route='static-pages.static-page' @model='word-lid' class="page-actions-buttons">
-              <BsButton @type="primary" class="public-navbar-button {{if (eq router.currentURL '/static-pages/word-lid') 'selected'}}">{{t "component.headerNav.becomeMember"}}</BsButton>
+              <BsButton @type="primary" class="public-navbar-button {{if (eq this.router.currentURL '/static-pages/word-lid') 'selected'}}">{{t "component.headerNav.becomeMember"}}</BsButton>
             </LinkTo>
             <LinkTo @route='static-pages.static-page' @model='sponsoring' class="page-actions-buttons">
-              <BsButton @type="primary" class="public-navbar-button {{if (eq router.currentURL '/static-pages/sponsoring') 'selected'}}">{{t "component.headerNav.sponsoring"}}</BsButton>
+              <BsButton @type="primary" class="public-navbar-button {{if (eq this.router.currentURL '/static-pages/sponsoring') 'selected'}}">{{t "component.headerNav.sponsoring"}}</BsButton>
             </LinkTo>
           {{/if}}
         </div>
@@ -51,20 +53,20 @@
 
       <div id='navbar-wormhole'></div>
 
-      {{#unless session.isAuthenticated}}
+      {{#unless this.session.isAuthenticated}}
         <LinkTo @route='login' class='d-none d-md-flex me-2'>
-          <button class='btn btn-primary public-navbar-button {{if (eq router.currentRouteName 'login') 'selected'}}' type='button'>
+          <button class='btn btn-primary public-navbar-button {{if (eq this.router.currentRouteName 'login') 'selected'}}' type='button'>
             {{t 'tag.button.signin'}}
           </button>
         </LinkTo>
       {{/unless}}
     </div>
 
-    {{#unless session.isAuthenticated}}
+    {{#unless this.session.isAuthenticated}}
       <button
-        class='btn btn-locale btn-inverse-locale-{{intl.locale}} me-2'
+        class='btn btn-locale btn-inverse-locale-{{this.intl.locale}} me-2'
         title='{{t "component.headerNav.changeLocale"}}'
-        {{action 'toggleLocale'}}
+        {{on 'click' this.toggleLocale}}
         type='button'>
       </button>
     {{/unless}}
diff --git a/app/components/header-nav.js b/app/components/header-nav.js
index daa9539dd..c8b0900a4 100644
--- a/app/components/header-nav.js
+++ b/app/components/header-nav.js
@@ -1,70 +1,77 @@
 import { inject as service } from '@ember/service';
-import Component from '@ember/component';
+import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
-import { computed } from '@ember/object';
+import { action } from '@ember/object';
 
-export default Component.extend({
-  tagName: 'nav',
-  classNames: 'header-nav',
-  session: service(),
-  layoutManager: service('layout-manager'),
-  media: service(),
-  intl: service(),
-  localStorage: service(),
-  store: service(),
-  router: service(),
-  abilities: service(),
-  staticPages: tracked(),
+export default class HeaderNav extends Component {
+  @service session;
+  @service('layout-manager') layoutManager;
+  @service media;
+  @service intl;
+  @service localStorage;
+  @service store;
+  @service router;
+  @service abilities;
+  @tracked staticPages;
 
-  onAboutUsPage: computed('router.{currentRouteName,currentURL}', function () {
+  get onAboutUsPage() {
     return (
-      this.router.currentRouteName === 'static-pages.static-page.index' &&
-      this.router.currentURL !== '/static-pages/word-lid' &&
-      this.router.currentURL !== '/static-pages/sponsoring'
+      this.router.currentRouteName === 'public.room-forum' ||
+      (this.router.currentRouteName === 'static-pages.static-page.index' &&
+        this.router.currentURL !== '/static-pages/word-lid' &&
+        this.router.currentURL !== '/static-pages/sponsoring')
     );
-  }),
+  }
 
-  actions: {
-    handleLogoAction() {
-      if (this.media.isMobile) {
-        this.send('toggleLeftSidebar');
-      } else {
-        this.router.transitionTo('index');
-      }
-    },
-    toggleLeftSidebar() {
-      this.layoutManager.toggleLeftSidebar();
-    },
-    toggleRightSidebar() {
-      this.layoutManager.toggleRightSidebar();
-    },
-    closeSidebars() {
-      this.layoutManager.closeSidebars();
-    },
-    toggleLocale() {
-      const { locale } = this.intl;
-      if (locale[0] === 'nl') {
-        this.set('intl.locale', 'en');
-        localStorage.setItem('locale', 'en-');
-      } else {
-        this.set('intl.locale', 'nl');
-        localStorage.setItem('locale', 'nl');
-      }
-      console.log(this.router);
-    },
-    setStaticPages() {
-      if (!this.session.isAuthenticated && !this.media.isMobile) {
-        this.store.findAll('static-page').then((pages) => {
-          // make key-value pairs for all found static pages that do not appear by itself
-          let staticPages = {};
-          pages.forEach((page) => {
-            if (!['word-lid', 'sponsoring'].includes(page.id)) {
-              staticPages[page.id] = page.title;
-            }
-          });
-          this.staticPages = staticPages;
+  @action
+  handleLogoAction() {
+    if (this.media.isMobile) {
+      this.toggleLeftSidebar();
+    } else {
+      this.router.transitionTo('index');
+    }
+  }
+
+  @action
+  toggleLeftSidebar() {
+    this.layoutManager.toggleLeftSidebar();
+  }
+
+  @action
+  toggleRightSidebar() {
+    this.layoutManager.toggleRightSidebar();
+  }
+
+  @action
+  closeSidebars() {
+    this.layoutManager.closeSidebars();
+  }
+
+  @action
+  toggleLocale() {
+    const { locale } = this.intl;
+    if (locale[0] === 'nl') {
+      this.intl.locale = 'en';
+      this.localStorage.setItem('locale', 'en-');
+    } else {
+      this.intl.locale = 'nl';
+      this.localStorage.setItem('locale', 'nl');
+    }
+  }
+
+  @action
+  setStaticPages() {
+    if (!this.session.isAuthenticated && !this.media.isMobile) {
+      this.store.findAll('static-page').then((pages) => {
+        // make key-value pairs for all found static pages that do not appear by itself
+        let staticPages = {};
+        pages.forEach((page) => {
+          if (!['word-lid', 'sponsoring'].includes(page.id)) {
+            staticPages[page.id] = page.title;
+          }
         });
-      }
-    },
-  },
-});
+        this.staticPages = staticPages;
+      });
+    }
+  }
+}
diff --git a/app/components/index/public.hbs b/app/components/index/public.hbs
index b51916ca6..4a1c08891 100644
--- a/app/components/index/public.hbs
+++ b/app/components/index/public.hbs
@@ -1,4 +1,4 @@
-<div class="public-index">
+<div class="public">
   <Public::Index::Header/>
 
   <Public::Index::AboutAlpha />
diff --git a/app/components/menu-sidebar.hbs b/app/components/menu-sidebar.hbs
index 3ac36eab1..60e40cf87 100644
--- a/app/components/menu-sidebar.hbs
+++ b/app/components/menu-sidebar.hbs
@@ -138,6 +138,12 @@
         @icon='suitcase'
         @title={{t 'mixin.menuItems.vacancies'}}
       />
+      <MenuSidebarItem
+        @link='room-adverts'
+        @hasPermission={{can 'show room-adverts'}}
+        @icon='people-roof'
+        @title={{t 'mixin.menuItems.roomAdverts'}}
+      />
       <MenuSidebarItem
         @link='forum'
         @hasPermission={{can 'show forum/categories'}}
@@ -217,6 +223,12 @@
           @title={{title}}
         />
         {{/each-in}}
+        <MenuSidebarItem
+          @link='public.room-forum'
+          @hasPermission={{true}}
+          @icon='people-roof'
+          @title={{t 'mixin.menuItems.roomForum'}}
+        />
       </div>
 
       <MenuSidebarItem
diff --git a/app/components/photo-albums/photo.hbs b/app/components/photo-albums/photo.hbs
index 8fe2a4408..267c27bf3 100644
--- a/app/components/photo-albums/photo.hbs
+++ b/app/components/photo-albums/photo.hbs
@@ -1,5 +1,11 @@
 <div class='d-flex justify-content-center align-items-center'>
-  <img src={{@model.imageUrl}} class='photo-large' />
+  {{#if this.showTags}}
+    <PhotoTags::PhotoTags @model={{@model}}>
+      <img src={{@model.imageUrl}} class='photo-large' />
+    </PhotoTags::PhotoTags>
+  {{else}}
+    <img src={{@model.imageUrl}} class='photo-large' />
+  {{/if}}
 </div>
 
 {{#if (can 'show individual users')}}
diff --git a/app/components/photo-albums/photo.js b/app/components/photo-albums/photo.js
index 9134071c0..a4524ddb5 100644
--- a/app/components/photo-albums/photo.js
+++ b/app/components/photo-albums/photo.js
@@ -1,8 +1,11 @@
 import { action } from '@ember/object';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
 
 export default class Photo extends Component {
+  @service abilities;
+
   @tracked
   showExif = false;
 
@@ -10,6 +13,10 @@ export default class Photo extends Component {
     return this.args.showInfo ?? true;
   }
 
+  get showTags() {
+    return this.showInfo && this.abilities.can('show photo-tags');
+  }
+
   @action
   toggleShowExif() {
     this.showExif = !this.showExif;
diff --git a/app/components/photo-tags/photo-tags.hbs b/app/components/photo-tags/photo-tags.hbs
new file mode 100644
index 000000000..9e935f9c4
--- /dev/null
+++ b/app/components/photo-tags/photo-tags.hbs
@@ -0,0 +1,41 @@
+<div class="position-relative photo-tags 
+  {{if showTags 'photo-tags--show'}}" 
+  {{on 'click' this.addTag}}
+  {{did-insert this.addCloseAddTagListener}}
+  {{will-destroy this.removeCloseAddTagListener}}
+>
+  {{yield}}
+
+  {{#if (gt @model.amountOfTags 0)}}
+    <button class="btn btn-info photo-tags-button" type="button" {{on 'click' this.toggleShowTags}}>
+      <FaIcon @icon='tag' />
+      {{ @model.amountOfTags }}
+    </button>
+  {{/if}}
+
+  {{#each @model.tags as |tag|}}
+    <div class="photo-tag" style={{ tag.tagStyle }}>
+      <LinkTo @route='users.user.photos' @model={{tag.taggedUser.id}}>
+        {{ tag.taggedUser.fullName }}
+      </LinkTo>
+      {{#if (can 'destroy photo-tag' tag)}}
+        <FaIcon @icon='xmark' {{ on 'click' (fn this.deleteTag tag) }} />
+      {{/if}}
+    </div>
+  {{/each}}
+
+  {{#if this.newTagStyle }}
+    <div class="photo-tag photo-tag--new" style={{ this.newTagStyle }}>
+      <PowerSelect
+        @options={{this.users}}
+        @onChange={{this.storeTag}}
+        @searchEnabled={{true}}
+        @searchField='fullName'
+        @registerAPI={{this.openUserSelect}}
+        as |user|
+      >
+        {{user.fullName}}
+      </PowerSelect>
+    </div>
+  {{/if}}
+</div>
diff --git a/app/components/photo-tags/photo-tags.js b/app/components/photo-tags/photo-tags.js
new file mode 100644
index 000000000..1894325df
--- /dev/null
+++ b/app/components/photo-tags/photo-tags.js
@@ -0,0 +1,110 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { next } from '@ember/runloop';
+import { htmlSafe } from '@ember/template';
+
+export default class PhotoTags extends Component {
+  @service store;
+  @service flashNotice;
+  @tracked newTagX;
+  @tracked newTagY;
+  @tracked selectApi;
+  @tracked showTags = false;
+
+  get users() {
+    return this.store.findAll('user');
+  }
+
+  @action
+  toggleShowTags() {
+    this.showTags = !this.showTags;
+  }
+
+  @action
+  addTag(e) {
+    if (e.target.tagName.toLowerCase() != 'img' || this.newTagX || this.newTagY)
+      return;
+    e.stopPropagation();
+    let x = (e.layerX / e.target.width) * 100;
+    let y = (e.layerY / e.target.height) * 100;
+    this.newTagX = x;
+    this.newTagY = y;
+    next(this, () => {
+      this.selectApi.actions.open();
+    });
+  }
+
+  @action
+  addCloseAddTagListener() {
+    this.closeAddTagListener = (e) => {
+      let element = e.target;
+      if (
+        element.closest('.ember-power-select-dropdown') !== null ||
+        element.closest('.photo-tag--new') !== null
+      )
+        return;
+      e.stopPropagation();
+      this.newTagX = null;
+      this.newTagY = null;
+    };
+
+    document.addEventListener('click', this.closeAddTagListener);
+  }
+
+  @action
+  removeCloseAddTagListener() {
+    document.removeEventListener('click', this.closeAddTagListener);
+  }
+
+  @action
+  async storeTag(taggedUser) {
+    let photo = this.args.model;
+    let photoTag = this.store.createRecord('photo-tag', {
+      photo,
+      taggedUser,
+      x: this.newTagX,
+      y: this.newTagY,
+    });
+    this.newTagX = null;
+    this.newTagY = null;
+
+    try {
+      await photoTag.save();
+      this.flashNotice.sendSuccess('Tag opgeslagen!');
+      photo.reload();
+      this.showTags = true;
+    } catch (e) {
+      this.flashNotice.sendError(
+        'Tag opslaan mislukt. Is deze gebruiker al getagged?'
+      );
+      photoTag.deleteRecord();
+    }
+  }
+
+  @action
+  async deleteTag(tag) {
+    try {
+      tag.deleteRecord();
+      await tag.save();
+      this.flashNotice.sendSuccess('Tag verwijderd!');
+      this.args.model.reload();
+    } catch (e) {
+      this.flashNotice.sendError('Tag verwijderen mislukt.');
+      tag.rollbackAttributes();
+    }
+  }
+
+  @action
+  openUserSelect(userSelect) {
+    this.selectApi = userSelect;
+  }
+
+  get newTagStyle() {
+    if (!this.newTagX || !this.newTagY) return null;
+    return htmlSafe(
+      `left: ${parseFloat(this.newTagX)}%; top: ${parseFloat(this.newTagY)}%;`
+    );
+  }
+}
diff --git a/app/components/public/header.hbs b/app/components/public/header.hbs
new file mode 100644
index 000000000..2d4050343
--- /dev/null
+++ b/app/components/public/header.hbs
@@ -0,0 +1,5 @@
+<div class='container-fluid public-header mb-5'>
+  <img src="{{@imageUrl}}" class="header-background" />
+  <div class="header-overlay"></div>
+  <p class="header-title">{{@title}}</p>
+</div>
\ No newline at end of file
diff --git a/app/components/public/index/about-alpha.hbs b/app/components/public/index/about-alpha.hbs
index ec1fc2b49..8e4dc22e6 100644
--- a/app/components/public/index/about-alpha.hbs
+++ b/app/components/public/index/about-alpha.hbs
@@ -6,21 +6,21 @@
 
   <div class="mt-3 row">
     <div class="about-v col-12 col-md-4 mt-5">
-      <img class="about-v-image" src="/images/public/vriendschap.jpg" alt="">
+      <img class="about-v-image" src="/images/public/index/vriendschap.jpg" alt="">
       <h2 class="about-v-title">{{t 'component.public.index.aboutAlpha.vriendschap-title'}}</h2>
       <p class="about-v-text">
         {{t 'component.public.index.aboutAlpha.vriendschap-text'}}
       </p>
     </div>
     <div class="about-v col-12 col-md-4">
-      <img class="about-v-image" src="/images/public/vorming.jpg" alt="">
+      <img class="about-v-image" src="/images/public/index/vorming.jpg" alt="">
       <h2 class="about-v-title">{{t 'component.public.index.aboutAlpha.vorming-title'}}</h2>
       <p class="about-v-text">
         {{t 'component.public.index.aboutAlpha.vorming-text'}}
       </p>
     </div>
     <div class="about-v col-12 col-md-4 mt-5">
-      <img class="about-v-image" src="/images/public/verantwoordelijkheid.jpg" alt="">
+      <img class="about-v-image" src="/images/public/index/verantwoordelijkheid.jpg" alt="">
       <h2 class="about-v-title">{{t 'component.public.index.aboutAlpha.verantwoordelijkheid-title'}}</h2>
       <p class="about-v-text">
         {{t 'component.public.index.aboutAlpha.verantwoordelijkheid-text'}}
diff --git a/app/components/public/index/header.hbs b/app/components/public/index/header.hbs
index cba16eb60..04b9fac25 100644
--- a/app/components/public/index/header.hbs
+++ b/app/components/public/index/header.hbs
@@ -1,5 +1,5 @@
-<div class='container-fluid public-index-header'>
-  <img src="/images/public/banner.jpg" class="header-background" />
+<div class='container-fluid public-header'>
+  <img src="/images/public/index/banner.jpg" class="header-background" />
   <div class="header-overlay"></div>
   <p class="header-slogan">
     {{t 'component.public.index.header.slogan-1'}}
diff --git a/app/components/quick-post-notification-button.hbs b/app/components/quick-post-notification-button.hbs
deleted file mode 100644
index 508aa76ec..000000000
--- a/app/components/quick-post-notification-button.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-{{#if notification.isSupported}}
-  {{#if notification.isEnabled}}
-    {{#if notification.isSoundEnabled}}
-      <button {{action 'disable'}} class='btn btn-default' type='button'>
-        <FaIcon @icon='volume-high' />
-      </button>
-    {{else}}
-      <button {{action 'soundOn'}} class='btn btn-default' type='button'>
-        <FaIcon @icon='bell' />
-      </button>
-    {{/if}}
-  {{else}}
-    <button {{action 'activate'}} class='btn btn-default' type='button'>
-      <FaIcon @icon='bell-slash' />
-    </button>
-  {{/if}}
-{{/if}}
\ No newline at end of file
diff --git a/app/components/quick-post-notification-button.js b/app/components/quick-post-notification-button.js
deleted file mode 100644
index 6be36ae2b..000000000
--- a/app/components/quick-post-notification-button.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { inject as service } from '@ember/service';
-import Component from '@ember/component';
-
-export default Component.extend({
-  session: service(),
-  notification: service(),
-  actions: {
-    sendTest() {
-      this.notification.new(
-        'Test',
-        'Dit is een test bericht',
-        '/images/alphalogonotext.png'
-      );
-    },
-    activate() {
-      this.notification.getPermission();
-    },
-    disable() {
-      this.notification.turnOff();
-      this.send('sendTest');
-    },
-    soundOn() {
-      this.notification.toggleSound();
-      this.send('sendTest');
-    },
-  },
-});
diff --git a/app/components/quick-post.hbs b/app/components/quick-post.hbs
deleted file mode 100644
index 40ffd9576..000000000
--- a/app/components/quick-post.hbs
+++ /dev/null
@@ -1,135 +0,0 @@
-<div class='card quickpost'>
-  <div class='progress bg-white'>
-    <div
-      class='progress-bar bg-{{this.progressBarClass}}'
-      style={{this.progressBarStyle}}
-      role='progressbar'
-      aria-valuenow={{this.characterCountPercentage}}
-      aria-valuemin='0'
-      aria-valuemax='100'
-    ></div>
-  </div>
-
-  <div class='card-block'>
-    <div class='p-3 pb-5'>
-      <div class='row pb-2'>
-        <LinkTo
-          @route='users.user'
-          @model={{this.session.currentUser.id}}
-          class="p-0 w-auto"
-        >
-          <img
-            class='profile-picture profile-picture-md ms-3 p-0'
-            alt='{{this.session.currentUser.fullName}}'
-            src='{{this.session.currentUser.avatarThumbUrlOrDefault}}'
-          />
-        </LinkTo>
-        <Textarea
-          id='qp-inputfield'
-          @value={{this.newQpMessage}}
-          rows={{4}}
-          class='col form-control ms-3 me-3 qp-inputfield'
-          placeholder={{this.welcomeText}}
-          minlength='1'
-          maxlength={{this.maxCharacters}}
-          @enter='saveMessage'
-        />
-      </div>
-
-      <div class='d-flex float-end'>
-        <span
-          class='qp-characters-indicator
-            {{if this.tooMuchText "text-danger" "text-muted"}}
-            {{unless this.currentCharacterCount "hidden"}}
-            pt-2 pe-3'
-        >
-          {{this.currentCharacterCount}}
-          /
-          {{this.maxCharacters}}
-        </span>
-
-        <QuickPostNotificationButton />
-
-        <BsDropdown class='ms-1 d-block' @closeOnMenuClick={{true}} as |dd|>
-          <dd.button @type='button' class='btn-default'>
-            <FaIcon @icon='face-smile' @prefix='far' />
-          </dd.button>
-          <dd.menu class='emoticon-holder card' as |menu|>
-            <div class='row gx-0'>
-              {{#each this.emoticons as |emoticon|}}
-                <div class='emoticon' {{action 'appendSmileyToText' emoticon}}>
-                  {{emoticon}}
-                </div>
-              {{/each}}
-            </div>
-          </dd.menu>
-        </BsDropdown>
-
-        <button
-          class='btn btn-primary ms-1 mb-3 {{if this.tooMuchText "disabled"}}'
-          {{action 'saveMessage'}}
-          type='button'
-        >
-          Versturen
-        </button>
-      </div>
-    </div>
-
-    {{#each this.sortedMessages as |message index|}}
-      <hr />
-      <div class='row qp-message p-3'>
-        <LinkTo
-          @route='users.user'
-          @model={{message.author.id}}
-          class="p-0 w-auto"
-        >
-          <img
-            class='profile-picture profile-picture-md ms-3 p-0'
-            alt='{{message.author.fullName}}'
-            src='{{message.author.avatarThumbUrlOrDefault}}'
-          />
-        </LinkTo>
-
-        <div class='ps-3 col'>
-          <div class='row'>
-            <LinkTo
-              @route='users.user'
-              @model={{message.author.id}}
-              class='col w-auto'
-            >
-              <b class='text-sm text-muted'>
-                {{message.author.fullNameWithNickname}}
-              </b>
-            </LinkTo>
-
-            <small class='text-muted pe-3 w-auto'>
-              {{#if (can 'destroy quickpost-messages')}}
-                <FaIcon
-                  @icon='trash'
-                  class='qp-destroy-icon link-highlight'
-                  {{on 'click' (action 'destroyMessage' message)}}
-                />
-              {{/if}}
-              {{moment-format message.createdAt 'dddd D MMMM HH:mm'}}
-            </small>
-          </div>
-          <p class='qp-message-text'>
-            {{linkify message.message '_blank' urlLength=30}}
-          </p>
-        </div>
-      </div>
-    {{/each}}
-
-    {{#if this.showLoaderButton}}
-      <div class='d-grid'>
-        <button
-          class='btn btn-sm btn-secondary btn-read-more mx-2'
-          {{action 'loadMore'}}
-          type='button'
-        >
-          Meer laden
-        </button>
-      </div>
-    {{/if}}
-  </div>
-</div>
\ No newline at end of file
diff --git a/app/components/quick-post.js b/app/components/quick-post.js
deleted file mode 100644
index eaaf3bbd6..000000000
--- a/app/components/quick-post.js
+++ /dev/null
@@ -1,183 +0,0 @@
-import { inject as service } from '@ember/service';
-import { htmlSafe } from '@ember/template';
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import { WelcomeTextLines, SuggestedEmojis } from 'amber-ui/constants';
-import { convertToUnicode } from 'amber-ui/helpers/convert-to-unicode';
-
-export default class QuickPost extends Component {
-  @service session;
-  @service store;
-  @service messageBus;
-  @service notification;
-  @service abilities;
-
-  @tracked newQpMessage = '';
-  @tracked page = 1;
-  @tracked totalPages = 1;
-  @tracked messages = [];
-  maxCharacters = 400;
-  emoticons = SuggestedEmojis;
-
-  get sortedMessages() {
-    return this.messages
-      .map((message) => message) // turn the RecordArray into a js array to allow sorting
-      .sort((a, b) => -('' + a.createdAt).localeCompare(b.createdAt));
-  }
-
-  get currentCharacterCount() {
-    return this.newQpMessage.length;
-  }
-
-  constructor() {
-    super(...arguments);
-    if (this.abilities.can('show quickpost-messages')) {
-      this.loadMessages(1);
-      this.subscribeToQuickpostMessagesMessageBus();
-    }
-  }
-
-  get characterCountPercentage() {
-    return Math.round((this.currentCharacterCount / this.maxCharacters) * 100);
-  }
-
-  get progressBarClass() {
-    const count = this.currentCharacterCount;
-    const max = this.maxCharacters;
-    if (count > max) {
-      return 'danger';
-    } else if (count > 0.8 * max) {
-      return 'warning';
-    }
-    return 'primary';
-  }
-
-  get progressBarStyle() {
-    return htmlSafe(`width: ${this.characterCountPercentage}%`);
-  }
-
-  get tooMuchText() {
-    return this.currentCharacterCount > this.maxCharacters;
-  }
-
-  get welcomeText() {
-    return WelcomeTextLines[
-      Math.floor(Math.random() * WelcomeTextLines.length)
-    ];
-  }
-
-  get showLoaderButton() {
-    return this.page < this.totalPages;
-  }
-
-  @action
-  loadMore() {
-    return this.loadMessages(this.page + 1);
-  }
-
-  @action
-  koeAan(message) {
-    // The best easter egg
-    if (message === 'KOE AAN!!') {
-      const notificationSound = new Audio('/sounds/cow.ogg');
-      this.notification.set('notificationSound', notificationSound);
-      if (this.notification.isSoundEnabled) {
-        notificationSound.play();
-      }
-    }
-  }
-
-  @action
-  appendSmileyToText(emoticon) {
-    const currentText = this.newQpMessage;
-    this.newQpMessage = htmlSafe((currentText || '') + emoticon);
-    this.element.querySelector('#qp-inputfield').focus();
-  }
-
-  @action
-  destroyMessage(message) {
-    const answer = confirm(
-      'Weet je zeker dat je dit bericht wilt verwijderen?'
-    ); // eslint-disable-line no-alert
-    if (answer) {
-      message.destroyRecord().then(() => {
-        this.messages = [];
-        this.loadMessages(1);
-      });
-    }
-  }
-
-  @action
-  saveMessage() {
-    const message = this.newQpMessage;
-    if (message && message.length > 0 && !this.tooMuchText) {
-      message.trim().replace(/(\r\n|\n|\r)/gm, '');
-      const unicodeMessage = convertToUnicode(message);
-
-      this.store
-        .createRecord('quickpost-message', { message: unicodeMessage })
-        .save();
-      this.koeAan(unicodeMessage);
-      this.newQpMessage = '';
-    }
-  }
-
-  @action
-  async loadMessages(page) {
-    const pageParams = {};
-    pageParams['page[size]'] = 15;
-    pageParams['page[number]'] = page;
-    pageParams.sort = '-created_at';
-    const result = await this.store.query('quickpost-message', pageParams);
-    this.totalPages = result.get('meta.page_count');
-    this.messages = this.store.peekAll('quickpost-message');
-    this.page = page;
-  }
-
-  @action
-  subscribeToQuickpostMessagesMessageBus() {
-    const channel = '/quickpost_messages';
-    this.messageBus.subscribe(
-      channel,
-      (data) => {
-        const json = JSON.parse(data);
-        const quickpostMessageData = {
-          data: {
-            type: 'quickpost-message',
-            id: json.id,
-            attributes: {
-              message: json.message,
-              createdAt: new Date(json.created_at),
-            },
-            relationships: {
-              author: {
-                data: {
-                  type: 'user',
-                  id: json.author_id,
-                },
-              },
-            },
-          },
-        };
-        const quickpost = this.store.push(quickpostMessageData);
-        this.notify(quickpost);
-      },
-      null
-    );
-  }
-
-  @action
-  notify(quickpost) {
-    if (
-      this.notification.isEnabled &&
-      quickpost.get('author.id') !== this.session.currentUser.id
-    ) {
-      this.notification.new(
-        quickpost.get('author.fullName'),
-        quickpost.get('message'),
-        quickpost.get('author.avatarThumbUrlOrDefault')
-      );
-    }
-  }
-}
diff --git a/app/controllers/public/room-forum.js b/app/controllers/public/room-forum.js
new file mode 100644
index 000000000..3c7e298a5
--- /dev/null
+++ b/app/controllers/public/room-forum.js
@@ -0,0 +1,23 @@
+import FilterableAndSortableController from 'amber-ui/controllers/application/filterable-and-sortable';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { Modal } from 'bootstrap';
+
+export default class RoomForumController extends FilterableAndSortableController {
+  @tracked sortedAttribute = 'created_at';
+  @tracked sortedAscending = false;
+  @tracked openedAdvert = null;
+
+  queryParams = ['page', 'sort'];
+
+  @action
+  openAdvert(advert) {
+    this.openedAdvert = advert;
+    new Modal('#room-advert-modal', {}).show();
+  }
+
+  @action
+  removeBackdrops() {
+    document.querySelectorAll('.modal-backdrop').forEach((e) => e.remove());
+  }
+}
diff --git a/app/controllers/room-adverts/index.js b/app/controllers/room-adverts/index.js
new file mode 100644
index 000000000..12f6438a1
--- /dev/null
+++ b/app/controllers/room-adverts/index.js
@@ -0,0 +1,11 @@
+import FilterableAndSortableController from 'amber-ui/controllers/application/filterable-and-sortable';
+import { tracked } from '@glimmer/tracking';
+
+export default class RoomAdvertsIndexController extends FilterableAndSortableController {
+  @tracked sortedAttribute = 'created_at';
+  @tracked sortedAscending = false;
+
+  queryParams = ['page', 'sort'];
+
+  routeOnEnter = 'room-adverts.room-advert';
+}
diff --git a/app/controllers/room-adverts/new.js b/app/controllers/room-adverts/new.js
new file mode 100644
index 000000000..3160e8081
--- /dev/null
+++ b/app/controllers/room-adverts/new.js
@@ -0,0 +1,8 @@
+import RoomAdvertEditController from './room-advert/edit';
+
+export default class RoomAdvertsNewController extends RoomAdvertEditController {
+  successMessage = 'Kamer advertentie aangemaakt!';
+  cancelMessage = 'Kamer advertentie aanmaken geannuleerd.';
+  cancelTransitionTarget = 'room-adverts';
+  cancelTransitionModel = null;
+}
diff --git a/app/controllers/room-adverts/room-advert/destroy.js b/app/controllers/room-adverts/room-advert/destroy.js
new file mode 100644
index 000000000..66d475930
--- /dev/null
+++ b/app/controllers/room-adverts/room-advert/destroy.js
@@ -0,0 +1,6 @@
+import DestroyController from 'amber-ui/controllers/application/destroy';
+
+export default class VacancyDestroyController extends DestroyController {
+  successTransitionTarget = 'room-adverts';
+  cancelTransitionTarget = 'room-adverts.room-advert';
+}
diff --git a/app/controllers/room-adverts/room-advert/edit.js b/app/controllers/room-adverts/room-advert/edit.js
new file mode 100644
index 000000000..208ca3c94
--- /dev/null
+++ b/app/controllers/room-adverts/room-advert/edit.js
@@ -0,0 +1,17 @@
+import EditController from 'amber-ui/controllers/application/edit';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+
+export default class RoomAdvertEditController extends EditController {
+  @service abilities;
+  @service session;
+
+  successMessage = 'Kamer advertentie opgeslagen!';
+  successTransitionTarget = 'room-adverts.room-advert';
+
+  @action
+  coverPhotoLoaded(file) {
+    const roomAdvert = this.model;
+    roomAdvert.set('coverPhoto', file.data);
+  }
+}
diff --git a/app/models/photo-album.js b/app/models/photo-album.js
index d1f4f98c2..f063eb8fb 100644
--- a/app/models/photo-album.js
+++ b/app/models/photo-album.js
@@ -35,6 +35,18 @@ export default class PhotoAlbum extends Model {
     return this.photos?.sortBy('exifDateTimeOriginal', 'createdAt');
   }
 
+  get amountOfTaggedPhotos() {
+    var counter = 0;
+    this.photos.content.forEach((photo) => {
+      counter += photo.amountOfTags > 0 ? 1 : 0;
+    });
+    return counter;
+  }
+
+  get amountOfPhotos() {
+    return this.photos.length;
+  }
+
   // Methods
   isOwner(user) {
     if (user.get('id') === this.author.get('id')) {
diff --git a/app/models/photo-tag.js b/app/models/photo-tag.js
new file mode 100644
index 000000000..815431405
--- /dev/null
+++ b/app/models/photo-tag.js
@@ -0,0 +1,18 @@
+import Model, { belongsTo, attr } from '@ember-data/model';
+
+export default class PhotoTag extends Model {
+  // Properties
+  @attr x;
+  @attr y;
+  @attr('date') updatedAt;
+  @attr('date') createdAt;
+
+  // Relations
+  @belongsTo('user') author;
+  @belongsTo('user') taggedUser;
+  @belongsTo photo;
+
+  get tagStyle() {
+    return `left: ${parseFloat(this.x)}%; top: ${parseFloat(this.y)}%;`;
+  }
+}
diff --git a/app/models/photo.js b/app/models/photo.js
index 88b6a2f25..0458311ae 100644
--- a/app/models/photo.js
+++ b/app/models/photo.js
@@ -18,6 +18,7 @@ export default class Photo extends Model {
   @attr imageThumbUrl;
   @attr imageMediumUrl;
   @attr amountOfComments;
+  @attr amountOfTags;
   @attr('date') updatedAt;
   @attr('date') createdAt;
 
@@ -35,6 +36,7 @@ export default class Photo extends Model {
   @belongsTo photoAlbum;
   @belongsTo('user') uploader;
   @hasMany('photoComment') comments;
+  @hasMany('photoTag') tags;
 
   // Getters
   get hasExif() {
diff --git a/app/models/quickpost-message.js b/app/models/quickpost-message.js
deleted file mode 100644
index a3fb39461..000000000
--- a/app/models/quickpost-message.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Model, { belongsTo, attr } from '@ember-data/model';
-
-export default class QuickpostMessage extends Model {
-  @attr message;
-  @attr('date') createdAt;
-
-  // Relationships
-  @belongsTo('user') author;
-}
diff --git a/app/models/room-advert.js b/app/models/room-advert.js
new file mode 100644
index 000000000..1d7655422
--- /dev/null
+++ b/app/models/room-advert.js
@@ -0,0 +1,30 @@
+import Model, { belongsTo, attr } from '@ember-data/model';
+import { CoverPhotoFallback } from 'amber-ui/constants';
+
+export default class RoomAdvert extends Model {
+  // Attributes
+  @attr houseName;
+  @attr contact;
+  @attr location;
+  @attr availableFrom;
+  @attr description;
+  @attr descriptionCamofied;
+  @attr authorName;
+  @attr('date') createdAt;
+  @attr('date') updatedAt;
+  @attr coverPhoto;
+  @attr coverPhotoUrl;
+  @attr({ defaultValue: false }) publiclyVisible;
+
+  // Relations
+  @belongsTo('user') author;
+
+  // Getters
+  get coverPhotoUrlOrDefault() {
+    return this.coverPhotoUrl || CoverPhotoFallback;
+  }
+
+  isOwner(user) {
+    return user.get('id') === this.author.get('id');
+  }
+}
diff --git a/app/models/user.js b/app/models/user.js
index 2c5a1cfef..2688bb730 100644
--- a/app/models/user.js
+++ b/app/models/user.js
@@ -64,6 +64,9 @@ export default class User extends Model {
   @hasMany('debit/mandate') mandates;
   @hasMany mailAliases;
   @hasMany('mail-alias') groupMailAliases;
+  @hasMany('photo-tags', { inverse: 'author' }) createdPhotoTags;
+  @hasMany('photo-tags', { inverse: 'taggedUser' }) photoTags;
+  @hasMany('photos') photos;
 
   // Computed properties
   get fullName() {
@@ -151,6 +154,10 @@ export default class User extends Model {
     return this.avatarThumbUrl || AvatarThumbFallback;
   }
 
+  get sortedPhotos() {
+    return this.photos?.sortBy('exifDateTimeOriginal', 'createdAt');
+  }
+
   // Methods
   setNullIfEmptyString(property) {
     const value = this.get(property);
diff --git a/app/router.js b/app/router.js
index c12278f6d..aa21548ab 100644
--- a/app/router.js
+++ b/app/router.js
@@ -203,7 +203,14 @@ Router.map(function () {
 
   this.route('profile');
 
-  this.route('quickpost');
+  this.route('room-adverts', function () {
+    this.route('new');
+
+    this.route('room-advert', { path: ':id' }, function () {
+      this.route('edit');
+      this.route('destroy');
+    });
+  });
 
   this.route('sog', function () {
     this.route('name-trainer');
@@ -240,6 +247,7 @@ Router.map(function () {
       this.route('mail');
       this.route('mandates');
       this.route('permissions');
+      this.route('photos');
       this.route('settings');
 
       this.route('resend-activation-code');
@@ -259,5 +267,9 @@ Router.map(function () {
     });
   });
 
+  this.route('public', function () {
+    this.route('room-forum');
+  });
+
   return true;
 });
diff --git a/app/routes/books.js b/app/routes/books.js
index 3c248ede0..94d9b011f 100644
--- a/app/routes/books.js
+++ b/app/routes/books.js
@@ -1,7 +1,11 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class BooksRoute extends ApplicationRoute {
+export default class BooksRoute extends AuthenticatedRoute {
   queryParams = {};
 
   breadcrumb = { title: 'Boeken' };
+
+  canAccess() {
+    return this.abilities.can('show books');
+  }
 }
diff --git a/app/routes/debit/collections.js b/app/routes/debit/collections.js
index b34645c7c..49ecdd9dc 100644
--- a/app/routes/debit/collections.js
+++ b/app/routes/debit/collections.js
@@ -1,7 +1,11 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class CollectionsRoute extends ApplicationRoute {
+export default class CollectionsRoute extends AuthenticatedRoute {
   queryParams = {};
 
   breadcrumb = { title: "Incasso's" };
+
+  canAccess() {
+    return this.abilities.can('show debit/collections');
+  }
 }
diff --git a/app/routes/debit/mandates.js b/app/routes/debit/mandates.js
index 11aab8217..86f179735 100644
--- a/app/routes/debit/mandates.js
+++ b/app/routes/debit/mandates.js
@@ -1,7 +1,11 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class MandatesRoute extends ApplicationRoute {
+export default class MandatesRoute extends AuthenticatedRoute {
   queryParams = {};
 
   breadcrumb = { title: 'Incasso mandaten' };
+
+  canAccess() {
+    return this.abilities.can('show debit/mandates');
+  }
 }
diff --git a/app/routes/debit/transactions.js b/app/routes/debit/transactions.js
index 78ca2bfdb..7f3d5b7c2 100644
--- a/app/routes/debit/transactions.js
+++ b/app/routes/debit/transactions.js
@@ -1,7 +1,11 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class TransactionsRoute extends ApplicationRoute {
+export default class TransactionsRoute extends AuthenticatedRoute {
   queryParams = {};
 
   breadcrumb = { title: 'Transacties' };
+
+  canAccess() {
+    return this.abilities.can('show debit/transactions');
+  }
 }
diff --git a/app/routes/forum.js b/app/routes/forum.js
index 5e68c11dd..d98136507 100644
--- a/app/routes/forum.js
+++ b/app/routes/forum.js
@@ -1,7 +1,11 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class ForumRoute extends ApplicationRoute {
+export default class ForumRoute extends AuthenticatedRoute {
   queryParams = {};
 
   breadcrumb = { title: 'Forum' };
+
+  canAccess() {
+    return this.abilities.can('show forum/categories');
+  }
 }
diff --git a/app/routes/forum/categories/category/index.js b/app/routes/forum/categories/category/index.js
index d1bbbb0fb..700789f9e 100644
--- a/app/routes/forum/categories/category/index.js
+++ b/app/routes/forum/categories/category/index.js
@@ -1,7 +1,11 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class CategoryIndexRoute extends ApplicationRoute {
+export default class CategoryIndexRoute extends AuthenticatedRoute {
   beforeModel() {
     this.transitionTo('forum.categories.category.threads');
   }
+
+  canAccess() {
+    return this.abilities.can('show forum/categories');
+  }
 }
diff --git a/app/routes/forum/categories/category/threads/thread/index.js b/app/routes/forum/categories/category/threads/thread/index.js
index 8a9c7636b..593b1d8b2 100644
--- a/app/routes/forum/categories/category/threads/thread/index.js
+++ b/app/routes/forum/categories/category/threads/thread/index.js
@@ -1,7 +1,11 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class ThreadIndexRoute extends ApplicationRoute {
+export default class ThreadIndexRoute extends AuthenticatedRoute {
   beforeModel() {
     this.transitionTo('forum.categories.category.threads.thread.posts');
   }
+
+  canAccess() {
+    return this.abilities.can('show forum/threads');
+  }
 }
diff --git a/app/routes/groups.js b/app/routes/groups.js
index c4e1147b4..c426879cf 100644
--- a/app/routes/groups.js
+++ b/app/routes/groups.js
@@ -1,7 +1,11 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class GroupsRoute extends ApplicationRoute {
+export default class GroupsRoute extends AuthenticatedRoute {
   queryParams = {};
 
   breadcrumb = { title: 'Groepen' };
+
+  canAccess() {
+    return this.abilities.can('show groups');
+  }
 }
diff --git a/app/routes/photo-comments/index.js b/app/routes/photo-comments/index.js
index e40c823aa..5fa119ac5 100644
--- a/app/routes/photo-comments/index.js
+++ b/app/routes/photo-comments/index.js
@@ -1,6 +1,6 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class PhotoCommentsIndexRoute extends ApplicationRoute {
+export default class PhotoCommentsIndexRoute extends AuthenticatedRoute {
   canAccess() {
     return this.abilities.can('show photo-comments');
   }
diff --git a/app/routes/polls.js b/app/routes/polls.js
index 2786f429d..7a40d0f76 100644
--- a/app/routes/polls.js
+++ b/app/routes/polls.js
@@ -1,7 +1,11 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class PollsRoute extends ApplicationRoute {
+export default class PollsRoute extends AuthenticatedRoute {
   queryParams = {};
 
   breadcrumb = { title: 'Polls' };
+
+  canAccess() {
+    return this.abilities.can('show polls');
+  }
 }
diff --git a/app/routes/public/room-forum.js b/app/routes/public/room-forum.js
new file mode 100644
index 000000000..be3cda3c0
--- /dev/null
+++ b/app/routes/public/room-forum.js
@@ -0,0 +1,8 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class RoomAdvertsRoute extends ApplicationRoute {
+  model(params) {
+    params.perPage = 5;
+    return this.store.queryPaged('room-advert', params);
+  }
+}
diff --git a/app/routes/quickpost.js b/app/routes/quickpost.js
deleted file mode 100644
index 170104311..000000000
--- a/app/routes/quickpost.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class QuickpostRoute extends AuthenticatedRoute {
-  breadcrumb = { title: 'Quickpost' };
-
-  canAccess() {
-    return this.abilities.can('show quickpost-messages');
-  }
-}
diff --git a/app/routes/room-adverts.js b/app/routes/room-adverts.js
new file mode 100644
index 000000000..3ccf1b0ae
--- /dev/null
+++ b/app/routes/room-adverts.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class RoomAdvertsRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Kamer advertenties' };
+}
diff --git a/app/routes/room-adverts/index.js b/app/routes/room-adverts/index.js
new file mode 100644
index 000000000..821e6e39d
--- /dev/null
+++ b/app/routes/room-adverts/index.js
@@ -0,0 +1,29 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class RoomAdvertsIndexRoute extends AuthenticatedRoute {
+  queryParams = {
+    page: {
+      refreshModel: true,
+    },
+  };
+
+  get pageActions() {
+    return [
+      {
+        link: 'room-adverts.new',
+        title: 'Nieuwe kamer advertentie',
+        icon: 'plus',
+        canAccess: this.abilities.can('create room-adverts'),
+      },
+    ];
+  }
+
+  canAccess() {
+    return this.abilities.can('show room-adverts');
+  }
+
+  model(params) {
+    params.perPage = 6;
+    return this.store.queryPaged('room-advert', params);
+  }
+}
diff --git a/app/routes/room-adverts/new.js b/app/routes/room-adverts/new.js
new file mode 100644
index 000000000..b078071a9
--- /dev/null
+++ b/app/routes/room-adverts/new.js
@@ -0,0 +1,18 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class RoomAdvertsNewRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Kamer advertentie aanmaken' };
+
+  canAccess() {
+    return this.abilities.can('create room-adverts');
+  }
+
+  model() {
+    return this.store.createRecord('room-advert');
+  }
+
+  deactivate() {
+    super.deactivate();
+    this.controller.model?.rollbackAttributes();
+  }
+}
diff --git a/app/routes/room-adverts/room-advert.js b/app/routes/room-adverts/room-advert.js
new file mode 100644
index 000000000..829ec5fb7
--- /dev/null
+++ b/app/routes/room-adverts/room-advert.js
@@ -0,0 +1,17 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class RoomAdvertRoute extends AuthenticatedRoute {
+  queryParams = {};
+
+  get breadcrumb() {
+    return { title: this.controller?.model.houseName };
+  }
+
+  canAccess() {
+    return this.abilities.can('show room-adverts');
+  }
+
+  model(params) {
+    return this.store.findRecord('room-advert', params.id, params);
+  }
+}
diff --git a/app/routes/room-adverts/room-advert/destroy.js b/app/routes/room-adverts/room-advert/destroy.js
new file mode 100644
index 000000000..658822b24
--- /dev/null
+++ b/app/routes/room-adverts/room-advert/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class RoomAdvertDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Kamer advertentie verwijderen' };
+
+  canAccess(model) {
+    return this.abilities.can('destroy room-adverts', model);
+  }
+}
diff --git a/app/routes/room-adverts/room-advert/edit.js b/app/routes/room-adverts/room-advert/edit.js
new file mode 100644
index 000000000..d50e6bff3
--- /dev/null
+++ b/app/routes/room-adverts/room-advert/edit.js
@@ -0,0 +1,14 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class RoomAdvertEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Kamer advertentie aanpassen' };
+
+  canAccess(model) {
+    return this.abilities.can('edit room-advert', model);
+  }
+
+  deactivate() {
+    super.deactivate();
+    this.controller.model?.rollbackAttributes();
+  }
+}
diff --git a/app/routes/room-adverts/room-advert/index.js b/app/routes/room-adverts/room-advert/index.js
new file mode 100644
index 000000000..071d953a6
--- /dev/null
+++ b/app/routes/room-adverts/room-advert/index.js
@@ -0,0 +1,27 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class RoomAdvertIndexRoute extends AuthenticatedRoute {
+  get pageActions() {
+    const roomAdvert = this.controller.model;
+    return [
+      {
+        link: 'room-adverts.room-advert.edit',
+        title: 'Wijzigen',
+        icon: 'pencil',
+        linkArgument: roomAdvert,
+        canAccess: this.abilities.can('edit room-advert', roomAdvert),
+      },
+      {
+        link: 'room-adverts.room-advert.destroy',
+        title: 'Verwijderen',
+        icon: 'trash',
+        linkArgument: roomAdvert,
+        canAccess: this.abilities.can('destroy room-adverts', roomAdvert),
+      },
+    ];
+  }
+
+  canAccess() {
+    return this.abilities.can('show room-adverts');
+  }
+}
diff --git a/app/routes/sog/index.js b/app/routes/sog/index.js
index 6e9f15827..5dfdca975 100644
--- a/app/routes/sog/index.js
+++ b/app/routes/sog/index.js
@@ -1,13 +1,22 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class SogIndexRoute extends ApplicationRoute {
+export default class SogIndexRoute extends AuthenticatedRoute {
   breadcrumb = { title: 'SOG' };
 
   canAccess() {
     return this.abilities.can('show sog');
   }
 
-  model() {
-    return [];
+  async model() {
+    /* eslint-disable camelcase */
+    let photoAlbumsWithoutTags = await this.store.query('photo-album', {
+      sort: '-date',
+      filter: { without_photo_tags: true },
+      page: { number: '1', size: 4 },
+    });
+    /* eslint-enable camelcase */
+    return {
+      photoAlbumsWithoutTags,
+    };
   }
 }
diff --git a/app/routes/users/user/index.js b/app/routes/users/user/index.js
index 06979c424..d294d009e 100644
--- a/app/routes/users/user/index.js
+++ b/app/routes/users/user/index.js
@@ -36,6 +36,12 @@ export default class UserIndexRoute extends AuthenticatedRoute {
         linkArgument: user,
         canAccess: this.abilities.can('show memberships'),
       },
+      {
+        link: 'users.user.photos',
+        title: "Foto's",
+        linkArgument: user,
+        canAccess: this.abilities.can('show photo-tags'),
+      },
       {
         link: 'users.user.settings',
         title: 'Instellingen',
diff --git a/app/routes/users/user/photos.js b/app/routes/users/user/photos.js
new file mode 100644
index 000000000..1c2227584
--- /dev/null
+++ b/app/routes/users/user/photos.js
@@ -0,0 +1,5 @@
+import UserIndexRoute from './index';
+
+export default class UserPhotosRoute extends UserIndexRoute {
+  pageActions = null;
+}
diff --git a/app/services/notification.js b/app/services/notification.js
deleted file mode 100644
index bc2bf2b4f..000000000
--- a/app/services/notification.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import Service from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-
-export default class NotificationService extends Service {
-  isSupported = null;
-  @tracked permissionIsGranted = null;
-  @tracked permissionIsDenied = null;
-  @tracked isEnabled = null;
-  @tracked isSoundEnabled = null;
-  notificationSound = new Audio('/sounds/notification.mp3');
-
-  constructor() {
-    super(...arguments);
-
-    if ('Notification' in window) {
-      this.isSupported = true;
-      this.permissionIsGranted = Notification.permission === 'granted';
-      this.permissionIsDenied = Notification.permission === 'denied';
-      this.isEnabled = localStorage.getItem('notificationEnabled') === 'true';
-      this.isSoundEnabled =
-        localStorage.getItem('notificationSoundEnabled') === 'true';
-    } else {
-      this.isSupported = false;
-      this.permissionIsGranted = false;
-      this.permissionIsDenied = false;
-      this.isEnabled = false;
-      this.isSoundEnabled = false;
-    }
-  }
-
-  getPermission() {
-    if (!this.isEnabled) {
-      Notification.requestPermission((permission) => {
-        if (permission === 'granted') {
-          this.permissionIsGranted = true;
-          this.new(
-            'Notificaties zijn nu ingeschakeld',
-            'Je zult ze ontvangen bij elk Quickpost bericht',
-            '/images/alphalogonotext.png'
-          );
-        } else if (permission === 'denied') {
-          this.permissionIsGranted = false;
-          this.permissionIsDenied = true;
-          return false;
-        }
-      });
-    }
-
-    this.isEnabled = this.permissionIsGranted;
-    localStorage.setItem('notificationEnabled', this.permissionIsGranted);
-    this.isSoundEnabled = false;
-    localStorage.setItem('notificationSoundEnabled', this.isSoundEnabled);
-  }
-
-  turnOff() {
-    this.isEnabled = false;
-    localStorage.setItem('notificationEnabled', false);
-  }
-
-  new(title, body, icon) {
-    const options = {
-      body,
-      icon,
-    };
-    if (this.permissionIsGranted && this.isEnabled) {
-      try {
-        return new Notification(title, options);
-      } catch (error) {
-        if ('serviceWorker' in navigator) {
-          navigator.serviceWorker.register('sw.js').then((registration) => {
-            registration.showNotification(title, options);
-          });
-        }
-      } finally {
-        if (this.isSoundEnabled) {
-          this.notificationSound.play();
-        }
-      }
-    }
-  }
-
-  toggleSound() {
-    this.isSoundEnabled = !this.isSoundEnabled;
-    localStorage.setItem('notificationSoundEnabled', this.isSoundEnabled);
-  }
-
-  soundOn() {
-    this.isSoundEnabled = true;
-    localStorage.setItem('notificationSoundEnabled', this.isSoundEnabled);
-  }
-}
diff --git a/app/styles/app.scss b/app/styles/app.scss
index be937112b..01aea12e2 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -11,24 +11,26 @@
 @import 'components/basic-modal';
 @import 'components/bread-crumbs';
 @import 'components/cards/public-activity-card-small';
+@import 'components/cards/public-room-advert-card';
 @import 'components/cards/membership-card';
 @import 'components/cards/photo-album-card';
 @import 'components/dropzone';
 @import 'components/flash-notice';
 @import 'components/forum/forum-post';
 @import 'components/footer';
+@import 'components/list-group';
 @import 'components/md-editor';
 @import 'components/menu-sidebar';
 @import 'components/navbar';
 @import 'components/page-actions';
 @import 'components/pagination';
+@import 'components/photo-tags';
+@import 'components/public/header';
 @import 'components/public/index/about-alpha';
 @import 'components/public/index/activities';
-@import 'components/public/index/header';
 @import 'components/public/index/photo-albums';
 @import 'components/public/index/sponsor-banner';
 @import 'components/public/index/youtube-videos';
-@import 'components/quickpost';
 @import 'components/sidebar';
 @import 'components/social-media-buttons';
 @import 'components/tools/board-room-presence';
@@ -68,9 +70,12 @@
 @import 'routes/login';
 @import 'routes/photos';
 @import 'routes/polls';
-@import 'routes/public/index';
+@import 'routes/public';
 @import 'routes/sog/name-trainer';
 
 // Import package style
 @import 'ember-power-select/themes/bootstrap';
 @import 'ember-power-select';
+
+// Dies theme, comment out when not in the Dies-week
+// @import 'dies-theme';
diff --git a/app/styles/components/advertisement-tool.scss b/app/styles/components/advertisement-tool.scss
index ffc85258c..a1a6146b9 100644
--- a/app/styles/components/advertisement-tool.scss
+++ b/app/styles/components/advertisement-tool.scss
@@ -1,5 +1,5 @@
 // CSS3 code for animation of advertisements
-$amount-of-advertisements: 14;
+$amount-of-advertisements: 18;
 $single-advertisement-width: 175px;
 $advertisement-animation-duration: 16s;
 $advertisement-animation-holder-width: -$amount-of-advertisements *
diff --git a/app/styles/components/cards/photo-album-card.scss b/app/styles/components/cards/photo-album-card.scss
index 6fa9418a4..8ec6541d8 100644
--- a/app/styles/components/cards/photo-album-card.scss
+++ b/app/styles/components/cards/photo-album-card.scss
@@ -19,4 +19,12 @@
   .card-title {
     font-size: 1.5rem;
   }
+
+  .album-tag-counter {
+    position: absolute;
+    bottom: 0;
+    margin-right: 15px;
+    margin-bottom: 1rem;
+    padding-left: 5px;
+  }
 }
diff --git a/app/styles/components/cards/public-room-advert-card.scss b/app/styles/components/cards/public-room-advert-card.scss
new file mode 100644
index 000000000..ff3016a18
--- /dev/null
+++ b/app/styles/components/cards/public-room-advert-card.scss
@@ -0,0 +1,33 @@
+.room-advert-card {
+  max-width: var(--bs-modal-width);
+
+  .description {
+    max-height: max-content;
+  }
+
+  &.collapsed {
+    .description {
+      position: relative;
+      max-height: 15rem;
+    }
+  }
+
+  .advert-modal-header {
+    .title {
+      font-family: 'Advent Pro', sans-serif;
+      font-size: min(4rem, 6vw);
+    }
+  }
+}
+
+.room-advert-modal {
+  overflow: hidden;
+
+  .modal-dialog {
+    max-width: var(--bs-modal-width);
+
+    .modal-body {
+      max-height: 88vh;
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/styles/components/list-group.scss b/app/styles/components/list-group.scss
new file mode 100644
index 000000000..4dbed5928
--- /dev/null
+++ b/app/styles/components/list-group.scss
@@ -0,0 +1,8 @@
+.list-group-item:not(:first-child), a:not(:first-child) > .list-group-item {
+    border-top: 0;
+}
+
+.list-group-flush .list-group-item {
+    border-right: 0;
+    border-left: 0;
+}
\ No newline at end of file
diff --git a/app/styles/components/navbar.scss b/app/styles/components/navbar.scss
index c8388e736..a6566bace 100644
--- a/app/styles/components/navbar.scss
+++ b/app/styles/components/navbar.scss
@@ -1,17 +1,13 @@
-.header-nav {
-  position: fixed;
+.header-nav.navbar {position: fixed;
   top: 0;
+  flex-wrap: nowrap;
   transition: background-color 0.5s ease-in-out;
   z-index: 5;
   background-color: $brand-primary;
   width: 100vw;
 
-  .navbar {
-    flex-wrap: nowrap;
-
-    &.public {
-      border-bottom: 4px solid $brand-secondary;
-    }
+  &.public {
+    border-bottom: 4px solid $brand-secondary;
   }
 }
 
diff --git a/app/styles/components/photo-tags.scss b/app/styles/components/photo-tags.scss
new file mode 100644
index 000000000..8503e530a
--- /dev/null
+++ b/app/styles/components/photo-tags.scss
@@ -0,0 +1,47 @@
+.photo-tag {
+  position: absolute;
+  transform: translate(-50%, -50%);
+  transition: 0.5s ease opacity;
+  opacity: 0;
+  border-radius: 10px;
+  background: rgb(0 0 0 / 80%);
+  padding: 5px 10px;
+  color: #fff;
+  font-size: 12px;
+  pointer-events: none;
+
+  &--new {
+    opacity: 1;
+    z-index: 2;
+    min-width: 200px;
+    pointer-events: auto;
+  }
+
+  &:hover {
+    z-index: 1;
+  }
+
+  &:has(.fa-xmark) {
+    padding-right: 25px;
+  }
+
+  .fa-xmark {
+    position: absolute;
+    top: 50%;
+    right: 10px;
+    transform: translateY(-50%);
+    cursor: pointer;
+  }
+}
+
+.photo-tags.photo-tags--show .photo-tag {
+  opacity: 1;
+  pointer-events: auto;
+}
+
+.photo-tags-button {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  color: #fff;
+}
diff --git a/app/styles/components/public/index/header.scss b/app/styles/components/public/header.scss
similarity index 81%
rename from app/styles/components/public/index/header.scss
rename to app/styles/components/public/header.scss
index d027d1dcc..fd9e100ff 100644
--- a/app/styles/components/public/index/header.scss
+++ b/app/styles/components/public/header.scss
@@ -1,4 +1,4 @@
-.public-index-header {
+.public-header {
   display: flex;
   position: relative;
   flex-direction: column;
@@ -8,19 +8,9 @@
   padding-top: 80px;
   padding-bottom: 60px;
   height: fit-content;
-  min-height: 22vw;
+  min-height: 25vw;
   color: $white;
 
-  .header-background {
-    object-fit: cover;
-    object-position: bottom;
-  }
-
-  .header-overlay {
-    opacity: 0.45;
-    background-color: $black;
-  }
-
   .header-background, .header-overlay {
     position: absolute;
     top: 56px;
@@ -29,10 +19,22 @@
     margin-left: -50vw;
     width: 100vw;
     max-width: 100vw;
+  }
+
+  .header-background {
+    border-bottom: 4px solid $brand-secondary;
     height: 100%;
+    object-fit: cover;
+    object-position: bottom;
+  }
+
+  .header-overlay {
+    opacity: 0.35;
+    background-color: $black;
+    height: calc(100% - 4px);
   }
 
-  .header-slogan {
+  .header-slogan, .header-title {
     z-index: 1;
     text-align: center;
     text-transform: uppercase;
@@ -46,6 +48,10 @@
     }
   }
 
+  .header-title {
+    font-size: min(7rem, 11vw);
+  }
+
   .header-buttons {
     z-index: 1;
 
diff --git a/app/styles/components/quickpost.scss b/app/styles/components/quickpost.scss
deleted file mode 100644
index 109749853..000000000
--- a/app/styles/components/quickpost.scss
+++ /dev/null
@@ -1,93 +0,0 @@
-.quickpost {
-  .progress {
-    max-height: 4px;
-
-    .progress-bar {
-      transition: background-color 0.3s ease-in-out, width 0.3s ease-in-out;
-    }
-  }
-}
-
-.qp-scroll-container {
-  flex: 1;
-  height: 100%;
-  overflow-x: hidden; //when word breaks fail then still don't do horizontal scroll.
-  overflow-y: scroll;
-}
-
-.btn-read-more {
-  margin: 0.6rem 0;
-}
-
-.full-page-qp {
-  display: flex;
-  right: 0;
-  flex-flow: column;
-  padding-right: 20px;
-  padding-left: 20px;
-  height: 100%;
-}
-
-.qp-inputfield {
-  margin: 0;
-  outline: none;
-  border: 0;
-  padding: 0;
-  overflow: hidden;
-  word-break: break-word;
-  word-wrap: break-word;
-  hyphens: auto;
-  overflow-wrap: break-word;
-  resize: none;
-}
-
-.emoticon-toggle {
-  flex: 1;
-  margin: 0;
-  outline: none;
-  padding: 0;
-  width: 32px;
-  color: $brand-primary-dark;
-  font-size: $font-size-lg;
-}
-
-.text-emoticon-row {
-  display: flex;
-  padding-right: 0;
-}
-
-.emoticon-holder {
-  padding: 10px;
-  width: 15rem;
-
-  .emoticon {
-    text-align: center;
-  }
-}
-
-.qp-message {
-  &:hover .qp-destroy-icon {
-    display: inline;
-  }
-}
-
-.qp-destroy-icon {
-  display: none;
-}
-
-.emoticon {
-  cursor: pointer;
-  padding: 2px 0;
-  width: 20%;
-  min-width: 20%;
-  font-size: $font-size-lg;
-}
-
-.qp-characters-indicator {
-  transition: opacity 0.3s ease-in-out;
-  opacity: 1;
-
-  &.hidden {
-    opacity: 0;
-  }
-}
diff --git a/app/styles/dies-theme.scss b/app/styles/dies-theme.scss
new file mode 100644
index 000000000..0990bb048
--- /dev/null
+++ b/app/styles/dies-theme.scss
@@ -0,0 +1,130 @@
+// stylelint-disable selector-no-qualifying-type
+html.authenticated {
+  $primary-color: #840400;
+  $link-color: #840400;
+  $button-fg-color: #efead6;
+  $button-bg-color: #840400;
+  $app-bg-color: #efead6;
+  $sidebar-fg-color: #efead6;
+  $sidebar-bg-color: #840400;
+  $navbar-fg-color: #efead6;
+  $navbar-bg-color: #0f1c3f;
+  $navbar-button-fg-color: #efead6;
+  $navbar-button-bg-color: #840400;
+  $dies-logo-url: '/images/dies_logo.png';
+  $dies-logo-width: 5rem;
+
+  .app {
+    background-color: $app-bg-color;
+  }
+
+  .header-nav {
+    background-color: $navbar-bg-color;
+    color: $navbar-fg-color;
+
+    .breadcrumb-item::before {
+      color: $navbar-fg-color;
+    }
+
+    .header-logo {
+      background-image: url($dies-logo-url);
+      background-repeat: no-repeat;
+      background-position: center;
+      background-size: contain;
+      width: $dies-logo-width;
+    }
+
+    .btn-primary {
+      @include button-variant(
+        $navbar-button-bg-color,
+        $navbar-button-bg-color,
+      );
+
+      color: $navbar-button-fg-color;
+    }
+  }
+
+  .menu-sidebar {
+    background-color: $sidebar-bg-color;
+
+    .menu-sidebar-item {
+      color: $sidebar-fg-color;
+
+      &.sidebar-item-minor {
+        color: shade-color($sidebar-fg-color, 40%);  /* stylelint-disable-line function-no-unknown */
+      }
+    }
+  }
+
+  .btn-primary {
+    @include button-variant(
+      $button-bg-color,
+      $button-bg-color,
+    );
+
+    color: $button-fg-color;
+  }
+
+  p a {
+    color: $link-color;
+  }
+
+  a:hover, 
+  a .list-group-item:hover, 
+  .link-highlight:hover {
+    color: shade-color($link-color, 30%);  /* stylelint-disable-line function-no-unknown */
+  }
+
+  .form-check-input { 
+    &:checked {
+      border-color: $button-bg-color;
+      background-color: $button-bg-color;
+    }
+
+    &:focus {
+      border-color: tint-color($button-bg-color, 50%);  /* stylelint-disable-line function-no-unknown */
+      box-shadow: 0 0 0 0.25rem rgba($button-bg-color, 0.25);
+    }
+  }
+
+  .text-primary {
+    color: $primary-color !important;
+  }
+
+  .bg-primary {
+    background-color: $primary-color !important;
+  }
+
+  .form-control:focus {
+    box-shadow: 0 0 0 0.25rem rgba($primary-color, 0.25);
+  }
+
+  .page-actions-buttons {
+    // stylelint-disable selector-max-compound-selectors
+    .input-group-text, 
+    .filter-bar-filter, 
+    .input-group button {
+      background-color: tint-color($navbar-bg-color, 10%);  /* stylelint-disable-line function-no-unknown */
+      color: $navbar-fg-color;
+    }
+
+    .filter-bar-filter::placeholder {
+      opacity: 1; /* Firefox */
+      color: shade-color($navbar-fg-color, 30%); /* stylelint-disable-line function-no-unknown */
+    }
+
+    .form-control:focus {
+      box-shadow: 0 0 0 0.25rem tint-color($navbar-bg-color, 15%); /* stylelint-disable-line function-no-unknown */
+    }
+  }
+
+  .new-forum-posts {
+    background-color: $primary-color;
+  }
+
+  .advertisement-tool {
+    background: $white;
+  }
+
+}
+// stylelint-enable selector-no-qualifying-type
\ No newline at end of file
diff --git a/app/styles/modules/base.scss b/app/styles/modules/base.scss
index 4f9ee63f9..36206307b 100644
--- a/app/styles/modules/base.scss
+++ b/app/styles/modules/base.scss
@@ -118,4 +118,25 @@ img {
     margin-left: -50vw;
     width: 100vw;
   }
+}
+
+.object-fit-cover {
+  object-fit: cover;
+}
+
+.width-fit-content {
+  width: fit-content;
+}
+
+.fade-to-white-background {
+  position: absolute;
+  top: 0;
+  left: 0;
+  background-image: linear-gradient(transparent 70%, $white);
+  width: 100%;
+  height: 100%;
+
+  &.fade-to-white-background-50 {
+    background-image: linear-gradient(transparent 50%, $white);
+  }
 }
\ No newline at end of file
diff --git a/app/styles/modules/card.scss b/app/styles/modules/card.scss
index 6003965f6..874752d7e 100644
--- a/app/styles/modules/card.scss
+++ b/app/styles/modules/card.scss
@@ -127,6 +127,10 @@ $card-border: 0 solid $gray-300;
       bottom: 0;
       padding: 0.8rem;
       min-height: 5rem;
+
+      &.without-subtitle {
+        min-height: max-content;
+      }
     }
 
     .card-title {
@@ -165,6 +169,15 @@ $card-border: 0 solid $gray-300;
   }
 }
 
+.card-sub-bottom-row {
+  border-top: 1px solid $gray-200;
+  width: 100%;
+
+  .card-sub-item {
+    color: $gray-600;
+  }
+}
+
 %gradient-overlay {
   background: linear-gradient(
     to bottom,
diff --git a/app/styles/routes/public/index.scss b/app/styles/routes/public.scss
similarity index 82%
rename from app/styles/routes/public/index.scss
rename to app/styles/routes/public.scss
index 5224a947d..f33893f45 100644
--- a/app/styles/routes/public/index.scss
+++ b/app/styles/routes/public.scss
@@ -1,4 +1,4 @@
-.public-index {
+.public {
   .public-title {
     margin-bottom: 1rem;
     text-align: center;
@@ -10,6 +10,11 @@
       font-size: 2.5rem;
     }
   }
+
+  .public-text {
+    font-size: 1.5rem;
+    hyphens: none;
+  }
   
   .public-title-border {
     width: 30vw;
diff --git a/app/templates/photo-albums/photo-album/photos/index.hbs b/app/templates/photo-albums/photo-album/photos/index.hbs
index 77d05cdae..bbab2ce02 100644
--- a/app/templates/photo-albums/photo-album/photos/index.hbs
+++ b/app/templates/photo-albums/photo-album/photos/index.hbs
@@ -21,10 +21,16 @@
         @route='photo-albums.photo-album.photos.photo'
         @model={{photo.id}}
       >
-        {{#if photo.amountOfComments}}
+        {{#if (or photo.amountOfComments photo.amountOfTags)}}
           <span class='comments-counter badge bg-info bottom-0 start-0'>
-            <FaIcon @icon='comments' />
-            {{photo.amountOfComments}}
+            {{#if photo.amountOfComments}}
+              <FaIcon @icon='comments' />
+              {{photo.amountOfComments}}
+            {{/if}}
+            {{#if photo.amountOfTags}}
+              <FaIcon @icon='tag' />
+              {{photo.amountOfTags}}
+            {{/if}}
           </span>
         {{/if}}
         <img class='image' src='{{photo.imageThumbUrl}}' />
diff --git a/app/templates/public/room-forum.hbs b/app/templates/public/room-forum.hbs
new file mode 100644
index 000000000..8d00dd217
--- /dev/null
+++ b/app/templates/public/room-forum.hbs
@@ -0,0 +1,43 @@
+<div class="public">
+  <Public::Header
+    @imageUrl="/images/public/room-forum/banner.jpg"
+    @title="{{t 'component.public.roomForum.header'}}"
+    @introTitle="{{t 'component.public.roomForum.intro-title'}}"
+    @intro="{{t 'component.public.roomForum.intro'}}"
+  />
+
+  {{#each @model as |roomAdvert|}}
+    <Cards::PublicRoomAdvertCard @roomAdvert={{roomAdvert}} @collapsed={{true}} @open={{this.openAdvert}} />
+  {{/each}}
+
+  {{#if (eq @model.length 0)}}
+    <div class='col-12'>
+      <div class='alert alert-warning' role='alert'>
+        {{t 'component.public.roomForum.noAds'}}
+      </div>
+    </div>
+  {{/if}}
+
+  {{#if (gt @model.meta.page_count 1)}}
+    <div class='row justify-content-center'>
+      <PageNumbers @info={{@model.meta}} />
+    </div>
+  {{/if}}
+</div>
+
+<EmberWormhole @to='ember-wormhole-destination'>
+  <div class="modal modal-xl fade room-advert-modal" id="room-advert-modal" tabindex="-1" aria-hidden="true" {{on "hide.bs.modal" this.removeBackdrops}}>
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-body p-0">
+          {{#if this.openedAdvert}}
+            <Cards::PublicRoomAdvertCard @roomAdvert={{this.openedAdvert}} @collapsed={{false}}/>
+          {{/if}}
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary fw-bold" data-bs-dismiss="modal">Sluiten</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</EmberWormhole>
\ No newline at end of file
diff --git a/app/templates/quickpost.hbs b/app/templates/quickpost.hbs
deleted file mode 100644
index 243cc0039..000000000
--- a/app/templates/quickpost.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<QuickPost />
\ No newline at end of file
diff --git a/app/templates/room-adverts/index.hbs b/app/templates/room-adverts/index.hbs
new file mode 100644
index 000000000..aad707c3a
--- /dev/null
+++ b/app/templates/room-adverts/index.hbs
@@ -0,0 +1,84 @@
+<EmberWormhole @to='navbar-wormhole'>
+  <PageActionsButtons @pageActions={{pageActions}} />
+</EmberWormhole>
+
+<div class='row'>
+  {{#each @model as |roomAdvert|}}
+    <div class='d-flex col-md-6 mb-3'>
+      <div class='d-flex'>
+        <div class='card mb-0'>
+          <LinkTo @route='room-adverts.room-advert' @model={{roomAdvert.id}}>
+            <div class='card-header card-header--overlay'>
+              <img
+                itemprop='image'
+                class='card-img-top'
+                src={{roomAdvert.coverPhotoUrlOrDefault}}
+              />
+
+              <div class='card-title-bar gradient-overlay without-subtitle'>
+                <div class='card-titles'>
+                  <LinkTo @route='room-adverts.room-advert' @model={{roomAdvert.id}}>
+                    <h2 class='card-title' itemprop='name headline'>
+                      {{roomAdvert.houseName}}
+                    </h2>
+                  </LinkTo>
+                </div>
+              </div>
+            </div>
+          </LinkTo>
+
+          <div class='card-body'>
+            <div class='card-text pb-2 h-100 d-flex flex-column' itemprop='roomAdvertBody'>
+              {{! Table without style }}
+              <table>
+                {{#if roomAdvert.location}}
+                  <tr>
+                    <th class="pe-3">Locatie: </th>
+                    <td>
+                      <a
+                        href='https://maps.google.com/?q={{roomAdvert.location}}'
+                        target='_blank'
+                      >
+                        {{roomAdvert.location}}
+                      </a>
+                    </td>
+                  </tr>
+                {{/if}}
+                {{#if roomAdvert.availableFrom}}
+                  <tr>
+                    <th class="pe-3">Beschikbaar vanaf: </th>
+                    <td>{{moment-format roomAdvert.availableFrom 'DD-M-YYYY'}}</td>
+                  </tr>
+                {{/if}}
+              </table>
+              <div class='mt-2 mb-4 overflow-hidden position-relative' style="max-height: 5rem">
+                {{roomAdvert.descriptionCamofied}}
+                <div class="fade-to-white-background fade-to-white-background-50"></div>
+              </div>
+              <div class="flex-grow-1" />
+              <LinkTo
+                @route='room-adverts.room-advert'
+                @model={{roomAdvert.id}}
+                itemprop='url'
+              >
+                <i>{{t 'tag.button.readMore'}}</i>
+              </LinkTo>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  {{/each}}
+
+  {{#if (eq @model.length 0)}}
+    <div class='col-12'>
+      <div class='alert alert-warning' role='alert'>
+        {{t 'component.public.roomForum.noAds'}}
+      </div>
+    </div>
+  {{/if}}
+</div>
+
+<div class='row justify-content-center'>
+  <PageNumbers @info={{@model.meta}} />
+</div>
\ No newline at end of file
diff --git a/app/templates/room-adverts/new.hbs b/app/templates/room-adverts/new.hbs
new file mode 100644
index 000000000..025010658
--- /dev/null
+++ b/app/templates/room-adverts/new.hbs
@@ -0,0 +1,7 @@
+<Forms::RoomAdvertForm
+  @model={{@model}}
+  @errorMessage={{this.errorMessage}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
+  @onCoverPhotoLoaded={{this.coverPhotoLoaded}}
+/>
\ No newline at end of file
diff --git a/app/templates/room-adverts/room-advert/destroy.hbs b/app/templates/room-adverts/room-advert/destroy.hbs
new file mode 100644
index 000000000..16a4cef39
--- /dev/null
+++ b/app/templates/room-adverts/room-advert/destroy.hbs
@@ -0,0 +1,21 @@
+<div class='card'>
+  <div class='card-header'>
+    <h5>Kamer advertentie verwijderen</h5>
+  </div>
+  <div class='card-block p-3'>
+    <p class='card-text'>
+      Weet je zeker dat je deze kamer advertentie ({{@model.houseName}}) wil verwijderen?
+    </p>
+    {{#if errorMessage}}
+      <div class='text-danger'>{{this.errorMessage}}</div>
+    {{/if}}
+  </div>
+  <div class='card-footer'>
+    <button {{on 'click' this.destroyModel}} class='btn btn-danger' type='button'>
+      Kamer advertentie verwijderen
+    </button>
+    <button {{on 'click' this.cancel}} type="button" class='btn btn-default'>
+      Annuleren
+    </button>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/room-adverts/room-advert/edit.hbs b/app/templates/room-adverts/room-advert/edit.hbs
new file mode 100644
index 000000000..40ca7c5c7
--- /dev/null
+++ b/app/templates/room-adverts/room-advert/edit.hbs
@@ -0,0 +1,12 @@
+<EmberWormhole @to='navbar-wormhole'>
+  <PageActionsButtons @pageActions={{pageActions}} />
+</EmberWormhole>
+
+<Forms::RoomAdvertForm
+  @model={{@model}}
+  @errorMessage={{this.errorMessage}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
+  @onCoverPhotoLoaded={{action this.coverPhotoLoaded}}
+  @groups={{this.groups}}
+/>
\ No newline at end of file
diff --git a/app/templates/room-adverts/room-advert/index.hbs b/app/templates/room-adverts/room-advert/index.hbs
new file mode 100644
index 000000000..0a580d524
--- /dev/null
+++ b/app/templates/room-adverts/room-advert/index.hbs
@@ -0,0 +1,5 @@
+<EmberWormhole @to='navbar-wormhole'>
+  <PageActionsButtons @pageActions={{pageActions}} />
+</EmberWormhole>
+
+<Cards::RoomAdvertCard @roomAdvert={{@model}} />
\ No newline at end of file
diff --git a/app/templates/sog/index.hbs b/app/templates/sog/index.hbs
index 7cbfb55d7..c18b9664d 100644
--- a/app/templates/sog/index.hbs
+++ b/app/templates/sog/index.hbs
@@ -17,4 +17,63 @@
       </LinkTo>
     </div>
   </div>
+{{/if}}
+
+{{#if (can 'create photo-tag')}}
+  <div class='card'>
+    <div class='card-body'>
+      <h2 class='card-title'>Foto's taggen</h2>
+      <p class='card-text'>
+        Help jij mee om &aacute;lle foto's te taggen? Zoek een album of foto op zonder tags en tag wie er op de foto staan! Je kan ook een van de onderstaande albums bekijken, deze albums hebben momenteel geen enkele foto met tags.
+      </p>
+    </div>
+    <ul class='list-group list-group-flush mt-2'>
+      {{#each this.model.photoAlbumsWithoutTags as |album|}}
+        <LinkTo @route='photo-albums.photo-album' @model={{album.id}}>
+          <li class='list-group-item'>{{album.title}}</li>
+        </LinkTo>
+      {{else}}
+        <li class='list-group-item'>
+          <i>Alle albums bevatten al foto's met tags. Bekijk zelf of er nog foto's zijn in albums die nog tags missen!</i>
+        </li>
+      {{/each}}
+    </ul>
+    <div class='card-footer text-end'>
+      <LinkTo @route='photo-albums.index' class='btn btn-primary'>
+        Begin met taggen!
+      </LinkTo>
+    </div>
+  </div>
+{{/if}}
+
+{{#if (can 'show books')}}
+  <div class='card'>
+    <div class='card-body'>
+      <h2 class='card-title'>Leen een boek</h2>
+      <p class='card-text'>
+        Geen zin in je studie maar wil je toch wat nuttigs doen? Leen een boek uit de bibliotheek in de bestuurskamer! 
+      </p>
+    </div>
+    <div class='card-footer text-end'>
+      <LinkTo @route='books.index' class='btn btn-primary'>
+        Bekijk alle boeken!
+      </LinkTo>
+    </div>
+  </div>
+{{/if}}
+
+{{#if (can 'show forum/categories')}}
+  <div class='card'>
+    <div class='card-body'>
+      <h2 class='card-title'>Lees of schrijf op het forum</h2>
+      <p class='card-text'>
+        Neem deel aan het juffen op het forum, bekijk wat uw medeleden gezegd hebben op het grote quote topic, of start uw eigen topic!
+      </p>
+    </div>
+    <div class='card-footer text-end'>
+      <LinkTo @route='forum.categories' class='btn btn-primary'>
+        Bekijk het forum!
+      </LinkTo>
+    </div>
+  </div>
 {{/if}}
\ No newline at end of file
diff --git a/app/templates/users/user/edit/index.hbs b/app/templates/users/user/edit/index.hbs
index 70c5cd7c5..3139cabf9 100644
--- a/app/templates/users/user/edit/index.hbs
+++ b/app/templates/users/user/edit/index.hbs
@@ -1,4 +1,4 @@
-<TabbedView @tabItems={{tabItems}}>
+<TabbedView @tabItems={{this.tabItems}}>
   <Forms::UserForm
     @model={{@model}}
     @onSubmit={{action 'submit'}}
diff --git a/app/templates/users/user/edit/permissions.hbs b/app/templates/users/user/edit/permissions.hbs
index b85fbdfb2..9ab1edc6b 100644
--- a/app/templates/users/user/edit/permissions.hbs
+++ b/app/templates/users/user/edit/permissions.hbs
@@ -1,4 +1,4 @@
-<TabbedView @tabItems={{tabItems}}>
+<TabbedView @tabItems={{this.tabItems}}>
   <form class='form' {{action 'submit' on='submit'}}>
     <h5>Permissies</h5>
     <Permissions::PermissionsTable
diff --git a/app/templates/users/user/edit/privacy.hbs b/app/templates/users/user/edit/privacy.hbs
index 686ec8c39..25a426c94 100644
--- a/app/templates/users/user/edit/privacy.hbs
+++ b/app/templates/users/user/edit/privacy.hbs
@@ -1,3 +1,3 @@
-<TabbedView @tabItems={{tabItems}}>
+<TabbedView @tabItems={{this.tabItems}}>
   <Users::PrivacySettings @model={{model}} @onSubmit={{action 'submit'}} @onCancel={{action 'cancel'}}/>
 </TabbedView>
\ No newline at end of file
diff --git a/app/templates/users/user/edit/security.hbs b/app/templates/users/user/edit/security.hbs
index bae2d6997..0c6b47a71 100644
--- a/app/templates/users/user/edit/security.hbs
+++ b/app/templates/users/user/edit/security.hbs
@@ -1,4 +1,4 @@
-<TabbedView @tabItems={{tabItems}}>
+<TabbedView @tabItems={{this.tabItems}}>
   <Users::PasswordSettings @model={{model}} />
   <br /><hr />
   <Users::OtpSettings @model={{model}} />
diff --git a/app/templates/users/user/groups.hbs b/app/templates/users/user/groups.hbs
index c5702a368..7f37c01d1 100644
--- a/app/templates/users/user/groups.hbs
+++ b/app/templates/users/user/groups.hbs
@@ -2,7 +2,7 @@
   <PageActionsButtons @pageActions={{pageActions}} />
 </EmberWormhole>
 
-<TabbedView @tabItems={{tabItems}}>
+<TabbedView @tabItems={{this.tabItems}}>
   <div class='row tabs-with-filterbar-row'>
     <div class='col'>
       <ul class='nav nav-tabs d-flex'>
diff --git a/app/templates/users/user/index.hbs b/app/templates/users/user/index.hbs
index 1d129e468..1fc93d357 100644
--- a/app/templates/users/user/index.hbs
+++ b/app/templates/users/user/index.hbs
@@ -2,7 +2,7 @@
   <PageActionsButtons @pageActions={{pageActions}} />
 </EmberWormhole>
 
-<TabbedView @tabItems={{tabItems}}>
+<TabbedView @tabItems={{this.tabItems}}>
   <div class='col'>
     <div class='card-body'>
       <p class='card-text'>
diff --git a/app/templates/users/user/mail.hbs b/app/templates/users/user/mail.hbs
index 3bb07f341..7d8e55af8 100644
--- a/app/templates/users/user/mail.hbs
+++ b/app/templates/users/user/mail.hbs
@@ -2,7 +2,7 @@
   <PageActionsButtons @pageActions={{pageActions}} />
 </EmberWormhole>
 
-<TabbedView @tabItems={{tabItems}}>
+<TabbedView @tabItems={{this.tabItems}}>
   <h5>Mail aliassen</h5>
   <div class='table-responsive'>
     <table class='table'>
diff --git a/app/templates/users/user/mandates.hbs b/app/templates/users/user/mandates.hbs
index c0e4bd052..c2e7d157d 100644
--- a/app/templates/users/user/mandates.hbs
+++ b/app/templates/users/user/mandates.hbs
@@ -2,7 +2,7 @@
   <PageActionsButtons @pageActions={{pageActions}} />
 </EmberWormhole>
 
-<TabbedView @tabItems={{tabItems}}>
+<TabbedView @tabItems={{this.tabItems}}>
   <h5>Incasso mandaten</h5>
 
   <table class='table'>
diff --git a/app/templates/users/user/permissions.hbs b/app/templates/users/user/permissions.hbs
index 960fdaf75..c3f6e9708 100644
--- a/app/templates/users/user/permissions.hbs
+++ b/app/templates/users/user/permissions.hbs
@@ -2,7 +2,7 @@
   <PageActionsButtons @pageActions={{pageActions}} />
 </EmberWormhole>
 
-<TabbedView @tabItems={{tabItems}}>
+<TabbedView @tabItems={{this.tabItems}}>
   <h5>Persoonlijke rechten</h5>
   <div class='table-responsive'>
     <Permissions::PermissionsTable
diff --git a/app/templates/users/user/photos.hbs b/app/templates/users/user/photos.hbs
new file mode 100644
index 000000000..5a4ae4e88
--- /dev/null
+++ b/app/templates/users/user/photos.hbs
@@ -0,0 +1,26 @@
+<EmberWormhole @to='navbar-wormhole'>
+  <PageActionsButtons @pageActions={{pageActions}} />
+</EmberWormhole>
+
+<TabbedView @tabItems={{this.tabItems}}>
+  <h5>Foto's</h5>
+
+  <div class='row px-3'>
+    {{#each @model.sortedPhotos as |photo|}}
+      <div class='col-md-3 col-xs-6 photo-album-image-card'>
+        <LinkTo
+          @route='photo-albums.photo-album.photos.photo'
+          @models={{array photo.photoAlbum photo.id}}
+        >
+          <img class='image' src='{{photo.imageThumbUrl}}' />
+        </LinkTo>
+      </div>
+    {{else}}
+      <div class='alert alert-warning'>
+        <LinkTo @route='photo-albums.photo-album.edit' @model={{model.id}}>
+          Geen foto's gevonden waarin {{ @model.fullName }} getagd is.
+        </LinkTo>
+      </div>
+    {{/each}}
+  </div>
+</TabbedView>
\ No newline at end of file
diff --git a/app/templates/users/user/settings.hbs b/app/templates/users/user/settings.hbs
index d47fecebc..8696b5741 100644
--- a/app/templates/users/user/settings.hbs
+++ b/app/templates/users/user/settings.hbs
@@ -2,7 +2,7 @@
   <PageActionsButtons @pageActions={{pageActions}} />
 </EmberWormhole>
 
-<TabbedView @tabItems={{tabItems}}>
+<TabbedView @tabItems={{this.tabItems}}>
   <p>
     Deze informatie is alleen voor jou, het bestuur en de ICT-commissie
     beschikbaar
diff --git a/app/templates/vacancies/index.hbs b/app/templates/vacancies/index.hbs
index 50a7b31af..0f9567dd9 100644
--- a/app/templates/vacancies/index.hbs
+++ b/app/templates/vacancies/index.hbs
@@ -68,7 +68,7 @@
             </div>
 
             <div class='card-body'>
-              <div class='card-text' itemprop='articleBody'>
+              <div class='card-text pb-2 h-100 d-flex flex-column' itemprop='vacancyBody'>
                 {{! Table without style }}
                 <table class='mb-4'>
                   {{#if vacancy.deadline}}
@@ -90,13 +90,13 @@
                     </tr>
                   {{/if}}
                 </table>
-
+                <div class="flex-grow-1" />
                 <LinkTo
-                  @route='articles.article'
-                  @model={{article.id}}
+                  @route='vacancies.vacancy'
+                  @model={{vacancy.id}}
                   itemprop='url'
                 >
-                  {{t 'tag.button.readMore'}}
+                  <i>{{t 'tag.button.readMore'}}</i>
                 </LinkTo>
               </div>
             </div>
diff --git a/config/environment.js b/config/environment.js
index d09b2ba9b..b46d1fa5c 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -118,7 +118,7 @@ module.exports = function (environment) {
   }
 
   if (deployTarget === 'staging') {
-    ENV.clientId = 'rY_z6I7WAhNjzcIi3B4SB4KelwogD2BUK25D7vn9g1g';
+    ENV.clientId = 'D0HhpORylbWUgOBwyR-0GGDcfsi9PG6zSNgctW--f-4';
   }
 
   return ENV;
diff --git a/config/icons.js b/config/icons.js
index 72107d73c..2484dc720 100644
--- a/config/icons.js
+++ b/config/icons.js
@@ -53,6 +53,7 @@ module.exports = function () {
       'pencil',
       'pen-to-square',
       'people-group',
+      'people-roof',
       'person-circle-plus',
       'phone',
       'plus',
@@ -63,6 +64,7 @@ module.exports = function () {
       'sort',
       'suitcase',
       'strikethrough',
+      'tag',
       'thumbtack',
       'trash',
       'upload',
diff --git a/ember-cli-build.js b/ember-cli-build.js
index d255229ec..43f309a90 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -23,6 +23,7 @@ module.exports = function (defaults) {
     },
 
     babel: {
+      plugins: [...require('ember-cli-code-coverage').buildBabelPlugin()],
       sourceMaps: 'inline',
     },
 
diff --git a/mirage/config.js b/mirage/config.js
index 0bce4bad8..8cd750bce 100644
--- a/mirage/config.js
+++ b/mirage/config.js
@@ -1,4 +1,6 @@
 export default function () {
+  this.passthrough('/write-coverage');
+
   this.namespace = '/api/v1';
 
   this.post(
@@ -28,10 +30,10 @@ export default function () {
   this.resource('activities');
   this.resource('daily_verse');
   this.resource('groups');
-  this.resource('quickpost_messages');
   this.resource('board_room_presences');
   this.resource('photo_albums');
   this.resource('photo_comments');
+  this.resource('photo_tags');
   this.resource('photos');
   this.resource('static_pages');
   this.resource('users');
diff --git a/mirage/models/photo-tag.js b/mirage/models/photo-tag.js
new file mode 100644
index 000000000..1ef1b2fa3
--- /dev/null
+++ b/mirage/models/photo-tag.js
@@ -0,0 +1,7 @@
+import { Model, belongsTo } from 'ember-cli-mirage';
+
+export default Model.extend({
+  author: belongsTo('user'),
+  taggedUser: belongsTo('user'),
+  photo: belongsTo(),
+});
diff --git a/mirage/scenarios/default.js b/mirage/scenarios/default.js
index d210fdea7..10b590205 100644
--- a/mirage/scenarios/default.js
+++ b/mirage/scenarios/default.js
@@ -13,7 +13,7 @@ export default function (server) {
     'photo_album',
     'photo',
     'photo_comment',
-    'quickpost_message',
+    'photo_tag',
     'forum/category',
     'forum/thread',
     'forum/post',
@@ -47,5 +47,4 @@ export default function (server) {
   server.createList('article', 5);
   server.createList('group', 5, 'withMembers');
   server.createList('forum-category', 5, 'withThreads');
-  server.createList('quickpost-message', 10);
 }
diff --git a/package.json b/package.json
index e3c07879b..719b2213a 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/render-modifiers": "^2.0.5",
+    "@ember/render-modifiers": "^2.1.0",
     "@ember/test-helpers": "^2.6.0",
     "@faker-js/faker": "^7.6.0",
     "@fortawesome/ember-fontawesome": "^0.4.1",
@@ -46,6 +46,7 @@
     "ember-can": "^4.2.0",
     "ember-cli": "~4.11.0",
     "ember-cli-babel": "^7.26.10",
+    "ember-cli-code-coverage": "^2.0.0",
     "ember-cli-content-security-policy": "^2.0.3",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-dropzonejs": "^1.3.6",
diff --git a/public/advertisements/bouwhuis.png b/public/advertisements/Baktotaal.png
similarity index 99%
rename from public/advertisements/bouwhuis.png
rename to public/advertisements/Baktotaal.png
index d38f8144a..463a79c48 100644
Binary files a/public/advertisements/bouwhuis.png and b/public/advertisements/Baktotaal.png differ
diff --git a/public/advertisements/BeBo.png b/public/advertisements/BeBo.png
new file mode 100644
index 000000000..9f70a6b64
Binary files /dev/null and b/public/advertisements/BeBo.png differ
diff --git a/public/advertisements/BoeketCadeau.png b/public/advertisements/BoeketCadeau.png
new file mode 100644
index 000000000..9da9df28a
Binary files /dev/null and b/public/advertisements/BoeketCadeau.png differ
diff --git a/public/advertisements/ComfortProducts.png b/public/advertisements/ComfortProducts.png
new file mode 100644
index 000000000..3a431bfa7
Binary files /dev/null and b/public/advertisements/ComfortProducts.png differ
diff --git a/public/advertisements/Huurzone.png b/public/advertisements/Huurzone.png
new file mode 100644
index 000000000..111ee05d8
Binary files /dev/null and b/public/advertisements/Huurzone.png differ
diff --git a/public/advertisements/Inshared.png b/public/advertisements/Inshared.png
new file mode 100644
index 000000000..48f5fbed4
Binary files /dev/null and b/public/advertisements/Inshared.png differ
diff --git a/public/advertisements/LedlampenKopen.png b/public/advertisements/LedlampenKopen.png
new file mode 100644
index 000000000..6350e205e
Binary files /dev/null and b/public/advertisements/LedlampenKopen.png differ
diff --git a/public/advertisements/ParcelPro.png b/public/advertisements/ParcelPro.png
new file mode 100644
index 000000000..077d07a12
Binary files /dev/null and b/public/advertisements/ParcelPro.png differ
diff --git a/public/advertisements/qorting.png b/public/advertisements/Qorting.png
similarity index 100%
rename from public/advertisements/qorting.png
rename to public/advertisements/Qorting.png
diff --git a/public/advertisements/Rike_2022.png b/public/advertisements/Rike_2022.png
new file mode 100644
index 000000000..c51e304dd
Binary files /dev/null and b/public/advertisements/Rike_2022.png differ
diff --git a/public/advertisements/RotimShop.png b/public/advertisements/RotimShop.png
new file mode 100644
index 000000000..90684c110
Binary files /dev/null and b/public/advertisements/RotimShop.png differ
diff --git a/public/advertisements/ShopsUnited.png b/public/advertisements/ShopsUnited.png
new file mode 100644
index 000000000..4e2881e74
Binary files /dev/null and b/public/advertisements/ShopsUnited.png differ
diff --git a/public/advertisements/Sleiderink.png b/public/advertisements/Sleiderink.png
new file mode 100644
index 000000000..7917ade36
Binary files /dev/null and b/public/advertisements/Sleiderink.png differ
diff --git a/public/advertisements/sliponline.png b/public/advertisements/SlipOnline.png
similarity index 96%
rename from public/advertisements/sliponline.png
rename to public/advertisements/SlipOnline.png
index e649b7c08..550701b9a 100644
Binary files a/public/advertisements/sliponline.png and b/public/advertisements/SlipOnline.png differ
diff --git a/public/advertisements/sponsorkliks.png b/public/advertisements/SponsorKliks.png
similarity index 100%
rename from public/advertisements/sponsorkliks.png
rename to public/advertisements/SponsorKliks.png
diff --git a/public/advertisements/stellingstunt.png b/public/advertisements/StellingStunt.png
similarity index 98%
rename from public/advertisements/stellingstunt.png
rename to public/advertisements/StellingStunt.png
index 66174feb7..83c4e18ef 100644
Binary files a/public/advertisements/stellingstunt.png and b/public/advertisements/StellingStunt.png differ
diff --git a/public/advertisements/TrafficToday.jpg b/public/advertisements/TrafficToday.jpg
new file mode 100644
index 000000000..e28822c20
Binary files /dev/null and b/public/advertisements/TrafficToday.jpg differ
diff --git a/public/advertisements/VerzekeringNL.png b/public/advertisements/VerzekeringNL.png
new file mode 100644
index 000000000..4268b1a13
Binary files /dev/null and b/public/advertisements/VerzekeringNL.png differ
diff --git a/public/advertisements/Visser&Visser.png b/public/advertisements/Visser&Visser.png
new file mode 100644
index 000000000..7386577a5
Binary files /dev/null and b/public/advertisements/Visser&Visser.png differ
diff --git a/public/advertisements/inshared.png b/public/advertisements/inshared.png
deleted file mode 100644
index e4f23d5c6..000000000
Binary files a/public/advertisements/inshared.png and /dev/null differ
diff --git a/public/advertisements/led24.png b/public/advertisements/led24.png
deleted file mode 100644
index 76750a6fd..000000000
Binary files a/public/advertisements/led24.png and /dev/null differ
diff --git a/public/advertisements/noppies.png b/public/advertisements/noppies.png
deleted file mode 100644
index d48fe0dd2..000000000
Binary files a/public/advertisements/noppies.png and /dev/null differ
diff --git a/public/advertisements/prefixbroker.png b/public/advertisements/prefixbroker.png
deleted file mode 100644
index a0f8a23a6..000000000
Binary files a/public/advertisements/prefixbroker.png and /dev/null differ
diff --git a/public/advertisements/rike.png b/public/advertisements/rike.png
deleted file mode 100644
index 91c85b936..000000000
Binary files a/public/advertisements/rike.png and /dev/null differ
diff --git a/public/advertisements/rotim.png b/public/advertisements/rotim.png
deleted file mode 100644
index 1de6084da..000000000
Binary files a/public/advertisements/rotim.png and /dev/null differ
diff --git a/public/advertisements/sans.png b/public/advertisements/sans.png
deleted file mode 100644
index 9c101ddc9..000000000
Binary files a/public/advertisements/sans.png and /dev/null differ
diff --git a/public/advertisements/shops-united.png b/public/advertisements/shops-united.png
deleted file mode 100644
index be7188eda..000000000
Binary files a/public/advertisements/shops-united.png and /dev/null differ
diff --git a/public/advertisements/studenten-wegwijzer.png b/public/advertisements/studenten-wegwijzer.png
deleted file mode 100644
index 9beba7870..000000000
Binary files a/public/advertisements/studenten-wegwijzer.png and /dev/null differ
diff --git a/public/advertisements/trendiq.jpg b/public/advertisements/trendiq.jpg
deleted file mode 100644
index f798c6b2c..000000000
Binary files a/public/advertisements/trendiq.jpg and /dev/null differ
diff --git a/public/advertisements/urbansofa.png b/public/advertisements/urbansofa.png
deleted file mode 100644
index ad16fba81..000000000
Binary files a/public/advertisements/urbansofa.png and /dev/null differ
diff --git a/public/advertisements/van-eyck.png b/public/advertisements/van-eyck.png
deleted file mode 100644
index 2a8e136a9..000000000
Binary files a/public/advertisements/van-eyck.png and /dev/null differ
diff --git a/public/advertisements/verzekering.png b/public/advertisements/verzekering.png
deleted file mode 100644
index be5720203..000000000
Binary files a/public/advertisements/verzekering.png and /dev/null differ
diff --git a/public/advertisements/zantman.png b/public/advertisements/zantman.png
deleted file mode 100644
index 37b338b7a..000000000
Binary files a/public/advertisements/zantman.png and /dev/null differ
diff --git a/public/images/alphalogo.svg b/public/images/alphalogo.svg
index eeec565f5..ad3a03046 100644
--- a/public/images/alphalogo.svg
+++ b/public/images/alphalogo.svg
@@ -1,2 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="233.97" height="235.36" enable-background="new 0 0 293.041 286.96" version="1.1" viewBox="0 0 233.97 235.36" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g transform="translate(-30.479,-26.395)"><defs><rect id="SVGID_1_" width="293.04" height="286.96"/></defs><clipPath id="SVGID_2_"><use overflow="visible" xlink:href="#SVGID_1_"/></clipPath><path d="m147.52 46.478-9.938 0.469-9.625 1.562-9.312 2.313-8.844 3.25-8.531 4.031-7.906 4.969-7.469 5.594-6.969 6.218-6.219 6.813-5.593 7.469-4.969 8.062-4.031 8.375-3.25 9-2.313 9.156-1.562 9.625-0.469 9.938 0.469 9.938 1.562 9.625 2.313 9.313 3.25 9 4.031 8.531 4.969 7.906 5.593 7.469 6.219 6.969 6.969 6.219 7.469 5.594 7.906 4.813 8.531 4.188 8.844 3.25 9.312 2.313 9.625 1.563 9.938 0.469 9.937-0.469 9.625-1.563 9.313-2.313 8.844-3.25 8.531-4.188 7.906-4.813 7.469-5.594 6.969-6.219 6.219-6.969 5.594-7.469 4.969-7.906 4.031-8.531 3.25-9 2.313-9.313 1.563-9.625 0.469-9.938-0.469-9.938-1.563-9.625-2.313-9.156-3.25-9-4.031-8.375-4.969-8.062-5.594-7.469-6.219-6.813-6.969-6.218-7.469-5.594-7.906-4.969-8.531-4.031-8.844-3.25-9.313-2.313-9.625-1.562zm-0.625 7.125 3.562 4.375 3.438 4.781 3.094 4.813 2.781 5.281 2.656 5.281 2.469 5.594 2.188 5.75 2 5.875 0.313 1.031 2.813 2.094 2.937 2.469 2.938 2.5 2.812 2.781 2.625 2.938 2.813 3.125 2.468 3.406 2.469 3.406 2.344 3.719 2.188 4.062 2.157 4.032 0.5 1.062 1.062-1.844 3.094-6.218 2.47-6.219 2.187-5.719 1.563-5.281 0.906-4.813 0.469-4.187-0.156 6.187-0.313 6.219-0.594 5.75-0.781 5.75-0.938 5.406-1.25 5.438-1.219 4.969-1.563 4.969-0.375 1.031 0.375 1 1.563 4.969 1.219 5.125 1.25 5.25 0.938 5.438 0.781 5.75 0.594 5.75 0.313 6.188 0.156 6.219-0.469-4.188-0.906-4.813-1.563-5.281-2.187-5.75-2.47-6.031-3.094-6.219-1.094-1.844h-0.063l-0.405 0.906-2.157 4.188-2.188 3.875-2.344 3.75-2.469 3.563-2.468 3.25-2.813 3.281-2.625 2.938-2.812 2.781-2.938 2.5-2.937 2.313-2.595 2.031-0.531 1.844-2 5.906-2.188 5.75-2.469 5.438-2.656 5.438-2.781 4.938-3.094 4.969-3.438 4.531-3.562 4.188-3.094-4.188-3.094-4.531-2.812-4.969-2.625-5.094-2.5-5.281-2.313-5.594-0.875-2.25-0.843-0.094-5.282-1.375-5.125-1.875-4.968-2.469-4.969-2.969-4.656-3.406-4.344-4.031-4.031-4.188-3.719-4.656-3.25-4.969-2.813-5.125-2.312-5.438-1.563-5.749-1.062-5.719-0.313-5.907 2.938 4.813 3.406 4.656 3.563 4.188 3.75 3.875 4.031 3.563 4.187 3.28 4.188 2.782 4.187 2.625 4.344 2.188 4.188 1.875 3.656 1.156-1-4.438-1.094-6.188-0.781-6.062-0.625-6.063-0.469-6.031-0.156-5.906 0.156-6.063 0.469-6.187 0.625-6.219 0.937-6.375 1.094-6.5 0.875-4.125-3.687 1.312-4.188 1.719-4.344 2.188-4.187 2.625-4.188 2.937-4.187 3.125-4.031 3.563-3.75 4.031-3.563 4.187-3.406 4.5-2.938 4.813 0.313-5.906 1.062-5.719 1.563-5.594 2.312-5.437 2.813-5.282 3.25-4.812 3.719-4.656 4.031-4.344 4.344-3.875 4.656-3.406 4.969-2.969 4.968-2.469 5.125-1.875 5.282-1.375 0.718-0.094 1.469-3.968 2.313-5.563 2.5-5.281 2.625-4.813 2.781-4.656 2.812-4.031zm-17.438 31.906-0.718 1.938-2 6.062-1.719 6.188-1.719 6.375-0.5 2.25 0.656-0.219 4.032-1.094 4.031-0.625 3.75-0.312 3.562 0.156 3.25 0.469 7.75 2.312 7.313 3.282 6.969 4.031 6.375 4.656 4.72 4-0.688-5.406-0.937-6.219-1.375-6.031-1.407-6.063-1.406-4.875-0.156-0.093-2.938-2-3.094-1.719-2.969-1.719-3.094-1.375-3.094-1.25-3.125-0.937-2.937-0.938-3.094-0.625-2.969-0.437-2.937-0.313h-5.125zm45.75 39.469 0.093 0.656 0.625 6.063 0.313 6.031 0.156 6.063-0.156 5.906-0.313 6.031-0.625 6.063 1.25-1.094 5.563-5.594 4.969-6.031 4.188-5.594-4.188-5.594-4.969-6.062-5.563-5.719zm16.062 18.5 0.031 0.032v-0.063zm-15.969 18.313-4.813 4.187-6.375 4.657-6.969 3.875-7.313 3.25-7.75 2.344-3.25 0.469-3.562 0.156-3.75-0.313-4.031-0.625-4.032-1.094-0.687-0.219 0.375 1.625 1.562 6.063 1.719 6.063 1.844 5.875 1.312 3.344 4.282 0.531h5.125l2.937-0.313 2.969-0.469 3.094-0.594 2.937-0.938 3.125-0.938 3.094-1.25 3.094-1.375 2.969-1.719 3.094-1.875 2.938-1.844 0.375-0.313 1.188-4.031 1.407-6.063 1.375-6.219 0.937-6.031zm27.719-18.375-0.094-0.25v0.5z" clip-path="url(#SVGID_2_)" fill="#13110c"/><polygon points="104.44 249.03 101.62 248.42 102.2 246.96 104.7 248.43 104.72 248.38 103.8 245.62 105.4 245.39 105.4 248.3 105.44 248.29 107.45 246.2 108.39 247.45 105.84 248.85 105.82 248.9 108.58 249.51 108 250.97 105.6 249.5 105.59 249.53 106.44 252.33 104.85 252.56 104.85 249.67 104.81 249.66 102.81 251.76 101.84 250.51 104.42 249.07" clip-path="url(#SVGID_2_)"/><path d="m88.148 230.2c0.584 0.063 1.729 0.43 2.999 1.218 3.313 2.055 4.041 5.379 2.062 8.568-2.132 3.439-5.82 4.025-9.01 2.046-1.255-0.776-1.975-1.588-2.237-2.029l1.344-1.269c0.362 0.525 0.944 1.144 1.795 1.671 2.121 1.316 4.482 0.936 6.036-1.573 1.433-2.309 1.003-4.591-1.304-6.021-0.76-0.471-1.66-0.814-2.307-0.915z" clip-path="url(#SVGID_2_)"/><polygon points="74.43 228.4 71.305 232.2 69.574 230.78 77.375 221.28 79.107 222.71 75.669 226.89 79.683 230.19 83.121 226 84.854 227.43 77.052 236.92 75.32 235.5 78.445 231.7" clip-path="url(#SVGID_2_)"/><path d="m65.004 226.16c-0.707-0.514-1.633-1.342-2.517-2.286-1.211-1.291-1.808-2.355-1.876-3.44-0.049-0.879 0.314-1.744 1.086-2.467 1.156-1.085 2.677-1.036 3.767-0.459l0.04-0.037c-0.371-0.877-0.108-1.848 0.557-2.871 0.843-1.34 1.655-2.552 1.841-3.049l1.57 1.676c-0.142 0.383-0.661 1.294-1.555 2.581-0.92 1.363-0.906 2.124-0.06 3.08l0.772 0.825 3.685-3.454 1.52 1.623zm2.431-5.325-0.911-0.971c-1.035-1.104-2.256-1.234-3.147-0.399-0.971 0.911-0.801 2.025 0.198 3.089 0.485 0.52 0.837 0.815 1.026 0.938z" clip-path="url(#SVGID_2_)"/><rect transform="matrix(-.7917 .6109 -.6109 -.7917 236.11 341.75)" x="53.652" y="210.01" width="12.285" height="2.242" clip-path="url(#SVGID_2_)"/><path d="m58.966 203.79c-0.027-0.825-0.316-1.959-0.934-2.928-0.762-1.2-1.762-1.516-2.609-0.978-0.783 0.499-0.913 1.316-0.558 2.928 0.482 2.113 0.269 3.783-1.224 4.732-1.707 1.087-3.884 0.483-5.323-1.778-0.714-1.122-0.987-2.095-1.053-2.81l1.807-0.521c0.044 0.512 0.212 1.421 0.83 2.39 0.762 1.199 1.716 1.306 2.331 0.915 0.8-0.509 0.788-1.344 0.445-3.072-0.468-2.229-0.108-3.668 1.384-4.618 1.677-1.066 3.925-0.725 5.618 1.937 0.705 1.107 1.121 2.441 1.13 3.235z" clip-path="url(#SVGID_2_)"/><polygon points="44.328 198.68 40.267 190.34 41.956 189.52 43.502 192.7 52.86 188.14 53.842 190.16 44.483 194.71 46.016 197.86" clip-path="url(#SVGID_2_)"/><polygon points="47.421 179.9 45.698 175.02 47.435 174.41 49.905 181.4 38.318 185.5 35.939 178.76 37.675 178.14 39.308 182.77 42.297 181.71 40.757 177.35 42.477 176.74 44.019 181.1" clip-path="url(#SVGID_2_)"/><polygon points="43.907 168.42 42.764 163.5 44.592 163.08 46.244 170.18 34.279 172.96 33.772 170.78" clip-path="url(#SVGID_2_)"/><rect transform="matrix(-.9904 .1382 -.1382 -.9904 97.04 310.69)" x="31.588" y="157.6" width="12.284" height="2.242" clip-path="url(#SVGID_2_)"/><path d="m30.716 149.99-0.126-2.237 7.954-0.451c3.385-0.192 4.607 1.382 4.742 3.803 0.036 0.637-0.028 1.408-0.182 1.909l-1.819-0.17c0.107-0.372 0.17-0.868 0.141-1.396-0.072-1.274-0.699-2.023-2.828-1.903z" clip-path="url(#SVGID_2_)"/><path d="m30.479 141.52 0.115-2.222 5.646 0.293 3e-3 -0.054c-0.459-0.316-0.879-0.648-1.283-0.961l-4.15-3.448 0.144-2.75 5.006 4.496 7.282-4.132-0.135 2.622-5.807 3.168 1.253 1.179 4.317 0.224-0.116 2.222z" clip-path="url(#SVGID_2_)"/><polygon points="42.31 126.7 43.179 121.59 44.996 121.9 43.75 129.22 31.632 127.16 32.833 120.11 34.647 120.42 33.824 125.26 36.952 125.79 37.73 121.22 39.528 121.53 38.75 126.1" clip-path="url(#SVGID_2_)"/><polygon points="39.991 105.37 40.475 102.53 41.955 103.04 40.604 105.6 40.655 105.62 43.373 104.58 43.668 106.16 40.769 106.3 40.772 106.34 42.964 108.26 41.752 109.24 40.238 106.77 40.186 106.75 39.704 109.54 38.222 109.02 39.579 106.56 39.543 106.55 36.792 107.52 36.489 105.95 39.374 105.81 39.386 105.78 37.189 103.88 38.396 102.85 39.956 105.36" clip-path="url(#SVGID_2_)"/><path d="m51.9 94.946c0.709-0.422 1.563-1.221 2.115-2.229 0.685-1.247 0.479-2.275-0.4-2.757-0.816-0.447-1.593-0.167-2.835 0.921-1.621 1.44-3.188 2.057-4.737 1.207-1.776-0.974-2.295-3.172-1.006-5.523 0.639-1.167 1.361-1.874 1.955-2.276l1.328 1.332c-0.427 0.286-1.143 0.871-1.695 1.878-0.685 1.247-0.318 2.134 0.322 2.485 0.831 0.455 1.557 0.043 2.905-1.089 1.731-1.486 3.164-1.863 4.715-1.012 1.743 0.956 2.526 3.091 1.01 5.856-0.632 1.151-1.6 2.16-2.293 2.549z" clip-path="url(#SVGID_2_)"/><polygon points="49.32 79.662 54.68 72.09 56.213 73.175 54.169 76.061 62.663 82.073 61.368 83.903 52.874 77.891 50.853 80.747" clip-path="url(#SVGID_2_)"/><path d="m59.537 66.288 5.277 4.842c1.774 1.625 3.27 1.638 4.293 0.524 1.096-1.196 0.93-2.659-0.842-4.285l-5.279-4.842 1.515-1.652 5.171 4.743c2.794 2.563 2.712 5.133 0.716 7.309-1.921 2.095-4.335 2.38-7.182-0.232l-5.185-4.755z" clip-path="url(#SVGID_2_)"/><path d="m69.418 56.424c0.681-0.75 1.569-1.623 2.596-2.469 1.775-1.46 3.286-2.091 4.762-2.077 1.544-0.018 3.046 0.659 4.367 2.264 1.402 1.704 1.857 3.432 1.628 4.991-0.237 1.635-1.385 3.311-3.229 4.83-1 0.822-1.807 1.392-2.442 1.796zm8.359 6.628c0.273-0.154 0.642-0.456 0.992-0.746 2.265-1.839 2.571-4.193 0.589-6.601-1.7-2.095-3.908-2.31-6.075-0.526-0.549 0.452-0.896 0.808-1.102 1.073z" clip-path="url(#SVGID_2_)"/><polygon points="89.713 53.947 94.09 51.183 95.073 52.74 88.798 56.701 82.238 46.309 88.282 42.494 89.265 44.051 85.118 46.67 86.811 49.352 90.728 46.88 91.701 48.422 87.784 50.894" clip-path="url(#SVGID_2_)"/><path d="m98.838 50.623-5.204-11.129 2.328-1.089 5.104 3.428c1.306 0.899 2.568 1.878 3.644 2.844l0.033-0.015c-0.843-1.417-1.55-2.838-2.344-4.539l-1.815-3.88 1.883-0.88 5.205 11.129-2.113 0.988-5.2-3.545c-1.282-0.89-2.642-1.904-3.773-2.904l-0.059 0.048c0.755 1.397 1.475 2.851 2.332 4.684l1.861 3.979z" clip-path="url(#SVGID_2_)"/><polygon points="107.47 33.415 116.31 30.579 116.88 32.367 113.51 33.447 116.69 43.36 114.56 44.045 111.38 34.133 108.04 35.203" clip-path="url(#SVGID_2_)"/><polygon points="125.64 39.145 130.71 38.133 131.07 39.938 123.8 41.388 121.4 29.34 128.4 27.943 128.76 29.749 123.96 30.707 124.58 33.817 129.12 32.913 129.47 34.7 124.93 35.604" clip-path="url(#SVGID_2_)"/><path d="m135.34 39.318-0.843-12.253 2.564-0.178 3.525 5.037c0.894 1.309 1.719 2.677 2.373 3.965l0.036-2e-3c-0.275-1.625-0.421-3.205-0.55-5.077l-0.293-4.273 2.073-0.142 0.843 12.253-2.328 0.161-3.572-5.179c-0.874-1.292-1.777-2.728-2.472-4.068l-0.072 0.023c0.201 1.575 0.349 3.191 0.487 5.209l0.303 4.381z" clip-path="url(#SVGID_2_)"/><polygon points="160.67 30.139 163.55 29.985 163.37 31.543 160.58 30.789 160.57 30.843 162.19 33.262 160.71 33.904 159.94 31.103 159.9 31.117 158.52 33.676 157.28 32.713 159.36 30.69 159.37 30.635 156.55 30.778 156.72 29.22 159.42 29.999 159.42 29.963 157.87 27.496 159.33 26.853 160.1 29.635 160.14 29.64 161.51 27.078 162.78 28.028 160.68 30.103" clip-path="url(#SVGID_2_)"/><path d="m174.9 42.385-0.468-12.903 2.35 0.666 0.085 5.841c0.032 1.621 0.048 3.103-0.062 4.625l0.034 0.01c0.715-1.313 1.561-2.627 2.425-3.935l3.252-4.913 2.297 0.652-7.441 10.659z" clip-path="url(#SVGID_2_)"/><polygon points="187.7 44.757 192.47 46.758 191.76 48.456 184.92 45.588 189.67 34.255 196.26 37.017 195.55 38.716 191.02 36.821 189.8 39.745 194.07 41.536 193.36 43.217 189.09 41.427" clip-path="url(#SVGID_2_)"/><path d="m201.65 39.85c0.83 0.279 1.962 0.795 3.089 1.432 1.54 0.871 2.428 1.709 2.816 2.725 0.309 0.824 0.22 1.758-0.301 2.679-0.782 1.381-2.247 1.787-3.461 1.562l-0.026 0.047c0.615 0.726 0.654 1.733 0.324 2.907-0.405 1.531-0.819 2.931-0.848 3.46l-1.999-1.131c0.021-0.407 0.244-1.433 0.713-2.928 0.474-1.576 0.232-2.298-0.859-2.959l-0.985-0.557-2.487 4.397-1.936-1.096zm-0.728 5.809 1.159 0.655c1.317 0.745 2.521 0.505 3.123-0.558 0.654-1.159 0.16-2.172-1.109-2.89-0.619-0.351-1.043-0.527-1.26-0.588z" clip-path="url(#SVGID_2_)"/><polygon points="209.51 56.778 213.68 59.839 212.6 61.324 206.61 56.938 213.88 47.028 219.64 51.252 218.55 52.737 214.6 49.838 212.72 52.396 216.45 55.134 215.38 56.604 211.64 53.868" clip-path="url(#SVGID_2_)"/><path d="m215.94 64.048 8.456-8.918 1.865 1.768-1.322 6.007c-0.359 1.544-0.809 3.079-1.313 4.434l0.025 0.025c1.011-1.304 2.075-2.48 3.367-3.843l2.949-3.11 1.509 1.43-8.456 8.919-1.694-1.606 1.397-6.138c0.358-1.519 0.806-3.156 1.32-4.575l-0.063-0.038c-1.025 1.214-2.115 2.417-3.508 3.886l-3.023 3.189z" clip-path="url(#SVGID_2_)"/><rect transform="matrix(.7606 -.6492 .6492 .7606 9.1093 167.54)" x="225.59" y="70.297" width="12.284" height="2.242" clip-path="url(#SVGID_2_)"/><path d="m237.02 87.866c-0.686-0.479-1.885-1.513-2.805-2.848-1.179-1.711-1.643-3.317-1.388-4.907 0.234-1.49 1.218-2.921 2.748-3.975 3.223-2.198 6.824-1.338 9.132 2.009 0.856 1.245 1.274 2.396 1.369 3.016l-1.765 0.619c-0.127-0.731-0.412-1.53-1.146-2.596-1.491-2.161-3.811-2.798-6.167-1.174-2.295 1.582-2.689 3.933-1.242 6.034 0.466 0.675 0.888 1.093 1.158 1.261l2.535-1.747-1.23-1.786 1.456-1.003 2.461 3.572z" clip-path="url(#SVGID_2_)"/><rect transform="matrix(.8777 -.4791 .4791 .8777 -13.372 128.33)" x="238.65" y="89.248" width="12.29" height="2.244" clip-path="url(#SVGID_2_)"/><path d="m242.27 98.7 11.342-4.734 0.99 2.373-3.641 4.958c-0.953 1.267-1.985 2.488-2.996 3.523l0.015 0.033c1.451-0.783 2.901-1.429 4.635-2.152l3.954-1.65 0.801 1.918-11.342 4.735-0.898-2.154 3.761-5.049c0.943-1.243 2.014-2.56 3.062-3.649l-0.045-0.06c-1.429 0.696-2.913 1.354-4.781 2.134l-4.055 1.692z" clip-path="url(#SVGID_2_)"/><path d="m250.64 121.76c-0.48-0.685-1.256-2.065-1.668-3.635-0.526-2.011-0.416-3.68 0.364-5.091 0.729-1.322 2.143-2.332 3.942-2.803 3.78-0.971 6.876 1.066 7.906 5 0.383 1.465 0.383 2.689 0.261 3.306l-1.87-0.02c0.129-0.731 0.134-1.58-0.195-2.833-0.665-2.54-2.63-3.93-5.4-3.205-2.699 0.706-3.87 2.785-3.225 5.255 0.208 0.794 0.462 1.331 0.659 1.581l2.981-0.781-0.55-2.099 1.711-0.448 1.1 4.199z" clip-path="url(#SVGID_2_)"/><polygon points="261.28 135.34 261.97 138.14 260.41 138.26 260.62 135.38 260.57 135.38 258.5 137.42 257.59 136.08 260.2 134.81 260.18 134.77 257.4 133.88 258.12 132.5 260.5 134.16 260.55 134.16 259.89 131.41 261.45 131.29 261.19 134.09 261.22 134.09 263.36 132.1 264.26 133.42 261.67 134.69 261.67 134.73 264.44 135.6 263.75 137.02 261.32 135.34" clip-path="url(#SVGID_2_)"/><polygon points="253.69 151.86 253.22 157.02 251.39 156.85 252.06 149.46 264.3 150.58 263.65 157.7 261.81 157.53 262.26 152.65 259.1 152.36 258.68 156.97 256.86 156.8 257.29 152.19" clip-path="url(#SVGID_2_)"/><path d="m250.78 161.12 11.997 2.636-0.55 2.51-5.826 1.968c-1.508 0.489-3.053 0.896-4.472 1.163l-8e-3 0.035c1.636 0.191 3.192 0.496 5.026 0.899l4.183 0.919-0.445 2.029-11.998-2.636 0.5-2.278 5.976-1.972c1.485-0.477 3.118-0.938 4.6-1.229l-2e-3 -0.075c-1.567-0.251-3.161-0.563-5.137-0.997l-4.29-0.942z" clip-path="url(#SVGID_2_)"/><path d="m249.55 176.18c-0.632 0.528-1.349 1.455-1.734 2.537-0.476 1.341-0.109 2.321 0.836 2.658 0.877 0.312 1.6-0.09 2.651-1.36 1.371-1.681 2.818-2.539 4.485-1.947 1.907 0.678 2.771 2.765 1.873 5.291-0.445 1.254-1.045 2.066-1.567 2.558l-1.524-1.103c0.376-0.351 0.99-1.041 1.375-2.123 0.476-1.341-0.026-2.158-0.713-2.403-0.894-0.317-1.545 0.206-2.695 1.539-1.471 1.742-2.826 2.343-4.492 1.751-1.874-0.666-2.987-2.647-1.933-5.621 0.441-1.237 1.236-2.386 1.858-2.881z" clip-path="url(#SVGID_2_)"/><path d="m239.4 194.52c7e-3 -0.588 0.266-1.763 0.931-3.1 1.737-3.491 4.979-4.524 8.341-2.853 3.621 1.802 4.549 5.419 2.876 8.778-0.656 1.322-1.397 2.113-1.813 2.416l-1.388-1.219c0.488-0.409 1.05-1.045 1.496-1.943 1.112-2.234 0.513-4.548-2.131-5.862-2.431-1.21-4.663-0.57-5.871 1.861-0.398 0.8-0.656 1.729-0.696 2.382z" clip-path="url(#SVGID_2_)"/><polygon points="238.88 208.34 242.96 211.1 241.7 212.96 231.52 206.07 232.78 204.21 237.27 207.24 240.18 202.94 235.69 199.91 236.95 198.05 247.13 204.93 245.87 206.79 241.79 204.03" clip-path="url(#SVGID_2_)"/><polygon points="228.34 212.8 224.92 216.68 223.54 215.47 228.44 209.9 237.67 218.01 232.95 223.38 231.56 222.16 234.8 218.48 232.42 216.39 229.36 219.86 227.99 218.66 231.05 215.18" clip-path="url(#SVGID_2_)"/><path d="m228.55 227.67c-0.655 0.772-1.512 1.676-2.511 2.557-1.723 1.521-3.213 2.204-4.688 2.24-1.542 0.071-3.067-0.554-4.442-2.112-1.46-1.654-1.974-3.366-1.798-4.932 0.18-1.644 1.269-3.358 3.06-4.939 0.972-0.856 1.759-1.454 2.378-1.881zm-8.585-6.338c-0.269 0.164-0.624 0.479-0.966 0.779-2.2 1.917-2.426 4.281-0.361 6.619 1.772 2.037 3.986 2.175 6.093 0.316 0.533-0.471 0.865-0.838 1.064-1.11z" clip-path="url(#SVGID_2_)"/><polygon points="208.33 230.85 204.05 233.76 203.01 232.24 209.15 228.07 216.06 238.24 210.15 242.25 209.11 240.73 213.17 237.97 211.39 235.35 207.55 237.95 206.53 236.44 210.36 233.84" clip-path="url(#SVGID_2_)"/><polygon points="194.57 247.29 192.19 248.91 191.53 247.49 194.32 246.69 194.29 246.64 191.66 245.4 192.6 244.09 194.7 246.09 194.73 246.06 194.59 243.15 196.14 243.34 195.41 246.14 195.43 246.2 197.77 244.62 198.43 246.04 195.72 246.77 195.73 246.8 198.34 248.11 197.42 249.42 195.32 247.43 195.29 247.45 195.44 250.35 193.86 250.19 194.59 247.33" clip-path="url(#SVGID_2_)"/><path d="m124.4 245.34 1.752 14.598-3.055-0.741-0.288-3.227-5.004-1.216-1.773 2.725-2.962-0.72 8.313-12.152zm-1.826 8.25-0.494-5.32-0.037-0.01-2.937 4.488z" clip-path="url(#SVGID_2_)"/><polygon points="139.81 259.02 139.52 261.56 129.84 260.45 131.4 246.77 134.41 247.11 133.14 258.26" clip-path="url(#SVGID_2_)"/><path d="m149.82 247.92c0.861-9e-3 1.596 0.11 2.203 0.355 0.605 0.244 1.102 0.57 1.485 0.978 0.383 0.407 0.664 0.873 0.843 1.4 0.18 0.524 0.271 1.07 0.277 1.636 6e-3 0.553-0.076 1.097-0.244 1.633-0.168 0.535-0.439 1.011-0.814 1.427-0.375 0.414-0.864 0.751-1.465 1.007-0.603 0.258-1.334 0.39-2.194 0.398l-3.184 0.032 0.05 4.938-3.028 0.03-0.14-13.771zm-0.763 6.49c0.347-4e-3 0.682-0.032 1.002-0.087 0.321-0.055 0.604-0.158 0.846-0.31 0.243-0.148 0.437-0.359 0.582-0.631 0.146-0.272 0.217-0.627 0.211-1.063-4e-3 -0.438-0.082-0.79-0.232-1.06-0.15-0.267-0.35-0.475-0.595-0.621-0.246-0.145-0.53-0.241-0.852-0.289-0.321-0.049-0.657-0.07-1.004-0.066l-2.354 0.023 0.043 4.128z" clip-path="url(#SVGID_2_)"/><polygon points="166.5 251.63 165.72 246.4 168.72 245.95 170.74 259.58 167.75 260.02 166.88 254.15 161.36 254.97 162.24 260.84 159.24 261.29 157.22 247.66 160.21 247.22 160.99 252.45" clip-path="url(#SVGID_2_)"/><path d="m178.61 243.24 8.84 11.749-3.015 0.891-1.869-2.646-4.938 1.458-0.167 3.246-2.923 0.864 1.093-14.683zm2.561 8.053-3.098-4.354-0.036 0.011-0.289 5.354z" clip-path="url(#SVGID_2_)"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="233.97" height="235.36" enable-background="new 0 0 293.041 286.96" version="1.1" viewBox="0 0 233.97 235.36" xml:space="preserve"><g transform="translate(-30.479,-26.395)"><defs><rect id="SVGID_1_" width="293.04" height="286.96"/></defs><clipPath id="SVGID_2_"><use overflow="visible" xlink:href="#SVGID_1_"/></clipPath><path fill="#13110c" d="m147.52 46.478-9.938 0.469-9.625 1.562-9.312 2.313-8.844 3.25-8.531 4.031-7.906 4.969-7.469 5.594-6.969 6.218-6.219 6.813-5.593 7.469-4.969 8.062-4.031 8.375-3.25 9-2.313 9.156-1.562 9.625-0.469 9.938 0.469 9.938 1.562 9.625 2.313 9.313 3.25 9 4.031 8.531 4.969 7.906 5.593 7.469 6.219 6.969 6.969 6.219 7.469 5.594 7.906 4.813 8.531 4.188 8.844 3.25 9.312 2.313 9.625 1.563 9.938 0.469 9.937-0.469 9.625-1.563 9.313-2.313 8.844-3.25 8.531-4.188 7.906-4.813 7.469-5.594 6.969-6.219 6.219-6.969 5.594-7.469 4.969-7.906 4.031-8.531 3.25-9 2.313-9.313 1.563-9.625 0.469-9.938-0.469-9.938-1.563-9.625-2.313-9.156-3.25-9-4.031-8.375-4.969-8.062-5.594-7.469-6.219-6.813-6.969-6.218-7.469-5.594-7.906-4.969-8.531-4.031-8.844-3.25-9.313-2.313-9.625-1.562zm-0.625 7.125 3.562 4.375 3.438 4.781 3.094 4.813 2.781 5.281 2.656 5.281 2.469 5.594 2.188 5.75 2 5.875 0.313 1.031 2.813 2.094 2.937 2.469 2.938 2.5 2.812 2.781 2.625 2.938 2.813 3.125 2.468 3.406 2.469 3.406 2.344 3.719 2.188 4.062 2.157 4.032 0.5 1.062 1.062-1.844 3.094-6.218 2.47-6.219 2.187-5.719 1.563-5.281 0.906-4.813 0.469-4.187-0.156 6.187-0.313 6.219-0.594 5.75-0.781 5.75-0.938 5.406-1.25 5.438-1.219 4.969-1.563 4.969-0.375 1.031 0.375 1 1.563 4.969 1.219 5.125 1.25 5.25 0.938 5.438 0.781 5.75 0.594 5.75 0.313 6.188 0.156 6.219-0.469-4.188-0.906-4.813-1.563-5.281-2.187-5.75-2.47-6.031-3.094-6.219-1.094-1.844h-0.063l-0.405 0.906-2.157 4.188-2.188 3.875-2.344 3.75-2.469 3.563-2.468 3.25-2.813 3.281-2.625 2.938-2.812 2.781-2.938 2.5-2.937 2.313-2.595 2.031-0.531 1.844-2 5.906-2.188 5.75-2.469 5.438-2.656 5.438-2.781 4.938-3.094 4.969-3.438 4.531-3.562 4.188-3.094-4.188-3.094-4.531-2.812-4.969-2.625-5.094-2.5-5.281-2.313-5.594-0.875-2.25-0.843-0.094-5.282-1.375-5.125-1.875-4.968-2.469-4.969-2.969-4.656-3.406-4.344-4.031-4.031-4.188-3.719-4.656-3.25-4.969-2.813-5.125-2.312-5.438-1.563-5.749-1.062-5.719-0.313-5.907 2.938 4.813 3.406 4.656 3.563 4.188 3.75 3.875 4.031 3.563 4.187 3.28 4.188 2.782 4.187 2.625 4.344 2.188 4.188 1.875 3.656 1.156-1-4.438-1.094-6.188-0.781-6.062-0.625-6.063-0.469-6.031-0.156-5.906 0.156-6.063 0.469-6.187 0.625-6.219 0.937-6.375 1.094-6.5 0.875-4.125-3.687 1.312-4.188 1.719-4.344 2.188-4.187 2.625-4.188 2.937-4.187 3.125-4.031 3.563-3.75 4.031-3.563 4.187-3.406 4.5-2.938 4.813 0.313-5.906 1.062-5.719 1.563-5.594 2.312-5.437 2.813-5.282 3.25-4.812 3.719-4.656 4.031-4.344 4.344-3.875 4.656-3.406 4.969-2.969 4.968-2.469 5.125-1.875 5.282-1.375 0.718-0.094 1.469-3.968 2.313-5.563 2.5-5.281 2.625-4.813 2.781-4.656 2.812-4.031zm-17.438 31.906-0.718 1.938-2 6.062-1.719 6.188-1.719 6.375-0.5 2.25 0.656-0.219 4.032-1.094 4.031-0.625 3.75-0.312 3.562 0.156 3.25 0.469 7.75 2.312 7.313 3.282 6.969 4.031 6.375 4.656 4.72 4-0.688-5.406-0.937-6.219-1.375-6.031-1.407-6.063-1.406-4.875-0.156-0.093-2.938-2-3.094-1.719-2.969-1.719-3.094-1.375-3.094-1.25-3.125-0.937-2.937-0.938-3.094-0.625-2.969-0.437-2.937-0.313h-5.125zm45.75 39.469 0.093 0.656 0.625 6.063 0.313 6.031 0.156 6.063-0.156 5.906-0.313 6.031-0.625 6.063 1.25-1.094 5.563-5.594 4.969-6.031 4.188-5.594-4.188-5.594-4.969-6.062-5.563-5.719zm16.062 18.5 0.031 0.032v-0.063zm-15.969 18.313-4.813 4.187-6.375 4.657-6.969 3.875-7.313 3.25-7.75 2.344-3.25 0.469-3.562 0.156-3.75-0.313-4.031-0.625-4.032-1.094-0.687-0.219 0.375 1.625 1.562 6.063 1.719 6.063 1.844 5.875 1.312 3.344 4.282 0.531h5.125l2.937-0.313 2.969-0.469 3.094-0.594 2.937-0.938 3.125-0.938 3.094-1.25 3.094-1.375 2.969-1.719 3.094-1.875 2.938-1.844 0.375-0.313 1.188-4.031 1.407-6.063 1.375-6.219 0.937-6.031zm27.719-18.375-0.094-0.25v0.5z" clip-path="url(#SVGID_2_)"/><polygon points="104.44 249.03 101.62 248.42 102.2 246.96 104.7 248.43 104.72 248.38 103.8 245.62 105.4 245.39 105.4 248.3 105.44 248.29 107.45 246.2 108.39 247.45 105.84 248.85 105.82 248.9 108.58 249.51 108 250.97 105.6 249.5 105.59 249.53 106.44 252.33 104.85 252.56 104.85 249.67 104.81 249.66 102.81 251.76 101.84 250.51 104.42 249.07" clip-path="url(#SVGID_2_)"/><path d="m88.148 230.2c0.584 0.063 1.729 0.43 2.999 1.218 3.313 2.055 4.041 5.379 2.062 8.568-2.132 3.439-5.82 4.025-9.01 2.046-1.255-0.776-1.975-1.588-2.237-2.029l1.344-1.269c0.362 0.525 0.944 1.144 1.795 1.671 2.121 1.316 4.482 0.936 6.036-1.573 1.433-2.309 1.003-4.591-1.304-6.021-0.76-0.471-1.66-0.814-2.307-0.915z" clip-path="url(#SVGID_2_)"/><polygon points="74.43 228.4 71.305 232.2 69.574 230.78 77.375 221.28 79.107 222.71 75.669 226.89 79.683 230.19 83.121 226 84.854 227.43 77.052 236.92 75.32 235.5 78.445 231.7" clip-path="url(#SVGID_2_)"/><path d="m65.004 226.16c-0.707-0.514-1.633-1.342-2.517-2.286-1.211-1.291-1.808-2.355-1.876-3.44-0.049-0.879 0.314-1.744 1.086-2.467 1.156-1.085 2.677-1.036 3.767-0.459l0.04-0.037c-0.371-0.877-0.108-1.848 0.557-2.871 0.843-1.34 1.655-2.552 1.841-3.049l1.57 1.676c-0.142 0.383-0.661 1.294-1.555 2.581-0.92 1.363-0.906 2.124-0.06 3.08l0.772 0.825 3.685-3.454 1.52 1.623zm2.431-5.325-0.911-0.971c-1.035-1.104-2.256-1.234-3.147-0.399-0.971 0.911-0.801 2.025 0.198 3.089 0.485 0.52 0.837 0.815 1.026 0.938z" clip-path="url(#SVGID_2_)"/><rect width="12.285" height="2.242" x="53.652" y="210.01" clip-path="url(#SVGID_2_)" transform="matrix(-.7917 .6109 -.6109 -.7917 236.11 341.75)"/><path d="m58.966 203.79c-0.027-0.825-0.316-1.959-0.934-2.928-0.762-1.2-1.762-1.516-2.609-0.978-0.783 0.499-0.913 1.316-0.558 2.928 0.482 2.113 0.269 3.783-1.224 4.732-1.707 1.087-3.884 0.483-5.323-1.778-0.714-1.122-0.987-2.095-1.053-2.81l1.807-0.521c0.044 0.512 0.212 1.421 0.83 2.39 0.762 1.199 1.716 1.306 2.331 0.915 0.8-0.509 0.788-1.344 0.445-3.072-0.468-2.229-0.108-3.668 1.384-4.618 1.677-1.066 3.925-0.725 5.618 1.937 0.705 1.107 1.121 2.441 1.13 3.235z" clip-path="url(#SVGID_2_)"/><polygon points="44.328 198.68 40.267 190.34 41.956 189.52 43.502 192.7 52.86 188.14 53.842 190.16 44.483 194.71 46.016 197.86" clip-path="url(#SVGID_2_)"/><polygon points="47.421 179.9 45.698 175.02 47.435 174.41 49.905 181.4 38.318 185.5 35.939 178.76 37.675 178.14 39.308 182.77 42.297 181.71 40.757 177.35 42.477 176.74 44.019 181.1" clip-path="url(#SVGID_2_)"/><polygon points="43.907 168.42 42.764 163.5 44.592 163.08 46.244 170.18 34.279 172.96 33.772 170.78" clip-path="url(#SVGID_2_)"/><rect width="12.284" height="2.242" x="31.588" y="157.6" clip-path="url(#SVGID_2_)" transform="matrix(-.9904 .1382 -.1382 -.9904 97.04 310.69)"/><path d="m30.716 149.99-0.126-2.237 7.954-0.451c3.385-0.192 4.607 1.382 4.742 3.803 0.036 0.637-0.028 1.408-0.182 1.909l-1.819-0.17c0.107-0.372 0.17-0.868 0.141-1.396-0.072-1.274-0.699-2.023-2.828-1.903z" clip-path="url(#SVGID_2_)"/><path d="m30.479 141.52 0.115-2.222 5.646 0.293 3e-3 -0.054c-0.459-0.316-0.879-0.648-1.283-0.961l-4.15-3.448 0.144-2.75 5.006 4.496 7.282-4.132-0.135 2.622-5.807 3.168 1.253 1.179 4.317 0.224-0.116 2.222z" clip-path="url(#SVGID_2_)"/><polygon points="42.31 126.7 43.179 121.59 44.996 121.9 43.75 129.22 31.632 127.16 32.833 120.11 34.647 120.42 33.824 125.26 36.952 125.79 37.73 121.22 39.528 121.53 38.75 126.1" clip-path="url(#SVGID_2_)"/><polygon points="39.991 105.37 40.475 102.53 41.955 103.04 40.604 105.6 40.655 105.62 43.373 104.58 43.668 106.16 40.769 106.3 40.772 106.34 42.964 108.26 41.752 109.24 40.238 106.77 40.186 106.75 39.704 109.54 38.222 109.02 39.579 106.56 39.543 106.55 36.792 107.52 36.489 105.95 39.374 105.81 39.386 105.78 37.189 103.88 38.396 102.85 39.956 105.36" clip-path="url(#SVGID_2_)"/><path d="m51.9 94.946c0.709-0.422 1.563-1.221 2.115-2.229 0.685-1.247 0.479-2.275-0.4-2.757-0.816-0.447-1.593-0.167-2.835 0.921-1.621 1.44-3.188 2.057-4.737 1.207-1.776-0.974-2.295-3.172-1.006-5.523 0.639-1.167 1.361-1.874 1.955-2.276l1.328 1.332c-0.427 0.286-1.143 0.871-1.695 1.878-0.685 1.247-0.318 2.134 0.322 2.485 0.831 0.455 1.557 0.043 2.905-1.089 1.731-1.486 3.164-1.863 4.715-1.012 1.743 0.956 2.526 3.091 1.01 5.856-0.632 1.151-1.6 2.16-2.293 2.549z" clip-path="url(#SVGID_2_)"/><polygon points="49.32 79.662 54.68 72.09 56.213 73.175 54.169 76.061 62.663 82.073 61.368 83.903 52.874 77.891 50.853 80.747" clip-path="url(#SVGID_2_)"/><path d="m59.537 66.288 5.277 4.842c1.774 1.625 3.27 1.638 4.293 0.524 1.096-1.196 0.93-2.659-0.842-4.285l-5.279-4.842 1.515-1.652 5.171 4.743c2.794 2.563 2.712 5.133 0.716 7.309-1.921 2.095-4.335 2.38-7.182-0.232l-5.185-4.755z" clip-path="url(#SVGID_2_)"/><path d="m69.418 56.424c0.681-0.75 1.569-1.623 2.596-2.469 1.775-1.46 3.286-2.091 4.762-2.077 1.544-0.018 3.046 0.659 4.367 2.264 1.402 1.704 1.857 3.432 1.628 4.991-0.237 1.635-1.385 3.311-3.229 4.83-1 0.822-1.807 1.392-2.442 1.796zm8.359 6.628c0.273-0.154 0.642-0.456 0.992-0.746 2.265-1.839 2.571-4.193 0.589-6.601-1.7-2.095-3.908-2.31-6.075-0.526-0.549 0.452-0.896 0.808-1.102 1.073z" clip-path="url(#SVGID_2_)"/><polygon points="89.713 53.947 94.09 51.183 95.073 52.74 88.798 56.701 82.238 46.309 88.282 42.494 89.265 44.051 85.118 46.67 86.811 49.352 90.728 46.88 91.701 48.422 87.784 50.894" clip-path="url(#SVGID_2_)"/><path d="m98.838 50.623-5.204-11.129 2.328-1.089 5.104 3.428c1.306 0.899 2.568 1.878 3.644 2.844l0.033-0.015c-0.843-1.417-1.55-2.838-2.344-4.539l-1.815-3.88 1.883-0.88 5.205 11.129-2.113 0.988-5.2-3.545c-1.282-0.89-2.642-1.904-3.773-2.904l-0.059 0.048c0.755 1.397 1.475 2.851 2.332 4.684l1.861 3.979z" clip-path="url(#SVGID_2_)"/><polygon points="107.47 33.415 116.31 30.579 116.88 32.367 113.51 33.447 116.69 43.36 114.56 44.045 111.38 34.133 108.04 35.203" clip-path="url(#SVGID_2_)"/><polygon points="125.64 39.145 130.71 38.133 131.07 39.938 123.8 41.388 121.4 29.34 128.4 27.943 128.76 29.749 123.96 30.707 124.58 33.817 129.12 32.913 129.47 34.7 124.93 35.604" clip-path="url(#SVGID_2_)"/><path d="m135.34 39.318-0.843-12.253 2.564-0.178 3.525 5.037c0.894 1.309 1.719 2.677 2.373 3.965l0.036-2e-3c-0.275-1.625-0.421-3.205-0.55-5.077l-0.293-4.273 2.073-0.142 0.843 12.253-2.328 0.161-3.572-5.179c-0.874-1.292-1.777-2.728-2.472-4.068l-0.072 0.023c0.201 1.575 0.349 3.191 0.487 5.209l0.303 4.381z" clip-path="url(#SVGID_2_)"/><polygon points="160.67 30.139 163.55 29.985 163.37 31.543 160.58 30.789 160.57 30.843 162.19 33.262 160.71 33.904 159.94 31.103 159.9 31.117 158.52 33.676 157.28 32.713 159.36 30.69 159.37 30.635 156.55 30.778 156.72 29.22 159.42 29.999 159.42 29.963 157.87 27.496 159.33 26.853 160.1 29.635 160.14 29.64 161.51 27.078 162.78 28.028 160.68 30.103" clip-path="url(#SVGID_2_)"/><path d="m174.9 42.385-0.468-12.903 2.35 0.666 0.085 5.841c0.032 1.621 0.048 3.103-0.062 4.625l0.034 0.01c0.715-1.313 1.561-2.627 2.425-3.935l3.252-4.913 2.297 0.652-7.441 10.659z" clip-path="url(#SVGID_2_)"/><polygon points="187.7 44.757 192.47 46.758 191.76 48.456 184.92 45.588 189.67 34.255 196.26 37.017 195.55 38.716 191.02 36.821 189.8 39.745 194.07 41.536 193.36 43.217 189.09 41.427" clip-path="url(#SVGID_2_)"/><path d="m201.65 39.85c0.83 0.279 1.962 0.795 3.089 1.432 1.54 0.871 2.428 1.709 2.816 2.725 0.309 0.824 0.22 1.758-0.301 2.679-0.782 1.381-2.247 1.787-3.461 1.562l-0.026 0.047c0.615 0.726 0.654 1.733 0.324 2.907-0.405 1.531-0.819 2.931-0.848 3.46l-1.999-1.131c0.021-0.407 0.244-1.433 0.713-2.928 0.474-1.576 0.232-2.298-0.859-2.959l-0.985-0.557-2.487 4.397-1.936-1.096zm-0.728 5.809 1.159 0.655c1.317 0.745 2.521 0.505 3.123-0.558 0.654-1.159 0.16-2.172-1.109-2.89-0.619-0.351-1.043-0.527-1.26-0.588z" clip-path="url(#SVGID_2_)"/><polygon points="209.51 56.778 213.68 59.839 212.6 61.324 206.61 56.938 213.88 47.028 219.64 51.252 218.55 52.737 214.6 49.838 212.72 52.396 216.45 55.134 215.38 56.604 211.64 53.868" clip-path="url(#SVGID_2_)"/><path d="m215.94 64.048 8.456-8.918 1.865 1.768-1.322 6.007c-0.359 1.544-0.809 3.079-1.313 4.434l0.025 0.025c1.011-1.304 2.075-2.48 3.367-3.843l2.949-3.11 1.509 1.43-8.456 8.919-1.694-1.606 1.397-6.138c0.358-1.519 0.806-3.156 1.32-4.575l-0.063-0.038c-1.025 1.214-2.115 2.417-3.508 3.886l-3.023 3.189z" clip-path="url(#SVGID_2_)"/><rect width="12.284" height="2.242" x="225.59" y="70.297" clip-path="url(#SVGID_2_)" transform="matrix(.7606 -.6492 .6492 .7606 9.1093 167.54)"/><path d="m237.02 87.866c-0.686-0.479-1.885-1.513-2.805-2.848-1.179-1.711-1.643-3.317-1.388-4.907 0.234-1.49 1.218-2.921 2.748-3.975 3.223-2.198 6.824-1.338 9.132 2.009 0.856 1.245 1.274 2.396 1.369 3.016l-1.765 0.619c-0.127-0.731-0.412-1.53-1.146-2.596-1.491-2.161-3.811-2.798-6.167-1.174-2.295 1.582-2.689 3.933-1.242 6.034 0.466 0.675 0.888 1.093 1.158 1.261l2.535-1.747-1.23-1.786 1.456-1.003 2.461 3.572z" clip-path="url(#SVGID_2_)"/><rect width="12.29" height="2.244" x="238.65" y="89.248" clip-path="url(#SVGID_2_)" transform="matrix(.8777 -.4791 .4791 .8777 -13.372 128.33)"/><path d="m242.27 98.7 11.342-4.734 0.99 2.373-3.641 4.958c-0.953 1.267-1.985 2.488-2.996 3.523l0.015 0.033c1.451-0.783 2.901-1.429 4.635-2.152l3.954-1.65 0.801 1.918-11.342 4.735-0.898-2.154 3.761-5.049c0.943-1.243 2.014-2.56 3.062-3.649l-0.045-0.06c-1.429 0.696-2.913 1.354-4.781 2.134l-4.055 1.692z" clip-path="url(#SVGID_2_)"/><path d="m250.64 121.76c-0.48-0.685-1.256-2.065-1.668-3.635-0.526-2.011-0.416-3.68 0.364-5.091 0.729-1.322 2.143-2.332 3.942-2.803 3.78-0.971 6.876 1.066 7.906 5 0.383 1.465 0.383 2.689 0.261 3.306l-1.87-0.02c0.129-0.731 0.134-1.58-0.195-2.833-0.665-2.54-2.63-3.93-5.4-3.205-2.699 0.706-3.87 2.785-3.225 5.255 0.208 0.794 0.462 1.331 0.659 1.581l2.981-0.781-0.55-2.099 1.711-0.448 1.1 4.199z" clip-path="url(#SVGID_2_)"/><polygon points="261.28 135.34 261.97 138.14 260.41 138.26 260.62 135.38 260.57 135.38 258.5 137.42 257.59 136.08 260.2 134.81 260.18 134.77 257.4 133.88 258.12 132.5 260.5 134.16 260.55 134.16 259.89 131.41 261.45 131.29 261.19 134.09 261.22 134.09 263.36 132.1 264.26 133.42 261.67 134.69 261.67 134.73 264.44 135.6 263.75 137.02 261.32 135.34" clip-path="url(#SVGID_2_)"/><polygon points="253.69 151.86 253.22 157.02 251.39 156.85 252.06 149.46 264.3 150.58 263.65 157.7 261.81 157.53 262.26 152.65 259.1 152.36 258.68 156.97 256.86 156.8 257.29 152.19" clip-path="url(#SVGID_2_)"/><path d="m250.78 161.12 11.997 2.636-0.55 2.51-5.826 1.968c-1.508 0.489-3.053 0.896-4.472 1.163l-8e-3 0.035c1.636 0.191 3.192 0.496 5.026 0.899l4.183 0.919-0.445 2.029-11.998-2.636 0.5-2.278 5.976-1.972c1.485-0.477 3.118-0.938 4.6-1.229l-2e-3 -0.075c-1.567-0.251-3.161-0.563-5.137-0.997l-4.29-0.942z" clip-path="url(#SVGID_2_)"/><path d="m249.55 176.18c-0.632 0.528-1.349 1.455-1.734 2.537-0.476 1.341-0.109 2.321 0.836 2.658 0.877 0.312 1.6-0.09 2.651-1.36 1.371-1.681 2.818-2.539 4.485-1.947 1.907 0.678 2.771 2.765 1.873 5.291-0.445 1.254-1.045 2.066-1.567 2.558l-1.524-1.103c0.376-0.351 0.99-1.041 1.375-2.123 0.476-1.341-0.026-2.158-0.713-2.403-0.894-0.317-1.545 0.206-2.695 1.539-1.471 1.742-2.826 2.343-4.492 1.751-1.874-0.666-2.987-2.647-1.933-5.621 0.441-1.237 1.236-2.386 1.858-2.881z" clip-path="url(#SVGID_2_)"/><path d="m239.4 194.52c7e-3 -0.588 0.266-1.763 0.931-3.1 1.737-3.491 4.979-4.524 8.341-2.853 3.621 1.802 4.549 5.419 2.876 8.778-0.656 1.322-1.397 2.113-1.813 2.416l-1.388-1.219c0.488-0.409 1.05-1.045 1.496-1.943 1.112-2.234 0.513-4.548-2.131-5.862-2.431-1.21-4.663-0.57-5.871 1.861-0.398 0.8-0.656 1.729-0.696 2.382z" clip-path="url(#SVGID_2_)"/><polygon points="238.88 208.34 242.96 211.1 241.7 212.96 231.52 206.07 232.78 204.21 237.27 207.24 240.18 202.94 235.69 199.91 236.95 198.05 247.13 204.93 245.87 206.79 241.79 204.03" clip-path="url(#SVGID_2_)"/><polygon points="228.34 212.8 224.92 216.68 223.54 215.47 228.44 209.9 237.67 218.01 232.95 223.38 231.56 222.16 234.8 218.48 232.42 216.39 229.36 219.86 227.99 218.66 231.05 215.18" clip-path="url(#SVGID_2_)"/><path d="m228.55 227.67c-0.655 0.772-1.512 1.676-2.511 2.557-1.723 1.521-3.213 2.204-4.688 2.24-1.542 0.071-3.067-0.554-4.442-2.112-1.46-1.654-1.974-3.366-1.798-4.932 0.18-1.644 1.269-3.358 3.06-4.939 0.972-0.856 1.759-1.454 2.378-1.881zm-8.585-6.338c-0.269 0.164-0.624 0.479-0.966 0.779-2.2 1.917-2.426 4.281-0.361 6.619 1.772 2.037 3.986 2.175 6.093 0.316 0.533-0.471 0.865-0.838 1.064-1.11z" clip-path="url(#SVGID_2_)"/><polygon points="208.33 230.85 204.05 233.76 203.01 232.24 209.15 228.07 216.06 238.24 210.15 242.25 209.11 240.73 213.17 237.97 211.39 235.35 207.55 237.95 206.53 236.44 210.36 233.84" clip-path="url(#SVGID_2_)"/><polygon points="194.57 247.29 192.19 248.91 191.53 247.49 194.32 246.69 194.29 246.64 191.66 245.4 192.6 244.09 194.7 246.09 194.73 246.06 194.59 243.15 196.14 243.34 195.41 246.14 195.43 246.2 197.77 244.62 198.43 246.04 195.72 246.77 195.73 246.8 198.34 248.11 197.42 249.42 195.32 247.43 195.29 247.45 195.44 250.35 193.86 250.19 194.59 247.33" clip-path="url(#SVGID_2_)"/><path d="m124.4 245.34 1.752 14.598-3.055-0.741-0.288-3.227-5.004-1.216-1.773 2.725-2.962-0.72 8.313-12.152zm-1.826 8.25-0.494-5.32-0.037-0.01-2.937 4.488z" clip-path="url(#SVGID_2_)"/><polygon points="139.81 259.02 139.52 261.56 129.84 260.45 131.4 246.77 134.41 247.11 133.14 258.26" clip-path="url(#SVGID_2_)"/><path d="m149.82 247.92c0.861-9e-3 1.596 0.11 2.203 0.355 0.605 0.244 1.102 0.57 1.485 0.978 0.383 0.407 0.664 0.873 0.843 1.4 0.18 0.524 0.271 1.07 0.277 1.636 6e-3 0.553-0.076 1.097-0.244 1.633-0.168 0.535-0.439 1.011-0.814 1.427-0.375 0.414-0.864 0.751-1.465 1.007-0.603 0.258-1.334 0.39-2.194 0.398l-3.184 0.032 0.05 4.938-3.028 0.03-0.14-13.771zm-0.763 6.49c0.347-4e-3 0.682-0.032 1.002-0.087 0.321-0.055 0.604-0.158 0.846-0.31 0.243-0.148 0.437-0.359 0.582-0.631 0.146-0.272 0.217-0.627 0.211-1.063-4e-3 -0.438-0.082-0.79-0.232-1.06-0.15-0.267-0.35-0.475-0.595-0.621-0.246-0.145-0.53-0.241-0.852-0.289-0.321-0.049-0.657-0.07-1.004-0.066l-2.354 0.023 0.043 4.128z" clip-path="url(#SVGID_2_)"/><polygon points="166.5 251.63 165.72 246.4 168.72 245.95 170.74 259.58 167.75 260.02 166.88 254.15 161.36 254.97 162.24 260.84 159.24 261.29 157.22 247.66 160.21 247.22 160.99 252.45" clip-path="url(#SVGID_2_)"/><path d="m178.61 243.24 8.84 11.749-3.015 0.891-1.869-2.646-4.938 1.458-0.167 3.246-2.923 0.864 1.093-14.683zm2.561 8.053-3.098-4.354-0.036 0.011-0.289 5.354z" clip-path="url(#SVGID_2_)"/></g></svg>
\ No newline at end of file
diff --git a/public/images/alphalogonotextyellow.svg b/public/images/alphalogonotextyellow.svg
index b0b7b0389..5b487c93b 100644
--- a/public/images/alphalogonotextyellow.svg
+++ b/public/images/alphalogonotextyellow.svg
@@ -1,20 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="194.002"
-   height="194.004"
-   enable-background="new 0 0 217.667 217.666"
-   version="1.1"
-   viewBox="0 0 194.002 194.004"
-   xml:space="preserve"
-   id="svg6"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-     id="defs10" /><circle
-     cx="97.000999"
-     cy="97.001999"
-     r="94.111"
-     fill="#ffd218"
-     id="circle2" /><path
-     d="M 97.000001,0 87.062,0.469 l -9.625,1.562 -9.312,2.313 -8.844,3.25 -8.531,4.031 -7.906,4.969 -7.469,5.594 -6.969,6.218 -6.219,6.813 -5.593,7.469 -4.969,8.062 -4.031,8.375 -3.25,9 L 2.031,77.281 0.469,86.906 0,96.844001 0.469,106.782 l 1.562,9.625 2.313,9.313 3.25,9 4.031,8.531 4.969,7.906 5.593,7.469 6.219,6.969 6.969,6.219 7.469,5.594 7.906,4.813 8.531,4.188 8.844,3.25 9.312,2.313 9.625,1.563 9.938001,0.469 9.936999,-0.469 9.625,-1.563 9.313,-2.313 8.844,-3.25 8.531,-4.188 7.906,-4.813 7.469,-5.594 6.969,-6.219 6.219,-6.969 5.594,-7.469 4.969,-7.906 4.031,-8.531 3.25,-9 2.313,-9.313 1.563,-9.625 0.469,-9.937999 -0.469,-9.938001 -1.563,-9.625 -2.313,-9.156 -3.25,-9 -4.031,-8.375 -4.969,-8.062 -5.594,-7.469 -6.219,-6.813 -6.969,-6.218 -7.469,-5.594 -7.906,-4.969 -8.531,-4.031 -8.844,-3.25 -9.313,-2.313 -9.625,-1.562 z m -0.625,7.125 3.562,4.375 3.437999,4.781 3.094,4.813 2.781,5.281 2.656,5.281 2.469,5.594 2.188,5.75 2,5.875 0.313,1.031 2.813,2.094 2.937,2.469 2.938,2.5 2.812,2.781 2.625,2.938 2.813,3.125 2.468,3.406 2.469,3.406 2.344,3.719 2.188,4.062 2.157,4.032 0.5,1.062 1.062,-1.844 3.094,-6.218 2.47,-6.219 2.187,-5.719 1.563,-5.281 0.906,-4.813 0.469,-4.187 -0.156,6.187 -0.313,6.219 -0.594,5.75 -0.781,5.75 -0.938,5.406 -1.25,5.438 -1.219,4.969001 -1.563,4.969 -0.375,1.031 0.375,1 1.563,4.968999 1.219,5.125 1.25,5.25 0.938,5.438 0.781,5.75 0.594,5.75 0.313,6.188 0.156,6.219 -0.469,-4.188 -0.906,-4.813 -1.563,-5.281 -2.187,-5.75 -2.47,-6.031 -3.094,-6.219 -1.094,-1.844 h -0.063 l -0.405,0.906 -2.157,4.188 -2.188,3.875 -2.344,3.75 -2.469,3.563 -2.468,3.25 -2.813,3.281 -2.625,2.938 -2.812,2.781 -2.938,2.5 -2.937,2.313 -2.595,2.031 -0.531,1.844 -2,5.906 -2.188,5.75 -2.469,5.438 -2.656,5.438 -2.781,4.938 -3.094,4.969 -3.437999,4.531 -3.562,4.188 -3.094,-4.188 -3.094,-4.531 -2.812001,-4.969 -2.625,-5.094 -2.5,-5.281 -2.313,-5.594 -0.875,-2.25 -0.843,-0.094 -5.282,-1.375 -5.125,-1.875 -4.968,-2.469 -4.969,-2.969 -4.656,-3.406 -4.344,-4.031 -4.031,-4.188 -3.719,-4.656 -3.25,-4.969 -2.813,-5.125 -2.312,-5.438 -1.563,-5.749 -1.062,-5.719 -0.313,-5.906999 2.938,4.812999 3.406,4.656 3.563,4.188 3.75,3.875 4.031,3.563 4.187,3.28 4.188,2.782 4.187,2.625 4.344,2.188 4.188,1.875 3.656,1.156 -1,-4.438 -1.094,-6.188 -0.781,-6.062 -0.625,-6.063 -0.469,-6.031 -0.156,-5.905999 0.156,-6.063 0.469,-6.187001 0.625,-6.219 0.937,-6.375 1.094,-6.5 0.875,-4.125 -3.687,1.312 -4.188,1.719 -4.344,2.188 -4.187,2.625 -4.188,2.937 -4.187,3.125 -4.031,3.563 -3.75,4.031 -3.563,4.187 -3.406,4.500001 -2.938,4.813 0.313,-5.906 1.062,-5.719001 1.563,-5.594 2.312,-5.437 2.813,-5.282 3.25,-4.812 3.719,-4.656 4.031,-4.344 4.344,-3.875 4.656,-3.406 4.969,-2.969 4.968,-2.469 5.125,-1.875 5.282,-1.375 0.718,-0.094 1.469,-3.968 2.313,-5.563 2.5,-5.281 2.625,-4.813 2.781001,-4.656 2.812,-4.031 z M 78.938,39.031 l -0.718,1.938 -2,6.062 -1.719,6.188 -1.719,6.375 -0.5,2.25 0.656,-0.219 4.032,-1.094 4.031,-0.625 3.75,-0.312 3.562001,0.156 3.25,0.469 7.75,2.312 7.312999,3.282 6.969,4.031 6.375,4.656 4.72,4 -0.688,-5.406 -0.937,-6.219 -1.375,-6.031 -1.407,-6.063 -1.406,-4.875 -0.156,-0.093 -2.938,-2 -3.094,-1.719 -2.969,-1.719 -3.094,-1.375 -3.094,-1.25 -3.125,-0.937 -2.936999,-0.938 -3.094,-0.625 -2.969,-0.437 -2.937,-0.313 H 83.345 Z m 45.75,39.469 0.093,0.656 0.625,6.063 0.313,6.031001 0.156,6.063 -0.156,5.905999 -0.313,6.031 -0.625,6.063 1.25,-1.094 5.563,-5.594 4.969,-6.031 4.188,-5.593999 -4.188,-5.594 -4.969,-6.062001 -5.563,-5.719 z m 16.062,18.500001 0.031,0.032 v -0.063 z m -15.969,18.312999 -4.813,4.187 -6.375,4.657 -6.969,3.875 -7.312999,3.25 -7.75,2.344 -3.25,0.469 -3.562001,0.156 -3.75,-0.313 -4.031,-0.625 -4.032,-1.094 -0.687,-0.219 0.375,1.625 1.562,6.063 1.719,6.063 1.844,5.875 1.312,3.344 4.282,0.531 h 5.125001 l 2.937,-0.313 2.969,-0.469 3.094,-0.594 2.936999,-0.938 3.125,-0.938 3.094,-1.25 3.094,-1.375 2.969,-1.719 3.094,-1.875 2.938,-1.844 0.375,-0.313 1.188,-4.031 1.407,-6.063 1.375,-6.219 0.937,-6.031 z m 27.719,-18.374999 -0.094,-0.25 v 0.5 z"
-     fill="#010202"
-     id="path4" /></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="svg6" width="194.002" height="194.004" enable-background="new 0 0 217.667 217.666" version="1.1" viewBox="0 0 194.002 194.004" xml:space="preserve"><circle id="circle2" cx="97.001" cy="97.002" r="94.111" fill="#ffd218"/><path id="path4" fill="#010202" d="M 97.000001,0 87.062,0.469 l -9.625,1.562 -9.312,2.313 -8.844,3.25 -8.531,4.031 -7.906,4.969 -7.469,5.594 -6.969,6.218 -6.219,6.813 -5.593,7.469 -4.969,8.062 -4.031,8.375 -3.25,9 L 2.031,77.281 0.469,86.906 0,96.844001 0.469,106.782 l 1.562,9.625 2.313,9.313 3.25,9 4.031,8.531 4.969,7.906 5.593,7.469 6.219,6.969 6.969,6.219 7.469,5.594 7.906,4.813 8.531,4.188 8.844,3.25 9.312,2.313 9.625,1.563 9.938001,0.469 9.936999,-0.469 9.625,-1.563 9.313,-2.313 8.844,-3.25 8.531,-4.188 7.906,-4.813 7.469,-5.594 6.969,-6.219 6.219,-6.969 5.594,-7.469 4.969,-7.906 4.031,-8.531 3.25,-9 2.313,-9.313 1.563,-9.625 0.469,-9.937999 -0.469,-9.938001 -1.563,-9.625 -2.313,-9.156 -3.25,-9 -4.031,-8.375 -4.969,-8.062 -5.594,-7.469 -6.219,-6.813 -6.969,-6.218 -7.469,-5.594 -7.906,-4.969 -8.531,-4.031 -8.844,-3.25 -9.313,-2.313 -9.625,-1.562 z m -0.625,7.125 3.562,4.375 3.437999,4.781 3.094,4.813 2.781,5.281 2.656,5.281 2.469,5.594 2.188,5.75 2,5.875 0.313,1.031 2.813,2.094 2.937,2.469 2.938,2.5 2.812,2.781 2.625,2.938 2.813,3.125 2.468,3.406 2.469,3.406 2.344,3.719 2.188,4.062 2.157,4.032 0.5,1.062 1.062,-1.844 3.094,-6.218 2.47,-6.219 2.187,-5.719 1.563,-5.281 0.906,-4.813 0.469,-4.187 -0.156,6.187 -0.313,6.219 -0.594,5.75 -0.781,5.75 -0.938,5.406 -1.25,5.438 -1.219,4.969001 -1.563,4.969 -0.375,1.031 0.375,1 1.563,4.968999 1.219,5.125 1.25,5.25 0.938,5.438 0.781,5.75 0.594,5.75 0.313,6.188 0.156,6.219 -0.469,-4.188 -0.906,-4.813 -1.563,-5.281 -2.187,-5.75 -2.47,-6.031 -3.094,-6.219 -1.094,-1.844 h -0.063 l -0.405,0.906 -2.157,4.188 -2.188,3.875 -2.344,3.75 -2.469,3.563 -2.468,3.25 -2.813,3.281 -2.625,2.938 -2.812,2.781 -2.938,2.5 -2.937,2.313 -2.595,2.031 -0.531,1.844 -2,5.906 -2.188,5.75 -2.469,5.438 -2.656,5.438 -2.781,4.938 -3.094,4.969 -3.437999,4.531 -3.562,4.188 -3.094,-4.188 -3.094,-4.531 -2.812001,-4.969 -2.625,-5.094 -2.5,-5.281 -2.313,-5.594 -0.875,-2.25 -0.843,-0.094 -5.282,-1.375 -5.125,-1.875 -4.968,-2.469 -4.969,-2.969 -4.656,-3.406 -4.344,-4.031 -4.031,-4.188 -3.719,-4.656 -3.25,-4.969 -2.813,-5.125 -2.312,-5.438 -1.563,-5.749 -1.062,-5.719 -0.313,-5.906999 2.938,4.812999 3.406,4.656 3.563,4.188 3.75,3.875 4.031,3.563 4.187,3.28 4.188,2.782 4.187,2.625 4.344,2.188 4.188,1.875 3.656,1.156 -1,-4.438 -1.094,-6.188 -0.781,-6.062 -0.625,-6.063 -0.469,-6.031 -0.156,-5.905999 0.156,-6.063 0.469,-6.187001 0.625,-6.219 0.937,-6.375 1.094,-6.5 0.875,-4.125 -3.687,1.312 -4.188,1.719 -4.344,2.188 -4.187,2.625 -4.188,2.937 -4.187,3.125 -4.031,3.563 -3.75,4.031 -3.563,4.187 -3.406,4.500001 -2.938,4.813 0.313,-5.906 1.062,-5.719001 1.563,-5.594 2.312,-5.437 2.813,-5.282 3.25,-4.812 3.719,-4.656 4.031,-4.344 4.344,-3.875 4.656,-3.406 4.969,-2.969 4.968,-2.469 5.125,-1.875 5.282,-1.375 0.718,-0.094 1.469,-3.968 2.313,-5.563 2.5,-5.281 2.625,-4.813 2.781001,-4.656 2.812,-4.031 z M 78.938,39.031 l -0.718,1.938 -2,6.062 -1.719,6.188 -1.719,6.375 -0.5,2.25 0.656,-0.219 4.032,-1.094 4.031,-0.625 3.75,-0.312 3.562001,0.156 3.25,0.469 7.75,2.312 7.312999,3.282 6.969,4.031 6.375,4.656 4.72,4 -0.688,-5.406 -0.937,-6.219 -1.375,-6.031 -1.407,-6.063 -1.406,-4.875 -0.156,-0.093 -2.938,-2 -3.094,-1.719 -2.969,-1.719 -3.094,-1.375 -3.094,-1.25 -3.125,-0.937 -2.936999,-0.938 -3.094,-0.625 -2.969,-0.437 -2.937,-0.313 H 83.345 Z m 45.75,39.469 0.093,0.656 0.625,6.063 0.313,6.031001 0.156,6.063 -0.156,5.905999 -0.313,6.031 -0.625,6.063 1.25,-1.094 5.563,-5.594 4.969,-6.031 4.188,-5.593999 -4.188,-5.594 -4.969,-6.062001 -5.563,-5.719 z m 16.062,18.500001 0.031,0.032 v -0.063 z m -15.969,18.312999 -4.813,4.187 -6.375,4.657 -6.969,3.875 -7.312999,3.25 -7.75,2.344 -3.25,0.469 -3.562001,0.156 -3.75,-0.313 -4.031,-0.625 -4.032,-1.094 -0.687,-0.219 0.375,1.625 1.562,6.063 1.719,6.063 1.844,5.875 1.312,3.344 4.282,0.531 h 5.125001 l 2.937,-0.313 2.969,-0.469 3.094,-0.594 2.936999,-0.938 3.125,-0.938 3.094,-1.25 3.094,-1.375 2.969,-1.719 3.094,-1.875 2.938,-1.844 0.375,-0.313 1.188,-4.031 1.407,-6.063 1.375,-6.219 0.937,-6.031 z m 27.719,-18.374999 -0.094,-0.25 v 0.5 z"/></svg>
\ No newline at end of file
diff --git a/public/images/dies_logo.png b/public/images/dies_logo.png
new file mode 100644
index 000000000..5285aeaa3
Binary files /dev/null and b/public/images/dies_logo.png differ
diff --git a/public/images/fallback/public_coverphoto_default.png b/public/images/fallback/public_coverphoto_default.png
index ad3a99175..bb456f7d0 100644
Binary files a/public/images/fallback/public_coverphoto_default.png and b/public/images/fallback/public_coverphoto_default.png differ
diff --git a/public/images/flag-locale-en.png b/public/images/flag-locale-en.png
index 920d65f1c..41e2ae18c 100644
Binary files a/public/images/flag-locale-en.png and b/public/images/flag-locale-en.png differ
diff --git a/public/images/icons/facebook.png b/public/images/icons/facebook.png
index 7a187d128..ce7c555d2 100644
Binary files a/public/images/icons/facebook.png and b/public/images/icons/facebook.png differ
diff --git a/public/images/icons/instagram.png b/public/images/icons/instagram.png
index 5479e62a1..5420a2b02 100644
Binary files a/public/images/icons/instagram.png and b/public/images/icons/instagram.png differ
diff --git a/public/images/public/banner.jpg b/public/images/public/index/banner.jpg
similarity index 99%
rename from public/images/public/banner.jpg
rename to public/images/public/index/banner.jpg
index a0cf26ed8..3645886d4 100644
Binary files a/public/images/public/banner.jpg and b/public/images/public/index/banner.jpg differ
diff --git a/public/images/public/verantwoordelijkheid.jpg b/public/images/public/index/verantwoordelijkheid.jpg
similarity index 99%
rename from public/images/public/verantwoordelijkheid.jpg
rename to public/images/public/index/verantwoordelijkheid.jpg
index abe1591ab..75fd2c0ae 100644
Binary files a/public/images/public/verantwoordelijkheid.jpg and b/public/images/public/index/verantwoordelijkheid.jpg differ
diff --git a/public/images/public/index/vorming.jpg b/public/images/public/index/vorming.jpg
new file mode 100644
index 000000000..eb7116ffe
Binary files /dev/null and b/public/images/public/index/vorming.jpg differ
diff --git a/public/images/public/index/vriendschap.jpg b/public/images/public/index/vriendschap.jpg
new file mode 100644
index 000000000..449e6db3e
Binary files /dev/null and b/public/images/public/index/vriendschap.jpg differ
diff --git a/public/images/public/room-forum/banner.jpg b/public/images/public/room-forum/banner.jpg
new file mode 100644
index 000000000..dad7d8387
Binary files /dev/null and b/public/images/public/room-forum/banner.jpg differ
diff --git a/public/images/public/vorming.jpg b/public/images/public/vorming.jpg
deleted file mode 100644
index 3e5e6402e..000000000
Binary files a/public/images/public/vorming.jpg and /dev/null differ
diff --git a/public/images/public/vriendschap.jpg b/public/images/public/vriendschap.jpg
deleted file mode 100644
index fc65fb500..000000000
Binary files a/public/images/public/vriendschap.jpg and /dev/null differ
diff --git a/tests/rendering/components/advertisement-tool-test.js b/tests/rendering/components/advertisement-tool-test.js
index b3969080f..940f9c60f 100644
--- a/tests/rendering/components/advertisement-tool-test.js
+++ b/tests/rendering/components/advertisement-tool-test.js
@@ -13,7 +13,7 @@ module('Integration | Component | advertisement tool', function (hooks) {
 
     assert.equal(
       this.element.querySelectorAll('.advertisement-item').length,
-      40 // Number of advertisements times two
+      38 // Number of advertisements times two
     );
   });
 });
diff --git a/tests/test-helper.js b/tests/test-helper.js
index 2b77b73cc..7b539e66d 100644
--- a/tests/test-helper.js
+++ b/tests/test-helper.js
@@ -4,9 +4,18 @@ import * as QUnit from 'qunit';
 import { setApplication } from '@ember/test-helpers';
 import { setup } from 'qunit-dom';
 import { start } from 'ember-qunit';
+import {
+  forceModulesToBeLoaded,
+  sendCoverage,
+} from 'ember-cli-code-coverage/test-support';
 
 setApplication(Application.create(config.APP));
 
 setup(QUnit.assert);
 
+QUnit.done(async function () {
+  forceModulesToBeLoaded();
+  await sendCoverage();
+});
+
 start();
diff --git a/tests/unit/models/photo-album-test.js b/tests/unit/models/photo-album-test.js
new file mode 100644
index 000000000..7cbef4cec
--- /dev/null
+++ b/tests/unit/models/photo-album-test.js
@@ -0,0 +1,32 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+let album;
+let photos = [];
+
+module('Unit | Model | photo-album', function (hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function () {
+    const store = this.owner.lookup('service:store');
+    photos = [
+      store.createRecord('Photo'),
+      store.createRecord('Photo'),
+      store.createRecord('Photo'),
+    ];
+    album = store.createRecord('PhotoAlbum', { photos });
+  });
+
+  test('Photo count', function (assert) {
+    assert.expect(2);
+    photos[0].amountOfTags = 0;
+    photos[1].amountOfTags = 1;
+    photos[2].amountOfTags = 5;
+    assert.equal(album.amountOfPhotos, 3, 'Amount of photos is correct');
+    assert.equal(
+      album.amountOfTaggedPhotos,
+      2,
+      'Amount of tagged photos in album is correct'
+    );
+  });
+});
diff --git a/tests/unit/routes/public/room-forum-test.js b/tests/unit/routes/public/room-forum-test.js
new file mode 100644
index 000000000..daf1938b0
--- /dev/null
+++ b/tests/unit/routes/public/room-forum-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | public/room-forum', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:public/room-forum');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/quickpost-test.js b/tests/unit/routes/room-adverts-test.js
similarity index 60%
rename from tests/unit/routes/quickpost-test.js
rename to tests/unit/routes/room-adverts-test.js
index 48cfc0df8..6993a56bf 100644
--- a/tests/unit/routes/quickpost-test.js
+++ b/tests/unit/routes/room-adverts-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | quickpost', function (hooks) {
+module('Unit | Route | room-advert', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const route = this.owner.lookup('route:quickpost');
+    const route = this.owner.lookup('route:room-adverts');
     assert.ok(route);
   });
 });
diff --git a/tests/unit/routes/users/user/photos-test.js b/tests/unit/routes/users/user/photos-test.js
new file mode 100644
index 000000000..5c01e0882
--- /dev/null
+++ b/tests/unit/routes/users/user/photos-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user/photos', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user/photos');
+    assert.ok(route);
+  });
+});
diff --git a/translations/en.yaml b/translations/en.yaml
index b11419698..4d4b23198 100644
--- a/translations/en.yaml
+++ b/translations/en.yaml
@@ -262,11 +262,16 @@ component:
         partner-1: LANG-TODO
         partner-2: LANG-TODO
         partner-3: LANG-TODO
-    rooms:
-      header: LANG-TODO
-      intro-title: LANG-TODO
-      intro: LANG-TODO
-      locatie: Location
+    roomForum:
+      header: Room forum
+      intro-title: Check the available rooms in homes of our members here!
+      intro: 
+        Members of Alpha mainly live in student housing, either in "Alpha houses" or other student houses.
+        If a room becomes available in an Alpha house or in a student house of a member, you will find it here!
+      location: Location
+      contact: Contact
+      availableFrom: Available from
+      noAds: There are no available rooms at the moment.
   socialMediaButtons:
     facebook: Like us on Facebook
     instagram: Follow us on Instagram
@@ -297,6 +302,8 @@ mixin:
     articles: Articles
     activities: Activities
     vacancies: Vacancies
+    roomAdverts: Rooms
+    roomForum: Room forum
     forum: Forum
     photoAlbums: Photo-albums
     polls: Polls
diff --git a/translations/nl.yaml b/translations/nl.yaml
index 53c51a96b..cc19c17b7 100644
--- a/translations/nl.yaml
+++ b/translations/nl.yaml
@@ -181,7 +181,7 @@ component:
         logistics: Logistiek Coördinator
         vice-president: Vice Voorzitter
     history:
-      header: LANG-TODO
+      header: LANG-TODO 
       event-1980: LANG-TODO
       event-1981: LANG-TODO
       event-1982: LANG-TODO
@@ -267,11 +267,16 @@ component:
         partner-1: LANG-TODO
         partner-2: LANG-TODO
         partner-3: LANG-TODO
-    rooms:
-      header: LANG-TODO
-      intro-title: LANG-TODO
-      intro: LANG-TODO
-      locatie: Locatie
+    roomForum:
+      header: Kamer forum
+      intro-title: Check hier de beschikbare kamers bij Alphanen in huis!
+      intro: 
+        Alphanen wonen verspreidt over vele studentenhuizen, zowel in Alphahuizen als gewone studentenhuizen. 
+        Als er een kamer vrijkomt op een Alphahuis of bij een Alphaan, vind je dat hier!
+      location: Locatie
+      contact: Contact
+      availableFrom: Beschikbaar vanaf
+      noAds:  Momenteel zijn er geen kamers beschikbaar.
   socialMediaButtons:
     facebook: Like ons op Facebook
     instagram: Volg ons op Instagram
@@ -302,6 +307,8 @@ mixin:
     articles: Artikelen
     activities: Activiteiten
     vacancies: Vacatures
+    roomAdverts: Kamers
+    roomForum: Kamerforum
     forum: Forum
     photoAlbums: Fotoalbums
     polls: Polls
diff --git a/yarn.lock b/yarn.lock
index 925c0eda5..c3e9592c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,6 +42,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/code-frame@npm:^7.14.5, @babel/code-frame@npm:^7.22.13":
+  version: 7.22.13
+  resolution: "@babel/code-frame@npm:7.22.13"
+  dependencies:
+    "@babel/highlight": ^7.22.13
+    chalk: ^2.4.2
+  checksum: 22e342c8077c8b77eeb11f554ecca2ba14153f707b85294fcf6070b6f6150aae88a7b7436dd88d8c9289970585f3fe5b9b941c5aa3aa26a6d5a8ef3f292da058
+  languageName: node
+  linkType: hard
+
 "@babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.21.4":
   version: 7.21.4
   resolution: "@babel/code-frame@npm:7.21.4"
@@ -65,6 +75,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.23.2":
+  version: 7.23.2
+  resolution: "@babel/compat-data@npm:7.23.2"
+  checksum: d8dc27437d40907b271161d4c88ffe72ccecb034c730deb1960a417b59a14d7c5ebca8cd80dd458a01cd396a7a329eb48cddcc3791b5a84da33d7f278f7bec6a
+  languageName: node
+  linkType: hard
+
 "@babel/core@npm:^7.0.0, @babel/core@npm:^7.16.10, @babel/core@npm:^7.20.12":
   version: 7.21.8
   resolution: "@babel/core@npm:7.21.8"
@@ -111,6 +128,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/core@npm:^7.12.3, @babel/core@npm:^7.14.5":
+  version: 7.23.2
+  resolution: "@babel/core@npm:7.23.2"
+  dependencies:
+    "@ampproject/remapping": ^2.2.0
+    "@babel/code-frame": ^7.22.13
+    "@babel/generator": ^7.23.0
+    "@babel/helper-compilation-targets": ^7.22.15
+    "@babel/helper-module-transforms": ^7.23.0
+    "@babel/helpers": ^7.23.2
+    "@babel/parser": ^7.23.0
+    "@babel/template": ^7.22.15
+    "@babel/traverse": ^7.23.2
+    "@babel/types": ^7.23.0
+    convert-source-map: ^2.0.0
+    debug: ^4.1.0
+    gensync: ^1.0.0-beta.2
+    json5: ^2.2.3
+    semver: ^6.3.1
+  checksum: 003897718ded16f3b75632d63cd49486bf67ff206cc7ebd1a10d49e2456f8d45740910d5ec7e42e3faf0deec7a2e96b1a02e766d19a67a8309053f0d4e57c0fe
+  languageName: node
+  linkType: hard
+
 "@babel/generator@npm:^7.17.3, @babel/generator@npm:^7.17.7":
   version: 7.17.7
   resolution: "@babel/generator@npm:7.17.7"
@@ -134,6 +174,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/generator@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/generator@npm:7.23.0"
+  dependencies:
+    "@babel/types": ^7.23.0
+    "@jridgewell/gen-mapping": ^0.3.2
+    "@jridgewell/trace-mapping": ^0.3.17
+    jsesc: ^2.5.1
+  checksum: 8efe24adad34300f1f8ea2add420b28171a646edc70f2a1b3e1683842f23b8b7ffa7e35ef0119294e1901f45bfea5b3dc70abe1f10a1917ccdfb41bed69be5f1
+  languageName: node
+  linkType: hard
+
 "@babel/helper-annotate-as-pure@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/helper-annotate-as-pure@npm:7.16.7"
@@ -152,6 +204,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-annotate-as-pure@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
+  dependencies:
+    "@babel/types": ^7.22.5
+  checksum: 53da330f1835c46f26b7bf4da31f7a496dee9fd8696cca12366b94ba19d97421ce519a74a837f687749318f94d1a37f8d1abcbf35e8ed22c32d16373b2f6198d
+  languageName: node
+  linkType: hard
+
 "@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.16.7"
@@ -162,6 +223,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.5":
+  version: 7.22.15
+  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
+  dependencies:
+    "@babel/types": ^7.22.15
+  checksum: 639c697a1c729f9fafa2dd4c9af2e18568190299b5907bd4c2d0bc818fcbd1e83ffeecc2af24327a7faa7ac4c34edd9d7940510a5e66296c19bad17001cf5c7a
+  languageName: node
+  linkType: hard
+
 "@babel/helper-compilation-targets@npm:^7.12.0, @babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.16.7, @babel/helper-compilation-targets@npm:^7.17.7":
   version: 7.17.7
   resolution: "@babel/helper-compilation-targets@npm:7.17.7"
@@ -191,6 +261,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.5, @babel/helper-compilation-targets@npm:^7.22.6":
+  version: 7.22.15
+  resolution: "@babel/helper-compilation-targets@npm:7.22.15"
+  dependencies:
+    "@babel/compat-data": ^7.22.9
+    "@babel/helper-validator-option": ^7.22.15
+    browserslist: ^4.21.9
+    lru-cache: ^5.1.1
+    semver: ^6.3.1
+  checksum: ce85196769e091ae54dd39e4a80c2a9df1793da8588e335c383d536d54f06baf648d0a08fc873044f226398c4ded15c4ae9120ee18e7dfd7c639a68e3cdc9980
+  languageName: node
+  linkType: hard
+
 "@babel/helper-create-class-features-plugin@npm:^7.13.0, @babel/helper-create-class-features-plugin@npm:^7.16.10, @babel/helper-create-class-features-plugin@npm:^7.16.7, @babel/helper-create-class-features-plugin@npm:^7.17.1, @babel/helper-create-class-features-plugin@npm:^7.17.6, @babel/helper-create-class-features-plugin@npm:^7.5.5, @babel/helper-create-class-features-plugin@npm:^7.8.3":
   version: 7.17.6
   resolution: "@babel/helper-create-class-features-plugin@npm:7.17.6"
@@ -227,6 +310,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-create-class-features-plugin@npm:^7.22.11, @babel/helper-create-class-features-plugin@npm:^7.22.5":
+  version: 7.22.15
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.22.15"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-environment-visitor": ^7.22.5
+    "@babel/helper-function-name": ^7.22.5
+    "@babel/helper-member-expression-to-functions": ^7.22.15
+    "@babel/helper-optimise-call-expression": ^7.22.5
+    "@babel/helper-replace-supers": ^7.22.9
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+    "@babel/helper-split-export-declaration": ^7.22.6
+    semver: ^6.3.1
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 52c500d8d164abb3a360b1b7c4b8fff77bc4a5920d3a2b41ae6e1d30617b0dc0b972c1f5db35b1752007e04a748908b4a99bc872b73549ae837e87dcdde005a3
+  languageName: node
+  linkType: hard
+
 "@babel/helper-create-regexp-features-plugin@npm:^7.16.7":
   version: 7.17.0
   resolution: "@babel/helper-create-regexp-features-plugin@npm:7.17.0"
@@ -239,6 +341,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
+  version: 7.22.15
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.15"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    regexpu-core: ^5.3.1
+    semver: ^6.3.1
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 0243b8d4854f1dc8861b1029a46d3f6393ad72f366a5a08e36a4648aa682044f06da4c6e87a456260e1e1b33c999f898ba591a0760842c1387bcc93fbf2151a6
+  languageName: node
+  linkType: hard
+
 "@babel/helper-define-polyfill-provider@npm:^0.1.5":
   version: 0.1.5
   resolution: "@babel/helper-define-polyfill-provider@npm:0.1.5"
@@ -275,6 +390,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-define-polyfill-provider@npm:^0.4.3":
+  version: 0.4.3
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.3"
+  dependencies:
+    "@babel/helper-compilation-targets": ^7.22.6
+    "@babel/helper-plugin-utils": ^7.22.5
+    debug: ^4.1.1
+    lodash.debounce: ^4.0.8
+    resolve: ^1.14.2
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 5d21e3f47b320e4b5b644195ec405e7ebc3739e48e65899efc808c5fa9c3bf5b06ce0d8ff5246ca99d1411e368f4557bc66730196c5781a5c4e986ee703bee79
+  languageName: node
+  linkType: hard
+
 "@babel/helper-environment-visitor@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/helper-environment-visitor@npm:7.16.7"
@@ -291,6 +421,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-environment-visitor@npm:^7.22.20, @babel/helper-environment-visitor@npm:^7.22.5":
+  version: 7.22.20
+  resolution: "@babel/helper-environment-visitor@npm:7.22.20"
+  checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69
+  languageName: node
+  linkType: hard
+
 "@babel/helper-explode-assignable-expression@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/helper-explode-assignable-expression@npm:7.16.7"
@@ -321,6 +458,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-function-name@npm:^7.22.5, @babel/helper-function-name@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/helper-function-name@npm:7.23.0"
+  dependencies:
+    "@babel/template": ^7.22.15
+    "@babel/types": ^7.23.0
+  checksum: e44542257b2d4634a1f979244eb2a4ad8e6d75eb6761b4cfceb56b562f7db150d134bc538c8e6adca3783e3bc31be949071527aa8e3aab7867d1ad2d84a26e10
+  languageName: node
+  linkType: hard
+
 "@babel/helper-get-function-arity@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/helper-get-function-arity@npm:7.16.7"
@@ -348,6 +495,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-hoist-variables@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-hoist-variables@npm:7.22.5"
+  dependencies:
+    "@babel/types": ^7.22.5
+  checksum: 394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc
+  languageName: node
+  linkType: hard
+
 "@babel/helper-member-expression-to-functions@npm:^7.16.7":
   version: 7.17.7
   resolution: "@babel/helper-member-expression-to-functions@npm:7.17.7"
@@ -366,6 +522,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-member-expression-to-functions@npm:^7.22.15":
+  version: 7.23.0
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.23.0"
+  dependencies:
+    "@babel/types": ^7.23.0
+  checksum: 494659361370c979ada711ca685e2efe9460683c36db1b283b446122596602c901e291e09f2f980ecedfe6e0f2bd5386cb59768285446530df10c14df1024e75
+  languageName: node
+  linkType: hard
+
 "@babel/helper-module-imports@npm:^7.12.13, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.8.3":
   version: 7.16.7
   resolution: "@babel/helper-module-imports@npm:7.16.7"
@@ -384,6 +549,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.22.5":
+  version: 7.22.15
+  resolution: "@babel/helper-module-imports@npm:7.22.15"
+  dependencies:
+    "@babel/types": ^7.22.15
+  checksum: ecd7e457df0a46f889228f943ef9b4a47d485d82e030676767e6a2fdcbdaa63594d8124d4b55fd160b41c201025aec01fc27580352b1c87a37c9c6f33d116702
+  languageName: node
+  linkType: hard
+
 "@babel/helper-module-transforms@npm:^7.16.7, @babel/helper-module-transforms@npm:^7.17.7":
   version: 7.17.7
   resolution: "@babel/helper-module-transforms@npm:7.17.7"
@@ -416,6 +590,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-module-transforms@npm:^7.22.5, @babel/helper-module-transforms@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/helper-module-transforms@npm:7.23.0"
+  dependencies:
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-module-imports": ^7.22.15
+    "@babel/helper-simple-access": ^7.22.5
+    "@babel/helper-split-export-declaration": ^7.22.6
+    "@babel/helper-validator-identifier": ^7.22.20
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 6e2afffb058cf3f8ce92f5116f710dda4341c81cfcd872f9a0197ea594f7ce0ab3cb940b0590af2fe99e60d2e5448bfba6bca8156ed70a2ed4be2adc8586c891
+  languageName: node
+  linkType: hard
+
 "@babel/helper-optimise-call-expression@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/helper-optimise-call-expression@npm:7.16.7"
@@ -434,6 +623,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-optimise-call-expression@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
+  dependencies:
+    "@babel/types": ^7.22.5
+  checksum: c70ef6cc6b6ed32eeeec4482127e8be5451d0e5282d5495d5d569d39eb04d7f1d66ec99b327f45d1d5842a9ad8c22d48567e93fc502003a47de78d122e355f7c
+  languageName: node
+  linkType: hard
+
 "@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.13.0, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
   version: 7.16.7
   resolution: "@babel/helper-plugin-utils@npm:7.16.7"
@@ -441,6 +639,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-plugin-utils@npm:7.22.5"
+  checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5
+  languageName: node
+  linkType: hard
+
 "@babel/helper-plugin-utils@npm:^7.20.2":
   version: 7.21.5
   resolution: "@babel/helper-plugin-utils@npm:7.21.5"
@@ -459,6 +664,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-remap-async-to-generator@npm:^7.22.20, @babel/helper-remap-async-to-generator@npm:^7.22.5":
+  version: 7.22.20
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-wrap-function": ^7.22.20
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 2fe6300a6f1b58211dffa0aed1b45d4958506d096543663dba83bd9251fe8d670fa909143a65b45e72acb49e7e20fbdb73eae315d9ddaced467948c3329986e7
+  languageName: node
+  linkType: hard
+
 "@babel/helper-replace-supers@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/helper-replace-supers@npm:7.16.7"
@@ -486,6 +704,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-replace-supers@npm:^7.22.5, @babel/helper-replace-supers@npm:^7.22.9":
+  version: 7.22.20
+  resolution: "@babel/helper-replace-supers@npm:7.22.20"
+  dependencies:
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-member-expression-to-functions": ^7.22.15
+    "@babel/helper-optimise-call-expression": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: a0008332e24daedea2e9498733e3c39b389d6d4512637e000f96f62b797e702ee24a407ccbcd7a236a551590a38f31282829a8ef35c50a3c0457d88218cae639
+  languageName: node
+  linkType: hard
+
 "@babel/helper-simple-access@npm:^7.17.7":
   version: 7.17.7
   resolution: "@babel/helper-simple-access@npm:7.17.7"
@@ -504,6 +735,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-simple-access@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-simple-access@npm:7.22.5"
+  dependencies:
+    "@babel/types": ^7.22.5
+  checksum: fe9686714caf7d70aedb46c3cce090f8b915b206e09225f1e4dbc416786c2fdbbee40b38b23c268b7ccef749dd2db35f255338fb4f2444429874d900dede5ad2
+  languageName: node
+  linkType: hard
+
 "@babel/helper-skip-transparent-expression-wrappers@npm:^7.16.0":
   version: 7.16.0
   resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.16.0"
@@ -522,6 +762,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
+  dependencies:
+    "@babel/types": ^7.22.5
+  checksum: 1012ef2295eb12dc073f2b9edf3425661e9b8432a3387e62a8bc27c42963f1f216ab3124228015c748770b2257b4f1fda882ca8fa34c0bf485e929ae5bc45244
+  languageName: node
+  linkType: hard
+
 "@babel/helper-split-export-declaration@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/helper-split-export-declaration@npm:7.16.7"
@@ -540,6 +789,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-split-export-declaration@npm:^7.22.6":
+  version: 7.22.6
+  resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
+  dependencies:
+    "@babel/types": ^7.22.5
+  checksum: e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921
+  languageName: node
+  linkType: hard
+
 "@babel/helper-string-parser@npm:^7.18.10":
   version: 7.18.10
   resolution: "@babel/helper-string-parser@npm:7.18.10"
@@ -554,6 +812,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-string-parser@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-string-parser@npm:7.22.5"
+  checksum: 836851ca5ec813077bbb303acc992d75a360267aa3b5de7134d220411c852a6f17de7c0d0b8c8dcc0f567f67874c00f4528672b2a4f1bc978a3ada64c8c78467
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-identifier@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/helper-validator-identifier@npm:7.16.7"
@@ -575,6 +840,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-identifier@npm:^7.22.20":
+  version: 7.22.20
+  resolution: "@babel/helper-validator-identifier@npm:7.22.20"
+  checksum: 136412784d9428266bcdd4d91c32bcf9ff0e8d25534a9d94b044f77fe76bc50f941a90319b05aafd1ec04f7d127cd57a179a3716009ff7f3412ef835ada95bdc
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-option@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/helper-validator-option@npm:7.16.7"
@@ -589,6 +861,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-option@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/helper-validator-option@npm:7.22.15"
+  checksum: 68da52b1e10002a543161494c4bc0f4d0398c8fdf361d5f7f4272e95c45d5b32d974896d44f6a0ea7378c9204988879d73613ca683e13bd1304e46d25ff67a8d
+  languageName: node
+  linkType: hard
+
 "@babel/helper-wrap-function@npm:^7.16.8":
   version: 7.16.8
   resolution: "@babel/helper-wrap-function@npm:7.16.8"
@@ -601,6 +880,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-wrap-function@npm:^7.22.20":
+  version: 7.22.20
+  resolution: "@babel/helper-wrap-function@npm:7.22.20"
+  dependencies:
+    "@babel/helper-function-name": ^7.22.5
+    "@babel/template": ^7.22.15
+    "@babel/types": ^7.22.19
+  checksum: 221ed9b5572612aeb571e4ce6a256f2dee85b3c9536f1dd5e611b0255e5f59a3d0ec392d8d46d4152149156a8109f92f20379b1d6d36abb613176e0e33f05fca
+  languageName: node
+  linkType: hard
+
 "@babel/helpers@npm:^7.17.7":
   version: 7.17.7
   resolution: "@babel/helpers@npm:7.17.7"
@@ -623,6 +913,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helpers@npm:^7.23.2":
+  version: 7.23.2
+  resolution: "@babel/helpers@npm:7.23.2"
+  dependencies:
+    "@babel/template": ^7.22.15
+    "@babel/traverse": ^7.23.2
+    "@babel/types": ^7.23.0
+  checksum: aaf4828df75ec460eaa70e5c9f66e6dadc28dae3728ddb7f6c13187dbf38030e142194b83d81aa8a31bbc35a5529a5d7d3f3cf59d5d0b595f5dd7f9d8f1ced8e
+  languageName: node
+  linkType: hard
+
 "@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.16.7":
   version: 7.16.10
   resolution: "@babel/highlight@npm:7.16.10"
@@ -645,6 +946,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/highlight@npm:^7.22.13":
+  version: 7.22.20
+  resolution: "@babel/highlight@npm:7.22.20"
+  dependencies:
+    "@babel/helper-validator-identifier": ^7.22.20
+    chalk: ^2.4.2
+    js-tokens: ^4.0.0
+  checksum: 84bd034dca309a5e680083cd827a766780ca63cef37308404f17653d32366ea76262bd2364b2d38776232f2d01b649f26721417d507e8b4b6da3e4e739f6d134
+  languageName: node
+  linkType: hard
+
+"@babel/parser@npm:^7.14.5, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/parser@npm:7.23.0"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 453fdf8b9e2c2b7d7b02139e0ce003d1af21947bbc03eb350fb248ee335c9b85e4ab41697ddbdd97079698de825a265e45a0846bb2ed47a2c7c1df833f42a354
+  languageName: node
+  linkType: hard
+
 "@babel/parser@npm:^7.16.7, @babel/parser@npm:^7.17.3, @babel/parser@npm:^7.17.7, @babel/parser@npm:^7.4.5, @babel/parser@npm:^7.7.0":
   version: 7.17.7
   resolution: "@babel/parser@npm:7.17.7"
@@ -674,6 +995,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.22.15"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 8910ca21a7ec7c06f7b247d4b86c97c5aa15ef321518f44f6f490c5912fdf82c605aaa02b90892e375d82ccbedeadfdeadd922c1b836c9dd4c596871bf654753
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.16.7"
@@ -687,6 +1019,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.22.15"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+    "@babel/plugin-transform-optional-chaining": ^7.22.15
+  peerDependencies:
+    "@babel/core": ^7.13.0
+  checksum: fbefedc0da014c37f1a50a8094ce7dbbf2181ae93243f23d6ecba2499b5b20196c2124d6a4dfe3e9e0125798e80593103e456352a4beb4e5c6f7c75efb80fdac
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-proposal-async-generator-functions@npm:^7.16.8":
   version: 7.16.8
   resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.16.8"
@@ -864,6 +1209,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2":
+  version: 7.21.0-placeholder-for-preset-env.2
+  resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: d97745d098b835d55033ff3a7fb2b895b9c5295b08a5759e4f20df325aa385a3e0bc9bd5ad8f2ec554a44d4e6525acfc257b8c5848a1345cb40f26a30e277e91
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-proposal-private-property-in-object@npm:^7.16.5, @babel/plugin-proposal-private-property-in-object@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.16.7"
@@ -967,6 +1321,39 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-syntax-import-assertions@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 2b8b5572db04a7bef1e6cd20debf447e4eef7cb012616f5eceb8fa3e23ce469b8f76ee74fd6d1e158ba17a8f58b0aec579d092fb67c5a30e83ccfbc5754916c1
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-import-attributes@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 197b3c5ea2a9649347f033342cb222ab47f4645633695205c0250c6bf2af29e643753b8bb24a2db39948bef08e7c540babfd365591eb57fc110cb30b425ffc47
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-import-meta@npm:^7.10.4":
+  version: 7.10.4
+  resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.10.4
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 166ac1125d10b9c0c430e4156249a13858c0366d38844883d75d27389621ebe651115cb2ceb6dc011534d5055719fa1727b59f39e1ab3ca97820eef3dcab5b9b
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-syntax-json-strings@npm:^7.8.3":
   version: 7.8.3
   resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3"
@@ -1088,6 +1475,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-syntax-unicode-sets-regex@npm:^7.18.6":
+  version: 7.18.6
+  resolution: "@babel/plugin-syntax-unicode-sets-regex@npm:7.18.6"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.18.6
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: a651d700fe63ff0ddfd7186f4ebc24447ca734f114433139e3c027bc94a900d013cf1ef2e2db8430425ba542e39ae160c3b05f06b59fd4656273a3df97679e9c
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-arrow-functions@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-arrow-functions@npm:7.16.7"
@@ -1099,6 +1498,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-arrow-functions@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 35abb6c57062802c7ce8bd96b2ef2883e3124370c688bbd67609f7d2453802fb73944df8808f893b6c67de978eb2bcf87bbfe325e46d6f39b5fcb09ece11d01a
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-async-generator-functions@npm:^7.23.2":
+  version: 7.23.2
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.2"
+  dependencies:
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-remap-async-to-generator": ^7.22.20
+    "@babel/plugin-syntax-async-generators": ^7.8.4
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: e1abae0edcda7304d7c17702ac25a127578791b89c4f767d60589249fa3e50ec33f8c9ff39d3d8d41f00b29947654eaddd4fd586e04c4d598122db745fab2868
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-async-to-generator@npm:^7.16.8":
   version: 7.16.8
   resolution: "@babel/plugin-transform-async-to-generator@npm:7.16.8"
@@ -1112,6 +1536,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-async-to-generator@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.22.5"
+  dependencies:
+    "@babel/helper-module-imports": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-remap-async-to-generator": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: b95f23f99dcb379a9f0a1c2a3bbea3f8dc0e1b16dc1ac8b484fe378370169290a7a63d520959a9ba1232837cf74a80e23f6facbe14fd42a3cda6d3c2d7168e62
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-block-scoped-functions@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.16.7"
@@ -1123,6 +1560,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-block-scoped-functions@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 416b1341858e8ca4e524dee66044735956ced5f478b2c3b9bc11ec2285b0c25d7dbb96d79887169eb938084c95d0a89338c8b2fe70d473bd9dc92e5d9db1732c
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-block-scoping@npm:^7.16.7, @babel/plugin-transform-block-scoping@npm:^7.8.3":
   version: 7.16.7
   resolution: "@babel/plugin-transform-block-scoping@npm:7.16.7"
@@ -1134,6 +1582,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-block-scoping@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.23.0"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 0cfe925cc3b5a3ad407e2253fab3ceeaa117a4b291c9cb245578880872999bca91bd83ffa0128ae9ca356330702e1ef1dcb26804f28d2cef678239caf629f73e
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-class-properties@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-class-properties@npm:7.22.5"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: b830152dfc2ff2f647f0abe76e6251babdfbef54d18c4b2c73a6bf76b1a00050a5d998dac80dc901a48514e95604324943a9dd39317073fe0928b559e0e0c579
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-class-static-block@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.22.11"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": ^7.22.11
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-class-static-block": ^7.14.5
+  peerDependencies:
+    "@babel/core": ^7.12.0
+  checksum: 69f040506fad66f1c6918d288d0e0edbc5c8a07c8b4462c1184ad2f9f08995d68b057126c213871c0853ae0c72afc60ec87492049dfacb20902e32346a448bcb
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-classes@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-classes@npm:7.16.7"
@@ -1152,6 +1636,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-classes@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/plugin-transform-classes@npm:7.22.15"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-compilation-targets": ^7.22.15
+    "@babel/helper-environment-visitor": ^7.22.5
+    "@babel/helper-function-name": ^7.22.5
+    "@babel/helper-optimise-call-expression": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-replace-supers": ^7.22.9
+    "@babel/helper-split-export-declaration": ^7.22.6
+    globals: ^11.1.0
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: d3f4d0c107dd8a3557ea3575cc777fab27efa92958b41e4a9822f7499725c1f554beae58855de16ddec0a7b694e45f59a26cea8fbde4275563f72f09c6e039a0
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-computed-properties@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-computed-properties@npm:7.16.7"
@@ -1163,6 +1666,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-computed-properties@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/template": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: c2a77a0f94ec71efbc569109ec14ea2aa925b333289272ced8b33c6108bdbb02caf01830ffc7e49486b62dec51911924d13f3a76f1149f40daace1898009e131
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-destructuring@npm:^7.16.7":
   version: 7.17.7
   resolution: "@babel/plugin-transform-destructuring@npm:7.17.7"
@@ -1174,6 +1689,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-destructuring@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/plugin-transform-destructuring@npm:7.23.0"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: cd6dd454ccc2766be551e4f8a04b1acc2aa539fa19e5c7501c56cc2f8cc921dd41a7ffb78455b4c4b2f954fcab8ca4561ba7c9c7bd5af9f19465243603d18cc3
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-dotall-regex@npm:^7.16.7, @babel/plugin-transform-dotall-regex@npm:^7.4.4":
   version: 7.16.7
   resolution: "@babel/plugin-transform-dotall-regex@npm:7.16.7"
@@ -1186,6 +1712,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-dotall-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.22.5"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 409b658d11e3082c8f69e9cdef2d96e4d6d11256f005772425fb230cc48fd05945edbfbcb709dab293a1a2f01f9c8a5bb7b4131e632b23264039d9f95864b453
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-duplicate-keys@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-duplicate-keys@npm:7.16.7"
@@ -1197,9 +1735,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.16.7"
+"@babel/plugin-transform-duplicate-keys@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: bb1280fbabaab6fab2ede585df34900712698210a3bd413f4df5bae6d8c24be36b496c92722ae676a7a67d060a4624f4d6c23b923485f906bfba8773c69f55b4
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-dynamic-import@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.22.11"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-dynamic-import": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 78fc9c532210bf9e8f231747f542318568ac360ee6c27e80853962c984283c73da3f8f8aebe83c2096090a435b356b092ed85de617a156cbe0729d847632be45
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-exponentiation-operator@npm:^7.16.7":
+  version: 7.16.7
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.16.7"
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor": ^7.16.7
     "@babel/helper-plugin-utils": ^7.16.7
@@ -1209,6 +1770,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-exponentiation-operator@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.22.5"
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: f2d660c1b1d51ad5fec1cd5ad426a52187204068c4158f8c4aa977b31535c61b66898d532603eef21c15756827be8277f724c869b888d560f26d7fe848bb5eae
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-export-namespace-from@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.22.11"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 73af5883a321ed56a4bfd43c8a7de0164faebe619287706896fc6ee2f7a4e69042adaa1338c0b8b4bdb9f7e5fdceb016fb1d40694cb43ca3b8827429e8aac4bf
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-for-of@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-for-of@npm:7.16.7"
@@ -1220,6 +1805,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-for-of@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/plugin-transform-for-of@npm:7.22.15"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: f395ae7bce31e14961460f56cf751b5d6e37dd27d7df5b1f4e49fec1c11b6f9cf71991c7ffbe6549878591e87df0d66af798cf26edfa4bfa6b4c3dba1fb2f73a
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-function-name@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-function-name@npm:7.16.7"
@@ -1233,6 +1829,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-function-name@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-function-name@npm:7.22.5"
+  dependencies:
+    "@babel/helper-compilation-targets": ^7.22.5
+    "@babel/helper-function-name": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: cff3b876357999cb8ae30e439c3ec6b0491a53b0aa6f722920a4675a6dd5b53af97a833051df4b34791fe5b3dd326ccf769d5c8e45b322aa50ee11a660b17845
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-json-strings@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-json-strings@npm:7.22.11"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-json-strings": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 50665e5979e66358c50e90a26db53c55917f78175127ac2fa05c7888d156d418ffb930ec0a109353db0a7c5f57c756ce01bfc9825d24cbfd2b3ec453f2ed8cba
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-literals@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-literals@npm:7.16.7"
@@ -1244,6 +1865,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-literals@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-literals@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: ec37cc2ffb32667af935ab32fe28f00920ec8a1eb999aa6dc6602f2bebd8ba205a558aeedcdccdebf334381d5c57106c61f52332045730393e73410892a9735b
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.22.11"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: c664e9798e85afa7f92f07b867682dee7392046181d82f5d21bae6f2ca26dfe9c8375cdc52b7483c3fc09a983c1989f60eff9fbc4f373b0c0a74090553d05739
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-member-expression-literals@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-member-expression-literals@npm:7.16.7"
@@ -1255,6 +1899,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-member-expression-literals@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: ec4b0e07915ddd4fda0142fd104ee61015c208608a84cfa13643a95d18760b1dc1ceb6c6e0548898b8c49e5959a994e46367260176dbabc4467f729b21868504
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-modules-amd@npm:^7.13.0, @babel/plugin-transform-modules-amd@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-modules-amd@npm:7.16.7"
@@ -1280,6 +1935,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-modules-amd@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.23.0"
+  dependencies:
+    "@babel/helper-module-transforms": ^7.23.0
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 5d92875170a37b8282d4bcd805f55829b8fab0f9c8d08b53d32a7a0bfdc62b868e489b52d329ae768ecafc0c993eed0ad7a387baa673ac33211390a9f833ab5d
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-modules-commonjs@npm:^7.16.8":
   version: 7.17.7
   resolution: "@babel/plugin-transform-modules-commonjs@npm:7.17.7"
@@ -1294,6 +1961,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-modules-commonjs@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.0"
+  dependencies:
+    "@babel/helper-module-transforms": ^7.23.0
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-simple-access": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 7fb25997194053e167c4207c319ff05362392da841bd9f42ddb3caf9c8798a5d203bd926d23ddf5830fdf05eddc82c2810f40d1287e3a4f80b07eff13d1024b5
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-modules-systemjs@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-modules-systemjs@npm:7.16.7"
@@ -1309,6 +1989,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-modules-systemjs@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.0"
+  dependencies:
+    "@babel/helper-hoist-variables": ^7.22.5
+    "@babel/helper-module-transforms": ^7.23.0
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-validator-identifier": ^7.22.20
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 2d481458b22605046badea2317d5cc5c94ac3031c2293e34c96f02063f5b02af0979c4da6a8fbc67cc249541575dc9c6d710db6b919ede70b7337a22d9fd57a7
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-modules-umd@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-modules-umd@npm:7.16.7"
@@ -1321,6 +2015,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-modules-umd@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.22.5"
+  dependencies:
+    "@babel/helper-module-transforms": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 46622834c54c551b231963b867adbc80854881b3e516ff29984a8da989bd81665bd70e8cba6710345248e97166689310f544aee1a5773e262845a8f1b3e5b8b4
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-named-capturing-groups-regex@npm:^7.16.8":
   version: 7.16.8
   resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.16.8"
@@ -1332,6 +2038,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 3ee564ddee620c035b928fdc942c5d17e9c4b98329b76f9cefac65c111135d925eb94ed324064cd7556d4f5123beec79abea1d4b97d1c8a2a5c748887a2eb623
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-new-target@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-new-target@npm:7.16.7"
@@ -1343,6 +2061,41 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-new-target@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-new-target@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 6b72112773487a881a1d6ffa680afde08bad699252020e86122180ee7a88854d5da3f15d9bca3331cf2e025df045604494a8208a2e63b486266b07c14e2ffbf3
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.11"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 167babecc8b8fe70796a7b7d34af667ebbf43da166c21689502e5e8cc93180b7a85979c77c9f64b7cce431b36718bd0a6df9e5e0ffea4ae22afb22cfef886372
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-numeric-separator@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.22.11"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-numeric-separator": ^7.10.4
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: af064d06a4a041767ec396a5f258103f64785df290e038bba9f0ef454e6c914f2ac45d862bbdad8fac2c7ad47fa4e95356f29053c60c100a0160b02a995fe2a3
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-object-assign@npm:^7.8.3":
   version: 7.12.13
   resolution: "@babel/plugin-transform-object-assign@npm:7.12.13"
@@ -1354,6 +2107,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-object-rest-spread@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.22.15"
+  dependencies:
+    "@babel/compat-data": ^7.22.9
+    "@babel/helper-compilation-targets": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
+    "@babel/plugin-transform-parameters": ^7.22.15
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 62197a6f12289c1c1bd57f3bed9f0f765ca32390bfe91e0b5561dd94dd9770f4480c4162dec98da094bc0ba99d2c2ebba68de47c019454041b0b7a68ba2ec66d
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-object-super@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-object-super@npm:7.16.7"
@@ -1366,6 +2134,43 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-object-super@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-object-super@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-replace-supers": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: b71887877d74cb64dbccb5c0324fa67e31171e6a5311991f626650e44a4083e5436a1eaa89da78c0474fb095d4ec322d63ee778b202d33aa2e4194e1ed8e62d7
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-optional-catch-binding@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.22.11"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: f17abd90e1de67c84d63afea29c8021c74abb2794d3a6eeafb0bbe7372d3db32aefca386e392116ec63884537a4a2815d090d26264d259bacc08f6e3ed05294c
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-optional-chaining@npm:^7.22.15, @babel/plugin-transform-optional-chaining@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.0"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+    "@babel/plugin-syntax-optional-chaining": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: f702634f2b97e5260dbec0d4bde05ccb6f4d96d7bfa946481aeacfa205ca846cb6e096a38312f9d51fdbdac1f258f211138c5f7075952e46a5bf8574de6a1329
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-parameters@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-parameters@npm:7.16.7"
@@ -1377,6 +2182,43 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-parameters@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/plugin-transform-parameters@npm:7.22.15"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 541188bb7d1876cad87687b5c7daf90f63d8208ae83df24acb1e2b05020ad1c78786b2723ca4054a83fcb74fb6509f30c4cacc5b538ee684224261ad5fb047c1
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-private-methods@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-private-methods@npm:7.22.5"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 321479b4fcb6d3b3ef622ab22fd24001e43d46e680e8e41324c033d5810c84646e470f81b44cbcbef5c22e99030784f7cac92f1829974da7a47a60a7139082c3
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-private-property-in-object@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.22.11"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-create-class-features-plugin": ^7.22.11
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 4d029d84901e53c46dead7a46e2990a7bc62470f4e4ca58a0d063394f86652fd58fe4eea1eb941da3669cd536b559b9d058b342b59300026346b7a2a51badac8
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-property-literals@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-property-literals@npm:7.16.7"
@@ -1388,6 +2230,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-property-literals@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-property-literals@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 796176a3176106f77fcb8cd04eb34a8475ce82d6d03a88db089531b8f0453a2fb8b0c6ec9a52c27948bc0ea478becec449893741fc546dfc3930ab927e3f9f2e
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-regenerator@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-regenerator@npm:7.16.7"
@@ -1399,6 +2252,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-regenerator@npm:^7.22.10":
+  version: 7.22.10
+  resolution: "@babel/plugin-transform-regenerator@npm:7.22.10"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    regenerator-transform: ^0.15.2
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: e13678d62d6fa96f11cb8b863f00e8693491e7adc88bfca3f2820f80cbac8336e7dec3a596eee6a1c4663b7ececc3564f2cd7fb44ed6d4ce84ac2bb7f39ecc6e
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-reserved-words@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-reserved-words@npm:7.16.7"
@@ -1410,6 +2275,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-reserved-words@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 3ffd7dbc425fe8132bfec118b9817572799cab1473113a635d25ab606c1f5a2341a636c04cf6b22df3813320365ed5a965b5eeb3192320a10e4cc2c137bd8bfc
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-runtime@npm:^7.13.9":
   version: 7.13.10
   resolution: "@babel/plugin-transform-runtime@npm:7.13.10"
@@ -1426,6 +2302,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-runtime@npm:^7.14.5":
+  version: 7.23.2
+  resolution: "@babel/plugin-transform-runtime@npm:7.23.2"
+  dependencies:
+    "@babel/helper-module-imports": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+    babel-plugin-polyfill-corejs2: ^0.4.6
+    babel-plugin-polyfill-corejs3: ^0.8.5
+    babel-plugin-polyfill-regenerator: ^0.5.3
+    semver: ^6.3.1
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 09f4273bfe9600c67e72e26f853f11c24ee4c1cbb3935c4a28a94d388e7c0d8733479d868c333cb34e9c236f1765788c6daef7852331f5c70a3b5543fd0247a1
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-shorthand-properties@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-shorthand-properties@npm:7.16.7"
@@ -1437,6 +2329,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-shorthand-properties@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: a5ac902c56ea8effa99f681340ee61bac21094588f7aef0bc01dff98246651702e677552fa6d10e548c4ac22a3ffad047dd2f8c8f0540b68316c2c203e56818b
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-spread@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-spread@npm:7.16.7"
@@ -1449,6 +2352,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-spread@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-spread@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 5587f0deb60b3dfc9b274e269031cc45ec75facccf1933ea2ea71ced9fd3ce98ed91bb36d6cd26817c14474b90ed998c5078415f0eab531caf301496ce24c95c
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-sticky-regex@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-sticky-regex@npm:7.16.7"
@@ -1460,6 +2375,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-sticky-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 63b2c575e3e7f96c32d52ed45ee098fb7d354b35c2223b8c8e76840b32cc529ee0c0ceb5742fd082e56e91e3d82842a367ce177e82b05039af3d602c9627a729
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-template-literals@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-template-literals@npm:7.16.7"
@@ -1471,6 +2397,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-template-literals@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-template-literals@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 27e9bb030654cb425381c69754be4abe6a7c75b45cd7f962cd8d604b841b2f0fb7b024f2efc1c25cc53f5b16d79d5e8cfc47cacbdaa983895b3aeefa3e7e24ff
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-typeof-symbol@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-typeof-symbol@npm:7.16.7"
@@ -1482,6 +2419,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-typeof-symbol@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 82a53a63ffc3010b689ca9a54e5f53b2718b9f4b4a9818f36f9b7dba234f38a01876680553d2716a645a61920b5e6e4aaf8d4a0064add379b27ca0b403049512
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-typescript@npm:^7.13.0":
   version: 7.13.0
   resolution: "@babel/plugin-transform-typescript@npm:7.13.0"
@@ -1558,6 +2506,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-unicode-escapes@npm:^7.22.10":
+  version: 7.22.10
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.22.10"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 807f40ed1324c8cb107c45358f1903384ca3f0ef1d01c5a3c5c9b271c8d8eec66936a3dcc8d75ddfceea9421420368c2e77ae3adef0a50557e778dfe296bf382
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-unicode-property-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.22.5"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 2495e5f663cb388e3d888b4ba3df419ac436a5012144ac170b622ddfc221f9ea9bdba839fa2bc0185cb776b578030666406452ec7791cbf0e7a3d4c88ae9574c
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-unicode-regex@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-unicode-regex@npm:7.16.7"
@@ -1570,6 +2541,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-unicode-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.22.5"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 6b5d1404c8c623b0ec9bd436c00d885a17d6a34f3f2597996343ddb9d94f6379705b21582dfd4cec2c47fd34068872e74ab6b9580116c0566b3f9447e2a7fa06
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.22.5"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: c042070f980b139547f8b0179efbc049ac5930abec7fc26ed7a41d89a048d8ab17d362200e204b6f71c3c20d6991a0e74415e1a412a49adc8131c2a40c04822e
+  languageName: node
+  linkType: hard
+
 "@babel/polyfill@npm:^7.11.5":
   version: 7.12.1
   resolution: "@babel/polyfill@npm:7.12.1"
@@ -1664,6 +2659,109 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/preset-env@npm:^7.14.5":
+  version: 7.23.2
+  resolution: "@babel/preset-env@npm:7.23.2"
+  dependencies:
+    "@babel/compat-data": ^7.23.2
+    "@babel/helper-compilation-targets": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-validator-option": ^7.22.15
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.22.15
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.22.15
+    "@babel/plugin-proposal-private-property-in-object": 7.21.0-placeholder-for-preset-env.2
+    "@babel/plugin-syntax-async-generators": ^7.8.4
+    "@babel/plugin-syntax-class-properties": ^7.12.13
+    "@babel/plugin-syntax-class-static-block": ^7.14.5
+    "@babel/plugin-syntax-dynamic-import": ^7.8.3
+    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
+    "@babel/plugin-syntax-import-assertions": ^7.22.5
+    "@babel/plugin-syntax-import-attributes": ^7.22.5
+    "@babel/plugin-syntax-import-meta": ^7.10.4
+    "@babel/plugin-syntax-json-strings": ^7.8.3
+    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
+    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
+    "@babel/plugin-syntax-numeric-separator": ^7.10.4
+    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
+    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
+    "@babel/plugin-syntax-optional-chaining": ^7.8.3
+    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
+    "@babel/plugin-syntax-top-level-await": ^7.14.5
+    "@babel/plugin-syntax-unicode-sets-regex": ^7.18.6
+    "@babel/plugin-transform-arrow-functions": ^7.22.5
+    "@babel/plugin-transform-async-generator-functions": ^7.23.2
+    "@babel/plugin-transform-async-to-generator": ^7.22.5
+    "@babel/plugin-transform-block-scoped-functions": ^7.22.5
+    "@babel/plugin-transform-block-scoping": ^7.23.0
+    "@babel/plugin-transform-class-properties": ^7.22.5
+    "@babel/plugin-transform-class-static-block": ^7.22.11
+    "@babel/plugin-transform-classes": ^7.22.15
+    "@babel/plugin-transform-computed-properties": ^7.22.5
+    "@babel/plugin-transform-destructuring": ^7.23.0
+    "@babel/plugin-transform-dotall-regex": ^7.22.5
+    "@babel/plugin-transform-duplicate-keys": ^7.22.5
+    "@babel/plugin-transform-dynamic-import": ^7.22.11
+    "@babel/plugin-transform-exponentiation-operator": ^7.22.5
+    "@babel/plugin-transform-export-namespace-from": ^7.22.11
+    "@babel/plugin-transform-for-of": ^7.22.15
+    "@babel/plugin-transform-function-name": ^7.22.5
+    "@babel/plugin-transform-json-strings": ^7.22.11
+    "@babel/plugin-transform-literals": ^7.22.5
+    "@babel/plugin-transform-logical-assignment-operators": ^7.22.11
+    "@babel/plugin-transform-member-expression-literals": ^7.22.5
+    "@babel/plugin-transform-modules-amd": ^7.23.0
+    "@babel/plugin-transform-modules-commonjs": ^7.23.0
+    "@babel/plugin-transform-modules-systemjs": ^7.23.0
+    "@babel/plugin-transform-modules-umd": ^7.22.5
+    "@babel/plugin-transform-named-capturing-groups-regex": ^7.22.5
+    "@babel/plugin-transform-new-target": ^7.22.5
+    "@babel/plugin-transform-nullish-coalescing-operator": ^7.22.11
+    "@babel/plugin-transform-numeric-separator": ^7.22.11
+    "@babel/plugin-transform-object-rest-spread": ^7.22.15
+    "@babel/plugin-transform-object-super": ^7.22.5
+    "@babel/plugin-transform-optional-catch-binding": ^7.22.11
+    "@babel/plugin-transform-optional-chaining": ^7.23.0
+    "@babel/plugin-transform-parameters": ^7.22.15
+    "@babel/plugin-transform-private-methods": ^7.22.5
+    "@babel/plugin-transform-private-property-in-object": ^7.22.11
+    "@babel/plugin-transform-property-literals": ^7.22.5
+    "@babel/plugin-transform-regenerator": ^7.22.10
+    "@babel/plugin-transform-reserved-words": ^7.22.5
+    "@babel/plugin-transform-shorthand-properties": ^7.22.5
+    "@babel/plugin-transform-spread": ^7.22.5
+    "@babel/plugin-transform-sticky-regex": ^7.22.5
+    "@babel/plugin-transform-template-literals": ^7.22.5
+    "@babel/plugin-transform-typeof-symbol": ^7.22.5
+    "@babel/plugin-transform-unicode-escapes": ^7.22.10
+    "@babel/plugin-transform-unicode-property-regex": ^7.22.5
+    "@babel/plugin-transform-unicode-regex": ^7.22.5
+    "@babel/plugin-transform-unicode-sets-regex": ^7.22.5
+    "@babel/preset-modules": 0.1.6-no-external-plugins
+    "@babel/types": ^7.23.0
+    babel-plugin-polyfill-corejs2: ^0.4.6
+    babel-plugin-polyfill-corejs3: ^0.8.5
+    babel-plugin-polyfill-regenerator: ^0.5.3
+    core-js-compat: ^3.31.0
+    semver: ^6.3.1
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 49327ef584b529b56aedd6577937b80c0d89603c68b23795495a13af04b5aa008db9ad04cd280423600cdc0d3cce13ae9d0d9a977db5c8193697b20ced8a10b2
+  languageName: node
+  linkType: hard
+
+"@babel/preset-modules@npm:0.1.6-no-external-plugins":
+  version: 0.1.6-no-external-plugins
+  resolution: "@babel/preset-modules@npm:0.1.6-no-external-plugins"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.0.0
+    "@babel/types": ^7.4.4
+    esutils: ^2.0.2
+  peerDependencies:
+    "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0
+  checksum: 4855e799bc50f2449fb5210f78ea9e8fd46cf4f242243f1e2ed838e2bd702e25e73e822e7f8447722a5f4baa5e67a8f7a0e403f3e7ce04540ff743a9c411c375
+  languageName: node
+  linkType: hard
+
 "@babel/preset-modules@npm:^0.1.5":
   version: 0.1.5
   resolution: "@babel/preset-modules@npm:0.1.5"
@@ -1679,6 +2777,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/regjsgen@npm:^0.8.0":
+  version: 0.8.0
+  resolution: "@babel/regjsgen@npm:0.8.0"
+  checksum: 89c338fee774770e5a487382170711014d49a68eb281e74f2b5eac88f38300a4ad545516a7786a8dd5702e9cf009c94c2f582d200f077ac5decd74c56b973730
+  languageName: node
+  linkType: hard
+
 "@babel/runtime@npm:7.12.18, @babel/runtime@npm:^7.8.4":
   version: 7.12.18
   resolution: "@babel/runtime@npm:7.12.18"
@@ -1697,6 +2802,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/runtime@npm:^7.14.5":
+  version: 7.23.2
+  resolution: "@babel/runtime@npm:7.23.2"
+  dependencies:
+    regenerator-runtime: ^0.14.0
+  checksum: 6c4df4839ec75ca10175f636d6362f91df8a3137f86b38f6cd3a4c90668a0fe8e9281d320958f4fbd43b394988958585a17c3aab2a4ea6bf7316b22916a371fb
+  languageName: node
+  linkType: hard
+
 "@babel/template@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/template@npm:7.16.7"
@@ -1719,6 +2833,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/template@npm:^7.22.15, @babel/template@npm:^7.22.5":
+  version: 7.22.15
+  resolution: "@babel/template@npm:7.22.15"
+  dependencies:
+    "@babel/code-frame": ^7.22.13
+    "@babel/parser": ^7.22.15
+    "@babel/types": ^7.22.15
+  checksum: 1f3e7dcd6c44f5904c184b3f7fe280394b191f2fed819919ffa1e529c259d5b197da8981b6ca491c235aee8dbad4a50b7e31304aa531271cb823a4a24a0dd8fd
+  languageName: node
+  linkType: hard
+
 "@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.16.7, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.17.3, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.0":
   version: 7.17.3
   resolution: "@babel/traverse@npm:7.17.3"
@@ -1737,6 +2862,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/traverse@npm:^7.14.5, @babel/traverse@npm:^7.23.2":
+  version: 7.23.2
+  resolution: "@babel/traverse@npm:7.23.2"
+  dependencies:
+    "@babel/code-frame": ^7.22.13
+    "@babel/generator": ^7.23.0
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-function-name": ^7.23.0
+    "@babel/helper-hoist-variables": ^7.22.5
+    "@babel/helper-split-export-declaration": ^7.22.6
+    "@babel/parser": ^7.23.0
+    "@babel/types": ^7.23.0
+    debug: ^4.1.0
+    globals: ^11.1.0
+  checksum: 26a1eea0dde41ab99dde8b9773a013a0dc50324e5110a049f5d634e721ff08afffd54940b3974a20308d7952085ac769689369e9127dea655f868c0f6e1ab35d
+  languageName: node
+  linkType: hard
+
 "@babel/traverse@npm:^7.21.5":
   version: 7.21.5
   resolution: "@babel/traverse@npm:7.21.5"
@@ -1787,6 +2930,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/types@npm:7.23.0"
+  dependencies:
+    "@babel/helper-string-parser": ^7.22.5
+    "@babel/helper-validator-identifier": ^7.22.20
+    to-fast-properties: ^2.0.0
+  checksum: 215fe04bd7feef79eeb4d33374b39909ce9cad1611c4135a4f7fdf41fe3280594105af6d7094354751514625ea92d0875aba355f53e86a92600f290e77b0e604
+  languageName: node
+  linkType: hard
+
 "@cnakazawa/watch@npm:^1.0.3":
   version: 1.0.4
   resolution: "@cnakazawa/watch@npm:1.0.4"
@@ -2063,7 +3217,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ember/render-modifiers@npm:^2.0.4, @ember/render-modifiers@npm:^2.0.5":
+"@ember/render-modifiers@npm:^2.0.4":
   version: 2.0.5
   resolution: "@ember/render-modifiers@npm:2.0.5"
   dependencies:
@@ -2076,6 +3230,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ember/render-modifiers@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "@ember/render-modifiers@npm:2.1.0"
+  dependencies:
+    "@embroider/macros": ^1.0.0
+    ember-cli-babel: ^7.26.11
+    ember-modifier-manager-polyfill: ^1.2.0
+  peerDependencies:
+    "@glint/template": ^1.0.2
+    ember-source: ^3.8 || ^4.0.0 || ^5.0.0
+  peerDependenciesMeta:
+    "@glint/template":
+      optional: true
+  checksum: 6c4d617b67ee52e8e29e9a2b9f42a30e8ea333a7b7a4c5a61fdf5f15623da11f40d82218aeddfbe32bee1f508c569740e842a8233f4a372728d18b66bbc197d5
+  languageName: node
+  linkType: hard
+
 "@ember/string@npm:^1.0.0":
   version: 1.1.0
   resolution: "@ember/string@npm:1.1.0"
@@ -2137,18 +3308,106 @@ __metadata:
   dependencies:
     "@embroider/shared-internals": ^1.8.3
     semver: ^7.3.5
-  checksum: 11dfdb956631179656727599eb6d6223369f6a04f0e28ac04b793064338c577a89a77c59254a4a665acc46e174cf87196d0f335ab8049be7fe8a2c71ef695974
+  checksum: 11dfdb956631179656727599eb6d6223369f6a04f0e28ac04b793064338c577a89a77c59254a4a665acc46e174cf87196d0f335ab8049be7fe8a2c71ef695974
+  languageName: node
+  linkType: hard
+
+"@embroider/addon-shim@npm:^1.8.0, @embroider/addon-shim@npm:^1.8.3, @embroider/addon-shim@npm:^1.8.4":
+  version: 1.8.4
+  resolution: "@embroider/addon-shim@npm:1.8.4"
+  dependencies:
+    "@embroider/shared-internals": ^2.0.0
+    broccoli-funnel: ^3.0.8
+    semver: ^7.3.8
+  checksum: 107220e97bbd46ead81dfbbfc6cf7daa61731096a6e81b989659a9a0b29b48b3c97ebdd446b6dc0636c4be369f3744e514b7f5e5c0fdc54c1c0e026f54404cc2
+  languageName: node
+  linkType: hard
+
+"@embroider/compat@npm:^0.47.0":
+  version: 0.47.2
+  resolution: "@embroider/compat@npm:0.47.2"
+  dependencies:
+    "@babel/code-frame": ^7.14.5
+    "@babel/core": ^7.14.5
+    "@babel/plugin-syntax-dynamic-import": ^7.8.3
+    "@babel/preset-env": ^7.14.5
+    "@babel/traverse": ^7.14.5
+    "@embroider/macros": 0.47.2
+    "@embroider/shared-internals": 0.47.2
+    "@types/babel__code-frame": ^7.0.2
+    "@types/yargs": ^17.0.3
+    assert-never: ^1.1.0
+    babel-plugin-syntax-dynamic-import: ^6.18.0
+    babylon: ^6.18.0
+    bind-decorator: ^1.0.11
+    broccoli: ^3.5.2
+    broccoli-concat: ^4.2.5
+    broccoli-file-creator: ^2.1.1
+    broccoli-funnel: ^3.0.7
+    broccoli-merge-trees: ^4.2.0
+    broccoli-persistent-filter: ^3.1.2
+    broccoli-plugin: ^4.0.7
+    broccoli-source: ^3.0.1
+    chalk: ^4.1.1
+    debug: ^4.3.2
+    fs-extra: ^9.1.0
+    fs-tree-diff: ^2.0.1
+    heimdalljs: ^0.2.6
+    jsdom: ^16.6.0
+    lodash: ^4.17.21
+    pkg-up: ^3.1.0
+    resolve: ^1.20.0
+    resolve-package-path: ^4.0.1
+    semver: ^7.3.5
+    symlink-or-copy: ^1.3.1
+    tree-sync: ^2.1.0
+    typescript-memoize: ^1.0.1
+    walk-sync: ^3.0.0
+    yargs: ^17.0.1
+  peerDependencies:
+    "@embroider/core": 0.47.2
+  bin:
+    embroider-compat-audit: src/audit-cli.js
+  checksum: bee7579341ac7d77384fd5bd563d206794ff65b5dd1bcf813769cad4fb300ed5fafdf9f3dc430107b682a0560a7a5dee67813dbab436be3cf0448e8350a8bd45
   languageName: node
   linkType: hard
 
-"@embroider/addon-shim@npm:^1.8.0, @embroider/addon-shim@npm:^1.8.3, @embroider/addon-shim@npm:^1.8.4":
-  version: 1.8.4
-  resolution: "@embroider/addon-shim@npm:1.8.4"
+"@embroider/core@npm:^0.47.0":
+  version: 0.47.2
+  resolution: "@embroider/core@npm:0.47.2"
   dependencies:
-    "@embroider/shared-internals": ^2.0.0
-    broccoli-funnel: ^3.0.8
-    semver: ^7.3.8
-  checksum: 107220e97bbd46ead81dfbbfc6cf7daa61731096a6e81b989659a9a0b29b48b3c97ebdd446b6dc0636c4be369f3744e514b7f5e5c0fdc54c1c0e026f54404cc2
+    "@babel/core": ^7.14.5
+    "@babel/parser": ^7.14.5
+    "@babel/plugin-syntax-dynamic-import": ^7.8.3
+    "@babel/plugin-transform-runtime": ^7.14.5
+    "@babel/runtime": ^7.14.5
+    "@babel/traverse": ^7.14.5
+    "@embroider/macros": 0.47.2
+    "@embroider/shared-internals": 0.47.2
+    assert-never: ^1.2.1
+    babel-import-util: ^0.2.0
+    babel-plugin-ember-template-compilation: ^1.0.0
+    broccoli-node-api: ^1.7.0
+    broccoli-persistent-filter: ^3.1.2
+    broccoli-plugin: ^4.0.7
+    broccoli-source: ^3.0.1
+    debug: ^4.3.2
+    escape-string-regexp: ^4.0.0
+    fast-sourcemap-concat: ^1.4.0
+    filesize: ^5.0.0
+    fs-extra: ^9.1.0
+    fs-tree-diff: ^2.0.1
+    handlebars: ^4.7.7
+    js-string-escape: ^1.0.1
+    jsdom: ^16.6.0
+    lodash: ^4.17.21
+    resolve: ^1.20.0
+    resolve-package-path: ^4.0.1
+    strip-bom: ^4.0.0
+    typescript-memoize: ^1.0.1
+    walk-sync: ^3.0.0
+    wrap-legacy-hbs-plugin-if-needed: ^1.0.1
+  checksum: f378bd2081114f6742f87a1f2db9e409692ce4319599b21da56339320dc02db6052a93a00d171ede237f03578d624b04ec8600fa6373d2a5169502d1c0eadcba
   languageName: node
   linkType: hard
 
@@ -2168,6 +3427,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@embroider/shared-internals@npm:0.47.2":
+  version: 0.47.2
+  resolution: "@embroider/shared-internals@npm:0.47.2"
+  dependencies:
+    babel-import-util: ^0.2.0
+    ember-rfc176-data: ^0.3.17
+    fs-extra: ^9.1.0
+    lodash: ^4.17.21
+    resolve-package-path: ^4.0.1
+    semver: ^7.3.5
+    typescript-memoize: ^1.0.1
+  checksum: c32b829a66f31da9576230d576be35809aa94c9faf8e62b3b174851605ffe080901cc3fafbbdd45df5cb3a91e7c77696c02fb627f6914a166a6b3b496f1fd956
+  languageName: node
+  linkType: hard
+
 "@embroider/shared-internals@npm:1.5.0, @embroider/shared-internals@npm:^1.0.0":
   version: 1.5.0
   resolution: "@embroider/shared-internals@npm:1.5.0"
@@ -2459,6 +3733,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@glimmer/encoder@npm:^0.42.2":
+  version: 0.42.2
+  resolution: "@glimmer/encoder@npm:0.42.2"
+  dependencies:
+    "@glimmer/interfaces": ^0.42.2
+    "@glimmer/vm": ^0.42.2
+  checksum: 1e857e09176a6673c599a7b466b8cb20fde55df3dfd7e2d923ac2e065261ddf2ef82651a64c40c0209bb9fc684abcf6f79ea52e23b9f7463c7a244f0540bce50
+  languageName: node
+  linkType: hard
+
 "@glimmer/env@npm:0.1.7, @glimmer/env@npm:^0.1.7":
   version: 0.1.7
   resolution: "@glimmer/env@npm:0.1.7"
@@ -2493,6 +3777,40 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@glimmer/interfaces@npm:^0.42.2":
+  version: 0.42.2
+  resolution: "@glimmer/interfaces@npm:0.42.2"
+  checksum: c9dfcba6456955d797e5e0746ba69655c0d99a4962adb0de875e8de4e826767bce1c544966468bc9da40468286572966e59ce2c19b3f3879bfd23922b7d57cc6
+  languageName: node
+  linkType: hard
+
+"@glimmer/low-level@npm:^0.42.2":
+  version: 0.42.2
+  resolution: "@glimmer/low-level@npm:0.42.2"
+  checksum: 7d7c5af8d127e588853ad590f4bfa4d06c545b27b86dfee102e036a5cf9a59971d735b8a13f7611cf8c4006c10349e93a15a7eb55e246cb2f047bf2d524b0f6d
+  languageName: node
+  linkType: hard
+
+"@glimmer/program@npm:^0.42.2":
+  version: 0.42.2
+  resolution: "@glimmer/program@npm:0.42.2"
+  dependencies:
+    "@glimmer/encoder": ^0.42.2
+    "@glimmer/interfaces": ^0.42.2
+    "@glimmer/util": ^0.42.2
+  checksum: 570c60a96b96c37c43bfae1fe9c5b29459d0c0c4eadc2da478ccfe38f1a3e3ab5d0dffa05d09ac4828899ccf610b9ff987e5cc76b5491570c16448b82db975aa
+  languageName: node
+  linkType: hard
+
+"@glimmer/reference@npm:^0.42.1, @glimmer/reference@npm:^0.42.2":
+  version: 0.42.2
+  resolution: "@glimmer/reference@npm:0.42.2"
+  dependencies:
+    "@glimmer/util": ^0.42.2
+  checksum: b5b66e2210b429d69a3287fed79b4fb4036282da2f31ea2b8c0a200e452fd21bcb4dff39b031d2cc98646d9443b2b8fb0c910aaf30cc3b0597df0f07532b361d
+  languageName: node
+  linkType: hard
+
 "@glimmer/reference@npm:^0.65.0":
   version: 0.65.4
   resolution: "@glimmer/reference@npm:0.65.4"
@@ -2506,6 +3824,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@glimmer/runtime@npm:^0.42.1":
+  version: 0.42.2
+  resolution: "@glimmer/runtime@npm:0.42.2"
+  dependencies:
+    "@glimmer/interfaces": ^0.42.2
+    "@glimmer/low-level": ^0.42.2
+    "@glimmer/program": ^0.42.2
+    "@glimmer/reference": ^0.42.2
+    "@glimmer/util": ^0.42.2
+    "@glimmer/vm": ^0.42.2
+    "@glimmer/wire-format": ^0.42.2
+  checksum: 45345713e44033fac3fc8356ce5ab1b1e90ff998ed25bdd0b615a45f05574b65b8fc87dbc22ed79a7c8d448f1c634228ab5aa546ea50a2ba878a45453bfe4fe2
+  languageName: node
+  linkType: hard
+
 "@glimmer/syntax@npm:^0.27.0":
   version: 0.27.0
   resolution: "@glimmer/syntax@npm:0.27.0"
@@ -2518,6 +3851,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@glimmer/syntax@npm:^0.42.1":
+  version: 0.42.2
+  resolution: "@glimmer/syntax@npm:0.42.2"
+  dependencies:
+    "@glimmer/interfaces": ^0.42.2
+    "@glimmer/util": ^0.42.2
+    handlebars: ^4.0.13
+    simple-html-tokenizer: ^0.5.8
+  checksum: 7597a643b88a967fbb85c3c3e0a8f57a4e7a328f78b9605fb31a5ee678531ca0b7935971cab8755af33f2b3ea71836a38e10dffbec259c6ab1ca411c2f1ec80d
+  languageName: node
+  linkType: hard
+
 "@glimmer/syntax@npm:^0.65.0":
   version: 0.65.4
   resolution: "@glimmer/syntax@npm:0.65.4"
@@ -2568,6 +3913,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@glimmer/util@npm:^0.42.2":
+  version: 0.42.2
+  resolution: "@glimmer/util@npm:0.42.2"
+  checksum: 996a84c3db284e47202a7daeccce31870a413dd6817a88908ad18484f2cd4559d19c8bc98e921cc00db72db3a1efa52931725abe4c71d4a3bb1bb78a50fb739a
+  languageName: node
+  linkType: hard
+
 "@glimmer/util@npm:^0.44.0":
   version: 0.44.0
   resolution: "@glimmer/util@npm:0.44.0"
@@ -2601,6 +3953,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@glimmer/vm@npm:^0.42.2":
+  version: 0.42.2
+  resolution: "@glimmer/vm@npm:0.42.2"
+  dependencies:
+    "@glimmer/interfaces": ^0.42.2
+    "@glimmer/util": ^0.42.2
+  checksum: 3adb1963fb5cfe9ee795e10f144ec0ba1c5e9289525a95b3e506d05477da47247f36e01837dbfe5f728d74a6d44f4d62e1a59e7ec9ebdaabf5cbe955c643dc34
+  languageName: node
+  linkType: hard
+
 "@glimmer/wire-format@npm:^0.27.0":
   version: 0.27.0
   resolution: "@glimmer/wire-format@npm:0.27.0"
@@ -2610,6 +3972,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@glimmer/wire-format@npm:^0.42.2":
+  version: 0.42.2
+  resolution: "@glimmer/wire-format@npm:0.42.2"
+  dependencies:
+    "@glimmer/interfaces": ^0.42.2
+    "@glimmer/util": ^0.42.2
+  checksum: f1778ba0ec24a41f15b55e328854d9e9dbd3371269bc6912b633b5487f52f725a8f12b0ef9ba4b9614633b89abdc2b02ee7a25a07b28ab2452ffe6b854589adb
+  languageName: node
+  linkType: hard
+
 "@handlebars/parser@npm:^1.1.0":
   version: 1.1.0
   resolution: "@handlebars/parser@npm:1.1.0"
@@ -2635,6 +4007,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@istanbuljs/load-nyc-config@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "@istanbuljs/load-nyc-config@npm:1.1.0"
+  dependencies:
+    camelcase: ^5.3.1
+    find-up: ^4.1.0
+    get-package-type: ^0.1.0
+    js-yaml: ^3.13.1
+    resolve-from: ^5.0.0
+  checksum: d578da5e2e804d5c93228450a1380e1a3c691de4953acc162f387b717258512a3e07b83510a936d9fab03eac90817473917e24f5d16297af3867f59328d58568
+  languageName: node
+  linkType: hard
+
+"@istanbuljs/schema@npm:^0.1.2":
+  version: 0.1.3
+  resolution: "@istanbuljs/schema@npm:0.1.3"
+  checksum: 5282759d961d61350f33d9118d16bcaed914ebf8061a52f4fa474b2cb08720c9c81d165e13b82f2e5a8a212cc5af482f0c6fc1ac27b9e067e5394c9a6ed186c9
+  languageName: node
+  linkType: hard
+
 "@jacobq/source-map@npm:^1.1.0":
   version: 1.1.0
   resolution: "@jacobq/source-map@npm:1.1.0"
@@ -2979,6 +4371,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/babel__code-frame@npm:^7.0.2":
+  version: 7.0.4
+  resolution: "@types/babel__code-frame@npm:7.0.4"
+  checksum: eb4adb0a79c5cbf2d88ad087b2694a1e38749dc0056693e6125c17a3967fc8d4cc1eb33eab26d3dcaaa8995236cba4a088965cc3a115967545f2a01ee430c87f
+  languageName: node
+  linkType: hard
+
 "@types/body-parser@npm:*":
   version: 1.19.0
   resolution: "@types/body-parser@npm:1.19.0"
@@ -3463,6 +4862,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/yargs-parser@npm:*":
+  version: 21.0.1
+  resolution: "@types/yargs-parser@npm:21.0.1"
+  checksum: 64e6316c2045e2d460c4fb79572f872f9d2f98fddc6d9d3949c71f0b6ad0ef8a2706cf49db26dfb02a9cb81433abb8f340f015e1d20a9692279abe9477b72c8e
+  languageName: node
+  linkType: hard
+
+"@types/yargs@npm:^17.0.3":
+  version: 17.0.28
+  resolution: "@types/yargs@npm:17.0.28"
+  dependencies:
+    "@types/yargs-parser": "*"
+  checksum: f78c5e5c29903933c0557b4ffcd1d0b8564d66859c8ca4aa51da3714e49109ed7c2644334a1918d033df19028f4cecc91fd2e502651bb8e8451f246c371da847
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/ast@npm:1.11.1":
   version: 1.11.1
   resolution: "@webassemblyjs/ast@npm:1.11.1"
@@ -3848,6 +5263,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"abab@npm:^2.0.3, abab@npm:^2.0.5":
+  version: 2.0.6
+  resolution: "abab@npm:2.0.6"
+  checksum: 6ffc1af4ff315066c62600123990d87551ceb0aafa01e6539da77b0f5987ac7019466780bf480f1787576d4385e3690c81ccc37cfda12819bf510b8ab47e5a3e
+  languageName: node
+  linkType: hard
+
 "abbrev@npm:1, abbrev@npm:~1.1.0":
   version: 1.1.1
   resolution: "abbrev@npm:1.1.1"
@@ -3891,6 +5313,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"acorn-globals@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "acorn-globals@npm:6.0.0"
+  dependencies:
+    acorn: ^7.1.1
+    acorn-walk: ^7.1.1
+  checksum: 72d95e5b5e585f9acd019b993ab8bbba68bb3cbc9d9b5c1ebb3c2f1fe5981f11deababfb4949f48e6262f9c57878837f5958c0cca396f81023814680ca878042
+  languageName: node
+  linkType: hard
+
 "acorn-import-assertions@npm:^1.7.6":
   version: 1.8.0
   resolution: "acorn-import-assertions@npm:1.8.0"
@@ -3909,6 +5341,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"acorn-walk@npm:^7.1.1":
+  version: 7.2.0
+  resolution: "acorn-walk@npm:7.2.0"
+  checksum: 9252158a79b9d92f1bc0dd6acc0fcfb87a67339e84bcc301bb33d6078936d27e35d606b4d35626d2962cd43c256d6f27717e70cbe15c04fff999ab0b2260b21f
+  languageName: node
+  linkType: hard
+
 "acorn@npm:^5.0.0, acorn@npm:^5.5.3":
   version: 5.7.4
   resolution: "acorn@npm:5.7.4"
@@ -3927,7 +5366,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^7.1.0, acorn@npm:^7.4.0":
+"acorn@npm:^7.1.0, acorn@npm:^7.1.1, acorn@npm:^7.4.0":
   version: 7.4.1
   resolution: "acorn@npm:7.4.1"
   bin:
@@ -3936,6 +5375,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"acorn@npm:^8.2.4":
+  version: 8.10.0
+  resolution: "acorn@npm:8.10.0"
+  bin:
+    acorn: bin/acorn
+  checksum: 538ba38af0cc9e5ef983aee196c4b8b4d87c0c94532334fa7e065b2c8a1f85863467bb774231aae91613fcda5e68740c15d97b1967ae3394d20faddddd8af61d
+  languageName: node
+  linkType: hard
+
 "acorn@npm:^8.4.1, acorn@npm:^8.5.0":
   version: 8.7.0
   resolution: "acorn@npm:8.7.0"
@@ -4075,7 +5523,7 @@ __metadata:
   resolution: "amber-ui@workspace:."
   dependencies:
     "@ember/optional-features": ^2.0.0
-    "@ember/render-modifiers": ^2.0.5
+    "@ember/render-modifiers": ^2.1.0
     "@ember/test-helpers": ^2.6.0
     "@faker-js/faker": ^7.6.0
     "@fortawesome/ember-fontawesome": ^0.4.1
@@ -4095,6 +5543,7 @@ __metadata:
     ember-can: ^4.2.0
     ember-cli: ~4.11.0
     ember-cli-babel: ^7.26.10
+    ember-cli-code-coverage: ^2.0.0
     ember-cli-content-security-policy: ^2.0.3
     ember-cli-dependency-checker: ^3.2.0
     ember-cli-dropzonejs: ^1.3.6
@@ -4519,7 +5968,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"assert-never@npm:^1.2.1":
+"assert-never@npm:^1.1.0, assert-never@npm:^1.2.1":
   version: 1.2.1
   resolution: "assert-never@npm:1.2.1"
   checksum: ea4f1756d90f55254c4dc7a20d6c5d5bc169160562aefe3d8756b598c10e695daf568f21b6d6b12245d7f3782d3ff83ef6a01ab75d487adfc6909470a813bf8c
@@ -5048,6 +6497,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-plugin-istanbul@npm:^6.0.0":
+  version: 6.1.1
+  resolution: "babel-plugin-istanbul@npm:6.1.1"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.0.0
+    "@istanbuljs/load-nyc-config": ^1.0.0
+    "@istanbuljs/schema": ^0.1.2
+    istanbul-lib-instrument: ^5.0.4
+    test-exclude: ^6.0.0
+  checksum: cb4fd95738219f232f0aece1116628cccff16db891713c4ccb501cddbbf9272951a5df81f2f2658dfdf4b3e7b236a9d5cbcf04d5d8c07dd5077297339598061a
+  languageName: node
+  linkType: hard
+
 "babel-plugin-module-resolver@npm:^3.2.0":
   version: 3.2.0
   resolution: "babel-plugin-module-resolver@npm:3.2.0"
@@ -5100,6 +6562,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-plugin-polyfill-corejs2@npm:^0.4.6":
+  version: 0.4.6
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.6"
+  dependencies:
+    "@babel/compat-data": ^7.22.6
+    "@babel/helper-define-polyfill-provider": ^0.4.3
+    semver: ^6.3.1
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 08896811df31530be6a9bcdd630cb9fd4b5ae5181039d18db3796efbc54e38d57a42af460845c10a04434e1bc45c0d47743c7e6c860383cc6b141083cde22030
+  languageName: node
+  linkType: hard
+
 "babel-plugin-polyfill-corejs3@npm:^0.1.3":
   version: 0.1.7
   resolution: "babel-plugin-polyfill-corejs3@npm:0.1.7"
@@ -5124,6 +6599,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-plugin-polyfill-corejs3@npm:^0.8.5":
+  version: 0.8.5
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.5"
+  dependencies:
+    "@babel/helper-define-polyfill-provider": ^0.4.3
+    core-js-compat: ^3.32.2
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 54ff3956c4f88e483d38b27ceec6199b9e73fceac10ebf969469d215e6a62929384e4433f85335c9a6ba809329636e27f9bdae2f54075f833e7a745341c07d84
+  languageName: node
+  linkType: hard
+
 "babel-plugin-polyfill-regenerator@npm:^0.1.2":
   version: 0.1.6
   resolution: "babel-plugin-polyfill-regenerator@npm:0.1.6"
@@ -5146,6 +6633,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-plugin-polyfill-regenerator@npm:^0.5.3":
+  version: 0.5.3
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.3"
+  dependencies:
+    "@babel/helper-define-polyfill-provider": ^0.4.3
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 2bb546582cda1870d19e646a7183baeb2cccd56e0ef3e4eaeabd28e120daf17cb87399194a9ccdcf32506bcaa68d23e73440fc8ab990a7a0f8c5a77c12d5d4bc
+  languageName: node
+  linkType: hard
+
 "babel-plugin-syntax-async-functions@npm:^6.8.0":
   version: 6.13.0
   resolution: "babel-plugin-syntax-async-functions@npm:6.13.0"
@@ -5686,6 +7184,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bind-decorator@npm:^1.0.11":
+  version: 1.0.11
+  resolution: "bind-decorator@npm:1.0.11"
+  checksum: 41b6c69af51ee7e6e01ea6f2939df94c9c760383f89f5befda0890951657baedbf499a0b96a789fd85cb77252465134f4e6184aae6639ed60cf59549ef15353d
+  languageName: node
+  linkType: hard
+
 "bindings@npm:^1.5.0":
   version: 1.5.0
   resolution: "bindings@npm:1.5.0"
@@ -5798,6 +7303,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"body-parser@npm:^1.19.0":
+  version: 1.20.2
+  resolution: "body-parser@npm:1.20.2"
+  dependencies:
+    bytes: 3.1.2
+    content-type: ~1.0.5
+    debug: 2.6.9
+    depd: 2.0.0
+    destroy: 1.2.0
+    http-errors: 2.0.0
+    iconv-lite: 0.4.24
+    on-finished: 2.4.1
+    qs: 6.11.0
+    raw-body: 2.5.2
+    type-is: ~1.6.18
+    unpipe: 1.0.0
+  checksum: 14d37ec638ab5c93f6099ecaed7f28f890d222c650c69306872e00b9efa081ff6c596cd9afb9930656aae4d6c4e1c17537bea12bb73c87a217cb3cfea8896737
+  languageName: node
+  linkType: hard
+
 "body@npm:^5.1.0":
   version: 5.1.0
   resolution: "body@npm:5.1.0"
@@ -6258,7 +7783,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"broccoli-funnel@npm:^3.0.1, broccoli-funnel@npm:^3.0.3, broccoli-funnel@npm:^3.0.5, broccoli-funnel@npm:^3.0.8":
+"broccoli-funnel@npm:^3.0.1, broccoli-funnel@npm:^3.0.3, broccoli-funnel@npm:^3.0.5, broccoli-funnel@npm:^3.0.7, broccoli-funnel@npm:^3.0.8":
   version: 3.0.8
   resolution: "broccoli-funnel@npm:3.0.8"
   dependencies:
@@ -6759,6 +8284,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"browser-process-hrtime@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "browser-process-hrtime@npm:1.0.0"
+  checksum: e30f868cdb770b1201afb714ad1575dd86366b6e861900884665fb627109b3cc757c40067d3bfee1ff2a29c835257ea30725a8018a9afd02ac1c24b408b1e45f
+  languageName: node
+  linkType: hard
+
 "browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4":
   version: 1.2.0
   resolution: "browserify-aes@npm:1.2.0"
@@ -6873,6 +8405,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"browserslist@npm:^4.21.9, browserslist@npm:^4.22.1":
+  version: 4.22.1
+  resolution: "browserslist@npm:4.22.1"
+  dependencies:
+    caniuse-lite: ^1.0.30001541
+    electron-to-chromium: ^1.4.535
+    node-releases: ^2.0.13
+    update-browserslist-db: ^1.0.13
+  bin:
+    browserslist: cli.js
+  checksum: 7e6b10c53f7dd5d83fd2b95b00518889096382539fed6403829d447e05df4744088de46a571071afb447046abc3c66ad06fbc790e70234ec2517452e32ffd862
+  languageName: node
+  linkType: hard
+
 "bser@npm:2.1.1":
   version: 2.1.1
   resolution: "bser@npm:2.1.1"
@@ -7281,17 +8827,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000844, caniuse-lite@npm:^1.0.30001313":
-  version: 1.0.30001458
-  resolution: "caniuse-lite@npm:1.0.30001458"
-  checksum: 258cc5a25babbbfe483bf788c6f321a19400ff80b2bf156b360bac09a6f9f4da44516350d187a30395667cb142c682d9ea96577ea0df236d35f76234b07ccb41
-  languageName: node
-  linkType: hard
-
-"caniuse-lite@npm:^1.0.30001449":
-  version: 1.0.30001485
-  resolution: "caniuse-lite@npm:1.0.30001485"
-  checksum: 2db8a9e5facf8df5275c96e44714a6caf3b9485813be1fe0aa5a72a7ced974137adeeed806a9a97f713d2f6d1b5c342949b88355ee0323ba35656bfa00d57fea
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000844, caniuse-lite@npm:^1.0.30001313, caniuse-lite@npm:^1.0.30001449, caniuse-lite@npm:^1.0.30001541":
+  version: 1.0.30001668
+  resolution: "caniuse-lite@npm:1.0.30001668"
+  checksum: ce6996901b5883454a8ddb3040f82342277b6a6275876dfefcdecb11f7e472e29877f34cae47c2b674f08f2e71971dd4a2acb9bc01adfe8421b7148a7e9e8297
   languageName: node
   linkType: hard
 
@@ -7656,6 +9195,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cliui@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "cliui@npm:8.0.1"
+  dependencies:
+    string-width: ^4.2.0
+    strip-ansi: ^6.0.1
+    wrap-ansi: ^7.0.0
+  checksum: 79648b3b0045f2e285b76fb2e24e207c6db44323581e421c3acbd0e86454cba1b37aea976ab50195a49e7384b871e6dfb2247ad7dec53c02454ac6497394cb56
+  languageName: node
+  linkType: hard
+
 "clone-response@npm:^1.0.2":
   version: 1.0.2
   resolution: "clone-response@npm:1.0.2"
@@ -7778,7 +9328,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"combined-stream@npm:^1.0.5, combined-stream@npm:^1.0.6, combined-stream@npm:~1.0.5, combined-stream@npm:~1.0.6":
+"combined-stream@npm:^1.0.5, combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8, combined-stream@npm:~1.0.5, combined-stream@npm:~1.0.6":
   version: 1.0.8
   resolution: "combined-stream@npm:1.0.8"
   dependencies:
@@ -8006,6 +9556,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"content-type@npm:~1.0.5":
+  version: 1.0.5
+  resolution: "content-type@npm:1.0.5"
+  checksum: 566271e0a251642254cde0f845f9dd4f9856e52d988f4eb0d0dcffbb7a1f8ec98de7a5215fc628f3bce30fe2fb6fd2bc064b562d721658c59b544e2d34ea2766
+  languageName: node
+  linkType: hard
+
 "continuable-cache@npm:^0.3.1":
   version: 0.3.1
   resolution: "continuable-cache@npm:0.3.1"
@@ -8022,6 +9579,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"convert-source-map@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "convert-source-map@npm:2.0.0"
+  checksum: 63ae9933be5a2b8d4509daca5124e20c14d023c820258e484e32dc324d34c2754e71297c94a05784064ad27615037ef677e3f0c00469fb55f409d2bb21261035
+  languageName: node
+  linkType: hard
+
 "cookie-signature@npm:1.0.6":
   version: 1.0.6
   resolution: "cookie-signature@npm:1.0.6"
@@ -8088,6 +9652,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.32.2":
+  version: 3.33.0
+  resolution: "core-js-compat@npm:3.33.0"
+  dependencies:
+    browserslist: ^4.22.1
+  checksum: 83ae54008c09b8e0ae3c59457039866c342c7e28b0d30eebb638a5b51c01432e63fe97695c90645cbc6a8b073a4f9a8b0e75f0818bbf8b4b054e01f4c17d3181
+  languageName: node
+  linkType: hard
+
 "core-js@npm:^2.4.0, core-js@npm:^2.4.1, core-js@npm:^2.5.0, core-js@npm:^2.6.5":
   version: 2.6.12
   resolution: "core-js@npm:2.6.12"
@@ -8326,6 +9899,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cssom@npm:^0.4.4":
+  version: 0.4.4
+  resolution: "cssom@npm:0.4.4"
+  checksum: e3bc1076e7ee4213d4fef05e7ae03bfa83dc05f32611d8edc341f4ecc3d9647b89c8245474c7dd2cdcdb797a27c462e99da7ad00a34399694559f763478ff53f
+  languageName: node
+  linkType: hard
+
+"cssom@npm:~0.3.6":
+  version: 0.3.8
+  resolution: "cssom@npm:0.3.8"
+  checksum: 24beb3087c76c0d52dd458be9ee1fbc80ac771478a9baef35dd258cdeb527c68eb43204dd439692bb2b1ae5272fa5f2946d10946edab0d04f1078f85e06bc7f6
+  languageName: node
+  linkType: hard
+
+"cssstyle@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "cssstyle@npm:2.3.0"
+  dependencies:
+    cssom: ~0.3.6
+  checksum: 5f05e6fd2e3df0b44695c2f08b9ef38b011862b274e320665176467c0725e44a53e341bc4959a41176e83b66064ab786262e7380fd1cabeae6efee0d255bb4e3
+  languageName: node
+  linkType: hard
+
 "cyclist@npm:^1.0.1":
   version: 1.0.1
   resolution: "cyclist@npm:1.0.1"
@@ -8349,6 +9945,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"data-urls@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "data-urls@npm:2.0.0"
+  dependencies:
+    abab: ^2.0.3
+    whatwg-mimetype: ^2.3.0
+    whatwg-url: ^8.0.0
+  checksum: 97caf828aac25e25e04ba6869db0f99c75e6859bb5b424ada28d3e7841941ebf08ddff3c1b1bb4585986bd507a5d54c2a716853ea6cb98af877400e637393e71
+  languageName: node
+  linkType: hard
+
 "date-fns@npm:^2.28.0":
   version: 2.28.0
   resolution: "date-fns@npm:2.28.0"
@@ -8404,7 +10011,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:^4.3.4":
+"debug@npm:^4.3.2, debug@npm:^4.3.4":
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
   dependencies:
@@ -8440,6 +10047,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"decimal.js@npm:^10.2.1":
+  version: 10.4.3
+  resolution: "decimal.js@npm:10.4.3"
+  checksum: 796404dcfa9d1dbfdc48870229d57f788b48c21c603c3f6554a1c17c10195fc1024de338b0cf9e1efe0c7c167eeb18f04548979bcc5fdfabebb7cc0ae3287bae
+  languageName: node
+  linkType: hard
+
 "decode-uri-component@npm:^0.2.0":
   version: 0.2.0
   resolution: "decode-uri-component@npm:0.2.0"
@@ -8672,6 +10286,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"domexception@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "domexception@npm:2.0.1"
+  dependencies:
+    webidl-conversions: ^5.0.0
+  checksum: d638e9cb05c52999f1b2eb87c374b03311ea5b1d69c2f875bc92da73e17db60c12142b45c950228642ff7f845c536b65305483350d080df59003a653da80b691
+  languageName: node
+  linkType: hard
+
 "dot-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "dot-case@npm:3.0.4"
@@ -8788,6 +10411,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"electron-to-chromium@npm:^1.4.535":
+  version: 1.4.553
+  resolution: "electron-to-chromium@npm:1.4.553"
+  checksum: ee1fd847da4277de5630ecfc3fba22e1f429e109d254fed9c798c6d86d0ff97a7655854c4ddc86a814954846d29a912e13f1be7b647d646708c0b4fa69d3d290
+  languageName: node
+  linkType: hard
+
 "elliptic@npm:^6.5.3":
   version: 6.5.4
   resolution: "elliptic@npm:6.5.4"
@@ -9195,6 +10825,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ember-cli-code-coverage@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "ember-cli-code-coverage@npm:2.0.0"
+  dependencies:
+    "@embroider/compat": ^0.47.0
+    "@embroider/core": ^0.47.0
+    babel-plugin-istanbul: ^6.0.0
+    body-parser: ^1.19.0
+    ember-cli-babel: ^7.26.6
+    express: ^4.17.1
+    fs-extra: ^9.0.0
+    istanbul-lib-coverage: ^3.0.0
+    istanbul-lib-report: ^3.0.0
+    istanbul-reports: ^3.0.2
+    node-dir: ^0.1.17
+    walk-sync: ^2.1.0
+  checksum: 21200bd1cc877f2b87977aa93dbd0856dfffd2591e0f012af11a9025286f234dc97ee12b67d6d139ad35fae3185d9ce65e0f65fc3bd9383c72f49da21a933d65
+  languageName: node
+  linkType: hard
+
 "ember-cli-content-security-policy@npm:^2.0.3":
   version: 2.0.3
   resolution: "ember-cli-content-security-policy@npm:2.0.3"
@@ -10952,6 +12602,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"escodegen@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "escodegen@npm:2.1.0"
+  dependencies:
+    esprima: ^4.0.1
+    estraverse: ^5.2.0
+    esutils: ^2.0.2
+    source-map: ~0.6.1
+  dependenciesMeta:
+    source-map:
+      optional: true
+  bin:
+    escodegen: bin/escodegen.js
+    esgenerate: bin/esgenerate.js
+  checksum: 096696407e161305cd05aebb95134ad176708bc5cb13d0dcc89a5fcbb959b8ed757e7f2591a5f8036f8f4952d4a724de0df14cd419e29212729fa6df5ce16bf6
+  languageName: node
+  linkType: hard
+
 "eslint-config-prettier@npm:^8.3.0":
   version: 8.3.0
   resolution: "eslint-config-prettier@npm:8.3.0"
@@ -11156,7 +12824,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esprima@npm:^4.0.0, esprima@npm:~4.0.0":
+"esprima@npm:^4.0.0, esprima@npm:^4.0.1, esprima@npm:~4.0.0":
   version: 4.0.1
   resolution: "esprima@npm:4.0.1"
   bin:
@@ -11450,7 +13118,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"express@npm:^4.18.1":
+"express@npm:^4.17.1, express@npm:^4.18.1":
   version: 4.18.2
   resolution: "express@npm:4.18.2"
   dependencies:
@@ -11778,6 +13446,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"filesize@npm:^5.0.0":
+  version: 5.0.3
+  resolution: "filesize@npm:5.0.3"
+  checksum: b540c11a594dbea178acc78a8e5cf55760d1cc4143ae0e7c7cdcfe685d346240fb96576c796f66d3aec2879b22eee85cdb062aad5f9d4c8f933a2ed20583b2b2
+  languageName: node
+  linkType: hard
+
 "fill-range@npm:^4.0.0":
   version: 4.0.0
   resolution: "fill-range@npm:4.0.0"
@@ -12070,6 +13745,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"form-data@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "form-data@npm:3.0.1"
+  dependencies:
+    asynckit: ^0.4.0
+    combined-stream: ^1.0.8
+    mime-types: ^2.1.12
+  checksum: b019e8d35c8afc14a2bd8a7a92fa4f525a4726b6d5a9740e8d2623c30e308fbb58dc8469f90415a856698933c8479b01646a9dff33c87cc4e76d72aedbbf860d
+  languageName: node
+  linkType: hard
+
 "form-data@npm:~2.1.1":
   version: 2.1.4
   resolution: "form-data@npm:2.1.4"
@@ -12506,6 +14192,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-package-type@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "get-package-type@npm:0.1.0"
+  checksum: bba0811116d11e56d702682ddef7c73ba3481f114590e705fc549f4d868972263896af313c57a25c076e3c0d567e11d919a64ba1b30c879be985fc9d44f96148
+  languageName: node
+  linkType: hard
+
 "get-stdin@npm:^4.0.1":
   version: 4.0.1
   resolution: "get-stdin@npm:4.0.1"
@@ -12909,6 +14602,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"handlebars@npm:^4.0.13, handlebars@npm:^4.7.7":
+  version: 4.7.8
+  resolution: "handlebars@npm:4.7.8"
+  dependencies:
+    minimist: ^1.2.5
+    neo-async: ^2.6.2
+    source-map: ^0.6.1
+    uglify-js: ^3.1.4
+    wordwrap: ^1.0.0
+  dependenciesMeta:
+    uglify-js:
+      optional: true
+  bin:
+    handlebars: bin/handlebars
+  checksum: 00e68bb5c183fd7b8b63322e6234b5ac8fbb960d712cb3f25587d559c2951d9642df83c04a1172c918c41bcfc81bfbd7a7718bbce93b893e0135fc99edea93ff
+  languageName: node
+  linkType: hard
+
 "handlebars@npm:^4.0.4, handlebars@npm:^4.0.6, handlebars@npm:^4.3.1, handlebars@npm:^4.7.3":
   version: 4.7.7
   resolution: "handlebars@npm:4.7.7"
@@ -13258,6 +14969,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"html-encoding-sniffer@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "html-encoding-sniffer@npm:2.0.1"
+  dependencies:
+    whatwg-encoding: ^1.0.5
+  checksum: bf30cce461015ed7e365736fcd6a3063c7bc016a91f74398ef6158886970a96333938f7c02417ab3c12aa82e3e53b40822145facccb9ddfbcdc15a879ae4d7ba
+  languageName: node
+  linkType: hard
+
+"html-escaper@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "html-escaper@npm:2.0.2"
+  checksum: d2df2da3ad40ca9ee3a39c5cc6475ef67c8f83c234475f24d8e9ce0dc80a2c82df8e1d6fa78ddd1e9022a586ea1bd247a615e80a5cd9273d90111ddda7d9e974
+  languageName: node
+  linkType: hard
+
 "html-tags@npm:^3.3.1":
   version: 3.3.1
   resolution: "html-tags@npm:3.3.1"
@@ -14264,6 +15991,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-potential-custom-element-name@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-potential-custom-element-name@npm:1.0.1"
+  checksum: ced7bbbb6433a5b684af581872afe0e1767e2d1146b2207ca0068a648fb5cab9d898495d1ac0583524faaf24ca98176a7d9876363097c2d14fee6dd324f3a1ab
+  languageName: node
+  linkType: hard
+
 "is-redirect@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-redirect@npm:1.0.0"
@@ -14449,6 +16183,47 @@ __metadata:
   languageName: node
   linkType: hard
 
+"istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "istanbul-lib-coverage@npm:3.2.0"
+  checksum: a2a545033b9d56da04a8571ed05c8120bf10e9bce01cf8633a3a2b0d1d83dff4ac4fe78d6d5673c27fc29b7f21a41d75f83a36be09f82a61c367b56aa73c1ff9
+  languageName: node
+  linkType: hard
+
+"istanbul-lib-instrument@npm:^5.0.4":
+  version: 5.2.1
+  resolution: "istanbul-lib-instrument@npm:5.2.1"
+  dependencies:
+    "@babel/core": ^7.12.3
+    "@babel/parser": ^7.14.7
+    "@istanbuljs/schema": ^0.1.2
+    istanbul-lib-coverage: ^3.2.0
+    semver: ^6.3.0
+  checksum: bf16f1803ba5e51b28bbd49ed955a736488381e09375d830e42ddeb403855b2006f850711d95ad726f2ba3f1ae8e7366de7e51d2b9ac67dc4d80191ef7ddf272
+  languageName: node
+  linkType: hard
+
+"istanbul-lib-report@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "istanbul-lib-report@npm:3.0.1"
+  dependencies:
+    istanbul-lib-coverage: ^3.0.0
+    make-dir: ^4.0.0
+    supports-color: ^7.1.0
+  checksum: fd17a1b879e7faf9bb1dc8f80b2a16e9f5b7b8498fe6ed580a618c34df0bfe53d2abd35bf8a0a00e628fb7405462576427c7df20bbe4148d19c14b431c974b21
+  languageName: node
+  linkType: hard
+
+"istanbul-reports@npm:^3.0.2":
+  version: 3.1.6
+  resolution: "istanbul-reports@npm:3.1.6"
+  dependencies:
+    html-escaper: ^2.0.0
+    istanbul-lib-report: ^3.0.0
+  checksum: 44c4c0582f287f02341e9720997f9e82c071627e1e862895745d5f52ec72c9b9f38e1d12370015d2a71dcead794f34c7732aaef3fab80a24bc617a21c3d911d6
+  languageName: node
+  linkType: hard
+
 "istextorbinary@npm:2.1.0":
   version: 2.1.0
   resolution: "istextorbinary@npm:2.1.0"
@@ -14540,6 +16315,46 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsdom@npm:^16.6.0":
+  version: 16.7.0
+  resolution: "jsdom@npm:16.7.0"
+  dependencies:
+    abab: ^2.0.5
+    acorn: ^8.2.4
+    acorn-globals: ^6.0.0
+    cssom: ^0.4.4
+    cssstyle: ^2.3.0
+    data-urls: ^2.0.0
+    decimal.js: ^10.2.1
+    domexception: ^2.0.1
+    escodegen: ^2.0.0
+    form-data: ^3.0.0
+    html-encoding-sniffer: ^2.0.1
+    http-proxy-agent: ^4.0.1
+    https-proxy-agent: ^5.0.0
+    is-potential-custom-element-name: ^1.0.1
+    nwsapi: ^2.2.0
+    parse5: 6.0.1
+    saxes: ^5.0.1
+    symbol-tree: ^3.2.4
+    tough-cookie: ^4.0.0
+    w3c-hr-time: ^1.0.2
+    w3c-xmlserializer: ^2.0.0
+    webidl-conversions: ^6.1.0
+    whatwg-encoding: ^1.0.5
+    whatwg-mimetype: ^2.3.0
+    whatwg-url: ^8.5.0
+    ws: ^7.4.6
+    xml-name-validator: ^3.0.0
+  peerDependencies:
+    canvas: ^2.5.0
+  peerDependenciesMeta:
+    canvas:
+      optional: true
+  checksum: 454b83371857000763ed31130a049acd1b113e3b927e6dcd75c67ddc30cdd242d7ebcac5c2294b7a1a6428155cb1398709c573b3c6d809218692ea68edd93370
+  languageName: node
+  linkType: hard
+
 "jsesc@npm:^1.3.0":
   version: 1.3.0
   resolution: "jsesc@npm:1.3.0"
@@ -14672,7 +16487,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:^2.2.2":
+"json5@npm:^2.2.2, json5@npm:^2.2.3":
   version: 2.2.3
   resolution: "json5@npm:2.2.3"
   bin:
@@ -15488,7 +17303,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:^4.17.12, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.4":
+"lodash@npm:^4.17.12, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.7.0":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
@@ -15629,6 +17444,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"make-dir@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "make-dir@npm:4.0.0"
+  dependencies:
+    semver: ^7.5.3
+  checksum: bf0731a2dd3aab4db6f3de1585cea0b746bb73eb5a02e3d8d72757e376e64e6ada190b1eddcde5b2f24a81b688a9897efd5018737d05e02e2a671dda9cff8a8a
+  languageName: node
+  linkType: hard
+
 "make-fetch-happen@npm:^10.0.3":
   version: 10.0.6
   resolution: "make-fetch-happen@npm:10.0.6"
@@ -16627,6 +18451,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-dir@npm:^0.1.17":
+  version: 0.1.17
+  resolution: "node-dir@npm:0.1.17"
+  dependencies:
+    minimatch: ^3.0.2
+  checksum: 29de9560e52cdac8d3f794d38d782f6799e13d4d11aaf96d3da8c28458e1c5e33bb5f8edfb42dc34172ec5516c50c5b8850c9e1526542616757a969267263328
+  languageName: node
+  linkType: hard
+
 "node-fetch-npm@npm:^2.0.2":
   version: 2.0.4
   resolution: "node-fetch-npm@npm:2.0.4"
@@ -16788,6 +18621,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-releases@npm:^2.0.13":
+  version: 2.0.13
+  resolution: "node-releases@npm:2.0.13"
+  checksum: 17ec8f315dba62710cae71a8dad3cd0288ba943d2ece43504b3b1aa8625bf138637798ab470b1d9035b0545996f63000a8a926e0f6d35d0996424f8b6d36dda3
+  languageName: node
+  linkType: hard
+
 "node-releases@npm:^2.0.2":
   version: 2.0.2
   resolution: "node-releases@npm:2.0.2"
@@ -17285,6 +19125,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nwsapi@npm:^2.2.0":
+  version: 2.2.7
+  resolution: "nwsapi@npm:2.2.7"
+  checksum: cab25f7983acec7e23490fec3ef7be608041b460504229770e3bfcf9977c41d6fe58f518994d3bd9aa3a101f501089a3d4a63536f4ff8ae4b8c4ca23bdbfda4e
+  languageName: node
+  linkType: hard
+
 "oauth-sign@npm:~0.8.1":
   version: 0.8.2
   resolution: "oauth-sign@npm:0.8.2"
@@ -17865,7 +19712,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse5@npm:^6.0.1":
+"parse5@npm:6.0.1, parse5@npm:^6.0.1":
   version: 6.0.1
   resolution: "parse5@npm:6.0.1"
   checksum: 7d569a176c5460897f7c8f3377eff640d54132b9be51ae8a8fa4979af940830b2b0c296ce75e5bd8f4041520aadde13170dbdec44889975f906098ea0002f4bd
@@ -18549,6 +20396,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"psl@npm:^1.1.33":
+  version: 1.9.0
+  resolution: "psl@npm:1.9.0"
+  checksum: 20c4277f640c93d393130673f392618e9a8044c6c7bf61c53917a0fddb4952790f5f362c6c730a9c32b124813e173733f9895add8d26f566ed0ea0654b2e711d
+  languageName: node
+  linkType: hard
+
 "public-encrypt@npm:^4.0.0":
   version: 4.0.3
   resolution: "public-encrypt@npm:4.0.3"
@@ -18685,6 +20539,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"querystringify@npm:^2.1.1":
+  version: 2.2.0
+  resolution: "querystringify@npm:2.2.0"
+  checksum: 5641ea231bad7ef6d64d9998faca95611ed4b11c2591a8cae741e178a974f6a8e0ebde008475259abe1621cb15e692404e6b6626e927f7b849d5c09392604b15
+  languageName: node
+  linkType: hard
+
 "queue-microtask@npm:^1.2.2":
   version: 1.2.2
   resolution: "queue-microtask@npm:1.2.2"
@@ -18785,6 +20646,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"raw-body@npm:2.5.2":
+  version: 2.5.2
+  resolution: "raw-body@npm:2.5.2"
+  dependencies:
+    bytes: 3.1.2
+    http-errors: 2.0.0
+    iconv-lite: 0.4.24
+    unpipe: 1.0.0
+  checksum: ba1583c8d8a48e8fbb7a873fdbb2df66ea4ff83775421bfe21ee120140949ab048200668c47d9ae3880012f6e217052690628cf679ddfbd82c9fc9358d574676
+  languageName: node
+  linkType: hard
+
 "raw-body@npm:~1.1.0":
   version: 1.1.7
   resolution: "raw-body@npm:1.1.7"
@@ -19077,6 +20950,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"regenerate-unicode-properties@npm:^10.1.0":
+  version: 10.1.1
+  resolution: "regenerate-unicode-properties@npm:10.1.1"
+  dependencies:
+    regenerate: ^1.4.2
+  checksum: b80958ef40f125275824c2c47d5081dfaefebd80bff26c76761e9236767c748a4a95a69c053fe29d2df881177f2ca85df4a71fe70a82360388b31159ef19adcf
+  languageName: node
+  linkType: hard
+
 "regenerate@npm:^1.2.1, regenerate@npm:^1.4.2":
   version: 1.4.2
   resolution: "regenerate@npm:1.4.2"
@@ -19112,6 +20994,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"regenerator-runtime@npm:^0.14.0":
+  version: 0.14.0
+  resolution: "regenerator-runtime@npm:0.14.0"
+  checksum: 1c977ad82a82a4412e4f639d65d22be376d3ebdd30da2c003eeafdaaacd03fc00c2320f18120007ee700900979284fc78a9f00da7fb593f6e6eeebc673fba9a3
+  languageName: node
+  linkType: hard
+
 "regenerator-runtime@npm:^0.9.5":
   version: 0.9.6
   resolution: "regenerator-runtime@npm:0.9.6"
@@ -19139,6 +21028,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"regenerator-transform@npm:^0.15.2":
+  version: 0.15.2
+  resolution: "regenerator-transform@npm:0.15.2"
+  dependencies:
+    "@babel/runtime": ^7.8.4
+  checksum: 20b6f9377d65954980fe044cfdd160de98df415b4bff38fbade67b3337efaf078308c4fed943067cd759827cc8cfeca9cb28ccda1f08333b85d6a2acbd022c27
+  languageName: node
+  linkType: hard
+
 "regex-not@npm:^1.0.0, regex-not@npm:^1.0.2":
   version: 1.0.2
   resolution: "regex-not@npm:1.0.2"
@@ -19191,6 +21089,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"regexpu-core@npm:^5.3.1":
+  version: 5.3.2
+  resolution: "regexpu-core@npm:5.3.2"
+  dependencies:
+    "@babel/regjsgen": ^0.8.0
+    regenerate: ^1.4.2
+    regenerate-unicode-properties: ^10.1.0
+    regjsparser: ^0.9.1
+    unicode-match-property-ecmascript: ^2.0.0
+    unicode-match-property-value-ecmascript: ^2.1.0
+  checksum: 95bb97088419f5396e07769b7de96f995f58137ad75fac5811fb5fe53737766dfff35d66a0ee66babb1eb55386ef981feaef392f9df6d671f3c124812ba24da2
+  languageName: node
+  linkType: hard
+
 "registry-auth-token@npm:^3.0.1":
   version: 3.4.0
   resolution: "registry-auth-token@npm:3.4.0"
@@ -19264,6 +21176,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"regjsparser@npm:^0.9.1":
+  version: 0.9.1
+  resolution: "regjsparser@npm:0.9.1"
+  dependencies:
+    jsesc: ~0.5.0
+  bin:
+    regjsparser: bin/parser
+  checksum: 5e1b76afe8f1d03c3beaf9e0d935dd467589c3625f6d65fb8ffa14f224d783a0fed4bf49c2c1b8211043ef92b6117313419edf055a098ed8342e340586741afc
+  languageName: node
+  linkType: hard
+
 "remove-markdown@npm:^0.5.0":
   version: 0.5.0
   resolution: "remove-markdown@npm:0.5.0"
@@ -19901,6 +21824,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"saxes@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "saxes@npm:5.0.1"
+  dependencies:
+    xmlchars: ^2.2.0
+  checksum: 5636b55cf15f7cf0baa73f2797bf992bdcf75d1b39d82c0aa4608555c774368f6ac321cb641fd5f3d3ceb87805122cd47540da6a7b5960fe0dbdb8f8c263f000
+  languageName: node
+  linkType: hard
+
 "schema-utils@npm:^1.0.0":
   version: 1.0.0
   resolution: "schema-utils@npm:1.0.0"
@@ -19991,6 +21923,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "semver@npm:6.3.1"
+  bin:
+    semver: bin/semver.js
+  checksum: ae47d06de28836adb9d3e25f22a92943477371292d9b665fb023fae278d345d508ca1958232af086d85e0155aee22e313e100971898bbb8d5d89b8b1d4054ca2
+  languageName: node
+  linkType: hard
+
 "semver@npm:^7.0.0":
   version: 7.5.0
   resolution: "semver@npm:7.5.0"
@@ -20024,6 +21965,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:^7.5.3":
+  version: 7.5.4
+  resolution: "semver@npm:7.5.4"
+  dependencies:
+    lru-cache: ^6.0.0
+  bin:
+    semver: bin/semver.js
+  checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3
+  languageName: node
+  linkType: hard
+
 "semver@npm:~5.3.0":
   version: 5.3.0
   resolution: "semver@npm:5.3.0"
@@ -20284,7 +22236,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"simple-html-tokenizer@npm:^0.5.10":
+"simple-html-tokenizer@npm:^0.5.10, simple-html-tokenizer@npm:^0.5.8":
   version: 0.5.11
   resolution: "simple-html-tokenizer@npm:0.5.11"
   checksum: f834a5a0b169ffe10f74bd479a071a7161e0186669e28a1cd662efacdaedd27667469e2b965d5a8538d9d8e7373cb741ea8d748259221f40fa3e4bda2efbdbfc
@@ -21282,6 +23234,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"symbol-tree@npm:^3.2.4":
+  version: 3.2.4
+  resolution: "symbol-tree@npm:3.2.4"
+  checksum: 6e8fc7e1486b8b54bea91199d9535bb72f10842e40c79e882fc94fb7b14b89866adf2fd79efa5ebb5b658bc07fb459ccce5ac0e99ef3d72f474e74aaf284029d
+  languageName: node
+  linkType: hard
+
 "symlink-or-copy@npm:^1.0.0, symlink-or-copy@npm:^1.0.1, symlink-or-copy@npm:^1.1.8, symlink-or-copy@npm:^1.2.0, symlink-or-copy@npm:^1.3.1":
   version: 1.3.1
   resolution: "symlink-or-copy@npm:1.3.1"
@@ -21514,6 +23473,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"test-exclude@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "test-exclude@npm:6.0.0"
+  dependencies:
+    "@istanbuljs/schema": ^0.1.2
+    glob: ^7.1.4
+    minimatch: ^3.0.4
+  checksum: 3b34a3d77165a2cb82b34014b3aba93b1c4637a5011807557dc2f3da826c59975a5ccad765721c4648b39817e3472789f9b0fa98fc854c5c1c7a1e632aacdc28
+  languageName: node
+  linkType: hard
+
 "testem@npm:^3.10.1":
   version: 3.10.1
   resolution: "testem@npm:3.10.1"
@@ -21782,6 +23752,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tough-cookie@npm:^4.0.0":
+  version: 4.1.3
+  resolution: "tough-cookie@npm:4.1.3"
+  dependencies:
+    psl: ^1.1.33
+    punycode: ^2.1.1
+    universalify: ^0.2.0
+    url-parse: ^1.5.3
+  checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc
+  languageName: node
+  linkType: hard
+
 "tough-cookie@npm:~2.3.0":
   version: 2.3.4
   resolution: "tough-cookie@npm:2.3.4"
@@ -21801,6 +23783,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tr46@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "tr46@npm:2.1.0"
+  dependencies:
+    punycode: ^2.1.1
+  checksum: ffe6049b9dca3ae329b059aada7f515b0f0064c611b39b51ff6b53897e954650f6f63d9319c6c008d36ead477c7b55e5f64c9dc60588ddc91ff720d64eb710b3
+  languageName: node
+  linkType: hard
+
 "tr46@npm:^3.0.0":
   version: 3.0.0
   resolution: "tr46@npm:3.0.0"
@@ -22093,6 +24084,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unicode-match-property-value-ecmascript@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "unicode-match-property-value-ecmascript@npm:2.1.0"
+  checksum: 8d6f5f586b9ce1ed0e84a37df6b42fdba1317a05b5df0c249962bd5da89528771e2d149837cad11aa26bcb84c35355cb9f58a10c3d41fa3b899181ece6c85220
+  languageName: node
+  linkType: hard
+
 "unicode-property-aliases-ecmascript@npm:^2.0.0":
   version: 2.0.0
   resolution: "unicode-property-aliases-ecmascript@npm:2.0.0"
@@ -22155,6 +24153,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"universalify@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "universalify@npm:0.2.0"
+  checksum: e86134cb12919d177c2353196a4cc09981524ee87abf621f7bc8d249dbbbebaec5e7d1314b96061497981350df786e4c5128dbf442eba104d6e765bc260678b5
+  languageName: node
+  linkType: hard
+
 "universalify@npm:^2.0.0":
   version: 2.0.0
   resolution: "universalify@npm:2.0.0"
@@ -22216,6 +24221,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"update-browserslist-db@npm:^1.0.13":
+  version: 1.0.13
+  resolution: "update-browserslist-db@npm:1.0.13"
+  dependencies:
+    escalade: ^3.1.1
+    picocolors: ^1.0.0
+  peerDependencies:
+    browserslist: ">= 4.21.0"
+  bin:
+    update-browserslist-db: cli.js
+  checksum: 1e47d80182ab6e4ad35396ad8b61008ae2a1330221175d0abd37689658bdb61af9b705bfc41057fd16682474d79944fb2d86767c5ed5ae34b6276b9bed353322
+  languageName: node
+  linkType: hard
+
 "update-notifier@npm:^2.3.0":
   version: 2.5.0
   resolution: "update-notifier@npm:2.5.0"
@@ -22306,6 +24325,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"url-parse@npm:^1.5.3":
+  version: 1.5.10
+  resolution: "url-parse@npm:1.5.10"
+  dependencies:
+    querystringify: ^2.1.1
+    requires-port: ^1.0.0
+  checksum: fbdba6b1d83336aca2216bbdc38ba658d9cfb8fc7f665eb8b17852de638ff7d1a162c198a8e4ed66001ddbf6c9888d41e4798912c62b4fd777a31657989f7bdf
+  languageName: node
+  linkType: hard
+
 "url@npm:^0.11.0":
   version: 0.11.0
   resolution: "url@npm:0.11.0"
@@ -22466,6 +24495,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"w3c-hr-time@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "w3c-hr-time@npm:1.0.2"
+  dependencies:
+    browser-process-hrtime: ^1.0.0
+  checksum: ec3c2dacbf8050d917bbf89537a101a08c2e333b4c19155f7d3bedde43529d4339db6b3d049d9610789cb915f9515f8be037e0c54c079e9d4735c50b37ed52b9
+  languageName: node
+  linkType: hard
+
+"w3c-xmlserializer@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "w3c-xmlserializer@npm:2.0.0"
+  dependencies:
+    xml-name-validator: ^3.0.0
+  checksum: ae25c51cf71f1fb2516df1ab33a481f83461a117565b95e3d0927432522323f93b1b2846cbb60196d337970c421adb604fc2d0d180c6a47a839da01db5b9973b
+  languageName: node
+  linkType: hard
+
 "walk-sync@npm:^0.2.5":
   version: 0.2.7
   resolution: "walk-sync@npm:0.2.7"
@@ -22497,7 +24544,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"walk-sync@npm:^2.0.0, walk-sync@npm:^2.0.2, walk-sync@npm:^2.2.0":
+"walk-sync@npm:^2.0.0, walk-sync@npm:^2.0.2, walk-sync@npm:^2.1.0, walk-sync@npm:^2.2.0":
   version: 2.2.0
   resolution: "walk-sync@npm:2.2.0"
   dependencies:
@@ -22605,6 +24652,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"webidl-conversions@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "webidl-conversions@npm:5.0.0"
+  checksum: ccf1ec2ca7c0b5671e5440ace4a66806ae09c49016ab821481bec0c05b1b82695082dc0a27d1fe9d804d475a408ba0c691e6803fd21be608e710955d4589cd69
+  languageName: node
+  linkType: hard
+
+"webidl-conversions@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "webidl-conversions@npm:6.1.0"
+  checksum: 1f526507aa491f972a0c1409d07f8444e1d28778dfa269a9971f2e157182f3d496dc33296e4ed45b157fdb3bf535bb90c90bf10c50dcf1dd6caacb2a34cc84fb
+  languageName: node
+  linkType: hard
+
 "webidl-conversions@npm:^7.0.0":
   version: 7.0.0
   resolution: "webidl-conversions@npm:7.0.0"
@@ -22722,6 +24783,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-encoding@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "whatwg-encoding@npm:1.0.5"
+  dependencies:
+    iconv-lite: 0.4.24
+  checksum: 5be4efe111dce29ddee3448d3915477fcc3b28f991d9cf1300b4e50d6d189010d47bca2f51140a844cf9b726e8f066f4aee72a04d687bfe4f2ee2767b2f5b1e6
+  languageName: node
+  linkType: hard
+
 "whatwg-fetch@npm:^3.6.2":
   version: 3.6.2
   resolution: "whatwg-fetch@npm:3.6.2"
@@ -22729,6 +24799,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-mimetype@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "whatwg-mimetype@npm:2.3.0"
+  checksum: 23eb885940bcbcca4ff841c40a78e9cbb893ec42743993a42bf7aed16085b048b44b06f3402018931687153550f9a32d259dfa524e4f03577ab898b6965e5383
+  languageName: node
+  linkType: hard
+
 "whatwg-url@npm:^11.0.0":
   version: 11.0.0
   resolution: "whatwg-url@npm:11.0.0"
@@ -22749,6 +24826,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.5.0":
+  version: 8.7.0
+  resolution: "whatwg-url@npm:8.7.0"
+  dependencies:
+    lodash: ^4.7.0
+    tr46: ^2.1.0
+    webidl-conversions: ^6.1.0
+  checksum: a87abcc6cefcece5311eb642858c8fdb234e51ec74196bfacf8def2edae1bfbffdf6acb251646ed6301f8cee44262642d8769c707256125a91387e33f405dd1e
+  languageName: node
+  linkType: hard
+
 "which-boxed-primitive@npm:^1.0.2":
   version: 1.0.2
   resolution: "which-boxed-primitive@npm:1.0.2"
@@ -22935,6 +25023,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"wrap-legacy-hbs-plugin-if-needed@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "wrap-legacy-hbs-plugin-if-needed@npm:1.0.1"
+  dependencies:
+    "@glimmer/reference": ^0.42.1
+    "@glimmer/runtime": ^0.42.1
+    "@glimmer/syntax": ^0.42.1
+    "@simple-dom/interface": ^1.4.0
+  checksum: b273f53b92fa26041e6cf8f3b712a0267a3cc75c8def3370e556428e72ef38deea605897c8d42b2a3b90f04d810c432b1de470db983b0c131030b29dc46aa1bd
+  languageName: node
+  linkType: hard
+
 "wrappy@npm:1, wrappy@npm:~1.0.2":
   version: 1.0.2
   resolution: "wrappy@npm:1.0.2"
@@ -22986,6 +25086,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ws@npm:^7.4.6":
+  version: 7.5.9
+  resolution: "ws@npm:7.5.9"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ^5.0.2
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138
+  languageName: node
+  linkType: hard
+
 "ws@npm:~8.2.3":
   version: 8.2.3
   resolution: "ws@npm:8.2.3"
@@ -23015,6 +25130,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xml-name-validator@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "xml-name-validator@npm:3.0.0"
+  checksum: b3ac459afed783c285bb98e4960bd1f3ba12754fd4f2320efa0f9181ca28928c53cc75ca660d15d205e81f92304419afe94c531c7cfb3e0649aa6d140d53ecb0
+  languageName: node
+  linkType: hard
+
+"xmlchars@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "xmlchars@npm:2.2.0"
+  checksum: 8c70ac94070ccca03f47a81fcce3b271bd1f37a591bf5424e787ae313fcb9c212f5f6786e1fa82076a2c632c0141552babcd85698c437506dfa6ae2d58723062
+  languageName: node
+  linkType: hard
+
 "xtend@npm:>=4.0.0 <4.1.0-0, xtend@npm:^4.0.0, xtend@npm:~4.0.1":
   version: 4.0.2
   resolution: "xtend@npm:4.0.2"
@@ -23098,6 +25227,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yargs-parser@npm:^21.1.1":
+  version: 21.1.1
+  resolution: "yargs-parser@npm:21.1.1"
+  checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c
+  languageName: node
+  linkType: hard
+
 "yargs-parser@npm:^9.0.2":
   version: 9.0.2
   resolution: "yargs-parser@npm:9.0.2"
@@ -23176,6 +25312,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yargs@npm:^17.0.1":
+  version: 17.7.2
+  resolution: "yargs@npm:17.7.2"
+  dependencies:
+    cliui: ^8.0.1
+    escalade: ^3.1.1
+    get-caller-file: ^2.0.5
+    require-directory: ^2.1.1
+    string-width: ^4.2.3
+    y18n: ^5.0.5
+    yargs-parser: ^21.1.1
+  checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a
+  languageName: node
+  linkType: hard
+
 "yocto-queue@npm:^0.1.0":
   version: 0.1.0
   resolution: "yocto-queue@npm:0.1.0"