diff --git a/src/components/AppLayout/AppEmptyLayout.astro b/src/components/AppLayout/AppLayout.astro
similarity index 100%
rename from src/components/AppLayout/AppEmptyLayout.astro
rename to src/components/AppLayout/AppLayout.astro
diff --git a/src/pages/404.astro b/src/pages/404.astro
index c3de399..300c0e2 100644
--- a/src/pages/404.astro
+++ b/src/pages/404.astro
@@ -1,10 +1,10 @@
 ---
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import AppLayoutTitle from "components/AppLayout/components/AppLayoutTitle.astro";
 ---
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout>
+<AppLayout>
   <AppLayoutTitle title="Oh nyo..." />
-</AppEmptyLayout>
+</AppLayout>
diff --git a/src/pages/[locale]/audios/[id].astro b/src/pages/[locale]/audios/[id].astro
index ae34f5c..85a727b 100644
--- a/src/pages/[locale]/audios/[id].astro
+++ b/src/pages/[locale]/audios/[id].astro
@@ -1,5 +1,5 @@
 ---
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import AppLayoutTitle from "components/AppLayout/components/AppLayoutTitle.astro";
 import AudioPlayer from "components/AudioPlayer.astro";
 import Credits from "components/Credits.astro";
@@ -71,7 +71,7 @@ const tagsAndAttributes = [
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout
+<AppLayout
   openGraph={{
     thumbnail,
     audio,
@@ -97,7 +97,7 @@ const tagsAndAttributes = [
       <DownloadButton href={url} filename={filename} />
     </div>
   </div>
-</AppEmptyLayout>
+</AppLayout>
 
 {/* ------------------------------------------- CSS -------------------------------------------- */}
 
diff --git a/src/pages/[locale]/collectibles/[slug]/gallery/[index].astro b/src/pages/[locale]/collectibles/[slug]/gallery/[index].astro
index bb24d95..2fda58b 100644
--- a/src/pages/[locale]/collectibles/[slug]/gallery/[index].astro
+++ b/src/pages/[locale]/collectibles/[slug]/gallery/[index].astro
@@ -1,5 +1,5 @@
 ---
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import Lightbox from "components/Lightbox.astro";
 import { getI18n } from "src/i18n/i18n";
 import { payload } from "src/shared/payload/payload-sdk";
@@ -54,7 +54,7 @@ const tagsAndAttributes = [
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout
+<AppLayout
   openGraph={{
     thumbnail: image,
     description: description ? formatRichTextToString(description) : undefined,
@@ -77,4 +77,4 @@ const tagsAndAttributes = [
     tagGroups={tagsAndAttributes}
     credits={credits}
   />
-</AppEmptyLayout>
+</AppLayout>
diff --git a/src/pages/[locale]/collectibles/[slug]/gallery/index.astro b/src/pages/[locale]/collectibles/[slug]/gallery/index.astro
index 612e1b9..e5c7562 100644
--- a/src/pages/[locale]/collectibles/[slug]/gallery/index.astro
+++ b/src/pages/[locale]/collectibles/[slug]/gallery/index.astro
@@ -1,5 +1,5 @@
 ---
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import AppLayoutDescription from "components/AppLayout/components/AppLayoutDescription.astro";
 import AppLayoutTitle from "components/AppLayout/components/AppLayoutTitle.astro";
 import { getI18n } from "src/i18n/i18n";
@@ -21,7 +21,7 @@ const translation = getLocalizedMatch(translations);
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout
+<AppLayout
   openGraph={{
     title: `${formatInlineTitle(translation)} (${t("collectibles.gallery")})`,
     description: translation.description && formatRichTextToString(translation.description),
@@ -45,7 +45,7 @@ const translation = getLocalizedMatch(translations);
       ))
     }
   </div>
-</AppEmptyLayout>
+</AppLayout>
 
 {/* ------------------------------------------- CSS -------------------------------------------- */}
 
diff --git a/src/pages/[locale]/collectibles/[slug]/index.astro b/src/pages/[locale]/collectibles/[slug]/index.astro
index b4de5d2..0fec2a1 100644
--- a/src/pages/[locale]/collectibles/[slug]/index.astro
+++ b/src/pages/[locale]/collectibles/[slug]/index.astro
@@ -1,5 +1,5 @@
 ---
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import AppLayoutTitle from "components/AppLayout/components/AppLayoutTitle.astro";
 import TagGroups from "components/TagGroups.astro";
 import { getI18n } from "src/i18n/i18n";
@@ -49,7 +49,7 @@ const translation = getLocalizedMatch(translations);
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout
+<AppLayout
   openGraph={{
     title: formatInlineTitle(translation),
     description: translation.description && formatRichTextToString(translation.description),
@@ -127,7 +127,7 @@ const translation = getLocalizedMatch(translations);
 
     {contents.length > 0 && <ContentsSection contents={contents} />}
   </AsideLayout>
-</AppEmptyLayout>
+</AppLayout>
 
 {/* ------------------------------------------- CSS -------------------------------------------- */}
 
diff --git a/src/pages/[locale]/collectibles/[slug]/scans/[index].astro b/src/pages/[locale]/collectibles/[slug]/scans/[index].astro
index 896891c..8356949 100644
--- a/src/pages/[locale]/collectibles/[slug]/scans/[index].astro
+++ b/src/pages/[locale]/collectibles/[slug]/scans/[index].astro
@@ -1,5 +1,5 @@
 ---
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import Lightbox from "components/Lightbox.astro";
 import { getI18n } from "src/i18n/i18n";
 import { payload } from "src/shared/payload/payload-sdk";
@@ -23,7 +23,7 @@ const translation = getLocalizedMatch(translations);
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout
+<AppLayout
   openGraph={{
     title: `${formatInlineTitle(translation)} (${index})`,
     description: translation.description && formatRichTextToString(translation.description),
@@ -41,4 +41,4 @@ const translation = getLocalizedMatch(translations);
       : undefined}
     filename={image.filename}
   />
-</AppEmptyLayout>
+</AppLayout>
diff --git a/src/pages/[locale]/collectibles/[slug]/scans/index.astro b/src/pages/[locale]/collectibles/[slug]/scans/index.astro
index 7bbdfb0..f96382a 100644
--- a/src/pages/[locale]/collectibles/[slug]/scans/index.astro
+++ b/src/pages/[locale]/collectibles/[slug]/scans/index.astro
@@ -1,5 +1,5 @@
 ---
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import AppLayoutTitle from "components/AppLayout/components/AppLayoutTitle.astro";
 import Credits from "components/Credits.astro";
 import { getI18n } from "src/i18n/i18n";
@@ -39,7 +39,7 @@ const hasOutsideObi = obi ? Object.keys(obi).some((value) => !value.includes("in
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout
+<AppLayout
   openGraph={{
     title: `${formatInlineTitle(translation)} (${t("collectibles.scans")})`,
     description: translation.description && formatRichTextToString(translation.description),
@@ -184,7 +184,7 @@ const hasOutsideObi = obi ? Object.keys(obi).some((value) => !value.includes("in
       </section>
     )
   }
-</AppEmptyLayout>
+</AppLayout>
 
 {/* ------------------------------------------- CSS -------------------------------------------- */}
 
diff --git a/src/pages/[locale]/dev/rich-text.astro b/src/pages/[locale]/dev/rich-text.astro
index 88c3d52..33affb4 100644
--- a/src/pages/[locale]/dev/rich-text.astro
+++ b/src/pages/[locale]/dev/rich-text.astro
@@ -1,12 +1,12 @@
 ---
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import AppLayoutDescription from "components/AppLayout/components/AppLayoutDescription.astro";
 import AppLayoutTitle from "components/AppLayout/components/AppLayoutTitle.astro";
 ---
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout>
+<AppLayout>
   <AppLayoutTitle pretitle="Guide to" title="Rich Text Editor" />
   <AppLayoutDescription
     description="Having troubles using the Rich Text Editor? Looking for tips and advanced techniques? You've come to the right place!"
@@ -32,7 +32,7 @@ import AppLayoutTitle from "components/AppLayout/components/AppLayoutTitle.astro
       </kbd> to create a linebreak.
     </p>
   </div>
-</AppEmptyLayout>
+</AppLayout>
 
 {/* ------------------------------------------- CSS -------------------------------------------- */}
 
diff --git a/src/pages/[locale]/folders/[slug].astro b/src/pages/[locale]/folders/[slug].astro
index 467a988..e12f8f6 100644
--- a/src/pages/[locale]/folders/[slug].astro
+++ b/src/pages/[locale]/folders/[slug].astro
@@ -10,7 +10,7 @@ import { formatRichTextToString } from "src/utils/format";
 import ImagePreview from "components/Previews/ImagePreview.astro";
 import AudioPreview from "components/Previews/AudioPreview.astro";
 import VideoPreview from "components/Previews/VideoPreview.astro";
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import AppLayoutTitle from "components/AppLayout/components/AppLayoutTitle.astro";
 import AppLayoutDescription from "components/AppLayout/components/AppLayoutDescription.astro";
 
@@ -27,7 +27,7 @@ const meta = getLocalizedMatch(folder.translations);
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout
+<AppLayout
   openGraph={{
     title: meta.name,
     description: meta.description && formatRichTextToString(meta.description),
@@ -91,7 +91,7 @@ const meta = getLocalizedMatch(folder.translations);
       }
     </div>
   </div>
-</AppEmptyLayout>
+</AppLayout>
 
 {/* ------------------------------------------- CSS -------------------------------------------- */}
 
diff --git a/src/pages/[locale]/images/[id].astro b/src/pages/[locale]/images/[id].astro
index 86415d6..36286eb 100644
--- a/src/pages/[locale]/images/[id].astro
+++ b/src/pages/[locale]/images/[id].astro
@@ -1,5 +1,5 @@
 ---
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import Lightbox from "components/Lightbox.astro";
 import { getI18n } from "src/i18n/i18n";
 import { payload } from "src/shared/payload/payload-sdk";
@@ -49,7 +49,7 @@ const tagsAndAttributes = [
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout
+<AppLayout
   openGraph={{
     thumbnail: image,
     description: description ? formatRichTextToString(description) : undefined,
@@ -65,4 +65,4 @@ const tagsAndAttributes = [
     tagGroups={tagsAndAttributes}
     credits={credits}
   />
-</AppEmptyLayout>
+</AppLayout>
diff --git a/src/pages/[locale]/index.astro b/src/pages/[locale]/index.astro
index 7dabe81..893f7e7 100644
--- a/src/pages/[locale]/index.astro
+++ b/src/pages/[locale]/index.astro
@@ -6,7 +6,7 @@ import ChronicleCard from "./_components/ChronicleCard.astro";
 import LinkCard from "./_components/LinkCard.astro";
 import { getI18n } from "src/i18n/i18n";
 import { cache } from "src/utils/cachedPayload";
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import AppLayoutDescription from "components/AppLayout/components/AppLayoutDescription.astro";
 
 const { t, getLocalizedUrl } = await getI18n(Astro.locals.currentLocale);
@@ -14,7 +14,7 @@ const { t, getLocalizedUrl } = await getI18n(Astro.locals.currentLocale);
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout
+<AppLayout
   openGraph={{ title: t("home.title") }}
   backgroundImage={{
     url: "/img/background-image.webp",
@@ -179,7 +179,7 @@ const { t, getLocalizedUrl } = await getI18n(Astro.locals.currentLocale);
       </div>
     </section>
   </div>
-</AppEmptyLayout>
+</AppLayout>
 
 {/* ------------------------------------------- CSS -------------------------------------------- */}
 
diff --git a/src/pages/[locale]/pages/[slug].astro b/src/pages/[locale]/pages/[slug].astro
index a19f0c9..76d0d95 100644
--- a/src/pages/[locale]/pages/[slug].astro
+++ b/src/pages/[locale]/pages/[slug].astro
@@ -1,5 +1,5 @@
 ---
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import { getI18n } from "src/i18n/i18n";
 import Page from "src/pages/[locale]/api/pages/partial.astro";
 import { payload } from "src/shared/payload/payload-sdk";
@@ -19,7 +19,7 @@ const meta = getLocalizedMatch(page.translations);
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout
+<AppLayout
   openGraph={{
     title: formatInlineTitle(meta),
     description: meta.summary && formatRichTextToString(meta.summary),
@@ -28,4 +28,4 @@ const meta = getLocalizedMatch(page.translations);
   parentPages={page.parentPages}
   backgroundImage={page.backgroundImage ?? page.thumbnail}>
   <Page slug={page.slug} lang={Astro.locals.currentLocale} page={page} />
-</AppEmptyLayout>
+</AppLayout>
diff --git a/src/pages/[locale]/settings/index.astro b/src/pages/[locale]/settings/index.astro
index a8ee0cf..315356d 100644
--- a/src/pages/[locale]/settings/index.astro
+++ b/src/pages/[locale]/settings/index.astro
@@ -1,5 +1,5 @@
 ---
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import AppLayoutTitle from "components/AppLayout/components/AppLayoutTitle.astro";
 import { getI18n } from "src/i18n/i18n";
 import { cache } from "src/utils/cachedPayload";
@@ -12,7 +12,7 @@ const { t } = await getI18n(currentLocale);
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout openGraph={{ title: t("settings.title") }}>
+<AppLayout openGraph={{ title: t("settings.title") }}>
   <AppLayoutTitle title={t("settings.title")} />
 
   <div id="main">
@@ -69,7 +69,7 @@ const { t } = await getI18n(currentLocale);
       }
     </div>
   </div>
-</AppEmptyLayout>
+</AppLayout>
 
 {/* ------------------------------------------- CSS -------------------------------------------- */}
 
diff --git a/src/pages/[locale]/timeline/index.astro b/src/pages/[locale]/timeline/index.astro
index 797a4e5..a901cc7 100644
--- a/src/pages/[locale]/timeline/index.astro
+++ b/src/pages/[locale]/timeline/index.astro
@@ -2,7 +2,7 @@
 import { payload } from "src/shared/payload/payload-sdk";
 import { groupBy } from "src/utils/array";
 import TimelineYear from "./_components/TimelineYear.astro";
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import AppLayoutTitle from "components/AppLayout/components/AppLayoutTitle.astro";
 import Card from "components/Card.astro";
 import { getI18n } from "src/i18n/i18n";
@@ -18,7 +18,7 @@ const { getLocalizedUrl, t, formatTimelineDate } = await getI18n(Astro.locals.cu
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout>
+<AppLayout>
   <AppLayoutBackgroundImg
     img={{
       url: "/img/timeline-background.webp",
@@ -76,7 +76,7 @@ const { getLocalizedUrl, t, formatTimelineDate } = await getI18n(Astro.locals.cu
     </Card>
   </div>
   {groupedEvents.map(({ key, values }) => <TimelineYear year={key} events={values} />)}
-</AppEmptyLayout>
+</AppLayout>
 
 {/* ------------------------------------------- CSS -------------------------------------------- */}
 
diff --git a/src/pages/[locale]/videos/[id].astro b/src/pages/[locale]/videos/[id].astro
index dd986c5..2bdfa98 100644
--- a/src/pages/[locale]/videos/[id].astro
+++ b/src/pages/[locale]/videos/[id].astro
@@ -1,5 +1,5 @@
 ---
-import AppEmptyLayout from "components/AppLayout/AppEmptyLayout.astro";
+import AppLayout from "components/AppLayout/AppLayout.astro";
 import AppLayoutTitle from "components/AppLayout/components/AppLayoutTitle.astro";
 import Credits from "components/Credits.astro";
 import DownloadButton from "components/DownloadButton.astro";
@@ -70,7 +70,7 @@ const tagsAndAttributes = [
 
 {/* ------------------------------------------- HTML ------------------------------------------- */}
 
-<AppEmptyLayout
+<AppLayout
   openGraph={{
     thumbnail,
     video,
@@ -96,7 +96,7 @@ const tagsAndAttributes = [
       <DownloadButton href={url} filename={filename} />
     </div>
   </div>
-</AppEmptyLayout>
+</AppLayout>
 
 {/* ------------------------------------------- CSS -------------------------------------------- */}