diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex
index 2037fd78..ef6da8b5 100644
Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ
diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index ff6afa5c..d5097368 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -47938,7 +47938,7 @@ AirAttkInit   	VagrantGndAttkInit
 Unused1       	VagrantUnused1
 GndAttkRpt    	VagrantGndAttkInit
 AirAttkRpt    	VagrantGndAttkInit
-CastSpell     	VagrantCastSpell
+CastSpell     	[NONE]
 GndAttkToIdle 	VagrantGndAttkToIdle
 AirAttkToIdle 	VagrantGndAttkToIdle
 Unused2       	[NONE]
@@ -47957,17 +47957,10 @@ WarpIn        	VagrantWarpIn
 # ----------------------------------------------------------------------------- #
 
 VagrantInit:
-	if unit_id == 317 goto PatriarchInit
 	imgul             	1277 0 0 # Vagrant Shadow (cm\protoss\vagrant-shadow.grp)
 	playfram          	0x00
 	wait				2
 	goto              	VagrantLocal00
-	
-PatriarchInit:
-	imgul             	1627 0 0 # Patriarch Shadow (cm\protoss\patriarch-shadow.grp)
-	playfram          	0x00
-	wait				2
-	goto              	VagrantLocal00
 
 VagrantLocal00:
 	wait				1
@@ -48052,31 +48045,6 @@ VagrantGndAttkToIdle:
 	wait 				1
 	goto              	VagrantLocal00
 
-VagrantCastSpell:
-	playfram          	0x154
-	wait              	1
-	nobrkcodestart
-	playfram          	0x165
-	playsndbtwn			2126 2130 # Vagrant attack 01, 02, 03, 04, 05
-	castspell
-	sigorder          	2
-	wait              	1
-	playfram          	0x176
-	wait              	1
-	playfram          	0x187
-	wait				1
-	playfram          	0x198
-	wait				1
-	playfram          	0x1A9
-	wait				1
-	playfram          	0x1BA
-	wait				1
-	playfram          	0x1CB
-	wait				1
-	nobrkcodeend
-	gotorepeatattk
-	goto              	VagrantGndAttkToIdle
-
 VagrantWalking:
 	move              	5
 	wait              	1
@@ -52325,4 +52293,174 @@ OptectonWalkingToIdle:
 
 OptectonWarpIn:
 	imgol             	125 0 0	# High Templar Warp Flash (protoss\templar.grp)
-	goto              	OptectonLocal00
\ No newline at end of file
+	goto              	OptectonLocal00
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1276 Patriarch (cm\protoss\patriarch.grp)
+.headerstart
+IsId          	729
+Type          	21
+Init          	PatriarchInit
+Death         	PatriarchDeath
+GndAttkInit   	PatriarchGndAttkInit
+AirAttkInit   	PatriarchGndAttkInit
+Unused1       	PatriarchUnused1
+GndAttkRpt    	PatriarchGndAttkInit
+AirAttkRpt    	PatriarchGndAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	PatriarchGndAttkToIdle
+AirAttkToIdle 	PatriarchGndAttkToIdle
+Unused2       	[NONE]
+Walking       	PatriarchWalking
+WalkingToIdle 	PatriarchWalkingToIdle
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	PatriarchWarpIn
+.headerend
+# ----------------------------------------------------------------------------- #
+
+PatriarchInit:
+	imgul             	1627 0 0 # Patriarch Shadow (cm\protoss\patriarch-shadow.grp)
+	playfram          	0x00
+	wait				2
+	goto              	PatriarchLocal00
+
+PatriarchLocal00:
+	wait				1
+	waitrand			62 74
+	randcondjmp       	25 PatriarchLocal01
+	goto              	PatriarchLocal00
+
+PatriarchLocal01:
+	playfram			0x11
+	wait				1
+	playfram			0x22
+	wait				1
+	playfram			0x33
+	wait				1
+	playfram			0x44
+	wait				1
+	playfram			0x55
+	wait				1
+	playfram			0x66
+	wait				1
+	playfram			0x00
+	goto				PatriarchLocal00
+
+PatriarchLocal42:
+	playfram			0x00
+	goto				PatriarchLocal00
+
+PatriarchDeath:
+	playsnd           	635	# Protoss\TEMPLAR\PTeDth00.WAV
+	imgol             	153 0 0 # Zealot Death (protoss\zealot.grp)
+	wait              	1
+	end
+	
+PatriarchUnused1:
+	wait				1
+	nobrkcodestart
+	setfldirect       	0 
+	playsnd				1186 # Cantavis revive 01
+	imgol             	1445 0 0 # Zealot death reversed
+#	playfram			244
+	wait				2
+#	playfram			243
+	wait				2
+#	playfram			242
+	wait				2
+#	playfram			241
+	wait				2
+#	playfram			240
+	wait				2
+	wait				2
+	setfldirect       	12
+	nobrkcodeend
+	goto				PatriarchLocal42
+
+PatriarchGndAttkInit:
+	playfram          	0x154
+	wait              	1
+	nobrkcodestart
+	playfram          	0x165
+	playsndbtwn			2126 2130 # Patriarch attack 01, 02, 03, 04, 05
+	attackwith        	1
+	wait              	1
+	playfram          	0x176
+	wait              	1
+	playfram          	0x187
+	wait				1
+	playfram          	0x198
+	wait				1
+	playfram          	0x1A9
+	wait				1
+	playfram          	0x1BA
+	wait				1
+	playfram          	0x1CB
+	wait				1
+	nobrkcodeend
+	gotorepeatattk
+	ignorerest
+	goto				PatriarchGndAttkToIdle
+	
+PatriarchGndAttkToIdle:
+	playfram 			0x00
+	wait 				1
+	goto              	PatriarchLocal00
+
+PatriarchWalking:
+	move              	5
+	wait              	1
+	playfram          	0x77
+	move              	5
+	wait              	1
+	playfram          	0x88
+	move              	5
+	wait              	1
+	playfram          	0x99
+	move              	5
+	wait              	1
+	playfram          	0xaa
+	move              	5
+	wait              	1
+	playfram          	0xbb
+	move              	5
+	wait              	1
+	playfram          	0xcc
+	move              	5
+	wait              	1
+	playfram          	0xdd
+	move              	5
+	wait              	1
+	playfram          	0xee
+	move              	5
+	wait              	1
+	playfram          	0xff
+	move              	5
+	wait              	1
+	playfram          	0x110
+	move              	5
+	wait              	1
+	playfram          	0x121
+	move              	5
+	wait              	1
+	playfram          	0x132
+	move              	5
+	wait              	1
+	playfram          	0x143
+	goto				PatriarchWalking
+	
+PatriarchWalkingToIdle:
+	playfram			0x00
+	goto				PatriarchLocal00
+
+PatriarchWarpIn:
+	imgol             	128 0 0	# High Templar Warp Flash (protoss\templar.grp)
+	goto              	InfestedTerranLocal00
\ No newline at end of file
diff --git a/patchnotes.md b/patchnotes.md
index 795f11ce..0fd29ece 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -22,6 +22,7 @@ Aside from that: We are continuing to polish existing content and remove low-cou
 
 ## Audiovisuals
 - Superior engine graphics for the Mason and the Trojan have been added (c. DarkenedFantasies)
+- Patriarch now uses its own shadow instead of the Vagrant's
 - Weapon fire SFX for Madcap, Sundog, and Salamander have been adjusted to reduce clipping
 - New weaponfire SFX:
 	- Optecton (both attacks)