diff --git a/src/mami.css/_main.css b/src/mami.css/_main.css
deleted file mode 100644
index 6e53568..0000000
--- a/src/mami.css/_main.css
+++ /dev/null
@@ -1,89 +0,0 @@
-* {
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-    position: relative;
-    outline-style: none;
-    text-size-adjust: none;
-}
-
-html {
-    /* what the fuck even is CSS anymore at this point */
-    width: 100%;
-    width: 100vw;
-    width: 100dvw;
-    height: 100%;
-    height: 100vh;
-    height: 100dvh;
-}
-
-body {
-    width: 100%;
-    height: 100%;
-    background: var(--theme-colour-main-background, #000);
-    color: var(--theme-colour-main-colour, #fff);
-}
-
-a {
-    color: inherit;
-    text-decoration: none;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-.hidden {
-    display: none !important;
-}
-
-.noscript {
-    width: 100%;
-    height: 100%;
-    background: #000;
-    color: #fff;
-    font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-    display: flex;
-    text-align: center;
-    justify-content: center;
-    align-items: center;
-    background: repeating-linear-gradient(-45deg, #220, #220 20px, #000 20px, #000 40px);
-    box-shadow: inset 0 0 1em #000;
-}
-.noscript-icon {
-    margin: 6px;
-}
-.noscript-content {
-    width: 100%;
-    background-color: rgba(0, 0, 0, .8);
-    padding: 20px;
-    box-shadow: 0 0 1em #000;
-}
-.noscript-header {
-    font-size: 1.4em;
-    line-height: 1.6em;
-}
-.noscript-body {
-    font-size: .9em;
-    margin-top: 4px;
-}
-.noscript-body p {
-    line-height: 1.5em;
-}
-.noscript-body code {
-    font-size: 1.3em;
-}
-
-.sjis {
-    font-family: IPAMonaPGothic, 'IPA モナー Pゴシック', Monapo, Mona, 'MS PGothic', 'ＭＳ Ｐゴシック', monospace;
-    font-size: 16px;
-    line-height: 18px;
-}
-
-.mami-copyright {
-    text-align: center;
-    padding: 6px 0;
-    font-size: .9em;
-    opacity: .8;
-    line-height: 1.5em;
-}
diff --git a/src/mami.css/__animations.css b/src/mami.css/animations.css
similarity index 100%
rename from src/mami.css/__animations.css
rename to src/mami.css/animations.css
diff --git a/src/mami.css/main.css b/src/mami.css/main.css
index 1179e54..9ebc7a3 100644
--- a/src/mami.css/main.css
+++ b/src/mami.css/main.css
@@ -1,5 +1,73 @@
-@include __animations.css;
-@include _main.css;
+@include animations.css;
+
+* {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+    position: relative;
+    outline-style: none;
+    text-size-adjust: none;
+}
+
+html {
+    /* what the fuck even is CSS anymore at this point */
+    width: 100%;
+    width: 100vw;
+    width: 100dvw;
+    height: 100%;
+    height: 100vh;
+    height: 100dvh;
+}
+
+body {
+    width: 100%;
+    height: 100%;
+    background: var(--theme-colour-main-background, #000);
+    color: var(--theme-colour-main-colour, #fff);
+}
+
+a {
+    color: inherit;
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
+.hidden {
+    display: none !important;
+}
+
+.sjis {
+    font-family: IPAMonaPGothic, 'IPA モナー Pゴシック', Monapo, Mona, 'MS PGothic', 'ＭＳ Ｐゴシック', monospace;
+    font-size: 16px;
+    line-height: 18px;
+}
+
+.mami-copyright {
+    text-align: center;
+    padding: 6px 0;
+    font-size: .9em;
+    opacity: .8;
+    line-height: 1.5em;
+}
+
+.main {
+    flex-grow: 2;
+    flex-shrink: 1;
+    display: flex;
+    gap: 4px;
+    flex-direction: column;
+}
+
+@media (max-width: 800px) {
+    .main {
+        margin-right: 44px;
+    }
+}
+
+@include noscript.css;
 
 @include controls/msgbox.css;
 @include controls/views.css;
@@ -12,7 +80,6 @@
 @include eeprom.css;
 @include emote.css;
 @include input.css;
-@include main_cont.css;
 @include markup.css;
 @include message.css;
 @include overlay.css;
@@ -23,8 +90,8 @@
 
 @include colpick.css;
 
-@include zz_ls_archaic.css;
-@include zz_ls_blue.css;
-@include zz_ls_dark.css;
-@include zz_ls_light.css;
-@include zz_ls_purple.css;
+@include themes/archaic.css;
+@include themes/blue.css;
+@include themes/dark.css;
+@include themes/light.css;
+@include themes/purple.css;
diff --git a/src/mami.css/main_cont.css b/src/mami.css/main_cont.css
deleted file mode 100644
index 3144960..0000000
--- a/src/mami.css/main_cont.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.main {
-    flex-grow: 2;
-    flex-shrink: 1;
-    display: flex;
-    gap: 4px;
-    flex-direction: column;
-}
-
-@media (max-width: 800px) {
-    .main {
-        margin-right: 44px;
-    }
-}
diff --git a/src/mami.css/noscript.css b/src/mami.css/noscript.css
new file mode 100644
index 0000000..135765a
--- /dev/null
+++ b/src/mami.css/noscript.css
@@ -0,0 +1,36 @@
+.noscript {
+    width: 100%;
+    height: 100%;
+    background: #000;
+    color: #fff;
+    font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+    display: flex;
+    text-align: center;
+    justify-content: center;
+    align-items: center;
+    background: repeating-linear-gradient(-45deg, #220, #220 20px, #000 20px, #000 40px);
+    box-shadow: inset 0 0 1em #000;
+}
+.noscript-icon {
+    margin: 6px;
+}
+.noscript-content {
+    width: 100%;
+    background-color: rgba(0, 0, 0, .8);
+    padding: 20px;
+    box-shadow: 0 0 1em #000;
+}
+.noscript-header {
+    font-size: 1.4em;
+    line-height: 1.6em;
+}
+.noscript-body {
+    font-size: .9em;
+    margin-top: 4px;
+}
+.noscript-body p {
+    line-height: 1.5em;
+}
+.noscript-body code {
+    font-size: 1.3em;
+}
diff --git a/src/mami.css/zz_ls_archaic.css b/src/mami.css/themes/archaic.css
similarity index 100%
rename from src/mami.css/zz_ls_archaic.css
rename to src/mami.css/themes/archaic.css
diff --git a/src/mami.css/zz_ls_blue.css b/src/mami.css/themes/blue.css
similarity index 100%
rename from src/mami.css/zz_ls_blue.css
rename to src/mami.css/themes/blue.css
diff --git a/src/mami.css/zz_ls_dark.css b/src/mami.css/themes/dark.css
similarity index 100%
rename from src/mami.css/zz_ls_dark.css
rename to src/mami.css/themes/dark.css
diff --git a/src/mami.css/zz_ls_light.css b/src/mami.css/themes/light.css
similarity index 100%
rename from src/mami.css/zz_ls_light.css
rename to src/mami.css/themes/light.css
diff --git a/src/mami.css/zz_ls_purple.css b/src/mami.css/themes/purple.css
similarity index 100%
rename from src/mami.css/zz_ls_purple.css
rename to src/mami.css/themes/purple.css