diff --git a/app/src/processing/app/tools/ThemeSelector.java b/app/src/processing/app/tools/ThemeSelector.java
index 57b0a0c17..e3b738a28 100644
--- a/app/src/processing/app/tools/ThemeSelector.java
+++ b/app/src/processing/app/tools/ThemeSelector.java
@@ -65,7 +65,7 @@ public class ThemeSelector extends JFrame implements Tool {
     themeContents = new String[COUNT];
     for (int i = 0; i < COUNT; i++) {
       try {
-        File file = Base.getLibFile("themes/" + themeOrder[i] + ".txt");
+        File file = Base.getLibFile("themes/Minerals/" + themeOrder[i] + ".txt");
         themeContents[i] = Util.loadFile(file);
 
       } catch (IOException e) {
@@ -178,7 +178,7 @@ public class ThemeSelector extends JFrame implements Tool {
     Image image;
 
     ColorfulPanel() {
-      image = Toolkit.getLibImage("themes/4x4.png");
+      image = Toolkit.getLibImage("themes/Minerals/4x4.png");
       addMouseListener(new MouseAdapter() {
         @Override
         public void mousePressed(MouseEvent e) {
diff --git a/build/shared/lib/themes/4x4.png b/build/shared/lib/themes/Minerals/4x4.png
similarity index 100%
rename from build/shared/lib/themes/4x4.png
rename to build/shared/lib/themes/Minerals/4x4.png
diff --git a/build/shared/lib/themes/antimony.txt b/build/shared/lib/themes/Minerals/antimony.txt
similarity index 100%
rename from build/shared/lib/themes/antimony.txt
rename to build/shared/lib/themes/Minerals/antimony.txt
diff --git a/build/shared/lib/themes/bauxite.txt b/build/shared/lib/themes/Minerals/bauxite.txt
similarity index 100%
rename from build/shared/lib/themes/bauxite.txt
rename to build/shared/lib/themes/Minerals/bauxite.txt
diff --git a/build/shared/lib/themes/beryl.txt b/build/shared/lib/themes/Minerals/beryl.txt
similarity index 100%
rename from build/shared/lib/themes/beryl.txt
rename to build/shared/lib/themes/Minerals/beryl.txt
diff --git a/build/shared/lib/themes/calcite.txt b/build/shared/lib/themes/Minerals/calcite.txt
similarity index 100%
rename from build/shared/lib/themes/calcite.txt
rename to build/shared/lib/themes/Minerals/calcite.txt
diff --git a/build/shared/lib/themes/feldspar.txt b/build/shared/lib/themes/Minerals/feldspar.txt
similarity index 100%
rename from build/shared/lib/themes/feldspar.txt
rename to build/shared/lib/themes/Minerals/feldspar.txt
diff --git a/build/shared/lib/themes/fluorite.txt b/build/shared/lib/themes/Minerals/fluorite.txt
similarity index 100%
rename from build/shared/lib/themes/fluorite.txt
rename to build/shared/lib/themes/Minerals/fluorite.txt
diff --git a/build/shared/lib/themes/gabbro.txt b/build/shared/lib/themes/Minerals/gabbro.txt
similarity index 100%
rename from build/shared/lib/themes/gabbro.txt
rename to build/shared/lib/themes/Minerals/gabbro.txt
diff --git a/build/shared/lib/themes/galena.txt b/build/shared/lib/themes/Minerals/galena.txt
similarity index 100%
rename from build/shared/lib/themes/galena.txt
rename to build/shared/lib/themes/Minerals/galena.txt
diff --git a/build/shared/lib/themes/garnet.txt b/build/shared/lib/themes/Minerals/garnet.txt
similarity index 100%
rename from build/shared/lib/themes/garnet.txt
rename to build/shared/lib/themes/Minerals/garnet.txt
diff --git a/build/shared/lib/themes/jasper.txt b/build/shared/lib/themes/Minerals/jasper.txt
similarity index 100%
rename from build/shared/lib/themes/jasper.txt
rename to build/shared/lib/themes/Minerals/jasper.txt
diff --git a/build/shared/lib/themes/kyanite.txt b/build/shared/lib/themes/Minerals/kyanite.txt
similarity index 100%
rename from build/shared/lib/themes/kyanite.txt
rename to build/shared/lib/themes/Minerals/kyanite.txt
diff --git a/build/shared/lib/themes/malachite.txt b/build/shared/lib/themes/Minerals/malachite.txt
similarity index 100%
rename from build/shared/lib/themes/malachite.txt
rename to build/shared/lib/themes/Minerals/malachite.txt
diff --git a/build/shared/lib/themes/olivine.txt b/build/shared/lib/themes/Minerals/olivine.txt
similarity index 100%
rename from build/shared/lib/themes/olivine.txt
rename to build/shared/lib/themes/Minerals/olivine.txt
diff --git a/build/shared/lib/themes/Minerals/order.txt b/build/shared/lib/themes/Minerals/order.txt
new file mode 100644
index 000000000..4dfe6d3d3
--- /dev/null
+++ b/build/shared/lib/themes/Minerals/order.txt
@@ -0,0 +1,16 @@
+kyanite
+calcite
+olivine
+beryl
+galena
+jasper
+malachite
+pyrite
+gabbro
+fluorite
+orpiment
+feldspar
+antimony
+serandite
+bauxite
+garnet
diff --git a/build/shared/lib/themes/orpiment.txt b/build/shared/lib/themes/Minerals/orpiment.txt
similarity index 100%
rename from build/shared/lib/themes/orpiment.txt
rename to build/shared/lib/themes/Minerals/orpiment.txt
diff --git a/build/shared/lib/themes/pyrite.txt b/build/shared/lib/themes/Minerals/pyrite.txt
similarity index 100%
rename from build/shared/lib/themes/pyrite.txt
rename to build/shared/lib/themes/Minerals/pyrite.txt
diff --git a/build/shared/lib/themes/serandite.txt b/build/shared/lib/themes/Minerals/serandite.txt
similarity index 100%
rename from build/shared/lib/themes/serandite.txt
rename to build/shared/lib/themes/Minerals/serandite.txt