diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex
index 47379389..e0210abf 100644
Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ
diff --git a/mpq/arr/images.tbl b/mpq/arr/images.tbl
index 5646ab5e..a1bd7e84 100644
Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ
diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt
index 87cc2f33..a974c70e 100644
--- a/mpq/arr/images.txt
+++ b/mpq/arr/images.txt
@@ -1108,7 +1108,7 @@ Augur Death Explosion
 Energy Decay Small
 Energy Decay Medium
 Energy Decay Large
-Magic Sylon
+Savant Form Switch - Power
 Alkajelisk
 Alkajelisk Shadow
 Keskathalor
@@ -1844,7 +1844,7 @@ Algoztalisk Birth (Egg)
 Algoztalisk Birth (Cocoon)
 Gorgon Petrification
 Autocrat Controlled Opposition
-Extended Image #844
+Savant Form Switch - Entropy
 Extended Image #845
 Extended Image #846
 Extended Image #847
diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat
index 8f359d17..34acbf3c 100644
Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ
diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt
index 86ad6d9b..dff1c799 100644
--- a/mpq/arr/sfxdata.txt
+++ b/mpq/arr/sfxdata.txt
@@ -81,8 +81,8 @@ Bullet\ZLuHit00.wav
 Bullet\HKMISSLE.wav
 Bullet\TGoFi200.wav
 Bullet\TPhFi200.wav
-Bullet\TNsFir00.wav (1)
-Bullet\TNsFir00.wav (2)
+Bullet\TPhFi200.wav (2)
+Bullet\TNsFir00.wav
 Bullet\TNsHit00.wav
 Bullet\PhoAtt00.wav
 Bullet\PhoHit00.wav
@@ -3075,8 +3075,8 @@ Cataphract Death 07
 Ancile Death 01
 Ancile Death 02
 Ancile Death 03
-Extended Sound #1
-Extended Sound #1
+Savant Switch A 01
+Savant Switch B 01
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1
diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt
index 260bef47..ec1b39d8 100644
--- a/mpq/arr/sounds.txt
+++ b/mpq/arr/sounds.txt
@@ -3074,4 +3074,6 @@ cm\t\cataphract\dth-06.wav
 cm\t\cataphract\dth-07.wav
 cm\t\ancile\dth-01.wav
 cm\t\ancile\dth-02.wav
-cm\t\ancile\dth-03.wav
\ No newline at end of file
+cm\t\ancile\dth-03.wav
+cm\t\savant\sw-01.wav
+cm\t\savant\sw-02.wav
\ No newline at end of file
diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index d99bfca9..75920270 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -25616,7 +25616,7 @@ EnergyDecayDeath:
 	
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
-# 1110 Magic Sylon 	(cm\effect\magicsylon.grp)
+# 1110 Magic Sylon (cm\effect\magicsylon.grp)
 .headerstart
 IsId          	459
 Type          	1
@@ -25628,7 +25628,6 @@ Death         	MagicSylonDeath
 MagicSylonInit:
 	playfram          	0x00
 	wait              	1
-MagicSylonLocal00:
 	playfram          	1
 	wait              	1
 	playfram          	2
@@ -25661,41 +25660,7 @@ MagicSylonLocal00:
 	wait              	1
 	playfram          	16
 	wait              	1
-	playfram          	0x11
-	wait              	1
-	playfram          	18
-	wait              	1
-	playfram          	19
-	wait              	1
-	playfram          	20
-	wait              	1
-	playfram          	21
-	wait              	1
-	playfram          	22
-	wait              	1
-	playfram          	23
-	wait              	1
-	playfram          	24
-	wait              	1
-	playfram          	25
-	wait              	1
-	playfram          	26
-	wait              	1
-	playfram          	27
-	wait              	1
-	playfram          	28
-	wait              	1
-	playfram          	29
-	wait              	1
-	playfram          	30
-	wait              	1
-	playfram          	31
-	wait              	1
-	playfram          	32
-	wait              	1
-	playfram          	33
-	wait              	1
-	playfram          	0x22
+	playfram          	34
 	wait              	1
 	playfram          	35
 	wait              	1
diff --git a/mpq/sound/cm/t/savant/sw-01.wav b/mpq/sound/cm/t/savant/sw-01.wav
new file mode 100644
index 00000000..a315c973
Binary files /dev/null and b/mpq/sound/cm/t/savant/sw-01.wav differ
diff --git a/mpq/sound/cm/t/savant/sw-02.wav b/mpq/sound/cm/t/savant/sw-02.wav
new file mode 100644
index 00000000..71260e23
Binary files /dev/null and b/mpq/sound/cm/t/savant/sw-02.wav differ
diff --git a/mpq/unit/cm/effect/magicsylon.grp b/mpq/unit/cm/effect/magicsylon.grp
deleted file mode 100644
index 5184b858..00000000
Binary files a/mpq/unit/cm/effect/magicsylon.grp and /dev/null differ
diff --git a/mpq/unit/cm/terran/savant-form-switch.grp b/mpq/unit/cm/terran/savant-form-switch.grp
new file mode 100644
index 00000000..270f4a40
Binary files /dev/null and b/mpq/unit/cm/terran/savant-form-switch.grp differ
diff --git a/patchnotes.md b/patchnotes.md
index ef1c00d6..b2c3bda6 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -14,11 +14,9 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 - Kiting logic:
 	- No longer runs for Dilettantes
 
-## Bugfixes
-- Gameplay:
-	- Units which need to decollide are now prohibited from processing orders (c. DF)
-
 ## Audiovisuals
+- Added reads for:
+	- Savant form switch
 - Advisors:
 	- Achieved custom advisor support for:
 		- Missile arming
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 57179744..5cf07417 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ