diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex
index 1680c280..983f92e9 100644
Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ
diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp
index 77a9a20d..260ff8e6 100644
Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ
diff --git a/mpq/scripts/iscript_general.bin b/mpq/scripts/iscript_general.bin
index f53b6eec..b4f02e7b 100644
Binary files a/mpq/scripts/iscript_general.bin and b/mpq/scripts/iscript_general.bin differ
diff --git a/mpq/scripts/iscript_general.txt b/mpq/scripts/iscript_general.txt
index 173123e4..6840f777 100644
--- a/mpq/scripts/iscript_general.txt
+++ b/mpq/scripts/iscript_general.txt
@@ -3630,7 +3630,7 @@ EnergyRegenOverlayDeath:
 # 1676 Santa Hat - Extra Large - 17
 .headerstart
 IsId          	722
-Type          	24
+Type          	26
 Init          	SantaHatInit
 Death         	SantaHatDeath
 GndAttkInit   	SantaHatLocal00
@@ -5062,8 +5062,10 @@ AthlaGndAttkInit:
 AthlaWalking:
     setvertpos          0
     playfram            0x00
+	move				7
+	wait				1
 #	imgol             	142 0 0 # Athla Engines (thingy\pscGlow.grp)
-    goto                SkryrokorLocal00
+    goto                AthlaWalking
     
 AthlaWalkingToIdle:
 	playfram          	0x00
diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp
index 611f6260..7c66e069 100644
Binary files a/mpq/unit/cmdbtns/cmdicons.grp and b/mpq/unit/cmdbtns/cmdicons.grp differ
diff --git a/mpq/unit/cmdbtns/uniticons.grp b/mpq/unit/cmdbtns/uniticons.grp
index a62c64e2..4116947d 100644
Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ
diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp
index b309b3df..3066fe1d 100644
Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ
diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp
index 0f54b253..efbbc1b2 100644
Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ
diff --git a/mpq/unit/zerg/zhyshad.grp b/mpq/unit/zerg/zhyshad.grp
deleted file mode 100644
index cc59e1f0..00000000
Binary files a/mpq/unit/zerg/zhyshad.grp and /dev/null differ
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 3a52055a..a770de13 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ