diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index def6e798f..3d507fa36 100644
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@ -21,6 +21,4 @@
 @import 'mastodon/dashboard';
 @import 'mastodon/rtl';
 @import 'mastodon/accessibility';
-@import 'mastodon/rich_text';
-
-@import 'tangerineui-chinwag/tangerineui-chinwag.scss';
+@import 'mastodon/rich_text';
\ No newline at end of file
diff --git a/app/javascript/styles/chinwag-light.scss b/app/javascript/styles/chinwag-light.scss
new file mode 100644
index 000000000..b2b07e734
--- /dev/null
+++ b/app/javascript/styles/chinwag-light.scss
@@ -0,0 +1,5 @@
+@import 'mastodon-light/variables';
+@import 'application';
+@import 'mastodon-light/diff';
+
+@import 'tangerineui-chinwag/tangerineui-chinwag.scss';
diff --git a/app/javascript/styles/chinwag.scss b/app/javascript/styles/chinwag.scss
new file mode 100644
index 000000000..95ccfb604
--- /dev/null
+++ b/app/javascript/styles/chinwag.scss
@@ -0,0 +1,3 @@
+@import 'application';
+
+@import 'tangerineui-chinwag/tangerineui-chinwag.scss';
diff --git a/app/javascript/styles/classic-light.scss b/app/javascript/styles/classic-light.scss
new file mode 100644
index 000000000..756a12d86
--- /dev/null
+++ b/app/javascript/styles/classic-light.scss
@@ -0,0 +1,3 @@
+@import 'mastodon-light/variables';
+@import 'application';
+@import 'mastodon-light/diff';
diff --git a/app/javascript/styles/classic.scss b/app/javascript/styles/classic.scss
new file mode 100644
index 000000000..97a981243
--- /dev/null
+++ b/app/javascript/styles/classic.scss
@@ -0,0 +1 @@
+@import 'application';
diff --git a/app/javascript/styles/mastodon-light.scss b/app/javascript/styles/mastodon-light.scss
index 1ca3581bd..756a12d86 100644
--- a/app/javascript/styles/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-light.scss
@@ -1,3 +1,3 @@
 @import 'mastodon-light/variables';
-@import 'mastodon';
+@import 'application';
 @import 'mastodon-light/diff';
diff --git a/app/javascript/styles/mastodon.scss b/app/javascript/styles/mastodon.scss
deleted file mode 100644
index 465b74807..000000000
--- a/app/javascript/styles/mastodon.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-@import 'mastodon/mixins';
-@import 'mastodon/variables';
-@import 'fonts/roboto';
-@import 'fonts/roboto-mono';
-
-@import 'mastodon/reset';
-@import 'mastodon/basics';
-@import 'mastodon/branding';
-@import 'mastodon/containers';
-@import 'mastodon/lists';
-@import 'mastodon/widgets';
-@import 'mastodon/forms';
-@import 'mastodon/accounts';
-@import 'mastodon/components';
-@import 'mastodon/polls';
-@import 'mastodon/modal';
-@import 'mastodon/emoji_picker';
-@import 'mastodon/about';
-@import 'mastodon/tables';
-@import 'mastodon/admin';
-@import 'mastodon/dashboard';
-@import 'mastodon/rtl';
-@import 'mastodon/accessibility';
-@import 'mastodon/rich_text';
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6a6ef6ecd..d02eb2e13 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1800,11 +1800,12 @@ en:
   tags:
     does_not_match_previous_name: does not match the previous name
   themes:
-    system: Automatic (use system theme)
-    default: Chinwag
+    system: Chinwag (follow system theme)
+    default: Chinwag (Dark UI)
     contrast: High Contrast
-    mastodon: Mastodon Dark
-    mastodon-light: Mastodon Light
+    mastodon-light: Chinwag (Light UI)
+    classic-light: Chinwag Classic (Light)
+    classic: Chinwag Classic (Dark)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/themes.yml b/config/themes.yml
index f84ad06e5..5870897d3 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -1,4 +1,5 @@
-default: styles/application.scss
+default: styles/chinwag.scss
 contrast: styles/contrast.scss
-mastodon: styles/mastodon.scss
-mastodon-light: styles/mastodon-light.scss
+mastodon-light: styles/chinwag-light.scss
+classic: styles/classic.scss
+classic-light: styles/classic-light.scss