diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex
index e0210abf..1ee7f9a4 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 a1bd7e84..c8fdaf14 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 a974c70e..e1ec7d41 100644
--- a/mpq/arr/images.txt
+++ b/mpq/arr/images.txt
@@ -1845,9 +1845,9 @@ Algoztalisk Birth (Cocoon)
 Gorgon Petrification
 Autocrat Controlled Opposition
 Savant Form Switch - Entropy
-Extended Image #845
-Extended Image #846
-Extended Image #847
+Maverick Stimpack Inject
+Maverick Stimpack Proc
+Maverick Stimpack Expire
 Extended Image #848
 Extended Image #849
 Extended Image #850
diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat
index 34acbf3c..fca4b9ce 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 dff1c799..a2a16c83 100644
--- a/mpq/arr/sfxdata.txt
+++ b/mpq/arr/sfxdata.txt
@@ -3077,7 +3077,7 @@ Ancile Death 02
 Ancile Death 03
 Savant Switch A 01
 Savant Switch B 01
-Extended Sound #1
+Stimpack Expire 01
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1
diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt
index ec1b39d8..f8a726ba 100644
--- a/mpq/arr/sounds.txt
+++ b/mpq/arr/sounds.txt
@@ -3076,4 +3076,5 @@ cm\t\ancile\dth-01.wav
 cm\t\ancile\dth-02.wav
 cm\t\ancile\dth-03.wav
 cm\t\savant\sw-01.wav
-cm\t\savant\sw-02.wav
\ No newline at end of file
+cm\t\savant\sw-02.wav
+cm\t\maverick\stimpack-expire-01.wav
\ No newline at end of file
diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index 75920270..ca685666 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -25616,16 +25616,17 @@ EnergyDecayDeath:
 	
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
-# 1110 Magic Sylon (cm\effect\magicsylon.grp)
+# 1110 Savant Form Switch - Power (cm\terran\savant-form-switch.grp)
+# 1846 Savant Form Switch - Entropy (cm\terran\savant-form-switch.grp)
 .headerstart
 IsId          	459
 Type          	1
-Init          	MagicSylonInit
-Death         	MagicSylonDeath
+Init          	SavantFormSwitchInit
+Death         	SavantFormSwitchDeath
 .headerend
 # ----------------------------------------------------------------------------- #
 
-MagicSylonInit:
+SavantFormSwitchInit:
 	playfram          	0x00
 	wait              	1
 	playfram          	1
@@ -25679,7 +25680,7 @@ MagicSylonInit:
 	playfram          	42
 	wait              	1
 	playfram          	43
-MagicSylonDeath:
+SavantFormSwitchDeath:
 	wait              	1
 	end
 	
@@ -50944,4 +50945,27 @@ GorgonPetrificationInit:
 	wait				1
 	end
 	
-## Next free IsId: 777
\ No newline at end of file
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1847 Maverick Stimpack (cm\terran\maverick-stimpack.grp)
+.headerstart
+IsId          	777
+Type          	1
+Init          	MaverickStimpackInit
+Death         	MaverickStimpackDeath
+.headerend
+# ----------------------------------------------------------------------------- #
+
+MaverickStimpackInit:
+	playfram          	1
+	wait              	1
+	playfram          	2
+	wait              	1
+	playfram          	4
+	wait              	1
+	playfram          	5
+MaverickStimpackDeath:
+	wait              	1
+	end
+	
+## Next free IsId: 778
\ No newline at end of file
diff --git a/mpq/sound/cm/t/maverick/stimpack-expire-01.wav b/mpq/sound/cm/t/maverick/stimpack-expire-01.wav
new file mode 100644
index 00000000..ca390ee5
Binary files /dev/null and b/mpq/sound/cm/t/maverick/stimpack-expire-01.wav differ
diff --git a/mpq/sound/cm/t/maverick/stimpack-inject-01.wav b/mpq/sound/cm/t/maverick/stimpack-inject-01.wav
index 1d74f5b9..e13741ba 100644
Binary files a/mpq/sound/cm/t/maverick/stimpack-inject-01.wav and b/mpq/sound/cm/t/maverick/stimpack-inject-01.wav differ
diff --git a/mpq/unit/cm/terran/maverick-stimpack-expire.grp b/mpq/unit/cm/terran/maverick-stimpack-expire.grp
new file mode 100644
index 00000000..9a81d3af
Binary files /dev/null and b/mpq/unit/cm/terran/maverick-stimpack-expire.grp differ
diff --git a/mpq/unit/cm/terran/maverick-stimpack-inject.grp b/mpq/unit/cm/terran/maverick-stimpack-inject.grp
new file mode 100644
index 00000000..19f85169
Binary files /dev/null and b/mpq/unit/cm/terran/maverick-stimpack-inject.grp differ
diff --git a/mpq/unit/cm/terran/maverick-stimpack-proc.grp b/mpq/unit/cm/terran/maverick-stimpack-proc.grp
new file mode 100644
index 00000000..27863db2
Binary files /dev/null and b/mpq/unit/cm/terran/maverick-stimpack-proc.grp differ
diff --git a/patchnotes.md b/patchnotes.md
index b2c3bda6..38ab1641 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -16,7 +16,9 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 
 ## Audiovisuals
 - Added reads for:
+	- Maverick Stimpack (inject, proc, expire)
 	- Savant form switch
+	- Madcap Cabeirus Feeders achieving full stacks
 - Advisors:
 	- Achieved custom advisor support for:
 		- Missile arming
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 5cf07417..7f3c8cb3 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ