diff --git a/packages/frontend/.template-lintrc.js b/packages/frontend/.template-lintrc.js
index f27363c..5ab5d42 100644
--- a/packages/frontend/.template-lintrc.js
+++ b/packages/frontend/.template-lintrc.js
@@ -1,7 +1,8 @@
 'use strict';
 
 module.exports = {
-  extends: 'recommended',
+  plugins: ['ember-template-lint-plugin-prettier'],
+  extends: ['recommended', 'ember-template-lint-plugin-prettier:recommended'],
   rules: {
     'no-implicit-this': {
       //our helpers which do not take arguments have to be listed here
diff --git a/packages/frontend/app/components/counter.hbs b/packages/frontend/app/components/counter.hbs
index efc4d0b..8de6e07 100644
--- a/packages/frontend/app/components/counter.hbs
+++ b/packages/frontend/app/components/counter.hbs
@@ -16,8 +16,12 @@
   </div>
 
   <div class="buttons">
-    <button type="button" {{on "click" (fn this.change 1)}}>{{t "components.counter.countAdd"}}</button>
-    <button type="button" {{on "click" (fn this.change -1)}}>{{t "components.counter.countSubtract"}}</button>
+    <button type="button" {{on "click" (fn this.change 1)}}>{{t
+        "components.counter.countAdd"
+      }}</button>
+    <button type="button" {{on "click" (fn this.change -1)}}>{{t
+        "components.counter.countSubtract"
+      }}</button>
 
     <button type="button" {{on "click" this.double}}>{{t "components.counter.multiX2"}}</button>
 
diff --git a/packages/frontend/app/components/debug.hbs b/packages/frontend/app/components/debug.hbs
index 10f164c..dc815f5 100644
--- a/packages/frontend/app/components/debug.hbs
+++ b/packages/frontend/app/components/debug.hbs
@@ -1,67 +1,45 @@
 {{#if @isExpanded}}
-<details
-  class="debug"
-  {{on "click" this.saveDebugVisibility}}
-  open
->
-  <summary>{{t "components.debug.summary"}}</summary>
-  <div class="gallery">
-    <Box @text="Hello I'm a <code>Box</code> component in the <code>Debug</code> component." />
-    <Box>
-      {{t "components.box.defaultBlock1"}}
-    </Box>
+  <details class="debug" {{on "click" this.saveDebugVisibility}} open>
+    <summary>{{t "components.debug.summary"}}</summary>
+    <div class="gallery">
+      <Box @text="Hello I'm a <code>Box</code> component in the <code>Debug</code> component." />
+      <Box>
+        {{t "components.box.defaultBlock1"}}
+      </Box>
 
-    <DoubleIt />
+      <DoubleIt />
 
-    {{#if (eq this.env "production")}}
-      <AudioPlayer
-        @srcURL={{this.envApp.AUDIO_PLAYER_FILE_REMOTE}}
-        @shouldLoop={{true}}
-      />
-    {{else}}
-      <AudioPlayer
-        @srcURL={{this.envApp.AUDIO_PLAYER_FILE_LOCAL}}
-        @shouldLoop={{true}}
-      />
-    {{/if}}
+      {{#if (eq this.env "production")}}
+        <AudioPlayer @srcURL={{this.envApp.AUDIO_PLAYER_FILE_REMOTE}} @shouldLoop={{true}} />
+      {{else}}
+        <AudioPlayer @srcURL={{this.envApp.AUDIO_PLAYER_FILE_LOCAL}} @shouldLoop={{true}} />
+      {{/if}}
 
-    <GhUser
-      @username={{@ghUsername}}
-      @htmlUrl={{@ghHtmlUrl}}
-      @publicRepos={{@ghPublicRepos}}
-      @publicGists={{@ghPublicGists}}
-      @followers={{@ghFollowers}}
-      @following={{@ghFollowing}}
-    />
+      <GhUser
+        @username={{@ghUsername}}
+        @htmlUrl={{@ghHtmlUrl}}
+        @publicRepos={{@ghPublicRepos}}
+        @publicGists={{@ghPublicGists}}
+        @followers={{@ghFollowers}}
+        @following={{@ghFollowing}}
+      />
 
-    <Mover />
-  </div>
-</details>
+      <Mover />
+    </div>
+  </details>
 {{else}}
-<details
-  class="debug"
-  {{on "click" this.saveDebugVisibility}}
->
-  <summary>{{t "components.debug.summary"}}</summary>
-  <div class="gallery">
-    <DoubleIt />
+  <details class="debug" {{on "click" this.saveDebugVisibility}}>
+    <summary>{{t "components.debug.summary"}}</summary>
+    <div class="gallery">
+      <DoubleIt />
 
-    {{#if (eq this.env "production")}}
-      <AudioPlayer
-        @srcURL={{this.envApp.AUDIO_PLAYER_FILE_REMOTE}}
-        @shouldLoop={{true}}
-      />
-    {{else}}
-      <AudioPlayer
-        @srcURL={{this.envApp.AUDIO_PLAYER_FILE_LOCAL}}
-        @shouldLoop={{true}}
-      />
-    {{/if}}
+      {{#if (eq this.env "production")}}
+        <AudioPlayer @srcURL={{this.envApp.AUDIO_PLAYER_FILE_REMOTE}} @shouldLoop={{true}} />
+      {{else}}
+        <AudioPlayer @srcURL={{this.envApp.AUDIO_PLAYER_FILE_LOCAL}} @shouldLoop={{true}} />
+      {{/if}}
 
-    <GhUser
-      @username={{@ghUsername}}
-      @publicRepos={{@ghPublicRepos}}
-    />
-  </div>
-</details>
+      <GhUser @username={{@ghUsername}} @publicRepos={{@ghPublicRepos}} />
+    </div>
+  </details>
 {{/if}}
\ No newline at end of file
diff --git a/packages/frontend/app/components/gh-commits/index.hbs b/packages/frontend/app/components/gh-commits/index.hbs
index 1ab97bc..5932de4 100644
--- a/packages/frontend/app/components/gh-commits/index.hbs
+++ b/packages/frontend/app/components/gh-commits/index.hbs
@@ -1,34 +1,34 @@
 <div class="gh-commits">
   <h3>{{if @title @title (t "components.ghCommits.head")}}</h3>
   {{#if @commits}}
-  <table>
-    <thead>
-      <th></th>
-      <th></th>
-    </thead>
-    <tbody>
-      {{#each @commits as |commit|}}
-      <tr>
-        <td class="commit-date">
-          {{format-date
-            commit.commit.author.date
-            month="2-digit"
-            day="2-digit"
-            year="numeric"
-            hour="2-digit"
-            minute="2-digit"
-          }}
-        </td>
-        <td class="commit-message">
-          <a href={{commit.html_url}} target="_blank" rel="noopener noreferrer">
-            {{commit.commit.message}}
-          </a>
-        </td>
-      </tr>
-      {{/each}}
-    </tbody>
-  </table>
+    <table>
+      <thead>
+        <th></th>
+        <th></th>
+      </thead>
+      <tbody>
+        {{#each @commits as |commit|}}
+          <tr>
+            <td class="commit-date">
+              {{format-date
+                commit.commit.author.date
+                month="2-digit"
+                day="2-digit"
+                year="numeric"
+                hour="2-digit"
+                minute="2-digit"
+              }}
+            </td>
+            <td class="commit-message">
+              <a href={{commit.html_url}} target="_blank" rel="noopener noreferrer">
+                {{commit.commit.message}}
+              </a>
+            </td>
+          </tr>
+        {{/each}}
+      </tbody>
+    </table>
   {{else}}
-  <p>{{t "general.noneFound" items="commits"}} {{t "errors.checkConsole"}}</p>
+    <p>{{t "general.noneFound" items="commits"}} {{t "errors.checkConsole"}}</p>
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/packages/frontend/app/components/gh-commits/loading.hbs b/packages/frontend/app/components/gh-commits/loading.hbs
index edaa439..3e51800 100644
--- a/packages/frontend/app/components/gh-commits/loading.hbs
+++ b/packages/frontend/app/components/gh-commits/loading.hbs
@@ -1,8 +1,8 @@
 <div class="gh-commits-loading">
   <h3>{{if @title @title (t "components.headGhCommits")}}</h3>
   {{#if @commits}}
-  <p>{{t "general.loading" items="commits"}}</p>
+    <p>{{t "general.loading" items="commits"}}</p>
   {{else}}
-  <p>{{t "general.noneFound" items="commits"}}</p>
+    <p>{{t "general.noneFound" items="commits"}}</p>
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/packages/frontend/app/components/gh-user.hbs b/packages/frontend/app/components/gh-user.hbs
index 03af978..d433c05 100644
--- a/packages/frontend/app/components/gh-user.hbs
+++ b/packages/frontend/app/components/gh-user.hbs
@@ -2,8 +2,12 @@
   <h3>{{t "components.ghUser.head"}}</h3>
 
   <strong><a href={{@htmlUrl}}>{{@username}}</a></strong><br />
-  {{t "components.ghUser.repos"}}: {{@publicRepos}}<br />
-  {{t "components.ghUser.gists"}}: {{@publicGists}}<br />
-  {{t "components.ghUser.followers"}}: {{@followers}}<br />
-  {{t "components.ghUser.following"}}: {{@following}}<br />
+  {{t "components.ghUser.repos"}}:
+  {{@publicRepos}}<br />
+  {{t "components.ghUser.gists"}}:
+  {{@publicGists}}<br />
+  {{t "components.ghUser.followers"}}:
+  {{@followers}}<br />
+  {{t "components.ghUser.following"}}:
+  {{@following}}<br />
 </div>
\ No newline at end of file
diff --git a/packages/frontend/app/components/layout/nav-bar.hbs b/packages/frontend/app/components/layout/nav-bar.hbs
index 0190fed..08cf163 100644
--- a/packages/frontend/app/components/layout/nav-bar.hbs
+++ b/packages/frontend/app/components/layout/nav-bar.hbs
@@ -10,22 +10,14 @@
 
   <div class="links">
     {{#each this.routes as |route|}}
-      {{#if (eq route.route 'users')}}
-      <LinkTo
-        @route={{route.route}}
-        class="menu-{{route.route}}"
-        target={{route.target}}
-      >
-        <FaIcon @icon="user" />
-      </LinkTo>
+      {{#if (eq route.route "users")}}
+        <LinkTo @route={{route.route}} class="menu-{{route.route}}" target={{route.target}}>
+          <FaIcon @icon="user" />
+        </LinkTo>
       {{else}}
-      <LinkTo
-        @route={{route.route}}
-        class="menu-{{route.route}}"
-        target={{route.target}}
-      >
-        {{route.title}}
-      </LinkTo>
+        <LinkTo @route={{route.route}} class="menu-{{route.route}}" target={{route.target}}>
+          {{route.title}}
+        </LinkTo>
       {{/if}}
     {{/each}}
   </div>
diff --git a/packages/frontend/app/components/locale-chooser.hbs b/packages/frontend/app/components/locale-chooser.hbs
index 883e7c6..5e52b5e 100644
--- a/packages/frontend/app/components/locale-chooser.hbs
+++ b/packages/frontend/app/components/locale-chooser.hbs
@@ -1,8 +1,4 @@
-<div
-  class="locale-chooser"
-  data-test-locale-chooser
-  {{on-click-outside this.close}}
->
+<div class="locale-chooser" data-test-locale-chooser {{on-click-outside this.close}}>
   <button
     type="button"
     class="toggle"
@@ -21,10 +17,7 @@
     <FaIcon @icon={{if this.isOpen "caret-down" "caret-right"}} />
   </button>
   {{#if this.isOpen}}
-    <div
-      class="menu"
-      role="menu"
-    >
+    <div class="menu" role="menu">
       {{#each this.locales as |loc index|}}
         <button
           type="button"
@@ -44,4 +37,4 @@
       {{/each}}
     </div>
   {{/if}}
-</div>
+</div>
\ No newline at end of file
diff --git a/packages/frontend/app/components/messages.hbs b/packages/frontend/app/components/messages.hbs
index ba6be40..8867f0a 100644
--- a/packages/frontend/app/components/messages.hbs
+++ b/packages/frontend/app/components/messages.hbs
@@ -10,7 +10,8 @@
       {{sanitize message.content}}
     </Message>
   {{else}}
-    <p>{{t "general.noneFound" items="messages"}}</p> {{t "sections.messages.addNew"}}
+    <p>{{t "general.noneFound" items="messages"}}</p>
+    {{t "sections.messages.addNew"}}
   {{/each}}
 
   <Forms::NewMessageInput @onCreate={{this.addMessage}} />
diff --git a/packages/frontend/app/components/song-list/index.hbs b/packages/frontend/app/components/song-list/index.hbs
index 1496291..177a977 100644
--- a/packages/frontend/app/components/song-list/index.hbs
+++ b/packages/frontend/app/components/song-list/index.hbs
@@ -5,17 +5,19 @@
     <ul class="song-list">
       {{#each @songs as |song|}}
         <li>
-          <a href={{song.detailUrl}} 
-            target="_blank" 
+          <a
+            href={{song.detailUrl}}
+            target="_blank"
             rel="noopener noreferrer"
             title={{t "general.info"}}
           >
             <FaIcon @icon="circle-info" />
           </a>
-          <a href={{song.fileUrl}}
-            target="_blank" 
+          <a
+            href={{song.fileUrl}}
+            target="_blank"
             rel="noopener noreferrer"
-            title={{t "general.listen"}} 
+            title={{t "general.listen"}}
           >
             <FaIcon @icon="ear-listen" />
           </a>
diff --git a/packages/frontend/app/components/song-list/loading.hbs b/packages/frontend/app/components/song-list/loading.hbs
index ccdda90..b75def7 100644
--- a/packages/frontend/app/components/song-list/loading.hbs
+++ b/packages/frontend/app/components/song-list/loading.hbs
@@ -1 +1 @@
-<FaIcon @icon="spinner" @spin={{true}} />{{t "general.loading"}}
+<FaIcon @icon="spinner" @spin={{true}} />{{t "general.loading"}}
\ No newline at end of file
diff --git a/packages/frontend/app/components/user-list.hbs b/packages/frontend/app/components/user-list.hbs
index 183d391..769e5a2 100644
--- a/packages/frontend/app/components/user-list.hbs
+++ b/packages/frontend/app/components/user-list.hbs
@@ -32,11 +32,11 @@
           </td>
           <td class="text-left" colspan="1" data-test-root>
             {{#if user.root}}
-            <FaIcon @icon="shield" />
+              <FaIcon @icon="shield" />
             {{/if}}
           </td>
         </tr>
       {{/each}}
     </tbody>
   </table>
-</div>
+</div>
\ No newline at end of file
diff --git a/packages/frontend/app/components/user-profile.hbs b/packages/frontend/app/components/user-profile.hbs
index ed914be..59c2141 100644
--- a/packages/frontend/app/components/user-profile.hbs
+++ b/packages/frontend/app/components/user-profile.hbs
@@ -4,4 +4,4 @@
   </h1>
   <p>{{@user.email}}</p>
   <p>{{if @user.root "Admin" "User"}}</p>
-</div>
+</div>
\ No newline at end of file
diff --git a/packages/frontend/app/templates/about.hbs b/packages/frontend/app/templates/about.hbs
index 97942ae..d6f1954 100644
--- a/packages/frontend/app/templates/about.hbs
+++ b/packages/frontend/app/templates/about.hbs
@@ -4,8 +4,5 @@
 {{#if this.isLoading}}
   <GhCommits::Loading />
 {{else}}
-  <GhCommits
-    @title="Last 5 Commits" 
-    @commits={{@model}} 
-  />
-{{/if}}
+  <GhCommits @title="Last 5 Commits" @commits={{@model}} />
+{{/if}}
\ No newline at end of file
diff --git a/packages/frontend/app/templates/head.hbs b/packages/frontend/app/templates/head.hbs
index 99f35f6..8dda915 100644
--- a/packages/frontend/app/templates/head.hbs
+++ b/packages/frontend/app/templates/head.hbs
@@ -1,7 +1,9 @@
 <title>
   ({{this.model.envTitle}})
-  {{#if this.model.routeTitle }}
-    {{this.model.routeTitle}} | {{this.model.title}}
+  {{#if this.model.routeTitle}}
+    {{this.model.routeTitle}}
+    |
+    {{this.model.title}}
   {{else}}
     {{this.model.title}}
   {{/if}}
@@ -10,11 +12,5 @@
 {{! template-lint-disable no-forbidden-elements }}
 <meta property="og:title" content={{this.model.ogTitle}} />
 
-<link
-  rel="shortcut icon"
-  href="/assets/icons/favicon-{{this.model.faviconType}}32.png"
-/>
-<link
-  rel="icon"
-  href="/assets/icons/favicon-{{this.model.faviconType}}32.png"
-/>
\ No newline at end of file
+<link rel="shortcut icon" href="/assets/icons/favicon-{{this.model.faviconType}}32.png" />
+<link rel="icon" href="/assets/icons/favicon-{{this.model.faviconType}}32.png" />
\ No newline at end of file
diff --git a/packages/frontend/app/templates/index.hbs b/packages/frontend/app/templates/index.hbs
index 7629b4a..c5aa936 100644
--- a/packages/frontend/app/templates/index.hbs
+++ b/packages/frontend/app/templates/index.hbs
@@ -1,24 +1,24 @@
 <div class="checklists">
   {{#each @model.checklists as |checklist|}}
-  <h2>{{checklist.title}}</h2>
+    <h2>{{checklist.title}}</h2>
 
-  <details>
-    <summary>{{if checklist.summary checklist.summary "Details"}}</summary>
-    {{#each checklist.lists as |list|}}
-    <ul class="checklist">
-      <li>
-        <span class={{if list.checked "checked"}}>
-          {{list.title}}
-        </span>
-        <ul class="{{if list.code "code"}}">
-          {{#each list.items as |item|}}
-          <li>{{item}}</li>
-          {{/each}}
+    <details>
+      <summary>{{if checklist.summary checklist.summary "Details"}}</summary>
+      {{#each checklist.lists as |list|}}
+        <ul class="checklist">
+          <li>
+            <span class={{if list.checked "checked"}}>
+              {{list.title}}
+            </span>
+            <ul class="{{if list.code 'code'}}">
+              {{#each list.items as |item|}}
+                <li>{{item}}</li>
+              {{/each}}
+            </ul>
+          </li>
         </ul>
-      </li>
-    </ul>
-    {{/each}}
-  </details>
+      {{/each}}
+    </details>
   {{/each}}
 </div>
 
@@ -34,4 +34,4 @@
   @isExpanded={{this.debugVisibility}}
 />
 
-<RandomText @paragraphs="5" @sentences="5" />
+<RandomText @paragraphs="5" @sentences="5" />
\ No newline at end of file
diff --git a/packages/frontend/app/templates/user.hbs b/packages/frontend/app/templates/user.hbs
index 6a5851e..a42e955 100644
--- a/packages/frontend/app/templates/user.hbs
+++ b/packages/frontend/app/templates/user.hbs
@@ -1,4 +1,6 @@
 <h2>
-  <LinkTo @route="users">{{t "general.users"}}</LinkTo> {{t "general.gt"}} {{t "general.user"}}
+  <LinkTo @route="users">{{t "general.users"}}</LinkTo>
+  {{t "general.gt"}}
+  {{t "general.user"}}
 </h2>
 <UserProfile @user={{@model}} />
\ No newline at end of file
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index e4ee39a..fcbb8d7 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -83,6 +83,7 @@
     "ember-set-helper": "^3.0.1",
     "ember-source": "~5.11.0",
     "ember-template-lint": "^6.0.0",
+    "ember-template-lint-plugin-prettier": "^5.0.0",
     "ember-truth-helpers": "^4.0.3",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
diff --git a/packages/frontend/tests/integration/components/audio-player-test.js b/packages/frontend/tests/integration/components/audio-player-test.js
index 54023ab..abf3a47 100644
--- a/packages/frontend/tests/integration/components/audio-player-test.js
+++ b/packages/frontend/tests/integration/components/audio-player-test.js
@@ -7,14 +7,14 @@ module('Integration | Component | audio-player', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it renders', async function (assert) {
-    await render(hbs`<AudioPlayer @srcUrl="/assets/audio/audio.mp3" />`);
+    await render(hbs`<AudioPlayer @srcUrl='/assets/audio/audio.mp3' />`);
 
     assert.dom('[data-test-audio-player]').exists();
     assert.dom('audio source').exists();
   });
 
   test('it sets loop attribute properly', async function (assert) {
-    await render(hbs`<AudioPlayer @srcUrl="/assets/audio/audio.mp3" @shouldLoop={{true}}/>`);
+    await render(hbs`<AudioPlayer @srcUrl='/assets/audio/audio.mp3' @shouldLoop={{true}} />`);
 
     assert.dom('audio').hasAttribute('loop');
   });
diff --git a/packages/frontend/tests/integration/components/box-test.js b/packages/frontend/tests/integration/components/box-test.js
index a775caa..da88bf9 100644
--- a/packages/frontend/tests/integration/components/box-test.js
+++ b/packages/frontend/tests/integration/components/box-test.js
@@ -10,9 +10,6 @@ module('Integration | Component | box', function (hooks) {
   test('it renders empty', async function (assert) {
     await render(hbs`<Box />`);
     assert.strictEqual(component.text, '', 'Box with no block exists, and has no text');
-
-    await render(hbs`<Box></Box>`);
-    assert.dom('.box-text').doesNotExist();
   });
 
   test('it renders short text in full', async function (assert) {
diff --git a/packages/frontend/tests/integration/components/message-test.js b/packages/frontend/tests/integration/components/message-test.js
index 9170735..6b77270 100644
--- a/packages/frontend/tests/integration/components/message-test.js
+++ b/packages/frontend/tests/integration/components/message-test.js
@@ -8,17 +8,15 @@ module('Integration | Component | message', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it renders', async function (assert) {
-    await render(hbs`
-      <Message
-        @id='message-0'
-        @username='Tomster'
-        @userIsActive={{true}}
-        @userIsCurrent={{false}}
-        @userLocalTime='5:15 PM'
-      >
-        <p>{{t 'general.hello' name='Tomster'}}</p>
-      </Message>
-    `);
+    await render(hbs`<Message
+  @id='message-0'
+  @username='Tomster'
+  @userIsActive={{true}}
+  @userIsCurrent={{false}}
+  @userLocalTime='5:15 PM'
+>
+  <p>{{t 'general.hello' name='Tomster'}}</p>
+</Message>`);
 
     assert.dom('.message').exists();
     assert.dom('.message aside').exists();
diff --git a/packages/frontend/tests/integration/components/message/message-username-test.js b/packages/frontend/tests/integration/components/message/message-username-test.js
index 7921268..6cab9a9 100644
--- a/packages/frontend/tests/integration/components/message/message-username-test.js
+++ b/packages/frontend/tests/integration/components/message/message-username-test.js
@@ -9,11 +9,11 @@ module('Integration | Component | message-username', function (hooks) {
   setupIntl(hooks, 'en-us');
 
   test('it renders', async function (assert) {
-    await render(hbs`<Message::Username @name="Tomster" />`);
+    await render(hbs`<Message::Username @name='Tomster' />`);
 
     assert.dom().hasText('Tomster');
 
-    await render(hbs`<Message::Username @name="Tomster" @localTime='5:15 PM' />`);
+    await render(hbs`<Message::Username @name='Tomster' @localTime='5:15 PM' />`);
 
     assert.dom().hasText('Tomster Local time: 5:15 PM');
   });
diff --git a/packages/frontend/tests/integration/components/mover-test.js b/packages/frontend/tests/integration/components/mover-test.js
index 3ecb4e5..4e22391 100644
--- a/packages/frontend/tests/integration/components/mover-test.js
+++ b/packages/frontend/tests/integration/components/mover-test.js
@@ -15,11 +15,9 @@ module('Integration | Component | mover', function (hooks) {
 
     assert.dom('#mover').hasText('Mover (CMN) Click toggle to stop moving!');
 
-    await render(hbs`
-      <Mover>
-        {{t 'general.helloWorld'}}
-      </Mover>
-    `);
+    await render(hbs`<Mover>
+  {{t 'general.helloWorld'}}
+</Mover>`);
 
     assert.dom().hasText('Mover (CMN) Click toggle to start moving! Hello World!');
   });
diff --git a/packages/frontend/tests/integration/components/ribbon-test.js b/packages/frontend/tests/integration/components/ribbon-test.js
index 1e5af8a..f2c79f0 100644
--- a/packages/frontend/tests/integration/components/ribbon-test.js
+++ b/packages/frontend/tests/integration/components/ribbon-test.js
@@ -11,7 +11,7 @@ module('Integration | Component | ribbon', function (hooks) {
 
     assert.dom('.ribbon').exists();
 
-    await render(hbs`<Layout::Ribbon @position="left" @content="development" />`);
+    await render(hbs`<Layout::Ribbon @position='left' @content='development' />`);
 
     assert.dom('.ribbon').hasClass('dev');
     assert.dom('.ribbon').hasClass('left');
diff --git a/packages/frontend/tests/integration/components/song-list-test.js b/packages/frontend/tests/integration/components/song-list-test.js
index fff2f91..6d31b9e 100644
--- a/packages/frontend/tests/integration/components/song-list-test.js
+++ b/packages/frontend/tests/integration/components/song-list-test.js
@@ -11,7 +11,7 @@ module('Integration | Component | song-list', function (hooks) {
 
     this.set('songs', songs);
 
-    await render(hbs`<SongList @songs={{this.songs}}/>`);
+    await render(hbs`<SongList @songs={{this.songs}} />`);
 
     assert.dom('.song-list').exists();
     assert.dom('.song-list li').exists();
diff --git a/packages/frontend/tests/integration/helpers/pick-test.js b/packages/frontend/tests/integration/helpers/pick-test.js
index 7395a8b..adb86ab 100644
--- a/packages/frontend/tests/integration/helpers/pick-test.js
+++ b/packages/frontend/tests/integration/helpers/pick-test.js
@@ -14,14 +14,9 @@ module('Integration | Helper | pick', function (hooks) {
       assert.strictEqual(value, 'pizza party', 'The action receives the correct value');
     });
 
-    await render(hbs`
-      <input
-        id="test-input"
-        value="pizza party"
-        {{on "focusin" (pick "target.value" this.onFocus)}}
-      />
-
-`);
+    await render(
+      hbs`<input id='test-input' value='pizza party' {{on 'focusin' (pick 'target.value' this.onFocus)}} />`,
+    );
 
     await click('#test-input');
   });
diff --git a/packages/frontend/tests/integration/modifiers/play-when-test.js b/packages/frontend/tests/integration/modifiers/play-when-test.js
index 1ae3e8f..dec9a4b 100644
--- a/packages/frontend/tests/integration/modifiers/play-when-test.js
+++ b/packages/frontend/tests/integration/modifiers/play-when-test.js
@@ -11,13 +11,11 @@ module('Integration | Modifier | play-when', function (hooks) {
   test('it renders', async function (assert) {
     this.set('isPlaying', false);
 
-    await render(hbs`
-      <audio {{play-when this.isPlaying}}>
-        <source src={{@srcURL}} />
-        <track kind="captions" />
-        {{t "errors.audio"}}
-      </audio>
-    `);
+    await render(hbs`<audio {{play-when this.isPlaying}}>
+  <source src={{@srcURL}} />
+  <track kind='captions' />
+  {{t 'errors.audio'}}
+</audio>`);
 
     assert.ok(true);
   });
diff --git a/packages/rs-common/.template-lintrc.js b/packages/rs-common/.template-lintrc.js
index 34a0fc2..458bb40 100644
--- a/packages/rs-common/.template-lintrc.js
+++ b/packages/rs-common/.template-lintrc.js
@@ -1,7 +1,8 @@
 'use strict';
 
 module.exports = {
-  extends: 'recommended',
+  plugins: ['ember-template-lint-plugin-prettier'],
+  extends: ['recommended', 'ember-template-lint-plugin-prettier:recommended'],
   rules: {
     'no-bare-strings': true,
   },
diff --git a/packages/rs-common/addon/components/audio-player.hbs b/packages/rs-common/addon/components/audio-player.hbs
index b97a2b7..c100272 100644
--- a/packages/rs-common/addon/components/audio-player.hbs
+++ b/packages/rs-common/addon/components/audio-player.hbs
@@ -14,7 +14,15 @@
       {{t "errors.notSupported" description="<audio>"}}
     </audio>
   {{/if}}
-  <input type="range" min="0" max="100" step="1" value={{this.rangeVolume}} id="audio-volume" oninput={{this.setVolume}} />
+  <input
+    type="range"
+    min="0"
+    max="100"
+    step="1"
+    value={{this.rangeVolume}}
+    id="audio-volume"
+    oninput={{this.setVolume}}
+  />
   {{!-- <div class="volume-tooltip">{{this.rangeVolume}}</div> --}}
 
   {{#if (eq this.env "production")}}
diff --git a/packages/rs-common/addon/components/box-gallery.hbs b/packages/rs-common/addon/components/box-gallery.hbs
index 7c228b2..96b61ca 100644
--- a/packages/rs-common/addon/components/box-gallery.hbs
+++ b/packages/rs-common/addon/components/box-gallery.hbs
@@ -27,4 +27,4 @@
       {{/if}}
     {{/each}}
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/packages/rs-common/addon/components/box.hbs b/packages/rs-common/addon/components/box.hbs
index fc57a38..8ae7054 100644
--- a/packages/rs-common/addon/components/box.hbs
+++ b/packages/rs-common/addon/components/box.hbs
@@ -6,38 +6,37 @@
     data-test-box
     ...attributes
   >
-    {{yield this.displayText this.expand this.collapse this.updateTextDims this.isFaded this.expanded}}
+    {{yield
+      this.displayText
+      this.expand
+      this.collapse
+      this.updateTextDims
+      this.isFaded
+      this.expanded
+    }}
   </div>
 {{else}}
-  <div
-    class="box no-block"
-    id={{unique-id}}
-    data-test-box
-    ...attributes
-  >
+  <div class="box no-block" id={{unique-id}} data-test-box ...attributes>
     <div class="box-text" data-test-box-text>
       <div class="display-text-wrapper{{if this.isFaded ' is-faded'}}">
-        <div
-          class="display-text"
-          {{on-resize this.updateTextDims}}
-        >
+        <div class="display-text" {{on-resize this.updateTextDims}}>
           {{this.displayText}}
         </div>
       </div>
     </div>
     {{#if this.isFaded}}
-    <div class="box-text-control">
-      <button
-        class="expand-buttons"
-        aria-label={{t "general.expand"}}
-        title={{t "general.expand"}}
-        type="button"
-        data-test-expand
-        {{on "click" this.expand}}
-      >
-        <FaIcon @icon="angles-down" />
-      </button>
-    </div>
+      <div class="box-text-control">
+        <button
+          class="expand-buttons"
+          aria-label={{t "general.expand"}}
+          title={{t "general.expand"}}
+          type="button"
+          data-test-expand
+          {{on "click" this.expand}}
+        >
+          <FaIcon @icon="angles-down" />
+        </button>
+      </div>
     {{else}}
       {{#if this.expanded}}
         <button
@@ -53,4 +52,4 @@
       {{/if}}
     {{/if}}
   </div>
-{{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/packages/rs-common/addon/components/loading-spinner.hbs b/packages/rs-common/addon/components/loading-spinner.hbs
index aa91570..81d573f 100644
--- a/packages/rs-common/addon/components/loading-spinner.hbs
+++ b/packages/rs-common/addon/components/loading-spinner.hbs
@@ -1,3 +1,3 @@
 <span class="loading-spinner">
   <FaIcon @icon="spinner" @spin={{true}} />
-</span>
+</span>
\ No newline at end of file
diff --git a/packages/rs-common/addon/components/mover.hbs b/packages/rs-common/addon/components/mover.hbs
index 7daba67..7a91389 100644
--- a/packages/rs-common/addon/components/mover.hbs
+++ b/packages/rs-common/addon/components/mover.hbs
@@ -1,23 +1,23 @@
 {{#if this.isEnabled}}
-<div id="mover" class="moving" {{move-randomly-switch}}>
-  <h3>
-    {{t "components.mover.head"}}
-    <button type="button" class="header" {{on "click" this.toggleMovement}}>
-      <FaIcon @icon="toggle-on" />
-    </button>
-  </h3>
-  {{t "components.mover.clickMeOff"}}
-  <p>{{yield}}</p>
-</div>
+  <div id="mover" class="moving" {{move-randomly-switch}}>
+    <h3>
+      {{t "components.mover.head"}}
+      <button type="button" class="header" {{on "click" this.toggleMovement}}>
+        <FaIcon @icon="toggle-on" />
+      </button>
+    </h3>
+    {{t "components.mover.clickMeOff"}}
+    <p>{{yield}}</p>
+  </div>
 {{else}}
-<div id="mover">
-  <h3>
-    {{t "components.mover.head"}}
-    <button type="button" class="header" {{on "click" this.toggleMovement}}>
-      <FaIcon @icon="toggle-off" />
-    </button>
-  </h3>
-  {{t "components.mover.clickMeOn"}}
-  <p>{{yield}}</p>
-</div>
+  <div id="mover">
+    <h3>
+      {{t "components.mover.head"}}
+      <button type="button" class="header" {{on "click" this.toggleMovement}}>
+        <FaIcon @icon="toggle-off" />
+      </button>
+    </h3>
+    {{t "components.mover.clickMeOn"}}
+    <p>{{yield}}</p>
+  </div>
 {{/if}}
\ No newline at end of file
diff --git a/packages/rs-common/addon/components/random-text.hbs b/packages/rs-common/addon/components/random-text.hbs
index c101de9..4fd683f 100644
--- a/packages/rs-common/addon/components/random-text.hbs
+++ b/packages/rs-common/addon/components/random-text.hbs
@@ -3,6 +3,6 @@
   {{#if this.requestText.isRunning}}
     <LoadingSpinner />
   {{else}}
-    {{ this.text }}
+    {{this.text}}
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/packages/rs-common/addon/components/tomster-popper.hbs b/packages/rs-common/addon/components/tomster-popper.hbs
index 094c6d6..5997584 100644
--- a/packages/rs-common/addon/components/tomster-popper.hbs
+++ b/packages/rs-common/addon/components/tomster-popper.hbs
@@ -1,10 +1,10 @@
-<div id="tomster-popper" class={{if this.isVisible 'show' 'hide'}}>
+<div id="tomster-popper" class={{if this.isVisible "show" "hide"}}>
   <div id="greeting">
     {{t "general.greeting" name="Tomster"}}
   </div>
   <img
     src="/assets/images/teaching-tomster.png"
     alt={{t "general.teachingTomster"}}
-    {{on-key 'ctrl+shift+KeyT' this.popToggle event='keyup'}}
+    {{on-key "ctrl+shift+KeyT" this.popToggle event="keyup"}}
   />
 </div>
\ No newline at end of file
diff --git a/packages/rs-common/addon/components/user-name-info.hbs b/packages/rs-common/addon/components/user-name-info.hbs
index 9511126..fd76fb4 100644
--- a/packages/rs-common/addon/components/user-name-info.hbs
+++ b/packages/rs-common/addon/components/user-name-info.hbs
@@ -1,7 +1,3 @@
-<span
-  class="user-name-info"
-  data-test-user-name-info
-  ...attributes
->
+<span class="user-name-info" data-test-user-name-info ...attributes>
   <span data-test-fullname>{{@user.fullName}}</span>
-</span>
+</span>
\ No newline at end of file
diff --git a/packages/rs-common/package.json b/packages/rs-common/package.json
index a244c65..f6b6482 100644
--- a/packages/rs-common/package.json
+++ b/packages/rs-common/package.json
@@ -91,6 +91,7 @@
     "ember-source": "~5.9.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^6.0.0",
+    "ember-template-lint-plugin-prettier": "^5.0.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-ember": "^11.12.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e49d168..129113c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -191,6 +191,9 @@ importers:
       ember-template-lint:
         specifier: ^6.0.0
         version: 6.0.0
+      ember-template-lint-plugin-prettier:
+        specifier: ^5.0.0
+        version: 5.0.0(ember-template-lint@6.0.0)(prettier@3.3.3)
       ember-truth-helpers:
         specifier: ^4.0.3
         version: 4.0.3(ember-source@5.11.1(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))
@@ -429,6 +432,9 @@ importers:
       ember-template-lint:
         specifier: ^6.0.0
         version: 6.0.0
+      ember-template-lint-plugin-prettier:
+        specifier: ^5.0.0
+        version: 5.0.0(ember-template-lint@6.0.0)(prettier@3.3.3)
       eslint:
         specifier: ^8.57.0
         version: 8.57.1
@@ -1692,6 +1698,11 @@ packages:
     resolution: {integrity: sha512-0iJnNkS4T8lJE4ldOhRERgER1o59iHA1nMlvpUI5lxNC9SUruH6peRUOlP4/rNcDg+UQ9u0rt5loYOnWKCojtw==}
     engines: {node: '>=16.14'}
 
+  '@prettier/sync@0.2.1':
+    resolution: {integrity: sha512-7ls1R6//+GPYD9vof1XaL5psViv83CwpdwlS8oUkWldYgbPhzZ3WgxIQMWqGyBmWPmoBfQg8C7jj7KI/ZuDHhQ==}
+    peerDependencies:
+      prettier: ^3.0.0
+
   '@ro0gr/ceibo@2.2.0':
     resolution: {integrity: sha512-4gSXPwwr99zUWxnTllN5L4QlfgFDloYKOsenoPvx46LE75x3wvLgGUhxUxhIMxJbqOZ0w9pzrugjQR7St0/PQg==}
 
@@ -3530,6 +3541,13 @@ packages:
     resolution: {integrity: sha512-OS8TUVG2kQYYwP3netunLVfeijPoOKIs1SvPQRTNOQX4Pu8xGGBEZmrv0U1YTnQn12Eg+p6w/0UdGbUnITjyzw==}
     engines: {node: 12.* || >= 14}
 
+  ember-template-lint-plugin-prettier@5.0.0:
+    resolution: {integrity: sha512-aXUYM4yuIdPZ80+AsAU8QBwGSJJ/aAkRsNcQ5vI5HmXiBjzHlDc/ZhmP6iVcYuCmoA/3iKcssMAYwIDbuby4pg==}
+    engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
+    peerDependencies:
+      ember-template-lint: '>= 4.0.0'
+      prettier: '>= 3.0.0'
+
   ember-template-lint@6.0.0:
     resolution: {integrity: sha512-TWWt/qCd4KoQ50T3We5nCoKcsrAT8Ip79Kmm9eyWjjyL+LAbRFu0z+GxcmW7MR+QCNW/1LQs3kwEdtIcaHEGiA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -8704,6 +8722,10 @@ snapshots:
       '@pnpm/error': 5.0.3
       find-up: 5.0.0
 
+  '@prettier/sync@0.2.1(prettier@3.3.3)':
+    dependencies:
+      prettier: 3.3.3
+
   '@ro0gr/ceibo@2.2.0': {}
 
   '@rollup/plugin-node-resolve@15.3.0(rollup@2.79.1)':
@@ -11598,6 +11620,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  ember-template-lint-plugin-prettier@5.0.0(ember-template-lint@6.0.0)(prettier@3.3.3):
+    dependencies:
+      '@prettier/sync': 0.2.1(prettier@3.3.3)
+      ember-template-lint: 6.0.0
+      prettier: 3.3.3
+      prettier-linter-helpers: 1.0.0
+
   ember-template-lint@6.0.0:
     dependencies:
       '@lint-todo/utils': 13.1.1