diff --git a/sc2/content/addons/3domusic/3domusic.rmp b/sc2/content/addons/3domusic/3domusic.rmp
index 6323dcf24..15f4e77a8 100644
--- a/sc2/content/addons/3domusic/3domusic.rmp
+++ b/sc2/content/addons/3domusic/3domusic.rmp
@@ -1,6 +1,6 @@
-music.arispace = MUSICRES:addons/3domusic/arispace.ogg
+music.quasispace = MUSICRES:addons/3domusic/quasispace.ogg
 music.battle = MUSICRES:addons/3domusic/battle.ogg
-music.hyper = MUSICRES:addons/3domusic/hyper.ogg
+music.hyperspace = MUSICRES:addons/3domusic/hyper.ogg
 music.orbit1 = MUSICRES:addons/3domusic/orbit1.ogg
 music.orbit2 = MUSICRES:addons/3domusic/orbit2.ogg
 music.orbit3 = MUSICRES:addons/3domusic/orbit3.ogg
diff --git a/sc2/content/addons/3domusic/arispace.ogg b/sc2/content/addons/3domusic/quasispace.ogg
similarity index 100%
rename from sc2/content/addons/3domusic/arispace.ogg
rename to sc2/content/addons/3domusic/quasispace.ogg
diff --git a/sc2/content/base/battle/astbig.0.png b/sc2/content/base/battle/asteroid-big.0.png
similarity index 100%
rename from sc2/content/base/battle/astbig.0.png
rename to sc2/content/base/battle/asteroid-big.0.png
diff --git a/sc2/content/base/battle/astbig.1.png b/sc2/content/base/battle/asteroid-big.1.png
similarity index 100%
rename from sc2/content/base/battle/astbig.1.png
rename to sc2/content/base/battle/asteroid-big.1.png
diff --git a/sc2/content/base/battle/astbig.10.png b/sc2/content/base/battle/asteroid-big.10.png
similarity index 100%
rename from sc2/content/base/battle/astbig.10.png
rename to sc2/content/base/battle/asteroid-big.10.png
diff --git a/sc2/content/base/battle/astbig.11.png b/sc2/content/base/battle/asteroid-big.11.png
similarity index 100%
rename from sc2/content/base/battle/astbig.11.png
rename to sc2/content/base/battle/asteroid-big.11.png
diff --git a/sc2/content/base/battle/astbig.12.png b/sc2/content/base/battle/asteroid-big.12.png
similarity index 100%
rename from sc2/content/base/battle/astbig.12.png
rename to sc2/content/base/battle/asteroid-big.12.png
diff --git a/sc2/content/base/battle/astbig.13.png b/sc2/content/base/battle/asteroid-big.13.png
similarity index 100%
rename from sc2/content/base/battle/astbig.13.png
rename to sc2/content/base/battle/asteroid-big.13.png
diff --git a/sc2/content/base/battle/astbig.14.png b/sc2/content/base/battle/asteroid-big.14.png
similarity index 100%
rename from sc2/content/base/battle/astbig.14.png
rename to sc2/content/base/battle/asteroid-big.14.png
diff --git a/sc2/content/base/battle/astbig.15.png b/sc2/content/base/battle/asteroid-big.15.png
similarity index 100%
rename from sc2/content/base/battle/astbig.15.png
rename to sc2/content/base/battle/asteroid-big.15.png
diff --git a/sc2/content/base/battle/astbig.16.png b/sc2/content/base/battle/asteroid-big.16.png
similarity index 100%
rename from sc2/content/base/battle/astbig.16.png
rename to sc2/content/base/battle/asteroid-big.16.png
diff --git a/sc2/content/base/battle/astbig.17.png b/sc2/content/base/battle/asteroid-big.17.png
similarity index 100%
rename from sc2/content/base/battle/astbig.17.png
rename to sc2/content/base/battle/asteroid-big.17.png
diff --git a/sc2/content/base/battle/astbig.18.png b/sc2/content/base/battle/asteroid-big.18.png
similarity index 100%
rename from sc2/content/base/battle/astbig.18.png
rename to sc2/content/base/battle/asteroid-big.18.png
diff --git a/sc2/content/base/battle/astbig.19.png b/sc2/content/base/battle/asteroid-big.19.png
similarity index 100%
rename from sc2/content/base/battle/astbig.19.png
rename to sc2/content/base/battle/asteroid-big.19.png
diff --git a/sc2/content/base/battle/astbig.2.png b/sc2/content/base/battle/asteroid-big.2.png
similarity index 100%
rename from sc2/content/base/battle/astbig.2.png
rename to sc2/content/base/battle/asteroid-big.2.png
diff --git a/sc2/content/base/battle/astbig.20.png b/sc2/content/base/battle/asteroid-big.20.png
similarity index 100%
rename from sc2/content/base/battle/astbig.20.png
rename to sc2/content/base/battle/asteroid-big.20.png
diff --git a/sc2/content/base/battle/astbig.3.png b/sc2/content/base/battle/asteroid-big.3.png
similarity index 100%
rename from sc2/content/base/battle/astbig.3.png
rename to sc2/content/base/battle/asteroid-big.3.png
diff --git a/sc2/content/base/battle/astbig.4.png b/sc2/content/base/battle/asteroid-big.4.png
similarity index 100%
rename from sc2/content/base/battle/astbig.4.png
rename to sc2/content/base/battle/asteroid-big.4.png
diff --git a/sc2/content/base/battle/astbig.5.png b/sc2/content/base/battle/asteroid-big.5.png
similarity index 100%
rename from sc2/content/base/battle/astbig.5.png
rename to sc2/content/base/battle/asteroid-big.5.png
diff --git a/sc2/content/base/battle/astbig.6.png b/sc2/content/base/battle/asteroid-big.6.png
similarity index 100%
rename from sc2/content/base/battle/astbig.6.png
rename to sc2/content/base/battle/asteroid-big.6.png
diff --git a/sc2/content/base/battle/astbig.7.png b/sc2/content/base/battle/asteroid-big.7.png
similarity index 100%
rename from sc2/content/base/battle/astbig.7.png
rename to sc2/content/base/battle/asteroid-big.7.png
diff --git a/sc2/content/base/battle/astbig.8.png b/sc2/content/base/battle/asteroid-big.8.png
similarity index 100%
rename from sc2/content/base/battle/astbig.8.png
rename to sc2/content/base/battle/asteroid-big.8.png
diff --git a/sc2/content/base/battle/astbig.9.png b/sc2/content/base/battle/asteroid-big.9.png
similarity index 100%
rename from sc2/content/base/battle/astbig.9.png
rename to sc2/content/base/battle/asteroid-big.9.png
diff --git a/sc2/content/base/battle/asteroid-big.ani b/sc2/content/base/battle/asteroid-big.ani
new file mode 100644
index 000000000..66ea03a1d
--- /dev/null
+++ b/sc2/content/base/battle/asteroid-big.ani
@@ -0,0 +1,21 @@
+asteroid-big.0.png 0 1 11 11
+asteroid-big.1.png 0 1 11 11
+asteroid-big.2.png 0 1 11 11
+asteroid-big.3.png 0 1 11 11
+asteroid-big.4.png 0 1 11 11
+asteroid-big.5.png 0 1 11 11
+asteroid-big.6.png 0 1 11 11
+asteroid-big.7.png 0 1 11 11
+asteroid-big.8.png 0 1 11 11
+asteroid-big.9.png 0 1 11 11
+asteroid-big.10.png 0 1 11 11
+asteroid-big.11.png 0 1 11 11
+asteroid-big.12.png 0 1 11 11
+asteroid-big.13.png 0 1 11 11
+asteroid-big.14.png 0 1 11 11
+asteroid-big.15.png 0 1 11 11
+asteroid-big.16.png 0 1 8 9
+asteroid-big.17.png 0 1 10 12
+asteroid-big.18.png 0 1 11 13
+asteroid-big.19.png 0 1 14 14
+asteroid-big.20.png 0 1 15 15
diff --git a/sc2/content/base/battle/astmed.0.png b/sc2/content/base/battle/asteroid-med.0.png
similarity index 100%
rename from sc2/content/base/battle/astmed.0.png
rename to sc2/content/base/battle/asteroid-med.0.png
diff --git a/sc2/content/base/battle/astmed.1.png b/sc2/content/base/battle/asteroid-med.1.png
similarity index 100%
rename from sc2/content/base/battle/astmed.1.png
rename to sc2/content/base/battle/asteroid-med.1.png
diff --git a/sc2/content/base/battle/astmed.10.png b/sc2/content/base/battle/asteroid-med.10.png
similarity index 100%
rename from sc2/content/base/battle/astmed.10.png
rename to sc2/content/base/battle/asteroid-med.10.png
diff --git a/sc2/content/base/battle/astmed.11.png b/sc2/content/base/battle/asteroid-med.11.png
similarity index 100%
rename from sc2/content/base/battle/astmed.11.png
rename to sc2/content/base/battle/asteroid-med.11.png
diff --git a/sc2/content/base/battle/astmed.12.png b/sc2/content/base/battle/asteroid-med.12.png
similarity index 100%
rename from sc2/content/base/battle/astmed.12.png
rename to sc2/content/base/battle/asteroid-med.12.png
diff --git a/sc2/content/base/battle/astmed.13.png b/sc2/content/base/battle/asteroid-med.13.png
similarity index 100%
rename from sc2/content/base/battle/astmed.13.png
rename to sc2/content/base/battle/asteroid-med.13.png
diff --git a/sc2/content/base/battle/astmed.14.png b/sc2/content/base/battle/asteroid-med.14.png
similarity index 100%
rename from sc2/content/base/battle/astmed.14.png
rename to sc2/content/base/battle/asteroid-med.14.png
diff --git a/sc2/content/base/battle/astmed.15.png b/sc2/content/base/battle/asteroid-med.15.png
similarity index 100%
rename from sc2/content/base/battle/astmed.15.png
rename to sc2/content/base/battle/asteroid-med.15.png
diff --git a/sc2/content/base/battle/astmed.16.png b/sc2/content/base/battle/asteroid-med.16.png
similarity index 100%
rename from sc2/content/base/battle/astmed.16.png
rename to sc2/content/base/battle/asteroid-med.16.png
diff --git a/sc2/content/base/battle/astmed.17.png b/sc2/content/base/battle/asteroid-med.17.png
similarity index 100%
rename from sc2/content/base/battle/astmed.17.png
rename to sc2/content/base/battle/asteroid-med.17.png
diff --git a/sc2/content/base/battle/astmed.18.png b/sc2/content/base/battle/asteroid-med.18.png
similarity index 100%
rename from sc2/content/base/battle/astmed.18.png
rename to sc2/content/base/battle/asteroid-med.18.png
diff --git a/sc2/content/base/battle/astmed.19.png b/sc2/content/base/battle/asteroid-med.19.png
similarity index 100%
rename from sc2/content/base/battle/astmed.19.png
rename to sc2/content/base/battle/asteroid-med.19.png
diff --git a/sc2/content/base/battle/astmed.2.png b/sc2/content/base/battle/asteroid-med.2.png
similarity index 100%
rename from sc2/content/base/battle/astmed.2.png
rename to sc2/content/base/battle/asteroid-med.2.png
diff --git a/sc2/content/base/battle/astmed.20.png b/sc2/content/base/battle/asteroid-med.20.png
similarity index 100%
rename from sc2/content/base/battle/astmed.20.png
rename to sc2/content/base/battle/asteroid-med.20.png
diff --git a/sc2/content/base/battle/astmed.3.png b/sc2/content/base/battle/asteroid-med.3.png
similarity index 100%
rename from sc2/content/base/battle/astmed.3.png
rename to sc2/content/base/battle/asteroid-med.3.png
diff --git a/sc2/content/base/battle/astmed.4.png b/sc2/content/base/battle/asteroid-med.4.png
similarity index 100%
rename from sc2/content/base/battle/astmed.4.png
rename to sc2/content/base/battle/asteroid-med.4.png
diff --git a/sc2/content/base/battle/astmed.5.png b/sc2/content/base/battle/asteroid-med.5.png
similarity index 100%
rename from sc2/content/base/battle/astmed.5.png
rename to sc2/content/base/battle/asteroid-med.5.png
diff --git a/sc2/content/base/battle/astmed.6.png b/sc2/content/base/battle/asteroid-med.6.png
similarity index 100%
rename from sc2/content/base/battle/astmed.6.png
rename to sc2/content/base/battle/asteroid-med.6.png
diff --git a/sc2/content/base/battle/astmed.7.png b/sc2/content/base/battle/asteroid-med.7.png
similarity index 100%
rename from sc2/content/base/battle/astmed.7.png
rename to sc2/content/base/battle/asteroid-med.7.png
diff --git a/sc2/content/base/battle/astmed.8.png b/sc2/content/base/battle/asteroid-med.8.png
similarity index 100%
rename from sc2/content/base/battle/astmed.8.png
rename to sc2/content/base/battle/asteroid-med.8.png
diff --git a/sc2/content/base/battle/astmed.9.png b/sc2/content/base/battle/asteroid-med.9.png
similarity index 100%
rename from sc2/content/base/battle/astmed.9.png
rename to sc2/content/base/battle/asteroid-med.9.png
diff --git a/sc2/content/base/battle/asteroid-med.ani b/sc2/content/base/battle/asteroid-med.ani
new file mode 100644
index 000000000..99164acdd
--- /dev/null
+++ b/sc2/content/base/battle/asteroid-med.ani
@@ -0,0 +1,21 @@
+asteroid-med.0.png 0 1 5 5
+asteroid-med.1.png 0 1 5 5
+asteroid-med.2.png 0 1 5 5
+asteroid-med.3.png 0 1 5 5
+asteroid-med.4.png 0 1 5 5
+asteroid-med.5.png 0 1 5 5
+asteroid-med.6.png 0 1 5 5
+asteroid-med.7.png 0 1 5 5
+asteroid-med.8.png 0 1 5 5
+asteroid-med.9.png 0 1 5 5
+asteroid-med.10.png 0 1 5 5
+asteroid-med.11.png 0 1 5 5
+asteroid-med.12.png 0 1 5 5
+asteroid-med.13.png 0 1 5 5
+asteroid-med.14.png 0 1 5 5
+asteroid-med.15.png 0 1 5 5
+asteroid-med.16.png 0 1 6 6
+asteroid-med.17.png 0 1 6 7
+asteroid-med.18.png 0 1 7 8
+asteroid-med.19.png 0 1 8 8
+asteroid-med.20.png 0 1 8 8
diff --git a/sc2/content/base/battle/astsml.0.png b/sc2/content/base/battle/asteroid-sml.0.png
similarity index 100%
rename from sc2/content/base/battle/astsml.0.png
rename to sc2/content/base/battle/asteroid-sml.0.png
diff --git a/sc2/content/base/battle/astsml.1.png b/sc2/content/base/battle/asteroid-sml.1.png
similarity index 100%
rename from sc2/content/base/battle/astsml.1.png
rename to sc2/content/base/battle/asteroid-sml.1.png
diff --git a/sc2/content/base/battle/astsml.10.png b/sc2/content/base/battle/asteroid-sml.10.png
similarity index 100%
rename from sc2/content/base/battle/astsml.10.png
rename to sc2/content/base/battle/asteroid-sml.10.png
diff --git a/sc2/content/base/battle/astsml.11.png b/sc2/content/base/battle/asteroid-sml.11.png
similarity index 100%
rename from sc2/content/base/battle/astsml.11.png
rename to sc2/content/base/battle/asteroid-sml.11.png
diff --git a/sc2/content/base/battle/astsml.12.png b/sc2/content/base/battle/asteroid-sml.12.png
similarity index 100%
rename from sc2/content/base/battle/astsml.12.png
rename to sc2/content/base/battle/asteroid-sml.12.png
diff --git a/sc2/content/base/battle/astsml.13.png b/sc2/content/base/battle/asteroid-sml.13.png
similarity index 100%
rename from sc2/content/base/battle/astsml.13.png
rename to sc2/content/base/battle/asteroid-sml.13.png
diff --git a/sc2/content/base/battle/astsml.14.png b/sc2/content/base/battle/asteroid-sml.14.png
similarity index 100%
rename from sc2/content/base/battle/astsml.14.png
rename to sc2/content/base/battle/asteroid-sml.14.png
diff --git a/sc2/content/base/battle/astsml.15.png b/sc2/content/base/battle/asteroid-sml.15.png
similarity index 100%
rename from sc2/content/base/battle/astsml.15.png
rename to sc2/content/base/battle/asteroid-sml.15.png
diff --git a/sc2/content/base/battle/astsml.16.png b/sc2/content/base/battle/asteroid-sml.16.png
similarity index 100%
rename from sc2/content/base/battle/astsml.16.png
rename to sc2/content/base/battle/asteroid-sml.16.png
diff --git a/sc2/content/base/battle/astsml.17.png b/sc2/content/base/battle/asteroid-sml.17.png
similarity index 100%
rename from sc2/content/base/battle/astsml.17.png
rename to sc2/content/base/battle/asteroid-sml.17.png
diff --git a/sc2/content/base/battle/astsml.18.png b/sc2/content/base/battle/asteroid-sml.18.png
similarity index 100%
rename from sc2/content/base/battle/astsml.18.png
rename to sc2/content/base/battle/asteroid-sml.18.png
diff --git a/sc2/content/base/battle/astsml.19.png b/sc2/content/base/battle/asteroid-sml.19.png
similarity index 100%
rename from sc2/content/base/battle/astsml.19.png
rename to sc2/content/base/battle/asteroid-sml.19.png
diff --git a/sc2/content/base/battle/astsml.2.png b/sc2/content/base/battle/asteroid-sml.2.png
similarity index 100%
rename from sc2/content/base/battle/astsml.2.png
rename to sc2/content/base/battle/asteroid-sml.2.png
diff --git a/sc2/content/base/battle/astsml.20.png b/sc2/content/base/battle/asteroid-sml.20.png
similarity index 100%
rename from sc2/content/base/battle/astsml.20.png
rename to sc2/content/base/battle/asteroid-sml.20.png
diff --git a/sc2/content/base/battle/astsml.3.png b/sc2/content/base/battle/asteroid-sml.3.png
similarity index 100%
rename from sc2/content/base/battle/astsml.3.png
rename to sc2/content/base/battle/asteroid-sml.3.png
diff --git a/sc2/content/base/battle/astsml.4.png b/sc2/content/base/battle/asteroid-sml.4.png
similarity index 100%
rename from sc2/content/base/battle/astsml.4.png
rename to sc2/content/base/battle/asteroid-sml.4.png
diff --git a/sc2/content/base/battle/astsml.5.png b/sc2/content/base/battle/asteroid-sml.5.png
similarity index 100%
rename from sc2/content/base/battle/astsml.5.png
rename to sc2/content/base/battle/asteroid-sml.5.png
diff --git a/sc2/content/base/battle/astsml.6.png b/sc2/content/base/battle/asteroid-sml.6.png
similarity index 100%
rename from sc2/content/base/battle/astsml.6.png
rename to sc2/content/base/battle/asteroid-sml.6.png
diff --git a/sc2/content/base/battle/astsml.7.png b/sc2/content/base/battle/asteroid-sml.7.png
similarity index 100%
rename from sc2/content/base/battle/astsml.7.png
rename to sc2/content/base/battle/asteroid-sml.7.png
diff --git a/sc2/content/base/battle/astsml.8.png b/sc2/content/base/battle/asteroid-sml.8.png
similarity index 100%
rename from sc2/content/base/battle/astsml.8.png
rename to sc2/content/base/battle/asteroid-sml.8.png
diff --git a/sc2/content/base/battle/astsml.9.png b/sc2/content/base/battle/asteroid-sml.9.png
similarity index 100%
rename from sc2/content/base/battle/astsml.9.png
rename to sc2/content/base/battle/asteroid-sml.9.png
diff --git a/sc2/content/base/battle/asteroid-sml.ani b/sc2/content/base/battle/asteroid-sml.ani
new file mode 100644
index 000000000..12278b6be
--- /dev/null
+++ b/sc2/content/base/battle/asteroid-sml.ani
@@ -0,0 +1,21 @@
+asteroid-sml.0.png 0 1 3 3
+asteroid-sml.1.png 0 1 3 3
+asteroid-sml.2.png 0 1 3 3
+asteroid-sml.3.png 0 1 3 3
+asteroid-sml.4.png 0 1 3 3
+asteroid-sml.5.png 0 1 3 3
+asteroid-sml.6.png 0 1 3 3
+asteroid-sml.7.png 0 1 3 3
+asteroid-sml.8.png 0 1 3 3
+asteroid-sml.9.png 0 1 3 3
+asteroid-sml.10.png 0 1 3 3
+asteroid-sml.11.png 0 1 3 3
+asteroid-sml.12.png 0 1 3 3
+asteroid-sml.13.png 0 1 3 3
+asteroid-sml.14.png 0 1 3 3
+asteroid-sml.15.png 0 1 3 3
+asteroid-sml.16.png 0 1 2 2
+asteroid-sml.17.png 0 1 3 3
+asteroid-sml.18.png 0 1 4 4
+asteroid-sml.19.png 0 1 4 4
+asteroid-sml.20.png 0 1 0 0
diff --git a/sc2/content/base/battle/asteroid.big b/sc2/content/base/battle/asteroid.big
deleted file mode 100644
index 72fdf227d..000000000
--- a/sc2/content/base/battle/asteroid.big
+++ /dev/null
@@ -1,21 +0,0 @@
-astbig.0.png 0 1 11 11
-astbig.1.png 0 1 11 11
-astbig.2.png 0 1 11 11
-astbig.3.png 0 1 11 11
-astbig.4.png 0 1 11 11
-astbig.5.png 0 1 11 11
-astbig.6.png 0 1 11 11
-astbig.7.png 0 1 11 11
-astbig.8.png 0 1 11 11
-astbig.9.png 0 1 11 11
-astbig.10.png 0 1 11 11
-astbig.11.png 0 1 11 11
-astbig.12.png 0 1 11 11
-astbig.13.png 0 1 11 11
-astbig.14.png 0 1 11 11
-astbig.15.png 0 1 11 11
-astbig.16.png 0 1 8 9
-astbig.17.png 0 1 10 12
-astbig.18.png 0 1 11 13
-astbig.19.png 0 1 14 14
-astbig.20.png 0 1 15 15
diff --git a/sc2/content/base/battle/asteroid.med b/sc2/content/base/battle/asteroid.med
deleted file mode 100644
index a9fbc17ff..000000000
--- a/sc2/content/base/battle/asteroid.med
+++ /dev/null
@@ -1,21 +0,0 @@
-astmed.0.png 0 1 5 5
-astmed.1.png 0 1 5 5
-astmed.2.png 0 1 5 5
-astmed.3.png 0 1 5 5
-astmed.4.png 0 1 5 5
-astmed.5.png 0 1 5 5
-astmed.6.png 0 1 5 5
-astmed.7.png 0 1 5 5
-astmed.8.png 0 1 5 5
-astmed.9.png 0 1 5 5
-astmed.10.png 0 1 5 5
-astmed.11.png 0 1 5 5
-astmed.12.png 0 1 5 5
-astmed.13.png 0 1 5 5
-astmed.14.png 0 1 5 5
-astmed.15.png 0 1 5 5
-astmed.16.png 0 1 6 6
-astmed.17.png 0 1 6 7
-astmed.18.png 0 1 7 8
-astmed.19.png 0 1 8 8
-astmed.20.png 0 1 8 8
diff --git a/sc2/content/base/battle/asteroid.sml b/sc2/content/base/battle/asteroid.sml
deleted file mode 100644
index 810fbc9b6..000000000
--- a/sc2/content/base/battle/asteroid.sml
+++ /dev/null
@@ -1,21 +0,0 @@
-astsml.0.png 0 1 3 3
-astsml.1.png 0 1 3 3
-astsml.2.png 0 1 3 3
-astsml.3.png 0 1 3 3
-astsml.4.png 0 1 3 3
-astsml.5.png 0 1 3 3
-astsml.6.png 0 1 3 3
-astsml.7.png 0 1 3 3
-astsml.8.png 0 1 3 3
-astsml.9.png 0 1 3 3
-astsml.10.png 0 1 3 3
-astsml.11.png 0 1 3 3
-astsml.12.png 0 1 3 3
-astsml.13.png 0 1 3 3
-astsml.14.png 0 1 3 3
-astsml.15.png 0 1 3 3
-astsml.16.png 0 1 2 2
-astsml.17.png 0 1 3 3
-astsml.18.png 0 1 4 4
-astsml.19.png 0 1 4 4
-astsml.20.png 0 1 0 0
diff --git a/sc2/content/base/battle/gamesnd.snd b/sc2/content/base/battle/battle.snd
similarity index 100%
rename from sc2/content/base/battle/gamesnd.snd
rename to sc2/content/base/battle/battle.snd
diff --git a/sc2/content/base/battle/blabig.ani b/sc2/content/base/battle/blabig.ani
deleted file mode 100644
index ca6daa43b..000000000
--- a/sc2/content/base/battle/blabig.ani
+++ /dev/null
@@ -1,8 +0,0 @@
-blabig.0.png 0 1 5 5
-blabig.1.png 0 1 3 5
-blabig.2.png 0 1 1 5
-blabig.3.png 0 1 3 3
-blabig.4.png 0 1 5 1
-blabig.5.png 0 1 6 3
-blabig.6.png 0 1 5 5
-blabig.7.png 0 1 6 5
diff --git a/sc2/content/base/battle/blamed.ani b/sc2/content/base/battle/blamed.ani
deleted file mode 100644
index 2a110df22..000000000
--- a/sc2/content/base/battle/blamed.ani
+++ /dev/null
@@ -1,8 +0,0 @@
-blamed.0.png 0 1 3 3
-blamed.1.png 0 1 2 2
-blamed.2.png 0 1 0 3
-blamed.3.png 0 1 2 2
-blamed.4.png 0 1 3 0
-blamed.5.png 0 1 3 2
-blamed.6.png 0 1 3 3
-blamed.7.png 0 1 3 3
diff --git a/sc2/content/base/battle/blasml.ani b/sc2/content/base/battle/blasml.ani
deleted file mode 100644
index 3d207780d..000000000
--- a/sc2/content/base/battle/blasml.ani
+++ /dev/null
@@ -1,8 +0,0 @@
-blasml.0.png 0 1 1 1
-blasml.1.png 0 1 1 1
-blasml.2.png 0 1 1 1
-blasml.3.png 0 1 1 1
-blasml.4.png 0 1 1 1
-blasml.5.png 0 1 1 1
-blasml.6.png 0 1 1 1
-blasml.7.png 0 1 1 1
diff --git a/sc2/content/base/battle/blabig.0.png b/sc2/content/base/battle/blast-big.0.png
similarity index 100%
rename from sc2/content/base/battle/blabig.0.png
rename to sc2/content/base/battle/blast-big.0.png
diff --git a/sc2/content/base/battle/blabig.1.png b/sc2/content/base/battle/blast-big.1.png
similarity index 100%
rename from sc2/content/base/battle/blabig.1.png
rename to sc2/content/base/battle/blast-big.1.png
diff --git a/sc2/content/base/battle/blabig.2.png b/sc2/content/base/battle/blast-big.2.png
similarity index 100%
rename from sc2/content/base/battle/blabig.2.png
rename to sc2/content/base/battle/blast-big.2.png
diff --git a/sc2/content/base/battle/blabig.3.png b/sc2/content/base/battle/blast-big.3.png
similarity index 100%
rename from sc2/content/base/battle/blabig.3.png
rename to sc2/content/base/battle/blast-big.3.png
diff --git a/sc2/content/base/battle/blabig.4.png b/sc2/content/base/battle/blast-big.4.png
similarity index 100%
rename from sc2/content/base/battle/blabig.4.png
rename to sc2/content/base/battle/blast-big.4.png
diff --git a/sc2/content/base/battle/blabig.5.png b/sc2/content/base/battle/blast-big.5.png
similarity index 100%
rename from sc2/content/base/battle/blabig.5.png
rename to sc2/content/base/battle/blast-big.5.png
diff --git a/sc2/content/base/battle/blabig.6.png b/sc2/content/base/battle/blast-big.6.png
similarity index 100%
rename from sc2/content/base/battle/blabig.6.png
rename to sc2/content/base/battle/blast-big.6.png
diff --git a/sc2/content/base/battle/blabig.7.png b/sc2/content/base/battle/blast-big.7.png
similarity index 100%
rename from sc2/content/base/battle/blabig.7.png
rename to sc2/content/base/battle/blast-big.7.png
diff --git a/sc2/content/base/battle/blast-big.ani b/sc2/content/base/battle/blast-big.ani
new file mode 100644
index 000000000..28795d4aa
--- /dev/null
+++ b/sc2/content/base/battle/blast-big.ani
@@ -0,0 +1,8 @@
+blast-big.0.png 0 1 5 5
+blast-big.1.png 0 1 3 5
+blast-big.2.png 0 1 1 5
+blast-big.3.png 0 1 3 3
+blast-big.4.png 0 1 5 1
+blast-big.5.png 0 1 6 3
+blast-big.6.png 0 1 5 5
+blast-big.7.png 0 1 6 5
diff --git a/sc2/content/base/battle/blamed.0.png b/sc2/content/base/battle/blast-med.0.png
similarity index 100%
rename from sc2/content/base/battle/blamed.0.png
rename to sc2/content/base/battle/blast-med.0.png
diff --git a/sc2/content/base/battle/blamed.1.png b/sc2/content/base/battle/blast-med.1.png
similarity index 100%
rename from sc2/content/base/battle/blamed.1.png
rename to sc2/content/base/battle/blast-med.1.png
diff --git a/sc2/content/base/battle/blamed.2.png b/sc2/content/base/battle/blast-med.2.png
similarity index 100%
rename from sc2/content/base/battle/blamed.2.png
rename to sc2/content/base/battle/blast-med.2.png
diff --git a/sc2/content/base/battle/blamed.3.png b/sc2/content/base/battle/blast-med.3.png
similarity index 100%
rename from sc2/content/base/battle/blamed.3.png
rename to sc2/content/base/battle/blast-med.3.png
diff --git a/sc2/content/base/battle/blamed.4.png b/sc2/content/base/battle/blast-med.4.png
similarity index 100%
rename from sc2/content/base/battle/blamed.4.png
rename to sc2/content/base/battle/blast-med.4.png
diff --git a/sc2/content/base/battle/blamed.5.png b/sc2/content/base/battle/blast-med.5.png
similarity index 100%
rename from sc2/content/base/battle/blamed.5.png
rename to sc2/content/base/battle/blast-med.5.png
diff --git a/sc2/content/base/battle/blamed.6.png b/sc2/content/base/battle/blast-med.6.png
similarity index 100%
rename from sc2/content/base/battle/blamed.6.png
rename to sc2/content/base/battle/blast-med.6.png
diff --git a/sc2/content/base/battle/blamed.7.png b/sc2/content/base/battle/blast-med.7.png
similarity index 100%
rename from sc2/content/base/battle/blamed.7.png
rename to sc2/content/base/battle/blast-med.7.png
diff --git a/sc2/content/base/battle/blast-med.ani b/sc2/content/base/battle/blast-med.ani
new file mode 100644
index 000000000..2a063b898
--- /dev/null
+++ b/sc2/content/base/battle/blast-med.ani
@@ -0,0 +1,8 @@
+blast-med.0.png 0 1 3 3
+blast-med.1.png 0 1 2 2
+blast-med.2.png 0 1 0 3
+blast-med.3.png 0 1 2 2
+blast-med.4.png 0 1 3 0
+blast-med.5.png 0 1 3 2
+blast-med.6.png 0 1 3 3
+blast-med.7.png 0 1 3 3
diff --git a/sc2/content/base/battle/blasml.0.png b/sc2/content/base/battle/blast-sml.0.png
similarity index 100%
rename from sc2/content/base/battle/blasml.0.png
rename to sc2/content/base/battle/blast-sml.0.png
diff --git a/sc2/content/base/battle/blasml.1.png b/sc2/content/base/battle/blast-sml.1.png
similarity index 100%
rename from sc2/content/base/battle/blasml.1.png
rename to sc2/content/base/battle/blast-sml.1.png
diff --git a/sc2/content/base/battle/blasml.2.png b/sc2/content/base/battle/blast-sml.2.png
similarity index 100%
rename from sc2/content/base/battle/blasml.2.png
rename to sc2/content/base/battle/blast-sml.2.png
diff --git a/sc2/content/base/battle/blasml.3.png b/sc2/content/base/battle/blast-sml.3.png
similarity index 100%
rename from sc2/content/base/battle/blasml.3.png
rename to sc2/content/base/battle/blast-sml.3.png
diff --git a/sc2/content/base/battle/blasml.4.png b/sc2/content/base/battle/blast-sml.4.png
similarity index 100%
rename from sc2/content/base/battle/blasml.4.png
rename to sc2/content/base/battle/blast-sml.4.png
diff --git a/sc2/content/base/battle/blasml.5.png b/sc2/content/base/battle/blast-sml.5.png
similarity index 100%
rename from sc2/content/base/battle/blasml.5.png
rename to sc2/content/base/battle/blast-sml.5.png
diff --git a/sc2/content/base/battle/blasml.6.png b/sc2/content/base/battle/blast-sml.6.png
similarity index 100%
rename from sc2/content/base/battle/blasml.6.png
rename to sc2/content/base/battle/blast-sml.6.png
diff --git a/sc2/content/base/battle/blasml.7.png b/sc2/content/base/battle/blast-sml.7.png
similarity index 100%
rename from sc2/content/base/battle/blasml.7.png
rename to sc2/content/base/battle/blast-sml.7.png
diff --git a/sc2/content/base/battle/blast-sml.ani b/sc2/content/base/battle/blast-sml.ani
new file mode 100644
index 000000000..09cc3c34a
--- /dev/null
+++ b/sc2/content/base/battle/blast-sml.ani
@@ -0,0 +1,8 @@
+blast-sml.0.png 0 1 1 1
+blast-sml.1.png 0 1 1 1
+blast-sml.2.png 0 1 1 1
+blast-sml.3.png 0 1 1 1
+blast-sml.4.png 0 1 1 1
+blast-sml.5.png 0 1 1 1
+blast-sml.6.png 0 1 1 1
+blast-sml.7.png 0 1 1 1
diff --git a/sc2/content/base/battle/boobig.ani b/sc2/content/base/battle/boobig.ani
deleted file mode 100644
index 527846f99..000000000
--- a/sc2/content/base/battle/boobig.ani
+++ /dev/null
@@ -1,9 +0,0 @@
-boobig.0.png -1 1 0 0
-boobig.1.png 0 1 1 1
-boobig.2.png 0 1 3 3
-boobig.3.png 0 1 3 3
-boobig.4.png 0 1 3 3
-boobig.5.png 0 1 3 3
-boobig.6.png 0 1 2 2
-boobig.7.png 0 1 1 1
-boobig.8.png -1 1 0 0
diff --git a/sc2/content/base/battle/boobig.0.png b/sc2/content/base/battle/boom-big.0.png
similarity index 100%
rename from sc2/content/base/battle/boobig.0.png
rename to sc2/content/base/battle/boom-big.0.png
diff --git a/sc2/content/base/battle/boobig.1.png b/sc2/content/base/battle/boom-big.1.png
similarity index 100%
rename from sc2/content/base/battle/boobig.1.png
rename to sc2/content/base/battle/boom-big.1.png
diff --git a/sc2/content/base/battle/boobig.2.png b/sc2/content/base/battle/boom-big.2.png
similarity index 100%
rename from sc2/content/base/battle/boobig.2.png
rename to sc2/content/base/battle/boom-big.2.png
diff --git a/sc2/content/base/battle/boobig.3.png b/sc2/content/base/battle/boom-big.3.png
similarity index 100%
rename from sc2/content/base/battle/boobig.3.png
rename to sc2/content/base/battle/boom-big.3.png
diff --git a/sc2/content/base/battle/boobig.4.png b/sc2/content/base/battle/boom-big.4.png
similarity index 100%
rename from sc2/content/base/battle/boobig.4.png
rename to sc2/content/base/battle/boom-big.4.png
diff --git a/sc2/content/base/battle/boobig.5.png b/sc2/content/base/battle/boom-big.5.png
similarity index 100%
rename from sc2/content/base/battle/boobig.5.png
rename to sc2/content/base/battle/boom-big.5.png
diff --git a/sc2/content/base/battle/boobig.6.png b/sc2/content/base/battle/boom-big.6.png
similarity index 100%
rename from sc2/content/base/battle/boobig.6.png
rename to sc2/content/base/battle/boom-big.6.png
diff --git a/sc2/content/base/battle/boobig.7.png b/sc2/content/base/battle/boom-big.7.png
similarity index 100%
rename from sc2/content/base/battle/boobig.7.png
rename to sc2/content/base/battle/boom-big.7.png
diff --git a/sc2/content/base/battle/boobig.8.png b/sc2/content/base/battle/boom-big.8.png
similarity index 100%
rename from sc2/content/base/battle/boobig.8.png
rename to sc2/content/base/battle/boom-big.8.png
diff --git a/sc2/content/base/battle/boom-big.ani b/sc2/content/base/battle/boom-big.ani
new file mode 100644
index 000000000..627458428
--- /dev/null
+++ b/sc2/content/base/battle/boom-big.ani
@@ -0,0 +1,9 @@
+boom-big.0.png -1 1 0 0
+boom-big.1.png 0 1 1 1
+boom-big.2.png 0 1 3 3
+boom-big.3.png 0 1 3 3
+boom-big.4.png 0 1 3 3
+boom-big.5.png 0 1 3 3
+boom-big.6.png 0 1 2 2
+boom-big.7.png 0 1 1 1
+boom-big.8.png -1 1 0 0
diff --git a/sc2/content/base/battle/boomed.0.png b/sc2/content/base/battle/boom-med.0.png
similarity index 100%
rename from sc2/content/base/battle/boomed.0.png
rename to sc2/content/base/battle/boom-med.0.png
diff --git a/sc2/content/base/battle/boomed.1.png b/sc2/content/base/battle/boom-med.1.png
similarity index 100%
rename from sc2/content/base/battle/boomed.1.png
rename to sc2/content/base/battle/boom-med.1.png
diff --git a/sc2/content/base/battle/boomed.2.png b/sc2/content/base/battle/boom-med.2.png
similarity index 100%
rename from sc2/content/base/battle/boomed.2.png
rename to sc2/content/base/battle/boom-med.2.png
diff --git a/sc2/content/base/battle/boomed.3.png b/sc2/content/base/battle/boom-med.3.png
similarity index 100%
rename from sc2/content/base/battle/boomed.3.png
rename to sc2/content/base/battle/boom-med.3.png
diff --git a/sc2/content/base/battle/boomed.4.png b/sc2/content/base/battle/boom-med.4.png
similarity index 100%
rename from sc2/content/base/battle/boomed.4.png
rename to sc2/content/base/battle/boom-med.4.png
diff --git a/sc2/content/base/battle/boomed.5.png b/sc2/content/base/battle/boom-med.5.png
similarity index 100%
rename from sc2/content/base/battle/boomed.5.png
rename to sc2/content/base/battle/boom-med.5.png
diff --git a/sc2/content/base/battle/boomed.6.png b/sc2/content/base/battle/boom-med.6.png
similarity index 100%
rename from sc2/content/base/battle/boomed.6.png
rename to sc2/content/base/battle/boom-med.6.png
diff --git a/sc2/content/base/battle/boomed.7.png b/sc2/content/base/battle/boom-med.7.png
similarity index 100%
rename from sc2/content/base/battle/boomed.7.png
rename to sc2/content/base/battle/boom-med.7.png
diff --git a/sc2/content/base/battle/boomed.8.png b/sc2/content/base/battle/boom-med.8.png
similarity index 100%
rename from sc2/content/base/battle/boomed.8.png
rename to sc2/content/base/battle/boom-med.8.png
diff --git a/sc2/content/base/battle/boom-med.ani b/sc2/content/base/battle/boom-med.ani
new file mode 100644
index 000000000..8336df0ee
--- /dev/null
+++ b/sc2/content/base/battle/boom-med.ani
@@ -0,0 +1,9 @@
+boom-med.0.png -1 1 0 0
+boom-med.1.png -1 1 0 0
+boom-med.2.png 0 1 1 1
+boom-med.3.png 0 1 1 1
+boom-med.4.png 0 1 1 1
+boom-med.5.png 0 1 1 1
+boom-med.6.png 0 1 1 1
+boom-med.7.png -1 1 0 0
+boom-med.8.png -1 1 0 0
diff --git a/sc2/content/base/battle/boosml.0.png b/sc2/content/base/battle/boom-sml.0.png
similarity index 100%
rename from sc2/content/base/battle/boosml.0.png
rename to sc2/content/base/battle/boom-sml.0.png
diff --git a/sc2/content/base/battle/boosml.1.png b/sc2/content/base/battle/boom-sml.1.png
similarity index 100%
rename from sc2/content/base/battle/boosml.1.png
rename to sc2/content/base/battle/boom-sml.1.png
diff --git a/sc2/content/base/battle/boosml.2.png b/sc2/content/base/battle/boom-sml.2.png
similarity index 100%
rename from sc2/content/base/battle/boosml.2.png
rename to sc2/content/base/battle/boom-sml.2.png
diff --git a/sc2/content/base/battle/boosml.3.png b/sc2/content/base/battle/boom-sml.3.png
similarity index 100%
rename from sc2/content/base/battle/boosml.3.png
rename to sc2/content/base/battle/boom-sml.3.png
diff --git a/sc2/content/base/battle/boosml.4.png b/sc2/content/base/battle/boom-sml.4.png
similarity index 100%
rename from sc2/content/base/battle/boosml.4.png
rename to sc2/content/base/battle/boom-sml.4.png
diff --git a/sc2/content/base/battle/boosml.5.png b/sc2/content/base/battle/boom-sml.5.png
similarity index 100%
rename from sc2/content/base/battle/boosml.5.png
rename to sc2/content/base/battle/boom-sml.5.png
diff --git a/sc2/content/base/battle/boosml.6.png b/sc2/content/base/battle/boom-sml.6.png
similarity index 100%
rename from sc2/content/base/battle/boosml.6.png
rename to sc2/content/base/battle/boom-sml.6.png
diff --git a/sc2/content/base/battle/boosml.7.png b/sc2/content/base/battle/boom-sml.7.png
similarity index 100%
rename from sc2/content/base/battle/boosml.7.png
rename to sc2/content/base/battle/boom-sml.7.png
diff --git a/sc2/content/base/battle/boosml.8.png b/sc2/content/base/battle/boom-sml.8.png
similarity index 100%
rename from sc2/content/base/battle/boosml.8.png
rename to sc2/content/base/battle/boom-sml.8.png
diff --git a/sc2/content/base/battle/boom-sml.ani b/sc2/content/base/battle/boom-sml.ani
new file mode 100644
index 000000000..b65b21cfc
--- /dev/null
+++ b/sc2/content/base/battle/boom-sml.ani
@@ -0,0 +1,9 @@
+boom-sml.0.png -1 1 0 0
+boom-sml.1.png -1 1 0 0
+boom-sml.2.png 0 1 1 1
+boom-sml.3.png 0 1 1 1
+boom-sml.4.png 0 1 1 1
+boom-sml.5.png 0 1 1 1
+boom-sml.6.png -1 1 0 0
+boom-sml.7.png -1 1 0 0
+boom-sml.8.png -1 1 0 0
diff --git a/sc2/content/base/battle/boomed.ani b/sc2/content/base/battle/boomed.ani
deleted file mode 100644
index cc6ffe7ef..000000000
--- a/sc2/content/base/battle/boomed.ani
+++ /dev/null
@@ -1,9 +0,0 @@
-boomed.0.png -1 1 0 0
-boomed.1.png -1 1 0 0
-boomed.2.png 0 1 1 1
-boomed.3.png 0 1 1 1
-boomed.4.png 0 1 1 1
-boomed.5.png 0 1 1 1
-boomed.6.png 0 1 1 1
-boomed.7.png -1 1 0 0
-boomed.8.png -1 1 0 0
diff --git a/sc2/content/base/battle/boosml.ani b/sc2/content/base/battle/boosml.ani
deleted file mode 100644
index 9043d54c2..000000000
--- a/sc2/content/base/battle/boosml.ani
+++ /dev/null
@@ -1,9 +0,0 @@
-boosml.0.png -1 1 0 0
-boosml.1.png -1 1 0 0
-boosml.2.png 0 1 1 1
-boosml.3.png 0 1 1 1
-boosml.4.png 0 1 1 1
-boosml.5.png 0 1 1 1
-boosml.6.png -1 1 0 0
-boosml.7.png -1 1 0 0
-boosml.8.png -1 1 0 0
diff --git a/sc2/content/base/cutscene/ending/sis_skel.0.png b/sc2/content/base/cutscene/ending/fs_skeleton.0.png
similarity index 100%
rename from sc2/content/base/cutscene/ending/sis_skel.0.png
rename to sc2/content/base/cutscene/ending/fs_skeleton.0.png
diff --git a/sc2/content/base/cutscene/ending/fs_skeleton.ani b/sc2/content/base/cutscene/ending/fs_skeleton.ani
new file mode 100644
index 000000000..fef87af3a
--- /dev/null
+++ b/sc2/content/base/cutscene/ending/fs_skeleton.ani
@@ -0,0 +1 @@
+fs_skeleton.0.png 4 68 0 0
diff --git a/sc2/content/base/cutscene/ending/sis_skel.ani b/sc2/content/base/cutscene/ending/sis_skel.ani
deleted file mode 100644
index b16f2f58e..000000000
--- a/sc2/content/base/cutscene/ending/sis_skel.ani
+++ /dev/null
@@ -1 +0,0 @@
-sis_skel.0.png 4 68 0 0
diff --git a/sc2/content/base/fonts/fontgrad.ani b/sc2/content/base/fonts/fontgrad.ani
deleted file mode 100644
index 78a09abc1..000000000
--- a/sc2/content/base/fonts/fontgrad.ani
+++ /dev/null
@@ -1,6 +0,0 @@
-fontgrad.0.png -1 -1 0 0
-fontgrad.1.png -1 -1 0 0
-fontgrad.2.png -1 -1 0 0
-fontgrad.3.png -1 -1 0 0
-fontgrad.4.png -1 -1 0 0
-fontgrad.5.png -1 -1 0 0
diff --git a/sc2/content/base/fonts/fontgrad.0.png b/sc2/content/base/fonts/fontgradient.0.png
similarity index 100%
rename from sc2/content/base/fonts/fontgrad.0.png
rename to sc2/content/base/fonts/fontgradient.0.png
diff --git a/sc2/content/base/fonts/fontgrad.1.png b/sc2/content/base/fonts/fontgradient.1.png
similarity index 100%
rename from sc2/content/base/fonts/fontgrad.1.png
rename to sc2/content/base/fonts/fontgradient.1.png
diff --git a/sc2/content/base/fonts/fontgrad.2.png b/sc2/content/base/fonts/fontgradient.2.png
similarity index 100%
rename from sc2/content/base/fonts/fontgrad.2.png
rename to sc2/content/base/fonts/fontgradient.2.png
diff --git a/sc2/content/base/fonts/fontgrad.3.png b/sc2/content/base/fonts/fontgradient.3.png
similarity index 100%
rename from sc2/content/base/fonts/fontgrad.3.png
rename to sc2/content/base/fonts/fontgradient.3.png
diff --git a/sc2/content/base/fonts/fontgrad.4.png b/sc2/content/base/fonts/fontgradient.4.png
similarity index 100%
rename from sc2/content/base/fonts/fontgrad.4.png
rename to sc2/content/base/fonts/fontgradient.4.png
diff --git a/sc2/content/base/fonts/fontgrad.5.png b/sc2/content/base/fonts/fontgradient.5.png
similarity index 100%
rename from sc2/content/base/fonts/fontgrad.5.png
rename to sc2/content/base/fonts/fontgradient.5.png
diff --git a/sc2/content/base/fonts/fontgradient.ani b/sc2/content/base/fonts/fontgradient.ani
new file mode 100644
index 000000000..55ca06775
--- /dev/null
+++ b/sc2/content/base/fonts/fontgradient.ani
@@ -0,0 +1,6 @@
+fontgradient.0.png -1 -1 0 0
+fontgradient.1.png -1 -1 0 0
+fontgradient.2.png -1 -1 0 0
+fontgradient.3.png -1 -1 0 0
+fontgradient.4.png -1 -1 0 0
+fontgradient.5.png -1 -1 0 0
diff --git a/sc2/content/base/lander/energy/aquhelix.0.png b/sc2/content/base/lander/energy/aquahelix.0.png
similarity index 100%
rename from sc2/content/base/lander/energy/aquhelix.0.png
rename to sc2/content/base/lander/energy/aquahelix.0.png
diff --git a/sc2/content/base/lander/energy/aquhelix.1.png b/sc2/content/base/lander/energy/aquahelix.1.png
similarity index 100%
rename from sc2/content/base/lander/energy/aquhelix.1.png
rename to sc2/content/base/lander/energy/aquahelix.1.png
diff --git a/sc2/content/base/lander/energy/aquhelix.2.png b/sc2/content/base/lander/energy/aquahelix.2.png
similarity index 100%
rename from sc2/content/base/lander/energy/aquhelix.2.png
rename to sc2/content/base/lander/energy/aquahelix.2.png
diff --git a/sc2/content/base/lander/energy/aquhelix.3.png b/sc2/content/base/lander/energy/aquahelix.3.png
similarity index 100%
rename from sc2/content/base/lander/energy/aquhelix.3.png
rename to sc2/content/base/lander/energy/aquahelix.3.png
diff --git a/sc2/content/base/lander/energy/aquahelix.ani b/sc2/content/base/lander/energy/aquahelix.ani
index 658a5cfe5..06d9706be 100644
--- a/sc2/content/base/lander/energy/aquahelix.ani
+++ b/sc2/content/base/lander/energy/aquahelix.ani
@@ -1,4 +1,4 @@
-aquhelix.0.png 0 90 16 17
-aquhelix.1.png 0 90 16 17
-aquhelix.2.png 0 90 16 17
-aquhelix.3.png 0 90 16 17
+aquahelix.0.png 0 90 16 17
+aquahelix.1.png 0 90 16 17
+aquahelix.2.png 0 90 16 17
+aquahelix.3.png 0 90 16 17
diff --git a/sc2/content/base/lander/energy/drutrans.0.png b/sc2/content/base/lander/energy/burvixcaster.0.png
similarity index 100%
rename from sc2/content/base/lander/energy/drutrans.0.png
rename to sc2/content/base/lander/energy/burvixcaster.0.png
diff --git a/sc2/content/base/lander/energy/drutrans.1.png b/sc2/content/base/lander/energy/burvixcaster.1.png
similarity index 100%
rename from sc2/content/base/lander/energy/drutrans.1.png
rename to sc2/content/base/lander/energy/burvixcaster.1.png
diff --git a/sc2/content/base/lander/energy/drutrans.2.png b/sc2/content/base/lander/energy/burvixcaster.2.png
similarity index 100%
rename from sc2/content/base/lander/energy/drutrans.2.png
rename to sc2/content/base/lander/energy/burvixcaster.2.png
diff --git a/sc2/content/base/lander/energy/drutrans.3.png b/sc2/content/base/lander/energy/burvixcaster.3.png
similarity index 100%
rename from sc2/content/base/lander/energy/drutrans.3.png
rename to sc2/content/base/lander/energy/burvixcaster.3.png
diff --git a/sc2/content/base/lander/energy/burvixcaster.ani b/sc2/content/base/lander/energy/burvixcaster.ani
index a5af477e7..90e04dbd3 100644
--- a/sc2/content/base/lander/energy/burvixcaster.ani
+++ b/sc2/content/base/lander/energy/burvixcaster.ani
@@ -1,4 +1,4 @@
-drutrans.0.png 0 91 15 12
-drutrans.1.png 0 91 16 14
-drutrans.2.png 0 91 13 10
-drutrans.3.png 0 91 15 12
+burvixcaster.0.png 0 91 15 12
+burvixcaster.1.png 0 91 16 14
+burvixcaster.2.png 0 91 13 10
+burvixcaster.3.png 0 91 15 12
diff --git a/sc2/content/base/lander/energy/spapluto.0.png b/sc2/content/base/lander/energy/fwiffo.0.png
similarity index 100%
rename from sc2/content/base/lander/energy/spapluto.0.png
rename to sc2/content/base/lander/energy/fwiffo.0.png
diff --git a/sc2/content/base/lander/energy/spapluto.1.png b/sc2/content/base/lander/energy/fwiffo.1.png
similarity index 100%
rename from sc2/content/base/lander/energy/spapluto.1.png
rename to sc2/content/base/lander/energy/fwiffo.1.png
diff --git a/sc2/content/base/lander/energy/spapluto.2.png b/sc2/content/base/lander/energy/fwiffo.2.png
similarity index 100%
rename from sc2/content/base/lander/energy/spapluto.2.png
rename to sc2/content/base/lander/energy/fwiffo.2.png
diff --git a/sc2/content/base/lander/energy/spapluto.3.png b/sc2/content/base/lander/energy/fwiffo.3.png
similarity index 100%
rename from sc2/content/base/lander/energy/spapluto.3.png
rename to sc2/content/base/lander/energy/fwiffo.3.png
diff --git a/sc2/content/base/lander/energy/fwiffo.ani b/sc2/content/base/lander/energy/fwiffo.ani
index 397fd1f3c..d2762b1b0 100644
--- a/sc2/content/base/lander/energy/fwiffo.ani
+++ b/sc2/content/base/lander/energy/fwiffo.ani
@@ -1,4 +1,4 @@
-spapluto.0.png 0 98 18 13
-spapluto.1.png 0 98 18 13
-spapluto.2.png 0 98 18 13
-spapluto.3.png 0 98 18 13
+fwiffo.0.png 0 98 18 13
+fwiffo.1.png 0 98 18 13
+fwiffo.2.png 0 98 18 13
+fwiffo.3.png 0 98 18 13
diff --git a/sc2/content/base/lander/energy/sundevic.0.png b/sc2/content/base/lander/energy/sundevice.0.png
similarity index 100%
rename from sc2/content/base/lander/energy/sundevic.0.png
rename to sc2/content/base/lander/energy/sundevice.0.png
diff --git a/sc2/content/base/lander/energy/sundevic.1.png b/sc2/content/base/lander/energy/sundevice.1.png
similarity index 100%
rename from sc2/content/base/lander/energy/sundevic.1.png
rename to sc2/content/base/lander/energy/sundevice.1.png
diff --git a/sc2/content/base/lander/energy/sundevic.2.png b/sc2/content/base/lander/energy/sundevice.2.png
similarity index 100%
rename from sc2/content/base/lander/energy/sundevic.2.png
rename to sc2/content/base/lander/energy/sundevice.2.png
diff --git a/sc2/content/base/lander/energy/sundevic.3.png b/sc2/content/base/lander/energy/sundevice.3.png
similarity index 100%
rename from sc2/content/base/lander/energy/sundevic.3.png
rename to sc2/content/base/lander/energy/sundevice.3.png
diff --git a/sc2/content/base/lander/energy/sundevice.ani b/sc2/content/base/lander/energy/sundevice.ani
index 2438cdcdd..f67dd989e 100644
--- a/sc2/content/base/lander/energy/sundevice.ani
+++ b/sc2/content/base/lander/energy/sundevice.ani
@@ -1,4 +1,4 @@
-sundevic.0.png 0 99 7 8
-sundevic.1.png 0 99 9 10
-sundevic.2.png 0 99 9 12
-sundevic.3.png 0 99 8 10
+sundevice.0.png 0 99 7 8
+sundevice.1.png 0 99 9 10
+sundevice.2.png 0 99 9 12
+sundevice.3.png 0 99 8 10
diff --git a/sc2/content/base/lander/energy/syrvault.0.png b/sc2/content/base/lander/energy/syreenvault.0.png
similarity index 100%
rename from sc2/content/base/lander/energy/syrvault.0.png
rename to sc2/content/base/lander/energy/syreenvault.0.png
diff --git a/sc2/content/base/lander/energy/syrvault.1.png b/sc2/content/base/lander/energy/syreenvault.1.png
similarity index 100%
rename from sc2/content/base/lander/energy/syrvault.1.png
rename to sc2/content/base/lander/energy/syreenvault.1.png
diff --git a/sc2/content/base/lander/energy/syrvault.2.png b/sc2/content/base/lander/energy/syreenvault.2.png
similarity index 100%
rename from sc2/content/base/lander/energy/syrvault.2.png
rename to sc2/content/base/lander/energy/syreenvault.2.png
diff --git a/sc2/content/base/lander/energy/syrvault.3.png b/sc2/content/base/lander/energy/syreenvault.3.png
similarity index 100%
rename from sc2/content/base/lander/energy/syrvault.3.png
rename to sc2/content/base/lander/energy/syreenvault.3.png
diff --git a/sc2/content/base/lander/energy/syreenvault.ani b/sc2/content/base/lander/energy/syreenvault.ani
index 4c9268fb6..2035e685f 100644
--- a/sc2/content/base/lander/energy/syreenvault.ani
+++ b/sc2/content/base/lander/energy/syreenvault.ani
@@ -1,4 +1,4 @@
-syrvault.0.png 0 100 16 16
-syrvault.1.png 0 100 16 16
-syrvault.2.png 0 100 16 16
-syrvault.3.png 0 100 16 16
+syreenvault.0.png 0 100 16 16
+syreenvault.1.png 0 100 16 16
+syreenvault.2.png 0 100 16 16
+syreenvault.3.png 0 100 16 16
diff --git a/sc2/content/base/lander/energy/taadevic.0.png b/sc2/content/base/lander/energy/taalodevice.0.png
similarity index 100%
rename from sc2/content/base/lander/energy/taadevic.0.png
rename to sc2/content/base/lander/energy/taalodevice.0.png
diff --git a/sc2/content/base/lander/energy/taadevic.1.png b/sc2/content/base/lander/energy/taalodevice.1.png
similarity index 100%
rename from sc2/content/base/lander/energy/taadevic.1.png
rename to sc2/content/base/lander/energy/taalodevice.1.png
diff --git a/sc2/content/base/lander/energy/taadevic.2.png b/sc2/content/base/lander/energy/taalodevice.2.png
similarity index 100%
rename from sc2/content/base/lander/energy/taadevic.2.png
rename to sc2/content/base/lander/energy/taalodevice.2.png
diff --git a/sc2/content/base/lander/energy/taadevic.3.png b/sc2/content/base/lander/energy/taalodevice.3.png
similarity index 100%
rename from sc2/content/base/lander/energy/taadevic.3.png
rename to sc2/content/base/lander/energy/taalodevice.3.png
diff --git a/sc2/content/base/lander/energy/taalodevice.ani b/sc2/content/base/lander/energy/taalodevice.ani
index 228f72a98..49958a604 100644
--- a/sc2/content/base/lander/energy/taalodevice.ani
+++ b/sc2/content/base/lander/energy/taalodevice.ani
@@ -1,4 +1,4 @@
-taadevic.0.png 0 101 17 14
-taadevic.1.png 0 101 17 14
-taadevic.2.png 0 101 17 14
-taadevic.3.png 0 101 17 14
+taalodevice.0.png 0 101 17 14
+taalodevice.1.png 0 101 17 14
+taalodevice.2.png 0 101 17 14
+taalodevice.3.png 0 101 17 14
diff --git a/sc2/content/base/lander/energy/umgtrans.0.png b/sc2/content/base/lander/energy/umgahcaster.0.png
similarity index 100%
rename from sc2/content/base/lander/energy/umgtrans.0.png
rename to sc2/content/base/lander/energy/umgahcaster.0.png
diff --git a/sc2/content/base/lander/energy/umgtrans.1.png b/sc2/content/base/lander/energy/umgahcaster.1.png
similarity index 100%
rename from sc2/content/base/lander/energy/umgtrans.1.png
rename to sc2/content/base/lander/energy/umgahcaster.1.png
diff --git a/sc2/content/base/lander/energy/umgtrans.2.png b/sc2/content/base/lander/energy/umgahcaster.2.png
similarity index 100%
rename from sc2/content/base/lander/energy/umgtrans.2.png
rename to sc2/content/base/lander/energy/umgahcaster.2.png
diff --git a/sc2/content/base/lander/energy/umgtrans.3.png b/sc2/content/base/lander/energy/umgahcaster.3.png
similarity index 100%
rename from sc2/content/base/lander/energy/umgtrans.3.png
rename to sc2/content/base/lander/energy/umgahcaster.3.png
diff --git a/sc2/content/base/lander/energy/umgahcaster.ani b/sc2/content/base/lander/energy/umgahcaster.ani
index 35dfdd729..a7770b34f 100644
--- a/sc2/content/base/lander/energy/umgahcaster.ani
+++ b/sc2/content/base/lander/energy/umgahcaster.ani
@@ -1,4 +1,4 @@
-umgtrans.0.png 0 102 16 13
-umgtrans.1.png 0 102 16 13
-umgtrans.2.png 0 102 16 13
-umgtrans.3.png 0 102 16 13
+umgahcaster.0.png 0 102 16 13
+umgahcaster.1.png 0 102 16 13
+umgahcaster.2.png 0 102 16 13
+umgahcaster.3.png 0 102 16 13
diff --git a/sc2/content/base/lander/energy/urqwreck.0.png b/sc2/content/base/lander/energy/urquanwreck.0.png
similarity index 100%
rename from sc2/content/base/lander/energy/urqwreck.0.png
rename to sc2/content/base/lander/energy/urquanwreck.0.png
diff --git a/sc2/content/base/lander/energy/urqwreck.1.png b/sc2/content/base/lander/energy/urquanwreck.1.png
similarity index 100%
rename from sc2/content/base/lander/energy/urqwreck.1.png
rename to sc2/content/base/lander/energy/urquanwreck.1.png
diff --git a/sc2/content/base/lander/energy/urqwreck.2.png b/sc2/content/base/lander/energy/urquanwreck.2.png
similarity index 100%
rename from sc2/content/base/lander/energy/urqwreck.2.png
rename to sc2/content/base/lander/energy/urquanwreck.2.png
diff --git a/sc2/content/base/lander/energy/urqwreck.3.png b/sc2/content/base/lander/energy/urquanwreck.3.png
similarity index 100%
rename from sc2/content/base/lander/energy/urqwreck.3.png
rename to sc2/content/base/lander/energy/urquanwreck.3.png
diff --git a/sc2/content/base/lander/energy/urquanwreck.ani b/sc2/content/base/lander/energy/urquanwreck.ani
index 958e3232c..23c618d8b 100644
--- a/sc2/content/base/lander/energy/urquanwreck.ani
+++ b/sc2/content/base/lander/energy/urquanwreck.ani
@@ -1,4 +1,4 @@
-urqwreck.0.png 0 103 14 10
-urqwreck.1.png 0 103 14 12
-urqwreck.2.png 0 103 14 13
-urqwreck.3.png 0 103 14 11
+urquanwreck.0.png 0 103 14 10
+urquanwreck.1.png 0 103 14 12
+urquanwreck.2.png 0 103 14 13
+urquanwreck.3.png 0 103 14 11
diff --git a/sc2/content/base/lander/energy/utwbomb.0.png b/sc2/content/base/lander/energy/utwigbomb.0.png
similarity index 100%
rename from sc2/content/base/lander/energy/utwbomb.0.png
rename to sc2/content/base/lander/energy/utwigbomb.0.png
diff --git a/sc2/content/base/lander/energy/utwbomb.1.png b/sc2/content/base/lander/energy/utwigbomb.1.png
similarity index 100%
rename from sc2/content/base/lander/energy/utwbomb.1.png
rename to sc2/content/base/lander/energy/utwigbomb.1.png
diff --git a/sc2/content/base/lander/energy/utwbomb.2.png b/sc2/content/base/lander/energy/utwigbomb.2.png
similarity index 100%
rename from sc2/content/base/lander/energy/utwbomb.2.png
rename to sc2/content/base/lander/energy/utwigbomb.2.png
diff --git a/sc2/content/base/lander/energy/utwbomb.3.png b/sc2/content/base/lander/energy/utwigbomb.3.png
similarity index 100%
rename from sc2/content/base/lander/energy/utwbomb.3.png
rename to sc2/content/base/lander/energy/utwigbomb.3.png
diff --git a/sc2/content/base/lander/energy/utwigbomb.ani b/sc2/content/base/lander/energy/utwigbomb.ani
index 08af1aaa8..270e252a5 100644
--- a/sc2/content/base/lander/energy/utwigbomb.ani
+++ b/sc2/content/base/lander/energy/utwigbomb.ani
@@ -1,4 +1,4 @@
-utwbomb.0.png 0 104 19 15
-utwbomb.1.png 0 104 19 15
-utwbomb.2.png 0 104 19 15
-utwbomb.3.png 0 104 19 15
+utwigbomb.0.png 0 104 19 15
+utwigbomb.1.png 0 104 19 15
+utwigbomb.2.png 0 104 19 15
+utwigbomb.3.png 0 104 19 15
diff --git a/sc2/content/base/lander/landfeff.0.png b/sc2/content/base/lander/fonteffect.0.png
similarity index 100%
rename from sc2/content/base/lander/landfeff.0.png
rename to sc2/content/base/lander/fonteffect.0.png
diff --git a/sc2/content/base/lander/fonteffect.ani b/sc2/content/base/lander/fonteffect.ani
index a4f6548e7..7c8e1809b 100644
--- a/sc2/content/base/lander/fonteffect.ani
+++ b/sc2/content/base/lander/fonteffect.ani
@@ -1 +1 @@
-landfeff.0.png -1 -1 0 0
+fonteffect.0.png -1 -1 0 0
diff --git a/sc2/content/base/lander/lightnin.0.png b/sc2/content/base/lander/hazard/lightning.0.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.0.png
rename to sc2/content/base/lander/hazard/lightning.0.png
diff --git a/sc2/content/base/lander/lightnin.1.png b/sc2/content/base/lander/hazard/lightning.1.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.1.png
rename to sc2/content/base/lander/hazard/lightning.1.png
diff --git a/sc2/content/base/lander/lightnin.10.png b/sc2/content/base/lander/hazard/lightning.10.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.10.png
rename to sc2/content/base/lander/hazard/lightning.10.png
diff --git a/sc2/content/base/lander/lightnin.11.png b/sc2/content/base/lander/hazard/lightning.11.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.11.png
rename to sc2/content/base/lander/hazard/lightning.11.png
diff --git a/sc2/content/base/lander/lightnin.12.png b/sc2/content/base/lander/hazard/lightning.12.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.12.png
rename to sc2/content/base/lander/hazard/lightning.12.png
diff --git a/sc2/content/base/lander/lightnin.13.png b/sc2/content/base/lander/hazard/lightning.13.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.13.png
rename to sc2/content/base/lander/hazard/lightning.13.png
diff --git a/sc2/content/base/lander/lightnin.14.png b/sc2/content/base/lander/hazard/lightning.14.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.14.png
rename to sc2/content/base/lander/hazard/lightning.14.png
diff --git a/sc2/content/base/lander/lightnin.15.png b/sc2/content/base/lander/hazard/lightning.15.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.15.png
rename to sc2/content/base/lander/hazard/lightning.15.png
diff --git a/sc2/content/base/lander/lightnin.16.png b/sc2/content/base/lander/hazard/lightning.16.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.16.png
rename to sc2/content/base/lander/hazard/lightning.16.png
diff --git a/sc2/content/base/lander/lightnin.2.png b/sc2/content/base/lander/hazard/lightning.2.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.2.png
rename to sc2/content/base/lander/hazard/lightning.2.png
diff --git a/sc2/content/base/lander/lightnin.3.png b/sc2/content/base/lander/hazard/lightning.3.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.3.png
rename to sc2/content/base/lander/hazard/lightning.3.png
diff --git a/sc2/content/base/lander/lightnin.4.png b/sc2/content/base/lander/hazard/lightning.4.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.4.png
rename to sc2/content/base/lander/hazard/lightning.4.png
diff --git a/sc2/content/base/lander/lightnin.5.png b/sc2/content/base/lander/hazard/lightning.5.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.5.png
rename to sc2/content/base/lander/hazard/lightning.5.png
diff --git a/sc2/content/base/lander/lightnin.6.png b/sc2/content/base/lander/hazard/lightning.6.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.6.png
rename to sc2/content/base/lander/hazard/lightning.6.png
diff --git a/sc2/content/base/lander/lightnin.7.png b/sc2/content/base/lander/hazard/lightning.7.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.7.png
rename to sc2/content/base/lander/hazard/lightning.7.png
diff --git a/sc2/content/base/lander/lightnin.8.png b/sc2/content/base/lander/hazard/lightning.8.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.8.png
rename to sc2/content/base/lander/hazard/lightning.8.png
diff --git a/sc2/content/base/lander/lightnin.9.png b/sc2/content/base/lander/hazard/lightning.9.png
similarity index 100%
rename from sc2/content/base/lander/lightnin.9.png
rename to sc2/content/base/lander/hazard/lightning.9.png
diff --git a/sc2/content/base/lander/hazard/lightning.ani b/sc2/content/base/lander/hazard/lightning.ani
new file mode 100644
index 000000000..01603340f
--- /dev/null
+++ b/sc2/content/base/lander/hazard/lightning.ani
@@ -0,0 +1,17 @@
+lightning.0.png 0 0 -1 51
+lightning.1.png 0 0 0 51
+lightning.2.png 0 0 -1 51
+lightning.3.png 0 0 -2 51
+lightning.4.png 0 0 -1 51
+lightning.5.png 0 0 0 51
+lightning.6.png 0 0 -1 51
+lightning.7.png 0 0 -1 51
+lightning.8.png 0 0 -2 51
+lightning.9.png 0 0 -1 51
+lightning.10.png 0 0 0 0
+lightning.11.png 0 0 1 1
+lightning.12.png 0 0 2 3
+lightning.13.png 0 0 4 4
+lightning.14.png 0 0 5 4
+lightning.15.png 0 0 6 3
+lightning.16.png 0 0 7 1
diff --git a/sc2/content/base/lander/lightning.ani b/sc2/content/base/lander/lightning.ani
deleted file mode 100644
index 16e000d12..000000000
--- a/sc2/content/base/lander/lightning.ani
+++ /dev/null
@@ -1,17 +0,0 @@
-lightnin.0.png 0 0 -1 51
-lightnin.1.png 0 0 0 51
-lightnin.2.png 0 0 -1 51
-lightnin.3.png 0 0 -2 51
-lightnin.4.png 0 0 -1 51
-lightnin.5.png 0 0 0 51
-lightnin.6.png 0 0 -1 51
-lightnin.7.png 0 0 -1 51
-lightnin.8.png 0 0 -2 51
-lightnin.9.png 0 0 -1 51
-lightnin.10.png 0 0 0 0
-lightnin.11.png 0 0 1 1
-lightnin.12.png 0 0 2 3
-lightnin.13.png 0 0 4 4
-lightnin.14.png 0 0 5 4
-lightnin.15.png 0 0 6 3
-lightnin.16.png 0 0 7 1
diff --git a/sc2/content/base/lander/lndrshld.0.png b/sc2/content/base/lander/shield.0.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.0.png
rename to sc2/content/base/lander/shield.0.png
diff --git a/sc2/content/base/lander/lndrshld.1.png b/sc2/content/base/lander/shield.1.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.1.png
rename to sc2/content/base/lander/shield.1.png
diff --git a/sc2/content/base/lander/lndrshld.10.png b/sc2/content/base/lander/shield.10.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.10.png
rename to sc2/content/base/lander/shield.10.png
diff --git a/sc2/content/base/lander/lndrshld.11.png b/sc2/content/base/lander/shield.11.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.11.png
rename to sc2/content/base/lander/shield.11.png
diff --git a/sc2/content/base/lander/lndrshld.12.png b/sc2/content/base/lander/shield.12.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.12.png
rename to sc2/content/base/lander/shield.12.png
diff --git a/sc2/content/base/lander/lndrshld.13.png b/sc2/content/base/lander/shield.13.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.13.png
rename to sc2/content/base/lander/shield.13.png
diff --git a/sc2/content/base/lander/lndrshld.14.png b/sc2/content/base/lander/shield.14.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.14.png
rename to sc2/content/base/lander/shield.14.png
diff --git a/sc2/content/base/lander/lndrshld.15.png b/sc2/content/base/lander/shield.15.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.15.png
rename to sc2/content/base/lander/shield.15.png
diff --git a/sc2/content/base/lander/lndrshld.2.png b/sc2/content/base/lander/shield.2.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.2.png
rename to sc2/content/base/lander/shield.2.png
diff --git a/sc2/content/base/lander/lndrshld.3.png b/sc2/content/base/lander/shield.3.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.3.png
rename to sc2/content/base/lander/shield.3.png
diff --git a/sc2/content/base/lander/lndrshld.4.png b/sc2/content/base/lander/shield.4.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.4.png
rename to sc2/content/base/lander/shield.4.png
diff --git a/sc2/content/base/lander/lndrshld.5.png b/sc2/content/base/lander/shield.5.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.5.png
rename to sc2/content/base/lander/shield.5.png
diff --git a/sc2/content/base/lander/lndrshld.6.png b/sc2/content/base/lander/shield.6.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.6.png
rename to sc2/content/base/lander/shield.6.png
diff --git a/sc2/content/base/lander/lndrshld.7.png b/sc2/content/base/lander/shield.7.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.7.png
rename to sc2/content/base/lander/shield.7.png
diff --git a/sc2/content/base/lander/lndrshld.8.png b/sc2/content/base/lander/shield.8.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.8.png
rename to sc2/content/base/lander/shield.8.png
diff --git a/sc2/content/base/lander/lndrshld.9.png b/sc2/content/base/lander/shield.9.png
similarity index 100%
rename from sc2/content/base/lander/lndrshld.9.png
rename to sc2/content/base/lander/shield.9.png
diff --git a/sc2/content/base/lander/shield.ani b/sc2/content/base/lander/shield.ani
index bb7a1232d..18381e2fa 100644
--- a/sc2/content/base/lander/shield.ani
+++ b/sc2/content/base/lander/shield.ani
@@ -1,16 +1,16 @@
-lndrshld.0.png 0 0 7 9
-lndrshld.1.png 0 0 7 8
-lndrshld.2.png 0 0 7 7
-lndrshld.3.png 0 0 7 6
-lndrshld.4.png 0 0 6 7
-lndrshld.5.png 0 0 7 7
-lndrshld.6.png 0 0 7 7
-lndrshld.7.png 0 0 7 7
-lndrshld.8.png 0 0 7 6
-lndrshld.9.png 0 0 6 7
-lndrshld.10.png 0 0 7 7
-lndrshld.11.png 0 0 8 7
-lndrshld.12.png 0 0 9 7
-lndrshld.13.png 0 0 8 6
-lndrshld.14.png 0 0 7 7
-lndrshld.15.png 0 0 6 8
+shield.0.png 0 0 7 9
+shield.1.png 0 0 7 8
+shield.2.png 0 0 7 7
+shield.3.png 0 0 7 6
+shield.4.png 0 0 6 7
+shield.5.png 0 0 7 7
+shield.6.png 0 0 7 7
+shield.7.png 0 0 7 7
+shield.8.png 0 0 7 6
+shield.9.png 0 0 6 7
+shield.10.png 0 0 7 7
+shield.11.png 0 0 8 7
+shield.12.png 0 0 9 7
+shield.13.png 0 0 8 6
+shield.14.png 0 0 7 7
+shield.15.png 0 0 6 8
diff --git a/sc2/content/base/nav/ambanim.0.png b/sc2/content/base/nav/ambient.0.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.0.png
rename to sc2/content/base/nav/ambient.0.png
diff --git a/sc2/content/base/nav/ambanim.1.png b/sc2/content/base/nav/ambient.1.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.1.png
rename to sc2/content/base/nav/ambient.1.png
diff --git a/sc2/content/base/nav/ambanim.10.png b/sc2/content/base/nav/ambient.10.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.10.png
rename to sc2/content/base/nav/ambient.10.png
diff --git a/sc2/content/base/nav/ambanim.11.png b/sc2/content/base/nav/ambient.11.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.11.png
rename to sc2/content/base/nav/ambient.11.png
diff --git a/sc2/content/base/nav/ambanim.12.png b/sc2/content/base/nav/ambient.12.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.12.png
rename to sc2/content/base/nav/ambient.12.png
diff --git a/sc2/content/base/nav/ambanim.13.png b/sc2/content/base/nav/ambient.13.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.13.png
rename to sc2/content/base/nav/ambient.13.png
diff --git a/sc2/content/base/nav/ambanim.14.png b/sc2/content/base/nav/ambient.14.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.14.png
rename to sc2/content/base/nav/ambient.14.png
diff --git a/sc2/content/base/nav/ambanim.15.png b/sc2/content/base/nav/ambient.15.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.15.png
rename to sc2/content/base/nav/ambient.15.png
diff --git a/sc2/content/base/nav/ambanim.16.png b/sc2/content/base/nav/ambient.16.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.16.png
rename to sc2/content/base/nav/ambient.16.png
diff --git a/sc2/content/base/nav/ambanim.17.png b/sc2/content/base/nav/ambient.17.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.17.png
rename to sc2/content/base/nav/ambient.17.png
diff --git a/sc2/content/base/nav/ambanim.18.png b/sc2/content/base/nav/ambient.18.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.18.png
rename to sc2/content/base/nav/ambient.18.png
diff --git a/sc2/content/base/nav/ambanim.19.png b/sc2/content/base/nav/ambient.19.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.19.png
rename to sc2/content/base/nav/ambient.19.png
diff --git a/sc2/content/base/nav/ambanim.2.png b/sc2/content/base/nav/ambient.2.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.2.png
rename to sc2/content/base/nav/ambient.2.png
diff --git a/sc2/content/base/nav/ambanim.20.png b/sc2/content/base/nav/ambient.20.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.20.png
rename to sc2/content/base/nav/ambient.20.png
diff --git a/sc2/content/base/nav/ambanim.21.png b/sc2/content/base/nav/ambient.21.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.21.png
rename to sc2/content/base/nav/ambient.21.png
diff --git a/sc2/content/base/nav/ambanim.22.png b/sc2/content/base/nav/ambient.22.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.22.png
rename to sc2/content/base/nav/ambient.22.png
diff --git a/sc2/content/base/nav/ambanim.23.png b/sc2/content/base/nav/ambient.23.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.23.png
rename to sc2/content/base/nav/ambient.23.png
diff --git a/sc2/content/base/nav/ambanim.24.png b/sc2/content/base/nav/ambient.24.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.24.png
rename to sc2/content/base/nav/ambient.24.png
diff --git a/sc2/content/base/nav/ambanim.25.png b/sc2/content/base/nav/ambient.25.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.25.png
rename to sc2/content/base/nav/ambient.25.png
diff --git a/sc2/content/base/nav/ambanim.26.png b/sc2/content/base/nav/ambient.26.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.26.png
rename to sc2/content/base/nav/ambient.26.png
diff --git a/sc2/content/base/nav/ambanim.27.png b/sc2/content/base/nav/ambient.27.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.27.png
rename to sc2/content/base/nav/ambient.27.png
diff --git a/sc2/content/base/nav/ambanim.28.png b/sc2/content/base/nav/ambient.28.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.28.png
rename to sc2/content/base/nav/ambient.28.png
diff --git a/sc2/content/base/nav/ambanim.29.png b/sc2/content/base/nav/ambient.29.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.29.png
rename to sc2/content/base/nav/ambient.29.png
diff --git a/sc2/content/base/nav/ambanim.3.png b/sc2/content/base/nav/ambient.3.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.3.png
rename to sc2/content/base/nav/ambient.3.png
diff --git a/sc2/content/base/nav/ambanim.30.png b/sc2/content/base/nav/ambient.30.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.30.png
rename to sc2/content/base/nav/ambient.30.png
diff --git a/sc2/content/base/nav/ambanim.31.png b/sc2/content/base/nav/ambient.31.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.31.png
rename to sc2/content/base/nav/ambient.31.png
diff --git a/sc2/content/base/nav/ambanim.32.png b/sc2/content/base/nav/ambient.32.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.32.png
rename to sc2/content/base/nav/ambient.32.png
diff --git a/sc2/content/base/nav/ambanim.33.png b/sc2/content/base/nav/ambient.33.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.33.png
rename to sc2/content/base/nav/ambient.33.png
diff --git a/sc2/content/base/nav/ambanim.34.png b/sc2/content/base/nav/ambient.34.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.34.png
rename to sc2/content/base/nav/ambient.34.png
diff --git a/sc2/content/base/nav/ambanim.35.png b/sc2/content/base/nav/ambient.35.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.35.png
rename to sc2/content/base/nav/ambient.35.png
diff --git a/sc2/content/base/nav/ambanim.36.png b/sc2/content/base/nav/ambient.36.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.36.png
rename to sc2/content/base/nav/ambient.36.png
diff --git a/sc2/content/base/nav/ambanim.37.png b/sc2/content/base/nav/ambient.37.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.37.png
rename to sc2/content/base/nav/ambient.37.png
diff --git a/sc2/content/base/nav/ambanim.38.png b/sc2/content/base/nav/ambient.38.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.38.png
rename to sc2/content/base/nav/ambient.38.png
diff --git a/sc2/content/base/nav/ambanim.39.png b/sc2/content/base/nav/ambient.39.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.39.png
rename to sc2/content/base/nav/ambient.39.png
diff --git a/sc2/content/base/nav/ambanim.4.png b/sc2/content/base/nav/ambient.4.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.4.png
rename to sc2/content/base/nav/ambient.4.png
diff --git a/sc2/content/base/nav/ambanim.40.png b/sc2/content/base/nav/ambient.40.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.40.png
rename to sc2/content/base/nav/ambient.40.png
diff --git a/sc2/content/base/nav/ambanim.41.png b/sc2/content/base/nav/ambient.41.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.41.png
rename to sc2/content/base/nav/ambient.41.png
diff --git a/sc2/content/base/nav/ambanim.42.png b/sc2/content/base/nav/ambient.42.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.42.png
rename to sc2/content/base/nav/ambient.42.png
diff --git a/sc2/content/base/nav/ambanim.43.png b/sc2/content/base/nav/ambient.43.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.43.png
rename to sc2/content/base/nav/ambient.43.png
diff --git a/sc2/content/base/nav/ambanim.44.png b/sc2/content/base/nav/ambient.44.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.44.png
rename to sc2/content/base/nav/ambient.44.png
diff --git a/sc2/content/base/nav/ambanim.45.png b/sc2/content/base/nav/ambient.45.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.45.png
rename to sc2/content/base/nav/ambient.45.png
diff --git a/sc2/content/base/nav/ambanim.46.png b/sc2/content/base/nav/ambient.46.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.46.png
rename to sc2/content/base/nav/ambient.46.png
diff --git a/sc2/content/base/nav/ambanim.47.png b/sc2/content/base/nav/ambient.47.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.47.png
rename to sc2/content/base/nav/ambient.47.png
diff --git a/sc2/content/base/nav/ambanim.48.png b/sc2/content/base/nav/ambient.48.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.48.png
rename to sc2/content/base/nav/ambient.48.png
diff --git a/sc2/content/base/nav/ambanim.49.png b/sc2/content/base/nav/ambient.49.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.49.png
rename to sc2/content/base/nav/ambient.49.png
diff --git a/sc2/content/base/nav/ambanim.5.png b/sc2/content/base/nav/ambient.5.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.5.png
rename to sc2/content/base/nav/ambient.5.png
diff --git a/sc2/content/base/nav/ambanim.50.png b/sc2/content/base/nav/ambient.50.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.50.png
rename to sc2/content/base/nav/ambient.50.png
diff --git a/sc2/content/base/nav/ambanim.51.png b/sc2/content/base/nav/ambient.51.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.51.png
rename to sc2/content/base/nav/ambient.51.png
diff --git a/sc2/content/base/nav/ambanim.52.png b/sc2/content/base/nav/ambient.52.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.52.png
rename to sc2/content/base/nav/ambient.52.png
diff --git a/sc2/content/base/nav/ambanim.53.png b/sc2/content/base/nav/ambient.53.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.53.png
rename to sc2/content/base/nav/ambient.53.png
diff --git a/sc2/content/base/nav/ambanim.54.png b/sc2/content/base/nav/ambient.54.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.54.png
rename to sc2/content/base/nav/ambient.54.png
diff --git a/sc2/content/base/nav/ambanim.55.png b/sc2/content/base/nav/ambient.55.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.55.png
rename to sc2/content/base/nav/ambient.55.png
diff --git a/sc2/content/base/nav/ambanim.56.png b/sc2/content/base/nav/ambient.56.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.56.png
rename to sc2/content/base/nav/ambient.56.png
diff --git a/sc2/content/base/nav/ambanim.57.png b/sc2/content/base/nav/ambient.57.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.57.png
rename to sc2/content/base/nav/ambient.57.png
diff --git a/sc2/content/base/nav/ambanim.58.png b/sc2/content/base/nav/ambient.58.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.58.png
rename to sc2/content/base/nav/ambient.58.png
diff --git a/sc2/content/base/nav/ambanim.59.png b/sc2/content/base/nav/ambient.59.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.59.png
rename to sc2/content/base/nav/ambient.59.png
diff --git a/sc2/content/base/nav/ambanim.6.png b/sc2/content/base/nav/ambient.6.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.6.png
rename to sc2/content/base/nav/ambient.6.png
diff --git a/sc2/content/base/nav/ambanim.60.png b/sc2/content/base/nav/ambient.60.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.60.png
rename to sc2/content/base/nav/ambient.60.png
diff --git a/sc2/content/base/nav/ambanim.61.png b/sc2/content/base/nav/ambient.61.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.61.png
rename to sc2/content/base/nav/ambient.61.png
diff --git a/sc2/content/base/nav/ambanim.62.png b/sc2/content/base/nav/ambient.62.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.62.png
rename to sc2/content/base/nav/ambient.62.png
diff --git a/sc2/content/base/nav/ambanim.63.png b/sc2/content/base/nav/ambient.63.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.63.png
rename to sc2/content/base/nav/ambient.63.png
diff --git a/sc2/content/base/nav/ambanim.64.png b/sc2/content/base/nav/ambient.64.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.64.png
rename to sc2/content/base/nav/ambient.64.png
diff --git a/sc2/content/base/nav/ambanim.65.png b/sc2/content/base/nav/ambient.65.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.65.png
rename to sc2/content/base/nav/ambient.65.png
diff --git a/sc2/content/base/nav/ambanim.66.png b/sc2/content/base/nav/ambient.66.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.66.png
rename to sc2/content/base/nav/ambient.66.png
diff --git a/sc2/content/base/nav/ambanim.67.png b/sc2/content/base/nav/ambient.67.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.67.png
rename to sc2/content/base/nav/ambient.67.png
diff --git a/sc2/content/base/nav/ambanim.68.png b/sc2/content/base/nav/ambient.68.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.68.png
rename to sc2/content/base/nav/ambient.68.png
diff --git a/sc2/content/base/nav/ambanim.69.png b/sc2/content/base/nav/ambient.69.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.69.png
rename to sc2/content/base/nav/ambient.69.png
diff --git a/sc2/content/base/nav/ambanim.7.png b/sc2/content/base/nav/ambient.7.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.7.png
rename to sc2/content/base/nav/ambient.7.png
diff --git a/sc2/content/base/nav/ambanim.70.png b/sc2/content/base/nav/ambient.70.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.70.png
rename to sc2/content/base/nav/ambient.70.png
diff --git a/sc2/content/base/nav/ambanim.71.png b/sc2/content/base/nav/ambient.71.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.71.png
rename to sc2/content/base/nav/ambient.71.png
diff --git a/sc2/content/base/nav/ambanim.72.png b/sc2/content/base/nav/ambient.72.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.72.png
rename to sc2/content/base/nav/ambient.72.png
diff --git a/sc2/content/base/nav/ambanim.73.png b/sc2/content/base/nav/ambient.73.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.73.png
rename to sc2/content/base/nav/ambient.73.png
diff --git a/sc2/content/base/nav/ambanim.74.png b/sc2/content/base/nav/ambient.74.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.74.png
rename to sc2/content/base/nav/ambient.74.png
diff --git a/sc2/content/base/nav/ambanim.75.png b/sc2/content/base/nav/ambient.75.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.75.png
rename to sc2/content/base/nav/ambient.75.png
diff --git a/sc2/content/base/nav/ambanim.76.png b/sc2/content/base/nav/ambient.76.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.76.png
rename to sc2/content/base/nav/ambient.76.png
diff --git a/sc2/content/base/nav/ambanim.77.png b/sc2/content/base/nav/ambient.77.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.77.png
rename to sc2/content/base/nav/ambient.77.png
diff --git a/sc2/content/base/nav/ambanim.78.png b/sc2/content/base/nav/ambient.78.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.78.png
rename to sc2/content/base/nav/ambient.78.png
diff --git a/sc2/content/base/nav/ambanim.79.png b/sc2/content/base/nav/ambient.79.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.79.png
rename to sc2/content/base/nav/ambient.79.png
diff --git a/sc2/content/base/nav/ambanim.8.png b/sc2/content/base/nav/ambient.8.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.8.png
rename to sc2/content/base/nav/ambient.8.png
diff --git a/sc2/content/base/nav/ambanim.80.png b/sc2/content/base/nav/ambient.80.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.80.png
rename to sc2/content/base/nav/ambient.80.png
diff --git a/sc2/content/base/nav/ambanim.81.png b/sc2/content/base/nav/ambient.81.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.81.png
rename to sc2/content/base/nav/ambient.81.png
diff --git a/sc2/content/base/nav/ambanim.82.png b/sc2/content/base/nav/ambient.82.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.82.png
rename to sc2/content/base/nav/ambient.82.png
diff --git a/sc2/content/base/nav/ambanim.83.png b/sc2/content/base/nav/ambient.83.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.83.png
rename to sc2/content/base/nav/ambient.83.png
diff --git a/sc2/content/base/nav/ambanim.84.png b/sc2/content/base/nav/ambient.84.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.84.png
rename to sc2/content/base/nav/ambient.84.png
diff --git a/sc2/content/base/nav/ambanim.85.png b/sc2/content/base/nav/ambient.85.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.85.png
rename to sc2/content/base/nav/ambient.85.png
diff --git a/sc2/content/base/nav/ambanim.86.png b/sc2/content/base/nav/ambient.86.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.86.png
rename to sc2/content/base/nav/ambient.86.png
diff --git a/sc2/content/base/nav/ambanim.87.png b/sc2/content/base/nav/ambient.87.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.87.png
rename to sc2/content/base/nav/ambient.87.png
diff --git a/sc2/content/base/nav/ambanim.88.png b/sc2/content/base/nav/ambient.88.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.88.png
rename to sc2/content/base/nav/ambient.88.png
diff --git a/sc2/content/base/nav/ambanim.89.png b/sc2/content/base/nav/ambient.89.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.89.png
rename to sc2/content/base/nav/ambient.89.png
diff --git a/sc2/content/base/nav/ambanim.9.png b/sc2/content/base/nav/ambient.9.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.9.png
rename to sc2/content/base/nav/ambient.9.png
diff --git a/sc2/content/base/nav/ambanim.90.png b/sc2/content/base/nav/ambient.90.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.90.png
rename to sc2/content/base/nav/ambient.90.png
diff --git a/sc2/content/base/nav/ambanim.91.png b/sc2/content/base/nav/ambient.91.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.91.png
rename to sc2/content/base/nav/ambient.91.png
diff --git a/sc2/content/base/nav/ambanim.92.png b/sc2/content/base/nav/ambient.92.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.92.png
rename to sc2/content/base/nav/ambient.92.png
diff --git a/sc2/content/base/nav/ambanim.93.png b/sc2/content/base/nav/ambient.93.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.93.png
rename to sc2/content/base/nav/ambient.93.png
diff --git a/sc2/content/base/nav/ambanim.94.png b/sc2/content/base/nav/ambient.94.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.94.png
rename to sc2/content/base/nav/ambient.94.png
diff --git a/sc2/content/base/nav/ambanim.95.png b/sc2/content/base/nav/ambient.95.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.95.png
rename to sc2/content/base/nav/ambient.95.png
diff --git a/sc2/content/base/nav/ambanim.96.png b/sc2/content/base/nav/ambient.96.png
similarity index 100%
rename from sc2/content/base/nav/ambanim.96.png
rename to sc2/content/base/nav/ambient.96.png
diff --git a/sc2/content/base/nav/ambient.ani b/sc2/content/base/nav/ambient.ani
new file mode 100644
index 000000000..b56b94a2e
--- /dev/null
+++ b/sc2/content/base/nav/ambient.ani
@@ -0,0 +1,97 @@
+ambient.0.png 0 53 17 -17
+ambient.1.png 0 53 18 -16
+ambient.2.png 0 53 19 -15
+ambient.3.png 0 53 19 -15
+ambient.4.png 0 53 20 -13
+ambient.5.png 0 53 21 -7
+ambient.6.png 0 53 23 19
+ambient.7.png 0 53 26 20
+ambient.8.png 0 53 -4 21
+ambient.9.png 0 53 -10 23
+ambient.10.png 0 53 -8 25
+ambient.11.png 0 53 -15 19
+ambient.12.png 0 53 -15 19
+ambient.13.png 0 53 -16 18
+ambient.14.png 0 53 14 -8
+ambient.15.png 0 53 15 -7
+ambient.16.png 0 53 16 -6
+ambient.17.png 0 53 16 -4
+ambient.18.png 0 53 17 -1
+ambient.19.png 0 53 5 -2
+ambient.20.png 0 53 0 -2
+ambient.21.png 0 53 0 11
+ambient.22.png 0 53 -2 12
+ambient.23.png 0 53 -10 13
+ambient.24.png 0 53 -11 14
+ambient.25.png 0 53 -10 15
+ambient.26.png 0 53 0 0
+ambient.27.png 0 53 1 1
+ambient.28.png 0 53 2 2
+ambient.29.png 0 53 3 3
+ambient.30.png 0 53 4 4
+ambient.31.png 0 53 4 4
+ambient.32.png 0 53 4 4
+ambient.33.png 0 53 4 4
+ambient.34.png 0 53 4 4
+ambient.35.png 0 53 3 3
+ambient.36.png 0 53 2 2
+ambient.37.png 0 53 0 0
+ambient.38.png 0 53 0 0
+ambient.39.png 0 53 0 0
+ambient.40.png 0 53 0 0
+ambient.41.png 0 53 0 0
+ambient.42.png 0 53 0 0
+ambient.43.png 0 53 1 1
+ambient.44.png 0 53 2 2
+ambient.45.png 0 53 3 3
+ambient.46.png 0 53 4 4
+ambient.47.png 0 53 4 4
+ambient.48.png 0 53 4 4
+ambient.49.png 0 53 4 4
+ambient.50.png 0 53 4 4
+ambient.51.png 0 53 3 3
+ambient.52.png 0 53 2 2
+ambient.53.png 0 53 0 0
+ambient.54.png 0 53 0 0
+ambient.55.png 0 53 0 0
+ambient.56.png 0 53 0 0
+ambient.57.png 0 53 0 0
+ambient.58.png 0 53 0 0
+ambient.59.png 0 53 0 0
+ambient.60.png 0 53 1 1
+ambient.61.png 0 53 1 1
+ambient.62.png 0 53 2 2
+ambient.63.png 0 53 3 3
+ambient.64.png 0 53 4 4
+ambient.65.png 0 53 5 5
+ambient.66.png 0 53 5 5
+ambient.67.png 0 53 6 6
+ambient.68.png 0 53 7 7
+ambient.69.png 0 53 0 0
+ambient.70.png 0 53 0 0
+ambient.71.png 0 53 0 0
+ambient.72.png 0 53 0 0
+ambient.73.png 0 53 0 0
+ambient.74.png 0 53 0 0
+ambient.75.png 0 53 0 0
+ambient.76.png 0 53 0 0
+ambient.77.png 0 53 0 0
+ambient.78.png 0 53 0 0
+ambient.79.png 0 53 0 0
+ambient.80.png 0 53 0 0
+ambient.81.png 0 53 0 0
+ambient.82.png 0 53 0 0
+ambient.83.png 0 53 0 0
+ambient.84.png 0 53 0 0
+ambient.85.png 0 53 0 0
+ambient.86.png 0 53 0 0
+ambient.87.png 0 53 0 0
+ambient.88.png 0 53 0 0
+ambient.89.png 0 53 0 0
+ambient.90.png 0 53 2 2
+ambient.91.png 0 53 1 1
+ambient.92.png 0 53 1 1
+ambient.93.png 0 53 1 1
+ambient.94.png 0 53 2 2
+ambient.95.png 0 53 3 3
+ambient.96.png 0 53 0 0
diff --git a/sc2/content/base/nav/ambientanim.ani b/sc2/content/base/nav/ambientanim.ani
deleted file mode 100644
index 6738ad150..000000000
--- a/sc2/content/base/nav/ambientanim.ani
+++ /dev/null
@@ -1,97 +0,0 @@
-ambanim.0.png 0 53 17 -17
-ambanim.1.png 0 53 18 -16
-ambanim.2.png 0 53 19 -15
-ambanim.3.png 0 53 19 -15
-ambanim.4.png 0 53 20 -13
-ambanim.5.png 0 53 21 -7
-ambanim.6.png 0 53 23 19
-ambanim.7.png 0 53 26 20
-ambanim.8.png 0 53 -4 21
-ambanim.9.png 0 53 -10 23
-ambanim.10.png 0 53 -8 25
-ambanim.11.png 0 53 -15 19
-ambanim.12.png 0 53 -15 19
-ambanim.13.png 0 53 -16 18
-ambanim.14.png 0 53 14 -8
-ambanim.15.png 0 53 15 -7
-ambanim.16.png 0 53 16 -6
-ambanim.17.png 0 53 16 -4
-ambanim.18.png 0 53 17 -1
-ambanim.19.png 0 53 5 -2
-ambanim.20.png 0 53 0 -2
-ambanim.21.png 0 53 0 11
-ambanim.22.png 0 53 -2 12
-ambanim.23.png 0 53 -10 13
-ambanim.24.png 0 53 -11 14
-ambanim.25.png 0 53 -10 15
-ambanim.26.png 0 53 0 0
-ambanim.27.png 0 53 1 1
-ambanim.28.png 0 53 2 2
-ambanim.29.png 0 53 3 3
-ambanim.30.png 0 53 4 4
-ambanim.31.png 0 53 4 4
-ambanim.32.png 0 53 4 4
-ambanim.33.png 0 53 4 4
-ambanim.34.png 0 53 4 4
-ambanim.35.png 0 53 3 3
-ambanim.36.png 0 53 2 2
-ambanim.37.png 0 53 0 0
-ambanim.38.png 0 53 0 0
-ambanim.39.png 0 53 0 0
-ambanim.40.png 0 53 0 0
-ambanim.41.png 0 53 0 0
-ambanim.42.png 0 53 0 0
-ambanim.43.png 0 53 1 1
-ambanim.44.png 0 53 2 2
-ambanim.45.png 0 53 3 3
-ambanim.46.png 0 53 4 4
-ambanim.47.png 0 53 4 4
-ambanim.48.png 0 53 4 4
-ambanim.49.png 0 53 4 4
-ambanim.50.png 0 53 4 4
-ambanim.51.png 0 53 3 3
-ambanim.52.png 0 53 2 2
-ambanim.53.png 0 53 0 0
-ambanim.54.png 0 53 0 0
-ambanim.55.png 0 53 0 0
-ambanim.56.png 0 53 0 0
-ambanim.57.png 0 53 0 0
-ambanim.58.png 0 53 0 0
-ambanim.59.png 0 53 0 0
-ambanim.60.png 0 53 1 1
-ambanim.61.png 0 53 1 1
-ambanim.62.png 0 53 2 2
-ambanim.63.png 0 53 3 3
-ambanim.64.png 0 53 4 4
-ambanim.65.png 0 53 5 5
-ambanim.66.png 0 53 5 5
-ambanim.67.png 0 53 6 6
-ambanim.68.png 0 53 7 7
-ambanim.69.png 0 53 0 0
-ambanim.70.png 0 53 0 0
-ambanim.71.png 0 53 0 0
-ambanim.72.png 0 53 0 0
-ambanim.73.png 0 53 0 0
-ambanim.74.png 0 53 0 0
-ambanim.75.png 0 53 0 0
-ambanim.76.png 0 53 0 0
-ambanim.77.png 0 53 0 0
-ambanim.78.png 0 53 0 0
-ambanim.79.png 0 53 0 0
-ambanim.80.png 0 53 0 0
-ambanim.81.png 0 53 0 0
-ambanim.82.png 0 53 0 0
-ambanim.83.png 0 53 0 0
-ambanim.84.png 0 53 0 0
-ambanim.85.png 0 53 0 0
-ambanim.86.png 0 53 0 0
-ambanim.87.png 0 53 0 0
-ambanim.88.png 0 53 0 0
-ambanim.89.png 0 53 0 0
-ambanim.90.png 0 53 2 2
-ambanim.91.png 0 53 1 1
-ambanim.92.png 0 53 1 1
-ambanim.93.png 0 53 1 1
-ambanim.94.png 0 53 2 2
-ambanim.95.png 0 53 3 3
-ambanim.96.png 0 53 0 0
diff --git a/sc2/content/base/nav/sis_ip.0.png b/sc2/content/base/nav/flagship.0.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.0.png
rename to sc2/content/base/nav/flagship.0.png
diff --git a/sc2/content/base/nav/sis_ip.1.png b/sc2/content/base/nav/flagship.1.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.1.png
rename to sc2/content/base/nav/flagship.1.png
diff --git a/sc2/content/base/nav/sis_ip.10.png b/sc2/content/base/nav/flagship.10.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.10.png
rename to sc2/content/base/nav/flagship.10.png
diff --git a/sc2/content/base/nav/sis_ip.11.png b/sc2/content/base/nav/flagship.11.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.11.png
rename to sc2/content/base/nav/flagship.11.png
diff --git a/sc2/content/base/nav/sis_ip.12.png b/sc2/content/base/nav/flagship.12.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.12.png
rename to sc2/content/base/nav/flagship.12.png
diff --git a/sc2/content/base/nav/sis_ip.13.png b/sc2/content/base/nav/flagship.13.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.13.png
rename to sc2/content/base/nav/flagship.13.png
diff --git a/sc2/content/base/nav/sis_ip.14.png b/sc2/content/base/nav/flagship.14.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.14.png
rename to sc2/content/base/nav/flagship.14.png
diff --git a/sc2/content/base/nav/sis_ip.15.png b/sc2/content/base/nav/flagship.15.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.15.png
rename to sc2/content/base/nav/flagship.15.png
diff --git a/sc2/content/base/nav/sis_ip.2.png b/sc2/content/base/nav/flagship.2.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.2.png
rename to sc2/content/base/nav/flagship.2.png
diff --git a/sc2/content/base/nav/sis_ip.3.png b/sc2/content/base/nav/flagship.3.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.3.png
rename to sc2/content/base/nav/flagship.3.png
diff --git a/sc2/content/base/nav/sis_ip.4.png b/sc2/content/base/nav/flagship.4.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.4.png
rename to sc2/content/base/nav/flagship.4.png
diff --git a/sc2/content/base/nav/sis_ip.5.png b/sc2/content/base/nav/flagship.5.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.5.png
rename to sc2/content/base/nav/flagship.5.png
diff --git a/sc2/content/base/nav/sis_ip.6.png b/sc2/content/base/nav/flagship.6.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.6.png
rename to sc2/content/base/nav/flagship.6.png
diff --git a/sc2/content/base/nav/sis_ip.7.png b/sc2/content/base/nav/flagship.7.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.7.png
rename to sc2/content/base/nav/flagship.7.png
diff --git a/sc2/content/base/nav/sis_ip.8.png b/sc2/content/base/nav/flagship.8.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.8.png
rename to sc2/content/base/nav/flagship.8.png
diff --git a/sc2/content/base/nav/sis_ip.9.png b/sc2/content/base/nav/flagship.9.png
similarity index 100%
rename from sc2/content/base/nav/sis_ip.9.png
rename to sc2/content/base/nav/flagship.9.png
diff --git a/sc2/content/base/nav/flagship.ani b/sc2/content/base/nav/flagship.ani
new file mode 100644
index 000000000..fe79a2522
--- /dev/null
+++ b/sc2/content/base/nav/flagship.ani
@@ -0,0 +1,16 @@
+flagship.0.png 0 55 3 6
+flagship.1.png 0 55 4 6
+flagship.2.png 0 55 5 5
+flagship.3.png 0 55 6 3
+flagship.4.png 0 55 6 3
+flagship.5.png 0 55 6 4
+flagship.6.png 0 55 5 5
+flagship.7.png 0 55 4 6
+flagship.8.png 0 55 3 6
+flagship.9.png 0 55 3 6
+flagship.10.png 0 55 5 5
+flagship.11.png 0 55 7 4
+flagship.12.png 0 55 8 3
+flagship.13.png 0 55 7 3
+flagship.14.png 0 55 5 5
+flagship.15.png 0 55 3 6
diff --git a/sc2/content/base/nav/hyperstr.0.png b/sc2/content/base/nav/hyperstars.0.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.0.png
rename to sc2/content/base/nav/hyperstars.0.png
diff --git a/sc2/content/base/nav/hyperstr.1.png b/sc2/content/base/nav/hyperstars.1.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.1.png
rename to sc2/content/base/nav/hyperstars.1.png
diff --git a/sc2/content/base/nav/hyperstr.10.png b/sc2/content/base/nav/hyperstars.10.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.10.png
rename to sc2/content/base/nav/hyperstars.10.png
diff --git a/sc2/content/base/nav/hyperstr.11.png b/sc2/content/base/nav/hyperstars.11.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.11.png
rename to sc2/content/base/nav/hyperstars.11.png
diff --git a/sc2/content/base/nav/hyperstr.12.png b/sc2/content/base/nav/hyperstars.12.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.12.png
rename to sc2/content/base/nav/hyperstars.12.png
diff --git a/sc2/content/base/nav/hyperstr.13.png b/sc2/content/base/nav/hyperstars.13.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.13.png
rename to sc2/content/base/nav/hyperstars.13.png
diff --git a/sc2/content/base/nav/hyperstr.14.png b/sc2/content/base/nav/hyperstars.14.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.14.png
rename to sc2/content/base/nav/hyperstars.14.png
diff --git a/sc2/content/base/nav/hyperstr.15.png b/sc2/content/base/nav/hyperstars.15.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.15.png
rename to sc2/content/base/nav/hyperstars.15.png
diff --git a/sc2/content/base/nav/hyperstr.16.png b/sc2/content/base/nav/hyperstars.16.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.16.png
rename to sc2/content/base/nav/hyperstars.16.png
diff --git a/sc2/content/base/nav/hyperstr.17.png b/sc2/content/base/nav/hyperstars.17.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.17.png
rename to sc2/content/base/nav/hyperstars.17.png
diff --git a/sc2/content/base/nav/hyperstr.18.png b/sc2/content/base/nav/hyperstars.18.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.18.png
rename to sc2/content/base/nav/hyperstars.18.png
diff --git a/sc2/content/base/nav/hyperstr.19.png b/sc2/content/base/nav/hyperstars.19.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.19.png
rename to sc2/content/base/nav/hyperstars.19.png
diff --git a/sc2/content/base/nav/hyperstr.2.png b/sc2/content/base/nav/hyperstars.2.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.2.png
rename to sc2/content/base/nav/hyperstars.2.png
diff --git a/sc2/content/base/nav/hyperstr.20.png b/sc2/content/base/nav/hyperstars.20.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.20.png
rename to sc2/content/base/nav/hyperstars.20.png
diff --git a/sc2/content/base/nav/hyperstr.21.png b/sc2/content/base/nav/hyperstars.21.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.21.png
rename to sc2/content/base/nav/hyperstars.21.png
diff --git a/sc2/content/base/nav/hyperstr.22.png b/sc2/content/base/nav/hyperstars.22.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.22.png
rename to sc2/content/base/nav/hyperstars.22.png
diff --git a/sc2/content/base/nav/hyperstr.23.png b/sc2/content/base/nav/hyperstars.23.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.23.png
rename to sc2/content/base/nav/hyperstars.23.png
diff --git a/sc2/content/base/nav/hyperstr.24.png b/sc2/content/base/nav/hyperstars.24.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.24.png
rename to sc2/content/base/nav/hyperstars.24.png
diff --git a/sc2/content/base/nav/hyperstr.25.png b/sc2/content/base/nav/hyperstars.25.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.25.png
rename to sc2/content/base/nav/hyperstars.25.png
diff --git a/sc2/content/base/nav/hyperstr.26.png b/sc2/content/base/nav/hyperstars.26.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.26.png
rename to sc2/content/base/nav/hyperstars.26.png
diff --git a/sc2/content/base/nav/hyperstr.27.png b/sc2/content/base/nav/hyperstars.27.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.27.png
rename to sc2/content/base/nav/hyperstars.27.png
diff --git a/sc2/content/base/nav/hyperstr.28.png b/sc2/content/base/nav/hyperstars.28.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.28.png
rename to sc2/content/base/nav/hyperstars.28.png
diff --git a/sc2/content/base/nav/hyperstr.29.png b/sc2/content/base/nav/hyperstars.29.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.29.png
rename to sc2/content/base/nav/hyperstars.29.png
diff --git a/sc2/content/base/nav/hyperstr.3.png b/sc2/content/base/nav/hyperstars.3.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.3.png
rename to sc2/content/base/nav/hyperstars.3.png
diff --git a/sc2/content/base/nav/hyperstr.30.png b/sc2/content/base/nav/hyperstars.30.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.30.png
rename to sc2/content/base/nav/hyperstars.30.png
diff --git a/sc2/content/base/nav/hyperstr.31.png b/sc2/content/base/nav/hyperstars.31.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.31.png
rename to sc2/content/base/nav/hyperstars.31.png
diff --git a/sc2/content/base/nav/hyperstr.4.png b/sc2/content/base/nav/hyperstars.4.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.4.png
rename to sc2/content/base/nav/hyperstars.4.png
diff --git a/sc2/content/base/nav/hyperstr.5.png b/sc2/content/base/nav/hyperstars.5.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.5.png
rename to sc2/content/base/nav/hyperstars.5.png
diff --git a/sc2/content/base/nav/hyperstr.6.png b/sc2/content/base/nav/hyperstars.6.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.6.png
rename to sc2/content/base/nav/hyperstars.6.png
diff --git a/sc2/content/base/nav/hyperstr.7.png b/sc2/content/base/nav/hyperstars.7.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.7.png
rename to sc2/content/base/nav/hyperstars.7.png
diff --git a/sc2/content/base/nav/hyperstr.8.png b/sc2/content/base/nav/hyperstars.8.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.8.png
rename to sc2/content/base/nav/hyperstars.8.png
diff --git a/sc2/content/base/nav/hyperstr.9.png b/sc2/content/base/nav/hyperstars.9.png
similarity index 100%
rename from sc2/content/base/nav/hyperstr.9.png
rename to sc2/content/base/nav/hyperstars.9.png
diff --git a/sc2/content/base/nav/hyperstars.ani b/sc2/content/base/nav/hyperstars.ani
new file mode 100644
index 000000000..165bd791a
--- /dev/null
+++ b/sc2/content/base/nav/hyperstars.ani
@@ -0,0 +1,32 @@
+hyperstars.0.png 0 54 19 18
+hyperstars.1.png 0 54 24 22
+hyperstars.2.png 0 54 18 17
+hyperstars.3.png 0 54 23 21
+hyperstars.4.png 0 54 15 16
+hyperstars.5.png 0 54 21 19
+hyperstars.6.png 0 54 30 27
+hyperstars.7.png 0 54 25 23
+hyperstars.8.png 0 54 27 24
+hyperstars.9.png 0 54 29 29
+hyperstars.10.png 0 54 29 29
+hyperstars.11.png 0 54 24 22
+hyperstars.12.png 0 54 28 25
+hyperstars.13.png 0 54 28 25
+hyperstars.14.png 0 54 30 27
+hyperstars.15.png 0 54 30 27
+hyperstars.16.png 0 54 28 25
+hyperstars.17.png 0 54 30 27
+hyperstars.18.png 0 54 4 3
+hyperstars.19.png 0 54 6 5
+hyperstars.20.png 0 54 8 7
+hyperstars.21.png 0 54 14 12
+hyperstars.22.png 0 54 19 17
+hyperstars.23.png 0 54 2 2
+hyperstars.24.png 0 54 3 3
+hyperstars.25.png 0 54 5 5
+hyperstars.26.png 0 54 6 6
+hyperstars.27.png 0 54 8 7
+hyperstars.28.png 0 54 9 8
+hyperstars.29.png 0 54 10 9
+hyperstars.30.png 0 54 11 10
+hyperstars.31.png 0 54 12 11
diff --git a/sc2/content/base/nav/hyperstr.ani b/sc2/content/base/nav/hyperstr.ani
deleted file mode 100644
index e4c7927db..000000000
--- a/sc2/content/base/nav/hyperstr.ani
+++ /dev/null
@@ -1,32 +0,0 @@
-hyperstr.0.png 0 54 19 18
-hyperstr.1.png 0 54 24 22
-hyperstr.2.png 0 54 18 17
-hyperstr.3.png 0 54 23 21
-hyperstr.4.png 0 54 15 16
-hyperstr.5.png 0 54 21 19
-hyperstr.6.png 0 54 30 27
-hyperstr.7.png 0 54 25 23
-hyperstr.8.png 0 54 27 24
-hyperstr.9.png 0 54 29 29
-hyperstr.10.png 0 54 29 29
-hyperstr.11.png 0 54 24 22
-hyperstr.12.png 0 54 28 25
-hyperstr.13.png 0 54 28 25
-hyperstr.14.png 0 54 30 27
-hyperstr.15.png 0 54 30 27
-hyperstr.16.png 0 54 28 25
-hyperstr.17.png 0 54 30 27
-hyperstr.18.png 0 54 4 3
-hyperstr.19.png 0 54 6 5
-hyperstr.20.png 0 54 8 7
-hyperstr.21.png 0 54 14 12
-hyperstr.22.png 0 54 19 17
-hyperstr.23.png 0 54 2 2
-hyperstr.24.png 0 54 3 3
-hyperstr.25.png 0 54 5 5
-hyperstr.26.png 0 54 6 6
-hyperstr.27.png 0 54 8 7
-hyperstr.28.png 0 54 9 8
-hyperstr.29.png 0 54 10 9
-hyperstr.30.png 0 54 11 10
-hyperstr.31.png 0 54 12 11
diff --git a/sc2/content/base/nav/ip_sun.ani b/sc2/content/base/nav/ip_sun.ani
deleted file mode 100644
index 039930853..000000000
--- a/sc2/content/base/nav/ip_sun.ani
+++ /dev/null
@@ -1,5 +0,0 @@
-ip_sun.0.png 0 56 2 2
-ip_sun.1.png 0 56 4 3
-ip_sun.2.png 0 56 8 7
-ip_sun.3.png 0 56 16 15
-ip_sun.4.png 0 56 26 24
diff --git a/sc2/content/base/nav/obbkgnd.ani b/sc2/content/base/nav/obbkgnd.ani
deleted file mode 100644
index 7bd31cab8..000000000
--- a/sc2/content/base/nav/obbkgnd.ani
+++ /dev/null
@@ -1,22 +0,0 @@
-obbkgnd.0.png 0 57 0 0
-obbkgnd.1.png 0 57 0 0
-obbkgnd.2.png 0 57 0 0
-obbkgnd.3.png 0 57 0 0
-obbkgnd.4.png 0 57 0 0
-obbkgnd.5.png 0 57 0 0
-obbkgnd.6.png 0 57 1 1
-obbkgnd.7.png 0 57 2 2
-obbkgnd.8.png 0 57 1 1
-obbkgnd.9.png 0 57 4 4
-obbkgnd.10.png 0 57 5 5
-obbkgnd.11.png 0 57 5 5
-obbkgnd.12.png 0 57 5 5
-obbkgnd.13.png 0 57 5 5
-obbkgnd.14.png 0 57 5 5
-obbkgnd.15.png 0 57 5 5
-obbkgnd.16.png 0 57 7 8
-obbkgnd.17.png 0 57 11 10
-obbkgnd.18.png 0 57 0 0
-obbkgnd.19.png 0 57 9 6
-obbkgnd.20.png 0 57 2 -15
-obbkgnd.21.png 0 57 0 0
diff --git a/sc2/content/base/nav/obbkgnd.0.png b/sc2/content/base/nav/orbitbackground.0.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.0.png
rename to sc2/content/base/nav/orbitbackground.0.png
diff --git a/sc2/content/base/nav/obbkgnd.1.png b/sc2/content/base/nav/orbitbackground.1.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.1.png
rename to sc2/content/base/nav/orbitbackground.1.png
diff --git a/sc2/content/base/nav/obbkgnd.10.png b/sc2/content/base/nav/orbitbackground.10.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.10.png
rename to sc2/content/base/nav/orbitbackground.10.png
diff --git a/sc2/content/base/nav/obbkgnd.11.png b/sc2/content/base/nav/orbitbackground.11.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.11.png
rename to sc2/content/base/nav/orbitbackground.11.png
diff --git a/sc2/content/base/nav/obbkgnd.12.png b/sc2/content/base/nav/orbitbackground.12.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.12.png
rename to sc2/content/base/nav/orbitbackground.12.png
diff --git a/sc2/content/base/nav/obbkgnd.13.png b/sc2/content/base/nav/orbitbackground.13.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.13.png
rename to sc2/content/base/nav/orbitbackground.13.png
diff --git a/sc2/content/base/nav/obbkgnd.14.png b/sc2/content/base/nav/orbitbackground.14.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.14.png
rename to sc2/content/base/nav/orbitbackground.14.png
diff --git a/sc2/content/base/nav/obbkgnd.15.png b/sc2/content/base/nav/orbitbackground.15.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.15.png
rename to sc2/content/base/nav/orbitbackground.15.png
diff --git a/sc2/content/base/nav/obbkgnd.16.png b/sc2/content/base/nav/orbitbackground.16.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.16.png
rename to sc2/content/base/nav/orbitbackground.16.png
diff --git a/sc2/content/base/nav/obbkgnd.17.png b/sc2/content/base/nav/orbitbackground.17.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.17.png
rename to sc2/content/base/nav/orbitbackground.17.png
diff --git a/sc2/content/base/nav/obbkgnd.18.png b/sc2/content/base/nav/orbitbackground.18.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.18.png
rename to sc2/content/base/nav/orbitbackground.18.png
diff --git a/sc2/content/base/nav/obbkgnd.19.png b/sc2/content/base/nav/orbitbackground.19.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.19.png
rename to sc2/content/base/nav/orbitbackground.19.png
diff --git a/sc2/content/base/nav/obbkgnd.2.png b/sc2/content/base/nav/orbitbackground.2.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.2.png
rename to sc2/content/base/nav/orbitbackground.2.png
diff --git a/sc2/content/base/nav/obbkgnd.20.png b/sc2/content/base/nav/orbitbackground.20.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.20.png
rename to sc2/content/base/nav/orbitbackground.20.png
diff --git a/sc2/content/base/nav/obbkgnd.21.png b/sc2/content/base/nav/orbitbackground.21.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.21.png
rename to sc2/content/base/nav/orbitbackground.21.png
diff --git a/sc2/content/base/nav/obbkgnd.3.png b/sc2/content/base/nav/orbitbackground.3.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.3.png
rename to sc2/content/base/nav/orbitbackground.3.png
diff --git a/sc2/content/base/nav/obbkgnd.4.png b/sc2/content/base/nav/orbitbackground.4.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.4.png
rename to sc2/content/base/nav/orbitbackground.4.png
diff --git a/sc2/content/base/nav/obbkgnd.5.png b/sc2/content/base/nav/orbitbackground.5.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.5.png
rename to sc2/content/base/nav/orbitbackground.5.png
diff --git a/sc2/content/base/nav/obbkgnd.6.png b/sc2/content/base/nav/orbitbackground.6.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.6.png
rename to sc2/content/base/nav/orbitbackground.6.png
diff --git a/sc2/content/base/nav/obbkgnd.7.png b/sc2/content/base/nav/orbitbackground.7.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.7.png
rename to sc2/content/base/nav/orbitbackground.7.png
diff --git a/sc2/content/base/nav/obbkgnd.8.png b/sc2/content/base/nav/orbitbackground.8.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.8.png
rename to sc2/content/base/nav/orbitbackground.8.png
diff --git a/sc2/content/base/nav/obbkgnd.9.png b/sc2/content/base/nav/orbitbackground.9.png
similarity index 100%
rename from sc2/content/base/nav/obbkgnd.9.png
rename to sc2/content/base/nav/orbitbackground.9.png
diff --git a/sc2/content/base/nav/orbitbackground.ani b/sc2/content/base/nav/orbitbackground.ani
new file mode 100644
index 000000000..8ef501396
--- /dev/null
+++ b/sc2/content/base/nav/orbitbackground.ani
@@ -0,0 +1,22 @@
+orbitbackground.0.png 0 57 0 0
+orbitbackground.1.png 0 57 0 0
+orbitbackground.2.png 0 57 0 0
+orbitbackground.3.png 0 57 0 0
+orbitbackground.4.png 0 57 0 0
+orbitbackground.5.png 0 57 0 0
+orbitbackground.6.png 0 57 1 1
+orbitbackground.7.png 0 57 2 2
+orbitbackground.8.png 0 57 1 1
+orbitbackground.9.png 0 57 4 4
+orbitbackground.10.png 0 57 5 5
+orbitbackground.11.png 0 57 5 5
+orbitbackground.12.png 0 57 5 5
+orbitbackground.13.png 0 57 5 5
+orbitbackground.14.png 0 57 5 5
+orbitbackground.15.png 0 57 5 5
+orbitbackground.16.png 0 57 7 8
+orbitbackground.17.png 0 57 11 10
+orbitbackground.18.png 0 57 0 0
+orbitbackground.19.png 0 57 9 6
+orbitbackground.20.png 0 57 2 -15
+orbitbackground.21.png 0 57 0 0
diff --git a/sc2/content/base/nav/orbenter.0.png b/sc2/content/base/nav/orbitenter.0.png
similarity index 100%
rename from sc2/content/base/nav/orbenter.0.png
rename to sc2/content/base/nav/orbitenter.0.png
diff --git a/sc2/content/base/nav/orbitenter.ani b/sc2/content/base/nav/orbitenter.ani
index 06f783d46..c1f09e6c5 100644
--- a/sc2/content/base/nav/orbitenter.ani
+++ b/sc2/content/base/nav/orbitenter.ani
@@ -1 +1 @@
-orbenter.0.png -1 -1 0 0
+orbitenter.0.png -1 -1 0 0
diff --git a/sc2/content/base/nav/orbplan.ani b/sc2/content/base/nav/orbplan.ani
deleted file mode 100644
index bbc7141ab..000000000
--- a/sc2/content/base/nav/orbplan.ani
+++ /dev/null
@@ -1,96 +0,0 @@
-orbplan.0.png 0 111 1 1
-orbplan.1.png 0 111 1 1
-orbplan.2.png 0 111 1 1
-orbplan.3.png 0 111 1 1
-orbplan.4.png 0 111 1 1
-orbplan.5.png 0 111 1 1
-orbplan.6.png 0 111 1 1
-orbplan.7.png 0 111 1 1
-orbplan.8.png 0 111 1 1
-orbplan.9.png 0 111 1 1
-orbplan.10.png 0 111 1 1
-orbplan.11.png 0 111 1 1
-orbplan.12.png 0 111 1 1
-orbplan.13.png 0 111 1 1
-orbplan.14.png 0 111 1 1
-orbplan.15.png 0 111 1 1
-orbplan.16.png 0 111 1 1
-orbplan.17.png 0 111 1 1
-orbplan.18.png 0 111 1 1
-orbplan.19.png 0 111 1 1
-orbplan.20.png 0 111 1 1
-orbplan.21.png 0 111 1 1
-orbplan.22.png 0 111 1 1
-orbplan.23.png 0 111 1 1
-orbplan.24.png 0 111 1 1
-orbplan.25.png 0 111 1 1
-orbplan.26.png 0 111 1 1
-orbplan.27.png 0 111 1 1
-orbplan.28.png 0 111 1 1
-orbplan.29.png 0 111 1 1
-orbplan.30.png 0 111 1 1
-orbplan.31.png 0 111 1 1
-orbplan.32.png 0 111 3 3
-orbplan.33.png 0 111 3 3
-orbplan.34.png 0 111 3 3
-orbplan.35.png 0 111 3 3
-orbplan.36.png 0 111 3 3
-orbplan.37.png 0 111 3 3
-orbplan.38.png 0 111 3 3
-orbplan.39.png 0 111 3 3
-orbplan.40.png 0 111 3 3
-orbplan.41.png 0 111 3 3
-orbplan.42.png 0 111 3 3
-orbplan.43.png 0 111 3 3
-orbplan.44.png 0 111 3 3
-orbplan.45.png 0 111 3 3
-orbplan.46.png 0 111 3 3
-orbplan.47.png 0 111 3 3
-orbplan.48.png 0 111 5 5
-orbplan.49.png 0 111 5 5
-orbplan.50.png 0 111 5 5
-orbplan.51.png 0 111 5 5
-orbplan.52.png 0 111 5 5
-orbplan.53.png 0 111 5 5
-orbplan.54.png 0 111 5 5
-orbplan.55.png 0 111 5 5
-orbplan.56.png 0 111 5 5
-orbplan.57.png 0 111 5 5
-orbplan.58.png 0 111 5 5
-orbplan.59.png 0 111 5 5
-orbplan.60.png 0 111 5 5
-orbplan.61.png 0 111 5 5
-orbplan.62.png 0 111 5 5
-orbplan.63.png 0 111 5 5
-orbplan.64.png 0 111 7 6
-orbplan.65.png 0 111 7 6
-orbplan.66.png 0 111 7 6
-orbplan.67.png 0 111 7 6
-orbplan.68.png 0 111 7 6
-orbplan.69.png 0 111 7 6
-orbplan.70.png 0 111 7 6
-orbplan.71.png 0 111 7 6
-orbplan.72.png 0 111 7 6
-orbplan.73.png 0 111 7 6
-orbplan.74.png 0 111 7 6
-orbplan.75.png 0 111 7 6
-orbplan.76.png 0 111 7 6
-orbplan.77.png 0 111 7 6
-orbplan.78.png 0 111 7 6
-orbplan.79.png 0 111 7 6
-orbplan.80.png 0 111 14 13
-orbplan.81.png 0 111 14 13
-orbplan.82.png 0 111 14 13
-orbplan.83.png 0 111 14 13
-orbplan.84.png 0 111 14 13
-orbplan.85.png 0 111 14 13
-orbplan.86.png 0 111 14 13
-orbplan.87.png 0 111 14 13
-orbplan.88.png 0 111 14 13
-orbplan.89.png 0 111 14 13
-orbplan.90.png 0 111 14 13
-orbplan.91.png 0 111 14 13
-orbplan.92.png 0 111 14 13
-orbplan.93.png 0 111 14 13
-orbplan.94.png 0 111 14 13
-orbplan.95.png 0 111 14 13
diff --git a/sc2/content/base/nav/orbplan.0.png b/sc2/content/base/nav/planets.0.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.0.png
rename to sc2/content/base/nav/planets.0.png
diff --git a/sc2/content/base/nav/orbplan.1.png b/sc2/content/base/nav/planets.1.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.1.png
rename to sc2/content/base/nav/planets.1.png
diff --git a/sc2/content/base/nav/orbplan.10.png b/sc2/content/base/nav/planets.10.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.10.png
rename to sc2/content/base/nav/planets.10.png
diff --git a/sc2/content/base/nav/orbplan.11.png b/sc2/content/base/nav/planets.11.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.11.png
rename to sc2/content/base/nav/planets.11.png
diff --git a/sc2/content/base/nav/orbplan.12.png b/sc2/content/base/nav/planets.12.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.12.png
rename to sc2/content/base/nav/planets.12.png
diff --git a/sc2/content/base/nav/orbplan.13.png b/sc2/content/base/nav/planets.13.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.13.png
rename to sc2/content/base/nav/planets.13.png
diff --git a/sc2/content/base/nav/orbplan.14.png b/sc2/content/base/nav/planets.14.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.14.png
rename to sc2/content/base/nav/planets.14.png
diff --git a/sc2/content/base/nav/orbplan.15.png b/sc2/content/base/nav/planets.15.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.15.png
rename to sc2/content/base/nav/planets.15.png
diff --git a/sc2/content/base/nav/orbplan.16.png b/sc2/content/base/nav/planets.16.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.16.png
rename to sc2/content/base/nav/planets.16.png
diff --git a/sc2/content/base/nav/orbplan.17.png b/sc2/content/base/nav/planets.17.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.17.png
rename to sc2/content/base/nav/planets.17.png
diff --git a/sc2/content/base/nav/orbplan.18.png b/sc2/content/base/nav/planets.18.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.18.png
rename to sc2/content/base/nav/planets.18.png
diff --git a/sc2/content/base/nav/orbplan.19.png b/sc2/content/base/nav/planets.19.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.19.png
rename to sc2/content/base/nav/planets.19.png
diff --git a/sc2/content/base/nav/orbplan.2.png b/sc2/content/base/nav/planets.2.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.2.png
rename to sc2/content/base/nav/planets.2.png
diff --git a/sc2/content/base/nav/orbplan.20.png b/sc2/content/base/nav/planets.20.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.20.png
rename to sc2/content/base/nav/planets.20.png
diff --git a/sc2/content/base/nav/orbplan.21.png b/sc2/content/base/nav/planets.21.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.21.png
rename to sc2/content/base/nav/planets.21.png
diff --git a/sc2/content/base/nav/orbplan.22.png b/sc2/content/base/nav/planets.22.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.22.png
rename to sc2/content/base/nav/planets.22.png
diff --git a/sc2/content/base/nav/orbplan.23.png b/sc2/content/base/nav/planets.23.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.23.png
rename to sc2/content/base/nav/planets.23.png
diff --git a/sc2/content/base/nav/orbplan.24.png b/sc2/content/base/nav/planets.24.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.24.png
rename to sc2/content/base/nav/planets.24.png
diff --git a/sc2/content/base/nav/orbplan.25.png b/sc2/content/base/nav/planets.25.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.25.png
rename to sc2/content/base/nav/planets.25.png
diff --git a/sc2/content/base/nav/orbplan.26.png b/sc2/content/base/nav/planets.26.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.26.png
rename to sc2/content/base/nav/planets.26.png
diff --git a/sc2/content/base/nav/orbplan.27.png b/sc2/content/base/nav/planets.27.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.27.png
rename to sc2/content/base/nav/planets.27.png
diff --git a/sc2/content/base/nav/orbplan.28.png b/sc2/content/base/nav/planets.28.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.28.png
rename to sc2/content/base/nav/planets.28.png
diff --git a/sc2/content/base/nav/orbplan.29.png b/sc2/content/base/nav/planets.29.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.29.png
rename to sc2/content/base/nav/planets.29.png
diff --git a/sc2/content/base/nav/orbplan.3.png b/sc2/content/base/nav/planets.3.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.3.png
rename to sc2/content/base/nav/planets.3.png
diff --git a/sc2/content/base/nav/orbplan.30.png b/sc2/content/base/nav/planets.30.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.30.png
rename to sc2/content/base/nav/planets.30.png
diff --git a/sc2/content/base/nav/orbplan.31.png b/sc2/content/base/nav/planets.31.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.31.png
rename to sc2/content/base/nav/planets.31.png
diff --git a/sc2/content/base/nav/orbplan.32.png b/sc2/content/base/nav/planets.32.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.32.png
rename to sc2/content/base/nav/planets.32.png
diff --git a/sc2/content/base/nav/orbplan.33.png b/sc2/content/base/nav/planets.33.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.33.png
rename to sc2/content/base/nav/planets.33.png
diff --git a/sc2/content/base/nav/orbplan.34.png b/sc2/content/base/nav/planets.34.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.34.png
rename to sc2/content/base/nav/planets.34.png
diff --git a/sc2/content/base/nav/orbplan.35.png b/sc2/content/base/nav/planets.35.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.35.png
rename to sc2/content/base/nav/planets.35.png
diff --git a/sc2/content/base/nav/orbplan.36.png b/sc2/content/base/nav/planets.36.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.36.png
rename to sc2/content/base/nav/planets.36.png
diff --git a/sc2/content/base/nav/orbplan.37.png b/sc2/content/base/nav/planets.37.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.37.png
rename to sc2/content/base/nav/planets.37.png
diff --git a/sc2/content/base/nav/orbplan.38.png b/sc2/content/base/nav/planets.38.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.38.png
rename to sc2/content/base/nav/planets.38.png
diff --git a/sc2/content/base/nav/orbplan.39.png b/sc2/content/base/nav/planets.39.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.39.png
rename to sc2/content/base/nav/planets.39.png
diff --git a/sc2/content/base/nav/orbplan.4.png b/sc2/content/base/nav/planets.4.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.4.png
rename to sc2/content/base/nav/planets.4.png
diff --git a/sc2/content/base/nav/orbplan.40.png b/sc2/content/base/nav/planets.40.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.40.png
rename to sc2/content/base/nav/planets.40.png
diff --git a/sc2/content/base/nav/orbplan.41.png b/sc2/content/base/nav/planets.41.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.41.png
rename to sc2/content/base/nav/planets.41.png
diff --git a/sc2/content/base/nav/orbplan.42.png b/sc2/content/base/nav/planets.42.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.42.png
rename to sc2/content/base/nav/planets.42.png
diff --git a/sc2/content/base/nav/orbplan.43.png b/sc2/content/base/nav/planets.43.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.43.png
rename to sc2/content/base/nav/planets.43.png
diff --git a/sc2/content/base/nav/orbplan.44.png b/sc2/content/base/nav/planets.44.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.44.png
rename to sc2/content/base/nav/planets.44.png
diff --git a/sc2/content/base/nav/orbplan.45.png b/sc2/content/base/nav/planets.45.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.45.png
rename to sc2/content/base/nav/planets.45.png
diff --git a/sc2/content/base/nav/orbplan.46.png b/sc2/content/base/nav/planets.46.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.46.png
rename to sc2/content/base/nav/planets.46.png
diff --git a/sc2/content/base/nav/orbplan.47.png b/sc2/content/base/nav/planets.47.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.47.png
rename to sc2/content/base/nav/planets.47.png
diff --git a/sc2/content/base/nav/orbplan.48.png b/sc2/content/base/nav/planets.48.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.48.png
rename to sc2/content/base/nav/planets.48.png
diff --git a/sc2/content/base/nav/orbplan.49.png b/sc2/content/base/nav/planets.49.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.49.png
rename to sc2/content/base/nav/planets.49.png
diff --git a/sc2/content/base/nav/orbplan.5.png b/sc2/content/base/nav/planets.5.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.5.png
rename to sc2/content/base/nav/planets.5.png
diff --git a/sc2/content/base/nav/orbplan.50.png b/sc2/content/base/nav/planets.50.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.50.png
rename to sc2/content/base/nav/planets.50.png
diff --git a/sc2/content/base/nav/orbplan.51.png b/sc2/content/base/nav/planets.51.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.51.png
rename to sc2/content/base/nav/planets.51.png
diff --git a/sc2/content/base/nav/orbplan.52.png b/sc2/content/base/nav/planets.52.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.52.png
rename to sc2/content/base/nav/planets.52.png
diff --git a/sc2/content/base/nav/orbplan.53.png b/sc2/content/base/nav/planets.53.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.53.png
rename to sc2/content/base/nav/planets.53.png
diff --git a/sc2/content/base/nav/orbplan.54.png b/sc2/content/base/nav/planets.54.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.54.png
rename to sc2/content/base/nav/planets.54.png
diff --git a/sc2/content/base/nav/orbplan.55.png b/sc2/content/base/nav/planets.55.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.55.png
rename to sc2/content/base/nav/planets.55.png
diff --git a/sc2/content/base/nav/orbplan.56.png b/sc2/content/base/nav/planets.56.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.56.png
rename to sc2/content/base/nav/planets.56.png
diff --git a/sc2/content/base/nav/orbplan.57.png b/sc2/content/base/nav/planets.57.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.57.png
rename to sc2/content/base/nav/planets.57.png
diff --git a/sc2/content/base/nav/orbplan.58.png b/sc2/content/base/nav/planets.58.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.58.png
rename to sc2/content/base/nav/planets.58.png
diff --git a/sc2/content/base/nav/orbplan.59.png b/sc2/content/base/nav/planets.59.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.59.png
rename to sc2/content/base/nav/planets.59.png
diff --git a/sc2/content/base/nav/orbplan.6.png b/sc2/content/base/nav/planets.6.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.6.png
rename to sc2/content/base/nav/planets.6.png
diff --git a/sc2/content/base/nav/orbplan.60.png b/sc2/content/base/nav/planets.60.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.60.png
rename to sc2/content/base/nav/planets.60.png
diff --git a/sc2/content/base/nav/orbplan.61.png b/sc2/content/base/nav/planets.61.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.61.png
rename to sc2/content/base/nav/planets.61.png
diff --git a/sc2/content/base/nav/orbplan.62.png b/sc2/content/base/nav/planets.62.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.62.png
rename to sc2/content/base/nav/planets.62.png
diff --git a/sc2/content/base/nav/orbplan.63.png b/sc2/content/base/nav/planets.63.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.63.png
rename to sc2/content/base/nav/planets.63.png
diff --git a/sc2/content/base/nav/orbplan.64.png b/sc2/content/base/nav/planets.64.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.64.png
rename to sc2/content/base/nav/planets.64.png
diff --git a/sc2/content/base/nav/orbplan.65.png b/sc2/content/base/nav/planets.65.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.65.png
rename to sc2/content/base/nav/planets.65.png
diff --git a/sc2/content/base/nav/orbplan.66.png b/sc2/content/base/nav/planets.66.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.66.png
rename to sc2/content/base/nav/planets.66.png
diff --git a/sc2/content/base/nav/orbplan.67.png b/sc2/content/base/nav/planets.67.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.67.png
rename to sc2/content/base/nav/planets.67.png
diff --git a/sc2/content/base/nav/orbplan.68.png b/sc2/content/base/nav/planets.68.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.68.png
rename to sc2/content/base/nav/planets.68.png
diff --git a/sc2/content/base/nav/orbplan.69.png b/sc2/content/base/nav/planets.69.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.69.png
rename to sc2/content/base/nav/planets.69.png
diff --git a/sc2/content/base/nav/orbplan.7.png b/sc2/content/base/nav/planets.7.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.7.png
rename to sc2/content/base/nav/planets.7.png
diff --git a/sc2/content/base/nav/orbplan.70.png b/sc2/content/base/nav/planets.70.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.70.png
rename to sc2/content/base/nav/planets.70.png
diff --git a/sc2/content/base/nav/orbplan.71.png b/sc2/content/base/nav/planets.71.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.71.png
rename to sc2/content/base/nav/planets.71.png
diff --git a/sc2/content/base/nav/orbplan.72.png b/sc2/content/base/nav/planets.72.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.72.png
rename to sc2/content/base/nav/planets.72.png
diff --git a/sc2/content/base/nav/orbplan.73.png b/sc2/content/base/nav/planets.73.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.73.png
rename to sc2/content/base/nav/planets.73.png
diff --git a/sc2/content/base/nav/orbplan.74.png b/sc2/content/base/nav/planets.74.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.74.png
rename to sc2/content/base/nav/planets.74.png
diff --git a/sc2/content/base/nav/orbplan.75.png b/sc2/content/base/nav/planets.75.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.75.png
rename to sc2/content/base/nav/planets.75.png
diff --git a/sc2/content/base/nav/orbplan.76.png b/sc2/content/base/nav/planets.76.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.76.png
rename to sc2/content/base/nav/planets.76.png
diff --git a/sc2/content/base/nav/orbplan.77.png b/sc2/content/base/nav/planets.77.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.77.png
rename to sc2/content/base/nav/planets.77.png
diff --git a/sc2/content/base/nav/orbplan.78.png b/sc2/content/base/nav/planets.78.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.78.png
rename to sc2/content/base/nav/planets.78.png
diff --git a/sc2/content/base/nav/orbplan.79.png b/sc2/content/base/nav/planets.79.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.79.png
rename to sc2/content/base/nav/planets.79.png
diff --git a/sc2/content/base/nav/orbplan.8.png b/sc2/content/base/nav/planets.8.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.8.png
rename to sc2/content/base/nav/planets.8.png
diff --git a/sc2/content/base/nav/orbplan.80.png b/sc2/content/base/nav/planets.80.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.80.png
rename to sc2/content/base/nav/planets.80.png
diff --git a/sc2/content/base/nav/orbplan.81.png b/sc2/content/base/nav/planets.81.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.81.png
rename to sc2/content/base/nav/planets.81.png
diff --git a/sc2/content/base/nav/orbplan.82.png b/sc2/content/base/nav/planets.82.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.82.png
rename to sc2/content/base/nav/planets.82.png
diff --git a/sc2/content/base/nav/orbplan.83.png b/sc2/content/base/nav/planets.83.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.83.png
rename to sc2/content/base/nav/planets.83.png
diff --git a/sc2/content/base/nav/orbplan.84.png b/sc2/content/base/nav/planets.84.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.84.png
rename to sc2/content/base/nav/planets.84.png
diff --git a/sc2/content/base/nav/orbplan.85.png b/sc2/content/base/nav/planets.85.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.85.png
rename to sc2/content/base/nav/planets.85.png
diff --git a/sc2/content/base/nav/orbplan.86.png b/sc2/content/base/nav/planets.86.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.86.png
rename to sc2/content/base/nav/planets.86.png
diff --git a/sc2/content/base/nav/orbplan.87.png b/sc2/content/base/nav/planets.87.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.87.png
rename to sc2/content/base/nav/planets.87.png
diff --git a/sc2/content/base/nav/orbplan.88.png b/sc2/content/base/nav/planets.88.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.88.png
rename to sc2/content/base/nav/planets.88.png
diff --git a/sc2/content/base/nav/orbplan.89.png b/sc2/content/base/nav/planets.89.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.89.png
rename to sc2/content/base/nav/planets.89.png
diff --git a/sc2/content/base/nav/orbplan.9.png b/sc2/content/base/nav/planets.9.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.9.png
rename to sc2/content/base/nav/planets.9.png
diff --git a/sc2/content/base/nav/orbplan.90.png b/sc2/content/base/nav/planets.90.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.90.png
rename to sc2/content/base/nav/planets.90.png
diff --git a/sc2/content/base/nav/orbplan.91.png b/sc2/content/base/nav/planets.91.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.91.png
rename to sc2/content/base/nav/planets.91.png
diff --git a/sc2/content/base/nav/orbplan.92.png b/sc2/content/base/nav/planets.92.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.92.png
rename to sc2/content/base/nav/planets.92.png
diff --git a/sc2/content/base/nav/orbplan.93.png b/sc2/content/base/nav/planets.93.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.93.png
rename to sc2/content/base/nav/planets.93.png
diff --git a/sc2/content/base/nav/orbplan.94.png b/sc2/content/base/nav/planets.94.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.94.png
rename to sc2/content/base/nav/planets.94.png
diff --git a/sc2/content/base/nav/orbplan.95.png b/sc2/content/base/nav/planets.95.png
similarity index 100%
rename from sc2/content/base/nav/orbplan.95.png
rename to sc2/content/base/nav/planets.95.png
diff --git a/sc2/content/base/nav/planets.ani b/sc2/content/base/nav/planets.ani
new file mode 100644
index 000000000..c7bc761be
--- /dev/null
+++ b/sc2/content/base/nav/planets.ani
@@ -0,0 +1,96 @@
+planets.0.png 0 111 1 1
+planets.1.png 0 111 1 1
+planets.2.png 0 111 1 1
+planets.3.png 0 111 1 1
+planets.4.png 0 111 1 1
+planets.5.png 0 111 1 1
+planets.6.png 0 111 1 1
+planets.7.png 0 111 1 1
+planets.8.png 0 111 1 1
+planets.9.png 0 111 1 1
+planets.10.png 0 111 1 1
+planets.11.png 0 111 1 1
+planets.12.png 0 111 1 1
+planets.13.png 0 111 1 1
+planets.14.png 0 111 1 1
+planets.15.png 0 111 1 1
+planets.16.png 0 111 1 1
+planets.17.png 0 111 1 1
+planets.18.png 0 111 1 1
+planets.19.png 0 111 1 1
+planets.20.png 0 111 1 1
+planets.21.png 0 111 1 1
+planets.22.png 0 111 1 1
+planets.23.png 0 111 1 1
+planets.24.png 0 111 1 1
+planets.25.png 0 111 1 1
+planets.26.png 0 111 1 1
+planets.27.png 0 111 1 1
+planets.28.png 0 111 1 1
+planets.29.png 0 111 1 1
+planets.30.png 0 111 1 1
+planets.31.png 0 111 1 1
+planets.32.png 0 111 3 3
+planets.33.png 0 111 3 3
+planets.34.png 0 111 3 3
+planets.35.png 0 111 3 3
+planets.36.png 0 111 3 3
+planets.37.png 0 111 3 3
+planets.38.png 0 111 3 3
+planets.39.png 0 111 3 3
+planets.40.png 0 111 3 3
+planets.41.png 0 111 3 3
+planets.42.png 0 111 3 3
+planets.43.png 0 111 3 3
+planets.44.png 0 111 3 3
+planets.45.png 0 111 3 3
+planets.46.png 0 111 3 3
+planets.47.png 0 111 3 3
+planets.48.png 0 111 5 5
+planets.49.png 0 111 5 5
+planets.50.png 0 111 5 5
+planets.51.png 0 111 5 5
+planets.52.png 0 111 5 5
+planets.53.png 0 111 5 5
+planets.54.png 0 111 5 5
+planets.55.png 0 111 5 5
+planets.56.png 0 111 5 5
+planets.57.png 0 111 5 5
+planets.58.png 0 111 5 5
+planets.59.png 0 111 5 5
+planets.60.png 0 111 5 5
+planets.61.png 0 111 5 5
+planets.62.png 0 111 5 5
+planets.63.png 0 111 5 5
+planets.64.png 0 111 7 6
+planets.65.png 0 111 7 6
+planets.66.png 0 111 7 6
+planets.67.png 0 111 7 6
+planets.68.png 0 111 7 6
+planets.69.png 0 111 7 6
+planets.70.png 0 111 7 6
+planets.71.png 0 111 7 6
+planets.72.png 0 111 7 6
+planets.73.png 0 111 7 6
+planets.74.png 0 111 7 6
+planets.75.png 0 111 7 6
+planets.76.png 0 111 7 6
+planets.77.png 0 111 7 6
+planets.78.png 0 111 7 6
+planets.79.png 0 111 7 6
+planets.80.png 0 111 14 13
+planets.81.png 0 111 14 13
+planets.82.png 0 111 14 13
+planets.83.png 0 111 14 13
+planets.84.png 0 111 14 13
+planets.85.png 0 111 14 13
+planets.86.png 0 111 14 13
+planets.87.png 0 111 14 13
+planets.88.png 0 111 14 13
+planets.89.png 0 111 14 13
+planets.90.png 0 111 14 13
+planets.91.png 0 111 14 13
+planets.92.png 0 111 14 13
+planets.93.png 0 111 14 13
+planets.94.png 0 111 14 13
+planets.95.png 0 111 14 13
diff --git a/sc2/content/base/nav/arispace.0.png b/sc2/content/base/nav/quasispace.0.png
similarity index 100%
rename from sc2/content/base/nav/arispace.0.png
rename to sc2/content/base/nav/quasispace.0.png
diff --git a/sc2/content/base/nav/arispace.1.png b/sc2/content/base/nav/quasispace.1.png
similarity index 100%
rename from sc2/content/base/nav/arispace.1.png
rename to sc2/content/base/nav/quasispace.1.png
diff --git a/sc2/content/base/nav/arispace.2.png b/sc2/content/base/nav/quasispace.2.png
similarity index 100%
rename from sc2/content/base/nav/arispace.2.png
rename to sc2/content/base/nav/quasispace.2.png
diff --git a/sc2/content/base/nav/arispace.3.png b/sc2/content/base/nav/quasispace.3.png
similarity index 100%
rename from sc2/content/base/nav/arispace.3.png
rename to sc2/content/base/nav/quasispace.3.png
diff --git a/sc2/content/base/nav/arispace.4.png b/sc2/content/base/nav/quasispace.4.png
similarity index 100%
rename from sc2/content/base/nav/arispace.4.png
rename to sc2/content/base/nav/quasispace.4.png
diff --git a/sc2/content/base/nav/arispace.5.png b/sc2/content/base/nav/quasispace.5.png
similarity index 100%
rename from sc2/content/base/nav/arispace.5.png
rename to sc2/content/base/nav/quasispace.5.png
diff --git a/sc2/content/base/nav/quasispace.ani b/sc2/content/base/nav/quasispace.ani
index 3109ae35f..219a1b27d 100644
--- a/sc2/content/base/nav/quasispace.ani
+++ b/sc2/content/base/nav/quasispace.ani
@@ -1,6 +1,6 @@
-arispace.0.png 0 66 4 4
-arispace.1.png 0 66 6 6
-arispace.2.png 0 66 10 9
-arispace.3.png 0 66 16 13
-arispace.4.png 0 66 19 18
-arispace.5.png 1 66 37 37
+quasispace.0.png 0 66 4 4
+quasispace.1.png 0 66 6 6
+quasispace.2.png 0 66 10 9
+quasispace.3.png 0 66 16 13
+quasispace.4.png 0 66 19 18
+quasispace.5.png 1 66 37 37
diff --git a/sc2/content/base/nav/sis_ip.ani b/sc2/content/base/nav/sis_ip.ani
deleted file mode 100644
index d643f0d4f..000000000
--- a/sc2/content/base/nav/sis_ip.ani
+++ /dev/null
@@ -1,16 +0,0 @@
-sis_ip.0.png 0 55 3 6
-sis_ip.1.png 0 55 4 6
-sis_ip.2.png 0 55 5 5
-sis_ip.3.png 0 55 6 3
-sis_ip.4.png 0 55 6 3
-sis_ip.5.png 0 55 6 4
-sis_ip.6.png 0 55 5 5
-sis_ip.7.png 0 55 4 6
-sis_ip.8.png 0 55 3 6
-sis_ip.9.png 0 55 3 6
-sis_ip.10.png 0 55 5 5
-sis_ip.11.png 0 55 7 4
-sis_ip.12.png 0 55 8 3
-sis_ip.13.png 0 55 7 3
-sis_ip.14.png 0 55 5 5
-sis_ip.15.png 0 55 3 6
diff --git a/sc2/content/base/nav/ip_sun.0.png b/sc2/content/base/nav/truespacesun.0.png
similarity index 100%
rename from sc2/content/base/nav/ip_sun.0.png
rename to sc2/content/base/nav/truespacesun.0.png
diff --git a/sc2/content/base/nav/ip_sun.1.png b/sc2/content/base/nav/truespacesun.1.png
similarity index 100%
rename from sc2/content/base/nav/ip_sun.1.png
rename to sc2/content/base/nav/truespacesun.1.png
diff --git a/sc2/content/base/nav/ip_sun.2.png b/sc2/content/base/nav/truespacesun.2.png
similarity index 100%
rename from sc2/content/base/nav/ip_sun.2.png
rename to sc2/content/base/nav/truespacesun.2.png
diff --git a/sc2/content/base/nav/ip_sun.3.png b/sc2/content/base/nav/truespacesun.3.png
similarity index 100%
rename from sc2/content/base/nav/ip_sun.3.png
rename to sc2/content/base/nav/truespacesun.3.png
diff --git a/sc2/content/base/nav/ip_sun.4.png b/sc2/content/base/nav/truespacesun.4.png
similarity index 100%
rename from sc2/content/base/nav/ip_sun.4.png
rename to sc2/content/base/nav/truespacesun.4.png
diff --git a/sc2/content/base/nav/truespacesun.ani b/sc2/content/base/nav/truespacesun.ani
new file mode 100644
index 000000000..722692e82
--- /dev/null
+++ b/sc2/content/base/nav/truespacesun.ani
@@ -0,0 +1,5 @@
+truespacesun.0.png 0 56 2 2
+truespacesun.1.png 0 56 4 3
+truespacesun.2.png 0 56 8 7
+truespacesun.3.png 0 56 16 15
+truespacesun.4.png 0 56 26 24
diff --git a/sc2/content/base/planets/aci__big.ani b/sc2/content/base/planets/aci__big.ani
deleted file mode 100644
index f0e781fb3..000000000
--- a/sc2/content/base/planets/aci__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-aci__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/aci__med.ani b/sc2/content/base/planets/aci__med.ani
deleted file mode 100644
index ba567bd85..000000000
--- a/sc2/content/base/planets/aci__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-aci__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/aci__sml.ani b/sc2/content/base/planets/aci__sml.ani
deleted file mode 100644
index c3b567541..000000000
--- a/sc2/content/base/planets/aci__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-aci__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/aci__big.0.png b/sc2/content/base/planets/acid-big.0.png
similarity index 100%
rename from sc2/content/base/planets/aci__big.0.png
rename to sc2/content/base/planets/acid-big.0.png
diff --git a/sc2/content/base/planets/acid-big.ani b/sc2/content/base/planets/acid-big.ani
new file mode 100644
index 000000000..a2014adad
--- /dev/null
+++ b/sc2/content/base/planets/acid-big.ani
@@ -0,0 +1 @@
+acid-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/aci__med.0.png b/sc2/content/base/planets/acid-med.0.png
similarity index 100%
rename from sc2/content/base/planets/aci__med.0.png
rename to sc2/content/base/planets/acid-med.0.png
diff --git a/sc2/content/base/planets/acid-med.ani b/sc2/content/base/planets/acid-med.ani
new file mode 100644
index 000000000..a7a013cbe
--- /dev/null
+++ b/sc2/content/base/planets/acid-med.ani
@@ -0,0 +1 @@
+acid-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/aci__sml.0.png b/sc2/content/base/planets/acid-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/aci__sml.0.png
rename to sc2/content/base/planets/acid-sml.0.png
diff --git a/sc2/content/base/planets/acid-sml.ani b/sc2/content/base/planets/acid-sml.ani
new file mode 100644
index 000000000..1556ebc33
--- /dev/null
+++ b/sc2/content/base/planets/acid-sml.ani
@@ -0,0 +1 @@
+acid-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/alk__big.ani b/sc2/content/base/planets/alk__big.ani
deleted file mode 100644
index 99ed358af..000000000
--- a/sc2/content/base/planets/alk__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-alk__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/alk__med.ani b/sc2/content/base/planets/alk__med.ani
deleted file mode 100644
index fc70ad545..000000000
--- a/sc2/content/base/planets/alk__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-alk__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/alk__sml.ani b/sc2/content/base/planets/alk__sml.ani
deleted file mode 100644
index 9385e735d..000000000
--- a/sc2/content/base/planets/alk__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-alk__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/alk__big.0.png b/sc2/content/base/planets/alkali-big.0.png
similarity index 100%
rename from sc2/content/base/planets/alk__big.0.png
rename to sc2/content/base/planets/alkali-big.0.png
diff --git a/sc2/content/base/planets/alkali-big.ani b/sc2/content/base/planets/alkali-big.ani
new file mode 100644
index 000000000..841f6c060
--- /dev/null
+++ b/sc2/content/base/planets/alkali-big.ani
@@ -0,0 +1 @@
+alkali-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/alk__med.0.png b/sc2/content/base/planets/alkali-med.0.png
similarity index 100%
rename from sc2/content/base/planets/alk__med.0.png
rename to sc2/content/base/planets/alkali-med.0.png
diff --git a/sc2/content/base/planets/alkali-med.ani b/sc2/content/base/planets/alkali-med.ani
new file mode 100644
index 000000000..ae6dec35b
--- /dev/null
+++ b/sc2/content/base/planets/alkali-med.ani
@@ -0,0 +1 @@
+alkali-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/alk__sml.0.png b/sc2/content/base/planets/alkali-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/alk__sml.0.png
rename to sc2/content/base/planets/alkali-sml.0.png
diff --git a/sc2/content/base/planets/alkali-sml.ani b/sc2/content/base/planets/alkali-sml.ani
new file mode 100644
index 000000000..7064048c2
--- /dev/null
+++ b/sc2/content/base/planets/alkali-sml.ani
@@ -0,0 +1 @@
+alkali-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/aur__big.ani b/sc2/content/base/planets/aur__big.ani
deleted file mode 100644
index bb17b9f3c..000000000
--- a/sc2/content/base/planets/aur__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-aur__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/aur__med.ani b/sc2/content/base/planets/aur__med.ani
deleted file mode 100644
index f008c08df..000000000
--- a/sc2/content/base/planets/aur__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-aur__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/aur__sml.ani b/sc2/content/base/planets/aur__sml.ani
deleted file mode 100644
index 8e0413d82..000000000
--- a/sc2/content/base/planets/aur__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-aur__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/aur__big.0.png b/sc2/content/base/planets/auric-big.0.png
similarity index 100%
rename from sc2/content/base/planets/aur__big.0.png
rename to sc2/content/base/planets/auric-big.0.png
diff --git a/sc2/content/base/planets/auric-big.ani b/sc2/content/base/planets/auric-big.ani
new file mode 100644
index 000000000..2edfefa96
--- /dev/null
+++ b/sc2/content/base/planets/auric-big.ani
@@ -0,0 +1 @@
+auric-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/aur__med.0.png b/sc2/content/base/planets/auric-med.0.png
similarity index 100%
rename from sc2/content/base/planets/aur__med.0.png
rename to sc2/content/base/planets/auric-med.0.png
diff --git a/sc2/content/base/planets/auric-med.ani b/sc2/content/base/planets/auric-med.ani
new file mode 100644
index 000000000..d7a6c8f86
--- /dev/null
+++ b/sc2/content/base/planets/auric-med.ani
@@ -0,0 +1 @@
+auric-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/aur__sml.0.png b/sc2/content/base/planets/auric-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/aur__sml.0.png
rename to sc2/content/base/planets/auric-sml.0.png
diff --git a/sc2/content/base/planets/auric-sml.ani b/sc2/content/base/planets/auric-sml.ani
new file mode 100644
index 000000000..101098da5
--- /dev/null
+++ b/sc2/content/base/planets/auric-sml.ani
@@ -0,0 +1 @@
+auric-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/azu__big.ani b/sc2/content/base/planets/azu__big.ani
deleted file mode 100644
index 191f9066f..000000000
--- a/sc2/content/base/planets/azu__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-azu__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/azu__med.ani b/sc2/content/base/planets/azu__med.ani
deleted file mode 100644
index 724e0efd9..000000000
--- a/sc2/content/base/planets/azu__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-azu__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/azu__sml.ani b/sc2/content/base/planets/azu__sml.ani
deleted file mode 100644
index 5ab1ddf48..000000000
--- a/sc2/content/base/planets/azu__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-azu__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/azu__big.0.png b/sc2/content/base/planets/azure-big.0.png
similarity index 100%
rename from sc2/content/base/planets/azu__big.0.png
rename to sc2/content/base/planets/azure-big.0.png
diff --git a/sc2/content/base/planets/azure-big.ani b/sc2/content/base/planets/azure-big.ani
new file mode 100644
index 000000000..5d7d1ad0a
--- /dev/null
+++ b/sc2/content/base/planets/azure-big.ani
@@ -0,0 +1 @@
+azure-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/azu__med.0.png b/sc2/content/base/planets/azure-med.0.png
similarity index 100%
rename from sc2/content/base/planets/azu__med.0.png
rename to sc2/content/base/planets/azure-med.0.png
diff --git a/sc2/content/base/planets/azure-med.ani b/sc2/content/base/planets/azure-med.ani
new file mode 100644
index 000000000..fa906d556
--- /dev/null
+++ b/sc2/content/base/planets/azure-med.ani
@@ -0,0 +1 @@
+azure-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/azu__sml.0.png b/sc2/content/base/planets/azure-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/azu__sml.0.png
rename to sc2/content/base/planets/azure-sml.0.png
diff --git a/sc2/content/base/planets/azure-sml.ani b/sc2/content/base/planets/azure-sml.ani
new file mode 100644
index 000000000..8c9d230a4
--- /dev/null
+++ b/sc2/content/base/planets/azure-sml.ani
@@ -0,0 +1 @@
+azure-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/blg__big.ani b/sc2/content/base/planets/blg__big.ani
deleted file mode 100644
index a49640738..000000000
--- a/sc2/content/base/planets/blg__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-blg__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/blg__med.ani b/sc2/content/base/planets/blg__med.ani
deleted file mode 100644
index 65fa85627..000000000
--- a/sc2/content/base/planets/blg__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-blg__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/blg__sml.ani b/sc2/content/base/planets/blg__sml.ani
deleted file mode 100644
index c25f75533..000000000
--- a/sc2/content/base/planets/blg__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-blg__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/blg__big.0.png b/sc2/content/base/planets/bluegas-big.0.png
similarity index 100%
rename from sc2/content/base/planets/blg__big.0.png
rename to sc2/content/base/planets/bluegas-big.0.png
diff --git a/sc2/content/base/planets/bluegas-big.ani b/sc2/content/base/planets/bluegas-big.ani
new file mode 100644
index 000000000..a590d4660
--- /dev/null
+++ b/sc2/content/base/planets/bluegas-big.ani
@@ -0,0 +1 @@
+bluegas-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/blg__med.0.png b/sc2/content/base/planets/bluegas-med.0.png
similarity index 100%
rename from sc2/content/base/planets/blg__med.0.png
rename to sc2/content/base/planets/bluegas-med.0.png
diff --git a/sc2/content/base/planets/bluegas-med.ani b/sc2/content/base/planets/bluegas-med.ani
new file mode 100644
index 000000000..c90b995b1
--- /dev/null
+++ b/sc2/content/base/planets/bluegas-med.ani
@@ -0,0 +1 @@
+bluegas-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/blg__sml.0.png b/sc2/content/base/planets/bluegas-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/blg__sml.0.png
rename to sc2/content/base/planets/bluegas-sml.0.png
diff --git a/sc2/content/base/planets/bluegas-sml.ani b/sc2/content/base/planets/bluegas-sml.ani
new file mode 100644
index 000000000..05ebde952
--- /dev/null
+++ b/sc2/content/base/planets/bluegas-sml.ani
@@ -0,0 +1 @@
+bluegas-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/car__big.ani b/sc2/content/base/planets/car__big.ani
deleted file mode 100644
index 42d91e126..000000000
--- a/sc2/content/base/planets/car__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-car__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/car__med.ani b/sc2/content/base/planets/car__med.ani
deleted file mode 100644
index 6a716b40f..000000000
--- a/sc2/content/base/planets/car__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-car__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/car__sml.ani b/sc2/content/base/planets/car__sml.ani
deleted file mode 100644
index 9acfc0c8b..000000000
--- a/sc2/content/base/planets/car__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-car__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/car__big.0.png b/sc2/content/base/planets/carbide-big.0.png
similarity index 100%
rename from sc2/content/base/planets/car__big.0.png
rename to sc2/content/base/planets/carbide-big.0.png
diff --git a/sc2/content/base/planets/carbide-big.ani b/sc2/content/base/planets/carbide-big.ani
new file mode 100644
index 000000000..273a06395
--- /dev/null
+++ b/sc2/content/base/planets/carbide-big.ani
@@ -0,0 +1 @@
+carbide-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/car__med.0.png b/sc2/content/base/planets/carbide-med.0.png
similarity index 100%
rename from sc2/content/base/planets/car__med.0.png
rename to sc2/content/base/planets/carbide-med.0.png
diff --git a/sc2/content/base/planets/carbide-med.ani b/sc2/content/base/planets/carbide-med.ani
new file mode 100644
index 000000000..f79c8038d
--- /dev/null
+++ b/sc2/content/base/planets/carbide-med.ani
@@ -0,0 +1 @@
+carbide-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/car__sml.0.png b/sc2/content/base/planets/carbide-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/car__sml.0.png
rename to sc2/content/base/planets/carbide-sml.0.png
diff --git a/sc2/content/base/planets/carbide-sml.ani b/sc2/content/base/planets/carbide-sml.ani
new file mode 100644
index 000000000..c7d347618
--- /dev/null
+++ b/sc2/content/base/planets/carbide-sml.ani
@@ -0,0 +1 @@
+carbide-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/chl__big.ani b/sc2/content/base/planets/chl__big.ani
deleted file mode 100644
index 5a08021d5..000000000
--- a/sc2/content/base/planets/chl__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-chl__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/chl__med.ani b/sc2/content/base/planets/chl__med.ani
deleted file mode 100644
index 6f5f0db01..000000000
--- a/sc2/content/base/planets/chl__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-chl__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/chl__sml.ani b/sc2/content/base/planets/chl__sml.ani
deleted file mode 100644
index f2ad8ea72..000000000
--- a/sc2/content/base/planets/chl__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-chl__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/chl__big.0.png b/sc2/content/base/planets/chlorine-big.0.png
similarity index 100%
rename from sc2/content/base/planets/chl__big.0.png
rename to sc2/content/base/planets/chlorine-big.0.png
diff --git a/sc2/content/base/planets/chlorine-big.ani b/sc2/content/base/planets/chlorine-big.ani
new file mode 100644
index 000000000..1e4c7b184
--- /dev/null
+++ b/sc2/content/base/planets/chlorine-big.ani
@@ -0,0 +1 @@
+chlorine-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/chl__med.0.png b/sc2/content/base/planets/chlorine-med.0.png
similarity index 100%
rename from sc2/content/base/planets/chl__med.0.png
rename to sc2/content/base/planets/chlorine-med.0.png
diff --git a/sc2/content/base/planets/chlorine-med.ani b/sc2/content/base/planets/chlorine-med.ani
new file mode 100644
index 000000000..42c625269
--- /dev/null
+++ b/sc2/content/base/planets/chlorine-med.ani
@@ -0,0 +1 @@
+chlorine-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/chl__sml.0.png b/sc2/content/base/planets/chlorine-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/chl__sml.0.png
rename to sc2/content/base/planets/chlorine-sml.0.png
diff --git a/sc2/content/base/planets/chlorine-sml.ani b/sc2/content/base/planets/chlorine-sml.ani
new file mode 100644
index 000000000..95e68d05e
--- /dev/null
+++ b/sc2/content/base/planets/chlorine-sml.ani
@@ -0,0 +1 @@
+chlorine-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/cho__big.ani b/sc2/content/base/planets/cho__big.ani
deleted file mode 100644
index 460f6759f..000000000
--- a/sc2/content/base/planets/cho__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-cho__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/cho__med.ani b/sc2/content/base/planets/cho__med.ani
deleted file mode 100644
index 3847e00da..000000000
--- a/sc2/content/base/planets/cho__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-cho__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/cho__sml.ani b/sc2/content/base/planets/cho__sml.ani
deleted file mode 100644
index 0d620b522..000000000
--- a/sc2/content/base/planets/cho__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-cho__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/cho__big.0.png b/sc2/content/base/planets/chondrite-big.0.png
similarity index 100%
rename from sc2/content/base/planets/cho__big.0.png
rename to sc2/content/base/planets/chondrite-big.0.png
diff --git a/sc2/content/base/planets/chondrite-big.ani b/sc2/content/base/planets/chondrite-big.ani
new file mode 100644
index 000000000..08913d81e
--- /dev/null
+++ b/sc2/content/base/planets/chondrite-big.ani
@@ -0,0 +1 @@
+chondrite-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/cho__med.0.png b/sc2/content/base/planets/chondrite-med.0.png
similarity index 100%
rename from sc2/content/base/planets/cho__med.0.png
rename to sc2/content/base/planets/chondrite-med.0.png
diff --git a/sc2/content/base/planets/chondrite-med.ani b/sc2/content/base/planets/chondrite-med.ani
new file mode 100644
index 000000000..b4b3a713b
--- /dev/null
+++ b/sc2/content/base/planets/chondrite-med.ani
@@ -0,0 +1 @@
+chondrite-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/cho__sml.0.png b/sc2/content/base/planets/chondrite-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/cho__sml.0.png
rename to sc2/content/base/planets/chondrite-sml.0.png
diff --git a/sc2/content/base/planets/chondrite-sml.ani b/sc2/content/base/planets/chondrite-sml.ani
new file mode 100644
index 000000000..0c7359508
--- /dev/null
+++ b/sc2/content/base/planets/chondrite-sml.ani
@@ -0,0 +1 @@
+chondrite-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/cim__big.ani b/sc2/content/base/planets/cim__big.ani
deleted file mode 100644
index aa78a6041..000000000
--- a/sc2/content/base/planets/cim__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-cim__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/cim__med.ani b/sc2/content/base/planets/cim__med.ani
deleted file mode 100644
index 36f519323..000000000
--- a/sc2/content/base/planets/cim__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-cim__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/cim__sml.ani b/sc2/content/base/planets/cim__sml.ani
deleted file mode 100644
index 21bf4d425..000000000
--- a/sc2/content/base/planets/cim__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-cim__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/cim__big.0.png b/sc2/content/base/planets/cimmerian-big.0.png
similarity index 100%
rename from sc2/content/base/planets/cim__big.0.png
rename to sc2/content/base/planets/cimmerian-big.0.png
diff --git a/sc2/content/base/planets/cimmerian-big.ani b/sc2/content/base/planets/cimmerian-big.ani
new file mode 100644
index 000000000..753315877
--- /dev/null
+++ b/sc2/content/base/planets/cimmerian-big.ani
@@ -0,0 +1 @@
+cimmerian-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/cim__med.0.png b/sc2/content/base/planets/cimmerian-med.0.png
similarity index 100%
rename from sc2/content/base/planets/cim__med.0.png
rename to sc2/content/base/planets/cimmerian-med.0.png
diff --git a/sc2/content/base/planets/cimmerian-med.ani b/sc2/content/base/planets/cimmerian-med.ani
new file mode 100644
index 000000000..bb3598dae
--- /dev/null
+++ b/sc2/content/base/planets/cimmerian-med.ani
@@ -0,0 +1 @@
+cimmerian-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/cim__sml.0.png b/sc2/content/base/planets/cimmerian-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/cim__sml.0.png
rename to sc2/content/base/planets/cimmerian-sml.0.png
diff --git a/sc2/content/base/planets/cimmerian-sml.ani b/sc2/content/base/planets/cimmerian-sml.ani
new file mode 100644
index 000000000..4336c8381
--- /dev/null
+++ b/sc2/content/base/planets/cimmerian-sml.ani
@@ -0,0 +1 @@
+cimmerian-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/cop__big.ani b/sc2/content/base/planets/cop__big.ani
deleted file mode 100644
index 91c236166..000000000
--- a/sc2/content/base/planets/cop__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-cop__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/cop__med.ani b/sc2/content/base/planets/cop__med.ani
deleted file mode 100644
index 232b03d1c..000000000
--- a/sc2/content/base/planets/cop__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-cop__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/cop__sml.ani b/sc2/content/base/planets/cop__sml.ani
deleted file mode 100644
index 591786e26..000000000
--- a/sc2/content/base/planets/cop__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-cop__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/cop__big.0.png b/sc2/content/base/planets/copper-big.0.png
similarity index 100%
rename from sc2/content/base/planets/cop__big.0.png
rename to sc2/content/base/planets/copper-big.0.png
diff --git a/sc2/content/base/planets/copper-big.ani b/sc2/content/base/planets/copper-big.ani
new file mode 100644
index 000000000..5f4baa62b
--- /dev/null
+++ b/sc2/content/base/planets/copper-big.ani
@@ -0,0 +1 @@
+copper-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/cop__med.0.png b/sc2/content/base/planets/copper-med.0.png
similarity index 100%
rename from sc2/content/base/planets/cop__med.0.png
rename to sc2/content/base/planets/copper-med.0.png
diff --git a/sc2/content/base/planets/copper-med.ani b/sc2/content/base/planets/copper-med.ani
new file mode 100644
index 000000000..ed28c2227
--- /dev/null
+++ b/sc2/content/base/planets/copper-med.ani
@@ -0,0 +1 @@
+copper-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/cop__sml.0.png b/sc2/content/base/planets/copper-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/cop__sml.0.png
rename to sc2/content/base/planets/copper-sml.0.png
diff --git a/sc2/content/base/planets/copper-sml.ani b/sc2/content/base/planets/copper-sml.ani
new file mode 100644
index 000000000..37db16a3a
--- /dev/null
+++ b/sc2/content/base/planets/copper-sml.ani
@@ -0,0 +1 @@
+copper-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/cra__big.ani b/sc2/content/base/planets/cra__big.ani
deleted file mode 100644
index 501a7fae9..000000000
--- a/sc2/content/base/planets/cra__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-cra__big.0.png 0 -1 38 33
diff --git a/sc2/content/base/planets/cra__med.ani b/sc2/content/base/planets/cra__med.ani
deleted file mode 100644
index 5eea1c004..000000000
--- a/sc2/content/base/planets/cra__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-cra__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/cra__sml.ani b/sc2/content/base/planets/cra__sml.ani
deleted file mode 100644
index 0a471a46f..000000000
--- a/sc2/content/base/planets/cra__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-cra__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/cri__big.ani b/sc2/content/base/planets/cri__big.ani
deleted file mode 100644
index 1063fcd8c..000000000
--- a/sc2/content/base/planets/cri__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-cri__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/cri__med.ani b/sc2/content/base/planets/cri__med.ani
deleted file mode 100644
index 53f737dc7..000000000
--- a/sc2/content/base/planets/cri__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-cri__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/cri__sml.ani b/sc2/content/base/planets/cri__sml.ani
deleted file mode 100644
index d694277f1..000000000
--- a/sc2/content/base/planets/cri__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-cri__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/mar__big.0.png b/sc2/content/base/planets/crimson-big.0.png
similarity index 100%
rename from sc2/content/base/planets/mar__big.0.png
rename to sc2/content/base/planets/crimson-big.0.png
diff --git a/sc2/content/base/planets/crimson-big.ani b/sc2/content/base/planets/crimson-big.ani
new file mode 100644
index 000000000..7a00363d9
--- /dev/null
+++ b/sc2/content/base/planets/crimson-big.ani
@@ -0,0 +1 @@
+crimson-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/mar__med.0.png b/sc2/content/base/planets/crimson-med.0.png
similarity index 100%
rename from sc2/content/base/planets/mar__med.0.png
rename to sc2/content/base/planets/crimson-med.0.png
diff --git a/sc2/content/base/planets/crimson-med.ani b/sc2/content/base/planets/crimson-med.ani
new file mode 100644
index 000000000..427fd49a6
--- /dev/null
+++ b/sc2/content/base/planets/crimson-med.ani
@@ -0,0 +1 @@
+crimson-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/mar__sml.0.png b/sc2/content/base/planets/crimson-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/mar__sml.0.png
rename to sc2/content/base/planets/crimson-sml.0.png
diff --git a/sc2/content/base/planets/crimson-sml.ani b/sc2/content/base/planets/crimson-sml.ani
new file mode 100644
index 000000000..6fe0e1135
--- /dev/null
+++ b/sc2/content/base/planets/crimson-sml.ani
@@ -0,0 +1 @@
+crimson-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/cya__big.ani b/sc2/content/base/planets/cya__big.ani
deleted file mode 100644
index 2f55c8dfc..000000000
--- a/sc2/content/base/planets/cya__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-cya__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/cya__med.ani b/sc2/content/base/planets/cya__med.ani
deleted file mode 100644
index a89bda538..000000000
--- a/sc2/content/base/planets/cya__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-cya__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/cya__sml.ani b/sc2/content/base/planets/cya__sml.ani
deleted file mode 100644
index 6d3a1e2d0..000000000
--- a/sc2/content/base/planets/cya__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-cya__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/cyg__big.0.png b/sc2/content/base/planets/cyangas-big.0.png
similarity index 100%
rename from sc2/content/base/planets/cyg__big.0.png
rename to sc2/content/base/planets/cyangas-big.0.png
diff --git a/sc2/content/base/planets/cyangas-big.ani b/sc2/content/base/planets/cyangas-big.ani
new file mode 100644
index 000000000..242b3ac35
--- /dev/null
+++ b/sc2/content/base/planets/cyangas-big.ani
@@ -0,0 +1 @@
+cyangas-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/cyg__med.0.png b/sc2/content/base/planets/cyangas-med.0.png
similarity index 100%
rename from sc2/content/base/planets/cyg__med.0.png
rename to sc2/content/base/planets/cyangas-med.0.png
diff --git a/sc2/content/base/planets/cyangas-med.ani b/sc2/content/base/planets/cyangas-med.ani
new file mode 100644
index 000000000..3a804b021
--- /dev/null
+++ b/sc2/content/base/planets/cyangas-med.ani
@@ -0,0 +1 @@
+cyangas-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/cyg__sml.0.png b/sc2/content/base/planets/cyangas-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/cyg__sml.0.png
rename to sc2/content/base/planets/cyangas-sml.0.png
diff --git a/sc2/content/base/planets/cyangas-sml.ani b/sc2/content/base/planets/cyangas-sml.ani
new file mode 100644
index 000000000..c9be5c6d3
--- /dev/null
+++ b/sc2/content/base/planets/cyangas-sml.ani
@@ -0,0 +1 @@
+cyangas-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/cya__big.0.png b/sc2/content/base/planets/cyanic-big.0.png
similarity index 100%
rename from sc2/content/base/planets/cya__big.0.png
rename to sc2/content/base/planets/cyanic-big.0.png
diff --git a/sc2/content/base/planets/cyanic-big.ani b/sc2/content/base/planets/cyanic-big.ani
new file mode 100644
index 000000000..4ac11ed5f
--- /dev/null
+++ b/sc2/content/base/planets/cyanic-big.ani
@@ -0,0 +1 @@
+cyanic-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/cya__med.0.png b/sc2/content/base/planets/cyanic-med.0.png
similarity index 100%
rename from sc2/content/base/planets/cya__med.0.png
rename to sc2/content/base/planets/cyanic-med.0.png
diff --git a/sc2/content/base/planets/cyanic-med.ani b/sc2/content/base/planets/cyanic-med.ani
new file mode 100644
index 000000000..a13460575
--- /dev/null
+++ b/sc2/content/base/planets/cyanic-med.ani
@@ -0,0 +1 @@
+cyanic-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/cya__sml.0.png b/sc2/content/base/planets/cyanic-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/cya__sml.0.png
rename to sc2/content/base/planets/cyanic-sml.0.png
diff --git a/sc2/content/base/planets/cyanic-sml.ani b/sc2/content/base/planets/cyanic-sml.ani
new file mode 100644
index 000000000..892435393
--- /dev/null
+++ b/sc2/content/base/planets/cyanic-sml.ani
@@ -0,0 +1 @@
+cyanic-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/cyg__big.ani b/sc2/content/base/planets/cyg__big.ani
deleted file mode 100644
index caf526301..000000000
--- a/sc2/content/base/planets/cyg__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-cyg__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/cyg__med.ani b/sc2/content/base/planets/cyg__med.ani
deleted file mode 100644
index 69bc294cf..000000000
--- a/sc2/content/base/planets/cyg__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-cyg__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/cyg__sml.ani b/sc2/content/base/planets/cyg__sml.ani
deleted file mode 100644
index eccb70590..000000000
--- a/sc2/content/base/planets/cyg__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-cyg__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/deg__big.ani b/sc2/content/base/planets/deg__big.ani
deleted file mode 100644
index 708f44e12..000000000
--- a/sc2/content/base/planets/deg__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-deg__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/deg__med.ani b/sc2/content/base/planets/deg__med.ani
deleted file mode 100644
index 029966c73..000000000
--- a/sc2/content/base/planets/deg__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-deg__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/deg__sml.ani b/sc2/content/base/planets/deg__sml.ani
deleted file mode 100644
index 240dedb6c..000000000
--- a/sc2/content/base/planets/deg__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-deg__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/dus__big.ani b/sc2/content/base/planets/dus__big.ani
deleted file mode 100644
index 147ecc796..000000000
--- a/sc2/content/base/planets/dus__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-dus__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/dus__med.ani b/sc2/content/base/planets/dus__med.ani
deleted file mode 100644
index 4123bbde6..000000000
--- a/sc2/content/base/planets/dus__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-dus__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/dus__sml.ani b/sc2/content/base/planets/dus__sml.ani
deleted file mode 100644
index 3f2c06892..000000000
--- a/sc2/content/base/planets/dus__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-dus__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/dus__big.0.png b/sc2/content/base/planets/dust-big.0.png
similarity index 100%
rename from sc2/content/base/planets/dus__big.0.png
rename to sc2/content/base/planets/dust-big.0.png
diff --git a/sc2/content/base/planets/dust-big.ani b/sc2/content/base/planets/dust-big.ani
new file mode 100644
index 000000000..6469f0e1a
--- /dev/null
+++ b/sc2/content/base/planets/dust-big.ani
@@ -0,0 +1 @@
+dust-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/dus__med.0.png b/sc2/content/base/planets/dust-med.0.png
similarity index 100%
rename from sc2/content/base/planets/dus__med.0.png
rename to sc2/content/base/planets/dust-med.0.png
diff --git a/sc2/content/base/planets/dust-med.ani b/sc2/content/base/planets/dust-med.ani
new file mode 100644
index 000000000..74435a245
--- /dev/null
+++ b/sc2/content/base/planets/dust-med.ani
@@ -0,0 +1 @@
+dust-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/dus__sml.0.png b/sc2/content/base/planets/dust-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/dus__sml.0.png
rename to sc2/content/base/planets/dust-sml.0.png
diff --git a/sc2/content/base/planets/dust-sml.ani b/sc2/content/base/planets/dust-sml.ani
new file mode 100644
index 000000000..adc76a23f
--- /dev/null
+++ b/sc2/content/base/planets/dust-sml.ani
@@ -0,0 +1 @@
+dust-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/eme__big.ani b/sc2/content/base/planets/eme__big.ani
deleted file mode 100644
index b1ce31010..000000000
--- a/sc2/content/base/planets/eme__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-eme__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/eme__med.ani b/sc2/content/base/planets/eme__med.ani
deleted file mode 100644
index 27d53a139..000000000
--- a/sc2/content/base/planets/eme__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-eme__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/eme__sml.ani b/sc2/content/base/planets/eme__sml.ani
deleted file mode 100644
index d3e5dd799..000000000
--- a/sc2/content/base/planets/eme__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-eme__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/eme__big.0.png b/sc2/content/base/planets/emerald-big.0.png
similarity index 100%
rename from sc2/content/base/planets/eme__big.0.png
rename to sc2/content/base/planets/emerald-big.0.png
diff --git a/sc2/content/base/planets/emerald-big.ani b/sc2/content/base/planets/emerald-big.ani
new file mode 100644
index 000000000..dadadc1d2
--- /dev/null
+++ b/sc2/content/base/planets/emerald-big.ani
@@ -0,0 +1 @@
+emerald-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/eme__med.0.png b/sc2/content/base/planets/emerald-med.0.png
similarity index 100%
rename from sc2/content/base/planets/eme__med.0.png
rename to sc2/content/base/planets/emerald-med.0.png
diff --git a/sc2/content/base/planets/emerald-med.ani b/sc2/content/base/planets/emerald-med.ani
new file mode 100644
index 000000000..954d31798
--- /dev/null
+++ b/sc2/content/base/planets/emerald-med.ani
@@ -0,0 +1 @@
+emerald-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/eme__sml.0.png b/sc2/content/base/planets/emerald-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/eme__sml.0.png
rename to sc2/content/base/planets/emerald-sml.0.png
diff --git a/sc2/content/base/planets/emerald-sml.ani b/sc2/content/base/planets/emerald-sml.ani
new file mode 100644
index 000000000..943ba9bd8
--- /dev/null
+++ b/sc2/content/base/planets/emerald-sml.ani
@@ -0,0 +1 @@
+emerald-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/flu__big.ani b/sc2/content/base/planets/flu__big.ani
deleted file mode 100644
index b179123f7..000000000
--- a/sc2/content/base/planets/flu__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-flu__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/flu__med.ani b/sc2/content/base/planets/flu__med.ani
deleted file mode 100644
index 450e1500f..000000000
--- a/sc2/content/base/planets/flu__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-flu__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/flu__sml.ani b/sc2/content/base/planets/flu__sml.ani
deleted file mode 100644
index f53c16609..000000000
--- a/sc2/content/base/planets/flu__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-flu__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/flu__big.0.png b/sc2/content/base/planets/fluorescent-big.0.png
similarity index 100%
rename from sc2/content/base/planets/flu__big.0.png
rename to sc2/content/base/planets/fluorescent-big.0.png
diff --git a/sc2/content/base/planets/fluorescent-big.ani b/sc2/content/base/planets/fluorescent-big.ani
new file mode 100644
index 000000000..9d871b132
--- /dev/null
+++ b/sc2/content/base/planets/fluorescent-big.ani
@@ -0,0 +1 @@
+fluorescent-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/flu__med.0.png b/sc2/content/base/planets/fluorescent-med.0.png
similarity index 100%
rename from sc2/content/base/planets/flu__med.0.png
rename to sc2/content/base/planets/fluorescent-med.0.png
diff --git a/sc2/content/base/planets/fluorescent-med.ani b/sc2/content/base/planets/fluorescent-med.ani
new file mode 100644
index 000000000..d5507635a
--- /dev/null
+++ b/sc2/content/base/planets/fluorescent-med.ani
@@ -0,0 +1 @@
+fluorescent-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/flu__sml.0.png b/sc2/content/base/planets/fluorescent-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/flu__sml.0.png
rename to sc2/content/base/planets/fluorescent-sml.0.png
diff --git a/sc2/content/base/planets/fluorescent-sml.ani b/sc2/content/base/planets/fluorescent-sml.ani
new file mode 100644
index 000000000..a9384ed87
--- /dev/null
+++ b/sc2/content/base/planets/fluorescent-sml.ani
@@ -0,0 +1 @@
+fluorescent-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/gng__big.ani b/sc2/content/base/planets/gng__big.ani
deleted file mode 100644
index 98fc08e86..000000000
--- a/sc2/content/base/planets/gng__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-gng__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/gng__med.ani b/sc2/content/base/planets/gng__med.ani
deleted file mode 100644
index 9fdb57f1f..000000000
--- a/sc2/content/base/planets/gng__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-gng__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/gng__sml.ani b/sc2/content/base/planets/gng__sml.ani
deleted file mode 100644
index 9f8c5e40f..000000000
--- a/sc2/content/base/planets/gng__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-gng__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/gre__big.ani b/sc2/content/base/planets/gre__big.ani
deleted file mode 100644
index 05f702ddf..000000000
--- a/sc2/content/base/planets/gre__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-gre__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/gre__med.ani b/sc2/content/base/planets/gre__med.ani
deleted file mode 100644
index e1af0470e..000000000
--- a/sc2/content/base/planets/gre__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-gre__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/gre__sml.ani b/sc2/content/base/planets/gre__sml.ani
deleted file mode 100644
index 563aa75cf..000000000
--- a/sc2/content/base/planets/gre__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-gre__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/gre__big.0.png b/sc2/content/base/planets/green-big.0.png
similarity index 100%
rename from sc2/content/base/planets/gre__big.0.png
rename to sc2/content/base/planets/green-big.0.png
diff --git a/sc2/content/base/planets/green-big.ani b/sc2/content/base/planets/green-big.ani
new file mode 100644
index 000000000..4f0a6e517
--- /dev/null
+++ b/sc2/content/base/planets/green-big.ani
@@ -0,0 +1 @@
+green-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/gre__med.0.png b/sc2/content/base/planets/green-med.0.png
similarity index 100%
rename from sc2/content/base/planets/gre__med.0.png
rename to sc2/content/base/planets/green-med.0.png
diff --git a/sc2/content/base/planets/green-med.ani b/sc2/content/base/planets/green-med.ani
new file mode 100644
index 000000000..de1b43ef6
--- /dev/null
+++ b/sc2/content/base/planets/green-med.ani
@@ -0,0 +1 @@
+green-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/gre__sml.0.png b/sc2/content/base/planets/green-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/gre__sml.0.png
rename to sc2/content/base/planets/green-sml.0.png
diff --git a/sc2/content/base/planets/green-sml.ani b/sc2/content/base/planets/green-sml.ani
new file mode 100644
index 000000000..371b8b766
--- /dev/null
+++ b/sc2/content/base/planets/green-sml.ani
@@ -0,0 +1 @@
+green-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/gng__big.0.png b/sc2/content/base/planets/greengas-big.0.png
similarity index 100%
rename from sc2/content/base/planets/gng__big.0.png
rename to sc2/content/base/planets/greengas-big.0.png
diff --git a/sc2/content/base/planets/greengas-big.ani b/sc2/content/base/planets/greengas-big.ani
new file mode 100644
index 000000000..d968cabb7
--- /dev/null
+++ b/sc2/content/base/planets/greengas-big.ani
@@ -0,0 +1 @@
+greengas-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/gng__med.0.png b/sc2/content/base/planets/greengas-med.0.png
similarity index 100%
rename from sc2/content/base/planets/gng__med.0.png
rename to sc2/content/base/planets/greengas-med.0.png
diff --git a/sc2/content/base/planets/greengas-med.ani b/sc2/content/base/planets/greengas-med.ani
new file mode 100644
index 000000000..d82db7b80
--- /dev/null
+++ b/sc2/content/base/planets/greengas-med.ani
@@ -0,0 +1 @@
+greengas-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/gng__sml.0.png b/sc2/content/base/planets/greengas-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/gng__sml.0.png
rename to sc2/content/base/planets/greengas-sml.0.png
diff --git a/sc2/content/base/planets/greengas-sml.ani b/sc2/content/base/planets/greengas-sml.ani
new file mode 100644
index 000000000..b7ca004e2
--- /dev/null
+++ b/sc2/content/base/planets/greengas-sml.ani
@@ -0,0 +1 @@
+greengas-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/gyg__big.0.png b/sc2/content/base/planets/greygas-big.0.png
similarity index 100%
rename from sc2/content/base/planets/gyg__big.0.png
rename to sc2/content/base/planets/greygas-big.0.png
diff --git a/sc2/content/base/planets/greygas-big.ani b/sc2/content/base/planets/greygas-big.ani
new file mode 100644
index 000000000..ac8d9f94a
--- /dev/null
+++ b/sc2/content/base/planets/greygas-big.ani
@@ -0,0 +1 @@
+greygas-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/gyg__med.0.png b/sc2/content/base/planets/greygas-med.0.png
similarity index 100%
rename from sc2/content/base/planets/gyg__med.0.png
rename to sc2/content/base/planets/greygas-med.0.png
diff --git a/sc2/content/base/planets/greygas-med.ani b/sc2/content/base/planets/greygas-med.ani
new file mode 100644
index 000000000..9e58b8e68
--- /dev/null
+++ b/sc2/content/base/planets/greygas-med.ani
@@ -0,0 +1 @@
+greygas-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/gyg__sml.0.png b/sc2/content/base/planets/greygas-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/gyg__sml.0.png
rename to sc2/content/base/planets/greygas-sml.0.png
diff --git a/sc2/content/base/planets/greygas-sml.ani b/sc2/content/base/planets/greygas-sml.ani
new file mode 100644
index 000000000..5c5c6659f
--- /dev/null
+++ b/sc2/content/base/planets/greygas-sml.ani
@@ -0,0 +1 @@
+greygas-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/gyg__big.ani b/sc2/content/base/planets/gyg__big.ani
deleted file mode 100644
index a5f2c053f..000000000
--- a/sc2/content/base/planets/gyg__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-gyg__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/gyg__med.ani b/sc2/content/base/planets/gyg__med.ani
deleted file mode 100644
index 687fd49fe..000000000
--- a/sc2/content/base/planets/gyg__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-gyg__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/gyg__sml.ani b/sc2/content/base/planets/gyg__sml.ani
deleted file mode 100644
index 20353c85a..000000000
--- a/sc2/content/base/planets/gyg__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-gyg__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/hal__big.ani b/sc2/content/base/planets/hal__big.ani
deleted file mode 100644
index da92a0c73..000000000
--- a/sc2/content/base/planets/hal__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-hal__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/hal__med.ani b/sc2/content/base/planets/hal__med.ani
deleted file mode 100644
index f127ad09c..000000000
--- a/sc2/content/base/planets/hal__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-hal__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/hal__sml.ani b/sc2/content/base/planets/hal__sml.ani
deleted file mode 100644
index c21ba4a47..000000000
--- a/sc2/content/base/planets/hal__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-hal__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/hal__big.0.png b/sc2/content/base/planets/halide-big.0.png
similarity index 100%
rename from sc2/content/base/planets/hal__big.0.png
rename to sc2/content/base/planets/halide-big.0.png
diff --git a/sc2/content/base/planets/halide-big.ani b/sc2/content/base/planets/halide-big.ani
new file mode 100644
index 000000000..a6c571075
--- /dev/null
+++ b/sc2/content/base/planets/halide-big.ani
@@ -0,0 +1 @@
+halide-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/hal__med.0.png b/sc2/content/base/planets/halide-med.0.png
similarity index 100%
rename from sc2/content/base/planets/hal__med.0.png
rename to sc2/content/base/planets/halide-med.0.png
diff --git a/sc2/content/base/planets/halide-med.ani b/sc2/content/base/planets/halide-med.ani
new file mode 100644
index 000000000..0cbe4b6ec
--- /dev/null
+++ b/sc2/content/base/planets/halide-med.ani
@@ -0,0 +1 @@
+halide-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/hal__sml.0.png b/sc2/content/base/planets/halide-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/hal__sml.0.png
rename to sc2/content/base/planets/halide-sml.0.png
diff --git a/sc2/content/base/planets/halide-sml.ani b/sc2/content/base/planets/halide-sml.ani
new file mode 100644
index 000000000..88732ebbd
--- /dev/null
+++ b/sc2/content/base/planets/halide-sml.ani
@@ -0,0 +1 @@
+halide-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/hyd__big.ani b/sc2/content/base/planets/hyd__big.ani
deleted file mode 100644
index 6751c9503..000000000
--- a/sc2/content/base/planets/hyd__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-hyd__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/hyd__med.ani b/sc2/content/base/planets/hyd__med.ani
deleted file mode 100644
index 0799df681..000000000
--- a/sc2/content/base/planets/hyd__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-hyd__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/hyd__sml.ani b/sc2/content/base/planets/hyd__sml.ani
deleted file mode 100644
index 5aa16fa4a..000000000
--- a/sc2/content/base/planets/hyd__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-hyd__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/hyd__big.0.png b/sc2/content/base/planets/hydrocarbon-big.0.png
similarity index 100%
rename from sc2/content/base/planets/hyd__big.0.png
rename to sc2/content/base/planets/hydrocarbon-big.0.png
diff --git a/sc2/content/base/planets/hydrocarbon-big.ani b/sc2/content/base/planets/hydrocarbon-big.ani
new file mode 100644
index 000000000..0f2aa6898
--- /dev/null
+++ b/sc2/content/base/planets/hydrocarbon-big.ani
@@ -0,0 +1 @@
+hydrocarbon-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/hyd__med.0.png b/sc2/content/base/planets/hydrocarbon-med.0.png
similarity index 100%
rename from sc2/content/base/planets/hyd__med.0.png
rename to sc2/content/base/planets/hydrocarbon-med.0.png
diff --git a/sc2/content/base/planets/hydrocarbon-med.ani b/sc2/content/base/planets/hydrocarbon-med.ani
new file mode 100644
index 000000000..aa978171f
--- /dev/null
+++ b/sc2/content/base/planets/hydrocarbon-med.ani
@@ -0,0 +1 @@
+hydrocarbon-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/hyd__sml.0.png b/sc2/content/base/planets/hydrocarbon-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/hyd__sml.0.png
rename to sc2/content/base/planets/hydrocarbon-sml.0.png
diff --git a/sc2/content/base/planets/hydrocarbon-sml.ani b/sc2/content/base/planets/hydrocarbon-sml.ani
new file mode 100644
index 000000000..9e2fdf76d
--- /dev/null
+++ b/sc2/content/base/planets/hydrocarbon-sml.ani
@@ -0,0 +1 @@
+hydrocarbon-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/inf__big.ani b/sc2/content/base/planets/inf__big.ani
deleted file mode 100644
index f39316f60..000000000
--- a/sc2/content/base/planets/inf__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-inf__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/inf__med.ani b/sc2/content/base/planets/inf__med.ani
deleted file mode 100644
index 1e09ef2fa..000000000
--- a/sc2/content/base/planets/inf__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-inf__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/inf__sml.ani b/sc2/content/base/planets/inf__sml.ani
deleted file mode 100644
index d87867184..000000000
--- a/sc2/content/base/planets/inf__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-inf__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/inf__big.0.png b/sc2/content/base/planets/infrared-big.0.png
similarity index 100%
rename from sc2/content/base/planets/inf__big.0.png
rename to sc2/content/base/planets/infrared-big.0.png
diff --git a/sc2/content/base/planets/infrared-big.ani b/sc2/content/base/planets/infrared-big.ani
new file mode 100644
index 000000000..452eaeeb4
--- /dev/null
+++ b/sc2/content/base/planets/infrared-big.ani
@@ -0,0 +1 @@
+infrared-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/inf__med.0.png b/sc2/content/base/planets/infrared-med.0.png
similarity index 100%
rename from sc2/content/base/planets/inf__med.0.png
rename to sc2/content/base/planets/infrared-med.0.png
diff --git a/sc2/content/base/planets/infrared-med.ani b/sc2/content/base/planets/infrared-med.ani
new file mode 100644
index 000000000..9b22360e3
--- /dev/null
+++ b/sc2/content/base/planets/infrared-med.ani
@@ -0,0 +1 @@
+infrared-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/inf__sml.0.png b/sc2/content/base/planets/infrared-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/inf__sml.0.png
rename to sc2/content/base/planets/infrared-sml.0.png
diff --git a/sc2/content/base/planets/infrared-sml.ani b/sc2/content/base/planets/infrared-sml.ani
new file mode 100644
index 000000000..2a6c5c3dc
--- /dev/null
+++ b/sc2/content/base/planets/infrared-sml.ani
@@ -0,0 +1 @@
+infrared-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/iod__big.ani b/sc2/content/base/planets/iod__big.ani
deleted file mode 100644
index 83d227ae8..000000000
--- a/sc2/content/base/planets/iod__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-iod__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/iod__med.ani b/sc2/content/base/planets/iod__med.ani
deleted file mode 100644
index c6f0c021b..000000000
--- a/sc2/content/base/planets/iod__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-iod__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/iod__sml.ani b/sc2/content/base/planets/iod__sml.ani
deleted file mode 100644
index 0e8471205..000000000
--- a/sc2/content/base/planets/iod__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-iod__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/iod__big.0.png b/sc2/content/base/planets/iodine-big.0.png
similarity index 100%
rename from sc2/content/base/planets/iod__big.0.png
rename to sc2/content/base/planets/iodine-big.0.png
diff --git a/sc2/content/base/planets/iodine-big.ani b/sc2/content/base/planets/iodine-big.ani
new file mode 100644
index 000000000..73a591f11
--- /dev/null
+++ b/sc2/content/base/planets/iodine-big.ani
@@ -0,0 +1 @@
+iodine-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/iod__med.0.png b/sc2/content/base/planets/iodine-med.0.png
similarity index 100%
rename from sc2/content/base/planets/iod__med.0.png
rename to sc2/content/base/planets/iodine-med.0.png
diff --git a/sc2/content/base/planets/iodine-med.ani b/sc2/content/base/planets/iodine-med.ani
new file mode 100644
index 000000000..40f0e0bc1
--- /dev/null
+++ b/sc2/content/base/planets/iodine-med.ani
@@ -0,0 +1 @@
+iodine-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/iod__sml.0.png b/sc2/content/base/planets/iodine-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/iod__sml.0.png
rename to sc2/content/base/planets/iodine-sml.0.png
diff --git a/sc2/content/base/planets/iodine-sml.ani b/sc2/content/base/planets/iodine-sml.ani
new file mode 100644
index 000000000..3abd92be1
--- /dev/null
+++ b/sc2/content/base/planets/iodine-sml.ani
@@ -0,0 +1 @@
+iodine-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/lan__big.ani b/sc2/content/base/planets/lan__big.ani
deleted file mode 100644
index d8bcf0233..000000000
--- a/sc2/content/base/planets/lan__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-lan__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/lan__med.ani b/sc2/content/base/planets/lan__med.ani
deleted file mode 100644
index dd1ee276f..000000000
--- a/sc2/content/base/planets/lan__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-lan__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/lan__sml.ani b/sc2/content/base/planets/lan__sml.ani
deleted file mode 100644
index d9e8b5eb9..000000000
--- a/sc2/content/base/planets/lan__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-lan__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/lan__big.0.png b/sc2/content/base/planets/lanthanide-big.0.png
similarity index 100%
rename from sc2/content/base/planets/lan__big.0.png
rename to sc2/content/base/planets/lanthanide-big.0.png
diff --git a/sc2/content/base/planets/lanthanide-big.ani b/sc2/content/base/planets/lanthanide-big.ani
new file mode 100644
index 000000000..1f0943796
--- /dev/null
+++ b/sc2/content/base/planets/lanthanide-big.ani
@@ -0,0 +1 @@
+lanthanide-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/lan__med.0.png b/sc2/content/base/planets/lanthanide-med.0.png
similarity index 100%
rename from sc2/content/base/planets/lan__med.0.png
rename to sc2/content/base/planets/lanthanide-med.0.png
diff --git a/sc2/content/base/planets/lanthanide-med.ani b/sc2/content/base/planets/lanthanide-med.ani
new file mode 100644
index 000000000..a698d6d78
--- /dev/null
+++ b/sc2/content/base/planets/lanthanide-med.ani
@@ -0,0 +1 @@
+lanthanide-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/lan__sml.0.png b/sc2/content/base/planets/lanthanide-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/lan__sml.0.png
rename to sc2/content/base/planets/lanthanide-sml.0.png
diff --git a/sc2/content/base/planets/lanthanide-sml.ani b/sc2/content/base/planets/lanthanide-sml.ani
new file mode 100644
index 000000000..0dd527553
--- /dev/null
+++ b/sc2/content/base/planets/lanthanide-sml.ani
@@ -0,0 +1 @@
+lanthanide-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/mgm__big.0.png b/sc2/content/base/planets/magma-big.0.png
similarity index 100%
rename from sc2/content/base/planets/mgm__big.0.png
rename to sc2/content/base/planets/magma-big.0.png
diff --git a/sc2/content/base/planets/magma-big.ani b/sc2/content/base/planets/magma-big.ani
new file mode 100644
index 000000000..a98a43718
--- /dev/null
+++ b/sc2/content/base/planets/magma-big.ani
@@ -0,0 +1 @@
+magma-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/mgm__med.0.png b/sc2/content/base/planets/magma-med.0.png
similarity index 100%
rename from sc2/content/base/planets/mgm__med.0.png
rename to sc2/content/base/planets/magma-med.0.png
diff --git a/sc2/content/base/planets/magma-med.ani b/sc2/content/base/planets/magma-med.ani
new file mode 100644
index 000000000..cdd82ad38
--- /dev/null
+++ b/sc2/content/base/planets/magma-med.ani
@@ -0,0 +1 @@
+magma-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/mgm__sml.0.png b/sc2/content/base/planets/magma-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/mgm__sml.0.png
rename to sc2/content/base/planets/magma-sml.0.png
diff --git a/sc2/content/base/planets/magma-sml.ani b/sc2/content/base/planets/magma-sml.ani
new file mode 100644
index 000000000..7f1ec1393
--- /dev/null
+++ b/sc2/content/base/planets/magma-sml.ani
@@ -0,0 +1 @@
+magma-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/mgn__big.0.png b/sc2/content/base/planets/magnetic-big.0.png
similarity index 100%
rename from sc2/content/base/planets/mgn__big.0.png
rename to sc2/content/base/planets/magnetic-big.0.png
diff --git a/sc2/content/base/planets/magnetic-big.ani b/sc2/content/base/planets/magnetic-big.ani
new file mode 100644
index 000000000..71803fbf1
--- /dev/null
+++ b/sc2/content/base/planets/magnetic-big.ani
@@ -0,0 +1 @@
+magnetic-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/mgn__med.0.png b/sc2/content/base/planets/magnetic-med.0.png
similarity index 100%
rename from sc2/content/base/planets/mgn__med.0.png
rename to sc2/content/base/planets/magnetic-med.0.png
diff --git a/sc2/content/base/planets/magnetic-med.ani b/sc2/content/base/planets/magnetic-med.ani
new file mode 100644
index 000000000..2e4ddc0f4
--- /dev/null
+++ b/sc2/content/base/planets/magnetic-med.ani
@@ -0,0 +1 @@
+magnetic-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/mgn__sml.0.png b/sc2/content/base/planets/magnetic-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/mgn__sml.0.png
rename to sc2/content/base/planets/magnetic-sml.0.png
diff --git a/sc2/content/base/planets/magnetic-sml.ani b/sc2/content/base/planets/magnetic-sml.ani
new file mode 100644
index 000000000..c6390bec6
--- /dev/null
+++ b/sc2/content/base/planets/magnetic-sml.ani
@@ -0,0 +1 @@
+magnetic-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/mar__big.ani b/sc2/content/base/planets/mar__big.ani
deleted file mode 100644
index 5aa6e4a03..000000000
--- a/sc2/content/base/planets/mar__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-mar__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/mar__med.ani b/sc2/content/base/planets/mar__med.ani
deleted file mode 100644
index 5a6a5a5f3..000000000
--- a/sc2/content/base/planets/mar__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-mar__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/mar__sml.ani b/sc2/content/base/planets/mar__sml.ani
deleted file mode 100644
index 4f72250b9..000000000
--- a/sc2/content/base/planets/mar__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-mar__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/cri__big.0.png b/sc2/content/base/planets/maroon-big.0.png
similarity index 100%
rename from sc2/content/base/planets/cri__big.0.png
rename to sc2/content/base/planets/maroon-big.0.png
diff --git a/sc2/content/base/planets/maroon-big.ani b/sc2/content/base/planets/maroon-big.ani
new file mode 100644
index 000000000..c1fe5bb70
--- /dev/null
+++ b/sc2/content/base/planets/maroon-big.ani
@@ -0,0 +1 @@
+maroon-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/cri__med.0.png b/sc2/content/base/planets/maroon-med.0.png
similarity index 100%
rename from sc2/content/base/planets/cri__med.0.png
rename to sc2/content/base/planets/maroon-med.0.png
diff --git a/sc2/content/base/planets/maroon-med.ani b/sc2/content/base/planets/maroon-med.ani
new file mode 100644
index 000000000..7e197b5e0
--- /dev/null
+++ b/sc2/content/base/planets/maroon-med.ani
@@ -0,0 +1 @@
+maroon-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/cri__sml.0.png b/sc2/content/base/planets/maroon-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/cri__sml.0.png
rename to sc2/content/base/planets/maroon-sml.0.png
diff --git a/sc2/content/base/planets/maroon-sml.ani b/sc2/content/base/planets/maroon-sml.ani
new file mode 100644
index 000000000..f84a172df
--- /dev/null
+++ b/sc2/content/base/planets/maroon-sml.ani
@@ -0,0 +1 @@
+maroon-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/mtl__big.0.png b/sc2/content/base/planets/metal-big.0.png
similarity index 100%
rename from sc2/content/base/planets/mtl__big.0.png
rename to sc2/content/base/planets/metal-big.0.png
diff --git a/sc2/content/base/planets/metal-big.ani b/sc2/content/base/planets/metal-big.ani
new file mode 100644
index 000000000..e6429baca
--- /dev/null
+++ b/sc2/content/base/planets/metal-big.ani
@@ -0,0 +1 @@
+metal-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/mtl__med.0.png b/sc2/content/base/planets/metal-med.0.png
similarity index 100%
rename from sc2/content/base/planets/mtl__med.0.png
rename to sc2/content/base/planets/metal-med.0.png
diff --git a/sc2/content/base/planets/metal-med.ani b/sc2/content/base/planets/metal-med.ani
new file mode 100644
index 000000000..8b0d18bdf
--- /dev/null
+++ b/sc2/content/base/planets/metal-med.ani
@@ -0,0 +1 @@
+metal-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/mtl__sml.0.png b/sc2/content/base/planets/metal-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/mtl__sml.0.png
rename to sc2/content/base/planets/metal-sml.0.png
diff --git a/sc2/content/base/planets/metal-sml.ani b/sc2/content/base/planets/metal-sml.ani
new file mode 100644
index 000000000..f8db82d90
--- /dev/null
+++ b/sc2/content/base/planets/metal-sml.ani
@@ -0,0 +1 @@
+metal-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/mgm__big.ani b/sc2/content/base/planets/mgm__big.ani
deleted file mode 100644
index 43c99b07d..000000000
--- a/sc2/content/base/planets/mgm__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-mgm__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/mgm__med.ani b/sc2/content/base/planets/mgm__med.ani
deleted file mode 100644
index 3b6b131f0..000000000
--- a/sc2/content/base/planets/mgm__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-mgm__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/mgm__sml.ani b/sc2/content/base/planets/mgm__sml.ani
deleted file mode 100644
index 3fe14ff52..000000000
--- a/sc2/content/base/planets/mgm__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-mgm__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/mgn__big.ani b/sc2/content/base/planets/mgn__big.ani
deleted file mode 100644
index 38b766aec..000000000
--- a/sc2/content/base/planets/mgn__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-mgn__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/mgn__med.ani b/sc2/content/base/planets/mgn__med.ani
deleted file mode 100644
index 19199d58c..000000000
--- a/sc2/content/base/planets/mgn__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-mgn__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/mgn__sml.ani b/sc2/content/base/planets/mgn__sml.ani
deleted file mode 100644
index ae88cb6a6..000000000
--- a/sc2/content/base/planets/mgn__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-mgn__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/mtl__big.ani b/sc2/content/base/planets/mtl__big.ani
deleted file mode 100644
index c88ae272d..000000000
--- a/sc2/content/base/planets/mtl__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-mtl__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/mtl__med.ani b/sc2/content/base/planets/mtl__med.ani
deleted file mode 100644
index e00f28a30..000000000
--- a/sc2/content/base/planets/mtl__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-mtl__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/mtl__sml.ani b/sc2/content/base/planets/mtl__sml.ani
deleted file mode 100644
index 16fec2190..000000000
--- a/sc2/content/base/planets/mtl__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-mtl__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/nob__big.ani b/sc2/content/base/planets/nob__big.ani
deleted file mode 100644
index c0b326074..000000000
--- a/sc2/content/base/planets/nob__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-nob__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/nob__med.ani b/sc2/content/base/planets/nob__med.ani
deleted file mode 100644
index 2a4de49b2..000000000
--- a/sc2/content/base/planets/nob__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-nob__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/nob__sml.ani b/sc2/content/base/planets/nob__sml.ani
deleted file mode 100644
index a11fc5d9e..000000000
--- a/sc2/content/base/planets/nob__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-nob__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/nob__big.0.png b/sc2/content/base/planets/noble-big.0.png
similarity index 100%
rename from sc2/content/base/planets/nob__big.0.png
rename to sc2/content/base/planets/noble-big.0.png
diff --git a/sc2/content/base/planets/noble-big.ani b/sc2/content/base/planets/noble-big.ani
new file mode 100644
index 000000000..7cc64cb51
--- /dev/null
+++ b/sc2/content/base/planets/noble-big.ani
@@ -0,0 +1 @@
+noble-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/nob__med.0.png b/sc2/content/base/planets/noble-med.0.png
similarity index 100%
rename from sc2/content/base/planets/nob__med.0.png
rename to sc2/content/base/planets/noble-med.0.png
diff --git a/sc2/content/base/planets/noble-med.ani b/sc2/content/base/planets/noble-med.ani
new file mode 100644
index 000000000..46465135b
--- /dev/null
+++ b/sc2/content/base/planets/noble-med.ani
@@ -0,0 +1 @@
+noble-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/nob__sml.0.png b/sc2/content/base/planets/noble-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/nob__sml.0.png
rename to sc2/content/base/planets/noble-sml.0.png
diff --git a/sc2/content/base/planets/noble-sml.ani b/sc2/content/base/planets/noble-sml.ani
new file mode 100644
index 000000000..09d6b1bf4
--- /dev/null
+++ b/sc2/content/base/planets/noble-sml.ani
@@ -0,0 +1 @@
+noble-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/ool__big.ani b/sc2/content/base/planets/ool__big.ani
deleted file mode 100644
index 23a6b720e..000000000
--- a/sc2/content/base/planets/ool__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-ool__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/ool__med.ani b/sc2/content/base/planets/ool__med.ani
deleted file mode 100644
index 235d75846..000000000
--- a/sc2/content/base/planets/ool__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-ool__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/ool__sml.ani b/sc2/content/base/planets/ool__sml.ani
deleted file mode 100644
index b5dbb4ee3..000000000
--- a/sc2/content/base/planets/ool__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-ool__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/ool__big.0.png b/sc2/content/base/planets/oolite-big.0.png
similarity index 100%
rename from sc2/content/base/planets/ool__big.0.png
rename to sc2/content/base/planets/oolite-big.0.png
diff --git a/sc2/content/base/planets/oolite-big.ani b/sc2/content/base/planets/oolite-big.ani
new file mode 100644
index 000000000..eb88fecb9
--- /dev/null
+++ b/sc2/content/base/planets/oolite-big.ani
@@ -0,0 +1 @@
+oolite-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/ool__med.0.png b/sc2/content/base/planets/oolite-med.0.png
similarity index 100%
rename from sc2/content/base/planets/ool__med.0.png
rename to sc2/content/base/planets/oolite-med.0.png
diff --git a/sc2/content/base/planets/oolite-med.ani b/sc2/content/base/planets/oolite-med.ani
new file mode 100644
index 000000000..97bbd1054
--- /dev/null
+++ b/sc2/content/base/planets/oolite-med.ani
@@ -0,0 +1 @@
+oolite-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/ool__sml.0.png b/sc2/content/base/planets/oolite-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/ool__sml.0.png
rename to sc2/content/base/planets/oolite-sml.0.png
diff --git a/sc2/content/base/planets/oolite-sml.ani b/sc2/content/base/planets/oolite-sml.ani
new file mode 100644
index 000000000..548f052d5
--- /dev/null
+++ b/sc2/content/base/planets/oolite-sml.ani
@@ -0,0 +1 @@
+oolite-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/opa__big.ani b/sc2/content/base/planets/opa__big.ani
deleted file mode 100644
index 47d9a2aaa..000000000
--- a/sc2/content/base/planets/opa__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-opa__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/opa__med.ani b/sc2/content/base/planets/opa__med.ani
deleted file mode 100644
index c84937549..000000000
--- a/sc2/content/base/planets/opa__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-opa__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/opa__sml.ani b/sc2/content/base/planets/opa__sml.ani
deleted file mode 100644
index fd4600068..000000000
--- a/sc2/content/base/planets/opa__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-opa__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/opa__big.0.png b/sc2/content/base/planets/opalescent-big.0.png
similarity index 100%
rename from sc2/content/base/planets/opa__big.0.png
rename to sc2/content/base/planets/opalescent-big.0.png
diff --git a/sc2/content/base/planets/opalescent-big.ani b/sc2/content/base/planets/opalescent-big.ani
new file mode 100644
index 000000000..2f9cb029e
--- /dev/null
+++ b/sc2/content/base/planets/opalescent-big.ani
@@ -0,0 +1 @@
+opalescent-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/opa__med.0.png b/sc2/content/base/planets/opalescent-med.0.png
similarity index 100%
rename from sc2/content/base/planets/opa__med.0.png
rename to sc2/content/base/planets/opalescent-med.0.png
diff --git a/sc2/content/base/planets/opalescent-med.ani b/sc2/content/base/planets/opalescent-med.ani
new file mode 100644
index 000000000..0f716fb56
--- /dev/null
+++ b/sc2/content/base/planets/opalescent-med.ani
@@ -0,0 +1 @@
+opalescent-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/opa__sml.0.png b/sc2/content/base/planets/opalescent-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/opa__sml.0.png
rename to sc2/content/base/planets/opalescent-sml.0.png
diff --git a/sc2/content/base/planets/opalescent-sml.ani b/sc2/content/base/planets/opalescent-sml.ani
new file mode 100644
index 000000000..f57125467
--- /dev/null
+++ b/sc2/content/base/planets/opalescent-sml.ani
@@ -0,0 +1 @@
+opalescent-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/org__big.ani b/sc2/content/base/planets/org__big.ani
deleted file mode 100644
index b0a4f4f2f..000000000
--- a/sc2/content/base/planets/org__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-org__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/org__med.ani b/sc2/content/base/planets/org__med.ani
deleted file mode 100644
index 800de4268..000000000
--- a/sc2/content/base/planets/org__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-org__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/org__sml.ani b/sc2/content/base/planets/org__sml.ani
deleted file mode 100644
index 55654056f..000000000
--- a/sc2/content/base/planets/org__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-org__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/org__big.0.png b/sc2/content/base/planets/organic-big.0.png
similarity index 100%
rename from sc2/content/base/planets/org__big.0.png
rename to sc2/content/base/planets/organic-big.0.png
diff --git a/sc2/content/base/planets/organic-big.ani b/sc2/content/base/planets/organic-big.ani
new file mode 100644
index 000000000..a1e801cdd
--- /dev/null
+++ b/sc2/content/base/planets/organic-big.ani
@@ -0,0 +1 @@
+organic-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/org__med.0.png b/sc2/content/base/planets/organic-med.0.png
similarity index 100%
rename from sc2/content/base/planets/org__med.0.png
rename to sc2/content/base/planets/organic-med.0.png
diff --git a/sc2/content/base/planets/organic-med.ani b/sc2/content/base/planets/organic-med.ani
new file mode 100644
index 000000000..46d8514dd
--- /dev/null
+++ b/sc2/content/base/planets/organic-med.ani
@@ -0,0 +1 @@
+organic-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/org__sml.0.png b/sc2/content/base/planets/organic-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/org__sml.0.png
rename to sc2/content/base/planets/organic-sml.0.png
diff --git a/sc2/content/base/planets/organic-sml.ani b/sc2/content/base/planets/organic-sml.ani
new file mode 100644
index 000000000..7810fdfb9
--- /dev/null
+++ b/sc2/content/base/planets/organic-sml.ani
@@ -0,0 +1 @@
+organic-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/pel__big.ani b/sc2/content/base/planets/pel__big.ani
deleted file mode 100644
index 73a1cf1d2..000000000
--- a/sc2/content/base/planets/pel__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-pel__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/pel__med.ani b/sc2/content/base/planets/pel__med.ani
deleted file mode 100644
index 0098b6ad4..000000000
--- a/sc2/content/base/planets/pel__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-pel__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/pel__sml.ani b/sc2/content/base/planets/pel__sml.ani
deleted file mode 100644
index b77880b02..000000000
--- a/sc2/content/base/planets/pel__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-pel__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/pel__big.0.png b/sc2/content/base/planets/pellucid-big.0.png
similarity index 100%
rename from sc2/content/base/planets/pel__big.0.png
rename to sc2/content/base/planets/pellucid-big.0.png
diff --git a/sc2/content/base/planets/pellucid-big.ani b/sc2/content/base/planets/pellucid-big.ani
new file mode 100644
index 000000000..310e5c078
--- /dev/null
+++ b/sc2/content/base/planets/pellucid-big.ani
@@ -0,0 +1 @@
+pellucid-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/pel__med.0.png b/sc2/content/base/planets/pellucid-med.0.png
similarity index 100%
rename from sc2/content/base/planets/pel__med.0.png
rename to sc2/content/base/planets/pellucid-med.0.png
diff --git a/sc2/content/base/planets/pellucid-med.ani b/sc2/content/base/planets/pellucid-med.ani
new file mode 100644
index 000000000..26c102a67
--- /dev/null
+++ b/sc2/content/base/planets/pellucid-med.ani
@@ -0,0 +1 @@
+pellucid-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/pel__sml.0.png b/sc2/content/base/planets/pellucid-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/pel__sml.0.png
rename to sc2/content/base/planets/pellucid-sml.0.png
diff --git a/sc2/content/base/planets/pellucid-sml.ani b/sc2/content/base/planets/pellucid-sml.ani
new file mode 100644
index 000000000..eeb19e395
--- /dev/null
+++ b/sc2/content/base/planets/pellucid-sml.ani
@@ -0,0 +1 @@
+pellucid-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/plu__big.ani b/sc2/content/base/planets/plu__big.ani
deleted file mode 100644
index 921394ee1..000000000
--- a/sc2/content/base/planets/plu__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-plu__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/plu__med.ani b/sc2/content/base/planets/plu__med.ani
deleted file mode 100644
index bc3329d5d..000000000
--- a/sc2/content/base/planets/plu__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-plu__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/plu__sml.ani b/sc2/content/base/planets/plu__sml.ani
deleted file mode 100644
index 2482fa0ed..000000000
--- a/sc2/content/base/planets/plu__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-plu__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/plu__big.0.png b/sc2/content/base/planets/plutonic-big.0.png
similarity index 100%
rename from sc2/content/base/planets/plu__big.0.png
rename to sc2/content/base/planets/plutonic-big.0.png
diff --git a/sc2/content/base/planets/plutonic-big.ani b/sc2/content/base/planets/plutonic-big.ani
new file mode 100644
index 000000000..c3ab2c44d
--- /dev/null
+++ b/sc2/content/base/planets/plutonic-big.ani
@@ -0,0 +1 @@
+plutonic-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/plu__med.0.png b/sc2/content/base/planets/plutonic-med.0.png
similarity index 100%
rename from sc2/content/base/planets/plu__med.0.png
rename to sc2/content/base/planets/plutonic-med.0.png
diff --git a/sc2/content/base/planets/plutonic-med.ani b/sc2/content/base/planets/plutonic-med.ani
new file mode 100644
index 000000000..ec8975297
--- /dev/null
+++ b/sc2/content/base/planets/plutonic-med.ani
@@ -0,0 +1 @@
+plutonic-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/plu__sml.0.png b/sc2/content/base/planets/plutonic-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/plu__sml.0.png
rename to sc2/content/base/planets/plutonic-sml.0.png
diff --git a/sc2/content/base/planets/plutonic-sml.ani b/sc2/content/base/planets/plutonic-sml.ani
new file mode 100644
index 000000000..395f9e3f0
--- /dev/null
+++ b/sc2/content/base/planets/plutonic-sml.ani
@@ -0,0 +1 @@
+plutonic-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/pri__big.ani b/sc2/content/base/planets/pri__big.ani
deleted file mode 100644
index 6ca8d008f..000000000
--- a/sc2/content/base/planets/pri__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-pri__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/pri__med.ani b/sc2/content/base/planets/pri__med.ani
deleted file mode 100644
index fdea75605..000000000
--- a/sc2/content/base/planets/pri__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-pri__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/pri__sml.ani b/sc2/content/base/planets/pri__sml.ani
deleted file mode 100644
index 5d49b59b7..000000000
--- a/sc2/content/base/planets/pri__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-pri__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/pri__big.0.png b/sc2/content/base/planets/primordial-big.0.png
similarity index 100%
rename from sc2/content/base/planets/pri__big.0.png
rename to sc2/content/base/planets/primordial-big.0.png
diff --git a/sc2/content/base/planets/primordial-big.ani b/sc2/content/base/planets/primordial-big.ani
new file mode 100644
index 000000000..ad07966f1
--- /dev/null
+++ b/sc2/content/base/planets/primordial-big.ani
@@ -0,0 +1 @@
+primordial-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/pri__med.0.png b/sc2/content/base/planets/primordial-med.0.png
similarity index 100%
rename from sc2/content/base/planets/pri__med.0.png
rename to sc2/content/base/planets/primordial-med.0.png
diff --git a/sc2/content/base/planets/primordial-med.ani b/sc2/content/base/planets/primordial-med.ani
new file mode 100644
index 000000000..f1a4e79e1
--- /dev/null
+++ b/sc2/content/base/planets/primordial-med.ani
@@ -0,0 +1 @@
+primordial-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/pri__sml.0.png b/sc2/content/base/planets/primordial-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/pri__sml.0.png
rename to sc2/content/base/planets/primordial-sml.0.png
diff --git a/sc2/content/base/planets/primordial-sml.ani b/sc2/content/base/planets/primordial-sml.ani
new file mode 100644
index 000000000..cf39ba6ed
--- /dev/null
+++ b/sc2/content/base/planets/primordial-sml.ani
@@ -0,0 +1 @@
+primordial-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/pug__big.ani b/sc2/content/base/planets/pug__big.ani
deleted file mode 100644
index f25786724..000000000
--- a/sc2/content/base/planets/pug__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-pug__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/pug__med.ani b/sc2/content/base/planets/pug__med.ani
deleted file mode 100644
index 89440866d..000000000
--- a/sc2/content/base/planets/pug__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-pug__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/pug__sml.ani b/sc2/content/base/planets/pug__sml.ani
deleted file mode 100644
index 262397fc3..000000000
--- a/sc2/content/base/planets/pug__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-pug__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/pur__big.ani b/sc2/content/base/planets/pur__big.ani
deleted file mode 100644
index 818bdd57d..000000000
--- a/sc2/content/base/planets/pur__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-pur__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/pur__med.ani b/sc2/content/base/planets/pur__med.ani
deleted file mode 100644
index ee91bfc41..000000000
--- a/sc2/content/base/planets/pur__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-pur__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/pur__sml.ani b/sc2/content/base/planets/pur__sml.ani
deleted file mode 100644
index 9cbb5f6e2..000000000
--- a/sc2/content/base/planets/pur__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-pur__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/pur__big.0.png b/sc2/content/base/planets/purple-big.0.png
similarity index 100%
rename from sc2/content/base/planets/pur__big.0.png
rename to sc2/content/base/planets/purple-big.0.png
diff --git a/sc2/content/base/planets/purple-big.ani b/sc2/content/base/planets/purple-big.ani
new file mode 100644
index 000000000..938755604
--- /dev/null
+++ b/sc2/content/base/planets/purple-big.ani
@@ -0,0 +1 @@
+purple-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/pur__med.0.png b/sc2/content/base/planets/purple-med.0.png
similarity index 100%
rename from sc2/content/base/planets/pur__med.0.png
rename to sc2/content/base/planets/purple-med.0.png
diff --git a/sc2/content/base/planets/purple-med.ani b/sc2/content/base/planets/purple-med.ani
new file mode 100644
index 000000000..393529553
--- /dev/null
+++ b/sc2/content/base/planets/purple-med.ani
@@ -0,0 +1 @@
+purple-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/pur__sml.0.png b/sc2/content/base/planets/purple-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/pur__sml.0.png
rename to sc2/content/base/planets/purple-sml.0.png
diff --git a/sc2/content/base/planets/purple-sml.ani b/sc2/content/base/planets/purple-sml.ani
new file mode 100644
index 000000000..5c2d633df
--- /dev/null
+++ b/sc2/content/base/planets/purple-sml.ani
@@ -0,0 +1 @@
+purple-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/pug__big.0.png b/sc2/content/base/planets/purplegas-big.0.png
similarity index 100%
rename from sc2/content/base/planets/pug__big.0.png
rename to sc2/content/base/planets/purplegas-big.0.png
diff --git a/sc2/content/base/planets/purplegas-big.ani b/sc2/content/base/planets/purplegas-big.ani
new file mode 100644
index 000000000..002c38652
--- /dev/null
+++ b/sc2/content/base/planets/purplegas-big.ani
@@ -0,0 +1 @@
+purplegas-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/pug__med.0.png b/sc2/content/base/planets/purplegas-med.0.png
similarity index 100%
rename from sc2/content/base/planets/pug__med.0.png
rename to sc2/content/base/planets/purplegas-med.0.png
diff --git a/sc2/content/base/planets/purplegas-med.ani b/sc2/content/base/planets/purplegas-med.ani
new file mode 100644
index 000000000..7000515a0
--- /dev/null
+++ b/sc2/content/base/planets/purplegas-med.ani
@@ -0,0 +1 @@
+purplegas-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/pug__sml.0.png b/sc2/content/base/planets/purplegas-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/pug__sml.0.png
rename to sc2/content/base/planets/purplegas-sml.0.png
diff --git a/sc2/content/base/planets/purplegas-sml.ani b/sc2/content/base/planets/purplegas-sml.ani
new file mode 100644
index 000000000..621ddecd1
--- /dev/null
+++ b/sc2/content/base/planets/purplegas-sml.ani
@@ -0,0 +1 @@
+purplegas-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/deg__big.0.png b/sc2/content/base/planets/quasidegenerate-big.0.png
similarity index 100%
rename from sc2/content/base/planets/deg__big.0.png
rename to sc2/content/base/planets/quasidegenerate-big.0.png
diff --git a/sc2/content/base/planets/quasidegenerate-big.ani b/sc2/content/base/planets/quasidegenerate-big.ani
new file mode 100644
index 000000000..12a495647
--- /dev/null
+++ b/sc2/content/base/planets/quasidegenerate-big.ani
@@ -0,0 +1 @@
+quasidegenerate-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/deg__med.0.png b/sc2/content/base/planets/quasidegenerate-med.0.png
similarity index 100%
rename from sc2/content/base/planets/deg__med.0.png
rename to sc2/content/base/planets/quasidegenerate-med.0.png
diff --git a/sc2/content/base/planets/quasidegenerate-med.ani b/sc2/content/base/planets/quasidegenerate-med.ani
new file mode 100644
index 000000000..f1db7e97d
--- /dev/null
+++ b/sc2/content/base/planets/quasidegenerate-med.ani
@@ -0,0 +1 @@
+quasidegenerate-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/deg__sml.0.png b/sc2/content/base/planets/quasidegenerate-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/deg__sml.0.png
rename to sc2/content/base/planets/quasidegenerate-sml.0.png
diff --git a/sc2/content/base/planets/quasidegenerate-sml.ani b/sc2/content/base/planets/quasidegenerate-sml.ani
new file mode 100644
index 000000000..4563b8158
--- /dev/null
+++ b/sc2/content/base/planets/quasidegenerate-sml.ani
@@ -0,0 +1 @@
+quasidegenerate-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/rad__big.ani b/sc2/content/base/planets/rad__big.ani
deleted file mode 100644
index eb20abda5..000000000
--- a/sc2/content/base/planets/rad__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-rad__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/rad__med.ani b/sc2/content/base/planets/rad__med.ani
deleted file mode 100644
index 14017e2db..000000000
--- a/sc2/content/base/planets/rad__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-rad__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/rad__sml.ani b/sc2/content/base/planets/rad__sml.ani
deleted file mode 100644
index 2018aa149..000000000
--- a/sc2/content/base/planets/rad__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-rad__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/rad__big.0.png b/sc2/content/base/planets/radioactive-big.0.png
similarity index 100%
rename from sc2/content/base/planets/rad__big.0.png
rename to sc2/content/base/planets/radioactive-big.0.png
diff --git a/sc2/content/base/planets/radioactive-big.ani b/sc2/content/base/planets/radioactive-big.ani
new file mode 100644
index 000000000..57f6e396d
--- /dev/null
+++ b/sc2/content/base/planets/radioactive-big.ani
@@ -0,0 +1 @@
+radioactive-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/rad__med.0.png b/sc2/content/base/planets/radioactive-med.0.png
similarity index 100%
rename from sc2/content/base/planets/rad__med.0.png
rename to sc2/content/base/planets/radioactive-med.0.png
diff --git a/sc2/content/base/planets/radioactive-med.ani b/sc2/content/base/planets/radioactive-med.ani
new file mode 100644
index 000000000..0eedbc43b
--- /dev/null
+++ b/sc2/content/base/planets/radioactive-med.ani
@@ -0,0 +1 @@
+radioactive-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/rad__sml.0.png b/sc2/content/base/planets/radioactive-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/rad__sml.0.png
rename to sc2/content/base/planets/radioactive-sml.0.png
diff --git a/sc2/content/base/planets/radioactive-sml.ani b/sc2/content/base/planets/radioactive-sml.ani
new file mode 100644
index 000000000..5ee81c10d
--- /dev/null
+++ b/sc2/content/base/planets/radioactive-sml.ani
@@ -0,0 +1 @@
+radioactive-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/rai__big.ani b/sc2/content/base/planets/rai__big.ani
deleted file mode 100644
index 144cb57ac..000000000
--- a/sc2/content/base/planets/rai__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-rai__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/rai__med.ani b/sc2/content/base/planets/rai__med.ani
deleted file mode 100644
index 846bf7851..000000000
--- a/sc2/content/base/planets/rai__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-rai__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/rai__sml.ani b/sc2/content/base/planets/rai__sml.ani
deleted file mode 100644
index 8aba89d7e..000000000
--- a/sc2/content/base/planets/rai__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-rai__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/rai__big.0.png b/sc2/content/base/planets/rainbow-big.0.png
similarity index 100%
rename from sc2/content/base/planets/rai__big.0.png
rename to sc2/content/base/planets/rainbow-big.0.png
diff --git a/sc2/content/base/planets/rainbow-big.ani b/sc2/content/base/planets/rainbow-big.ani
new file mode 100644
index 000000000..faa3b202b
--- /dev/null
+++ b/sc2/content/base/planets/rainbow-big.ani
@@ -0,0 +1 @@
+rainbow-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/rai__med.0.png b/sc2/content/base/planets/rainbow-med.0.png
similarity index 100%
rename from sc2/content/base/planets/rai__med.0.png
rename to sc2/content/base/planets/rainbow-med.0.png
diff --git a/sc2/content/base/planets/rainbow-med.ani b/sc2/content/base/planets/rainbow-med.ani
new file mode 100644
index 000000000..2cd956043
--- /dev/null
+++ b/sc2/content/base/planets/rainbow-med.ani
@@ -0,0 +1 @@
+rainbow-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/rai__sml.0.png b/sc2/content/base/planets/rainbow-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/rai__sml.0.png
rename to sc2/content/base/planets/rainbow-sml.0.png
diff --git a/sc2/content/base/planets/rainbow-sml.ani b/sc2/content/base/planets/rainbow-sml.ani
new file mode 100644
index 000000000..7c73fce11
--- /dev/null
+++ b/sc2/content/base/planets/rainbow-sml.ani
@@ -0,0 +1 @@
+rainbow-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/red__big.ani b/sc2/content/base/planets/red__big.ani
deleted file mode 100644
index 083729816..000000000
--- a/sc2/content/base/planets/red__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-red__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/red__med.ani b/sc2/content/base/planets/red__med.ani
deleted file mode 100644
index da42324ae..000000000
--- a/sc2/content/base/planets/red__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-red__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/red__sml.ani b/sc2/content/base/planets/red__sml.ani
deleted file mode 100644
index 3b8af7f9a..000000000
--- a/sc2/content/base/planets/red__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-red__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/reg__big.0.png b/sc2/content/base/planets/redgas-big.0.png
similarity index 100%
rename from sc2/content/base/planets/reg__big.0.png
rename to sc2/content/base/planets/redgas-big.0.png
diff --git a/sc2/content/base/planets/redgas-big.ani b/sc2/content/base/planets/redgas-big.ani
new file mode 100644
index 000000000..0e2fc254f
--- /dev/null
+++ b/sc2/content/base/planets/redgas-big.ani
@@ -0,0 +1 @@
+redgas-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/reg__med.0.png b/sc2/content/base/planets/redgas-med.0.png
similarity index 100%
rename from sc2/content/base/planets/reg__med.0.png
rename to sc2/content/base/planets/redgas-med.0.png
diff --git a/sc2/content/base/planets/redgas-med.ani b/sc2/content/base/planets/redgas-med.ani
new file mode 100644
index 000000000..e55b31c62
--- /dev/null
+++ b/sc2/content/base/planets/redgas-med.ani
@@ -0,0 +1 @@
+redgas-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/reg__sml.0.png b/sc2/content/base/planets/redgas-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/reg__sml.0.png
rename to sc2/content/base/planets/redgas-sml.0.png
diff --git a/sc2/content/base/planets/redgas-sml.ani b/sc2/content/base/planets/redgas-sml.ani
new file mode 100644
index 000000000..d66401e93
--- /dev/null
+++ b/sc2/content/base/planets/redgas-sml.ani
@@ -0,0 +1 @@
+redgas-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/red__big.0.png b/sc2/content/base/planets/redux-big.0.png
similarity index 100%
rename from sc2/content/base/planets/red__big.0.png
rename to sc2/content/base/planets/redux-big.0.png
diff --git a/sc2/content/base/planets/redux-big.ani b/sc2/content/base/planets/redux-big.ani
new file mode 100644
index 000000000..07a871cd3
--- /dev/null
+++ b/sc2/content/base/planets/redux-big.ani
@@ -0,0 +1 @@
+redux-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/red__med.0.png b/sc2/content/base/planets/redux-med.0.png
similarity index 100%
rename from sc2/content/base/planets/red__med.0.png
rename to sc2/content/base/planets/redux-med.0.png
diff --git a/sc2/content/base/planets/redux-med.ani b/sc2/content/base/planets/redux-med.ani
new file mode 100644
index 000000000..4154184d2
--- /dev/null
+++ b/sc2/content/base/planets/redux-med.ani
@@ -0,0 +1 @@
+redux-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/red__sml.0.png b/sc2/content/base/planets/redux-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/red__sml.0.png
rename to sc2/content/base/planets/redux-sml.0.png
diff --git a/sc2/content/base/planets/redux-sml.ani b/sc2/content/base/planets/redux-sml.ani
new file mode 100644
index 000000000..ad945ced8
--- /dev/null
+++ b/sc2/content/base/planets/redux-sml.ani
@@ -0,0 +1 @@
+redux-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/reg__big.ani b/sc2/content/base/planets/reg__big.ani
deleted file mode 100644
index c051a0e7f..000000000
--- a/sc2/content/base/planets/reg__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-reg__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/reg__med.ani b/sc2/content/base/planets/reg__med.ani
deleted file mode 100644
index 79f65f8b1..000000000
--- a/sc2/content/base/planets/reg__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-reg__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/reg__sml.ani b/sc2/content/base/planets/reg__sml.ani
deleted file mode 100644
index b567b5760..000000000
--- a/sc2/content/base/planets/reg__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-reg__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/rub__big.ani b/sc2/content/base/planets/rub__big.ani
deleted file mode 100644
index b71207acc..000000000
--- a/sc2/content/base/planets/rub__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-rub__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/rub__med.ani b/sc2/content/base/planets/rub__med.ani
deleted file mode 100644
index 37cee6ce7..000000000
--- a/sc2/content/base/planets/rub__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-rub__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/rub__sml.ani b/sc2/content/base/planets/rub__sml.ani
deleted file mode 100644
index 413ff6968..000000000
--- a/sc2/content/base/planets/rub__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-rub__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/rub__big.0.png b/sc2/content/base/planets/ruby-big.0.png
similarity index 100%
rename from sc2/content/base/planets/rub__big.0.png
rename to sc2/content/base/planets/ruby-big.0.png
diff --git a/sc2/content/base/planets/ruby-big.ani b/sc2/content/base/planets/ruby-big.ani
new file mode 100644
index 000000000..bb23f70f1
--- /dev/null
+++ b/sc2/content/base/planets/ruby-big.ani
@@ -0,0 +1 @@
+ruby-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/rub__med.0.png b/sc2/content/base/planets/ruby-med.0.png
similarity index 100%
rename from sc2/content/base/planets/rub__med.0.png
rename to sc2/content/base/planets/ruby-med.0.png
diff --git a/sc2/content/base/planets/ruby-med.ani b/sc2/content/base/planets/ruby-med.ani
new file mode 100644
index 000000000..0b9504aa4
--- /dev/null
+++ b/sc2/content/base/planets/ruby-med.ani
@@ -0,0 +1 @@
+ruby-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/rub__sml.0.png b/sc2/content/base/planets/ruby-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/rub__sml.0.png
rename to sc2/content/base/planets/ruby-sml.0.png
diff --git a/sc2/content/base/planets/ruby-sml.ani b/sc2/content/base/planets/ruby-sml.ani
new file mode 100644
index 000000000..d92deda56
--- /dev/null
+++ b/sc2/content/base/planets/ruby-sml.ani
@@ -0,0 +1 @@
+ruby-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/sam__big.ani b/sc2/content/base/planets/sam__big.ani
deleted file mode 100644
index a4c8f268d..000000000
--- a/sc2/content/base/planets/sam__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-sam__big.0.png 0 2 74 44
diff --git a/sc2/content/base/planets/sam__big.0.png b/sc2/content/base/planets/samatra-big.0.png
similarity index 100%
rename from sc2/content/base/planets/sam__big.0.png
rename to sc2/content/base/planets/samatra-big.0.png
diff --git a/sc2/content/base/planets/samatra-big.ani b/sc2/content/base/planets/samatra-big.ani
new file mode 100644
index 000000000..db2c47566
--- /dev/null
+++ b/sc2/content/base/planets/samatra-big.ani
@@ -0,0 +1 @@
+samatra-big.0.png 0 2 74 44
diff --git a/sc2/content/base/planets/sap__big.ani b/sc2/content/base/planets/sap__big.ani
deleted file mode 100644
index 807bb118c..000000000
--- a/sc2/content/base/planets/sap__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-sap__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/sap__med.ani b/sc2/content/base/planets/sap__med.ani
deleted file mode 100644
index 7ee606a0f..000000000
--- a/sc2/content/base/planets/sap__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-sap__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/sap__sml.ani b/sc2/content/base/planets/sap__sml.ani
deleted file mode 100644
index ee08cd386..000000000
--- a/sc2/content/base/planets/sap__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-sap__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/sap__big.0.png b/sc2/content/base/planets/sapphire-big.0.png
similarity index 100%
rename from sc2/content/base/planets/sap__big.0.png
rename to sc2/content/base/planets/sapphire-big.0.png
diff --git a/sc2/content/base/planets/sapphire-big.ani b/sc2/content/base/planets/sapphire-big.ani
new file mode 100644
index 000000000..51641e2b3
--- /dev/null
+++ b/sc2/content/base/planets/sapphire-big.ani
@@ -0,0 +1 @@
+sapphire-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/sap__med.0.png b/sc2/content/base/planets/sapphire-med.0.png
similarity index 100%
rename from sc2/content/base/planets/sap__med.0.png
rename to sc2/content/base/planets/sapphire-med.0.png
diff --git a/sc2/content/base/planets/sapphire-med.ani b/sc2/content/base/planets/sapphire-med.ani
new file mode 100644
index 000000000..31230ee59
--- /dev/null
+++ b/sc2/content/base/planets/sapphire-med.ani
@@ -0,0 +1 @@
+sapphire-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/sap__sml.0.png b/sc2/content/base/planets/sapphire-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/sap__sml.0.png
rename to sc2/content/base/planets/sapphire-sml.0.png
diff --git a/sc2/content/base/planets/sapphire-sml.ani b/sc2/content/base/planets/sapphire-sml.ani
new file mode 100644
index 000000000..aa96be3f3
--- /dev/null
+++ b/sc2/content/base/planets/sapphire-sml.ani
@@ -0,0 +1 @@
+sapphire-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/sel__big.ani b/sc2/content/base/planets/sel__big.ani
deleted file mode 100644
index 6eef48ecc..000000000
--- a/sc2/content/base/planets/sel__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-sel__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/sel__med.ani b/sc2/content/base/planets/sel__med.ani
deleted file mode 100644
index 1f2ac9e79..000000000
--- a/sc2/content/base/planets/sel__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-sel__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/sel__sml.ani b/sc2/content/base/planets/sel__sml.ani
deleted file mode 100644
index db896bb8b..000000000
--- a/sc2/content/base/planets/sel__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-sel__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/sel__big.0.png b/sc2/content/base/planets/selenic-big.0.png
similarity index 100%
rename from sc2/content/base/planets/sel__big.0.png
rename to sc2/content/base/planets/selenic-big.0.png
diff --git a/sc2/content/base/planets/selenic-big.ani b/sc2/content/base/planets/selenic-big.ani
new file mode 100644
index 000000000..d43f67314
--- /dev/null
+++ b/sc2/content/base/planets/selenic-big.ani
@@ -0,0 +1 @@
+selenic-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/sel__med.0.png b/sc2/content/base/planets/selenic-med.0.png
similarity index 100%
rename from sc2/content/base/planets/sel__med.0.png
rename to sc2/content/base/planets/selenic-med.0.png
diff --git a/sc2/content/base/planets/selenic-med.ani b/sc2/content/base/planets/selenic-med.ani
new file mode 100644
index 000000000..69bde8542
--- /dev/null
+++ b/sc2/content/base/planets/selenic-med.ani
@@ -0,0 +1 @@
+selenic-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/sel__sml.0.png b/sc2/content/base/planets/selenic-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/sel__sml.0.png
rename to sc2/content/base/planets/selenic-sml.0.png
diff --git a/sc2/content/base/planets/selenic-sml.ani b/sc2/content/base/planets/selenic-sml.ani
new file mode 100644
index 000000000..08a447958
--- /dev/null
+++ b/sc2/content/base/planets/selenic-sml.ani
@@ -0,0 +1 @@
+selenic-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/cra__big.0.png b/sc2/content/base/planets/shattered-big.0.png
similarity index 100%
rename from sc2/content/base/planets/cra__big.0.png
rename to sc2/content/base/planets/shattered-big.0.png
diff --git a/sc2/content/base/planets/shattered-big.ani b/sc2/content/base/planets/shattered-big.ani
new file mode 100644
index 000000000..47c3f8d76
--- /dev/null
+++ b/sc2/content/base/planets/shattered-big.ani
@@ -0,0 +1 @@
+shattered-big.0.png 0 -1 38 33
diff --git a/sc2/content/base/planets/cra__med.0.png b/sc2/content/base/planets/shattered-med.0.png
similarity index 100%
rename from sc2/content/base/planets/cra__med.0.png
rename to sc2/content/base/planets/shattered-med.0.png
diff --git a/sc2/content/base/planets/shattered-med.ani b/sc2/content/base/planets/shattered-med.ani
new file mode 100644
index 000000000..1948808ed
--- /dev/null
+++ b/sc2/content/base/planets/shattered-med.ani
@@ -0,0 +1 @@
+shattered-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/cra__sml.0.png b/sc2/content/base/planets/shattered-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/cra__sml.0.png
rename to sc2/content/base/planets/shattered-sml.0.png
diff --git a/sc2/content/base/planets/shattered-sml.ani b/sc2/content/base/planets/shattered-sml.ani
new file mode 100644
index 000000000..2b11963cc
--- /dev/null
+++ b/sc2/content/base/planets/shattered-sml.ani
@@ -0,0 +1 @@
+shattered-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/shie_big.ani b/sc2/content/base/planets/shie_big.ani
deleted file mode 100644
index 228a17115..000000000
--- a/sc2/content/base/planets/shie_big.ani
+++ /dev/null
@@ -1 +0,0 @@
-shie_big.0.png 0 125 43 39
diff --git a/sc2/content/base/planets/shie_med.ani b/sc2/content/base/planets/shie_med.ani
deleted file mode 100644
index d3216ea9d..000000000
--- a/sc2/content/base/planets/shie_med.ani
+++ /dev/null
@@ -1 +0,0 @@
-shie_med.0.png 0 125 21 19
diff --git a/sc2/content/base/planets/shie_sml.ani b/sc2/content/base/planets/shie_sml.ani
deleted file mode 100644
index 426b6c4f9..000000000
--- a/sc2/content/base/planets/shie_sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-shie_sml.0.png 0 125 10 10
diff --git a/sc2/content/base/planets/shie_big.0.png b/sc2/content/base/planets/slaveshield-big.0.png
similarity index 100%
rename from sc2/content/base/planets/shie_big.0.png
rename to sc2/content/base/planets/slaveshield-big.0.png
diff --git a/sc2/content/base/planets/slaveshield-big.ani b/sc2/content/base/planets/slaveshield-big.ani
new file mode 100644
index 000000000..94d12c537
--- /dev/null
+++ b/sc2/content/base/planets/slaveshield-big.ani
@@ -0,0 +1 @@
+slaveshield-big.0.png 0 125 43 39
diff --git a/sc2/content/base/planets/shie_med.0.png b/sc2/content/base/planets/slaveshield-med.0.png
similarity index 100%
rename from sc2/content/base/planets/shie_med.0.png
rename to sc2/content/base/planets/slaveshield-med.0.png
diff --git a/sc2/content/base/planets/slaveshield-med.ani b/sc2/content/base/planets/slaveshield-med.ani
new file mode 100644
index 000000000..b28cdc853
--- /dev/null
+++ b/sc2/content/base/planets/slaveshield-med.ani
@@ -0,0 +1 @@
+slaveshield-med.0.png 0 125 21 19
diff --git a/sc2/content/base/planets/shie_sml.0.png b/sc2/content/base/planets/slaveshield-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/shie_sml.0.png
rename to sc2/content/base/planets/slaveshield-sml.0.png
diff --git a/sc2/content/base/planets/slaveshield-sml.ani b/sc2/content/base/planets/slaveshield-sml.ani
new file mode 100644
index 000000000..1e88e0a73
--- /dev/null
+++ b/sc2/content/base/planets/slaveshield-sml.ani
@@ -0,0 +1 @@
+slaveshield-sml.0.png 0 125 10 10
diff --git a/sc2/content/base/planets/sup__big.ani b/sc2/content/base/planets/sup__big.ani
deleted file mode 100644
index 19cfa76c2..000000000
--- a/sc2/content/base/planets/sup__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-sup__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/sup__med.ani b/sc2/content/base/planets/sup__med.ani
deleted file mode 100644
index 679e51587..000000000
--- a/sc2/content/base/planets/sup__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-sup__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/sup__sml.ani b/sc2/content/base/planets/sup__sml.ani
deleted file mode 100644
index 888733bab..000000000
--- a/sc2/content/base/planets/sup__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-sup__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/sup__big.0.png b/sc2/content/base/planets/superdense-big.0.png
similarity index 100%
rename from sc2/content/base/planets/sup__big.0.png
rename to sc2/content/base/planets/superdense-big.0.png
diff --git a/sc2/content/base/planets/superdense-big.ani b/sc2/content/base/planets/superdense-big.ani
new file mode 100644
index 000000000..f3c700ac6
--- /dev/null
+++ b/sc2/content/base/planets/superdense-big.ani
@@ -0,0 +1 @@
+superdense-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/sup__med.0.png b/sc2/content/base/planets/superdense-med.0.png
similarity index 100%
rename from sc2/content/base/planets/sup__med.0.png
rename to sc2/content/base/planets/superdense-med.0.png
diff --git a/sc2/content/base/planets/superdense-med.ani b/sc2/content/base/planets/superdense-med.ani
new file mode 100644
index 000000000..ee20ea49a
--- /dev/null
+++ b/sc2/content/base/planets/superdense-med.ani
@@ -0,0 +1 @@
+superdense-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/sup__sml.0.png b/sc2/content/base/planets/superdense-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/sup__sml.0.png
rename to sc2/content/base/planets/superdense-sml.0.png
diff --git a/sc2/content/base/planets/superdense-sml.ani b/sc2/content/base/planets/superdense-sml.ani
new file mode 100644
index 000000000..1eddd3a65
--- /dev/null
+++ b/sc2/content/base/planets/superdense-sml.ani
@@ -0,0 +1 @@
+superdense-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/tel__big.ani b/sc2/content/base/planets/tel__big.ani
deleted file mode 100644
index 1e231bf1c..000000000
--- a/sc2/content/base/planets/tel__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-tel__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/tel__med.ani b/sc2/content/base/planets/tel__med.ani
deleted file mode 100644
index 945b5a07e..000000000
--- a/sc2/content/base/planets/tel__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-tel__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/tel__sml.ani b/sc2/content/base/planets/tel__sml.ani
deleted file mode 100644
index c9b8ce9e7..000000000
--- a/sc2/content/base/planets/tel__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-tel__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/tel__big.0.png b/sc2/content/base/planets/telluric-big.0.png
similarity index 100%
rename from sc2/content/base/planets/tel__big.0.png
rename to sc2/content/base/planets/telluric-big.0.png
diff --git a/sc2/content/base/planets/telluric-big.ani b/sc2/content/base/planets/telluric-big.ani
new file mode 100644
index 000000000..1f739dc4b
--- /dev/null
+++ b/sc2/content/base/planets/telluric-big.ani
@@ -0,0 +1 @@
+telluric-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/tel__med.0.png b/sc2/content/base/planets/telluric-med.0.png
similarity index 100%
rename from sc2/content/base/planets/tel__med.0.png
rename to sc2/content/base/planets/telluric-med.0.png
diff --git a/sc2/content/base/planets/telluric-med.ani b/sc2/content/base/planets/telluric-med.ani
new file mode 100644
index 000000000..fa0cf9090
--- /dev/null
+++ b/sc2/content/base/planets/telluric-med.ani
@@ -0,0 +1 @@
+telluric-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/tel__sml.0.png b/sc2/content/base/planets/telluric-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/tel__sml.0.png
rename to sc2/content/base/planets/telluric-sml.0.png
diff --git a/sc2/content/base/planets/telluric-sml.ani b/sc2/content/base/planets/telluric-sml.ani
new file mode 100644
index 000000000..424fc5579
--- /dev/null
+++ b/sc2/content/base/planets/telluric-sml.ani
@@ -0,0 +1 @@
+telluric-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/tre__big.ani b/sc2/content/base/planets/tre__big.ani
deleted file mode 100644
index a7ec917d4..000000000
--- a/sc2/content/base/planets/tre__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-tre__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/tre__med.ani b/sc2/content/base/planets/tre__med.ani
deleted file mode 100644
index 599fcc0c8..000000000
--- a/sc2/content/base/planets/tre__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-tre__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/tre__sml.ani b/sc2/content/base/planets/tre__sml.ani
deleted file mode 100644
index 02a202987..000000000
--- a/sc2/content/base/planets/tre__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-tre__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/tre__big.0.png b/sc2/content/base/planets/treasure-big.0.png
similarity index 100%
rename from sc2/content/base/planets/tre__big.0.png
rename to sc2/content/base/planets/treasure-big.0.png
diff --git a/sc2/content/base/planets/treasure-big.ani b/sc2/content/base/planets/treasure-big.ani
new file mode 100644
index 000000000..f7cec6334
--- /dev/null
+++ b/sc2/content/base/planets/treasure-big.ani
@@ -0,0 +1 @@
+treasure-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/tre__med.0.png b/sc2/content/base/planets/treasure-med.0.png
similarity index 100%
rename from sc2/content/base/planets/tre__med.0.png
rename to sc2/content/base/planets/treasure-med.0.png
diff --git a/sc2/content/base/planets/treasure-med.ani b/sc2/content/base/planets/treasure-med.ani
new file mode 100644
index 000000000..0c742aaa0
--- /dev/null
+++ b/sc2/content/base/planets/treasure-med.ani
@@ -0,0 +1 @@
+treasure-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/tre__sml.0.png b/sc2/content/base/planets/treasure-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/tre__sml.0.png
rename to sc2/content/base/planets/treasure-sml.0.png
diff --git a/sc2/content/base/planets/treasure-sml.ani b/sc2/content/base/planets/treasure-sml.ani
new file mode 100644
index 000000000..c6f394732
--- /dev/null
+++ b/sc2/content/base/planets/treasure-sml.ani
@@ -0,0 +1 @@
+treasure-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/ult__big.ani b/sc2/content/base/planets/ult__big.ani
deleted file mode 100644
index 12ba5f2a8..000000000
--- a/sc2/content/base/planets/ult__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-ult__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/ult__med.ani b/sc2/content/base/planets/ult__med.ani
deleted file mode 100644
index 12edb4080..000000000
--- a/sc2/content/base/planets/ult__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-ult__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/ult__sml.ani b/sc2/content/base/planets/ult__sml.ani
deleted file mode 100644
index 2bddb2d5a..000000000
--- a/sc2/content/base/planets/ult__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-ult__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/ult__big.0.png b/sc2/content/base/planets/ultramarine-big.0.png
similarity index 100%
rename from sc2/content/base/planets/ult__big.0.png
rename to sc2/content/base/planets/ultramarine-big.0.png
diff --git a/sc2/content/base/planets/ultramarine-big.ani b/sc2/content/base/planets/ultramarine-big.ani
new file mode 100644
index 000000000..c03ed59ff
--- /dev/null
+++ b/sc2/content/base/planets/ultramarine-big.ani
@@ -0,0 +1 @@
+ultramarine-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/ult__med.0.png b/sc2/content/base/planets/ultramarine-med.0.png
similarity index 100%
rename from sc2/content/base/planets/ult__med.0.png
rename to sc2/content/base/planets/ultramarine-med.0.png
diff --git a/sc2/content/base/planets/ultramarine-med.ani b/sc2/content/base/planets/ultramarine-med.ani
new file mode 100644
index 000000000..313e03bb1
--- /dev/null
+++ b/sc2/content/base/planets/ultramarine-med.ani
@@ -0,0 +1 @@
+ultramarine-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/ult__sml.0.png b/sc2/content/base/planets/ultramarine-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/ult__sml.0.png
rename to sc2/content/base/planets/ultramarine-sml.0.png
diff --git a/sc2/content/base/planets/ultramarine-sml.ani b/sc2/content/base/planets/ultramarine-sml.ani
new file mode 100644
index 000000000..a597bfb33
--- /dev/null
+++ b/sc2/content/base/planets/ultramarine-sml.ani
@@ -0,0 +1 @@
+ultramarine-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/ure__big.ani b/sc2/content/base/planets/ure__big.ani
deleted file mode 100644
index 4ecb5f9a7..000000000
--- a/sc2/content/base/planets/ure__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-ure__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/ure__med.ani b/sc2/content/base/planets/ure__med.ani
deleted file mode 100644
index 5e113a97e..000000000
--- a/sc2/content/base/planets/ure__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-ure__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/ure__sml.ani b/sc2/content/base/planets/ure__sml.ani
deleted file mode 100644
index e1c2843e2..000000000
--- a/sc2/content/base/planets/ure__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-ure__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/ure__big.0.png b/sc2/content/base/planets/urea-big.0.png
similarity index 100%
rename from sc2/content/base/planets/ure__big.0.png
rename to sc2/content/base/planets/urea-big.0.png
diff --git a/sc2/content/base/planets/urea-big.ani b/sc2/content/base/planets/urea-big.ani
new file mode 100644
index 000000000..2897dad3c
--- /dev/null
+++ b/sc2/content/base/planets/urea-big.ani
@@ -0,0 +1 @@
+urea-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/ure__med.0.png b/sc2/content/base/planets/urea-med.0.png
similarity index 100%
rename from sc2/content/base/planets/ure__med.0.png
rename to sc2/content/base/planets/urea-med.0.png
diff --git a/sc2/content/base/planets/urea-med.ani b/sc2/content/base/planets/urea-med.ani
new file mode 100644
index 000000000..5798981c5
--- /dev/null
+++ b/sc2/content/base/planets/urea-med.ani
@@ -0,0 +1 @@
+urea-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/ure__sml.0.png b/sc2/content/base/planets/urea-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/ure__sml.0.png
rename to sc2/content/base/planets/urea-sml.0.png
diff --git a/sc2/content/base/planets/urea-sml.ani b/sc2/content/base/planets/urea-sml.ani
new file mode 100644
index 000000000..d420a6672
--- /dev/null
+++ b/sc2/content/base/planets/urea-sml.ani
@@ -0,0 +1 @@
+urea-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/vig__big.ani b/sc2/content/base/planets/vig__big.ani
deleted file mode 100644
index 37864b93e..000000000
--- a/sc2/content/base/planets/vig__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-vig__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/vig__med.ani b/sc2/content/base/planets/vig__med.ani
deleted file mode 100644
index ea90805b7..000000000
--- a/sc2/content/base/planets/vig__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-vig__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/vig__sml.ani b/sc2/content/base/planets/vig__sml.ani
deleted file mode 100644
index 607eb24a4..000000000
--- a/sc2/content/base/planets/vig__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-vig__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/vin__big.ani b/sc2/content/base/planets/vin__big.ani
deleted file mode 100644
index 039138141..000000000
--- a/sc2/content/base/planets/vin__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-vin__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/vin__med.ani b/sc2/content/base/planets/vin__med.ani
deleted file mode 100644
index 40e8d9aab..000000000
--- a/sc2/content/base/planets/vin__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-vin__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/vin__sml.ani b/sc2/content/base/planets/vin__sml.ani
deleted file mode 100644
index a13a9bad8..000000000
--- a/sc2/content/base/planets/vin__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-vin__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/vin__big.0.png b/sc2/content/base/planets/vinylogous-big.0.png
similarity index 100%
rename from sc2/content/base/planets/vin__big.0.png
rename to sc2/content/base/planets/vinylogous-big.0.png
diff --git a/sc2/content/base/planets/vinylogous-big.ani b/sc2/content/base/planets/vinylogous-big.ani
new file mode 100644
index 000000000..3ff1977c9
--- /dev/null
+++ b/sc2/content/base/planets/vinylogous-big.ani
@@ -0,0 +1 @@
+vinylogous-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/vin__med.0.png b/sc2/content/base/planets/vinylogous-med.0.png
similarity index 100%
rename from sc2/content/base/planets/vin__med.0.png
rename to sc2/content/base/planets/vinylogous-med.0.png
diff --git a/sc2/content/base/planets/vinylogous-med.ani b/sc2/content/base/planets/vinylogous-med.ani
new file mode 100644
index 000000000..67e25f3fa
--- /dev/null
+++ b/sc2/content/base/planets/vinylogous-med.ani
@@ -0,0 +1 @@
+vinylogous-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/vin__sml.0.png b/sc2/content/base/planets/vinylogous-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/vin__sml.0.png
rename to sc2/content/base/planets/vinylogous-sml.0.png
diff --git a/sc2/content/base/planets/vinylogous-sml.ani b/sc2/content/base/planets/vinylogous-sml.ani
new file mode 100644
index 000000000..96e09f340
--- /dev/null
+++ b/sc2/content/base/planets/vinylogous-sml.ani
@@ -0,0 +1 @@
+vinylogous-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/vig__big.0.png b/sc2/content/base/planets/violetgas-big.0.png
similarity index 100%
rename from sc2/content/base/planets/vig__big.0.png
rename to sc2/content/base/planets/violetgas-big.0.png
diff --git a/sc2/content/base/planets/violetgas-big.ani b/sc2/content/base/planets/violetgas-big.ani
new file mode 100644
index 000000000..4dea7d8e0
--- /dev/null
+++ b/sc2/content/base/planets/violetgas-big.ani
@@ -0,0 +1 @@
+violetgas-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/vig__med.0.png b/sc2/content/base/planets/violetgas-med.0.png
similarity index 100%
rename from sc2/content/base/planets/vig__med.0.png
rename to sc2/content/base/planets/violetgas-med.0.png
diff --git a/sc2/content/base/planets/violetgas-med.ani b/sc2/content/base/planets/violetgas-med.ani
new file mode 100644
index 000000000..45a400625
--- /dev/null
+++ b/sc2/content/base/planets/violetgas-med.ani
@@ -0,0 +1 @@
+violetgas-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/vig__sml.0.png b/sc2/content/base/planets/violetgas-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/vig__sml.0.png
rename to sc2/content/base/planets/violetgas-sml.0.png
diff --git a/sc2/content/base/planets/violetgas-sml.ani b/sc2/content/base/planets/violetgas-sml.ani
new file mode 100644
index 000000000..f6ffbf6a6
--- /dev/null
+++ b/sc2/content/base/planets/violetgas-sml.ani
@@ -0,0 +1 @@
+violetgas-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/wat__big.ani b/sc2/content/base/planets/wat__big.ani
deleted file mode 100644
index 4ee9ec950..000000000
--- a/sc2/content/base/planets/wat__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-wat__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/wat__med.ani b/sc2/content/base/planets/wat__med.ani
deleted file mode 100644
index f30b23be1..000000000
--- a/sc2/content/base/planets/wat__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-wat__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/wat__sml.ani b/sc2/content/base/planets/wat__sml.ani
deleted file mode 100644
index 641557ec9..000000000
--- a/sc2/content/base/planets/wat__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-wat__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/wat__big.0.png b/sc2/content/base/planets/water-big.0.png
similarity index 100%
rename from sc2/content/base/planets/wat__big.0.png
rename to sc2/content/base/planets/water-big.0.png
diff --git a/sc2/content/base/planets/water-big.ani b/sc2/content/base/planets/water-big.ani
new file mode 100644
index 000000000..4974f0add
--- /dev/null
+++ b/sc2/content/base/planets/water-big.ani
@@ -0,0 +1 @@
+water-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/wat__med.0.png b/sc2/content/base/planets/water-med.0.png
similarity index 100%
rename from sc2/content/base/planets/wat__med.0.png
rename to sc2/content/base/planets/water-med.0.png
diff --git a/sc2/content/base/planets/water-med.ani b/sc2/content/base/planets/water-med.ani
new file mode 100644
index 000000000..e27d2ff6f
--- /dev/null
+++ b/sc2/content/base/planets/water-med.ani
@@ -0,0 +1 @@
+water-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/wat__sml.0.png b/sc2/content/base/planets/water-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/wat__sml.0.png
rename to sc2/content/base/planets/water-sml.0.png
diff --git a/sc2/content/base/planets/water-sml.ani b/sc2/content/base/planets/water-sml.ani
new file mode 100644
index 000000000..e18efda17
--- /dev/null
+++ b/sc2/content/base/planets/water-sml.ani
@@ -0,0 +1 @@
+water-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/xen__big.ani b/sc2/content/base/planets/xen__big.ani
deleted file mode 100644
index fd4492195..000000000
--- a/sc2/content/base/planets/xen__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-xen__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/xen__med.ani b/sc2/content/base/planets/xen__med.ani
deleted file mode 100644
index 43d8a6e67..000000000
--- a/sc2/content/base/planets/xen__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-xen__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/xen__sml.ani b/sc2/content/base/planets/xen__sml.ani
deleted file mode 100644
index 7b41abcd7..000000000
--- a/sc2/content/base/planets/xen__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-xen__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/xen__big.0.png b/sc2/content/base/planets/xenolithic-big.0.png
similarity index 100%
rename from sc2/content/base/planets/xen__big.0.png
rename to sc2/content/base/planets/xenolithic-big.0.png
diff --git a/sc2/content/base/planets/xenolithic-big.ani b/sc2/content/base/planets/xenolithic-big.ani
new file mode 100644
index 000000000..421402fa0
--- /dev/null
+++ b/sc2/content/base/planets/xenolithic-big.ani
@@ -0,0 +1 @@
+xenolithic-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/xen__med.0.png b/sc2/content/base/planets/xenolithic-med.0.png
similarity index 100%
rename from sc2/content/base/planets/xen__med.0.png
rename to sc2/content/base/planets/xenolithic-med.0.png
diff --git a/sc2/content/base/planets/xenolithic-med.ani b/sc2/content/base/planets/xenolithic-med.ani
new file mode 100644
index 000000000..f7ff18a58
--- /dev/null
+++ b/sc2/content/base/planets/xenolithic-med.ani
@@ -0,0 +1 @@
+xenolithic-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/xen__sml.0.png b/sc2/content/base/planets/xenolithic-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/xen__sml.0.png
rename to sc2/content/base/planets/xenolithic-sml.0.png
diff --git a/sc2/content/base/planets/xenolithic-sml.ani b/sc2/content/base/planets/xenolithic-sml.ani
new file mode 100644
index 000000000..112478b56
--- /dev/null
+++ b/sc2/content/base/planets/xenolithic-sml.ani
@@ -0,0 +1 @@
+xenolithic-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/yeg__big.ani b/sc2/content/base/planets/yeg__big.ani
deleted file mode 100644
index e5b918ebb..000000000
--- a/sc2/content/base/planets/yeg__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-yeg__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/yeg__med.ani b/sc2/content/base/planets/yeg__med.ani
deleted file mode 100644
index 75021b923..000000000
--- a/sc2/content/base/planets/yeg__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-yeg__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/yeg__sml.ani b/sc2/content/base/planets/yeg__sml.ani
deleted file mode 100644
index c9ac61774..000000000
--- a/sc2/content/base/planets/yeg__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-yeg__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/yeg__big.0.png b/sc2/content/base/planets/yellowgas-big.0.png
similarity index 100%
rename from sc2/content/base/planets/yeg__big.0.png
rename to sc2/content/base/planets/yellowgas-big.0.png
diff --git a/sc2/content/base/planets/yellowgas-big.ani b/sc2/content/base/planets/yellowgas-big.ani
new file mode 100644
index 000000000..02cc6aa50
--- /dev/null
+++ b/sc2/content/base/planets/yellowgas-big.ani
@@ -0,0 +1 @@
+yellowgas-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/yeg__med.0.png b/sc2/content/base/planets/yellowgas-med.0.png
similarity index 100%
rename from sc2/content/base/planets/yeg__med.0.png
rename to sc2/content/base/planets/yellowgas-med.0.png
diff --git a/sc2/content/base/planets/yellowgas-med.ani b/sc2/content/base/planets/yellowgas-med.ani
new file mode 100644
index 000000000..0c6e2a812
--- /dev/null
+++ b/sc2/content/base/planets/yellowgas-med.ani
@@ -0,0 +1 @@
+yellowgas-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/yeg__sml.0.png b/sc2/content/base/planets/yellowgas-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/yeg__sml.0.png
rename to sc2/content/base/planets/yellowgas-sml.0.png
diff --git a/sc2/content/base/planets/yellowgas-sml.ani b/sc2/content/base/planets/yellowgas-sml.ani
new file mode 100644
index 000000000..ec96fb0c3
--- /dev/null
+++ b/sc2/content/base/planets/yellowgas-sml.ani
@@ -0,0 +1 @@
+yellowgas-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/ytt__big.ani b/sc2/content/base/planets/ytt__big.ani
deleted file mode 100644
index e615bc4bd..000000000
--- a/sc2/content/base/planets/ytt__big.ani
+++ /dev/null
@@ -1 +0,0 @@
-ytt__big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/ytt__med.ani b/sc2/content/base/planets/ytt__med.ani
deleted file mode 100644
index 5830c8aed..000000000
--- a/sc2/content/base/planets/ytt__med.ani
+++ /dev/null
@@ -1 +0,0 @@
-ytt__med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/ytt__sml.ani b/sc2/content/base/planets/ytt__sml.ani
deleted file mode 100644
index e1f2daf7c..000000000
--- a/sc2/content/base/planets/ytt__sml.ani
+++ /dev/null
@@ -1 +0,0 @@
-ytt__sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/planets/ytt__big.0.png b/sc2/content/base/planets/yttric-big.0.png
similarity index 100%
rename from sc2/content/base/planets/ytt__big.0.png
rename to sc2/content/base/planets/yttric-big.0.png
diff --git a/sc2/content/base/planets/yttric-big.ani b/sc2/content/base/planets/yttric-big.ani
new file mode 100644
index 000000000..ed2942249
--- /dev/null
+++ b/sc2/content/base/planets/yttric-big.ani
@@ -0,0 +1 @@
+yttric-big.0.png 0 -1 37 33
diff --git a/sc2/content/base/planets/ytt__med.0.png b/sc2/content/base/planets/yttric-med.0.png
similarity index 100%
rename from sc2/content/base/planets/ytt__med.0.png
rename to sc2/content/base/planets/yttric-med.0.png
diff --git a/sc2/content/base/planets/yttric-med.ani b/sc2/content/base/planets/yttric-med.ani
new file mode 100644
index 000000000..03ea52cf8
--- /dev/null
+++ b/sc2/content/base/planets/yttric-med.ani
@@ -0,0 +1 @@
+yttric-med.0.png 0 -1 19 17
diff --git a/sc2/content/base/planets/ytt__sml.0.png b/sc2/content/base/planets/yttric-sml.0.png
similarity index 100%
rename from sc2/content/base/planets/ytt__sml.0.png
rename to sc2/content/base/planets/yttric-sml.0.png
diff --git a/sc2/content/base/planets/yttric-sml.ani b/sc2/content/base/planets/yttric-sml.ani
new file mode 100644
index 000000000..d6e510cb5
--- /dev/null
+++ b/sc2/content/base/planets/yttric-sml.ani
@@ -0,0 +1 @@
+yttric-sml.0.png 0 -1 9 8
diff --git a/sc2/content/base/ui/sisblu.0.png b/sc2/content/base/ui/blueprints.0.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.0.png
rename to sc2/content/base/ui/blueprints.0.png
diff --git a/sc2/content/base/ui/sisblu.1.png b/sc2/content/base/ui/blueprints.1.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.1.png
rename to sc2/content/base/ui/blueprints.1.png
diff --git a/sc2/content/base/ui/sisblu.10.png b/sc2/content/base/ui/blueprints.10.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.10.png
rename to sc2/content/base/ui/blueprints.10.png
diff --git a/sc2/content/base/ui/sisblu.11.png b/sc2/content/base/ui/blueprints.11.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.11.png
rename to sc2/content/base/ui/blueprints.11.png
diff --git a/sc2/content/base/ui/sisblu.12.png b/sc2/content/base/ui/blueprints.12.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.12.png
rename to sc2/content/base/ui/blueprints.12.png
diff --git a/sc2/content/base/ui/sisblu.13.png b/sc2/content/base/ui/blueprints.13.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.13.png
rename to sc2/content/base/ui/blueprints.13.png
diff --git a/sc2/content/base/ui/sisblu.14.png b/sc2/content/base/ui/blueprints.14.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.14.png
rename to sc2/content/base/ui/blueprints.14.png
diff --git a/sc2/content/base/ui/sisblu.15.png b/sc2/content/base/ui/blueprints.15.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.15.png
rename to sc2/content/base/ui/blueprints.15.png
diff --git a/sc2/content/base/ui/sisblu.16.png b/sc2/content/base/ui/blueprints.16.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.16.png
rename to sc2/content/base/ui/blueprints.16.png
diff --git a/sc2/content/base/ui/sisblu.17.png b/sc2/content/base/ui/blueprints.17.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.17.png
rename to sc2/content/base/ui/blueprints.17.png
diff --git a/sc2/content/base/ui/sisblu.18.png b/sc2/content/base/ui/blueprints.18.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.18.png
rename to sc2/content/base/ui/blueprints.18.png
diff --git a/sc2/content/base/ui/sisblu.19.png b/sc2/content/base/ui/blueprints.19.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.19.png
rename to sc2/content/base/ui/blueprints.19.png
diff --git a/sc2/content/base/ui/sisblu.2.png b/sc2/content/base/ui/blueprints.2.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.2.png
rename to sc2/content/base/ui/blueprints.2.png
diff --git a/sc2/content/base/ui/sisblu.20.png b/sc2/content/base/ui/blueprints.20.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.20.png
rename to sc2/content/base/ui/blueprints.20.png
diff --git a/sc2/content/base/ui/sisblu.21.png b/sc2/content/base/ui/blueprints.21.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.21.png
rename to sc2/content/base/ui/blueprints.21.png
diff --git a/sc2/content/base/ui/sisblu.22.png b/sc2/content/base/ui/blueprints.22.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.22.png
rename to sc2/content/base/ui/blueprints.22.png
diff --git a/sc2/content/base/ui/sisblu.3.png b/sc2/content/base/ui/blueprints.3.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.3.png
rename to sc2/content/base/ui/blueprints.3.png
diff --git a/sc2/content/base/ui/sisblu.4.png b/sc2/content/base/ui/blueprints.4.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.4.png
rename to sc2/content/base/ui/blueprints.4.png
diff --git a/sc2/content/base/ui/sisblu.5.png b/sc2/content/base/ui/blueprints.5.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.5.png
rename to sc2/content/base/ui/blueprints.5.png
diff --git a/sc2/content/base/ui/sisblu.6.png b/sc2/content/base/ui/blueprints.6.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.6.png
rename to sc2/content/base/ui/blueprints.6.png
diff --git a/sc2/content/base/ui/sisblu.7.png b/sc2/content/base/ui/blueprints.7.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.7.png
rename to sc2/content/base/ui/blueprints.7.png
diff --git a/sc2/content/base/ui/sisblu.8.png b/sc2/content/base/ui/blueprints.8.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.8.png
rename to sc2/content/base/ui/blueprints.8.png
diff --git a/sc2/content/base/ui/sisblu.9.png b/sc2/content/base/ui/blueprints.9.png
similarity index 100%
rename from sc2/content/base/ui/sisblu.9.png
rename to sc2/content/base/ui/blueprints.9.png
diff --git a/sc2/content/base/ui/blueprints.ani b/sc2/content/base/ui/blueprints.ani
new file mode 100644
index 000000000..51fb4c000
--- /dev/null
+++ b/sc2/content/base/ui/blueprints.ani
@@ -0,0 +1,23 @@
+blueprints.0.png 1 28 0 0
+blueprints.1.png 1 28 0 0
+blueprints.2.png 1 28 0 3
+blueprints.3.png 1 28 0 0
+blueprints.4.png 1 28 0 -4
+blueprints.5.png 1 28 0 1
+blueprints.6.png 1 28 0 0
+blueprints.7.png 1 28 0 4
+blueprints.8.png 1 28 0 0
+blueprints.9.png 1 28 0 1
+blueprints.10.png 1 28 0 4
+blueprints.11.png 1 28 0 2
+blueprints.12.png 1 28 0 4
+blueprints.13.png 1 28 0 -1
+blueprints.14.png 1 28 0 -2
+blueprints.15.png 1 28 0 -3
+blueprints.16.png 1 28 0 0
+blueprints.17.png 1 28 0 4
+blueprints.18.png 1 28 0 3
+blueprints.19.png 1 28 0 0
+blueprints.20.png 1 28 -6 -11
+blueprints.21.png 1 28 0 0
+blueprints.22.png 1 28 -2 -7
diff --git a/sc2/content/base/ui/flagstat.0.png b/sc2/content/base/ui/flagshipstatus.0.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.0.png
rename to sc2/content/base/ui/flagshipstatus.0.png
diff --git a/sc2/content/base/ui/flagstat.1.png b/sc2/content/base/ui/flagshipstatus.1.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.1.png
rename to sc2/content/base/ui/flagshipstatus.1.png
diff --git a/sc2/content/base/ui/flagstat.10.png b/sc2/content/base/ui/flagshipstatus.10.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.10.png
rename to sc2/content/base/ui/flagshipstatus.10.png
diff --git a/sc2/content/base/ui/flagstat.11.png b/sc2/content/base/ui/flagshipstatus.11.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.11.png
rename to sc2/content/base/ui/flagshipstatus.11.png
diff --git a/sc2/content/base/ui/flagstat.12.png b/sc2/content/base/ui/flagshipstatus.12.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.12.png
rename to sc2/content/base/ui/flagshipstatus.12.png
diff --git a/sc2/content/base/ui/flagstat.13.png b/sc2/content/base/ui/flagshipstatus.13.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.13.png
rename to sc2/content/base/ui/flagshipstatus.13.png
diff --git a/sc2/content/base/ui/flagstat.14.png b/sc2/content/base/ui/flagshipstatus.14.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.14.png
rename to sc2/content/base/ui/flagshipstatus.14.png
diff --git a/sc2/content/base/ui/flagstat.15.png b/sc2/content/base/ui/flagshipstatus.15.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.15.png
rename to sc2/content/base/ui/flagshipstatus.15.png
diff --git a/sc2/content/base/ui/flagstat.16.png b/sc2/content/base/ui/flagshipstatus.16.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.16.png
rename to sc2/content/base/ui/flagshipstatus.16.png
diff --git a/sc2/content/base/ui/flagstat.17.png b/sc2/content/base/ui/flagshipstatus.17.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.17.png
rename to sc2/content/base/ui/flagshipstatus.17.png
diff --git a/sc2/content/base/ui/flagstat.18.png b/sc2/content/base/ui/flagshipstatus.18.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.18.png
rename to sc2/content/base/ui/flagshipstatus.18.png
diff --git a/sc2/content/base/ui/flagstat.19.png b/sc2/content/base/ui/flagshipstatus.19.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.19.png
rename to sc2/content/base/ui/flagshipstatus.19.png
diff --git a/sc2/content/base/ui/flagstat.2.png b/sc2/content/base/ui/flagshipstatus.2.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.2.png
rename to sc2/content/base/ui/flagshipstatus.2.png
diff --git a/sc2/content/base/ui/flagstat.20.png b/sc2/content/base/ui/flagshipstatus.20.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.20.png
rename to sc2/content/base/ui/flagshipstatus.20.png
diff --git a/sc2/content/base/ui/flagstat.21.png b/sc2/content/base/ui/flagshipstatus.21.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.21.png
rename to sc2/content/base/ui/flagshipstatus.21.png
diff --git a/sc2/content/base/ui/flagstat.22.png b/sc2/content/base/ui/flagshipstatus.22.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.22.png
rename to sc2/content/base/ui/flagshipstatus.22.png
diff --git a/sc2/content/base/ui/flagstat.3.png b/sc2/content/base/ui/flagshipstatus.3.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.3.png
rename to sc2/content/base/ui/flagshipstatus.3.png
diff --git a/sc2/content/base/ui/flagstat.4.png b/sc2/content/base/ui/flagshipstatus.4.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.4.png
rename to sc2/content/base/ui/flagshipstatus.4.png
diff --git a/sc2/content/base/ui/flagstat.5.png b/sc2/content/base/ui/flagshipstatus.5.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.5.png
rename to sc2/content/base/ui/flagshipstatus.5.png
diff --git a/sc2/content/base/ui/flagstat.6.png b/sc2/content/base/ui/flagshipstatus.6.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.6.png
rename to sc2/content/base/ui/flagshipstatus.6.png
diff --git a/sc2/content/base/ui/flagstat.7.png b/sc2/content/base/ui/flagshipstatus.7.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.7.png
rename to sc2/content/base/ui/flagshipstatus.7.png
diff --git a/sc2/content/base/ui/flagstat.8.png b/sc2/content/base/ui/flagshipstatus.8.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.8.png
rename to sc2/content/base/ui/flagshipstatus.8.png
diff --git a/sc2/content/base/ui/flagstat.9.png b/sc2/content/base/ui/flagshipstatus.9.png
similarity index 100%
rename from sc2/content/base/ui/flagstat.9.png
rename to sc2/content/base/ui/flagshipstatus.9.png
diff --git a/sc2/content/base/ui/flagshipstatus.ani b/sc2/content/base/ui/flagshipstatus.ani
new file mode 100644
index 000000000..e27859ae9
--- /dev/null
+++ b/sc2/content/base/ui/flagshipstatus.ani
@@ -0,0 +1,23 @@
+flagshipstatus.0.png 0 58 -1 -1
+flagshipstatus.1.png 0 58 1 1
+flagshipstatus.2.png 0 58 -18 -97
+flagshipstatus.3.png 0 58 -42 -97
+flagshipstatus.4.png 0 58 -20 -89
+flagshipstatus.5.png 0 58 -40 -89
+flagshipstatus.6.png 0 58 -27 -99
+flagshipstatus.7.png 0 58 -27 -99
+flagshipstatus.8.png 0 58 -27 -99
+flagshipstatus.9.png 0 58 -27 -99
+flagshipstatus.10.png 0 58 -27 -99
+flagshipstatus.11.png 0 58 -27 -99
+flagshipstatus.12.png 0 58 -27 -99
+flagshipstatus.13.png 0 58 -27 -99
+flagshipstatus.14.png 0 58 -27 -99
+flagshipstatus.15.png 0 58 -27 -99
+flagshipstatus.16.png 0 58 -27 -99
+flagshipstatus.17.png 0 58 -27 -99
+flagshipstatus.18.png 0 58 -27 -99
+flagshipstatus.19.png 0 58 -27 -99
+flagshipstatus.20.png 0 58 -27 -99
+flagshipstatus.21.png 0 58 -27 -99
+flagshipstatus.22.png 0 58 -27 -99
diff --git a/sc2/content/base/ui/flagstat.ani b/sc2/content/base/ui/flagstat.ani
deleted file mode 100644
index f4f1f3696..000000000
--- a/sc2/content/base/ui/flagstat.ani
+++ /dev/null
@@ -1,23 +0,0 @@
-flagstat.0.png 0 58 -1 -1
-flagstat.1.png 0 58 1 1
-flagstat.2.png 0 58 -18 -97
-flagstat.3.png 0 58 -42 -97
-flagstat.4.png 0 58 -20 -89
-flagstat.5.png 0 58 -40 -89
-flagstat.6.png 0 58 -27 -99
-flagstat.7.png 0 58 -27 -99
-flagstat.8.png 0 58 -27 -99
-flagstat.9.png 0 58 -27 -99
-flagstat.10.png 0 58 -27 -99
-flagstat.11.png 0 58 -27 -99
-flagstat.12.png 0 58 -27 -99
-flagstat.13.png 0 58 -27 -99
-flagstat.14.png 0 58 -27 -99
-flagstat.15.png 0 58 -27 -99
-flagstat.16.png 0 58 -27 -99
-flagstat.17.png 0 58 -27 -99
-flagstat.18.png 0 58 -27 -99
-flagstat.19.png 0 58 -27 -99
-flagstat.20.png 0 58 -27 -99
-flagstat.21.png 0 58 -27 -99
-flagstat.22.png 0 58 -27 -99
diff --git a/sc2/content/base/ui/melee.ani b/sc2/content/base/ui/melee.ani
deleted file mode 100644
index 245e13880..000000000
--- a/sc2/content/base/ui/melee.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-melee.0.png 0 0 0 0
-melee.1.png 0 0 0 0
diff --git a/sc2/content/base/ui/meleebackground.ani b/sc2/content/base/ui/meleebackground.ani
deleted file mode 100644
index 24f418eec..000000000
--- a/sc2/content/base/ui/meleebackground.ani
+++ /dev/null
@@ -1,39 +0,0 @@
-melebkgd.0.png -1 0 0 0
-melebkgd.1.png -1 0 -256 -24
-melebkgd.2.png -1 0 -256 -24
-melebkgd.3.png -1 0 -256 -24
-melebkgd.4.png -1 0 -256 -24
-melebkgd.5.png -1 0 -256 -24
-melebkgd.6.png -1 0 -256 -24
-melebkgd.7.png -1 0 -256 -24
-melebkgd.8.png -1 0 -256 -24
-melebkgd.9.png -1 0 -256 -167
-melebkgd.10.png -1 0 -256 -167
-melebkgd.11.png -1 0 -256 -167
-melebkgd.12.png -1 0 -256 -167
-melebkgd.13.png -1 0 -256 -167
-melebkgd.14.png -1 0 -256 -167
-melebkgd.15.png -1 0 -256 -167
-melebkgd.16.png -1 0 -256 -167
-melebkgd.17.png -1 0 -268 -69
-melebkgd.18.png -1 0 -268 -59
-melebkgd.19.png -1 0 -268 -69
-melebkgd.20.png -1 0 -268 -59
-melebkgd.21.png -1 0 -268 -157
-melebkgd.22.png -1 0 -268 -147
-melebkgd.23.png -1 0 -268 -157
-melebkgd.24.png -1 0 -268 -147
-melebkgd.25.png -1 0 -253 -77
-melebkgd.26.png -1 0 -253 -77
-melebkgd.27.png -1 0 0 50
-melebkgd.28.png -1 0 -2 -22
-melebkgd.29.png -1 0 -268 -217
-melebkgd.30.png -1 0 -268 -217
-netplay.0.png -1 0 -256 -24
-netplay.1.png -1 0 -256 -24
-netplay.2.png -1 0 -256 -167
-netplay.3.png -1 0 -256 -167
-netplay.4.png -1 0 -265 -12
-netplay.5.png -1 0 -265 -12
-netplay.4.png -1 0 -265 -200
-netplay.5.png -1 0 -265 -200
diff --git a/sc2/content/base/ui/melebkgd.0.png b/sc2/content/base/ui/meleemenu.0.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.0.png
rename to sc2/content/base/ui/meleemenu.0.png
diff --git a/sc2/content/base/ui/melebkgd.1.png b/sc2/content/base/ui/meleemenu.1.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.1.png
rename to sc2/content/base/ui/meleemenu.1.png
diff --git a/sc2/content/base/ui/melebkgd.10.png b/sc2/content/base/ui/meleemenu.10.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.10.png
rename to sc2/content/base/ui/meleemenu.10.png
diff --git a/sc2/content/base/ui/melebkgd.11.png b/sc2/content/base/ui/meleemenu.11.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.11.png
rename to sc2/content/base/ui/meleemenu.11.png
diff --git a/sc2/content/base/ui/melebkgd.12.png b/sc2/content/base/ui/meleemenu.12.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.12.png
rename to sc2/content/base/ui/meleemenu.12.png
diff --git a/sc2/content/base/ui/melebkgd.13.png b/sc2/content/base/ui/meleemenu.13.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.13.png
rename to sc2/content/base/ui/meleemenu.13.png
diff --git a/sc2/content/base/ui/melebkgd.14.png b/sc2/content/base/ui/meleemenu.14.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.14.png
rename to sc2/content/base/ui/meleemenu.14.png
diff --git a/sc2/content/base/ui/melebkgd.15.png b/sc2/content/base/ui/meleemenu.15.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.15.png
rename to sc2/content/base/ui/meleemenu.15.png
diff --git a/sc2/content/base/ui/melebkgd.16.png b/sc2/content/base/ui/meleemenu.16.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.16.png
rename to sc2/content/base/ui/meleemenu.16.png
diff --git a/sc2/content/base/ui/melebkgd.17.png b/sc2/content/base/ui/meleemenu.17.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.17.png
rename to sc2/content/base/ui/meleemenu.17.png
diff --git a/sc2/content/base/ui/melebkgd.18.png b/sc2/content/base/ui/meleemenu.18.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.18.png
rename to sc2/content/base/ui/meleemenu.18.png
diff --git a/sc2/content/base/ui/melebkgd.19.png b/sc2/content/base/ui/meleemenu.19.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.19.png
rename to sc2/content/base/ui/meleemenu.19.png
diff --git a/sc2/content/base/ui/melebkgd.2.png b/sc2/content/base/ui/meleemenu.2.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.2.png
rename to sc2/content/base/ui/meleemenu.2.png
diff --git a/sc2/content/base/ui/melebkgd.20.png b/sc2/content/base/ui/meleemenu.20.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.20.png
rename to sc2/content/base/ui/meleemenu.20.png
diff --git a/sc2/content/base/ui/melebkgd.21.png b/sc2/content/base/ui/meleemenu.21.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.21.png
rename to sc2/content/base/ui/meleemenu.21.png
diff --git a/sc2/content/base/ui/melebkgd.22.png b/sc2/content/base/ui/meleemenu.22.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.22.png
rename to sc2/content/base/ui/meleemenu.22.png
diff --git a/sc2/content/base/ui/melebkgd.23.png b/sc2/content/base/ui/meleemenu.23.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.23.png
rename to sc2/content/base/ui/meleemenu.23.png
diff --git a/sc2/content/base/ui/melebkgd.24.png b/sc2/content/base/ui/meleemenu.24.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.24.png
rename to sc2/content/base/ui/meleemenu.24.png
diff --git a/sc2/content/base/ui/melebkgd.25.png b/sc2/content/base/ui/meleemenu.25.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.25.png
rename to sc2/content/base/ui/meleemenu.25.png
diff --git a/sc2/content/base/ui/melebkgd.26.png b/sc2/content/base/ui/meleemenu.26.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.26.png
rename to sc2/content/base/ui/meleemenu.26.png
diff --git a/sc2/content/base/ui/melebkgd.27.png b/sc2/content/base/ui/meleemenu.27.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.27.png
rename to sc2/content/base/ui/meleemenu.27.png
diff --git a/sc2/content/base/ui/melebkgd.28.png b/sc2/content/base/ui/meleemenu.28.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.28.png
rename to sc2/content/base/ui/meleemenu.28.png
diff --git a/sc2/content/base/ui/melebkgd.29.png b/sc2/content/base/ui/meleemenu.29.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.29.png
rename to sc2/content/base/ui/meleemenu.29.png
diff --git a/sc2/content/base/ui/melebkgd.3.png b/sc2/content/base/ui/meleemenu.3.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.3.png
rename to sc2/content/base/ui/meleemenu.3.png
diff --git a/sc2/content/base/ui/melebkgd.30.png b/sc2/content/base/ui/meleemenu.30.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.30.png
rename to sc2/content/base/ui/meleemenu.30.png
diff --git a/sc2/content/base/ui/melebkgd.4.png b/sc2/content/base/ui/meleemenu.4.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.4.png
rename to sc2/content/base/ui/meleemenu.4.png
diff --git a/sc2/content/base/ui/melebkgd.5.png b/sc2/content/base/ui/meleemenu.5.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.5.png
rename to sc2/content/base/ui/meleemenu.5.png
diff --git a/sc2/content/base/ui/melebkgd.6.png b/sc2/content/base/ui/meleemenu.6.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.6.png
rename to sc2/content/base/ui/meleemenu.6.png
diff --git a/sc2/content/base/ui/melebkgd.7.png b/sc2/content/base/ui/meleemenu.7.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.7.png
rename to sc2/content/base/ui/meleemenu.7.png
diff --git a/sc2/content/base/ui/melebkgd.8.png b/sc2/content/base/ui/meleemenu.8.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.8.png
rename to sc2/content/base/ui/meleemenu.8.png
diff --git a/sc2/content/base/ui/melebkgd.9.png b/sc2/content/base/ui/meleemenu.9.png
similarity index 100%
rename from sc2/content/base/ui/melebkgd.9.png
rename to sc2/content/base/ui/meleemenu.9.png
diff --git a/sc2/content/base/ui/meleemenu.ani b/sc2/content/base/ui/meleemenu.ani
new file mode 100644
index 000000000..8f00d2650
--- /dev/null
+++ b/sc2/content/base/ui/meleemenu.ani
@@ -0,0 +1,39 @@
+meleemenu.0.png -1 0 0 0
+meleemenu.1.png -1 0 -256 -24
+meleemenu.2.png -1 0 -256 -24
+meleemenu.3.png -1 0 -256 -24
+meleemenu.4.png -1 0 -256 -24
+meleemenu.5.png -1 0 -256 -24
+meleemenu.6.png -1 0 -256 -24
+meleemenu.7.png -1 0 -256 -24
+meleemenu.8.png -1 0 -256 -24
+meleemenu.9.png -1 0 -256 -167
+meleemenu.10.png -1 0 -256 -167
+meleemenu.11.png -1 0 -256 -167
+meleemenu.12.png -1 0 -256 -167
+meleemenu.13.png -1 0 -256 -167
+meleemenu.14.png -1 0 -256 -167
+meleemenu.15.png -1 0 -256 -167
+meleemenu.16.png -1 0 -256 -167
+meleemenu.17.png -1 0 -268 -69
+meleemenu.18.png -1 0 -268 -59
+meleemenu.19.png -1 0 -268 -69
+meleemenu.20.png -1 0 -268 -59
+meleemenu.21.png -1 0 -268 -157
+meleemenu.22.png -1 0 -268 -147
+meleemenu.23.png -1 0 -268 -157
+meleemenu.24.png -1 0 -268 -147
+meleemenu.25.png -1 0 -253 -77
+meleemenu.26.png -1 0 -253 -77
+meleemenu.27.png -1 0 0 50
+meleemenu.28.png -1 0 -2 -22
+meleemenu.29.png -1 0 -268 -217
+meleemenu.30.png -1 0 -268 -217
+netplay.0.png -1 0 -256 -24
+netplay.1.png -1 0 -256 -24
+netplay.2.png -1 0 -256 -167
+netplay.3.png -1 0 -256 -167
+netplay.4.png -1 0 -265 -12
+netplay.5.png -1 0 -265 -12
+netplay.4.png -1 0 -265 -200
+netplay.5.png -1 0 -265 -200
diff --git a/sc2/content/base/ui/melee.0.png b/sc2/content/base/ui/meleepickship.0.png
similarity index 100%
rename from sc2/content/base/ui/melee.0.png
rename to sc2/content/base/ui/meleepickship.0.png
diff --git a/sc2/content/base/ui/melee.1.png b/sc2/content/base/ui/meleepickship.1.png
similarity index 100%
rename from sc2/content/base/ui/melee.1.png
rename to sc2/content/base/ui/meleepickship.1.png
diff --git a/sc2/content/base/ui/meleepickship.ani b/sc2/content/base/ui/meleepickship.ani
new file mode 100644
index 000000000..dad73dbe5
--- /dev/null
+++ b/sc2/content/base/ui/meleepickship.ani
@@ -0,0 +1,2 @@
+meleepickship.0.png 0 0 0 0
+meleepickship.1.png 0 0 0 0
diff --git a/sc2/content/base/ui/modules.ani b/sc2/content/base/ui/modules.ani
deleted file mode 100644
index 390601227..000000000
--- a/sc2/content/base/ui/modules.ani
+++ /dev/null
@@ -1,16 +0,0 @@
-modules.0.png 0 67 0 11
-modules.1.png 0 67 0 11
-modules.2.png 0 67 0 11
-modules.3.png 0 67 0 11
-modules.4.png 0 67 0 11
-modules.5.png 0 67 0 11
-modules.6.png 0 67 0 11
-modules.7.png 0 67 0 11
-modules.8.png 0 67 0 11
-modules.9.png 0 67 0 11
-modules.10.png 0 67 0 11
-modules.11.png 0 67 0 11
-modules.12.png 0 67 0 11
-modules.13.png 0 67 0 11
-modules.14.png 0 67 -29 -1
-modules.15.png 0 67 -1 -42
diff --git a/sc2/content/base/ui/modules.0.png b/sc2/content/base/ui/modulesmenu.0.png
similarity index 100%
rename from sc2/content/base/ui/modules.0.png
rename to sc2/content/base/ui/modulesmenu.0.png
diff --git a/sc2/content/base/ui/modules.1.png b/sc2/content/base/ui/modulesmenu.1.png
similarity index 100%
rename from sc2/content/base/ui/modules.1.png
rename to sc2/content/base/ui/modulesmenu.1.png
diff --git a/sc2/content/base/ui/modules.10.png b/sc2/content/base/ui/modulesmenu.10.png
similarity index 100%
rename from sc2/content/base/ui/modules.10.png
rename to sc2/content/base/ui/modulesmenu.10.png
diff --git a/sc2/content/base/ui/modules.11.png b/sc2/content/base/ui/modulesmenu.11.png
similarity index 100%
rename from sc2/content/base/ui/modules.11.png
rename to sc2/content/base/ui/modulesmenu.11.png
diff --git a/sc2/content/base/ui/modules.12.png b/sc2/content/base/ui/modulesmenu.12.png
similarity index 100%
rename from sc2/content/base/ui/modules.12.png
rename to sc2/content/base/ui/modulesmenu.12.png
diff --git a/sc2/content/base/ui/modules.13.png b/sc2/content/base/ui/modulesmenu.13.png
similarity index 100%
rename from sc2/content/base/ui/modules.13.png
rename to sc2/content/base/ui/modulesmenu.13.png
diff --git a/sc2/content/base/ui/modules.14.png b/sc2/content/base/ui/modulesmenu.14.png
similarity index 100%
rename from sc2/content/base/ui/modules.14.png
rename to sc2/content/base/ui/modulesmenu.14.png
diff --git a/sc2/content/base/ui/modules.15.png b/sc2/content/base/ui/modulesmenu.15.png
similarity index 100%
rename from sc2/content/base/ui/modules.15.png
rename to sc2/content/base/ui/modulesmenu.15.png
diff --git a/sc2/content/base/ui/modules.2.png b/sc2/content/base/ui/modulesmenu.2.png
similarity index 100%
rename from sc2/content/base/ui/modules.2.png
rename to sc2/content/base/ui/modulesmenu.2.png
diff --git a/sc2/content/base/ui/modules.3.png b/sc2/content/base/ui/modulesmenu.3.png
similarity index 100%
rename from sc2/content/base/ui/modules.3.png
rename to sc2/content/base/ui/modulesmenu.3.png
diff --git a/sc2/content/base/ui/modules.4.png b/sc2/content/base/ui/modulesmenu.4.png
similarity index 100%
rename from sc2/content/base/ui/modules.4.png
rename to sc2/content/base/ui/modulesmenu.4.png
diff --git a/sc2/content/base/ui/modules.5.png b/sc2/content/base/ui/modulesmenu.5.png
similarity index 100%
rename from sc2/content/base/ui/modules.5.png
rename to sc2/content/base/ui/modulesmenu.5.png
diff --git a/sc2/content/base/ui/modules.6.png b/sc2/content/base/ui/modulesmenu.6.png
similarity index 100%
rename from sc2/content/base/ui/modules.6.png
rename to sc2/content/base/ui/modulesmenu.6.png
diff --git a/sc2/content/base/ui/modules.7.png b/sc2/content/base/ui/modulesmenu.7.png
similarity index 100%
rename from sc2/content/base/ui/modules.7.png
rename to sc2/content/base/ui/modulesmenu.7.png
diff --git a/sc2/content/base/ui/modules.8.png b/sc2/content/base/ui/modulesmenu.8.png
similarity index 100%
rename from sc2/content/base/ui/modules.8.png
rename to sc2/content/base/ui/modulesmenu.8.png
diff --git a/sc2/content/base/ui/modules.9.png b/sc2/content/base/ui/modulesmenu.9.png
similarity index 100%
rename from sc2/content/base/ui/modules.9.png
rename to sc2/content/base/ui/modulesmenu.9.png
diff --git a/sc2/content/base/ui/modulesmenu.ani b/sc2/content/base/ui/modulesmenu.ani
new file mode 100644
index 000000000..e04686bf1
--- /dev/null
+++ b/sc2/content/base/ui/modulesmenu.ani
@@ -0,0 +1,16 @@
+modulesmenu.0.png 0 67 0 11
+modulesmenu.1.png 0 67 0 11
+modulesmenu.2.png 0 67 0 11
+modulesmenu.3.png 0 67 0 11
+modulesmenu.4.png 0 67 0 11
+modulesmenu.5.png 0 67 0 11
+modulesmenu.6.png 0 67 0 11
+modulesmenu.7.png 0 67 0 11
+modulesmenu.8.png 0 67 0 11
+modulesmenu.9.png 0 67 0 11
+modulesmenu.10.png 0 67 0 11
+modulesmenu.11.png 0 67 0 11
+modulesmenu.12.png 0 67 0 11
+modulesmenu.13.png 0 67 0 11
+modulesmenu.14.png 0 67 -29 -1
+modulesmenu.15.png 0 67 -1 -42
diff --git a/sc2/content/base/ui/sismods.0.png b/sc2/content/base/ui/outfitmodules.0.png
similarity index 100%
rename from sc2/content/base/ui/sismods.0.png
rename to sc2/content/base/ui/outfitmodules.0.png
diff --git a/sc2/content/base/ui/sismods.1.png b/sc2/content/base/ui/outfitmodules.1.png
similarity index 100%
rename from sc2/content/base/ui/sismods.1.png
rename to sc2/content/base/ui/outfitmodules.1.png
diff --git a/sc2/content/base/ui/sismods.10.png b/sc2/content/base/ui/outfitmodules.10.png
similarity index 100%
rename from sc2/content/base/ui/sismods.10.png
rename to sc2/content/base/ui/outfitmodules.10.png
diff --git a/sc2/content/base/ui/sismods.11.png b/sc2/content/base/ui/outfitmodules.11.png
similarity index 100%
rename from sc2/content/base/ui/sismods.11.png
rename to sc2/content/base/ui/outfitmodules.11.png
diff --git a/sc2/content/base/ui/sismods.12.png b/sc2/content/base/ui/outfitmodules.12.png
similarity index 100%
rename from sc2/content/base/ui/sismods.12.png
rename to sc2/content/base/ui/outfitmodules.12.png
diff --git a/sc2/content/base/ui/sismods.13.png b/sc2/content/base/ui/outfitmodules.13.png
similarity index 100%
rename from sc2/content/base/ui/sismods.13.png
rename to sc2/content/base/ui/outfitmodules.13.png
diff --git a/sc2/content/base/ui/sismods.14.png b/sc2/content/base/ui/outfitmodules.14.png
similarity index 100%
rename from sc2/content/base/ui/sismods.14.png
rename to sc2/content/base/ui/outfitmodules.14.png
diff --git a/sc2/content/base/ui/sismods.15.png b/sc2/content/base/ui/outfitmodules.15.png
similarity index 100%
rename from sc2/content/base/ui/sismods.15.png
rename to sc2/content/base/ui/outfitmodules.15.png
diff --git a/sc2/content/base/ui/sismods.16.png b/sc2/content/base/ui/outfitmodules.16.png
similarity index 100%
rename from sc2/content/base/ui/sismods.16.png
rename to sc2/content/base/ui/outfitmodules.16.png
diff --git a/sc2/content/base/ui/sismods.17.png b/sc2/content/base/ui/outfitmodules.17.png
similarity index 100%
rename from sc2/content/base/ui/sismods.17.png
rename to sc2/content/base/ui/outfitmodules.17.png
diff --git a/sc2/content/base/ui/sismods.18.png b/sc2/content/base/ui/outfitmodules.18.png
similarity index 100%
rename from sc2/content/base/ui/sismods.18.png
rename to sc2/content/base/ui/outfitmodules.18.png
diff --git a/sc2/content/base/ui/sismods.19.png b/sc2/content/base/ui/outfitmodules.19.png
similarity index 100%
rename from sc2/content/base/ui/sismods.19.png
rename to sc2/content/base/ui/outfitmodules.19.png
diff --git a/sc2/content/base/ui/sismods.2.png b/sc2/content/base/ui/outfitmodules.2.png
similarity index 100%
rename from sc2/content/base/ui/sismods.2.png
rename to sc2/content/base/ui/outfitmodules.2.png
diff --git a/sc2/content/base/ui/sismods.20.png b/sc2/content/base/ui/outfitmodules.20.png
similarity index 100%
rename from sc2/content/base/ui/sismods.20.png
rename to sc2/content/base/ui/outfitmodules.20.png
diff --git a/sc2/content/base/ui/sismods.21.png b/sc2/content/base/ui/outfitmodules.21.png
similarity index 100%
rename from sc2/content/base/ui/sismods.21.png
rename to sc2/content/base/ui/outfitmodules.21.png
diff --git a/sc2/content/base/ui/sismods.22.png b/sc2/content/base/ui/outfitmodules.22.png
similarity index 100%
rename from sc2/content/base/ui/sismods.22.png
rename to sc2/content/base/ui/outfitmodules.22.png
diff --git a/sc2/content/base/ui/sismods.23.png b/sc2/content/base/ui/outfitmodules.23.png
similarity index 100%
rename from sc2/content/base/ui/sismods.23.png
rename to sc2/content/base/ui/outfitmodules.23.png
diff --git a/sc2/content/base/ui/sismods.24.png b/sc2/content/base/ui/outfitmodules.24.png
similarity index 100%
rename from sc2/content/base/ui/sismods.24.png
rename to sc2/content/base/ui/outfitmodules.24.png
diff --git a/sc2/content/base/ui/sismods.25.png b/sc2/content/base/ui/outfitmodules.25.png
similarity index 100%
rename from sc2/content/base/ui/sismods.25.png
rename to sc2/content/base/ui/outfitmodules.25.png
diff --git a/sc2/content/base/ui/sismods.26.png b/sc2/content/base/ui/outfitmodules.26.png
similarity index 100%
rename from sc2/content/base/ui/sismods.26.png
rename to sc2/content/base/ui/outfitmodules.26.png
diff --git a/sc2/content/base/ui/sismods.27.png b/sc2/content/base/ui/outfitmodules.27.png
similarity index 100%
rename from sc2/content/base/ui/sismods.27.png
rename to sc2/content/base/ui/outfitmodules.27.png
diff --git a/sc2/content/base/ui/sismods.28.png b/sc2/content/base/ui/outfitmodules.28.png
similarity index 100%
rename from sc2/content/base/ui/sismods.28.png
rename to sc2/content/base/ui/outfitmodules.28.png
diff --git a/sc2/content/base/ui/sismods.29.png b/sc2/content/base/ui/outfitmodules.29.png
similarity index 100%
rename from sc2/content/base/ui/sismods.29.png
rename to sc2/content/base/ui/outfitmodules.29.png
diff --git a/sc2/content/base/ui/sismods.3.png b/sc2/content/base/ui/outfitmodules.3.png
similarity index 100%
rename from sc2/content/base/ui/sismods.3.png
rename to sc2/content/base/ui/outfitmodules.3.png
diff --git a/sc2/content/base/ui/sismods.30.png b/sc2/content/base/ui/outfitmodules.30.png
similarity index 100%
rename from sc2/content/base/ui/sismods.30.png
rename to sc2/content/base/ui/outfitmodules.30.png
diff --git a/sc2/content/base/ui/sismods.31.png b/sc2/content/base/ui/outfitmodules.31.png
similarity index 100%
rename from sc2/content/base/ui/sismods.31.png
rename to sc2/content/base/ui/outfitmodules.31.png
diff --git a/sc2/content/base/ui/sismods.32.png b/sc2/content/base/ui/outfitmodules.32.png
similarity index 100%
rename from sc2/content/base/ui/sismods.32.png
rename to sc2/content/base/ui/outfitmodules.32.png
diff --git a/sc2/content/base/ui/sismods.33.png b/sc2/content/base/ui/outfitmodules.33.png
similarity index 100%
rename from sc2/content/base/ui/sismods.33.png
rename to sc2/content/base/ui/outfitmodules.33.png
diff --git a/sc2/content/base/ui/sismods.34.png b/sc2/content/base/ui/outfitmodules.34.png
similarity index 100%
rename from sc2/content/base/ui/sismods.34.png
rename to sc2/content/base/ui/outfitmodules.34.png
diff --git a/sc2/content/base/ui/sismods.35.png b/sc2/content/base/ui/outfitmodules.35.png
similarity index 100%
rename from sc2/content/base/ui/sismods.35.png
rename to sc2/content/base/ui/outfitmodules.35.png
diff --git a/sc2/content/base/ui/sismods.36.png b/sc2/content/base/ui/outfitmodules.36.png
similarity index 100%
rename from sc2/content/base/ui/sismods.36.png
rename to sc2/content/base/ui/outfitmodules.36.png
diff --git a/sc2/content/base/ui/sismods.37.png b/sc2/content/base/ui/outfitmodules.37.png
similarity index 100%
rename from sc2/content/base/ui/sismods.37.png
rename to sc2/content/base/ui/outfitmodules.37.png
diff --git a/sc2/content/base/ui/sismods.38.png b/sc2/content/base/ui/outfitmodules.38.png
similarity index 100%
rename from sc2/content/base/ui/sismods.38.png
rename to sc2/content/base/ui/outfitmodules.38.png
diff --git a/sc2/content/base/ui/sismods.39.png b/sc2/content/base/ui/outfitmodules.39.png
similarity index 100%
rename from sc2/content/base/ui/sismods.39.png
rename to sc2/content/base/ui/outfitmodules.39.png
diff --git a/sc2/content/base/ui/sismods.4.png b/sc2/content/base/ui/outfitmodules.4.png
similarity index 100%
rename from sc2/content/base/ui/sismods.4.png
rename to sc2/content/base/ui/outfitmodules.4.png
diff --git a/sc2/content/base/ui/sismods.40.png b/sc2/content/base/ui/outfitmodules.40.png
similarity index 100%
rename from sc2/content/base/ui/sismods.40.png
rename to sc2/content/base/ui/outfitmodules.40.png
diff --git a/sc2/content/base/ui/sismods.41.png b/sc2/content/base/ui/outfitmodules.41.png
similarity index 100%
rename from sc2/content/base/ui/sismods.41.png
rename to sc2/content/base/ui/outfitmodules.41.png
diff --git a/sc2/content/base/ui/sismods.42.png b/sc2/content/base/ui/outfitmodules.42.png
similarity index 100%
rename from sc2/content/base/ui/sismods.42.png
rename to sc2/content/base/ui/outfitmodules.42.png
diff --git a/sc2/content/base/ui/sismods.43.png b/sc2/content/base/ui/outfitmodules.43.png
similarity index 100%
rename from sc2/content/base/ui/sismods.43.png
rename to sc2/content/base/ui/outfitmodules.43.png
diff --git a/sc2/content/base/ui/sismods.44.png b/sc2/content/base/ui/outfitmodules.44.png
similarity index 100%
rename from sc2/content/base/ui/sismods.44.png
rename to sc2/content/base/ui/outfitmodules.44.png
diff --git a/sc2/content/base/ui/sismods.45.png b/sc2/content/base/ui/outfitmodules.45.png
similarity index 100%
rename from sc2/content/base/ui/sismods.45.png
rename to sc2/content/base/ui/outfitmodules.45.png
diff --git a/sc2/content/base/ui/sismods.46.png b/sc2/content/base/ui/outfitmodules.46.png
similarity index 100%
rename from sc2/content/base/ui/sismods.46.png
rename to sc2/content/base/ui/outfitmodules.46.png
diff --git a/sc2/content/base/ui/sismods.47.png b/sc2/content/base/ui/outfitmodules.47.png
similarity index 100%
rename from sc2/content/base/ui/sismods.47.png
rename to sc2/content/base/ui/outfitmodules.47.png
diff --git a/sc2/content/base/ui/sismods.48.png b/sc2/content/base/ui/outfitmodules.48.png
similarity index 100%
rename from sc2/content/base/ui/sismods.48.png
rename to sc2/content/base/ui/outfitmodules.48.png
diff --git a/sc2/content/base/ui/sismods.49.png b/sc2/content/base/ui/outfitmodules.49.png
similarity index 100%
rename from sc2/content/base/ui/sismods.49.png
rename to sc2/content/base/ui/outfitmodules.49.png
diff --git a/sc2/content/base/ui/sismods.5.png b/sc2/content/base/ui/outfitmodules.5.png
similarity index 100%
rename from sc2/content/base/ui/sismods.5.png
rename to sc2/content/base/ui/outfitmodules.5.png
diff --git a/sc2/content/base/ui/sismods.50.png b/sc2/content/base/ui/outfitmodules.50.png
similarity index 100%
rename from sc2/content/base/ui/sismods.50.png
rename to sc2/content/base/ui/outfitmodules.50.png
diff --git a/sc2/content/base/ui/sismods.51.png b/sc2/content/base/ui/outfitmodules.51.png
similarity index 100%
rename from sc2/content/base/ui/sismods.51.png
rename to sc2/content/base/ui/outfitmodules.51.png
diff --git a/sc2/content/base/ui/sismods.52.png b/sc2/content/base/ui/outfitmodules.52.png
similarity index 100%
rename from sc2/content/base/ui/sismods.52.png
rename to sc2/content/base/ui/outfitmodules.52.png
diff --git a/sc2/content/base/ui/sismods.53.png b/sc2/content/base/ui/outfitmodules.53.png
similarity index 100%
rename from sc2/content/base/ui/sismods.53.png
rename to sc2/content/base/ui/outfitmodules.53.png
diff --git a/sc2/content/base/ui/sismods.54.png b/sc2/content/base/ui/outfitmodules.54.png
similarity index 100%
rename from sc2/content/base/ui/sismods.54.png
rename to sc2/content/base/ui/outfitmodules.54.png
diff --git a/sc2/content/base/ui/sismods.55.png b/sc2/content/base/ui/outfitmodules.55.png
similarity index 100%
rename from sc2/content/base/ui/sismods.55.png
rename to sc2/content/base/ui/outfitmodules.55.png
diff --git a/sc2/content/base/ui/sismods.6.png b/sc2/content/base/ui/outfitmodules.6.png
similarity index 100%
rename from sc2/content/base/ui/sismods.6.png
rename to sc2/content/base/ui/outfitmodules.6.png
diff --git a/sc2/content/base/ui/sismods.7.png b/sc2/content/base/ui/outfitmodules.7.png
similarity index 100%
rename from sc2/content/base/ui/sismods.7.png
rename to sc2/content/base/ui/outfitmodules.7.png
diff --git a/sc2/content/base/ui/sismods.8.png b/sc2/content/base/ui/outfitmodules.8.png
similarity index 100%
rename from sc2/content/base/ui/sismods.8.png
rename to sc2/content/base/ui/outfitmodules.8.png
diff --git a/sc2/content/base/ui/sismods.9.png b/sc2/content/base/ui/outfitmodules.9.png
similarity index 100%
rename from sc2/content/base/ui/sismods.9.png
rename to sc2/content/base/ui/outfitmodules.9.png
diff --git a/sc2/content/base/ui/outfitmodules.ani b/sc2/content/base/ui/outfitmodules.ani
new file mode 100644
index 000000000..6711ae337
--- /dev/null
+++ b/sc2/content/base/ui/outfitmodules.ani
@@ -0,0 +1,56 @@
+outfitmodules.0.png 0 67 0 0
+outfitmodules.1.png 0 67 0 0
+outfitmodules.2.png 0 67 0 0
+outfitmodules.3.png 0 67 0 0
+outfitmodules.4.png 0 67 0 0
+outfitmodules.5.png 0 67 0 0
+outfitmodules.6.png 0 67 0 -1
+outfitmodules.7.png 0 67 0 -7
+outfitmodules.8.png 0 67 0 0
+outfitmodules.9.png 0 67 0 0
+outfitmodules.10.png 0 67 0 0
+outfitmodules.11.png 0 67 0 0
+outfitmodules.12.png 0 67 0 0
+outfitmodules.13.png 0 67 0 0
+outfitmodules.14.png 0 67 0 -5
+outfitmodules.15.png 0 67 0 -7
+outfitmodules.16.png 0 67 0 -9
+outfitmodules.17.png 0 67 0 -6
+outfitmodules.18.png 0 67 0 -1
+outfitmodules.19.png 0 67 0 0
+outfitmodules.20.png 0 67 0 0
+outfitmodules.21.png 0 67 0 0
+outfitmodules.22.png 0 67 0 0
+outfitmodules.23.png 0 67 0 0
+outfitmodules.24.png 0 67 -12 0
+outfitmodules.25.png 0 67 -12 0
+outfitmodules.26.png 0 67 0 0
+outfitmodules.27.png 0 67 0 0
+outfitmodules.28.png 0 67 0 4
+outfitmodules.29.png 0 67 0 4
+outfitmodules.30.png 0 67 0 -4
+outfitmodules.31.png 0 67 0 -1
+outfitmodules.32.png 0 67 0 0
+outfitmodules.33.png 0 67 0 4
+outfitmodules.34.png 0 67 0 -1
+outfitmodules.35.png 0 67 0 1
+outfitmodules.36.png 0 67 0 4
+outfitmodules.37.png 0 67 0 4
+outfitmodules.38.png 0 67 0 4
+outfitmodules.39.png 0 67 0 -1
+outfitmodules.40.png 0 67 0 -2
+outfitmodules.41.png 0 67 0 -3
+outfitmodules.42.png 0 67 0 0
+outfitmodules.43.png 0 67 0 4
+outfitmodules.44.png 0 67 0 3
+outfitmodules.45.png 0 67 0 0
+outfitmodules.46.png 0 67 0 0
+outfitmodules.47.png 0 67 0 4
+outfitmodules.48.png 0 67 0 4
+outfitmodules.49.png 0 67 -12 4
+outfitmodules.50.png 0 67 -12 4
+outfitmodules.51.png 0 67 -178 -69
+outfitmodules.52.png 0 67 -189 -69
+outfitmodules.53.png 0 67 -200 -69
+outfitmodules.54.png 0 67 -211 -69
+outfitmodules.55.png 0 67 -15 -54
diff --git a/sc2/content/base/ui/sisblueprint.ani b/sc2/content/base/ui/sisblueprint.ani
deleted file mode 100644
index 13837d500..000000000
--- a/sc2/content/base/ui/sisblueprint.ani
+++ /dev/null
@@ -1,23 +0,0 @@
-sisblu.0.png 1 28 0 0
-sisblu.1.png 1 28 0 0
-sisblu.2.png 1 28 0 3
-sisblu.3.png 1 28 0 0
-sisblu.4.png 1 28 0 -4
-sisblu.5.png 1 28 0 1
-sisblu.6.png 1 28 0 0
-sisblu.7.png 1 28 0 4
-sisblu.8.png 1 28 0 0
-sisblu.9.png 1 28 0 1
-sisblu.10.png 1 28 0 4
-sisblu.11.png 1 28 0 2
-sisblu.12.png 1 28 0 4
-sisblu.13.png 1 28 0 -1
-sisblu.14.png 1 28 0 -2
-sisblu.15.png 1 28 0 -3
-sisblu.16.png 1 28 0 0
-sisblu.17.png 1 28 0 4
-sisblu.18.png 1 28 0 3
-sisblu.19.png 1 28 0 0
-sisblu.20.png 1 28 -6 -11
-sisblu.21.png 1 28 0 0
-sisblu.22.png 1 28 -2 -7
diff --git a/sc2/content/base/ui/sismodules.ani b/sc2/content/base/ui/sismodules.ani
deleted file mode 100644
index 696ac1422..000000000
--- a/sc2/content/base/ui/sismodules.ani
+++ /dev/null
@@ -1,56 +0,0 @@
-sismods.0.png 0 67 0 0
-sismods.1.png 0 67 0 0
-sismods.2.png 0 67 0 0
-sismods.3.png 0 67 0 0
-sismods.4.png 0 67 0 0
-sismods.5.png 0 67 0 0
-sismods.6.png 0 67 0 -1
-sismods.7.png 0 67 0 -7
-sismods.8.png 0 67 0 0
-sismods.9.png 0 67 0 0
-sismods.10.png 0 67 0 0
-sismods.11.png 0 67 0 0
-sismods.12.png 0 67 0 0
-sismods.13.png 0 67 0 0
-sismods.14.png 0 67 0 -5
-sismods.15.png 0 67 0 -7
-sismods.16.png 0 67 0 -9
-sismods.17.png 0 67 0 -6
-sismods.18.png 0 67 0 -1
-sismods.19.png 0 67 0 0
-sismods.20.png 0 67 0 0
-sismods.21.png 0 67 0 0
-sismods.22.png 0 67 0 0
-sismods.23.png 0 67 0 0
-sismods.24.png 0 67 -12 0
-sismods.25.png 0 67 -12 0
-sismods.26.png 0 67 0 0
-sismods.27.png 0 67 0 0
-sismods.28.png 0 67 0 4
-sismods.29.png 0 67 0 4
-sismods.30.png 0 67 0 -4
-sismods.31.png 0 67 0 -1
-sismods.32.png 0 67 0 0
-sismods.33.png 0 67 0 4
-sismods.34.png 0 67 0 -1
-sismods.35.png 0 67 0 1
-sismods.36.png 0 67 0 4
-sismods.37.png 0 67 0 4
-sismods.38.png 0 67 0 4
-sismods.39.png 0 67 0 -1
-sismods.40.png 0 67 0 -2
-sismods.41.png 0 67 0 -3
-sismods.42.png 0 67 0 0
-sismods.43.png 0 67 0 4
-sismods.44.png 0 67 0 3
-sismods.45.png 0 67 0 0
-sismods.46.png 0 67 0 0
-sismods.47.png 0 67 0 4
-sismods.48.png 0 67 0 4
-sismods.49.png 0 67 -12 4
-sismods.50.png 0 67 -12 4
-sismods.51.png 0 67 -178 -69
-sismods.52.png 0 67 -189 -69
-sismods.53.png 0 67 -200 -69
-sismods.54.png 0 67 -211 -69
-sismods.55.png 0 67 -15 -54
diff --git a/sc2/content/uqm.rmp b/sc2/content/uqm.rmp
index a27dbc26e..238d59a26 100644
--- a/sc2/content/uqm.rmp
+++ b/sc2/content/uqm.rmp
@@ -1,9 +1,9 @@
-colortable.arispace = BINTAB:base/nav/quasispace.ct
 colortable.hangar = BINTAB:base/ui/hangar.ct
-colortable.hyperpal = BINTAB:base/nav/hyperspace.ct
-colortable.ip_sun = BINTAB:base/nav/truespace.ct
+colortable.hyperspace = BINTAB:base/nav/hyperspace.ct
+colortable.main = BINTAB:base/uqm.ct
 colortable.orbplan = BINTAB:base/lander/orbit.ct
-colortable.scclrtab = BINTAB:base/uqm.ct
+colortable.quasispace = BINTAB:base/nav/quasispace.ct
+colortable.truespace = BINTAB:base/nav/truespace.ct
 comm.arilou.colortable = BINTAB:base/comm/arilou/arilou.ct
 comm.arilou.dialogue = CONVERSATION:base/comm/arilou/arilou.txt
 comm.arilou.font = FONTRES:base/fonts/arilou.fon
@@ -141,28 +141,32 @@ font.player = FONTRES:base/fonts/player.fon
 font.starcon = FONTRES:base/fonts/starcon.fon
 font.tiny = FONTRES:base/fonts/tiny.fon
 graphics.activity = GFXRES:base/ui/activity.ani
-graphics.ambanim = GFXRES:base/nav/ambientanim.ani
-graphics.aquhelix = GFXRES:base/lander/energy/aquahelix.ani
-graphics.arispace = GFXRES:base/nav/quasispace.ani
-graphics.astbig = GFXRES:base/battle/asteroid.big
-graphics.astmed = GFXRES:base/battle/asteroid.med
-graphics.astsml = GFXRES:base/battle/asteroid.sml
-graphics.blabig = GFXRES:base/battle/blabig.ani
-graphics.blamed = GFXRES:base/battle/blamed.ani
-graphics.blasml = GFXRES:base/battle/blasml.ani
-graphics.boobig = GFXRES:base/battle/boobig.ani
-graphics.boomed = GFXRES:base/battle/boomed.ani
-graphics.boosml = GFXRES:base/battle/boosml.ani
-graphics.drutrans = GFXRES:base/lander/energy/burvixcaster.ani
-graphics.eartmask = GFXRES:base/planets/earthmask.ani
+graphics.ambient = GFXRES:base/nav/ambient.ani
+graphics.aquahelix = GFXRES:base/lander/energy/aquahelix.ani
+graphics.asteroid.large = GFXRES:base/battle/asteroid-big.ani
+graphics.asteroid.medium = GFXRES:base/battle/asteroid-med.ani
+graphics.asteroid.small = GFXRES:base/battle/asteroid-sml.ani
+graphics.blast.large = GFXRES:base/battle/blast-big.ani
+graphics.blast.medium = GFXRES:base/battle/blast-med.ani
+graphics.blast.small = GFXRES:base/battle/blast-sml.ani
+graphics.blueprints = GFXRES:base/ui/blueprints.ani
+graphics.boom.large = GFXRES:base/battle/boom-big.ani
+graphics.boom.medium = GFXRES:base/battle/boom-med.ani
+graphics.boom.small = GFXRES:base/battle/boom-sml.ani
+graphics.burvixcaster = GFXRES:base/lander/energy/burvixcaster.ani
+graphics.earthmask = GFXRES:base/planets/earthmask.ani
 graphics.eggcase = GFXRES:base/lander/energy/eggcase.ani
-graphics.flagstat = GFXRES:base/ui/flagstat.ani
-graphics.fontgrad = GFXRES:base/fonts/fontgrad.ani
-graphics.hyperstr = GFXRES:base/nav/hyperstr.ani
-graphics.ip_sun = GFXRES:base/nav/ip_sun.ani
+graphics.flagship = GFXRES:base/nav/flagship.ani
+graphics.flagshipskeleton = GFXRES:base/cutscene/ending/fs_skeleton.ani
+graphics.flagshipstatus = GFXRES:base/ui/flagshipstatus.ani
+graphics.fontgradient = GFXRES:base/fonts/fontgradient.ani
+graphics.fwiffo = GFXRES:base/lander/energy/fwiffo.ani
+graphics.hyperstars = GFXRES:base/nav/hyperstars.ani
 graphics.lander = GFXRES:base/lander/lander.ani
-graphics.landfeff = GFXRES:base/lander/fonteffect.ani
-graphics.launch = GFXRES:base/lander/launch.ani
+graphics.landerfonteffect = GFXRES:base/lander/fonteffect.ani
+graphics.landerlaunch = GFXRES:base/lander/launch.ani
+graphics.landerreturn = GFXRES:base/lander/return.ani
+graphics.landershield = GFXRES:base/lander/shield.ani
 graphics.lavaspot = GFXRES:base/lander/hazard/lavaspot.ani
 graphics.life.0 = GFXRES:base/lander/bio/lifea.ani
 graphics.life.1 = GFXRES:base/lander/bio/lifeb.ani
@@ -191,772 +195,768 @@ graphics.life.7 = GFXRES:base/lander/bio/lifeh.ani
 graphics.life.8 = GFXRES:base/lander/bio/lifei.ani
 graphics.life.9 = GFXRES:base/lander/bio/lifej.ani
 graphics.lifecan = GFXRES:base/lander/bio/lifecan.ani
-graphics.lightnin = GFXRES:base/lander/lightning.ani
-graphics.lndrshld = GFXRES:base/lander/shield.ani
+graphics.lightning = GFXRES:base/lander/hazard/lightning.ani
 graphics.maidens = GFXRES:base/lander/energy/maidens.ani
-graphics.melebkgd = GFXRES:base/ui/meleebackground.ani
-graphics.melee = GFXRES:base/ui/melee.ani
+graphics.meleemenu = GFXRES:base/ui/meleemenu.ani
+graphics.meleepickship = GFXRES:base/ui/meleepickship.ani
 graphics.miscdata = GFXRES:base/ui/miscdata.ani
-graphics.modules = GFXRES:base/ui/modules.ani
+graphics.modulesmenu = GFXRES:base/ui/modulesmenu.ani
 graphics.moonbase = GFXRES:base/lander/energy/moonbase.ani
 graphics.newgame = GFXRES:base/ui/newgame.ani
-graphics.obbkgnd = GFXRES:base/nav/obbkgnd.ani
-graphics.orbenter = GFXRES:base/nav/orbitenter.ani
-graphics.orbplan = GFXRES:base/nav/orbplan.ani
+graphics.orbitbackground = GFXRES:base/nav/orbitbackground.ani
+graphics.orbitenter = GFXRES:base/nav/orbitenter.ani
 graphics.orbview = GFXRES:base/nav/orbview.ani
 graphics.outfit = GFXRES:base/ui/outfit.ani
+graphics.outfitmodules = GFXRES:base/ui/outfitmodules.ani
 graphics.pickship = GFXRES:base/ui/pickship.ani
+graphics.planets = GFXRES:base/nav/planets.ani
 graphics.playmenu = GFXRES:base/ui/playmenu.ani
 graphics.quake = GFXRES:base/lander/hazard/quake.ani
-graphics.return = GFXRES:base/lander/return.ani
+graphics.quasispace = GFXRES:base/nav/quasispace.ani
 graphics.ruins = GFXRES:base/lander/energy/ruins.ani
 graphics.segue = GFXRES:base/ui/segue.ani
 graphics.setupmenu = GFXRES:base/ui/setupmenu.ani
 graphics.shipyard = GFXRES:base/ui/shipyard.ani
-graphics.sis_ip = GFXRES:base/nav/sis_ip.ani
-graphics.sisblu = GFXRES:base/ui/sisblueprint.ani
-graphics.sismods = GFXRES:base/ui/sismodules.ani
-graphics.sisskeleton = GFXRES:base/cutscene/ending/sis_skel.ani
-graphics.spapluto = GFXRES:base/lander/energy/fwiffo.ani
 graphics.starbase = GFXRES:base/ui/starbase.ani
 graphics.stars = GFXRES:base/battle/stars.ani
 graphics.status = GFXRES:base/ui/status.ani
-graphics.sundevic = GFXRES:base/lander/energy/sundevice.ani
-graphics.syrvault = GFXRES:base/lander/energy/syreenvault.ani
-graphics.taadevic = GFXRES:base/lander/energy/taalodevice.ani
+graphics.sundevice = GFXRES:base/lander/energy/sundevice.ani
+graphics.syreenvault = GFXRES:base/lander/energy/syreenvault.ani
+graphics.taalodevice = GFXRES:base/lander/energy/taalodevice.ani
 graphics.title = GFXRES:base/ui/title.ani
-graphics.umgtrans = GFXRES:base/lander/energy/umgahcaster.ani
-graphics.urqwreck = GFXRES:base/lander/energy/urquanwreck.ani
-graphics.utwbomb = GFXRES:base/lander/energy/utwigbomb.ani
-music.arispace = MUSICRES:base/nav/quasispace.mod
+graphics.truespacesun = GFXRES:base/nav/truespacesun.ani
+graphics.umgahcaster = GFXRES:base/lander/energy/umgahcaster.ani
+graphics.urquanwreck = GFXRES:base/lander/energy/urquanwreck.ani
+graphics.utwigbomb = GFXRES:base/lander/energy/utwigbomb.ani
 music.battle = MUSICRES:base/battle/battle.mod
-music.hyper = MUSICRES:base/nav/hyper.mod
+music.hyperspace = MUSICRES:base/nav/hyper.mod
 music.orbit1 = MUSICRES:base/nav/orbit.mod
 music.orbit2 = MUSICRES:base/nav/orbit.mod
 music.orbit3 = MUSICRES:base/nav/orbit.mod
 music.orbit4 = MUSICRES:base/nav/orbit.mod
 music.orbit5 = MUSICRES:base/nav/orbit.mod
 music.outfit = MUSICRES:base/ui/outfit.mod
+music.quasispace = MUSICRES:base/nav/quasispace.mod
 music.redalert = MUSICRES:base/ui/redalert.mod
 music.shipyard = MUSICRES:base/ui/shipyard.mod
 music.space = MUSICRES:base/nav/space.mod
 music.starbase = MUSICRES:base/ui/starbase.mod
 planet.acid.colortable = BINTAB:base/planets/rusted.ct
-planet.acid.large = GFXRES:base/planets/aci__big.ani
-planet.acid.medium = GFXRES:base/planets/aci__med.ani
-planet.acid.small = GFXRES:base/planets/aci__sml.ani
+planet.acid.large = GFXRES:base/planets/acid-big.ani
+planet.acid.medium = GFXRES:base/planets/acid-med.ani
+planet.acid.small = GFXRES:base/planets/acid-sml.ani
 planet.acid.translatetable = BINTAB:base/planets/rusted.xlt
 planet.alkali.colortable = BINTAB:base/planets/banded.ct
-planet.alkali.large = GFXRES:base/planets/alk__big.ani
-planet.alkali.medium = GFXRES:base/planets/alk__med.ani
-planet.alkali.small = GFXRES:base/planets/alk__sml.ani
+planet.alkali.large = GFXRES:base/planets/alkali-big.ani
+planet.alkali.medium = GFXRES:base/planets/alkali-med.ani
+planet.alkali.small = GFXRES:base/planets/alkali-sml.ani
 planet.alkali.translatetable = BINTAB:base/planets/rusted.xlt
 planet.auric.colortable = BINTAB:base/planets/yellow.ct
-planet.auric.large = GFXRES:base/planets/aur__big.ani
-planet.auric.medium = GFXRES:base/planets/aur__med.ani
-planet.auric.small = GFXRES:base/planets/aur__sml.ani
+planet.auric.large = GFXRES:base/planets/auric-big.ani
+planet.auric.medium = GFXRES:base/planets/auric-med.ani
+planet.auric.small = GFXRES:base/planets/auric-sml.ani
 planet.auric.translatetable = BINTAB:base/planets/banded.xlt
 planet.azure.colortable = BINTAB:base/planets/azure.ct
-planet.azure.large = GFXRES:base/planets/azu__big.ani
-planet.azure.medium = GFXRES:base/planets/azu__med.ani
-planet.azure.small = GFXRES:base/planets/azu__sml.ani
+planet.azure.large = GFXRES:base/planets/azure-big.ani
+planet.azure.medium = GFXRES:base/planets/azure-med.ani
+planet.azure.small = GFXRES:base/planets/azure-sml.ani
 planet.azure.translatetable = BINTAB:base/planets/dented.xlt
 planet.bluegas.colortable = BINTAB:base/planets/bluegasgiant.ct
-planet.bluegas.large = GFXRES:base/planets/blg__big.ani
-planet.bluegas.medium = GFXRES:base/planets/blg__med.ani
-planet.bluegas.small = GFXRES:base/planets/blg__sml.ani
+planet.bluegas.large = GFXRES:base/planets/bluegas-big.ani
+planet.bluegas.medium = GFXRES:base/planets/bluegas-med.ani
+planet.bluegas.small = GFXRES:base/planets/bluegas-sml.ani
 planet.bluegas.translatetable = BINTAB:base/planets/gasgiant.xlt
 planet.carbide.colortable = BINTAB:base/planets/orange.ct
-planet.carbide.large = GFXRES:base/planets/car__big.ani
-planet.carbide.medium = GFXRES:base/planets/car__med.ani
-planet.carbide.small = GFXRES:base/planets/car__sml.ani
+planet.carbide.large = GFXRES:base/planets/carbide-big.ani
+planet.carbide.medium = GFXRES:base/planets/carbide-med.ani
+planet.carbide.small = GFXRES:base/planets/carbide-sml.ani
 planet.carbide.translatetable = BINTAB:base/planets/ice.xlt
 planet.chlorine.colortable = BINTAB:base/planets/rusted.ct
-planet.chlorine.large = GFXRES:base/planets/chl__big.ani
-planet.chlorine.medium = GFXRES:base/planets/chl__med.ani
-planet.chlorine.small = GFXRES:base/planets/chl__sml.ani
+planet.chlorine.large = GFXRES:base/planets/chlorine-big.ani
+planet.chlorine.medium = GFXRES:base/planets/chlorine-med.ani
+planet.chlorine.small = GFXRES:base/planets/chlorine-sml.ani
 planet.chlorine.translatetable = BINTAB:base/planets/continents.xlt
 planet.chondrite.colortable = BINTAB:base/planets/chrondrite.ct
-planet.chondrite.large = GFXRES:base/planets/cho__big.ani
-planet.chondrite.medium = GFXRES:base/planets/cho__med.ani
-planet.chondrite.small = GFXRES:base/planets/cho__sml.ani
+planet.chondrite.large = GFXRES:base/planets/chondrite-big.ani
+planet.chondrite.medium = GFXRES:base/planets/chondrite-med.ani
+planet.chondrite.small = GFXRES:base/planets/chondrite-sml.ani
 planet.chondrite.translatetable = BINTAB:base/planets/chondrite.xlt
 planet.cimmerian.colortable = BINTAB:base/planets/cimmerian.ct
-planet.cimmerian.large = GFXRES:base/planets/cim__big.ani
-planet.cimmerian.medium = GFXRES:base/planets/cim__med.ani
-planet.cimmerian.small = GFXRES:base/planets/cim__sml.ani
+planet.cimmerian.large = GFXRES:base/planets/cimmerian-big.ani
+planet.cimmerian.medium = GFXRES:base/planets/cimmerian-med.ani
+planet.cimmerian.small = GFXRES:base/planets/cimmerian-sml.ani
 planet.cimmerian.translatetable = BINTAB:base/planets/banded.xlt
 planet.copper.colortable = BINTAB:base/planets/copper.ct
-planet.copper.large = GFXRES:base/planets/cop__big.ani
-planet.copper.medium = GFXRES:base/planets/cop__med.ani
-planet.copper.small = GFXRES:base/planets/cop__sml.ani
+planet.copper.large = GFXRES:base/planets/copper-big.ani
+planet.copper.medium = GFXRES:base/planets/copper-med.ani
+planet.copper.small = GFXRES:base/planets/copper-sml.ani
 planet.copper.translatetable = BINTAB:base/planets/banded.xlt
 planet.crimson.colortable = BINTAB:base/planets/dust.ct
-planet.crimson.large = GFXRES:base/planets/mar__big.ani
-planet.crimson.medium = GFXRES:base/planets/mar__med.ani
-planet.crimson.small = GFXRES:base/planets/mar__sml.ani
+planet.crimson.large = GFXRES:base/planets/crimson-big.ani
+planet.crimson.medium = GFXRES:base/planets/crimson-med.ani
+planet.crimson.small = GFXRES:base/planets/crimson-sml.ani
 planet.crimson.translatetable = BINTAB:base/planets/dented.xlt
 planet.cyangas.colortable = BINTAB:base/planets/cyangasgiant.ct
-planet.cyangas.large = GFXRES:base/planets/cyg__big.ani
-planet.cyangas.medium = GFXRES:base/planets/cyg__med.ani
-planet.cyangas.small = GFXRES:base/planets/cyg__sml.ani
+planet.cyangas.large = GFXRES:base/planets/cyangas-big.ani
+planet.cyangas.medium = GFXRES:base/planets/cyangas-med.ani
+planet.cyangas.small = GFXRES:base/planets/cyangas-sml.ani
 planet.cyangas.translatetable = BINTAB:base/planets/gasgiant.xlt
 planet.cyanic.colortable = BINTAB:base/planets/copper.ct
-planet.cyanic.large = GFXRES:base/planets/cya__big.ani
-planet.cyanic.medium = GFXRES:base/planets/cya__med.ani
-planet.cyanic.small = GFXRES:base/planets/cya__sml.ani
+planet.cyanic.large = GFXRES:base/planets/cyanic-big.ani
+planet.cyanic.medium = GFXRES:base/planets/cyanic-med.ani
+planet.cyanic.small = GFXRES:base/planets/cyanic-sml.ani
 planet.cyanic.translatetable = BINTAB:base/planets/banded.xlt
 planet.dust.colortable = BINTAB:base/planets/dust.ct
-planet.dust.large = GFXRES:base/planets/dus__big.ani
-planet.dust.medium = GFXRES:base/planets/dus__med.ani
-planet.dust.small = GFXRES:base/planets/dus__sml.ani
+planet.dust.large = GFXRES:base/planets/dust-big.ani
+planet.dust.medium = GFXRES:base/planets/dust-med.ani
+planet.dust.small = GFXRES:base/planets/dust-sml.ani
 planet.dust.translatetable = BINTAB:base/planets/rusted.xlt
 planet.emerald.colortable = BINTAB:base/planets/emerald.ct
-planet.emerald.large = GFXRES:base/planets/eme__big.ani
-planet.emerald.medium = GFXRES:base/planets/eme__med.ani
-planet.emerald.small = GFXRES:base/planets/eme__sml.ani
+planet.emerald.large = GFXRES:base/planets/emerald-big.ani
+planet.emerald.medium = GFXRES:base/planets/emerald-med.ani
+planet.emerald.small = GFXRES:base/planets/emerald-sml.ani
 planet.emerald.translatetable = BINTAB:base/planets/crystal.xlt
 planet.fluorescent.colortable = BINTAB:base/planets/purple.ct
-planet.fluorescent.large = GFXRES:base/planets/flu__big.ani
-planet.fluorescent.medium = GFXRES:base/planets/flu__med.ani
-planet.fluorescent.small = GFXRES:base/planets/flu__sml.ani
+planet.fluorescent.large = GFXRES:base/planets/fluorescent-big.ani
+planet.fluorescent.medium = GFXRES:base/planets/fluorescent-med.ani
+planet.fluorescent.small = GFXRES:base/planets/fluorescent-sml.ani
 planet.fluorescent.translatetable = BINTAB:base/planets/ice.xlt
 planet.green.colortable = BINTAB:base/planets/green.ct
-planet.green.large = GFXRES:base/planets/gre__big.ani
-planet.green.medium = GFXRES:base/planets/gre__med.ani
-planet.green.small = GFXRES:base/planets/gre__sml.ani
+planet.green.large = GFXRES:base/planets/green-big.ani
+planet.green.medium = GFXRES:base/planets/green-med.ani
+planet.green.small = GFXRES:base/planets/green-sml.ani
 planet.green.translatetable = BINTAB:base/planets/dented.xlt
 planet.greengas.colortable = BINTAB:base/planets/greengasgiant.ct
-planet.greengas.large = GFXRES:base/planets/gng__big.ani
-planet.greengas.medium = GFXRES:base/planets/gng__med.ani
-planet.greengas.small = GFXRES:base/planets/gng__sml.ani
+planet.greengas.large = GFXRES:base/planets/greengas-big.ani
+planet.greengas.medium = GFXRES:base/planets/greengas-med.ani
+planet.greengas.small = GFXRES:base/planets/greengas-sml.ani
 planet.greengas.translatetable = BINTAB:base/planets/gasgiant.xlt
 planet.greygas.colortable = BINTAB:base/planets/greygasgiant.ct
-planet.greygas.large = GFXRES:base/planets/gyg__big.ani
-planet.greygas.medium = GFXRES:base/planets/gyg__med.ani
-planet.greygas.small = GFXRES:base/planets/gyg__sml.ani
+planet.greygas.large = GFXRES:base/planets/greygas-big.ani
+planet.greygas.medium = GFXRES:base/planets/greygas-med.ani
+planet.greygas.small = GFXRES:base/planets/greygas-sml.ani
 planet.greygas.translatetable = BINTAB:base/planets/gasgiant.xlt
 planet.halide.colortable = BINTAB:base/planets/redux.ct
-planet.halide.large = GFXRES:base/planets/hal__big.ani
-planet.halide.medium = GFXRES:base/planets/hal__med.ani
-planet.halide.small = GFXRES:base/planets/hal__sml.ani
+planet.halide.large = GFXRES:base/planets/halide-big.ani
+planet.halide.medium = GFXRES:base/planets/halide-med.ani
+planet.halide.small = GFXRES:base/planets/halide-sml.ani
 planet.halide.translatetable = BINTAB:base/planets/rusted.xlt
 planet.hydrocarbon.colortable = BINTAB:base/planets/azure.ct
-planet.hydrocarbon.large = GFXRES:base/planets/hyd__big.ani
-planet.hydrocarbon.medium = GFXRES:base/planets/hyd__med.ani
-planet.hydrocarbon.small = GFXRES:base/planets/hyd__sml.ani
+planet.hydrocarbon.large = GFXRES:base/planets/hydrocarbon-big.ani
+planet.hydrocarbon.medium = GFXRES:base/planets/hydrocarbon-med.ani
+planet.hydrocarbon.small = GFXRES:base/planets/hydrocarbon-sml.ani
 planet.hydrocarbon.translatetable = BINTAB:base/planets/banded.xlt
 planet.infrared.colortable = BINTAB:base/planets/dust.ct
-planet.infrared.large = GFXRES:base/planets/inf__big.ani
-planet.infrared.medium = GFXRES:base/planets/inf__med.ani
-planet.infrared.small = GFXRES:base/planets/inf__sml.ani
+planet.infrared.large = GFXRES:base/planets/infrared-big.ani
+planet.infrared.medium = GFXRES:base/planets/infrared-med.ani
+planet.infrared.small = GFXRES:base/planets/infrared-sml.ani
 planet.infrared.translatetable = BINTAB:base/planets/ice.xlt
 planet.iodine.colortable = BINTAB:base/planets/primordial.ct
-planet.iodine.large = GFXRES:base/planets/iod__big.ani
-planet.iodine.medium = GFXRES:base/planets/iod__med.ani
-planet.iodine.small = GFXRES:base/planets/iod__sml.ani
+planet.iodine.large = GFXRES:base/planets/iodine-big.ani
+planet.iodine.medium = GFXRES:base/planets/iodine-med.ani
+planet.iodine.small = GFXRES:base/planets/iodine-sml.ani
 planet.iodine.translatetable = BINTAB:base/planets/dented.xlt
 planet.lanthanide.colortable = BINTAB:base/planets/yellow.ct
-planet.lanthanide.large = GFXRES:base/planets/lan__big.ani
-planet.lanthanide.medium = GFXRES:base/planets/lan__med.ani
-planet.lanthanide.small = GFXRES:base/planets/lan__sml.ani
+planet.lanthanide.large = GFXRES:base/planets/lanthanide-big.ani
+planet.lanthanide.medium = GFXRES:base/planets/lanthanide-med.ani
+planet.lanthanide.small = GFXRES:base/planets/lanthanide-sml.ani
 planet.lanthanide.translatetable = BINTAB:base/planets/rusted.xlt
 planet.magma.colortable = BINTAB:base/planets/orange.ct
-planet.magma.large = GFXRES:base/planets/mgm__big.ani
-planet.magma.medium = GFXRES:base/planets/mgm__med.ani
-planet.magma.small = GFXRES:base/planets/mgm__sml.ani
+planet.magma.large = GFXRES:base/planets/magma-big.ani
+planet.magma.medium = GFXRES:base/planets/magma-med.ani
+planet.magma.small = GFXRES:base/planets/magma-sml.ani
 planet.magma.translatetable = BINTAB:base/planets/banded.xlt
 planet.magnetic.colortable = BINTAB:base/planets/redux.ct
-planet.magnetic.large = GFXRES:base/planets/mgn__big.ani
-planet.magnetic.medium = GFXRES:base/planets/mgn__med.ani
-planet.magnetic.small = GFXRES:base/planets/mgn__sml.ani
+planet.magnetic.large = GFXRES:base/planets/magnetic-big.ani
+planet.magnetic.medium = GFXRES:base/planets/magnetic-med.ani
+planet.magnetic.small = GFXRES:base/planets/magnetic-sml.ani
 planet.magnetic.translatetable = BINTAB:base/planets/ice.xlt
 planet.maroon.colortable = BINTAB:base/planets/maroon.ct
-planet.maroon.large = GFXRES:base/planets/cri__big.ani
-planet.maroon.medium = GFXRES:base/planets/cri__med.ani
-planet.maroon.small = GFXRES:base/planets/cri__sml.ani
+planet.maroon.large = GFXRES:base/planets/maroon-big.ani
+planet.maroon.medium = GFXRES:base/planets/maroon-med.ani
+planet.maroon.small = GFXRES:base/planets/maroon-sml.ani
 planet.maroon.translatetable = BINTAB:base/planets/dented.xlt
 planet.metal.colortable = BINTAB:base/planets/metal.ct
-planet.metal.large = GFXRES:base/planets/mtl__big.ani
-planet.metal.medium = GFXRES:base/planets/mtl__med.ani
-planet.metal.small = GFXRES:base/planets/mtl__sml.ani
+planet.metal.large = GFXRES:base/planets/metal-big.ani
+planet.metal.medium = GFXRES:base/planets/metal-med.ani
+planet.metal.small = GFXRES:base/planets/metal-sml.ani
 planet.metal.translatetable = BINTAB:base/planets/metal.xlt
 planet.noble.colortable = BINTAB:base/planets/noble.ct
-planet.noble.large = GFXRES:base/planets/nob__big.ani
-planet.noble.medium = GFXRES:base/planets/nob__med.ani
-planet.noble.small = GFXRES:base/planets/nob__sml.ani
+planet.noble.large = GFXRES:base/planets/noble-big.ani
+planet.noble.medium = GFXRES:base/planets/noble-med.ani
+planet.noble.small = GFXRES:base/planets/noble-sml.ani
 planet.noble.translatetable = BINTAB:base/planets/rusted.xlt
 planet.oolite.colortable = BINTAB:base/planets/oolite.ct
-planet.oolite.large = GFXRES:base/planets/ool__big.ani
-planet.oolite.medium = GFXRES:base/planets/ool__med.ani
-planet.oolite.small = GFXRES:base/planets/ool__sml.ani
+planet.oolite.large = GFXRES:base/planets/oolite-big.ani
+planet.oolite.medium = GFXRES:base/planets/oolite-med.ani
+planet.oolite.small = GFXRES:base/planets/oolite-sml.ani
 planet.oolite.translatetable = BINTAB:base/planets/oolite.xlt
 planet.opalescent.colortable = BINTAB:base/planets/opalescent.ct
-planet.opalescent.large = GFXRES:base/planets/opa__big.ani
-planet.opalescent.medium = GFXRES:base/planets/opa__med.ani
-planet.opalescent.small = GFXRES:base/planets/opa__sml.ani
+planet.opalescent.large = GFXRES:base/planets/opalescent-big.ani
+planet.opalescent.medium = GFXRES:base/planets/opalescent-med.ani
+planet.opalescent.small = GFXRES:base/planets/opalescent-sml.ani
 planet.opalescent.translatetable = BINTAB:base/planets/ice.xlt
 planet.orangegas.colortable = BINTAB:base/planets/orangegasgiant.ct
-planet.orangegas.large = GFXRES:base/planets/org__big.ani
-planet.orangegas.medium = GFXRES:base/planets/org__med.ani
-planet.orangegas.small = GFXRES:base/planets/org__sml.ani
+planet.orangegas.large = GFXRES:base/planets/organic-big.ani
+planet.orangegas.medium = GFXRES:base/planets/organic-med.ani
+planet.orangegas.small = GFXRES:base/planets/organic-sml.ani
 planet.orangegas.translatetable = BINTAB:base/planets/gasgiant.xlt
 planet.organic.colortable = BINTAB:base/planets/banded.ct
-planet.organic.large = GFXRES:base/planets/org__big.ani
-planet.organic.medium = GFXRES:base/planets/org__med.ani
-planet.organic.small = GFXRES:base/planets/org__sml.ani
+planet.organic.large = GFXRES:base/planets/organic-big.ani
+planet.organic.medium = GFXRES:base/planets/organic-med.ani
+planet.organic.small = GFXRES:base/planets/organic-sml.ani
 planet.organic.translatetable = BINTAB:base/planets/banded.xlt
 planet.pellucid.colortable = BINTAB:base/planets/pellucid.ct
-planet.pellucid.large = GFXRES:base/planets/pel__big.ani
-planet.pellucid.medium = GFXRES:base/planets/pel__med.ani
-planet.pellucid.small = GFXRES:base/planets/pel__sml.ani
+planet.pellucid.large = GFXRES:base/planets/pellucid-big.ani
+planet.pellucid.medium = GFXRES:base/planets/pellucid-med.ani
+planet.pellucid.small = GFXRES:base/planets/pellucid-sml.ani
 planet.pellucid.translatetable = BINTAB:base/planets/ice.xlt
 planet.plutonic.colortable = BINTAB:base/planets/plutonic.ct
-planet.plutonic.large = GFXRES:base/planets/plu__big.ani
-planet.plutonic.medium = GFXRES:base/planets/plu__med.ani
-planet.plutonic.small = GFXRES:base/planets/plu__sml.ani
+planet.plutonic.large = GFXRES:base/planets/plutonic-big.ani
+planet.plutonic.medium = GFXRES:base/planets/plutonic-med.ani
+planet.plutonic.small = GFXRES:base/planets/plutonic-sml.ani
 planet.plutonic.translatetable = BINTAB:base/planets/rusted.xlt
 planet.primordial.colortable = BINTAB:base/planets/primordial.ct
-planet.primordial.large = GFXRES:base/planets/pri__big.ani
-planet.primordial.medium = GFXRES:base/planets/pri__med.ani
-planet.primordial.small = GFXRES:base/planets/pri__sml.ani
+planet.primordial.large = GFXRES:base/planets/primordial-big.ani
+planet.primordial.medium = GFXRES:base/planets/primordial-med.ani
+planet.primordial.small = GFXRES:base/planets/primordial-sml.ani
 planet.primordial.translatetable = BINTAB:base/planets/rusted.xlt
 planet.purple.colortable = BINTAB:base/planets/purple.ct
-planet.purple.large = GFXRES:base/planets/pur__big.ani
-planet.purple.medium = GFXRES:base/planets/pur__med.ani
-planet.purple.small = GFXRES:base/planets/pur__sml.ani
+planet.purple.large = GFXRES:base/planets/purple-big.ani
+planet.purple.medium = GFXRES:base/planets/purple-med.ani
+planet.purple.small = GFXRES:base/planets/purple-sml.ani
 planet.purple.translatetable = BINTAB:base/planets/dented.xlt
 planet.purplegas.colortable = BINTAB:base/planets/purplegasgiant.ct
-planet.purplegas.large = GFXRES:base/planets/pug__big.ani
-planet.purplegas.medium = GFXRES:base/planets/pug__med.ani
-planet.purplegas.small = GFXRES:base/planets/pug__sml.ani
+planet.purplegas.large = GFXRES:base/planets/purplegas-big.ani
+planet.purplegas.medium = GFXRES:base/planets/purplegas-med.ani
+planet.purplegas.small = GFXRES:base/planets/purplegas-sml.ani
 planet.purplegas.translatetable = BINTAB:base/planets/gasgiant.xlt
 planet.quasidegenerate.colortable = BINTAB:base/planets/primordial.ct
-planet.quasidegenerate.large = GFXRES:base/planets/deg__big.ani
-planet.quasidegenerate.medium = GFXRES:base/planets/deg__med.ani
-planet.quasidegenerate.small = GFXRES:base/planets/deg__sml.ani
+planet.quasidegenerate.large = GFXRES:base/planets/quasidegenerate-big.ani
+planet.quasidegenerate.medium = GFXRES:base/planets/quasidegenerate-med.ani
+planet.quasidegenerate.small = GFXRES:base/planets/quasidegenerate-sml.ani
 planet.quasidegenerate.translatetable = BINTAB:base/planets/banded.xlt
 planet.radioactive.colortable = BINTAB:base/planets/orange.ct
-planet.radioactive.large = GFXRES:base/planets/rad__big.ani
-planet.radioactive.medium = GFXRES:base/planets/rad__med.ani
-planet.radioactive.small = GFXRES:base/planets/rad__sml.ani
+planet.radioactive.large = GFXRES:base/planets/radioactive-big.ani
+planet.radioactive.medium = GFXRES:base/planets/radioactive-med.ani
+planet.radioactive.small = GFXRES:base/planets/radioactive-sml.ani
 planet.radioactive.translatetable = BINTAB:base/planets/rusted.xlt
 planet.rainbow.colortable = BINTAB:base/planets/rainbow.ct
-planet.rainbow.large = GFXRES:base/planets/rai__big.ani
-planet.rainbow.medium = GFXRES:base/planets/rai__med.ani
-planet.rainbow.small = GFXRES:base/planets/rai__sml.ani
+planet.rainbow.large = GFXRES:base/planets/rainbow-big.ani
+planet.rainbow.medium = GFXRES:base/planets/rainbow-med.ani
+planet.rainbow.small = GFXRES:base/planets/rainbow-sml.ani
 planet.rainbow.translatetable = BINTAB:base/planets/rainbow.xlt
 planet.redgas.colortable = BINTAB:base/planets/redgasgiant.ct
-planet.redgas.large = GFXRES:base/planets/reg__big.ani
-planet.redgas.medium = GFXRES:base/planets/reg__med.ani
-planet.redgas.small = GFXRES:base/planets/reg__sml.ani
+planet.redgas.large = GFXRES:base/planets/redgas-big.ani
+planet.redgas.medium = GFXRES:base/planets/redgas-med.ani
+planet.redgas.small = GFXRES:base/planets/redgas-sml.ani
 planet.redgas.translatetable = BINTAB:base/planets/gasgiant.xlt
 planet.redux.colortable = BINTAB:base/planets/redux.ct
-planet.redux.large = GFXRES:base/planets/red__big.ani
-planet.redux.medium = GFXRES:base/planets/red__med.ani
-planet.redux.small = GFXRES:base/planets/red__sml.ani
+planet.redux.large = GFXRES:base/planets/redux-big.ani
+planet.redux.medium = GFXRES:base/planets/redux-med.ani
+planet.redux.small = GFXRES:base/planets/redux-sml.ani
 planet.redux.translatetable = BINTAB:base/planets/redux.xlt
 planet.ruby.colortable = BINTAB:base/planets/ruby.ct
-planet.ruby.large = GFXRES:base/planets/rub__big.ani
-planet.ruby.medium = GFXRES:base/planets/rub__med.ani
-planet.ruby.small = GFXRES:base/planets/rub__sml.ani
+planet.ruby.large = GFXRES:base/planets/ruby-big.ani
+planet.ruby.medium = GFXRES:base/planets/ruby-med.ani
+planet.ruby.small = GFXRES:base/planets/ruby-sml.ani
 planet.ruby.translatetable = BINTAB:base/planets/crystal.xlt
-planet.samatra.large = GFXRES:base/planets/sam__big.ani
+planet.samatra.large = GFXRES:base/planets/samatra-big.ani
 planet.sapphire.colortable = BINTAB:base/planets/sapphire.ct
-planet.sapphire.large = GFXRES:base/planets/sap__big.ani
-planet.sapphire.medium = GFXRES:base/planets/sap__med.ani
-planet.sapphire.small = GFXRES:base/planets/sap__sml.ani
+planet.sapphire.large = GFXRES:base/planets/sapphire-big.ani
+planet.sapphire.medium = GFXRES:base/planets/sapphire-med.ani
+planet.sapphire.small = GFXRES:base/planets/sapphire-sml.ani
 planet.sapphire.translatetable = BINTAB:base/planets/crystal.xlt
 planet.selenic.colortable = BINTAB:base/planets/selenic.ct
-planet.selenic.large = GFXRES:base/planets/sel__big.ani
-planet.selenic.medium = GFXRES:base/planets/sel__med.ani
-planet.selenic.small = GFXRES:base/planets/sel__sml.ani
+planet.selenic.large = GFXRES:base/planets/selenic-big.ani
+planet.selenic.medium = GFXRES:base/planets/selenic-med.ani
+planet.selenic.small = GFXRES:base/planets/selenic-sml.ani
 planet.selenic.translatetable = BINTAB:base/planets/dented.xlt
 planet.shattered.colortable = BINTAB:base/planets/shattered.ct
-planet.shattered.large = GFXRES:base/planets/cra__big.ani
-planet.shattered.medium = GFXRES:base/planets/cra__med.ani
-planet.shattered.small = GFXRES:base/planets/cra__sml.ani
+planet.shattered.large = GFXRES:base/planets/shattered-big.ani
+planet.shattered.medium = GFXRES:base/planets/shattered-med.ani
+planet.shattered.small = GFXRES:base/planets/shattered-sml.ani
 planet.shattered.translatetable = BINTAB:base/planets/shattered.xlt
-planet.slaveshield.large = GFXRES:base/planets/shie_big.ani
-planet.slaveshield.medium = GFXRES:base/planets/shie_med.ani
-planet.slaveshield.small = GFXRES:base/planets/shie_sml.ani
+planet.slaveshield.large = GFXRES:base/planets/slaveshield-big.ani
+planet.slaveshield.medium = GFXRES:base/planets/slaveshield-med.ani
+planet.slaveshield.small = GFXRES:base/planets/slaveshield-sml.ani
 planet.superdense.colortable = BINTAB:base/planets/superdense.ct
-planet.superdense.large = GFXRES:base/planets/sup__big.ani
-planet.superdense.medium = GFXRES:base/planets/sup__med.ani
-planet.superdense.small = GFXRES:base/planets/sup__sml.ani
+planet.superdense.large = GFXRES:base/planets/superdense-big.ani
+planet.superdense.medium = GFXRES:base/planets/superdense-med.ani
+planet.superdense.small = GFXRES:base/planets/superdense-sml.ani
 planet.superdense.translatetable = BINTAB:base/planets/banded.xlt
 planet.telluric.colortable = BINTAB:base/planets/water.ct
-planet.telluric.large = GFXRES:base/planets/tel__big.ani
-planet.telluric.medium = GFXRES:base/planets/tel__med.ani
-planet.telluric.small = GFXRES:base/planets/tel__sml.ani
+planet.telluric.large = GFXRES:base/planets/telluric-big.ani
+planet.telluric.medium = GFXRES:base/planets/telluric-med.ani
+planet.telluric.small = GFXRES:base/planets/telluric-sml.ani
 planet.telluric.translatetable = BINTAB:base/planets/rusted.xlt
 planet.treasure.colortable = BINTAB:base/planets/treasure.ct
-planet.treasure.large = GFXRES:base/planets/tre__big.ani
-planet.treasure.medium = GFXRES:base/planets/tre__med.ani
-planet.treasure.small = GFXRES:base/planets/tre__sml.ani
+planet.treasure.large = GFXRES:base/planets/treasure-big.ani
+planet.treasure.medium = GFXRES:base/planets/treasure-med.ani
+planet.treasure.small = GFXRES:base/planets/treasure-sml.ani
 planet.treasure.translatetable = BINTAB:base/planets/banded.xlt
 planet.ultramarine.colortable = BINTAB:base/planets/ultramarine.ct
-planet.ultramarine.large = GFXRES:base/planets/ult__big.ani
-planet.ultramarine.medium = GFXRES:base/planets/ult__med.ani
-planet.ultramarine.small = GFXRES:base/planets/ult__sml.ani
+planet.ultramarine.large = GFXRES:base/planets/ultramarine-big.ani
+planet.ultramarine.medium = GFXRES:base/planets/ultramarine-med.ani
+planet.ultramarine.small = GFXRES:base/planets/ultramarine-sml.ani
 planet.ultramarine.translatetable = BINTAB:base/planets/dented.xlt
 planet.ultraviolet.colortable = BINTAB:base/planets/purple.ct
-planet.ultraviolet.large = GFXRES:base/planets/ult__big.ani
-planet.ultraviolet.medium = GFXRES:base/planets/ult__med.ani
-planet.ultraviolet.small = GFXRES:base/planets/ult__sml.ani
+planet.ultraviolet.large = GFXRES:base/planets/ultramarine-big.ani
+planet.ultraviolet.medium = GFXRES:base/planets/ultramarine-med.ani
+planet.ultraviolet.small = GFXRES:base/planets/ultramarine-sml.ani
 planet.ultraviolet.translatetable = BINTAB:base/planets/rusted.xlt
 planet.urea.colortable = BINTAB:base/planets/yellow.ct
-planet.urea.large = GFXRES:base/planets/ure__big.ani
-planet.urea.medium = GFXRES:base/planets/ure__med.ani
-planet.urea.small = GFXRES:base/planets/ure__sml.ani
+planet.urea.large = GFXRES:base/planets/urea-big.ani
+planet.urea.medium = GFXRES:base/planets/urea-med.ani
+planet.urea.small = GFXRES:base/planets/urea-sml.ani
 planet.urea.translatetable = BINTAB:base/planets/dented.xlt
 planet.vinylogous.colortable = BINTAB:base/planets/vinyl.ct
-planet.vinylogous.large = GFXRES:base/planets/vin__big.ani
-planet.vinylogous.medium = GFXRES:base/planets/vin__med.ani
-planet.vinylogous.small = GFXRES:base/planets/vin__sml.ani
+planet.vinylogous.large = GFXRES:base/planets/vinylogous-big.ani
+planet.vinylogous.medium = GFXRES:base/planets/vinylogous-med.ani
+planet.vinylogous.small = GFXRES:base/planets/vinylogous-sml.ani
 planet.vinylogous.translatetable = BINTAB:base/planets/ice.xlt
 planet.violetgas.colortable = BINTAB:base/planets/violetgasgiant.ct
-planet.violetgas.large = GFXRES:base/planets/vig__big.ani
-planet.violetgas.medium = GFXRES:base/planets/vig__med.ani
-planet.violetgas.small = GFXRES:base/planets/vig__sml.ani
+planet.violetgas.large = GFXRES:base/planets/violetgas-big.ani
+planet.violetgas.medium = GFXRES:base/planets/violetgas-med.ani
+planet.violetgas.small = GFXRES:base/planets/violetgas-sml.ani
 planet.violetgas.translatetable = BINTAB:base/planets/gasgiant.xlt
 planet.water.colortable = BINTAB:base/planets/water.ct
-planet.water.large = GFXRES:base/planets/wat__big.ani
-planet.water.medium = GFXRES:base/planets/wat__med.ani
-planet.water.small = GFXRES:base/planets/wat__sml.ani
+planet.water.large = GFXRES:base/planets/water-big.ani
+planet.water.medium = GFXRES:base/planets/water-med.ani
+planet.water.small = GFXRES:base/planets/water-sml.ani
 planet.water.translatetable = BINTAB:base/planets/continents.xlt
 planet.xenolithic.colortable = BINTAB:base/planets/xenolithic.ct
-planet.xenolithic.large = GFXRES:base/planets/xen__big.ani
-planet.xenolithic.medium = GFXRES:base/planets/xen__med.ani
-planet.xenolithic.small = GFXRES:base/planets/xen__sml.ani
+planet.xenolithic.large = GFXRES:base/planets/xenolithic-big.ani
+planet.xenolithic.medium = GFXRES:base/planets/xenolithic-med.ani
+planet.xenolithic.small = GFXRES:base/planets/xenolithic-sml.ani
 planet.xenolithic.translatetable = BINTAB:base/planets/ice.xlt
 planet.yellowgas.colortable = BINTAB:base/planets/yellowgasgiant.ct
-planet.yellowgas.large = GFXRES:base/planets/yeg__big.ani
-planet.yellowgas.medium = GFXRES:base/planets/yeg__med.ani
-planet.yellowgas.small = GFXRES:base/planets/yeg__sml.ani
+planet.yellowgas.large = GFXRES:base/planets/yellowgas-big.ani
+planet.yellowgas.medium = GFXRES:base/planets/yellowgas-med.ani
+planet.yellowgas.small = GFXRES:base/planets/yellowgas-sml.ani
 planet.yellowgas.translatetable = BINTAB:base/planets/gasgiant.xlt
 planet.yttric.colortable = BINTAB:base/planets/vinyl.ct
-planet.yttric.large = GFXRES:base/planets/ytt__big.ani
-planet.yttric.medium = GFXRES:base/planets/ytt__med.ani
-planet.yttric.small = GFXRES:base/planets/ytt__sml.ani
+planet.yttric.large = GFXRES:base/planets/yttric-big.ani
+planet.yttric.medium = GFXRES:base/planets/yttric-med.ani
+planet.yttric.small = GFXRES:base/planets/yttric-sml.ani
 planet.yttric.translatetable = BINTAB:base/planets/rusted.xlt
 ship.androsynth.code = SHIP:0
-ship.androsynth.ditty = MUSICRES:base/ships/androsyn/andditty.mod
-ship.androsynth.graphics.androsyn.large = GFXRES:base/ships/androsyn/androsyn.big
-ship.androsynth.graphics.androsyn.medium = GFXRES:base/ships/androsyn/androsyn.med
-ship.androsynth.graphics.androsyn.small = GFXRES:base/ships/androsyn/androsyn.sml
-ship.androsynth.graphics.blazer.large = GFXRES:base/ships/androsyn/blazer.big
-ship.androsynth.graphics.blazer.medium = GFXRES:base/ships/androsyn/blazer.med
-ship.androsynth.graphics.blazer.small = GFXRES:base/ships/androsyn/blazer.sml
-ship.androsynth.graphics.bubble.large = GFXRES:base/ships/androsyn/bubble.big
-ship.androsynth.graphics.bubble.medium = GFXRES:base/ships/androsyn/bubble.med
-ship.androsynth.graphics.bubble.small = GFXRES:base/ships/androsyn/bubble.sml
-ship.androsynth.graphics.captain = GFXRES:base/ships/androsyn/andcap.ani
-ship.androsynth.icons = GFXRES:base/ships/androsyn/andicons.ani
-ship.androsynth.meleeicons = GFXRES:base/ships/androsyn/andmicon.ani
-ship.androsynth.sounds = SNDRES:base/ships/androsyn/andsound.snd
-ship.androsynth.text = STRTAB:base/ships/androsyn/andtext.txt
+ship.androsynth.ditty = MUSICRES:base/ships/androsynth/guardian.mod
+ship.androsynth.graphics.blazer.large = GFXRES:base/ships/androsynth/blazer.big
+ship.androsynth.graphics.blazer.medium = GFXRES:base/ships/androsynth/blazer.med
+ship.androsynth.graphics.blazer.small = GFXRES:base/ships/androsynth/blazer.sml
+ship.androsynth.graphics.bubble.large = GFXRES:base/ships/androsynth/bubble.big
+ship.androsynth.graphics.bubble.medium = GFXRES:base/ships/androsynth/bubble.med
+ship.androsynth.graphics.bubble.small = GFXRES:base/ships/androsynth/bubble.sml
+ship.androsynth.graphics.captain = GFXRES:base/ships/androsynth/guardian-cap.ani
+ship.androsynth.graphics.guardian.large = GFXRES:base/ships/androsynth/guardian-big.ani
+ship.androsynth.graphics.guardian.medium = GFXRES:base/ships/androsynth/guardian-med.ani
+ship.androsynth.graphics.guardian.small = GFXRES:base/ships/androsynth/guardian-sml.ani
+ship.androsynth.icons = GFXRES:base/ships/androsynth/guardian-icons.ani
+ship.androsynth.meleeicons = GFXRES:base/ships/androsynth/guardian-meleeicons.ani
+ship.androsynth.sounds = SNDRES:base/ships/androsynth/guardian.snd
+ship.androsynth.text = STRTAB:base/ships/androsynth/guardian.txt
 ship.arilou.code = SHIP:1
-ship.arilou.ditty = MUSICRES:base/ships/arilou/ariditty.mod
-ship.arilou.graphics.arilou.large = GFXRES:base/ships/arilou/arilou.big
-ship.arilou.graphics.arilou.medium = GFXRES:base/ships/arilou/arilou.med
-ship.arilou.graphics.arilou.small = GFXRES:base/ships/arilou/arilou.sml
-ship.arilou.graphics.captain = GFXRES:base/ships/arilou/aricap.ani
+ship.arilou.ditty = MUSICRES:base/ships/arilou/skiff.mod
+ship.arilou.graphics.captain = GFXRES:base/ships/arilou/skiff-cap.ani
+ship.arilou.graphics.skiff.large = GFXRES:base/ships/arilou/skiff-big.ani
+ship.arilou.graphics.skiff.medium = GFXRES:base/ships/arilou/skiff-med.ani
+ship.arilou.graphics.skiff.small = GFXRES:base/ships/arilou/skiff-sml.ani
 ship.arilou.graphics.warp.large = GFXRES:base/ships/arilou/warp.big
 ship.arilou.graphics.warp.medium = GFXRES:base/ships/arilou/warp.med
 ship.arilou.graphics.warp.small = GFXRES:base/ships/arilou/warp.sml
-ship.arilou.icons = GFXRES:base/ships/arilou/ariicons.ani
-ship.arilou.meleeicons = GFXRES:base/ships/arilou/arimicon.ani
-ship.arilou.sounds = SNDRES:base/ships/arilou/arisound.snd
-ship.arilou.text = STRTAB:base/ships/arilou/aritext.txt
+ship.arilou.icons = GFXRES:base/ships/arilou/skiff-icons.ani
+ship.arilou.meleeicons = GFXRES:base/ships/arilou/skiff-meleeicons.ani
+ship.arilou.sounds = SNDRES:base/ships/arilou/skiff.snd
+ship.arilou.text = STRTAB:base/ships/arilou/skiff.txt
 ship.chenjesu.code = SHIP:3
-ship.chenjesu.ditty = MUSICRES:base/ships/chenjesu/cheditty.mod
-ship.chenjesu.graphics.captain = GFXRES:base/ships/chenjesu/checap.ani
-ship.chenjesu.graphics.chenjesu.large = GFXRES:base/ships/chenjesu/chenjesu.big
-ship.chenjesu.graphics.chenjesu.medium = GFXRES:base/ships/chenjesu/chenjesu.med
-ship.chenjesu.graphics.chenjesu.small = GFXRES:base/ships/chenjesu/chenjesu.sml
+ship.chenjesu.ditty = MUSICRES:base/ships/chenjesu/broodhome.mod
+ship.chenjesu.graphics.broodhome.large = GFXRES:base/ships/chenjesu/broodhome-big.ani
+ship.chenjesu.graphics.broodhome.medium = GFXRES:base/ships/chenjesu/broodhome-med.ani
+ship.chenjesu.graphics.broodhome.small = GFXRES:base/ships/chenjesu/broodhome-sml.ani
+ship.chenjesu.graphics.captain = GFXRES:base/ships/chenjesu/broodhome-cap.ani
 ship.chenjesu.graphics.doggy.large = GFXRES:base/ships/chenjesu/doggy.big
 ship.chenjesu.graphics.doggy.medium = GFXRES:base/ships/chenjesu/doggy.med
 ship.chenjesu.graphics.doggy.small = GFXRES:base/ships/chenjesu/doggy.sml
 ship.chenjesu.graphics.spark.large = GFXRES:base/ships/chenjesu/spark.big
 ship.chenjesu.graphics.spark.medium = GFXRES:base/ships/chenjesu/spark.med
 ship.chenjesu.graphics.spark.small = GFXRES:base/ships/chenjesu/spark.sml
-ship.chenjesu.icons = GFXRES:base/ships/chenjesu/cheicons.ani
-ship.chenjesu.meleeicons = GFXRES:base/ships/chenjesu/chemicon.ani
-ship.chenjesu.sounds = SNDRES:base/ships/chenjesu/chesound.snd
-ship.chenjesu.text = STRTAB:base/ships/chenjesu/chetext.txt
+ship.chenjesu.icons = GFXRES:base/ships/chenjesu/broodhome-icons.ani
+ship.chenjesu.meleeicons = GFXRES:base/ships/chenjesu/broodhome-meleeicons.ani
+ship.chenjesu.sounds = SNDRES:base/ships/chenjesu/broodhome.snd
+ship.chenjesu.text = STRTAB:base/ships/chenjesu/broodhome.txt
 ship.chmmr.code = SHIP:4
-ship.chmmr.ditty = MUSICRES:base/ships/chmmr/chmditty.mod
-ship.chmmr.graphics.captain = GFXRES:base/ships/chmmr/chmcap.ani
-ship.chmmr.graphics.chmmr.large = GFXRES:base/ships/chmmr/chmmr.big
-ship.chmmr.graphics.chmmr.medium = GFXRES:base/ships/chmmr/chmmr.med
-ship.chmmr.graphics.chmmr.small = GFXRES:base/ships/chmmr/chmmr.sml
-ship.chmmr.graphics.muz.large = GFXRES:base/ships/chmmr/muzbig.ani
-ship.chmmr.graphics.muz.medium = GFXRES:base/ships/chmmr/muzmed.ani
-ship.chmmr.graphics.muz.small = GFXRES:base/ships/chmmr/muzsml.ani
-ship.chmmr.graphics.sat.large = GFXRES:base/ships/chmmr/satbig.ani
-ship.chmmr.graphics.sat.medium = GFXRES:base/ships/chmmr/satmed.ani
-ship.chmmr.graphics.sat.small = GFXRES:base/ships/chmmr/satsml.ani
-ship.chmmr.icons = GFXRES:base/ships/chmmr/chmicons.ani
-ship.chmmr.meleeicons = GFXRES:base/ships/chmmr/chmmicon.ani
-ship.chmmr.sounds = SNDRES:base/ships/chmmr/chmsound.snd
-ship.chmmr.text = STRTAB:base/ships/chmmr/chmtext.txt
+ship.chmmr.ditty = MUSICRES:base/ships/chmmr/avatar.mod
+ship.chmmr.graphics.avatar.large = GFXRES:base/ships/chmmr/avatar-big.ani
+ship.chmmr.graphics.avatar.medium = GFXRES:base/ships/chmmr/avatar-med.ani
+ship.chmmr.graphics.avatar.small = GFXRES:base/ships/chmmr/avatar-sml.ani
+ship.chmmr.graphics.captain = GFXRES:base/ships/chmmr/avatar-cap.ani
+ship.chmmr.graphics.muzzle.large = GFXRES:base/ships/chmmr/muzzle-big.ani
+ship.chmmr.graphics.muzzle.medium = GFXRES:base/ships/chmmr/muzzle-med.ani
+ship.chmmr.graphics.muzzle.small = GFXRES:base/ships/chmmr/muzzle-sml.ani
+ship.chmmr.graphics.satellite.large = GFXRES:base/ships/chmmr/satellite-big.ani
+ship.chmmr.graphics.satellite.medium = GFXRES:base/ships/chmmr/satellite-med.ani
+ship.chmmr.graphics.satellite.small = GFXRES:base/ships/chmmr/satellite-sml.ani
+ship.chmmr.icons = GFXRES:base/ships/chmmr/avatar-icons.ani
+ship.chmmr.meleeicons = GFXRES:base/ships/chmmr/avatar-meleeicons.ani
+ship.chmmr.sounds = SNDRES:base/ships/chmmr/avatar.snd
+ship.chmmr.text = STRTAB:base/ships/chmmr/avatar.txt
+ship.drone.code = SHIP:27
+ship.drone.meleeicons = GFXRES:base/ships/drone/drone-meleeicons.ani
 ship.druuge.code = SHIP:5
-ship.druuge.ditty = MUSICRES:base/ships/druuge/druditty.mod
-ship.druuge.graphics.can.large = GFXRES:base/ships/druuge/canbig.ani
-ship.druuge.graphics.can.medium = GFXRES:base/ships/druuge/canmed.ani
-ship.druuge.graphics.can.small = GFXRES:base/ships/druuge/cansml.ani
-ship.druuge.graphics.captain = GFXRES:base/ships/druuge/drucap.ani
-ship.druuge.graphics.druuge.large = GFXRES:base/ships/druuge/druuge.big
-ship.druuge.graphics.druuge.medium = GFXRES:base/ships/druuge/druuge.med
-ship.druuge.graphics.druuge.small = GFXRES:base/ships/druuge/druuge.sml
-ship.druuge.icons = GFXRES:base/ships/druuge/druicons.ani
-ship.druuge.meleeicons = GFXRES:base/ships/druuge/drumicon.ani
-ship.druuge.sounds = SNDRES:base/ships/druuge/drusound.snd
-ship.druuge.text = STRTAB:base/ships/druuge/drutext.txt
+ship.druuge.ditty = MUSICRES:base/ships/druuge/mauler.mod
+ship.druuge.graphics.cannon.large = GFXRES:base/ships/druuge/cannon-big.ani
+ship.druuge.graphics.cannon.medium = GFXRES:base/ships/druuge/cannon-med.ani
+ship.druuge.graphics.cannon.small = GFXRES:base/ships/druuge/cannon-sml.ani
+ship.druuge.graphics.captain = GFXRES:base/ships/druuge/mauler-cap.ani
+ship.druuge.graphics.mauler.large = GFXRES:base/ships/druuge/mauler-big.ani
+ship.druuge.graphics.mauler.medium = GFXRES:base/ships/druuge/mauler-med.ani
+ship.druuge.graphics.mauler.small = GFXRES:base/ships/druuge/mauler-sml.ani
+ship.druuge.icons = GFXRES:base/ships/druuge/mauler-icons.ani
+ship.druuge.meleeicons = GFXRES:base/ships/druuge/mauler-meleeicons.ani
+ship.druuge.sounds = SNDRES:base/ships/druuge/mauler.snd
+ship.druuge.text = STRTAB:base/ships/druuge/mauler.txt
 ship.earthling.code = SHIP:6
-ship.earthling.ditty = MUSICRES:base/ships/human/humditty.mod
-ship.earthling.graphics.captain = GFXRES:base/ships/human/humcap.ani
-ship.earthling.graphics.human.large = GFXRES:base/ships/human/human.big
-ship.earthling.graphics.human.medium = GFXRES:base/ships/human/human.med
-ship.earthling.graphics.human.small = GFXRES:base/ships/human/human.sml
+ship.earthling.ditty = MUSICRES:base/ships/human/cruiser.mod
+ship.earthling.graphics.captain = GFXRES:base/ships/human/cruiser-cap.ani
+ship.earthling.graphics.human.large = GFXRES:base/ships/human/cruiser-big.ani
+ship.earthling.graphics.human.medium = GFXRES:base/ships/human/cruiser-med.ani
+ship.earthling.graphics.human.small = GFXRES:base/ships/human/cruiser-sml.ani
 ship.earthling.graphics.saturn.large = GFXRES:base/ships/human/saturn.big
 ship.earthling.graphics.saturn.medium = GFXRES:base/ships/human/saturn.med
 ship.earthling.graphics.saturn.small = GFXRES:base/ships/human/saturn.sml
-ship.earthling.icons = GFXRES:base/ships/human/humicons.ani
-ship.earthling.meleeicons = GFXRES:base/ships/human/hummicon.ani
-ship.earthling.sounds = SNDRES:base/ships/human/humsound.snd
-ship.earthling.text = STRTAB:base/ships/human/humtext.txt
+ship.earthling.icons = GFXRES:base/ships/human/cruiser-icons.ani
+ship.earthling.meleeicons = GFXRES:base/ships/human/cruiser-meleeicons.ani
+ship.earthling.sounds = SNDRES:base/ships/human/cruiser.snd
+ship.earthling.text = STRTAB:base/ships/human/cruiser.txt
+ship.flagship.code = SHIP:26
+ship.flagship.ditty = MUSICRES:base/ships/flagship/flagship.mod
+ship.flagship.graphics.blaster.large = GFXRES:base/ships/flagship/blaster-big.ani
+ship.flagship.graphics.blaster.medium = GFXRES:base/ships/flagship/blaster-med.ani
+ship.flagship.graphics.blaster.small = GFXRES:base/ships/flagship/blaster-sml.ani
+ship.flagship.graphics.captain = GFXRES:base/ships/flagship/flagship-cap.ani
+ship.flagship.graphics.flagship.large = GFXRES:base/ships/flagship/flagship-big.ani
+ship.flagship.graphics.flagship.medium = GFXRES:base/ships/flagship/flagship-med.ani
+ship.flagship.graphics.flagship.small = GFXRES:base/ships/flagship/flagship-sml.ani
+ship.flagship.graphics.hyperspace = GFXRES:base/ships/flagship/hyperspace.ani
+ship.flagship.icons = GFXRES:base/ships/flagship/flagship-icons.ani
+ship.flagship.sounds = SNDRES:base/ships/flagship/flagship.snd
 ship.ilwrath.code = SHIP:7
-ship.ilwrath.ditty = MUSICRES:base/ships/ilwrath/ilwditty.mod
-ship.ilwrath.graphics.captain = GFXRES:base/ships/ilwrath/ilwcap.ani
+ship.ilwrath.ditty = MUSICRES:base/ships/ilwrath/avenger.mod
+ship.ilwrath.graphics.avenger.large = GFXRES:base/ships/ilwrath/avenger-big.ani
+ship.ilwrath.graphics.avenger.medium = GFXRES:base/ships/ilwrath/avenger-med.ani
+ship.ilwrath.graphics.avenger.small = GFXRES:base/ships/ilwrath/avenger-sml.ani
+ship.ilwrath.graphics.captain = GFXRES:base/ships/ilwrath/avenger-cap.ani
 ship.ilwrath.graphics.fire.large = GFXRES:base/ships/ilwrath/fire.big
 ship.ilwrath.graphics.fire.medium = GFXRES:base/ships/ilwrath/fire.med
 ship.ilwrath.graphics.fire.small = GFXRES:base/ships/ilwrath/fire.sml
-ship.ilwrath.graphics.ilwrath.large = GFXRES:base/ships/ilwrath/ilwrath.big
-ship.ilwrath.graphics.ilwrath.medium = GFXRES:base/ships/ilwrath/ilwrath.med
-ship.ilwrath.graphics.ilwrath.small = GFXRES:base/ships/ilwrath/ilwrath.sml
-ship.ilwrath.icons = GFXRES:base/ships/ilwrath/ilwicons.ani
-ship.ilwrath.meleeicons = GFXRES:base/ships/ilwrath/ilwmicon.ani
-ship.ilwrath.sounds = SNDRES:base/ships/ilwrath/ilwsound.snd
-ship.ilwrath.text = STRTAB:base/ships/ilwrath/ilwtext.txt
+ship.ilwrath.icons = GFXRES:base/ships/ilwrath/avenger-icons.ani
+ship.ilwrath.meleeicons = GFXRES:base/ships/ilwrath/avenger-meleeicons.ani
+ship.ilwrath.sounds = SNDRES:base/ships/ilwrath/avenger.snd
+ship.ilwrath.text = STRTAB:base/ships/ilwrath/avenger.txt
 ship.kohrah.code = SHIP:2
-ship.kohrah.ditty = MUSICRES:base/ships/kohrah/bladitty.mod
-ship.kohrah.graphics.blackurq.large = GFXRES:base/ships/kohrah/blackurq.big
-ship.kohrah.graphics.blackurq.medium = GFXRES:base/ships/kohrah/blackurq.med
-ship.kohrah.graphics.blackurq.small = GFXRES:base/ships/kohrah/blackurq.sml
-ship.kohrah.graphics.buz.large = GFXRES:base/ships/kohrah/buzbig.ani
-ship.kohrah.graphics.buz.medium = GFXRES:base/ships/kohrah/buzmed.ani
-ship.kohrah.graphics.buz.small = GFXRES:base/ships/kohrah/buzsml.ani
-ship.kohrah.graphics.captain = GFXRES:base/ships/kohrah/blacap.ani
-ship.kohrah.graphics.gas.large = GFXRES:base/ships/kohrah/gasbig.ani
-ship.kohrah.graphics.gas.medium = GFXRES:base/ships/kohrah/gasmed.ani
-ship.kohrah.graphics.gas.small = GFXRES:base/ships/kohrah/gassml.ani
-ship.kohrah.icons = GFXRES:base/ships/kohrah/blaicons.ani
-ship.kohrah.meleeicons = GFXRES:base/ships/kohrah/blamicon.ani
-ship.kohrah.sounds = SNDRES:base/ships/kohrah/blasound.snd
-ship.kohrah.text = STRTAB:base/ships/kohrah/blatext.txt
-ship.lastbat.code = SHIP:25
-ship.lastbat.graphics.captain = GFXRES:base/ships/lastbat/lascap.ani
-ship.lastbat.graphics.gen.large = GFXRES:base/ships/lastbat/genbig.ani
-ship.lastbat.graphics.gen.medium = GFXRES:base/ships/lastbat/genmed.ani
-ship.lastbat.graphics.gen.small = GFXRES:base/ships/lastbat/gensml.ani
-ship.lastbat.graphics.lastbat.large = GFXRES:base/ships/lastbat/lastbat.big
-ship.lastbat.graphics.lastbat.medium = GFXRES:base/ships/lastbat/lastbat.med
-ship.lastbat.graphics.lastbat.small = GFXRES:base/ships/lastbat/lastbat.sml
-ship.lastbat.graphics.sen.large = GFXRES:base/ships/lastbat/senbig.ani
-ship.lastbat.graphics.sen.medium = GFXRES:base/ships/lastbat/senmed.ani
-ship.lastbat.graphics.sen.small = GFXRES:base/ships/lastbat/sensml.ani
-ship.lastbat.sounds = SNDRES:base/ships/lastbat/lassound.snd
+ship.kohrah.ditty = MUSICRES:base/ships/kohrah/marauder.mod
+ship.kohrah.graphics.buzzsaw.large = GFXRES:base/ships/kohrah/buzzsaw-big.ani
+ship.kohrah.graphics.buzzsaw.medium = GFXRES:base/ships/kohrah/buzzsaw-med.ani
+ship.kohrah.graphics.buzzsaw.small = GFXRES:base/ships/kohrah/buzzsaw-sml.ani
+ship.kohrah.graphics.captain = GFXRES:base/ships/kohrah/marauder-cap.ani
+ship.kohrah.graphics.gas.large = GFXRES:base/ships/kohrah/gas-big.ani
+ship.kohrah.graphics.gas.medium = GFXRES:base/ships/kohrah/gas-med.ani
+ship.kohrah.graphics.gas.small = GFXRES:base/ships/kohrah/gas-sml.ani
+ship.kohrah.graphics.marauder.large = GFXRES:base/ships/kohrah/marauder-big.ani
+ship.kohrah.graphics.marauder.medium = GFXRES:base/ships/kohrah/marauder-med.ani
+ship.kohrah.graphics.marauder.small = GFXRES:base/ships/kohrah/marauder-sml.ani
+ship.kohrah.icons = GFXRES:base/ships/kohrah/marauder-icons.ani
+ship.kohrah.meleeicons = GFXRES:base/ships/kohrah/marauder-meleeicons.ani
+ship.kohrah.sounds = SNDRES:base/ships/kohrah/marauder.snd
+ship.kohrah.text = STRTAB:base/ships/kohrah/marauder.txt
 ship.melnorme.code = SHIP:8
-ship.melnorme.ditty = MUSICRES:base/ships/melnorme/melditty.mod
-ship.melnorme.graphics.captain = GFXRES:base/ships/melnorme/melcap.ani
-ship.melnorme.graphics.confu.large = GFXRES:base/ships/melnorme/confubig.ani
-ship.melnorme.graphics.confu.medium = GFXRES:base/ships/melnorme/confumed.ani
-ship.melnorme.graphics.confu.small = GFXRES:base/ships/melnorme/confusml.ani
-ship.melnorme.graphics.melnorme.large = GFXRES:base/ships/melnorme/melnorme.big
-ship.melnorme.graphics.melnorme.medium = GFXRES:base/ships/melnorme/melnorme.med
-ship.melnorme.graphics.melnorme.small = GFXRES:base/ships/melnorme/melnorme.sml
-ship.melnorme.graphics.pump.large = GFXRES:base/ships/melnorme/pumpbig.ani
-ship.melnorme.graphics.pump.medium = GFXRES:base/ships/melnorme/pumpmed.ani
-ship.melnorme.graphics.pump.small = GFXRES:base/ships/melnorme/pumpsml.ani
-ship.melnorme.icons = GFXRES:base/ships/melnorme/melicons.ani
-ship.melnorme.meleeicons = GFXRES:base/ships/melnorme/melmicon.ani
-ship.melnorme.sounds = SNDRES:base/ships/melnorme/melsound.snd
-ship.melnorme.text = STRTAB:base/ships/melnorme/meltext.txt
+ship.melnorme.ditty = MUSICRES:base/ships/melnorme/trader.mod
+ship.melnorme.graphics.captain = GFXRES:base/ships/melnorme/trader-cap.ani
+ship.melnorme.graphics.confuse.large = GFXRES:base/ships/melnorme/confuse-big.ani
+ship.melnorme.graphics.confuse.medium = GFXRES:base/ships/melnorme/confuse-med.ani
+ship.melnorme.graphics.confuse.small = GFXRES:base/ships/melnorme/confuse-sml.ani
+ship.melnorme.graphics.pumpup.large = GFXRES:base/ships/melnorme/pumpup-big.ani
+ship.melnorme.graphics.pumpup.medium = GFXRES:base/ships/melnorme/pumpup-med.ani
+ship.melnorme.graphics.pumpup.small = GFXRES:base/ships/melnorme/pumpup-sml.ani
+ship.melnorme.graphics.trader.large = GFXRES:base/ships/melnorme/trader-big.ani
+ship.melnorme.graphics.trader.medium = GFXRES:base/ships/melnorme/trader-med.ani
+ship.melnorme.graphics.trader.small = GFXRES:base/ships/melnorme/trader-sml.ani
+ship.melnorme.icons = GFXRES:base/ships/melnorme/trader-icons.ani
+ship.melnorme.meleeicons = GFXRES:base/ships/melnorme/trader-meleeicons.ani
+ship.melnorme.sounds = SNDRES:base/ships/melnorme/trader.snd
+ship.melnorme.text = STRTAB:base/ships/melnorme/trader.txt
 ship.mmrnmhrm.code = SHIP:9
-ship.mmrnmhrm.ditty = MUSICRES:base/ships/mmrnmhrm/mmrditty.mod
-ship.mmrnmhrm.graphics.captain = GFXRES:base/ships/mmrnmhrm/mmrcap.ani
-ship.mmrnmhrm.graphics.mmrnmhrm.large = GFXRES:base/ships/mmrnmhrm/mmrnmhrm.big
-ship.mmrnmhrm.graphics.mmrnmhrm.medium = GFXRES:base/ships/mmrnmhrm/mmrnmhrm.med
-ship.mmrnmhrm.graphics.mmrnmhrm.small = GFXRES:base/ships/mmrnmhrm/mmrnmhrm.sml
-ship.mmrnmhrm.graphics.torp.large = GFXRES:base/ships/mmrnmhrm/torp.big
-ship.mmrnmhrm.graphics.torp.medium = GFXRES:base/ships/mmrnmhrm/torp.med
-ship.mmrnmhrm.graphics.torp.small = GFXRES:base/ships/mmrnmhrm/torp.sml
+ship.mmrnmhrm.ditty = MUSICRES:base/ships/mmrnmhrm/xform.mod
+ship.mmrnmhrm.graphics.captain = GFXRES:base/ships/mmrnmhrm/xform-cap.ani
+ship.mmrnmhrm.graphics.torpedo.large = GFXRES:base/ships/mmrnmhrm/torpedo-big.ani
+ship.mmrnmhrm.graphics.torpedo.medium = GFXRES:base/ships/mmrnmhrm/torpedo-med.ani
+ship.mmrnmhrm.graphics.torpedo.small = GFXRES:base/ships/mmrnmhrm/torpedo-sml.ani
+ship.mmrnmhrm.graphics.xform.large = GFXRES:base/ships/mmrnmhrm/xform-big.ani
+ship.mmrnmhrm.graphics.xform.medium = GFXRES:base/ships/mmrnmhrm/xform-med.ani
+ship.mmrnmhrm.graphics.xform.small = GFXRES:base/ships/mmrnmhrm/xform-sml.ani
 ship.mmrnmhrm.graphics.ywing.large = GFXRES:base/ships/mmrnmhrm/ywing.big
 ship.mmrnmhrm.graphics.ywing.medium = GFXRES:base/ships/mmrnmhrm/ywing.med
 ship.mmrnmhrm.graphics.ywing.small = GFXRES:base/ships/mmrnmhrm/ywing.sml
-ship.mmrnmhrm.icons = GFXRES:base/ships/mmrnmhrm/mmricons.ani
-ship.mmrnmhrm.meleeicons = GFXRES:base/ships/mmrnmhrm/mmrmicon.ani
-ship.mmrnmhrm.sounds = SNDRES:base/ships/mmrnmhrm/mmrsound.snd
-ship.mmrnmhrm.text = STRTAB:base/ships/mmrnmhrm/mmrtext.txt
+ship.mmrnmhrm.icons = GFXRES:base/ships/mmrnmhrm/xform-icons.ani
+ship.mmrnmhrm.meleeicons = GFXRES:base/ships/mmrnmhrm/xform-meleeicons.ani
+ship.mmrnmhrm.sounds = SNDRES:base/ships/mmrnmhrm/xform.snd
+ship.mmrnmhrm.text = STRTAB:base/ships/mmrnmhrm/xform.txt
 ship.mycon.code = SHIP:10
-ship.mycon.ditty = MUSICRES:base/ships/mycon/mycditty.mod
-ship.mycon.graphics.captain = GFXRES:base/ships/mycon/myccap.ani
-ship.mycon.graphics.mycon.large = GFXRES:base/ships/mycon/mycon.big
-ship.mycon.graphics.mycon.medium = GFXRES:base/ships/mycon/mycon.med
-ship.mycon.graphics.mycon.small = GFXRES:base/ships/mycon/mycon.sml
+ship.mycon.ditty = MUSICRES:base/ships/mycon/podship.mod
+ship.mycon.graphics.captain = GFXRES:base/ships/mycon/podship-cap.ani
 ship.mycon.graphics.plasma.large = GFXRES:base/ships/mycon/plasma.big
 ship.mycon.graphics.plasma.medium = GFXRES:base/ships/mycon/plasma.med
 ship.mycon.graphics.plasma.small = GFXRES:base/ships/mycon/plasma.sml
-ship.mycon.icons = GFXRES:base/ships/mycon/mycicons.ani
-ship.mycon.meleeicons = GFXRES:base/ships/mycon/mycmicon.ani
-ship.mycon.sounds = SNDRES:base/ships/mycon/mycsound.snd
-ship.mycon.text = STRTAB:base/ships/mycon/myctext.txt
+ship.mycon.graphics.podship.large = GFXRES:base/ships/mycon/podship-big.ani
+ship.mycon.graphics.podship.medium = GFXRES:base/ships/mycon/podship-med.ani
+ship.mycon.graphics.podship.small = GFXRES:base/ships/mycon/podship-sml.ani
+ship.mycon.icons = GFXRES:base/ships/mycon/podship-icons.ani
+ship.mycon.meleeicons = GFXRES:base/ships/mycon/podship-meleeicons.ani
+ship.mycon.sounds = SNDRES:base/ships/mycon/podship.snd
+ship.mycon.text = STRTAB:base/ships/mycon/podship.txt
 ship.orz.code = SHIP:11
-ship.orz.ditty = MUSICRES:base/ships/orz/orzditty.mod
-ship.orz.graphics.captain = GFXRES:base/ships/orz/orzcap.ani
-ship.orz.graphics.how.large = GFXRES:base/ships/orz/howbig.ani
-ship.orz.graphics.how.medium = GFXRES:base/ships/orz/howmed.ani
-ship.orz.graphics.how.small = GFXRES:base/ships/orz/howsml.ani
-ship.orz.graphics.orz.large = GFXRES:base/ships/orz/orz.big
-ship.orz.graphics.orz.medium = GFXRES:base/ships/orz/orz.med
-ship.orz.graphics.orz.small = GFXRES:base/ships/orz/orz.sml
-ship.orz.graphics.tur.large = GFXRES:base/ships/orz/turbig.ani
-ship.orz.graphics.tur.medium = GFXRES:base/ships/orz/turmed.ani
-ship.orz.graphics.tur.small = GFXRES:base/ships/orz/tursml.ani
-ship.orz.icons = GFXRES:base/ships/orz/orzicons.ani
-ship.orz.meleeicons = GFXRES:base/ships/orz/orzmicon.ani
-ship.orz.sounds = SNDRES:base/ships/orz/orzsound.snd
-ship.orz.text = STRTAB:base/ships/orz/orztext.txt
+ship.orz.ditty = MUSICRES:base/ships/orz/nemesis.mod
+ship.orz.graphics.captain = GFXRES:base/ships/orz/nemesis-cap.ani
+ship.orz.graphics.howitzer.large = GFXRES:base/ships/orz/howitzer-big.ani
+ship.orz.graphics.howitzer.medium = GFXRES:base/ships/orz/howitzer-med.ani
+ship.orz.graphics.howitzer.small = GFXRES:base/ships/orz/howitzer-sml.ani
+ship.orz.graphics.nemesis.large = GFXRES:base/ships/orz/nemesis-big.ani
+ship.orz.graphics.nemesis.medium = GFXRES:base/ships/orz/nemesis-med.ani
+ship.orz.graphics.nemesis.small = GFXRES:base/ships/orz/nemesis-sml.ani
+ship.orz.graphics.turret.large = GFXRES:base/ships/orz/turret-big.ani
+ship.orz.graphics.turret.medium = GFXRES:base/ships/orz/turret-med.ani
+ship.orz.graphics.turret.small = GFXRES:base/ships/orz/turret-sml.ani
+ship.orz.icons = GFXRES:base/ships/orz/nemesis-icons.ani
+ship.orz.meleeicons = GFXRES:base/ships/orz/nemesis-meleeicons.ani
+ship.orz.sounds = SNDRES:base/ships/orz/nemesis.snd
+ship.orz.text = STRTAB:base/ships/orz/nemesis.txt
 ship.pkunk.code = SHIP:12
-ship.pkunk.ditty = MUSICRES:base/ships/pkunk/pkuditty.mod
-ship.pkunk.graphics.bug.large = GFXRES:base/ships/pkunk/bugbig.ani
-ship.pkunk.graphics.bug.medium = GFXRES:base/ships/pkunk/bugmed.ani
-ship.pkunk.graphics.bug.small = GFXRES:base/ships/pkunk/bugsml.ani
-ship.pkunk.graphics.captain = GFXRES:base/ships/pkunk/pkucap.ani
-ship.pkunk.graphics.pkunk.large = GFXRES:base/ships/pkunk/pkunk.big
-ship.pkunk.graphics.pkunk.medium = GFXRES:base/ships/pkunk/pkunk.med
-ship.pkunk.graphics.pkunk.small = GFXRES:base/ships/pkunk/pkunk.sml
-ship.pkunk.icons = GFXRES:base/ships/pkunk/pkuicons.ani
-ship.pkunk.meleeicons = GFXRES:base/ships/pkunk/pkumicon.ani
-ship.pkunk.sounds = SNDRES:base/ships/pkunk/pkusound.snd
-ship.pkunk.text = STRTAB:base/ships/pkunk/pkutext.txt
-ship.probe.code = SHIP:27
-ship.probe.meleeicons = GFXRES:base/ships/probe/promicon.ani
+ship.pkunk.ditty = MUSICRES:base/ships/pkunk/fury.mod
+ship.pkunk.graphics.bug.large = GFXRES:base/ships/pkunk/bug-big.ani
+ship.pkunk.graphics.bug.medium = GFXRES:base/ships/pkunk/bug-med.ani
+ship.pkunk.graphics.bug.small = GFXRES:base/ships/pkunk/bug-sml.ani
+ship.pkunk.graphics.captain = GFXRES:base/ships/pkunk/fury-cap.ani
+ship.pkunk.graphics.fury.large = GFXRES:base/ships/pkunk/fury-big.ani
+ship.pkunk.graphics.fury.medium = GFXRES:base/ships/pkunk/fury-med.ani
+ship.pkunk.graphics.fury.small = GFXRES:base/ships/pkunk/fury-sml.ani
+ship.pkunk.icons = GFXRES:base/ships/pkunk/fury-icons.ani
+ship.pkunk.meleeicons = GFXRES:base/ships/pkunk/fury-meleeicons.ani
+ship.pkunk.sounds = SNDRES:base/ships/pkunk/fury.snd
+ship.pkunk.text = STRTAB:base/ships/pkunk/fury.txt
+ship.samatra.code = SHIP:25
+ship.samatra.graphics.captain = GFXRES:base/ships/samatra/samatra-cap.ani
+ship.samatra.graphics.generator.large = GFXRES:base/ships/samatra/generator-big.ani
+ship.samatra.graphics.generator.medium = GFXRES:base/ships/samatra/generator-med.ani
+ship.samatra.graphics.generator.small = GFXRES:base/ships/samatra/generator-sml.ani
+ship.samatra.graphics.samatra.large = GFXRES:base/ships/samatra/samatra-big.ani
+ship.samatra.graphics.samatra.medium = GFXRES:base/ships/samatra/samatra-med.ani
+ship.samatra.graphics.samatra.small = GFXRES:base/ships/samatra/samatra-sml.ani
+ship.samatra.graphics.sentinel.large = GFXRES:base/ships/samatra/sentinel-big.ani
+ship.samatra.graphics.sentinel.medium = GFXRES:base/ships/samatra/sentinel-med.ani
+ship.samatra.graphics.sentinel.small = GFXRES:base/ships/samatra/sentinel-sml.ani
+ship.samatra.sounds = SNDRES:base/ships/samatra/samatra.snd
 ship.shofixti.code = SHIP:13
-ship.shofixti.ditty = MUSICRES:base/ships/shofixti/shoditty.mod
-ship.shofixti.graphics.captain = GFXRES:base/ships/shofixti/shocap.ani
+ship.shofixti.ditty = MUSICRES:base/ships/shofixti/scout.mod
+ship.shofixti.graphics.captain = GFXRES:base/ships/shofixti/scout-cap.ani
 ship.shofixti.graphics.destruct.large = GFXRES:base/ships/shofixti/destruct.big
 ship.shofixti.graphics.destruct.medium = GFXRES:base/ships/shofixti/destruct.med
 ship.shofixti.graphics.destruct.small = GFXRES:base/ships/shofixti/destruct.sml
 ship.shofixti.graphics.missile.large = GFXRES:base/ships/shofixti/missile.big
 ship.shofixti.graphics.missile.medium = GFXRES:base/ships/shofixti/missile.med
 ship.shofixti.graphics.missile.small = GFXRES:base/ships/shofixti/missile.sml
-ship.shofixti.graphics.oldcaptain = GFXRES:base/ships/shofixti/oldcap.ani
-ship.shofixti.graphics.oldshof.large = GFXRES:base/ships/shofixti/oldshof.big
-ship.shofixti.graphics.oldshof.medium = GFXRES:base/ships/shofixti/oldshof.med
-ship.shofixti.graphics.oldshof.small = GFXRES:base/ships/shofixti/oldshof.sml
-ship.shofixti.graphics.shofixti.large = GFXRES:base/ships/shofixti/shofixti.big
-ship.shofixti.graphics.shofixti.medium = GFXRES:base/ships/shofixti/shofixti.med
-ship.shofixti.graphics.shofixti.small = GFXRES:base/ships/shofixti/shofixti.sml
-ship.shofixti.icons = GFXRES:base/ships/shofixti/shoicons.ani
-ship.shofixti.meleeicons = GFXRES:base/ships/shofixti/shomicon.ani
-ship.shofixti.sounds = SNDRES:base/ships/shofixti/shosound.snd
-ship.shofixti.text = STRTAB:base/ships/shofixti/shotext.txt
-ship.sis_ship.code = SHIP:26
-ship.sis_ship.ditty = MUSICRES:base/ships/sis_ship/sisditty.mod
-ship.sis_ship.graphics.blas.large = GFXRES:base/ships/sis_ship/blasbig.ani
-ship.sis_ship.graphics.blas.medium = GFXRES:base/ships/sis_ship/blasmed.ani
-ship.sis_ship.graphics.blas.small = GFXRES:base/ships/sis_ship/blassml.ani
-ship.sis_ship.graphics.captain = GFXRES:base/ships/sis_ship/siscap.ani
-ship.sis_ship.graphics.sis.large = GFXRES:base/ships/sis_ship/sis.big
-ship.sis_ship.graphics.sis.medium = GFXRES:base/ships/sis_ship/sis.med
-ship.sis_ship.graphics.sis.small = GFXRES:base/ships/sis_ship/sis.sml
-ship.sis_ship.graphics.sishyper = GFXRES:base/ships/sis_ship/sishyper.ani
-ship.sis_ship.icons = GFXRES:base/ships/sis_ship/sisicons.ani
-ship.sis_ship.sounds = SNDRES:base/ships/sis_ship/sissound.snd
+ship.shofixti.graphics.oldcaptain = GFXRES:base/ships/shofixti/oldscout-cap.ani
+ship.shofixti.graphics.oldscout.large = GFXRES:base/ships/shofixti/oldscout-big.ani
+ship.shofixti.graphics.oldscout.medium = GFXRES:base/ships/shofixti/oldscout-med.ani
+ship.shofixti.graphics.oldscout.small = GFXRES:base/ships/shofixti/oldscout-sml.ani
+ship.shofixti.graphics.scout.large = GFXRES:base/ships/shofixti/scout-big.ani
+ship.shofixti.graphics.scout.medium = GFXRES:base/ships/shofixti/scout-med.ani
+ship.shofixti.graphics.scout.small = GFXRES:base/ships/shofixti/scout-sml.ani
+ship.shofixti.icons = GFXRES:base/ships/shofixti/scout-icons.ani
+ship.shofixti.meleeicons = GFXRES:base/ships/shofixti/scout-meleeicons.ani
+ship.shofixti.sounds = SNDRES:base/ships/shofixti/scout.snd
+ship.shofixti.text = STRTAB:base/ships/shofixti/scout.txt
 ship.slylandro.code = SHIP:14
-ship.slylandro.ditty = MUSICRES:base/ships/slylandr/slyditty.mod
-ship.slylandro.graphics.captain = GFXRES:base/ships/slylandr/slycap.ani
-ship.slylandro.graphics.slylandr.large = GFXRES:base/ships/slylandr/slylandr.big
-ship.slylandro.graphics.slylandr.medium = GFXRES:base/ships/slylandr/slylandr.med
-ship.slylandro.graphics.slylandr.small = GFXRES:base/ships/slylandr/slylandr.sml
-ship.slylandro.icons = GFXRES:base/ships/slylandr/slyicons.ani
-ship.slylandro.meleeicons = GFXRES:base/ships/slylandr/slymicon.ani
-ship.slylandro.sounds = SNDRES:base/ships/slylandr/slysound.snd
-ship.slylandro.text = STRTAB:base/ships/slylandr/slytext.txt
+ship.slylandro.ditty = MUSICRES:base/ships/slylandro/probe.mod
+ship.slylandro.graphics.captain = GFXRES:base/ships/slylandro/probe-cap.ani
+ship.slylandro.graphics.probe.large = GFXRES:base/ships/slylandro/probe-big.ani
+ship.slylandro.graphics.probe.medium = GFXRES:base/ships/slylandro/probe-med.ani
+ship.slylandro.graphics.probe.small = GFXRES:base/ships/slylandro/probe-sml.ani
+ship.slylandro.icons = GFXRES:base/ships/slylandro/probe-icons.ani
+ship.slylandro.meleeicons = GFXRES:base/ships/slylandro/probe-meleeicons.ani
+ship.slylandro.sounds = SNDRES:base/ships/slylandro/probe.snd
+ship.slylandro.text = STRTAB:base/ships/slylandro/probe.txt
 ship.spathi.code = SHIP:15
-ship.spathi.ditty = MUSICRES:base/ships/spathi/spaditty.mod
-ship.spathi.graphics.captain = GFXRES:base/ships/spathi/spacap.ani
-ship.spathi.graphics.discrim.large = GFXRES:base/ships/spathi/discrim.big
-ship.spathi.graphics.discrim.medium = GFXRES:base/ships/spathi/discrim.med
-ship.spathi.graphics.discrim.small = GFXRES:base/ships/spathi/discrim.sml
+ship.spathi.ditty = MUSICRES:base/ships/spathi/eluder.mod
+ship.spathi.graphics.butt.large = GFXRES:base/ships/spathi/butt-big.ani
+ship.spathi.graphics.butt.medium = GFXRES:base/ships/spathi/butt-med.ani
+ship.spathi.graphics.butt.small = GFXRES:base/ships/spathi/butt-sml.ani
+ship.spathi.graphics.captain = GFXRES:base/ships/spathi/eluder-cap.ani
+ship.spathi.graphics.eluder.large = GFXRES:base/ships/spathi/eluder-big.ani
+ship.spathi.graphics.eluder.medium = GFXRES:base/ships/spathi/eluder-med.ani
+ship.spathi.graphics.eluder.small = GFXRES:base/ships/spathi/eluder-sml.ani
 ship.spathi.graphics.missile.large = GFXRES:base/ships/spathi/missile.big
 ship.spathi.graphics.missile.medium = GFXRES:base/ships/spathi/missile.med
 ship.spathi.graphics.missile.small = GFXRES:base/ships/spathi/missile.sml
-ship.spathi.graphics.spathi.large = GFXRES:base/ships/spathi/spathi.big
-ship.spathi.graphics.spathi.medium = GFXRES:base/ships/spathi/spathi.med
-ship.spathi.graphics.spathi.small = GFXRES:base/ships/spathi/spathi.sml
-ship.spathi.icons = GFXRES:base/ships/spathi/spaicons.ani
-ship.spathi.meleeicons = GFXRES:base/ships/spathi/spamicon.ani
-ship.spathi.sounds = SNDRES:base/ships/spathi/spasound.snd
-ship.spathi.text = STRTAB:base/ships/spathi/spatext.txt
+ship.spathi.icons = GFXRES:base/ships/spathi/eluder-icons.ani
+ship.spathi.meleeicons = GFXRES:base/ships/spathi/eluder-meleeicons.ani
+ship.spathi.sounds = SNDRES:base/ships/spathi/eluder.snd
+ship.spathi.text = STRTAB:base/ships/spathi/eluder.txt
 ship.supox.code = SHIP:16
-ship.supox.ditty = MUSICRES:base/ships/supox/supditty.mod
-ship.supox.graphics.captain = GFXRES:base/ships/supox/supcap.ani
-ship.supox.graphics.gob.large = GFXRES:base/ships/supox/gobbig.ani
-ship.supox.graphics.gob.medium = GFXRES:base/ships/supox/gobmed.ani
-ship.supox.graphics.gob.small = GFXRES:base/ships/supox/gobsml.ani
-ship.supox.graphics.supox.large = GFXRES:base/ships/supox/supox.big
-ship.supox.graphics.supox.medium = GFXRES:base/ships/supox/supox.med
-ship.supox.graphics.supox.small = GFXRES:base/ships/supox/supox.sml
-ship.supox.icons = GFXRES:base/ships/supox/supicons.ani
-ship.supox.meleeicons = GFXRES:base/ships/supox/supmicon.ani
-ship.supox.sounds = SNDRES:base/ships/supox/supsound.snd
-ship.supox.text = STRTAB:base/ships/supox/suptext.txt
+ship.supox.ditty = MUSICRES:base/ships/supox/blade.mod
+ship.supox.graphics.blade.large = GFXRES:base/ships/supox/blade-big.ani
+ship.supox.graphics.blade.medium = GFXRES:base/ships/supox/blade-med.ani
+ship.supox.graphics.blade.small = GFXRES:base/ships/supox/blade-sml.ani
+ship.supox.graphics.captain = GFXRES:base/ships/supox/blade-cap.ani
+ship.supox.graphics.glob.large = GFXRES:base/ships/supox/glob-big.ani
+ship.supox.graphics.glob.medium = GFXRES:base/ships/supox/glob-med.ani
+ship.supox.graphics.glob.small = GFXRES:base/ships/supox/glob-sml.ani
+ship.supox.icons = GFXRES:base/ships/supox/blade-icons.ani
+ship.supox.meleeicons = GFXRES:base/ships/supox/blade-meleeicons.ani
+ship.supox.sounds = SNDRES:base/ships/supox/blade.snd
+ship.supox.text = STRTAB:base/ships/supox/blade.txt
 ship.syreen.code = SHIP:17
-ship.syreen.ditty = MUSICRES:base/ships/syreen/syrditty.mod
-ship.syreen.graphics.captain = GFXRES:base/ships/syreen/syrcap.ani
+ship.syreen.ditty = MUSICRES:base/ships/syreen/penetrator.mod
+ship.syreen.graphics.captain = GFXRES:base/ships/syreen/penetrator-cap.ani
 ship.syreen.graphics.dagger.large = GFXRES:base/ships/syreen/dagger.big
 ship.syreen.graphics.dagger.medium = GFXRES:base/ships/syreen/dagger.med
 ship.syreen.graphics.dagger.small = GFXRES:base/ships/syreen/dagger.sml
-ship.syreen.graphics.syreen.large = GFXRES:base/ships/syreen/syreen.big
-ship.syreen.graphics.syreen.medium = GFXRES:base/ships/syreen/syreen.med
-ship.syreen.graphics.syreen.small = GFXRES:base/ships/syreen/syreen.sml
-ship.syreen.icons = GFXRES:base/ships/syreen/syricons.ani
-ship.syreen.meleeicons = GFXRES:base/ships/syreen/syrmicon.ani
-ship.syreen.sounds = SNDRES:base/ships/syreen/syrsound.snd
-ship.syreen.text = STRTAB:base/ships/syreen/syrtext.txt
+ship.syreen.graphics.penetrator.large = GFXRES:base/ships/syreen/penetrator-big.ani
+ship.syreen.graphics.penetrator.medium = GFXRES:base/ships/syreen/penetrator-med.ani
+ship.syreen.graphics.penetrator.small = GFXRES:base/ships/syreen/penetrator-sml.ani
+ship.syreen.icons = GFXRES:base/ships/syreen/penetrator-icons.ani
+ship.syreen.meleeicons = GFXRES:base/ships/syreen/penetrator-meleeicons.ani
+ship.syreen.sounds = SNDRES:base/ships/syreen/penetrator.snd
+ship.syreen.text = STRTAB:base/ships/syreen/penetrator.txt
 ship.thraddash.code = SHIP:18
-ship.thraddash.ditty = MUSICRES:base/ships/thradd/thrditty.mod
-ship.thraddash.graphics.captain = GFXRES:base/ships/thradd/thrcap.ani
-ship.thraddash.graphics.hor.large = GFXRES:base/ships/thradd/horbig.ani
-ship.thraddash.graphics.hor.medium = GFXRES:base/ships/thradd/hormed.ani
-ship.thraddash.graphics.hor.small = GFXRES:base/ships/thradd/horsml.ani
-ship.thraddash.graphics.nap.large = GFXRES:base/ships/thradd/napbig.ani
-ship.thraddash.graphics.nap.medium = GFXRES:base/ships/thradd/napmed.ani
-ship.thraddash.graphics.nap.small = GFXRES:base/ships/thradd/napsml.ani
-ship.thraddash.graphics.thradd.large = GFXRES:base/ships/thradd/thradd.big
-ship.thraddash.graphics.thradd.medium = GFXRES:base/ships/thradd/thradd.med
-ship.thraddash.graphics.thradd.small = GFXRES:base/ships/thradd/thradd.sml
-ship.thraddash.icons = GFXRES:base/ships/thradd/thricons.ani
-ship.thraddash.meleeicons = GFXRES:base/ships/thradd/thrmicon.ani
-ship.thraddash.sounds = SNDRES:base/ships/thradd/thrsound.snd
-ship.thraddash.text = STRTAB:base/ships/thradd/thrtext.txt
+ship.thraddash.ditty = MUSICRES:base/ships/thraddash/torch.mod
+ship.thraddash.graphics.captain = GFXRES:base/ships/thraddash/torch-cap.ani
+ship.thraddash.graphics.horn.large = GFXRES:base/ships/thraddash/horn-big.ani
+ship.thraddash.graphics.horn.medium = GFXRES:base/ships/thraddash/horn-med.ani
+ship.thraddash.graphics.horn.small = GFXRES:base/ships/thraddash/horn-sml.ani
+ship.thraddash.graphics.napalm.large = GFXRES:base/ships/thraddash/napalm-big.ani
+ship.thraddash.graphics.napalm.medium = GFXRES:base/ships/thraddash/napalm-med.ani
+ship.thraddash.graphics.napalm.small = GFXRES:base/ships/thraddash/napalm-sml.ani
+ship.thraddash.graphics.torch.large = GFXRES:base/ships/thraddash/torch-big.ani
+ship.thraddash.graphics.torch.medium = GFXRES:base/ships/thraddash/torch-med.ani
+ship.thraddash.graphics.torch.small = GFXRES:base/ships/thraddash/torch-sml.ani
+ship.thraddash.icons = GFXRES:base/ships/thraddash/torch-icons.ani
+ship.thraddash.meleeicons = GFXRES:base/ships/thraddash/torch-meleeicons.ani
+ship.thraddash.sounds = SNDRES:base/ships/thraddash/torch.snd
+ship.thraddash.text = STRTAB:base/ships/thraddash/torch.txt
 ship.umgah.code = SHIP:19
-ship.umgah.ditty = MUSICRES:base/ships/umgah/umgditty.mod
-ship.umgah.graphics.captain = GFXRES:base/ships/umgah/umgcap.ani
+ship.umgah.ditty = MUSICRES:base/ships/umgah/drone.mod
+ship.umgah.graphics.captain = GFXRES:base/ships/umgah/drone-cap.ani
 ship.umgah.graphics.cone.large = GFXRES:base/ships/umgah/cone.big
 ship.umgah.graphics.cone.medium = GFXRES:base/ships/umgah/cone.med
 ship.umgah.graphics.cone.small = GFXRES:base/ships/umgah/cone.sml
+ship.umgah.graphics.drone.large = GFXRES:base/ships/umgah/drone-big.ani
+ship.umgah.graphics.drone.medium = GFXRES:base/ships/umgah/drone-med.ani
+ship.umgah.graphics.drone.small = GFXRES:base/ships/umgah/drone-sml.ani
 ship.umgah.graphics.spritz = GFXRES:base/ships/umgah/spritz.ani
-ship.umgah.graphics.umgah.large = GFXRES:base/ships/umgah/umgah.big
-ship.umgah.graphics.umgah.medium = GFXRES:base/ships/umgah/umgah.med
-ship.umgah.graphics.umgah.small = GFXRES:base/ships/umgah/umgah.sml
-ship.umgah.icons = GFXRES:base/ships/umgah/umgicons.ani
-ship.umgah.meleeicons = GFXRES:base/ships/umgah/umgmicon.ani
-ship.umgah.sounds = SNDRES:base/ships/umgah/umgsound.snd
-ship.umgah.text = STRTAB:base/ships/umgah/umgtext.txt
+ship.umgah.icons = GFXRES:base/ships/umgah/drone-icons.ani
+ship.umgah.meleeicons = GFXRES:base/ships/umgah/drone-meleeicons.ani
+ship.umgah.sounds = SNDRES:base/ships/umgah/drone.snd
+ship.umgah.text = STRTAB:base/ships/umgah/drone.txt
 ship.urquan.code = SHIP:20
-ship.urquan.ditty = MUSICRES:base/ships/urquan/urqditty.mod
-ship.urquan.graphics.captain = GFXRES:base/ships/urquan/urqcap.ani
-ship.urquan.graphics.fight.large = GFXRES:base/ships/urquan/fight.big
-ship.urquan.graphics.fight.medium = GFXRES:base/ships/urquan/fight.med
-ship.urquan.graphics.fight.small = GFXRES:base/ships/urquan/fight.sml
+ship.urquan.ditty = MUSICRES:base/ships/urquan/dreadnought.mod
+ship.urquan.graphics.captain = GFXRES:base/ships/urquan/dreadnought-cap.ani
+ship.urquan.graphics.dreadnought.large = GFXRES:base/ships/urquan/dreadnought-big.ani
+ship.urquan.graphics.dreadnought.medium = GFXRES:base/ships/urquan/dreadnought-med.ani
+ship.urquan.graphics.dreadnought.small = GFXRES:base/ships/urquan/dreadnought-sml.ani
+ship.urquan.graphics.fighter.large = GFXRES:base/ships/urquan/fighter-big.ani
+ship.urquan.graphics.fighter.medium = GFXRES:base/ships/urquan/fighter-med.ani
+ship.urquan.graphics.fighter.small = GFXRES:base/ships/urquan/fighter-sml.ani
 ship.urquan.graphics.fusion.large = GFXRES:base/ships/urquan/fusion.big
 ship.urquan.graphics.fusion.medium = GFXRES:base/ships/urquan/fusion.med
 ship.urquan.graphics.fusion.small = GFXRES:base/ships/urquan/fusion.sml
-ship.urquan.graphics.urquan.large = GFXRES:base/ships/urquan/urquan.big
-ship.urquan.graphics.urquan.medium = GFXRES:base/ships/urquan/urquan.med
-ship.urquan.graphics.urquan.small = GFXRES:base/ships/urquan/urquan.sml
-ship.urquan.icons = GFXRES:base/ships/urquan/urqicons.ani
-ship.urquan.meleeicons = GFXRES:base/ships/urquan/urqmicon.ani
-ship.urquan.sounds = SNDRES:base/ships/urquan/urqsound.snd
-ship.urquan.text = STRTAB:base/ships/urquan/urqtext.txt
+ship.urquan.icons = GFXRES:base/ships/urquan/dreadnought-icons.ani
+ship.urquan.meleeicons = GFXRES:base/ships/urquan/dreadnought-meleeicons.ani
+ship.urquan.sounds = SNDRES:base/ships/urquan/dreadnought.snd
+ship.urquan.text = STRTAB:base/ships/urquan/dreadnought.txt
 ship.utwig.code = SHIP:21
-ship.utwig.ditty = MUSICRES:base/ships/utwig/utwditty.mod
-ship.utwig.graphics.captain = GFXRES:base/ships/utwig/utwcap.ani
-ship.utwig.graphics.lan.large = GFXRES:base/ships/utwig/lanbig.ani
-ship.utwig.graphics.lan.medium = GFXRES:base/ships/utwig/lanmed.ani
-ship.utwig.graphics.lan.small = GFXRES:base/ships/utwig/lansml.ani
-ship.utwig.graphics.utwig.large = GFXRES:base/ships/utwig/utwig.big
-ship.utwig.graphics.utwig.medium = GFXRES:base/ships/utwig/utwig.med
-ship.utwig.graphics.utwig.small = GFXRES:base/ships/utwig/utwig.sml
-ship.utwig.icons = GFXRES:base/ships/utwig/utwicons.ani
-ship.utwig.meleeicons = GFXRES:base/ships/utwig/utwmicon.ani
-ship.utwig.sounds = SNDRES:base/ships/utwig/utwsound.snd
-ship.utwig.text = STRTAB:base/ships/utwig/utwtext.txt
+ship.utwig.ditty = MUSICRES:base/ships/utwig/jugger.mod
+ship.utwig.graphics.captain = GFXRES:base/ships/utwig/jugger-cap.ani
+ship.utwig.graphics.jugger.large = GFXRES:base/ships/utwig/jugger-big.ani
+ship.utwig.graphics.jugger.medium = GFXRES:base/ships/utwig/jugger-med.ani
+ship.utwig.graphics.jugger.small = GFXRES:base/ships/utwig/jugger-sml.ani
+ship.utwig.graphics.lance.large = GFXRES:base/ships/utwig/lance-big.ani
+ship.utwig.graphics.lance.medium = GFXRES:base/ships/utwig/lance-med.ani
+ship.utwig.graphics.lance.small = GFXRES:base/ships/utwig/lance-sml.ani
+ship.utwig.icons = GFXRES:base/ships/utwig/jugger-icons.ani
+ship.utwig.meleeicons = GFXRES:base/ships/utwig/jugger-meleeicons.ani
+ship.utwig.sounds = SNDRES:base/ships/utwig/jugger.snd
+ship.utwig.text = STRTAB:base/ships/utwig/jugger.txt
 ship.vux.code = SHIP:22
-ship.vux.ditty = MUSICRES:base/ships/vux/vuxditty.mod
-ship.vux.graphics.captain = GFXRES:base/ships/vux/vuxcap.ani
+ship.vux.ditty = MUSICRES:base/ships/vux/intruder.mod
+ship.vux.graphics.captain = GFXRES:base/ships/vux/intruder-cap.ani
+ship.vux.graphics.intruder.large = GFXRES:base/ships/vux/intruder-big.ani
+ship.vux.graphics.intruder.medium = GFXRES:base/ships/vux/intruder-med.ani
+ship.vux.graphics.intruder.small = GFXRES:base/ships/vux/intruder-sml.ani
 ship.vux.graphics.limpets.large = GFXRES:base/ships/vux/limpets.big
 ship.vux.graphics.limpets.medium = GFXRES:base/ships/vux/limpets.med
 ship.vux.graphics.limpets.small = GFXRES:base/ships/vux/limpets.sml
 ship.vux.graphics.slime = GFXRES:base/ships/vux/slime.ani
-ship.vux.graphics.vux.large = GFXRES:base/ships/vux/vux.big
-ship.vux.graphics.vux.medium = GFXRES:base/ships/vux/vux.med
-ship.vux.graphics.vux.small = GFXRES:base/ships/vux/vux.sml
-ship.vux.icons = GFXRES:base/ships/vux/vuxicons.ani
-ship.vux.meleeicons = GFXRES:base/ships/vux/vuxmicon.ani
-ship.vux.sounds = SNDRES:base/ships/vux/vuxsound.snd
-ship.vux.text = STRTAB:base/ships/vux/vuxtext.txt
+ship.vux.icons = GFXRES:base/ships/vux/intruder-icons.ani
+ship.vux.meleeicons = GFXRES:base/ships/vux/intruder-meleeicons.ani
+ship.vux.sounds = SNDRES:base/ships/vux/intruder.snd
+ship.vux.text = STRTAB:base/ships/vux/intruder.txt
 ship.yehat.code = SHIP:23
-ship.yehat.ditty = MUSICRES:base/ships/yehat/yehditty.mod
-ship.yehat.graphics.captain = GFXRES:base/ships/yehat/yehcap.ani
+ship.yehat.ditty = MUSICRES:base/ships/yehat/terminator.mod
+ship.yehat.graphics.captain = GFXRES:base/ships/yehat/terminator-cap.ani
 ship.yehat.graphics.missile.large = GFXRES:base/ships/yehat/missile.big
 ship.yehat.graphics.missile.medium = GFXRES:base/ships/yehat/missile.med
 ship.yehat.graphics.missile.small = GFXRES:base/ships/yehat/missile.sml
 ship.yehat.graphics.shield.large = GFXRES:base/ships/yehat/shield.big
 ship.yehat.graphics.shield.medium = GFXRES:base/ships/yehat/shield.med
 ship.yehat.graphics.shield.small = GFXRES:base/ships/yehat/shield.sml
-ship.yehat.graphics.yehat.large = GFXRES:base/ships/yehat/yehat.big
-ship.yehat.graphics.yehat.medium = GFXRES:base/ships/yehat/yehat.med
-ship.yehat.graphics.yehat.small = GFXRES:base/ships/yehat/yehat.sml
-ship.yehat.icons = GFXRES:base/ships/yehat/yehicons.ani
-ship.yehat.meleeicons = GFXRES:base/ships/yehat/yehmicon.ani
-ship.yehat.sounds = SNDRES:base/ships/yehat/yehsound.snd
-ship.yehat.text = STRTAB:base/ships/yehat/yehtext.txt
+ship.yehat.graphics.terminator.large = GFXRES:base/ships/yehat/terminator-big.ani
+ship.yehat.graphics.terminator.medium = GFXRES:base/ships/yehat/terminator-med.ani
+ship.yehat.graphics.terminator.small = GFXRES:base/ships/yehat/terminator-sml.ani
+ship.yehat.icons = GFXRES:base/ships/yehat/terminator-icons.ani
+ship.yehat.meleeicons = GFXRES:base/ships/yehat/terminator-meleeicons.ani
+ship.yehat.sounds = SNDRES:base/ships/yehat/terminator.snd
+ship.yehat.text = STRTAB:base/ships/yehat/terminator.txt
 ship.zoqfotpik.code = SHIP:24
-ship.zoqfotpik.ditty = MUSICRES:base/ships/zoqfot/zoqditty.mod
-ship.zoqfotpik.graphics.captain = GFXRES:base/ships/zoqfot/zoqcap.ani
-ship.zoqfotpik.graphics.spit.large = GFXRES:base/ships/zoqfot/spitbig.ani
-ship.zoqfotpik.graphics.spit.medium = GFXRES:base/ships/zoqfot/spitmed.ani
-ship.zoqfotpik.graphics.spit.small = GFXRES:base/ships/zoqfot/spitsml.ani
-ship.zoqfotpik.graphics.sti.large = GFXRES:base/ships/zoqfot/stibig.ani
-ship.zoqfotpik.graphics.sti.medium = GFXRES:base/ships/zoqfot/stimed.ani
-ship.zoqfotpik.graphics.sti.small = GFXRES:base/ships/zoqfot/stisml.ani
-ship.zoqfotpik.graphics.zoqfot.large = GFXRES:base/ships/zoqfot/zoqfot.big
-ship.zoqfotpik.graphics.zoqfot.medium = GFXRES:base/ships/zoqfot/zoqfot.med
-ship.zoqfotpik.graphics.zoqfot.small = GFXRES:base/ships/zoqfot/zoqfot.sml
-ship.zoqfotpik.icons = GFXRES:base/ships/zoqfot/zoqicons.ani
-ship.zoqfotpik.meleeicons = GFXRES:base/ships/zoqfot/zoqmicon.ani
-ship.zoqfotpik.sounds = SNDRES:base/ships/zoqfot/zoqsound.snd
-ship.zoqfotpik.text = STRTAB:base/ships/zoqfot/zoqtext.txt
+ship.zoqfotpik.ditty = MUSICRES:base/ships/zoqfotpik/stinger.mod
+ship.zoqfotpik.graphics.captain = GFXRES:base/ships/zoqfotpik/stinger-cap.ani
+ship.zoqfotpik.graphics.proboscis.large = GFXRES:base/ships/zoqfotpik/proboscis-big.ani
+ship.zoqfotpik.graphics.proboscis.medium = GFXRES:base/ships/zoqfotpik/proboscis-med.ani
+ship.zoqfotpik.graphics.proboscis.small = GFXRES:base/ships/zoqfotpik/proboscis-sml.ani
+ship.zoqfotpik.graphics.spit.large = GFXRES:base/ships/zoqfotpik/spit-big.ani
+ship.zoqfotpik.graphics.spit.medium = GFXRES:base/ships/zoqfotpik/spit-med.ani
+ship.zoqfotpik.graphics.spit.small = GFXRES:base/ships/zoqfotpik/spit-sml.ani
+ship.zoqfotpik.graphics.stinger.large = GFXRES:base/ships/zoqfotpik/stinger-big.ani
+ship.zoqfotpik.graphics.stinger.medium = GFXRES:base/ships/zoqfotpik/stinger-med.ani
+ship.zoqfotpik.graphics.stinger.small = GFXRES:base/ships/zoqfotpik/stinger-sml.ani
+ship.zoqfotpik.icons = GFXRES:base/ships/zoqfotpik/stinger-icons.ani
+ship.zoqfotpik.meleeicons = GFXRES:base/ships/zoqfotpik/stinger-meleeicons.ani
+ship.zoqfotpik.sounds = SNDRES:base/ships/zoqfotpik/stinger.snd
+ship.zoqfotpik.text = STRTAB:base/ships/zoqfotpik/stinger.txt
 slides.ending = STRTAB:base/cutscene/ending/ending.txt
 slides.intro = STRTAB:base/cutscene/intro/intro.txt
-sounds.game = SNDRES:base/battle/gamesnd.snd
-sounds.landsnds = SNDRES:base/lander/lander.snd
+sounds.battle = SNDRES:base/battle/battle.snd
+sounds.lander = SNDRES:base/lander/lander.snd
 sounds.menu = SNDRES:base/ui/menu.snd
-text.andruins = STRTAB:base/lander/energy/androsynth_ruins.txt
-text.aquhelix = STRTAB:base/lander/energy/aquahelix.txt
-text.burruins = STRTAB:base/lander/energy/burvixeseruins.txt
-text.chmmrbas = STRTAB:base/lander/energy/chmmrbase.txt
-text.drutrans = STRTAB:base/lander/energy/burvixcaster.txt
+text.androsynthruins = STRTAB:base/lander/energy/androsynth_ruins.txt
+text.aquahelix = STRTAB:base/lander/energy/aquahelix.txt
+text.burvixcaster = STRTAB:base/lander/energy/burvixcaster.txt
+text.burvixeseruins = STRTAB:base/lander/energy/burvixeseruins.txt
+text.chmmrbase = STRTAB:base/lander/energy/chmmrbase.txt
 text.eggcase = STRTAB:base/lander/energy/eggcase.txt
+text.fwiffo = STRTAB:base/lander/energy/fwiffo.txt
 text.joyalpha = STRTAB:base/ui/joyalpha.txt
 text.maidens = STRTAB:base/lander/energy/maidens.txt
 text.moonbase = STRTAB:base/lander/energy/moonbase.txt
 text.ruins = STRTAB:base/lander/energy/ruins.txt
 text.setupmenu = STRTAB:base/ui/setupmenu.txt
-text.spapluto = STRTAB:base/lander/energy/fwiffo.txt
 text.sphere = STRTAB:base/lander/energy/sphere.txt
 text.spindle = STRTAB:base/lander/energy/spindle.txt
 text.starcon = STRTAB:base/gamestrings.txt
-text.sundevic = STRTAB:base/lander/energy/sundevice.txt
-text.syrvault = STRTAB:base/lander/energy/syreenvault.txt
-text.taadevic = STRTAB:base/lander/energy/taalodevice.txt
-text.umgtrans = STRTAB:base/lander/energy/umgahcaster.txt
-text.urqwreck = STRTAB:base/lander/energy/urquanwreck.txt
-text.utwbomb = STRTAB:base/lander/energy/utwigbomb.txt
+text.sundevice = STRTAB:base/lander/energy/sundevice.txt
+text.syreenvault = STRTAB:base/lander/energy/syreenvault.txt
+text.taalodevice = STRTAB:base/lander/energy/taalodevice.txt
+text.umgahcaster = STRTAB:base/lander/energy/umgahcaster.txt
+text.urquanwreck = STRTAB:base/lander/energy/urquanwreck.txt
+text.utwigbomb = STRTAB:base/lander/energy/utwigbomb.txt
 text.vuxbeast = STRTAB:base/lander/bio/vuxbeast.txt
diff --git a/sc2/src/sc2code/comm/comandr/imusicre.h b/sc2/src/sc2code/comm/comandr/imusicre.h
index cf7cecbf7..676ca5926 100644
--- a/sc2/src/sc2code/comm/comandr/imusicre.h
+++ b/sc2/src/sc2code/comm/comandr/imusicre.h
@@ -2,6 +2,6 @@
    should not be edited directly.  Modify the master resource list
    instead and regenerate. */
 
-#define COMMANDER_LOWPOW_MUSIC "comm.comlowpw.music"
+#define COMMANDER_LOWPOW_MUSIC "comm.commander.lowpower.music"
 #define COMMANDER_MUSIC "comm.commander.music"
 #define STARBASE_ALT_MUSIC "comm.starbase.music"
diff --git a/sc2/src/sc2code/comm/utwig/imusicre.h b/sc2/src/sc2code/comm/utwig/imusicre.h
index 5c4817796..619016a0b 100644
--- a/sc2/src/sc2code/comm/utwig/imusicre.h
+++ b/sc2/src/sc2code/comm/utwig/imusicre.h
@@ -3,4 +3,4 @@
    instead and regenerate. */
 
 #define UTWIG_MUSIC "comm.utwig.music"
-#define UTWIG_ULTRON_MUSIC "comm.utwigult.music"
+#define UTWIG_ULTRON_MUSIC "comm.utwig.ultron.music"
diff --git a/sc2/src/sc2code/igfxres.h b/sc2/src/sc2code/igfxres.h
index 622c3466b..e31726d50 100644
--- a/sc2/src/sc2code/igfxres.h
+++ b/sc2/src/sc2code/igfxres.h
@@ -3,33 +3,33 @@
    instead and regenerate. */
 
 #define ACTIVITY_ANIM "graphics.activity"
-#define AMBIENT_MASK_PMAP_ANIM "graphics.ambanim"
-#define AQUA_MASK_PMAP_ANIM "graphics.aquhelix"
-#define ARISPACE_MASK_PMAP_ANIM "graphics.arispace"
-#define ASTEROID_BIG_MASK_PMAP_ANIM "graphics.astbig"
-#define ASTEROID_MED_MASK_PMAP_ANIM "graphics.astmed"
-#define ASTEROID_SML_MASK_PMAP_ANIM "graphics.astsml"
-#define BLAST_BIG_MASK_PMAP_ANIM "graphics.blabig"
-#define BLAST_MED_MASK_PMAP_ANIM "graphics.blamed"
-#define BLAST_SML_MASK_PMAP_ANIM "graphics.blasml"
-#define BOMB_MASK_PMAP_ANIM "graphics.utwbomb"
-#define BOOM_BIG_MASK_PMAP_ANIM "graphics.boobig"
-#define BOOM_MED_MASK_PMAP_ANIM "graphics.boomed"
-#define BOOM_SML_MASK_PMAP_ANIM "graphics.boosml"
-#define BURV_BCS_MASK_PMAP_ANIM "graphics.drutrans"
+#define AMBIENT_MASK_PMAP_ANIM "graphics.ambient"
+#define AQUA_MASK_PMAP_ANIM "graphics.aquahelix"
+#define ARISPACE_MASK_PMAP_ANIM "graphics.quasispace"
+#define ASTEROID_BIG_MASK_PMAP_ANIM "graphics.asteroid.large"
+#define ASTEROID_MED_MASK_PMAP_ANIM "graphics.asteroid.medium"
+#define ASTEROID_SML_MASK_PMAP_ANIM "graphics.asteroid.small"
+#define BLAST_BIG_MASK_PMAP_ANIM "graphics.blast.large"
+#define BLAST_MED_MASK_PMAP_ANIM "graphics.blast.medium"
+#define BLAST_SML_MASK_PMAP_ANIM "graphics.blast.small"
+#define BOMB_MASK_PMAP_ANIM "graphics.utwigbomb"
+#define BOOM_BIG_MASK_PMAP_ANIM "graphics.boom.large"
+#define BOOM_MED_MASK_PMAP_ANIM "graphics.boom.medium"
+#define BOOM_SML_MASK_PMAP_ANIM "graphics.boom.small"
+#define BURV_BCS_MASK_PMAP_ANIM "graphics.burvixcaster"
 #define CANNISTER_MASK_PMAP_ANIM "graphics.lifecan"
 #define CREDITS_BACK_ANIM "credits.background"
-#define EARTH_MASK_ANIM "graphics.eartmask"
+#define EARTH_MASK_ANIM "graphics.earthmask"
 #define EGG_CASE_MASK_PMAP_ANIM "graphics.eggcase"
-#define FLAGSTAT_MASK_PMAP_ANIM "graphics.flagstat"
-#define FONTGRAD_PMAP_ANIM "graphics.fontgrad"
-#define HYPERSTARS_MASK_PMAP_ANIM "graphics.hyperstr"
-#define IPBKGND_MASK_PMAP_ANIM "graphics.obbkgnd"
-#define LANDER_FONTEFF_PMAP_ANIM "graphics.landfeff"
-#define LANDER_LAUNCH_MASK_PMAP_ANIM "graphics.launch"
+#define FLAGSTAT_MASK_PMAP_ANIM "graphics.flagshipstatus"
+#define FONTGRAD_PMAP_ANIM "graphics.fontgradient"
+#define HYPERSTARS_MASK_PMAP_ANIM "graphics.hyperstars"
+#define IPBKGND_MASK_PMAP_ANIM "graphics.orbitbackground"
+#define LANDER_FONTEFF_PMAP_ANIM "graphics.landerfonteffect"
+#define LANDER_LAUNCH_MASK_PMAP_ANIM "graphics.landerlaunch"
 #define LANDER_MASK_PMAP_ANIM "graphics.lander"
-#define LANDER_RETURN_MASK_PMAP_ANIM "graphics.return"
-#define LANDER_SHIELD_MASK_ANIM "graphics.lndrshld"
+#define LANDER_RETURN_MASK_PMAP_ANIM "graphics.landerreturn"
+#define LANDER_SHIELD_MASK_ANIM "graphics.landershield"
 #define LAVA_MASK_PMAP_ANIM "graphics.lavaspot"
 #define LIFE00_MASK_PMAP_ANIM "graphics.life.0"
 #define LIFE01_MASK_PMAP_ANIM "graphics.life.1"
@@ -57,17 +57,17 @@
 #define LIFE23_MASK_PMAP_ANIM "graphics.life.23"
 #define LIFE24_MASK_PMAP_ANIM "graphics.life.24"
 #define LIFE25_MASK_PMAP_ANIM "graphics.life.25"
-#define LIGHTNING_MASK_ANIM "graphics.lightnin"
+#define LIGHTNING_MASK_ANIM "graphics.lightning"
 #define MAIDENS_MASK_PMAP_ANIM "graphics.maidens"
-#define MELEE_PICK_MASK_PMAP_ANIM "graphics.melee"
-#define MELEE_SCREEN_PMAP_ANIM "graphics.melebkgd"
+#define MELEE_PICK_MASK_PMAP_ANIM "graphics.meleepickship"
+#define MELEE_SCREEN_PMAP_ANIM "graphics.meleemenu"
 #define MENUBKG_PMAP_ANIM "graphics.setupmenu"
 #define MISCDATA_MASK_PMAP_ANIM "graphics.miscdata"
-#define MODULES_PMAP_ANIM "graphics.modules"
+#define MODULES_PMAP_ANIM "graphics.modulesmenu"
 #define MOONBASE_MASK_PMAP_ANIM "graphics.moonbase"
-#define ORBENTER_PMAP_ANIM "graphics.orbenter"
+#define ORBENTER_PMAP_ANIM "graphics.orbitenter"
 #define ORBIT_VIEW_ANIM "graphics.orbview"
-#define ORBPLAN_MASK_PMAP_ANIM "graphics.orbplan"
+#define ORBPLAN_MASK_PMAP_ANIM "graphics.planets"
 #define OUTFIT_PMAP_ANIM "graphics.outfit"
 #define PLANET00_BIG_MASK_PMAP_ANIM "planet.oolite.large"
 #define PLANET00_MED_MASK_PMAP_ANIM "planet.oolite.medium"
@@ -257,18 +257,18 @@
 #define SHIELDED_MED_MASK_PMAP_ANIM "planet.slaveshield.medium"
 #define SHIELDED_SML_MASK_PMAP_ANIM "planet.slaveshield.small"
 #define SHIPYARD_PMAP_ANIM "graphics.shipyard"
-#define SISBLU_MASK_ANIM "graphics.sisblu"
-#define SISIP_MASK_PMAP_ANIM "graphics.sis_ip"
-#define SISMODS_MASK_PMAP_ANIM "graphics.sismods"
-#define SISSKEL_MASK_PMAP_ANIM "graphics.sisskeleton"
-#define SPAPLUTO_MASK_PMAP_ANIM "graphics.spapluto"
+#define SISBLU_MASK_ANIM "graphics.blueprints"
+#define SISIP_MASK_PMAP_ANIM "graphics.flagship"
+#define SISMODS_MASK_PMAP_ANIM "graphics.outfitmodules"
+#define SISSKEL_MASK_PMAP_ANIM "graphics.flagshipskeleton"
+#define SPAPLUTO_MASK_PMAP_ANIM "graphics.fwiffo"
 #define STARBASE_ANIM "graphics.starbase"
 #define STAR_MASK_PMAP_ANIM "graphics.stars"
 #define STATUS_MASK_PMAP_ANIM "graphics.status"
-#define SUN_DEVICE_MASK_PMAP_ANIM "graphics.sundevic"
-#define SUN_MASK_PMAP_ANIM "graphics.ip_sun"
-#define TAALO_DEVICE_MASK_PMAP_ANIM "graphics.taadevic"
+#define SUN_DEVICE_MASK_PMAP_ANIM "graphics.sundevice"
+#define SUN_MASK_PMAP_ANIM "graphics.truespacesun"
+#define TAALO_DEVICE_MASK_PMAP_ANIM "graphics.taalodevice"
 #define TITLE_ANIM "graphics.title"
-#define UMGAH_BCS_MASK_PMAP_ANIM "graphics.umgtrans"
-#define VAULT_MASK_PMAP_ANIM "graphics.syrvault"
-#define WRECK_MASK_PMAP_ANIM "graphics.urqwreck"
+#define UMGAH_BCS_MASK_PMAP_ANIM "graphics.umgahcaster"
+#define VAULT_MASK_PMAP_ANIM "graphics.syreenvault"
+#define WRECK_MASK_PMAP_ANIM "graphics.urquanwreck"
diff --git a/sc2/src/sc2code/imusicre.h b/sc2/src/sc2code/imusicre.h
index 16dc49ac1..87d3ca413 100644
--- a/sc2/src/sc2code/imusicre.h
+++ b/sc2/src/sc2code/imusicre.h
@@ -4,7 +4,7 @@
 
 #define BATTLE_MUSIC "music.battle"
 #define CREDITS_MUSIC "music.credits"
-#define HYPERSPACE_MUSIC "music.hyper"
+#define HYPERSPACE_MUSIC "music.hyperspace"
 #define IP_MUSIC "music.space"
 #define MAINMENU_MUSIC "music.mainmenu"
 #define MELEE_MUSIC "music.meleemenu"
@@ -14,7 +14,7 @@
 #define ORBIT4_MUSIC "music.orbit4"
 #define ORBIT5_MUSIC "music.orbit5"
 #define OUTFIT_MUSIC "music.outfit"
-#define QUASISPACE_MUSIC "music.arispace"
+#define QUASISPACE_MUSIC "music.quasispace"
 #define REDALERT_MUSIC "music.redalert"
 #define SHIPYARD_MUSIC "music.shipyard"
 #define STARBASE_MUSIC "music.starbase"
diff --git a/sc2/src/sc2code/isndres.h b/sc2/src/sc2code/isndres.h
index 931685131..6de89e621 100644
--- a/sc2/src/sc2code/isndres.h
+++ b/sc2/src/sc2code/isndres.h
@@ -2,6 +2,6 @@
    should not be edited directly.  Modify the master resource list
    instead and regenerate. */
 
-#define GAME_SOUNDS "sounds.game"
-#define LANDER_SOUNDS "sounds.landsnds"
+#define GAME_SOUNDS "sounds.battle"
+#define LANDER_SOUNDS "sounds.lander"
 #define MENU_SOUNDS "sounds.menu"
diff --git a/sc2/src/sc2code/istrtab.h b/sc2/src/sc2code/istrtab.h
index 2a888bbb9..6f5983f7b 100644
--- a/sc2/src/sc2code/istrtab.h
+++ b/sc2/src/sc2code/istrtab.h
@@ -6,9 +6,9 @@
 #define ACID_XLAT_TAB "planet.acid.translatetable"
 #define ALKALI_COLOR_TAB "planet.alkali.colortable"
 #define ALKALI_XLAT_TAB "planet.alkali.translatetable"
-#define ANDROSYNTH_RUINS_STRTAB "text.andruins"
-#define AQUA_STRTAB "text.aquhelix"
-#define ARISPACE_COLOR_TAB "colortable.arispace"
+#define ANDROSYNTH_RUINS_STRTAB "text.androsynthruins"
+#define AQUA_STRTAB "text.aquahelix"
+#define ARISPACE_COLOR_TAB "colortable.quasispace"
 #define AURIC_COLOR_TAB "planet.auric.colortable"
 #define AURIC_XLAT_TAB "planet.auric.translatetable"
 #define AZURE_COLOR_TAB "planet.azure.colortable"
@@ -16,14 +16,14 @@
 #define BEAST_STRTAB "text.vuxbeast"
 #define BLU_GAS_COLOR_TAB "planet.bluegas.colortable"
 #define BLU_GAS_XLAT_TAB "planet.bluegas.translatetable"
-#define BOMB_STRTAB "text.utwbomb"
-#define BURV_BCS_STRTAB "text.drutrans"
-#define BURV_RUINS_STRTAB "text.burruins"
+#define BOMB_STRTAB "text.utwigbomb"
+#define BURV_BCS_STRTAB "text.burvixcaster"
+#define BURV_RUINS_STRTAB "text.burvixeseruins"
 #define CARBIDE_COLOR_TAB "planet.carbide.colortable"
 #define CARBIDE_XLAT_TAB "planet.carbide.translatetable"
 #define CHLORINE_COLOR_TAB "planet.chlorine.colortable"
 #define CHLORINE_XLAT_TAB "planet.chlorine.translatetable"
-#define CHMMR_BASE_STRTAB "text.chmmrbas"
+#define CHMMR_BASE_STRTAB "text.chmmrbase"
 #define CHONDRITE_COLOR_TAB "planet.chondrite.colortable"
 #define CHONDRITE_XLAT_TAB "planet.chondrite.translatetable"
 #define CIMMERIAN_COLOR_TAB "planet.cimmerian.colortable"
@@ -57,13 +57,13 @@
 #define HANGAR_COLOR_TAB "colortable.hangar"
 #define HYDROCARBON_COLOR_TAB "planet.hydrocarbon.colortable"
 #define HYDROCARBON_XLAT_TAB "planet.hydrocarbon.translatetable"
-#define HYPER_COLOR_TAB "colortable.hyperpal"
+#define HYPER_COLOR_TAB "colortable.hyperspace"
 #define INFRARED_COLOR_TAB "planet.infrared.colortable"
 #define INFRARED_XLAT_TAB "planet.infrared.translatetable"
 #define INTROPRES_STRTAB "slides.intro"
 #define IODINE_COLOR_TAB "planet.iodine.colortable"
 #define IODINE_XLAT_TAB "planet.iodine.translatetable"
-#define IPSUN_COLOR_MAP "colortable.ip_sun"
+#define IPSUN_COLOR_MAP "colortable.truespace"
 #define JOYSTICK_ALPHA_STRTAB "text.joyalpha"
 #define LANTHANIDE_COLOR_TAB "planet.lanthanide.colortable"
 #define LANTHANIDE_XLAT_TAB "planet.lanthanide.translatetable"
@@ -119,13 +119,13 @@
 #define SETUP_MENU_STRTAB "text.setupmenu"
 #define SHATTERED_COLOR_TAB "planet.shattered.colortable"
 #define SHATTERED_XLAT_TAB "planet.shattered.translatetable"
-#define SPAPLUTO_STRTAB "text.spapluto"
-#define STARCON_COLOR_MAP "colortable.scclrtab"
+#define SPAPLUTO_STRTAB "text.fwiffo"
+#define STARCON_COLOR_MAP "colortable.main"
 #define STARCON_GAME_STRINGS "text.starcon"
-#define SUN_DEVICE_STRTAB "text.sundevic"
+#define SUN_DEVICE_STRTAB "text.sundevice"
 #define SUPER_DENSE_COLOR_TAB "planet.superdense.colortable"
 #define SUPER_DENSE_XLAT_TAB "planet.superdense.translatetable"
-#define TAALO_DEVICE_STRTAB "text.taadevic"
+#define TAALO_DEVICE_STRTAB "text.taalodevice"
 #define TELLURIC_COLOR_TAB "planet.telluric.colortable"
 #define TELLURIC_XLAT_TAB "planet.telluric.translatetable"
 #define TREASURE_COLOR_TAB "planet.treasure.colortable"
@@ -134,17 +134,17 @@
 #define ULTRAMARINE_XLAT_TAB "planet.ultramarine.translatetable"
 #define ULTRAVIOLET_COLOR_TAB "planet.ultraviolet.colortable"
 #define ULTRAVIOLET_XLAT_TAB "planet.ultraviolet.translatetable"
-#define UMGAH_BCS_STRTAB "text.umgtrans"
+#define UMGAH_BCS_STRTAB "text.umgahcaster"
 #define UREA_COLOR_TAB "planet.urea.colortable"
 #define UREA_XLAT_TAB "planet.urea.translatetable"
-#define VAULT_STRTAB "text.syrvault"
+#define VAULT_STRTAB "text.syreenvault"
 #define VINYLOGOUS_COLOR_TAB "planet.vinylogous.colortable"
 #define VINYLOGOUS_XLAT_TAB "planet.vinylogous.translatetable"
 #define VIO_GAS_COLOR_TAB "planet.violetgas.colortable"
 #define VIO_GAS_XLAT_TAB "planet.violetgas.translatetable"
 #define WATER_COLOR_TAB "planet.water.colortable"
 #define WATER_XLAT_TAB "planet.water.translatetable"
-#define WRECK_STRTAB "text.urqwreck"
+#define WRECK_STRTAB "text.urquanwreck"
 #define XENOLITHIC_COLOR_TAB "planet.xenolithic.colortable"
 #define XENOLITHIC_XLAT_TAB "planet.xenolithic.translatetable"
 #define YEL_GAS_COLOR_TAB "planet.yellowgas.colortable"
diff --git a/sc2/src/uqmversion.h b/sc2/src/uqmversion.h
index fb0c33aec..29ce93903 100644
--- a/sc2/src/uqmversion.h
+++ b/sc2/src/uqmversion.h
@@ -21,8 +21,8 @@
 #define UQM_MAJOR_VERSION_S  "0"
 #define UQM_MINOR_VERSION     6
 #define UQM_MINOR_VERSION_S  "6"
-#define UQM_PATCH_VERSION     5
-#define UQM_PATCH_VERSION_S  "5"
+#define UQM_PATCH_VERSION     6
+#define UQM_PATCH_VERSION_S  "6"
 #define UQM_EXTRA_VERSION    ""
 /* The final version is interpreted as:
  * printf ("%d.%d.%d%s", UQM_MAJOR_VERSION, UQM_MINOR_VERSION,
diff --git a/tools/resmap/resources.csv b/tools/resmap/resources.csv
index 3e8a25b8f..f15d96203 100644
--- a/tools/resmap/resources.csv
+++ b/tools/resmap/resources.csv
@@ -1,5 +1,5 @@
-HYPERSPACE_MUSIC,music.hyper,sc2code/imusicre.h,MUSICRES,base/nav/hyper.mod
-QUASISPACE_MUSIC,music.arispace,sc2code/imusicre.h,MUSICRES,base/nav/quasispace.mod
+HYPERSPACE_MUSIC,music.hyperspace,sc2code/imusicre.h,MUSICRES,base/nav/hyper.mod
+QUASISPACE_MUSIC,music.quasispace,sc2code/imusicre.h,MUSICRES,base/nav/quasispace.mod
 IP_MUSIC,music.space,sc2code/imusicre.h,MUSICRES,base/nav/space.mod
 ORBIT1_MUSIC,music.orbit1,sc2code/imusicre.h,MUSICRES,base/nav/orbit.mod
 ORBIT2_MUSIC,music.orbit2,sc2code/imusicre.h,MUSICRES,base/nav/orbit.mod
@@ -22,10 +22,10 @@ PLAYER_FONT,font.player,sc2code/ifontres.h,FONTRES,base/fonts/player.fon
 PT13AA_FONT,credits.font.pt13,sc2code/ifontres.h,FONTRES,base/fonts/pt13.fon
 PT17AA_FONT,credits.font.pt17,sc2code/ifontres.h,FONTRES,base/fonts/pt17.fon
 PT45AA_FONT,credits.font.pt45,sc2code/ifontres.h,FONTRES,base/fonts/pt45.fon
-STARCON_COLOR_MAP,colortable.scclrtab,sc2code/istrtab.h,BINTAB,base/uqm.ct
+STARCON_COLOR_MAP,colortable.main,sc2code/istrtab.h,BINTAB,base/uqm.ct
 STARCON_GAME_STRINGS,text.starcon,sc2code/istrtab.h,STRTAB,base/gamestrings.txt
-HYPER_COLOR_TAB,colortable.hyperpal,sc2code/istrtab.h,BINTAB,base/nav/hyperspace.ct
-ARISPACE_COLOR_TAB,colortable.arispace,sc2code/istrtab.h,BINTAB,base/nav/quasispace.ct
+HYPER_COLOR_TAB,colortable.hyperspace,sc2code/istrtab.h,BINTAB,base/nav/hyperspace.ct
+ARISPACE_COLOR_TAB,colortable.quasispace,sc2code/istrtab.h,BINTAB,base/nav/quasispace.ct
 ORBPLAN_COLOR_MAP,colortable.orbplan,sc2code/istrtab.h,BINTAB,base/lander/orbit.ct
 OOLITE_COLOR_TAB,planet.oolite.colortable,sc2code/istrtab.h,BINTAB,base/planets/oolite.ct
 OOLITE_XLAT_TAB,planet.oolite.translatetable,sc2code/istrtab.h,BINTAB,base/planets/oolite.xlt
@@ -147,24 +147,24 @@ YEL_GAS_COLOR_TAB,planet.yellowgas.colortable,sc2code/istrtab.h,BINTAB,base/plan
 YEL_GAS_XLAT_TAB,planet.yellowgas.translatetable,sc2code/istrtab.h,BINTAB,base/planets/gasgiant.xlt
 MOONBASE_STRTAB,text.moonbase,sc2code/istrtab.h,STRTAB,base/lander/energy/moonbase.txt
 MAIDENS_STRTAB,text.maidens,sc2code/istrtab.h,STRTAB,base/lander/energy/maidens.txt
-CHMMR_BASE_STRTAB,text.chmmrbas,sc2code/istrtab.h,STRTAB,base/lander/energy/chmmrbase.txt
-AQUA_STRTAB,text.aquhelix,sc2code/istrtab.h,STRTAB,base/lander/energy/aquahelix.txt
-BURV_BCS_STRTAB,text.drutrans,sc2code/istrtab.h,STRTAB,base/lander/energy/burvixcaster.txt
-TAALO_DEVICE_STRTAB,text.taadevic,sc2code/istrtab.h,STRTAB,base/lander/energy/taalodevice.txt
-SUN_DEVICE_STRTAB,text.sundevic,sc2code/istrtab.h,STRTAB,base/lander/energy/sundevice.txt
-VAULT_STRTAB,text.syrvault,sc2code/istrtab.h,STRTAB,base/lander/energy/syreenvault.txt
-WRECK_STRTAB,text.urqwreck,sc2code/istrtab.h,STRTAB,base/lander/energy/urquanwreck.txt
-BOMB_STRTAB,text.utwbomb,sc2code/istrtab.h,STRTAB,base/lander/energy/utwigbomb.txt
+CHMMR_BASE_STRTAB,text.chmmrbase,sc2code/istrtab.h,STRTAB,base/lander/energy/chmmrbase.txt
+AQUA_STRTAB,text.aquahelix,sc2code/istrtab.h,STRTAB,base/lander/energy/aquahelix.txt
+BURV_BCS_STRTAB,text.burvixcaster,sc2code/istrtab.h,STRTAB,base/lander/energy/burvixcaster.txt
+TAALO_DEVICE_STRTAB,text.taalodevice,sc2code/istrtab.h,STRTAB,base/lander/energy/taalodevice.txt
+SUN_DEVICE_STRTAB,text.sundevice,sc2code/istrtab.h,STRTAB,base/lander/energy/sundevice.txt
+VAULT_STRTAB,text.syreenvault,sc2code/istrtab.h,STRTAB,base/lander/energy/syreenvault.txt
+WRECK_STRTAB,text.urquanwreck,sc2code/istrtab.h,STRTAB,base/lander/energy/urquanwreck.txt
+BOMB_STRTAB,text.utwigbomb,sc2code/istrtab.h,STRTAB,base/lander/energy/utwigbomb.txt
 BEAST_STRTAB,text.vuxbeast,sc2code/istrtab.h,STRTAB,base/lander/bio/vuxbeast.txt
 EGG_CASE_STRTAB,text.eggcase,sc2code/istrtab.h,STRTAB,base/lander/energy/eggcase.txt
-SPAPLUTO_STRTAB,text.spapluto,sc2code/istrtab.h,STRTAB,base/lander/energy/fwiffo.txt
-BURV_RUINS_STRTAB,text.burruins,sc2code/istrtab.h,STRTAB,base/lander/energy/burvixeseruins.txt
-ANDROSYNTH_RUINS_STRTAB,text.andruins,sc2code/istrtab.h,STRTAB,base/lander/energy/androsynth_ruins.txt
+SPAPLUTO_STRTAB,text.fwiffo,sc2code/istrtab.h,STRTAB,base/lander/energy/fwiffo.txt
+BURV_RUINS_STRTAB,text.burvixeseruins,sc2code/istrtab.h,STRTAB,base/lander/energy/burvixeseruins.txt
+ANDROSYNTH_RUINS_STRTAB,text.androsynthruins,sc2code/istrtab.h,STRTAB,base/lander/energy/androsynth_ruins.txt
 DRUUGE_RUINS_STRTAB,text.sphere,sc2code/istrtab.h,STRTAB,base/lander/energy/sphere.txt
 PKUNK_RUINS_STRTAB,text.spindle,sc2code/istrtab.h,STRTAB,base/lander/energy/spindle.txt
 RUINS_STRTAB,text.ruins,sc2code/istrtab.h,STRTAB,base/lander/energy/ruins.txt
-UMGAH_BCS_STRTAB,text.umgtrans,sc2code/istrtab.h,STRTAB,base/lander/energy/umgahcaster.txt
-IPSUN_COLOR_MAP,colortable.ip_sun,sc2code/istrtab.h,BINTAB,base/nav/truespace.ct
+UMGAH_BCS_STRTAB,text.umgahcaster,sc2code/istrtab.h,STRTAB,base/lander/energy/umgahcaster.txt
+IPSUN_COLOR_MAP,colortable.truespace,sc2code/istrtab.h,BINTAB,base/nav/truespace.ct
 HANGAR_COLOR_TAB,colortable.hangar,sc2code/istrtab.h,BINTAB,base/ui/hangar.ct
 INTROPRES_STRTAB,slides.intro,sc2code/istrtab.h,STRTAB,base/cutscene/intro/intro.txt
 FINALPRES_STRTAB,slides.ending,sc2code/istrtab.h,STRTAB,base/cutscene/ending/ending.txt
@@ -172,40 +172,40 @@ CREDITS_STRTAB,credits.credits,sc2code/istrtab.h,STRTAB,base/cutscene/credits/cr
 JOYSTICK_ALPHA_STRTAB,text.joyalpha,sc2code/istrtab.h,STRTAB,base/ui/joyalpha.txt
 SETUP_MENU_STRTAB,text.setupmenu,sc2code/istrtab.h,STRTAB,base/ui/setupmenu.txt
 MENU_SOUNDS,sounds.menu,sc2code/isndres.h,SNDRES,base/ui/menu.snd
-GAME_SOUNDS,sounds.game,sc2code/isndres.h,SNDRES,base/battle/gamesnd.snd
-LANDER_SOUNDS,sounds.landsnds,sc2code/isndres.h,SNDRES,base/lander/lander.snd
+GAME_SOUNDS,sounds.battle,sc2code/isndres.h,SNDRES,base/battle/battle.snd
+LANDER_SOUNDS,sounds.lander,sc2code/isndres.h,SNDRES,base/lander/lander.snd
 TITLE_ANIM,graphics.title,sc2code/igfxres.h,GFXRES,base/ui/title.ani
 STATUS_MASK_PMAP_ANIM,graphics.status,sc2code/igfxres.h,GFXRES,base/ui/status.ani
 ACTIVITY_ANIM,graphics.activity,sc2code/igfxres.h,GFXRES,base/ui/activity.ani
 PLAYMENU_ANIM,graphics.playmenu,sc2code/igfxres.h,GFXRES,base/ui/playmenu.ani
-FLAGSTAT_MASK_PMAP_ANIM,graphics.flagstat,sc2code/igfxres.h,GFXRES,base/ui/flagstat.ani
+FLAGSTAT_MASK_PMAP_ANIM,graphics.flagshipstatus,sc2code/igfxres.h,GFXRES,base/ui/flagshipstatus.ani
 MISCDATA_MASK_PMAP_ANIM,graphics.miscdata,sc2code/igfxres.h,GFXRES,base/ui/miscdata.ani
 STAR_MASK_PMAP_ANIM,graphics.stars,sc2code/igfxres.h,GFXRES,base/battle/stars.ani
-ASTEROID_BIG_MASK_PMAP_ANIM,graphics.astbig,sc2code/igfxres.h,GFXRES,base/battle/asteroid.big
-ASTEROID_MED_MASK_PMAP_ANIM,graphics.astmed,sc2code/igfxres.h,GFXRES,base/battle/asteroid.med
-ASTEROID_SML_MASK_PMAP_ANIM,graphics.astsml,sc2code/igfxres.h,GFXRES,base/battle/asteroid.sml
-BLAST_BIG_MASK_PMAP_ANIM,graphics.blabig,sc2code/igfxres.h,GFXRES,base/battle/blabig.ani
-BLAST_MED_MASK_PMAP_ANIM,graphics.blamed,sc2code/igfxres.h,GFXRES,base/battle/blamed.ani
-BLAST_SML_MASK_PMAP_ANIM,graphics.blasml,sc2code/igfxres.h,GFXRES,base/battle/blasml.ani
-BOOM_BIG_MASK_PMAP_ANIM,graphics.boobig,sc2code/igfxres.h,GFXRES,base/battle/boobig.ani
-BOOM_MED_MASK_PMAP_ANIM,graphics.boomed,sc2code/igfxres.h,GFXRES,base/battle/boomed.ani
-BOOM_SML_MASK_PMAP_ANIM,graphics.boosml,sc2code/igfxres.h,GFXRES,base/battle/boosml.ani
-AMBIENT_MASK_PMAP_ANIM,graphics.ambanim,sc2code/igfxres.h,GFXRES,base/nav/ambientanim.ani
-HYPERSTARS_MASK_PMAP_ANIM,graphics.hyperstr,sc2code/igfxres.h,GFXRES,base/nav/hyperstr.ani
-ARISPACE_MASK_PMAP_ANIM,graphics.arispace,sc2code/igfxres.h,GFXRES,base/nav/quasispace.ani
-IPBKGND_MASK_PMAP_ANIM,graphics.obbkgnd,sc2code/igfxres.h,GFXRES,base/nav/obbkgnd.ani
-SISIP_MASK_PMAP_ANIM,graphics.sis_ip,sc2code/igfxres.h,GFXRES,base/nav/sis_ip.ani
-ORBPLAN_MASK_PMAP_ANIM,graphics.orbplan,sc2code/igfxres.h,GFXRES,base/nav/orbplan.ani
-SUN_MASK_PMAP_ANIM,graphics.ip_sun,sc2code/igfxres.h,GFXRES,base/nav/ip_sun.ani
+ASTEROID_BIG_MASK_PMAP_ANIM,graphics.asteroid.large,sc2code/igfxres.h,GFXRES,base/battle/asteroid-big.ani
+ASTEROID_MED_MASK_PMAP_ANIM,graphics.asteroid.medium,sc2code/igfxres.h,GFXRES,base/battle/asteroid-med.ani
+ASTEROID_SML_MASK_PMAP_ANIM,graphics.asteroid.small,sc2code/igfxres.h,GFXRES,base/battle/asteroid-sml.ani
+BLAST_BIG_MASK_PMAP_ANIM,graphics.blast.large,sc2code/igfxres.h,GFXRES,base/battle/blast-big.ani
+BLAST_MED_MASK_PMAP_ANIM,graphics.blast.medium,sc2code/igfxres.h,GFXRES,base/battle/blast-med.ani
+BLAST_SML_MASK_PMAP_ANIM,graphics.blast.small,sc2code/igfxres.h,GFXRES,base/battle/blast-sml.ani
+BOOM_BIG_MASK_PMAP_ANIM,graphics.boom.large,sc2code/igfxres.h,GFXRES,base/battle/boom-big.ani
+BOOM_MED_MASK_PMAP_ANIM,graphics.boom.medium,sc2code/igfxres.h,GFXRES,base/battle/boom-med.ani
+BOOM_SML_MASK_PMAP_ANIM,graphics.boom.small,sc2code/igfxres.h,GFXRES,base/battle/boom-sml.ani
+AMBIENT_MASK_PMAP_ANIM,graphics.ambient,sc2code/igfxres.h,GFXRES,base/nav/ambient.ani
+HYPERSTARS_MASK_PMAP_ANIM,graphics.hyperstars,sc2code/igfxres.h,GFXRES,base/nav/hyperstars.ani
+ARISPACE_MASK_PMAP_ANIM,graphics.quasispace,sc2code/igfxres.h,GFXRES,base/nav/quasispace.ani
+IPBKGND_MASK_PMAP_ANIM,graphics.orbitbackground,sc2code/igfxres.h,GFXRES,base/nav/orbitbackground.ani
+SISIP_MASK_PMAP_ANIM,graphics.flagship,sc2code/igfxres.h,GFXRES,base/nav/flagship.ani
+ORBPLAN_MASK_PMAP_ANIM,graphics.planets,sc2code/igfxres.h,GFXRES,base/nav/planets.ani
+SUN_MASK_PMAP_ANIM,graphics.truespacesun,sc2code/igfxres.h,GFXRES,base/nav/truespacesun.ani
 LANDER_MASK_PMAP_ANIM,graphics.lander,sc2code/igfxres.h,GFXRES,base/lander/lander.ani
 QUAKE_MASK_PMAP_ANIM,graphics.quake,sc2code/igfxres.h,GFXRES,base/lander/hazard/quake.ani
-LIGHTNING_MASK_ANIM,graphics.lightnin,sc2code/igfxres.h,GFXRES,base/lander/lightning.ani
+LIGHTNING_MASK_ANIM,graphics.lightning,sc2code/igfxres.h,GFXRES,base/lander/hazard/lightning.ani
 LAVA_MASK_PMAP_ANIM,graphics.lavaspot,sc2code/igfxres.h,GFXRES,base/lander/hazard/lavaspot.ani
-LANDER_SHIELD_MASK_ANIM,graphics.lndrshld,sc2code/igfxres.h,GFXRES,base/lander/shield.ani
-LANDER_LAUNCH_MASK_PMAP_ANIM,graphics.launch,sc2code/igfxres.h,GFXRES,base/lander/launch.ani
-LANDER_RETURN_MASK_PMAP_ANIM,graphics.return,sc2code/igfxres.h,GFXRES,base/lander/return.ani
+LANDER_SHIELD_MASK_ANIM,graphics.landershield,sc2code/igfxres.h,GFXRES,base/lander/shield.ani
+LANDER_LAUNCH_MASK_PMAP_ANIM,graphics.landerlaunch,sc2code/igfxres.h,GFXRES,base/lander/launch.ani
+LANDER_RETURN_MASK_PMAP_ANIM,graphics.landerreturn,sc2code/igfxres.h,GFXRES,base/lander/return.ani
 ORBIT_VIEW_ANIM,graphics.orbview,sc2code/igfxres.h,GFXRES,base/nav/orbview.ani
-EARTH_MASK_ANIM,graphics.eartmask,sc2code/igfxres.h,GFXRES,base/planets/earthmask.ani
+EARTH_MASK_ANIM,graphics.earthmask,sc2code/igfxres.h,GFXRES,base/planets/earthmask.ani
 CANNISTER_MASK_PMAP_ANIM,graphics.lifecan,sc2code/igfxres.h,GFXRES,base/lander/bio/lifecan.ani
 LIFE00_MASK_PMAP_ANIM,graphics.life.0,sc2code/igfxres.h,GFXRES,base/lander/bio/lifea.ani
 LIFE01_MASK_PMAP_ANIM,graphics.life.1,sc2code/igfxres.h,GFXRES,base/lander/bio/lifeb.ani
@@ -235,215 +235,215 @@ LIFE24_MASK_PMAP_ANIM,graphics.life.24,sc2code/igfxres.h,GFXRES,base/lander/bio/
 LIFE25_MASK_PMAP_ANIM,graphics.life.25,sc2code/igfxres.h,GFXRES,base/lander/bio/lifez.ani
 MOONBASE_MASK_PMAP_ANIM,graphics.moonbase,sc2code/igfxres.h,GFXRES,base/lander/energy/moonbase.ani
 MAIDENS_MASK_PMAP_ANIM,graphics.maidens,sc2code/igfxres.h,GFXRES,base/lander/energy/maidens.ani
-AQUA_MASK_PMAP_ANIM,graphics.aquhelix,sc2code/igfxres.h,GFXRES,base/lander/energy/aquahelix.ani
-BURV_BCS_MASK_PMAP_ANIM,graphics.drutrans,sc2code/igfxres.h,GFXRES,base/lander/energy/burvixcaster.ani
-TAALO_DEVICE_MASK_PMAP_ANIM,graphics.taadevic,sc2code/igfxres.h,GFXRES,base/lander/energy/taalodevice.ani
-SUN_DEVICE_MASK_PMAP_ANIM,graphics.sundevic,sc2code/igfxres.h,GFXRES,base/lander/energy/sundevice.ani
-VAULT_MASK_PMAP_ANIM,graphics.syrvault,sc2code/igfxres.h,GFXRES,base/lander/energy/syreenvault.ani
-WRECK_MASK_PMAP_ANIM,graphics.urqwreck,sc2code/igfxres.h,GFXRES,base/lander/energy/urquanwreck.ani
-BOMB_MASK_PMAP_ANIM,graphics.utwbomb,sc2code/igfxres.h,GFXRES,base/lander/energy/utwigbomb.ani
+AQUA_MASK_PMAP_ANIM,graphics.aquahelix,sc2code/igfxres.h,GFXRES,base/lander/energy/aquahelix.ani
+BURV_BCS_MASK_PMAP_ANIM,graphics.burvixcaster,sc2code/igfxres.h,GFXRES,base/lander/energy/burvixcaster.ani
+TAALO_DEVICE_MASK_PMAP_ANIM,graphics.taalodevice,sc2code/igfxres.h,GFXRES,base/lander/energy/taalodevice.ani
+SUN_DEVICE_MASK_PMAP_ANIM,graphics.sundevice,sc2code/igfxres.h,GFXRES,base/lander/energy/sundevice.ani
+VAULT_MASK_PMAP_ANIM,graphics.syreenvault,sc2code/igfxres.h,GFXRES,base/lander/energy/syreenvault.ani
+WRECK_MASK_PMAP_ANIM,graphics.urquanwreck,sc2code/igfxres.h,GFXRES,base/lander/energy/urquanwreck.ani
+BOMB_MASK_PMAP_ANIM,graphics.utwigbomb,sc2code/igfxres.h,GFXRES,base/lander/energy/utwigbomb.ani
 EGG_CASE_MASK_PMAP_ANIM,graphics.eggcase,sc2code/igfxres.h,GFXRES,base/lander/energy/eggcase.ani
-SPAPLUTO_MASK_PMAP_ANIM,graphics.spapluto,sc2code/igfxres.h,GFXRES,base/lander/energy/fwiffo.ani
+SPAPLUTO_MASK_PMAP_ANIM,graphics.fwiffo,sc2code/igfxres.h,GFXRES,base/lander/energy/fwiffo.ani
 RUINS_MASK_PMAP_ANIM,graphics.ruins,sc2code/igfxres.h,GFXRES,base/lander/energy/ruins.ani
-UMGAH_BCS_MASK_PMAP_ANIM,graphics.umgtrans,sc2code/igfxres.h,GFXRES,base/lander/energy/umgahcaster.ani
-MELEE_SCREEN_PMAP_ANIM,graphics.melebkgd,sc2code/igfxres.h,GFXRES,base/ui/meleebackground.ani
-MELEE_PICK_MASK_PMAP_ANIM,graphics.melee,sc2code/igfxres.h,GFXRES,base/ui/melee.ani
+UMGAH_BCS_MASK_PMAP_ANIM,graphics.umgahcaster,sc2code/igfxres.h,GFXRES,base/lander/energy/umgahcaster.ani
+MELEE_SCREEN_PMAP_ANIM,graphics.meleemenu,sc2code/igfxres.h,GFXRES,base/ui/meleemenu.ani
+MELEE_PICK_MASK_PMAP_ANIM,graphics.meleepickship,sc2code/igfxres.h,GFXRES,base/ui/meleepickship.ani
 SEGUE_PMAP_ANIM,graphics.segue,sc2code/igfxres.h,GFXRES,base/ui/segue.ani
 SC2_PICK_PMAP_ANIM,graphics.pickship,sc2code/igfxres.h,GFXRES,base/ui/pickship.ani
 RESTART_PMAP_ANIM,graphics.newgame,sc2code/igfxres.h,GFXRES,base/ui/newgame.ani
-MODULES_PMAP_ANIM,graphics.modules,sc2code/igfxres.h,GFXRES,base/ui/modules.ani
-SISMODS_MASK_PMAP_ANIM,graphics.sismods,sc2code/igfxres.h,GFXRES,base/ui/sismodules.ani
+MODULES_PMAP_ANIM,graphics.modulesmenu,sc2code/igfxres.h,GFXRES,base/ui/modulesmenu.ani
+SISMODS_MASK_PMAP_ANIM,graphics.outfitmodules,sc2code/igfxres.h,GFXRES,base/ui/outfitmodules.ani
 OUTFIT_PMAP_ANIM,graphics.outfit,sc2code/igfxres.h,GFXRES,base/ui/outfit.ani
-SISBLU_MASK_ANIM,graphics.sisblu,sc2code/igfxres.h,GFXRES,base/ui/sisblueprint.ani
+SISBLU_MASK_ANIM,graphics.blueprints,sc2code/igfxres.h,GFXRES,base/ui/blueprints.ani
 SHIPYARD_PMAP_ANIM,graphics.shipyard,sc2code/igfxres.h,GFXRES,base/ui/shipyard.ani
 STARBASE_ANIM,graphics.starbase,sc2code/igfxres.h,GFXRES,base/ui/starbase.ani
-SAMATRA_BIG_MASK_PMAP_ANIM,planet.samatra.large,sc2code/igfxres.h,GFXRES,base/planets/sam__big.ani
-SHIELDED_BIG_MASK_PMAP_ANIM,planet.slaveshield.large,sc2code/igfxres.h,GFXRES,base/planets/shie_big.ani
-SHIELDED_MED_MASK_PMAP_ANIM,planet.slaveshield.medium,sc2code/igfxres.h,GFXRES,base/planets/shie_med.ani
-SHIELDED_SML_MASK_PMAP_ANIM,planet.slaveshield.small,sc2code/igfxres.h,GFXRES,base/planets/shie_sml.ani
-PLANET00_BIG_MASK_PMAP_ANIM,planet.oolite.large,sc2code/igfxres.h,GFXRES,base/planets/ool__big.ani
-PLANET00_MED_MASK_PMAP_ANIM,planet.oolite.medium,sc2code/igfxres.h,GFXRES,base/planets/ool__med.ani
-PLANET00_SML_MASK_PMAP_ANIM,planet.oolite.small,sc2code/igfxres.h,GFXRES,base/planets/ool__sml.ani
-PLANET01_BIG_MASK_PMAP_ANIM,planet.yttric.large,sc2code/igfxres.h,GFXRES,base/planets/ytt__big.ani
-PLANET01_MED_MASK_PMAP_ANIM,planet.yttric.medium,sc2code/igfxres.h,GFXRES,base/planets/ytt__med.ani
-PLANET01_SML_MASK_PMAP_ANIM,planet.yttric.small,sc2code/igfxres.h,GFXRES,base/planets/ytt__sml.ani
-PLANET02_BIG_MASK_PMAP_ANIM,planet.quasidegenerate.large,sc2code/igfxres.h,GFXRES,base/planets/deg__big.ani
-PLANET02_MED_MASK_PMAP_ANIM,planet.quasidegenerate.medium,sc2code/igfxres.h,GFXRES,base/planets/deg__med.ani
-PLANET02_SML_MASK_PMAP_ANIM,planet.quasidegenerate.small,sc2code/igfxres.h,GFXRES,base/planets/deg__sml.ani
-PLANET03_BIG_MASK_PMAP_ANIM,planet.lanthanide.large,sc2code/igfxres.h,GFXRES,base/planets/lan__big.ani
-PLANET03_MED_MASK_PMAP_ANIM,planet.lanthanide.medium,sc2code/igfxres.h,GFXRES,base/planets/lan__med.ani
-PLANET03_SML_MASK_PMAP_ANIM,planet.lanthanide.small,sc2code/igfxres.h,GFXRES,base/planets/lan__sml.ani
-PLANET04_BIG_MASK_PMAP_ANIM,planet.treasure.large,sc2code/igfxres.h,GFXRES,base/planets/tre__big.ani
-PLANET04_MED_MASK_PMAP_ANIM,planet.treasure.medium,sc2code/igfxres.h,GFXRES,base/planets/tre__med.ani
-PLANET04_SML_MASK_PMAP_ANIM,planet.treasure.small,sc2code/igfxres.h,GFXRES,base/planets/tre__sml.ani
-PLANET05_BIG_MASK_PMAP_ANIM,planet.urea.large,sc2code/igfxres.h,GFXRES,base/planets/ure__big.ani
-PLANET05_MED_MASK_PMAP_ANIM,planet.urea.medium,sc2code/igfxres.h,GFXRES,base/planets/ure__med.ani
-PLANET05_SML_MASK_PMAP_ANIM,planet.urea.small,sc2code/igfxres.h,GFXRES,base/planets/ure__sml.ani
-PLANET06_BIG_MASK_PMAP_ANIM,planet.metal.large,sc2code/igfxres.h,GFXRES,base/planets/mtl__big.ani
-PLANET06_MED_MASK_PMAP_ANIM,planet.metal.medium,sc2code/igfxres.h,GFXRES,base/planets/mtl__med.ani
-PLANET06_SML_MASK_PMAP_ANIM,planet.metal.small,sc2code/igfxres.h,GFXRES,base/planets/mtl__sml.ani
-PLANET07_BIG_MASK_PMAP_ANIM,planet.radioactive.large,sc2code/igfxres.h,GFXRES,base/planets/rad__big.ani
-PLANET07_MED_MASK_PMAP_ANIM,planet.radioactive.medium,sc2code/igfxres.h,GFXRES,base/planets/rad__med.ani
-PLANET07_SML_MASK_PMAP_ANIM,planet.radioactive.small,sc2code/igfxres.h,GFXRES,base/planets/rad__sml.ani
-PLANET08_BIG_MASK_PMAP_ANIM,planet.opalescent.large,sc2code/igfxres.h,GFXRES,base/planets/opa__big.ani
-PLANET08_MED_MASK_PMAP_ANIM,planet.opalescent.medium,sc2code/igfxres.h,GFXRES,base/planets/opa__med.ani
-PLANET08_SML_MASK_PMAP_ANIM,planet.opalescent.small,sc2code/igfxres.h,GFXRES,base/planets/opa__sml.ani
-PLANET09_BIG_MASK_PMAP_ANIM,planet.cyanic.large,sc2code/igfxres.h,GFXRES,base/planets/cya__big.ani
-PLANET09_MED_MASK_PMAP_ANIM,planet.cyanic.medium,sc2code/igfxres.h,GFXRES,base/planets/cya__med.ani
-PLANET09_SML_MASK_PMAP_ANIM,planet.cyanic.small,sc2code/igfxres.h,GFXRES,base/planets/cya__sml.ani
-PLANET10_BIG_MASK_PMAP_ANIM,planet.acid.large,sc2code/igfxres.h,GFXRES,base/planets/aci__big.ani
-PLANET10_MED_MASK_PMAP_ANIM,planet.acid.medium,sc2code/igfxres.h,GFXRES,base/planets/aci__med.ani
-PLANET10_SML_MASK_PMAP_ANIM,planet.acid.small,sc2code/igfxres.h,GFXRES,base/planets/aci__sml.ani
-PLANET11_BIG_MASK_PMAP_ANIM,planet.alkali.large,sc2code/igfxres.h,GFXRES,base/planets/alk__big.ani
-PLANET11_MED_MASK_PMAP_ANIM,planet.alkali.medium,sc2code/igfxres.h,GFXRES,base/planets/alk__med.ani
-PLANET11_SML_MASK_PMAP_ANIM,planet.alkali.small,sc2code/igfxres.h,GFXRES,base/planets/alk__sml.ani
-PLANET12_BIG_MASK_PMAP_ANIM,planet.halide.large,sc2code/igfxres.h,GFXRES,base/planets/hal__big.ani
-PLANET12_MED_MASK_PMAP_ANIM,planet.halide.medium,sc2code/igfxres.h,GFXRES,base/planets/hal__med.ani
-PLANET12_SML_MASK_PMAP_ANIM,planet.halide.small,sc2code/igfxres.h,GFXRES,base/planets/hal__sml.ani
-PLANET13_BIG_MASK_PMAP_ANIM,planet.green.large,sc2code/igfxres.h,GFXRES,base/planets/gre__big.ani
-PLANET13_MED_MASK_PMAP_ANIM,planet.green.medium,sc2code/igfxres.h,GFXRES,base/planets/gre__med.ani
-PLANET13_SML_MASK_PMAP_ANIM,planet.green.small,sc2code/igfxres.h,GFXRES,base/planets/gre__sml.ani
-PLANET14_BIG_MASK_PMAP_ANIM,planet.copper.large,sc2code/igfxres.h,GFXRES,base/planets/cop__big.ani
-PLANET14_MED_MASK_PMAP_ANIM,planet.copper.medium,sc2code/igfxres.h,GFXRES,base/planets/cop__med.ani
-PLANET14_SML_MASK_PMAP_ANIM,planet.copper.small,sc2code/igfxres.h,GFXRES,base/planets/cop__sml.ani
-PLANET15_BIG_MASK_PMAP_ANIM,planet.carbide.large,sc2code/igfxres.h,GFXRES,base/planets/car__big.ani
-PLANET15_MED_MASK_PMAP_ANIM,planet.carbide.medium,sc2code/igfxres.h,GFXRES,base/planets/car__med.ani
-PLANET15_SML_MASK_PMAP_ANIM,planet.carbide.small,sc2code/igfxres.h,GFXRES,base/planets/car__sml.ani
-PLANET16_BIG_MASK_PMAP_ANIM,planet.ultramarine.large,sc2code/igfxres.h,GFXRES,base/planets/ult__big.ani
-PLANET16_MED_MASK_PMAP_ANIM,planet.ultramarine.medium,sc2code/igfxres.h,GFXRES,base/planets/ult__med.ani
-PLANET16_SML_MASK_PMAP_ANIM,planet.ultramarine.small,sc2code/igfxres.h,GFXRES,base/planets/ult__sml.ani
-PLANET17_BIG_MASK_PMAP_ANIM,planet.noble.large,sc2code/igfxres.h,GFXRES,base/planets/nob__big.ani
-PLANET17_MED_MASK_PMAP_ANIM,planet.noble.medium,sc2code/igfxres.h,GFXRES,base/planets/nob__med.ani
-PLANET17_SML_MASK_PMAP_ANIM,planet.noble.small,sc2code/igfxres.h,GFXRES,base/planets/nob__sml.ani
-PLANET18_BIG_MASK_PMAP_ANIM,planet.azure.large,sc2code/igfxres.h,GFXRES,base/planets/azu__big.ani
-PLANET18_MED_MASK_PMAP_ANIM,planet.azure.medium,sc2code/igfxres.h,GFXRES,base/planets/azu__med.ani
-PLANET18_SML_MASK_PMAP_ANIM,planet.azure.small,sc2code/igfxres.h,GFXRES,base/planets/azu__sml.ani
-PLANET19_BIG_MASK_PMAP_ANIM,planet.chondrite.large,sc2code/igfxres.h,GFXRES,base/planets/cho__big.ani
-PLANET19_MED_MASK_PMAP_ANIM,planet.chondrite.medium,sc2code/igfxres.h,GFXRES,base/planets/cho__med.ani
-PLANET19_SML_MASK_PMAP_ANIM,planet.chondrite.small,sc2code/igfxres.h,GFXRES,base/planets/cho__sml.ani
-PLANET20_BIG_MASK_PMAP_ANIM,planet.purple.large,sc2code/igfxres.h,GFXRES,base/planets/pur__big.ani
-PLANET20_MED_MASK_PMAP_ANIM,planet.purple.medium,sc2code/igfxres.h,GFXRES,base/planets/pur__med.ani
-PLANET20_SML_MASK_PMAP_ANIM,planet.purple.small,sc2code/igfxres.h,GFXRES,base/planets/pur__sml.ani
-PLANET21_BIG_MASK_PMAP_ANIM,planet.superdense.large,sc2code/igfxres.h,GFXRES,base/planets/sup__big.ani
-PLANET21_MED_MASK_PMAP_ANIM,planet.superdense.medium,sc2code/igfxres.h,GFXRES,base/planets/sup__med.ani
-PLANET21_SML_MASK_PMAP_ANIM,planet.superdense.small,sc2code/igfxres.h,GFXRES,base/planets/sup__sml.ani
-PLANET22_BIG_MASK_PMAP_ANIM,planet.pellucid.large,sc2code/igfxres.h,GFXRES,base/planets/pel__big.ani
-PLANET22_MED_MASK_PMAP_ANIM,planet.pellucid.medium,sc2code/igfxres.h,GFXRES,base/planets/pel__med.ani
-PLANET22_SML_MASK_PMAP_ANIM,planet.pellucid.small,sc2code/igfxres.h,GFXRES,base/planets/pel__sml.ani
-PLANET23_BIG_MASK_PMAP_ANIM,planet.dust.large,sc2code/igfxres.h,GFXRES,base/planets/dus__big.ani
-PLANET23_MED_MASK_PMAP_ANIM,planet.dust.medium,sc2code/igfxres.h,GFXRES,base/planets/dus__med.ani
-PLANET23_SML_MASK_PMAP_ANIM,planet.dust.small,sc2code/igfxres.h,GFXRES,base/planets/dus__sml.ani
-PLANET24_BIG_MASK_PMAP_ANIM,planet.crimson.large,sc2code/igfxres.h,GFXRES,base/planets/mar__big.ani
-PLANET24_MED_MASK_PMAP_ANIM,planet.crimson.medium,sc2code/igfxres.h,GFXRES,base/planets/mar__med.ani
-PLANET24_SML_MASK_PMAP_ANIM,planet.crimson.small,sc2code/igfxres.h,GFXRES,base/planets/mar__sml.ani
-PLANET25_BIG_MASK_PMAP_ANIM,planet.cimmerian.large,sc2code/igfxres.h,GFXRES,base/planets/cim__big.ani
-PLANET25_MED_MASK_PMAP_ANIM,planet.cimmerian.medium,sc2code/igfxres.h,GFXRES,base/planets/cim__med.ani
-PLANET25_SML_MASK_PMAP_ANIM,planet.cimmerian.small,sc2code/igfxres.h,GFXRES,base/planets/cim__sml.ani
-PLANET26_BIG_MASK_PMAP_ANIM,planet.infrared.large,sc2code/igfxres.h,GFXRES,base/planets/inf__big.ani
-PLANET26_MED_MASK_PMAP_ANIM,planet.infrared.medium,sc2code/igfxres.h,GFXRES,base/planets/inf__med.ani
-PLANET26_SML_MASK_PMAP_ANIM,planet.infrared.small,sc2code/igfxres.h,GFXRES,base/planets/inf__sml.ani
-PLANET27_BIG_MASK_PMAP_ANIM,planet.selenic.large,sc2code/igfxres.h,GFXRES,base/planets/sel__big.ani
-PLANET27_MED_MASK_PMAP_ANIM,planet.selenic.medium,sc2code/igfxres.h,GFXRES,base/planets/sel__med.ani
-PLANET27_SML_MASK_PMAP_ANIM,planet.selenic.small,sc2code/igfxres.h,GFXRES,base/planets/sel__sml.ani
-PLANET28_BIG_MASK_PMAP_ANIM,planet.auric.large,sc2code/igfxres.h,GFXRES,base/planets/aur__big.ani
-PLANET28_MED_MASK_PMAP_ANIM,planet.auric.medium,sc2code/igfxres.h,GFXRES,base/planets/aur__med.ani
-PLANET28_SML_MASK_PMAP_ANIM,planet.auric.small,sc2code/igfxres.h,GFXRES,base/planets/aur__sml.ani
-PLANET29_BIG_MASK_PMAP_ANIM,planet.fluorescent.large,sc2code/igfxres.h,GFXRES,base/planets/flu__big.ani
-PLANET29_MED_MASK_PMAP_ANIM,planet.fluorescent.medium,sc2code/igfxres.h,GFXRES,base/planets/flu__med.ani
-PLANET29_SML_MASK_PMAP_ANIM,planet.fluorescent.small,sc2code/igfxres.h,GFXRES,base/planets/flu__sml.ani
-PLANET30_BIG_MASK_PMAP_ANIM,planet.ultraviolet.large,sc2code/igfxres.h,GFXRES,base/planets/ult__big.ani
-PLANET30_MED_MASK_PMAP_ANIM,planet.ultraviolet.medium,sc2code/igfxres.h,GFXRES,base/planets/ult__med.ani
-PLANET30_SML_MASK_PMAP_ANIM,planet.ultraviolet.small,sc2code/igfxres.h,GFXRES,base/planets/ult__sml.ani
-PLANET31_BIG_MASK_PMAP_ANIM,planet.plutonic.large,sc2code/igfxres.h,GFXRES,base/planets/plu__big.ani
-PLANET31_MED_MASK_PMAP_ANIM,planet.plutonic.medium,sc2code/igfxres.h,GFXRES,base/planets/plu__med.ani
-PLANET31_SML_MASK_PMAP_ANIM,planet.plutonic.small,sc2code/igfxres.h,GFXRES,base/planets/plu__sml.ani
-PLANET32_BIG_MASK_PMAP_ANIM,planet.rainbow.large,sc2code/igfxres.h,GFXRES,base/planets/rai__big.ani
-PLANET32_MED_MASK_PMAP_ANIM,planet.rainbow.medium,sc2code/igfxres.h,GFXRES,base/planets/rai__med.ani
-PLANET32_SML_MASK_PMAP_ANIM,planet.rainbow.small,sc2code/igfxres.h,GFXRES,base/planets/rai__sml.ani
-PLANET33_BIG_MASK_PMAP_ANIM,planet.shattered.large,sc2code/igfxres.h,GFXRES,base/planets/cra__big.ani
-PLANET33_MED_MASK_PMAP_ANIM,planet.shattered.medium,sc2code/igfxres.h,GFXRES,base/planets/cra__med.ani
-PLANET33_SML_MASK_PMAP_ANIM,planet.shattered.small,sc2code/igfxres.h,GFXRES,base/planets/cra__sml.ani
-PLANET34_BIG_MASK_PMAP_ANIM,planet.sapphire.large,sc2code/igfxres.h,GFXRES,base/planets/sap__big.ani
-PLANET34_MED_MASK_PMAP_ANIM,planet.sapphire.medium,sc2code/igfxres.h,GFXRES,base/planets/sap__med.ani
-PLANET34_SML_MASK_PMAP_ANIM,planet.sapphire.small,sc2code/igfxres.h,GFXRES,base/planets/sap__sml.ani
-PLANET35_BIG_MASK_PMAP_ANIM,planet.organic.large,sc2code/igfxres.h,GFXRES,base/planets/org__big.ani
-PLANET35_MED_MASK_PMAP_ANIM,planet.organic.medium,sc2code/igfxres.h,GFXRES,base/planets/org__med.ani
-PLANET35_SML_MASK_PMAP_ANIM,planet.organic.small,sc2code/igfxres.h,GFXRES,base/planets/org__sml.ani
-PLANET36_BIG_MASK_PMAP_ANIM,planet.xenolithic.large,sc2code/igfxres.h,GFXRES,base/planets/xen__big.ani
-PLANET36_MED_MASK_PMAP_ANIM,planet.xenolithic.medium,sc2code/igfxres.h,GFXRES,base/planets/xen__med.ani
-PLANET36_SML_MASK_PMAP_ANIM,planet.xenolithic.small,sc2code/igfxres.h,GFXRES,base/planets/xen__sml.ani
-PLANET37_BIG_MASK_PMAP_ANIM,planet.redux.large,sc2code/igfxres.h,GFXRES,base/planets/red__big.ani
-PLANET37_MED_MASK_PMAP_ANIM,planet.redux.medium,sc2code/igfxres.h,GFXRES,base/planets/red__med.ani
-PLANET37_SML_MASK_PMAP_ANIM,planet.redux.small,sc2code/igfxres.h,GFXRES,base/planets/red__sml.ani
-PLANET38_BIG_MASK_PMAP_ANIM,planet.primordial.large,sc2code/igfxres.h,GFXRES,base/planets/pri__big.ani
-PLANET38_MED_MASK_PMAP_ANIM,planet.primordial.medium,sc2code/igfxres.h,GFXRES,base/planets/pri__med.ani
-PLANET38_SML_MASK_PMAP_ANIM,planet.primordial.small,sc2code/igfxres.h,GFXRES,base/planets/pri__sml.ani
-PLANET39_BIG_MASK_PMAP_ANIM,planet.emerald.large,sc2code/igfxres.h,GFXRES,base/planets/eme__big.ani
-PLANET39_MED_MASK_PMAP_ANIM,planet.emerald.medium,sc2code/igfxres.h,GFXRES,base/planets/eme__med.ani
-PLANET39_SML_MASK_PMAP_ANIM,planet.emerald.small,sc2code/igfxres.h,GFXRES,base/planets/eme__sml.ani
-PLANET40_BIG_MASK_PMAP_ANIM,planet.chlorine.large,sc2code/igfxres.h,GFXRES,base/planets/chl__big.ani
-PLANET40_MED_MASK_PMAP_ANIM,planet.chlorine.medium,sc2code/igfxres.h,GFXRES,base/planets/chl__med.ani
-PLANET40_SML_MASK_PMAP_ANIM,planet.chlorine.small,sc2code/igfxres.h,GFXRES,base/planets/chl__sml.ani
-PLANET41_BIG_MASK_PMAP_ANIM,planet.magnetic.large,sc2code/igfxres.h,GFXRES,base/planets/mgn__big.ani
-PLANET41_MED_MASK_PMAP_ANIM,planet.magnetic.medium,sc2code/igfxres.h,GFXRES,base/planets/mgn__med.ani
-PLANET41_SML_MASK_PMAP_ANIM,planet.magnetic.small,sc2code/igfxres.h,GFXRES,base/planets/mgn__sml.ani
-PLANET42_BIG_MASK_PMAP_ANIM,planet.water.large,sc2code/igfxres.h,GFXRES,base/planets/wat__big.ani
-PLANET42_MED_MASK_PMAP_ANIM,planet.water.medium,sc2code/igfxres.h,GFXRES,base/planets/wat__med.ani
-PLANET42_SML_MASK_PMAP_ANIM,planet.water.small,sc2code/igfxres.h,GFXRES,base/planets/wat__sml.ani
-PLANET43_BIG_MASK_PMAP_ANIM,planet.telluric.large,sc2code/igfxres.h,GFXRES,base/planets/tel__big.ani
-PLANET43_MED_MASK_PMAP_ANIM,planet.telluric.medium,sc2code/igfxres.h,GFXRES,base/planets/tel__med.ani
-PLANET43_SML_MASK_PMAP_ANIM,planet.telluric.small,sc2code/igfxres.h,GFXRES,base/planets/tel__sml.ani
-PLANET44_BIG_MASK_PMAP_ANIM,planet.hydrocarbon.large,sc2code/igfxres.h,GFXRES,base/planets/hyd__big.ani
-PLANET44_MED_MASK_PMAP_ANIM,planet.hydrocarbon.medium,sc2code/igfxres.h,GFXRES,base/planets/hyd__med.ani
-PLANET44_SML_MASK_PMAP_ANIM,planet.hydrocarbon.small,sc2code/igfxres.h,GFXRES,base/planets/hyd__sml.ani
-PLANET45_BIG_MASK_PMAP_ANIM,planet.iodine.large,sc2code/igfxres.h,GFXRES,base/planets/iod__big.ani
-PLANET45_MED_MASK_PMAP_ANIM,planet.iodine.medium,sc2code/igfxres.h,GFXRES,base/planets/iod__med.ani
-PLANET45_SML_MASK_PMAP_ANIM,planet.iodine.small,sc2code/igfxres.h,GFXRES,base/planets/iod__sml.ani
-PLANET46_BIG_MASK_PMAP_ANIM,planet.vinylogous.large,sc2code/igfxres.h,GFXRES,base/planets/vin__big.ani
-PLANET46_MED_MASK_PMAP_ANIM,planet.vinylogous.medium,sc2code/igfxres.h,GFXRES,base/planets/vin__med.ani
-PLANET46_SML_MASK_PMAP_ANIM,planet.vinylogous.small,sc2code/igfxres.h,GFXRES,base/planets/vin__sml.ani
-PLANET47_BIG_MASK_PMAP_ANIM,planet.ruby.large,sc2code/igfxres.h,GFXRES,base/planets/rub__big.ani
-PLANET47_MED_MASK_PMAP_ANIM,planet.ruby.medium,sc2code/igfxres.h,GFXRES,base/planets/rub__med.ani
-PLANET47_SML_MASK_PMAP_ANIM,planet.ruby.small,sc2code/igfxres.h,GFXRES,base/planets/rub__sml.ani
-PLANET48_BIG_MASK_PMAP_ANIM,planet.magma.large,sc2code/igfxres.h,GFXRES,base/planets/mgm__big.ani
-PLANET48_MED_MASK_PMAP_ANIM,planet.magma.medium,sc2code/igfxres.h,GFXRES,base/planets/mgm__med.ani
-PLANET48_SML_MASK_PMAP_ANIM,planet.magma.small,sc2code/igfxres.h,GFXRES,base/planets/mgm__sml.ani
-PLANET49_BIG_MASK_PMAP_ANIM,planet.maroon.large,sc2code/igfxres.h,GFXRES,base/planets/cri__big.ani
-PLANET49_MED_MASK_PMAP_ANIM,planet.maroon.medium,sc2code/igfxres.h,GFXRES,base/planets/cri__med.ani
-PLANET49_SML_MASK_PMAP_ANIM,planet.maroon.small,sc2code/igfxres.h,GFXRES,base/planets/cri__sml.ani
-PLANET50_BIG_MASK_PMAP_ANIM,planet.bluegas.large,sc2code/igfxres.h,GFXRES,base/planets/blg__big.ani
-PLANET50_MED_MASK_PMAP_ANIM,planet.bluegas.medium,sc2code/igfxres.h,GFXRES,base/planets/blg__med.ani
-PLANET50_SML_MASK_PMAP_ANIM,planet.bluegas.small,sc2code/igfxres.h,GFXRES,base/planets/blg__sml.ani
-PLANET51_BIG_MASK_PMAP_ANIM,planet.cyangas.large,sc2code/igfxres.h,GFXRES,base/planets/cyg__big.ani
-PLANET51_MED_MASK_PMAP_ANIM,planet.cyangas.medium,sc2code/igfxres.h,GFXRES,base/planets/cyg__med.ani
-PLANET51_SML_MASK_PMAP_ANIM,planet.cyangas.small,sc2code/igfxres.h,GFXRES,base/planets/cyg__sml.ani
-PLANET52_BIG_MASK_PMAP_ANIM,planet.greengas.large,sc2code/igfxres.h,GFXRES,base/planets/gng__big.ani
-PLANET52_MED_MASK_PMAP_ANIM,planet.greengas.medium,sc2code/igfxres.h,GFXRES,base/planets/gng__med.ani
-PLANET52_SML_MASK_PMAP_ANIM,planet.greengas.small,sc2code/igfxres.h,GFXRES,base/planets/gng__sml.ani
-PLANET53_BIG_MASK_PMAP_ANIM,planet.greygas.large,sc2code/igfxres.h,GFXRES,base/planets/gyg__big.ani
-PLANET53_MED_MASK_PMAP_ANIM,planet.greygas.medium,sc2code/igfxres.h,GFXRES,base/planets/gyg__med.ani
-PLANET53_SML_MASK_PMAP_ANIM,planet.greygas.small,sc2code/igfxres.h,GFXRES,base/planets/gyg__sml.ani
-PLANET54_BIG_MASK_PMAP_ANIM,planet.orangegas.large,sc2code/igfxres.h,GFXRES,base/planets/org__big.ani
-PLANET54_MED_MASK_PMAP_ANIM,planet.orangegas.medium,sc2code/igfxres.h,GFXRES,base/planets/org__med.ani
-PLANET54_SML_MASK_PMAP_ANIM,planet.orangegas.small,sc2code/igfxres.h,GFXRES,base/planets/org__sml.ani
-PLANET55_BIG_MASK_PMAP_ANIM,planet.purplegas.large,sc2code/igfxres.h,GFXRES,base/planets/pug__big.ani
-PLANET55_MED_MASK_PMAP_ANIM,planet.purplegas.medium,sc2code/igfxres.h,GFXRES,base/planets/pug__med.ani
-PLANET55_SML_MASK_PMAP_ANIM,planet.purplegas.small,sc2code/igfxres.h,GFXRES,base/planets/pug__sml.ani
-PLANET56_BIG_MASK_PMAP_ANIM,planet.redgas.large,sc2code/igfxres.h,GFXRES,base/planets/reg__big.ani
-PLANET56_MED_MASK_PMAP_ANIM,planet.redgas.medium,sc2code/igfxres.h,GFXRES,base/planets/reg__med.ani
-PLANET56_SML_MASK_PMAP_ANIM,planet.redgas.small,sc2code/igfxres.h,GFXRES,base/planets/reg__sml.ani
-PLANET57_BIG_MASK_PMAP_ANIM,planet.violetgas.large,sc2code/igfxres.h,GFXRES,base/planets/vig__big.ani
-PLANET57_MED_MASK_PMAP_ANIM,planet.violetgas.medium,sc2code/igfxres.h,GFXRES,base/planets/vig__med.ani
-PLANET57_SML_MASK_PMAP_ANIM,planet.violetgas.small,sc2code/igfxres.h,GFXRES,base/planets/vig__sml.ani
-PLANET58_BIG_MASK_PMAP_ANIM,planet.yellowgas.large,sc2code/igfxres.h,GFXRES,base/planets/yeg__big.ani
-PLANET58_MED_MASK_PMAP_ANIM,planet.yellowgas.medium,sc2code/igfxres.h,GFXRES,base/planets/yeg__med.ani
-PLANET58_SML_MASK_PMAP_ANIM,planet.yellowgas.small,sc2code/igfxres.h,GFXRES,base/planets/yeg__sml.ani
+SAMATRA_BIG_MASK_PMAP_ANIM,planet.samatra.large,sc2code/igfxres.h,GFXRES,base/planets/samatra-big.ani
+SHIELDED_BIG_MASK_PMAP_ANIM,planet.slaveshield.large,sc2code/igfxres.h,GFXRES,base/planets/slaveshield-big.ani
+SHIELDED_MED_MASK_PMAP_ANIM,planet.slaveshield.medium,sc2code/igfxres.h,GFXRES,base/planets/slaveshield-med.ani
+SHIELDED_SML_MASK_PMAP_ANIM,planet.slaveshield.small,sc2code/igfxres.h,GFXRES,base/planets/slaveshield-sml.ani
+PLANET00_BIG_MASK_PMAP_ANIM,planet.oolite.large,sc2code/igfxres.h,GFXRES,base/planets/oolite-big.ani
+PLANET00_MED_MASK_PMAP_ANIM,planet.oolite.medium,sc2code/igfxres.h,GFXRES,base/planets/oolite-med.ani
+PLANET00_SML_MASK_PMAP_ANIM,planet.oolite.small,sc2code/igfxres.h,GFXRES,base/planets/oolite-sml.ani
+PLANET01_BIG_MASK_PMAP_ANIM,planet.yttric.large,sc2code/igfxres.h,GFXRES,base/planets/yttric-big.ani
+PLANET01_MED_MASK_PMAP_ANIM,planet.yttric.medium,sc2code/igfxres.h,GFXRES,base/planets/yttric-med.ani
+PLANET01_SML_MASK_PMAP_ANIM,planet.yttric.small,sc2code/igfxres.h,GFXRES,base/planets/yttric-sml.ani
+PLANET02_BIG_MASK_PMAP_ANIM,planet.quasidegenerate.large,sc2code/igfxres.h,GFXRES,base/planets/quasidegenerate-big.ani
+PLANET02_MED_MASK_PMAP_ANIM,planet.quasidegenerate.medium,sc2code/igfxres.h,GFXRES,base/planets/quasidegenerate-med.ani
+PLANET02_SML_MASK_PMAP_ANIM,planet.quasidegenerate.small,sc2code/igfxres.h,GFXRES,base/planets/quasidegenerate-sml.ani
+PLANET03_BIG_MASK_PMAP_ANIM,planet.lanthanide.large,sc2code/igfxres.h,GFXRES,base/planets/lanthanide-big.ani
+PLANET03_MED_MASK_PMAP_ANIM,planet.lanthanide.medium,sc2code/igfxres.h,GFXRES,base/planets/lanthanide-med.ani
+PLANET03_SML_MASK_PMAP_ANIM,planet.lanthanide.small,sc2code/igfxres.h,GFXRES,base/planets/lanthanide-sml.ani
+PLANET04_BIG_MASK_PMAP_ANIM,planet.treasure.large,sc2code/igfxres.h,GFXRES,base/planets/treasure-big.ani
+PLANET04_MED_MASK_PMAP_ANIM,planet.treasure.medium,sc2code/igfxres.h,GFXRES,base/planets/treasure-med.ani
+PLANET04_SML_MASK_PMAP_ANIM,planet.treasure.small,sc2code/igfxres.h,GFXRES,base/planets/treasure-sml.ani
+PLANET05_BIG_MASK_PMAP_ANIM,planet.urea.large,sc2code/igfxres.h,GFXRES,base/planets/urea-big.ani
+PLANET05_MED_MASK_PMAP_ANIM,planet.urea.medium,sc2code/igfxres.h,GFXRES,base/planets/urea-med.ani
+PLANET05_SML_MASK_PMAP_ANIM,planet.urea.small,sc2code/igfxres.h,GFXRES,base/planets/urea-sml.ani
+PLANET06_BIG_MASK_PMAP_ANIM,planet.metal.large,sc2code/igfxres.h,GFXRES,base/planets/metal-big.ani
+PLANET06_MED_MASK_PMAP_ANIM,planet.metal.medium,sc2code/igfxres.h,GFXRES,base/planets/metal-med.ani
+PLANET06_SML_MASK_PMAP_ANIM,planet.metal.small,sc2code/igfxres.h,GFXRES,base/planets/metal-sml.ani
+PLANET07_BIG_MASK_PMAP_ANIM,planet.radioactive.large,sc2code/igfxres.h,GFXRES,base/planets/radioactive-big.ani
+PLANET07_MED_MASK_PMAP_ANIM,planet.radioactive.medium,sc2code/igfxres.h,GFXRES,base/planets/radioactive-med.ani
+PLANET07_SML_MASK_PMAP_ANIM,planet.radioactive.small,sc2code/igfxres.h,GFXRES,base/planets/radioactive-sml.ani
+PLANET08_BIG_MASK_PMAP_ANIM,planet.opalescent.large,sc2code/igfxres.h,GFXRES,base/planets/opalescent-big.ani
+PLANET08_MED_MASK_PMAP_ANIM,planet.opalescent.medium,sc2code/igfxres.h,GFXRES,base/planets/opalescent-med.ani
+PLANET08_SML_MASK_PMAP_ANIM,planet.opalescent.small,sc2code/igfxres.h,GFXRES,base/planets/opalescent-sml.ani
+PLANET09_BIG_MASK_PMAP_ANIM,planet.cyanic.large,sc2code/igfxres.h,GFXRES,base/planets/cyanic-big.ani
+PLANET09_MED_MASK_PMAP_ANIM,planet.cyanic.medium,sc2code/igfxres.h,GFXRES,base/planets/cyanic-med.ani
+PLANET09_SML_MASK_PMAP_ANIM,planet.cyanic.small,sc2code/igfxres.h,GFXRES,base/planets/cyanic-sml.ani
+PLANET10_BIG_MASK_PMAP_ANIM,planet.acid.large,sc2code/igfxres.h,GFXRES,base/planets/acid-big.ani
+PLANET10_MED_MASK_PMAP_ANIM,planet.acid.medium,sc2code/igfxres.h,GFXRES,base/planets/acid-med.ani
+PLANET10_SML_MASK_PMAP_ANIM,planet.acid.small,sc2code/igfxres.h,GFXRES,base/planets/acid-sml.ani
+PLANET11_BIG_MASK_PMAP_ANIM,planet.alkali.large,sc2code/igfxres.h,GFXRES,base/planets/alkali-big.ani
+PLANET11_MED_MASK_PMAP_ANIM,planet.alkali.medium,sc2code/igfxres.h,GFXRES,base/planets/alkali-med.ani
+PLANET11_SML_MASK_PMAP_ANIM,planet.alkali.small,sc2code/igfxres.h,GFXRES,base/planets/alkali-sml.ani
+PLANET12_BIG_MASK_PMAP_ANIM,planet.halide.large,sc2code/igfxres.h,GFXRES,base/planets/halide-big.ani
+PLANET12_MED_MASK_PMAP_ANIM,planet.halide.medium,sc2code/igfxres.h,GFXRES,base/planets/halide-med.ani
+PLANET12_SML_MASK_PMAP_ANIM,planet.halide.small,sc2code/igfxres.h,GFXRES,base/planets/halide-sml.ani
+PLANET13_BIG_MASK_PMAP_ANIM,planet.green.large,sc2code/igfxres.h,GFXRES,base/planets/green-big.ani
+PLANET13_MED_MASK_PMAP_ANIM,planet.green.medium,sc2code/igfxres.h,GFXRES,base/planets/green-med.ani
+PLANET13_SML_MASK_PMAP_ANIM,planet.green.small,sc2code/igfxres.h,GFXRES,base/planets/green-sml.ani
+PLANET14_BIG_MASK_PMAP_ANIM,planet.copper.large,sc2code/igfxres.h,GFXRES,base/planets/copper-big.ani
+PLANET14_MED_MASK_PMAP_ANIM,planet.copper.medium,sc2code/igfxres.h,GFXRES,base/planets/copper-med.ani
+PLANET14_SML_MASK_PMAP_ANIM,planet.copper.small,sc2code/igfxres.h,GFXRES,base/planets/copper-sml.ani
+PLANET15_BIG_MASK_PMAP_ANIM,planet.carbide.large,sc2code/igfxres.h,GFXRES,base/planets/carbide-big.ani
+PLANET15_MED_MASK_PMAP_ANIM,planet.carbide.medium,sc2code/igfxres.h,GFXRES,base/planets/carbide-med.ani
+PLANET15_SML_MASK_PMAP_ANIM,planet.carbide.small,sc2code/igfxres.h,GFXRES,base/planets/carbide-sml.ani
+PLANET16_BIG_MASK_PMAP_ANIM,planet.ultramarine.large,sc2code/igfxres.h,GFXRES,base/planets/ultramarine-big.ani
+PLANET16_MED_MASK_PMAP_ANIM,planet.ultramarine.medium,sc2code/igfxres.h,GFXRES,base/planets/ultramarine-med.ani
+PLANET16_SML_MASK_PMAP_ANIM,planet.ultramarine.small,sc2code/igfxres.h,GFXRES,base/planets/ultramarine-sml.ani
+PLANET17_BIG_MASK_PMAP_ANIM,planet.noble.large,sc2code/igfxres.h,GFXRES,base/planets/noble-big.ani
+PLANET17_MED_MASK_PMAP_ANIM,planet.noble.medium,sc2code/igfxres.h,GFXRES,base/planets/noble-med.ani
+PLANET17_SML_MASK_PMAP_ANIM,planet.noble.small,sc2code/igfxres.h,GFXRES,base/planets/noble-sml.ani
+PLANET18_BIG_MASK_PMAP_ANIM,planet.azure.large,sc2code/igfxres.h,GFXRES,base/planets/azure-big.ani
+PLANET18_MED_MASK_PMAP_ANIM,planet.azure.medium,sc2code/igfxres.h,GFXRES,base/planets/azure-med.ani
+PLANET18_SML_MASK_PMAP_ANIM,planet.azure.small,sc2code/igfxres.h,GFXRES,base/planets/azure-sml.ani
+PLANET19_BIG_MASK_PMAP_ANIM,planet.chondrite.large,sc2code/igfxres.h,GFXRES,base/planets/chondrite-big.ani
+PLANET19_MED_MASK_PMAP_ANIM,planet.chondrite.medium,sc2code/igfxres.h,GFXRES,base/planets/chondrite-med.ani
+PLANET19_SML_MASK_PMAP_ANIM,planet.chondrite.small,sc2code/igfxres.h,GFXRES,base/planets/chondrite-sml.ani
+PLANET20_BIG_MASK_PMAP_ANIM,planet.purple.large,sc2code/igfxres.h,GFXRES,base/planets/purple-big.ani
+PLANET20_MED_MASK_PMAP_ANIM,planet.purple.medium,sc2code/igfxres.h,GFXRES,base/planets/purple-med.ani
+PLANET20_SML_MASK_PMAP_ANIM,planet.purple.small,sc2code/igfxres.h,GFXRES,base/planets/purple-sml.ani
+PLANET21_BIG_MASK_PMAP_ANIM,planet.superdense.large,sc2code/igfxres.h,GFXRES,base/planets/superdense-big.ani
+PLANET21_MED_MASK_PMAP_ANIM,planet.superdense.medium,sc2code/igfxres.h,GFXRES,base/planets/superdense-med.ani
+PLANET21_SML_MASK_PMAP_ANIM,planet.superdense.small,sc2code/igfxres.h,GFXRES,base/planets/superdense-sml.ani
+PLANET22_BIG_MASK_PMAP_ANIM,planet.pellucid.large,sc2code/igfxres.h,GFXRES,base/planets/pellucid-big.ani
+PLANET22_MED_MASK_PMAP_ANIM,planet.pellucid.medium,sc2code/igfxres.h,GFXRES,base/planets/pellucid-med.ani
+PLANET22_SML_MASK_PMAP_ANIM,planet.pellucid.small,sc2code/igfxres.h,GFXRES,base/planets/pellucid-sml.ani
+PLANET23_BIG_MASK_PMAP_ANIM,planet.dust.large,sc2code/igfxres.h,GFXRES,base/planets/dust-big.ani
+PLANET23_MED_MASK_PMAP_ANIM,planet.dust.medium,sc2code/igfxres.h,GFXRES,base/planets/dust-med.ani
+PLANET23_SML_MASK_PMAP_ANIM,planet.dust.small,sc2code/igfxres.h,GFXRES,base/planets/dust-sml.ani
+PLANET24_BIG_MASK_PMAP_ANIM,planet.crimson.large,sc2code/igfxres.h,GFXRES,base/planets/crimson-big.ani
+PLANET24_MED_MASK_PMAP_ANIM,planet.crimson.medium,sc2code/igfxres.h,GFXRES,base/planets/crimson-med.ani
+PLANET24_SML_MASK_PMAP_ANIM,planet.crimson.small,sc2code/igfxres.h,GFXRES,base/planets/crimson-sml.ani
+PLANET25_BIG_MASK_PMAP_ANIM,planet.cimmerian.large,sc2code/igfxres.h,GFXRES,base/planets/cimmerian-big.ani
+PLANET25_MED_MASK_PMAP_ANIM,planet.cimmerian.medium,sc2code/igfxres.h,GFXRES,base/planets/cimmerian-med.ani
+PLANET25_SML_MASK_PMAP_ANIM,planet.cimmerian.small,sc2code/igfxres.h,GFXRES,base/planets/cimmerian-sml.ani
+PLANET26_BIG_MASK_PMAP_ANIM,planet.infrared.large,sc2code/igfxres.h,GFXRES,base/planets/infrared-big.ani
+PLANET26_MED_MASK_PMAP_ANIM,planet.infrared.medium,sc2code/igfxres.h,GFXRES,base/planets/infrared-med.ani
+PLANET26_SML_MASK_PMAP_ANIM,planet.infrared.small,sc2code/igfxres.h,GFXRES,base/planets/infrared-sml.ani
+PLANET27_BIG_MASK_PMAP_ANIM,planet.selenic.large,sc2code/igfxres.h,GFXRES,base/planets/selenic-big.ani
+PLANET27_MED_MASK_PMAP_ANIM,planet.selenic.medium,sc2code/igfxres.h,GFXRES,base/planets/selenic-med.ani
+PLANET27_SML_MASK_PMAP_ANIM,planet.selenic.small,sc2code/igfxres.h,GFXRES,base/planets/selenic-sml.ani
+PLANET28_BIG_MASK_PMAP_ANIM,planet.auric.large,sc2code/igfxres.h,GFXRES,base/planets/auric-big.ani
+PLANET28_MED_MASK_PMAP_ANIM,planet.auric.medium,sc2code/igfxres.h,GFXRES,base/planets/auric-med.ani
+PLANET28_SML_MASK_PMAP_ANIM,planet.auric.small,sc2code/igfxres.h,GFXRES,base/planets/auric-sml.ani
+PLANET29_BIG_MASK_PMAP_ANIM,planet.fluorescent.large,sc2code/igfxres.h,GFXRES,base/planets/fluorescent-big.ani
+PLANET29_MED_MASK_PMAP_ANIM,planet.fluorescent.medium,sc2code/igfxres.h,GFXRES,base/planets/fluorescent-med.ani
+PLANET29_SML_MASK_PMAP_ANIM,planet.fluorescent.small,sc2code/igfxres.h,GFXRES,base/planets/fluorescent-sml.ani
+PLANET30_BIG_MASK_PMAP_ANIM,planet.ultraviolet.large,sc2code/igfxres.h,GFXRES,base/planets/ultramarine-big.ani
+PLANET30_MED_MASK_PMAP_ANIM,planet.ultraviolet.medium,sc2code/igfxres.h,GFXRES,base/planets/ultramarine-med.ani
+PLANET30_SML_MASK_PMAP_ANIM,planet.ultraviolet.small,sc2code/igfxres.h,GFXRES,base/planets/ultramarine-sml.ani
+PLANET31_BIG_MASK_PMAP_ANIM,planet.plutonic.large,sc2code/igfxres.h,GFXRES,base/planets/plutonic-big.ani
+PLANET31_MED_MASK_PMAP_ANIM,planet.plutonic.medium,sc2code/igfxres.h,GFXRES,base/planets/plutonic-med.ani
+PLANET31_SML_MASK_PMAP_ANIM,planet.plutonic.small,sc2code/igfxres.h,GFXRES,base/planets/plutonic-sml.ani
+PLANET32_BIG_MASK_PMAP_ANIM,planet.rainbow.large,sc2code/igfxres.h,GFXRES,base/planets/rainbow-big.ani
+PLANET32_MED_MASK_PMAP_ANIM,planet.rainbow.medium,sc2code/igfxres.h,GFXRES,base/planets/rainbow-med.ani
+PLANET32_SML_MASK_PMAP_ANIM,planet.rainbow.small,sc2code/igfxres.h,GFXRES,base/planets/rainbow-sml.ani
+PLANET33_BIG_MASK_PMAP_ANIM,planet.shattered.large,sc2code/igfxres.h,GFXRES,base/planets/shattered-big.ani
+PLANET33_MED_MASK_PMAP_ANIM,planet.shattered.medium,sc2code/igfxres.h,GFXRES,base/planets/shattered-med.ani
+PLANET33_SML_MASK_PMAP_ANIM,planet.shattered.small,sc2code/igfxres.h,GFXRES,base/planets/shattered-sml.ani
+PLANET34_BIG_MASK_PMAP_ANIM,planet.sapphire.large,sc2code/igfxres.h,GFXRES,base/planets/sapphire-big.ani
+PLANET34_MED_MASK_PMAP_ANIM,planet.sapphire.medium,sc2code/igfxres.h,GFXRES,base/planets/sapphire-med.ani
+PLANET34_SML_MASK_PMAP_ANIM,planet.sapphire.small,sc2code/igfxres.h,GFXRES,base/planets/sapphire-sml.ani
+PLANET35_BIG_MASK_PMAP_ANIM,planet.organic.large,sc2code/igfxres.h,GFXRES,base/planets/organic-big.ani
+PLANET35_MED_MASK_PMAP_ANIM,planet.organic.medium,sc2code/igfxres.h,GFXRES,base/planets/organic-med.ani
+PLANET35_SML_MASK_PMAP_ANIM,planet.organic.small,sc2code/igfxres.h,GFXRES,base/planets/organic-sml.ani
+PLANET36_BIG_MASK_PMAP_ANIM,planet.xenolithic.large,sc2code/igfxres.h,GFXRES,base/planets/xenolithic-big.ani
+PLANET36_MED_MASK_PMAP_ANIM,planet.xenolithic.medium,sc2code/igfxres.h,GFXRES,base/planets/xenolithic-med.ani
+PLANET36_SML_MASK_PMAP_ANIM,planet.xenolithic.small,sc2code/igfxres.h,GFXRES,base/planets/xenolithic-sml.ani
+PLANET37_BIG_MASK_PMAP_ANIM,planet.redux.large,sc2code/igfxres.h,GFXRES,base/planets/redux-big.ani
+PLANET37_MED_MASK_PMAP_ANIM,planet.redux.medium,sc2code/igfxres.h,GFXRES,base/planets/redux-med.ani
+PLANET37_SML_MASK_PMAP_ANIM,planet.redux.small,sc2code/igfxres.h,GFXRES,base/planets/redux-sml.ani
+PLANET38_BIG_MASK_PMAP_ANIM,planet.primordial.large,sc2code/igfxres.h,GFXRES,base/planets/primordial-big.ani
+PLANET38_MED_MASK_PMAP_ANIM,planet.primordial.medium,sc2code/igfxres.h,GFXRES,base/planets/primordial-med.ani
+PLANET38_SML_MASK_PMAP_ANIM,planet.primordial.small,sc2code/igfxres.h,GFXRES,base/planets/primordial-sml.ani
+PLANET39_BIG_MASK_PMAP_ANIM,planet.emerald.large,sc2code/igfxres.h,GFXRES,base/planets/emerald-big.ani
+PLANET39_MED_MASK_PMAP_ANIM,planet.emerald.medium,sc2code/igfxres.h,GFXRES,base/planets/emerald-med.ani
+PLANET39_SML_MASK_PMAP_ANIM,planet.emerald.small,sc2code/igfxres.h,GFXRES,base/planets/emerald-sml.ani
+PLANET40_BIG_MASK_PMAP_ANIM,planet.chlorine.large,sc2code/igfxres.h,GFXRES,base/planets/chlorine-big.ani
+PLANET40_MED_MASK_PMAP_ANIM,planet.chlorine.medium,sc2code/igfxres.h,GFXRES,base/planets/chlorine-med.ani
+PLANET40_SML_MASK_PMAP_ANIM,planet.chlorine.small,sc2code/igfxres.h,GFXRES,base/planets/chlorine-sml.ani
+PLANET41_BIG_MASK_PMAP_ANIM,planet.magnetic.large,sc2code/igfxres.h,GFXRES,base/planets/magnetic-big.ani
+PLANET41_MED_MASK_PMAP_ANIM,planet.magnetic.medium,sc2code/igfxres.h,GFXRES,base/planets/magnetic-med.ani
+PLANET41_SML_MASK_PMAP_ANIM,planet.magnetic.small,sc2code/igfxres.h,GFXRES,base/planets/magnetic-sml.ani
+PLANET42_BIG_MASK_PMAP_ANIM,planet.water.large,sc2code/igfxres.h,GFXRES,base/planets/water-big.ani
+PLANET42_MED_MASK_PMAP_ANIM,planet.water.medium,sc2code/igfxres.h,GFXRES,base/planets/water-med.ani
+PLANET42_SML_MASK_PMAP_ANIM,planet.water.small,sc2code/igfxres.h,GFXRES,base/planets/water-sml.ani
+PLANET43_BIG_MASK_PMAP_ANIM,planet.telluric.large,sc2code/igfxres.h,GFXRES,base/planets/telluric-big.ani
+PLANET43_MED_MASK_PMAP_ANIM,planet.telluric.medium,sc2code/igfxres.h,GFXRES,base/planets/telluric-med.ani
+PLANET43_SML_MASK_PMAP_ANIM,planet.telluric.small,sc2code/igfxres.h,GFXRES,base/planets/telluric-sml.ani
+PLANET44_BIG_MASK_PMAP_ANIM,planet.hydrocarbon.large,sc2code/igfxres.h,GFXRES,base/planets/hydrocarbon-big.ani
+PLANET44_MED_MASK_PMAP_ANIM,planet.hydrocarbon.medium,sc2code/igfxres.h,GFXRES,base/planets/hydrocarbon-med.ani
+PLANET44_SML_MASK_PMAP_ANIM,planet.hydrocarbon.small,sc2code/igfxres.h,GFXRES,base/planets/hydrocarbon-sml.ani
+PLANET45_BIG_MASK_PMAP_ANIM,planet.iodine.large,sc2code/igfxres.h,GFXRES,base/planets/iodine-big.ani
+PLANET45_MED_MASK_PMAP_ANIM,planet.iodine.medium,sc2code/igfxres.h,GFXRES,base/planets/iodine-med.ani
+PLANET45_SML_MASK_PMAP_ANIM,planet.iodine.small,sc2code/igfxres.h,GFXRES,base/planets/iodine-sml.ani
+PLANET46_BIG_MASK_PMAP_ANIM,planet.vinylogous.large,sc2code/igfxres.h,GFXRES,base/planets/vinylogous-big.ani
+PLANET46_MED_MASK_PMAP_ANIM,planet.vinylogous.medium,sc2code/igfxres.h,GFXRES,base/planets/vinylogous-med.ani
+PLANET46_SML_MASK_PMAP_ANIM,planet.vinylogous.small,sc2code/igfxres.h,GFXRES,base/planets/vinylogous-sml.ani
+PLANET47_BIG_MASK_PMAP_ANIM,planet.ruby.large,sc2code/igfxres.h,GFXRES,base/planets/ruby-big.ani
+PLANET47_MED_MASK_PMAP_ANIM,planet.ruby.medium,sc2code/igfxres.h,GFXRES,base/planets/ruby-med.ani
+PLANET47_SML_MASK_PMAP_ANIM,planet.ruby.small,sc2code/igfxres.h,GFXRES,base/planets/ruby-sml.ani
+PLANET48_BIG_MASK_PMAP_ANIM,planet.magma.large,sc2code/igfxres.h,GFXRES,base/planets/magma-big.ani
+PLANET48_MED_MASK_PMAP_ANIM,planet.magma.medium,sc2code/igfxres.h,GFXRES,base/planets/magma-med.ani
+PLANET48_SML_MASK_PMAP_ANIM,planet.magma.small,sc2code/igfxres.h,GFXRES,base/planets/magma-sml.ani
+PLANET49_BIG_MASK_PMAP_ANIM,planet.maroon.large,sc2code/igfxres.h,GFXRES,base/planets/maroon-big.ani
+PLANET49_MED_MASK_PMAP_ANIM,planet.maroon.medium,sc2code/igfxres.h,GFXRES,base/planets/maroon-med.ani
+PLANET49_SML_MASK_PMAP_ANIM,planet.maroon.small,sc2code/igfxres.h,GFXRES,base/planets/maroon-sml.ani
+PLANET50_BIG_MASK_PMAP_ANIM,planet.bluegas.large,sc2code/igfxres.h,GFXRES,base/planets/bluegas-big.ani
+PLANET50_MED_MASK_PMAP_ANIM,planet.bluegas.medium,sc2code/igfxres.h,GFXRES,base/planets/bluegas-med.ani
+PLANET50_SML_MASK_PMAP_ANIM,planet.bluegas.small,sc2code/igfxres.h,GFXRES,base/planets/bluegas-sml.ani
+PLANET51_BIG_MASK_PMAP_ANIM,planet.cyangas.large,sc2code/igfxres.h,GFXRES,base/planets/cyangas-big.ani
+PLANET51_MED_MASK_PMAP_ANIM,planet.cyangas.medium,sc2code/igfxres.h,GFXRES,base/planets/cyangas-med.ani
+PLANET51_SML_MASK_PMAP_ANIM,planet.cyangas.small,sc2code/igfxres.h,GFXRES,base/planets/cyangas-sml.ani
+PLANET52_BIG_MASK_PMAP_ANIM,planet.greengas.large,sc2code/igfxres.h,GFXRES,base/planets/greengas-big.ani
+PLANET52_MED_MASK_PMAP_ANIM,planet.greengas.medium,sc2code/igfxres.h,GFXRES,base/planets/greengas-med.ani
+PLANET52_SML_MASK_PMAP_ANIM,planet.greengas.small,sc2code/igfxres.h,GFXRES,base/planets/greengas-sml.ani
+PLANET53_BIG_MASK_PMAP_ANIM,planet.greygas.large,sc2code/igfxres.h,GFXRES,base/planets/greygas-big.ani
+PLANET53_MED_MASK_PMAP_ANIM,planet.greygas.medium,sc2code/igfxres.h,GFXRES,base/planets/greygas-med.ani
+PLANET53_SML_MASK_PMAP_ANIM,planet.greygas.small,sc2code/igfxres.h,GFXRES,base/planets/greygas-sml.ani
+PLANET54_BIG_MASK_PMAP_ANIM,planet.orangegas.large,sc2code/igfxres.h,GFXRES,base/planets/organic-big.ani
+PLANET54_MED_MASK_PMAP_ANIM,planet.orangegas.medium,sc2code/igfxres.h,GFXRES,base/planets/organic-med.ani
+PLANET54_SML_MASK_PMAP_ANIM,planet.orangegas.small,sc2code/igfxres.h,GFXRES,base/planets/organic-sml.ani
+PLANET55_BIG_MASK_PMAP_ANIM,planet.purplegas.large,sc2code/igfxres.h,GFXRES,base/planets/purplegas-big.ani
+PLANET55_MED_MASK_PMAP_ANIM,planet.purplegas.medium,sc2code/igfxres.h,GFXRES,base/planets/purplegas-med.ani
+PLANET55_SML_MASK_PMAP_ANIM,planet.purplegas.small,sc2code/igfxres.h,GFXRES,base/planets/purplegas-sml.ani
+PLANET56_BIG_MASK_PMAP_ANIM,planet.redgas.large,sc2code/igfxres.h,GFXRES,base/planets/redgas-big.ani
+PLANET56_MED_MASK_PMAP_ANIM,planet.redgas.medium,sc2code/igfxres.h,GFXRES,base/planets/redgas-med.ani
+PLANET56_SML_MASK_PMAP_ANIM,planet.redgas.small,sc2code/igfxres.h,GFXRES,base/planets/redgas-sml.ani
+PLANET57_BIG_MASK_PMAP_ANIM,planet.violetgas.large,sc2code/igfxres.h,GFXRES,base/planets/violetgas-big.ani
+PLANET57_MED_MASK_PMAP_ANIM,planet.violetgas.medium,sc2code/igfxres.h,GFXRES,base/planets/violetgas-med.ani
+PLANET57_SML_MASK_PMAP_ANIM,planet.violetgas.small,sc2code/igfxres.h,GFXRES,base/planets/violetgas-sml.ani
+PLANET58_BIG_MASK_PMAP_ANIM,planet.yellowgas.large,sc2code/igfxres.h,GFXRES,base/planets/yellowgas-big.ani
+PLANET58_MED_MASK_PMAP_ANIM,planet.yellowgas.medium,sc2code/igfxres.h,GFXRES,base/planets/yellowgas-med.ani
+PLANET58_SML_MASK_PMAP_ANIM,planet.yellowgas.small,sc2code/igfxres.h,GFXRES,base/planets/yellowgas-sml.ani
 CREDITS_BACK_ANIM,credits.background,sc2code/igfxres.h,GFXRES,base/cutscene/credits/credback.ani
-SISSKEL_MASK_PMAP_ANIM,graphics.sisskeleton,sc2code/igfxres.h,GFXRES,base/cutscene/ending/sis_skel.ani
-ORBENTER_PMAP_ANIM,graphics.orbenter,sc2code/igfxres.h,GFXRES,base/nav/orbitenter.ani
+SISSKEL_MASK_PMAP_ANIM,graphics.flagshipskeleton,sc2code/igfxres.h,GFXRES,base/cutscene/ending/fs_skeleton.ani
+ORBENTER_PMAP_ANIM,graphics.orbitenter,sc2code/igfxres.h,GFXRES,base/nav/orbitenter.ani
 MENUBKG_PMAP_ANIM,graphics.setupmenu,sc2code/igfxres.h,GFXRES,base/ui/setupmenu.ani
-FONTGRAD_PMAP_ANIM,graphics.fontgrad,sc2code/igfxres.h,GFXRES,base/fonts/fontgrad.ani
-LANDER_FONTEFF_PMAP_ANIM,graphics.landfeff,sc2code/igfxres.h,GFXRES,base/lander/fonteffect.ani
+FONTGRAD_PMAP_ANIM,graphics.fontgradient,sc2code/igfxres.h,GFXRES,base/fonts/fontgradient.ani
+LANDER_FONTEFF_PMAP_ANIM,graphics.landerfonteffect,sc2code/igfxres.h,GFXRES,base/lander/fonteffect.ani
 DRUUGE_MUSIC,comm.druuge.music,sc2code/comm/druuge/imusicre.h,MUSICRES,base/comm/druuge/druuge.mod
 DRUUGE_FONT,comm.druuge.font,sc2code/comm/druuge/ifontres.h,FONTRES,base/fonts/druuge.fon
 DRUUGE_CONVERSATION_PHRASES,comm.druuge.dialogue,sc2code/comm/druuge/istrtab.h,CONVERSATION,base/comm/druuge/druuge.txt
@@ -455,7 +455,7 @@ SLYLAND_CONVERSATION_PHRASES,comm.probe.dialogue,sc2code/comm/slyland/istrtab.h,
 SLYLAND_COLOR_MAP,comm.probe.colortable,sc2code/comm/slyland/istrtab.h,BINTAB,base/comm/probe/probe.ct
 SLYLAND_PMAP_ANIM,comm.probe.graphics,sc2code/comm/slyland/igfxres.h,GFXRES,base/comm/probe/probe.ani
 UTWIG_MUSIC,comm.utwig.music,sc2code/comm/utwig/imusicre.h,MUSICRES,base/comm/utwig/utwig.mod
-UTWIG_ULTRON_MUSIC,comm.utwigult.music,sc2code/comm/utwig/imusicre.h,--,--
+UTWIG_ULTRON_MUSIC,comm.utwig.ultron.music,sc2code/comm/utwig/imusicre.h,--,--
 UTWIG_FONT,comm.utwig.font,sc2code/comm/utwig/ifontres.h,FONTRES,base/fonts/utwig.fon
 UTWIG_CONVERSATION_PHRASES,comm.utwig.dialogue,sc2code/comm/utwig/istrtab.h,CONVERSATION,base/comm/utwig/utwig.txt
 UTWIG_COLOR_MAP,comm.utwig.colortable,sc2code/comm/utwig/istrtab.h,BINTAB,base/comm/utwig/utwig.ct
@@ -497,7 +497,7 @@ ARILOU_PMAP_ANIM,comm.arilou.graphics,sc2code/comm/arilou/igfxres.h,GFXRES,base/
 ARILOU_COLOR_MAP,comm.arilou.colortable,sc2code/comm/arilou/igfxres.h,BINTAB,base/comm/arilou/arilou.ct
 COMMANDER_MUSIC,comm.commander.music,sc2code/comm/comandr/imusicre.h,MUSICRES,base/comm/commander/commander.mod
 STARBASE_ALT_MUSIC,comm.starbase.music,sc2code/comm/comandr/imusicre.h,--,--
-COMMANDER_LOWPOW_MUSIC,comm.comlowpw.music,sc2code/comm/comandr/imusicre.h,--,--
+COMMANDER_LOWPOW_MUSIC,comm.commander.lowpower.music,sc2code/comm/comandr/imusicre.h,--,--
 COMMANDER_FONT,comm.commander.font,sc2code/comm/comandr/ifontres.h,FONTRES,base/fonts/commander.fon
 COMMANDER_COLOR_MAP,comm.commander.colortable,sc2code/comm/comandr/istrtab.h,BINTAB,base/comm/commander/commander.ct
 COMMANDER_CONVERSATION_PHRASES,comm.commander.dialogue,sc2code/comm/comandr/istrtab.h,CONVERSATION,base/comm/commander/commander.txt