diff --git a/mail/announcement.mjml b/mail/announcement.mjml
index 0e06847..6e30b2d 100644
--- a/mail/announcement.mjml
+++ b/mail/announcement.mjml
@@ -1,5 +1,29 @@
 <mjml>
   <mj-head>
+    <mj-raw>
+      <meta name="color-scheme" content="light dark">
+      <meta name="supported-color-schemes" content="light dark">
+    </mj-raw>
+    <mj-style>
+        :root {
+            Color-scheme: light dark;
+            supported-color-schemes: light dark;
+        }
+        @media (prefers-color-scheme: light) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+        @media (prefers-color-scheme: dark) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+    </mj-style>
     <mj-attributes>
       <mj-class name="bg" background-color="#101010" />
       <mj-class name="bg2" background-color="#242424" />
@@ -14,7 +38,7 @@
   <mj-body>
     <mj-section mj-class="bg2">
       <mj-column>
-        <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> Jellyfin </mj-text>
+          <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> {{ .jellyfin }} </mj-text>
       </mj-column>
     </mj-section>
     <mj-section mj-class="bg">
diff --git a/mail/confirmation.mjml b/mail/confirmation.mjml
index 5118e6d..6de3499 100644
--- a/mail/confirmation.mjml
+++ b/mail/confirmation.mjml
@@ -1,5 +1,29 @@
 <mjml>
   <mj-head>
+    <mj-raw>
+      <meta name="color-scheme" content="light dark">
+      <meta name="supported-color-schemes" content="light dark">
+    </mj-raw>
+    <mj-style>
+        :root {
+            Color-scheme: light dark;
+            supported-color-schemes: light dark;
+        }
+        @media (prefers-color-scheme: light) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+        @media (prefers-color-scheme: dark) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+    </mj-style>
     <mj-attributes>
       <mj-class name="bg" background-color="#101010" />
       <mj-class name="bg2" background-color="#242424" />
@@ -14,7 +38,7 @@
   <mj-body>
     <mj-section mj-class="bg2">
       <mj-column>
-        <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> Jellyfin </mj-text>
+          <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> {{ .jellyfin }} </mj-text>
       </mj-column>
     </mj-section>
     <mj-section mj-class="bg">
diff --git a/mail/created.mjml b/mail/created.mjml
index ff012ce..e0f5521 100644
--- a/mail/created.mjml
+++ b/mail/created.mjml
@@ -1,5 +1,29 @@
 <mjml>
   <mj-head>
+    <mj-raw>
+      <meta name="color-scheme" content="light dark">
+      <meta name="supported-color-schemes" content="light dark">
+    </mj-raw>
+    <mj-style>
+        :root {
+            Color-scheme: light dark;
+            supported-color-schemes: light dark;
+        }
+        @media (prefers-color-scheme: light) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+        @media (prefers-color-scheme: dark) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+    </mj-style>
     <mj-attributes>
       <mj-class name="bg" background-color="#101010" />
       <mj-class name="bg2" background-color="#242424" />
diff --git a/mail/deleted.mjml b/mail/deleted.mjml
index b4d6784..9720521 100644
--- a/mail/deleted.mjml
+++ b/mail/deleted.mjml
@@ -1,5 +1,29 @@
 <mjml>
   <mj-head>
+    <mj-raw>
+      <meta name="color-scheme" content="light dark">
+      <meta name="supported-color-schemes" content="light dark">
+    </mj-raw>
+    <mj-style>
+        :root {
+            Color-scheme: light dark;
+            supported-color-schemes: light dark;
+        }
+        @media (prefers-color-scheme: light) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+        @media (prefers-color-scheme: dark) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+    </mj-style>
     <mj-attributes>
       <mj-class name="bg" background-color="#101010" />
       <mj-class name="bg2" background-color="#242424" />
@@ -14,7 +38,7 @@
   <mj-body>
     <mj-section mj-class="bg2">
       <mj-column>
-        <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> Jellyfin </mj-text>
+          <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> {{ .jellyfin }} </mj-text>
       </mj-column>
     </mj-section>
     <mj-section mj-class="bg">
diff --git a/mail/email.mjml b/mail/email.mjml
index 0f816ff..37950f6 100644
--- a/mail/email.mjml
+++ b/mail/email.mjml
@@ -1,5 +1,29 @@
 <mjml>
   <mj-head>
+    <mj-raw>
+      <meta name="color-scheme" content="light dark">
+      <meta name="supported-color-schemes" content="light dark">
+    </mj-raw>
+    <mj-style>
+        :root {
+            Color-scheme: light dark;
+            supported-color-schemes: light dark;
+        }
+        @media (prefers-color-scheme: light) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+        @media (prefers-color-scheme: dark) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+    </mj-style>
     <mj-attributes>
       <mj-class name="bg" background-color="#101010" />
       <mj-class name="bg2" background-color="#242424" />
@@ -14,7 +38,7 @@
   <mj-body>
     <mj-section mj-class="bg2">
       <mj-column>
-        <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> Jellyfin </mj-text>
+          <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> {{ .jellyfin }} </mj-text>
       </mj-column>
     </mj-section>
     <mj-section mj-class="bg">
diff --git a/mail/expired.mjml b/mail/expired.mjml
index 928c1ca..2c89955 100644
--- a/mail/expired.mjml
+++ b/mail/expired.mjml
@@ -1,5 +1,29 @@
 <mjml>
   <mj-head>
+    <mj-raw>
+      <meta name="color-scheme" content="light dark">
+      <meta name="supported-color-schemes" content="light dark">
+    </mj-raw>
+    <mj-style>
+        :root {
+            Color-scheme: light dark;
+            supported-color-schemes: light dark;
+        }
+        @media (prefers-color-scheme: light) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+        @media (prefers-color-scheme: dark) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+    </mj-style>
     <mj-attributes>
       <mj-class name="bg" background-color="#101010" />
       <mj-class name="bg2" background-color="#242424" />
diff --git a/mail/invite-email.mjml b/mail/invite-email.mjml
index 6b6f902..7b3a862 100644
--- a/mail/invite-email.mjml
+++ b/mail/invite-email.mjml
@@ -1,5 +1,29 @@
 <mjml>
   <mj-head>
+    <mj-raw>
+      <meta name="color-scheme" content="light dark">
+      <meta name="supported-color-schemes" content="light dark">
+    </mj-raw>
+    <mj-style>
+        :root {
+            Color-scheme: light dark;
+            supported-color-schemes: light dark;
+        }
+        @media (prefers-color-scheme: light) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+        @media (prefers-color-scheme: dark) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+    </mj-style>
     <mj-attributes>
       <mj-class name="bg" background-color="#101010" />
       <mj-class name="bg2" background-color="#242424" />
@@ -14,7 +38,7 @@
   <mj-body>
     <mj-section mj-class="bg2">
       <mj-column>
-        <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> Jellyfin </mj-text>
+          <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> {{ .jellyfin }} </mj-text>
       </mj-column>
     </mj-section>
     <mj-section mj-class="bg">
diff --git a/mail/welcome.mjml b/mail/welcome.mjml
index 0009741..55c973e 100644
--- a/mail/welcome.mjml
+++ b/mail/welcome.mjml
@@ -1,5 +1,29 @@
 <mjml>
   <mj-head>
+    <mj-raw>
+      <meta name="color-scheme" content="light dark">
+      <meta name="supported-color-schemes" content="light dark">
+    </mj-raw>
+    <mj-style>
+        :root {
+            Color-scheme: light dark;
+            supported-color-schemes: light dark;
+        }
+        @media (prefers-color-scheme: light) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+        @media (prefers-color-scheme: dark) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+    </mj-style>
     <mj-attributes>
       <mj-class name="bg" background-color="#101010" />
       <mj-class name="bg2" background-color="#242424" />
@@ -14,7 +38,7 @@
   <mj-body>
     <mj-section mj-class="bg2">
       <mj-column>
-        <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> Jellyfin </mj-text>
+          <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> {{ .jellyfin }} </mj-text>
       </mj-column>
     </mj-section>
     <mj-section mj-class="bg">