diff --git a/mpq/templates/Competitive Mode(1).got b/mpq/templates/Competitive Mode(1).got
deleted file mode 100644
index 5605f09e..00000000
Binary files a/mpq/templates/Competitive Mode(1).got and /dev/null differ
diff --git a/mpq/templates/Competitive(1).got b/mpq/templates/Competitive(1).got
new file mode 100644
index 00000000..f0274f1a
Binary files /dev/null and b/mpq/templates/Competitive(1).got differ
diff --git a/mpq/templates/Scenario Mode(1).got b/mpq/templates/Scenario Mode(1).got
deleted file mode 100644
index 3f3dd356..00000000
Binary files a/mpq/templates/Scenario Mode(1).got and /dev/null differ
diff --git a/mpq/templates/Scenario(1).got b/mpq/templates/Scenario(1).got
new file mode 100644
index 00000000..4ca504a9
Binary files /dev/null and b/mpq/templates/Scenario(1).got differ
diff --git a/mpq/templates/templates.lst b/mpq/templates/templates.lst
index 2ac2877a..c09dc207 100644
--- a/mpq/templates/templates.lst
+++ b/mpq/templates/templates.lst
@@ -1,3 +1,3 @@
-"Competitive Mode(1).got"
-"Scenario Mode(1).got"
+"Competitive(1).got"
+"Scenario(1).got"
 "Omnipresence(1).got"
\ No newline at end of file
diff --git a/patchnotes.md b/patchnotes.md
index 254698cb..5da439c9 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -20,6 +20,8 @@ More rebalancings, more new sprites, more bugfixes, and a more useful patch desc
 - Added new config options for:
 	- Always showing condensed selections (c. DF)
 	- Showing ability cast ranges (WIP) (c. DF)
+- Movement speed is now back on the armor tooltip (c. DF)
+- There is now a 1/256 chance for certain units to get custom "easter egg" names (c. Veeq7)
 
 ## Audiovisuals:
 - New sprite:
@@ -33,6 +35,9 @@ More rebalancings, more new sprites, more bugfixes, and a more useful patch desc
 - New config options for advisors have surfaced! (with help from Veeq7)
 	- These are **not** yet fully-implemented, so changing from the default values will result in a rather schizophrenic experience until more hooks are completed!
 
+## AI
+- Improved worker assignments for better vespene saturation
+
 ## Bugfixes
 - Stability:
 	- Zarcavrokors suffering from Deconstruction no longer crash the game when attacked (r. Mystery Meat)
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 35f3c4d7..8e52cecb 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ