diff --git a/sc2/content/base/ships/kohrah/blacap.ani b/sc2/content/base/ships/kohrah/blacap.ani
deleted file mode 100644
index a263ae7c1..000000000
--- a/sc2/content/base/ships/kohrah/blacap.ani
+++ /dev/null
@@ -1,15 +0,0 @@
-blacap.0.png -1 1 0 0
-blacap.1.png 0 1 0 -8
-blacap.2.png 0 1 0 -8
-blacap.3.png 0 1 0 -8
-blacap.4.png 0 1 -38 -8
-blacap.5.png 0 1 -38 -8
-blacap.6.png 0 1 -21 -8
-blacap.7.png 0 1 -21 -8
-blacap.8.png 0 1 -21 -8
-blacap.9.png 0 1 -19 -19
-blacap.10.png 0 1 -19 -19
-blacap.11.png 0 1 -19 -19
-blacap.12.png 0 1 0 0
-blacap.13.png 0 1 0 0
-blacap.14.png 0 1 0 0
diff --git a/sc2/content/base/ships/kohrah/blackurq.big b/sc2/content/base/ships/kohrah/blackurq.big
deleted file mode 100644
index 345d4c1e9..000000000
--- a/sc2/content/base/ships/kohrah/blackurq.big
+++ /dev/null
@@ -1,16 +0,0 @@
-blackurq.big.0.png 1 3 11 20
-blackurq.big.1.png 1 3 14 20
-blackurq.big.2.png 1 3 17 18
-blackurq.big.3.png 1 3 18 15
-blackurq.big.4.png 1 3 18 10
-blackurq.big.5.png 1 3 19 15
-blackurq.big.6.png 1 3 17 16
-blackurq.big.7.png 1 3 14 17
-blackurq.big.8.png 1 3 10 17
-blackurq.big.9.png 1 3 15 16
-blackurq.big.10.png 1 3 19 17
-blackurq.big.11.png 1 3 21 14
-blackurq.big.12.png 1 3 21 11
-blackurq.big.13.png 1 3 20 15
-blackurq.big.14.png 1 3 19 20
-blackurq.big.15.png 1 3 15 21
diff --git a/sc2/content/base/ships/kohrah/blackurq.med b/sc2/content/base/ships/kohrah/blackurq.med
deleted file mode 100644
index 55236687c..000000000
--- a/sc2/content/base/ships/kohrah/blackurq.med
+++ /dev/null
@@ -1,16 +0,0 @@
-blackurq.med.0.png 0 3 5 10
-blackurq.med.1.png 0 3 7 10
-blackurq.med.2.png 1 3 9 9
-blackurq.med.3.png 0 3 9 7
-blackurq.med.4.png 0 3 9 6
-blackurq.med.5.png 1 3 10 9
-blackurq.med.6.png 1 3 9 10
-blackurq.med.7.png 1 3 7 10
-blackurq.med.8.png 0 3 5 10
-blackurq.med.9.png 1 3 6 11
-blackurq.med.10.png 0 3 7 11
-blackurq.med.11.png 0 3 9 8
-blackurq.med.12.png 0 3 9 6
-blackurq.med.13.png 1 3 9 7
-blackurq.med.14.png 1 3 9 9
-blackurq.med.15.png 1 3 8 9
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml b/sc2/content/base/ships/kohrah/blackurq.sml
deleted file mode 100644
index 5d21262bc..000000000
--- a/sc2/content/base/ships/kohrah/blackurq.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-blackurq.sml.0.png 0 3 2 5
-blackurq.sml.1.png 0 3 4 5
-blackurq.sml.2.png 0 3 4 4
-blackurq.sml.3.png 0 3 4 3
-blackurq.sml.4.png 0 3 4 2
-blackurq.sml.5.png 0 3 4 3
-blackurq.sml.6.png 0 3 4 4
-blackurq.sml.7.png 0 3 4 4
-blackurq.sml.8.png 0 3 2 4
-blackurq.sml.9.png 0 3 3 4
-blackurq.sml.10.png 0 3 4 4
-blackurq.sml.11.png 0 3 5 3
-blackurq.sml.12.png 0 3 5 2
-blackurq.sml.13.png 0 3 5 3
-blackurq.sml.14.png 0 3 4 4
-blackurq.sml.15.png 0 3 3 5
diff --git a/sc2/content/base/ships/kohrah/blaicons.ani b/sc2/content/base/ships/kohrah/blaicons.ani
deleted file mode 100644
index d92a5df7e..000000000
--- a/sc2/content/base/ships/kohrah/blaicons.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-blaicons.0.png 1 1 0 0
-blaicons.1.png 1 1 15 18
diff --git a/sc2/content/base/ships/kohrah/blamicon.ani b/sc2/content/base/ships/kohrah/blamicon.ani
deleted file mode 100644
index 1ce480963..000000000
--- a/sc2/content/base/ships/kohrah/blamicon.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-blamicon.0.png 1 1 16 15
-blamicon.1.png 0 1 2 4
diff --git a/sc2/content/base/ships/kohrah/buzbig.ani b/sc2/content/base/ships/kohrah/buzbig.ani
deleted file mode 100644
index b2df2d29f..000000000
--- a/sc2/content/base/ships/kohrah/buzbig.ani
+++ /dev/null
@@ -1,8 +0,0 @@
-buzbig.0.png 0 1 8 8
-buzbig.1.png 0 1 9 9
-buzbig.2.png 0 1 7 7
-buzbig.3.png 0 1 10 10
-buzbig.4.png 0 1 11 11
-buzbig.5.png 0 1 13 13
-buzbig.6.png 0 1 14 15
-buzbig.7.png 0 1 15 16
diff --git a/sc2/content/base/ships/kohrah/buzmed.ani b/sc2/content/base/ships/kohrah/buzmed.ani
deleted file mode 100644
index 9539b39a7..000000000
--- a/sc2/content/base/ships/kohrah/buzmed.ani
+++ /dev/null
@@ -1,8 +0,0 @@
-buzmed.0.png 0 1 4 4
-buzmed.1.png 0 1 4 4
-buzmed.2.png 0 1 7 7
-buzmed.3.png 0 1 3 3
-buzmed.4.png 0 1 5 5
-buzmed.5.png 0 1 6 7
-buzmed.6.png 0 1 7 7
-buzmed.7.png 0 1 6 8
diff --git a/sc2/content/base/ships/kohrah/buzsml.ani b/sc2/content/base/ships/kohrah/buzsml.ani
deleted file mode 100644
index 36ab377ad..000000000
--- a/sc2/content/base/ships/kohrah/buzsml.ani
+++ /dev/null
@@ -1,8 +0,0 @@
-buzsml.0.png 0 1 3 3
-buzsml.1.png 0 1 2 2
-buzsml.2.png 0 1 2 2
-buzsml.3.png 0 1 4 4
-buzsml.4.png 0 1 4 4
-buzsml.5.png 0 1 5 5
-buzsml.6.png 0 1 5 5
-buzsml.7.png 0 1 4 4
diff --git a/sc2/content/base/ships/kohrah/buzbig.0.png b/sc2/content/base/ships/kohrah/buzzsaw-big.0.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzbig.0.png
rename to sc2/content/base/ships/kohrah/buzzsaw-big.0.png
diff --git a/sc2/content/base/ships/kohrah/buzbig.1.png b/sc2/content/base/ships/kohrah/buzzsaw-big.1.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzbig.1.png
rename to sc2/content/base/ships/kohrah/buzzsaw-big.1.png
diff --git a/sc2/content/base/ships/kohrah/buzbig.2.png b/sc2/content/base/ships/kohrah/buzzsaw-big.2.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzbig.2.png
rename to sc2/content/base/ships/kohrah/buzzsaw-big.2.png
diff --git a/sc2/content/base/ships/kohrah/buzbig.3.png b/sc2/content/base/ships/kohrah/buzzsaw-big.3.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzbig.3.png
rename to sc2/content/base/ships/kohrah/buzzsaw-big.3.png
diff --git a/sc2/content/base/ships/kohrah/buzbig.4.png b/sc2/content/base/ships/kohrah/buzzsaw-big.4.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzbig.4.png
rename to sc2/content/base/ships/kohrah/buzzsaw-big.4.png
diff --git a/sc2/content/base/ships/kohrah/buzbig.5.png b/sc2/content/base/ships/kohrah/buzzsaw-big.5.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzbig.5.png
rename to sc2/content/base/ships/kohrah/buzzsaw-big.5.png
diff --git a/sc2/content/base/ships/kohrah/buzbig.6.png b/sc2/content/base/ships/kohrah/buzzsaw-big.6.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzbig.6.png
rename to sc2/content/base/ships/kohrah/buzzsaw-big.6.png
diff --git a/sc2/content/base/ships/kohrah/buzbig.7.png b/sc2/content/base/ships/kohrah/buzzsaw-big.7.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzbig.7.png
rename to sc2/content/base/ships/kohrah/buzzsaw-big.7.png
diff --git a/sc2/content/base/ships/kohrah/buzzsaw-big.ani b/sc2/content/base/ships/kohrah/buzzsaw-big.ani
new file mode 100644
index 000000000..8b14652a1
--- /dev/null
+++ b/sc2/content/base/ships/kohrah/buzzsaw-big.ani
@@ -0,0 +1,8 @@
+buzzsaw-big.0.png 0 1 8 8
+buzzsaw-big.1.png 0 1 9 9
+buzzsaw-big.2.png 0 1 7 7
+buzzsaw-big.3.png 0 1 10 10
+buzzsaw-big.4.png 0 1 11 11
+buzzsaw-big.5.png 0 1 13 13
+buzzsaw-big.6.png 0 1 14 15
+buzzsaw-big.7.png 0 1 15 16
diff --git a/sc2/content/base/ships/kohrah/buzmed.0.png b/sc2/content/base/ships/kohrah/buzzsaw-med.0.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzmed.0.png
rename to sc2/content/base/ships/kohrah/buzzsaw-med.0.png
diff --git a/sc2/content/base/ships/kohrah/buzmed.1.png b/sc2/content/base/ships/kohrah/buzzsaw-med.1.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzmed.1.png
rename to sc2/content/base/ships/kohrah/buzzsaw-med.1.png
diff --git a/sc2/content/base/ships/kohrah/buzmed.2.png b/sc2/content/base/ships/kohrah/buzzsaw-med.2.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzmed.2.png
rename to sc2/content/base/ships/kohrah/buzzsaw-med.2.png
diff --git a/sc2/content/base/ships/kohrah/buzmed.3.png b/sc2/content/base/ships/kohrah/buzzsaw-med.3.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzmed.3.png
rename to sc2/content/base/ships/kohrah/buzzsaw-med.3.png
diff --git a/sc2/content/base/ships/kohrah/buzmed.4.png b/sc2/content/base/ships/kohrah/buzzsaw-med.4.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzmed.4.png
rename to sc2/content/base/ships/kohrah/buzzsaw-med.4.png
diff --git a/sc2/content/base/ships/kohrah/buzmed.5.png b/sc2/content/base/ships/kohrah/buzzsaw-med.5.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzmed.5.png
rename to sc2/content/base/ships/kohrah/buzzsaw-med.5.png
diff --git a/sc2/content/base/ships/kohrah/buzmed.6.png b/sc2/content/base/ships/kohrah/buzzsaw-med.6.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzmed.6.png
rename to sc2/content/base/ships/kohrah/buzzsaw-med.6.png
diff --git a/sc2/content/base/ships/kohrah/buzmed.7.png b/sc2/content/base/ships/kohrah/buzzsaw-med.7.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzmed.7.png
rename to sc2/content/base/ships/kohrah/buzzsaw-med.7.png
diff --git a/sc2/content/base/ships/kohrah/buzzsaw-med.ani b/sc2/content/base/ships/kohrah/buzzsaw-med.ani
new file mode 100644
index 000000000..0e0ef4fe9
--- /dev/null
+++ b/sc2/content/base/ships/kohrah/buzzsaw-med.ani
@@ -0,0 +1,8 @@
+buzzsaw-med.0.png 0 1 4 4
+buzzsaw-med.1.png 0 1 4 4
+buzzsaw-med.2.png 0 1 7 7
+buzzsaw-med.3.png 0 1 3 3
+buzzsaw-med.4.png 0 1 5 5
+buzzsaw-med.5.png 0 1 6 7
+buzzsaw-med.6.png 0 1 7 7
+buzzsaw-med.7.png 0 1 6 8
diff --git a/sc2/content/base/ships/kohrah/buzsml.0.png b/sc2/content/base/ships/kohrah/buzzsaw-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzsml.0.png
rename to sc2/content/base/ships/kohrah/buzzsaw-sml.0.png
diff --git a/sc2/content/base/ships/kohrah/buzsml.1.png b/sc2/content/base/ships/kohrah/buzzsaw-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzsml.1.png
rename to sc2/content/base/ships/kohrah/buzzsaw-sml.1.png
diff --git a/sc2/content/base/ships/kohrah/buzsml.2.png b/sc2/content/base/ships/kohrah/buzzsaw-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzsml.2.png
rename to sc2/content/base/ships/kohrah/buzzsaw-sml.2.png
diff --git a/sc2/content/base/ships/kohrah/buzsml.3.png b/sc2/content/base/ships/kohrah/buzzsaw-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzsml.3.png
rename to sc2/content/base/ships/kohrah/buzzsaw-sml.3.png
diff --git a/sc2/content/base/ships/kohrah/buzsml.4.png b/sc2/content/base/ships/kohrah/buzzsaw-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzsml.4.png
rename to sc2/content/base/ships/kohrah/buzzsaw-sml.4.png
diff --git a/sc2/content/base/ships/kohrah/buzsml.5.png b/sc2/content/base/ships/kohrah/buzzsaw-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzsml.5.png
rename to sc2/content/base/ships/kohrah/buzzsaw-sml.5.png
diff --git a/sc2/content/base/ships/kohrah/buzsml.6.png b/sc2/content/base/ships/kohrah/buzzsaw-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzsml.6.png
rename to sc2/content/base/ships/kohrah/buzzsaw-sml.6.png
diff --git a/sc2/content/base/ships/kohrah/buzsml.7.png b/sc2/content/base/ships/kohrah/buzzsaw-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/buzsml.7.png
rename to sc2/content/base/ships/kohrah/buzzsaw-sml.7.png
diff --git a/sc2/content/base/ships/kohrah/buzzsaw-sml.ani b/sc2/content/base/ships/kohrah/buzzsaw-sml.ani
new file mode 100644
index 000000000..55da85831
--- /dev/null
+++ b/sc2/content/base/ships/kohrah/buzzsaw-sml.ani
@@ -0,0 +1,8 @@
+buzzsaw-sml.0.png 0 1 3 3
+buzzsaw-sml.1.png 0 1 2 2
+buzzsaw-sml.2.png 0 1 2 2
+buzzsaw-sml.3.png 0 1 4 4
+buzzsaw-sml.4.png 0 1 4 4
+buzzsaw-sml.5.png 0 1 5 5
+buzzsaw-sml.6.png 0 1 5 5
+buzzsaw-sml.7.png 0 1 4 4
diff --git a/sc2/content/base/ships/kohrah/gasbig.0.png b/sc2/content/base/ships/kohrah/gas-big.0.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasbig.0.png
rename to sc2/content/base/ships/kohrah/gas-big.0.png
diff --git a/sc2/content/base/ships/kohrah/gasbig.1.png b/sc2/content/base/ships/kohrah/gas-big.1.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasbig.1.png
rename to sc2/content/base/ships/kohrah/gas-big.1.png
diff --git a/sc2/content/base/ships/kohrah/gasbig.2.png b/sc2/content/base/ships/kohrah/gas-big.2.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasbig.2.png
rename to sc2/content/base/ships/kohrah/gas-big.2.png
diff --git a/sc2/content/base/ships/kohrah/gasbig.3.png b/sc2/content/base/ships/kohrah/gas-big.3.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasbig.3.png
rename to sc2/content/base/ships/kohrah/gas-big.3.png
diff --git a/sc2/content/base/ships/kohrah/gasbig.4.png b/sc2/content/base/ships/kohrah/gas-big.4.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasbig.4.png
rename to sc2/content/base/ships/kohrah/gas-big.4.png
diff --git a/sc2/content/base/ships/kohrah/gasbig.5.png b/sc2/content/base/ships/kohrah/gas-big.5.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasbig.5.png
rename to sc2/content/base/ships/kohrah/gas-big.5.png
diff --git a/sc2/content/base/ships/kohrah/gasbig.6.png b/sc2/content/base/ships/kohrah/gas-big.6.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasbig.6.png
rename to sc2/content/base/ships/kohrah/gas-big.6.png
diff --git a/sc2/content/base/ships/kohrah/gasbig.7.png b/sc2/content/base/ships/kohrah/gas-big.7.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasbig.7.png
rename to sc2/content/base/ships/kohrah/gas-big.7.png
diff --git a/sc2/content/base/ships/kohrah/gas-big.ani b/sc2/content/base/ships/kohrah/gas-big.ani
new file mode 100644
index 000000000..b73abe4b4
--- /dev/null
+++ b/sc2/content/base/ships/kohrah/gas-big.ani
@@ -0,0 +1,8 @@
+gas-big.0.png 0 5 4 3
+gas-big.1.png 0 5 4 4
+gas-big.2.png 0 5 5 5
+gas-big.3.png 0 5 5 5
+gas-big.4.png 0 5 6 6
+gas-big.5.png 0 5 7 6
+gas-big.6.png 0 5 9 8
+gas-big.7.png 0 5 10 9
diff --git a/sc2/content/base/ships/kohrah/gasmed.0.png b/sc2/content/base/ships/kohrah/gas-med.0.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasmed.0.png
rename to sc2/content/base/ships/kohrah/gas-med.0.png
diff --git a/sc2/content/base/ships/kohrah/gasmed.1.png b/sc2/content/base/ships/kohrah/gas-med.1.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasmed.1.png
rename to sc2/content/base/ships/kohrah/gas-med.1.png
diff --git a/sc2/content/base/ships/kohrah/gasmed.2.png b/sc2/content/base/ships/kohrah/gas-med.2.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasmed.2.png
rename to sc2/content/base/ships/kohrah/gas-med.2.png
diff --git a/sc2/content/base/ships/kohrah/gasmed.3.png b/sc2/content/base/ships/kohrah/gas-med.3.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasmed.3.png
rename to sc2/content/base/ships/kohrah/gas-med.3.png
diff --git a/sc2/content/base/ships/kohrah/gasmed.4.png b/sc2/content/base/ships/kohrah/gas-med.4.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasmed.4.png
rename to sc2/content/base/ships/kohrah/gas-med.4.png
diff --git a/sc2/content/base/ships/kohrah/gasmed.5.png b/sc2/content/base/ships/kohrah/gas-med.5.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasmed.5.png
rename to sc2/content/base/ships/kohrah/gas-med.5.png
diff --git a/sc2/content/base/ships/kohrah/gasmed.6.png b/sc2/content/base/ships/kohrah/gas-med.6.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasmed.6.png
rename to sc2/content/base/ships/kohrah/gas-med.6.png
diff --git a/sc2/content/base/ships/kohrah/gasmed.7.png b/sc2/content/base/ships/kohrah/gas-med.7.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gasmed.7.png
rename to sc2/content/base/ships/kohrah/gas-med.7.png
diff --git a/sc2/content/base/ships/kohrah/gas-med.ani b/sc2/content/base/ships/kohrah/gas-med.ani
new file mode 100644
index 000000000..e4bd88ac2
--- /dev/null
+++ b/sc2/content/base/ships/kohrah/gas-med.ani
@@ -0,0 +1,8 @@
+gas-med.0.png 0 5 2 2
+gas-med.1.png 0 5 2 2
+gas-med.2.png 0 5 2 2
+gas-med.3.png 0 5 2 2
+gas-med.4.png 0 5 3 2
+gas-med.5.png 0 5 3 3
+gas-med.6.png 0 5 4 4
+gas-med.7.png 0 5 5 4
diff --git a/sc2/content/base/ships/kohrah/gassml.0.png b/sc2/content/base/ships/kohrah/gas-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gassml.0.png
rename to sc2/content/base/ships/kohrah/gas-sml.0.png
diff --git a/sc2/content/base/ships/kohrah/gassml.1.png b/sc2/content/base/ships/kohrah/gas-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gassml.1.png
rename to sc2/content/base/ships/kohrah/gas-sml.1.png
diff --git a/sc2/content/base/ships/kohrah/gassml.2.png b/sc2/content/base/ships/kohrah/gas-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gassml.2.png
rename to sc2/content/base/ships/kohrah/gas-sml.2.png
diff --git a/sc2/content/base/ships/kohrah/gassml.3.png b/sc2/content/base/ships/kohrah/gas-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gassml.3.png
rename to sc2/content/base/ships/kohrah/gas-sml.3.png
diff --git a/sc2/content/base/ships/kohrah/gassml.4.png b/sc2/content/base/ships/kohrah/gas-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gassml.4.png
rename to sc2/content/base/ships/kohrah/gas-sml.4.png
diff --git a/sc2/content/base/ships/kohrah/gassml.5.png b/sc2/content/base/ships/kohrah/gas-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gassml.5.png
rename to sc2/content/base/ships/kohrah/gas-sml.5.png
diff --git a/sc2/content/base/ships/kohrah/gassml.6.png b/sc2/content/base/ships/kohrah/gas-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gassml.6.png
rename to sc2/content/base/ships/kohrah/gas-sml.6.png
diff --git a/sc2/content/base/ships/kohrah/gassml.7.png b/sc2/content/base/ships/kohrah/gas-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/gassml.7.png
rename to sc2/content/base/ships/kohrah/gas-sml.7.png
diff --git a/sc2/content/base/ships/kohrah/gas-sml.ani b/sc2/content/base/ships/kohrah/gas-sml.ani
new file mode 100644
index 000000000..fddcd98eb
--- /dev/null
+++ b/sc2/content/base/ships/kohrah/gas-sml.ani
@@ -0,0 +1,8 @@
+gas-sml.0.png 0 5 1 1
+gas-sml.1.png 0 5 1 1
+gas-sml.2.png 0 5 1 1
+gas-sml.3.png 0 5 1 1
+gas-sml.4.png 0 5 1 1
+gas-sml.5.png 0 5 2 1
+gas-sml.6.png 0 5 2 2
+gas-sml.7.png 0 5 2 2
diff --git a/sc2/content/base/ships/kohrah/gasbig.ani b/sc2/content/base/ships/kohrah/gasbig.ani
deleted file mode 100644
index f9f1039c1..000000000
--- a/sc2/content/base/ships/kohrah/gasbig.ani
+++ /dev/null
@@ -1,8 +0,0 @@
-gasbig.0.png 0 5 4 3
-gasbig.1.png 0 5 4 4
-gasbig.2.png 0 5 5 5
-gasbig.3.png 0 5 5 5
-gasbig.4.png 0 5 6 6
-gasbig.5.png 0 5 7 6
-gasbig.6.png 0 5 9 8
-gasbig.7.png 0 5 10 9
diff --git a/sc2/content/base/ships/kohrah/gasmed.ani b/sc2/content/base/ships/kohrah/gasmed.ani
deleted file mode 100644
index 21f71951a..000000000
--- a/sc2/content/base/ships/kohrah/gasmed.ani
+++ /dev/null
@@ -1,8 +0,0 @@
-gasmed.0.png 0 5 2 2
-gasmed.1.png 0 5 2 2
-gasmed.2.png 0 5 2 2
-gasmed.3.png 0 5 2 2
-gasmed.4.png 0 5 3 2
-gasmed.5.png 0 5 3 3
-gasmed.6.png 0 5 4 4
-gasmed.7.png 0 5 5 4
diff --git a/sc2/content/base/ships/kohrah/gassml.ani b/sc2/content/base/ships/kohrah/gassml.ani
deleted file mode 100644
index 1ea7c0e09..000000000
--- a/sc2/content/base/ships/kohrah/gassml.ani
+++ /dev/null
@@ -1,8 +0,0 @@
-gassml.0.png 0 5 1 1
-gassml.1.png 0 5 1 1
-gassml.2.png 0 5 1 1
-gassml.3.png 0 5 1 1
-gassml.4.png 0 5 1 1
-gassml.5.png 0 5 2 1
-gassml.6.png 0 5 2 2
-gassml.7.png 0 5 2 2
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.0.png b/sc2/content/base/ships/kohrah/marauder-big.0.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.0.png
rename to sc2/content/base/ships/kohrah/marauder-big.0.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.1.png b/sc2/content/base/ships/kohrah/marauder-big.1.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.1.png
rename to sc2/content/base/ships/kohrah/marauder-big.1.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.10.png b/sc2/content/base/ships/kohrah/marauder-big.10.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.10.png
rename to sc2/content/base/ships/kohrah/marauder-big.10.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.11.png b/sc2/content/base/ships/kohrah/marauder-big.11.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.11.png
rename to sc2/content/base/ships/kohrah/marauder-big.11.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.12.png b/sc2/content/base/ships/kohrah/marauder-big.12.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.12.png
rename to sc2/content/base/ships/kohrah/marauder-big.12.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.13.png b/sc2/content/base/ships/kohrah/marauder-big.13.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.13.png
rename to sc2/content/base/ships/kohrah/marauder-big.13.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.14.png b/sc2/content/base/ships/kohrah/marauder-big.14.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.14.png
rename to sc2/content/base/ships/kohrah/marauder-big.14.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.15.png b/sc2/content/base/ships/kohrah/marauder-big.15.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.15.png
rename to sc2/content/base/ships/kohrah/marauder-big.15.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.2.png b/sc2/content/base/ships/kohrah/marauder-big.2.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.2.png
rename to sc2/content/base/ships/kohrah/marauder-big.2.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.3.png b/sc2/content/base/ships/kohrah/marauder-big.3.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.3.png
rename to sc2/content/base/ships/kohrah/marauder-big.3.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.4.png b/sc2/content/base/ships/kohrah/marauder-big.4.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.4.png
rename to sc2/content/base/ships/kohrah/marauder-big.4.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.5.png b/sc2/content/base/ships/kohrah/marauder-big.5.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.5.png
rename to sc2/content/base/ships/kohrah/marauder-big.5.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.6.png b/sc2/content/base/ships/kohrah/marauder-big.6.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.6.png
rename to sc2/content/base/ships/kohrah/marauder-big.6.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.7.png b/sc2/content/base/ships/kohrah/marauder-big.7.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.7.png
rename to sc2/content/base/ships/kohrah/marauder-big.7.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.8.png b/sc2/content/base/ships/kohrah/marauder-big.8.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.8.png
rename to sc2/content/base/ships/kohrah/marauder-big.8.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.big.9.png b/sc2/content/base/ships/kohrah/marauder-big.9.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.big.9.png
rename to sc2/content/base/ships/kohrah/marauder-big.9.png
diff --git a/sc2/content/base/ships/kohrah/marauder-big.ani b/sc2/content/base/ships/kohrah/marauder-big.ani
new file mode 100644
index 000000000..33e860664
--- /dev/null
+++ b/sc2/content/base/ships/kohrah/marauder-big.ani
@@ -0,0 +1,16 @@
+marauder-big.0.png 1 3 11 20
+marauder-big.1.png 1 3 14 20
+marauder-big.2.png 1 3 17 18
+marauder-big.3.png 1 3 18 15
+marauder-big.4.png 1 3 18 10
+marauder-big.5.png 1 3 19 15
+marauder-big.6.png 1 3 17 16
+marauder-big.7.png 1 3 14 17
+marauder-big.8.png 1 3 10 17
+marauder-big.9.png 1 3 15 16
+marauder-big.10.png 1 3 19 17
+marauder-big.11.png 1 3 21 14
+marauder-big.12.png 1 3 21 11
+marauder-big.13.png 1 3 20 15
+marauder-big.14.png 1 3 19 20
+marauder-big.15.png 1 3 15 21
diff --git a/sc2/content/base/ships/kohrah/blacap.0.png b/sc2/content/base/ships/kohrah/marauder-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.0.png
rename to sc2/content/base/ships/kohrah/marauder-cap.0.png
diff --git a/sc2/content/base/ships/kohrah/blacap.1.png b/sc2/content/base/ships/kohrah/marauder-cap.1.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.1.png
rename to sc2/content/base/ships/kohrah/marauder-cap.1.png
diff --git a/sc2/content/base/ships/kohrah/blacap.10.png b/sc2/content/base/ships/kohrah/marauder-cap.10.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.10.png
rename to sc2/content/base/ships/kohrah/marauder-cap.10.png
diff --git a/sc2/content/base/ships/kohrah/blacap.11.png b/sc2/content/base/ships/kohrah/marauder-cap.11.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.11.png
rename to sc2/content/base/ships/kohrah/marauder-cap.11.png
diff --git a/sc2/content/base/ships/kohrah/blacap.12.png b/sc2/content/base/ships/kohrah/marauder-cap.12.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.12.png
rename to sc2/content/base/ships/kohrah/marauder-cap.12.png
diff --git a/sc2/content/base/ships/kohrah/blacap.13.png b/sc2/content/base/ships/kohrah/marauder-cap.13.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.13.png
rename to sc2/content/base/ships/kohrah/marauder-cap.13.png
diff --git a/sc2/content/base/ships/kohrah/blacap.14.png b/sc2/content/base/ships/kohrah/marauder-cap.14.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.14.png
rename to sc2/content/base/ships/kohrah/marauder-cap.14.png
diff --git a/sc2/content/base/ships/kohrah/blacap.2.png b/sc2/content/base/ships/kohrah/marauder-cap.2.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.2.png
rename to sc2/content/base/ships/kohrah/marauder-cap.2.png
diff --git a/sc2/content/base/ships/kohrah/blacap.3.png b/sc2/content/base/ships/kohrah/marauder-cap.3.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.3.png
rename to sc2/content/base/ships/kohrah/marauder-cap.3.png
diff --git a/sc2/content/base/ships/kohrah/blacap.4.png b/sc2/content/base/ships/kohrah/marauder-cap.4.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.4.png
rename to sc2/content/base/ships/kohrah/marauder-cap.4.png
diff --git a/sc2/content/base/ships/kohrah/blacap.5.png b/sc2/content/base/ships/kohrah/marauder-cap.5.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.5.png
rename to sc2/content/base/ships/kohrah/marauder-cap.5.png
diff --git a/sc2/content/base/ships/kohrah/blacap.6.png b/sc2/content/base/ships/kohrah/marauder-cap.6.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.6.png
rename to sc2/content/base/ships/kohrah/marauder-cap.6.png
diff --git a/sc2/content/base/ships/kohrah/blacap.7.png b/sc2/content/base/ships/kohrah/marauder-cap.7.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.7.png
rename to sc2/content/base/ships/kohrah/marauder-cap.7.png
diff --git a/sc2/content/base/ships/kohrah/blacap.8.png b/sc2/content/base/ships/kohrah/marauder-cap.8.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.8.png
rename to sc2/content/base/ships/kohrah/marauder-cap.8.png
diff --git a/sc2/content/base/ships/kohrah/blacap.9.png b/sc2/content/base/ships/kohrah/marauder-cap.9.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blacap.9.png
rename to sc2/content/base/ships/kohrah/marauder-cap.9.png
diff --git a/sc2/content/base/ships/kohrah/marauder-cap.ani b/sc2/content/base/ships/kohrah/marauder-cap.ani
new file mode 100644
index 000000000..645b1e587
--- /dev/null
+++ b/sc2/content/base/ships/kohrah/marauder-cap.ani
@@ -0,0 +1,15 @@
+marauder-cap.0.png -1 1 0 0
+marauder-cap.1.png 0 1 0 -8
+marauder-cap.2.png 0 1 0 -8
+marauder-cap.3.png 0 1 0 -8
+marauder-cap.4.png 0 1 -38 -8
+marauder-cap.5.png 0 1 -38 -8
+marauder-cap.6.png 0 1 -21 -8
+marauder-cap.7.png 0 1 -21 -8
+marauder-cap.8.png 0 1 -21 -8
+marauder-cap.9.png 0 1 -19 -19
+marauder-cap.10.png 0 1 -19 -19
+marauder-cap.11.png 0 1 -19 -19
+marauder-cap.12.png 0 1 0 0
+marauder-cap.13.png 0 1 0 0
+marauder-cap.14.png 0 1 0 0
diff --git a/sc2/content/base/ships/kohrah/blaicons.0.png b/sc2/content/base/ships/kohrah/marauder-icons.0.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blaicons.0.png
rename to sc2/content/base/ships/kohrah/marauder-icons.0.png
diff --git a/sc2/content/base/ships/kohrah/blaicons.1.png b/sc2/content/base/ships/kohrah/marauder-icons.1.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blaicons.1.png
rename to sc2/content/base/ships/kohrah/marauder-icons.1.png
diff --git a/sc2/content/base/ships/kohrah/marauder-icons.ani b/sc2/content/base/ships/kohrah/marauder-icons.ani
new file mode 100644
index 000000000..5921a82c9
--- /dev/null
+++ b/sc2/content/base/ships/kohrah/marauder-icons.ani
@@ -0,0 +1,2 @@
+marauder-icons.0.png 1 1 0 0
+marauder-icons.1.png 1 1 15 18
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.0.png b/sc2/content/base/ships/kohrah/marauder-med.0.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.0.png
rename to sc2/content/base/ships/kohrah/marauder-med.0.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.1.png b/sc2/content/base/ships/kohrah/marauder-med.1.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.1.png
rename to sc2/content/base/ships/kohrah/marauder-med.1.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.10.png b/sc2/content/base/ships/kohrah/marauder-med.10.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.10.png
rename to sc2/content/base/ships/kohrah/marauder-med.10.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.11.png b/sc2/content/base/ships/kohrah/marauder-med.11.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.11.png
rename to sc2/content/base/ships/kohrah/marauder-med.11.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.12.png b/sc2/content/base/ships/kohrah/marauder-med.12.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.12.png
rename to sc2/content/base/ships/kohrah/marauder-med.12.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.13.png b/sc2/content/base/ships/kohrah/marauder-med.13.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.13.png
rename to sc2/content/base/ships/kohrah/marauder-med.13.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.14.png b/sc2/content/base/ships/kohrah/marauder-med.14.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.14.png
rename to sc2/content/base/ships/kohrah/marauder-med.14.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.15.png b/sc2/content/base/ships/kohrah/marauder-med.15.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.15.png
rename to sc2/content/base/ships/kohrah/marauder-med.15.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.2.png b/sc2/content/base/ships/kohrah/marauder-med.2.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.2.png
rename to sc2/content/base/ships/kohrah/marauder-med.2.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.3.png b/sc2/content/base/ships/kohrah/marauder-med.3.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.3.png
rename to sc2/content/base/ships/kohrah/marauder-med.3.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.4.png b/sc2/content/base/ships/kohrah/marauder-med.4.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.4.png
rename to sc2/content/base/ships/kohrah/marauder-med.4.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.5.png b/sc2/content/base/ships/kohrah/marauder-med.5.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.5.png
rename to sc2/content/base/ships/kohrah/marauder-med.5.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.6.png b/sc2/content/base/ships/kohrah/marauder-med.6.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.6.png
rename to sc2/content/base/ships/kohrah/marauder-med.6.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.7.png b/sc2/content/base/ships/kohrah/marauder-med.7.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.7.png
rename to sc2/content/base/ships/kohrah/marauder-med.7.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.8.png b/sc2/content/base/ships/kohrah/marauder-med.8.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.8.png
rename to sc2/content/base/ships/kohrah/marauder-med.8.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.med.9.png b/sc2/content/base/ships/kohrah/marauder-med.9.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.med.9.png
rename to sc2/content/base/ships/kohrah/marauder-med.9.png
diff --git a/sc2/content/base/ships/kohrah/marauder-med.ani b/sc2/content/base/ships/kohrah/marauder-med.ani
new file mode 100644
index 000000000..f1b6c5463
--- /dev/null
+++ b/sc2/content/base/ships/kohrah/marauder-med.ani
@@ -0,0 +1,16 @@
+marauder-med.0.png 0 3 5 10
+marauder-med.1.png 0 3 7 10
+marauder-med.2.png 1 3 9 9
+marauder-med.3.png 0 3 9 7
+marauder-med.4.png 0 3 9 6
+marauder-med.5.png 1 3 10 9
+marauder-med.6.png 1 3 9 10
+marauder-med.7.png 1 3 7 10
+marauder-med.8.png 0 3 5 10
+marauder-med.9.png 1 3 6 11
+marauder-med.10.png 0 3 7 11
+marauder-med.11.png 0 3 9 8
+marauder-med.12.png 0 3 9 6
+marauder-med.13.png 1 3 9 7
+marauder-med.14.png 1 3 9 9
+marauder-med.15.png 1 3 8 9
diff --git a/sc2/content/base/ships/kohrah/blamicon.0.png b/sc2/content/base/ships/kohrah/marauder-meleeicons.0.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blamicon.0.png
rename to sc2/content/base/ships/kohrah/marauder-meleeicons.0.png
diff --git a/sc2/content/base/ships/kohrah/blamicon.1.png b/sc2/content/base/ships/kohrah/marauder-meleeicons.1.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blamicon.1.png
rename to sc2/content/base/ships/kohrah/marauder-meleeicons.1.png
diff --git a/sc2/content/base/ships/kohrah/marauder-meleeicons.ani b/sc2/content/base/ships/kohrah/marauder-meleeicons.ani
new file mode 100644
index 000000000..0a4f5ccab
--- /dev/null
+++ b/sc2/content/base/ships/kohrah/marauder-meleeicons.ani
@@ -0,0 +1,2 @@
+marauder-meleeicons.0.png 1 1 16 15
+marauder-meleeicons.1.png 0 1 2 4
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.0.png b/sc2/content/base/ships/kohrah/marauder-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.0.png
rename to sc2/content/base/ships/kohrah/marauder-sml.0.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.1.png b/sc2/content/base/ships/kohrah/marauder-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.1.png
rename to sc2/content/base/ships/kohrah/marauder-sml.1.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.10.png b/sc2/content/base/ships/kohrah/marauder-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.10.png
rename to sc2/content/base/ships/kohrah/marauder-sml.10.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.11.png b/sc2/content/base/ships/kohrah/marauder-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.11.png
rename to sc2/content/base/ships/kohrah/marauder-sml.11.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.12.png b/sc2/content/base/ships/kohrah/marauder-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.12.png
rename to sc2/content/base/ships/kohrah/marauder-sml.12.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.13.png b/sc2/content/base/ships/kohrah/marauder-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.13.png
rename to sc2/content/base/ships/kohrah/marauder-sml.13.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.14.png b/sc2/content/base/ships/kohrah/marauder-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.14.png
rename to sc2/content/base/ships/kohrah/marauder-sml.14.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.15.png b/sc2/content/base/ships/kohrah/marauder-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.15.png
rename to sc2/content/base/ships/kohrah/marauder-sml.15.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.2.png b/sc2/content/base/ships/kohrah/marauder-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.2.png
rename to sc2/content/base/ships/kohrah/marauder-sml.2.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.3.png b/sc2/content/base/ships/kohrah/marauder-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.3.png
rename to sc2/content/base/ships/kohrah/marauder-sml.3.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.4.png b/sc2/content/base/ships/kohrah/marauder-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.4.png
rename to sc2/content/base/ships/kohrah/marauder-sml.4.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.5.png b/sc2/content/base/ships/kohrah/marauder-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.5.png
rename to sc2/content/base/ships/kohrah/marauder-sml.5.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.6.png b/sc2/content/base/ships/kohrah/marauder-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.6.png
rename to sc2/content/base/ships/kohrah/marauder-sml.6.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.7.png b/sc2/content/base/ships/kohrah/marauder-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.7.png
rename to sc2/content/base/ships/kohrah/marauder-sml.7.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.8.png b/sc2/content/base/ships/kohrah/marauder-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.8.png
rename to sc2/content/base/ships/kohrah/marauder-sml.8.png
diff --git a/sc2/content/base/ships/kohrah/blackurq.sml.9.png b/sc2/content/base/ships/kohrah/marauder-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/kohrah/blackurq.sml.9.png
rename to sc2/content/base/ships/kohrah/marauder-sml.9.png
diff --git a/sc2/content/base/ships/kohrah/marauder-sml.ani b/sc2/content/base/ships/kohrah/marauder-sml.ani
new file mode 100644
index 000000000..ecbdbf52a
--- /dev/null
+++ b/sc2/content/base/ships/kohrah/marauder-sml.ani
@@ -0,0 +1,16 @@
+marauder-sml.0.png 0 3 2 5
+marauder-sml.1.png 0 3 4 5
+marauder-sml.2.png 0 3 4 4
+marauder-sml.3.png 0 3 4 3
+marauder-sml.4.png 0 3 4 2
+marauder-sml.5.png 0 3 4 3
+marauder-sml.6.png 0 3 4 4
+marauder-sml.7.png 0 3 4 4
+marauder-sml.8.png 0 3 2 4
+marauder-sml.9.png 0 3 3 4
+marauder-sml.10.png 0 3 4 4
+marauder-sml.11.png 0 3 5 3
+marauder-sml.12.png 0 3 5 2
+marauder-sml.13.png 0 3 5 3
+marauder-sml.14.png 0 3 4 4
+marauder-sml.15.png 0 3 3 5
diff --git a/sc2/content/base/ships/kohrah/bladitty.mod b/sc2/content/base/ships/kohrah/marauder.mod
similarity index 100%
rename from sc2/content/base/ships/kohrah/bladitty.mod
rename to sc2/content/base/ships/kohrah/marauder.mod
diff --git a/sc2/content/base/ships/kohrah/blasound.snd b/sc2/content/base/ships/kohrah/marauder.snd
similarity index 100%
rename from sc2/content/base/ships/kohrah/blasound.snd
rename to sc2/content/base/ships/kohrah/marauder.snd
diff --git a/sc2/content/base/ships/kohrah/blatext.txt b/sc2/content/base/ships/kohrah/marauder.txt
similarity index 100%
rename from sc2/content/base/ships/kohrah/blatext.txt
rename to sc2/content/base/ships/kohrah/marauder.txt
diff --git a/sc2/content/base/ships/melnorme/confubig.ani b/sc2/content/base/ships/melnorme/confubig.ani
deleted file mode 100644
index bdfaa92a9..000000000
--- a/sc2/content/base/ships/melnorme/confubig.ani
+++ /dev/null
@@ -1,16 +0,0 @@
-confubig.0.png 0 1 5 5
-confubig.1.png 0 1 6 6
-confubig.2.png 0 1 7 7
-confubig.3.png 0 1 7 7
-confubig.4.png 0 1 7 7
-confubig.5.png 0 1 7 7
-confubig.6.png 0 1 7 7
-confubig.7.png 0 1 7 7
-confubig.8.png 0 1 16 14
-confubig.9.png 0 1 11 16
-confubig.10.png 0 1 11 16
-confubig.11.png 0 1 13 16
-confubig.12.png 0 1 13 16
-confubig.13.png 0 1 16 15
-confubig.14.png 0 1 16 14
-confubig.15.png 0 1 16 14
diff --git a/sc2/content/base/ships/melnorme/confumed.ani b/sc2/content/base/ships/melnorme/confumed.ani
deleted file mode 100644
index 2b1abed93..000000000
--- a/sc2/content/base/ships/melnorme/confumed.ani
+++ /dev/null
@@ -1,16 +0,0 @@
-confumed.0.png 0 1 3 3
-confumed.1.png 0 1 4 4
-confumed.2.png 0 1 4 4
-confumed.3.png 0 1 4 4
-confumed.4.png 0 1 4 4
-confumed.5.png 0 1 4 4
-confumed.6.png 0 1 4 4
-confumed.7.png 0 1 4 4
-confumed.8.png 0 1 8 6
-confumed.9.png 0 1 5 7
-confumed.10.png 0 1 5 7
-confumed.11.png 0 1 6 7
-confumed.12.png 0 1 6 7
-confumed.13.png 0 1 8 7
-confumed.14.png 0 1 8 6
-confumed.15.png 0 1 8 6
diff --git a/sc2/content/base/ships/melnorme/confubig.0.png b/sc2/content/base/ships/melnorme/confuse-big.0.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.0.png
rename to sc2/content/base/ships/melnorme/confuse-big.0.png
diff --git a/sc2/content/base/ships/melnorme/confubig.1.png b/sc2/content/base/ships/melnorme/confuse-big.1.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.1.png
rename to sc2/content/base/ships/melnorme/confuse-big.1.png
diff --git a/sc2/content/base/ships/melnorme/confubig.10.png b/sc2/content/base/ships/melnorme/confuse-big.10.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.10.png
rename to sc2/content/base/ships/melnorme/confuse-big.10.png
diff --git a/sc2/content/base/ships/melnorme/confubig.11.png b/sc2/content/base/ships/melnorme/confuse-big.11.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.11.png
rename to sc2/content/base/ships/melnorme/confuse-big.11.png
diff --git a/sc2/content/base/ships/melnorme/confubig.12.png b/sc2/content/base/ships/melnorme/confuse-big.12.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.12.png
rename to sc2/content/base/ships/melnorme/confuse-big.12.png
diff --git a/sc2/content/base/ships/melnorme/confubig.13.png b/sc2/content/base/ships/melnorme/confuse-big.13.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.13.png
rename to sc2/content/base/ships/melnorme/confuse-big.13.png
diff --git a/sc2/content/base/ships/melnorme/confubig.14.png b/sc2/content/base/ships/melnorme/confuse-big.14.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.14.png
rename to sc2/content/base/ships/melnorme/confuse-big.14.png
diff --git a/sc2/content/base/ships/melnorme/confubig.15.png b/sc2/content/base/ships/melnorme/confuse-big.15.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.15.png
rename to sc2/content/base/ships/melnorme/confuse-big.15.png
diff --git a/sc2/content/base/ships/melnorme/confubig.2.png b/sc2/content/base/ships/melnorme/confuse-big.2.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.2.png
rename to sc2/content/base/ships/melnorme/confuse-big.2.png
diff --git a/sc2/content/base/ships/melnorme/confubig.3.png b/sc2/content/base/ships/melnorme/confuse-big.3.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.3.png
rename to sc2/content/base/ships/melnorme/confuse-big.3.png
diff --git a/sc2/content/base/ships/melnorme/confubig.4.png b/sc2/content/base/ships/melnorme/confuse-big.4.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.4.png
rename to sc2/content/base/ships/melnorme/confuse-big.4.png
diff --git a/sc2/content/base/ships/melnorme/confubig.5.png b/sc2/content/base/ships/melnorme/confuse-big.5.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.5.png
rename to sc2/content/base/ships/melnorme/confuse-big.5.png
diff --git a/sc2/content/base/ships/melnorme/confubig.6.png b/sc2/content/base/ships/melnorme/confuse-big.6.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.6.png
rename to sc2/content/base/ships/melnorme/confuse-big.6.png
diff --git a/sc2/content/base/ships/melnorme/confubig.7.png b/sc2/content/base/ships/melnorme/confuse-big.7.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.7.png
rename to sc2/content/base/ships/melnorme/confuse-big.7.png
diff --git a/sc2/content/base/ships/melnorme/confubig.8.png b/sc2/content/base/ships/melnorme/confuse-big.8.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.8.png
rename to sc2/content/base/ships/melnorme/confuse-big.8.png
diff --git a/sc2/content/base/ships/melnorme/confubig.9.png b/sc2/content/base/ships/melnorme/confuse-big.9.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confubig.9.png
rename to sc2/content/base/ships/melnorme/confuse-big.9.png
diff --git a/sc2/content/base/ships/melnorme/confuse-big.ani b/sc2/content/base/ships/melnorme/confuse-big.ani
new file mode 100644
index 000000000..9b2f49e66
--- /dev/null
+++ b/sc2/content/base/ships/melnorme/confuse-big.ani
@@ -0,0 +1,16 @@
+confuse-big.0.png 0 1 5 5
+confuse-big.1.png 0 1 6 6
+confuse-big.2.png 0 1 7 7
+confuse-big.3.png 0 1 7 7
+confuse-big.4.png 0 1 7 7
+confuse-big.5.png 0 1 7 7
+confuse-big.6.png 0 1 7 7
+confuse-big.7.png 0 1 7 7
+confuse-big.8.png 0 1 16 14
+confuse-big.9.png 0 1 11 16
+confuse-big.10.png 0 1 11 16
+confuse-big.11.png 0 1 13 16
+confuse-big.12.png 0 1 13 16
+confuse-big.13.png 0 1 16 15
+confuse-big.14.png 0 1 16 14
+confuse-big.15.png 0 1 16 14
diff --git a/sc2/content/base/ships/melnorme/confumed.0.png b/sc2/content/base/ships/melnorme/confuse-med.0.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.0.png
rename to sc2/content/base/ships/melnorme/confuse-med.0.png
diff --git a/sc2/content/base/ships/melnorme/confumed.1.png b/sc2/content/base/ships/melnorme/confuse-med.1.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.1.png
rename to sc2/content/base/ships/melnorme/confuse-med.1.png
diff --git a/sc2/content/base/ships/melnorme/confumed.10.png b/sc2/content/base/ships/melnorme/confuse-med.10.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.10.png
rename to sc2/content/base/ships/melnorme/confuse-med.10.png
diff --git a/sc2/content/base/ships/melnorme/confumed.11.png b/sc2/content/base/ships/melnorme/confuse-med.11.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.11.png
rename to sc2/content/base/ships/melnorme/confuse-med.11.png
diff --git a/sc2/content/base/ships/melnorme/confumed.12.png b/sc2/content/base/ships/melnorme/confuse-med.12.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.12.png
rename to sc2/content/base/ships/melnorme/confuse-med.12.png
diff --git a/sc2/content/base/ships/melnorme/confumed.13.png b/sc2/content/base/ships/melnorme/confuse-med.13.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.13.png
rename to sc2/content/base/ships/melnorme/confuse-med.13.png
diff --git a/sc2/content/base/ships/melnorme/confumed.14.png b/sc2/content/base/ships/melnorme/confuse-med.14.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.14.png
rename to sc2/content/base/ships/melnorme/confuse-med.14.png
diff --git a/sc2/content/base/ships/melnorme/confumed.15.png b/sc2/content/base/ships/melnorme/confuse-med.15.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.15.png
rename to sc2/content/base/ships/melnorme/confuse-med.15.png
diff --git a/sc2/content/base/ships/melnorme/confumed.2.png b/sc2/content/base/ships/melnorme/confuse-med.2.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.2.png
rename to sc2/content/base/ships/melnorme/confuse-med.2.png
diff --git a/sc2/content/base/ships/melnorme/confumed.3.png b/sc2/content/base/ships/melnorme/confuse-med.3.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.3.png
rename to sc2/content/base/ships/melnorme/confuse-med.3.png
diff --git a/sc2/content/base/ships/melnorme/confumed.4.png b/sc2/content/base/ships/melnorme/confuse-med.4.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.4.png
rename to sc2/content/base/ships/melnorme/confuse-med.4.png
diff --git a/sc2/content/base/ships/melnorme/confumed.5.png b/sc2/content/base/ships/melnorme/confuse-med.5.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.5.png
rename to sc2/content/base/ships/melnorme/confuse-med.5.png
diff --git a/sc2/content/base/ships/melnorme/confumed.6.png b/sc2/content/base/ships/melnorme/confuse-med.6.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.6.png
rename to sc2/content/base/ships/melnorme/confuse-med.6.png
diff --git a/sc2/content/base/ships/melnorme/confumed.7.png b/sc2/content/base/ships/melnorme/confuse-med.7.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.7.png
rename to sc2/content/base/ships/melnorme/confuse-med.7.png
diff --git a/sc2/content/base/ships/melnorme/confumed.8.png b/sc2/content/base/ships/melnorme/confuse-med.8.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.8.png
rename to sc2/content/base/ships/melnorme/confuse-med.8.png
diff --git a/sc2/content/base/ships/melnorme/confumed.9.png b/sc2/content/base/ships/melnorme/confuse-med.9.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confumed.9.png
rename to sc2/content/base/ships/melnorme/confuse-med.9.png
diff --git a/sc2/content/base/ships/melnorme/confuse-med.ani b/sc2/content/base/ships/melnorme/confuse-med.ani
new file mode 100644
index 000000000..3cb4a523a
--- /dev/null
+++ b/sc2/content/base/ships/melnorme/confuse-med.ani
@@ -0,0 +1,16 @@
+confuse-med.0.png 0 1 3 3
+confuse-med.1.png 0 1 4 4
+confuse-med.2.png 0 1 4 4
+confuse-med.3.png 0 1 4 4
+confuse-med.4.png 0 1 4 4
+confuse-med.5.png 0 1 4 4
+confuse-med.6.png 0 1 4 4
+confuse-med.7.png 0 1 4 4
+confuse-med.8.png 0 1 8 6
+confuse-med.9.png 0 1 5 7
+confuse-med.10.png 0 1 5 7
+confuse-med.11.png 0 1 6 7
+confuse-med.12.png 0 1 6 7
+confuse-med.13.png 0 1 8 7
+confuse-med.14.png 0 1 8 6
+confuse-med.15.png 0 1 8 6
diff --git a/sc2/content/base/ships/melnorme/confusml.0.png b/sc2/content/base/ships/melnorme/confuse-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.0.png
rename to sc2/content/base/ships/melnorme/confuse-sml.0.png
diff --git a/sc2/content/base/ships/melnorme/confusml.1.png b/sc2/content/base/ships/melnorme/confuse-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.1.png
rename to sc2/content/base/ships/melnorme/confuse-sml.1.png
diff --git a/sc2/content/base/ships/melnorme/confusml.10.png b/sc2/content/base/ships/melnorme/confuse-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.10.png
rename to sc2/content/base/ships/melnorme/confuse-sml.10.png
diff --git a/sc2/content/base/ships/melnorme/confusml.11.png b/sc2/content/base/ships/melnorme/confuse-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.11.png
rename to sc2/content/base/ships/melnorme/confuse-sml.11.png
diff --git a/sc2/content/base/ships/melnorme/confusml.12.png b/sc2/content/base/ships/melnorme/confuse-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.12.png
rename to sc2/content/base/ships/melnorme/confuse-sml.12.png
diff --git a/sc2/content/base/ships/melnorme/confusml.13.png b/sc2/content/base/ships/melnorme/confuse-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.13.png
rename to sc2/content/base/ships/melnorme/confuse-sml.13.png
diff --git a/sc2/content/base/ships/melnorme/confusml.14.png b/sc2/content/base/ships/melnorme/confuse-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.14.png
rename to sc2/content/base/ships/melnorme/confuse-sml.14.png
diff --git a/sc2/content/base/ships/melnorme/confusml.15.png b/sc2/content/base/ships/melnorme/confuse-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.15.png
rename to sc2/content/base/ships/melnorme/confuse-sml.15.png
diff --git a/sc2/content/base/ships/melnorme/confusml.2.png b/sc2/content/base/ships/melnorme/confuse-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.2.png
rename to sc2/content/base/ships/melnorme/confuse-sml.2.png
diff --git a/sc2/content/base/ships/melnorme/confusml.3.png b/sc2/content/base/ships/melnorme/confuse-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.3.png
rename to sc2/content/base/ships/melnorme/confuse-sml.3.png
diff --git a/sc2/content/base/ships/melnorme/confusml.4.png b/sc2/content/base/ships/melnorme/confuse-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.4.png
rename to sc2/content/base/ships/melnorme/confuse-sml.4.png
diff --git a/sc2/content/base/ships/melnorme/confusml.5.png b/sc2/content/base/ships/melnorme/confuse-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.5.png
rename to sc2/content/base/ships/melnorme/confuse-sml.5.png
diff --git a/sc2/content/base/ships/melnorme/confusml.6.png b/sc2/content/base/ships/melnorme/confuse-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.6.png
rename to sc2/content/base/ships/melnorme/confuse-sml.6.png
diff --git a/sc2/content/base/ships/melnorme/confusml.7.png b/sc2/content/base/ships/melnorme/confuse-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.7.png
rename to sc2/content/base/ships/melnorme/confuse-sml.7.png
diff --git a/sc2/content/base/ships/melnorme/confusml.8.png b/sc2/content/base/ships/melnorme/confuse-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.8.png
rename to sc2/content/base/ships/melnorme/confuse-sml.8.png
diff --git a/sc2/content/base/ships/melnorme/confusml.9.png b/sc2/content/base/ships/melnorme/confuse-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/confusml.9.png
rename to sc2/content/base/ships/melnorme/confuse-sml.9.png
diff --git a/sc2/content/base/ships/melnorme/confuse-sml.ani b/sc2/content/base/ships/melnorme/confuse-sml.ani
new file mode 100644
index 000000000..d21aa0fc1
--- /dev/null
+++ b/sc2/content/base/ships/melnorme/confuse-sml.ani
@@ -0,0 +1,16 @@
+confuse-sml.0.png -1 1 1 1
+confuse-sml.1.png 0 1 2 2
+confuse-sml.2.png 0 1 2 2
+confuse-sml.3.png 0 1 2 2
+confuse-sml.4.png 0 1 2 2
+confuse-sml.5.png 0 1 2 2
+confuse-sml.6.png 0 1 2 2
+confuse-sml.7.png 0 1 2 2
+confuse-sml.8.png 0 1 4 4
+confuse-sml.9.png 0 1 4 4
+confuse-sml.10.png 0 1 4 3
+confuse-sml.11.png 0 1 3 4
+confuse-sml.12.png 0 1 2 4
+confuse-sml.13.png 0 1 2 4
+confuse-sml.14.png 0 1 2 4
+confuse-sml.15.png 0 1 4 4
diff --git a/sc2/content/base/ships/melnorme/confusml.ani b/sc2/content/base/ships/melnorme/confusml.ani
deleted file mode 100644
index 641a1eda8..000000000
--- a/sc2/content/base/ships/melnorme/confusml.ani
+++ /dev/null
@@ -1,16 +0,0 @@
-confusml.0.png -1 1 1 1
-confusml.1.png 0 1 2 2
-confusml.2.png 0 1 2 2
-confusml.3.png 0 1 2 2
-confusml.4.png 0 1 2 2
-confusml.5.png 0 1 2 2
-confusml.6.png 0 1 2 2
-confusml.7.png 0 1 2 2
-confusml.8.png 0 1 4 4
-confusml.9.png 0 1 4 4
-confusml.10.png 0 1 4 3
-confusml.11.png 0 1 3 4
-confusml.12.png 0 1 2 4
-confusml.13.png 0 1 2 4
-confusml.14.png 0 1 2 4
-confusml.15.png 0 1 4 4
diff --git a/sc2/content/base/ships/melnorme/melcap.ani b/sc2/content/base/ships/melnorme/melcap.ani
deleted file mode 100644
index 7e0180ec9..000000000
--- a/sc2/content/base/ships/melnorme/melcap.ani
+++ /dev/null
@@ -1,15 +0,0 @@
-melcap.0.png -1 1 0 0
-melcap.1.png 0 1 -5 -17
-melcap.2.png 0 1 -5 -17
-melcap.3.png 0 1 -5 -17
-melcap.4.png 0 1 -31 -22
-melcap.5.png 0 1 -31 -22
-melcap.6.png 0 1 -38 -9
-melcap.7.png 0 1 -38 -9
-melcap.8.png 0 1 -38 -9
-melcap.9.png 1 1 0 0
-melcap.10.png 1 1 0 0
-melcap.11.png 1 1 0 0
-melcap.12.png 0 1 -9 -9
-melcap.13.png 0 1 -9 -9
-melcap.14.png 0 1 -9 -9
diff --git a/sc2/content/base/ships/melnorme/melicons.ani b/sc2/content/base/ships/melnorme/melicons.ani
deleted file mode 100644
index 80a9a7715..000000000
--- a/sc2/content/base/ships/melnorme/melicons.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-melicons.0.png 0 1 -1 0
-melicons.1.png 0 1 19 16
diff --git a/sc2/content/base/ships/melnorme/melmicon.ani b/sc2/content/base/ships/melnorme/melmicon.ani
deleted file mode 100644
index 0753a8b58..000000000
--- a/sc2/content/base/ships/melnorme/melmicon.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-melmicon.0.png 0 1 15 15
-melmicon.1.png 0 1 2 3
diff --git a/sc2/content/base/ships/melnorme/melnorme.big b/sc2/content/base/ships/melnorme/melnorme.big
deleted file mode 100644
index 1342356b7..000000000
--- a/sc2/content/base/ships/melnorme/melnorme.big
+++ /dev/null
@@ -1,16 +0,0 @@
-melnorme.big.0.png 0 1 14 17
-melnorme.big.1.png 0 1 15 16
-melnorme.big.2.png 0 1 14 18
-melnorme.big.3.png 0 1 14 18
-melnorme.big.4.png 0 1 14 16
-melnorme.big.5.png 0 1 14 16
-melnorme.big.6.png 0 1 14 15
-melnorme.big.7.png 0 1 15 15
-melnorme.big.8.png 0 1 15 14
-melnorme.big.9.png 0 1 16 15
-melnorme.big.10.png 0 1 16 15
-melnorme.big.11.png 0 1 15 16
-melnorme.big.12.png 0 1 16 16
-melnorme.big.13.png 0 1 16 17
-melnorme.big.14.png 0 1 16 17
-melnorme.big.15.png 0 1 17 17
diff --git a/sc2/content/base/ships/melnorme/melnorme.med b/sc2/content/base/ships/melnorme/melnorme.med
deleted file mode 100644
index 68726a40d..000000000
--- a/sc2/content/base/ships/melnorme/melnorme.med
+++ /dev/null
@@ -1,16 +0,0 @@
-melnorme.med.0.png 0 1 7 9
-melnorme.med.1.png 0 1 7 10
-melnorme.med.2.png 0 1 7 9
-melnorme.med.3.png 0 1 6 9
-melnorme.med.4.png 0 1 6 8
-melnorme.med.5.png 0 1 6 7
-melnorme.med.6.png 0 1 7 7
-melnorme.med.7.png 0 1 7 6
-melnorme.med.8.png 0 1 7 7
-melnorme.med.9.png 0 1 7 6
-melnorme.med.10.png 0 1 7 7
-melnorme.med.11.png 0 1 8 7
-melnorme.med.12.png 0 1 8 7
-melnorme.med.13.png 0 1 8 9
-melnorme.med.14.png 0 1 7 9
-melnorme.med.15.png 0 1 7 10
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml b/sc2/content/base/ships/melnorme/melnorme.sml
deleted file mode 100644
index a75468903..000000000
--- a/sc2/content/base/ships/melnorme/melnorme.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-melnorme.sml.0.png 0 1 3 4
-melnorme.sml.1.png 0 1 3 4
-melnorme.sml.2.png 0 1 3 4
-melnorme.sml.3.png 0 1 3 3
-melnorme.sml.4.png 0 1 3 3
-melnorme.sml.5.png 0 1 3 3
-melnorme.sml.6.png 0 1 3 3
-melnorme.sml.7.png 0 1 3 3
-melnorme.sml.8.png 0 1 3 3
-melnorme.sml.9.png 0 1 3 3
-melnorme.sml.10.png 0 1 4 3
-melnorme.sml.11.png 0 1 4 3
-melnorme.sml.12.png 0 1 4 3
-melnorme.sml.13.png 0 1 4 3
-melnorme.sml.14.png 0 1 4 4
-melnorme.sml.15.png 0 1 3 4
diff --git a/sc2/content/base/ships/melnorme/pumpbig.ani b/sc2/content/base/ships/melnorme/pumpbig.ani
deleted file mode 100644
index 832289501..000000000
--- a/sc2/content/base/ships/melnorme/pumpbig.ani
+++ /dev/null
@@ -1,26 +0,0 @@
-pumpbig.0.png 0 1 5 5
-pumpbig.1.png 0 1 4 4
-pumpbig.2.png 0 1 3 3
-pumpbig.3.png 0 1 3 3
-pumpbig.4.png 0 1 4 4
-pumpbig.5.png 0 1 6 6
-pumpbig.6.png 0 1 5 5
-pumpbig.7.png 0 1 4 4
-pumpbig.8.png 0 1 4 4
-pumpbig.9.png 0 1 5 5
-pumpbig.10.png 0 1 8 8
-pumpbig.11.png 0 1 7 7
-pumpbig.12.png 0 1 5 5
-pumpbig.13.png 0 1 5 5
-pumpbig.14.png 0 1 7 7
-pumpbig.15.png 0 1 12 12
-pumpbig.16.png 0 1 10 10
-pumpbig.17.png 0 1 8 8
-pumpbig.18.png 0 1 7 7
-pumpbig.19.png 0 1 10 10
-pumpbig.20.png -1 1 1 1
-pumpbig.21.png 0 1 2 2
-pumpbig.22.png 0 1 4 4
-pumpbig.23.png 0 1 6 6
-pumpbig.24.png 0 1 8 8
-pumpbig.25.png 0 1 10 10
diff --git a/sc2/content/base/ships/melnorme/pumpmed.ani b/sc2/content/base/ships/melnorme/pumpmed.ani
deleted file mode 100644
index 7006ebbf9..000000000
--- a/sc2/content/base/ships/melnorme/pumpmed.ani
+++ /dev/null
@@ -1,26 +0,0 @@
-pumpmed.0.png 0 1 2 2
-pumpmed.1.png 0 1 2 2
-pumpmed.2.png -1 1 1 1
-pumpmed.3.png -1 1 1 1
-pumpmed.4.png 0 1 2 2
-pumpmed.5.png 0 1 3 3
-pumpmed.6.png 0 1 3 3
-pumpmed.7.png 0 1 2 2
-pumpmed.8.png -1 1 2 2
-pumpmed.9.png 0 1 3 3
-pumpmed.10.png 0 1 5 5
-pumpmed.11.png 0 1 4 4
-pumpmed.12.png 0 1 3 3
-pumpmed.13.png 0 1 3 3
-pumpmed.14.png 0 1 4 4
-pumpmed.15.png 0 1 6 6
-pumpmed.16.png 0 1 5 5
-pumpmed.17.png 0 1 4 4
-pumpmed.18.png 0 1 4 4
-pumpmed.19.png 0 1 5 5
-pumpmed.20.png 0 1 1 1
-pumpmed.21.png 0 1 1 1
-pumpmed.22.png 0 1 2 2
-pumpmed.23.png 0 1 3 3
-pumpmed.24.png 0 1 4 4
-pumpmed.25.png 0 1 5 5
diff --git a/sc2/content/base/ships/melnorme/pumpsml.ani b/sc2/content/base/ships/melnorme/pumpsml.ani
deleted file mode 100644
index 6df89b2fb..000000000
--- a/sc2/content/base/ships/melnorme/pumpsml.ani
+++ /dev/null
@@ -1,26 +0,0 @@
-pumpsml.0.png -1 1 0 0
-pumpsml.1.png -1 1 0 0
-pumpsml.2.png -1 1 0 0
-pumpsml.3.png -1 1 0 0
-pumpsml.4.png -1 1 0 0
-pumpsml.5.png 0 1 1 1
-pumpsml.6.png -1 1 1 1
-pumpsml.7.png -1 1 1 1
-pumpsml.8.png -1 1 1 1
-pumpsml.9.png -1 1 1 1
-pumpsml.10.png 0 1 2 2
-pumpsml.11.png 0 1 2 2
-pumpsml.12.png -1 1 1 1
-pumpsml.13.png -1 1 1 1
-pumpsml.14.png 0 1 2 2
-pumpsml.15.png 0 1 3 3
-pumpsml.16.png 0 1 3 3
-pumpsml.17.png 0 1 2 2
-pumpsml.18.png -1 1 2 2
-pumpsml.19.png 0 1 3 3
-pumpsml.20.png -1 1 0 0
-pumpsml.21.png 0 1 1 1
-pumpsml.22.png 0 1 1 1
-pumpsml.23.png 0 1 1 1
-pumpsml.24.png 0 1 2 2
-pumpsml.25.png 0 1 2 2
diff --git a/sc2/content/base/ships/melnorme/pumpbig.0.png b/sc2/content/base/ships/melnorme/pumpup-big.0.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.0.png
rename to sc2/content/base/ships/melnorme/pumpup-big.0.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.1.png b/sc2/content/base/ships/melnorme/pumpup-big.1.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.1.png
rename to sc2/content/base/ships/melnorme/pumpup-big.1.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.10.png b/sc2/content/base/ships/melnorme/pumpup-big.10.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.10.png
rename to sc2/content/base/ships/melnorme/pumpup-big.10.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.11.png b/sc2/content/base/ships/melnorme/pumpup-big.11.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.11.png
rename to sc2/content/base/ships/melnorme/pumpup-big.11.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.12.png b/sc2/content/base/ships/melnorme/pumpup-big.12.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.12.png
rename to sc2/content/base/ships/melnorme/pumpup-big.12.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.13.png b/sc2/content/base/ships/melnorme/pumpup-big.13.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.13.png
rename to sc2/content/base/ships/melnorme/pumpup-big.13.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.14.png b/sc2/content/base/ships/melnorme/pumpup-big.14.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.14.png
rename to sc2/content/base/ships/melnorme/pumpup-big.14.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.15.png b/sc2/content/base/ships/melnorme/pumpup-big.15.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.15.png
rename to sc2/content/base/ships/melnorme/pumpup-big.15.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.16.png b/sc2/content/base/ships/melnorme/pumpup-big.16.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.16.png
rename to sc2/content/base/ships/melnorme/pumpup-big.16.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.17.png b/sc2/content/base/ships/melnorme/pumpup-big.17.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.17.png
rename to sc2/content/base/ships/melnorme/pumpup-big.17.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.18.png b/sc2/content/base/ships/melnorme/pumpup-big.18.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.18.png
rename to sc2/content/base/ships/melnorme/pumpup-big.18.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.19.png b/sc2/content/base/ships/melnorme/pumpup-big.19.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.19.png
rename to sc2/content/base/ships/melnorme/pumpup-big.19.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.2.png b/sc2/content/base/ships/melnorme/pumpup-big.2.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.2.png
rename to sc2/content/base/ships/melnorme/pumpup-big.2.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.20.png b/sc2/content/base/ships/melnorme/pumpup-big.20.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.20.png
rename to sc2/content/base/ships/melnorme/pumpup-big.20.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.21.png b/sc2/content/base/ships/melnorme/pumpup-big.21.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.21.png
rename to sc2/content/base/ships/melnorme/pumpup-big.21.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.22.png b/sc2/content/base/ships/melnorme/pumpup-big.22.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.22.png
rename to sc2/content/base/ships/melnorme/pumpup-big.22.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.23.png b/sc2/content/base/ships/melnorme/pumpup-big.23.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.23.png
rename to sc2/content/base/ships/melnorme/pumpup-big.23.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.24.png b/sc2/content/base/ships/melnorme/pumpup-big.24.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.24.png
rename to sc2/content/base/ships/melnorme/pumpup-big.24.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.25.png b/sc2/content/base/ships/melnorme/pumpup-big.25.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.25.png
rename to sc2/content/base/ships/melnorme/pumpup-big.25.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.3.png b/sc2/content/base/ships/melnorme/pumpup-big.3.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.3.png
rename to sc2/content/base/ships/melnorme/pumpup-big.3.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.4.png b/sc2/content/base/ships/melnorme/pumpup-big.4.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.4.png
rename to sc2/content/base/ships/melnorme/pumpup-big.4.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.5.png b/sc2/content/base/ships/melnorme/pumpup-big.5.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.5.png
rename to sc2/content/base/ships/melnorme/pumpup-big.5.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.6.png b/sc2/content/base/ships/melnorme/pumpup-big.6.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.6.png
rename to sc2/content/base/ships/melnorme/pumpup-big.6.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.7.png b/sc2/content/base/ships/melnorme/pumpup-big.7.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.7.png
rename to sc2/content/base/ships/melnorme/pumpup-big.7.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.8.png b/sc2/content/base/ships/melnorme/pumpup-big.8.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.8.png
rename to sc2/content/base/ships/melnorme/pumpup-big.8.png
diff --git a/sc2/content/base/ships/melnorme/pumpbig.9.png b/sc2/content/base/ships/melnorme/pumpup-big.9.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpbig.9.png
rename to sc2/content/base/ships/melnorme/pumpup-big.9.png
diff --git a/sc2/content/base/ships/melnorme/pumpup-big.ani b/sc2/content/base/ships/melnorme/pumpup-big.ani
new file mode 100644
index 000000000..34583e144
--- /dev/null
+++ b/sc2/content/base/ships/melnorme/pumpup-big.ani
@@ -0,0 +1,26 @@
+pumpup-big.0.png 0 1 5 5
+pumpup-big.1.png 0 1 4 4
+pumpup-big.2.png 0 1 3 3
+pumpup-big.3.png 0 1 3 3
+pumpup-big.4.png 0 1 4 4
+pumpup-big.5.png 0 1 6 6
+pumpup-big.6.png 0 1 5 5
+pumpup-big.7.png 0 1 4 4
+pumpup-big.8.png 0 1 4 4
+pumpup-big.9.png 0 1 5 5
+pumpup-big.10.png 0 1 8 8
+pumpup-big.11.png 0 1 7 7
+pumpup-big.12.png 0 1 5 5
+pumpup-big.13.png 0 1 5 5
+pumpup-big.14.png 0 1 7 7
+pumpup-big.15.png 0 1 12 12
+pumpup-big.16.png 0 1 10 10
+pumpup-big.17.png 0 1 8 8
+pumpup-big.18.png 0 1 7 7
+pumpup-big.19.png 0 1 10 10
+pumpup-big.20.png -1 1 1 1
+pumpup-big.21.png 0 1 2 2
+pumpup-big.22.png 0 1 4 4
+pumpup-big.23.png 0 1 6 6
+pumpup-big.24.png 0 1 8 8
+pumpup-big.25.png 0 1 10 10
diff --git a/sc2/content/base/ships/melnorme/pumpmed.0.png b/sc2/content/base/ships/melnorme/pumpup-med.0.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.0.png
rename to sc2/content/base/ships/melnorme/pumpup-med.0.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.1.png b/sc2/content/base/ships/melnorme/pumpup-med.1.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.1.png
rename to sc2/content/base/ships/melnorme/pumpup-med.1.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.10.png b/sc2/content/base/ships/melnorme/pumpup-med.10.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.10.png
rename to sc2/content/base/ships/melnorme/pumpup-med.10.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.11.png b/sc2/content/base/ships/melnorme/pumpup-med.11.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.11.png
rename to sc2/content/base/ships/melnorme/pumpup-med.11.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.12.png b/sc2/content/base/ships/melnorme/pumpup-med.12.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.12.png
rename to sc2/content/base/ships/melnorme/pumpup-med.12.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.13.png b/sc2/content/base/ships/melnorme/pumpup-med.13.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.13.png
rename to sc2/content/base/ships/melnorme/pumpup-med.13.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.14.png b/sc2/content/base/ships/melnorme/pumpup-med.14.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.14.png
rename to sc2/content/base/ships/melnorme/pumpup-med.14.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.15.png b/sc2/content/base/ships/melnorme/pumpup-med.15.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.15.png
rename to sc2/content/base/ships/melnorme/pumpup-med.15.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.16.png b/sc2/content/base/ships/melnorme/pumpup-med.16.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.16.png
rename to sc2/content/base/ships/melnorme/pumpup-med.16.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.17.png b/sc2/content/base/ships/melnorme/pumpup-med.17.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.17.png
rename to sc2/content/base/ships/melnorme/pumpup-med.17.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.18.png b/sc2/content/base/ships/melnorme/pumpup-med.18.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.18.png
rename to sc2/content/base/ships/melnorme/pumpup-med.18.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.19.png b/sc2/content/base/ships/melnorme/pumpup-med.19.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.19.png
rename to sc2/content/base/ships/melnorme/pumpup-med.19.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.2.png b/sc2/content/base/ships/melnorme/pumpup-med.2.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.2.png
rename to sc2/content/base/ships/melnorme/pumpup-med.2.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.20.png b/sc2/content/base/ships/melnorme/pumpup-med.20.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.20.png
rename to sc2/content/base/ships/melnorme/pumpup-med.20.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.21.png b/sc2/content/base/ships/melnorme/pumpup-med.21.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.21.png
rename to sc2/content/base/ships/melnorme/pumpup-med.21.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.22.png b/sc2/content/base/ships/melnorme/pumpup-med.22.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.22.png
rename to sc2/content/base/ships/melnorme/pumpup-med.22.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.23.png b/sc2/content/base/ships/melnorme/pumpup-med.23.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.23.png
rename to sc2/content/base/ships/melnorme/pumpup-med.23.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.24.png b/sc2/content/base/ships/melnorme/pumpup-med.24.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.24.png
rename to sc2/content/base/ships/melnorme/pumpup-med.24.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.25.png b/sc2/content/base/ships/melnorme/pumpup-med.25.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.25.png
rename to sc2/content/base/ships/melnorme/pumpup-med.25.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.3.png b/sc2/content/base/ships/melnorme/pumpup-med.3.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.3.png
rename to sc2/content/base/ships/melnorme/pumpup-med.3.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.4.png b/sc2/content/base/ships/melnorme/pumpup-med.4.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.4.png
rename to sc2/content/base/ships/melnorme/pumpup-med.4.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.5.png b/sc2/content/base/ships/melnorme/pumpup-med.5.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.5.png
rename to sc2/content/base/ships/melnorme/pumpup-med.5.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.6.png b/sc2/content/base/ships/melnorme/pumpup-med.6.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.6.png
rename to sc2/content/base/ships/melnorme/pumpup-med.6.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.7.png b/sc2/content/base/ships/melnorme/pumpup-med.7.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.7.png
rename to sc2/content/base/ships/melnorme/pumpup-med.7.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.8.png b/sc2/content/base/ships/melnorme/pumpup-med.8.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.8.png
rename to sc2/content/base/ships/melnorme/pumpup-med.8.png
diff --git a/sc2/content/base/ships/melnorme/pumpmed.9.png b/sc2/content/base/ships/melnorme/pumpup-med.9.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpmed.9.png
rename to sc2/content/base/ships/melnorme/pumpup-med.9.png
diff --git a/sc2/content/base/ships/melnorme/pumpup-med.ani b/sc2/content/base/ships/melnorme/pumpup-med.ani
new file mode 100644
index 000000000..8d128b1b3
--- /dev/null
+++ b/sc2/content/base/ships/melnorme/pumpup-med.ani
@@ -0,0 +1,26 @@
+pumpup-med.0.png 0 1 2 2
+pumpup-med.1.png 0 1 2 2
+pumpup-med.2.png -1 1 1 1
+pumpup-med.3.png -1 1 1 1
+pumpup-med.4.png 0 1 2 2
+pumpup-med.5.png 0 1 3 3
+pumpup-med.6.png 0 1 3 3
+pumpup-med.7.png 0 1 2 2
+pumpup-med.8.png -1 1 2 2
+pumpup-med.9.png 0 1 3 3
+pumpup-med.10.png 0 1 5 5
+pumpup-med.11.png 0 1 4 4
+pumpup-med.12.png 0 1 3 3
+pumpup-med.13.png 0 1 3 3
+pumpup-med.14.png 0 1 4 4
+pumpup-med.15.png 0 1 6 6
+pumpup-med.16.png 0 1 5 5
+pumpup-med.17.png 0 1 4 4
+pumpup-med.18.png 0 1 4 4
+pumpup-med.19.png 0 1 5 5
+pumpup-med.20.png 0 1 1 1
+pumpup-med.21.png 0 1 1 1
+pumpup-med.22.png 0 1 2 2
+pumpup-med.23.png 0 1 3 3
+pumpup-med.24.png 0 1 4 4
+pumpup-med.25.png 0 1 5 5
diff --git a/sc2/content/base/ships/melnorme/pumpsml.0.png b/sc2/content/base/ships/melnorme/pumpup-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.0.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.0.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.1.png b/sc2/content/base/ships/melnorme/pumpup-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.1.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.1.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.10.png b/sc2/content/base/ships/melnorme/pumpup-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.10.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.10.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.11.png b/sc2/content/base/ships/melnorme/pumpup-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.11.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.11.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.12.png b/sc2/content/base/ships/melnorme/pumpup-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.12.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.12.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.13.png b/sc2/content/base/ships/melnorme/pumpup-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.13.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.13.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.14.png b/sc2/content/base/ships/melnorme/pumpup-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.14.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.14.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.15.png b/sc2/content/base/ships/melnorme/pumpup-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.15.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.15.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.16.png b/sc2/content/base/ships/melnorme/pumpup-sml.16.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.16.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.16.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.17.png b/sc2/content/base/ships/melnorme/pumpup-sml.17.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.17.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.17.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.18.png b/sc2/content/base/ships/melnorme/pumpup-sml.18.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.18.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.18.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.19.png b/sc2/content/base/ships/melnorme/pumpup-sml.19.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.19.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.19.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.2.png b/sc2/content/base/ships/melnorme/pumpup-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.2.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.2.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.20.png b/sc2/content/base/ships/melnorme/pumpup-sml.20.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.20.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.20.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.21.png b/sc2/content/base/ships/melnorme/pumpup-sml.21.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.21.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.21.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.22.png b/sc2/content/base/ships/melnorme/pumpup-sml.22.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.22.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.22.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.23.png b/sc2/content/base/ships/melnorme/pumpup-sml.23.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.23.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.23.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.24.png b/sc2/content/base/ships/melnorme/pumpup-sml.24.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.24.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.24.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.25.png b/sc2/content/base/ships/melnorme/pumpup-sml.25.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.25.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.25.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.3.png b/sc2/content/base/ships/melnorme/pumpup-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.3.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.3.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.4.png b/sc2/content/base/ships/melnorme/pumpup-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.4.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.4.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.5.png b/sc2/content/base/ships/melnorme/pumpup-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.5.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.5.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.6.png b/sc2/content/base/ships/melnorme/pumpup-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.6.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.6.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.7.png b/sc2/content/base/ships/melnorme/pumpup-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.7.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.7.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.8.png b/sc2/content/base/ships/melnorme/pumpup-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.8.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.8.png
diff --git a/sc2/content/base/ships/melnorme/pumpsml.9.png b/sc2/content/base/ships/melnorme/pumpup-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/pumpsml.9.png
rename to sc2/content/base/ships/melnorme/pumpup-sml.9.png
diff --git a/sc2/content/base/ships/melnorme/pumpup-sml.ani b/sc2/content/base/ships/melnorme/pumpup-sml.ani
new file mode 100644
index 000000000..4ee371e8d
--- /dev/null
+++ b/sc2/content/base/ships/melnorme/pumpup-sml.ani
@@ -0,0 +1,26 @@
+pumpup-sml.0.png -1 1 0 0
+pumpup-sml.1.png -1 1 0 0
+pumpup-sml.2.png -1 1 0 0
+pumpup-sml.3.png -1 1 0 0
+pumpup-sml.4.png -1 1 0 0
+pumpup-sml.5.png 0 1 1 1
+pumpup-sml.6.png -1 1 1 1
+pumpup-sml.7.png -1 1 1 1
+pumpup-sml.8.png -1 1 1 1
+pumpup-sml.9.png -1 1 1 1
+pumpup-sml.10.png 0 1 2 2
+pumpup-sml.11.png 0 1 2 2
+pumpup-sml.12.png -1 1 1 1
+pumpup-sml.13.png -1 1 1 1
+pumpup-sml.14.png 0 1 2 2
+pumpup-sml.15.png 0 1 3 3
+pumpup-sml.16.png 0 1 3 3
+pumpup-sml.17.png 0 1 2 2
+pumpup-sml.18.png -1 1 2 2
+pumpup-sml.19.png 0 1 3 3
+pumpup-sml.20.png -1 1 0 0
+pumpup-sml.21.png 0 1 1 1
+pumpup-sml.22.png 0 1 1 1
+pumpup-sml.23.png 0 1 1 1
+pumpup-sml.24.png 0 1 2 2
+pumpup-sml.25.png 0 1 2 2
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.0.png b/sc2/content/base/ships/melnorme/trader-big.0.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.0.png
rename to sc2/content/base/ships/melnorme/trader-big.0.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.1.png b/sc2/content/base/ships/melnorme/trader-big.1.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.1.png
rename to sc2/content/base/ships/melnorme/trader-big.1.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.10.png b/sc2/content/base/ships/melnorme/trader-big.10.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.10.png
rename to sc2/content/base/ships/melnorme/trader-big.10.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.11.png b/sc2/content/base/ships/melnorme/trader-big.11.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.11.png
rename to sc2/content/base/ships/melnorme/trader-big.11.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.12.png b/sc2/content/base/ships/melnorme/trader-big.12.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.12.png
rename to sc2/content/base/ships/melnorme/trader-big.12.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.13.png b/sc2/content/base/ships/melnorme/trader-big.13.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.13.png
rename to sc2/content/base/ships/melnorme/trader-big.13.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.14.png b/sc2/content/base/ships/melnorme/trader-big.14.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.14.png
rename to sc2/content/base/ships/melnorme/trader-big.14.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.15.png b/sc2/content/base/ships/melnorme/trader-big.15.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.15.png
rename to sc2/content/base/ships/melnorme/trader-big.15.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.2.png b/sc2/content/base/ships/melnorme/trader-big.2.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.2.png
rename to sc2/content/base/ships/melnorme/trader-big.2.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.3.png b/sc2/content/base/ships/melnorme/trader-big.3.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.3.png
rename to sc2/content/base/ships/melnorme/trader-big.3.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.4.png b/sc2/content/base/ships/melnorme/trader-big.4.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.4.png
rename to sc2/content/base/ships/melnorme/trader-big.4.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.5.png b/sc2/content/base/ships/melnorme/trader-big.5.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.5.png
rename to sc2/content/base/ships/melnorme/trader-big.5.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.6.png b/sc2/content/base/ships/melnorme/trader-big.6.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.6.png
rename to sc2/content/base/ships/melnorme/trader-big.6.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.7.png b/sc2/content/base/ships/melnorme/trader-big.7.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.7.png
rename to sc2/content/base/ships/melnorme/trader-big.7.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.8.png b/sc2/content/base/ships/melnorme/trader-big.8.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.8.png
rename to sc2/content/base/ships/melnorme/trader-big.8.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.big.9.png b/sc2/content/base/ships/melnorme/trader-big.9.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.big.9.png
rename to sc2/content/base/ships/melnorme/trader-big.9.png
diff --git a/sc2/content/base/ships/melnorme/trader-big.ani b/sc2/content/base/ships/melnorme/trader-big.ani
new file mode 100644
index 000000000..6ffea274f
--- /dev/null
+++ b/sc2/content/base/ships/melnorme/trader-big.ani
@@ -0,0 +1,16 @@
+trader-big.0.png 0 1 14 17
+trader-big.1.png 0 1 15 16
+trader-big.2.png 0 1 14 18
+trader-big.3.png 0 1 14 18
+trader-big.4.png 0 1 14 16
+trader-big.5.png 0 1 14 16
+trader-big.6.png 0 1 14 15
+trader-big.7.png 0 1 15 15
+trader-big.8.png 0 1 15 14
+trader-big.9.png 0 1 16 15
+trader-big.10.png 0 1 16 15
+trader-big.11.png 0 1 15 16
+trader-big.12.png 0 1 16 16
+trader-big.13.png 0 1 16 17
+trader-big.14.png 0 1 16 17
+trader-big.15.png 0 1 17 17
diff --git a/sc2/content/base/ships/melnorme/melcap.0.png b/sc2/content/base/ships/melnorme/trader-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.0.png
rename to sc2/content/base/ships/melnorme/trader-cap.0.png
diff --git a/sc2/content/base/ships/melnorme/melcap.1.png b/sc2/content/base/ships/melnorme/trader-cap.1.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.1.png
rename to sc2/content/base/ships/melnorme/trader-cap.1.png
diff --git a/sc2/content/base/ships/melnorme/melcap.10.png b/sc2/content/base/ships/melnorme/trader-cap.10.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.10.png
rename to sc2/content/base/ships/melnorme/trader-cap.10.png
diff --git a/sc2/content/base/ships/melnorme/melcap.11.png b/sc2/content/base/ships/melnorme/trader-cap.11.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.11.png
rename to sc2/content/base/ships/melnorme/trader-cap.11.png
diff --git a/sc2/content/base/ships/melnorme/melcap.12.png b/sc2/content/base/ships/melnorme/trader-cap.12.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.12.png
rename to sc2/content/base/ships/melnorme/trader-cap.12.png
diff --git a/sc2/content/base/ships/melnorme/melcap.13.png b/sc2/content/base/ships/melnorme/trader-cap.13.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.13.png
rename to sc2/content/base/ships/melnorme/trader-cap.13.png
diff --git a/sc2/content/base/ships/melnorme/melcap.14.png b/sc2/content/base/ships/melnorme/trader-cap.14.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.14.png
rename to sc2/content/base/ships/melnorme/trader-cap.14.png
diff --git a/sc2/content/base/ships/melnorme/melcap.2.png b/sc2/content/base/ships/melnorme/trader-cap.2.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.2.png
rename to sc2/content/base/ships/melnorme/trader-cap.2.png
diff --git a/sc2/content/base/ships/melnorme/melcap.3.png b/sc2/content/base/ships/melnorme/trader-cap.3.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.3.png
rename to sc2/content/base/ships/melnorme/trader-cap.3.png
diff --git a/sc2/content/base/ships/melnorme/melcap.4.png b/sc2/content/base/ships/melnorme/trader-cap.4.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.4.png
rename to sc2/content/base/ships/melnorme/trader-cap.4.png
diff --git a/sc2/content/base/ships/melnorme/melcap.5.png b/sc2/content/base/ships/melnorme/trader-cap.5.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.5.png
rename to sc2/content/base/ships/melnorme/trader-cap.5.png
diff --git a/sc2/content/base/ships/melnorme/melcap.6.png b/sc2/content/base/ships/melnorme/trader-cap.6.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.6.png
rename to sc2/content/base/ships/melnorme/trader-cap.6.png
diff --git a/sc2/content/base/ships/melnorme/melcap.7.png b/sc2/content/base/ships/melnorme/trader-cap.7.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.7.png
rename to sc2/content/base/ships/melnorme/trader-cap.7.png
diff --git a/sc2/content/base/ships/melnorme/melcap.8.png b/sc2/content/base/ships/melnorme/trader-cap.8.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.8.png
rename to sc2/content/base/ships/melnorme/trader-cap.8.png
diff --git a/sc2/content/base/ships/melnorme/melcap.9.png b/sc2/content/base/ships/melnorme/trader-cap.9.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melcap.9.png
rename to sc2/content/base/ships/melnorme/trader-cap.9.png
diff --git a/sc2/content/base/ships/melnorme/trader-cap.ani b/sc2/content/base/ships/melnorme/trader-cap.ani
new file mode 100644
index 000000000..12d4d1132
--- /dev/null
+++ b/sc2/content/base/ships/melnorme/trader-cap.ani
@@ -0,0 +1,15 @@
+trader-cap.0.png -1 1 0 0
+trader-cap.1.png 0 1 -5 -17
+trader-cap.2.png 0 1 -5 -17
+trader-cap.3.png 0 1 -5 -17
+trader-cap.4.png 0 1 -31 -22
+trader-cap.5.png 0 1 -31 -22
+trader-cap.6.png 0 1 -38 -9
+trader-cap.7.png 0 1 -38 -9
+trader-cap.8.png 0 1 -38 -9
+trader-cap.9.png 1 1 0 0
+trader-cap.10.png 1 1 0 0
+trader-cap.11.png 1 1 0 0
+trader-cap.12.png 0 1 -9 -9
+trader-cap.13.png 0 1 -9 -9
+trader-cap.14.png 0 1 -9 -9
diff --git a/sc2/content/base/ships/melnorme/melicons.0.png b/sc2/content/base/ships/melnorme/trader-icons.0.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melicons.0.png
rename to sc2/content/base/ships/melnorme/trader-icons.0.png
diff --git a/sc2/content/base/ships/melnorme/melicons.1.png b/sc2/content/base/ships/melnorme/trader-icons.1.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melicons.1.png
rename to sc2/content/base/ships/melnorme/trader-icons.1.png
diff --git a/sc2/content/base/ships/melnorme/trader-icons.ani b/sc2/content/base/ships/melnorme/trader-icons.ani
new file mode 100644
index 000000000..7d0db196f
--- /dev/null
+++ b/sc2/content/base/ships/melnorme/trader-icons.ani
@@ -0,0 +1,2 @@
+trader-icons.0.png 0 1 -1 0
+trader-icons.1.png 0 1 19 16
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.0.png b/sc2/content/base/ships/melnorme/trader-med.0.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.0.png
rename to sc2/content/base/ships/melnorme/trader-med.0.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.1.png b/sc2/content/base/ships/melnorme/trader-med.1.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.1.png
rename to sc2/content/base/ships/melnorme/trader-med.1.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.10.png b/sc2/content/base/ships/melnorme/trader-med.10.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.10.png
rename to sc2/content/base/ships/melnorme/trader-med.10.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.11.png b/sc2/content/base/ships/melnorme/trader-med.11.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.11.png
rename to sc2/content/base/ships/melnorme/trader-med.11.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.12.png b/sc2/content/base/ships/melnorme/trader-med.12.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.12.png
rename to sc2/content/base/ships/melnorme/trader-med.12.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.13.png b/sc2/content/base/ships/melnorme/trader-med.13.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.13.png
rename to sc2/content/base/ships/melnorme/trader-med.13.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.14.png b/sc2/content/base/ships/melnorme/trader-med.14.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.14.png
rename to sc2/content/base/ships/melnorme/trader-med.14.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.15.png b/sc2/content/base/ships/melnorme/trader-med.15.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.15.png
rename to sc2/content/base/ships/melnorme/trader-med.15.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.2.png b/sc2/content/base/ships/melnorme/trader-med.2.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.2.png
rename to sc2/content/base/ships/melnorme/trader-med.2.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.3.png b/sc2/content/base/ships/melnorme/trader-med.3.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.3.png
rename to sc2/content/base/ships/melnorme/trader-med.3.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.4.png b/sc2/content/base/ships/melnorme/trader-med.4.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.4.png
rename to sc2/content/base/ships/melnorme/trader-med.4.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.5.png b/sc2/content/base/ships/melnorme/trader-med.5.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.5.png
rename to sc2/content/base/ships/melnorme/trader-med.5.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.6.png b/sc2/content/base/ships/melnorme/trader-med.6.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.6.png
rename to sc2/content/base/ships/melnorme/trader-med.6.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.7.png b/sc2/content/base/ships/melnorme/trader-med.7.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.7.png
rename to sc2/content/base/ships/melnorme/trader-med.7.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.8.png b/sc2/content/base/ships/melnorme/trader-med.8.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.8.png
rename to sc2/content/base/ships/melnorme/trader-med.8.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.med.9.png b/sc2/content/base/ships/melnorme/trader-med.9.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.med.9.png
rename to sc2/content/base/ships/melnorme/trader-med.9.png
diff --git a/sc2/content/base/ships/melnorme/trader-med.ani b/sc2/content/base/ships/melnorme/trader-med.ani
new file mode 100644
index 000000000..acfcd8c8b
--- /dev/null
+++ b/sc2/content/base/ships/melnorme/trader-med.ani
@@ -0,0 +1,16 @@
+trader-med.0.png 0 1 7 9
+trader-med.1.png 0 1 7 10
+trader-med.2.png 0 1 7 9
+trader-med.3.png 0 1 6 9
+trader-med.4.png 0 1 6 8
+trader-med.5.png 0 1 6 7
+trader-med.6.png 0 1 7 7
+trader-med.7.png 0 1 7 6
+trader-med.8.png 0 1 7 7
+trader-med.9.png 0 1 7 6
+trader-med.10.png 0 1 7 7
+trader-med.11.png 0 1 8 7
+trader-med.12.png 0 1 8 7
+trader-med.13.png 0 1 8 9
+trader-med.14.png 0 1 7 9
+trader-med.15.png 0 1 7 10
diff --git a/sc2/content/base/ships/melnorme/melmicon.0.png b/sc2/content/base/ships/melnorme/trader-meleeicons.0.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melmicon.0.png
rename to sc2/content/base/ships/melnorme/trader-meleeicons.0.png
diff --git a/sc2/content/base/ships/melnorme/melmicon.1.png b/sc2/content/base/ships/melnorme/trader-meleeicons.1.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melmicon.1.png
rename to sc2/content/base/ships/melnorme/trader-meleeicons.1.png
diff --git a/sc2/content/base/ships/melnorme/trader-meleeicons.ani b/sc2/content/base/ships/melnorme/trader-meleeicons.ani
new file mode 100644
index 000000000..a1a9b2e09
--- /dev/null
+++ b/sc2/content/base/ships/melnorme/trader-meleeicons.ani
@@ -0,0 +1,2 @@
+trader-meleeicons.0.png 0 1 15 15
+trader-meleeicons.1.png 0 1 2 3
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.0.png b/sc2/content/base/ships/melnorme/trader-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.0.png
rename to sc2/content/base/ships/melnorme/trader-sml.0.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.1.png b/sc2/content/base/ships/melnorme/trader-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.1.png
rename to sc2/content/base/ships/melnorme/trader-sml.1.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.10.png b/sc2/content/base/ships/melnorme/trader-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.10.png
rename to sc2/content/base/ships/melnorme/trader-sml.10.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.11.png b/sc2/content/base/ships/melnorme/trader-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.11.png
rename to sc2/content/base/ships/melnorme/trader-sml.11.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.12.png b/sc2/content/base/ships/melnorme/trader-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.12.png
rename to sc2/content/base/ships/melnorme/trader-sml.12.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.13.png b/sc2/content/base/ships/melnorme/trader-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.13.png
rename to sc2/content/base/ships/melnorme/trader-sml.13.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.14.png b/sc2/content/base/ships/melnorme/trader-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.14.png
rename to sc2/content/base/ships/melnorme/trader-sml.14.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.15.png b/sc2/content/base/ships/melnorme/trader-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.15.png
rename to sc2/content/base/ships/melnorme/trader-sml.15.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.2.png b/sc2/content/base/ships/melnorme/trader-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.2.png
rename to sc2/content/base/ships/melnorme/trader-sml.2.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.3.png b/sc2/content/base/ships/melnorme/trader-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.3.png
rename to sc2/content/base/ships/melnorme/trader-sml.3.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.4.png b/sc2/content/base/ships/melnorme/trader-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.4.png
rename to sc2/content/base/ships/melnorme/trader-sml.4.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.5.png b/sc2/content/base/ships/melnorme/trader-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.5.png
rename to sc2/content/base/ships/melnorme/trader-sml.5.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.6.png b/sc2/content/base/ships/melnorme/trader-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.6.png
rename to sc2/content/base/ships/melnorme/trader-sml.6.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.7.png b/sc2/content/base/ships/melnorme/trader-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.7.png
rename to sc2/content/base/ships/melnorme/trader-sml.7.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.8.png b/sc2/content/base/ships/melnorme/trader-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.8.png
rename to sc2/content/base/ships/melnorme/trader-sml.8.png
diff --git a/sc2/content/base/ships/melnorme/melnorme.sml.9.png b/sc2/content/base/ships/melnorme/trader-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/melnorme/melnorme.sml.9.png
rename to sc2/content/base/ships/melnorme/trader-sml.9.png
diff --git a/sc2/content/base/ships/melnorme/trader-sml.ani b/sc2/content/base/ships/melnorme/trader-sml.ani
new file mode 100644
index 000000000..962e62446
--- /dev/null
+++ b/sc2/content/base/ships/melnorme/trader-sml.ani
@@ -0,0 +1,16 @@
+trader-sml.0.png 0 1 3 4
+trader-sml.1.png 0 1 3 4
+trader-sml.2.png 0 1 3 4
+trader-sml.3.png 0 1 3 3
+trader-sml.4.png 0 1 3 3
+trader-sml.5.png 0 1 3 3
+trader-sml.6.png 0 1 3 3
+trader-sml.7.png 0 1 3 3
+trader-sml.8.png 0 1 3 3
+trader-sml.9.png 0 1 3 3
+trader-sml.10.png 0 1 4 3
+trader-sml.11.png 0 1 4 3
+trader-sml.12.png 0 1 4 3
+trader-sml.13.png 0 1 4 3
+trader-sml.14.png 0 1 4 4
+trader-sml.15.png 0 1 3 4
diff --git a/sc2/content/base/ships/melnorme/melditty.mod b/sc2/content/base/ships/melnorme/trader.mod
similarity index 100%
rename from sc2/content/base/ships/melnorme/melditty.mod
rename to sc2/content/base/ships/melnorme/trader.mod
diff --git a/sc2/content/base/ships/melnorme/melsound.snd b/sc2/content/base/ships/melnorme/trader.snd
similarity index 100%
rename from sc2/content/base/ships/melnorme/melsound.snd
rename to sc2/content/base/ships/melnorme/trader.snd
diff --git a/sc2/content/base/ships/melnorme/meltext.txt b/sc2/content/base/ships/melnorme/trader.txt
similarity index 100%
rename from sc2/content/base/ships/melnorme/meltext.txt
rename to sc2/content/base/ships/melnorme/trader.txt
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.ani b/sc2/content/base/ships/mmrnmhrm/mmrcap.ani
deleted file mode 100644
index 81d37b298..000000000
--- a/sc2/content/base/ships/mmrnmhrm/mmrcap.ani
+++ /dev/null
@@ -1,15 +0,0 @@
-mmrcap.0.png -1 1 0 0
-mmrcap.1.png 2 1 -37 -11
-mmrcap.2.png 2 1 -37 -11
-mmrcap.3.png 2 1 0 -11
-mmrcap.4.png 2 1 0 -11
-mmrcap.5.png 2 1 0 -11
-mmrcap.6.png -1 1 -19 -15
-mmrcap.7.png -1 1 -19 -15
-mmrcap.8.png -1 1 -19 -15
-mmrcap.9.png -1 1 -14 0
-mmrcap.10.png -1 1 -14 0
-mmrcap.11.png -1 1 -14 0
-mmrcap.12.png 0 1 0 0
-mmrcap.13.png 0 1 0 0
-mmrcap.14.png 0 1 0 0
diff --git a/sc2/content/base/ships/mmrnmhrm/mmricons.ani b/sc2/content/base/ships/mmrnmhrm/mmricons.ani
deleted file mode 100644
index 81bca0402..000000000
--- a/sc2/content/base/ships/mmrnmhrm/mmricons.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-mmricons.0.png 0 1 0 0
-mmricons.1.png 0 1 20 16
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrmicon.ani b/sc2/content/base/ships/mmrnmhrm/mmrmicon.ani
deleted file mode 100644
index 4ffaa6dea..000000000
--- a/sc2/content/base/ships/mmrnmhrm/mmrmicon.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-mmrmicon.0.png 0 1 16 16
-mmrmicon.1.png 0 1 4 4
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big b/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big
deleted file mode 100644
index 14b0b1882..000000000
--- a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big
+++ /dev/null
@@ -1,16 +0,0 @@
-mmrnmhrm.big.0.png 0 1 12 13
-mmrnmhrm.big.1.png 0 1 13 11
-mmrnmhrm.big.2.png 0 1 11 10
-mmrnmhrm.big.3.png 0 1 9 10
-mmrnmhrm.big.4.png 0 1 4 11
-mmrnmhrm.big.5.png 0 1 9 12
-mmrnmhrm.big.6.png 0 1 11 11
-mmrnmhrm.big.7.png 0 1 13 9
-mmrnmhrm.big.8.png 0 1 12 4
-mmrnmhrm.big.9.png 0 1 11 9
-mmrnmhrm.big.10.png 0 1 10 11
-mmrnmhrm.big.11.png 0 1 11 12
-mmrnmhrm.big.12.png 0 1 14 11
-mmrnmhrm.big.13.png 0 1 12 10
-mmrnmhrm.big.14.png 0 1 10 10
-mmrnmhrm.big.15.png 0 1 11 12
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med b/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med
deleted file mode 100644
index 8c5aefd8f..000000000
--- a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med
+++ /dev/null
@@ -1,16 +0,0 @@
-mmrnmhrm.med.0.png 0 1 6 4
-mmrnmhrm.med.1.png 0 1 6 5
-mmrnmhrm.med.2.png 0 1 5 5
-mmrnmhrm.med.3.png 0 1 5 6
-mmrnmhrm.med.4.png 0 1 5 5
-mmrnmhrm.med.5.png 0 1 5 6
-mmrnmhrm.med.6.png 0 1 5 5
-mmrnmhrm.med.7.png 0 1 6 5
-mmrnmhrm.med.8.png 0 1 6 4
-mmrnmhrm.med.9.png 0 1 6 5
-mmrnmhrm.med.10.png 0 1 5 5
-mmrnmhrm.med.11.png 0 1 5 6
-mmrnmhrm.med.12.png 0 1 5 5
-mmrnmhrm.med.13.png 0 1 5 6
-mmrnmhrm.med.14.png 0 1 5 5
-mmrnmhrm.med.15.png 0 1 6 5
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml b/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml
deleted file mode 100644
index c4440937a..000000000
--- a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-mmrnmhrm.sml.0.png 0 1 3 2
-mmrnmhrm.sml.1.png 0 1 3 2
-mmrnmhrm.sml.2.png 0 1 3 3
-mmrnmhrm.sml.3.png 0 1 2 3
-mmrnmhrm.sml.4.png 0 1 2 3
-mmrnmhrm.sml.5.png 0 1 2 3
-mmrnmhrm.sml.6.png 0 1 3 3
-mmrnmhrm.sml.7.png 0 1 3 2
-mmrnmhrm.sml.8.png 0 1 3 2
-mmrnmhrm.sml.9.png 0 1 3 2
-mmrnmhrm.sml.10.png 0 1 3 3
-mmrnmhrm.sml.11.png 0 1 2 3
-mmrnmhrm.sml.12.png 0 1 2 3
-mmrnmhrm.sml.13.png 0 1 2 3
-mmrnmhrm.sml.14.png 0 1 3 3
-mmrnmhrm.sml.15.png 0 1 3 2
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big b/sc2/content/base/ships/mmrnmhrm/torp.big
deleted file mode 100644
index 2b7af1a50..000000000
--- a/sc2/content/base/ships/mmrnmhrm/torp.big
+++ /dev/null
@@ -1,16 +0,0 @@
-torp.big.0.png 0 1 1 4
-torp.big.1.png 0 1 2 3
-torp.big.2.png 0 1 3 3
-torp.big.3.png 0 1 3 2
-torp.big.4.png 0 1 4 1
-torp.big.5.png 0 1 3 2
-torp.big.6.png 0 1 3 3
-torp.big.7.png 0 1 2 3
-torp.big.8.png 0 1 1 4
-torp.big.9.png 0 1 2 3
-torp.big.10.png 0 1 3 3
-torp.big.11.png 0 1 3 2
-torp.big.12.png 0 1 4 1
-torp.big.13.png 0 1 3 2
-torp.big.14.png 0 1 3 3
-torp.big.15.png 0 1 2 3
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med b/sc2/content/base/ships/mmrnmhrm/torp.med
deleted file mode 100644
index 881d2090c..000000000
--- a/sc2/content/base/ships/mmrnmhrm/torp.med
+++ /dev/null
@@ -1,16 +0,0 @@
-torp.med.0.png 0 1 1 2
-torp.med.1.png 0 1 1 2
-torp.med.2.png 0 1 2 2
-torp.med.3.png 0 1 2 1
-torp.med.4.png 0 1 2 1
-torp.med.5.png 0 1 2 1
-torp.med.6.png 0 1 2 2
-torp.med.7.png 0 1 1 2
-torp.med.8.png 0 1 1 2
-torp.med.9.png 0 1 1 2
-torp.med.10.png 0 1 2 2
-torp.med.11.png 0 1 2 1
-torp.med.12.png 0 1 2 1
-torp.med.13.png 0 1 2 1
-torp.med.14.png 0 1 2 2
-torp.med.15.png 0 1 1 2
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml b/sc2/content/base/ships/mmrnmhrm/torp.sml
deleted file mode 100644
index 24abb500f..000000000
--- a/sc2/content/base/ships/mmrnmhrm/torp.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-torp.sml.0.png -1 1 0 1
-torp.sml.1.png 0 1 1 1
-torp.sml.2.png 0 1 1 1
-torp.sml.3.png 0 1 1 1
-torp.sml.4.png -1 1 1 0
-torp.sml.5.png 0 1 1 1
-torp.sml.6.png 0 1 1 1
-torp.sml.7.png 0 1 1 1
-torp.sml.8.png -1 1 0 1
-torp.sml.9.png 0 1 1 1
-torp.sml.10.png 0 1 1 1
-torp.sml.11.png 0 1 1 1
-torp.sml.12.png -1 1 1 0
-torp.sml.13.png 0 1 1 1
-torp.sml.14.png 0 1 1 1
-torp.sml.15.png 0 1 1 1
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.0.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.0.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.0.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.0.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.1.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.1.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.1.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.1.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.10.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.10.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.10.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.10.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.11.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.11.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.11.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.11.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.12.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.12.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.12.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.12.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.13.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.13.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.13.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.13.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.14.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.14.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.14.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.14.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.15.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.15.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.15.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.15.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.2.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.2.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.2.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.2.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.3.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.3.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.3.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.3.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.4.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.4.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.4.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.4.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.5.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.5.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.5.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.5.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.6.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.6.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.6.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.6.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.7.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.7.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.7.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.7.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.8.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.8.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.8.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.8.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.big.9.png b/sc2/content/base/ships/mmrnmhrm/torpedo-big.9.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.big.9.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-big.9.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torpedo-big.ani b/sc2/content/base/ships/mmrnmhrm/torpedo-big.ani
new file mode 100644
index 000000000..49a3415b4
--- /dev/null
+++ b/sc2/content/base/ships/mmrnmhrm/torpedo-big.ani
@@ -0,0 +1,16 @@
+torpedo-big.0.png 0 1 1 4
+torpedo-big.1.png 0 1 2 3
+torpedo-big.2.png 0 1 3 3
+torpedo-big.3.png 0 1 3 2
+torpedo-big.4.png 0 1 4 1
+torpedo-big.5.png 0 1 3 2
+torpedo-big.6.png 0 1 3 3
+torpedo-big.7.png 0 1 2 3
+torpedo-big.8.png 0 1 1 4
+torpedo-big.9.png 0 1 2 3
+torpedo-big.10.png 0 1 3 3
+torpedo-big.11.png 0 1 3 2
+torpedo-big.12.png 0 1 4 1
+torpedo-big.13.png 0 1 3 2
+torpedo-big.14.png 0 1 3 3
+torpedo-big.15.png 0 1 2 3
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.0.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.0.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.0.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.0.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.1.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.1.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.1.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.1.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.10.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.10.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.10.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.10.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.11.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.11.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.11.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.11.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.12.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.12.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.12.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.12.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.13.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.13.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.13.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.13.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.14.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.14.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.14.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.14.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.15.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.15.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.15.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.15.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.2.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.2.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.2.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.2.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.3.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.3.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.3.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.3.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.4.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.4.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.4.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.4.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.5.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.5.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.5.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.5.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.6.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.6.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.6.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.6.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.7.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.7.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.7.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.7.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.8.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.8.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.8.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.8.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.med.9.png b/sc2/content/base/ships/mmrnmhrm/torpedo-med.9.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.med.9.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-med.9.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torpedo-med.ani b/sc2/content/base/ships/mmrnmhrm/torpedo-med.ani
new file mode 100644
index 000000000..924cc3c89
--- /dev/null
+++ b/sc2/content/base/ships/mmrnmhrm/torpedo-med.ani
@@ -0,0 +1,16 @@
+torpedo-med.0.png 0 1 1 2
+torpedo-med.1.png 0 1 1 2
+torpedo-med.2.png 0 1 2 2
+torpedo-med.3.png 0 1 2 1
+torpedo-med.4.png 0 1 2 1
+torpedo-med.5.png 0 1 2 1
+torpedo-med.6.png 0 1 2 2
+torpedo-med.7.png 0 1 1 2
+torpedo-med.8.png 0 1 1 2
+torpedo-med.9.png 0 1 1 2
+torpedo-med.10.png 0 1 2 2
+torpedo-med.11.png 0 1 2 1
+torpedo-med.12.png 0 1 2 1
+torpedo-med.13.png 0 1 2 1
+torpedo-med.14.png 0 1 2 2
+torpedo-med.15.png 0 1 1 2
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.0.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.0.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.0.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.1.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.1.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.1.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.10.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.10.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.10.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.11.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.11.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.11.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.12.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.12.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.12.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.13.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.13.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.13.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.14.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.14.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.14.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.15.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.15.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.15.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.2.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.2.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.2.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.3.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.3.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.3.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.4.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.4.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.4.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.5.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.5.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.5.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.6.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.6.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.6.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.7.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.7.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.7.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.8.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.8.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.8.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torp.sml.9.png b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/torp.sml.9.png
rename to sc2/content/base/ships/mmrnmhrm/torpedo-sml.9.png
diff --git a/sc2/content/base/ships/mmrnmhrm/torpedo-sml.ani b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.ani
new file mode 100644
index 000000000..bd3d80503
--- /dev/null
+++ b/sc2/content/base/ships/mmrnmhrm/torpedo-sml.ani
@@ -0,0 +1,16 @@
+torpedo-sml.0.png -1 1 0 1
+torpedo-sml.1.png 0 1 1 1
+torpedo-sml.2.png 0 1 1 1
+torpedo-sml.3.png 0 1 1 1
+torpedo-sml.4.png -1 1 1 0
+torpedo-sml.5.png 0 1 1 1
+torpedo-sml.6.png 0 1 1 1
+torpedo-sml.7.png 0 1 1 1
+torpedo-sml.8.png -1 1 0 1
+torpedo-sml.9.png 0 1 1 1
+torpedo-sml.10.png 0 1 1 1
+torpedo-sml.11.png 0 1 1 1
+torpedo-sml.12.png -1 1 1 0
+torpedo-sml.13.png 0 1 1 1
+torpedo-sml.14.png 0 1 1 1
+torpedo-sml.15.png 0 1 1 1
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.0.png b/sc2/content/base/ships/mmrnmhrm/xform-big.0.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.0.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.0.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.1.png b/sc2/content/base/ships/mmrnmhrm/xform-big.1.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.1.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.1.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.10.png b/sc2/content/base/ships/mmrnmhrm/xform-big.10.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.10.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.10.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.11.png b/sc2/content/base/ships/mmrnmhrm/xform-big.11.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.11.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.11.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.12.png b/sc2/content/base/ships/mmrnmhrm/xform-big.12.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.12.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.12.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.13.png b/sc2/content/base/ships/mmrnmhrm/xform-big.13.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.13.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.13.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.14.png b/sc2/content/base/ships/mmrnmhrm/xform-big.14.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.14.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.14.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.15.png b/sc2/content/base/ships/mmrnmhrm/xform-big.15.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.15.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.15.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.2.png b/sc2/content/base/ships/mmrnmhrm/xform-big.2.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.2.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.2.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.3.png b/sc2/content/base/ships/mmrnmhrm/xform-big.3.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.3.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.3.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.4.png b/sc2/content/base/ships/mmrnmhrm/xform-big.4.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.4.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.4.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.5.png b/sc2/content/base/ships/mmrnmhrm/xform-big.5.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.5.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.5.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.6.png b/sc2/content/base/ships/mmrnmhrm/xform-big.6.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.6.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.6.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.7.png b/sc2/content/base/ships/mmrnmhrm/xform-big.7.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.7.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.7.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.8.png b/sc2/content/base/ships/mmrnmhrm/xform-big.8.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.8.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.8.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.9.png b/sc2/content/base/ships/mmrnmhrm/xform-big.9.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.big.9.png
rename to sc2/content/base/ships/mmrnmhrm/xform-big.9.png
diff --git a/sc2/content/base/ships/mmrnmhrm/xform-big.ani b/sc2/content/base/ships/mmrnmhrm/xform-big.ani
new file mode 100644
index 000000000..1997c315a
--- /dev/null
+++ b/sc2/content/base/ships/mmrnmhrm/xform-big.ani
@@ -0,0 +1,16 @@
+xform-big.0.png 0 1 12 13
+xform-big.1.png 0 1 13 11
+xform-big.2.png 0 1 11 10
+xform-big.3.png 0 1 9 10
+xform-big.4.png 0 1 4 11
+xform-big.5.png 0 1 9 12
+xform-big.6.png 0 1 11 11
+xform-big.7.png 0 1 13 9
+xform-big.8.png 0 1 12 4
+xform-big.9.png 0 1 11 9
+xform-big.10.png 0 1 10 11
+xform-big.11.png 0 1 11 12
+xform-big.12.png 0 1 14 11
+xform-big.13.png 0 1 12 10
+xform-big.14.png 0 1 10 10
+xform-big.15.png 0 1 11 12
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.0.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.0.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.0.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.1.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.1.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.1.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.1.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.10.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.10.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.10.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.10.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.11.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.11.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.11.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.11.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.12.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.12.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.12.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.12.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.13.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.13.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.13.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.13.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.14.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.14.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.14.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.14.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.2.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.2.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.2.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.2.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.3.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.3.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.3.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.3.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.4.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.4.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.4.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.4.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.5.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.5.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.5.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.5.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.6.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.6.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.6.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.6.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.7.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.7.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.7.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.7.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.8.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.8.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.8.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.8.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrcap.9.png b/sc2/content/base/ships/mmrnmhrm/xform-cap.9.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrcap.9.png
rename to sc2/content/base/ships/mmrnmhrm/xform-cap.9.png
diff --git a/sc2/content/base/ships/mmrnmhrm/xform-cap.ani b/sc2/content/base/ships/mmrnmhrm/xform-cap.ani
new file mode 100644
index 000000000..bcc154457
--- /dev/null
+++ b/sc2/content/base/ships/mmrnmhrm/xform-cap.ani
@@ -0,0 +1,15 @@
+xform-cap.0.png -1 1 0 0
+xform-cap.1.png 2 1 -37 -11
+xform-cap.2.png 2 1 -37 -11
+xform-cap.3.png 2 1 0 -11
+xform-cap.4.png 2 1 0 -11
+xform-cap.5.png 2 1 0 -11
+xform-cap.6.png -1 1 -19 -15
+xform-cap.7.png -1 1 -19 -15
+xform-cap.8.png -1 1 -19 -15
+xform-cap.9.png -1 1 -14 0
+xform-cap.10.png -1 1 -14 0
+xform-cap.11.png -1 1 -14 0
+xform-cap.12.png 0 1 0 0
+xform-cap.13.png 0 1 0 0
+xform-cap.14.png 0 1 0 0
diff --git a/sc2/content/base/ships/mmrnmhrm/mmricons.0.png b/sc2/content/base/ships/mmrnmhrm/xform-icons.0.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmricons.0.png
rename to sc2/content/base/ships/mmrnmhrm/xform-icons.0.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmricons.1.png b/sc2/content/base/ships/mmrnmhrm/xform-icons.1.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmricons.1.png
rename to sc2/content/base/ships/mmrnmhrm/xform-icons.1.png
diff --git a/sc2/content/base/ships/mmrnmhrm/xform-icons.ani b/sc2/content/base/ships/mmrnmhrm/xform-icons.ani
new file mode 100644
index 000000000..4984ffcb1
--- /dev/null
+++ b/sc2/content/base/ships/mmrnmhrm/xform-icons.ani
@@ -0,0 +1,2 @@
+xform-icons.0.png 0 1 0 0
+xform-icons.1.png 0 1 20 16
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.0.png b/sc2/content/base/ships/mmrnmhrm/xform-med.0.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.0.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.0.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.1.png b/sc2/content/base/ships/mmrnmhrm/xform-med.1.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.1.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.1.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.10.png b/sc2/content/base/ships/mmrnmhrm/xform-med.10.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.10.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.10.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.11.png b/sc2/content/base/ships/mmrnmhrm/xform-med.11.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.11.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.11.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.12.png b/sc2/content/base/ships/mmrnmhrm/xform-med.12.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.12.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.12.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.13.png b/sc2/content/base/ships/mmrnmhrm/xform-med.13.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.13.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.13.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.14.png b/sc2/content/base/ships/mmrnmhrm/xform-med.14.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.14.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.14.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.15.png b/sc2/content/base/ships/mmrnmhrm/xform-med.15.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.15.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.15.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.2.png b/sc2/content/base/ships/mmrnmhrm/xform-med.2.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.2.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.2.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.3.png b/sc2/content/base/ships/mmrnmhrm/xform-med.3.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.3.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.3.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.4.png b/sc2/content/base/ships/mmrnmhrm/xform-med.4.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.4.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.4.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.5.png b/sc2/content/base/ships/mmrnmhrm/xform-med.5.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.5.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.5.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.6.png b/sc2/content/base/ships/mmrnmhrm/xform-med.6.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.6.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.6.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.7.png b/sc2/content/base/ships/mmrnmhrm/xform-med.7.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.7.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.7.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.8.png b/sc2/content/base/ships/mmrnmhrm/xform-med.8.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.8.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.8.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.9.png b/sc2/content/base/ships/mmrnmhrm/xform-med.9.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.med.9.png
rename to sc2/content/base/ships/mmrnmhrm/xform-med.9.png
diff --git a/sc2/content/base/ships/mmrnmhrm/xform-med.ani b/sc2/content/base/ships/mmrnmhrm/xform-med.ani
new file mode 100644
index 000000000..fabce54f5
--- /dev/null
+++ b/sc2/content/base/ships/mmrnmhrm/xform-med.ani
@@ -0,0 +1,16 @@
+xform-med.0.png 0 1 6 4
+xform-med.1.png 0 1 6 5
+xform-med.2.png 0 1 5 5
+xform-med.3.png 0 1 5 6
+xform-med.4.png 0 1 5 5
+xform-med.5.png 0 1 5 6
+xform-med.6.png 0 1 5 5
+xform-med.7.png 0 1 6 5
+xform-med.8.png 0 1 6 4
+xform-med.9.png 0 1 6 5
+xform-med.10.png 0 1 5 5
+xform-med.11.png 0 1 5 6
+xform-med.12.png 0 1 5 5
+xform-med.13.png 0 1 5 6
+xform-med.14.png 0 1 5 5
+xform-med.15.png 0 1 6 5
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrmicon.0.png b/sc2/content/base/ships/mmrnmhrm/xform-meleeicons.0.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrmicon.0.png
rename to sc2/content/base/ships/mmrnmhrm/xform-meleeicons.0.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrmicon.1.png b/sc2/content/base/ships/mmrnmhrm/xform-meleeicons.1.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrmicon.1.png
rename to sc2/content/base/ships/mmrnmhrm/xform-meleeicons.1.png
diff --git a/sc2/content/base/ships/mmrnmhrm/xform-meleeicons.ani b/sc2/content/base/ships/mmrnmhrm/xform-meleeicons.ani
new file mode 100644
index 000000000..f8f7e5c09
--- /dev/null
+++ b/sc2/content/base/ships/mmrnmhrm/xform-meleeicons.ani
@@ -0,0 +1,2 @@
+xform-meleeicons.0.png 0 1 16 16
+xform-meleeicons.1.png 0 1 4 4
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.0.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.0.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.0.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.1.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.1.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.1.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.10.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.10.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.10.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.11.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.11.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.11.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.12.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.12.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.12.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.13.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.13.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.13.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.14.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.14.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.14.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.15.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.15.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.15.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.2.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.2.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.2.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.3.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.3.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.3.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.4.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.4.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.4.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.5.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.5.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.5.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.6.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.6.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.6.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.7.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.7.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.7.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.8.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.8.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.8.png
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.9.png b/sc2/content/base/ships/mmrnmhrm/xform-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrnmhrm.sml.9.png
rename to sc2/content/base/ships/mmrnmhrm/xform-sml.9.png
diff --git a/sc2/content/base/ships/mmrnmhrm/xform-sml.ani b/sc2/content/base/ships/mmrnmhrm/xform-sml.ani
new file mode 100644
index 000000000..0f4b4b691
--- /dev/null
+++ b/sc2/content/base/ships/mmrnmhrm/xform-sml.ani
@@ -0,0 +1,16 @@
+xform-sml.0.png 0 1 3 2
+xform-sml.1.png 0 1 3 2
+xform-sml.2.png 0 1 3 3
+xform-sml.3.png 0 1 2 3
+xform-sml.4.png 0 1 2 3
+xform-sml.5.png 0 1 2 3
+xform-sml.6.png 0 1 3 3
+xform-sml.7.png 0 1 3 2
+xform-sml.8.png 0 1 3 2
+xform-sml.9.png 0 1 3 2
+xform-sml.10.png 0 1 3 3
+xform-sml.11.png 0 1 2 3
+xform-sml.12.png 0 1 2 3
+xform-sml.13.png 0 1 2 3
+xform-sml.14.png 0 1 3 3
+xform-sml.15.png 0 1 3 2
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrditty.mod b/sc2/content/base/ships/mmrnmhrm/xform.mod
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrditty.mod
rename to sc2/content/base/ships/mmrnmhrm/xform.mod
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrsound.snd b/sc2/content/base/ships/mmrnmhrm/xform.snd
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrsound.snd
rename to sc2/content/base/ships/mmrnmhrm/xform.snd
diff --git a/sc2/content/base/ships/mmrnmhrm/mmrtext.txt b/sc2/content/base/ships/mmrnmhrm/xform.txt
similarity index 100%
rename from sc2/content/base/ships/mmrnmhrm/mmrtext.txt
rename to sc2/content/base/ships/mmrnmhrm/xform.txt