diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt
index c695ffde..583309ab 100644
--- a/mpq/arr/sfxdata.txt
+++ b/mpq/arr/sfxdata.txt
@@ -4212,18 +4212,18 @@ Insurant Weaponfire 03
 Ghostwrit Weaponfire 01
 Ghostwrit Weaponfire 02
 Ghostwrit Weaponfire 03
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
+Ferrum Death 01
+Ferrum Death 02
+Ferrum Weaponhit 01
+Ferrum Weaponhit 02
+Ferrum Weaponhit 03
+Ferrum Weaponhit 04
+Exigo Weaponfire 01
+Exigo Weaponfire 02
+Exigo Weaponfire 03
+Exigo Weaponfire 04
+Vicere Weaponfire 01
+Vicere Weaponfire 02
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1
diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt
index c8ae3a72..608d87a3 100644
--- a/mpq/arr/sounds.txt
+++ b/mpq/arr/sounds.txt
@@ -4203,12 +4203,24 @@ cm\z\cloak-zerg-on.wav
 cm\z\cloak-zerg-off.wav
 cm\a\cloak-askosi-on.wav
 cm\a\cloak-askosi-off.wav
-cm\sp\h\sentinel\wf-01.wav
-cm\sp\h\sentinel\wf-02.wav
-cm\sp\h\sentinel\wf-03.wav
+hl\fr\ferrum\wf-01.wav
+hl\fr\ferrum\wf-02.wav
+hl\fr\ferrum\wf-03.wav
 cm\a\insurant\wf-01.wav
 cm\a\insurant\wf-02.wav
 cm\a\insurant\wf-03.wav
 cm\a\ghostwrit\wf-01.wav
 cm\a\ghostwrit\wf-02.wav
-cm\a\ghostwrit\wf-03.wav
\ No newline at end of file
+cm\a\ghostwrit\wf-03.wav
+hl\fr\ferrum\dth-01.wav
+hl\fr\ferrum\dth-02.wav
+hl\fr\ferrum\wh-01.wav
+hl\fr\ferrum\wh-02.wav
+hl\fr\ferrum\wh-03.wav
+hl\fr\ferrum\wh-04.wav
+hl\fr\exigo\wf-01.wav
+hl\fr\exigo\wf-02.wav
+hl\fr\exigo\wf-03.wav
+hl\fr\exigo\wf-04.wav
+hl\fr\vicere\wf-01.wav
+hl\fr\vicere\wf-02.wav
\ No newline at end of file
diff --git a/mpq/scripts/iscript_general.bin b/mpq/scripts/iscript_general.bin
index 324945c8..f53b6eec 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 37203e1f..173123e4 100644
--- a/mpq/scripts/iscript_general.txt
+++ b/mpq/scripts/iscript_general.txt
@@ -4668,7 +4668,7 @@ FerrumWalkingToIdle:
 	goto              	FerrumWalkingToIdle
 
 FerrumDeath:
-	playsnd           	533 # Protoss\Scout\PScDth00.WAV
+	playsndbtwn			4214 4215 # Ferrum death 01, 02
 	imgol             	213 0 0 # Explosion1 (Small) (thingy\tBangS.grp)
 	wait              	3
 	lowsprul          	1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp)
@@ -4742,7 +4742,7 @@ ChalybWalkingToIdle:
 	goto              	ChalybWalkingToIdle
 
 ChalybDeath:
-	playsnd           	533 # Protoss\Scout\PScDth00.WAV
+	playsndbtwn			4214 4215 # Ferrum death 01, 02
 	imgol             	213 0 0 # Explosion1 (Small) (thingy\tBangS.grp)
 	wait              	3
 	lowsprul          	1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp)
@@ -4816,7 +4816,7 @@ CircitorWalkingToIdle:
 	goto              	CircitorWalkingToIdle
 
 CircitorDeath:
-	playsnd           	533 # Protoss\Scout\PScDth00.WAV
+	playsndbtwn			4214 4215 # Ferrum death 01, 02
 	imgol             	213 0 0 # Explosion1 (Small) (thingy\tBangS.grp)
 	wait              	3
 	lowsprul          	1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp)
@@ -4899,10 +4899,18 @@ ExigoDeath:
 
 ExigoGndAttkInit:
 	wait				1
+	nobrkcodestart
+	attack
+	wait				6
+	attack
+	wait				6
+	attack
+	wait				6
 	attack
 	wait				6
 	attack
 	wait				2
+	nobrkcodeend
 	gotorepeatattk
 	ignorerest
 	goto              	SkryrokorLocal00
@@ -5036,7 +5044,7 @@ AthlaLocal69:
 	goto              	AthlaLocal69
 
 AthlaDeath:
-	playsnd           	533 # Protoss\Scout\PScDth00.WAV
+	playsndbtwn			4214 4215 # Ferrum death 01, 02
 	imgol             	213 0 0 # Explosion1 (Small) (thingy\tBangS.grp)
 	wait              	3
 	lowsprul          	1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp)
diff --git a/mpq/sound/hl/fr/exigo/wf-01.wav b/mpq/sound/hl/fr/exigo/wf-01.wav
new file mode 100644
index 00000000..d8b3b3dc
Binary files /dev/null and b/mpq/sound/hl/fr/exigo/wf-01.wav differ
diff --git a/mpq/sound/hl/fr/exigo/wf-02.wav b/mpq/sound/hl/fr/exigo/wf-02.wav
new file mode 100644
index 00000000..a5400198
Binary files /dev/null and b/mpq/sound/hl/fr/exigo/wf-02.wav differ
diff --git a/mpq/sound/hl/fr/exigo/wf-03.wav b/mpq/sound/hl/fr/exigo/wf-03.wav
new file mode 100644
index 00000000..d995e749
Binary files /dev/null and b/mpq/sound/hl/fr/exigo/wf-03.wav differ
diff --git a/mpq/sound/hl/fr/exigo/wf-04.wav b/mpq/sound/hl/fr/exigo/wf-04.wav
new file mode 100644
index 00000000..fd96ed3a
Binary files /dev/null and b/mpq/sound/hl/fr/exigo/wf-04.wav differ
diff --git a/mpq/sound/hl/fr/ferrum/dth-01.wav b/mpq/sound/hl/fr/ferrum/dth-01.wav
new file mode 100644
index 00000000..23f1d96f
Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/dth-01.wav differ
diff --git a/mpq/sound/hl/fr/ferrum/dth-02.wav b/mpq/sound/hl/fr/ferrum/dth-02.wav
new file mode 100644
index 00000000..4a8c6d76
Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/dth-02.wav differ
diff --git a/mpq/sound/cm/sp/h/sentinel/wf-01.wav b/mpq/sound/hl/fr/ferrum/wf-01.wav
similarity index 100%
rename from mpq/sound/cm/sp/h/sentinel/wf-01.wav
rename to mpq/sound/hl/fr/ferrum/wf-01.wav
diff --git a/mpq/sound/cm/sp/h/sentinel/wf-02.wav b/mpq/sound/hl/fr/ferrum/wf-02.wav
similarity index 100%
rename from mpq/sound/cm/sp/h/sentinel/wf-02.wav
rename to mpq/sound/hl/fr/ferrum/wf-02.wav
diff --git a/mpq/sound/cm/sp/h/sentinel/wf-03.wav b/mpq/sound/hl/fr/ferrum/wf-03.wav
similarity index 100%
rename from mpq/sound/cm/sp/h/sentinel/wf-03.wav
rename to mpq/sound/hl/fr/ferrum/wf-03.wav
diff --git a/mpq/sound/hl/fr/ferrum/wh-01.wav b/mpq/sound/hl/fr/ferrum/wh-01.wav
new file mode 100644
index 00000000..d6f3cb80
Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/wh-01.wav differ
diff --git a/mpq/sound/hl/fr/ferrum/wh-02.wav b/mpq/sound/hl/fr/ferrum/wh-02.wav
new file mode 100644
index 00000000..e15e2bd0
Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/wh-02.wav differ
diff --git a/mpq/sound/hl/fr/ferrum/wh-03.wav b/mpq/sound/hl/fr/ferrum/wh-03.wav
new file mode 100644
index 00000000..c8ffc852
Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/wh-03.wav differ
diff --git a/mpq/sound/hl/fr/ferrum/wh-04.wav b/mpq/sound/hl/fr/ferrum/wh-04.wav
new file mode 100644
index 00000000..ed67bb77
Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/wh-04.wav differ
diff --git a/mpq/sound/hl/fr/vicere/wf-01.wav b/mpq/sound/hl/fr/vicere/wf-01.wav
new file mode 100644
index 00000000..4b9d2d71
Binary files /dev/null and b/mpq/sound/hl/fr/vicere/wf-01.wav differ
diff --git a/mpq/sound/hl/fr/vicere/wf-02.wav b/mpq/sound/hl/fr/vicere/wf-02.wav
new file mode 100644
index 00000000..5cd3b146
Binary files /dev/null and b/mpq/sound/hl/fr/vicere/wf-02.wav differ
diff --git a/patchnotes.md b/patchnotes.md
index 2aa76448..41bcc3e8 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -59,6 +59,8 @@
 	- Vicar
 - New SFX for:
 	- Zerg and Askosi cloaking / decloaking (c. lolrsk8s)
+- Modified SFX for:
+	- Eidolon windup
 - New wireframe for: (c. jun3hong)
 	- **Autocrat**
 
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index bfc58585..6b5c4d56 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ