diff --git a/app/javascript/styles/pop-light.scss b/app/javascript/styles/pop-light.scss
index 1492540c0..faf08176d 100644
--- a/app/javascript/styles/pop-light.scss
+++ b/app/javascript/styles/pop-light.scss
@@ -1,55 +1,3 @@
-// Commonly used web colors
-$black: #3b3633;            // Black
-$white: #fafafa;            // White
-
-$classic-base-color: #49423e;         // Midnight Express
-$classic-primary-color: #c9c7c5;      // Echo Blue
-$classic-secondary-color: #ebe9e8;    // Pattens Blue
-$classic-highlight-color: #48b9c7;    // Summer Sky
-
-// Differences
-$success-green: #3e935b;    // Padua
-
-$base-overlay-background: $white !default;
-$valid-value-color: $success-green !default;
-
-$ui-base-color: $classic-secondary-color !default;         // Midnight Express
-$ui-base-lighter-color: #ababab;
-$ui-primary-color: #9a938e;      // Echo Blue
-$ui-secondary-color: $classic-base-color !default;    // Pattens Blue
-$ui-highlight-color: #48b9c7;    // Summer Sky
-
-$primary-text-color: $black !default;
-$darker-text-color: $classic-base-color !default;
-$dark-text-color: #0c0c0c;
-$action-button-color: #635d58;
-
-$error-red: #a3360a;        // Cerise
-$warning-red: #f9dfb6;      // Sunset Orange
-$gold-star: #faa41a;        // Dark Goldenrod
-
-$inverted-text-color: $black !default;
-$lighter-text-color: $classic-base-color !default;
-$light-text-color: #444b5d;
-
-$base-shadow-color: #3b3633;
-$base-overlay-background: #3b3633;
-$base-border-color: #fafafa;
-$simple-background-color: #fafafa;
-$valid-value-color: #3e935b;
-$error-value-color: #a3360a;
-
-//Newly added colors
-$account-background-color: $white !default;
-
-//Invert darkened and lightened colors
-@function darken($color, $amount) {
-  @return hsl(hue($color), saturation($color), lightness($color) + $amount);
-}
-
-@function lighten($color, $amount) {
-  @return hsl(hue($color), saturation($color), lightness($color) - $amount);
-}
-
+@import 'pop-light/variables';
 @import 'application';
 @import 'mastodon-light/diff';
diff --git a/app/javascript/styles/pop-light/variables.scss b/app/javascript/styles/pop-light/variables.scss
new file mode 100644
index 000000000..fea1087ba
--- /dev/null
+++ b/app/javascript/styles/pop-light/variables.scss
@@ -0,0 +1,53 @@
+// Commonly used web colors
+$black: #3b3633;            // Black
+$white: #fafafa;            // White
+
+$classic-base-color: #49423e;         // Midnight Express
+$classic-primary-color: #c9c7c5;      // Echo Blue
+$classic-secondary-color: #ebe9e8;    // Pattens Blue
+$classic-highlight-color: #48b9c7;    // Summer Sky
+
+// Differences
+$success-green: #3e935b;    // Padua
+
+$base-overlay-background: $white !default;
+$valid-value-color: $success-green !default;
+
+$ui-base-color: $classic-secondary-color !default;         // Midnight Express
+$ui-base-lighter-color: #ababab;
+$ui-primary-color: #9a938e;      // Echo Blue
+$ui-secondary-color: $classic-base-color !default;    // Pattens Blue
+$ui-highlight-color: #48b9c7;    // Summer Sky
+
+$primary-text-color: $black !default;
+$darker-text-color: $classic-base-color !default;
+$dark-text-color: #0c0c0c;
+$action-button-color: #635d58;
+
+$error-red: #a3360a;        // Cerise
+$warning-red: #f9dfb6;      // Sunset Orange
+$gold-star: #faa41a;        // Dark Goldenrod
+
+$inverted-text-color: $black !default;
+$lighter-text-color: $classic-base-color !default;
+$light-text-color: #444b5d;
+
+$base-shadow-color: #3b3633;
+$base-overlay-background: #3b3633;
+$base-border-color: #fafafa;
+$simple-background-color: #fafafa;
+$valid-value-color: #3e935b;
+$error-value-color: #a3360a;
+
+//Newly added colors
+$account-background-color: $white !default;
+
+//Invert darkened and lightened colors
+@function darken($color, $amount) {
+  @return hsl(hue($color), saturation($color), lightness($color) + $amount);
+}
+
+@function lighten($color, $amount) {
+  @return hsl(hue($color), saturation($color), lightness($color) - $amount);
+}
+
diff --git a/app/javascript/styles/pop.scss b/app/javascript/styles/pop.scss
index 86e6c5294..ed95dfb73 100644
--- a/app/javascript/styles/pop.scss
+++ b/app/javascript/styles/pop.scss
@@ -1,28 +1,2 @@
-// Commonly used web colors
-$black: #3b3633;            // Black
-$white: #fafafa;            // White
-$success-green: #3e935b;    // Padua
-$error-red: #a3360a;        // Cerise
-$warning-red: #f9dfb6;      // Sunset Orange
-$gold-star: #faa41a;        // Dark Goldenrod
-
-$base-shadow-color: #3b3633;
-$base-overlay-background: #3b3633;
-$base-border-color: #fafafa;
-$simple-background-color: #fafafa;
-$primary-text-color: #fafafa;
-$valid-value-color: #3e935b;
-$error-value-color: #a3360a;
-
-// Values from the classic Mastodon UI
-$classic-base-color: #49423e;         // Midnight Express
-$classic-primary-color: #c9c7c5;      // Echo Blue
-$classic-secondary-color: #ebe9e8;    // Pattens Blue
-$classic-highlight-color: #48b9c7;    // Summer Sky
-
-$ui-base-color: #49423e;         // Midnight Express
-$ui-primary-color: #c9c7c5;      // Echo Blue
-$ui-secondary-color: #ebe9e8;    // Pattens Blue
-$ui-highlight-color: #48b9c7;    // Summer Sky
-
+@import 'pop/variables';
 @import 'application';
diff --git a/app/javascript/styles/pop/variables.scss b/app/javascript/styles/pop/variables.scss
new file mode 100644
index 000000000..3c3bb8d9e
--- /dev/null
+++ b/app/javascript/styles/pop/variables.scss
@@ -0,0 +1,27 @@
+// Commonly used web colors
+$black: #3b3633;            // Black
+$white: #fafafa;            // White
+$success-green: #3e935b;    // Padua
+$error-red: #a3360a;        // Cerise
+$warning-red: #f9dfb6;      // Sunset Orange
+$gold-star: #faa41a;        // Dark Goldenrod
+
+$base-shadow-color: #3b3633;
+$base-overlay-background: #3b3633;
+$base-border-color: #fafafa;
+$simple-background-color: #fafafa;
+$primary-text-color: #fafafa;
+$valid-value-color: #3e935b;
+$error-value-color: #a3360a;
+
+// Values from the classic Mastodon UI
+$classic-base-color: #49423e;         // Midnight Express
+$classic-primary-color: #c9c7c5;      // Echo Blue
+$classic-secondary-color: #ebe9e8;    // Pattens Blue
+$classic-highlight-color: #48b9c7;    // Summer Sky
+
+$ui-base-color: #49423e;         // Midnight Express
+$ui-primary-color: #c9c7c5;      // Echo Blue
+$ui-secondary-color: #ebe9e8;    // Pattens Blue
+$ui-highlight-color: #48b9c7;    // Summer Sky
+
diff --git a/app/javascript/styles/werefox.scss b/app/javascript/styles/werefox.scss
index 9aeca694d..6ba2f53dc 100644
--- a/app/javascript/styles/werefox.scss
+++ b/app/javascript/styles/werefox.scss
@@ -1,28 +1,2 @@
-// Commonly used web colors
-$black: #3b3633;            // Black
-$white: #fafafa;            // White
-$success-green: #3e935b;    // Padua
-$error-red: #a3360a;        // Cerise
-$warning-red: #f9dfb6;      // Sunset Orange
-$gold-star: #faa41a;        // Dark Goldenrod
-
-$base-shadow-color: #999;
-$base-overlay-background: #3b3633;
-$base-border-color: #fafafa;
-$simple-background-color: #fafafa;
-$primary-text-color: #fafafa;
-$valid-value-color: #3e935b;
-$error-value-color: #a3360a;
-
-// Values from the classic Mastodon UI
-$classic-base-color: #2a2a2a;         // WS Black
-$classic-primary-color: #aaaaaa;      // WS Light Gray
-$classic-secondary-color: #9e9e9e;    // WS Gray
-$classic-highlight-color: #1c70ce;    // WS Blue
-
-$ui-base-color: #2a2a2a;         // WS Black
-$ui-primary-color: #aaaaaa;      // WS Light Gray
-$ui-secondary-color: #9e9e9e;    // WS Gray
-$ui-highlight-color: #1c70ce;    // WS Blue
-
+@import 'werefox/variables';
 @import 'application';
diff --git a/app/javascript/styles/werefox/variables.scss b/app/javascript/styles/werefox/variables.scss
new file mode 100644
index 000000000..6b6851179
--- /dev/null
+++ b/app/javascript/styles/werefox/variables.scss
@@ -0,0 +1,27 @@
+// Commonly used web colors
+$black: #3b3633;            // Black
+$white: #fafafa;            // White
+$success-green: #3e935b;    // Padua
+$error-red: #a3360a;        // Cerise
+$warning-red: #f9dfb6;      // Sunset Orange
+$gold-star: #faa41a;        // Dark Goldenrod
+
+$base-shadow-color: #999;
+$base-overlay-background: #3b3633;
+$base-border-color: #fafafa;
+$simple-background-color: #fafafa;
+$primary-text-color: #fafafa;
+$valid-value-color: #3e935b;
+$error-value-color: #a3360a;
+
+// Values from the classic Mastodon UI
+$classic-base-color: #2a2a2a;         // WS Black
+$classic-primary-color: #aaaaaa;      // WS Light Gray
+$classic-secondary-color: #9e9e9e;    // WS Gray
+$classic-highlight-color: #1c70ce;    // WS Blue
+
+$ui-base-color: #2a2a2a;         // WS Black
+$ui-primary-color: #aaaaaa;      // WS Light Gray
+$ui-secondary-color: #9e9e9e;    // WS Gray
+$ui-highlight-color: #1c70ce;    // WS Blue
+
diff --git a/config/locales/en-DG.yml b/config/locales/en-DG.yml
index b26254fcc..21845f077 100644
--- a/config/locales/en-DG.yml
+++ b/config/locales/en-DG.yml
@@ -1737,7 +1737,7 @@ en-DG:
     pop-wider: Pop (wider)
     pop-light: Pop (light)
     pop-light-wider: Pop (light, wider)
-    mastodon: Mastodon
+    default: Mastodon
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
     mastodon-light-wider: Mastodon (light, wider)
diff --git a/config/locales/en-LN.yml b/config/locales/en-LN.yml
index ef6046b9f..1cfa41695 100644
--- a/config/locales/en-LN.yml
+++ b/config/locales/en-LN.yml
@@ -1737,7 +1737,7 @@ en-LN:
     pop-wider: Pop (wider)
     pop-light: Pop (light)
     pop-light-wider: Pop (light, wider)
-    mastodon: Mastodon
+    default: Mastodon
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
     mastodon-light-wider: Mastodon (light, wider)
diff --git a/config/locales/en-SQ.yml b/config/locales/en-SQ.yml
index 4aa0fb8ea..e89723e20 100644
--- a/config/locales/en-SQ.yml
+++ b/config/locales/en-SQ.yml
@@ -1737,7 +1737,7 @@ en-SQ:
     pop-wider: Inflate (wider)
     pop-light: Inflate (light)
     pop-light-wider: Inflate (light, wider)
-    mastodon: Mastodon
+    default: Mastodon
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
     mastodon-light-wider: Mastodon (light, wider)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 71b8f27aa..a3ed350f8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1731,9 +1731,18 @@ en:
   tags:
     does_not_match_previous_name: does not match the previous name
   themes:
-    contrast: Mastodon (High contrast)
-    default: Mastodon (Dark)
-    mastodon-light: Mastodon (Light)
+    contrast: High contrast
+    contrast-wider: High contrast (wider)
+    pop: Pop
+    pop-wider: Pop (wider)
+    pop-light: Pop (light)
+    pop-light-wider: Pop (light, wider)
+    default: Mastodon
+    mastodon-wider: Mastodon (wider)
+    mastodon-light: Mastodon (light)
+    mastodon-light-wider: Mastodon (light, wider)
+    werefox: Werefox Software Theme
+    werefox-wider: Werefox Software Theme but W I D E
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/themes.yml b/config/themes.yml
index db22e0bbd..9a3ff5b65 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -1,11 +1,10 @@
-default: styles/application.scss
 contrast: styles/contrast.scss
 contrast-wider: styles/contrast-wider.scss
 pop: styles/pop.scss
 pop-wider: styles/pop-wider.scss
 pop-light: styles/pop-light.scss
 pop-light-wider: styles/pop-light-wider.scss
-mastodon: styles/application.scss
+default: styles/application.scss
 mastodon-wider: styles/mastodon-wider.scss
 mastodon-light: styles/mastodon-light.scss
 mastodon-light-wider: styles/mastodon-light-wider.scss