Theme settings to include pre-4.3 option

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';

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';

app/javascript/styles/chinwag.scss

@@ -0,0 +1,3 @@
+@import 'application';
+
+@import 'tangerineui-chinwag/tangerineui-chinwag.scss';

app/javascript/styles/classic-light.scss

@@ -0,0 +1,3 @@
+@import 'mastodon-light/variables';
+@import 'application';
+@import 'mastodon-light/diff';

app/javascript/styles/classic.scss

@@ -0,0 +1 @@
+@import 'application';

app/javascript/styles/mastodon-light.scss

@@ -1,3 +1,3 @@
 @import 'mastodon-light/variables';
-@import 'mastodon';
+@import 'application';
 @import 'mastodon-light/diff';

app/javascript/styles/mastodon.scss

@@ -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';

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"

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