diff --git a/src/base/_themable.scss b/src/base/_themable.scss
deleted file mode 100644
index 4493c8b..0000000
--- a/src/base/_themable.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-@import "../themes/classic/theme_bloodlust";
-@import "../themes/classic/theme_hexagon";
-@import "../themes/classic/theme_hotdog";
-@import "../themes/classic/theme_pony";
-@import "../themes/classic/theme_serpent";
-
-/*
-@import "../themes/muted/theme_bloodlust";
-@import "../themes/muted/theme_hexagon";
-@import "../themes/muted/theme_hotdog";
-@import "../themes/muted/theme_pony";
-@import "../themes/muted/theme_serpent";
-
-@import "../themes/popular/theme_bloodlust";
-@import "../themes/popular/theme_hexagon";
-@import "../themes/popular/theme_hotdog";
-@import "../themes/popular/theme_pony";
-@import "../themes/popular/theme_serpent";
-*/
diff --git a/src/themes/_themable_classic.scss b/src/themes/_themable_classic.scss
new file mode 100644
index 0000000..6ee6a4b
--- /dev/null
+++ b/src/themes/_themable_classic.scss
@@ -0,0 +1,5 @@
+@import "../themes/classic/theme_bloodlust";
+@import "../themes/classic/theme_hexagon";
+@import "../themes/classic/theme_hotdog";
+@import "../themes/classic/theme_pony";
+@import "../themes/classic/theme_serpent";
diff --git a/src/themes/_themable_muted.scss b/src/themes/_themable_muted.scss
new file mode 100644
index 0000000..bad858e
--- /dev/null
+++ b/src/themes/_themable_muted.scss
@@ -0,0 +1,5 @@
+@import "../themes/muted/theme_bloodlust";
+@import "../themes/muted/theme_hexagon";
+@import "../themes/muted/theme_hotdog";
+@import "../themes/muted/theme_pony";
+@import "../themes/muted/theme_serpent";
diff --git a/src/themes/_themable_popular.scss b/src/themes/_themable_popular.scss
new file mode 100644
index 0000000..3cca0d7
--- /dev/null
+++ b/src/themes/_themable_popular.scss
@@ -0,0 +1,5 @@
+@import "../themes/popular/theme_bloodlust";
+@import "../themes/popular/theme_hexagon";
+@import "../themes/popular/theme_hotdog";
+@import "../themes/popular/theme_pony";
+@import "../themes/popular/theme_serpent";