diff --git a/mpq/templates/Competitive Mode(1).got b/mpq/templates/Competitive Mode(1).got
new file mode 100644
index 00000000..a308959c
Binary files /dev/null and b/mpq/templates/Competitive Mode(1).got differ
diff --git a/mpq/templates/Scenario Mode(1).got b/mpq/templates/Scenario Mode(1).got
new file mode 100644
index 00000000..d34b3253
Binary files /dev/null and b/mpq/templates/Scenario Mode(1).got differ
diff --git a/mpq/templates/templates.lst b/mpq/templates/templates.lst
new file mode 100644
index 00000000..00639b96
--- /dev/null
+++ b/mpq/templates/templates.lst
@@ -0,0 +1,2 @@
+"Competitive Mode(1).got"
+"Scenario Mode(1).got"
\ No newline at end of file
diff --git a/patchnotes.md b/patchnotes.md
index dc793fb9..32969141 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -10,16 +10,29 @@ Please report any issues in #cmbw-issues on [discord](https://discord.gg/s5SKBmY
 
 TBD
 
-## Selection: (c. DF)
-- Selection is now capped at 252, from 12
-- When selecting more than 12 units, selections are collapsed, showing the quantity of units by type - at which point:
-	- Left-click selects all units of that type
-	- Shift-click deselects one unit of that type
-	- Ctrl-shift-click deselects all units of that type
+## User Interface
+- Selection: (c. DarkenedFantasies)
+	- Selection is now capped at 252, from 12
+	- When selecting more than 12 units, selections are collapsed, showing the quantity of units by type - at which point:
+		- Left-click selects all units of that type
+		- Shift-click deselects one unit of that type
+		- Ctrl-shift-click deselects all units of that type
+- Game modes: (c. Veeq7)
+	- Added "Competitive Mode" to once again display "kills" on combatants
+	- Renamed "Use Map Settings" to "Scenario Mode"
+	- Restricted multiplayer game mode selection to only that which is currently-supported
+		- Modes that had limited (and buggy) utility can be reimplemented more completely; please message us for specific requests!
 
 ## AI
-- Reduced the resource bias for expansion selection to prevent unwanted edge cases
+- Reduced the resource bias for expansion selection to prevent unwanted edge cases on some maps
 
 ## Bugfixes
+- Stability:
+	- An ai-related nullsprite crash has been resolved (r. beriso)
 - Gameplay:
-	- Lakizilisks will no longer become unresponsive when receiving an unburrow order while already unburrowed (r. exosus & fagguto)
\ No newline at end of file
+	- Lakizilisks will no longer become unresponsive when receiving an unburrow order while already unburrowed (r. exosus & fagguto)
+
+## Audiovisuals
+- The delay between "ally under attack" notifications has been increased by 50%
+- Improved sprites for:
+	- Aurora, Panoptus (c. Solstice)
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index c6d1315d..5a9be43a 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ