diff --git a/CMBW-editor/grafting/Buttons.txt b/CMBW-editor/grafting/Buttons.txt
index da55f11a..60994e02 100644
--- a/CMBW-editor/grafting/Buttons.txt
+++ b/CMBW-editor/grafting/Buttons.txt
@@ -850,8 +850,9 @@
  4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0)
  5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0)
  7, 369, 23, 24, 17, 17, 1112, 0 # Land Grab, Spell Researched ([17] Land Grab - Wyvern), Use Technology ([17] Land Grab - Wyvern)
- 8, 374, 23, 57, 34, 0, 1703, 0 # Reverse Thrust, Spell Researched ([34] Healing - Cleric), Cancel (0)
- 9, 236, 23, 24, 26, 26, 475, 475 # Cancel, Spell Researched ([26] Cancel New Ability), Use Technology ([26] Cancel New Ability)
+ 7, 236, 23, 24, 26, 26, 475, 475 # Cancel, Spell Researched ([26] Cancel New Ability), Use Technology ([26] Cancel New Ability)
+ 8, 391, 23, 57, 34, 0, 1391, 1391 # Kinetic Penetration, Spell Researched ([34] Healing - Cleric), Cancel (0)
+ 9, 374, 23, 57, 34, 0, 1703, 0 # Reverse Thrust, Spell Researched ([34] Healing - Cleric), Cancel (0)
 
 137: # Mutation Pit -- unused
  9, 236, 16, 27, 0, 0, 691, 0 # Cancel, Upgrade Underway (0), Cancel Upgrade Research (0)
diff --git a/CMBW-maps/melee/1v1/Work in Progress/(2)Nightfall.scx b/CMBW-maps/melee/1v1/Work in Progress/(2)Nightfall.scx
index 8589f3d4..98c966d3 100644
Binary files a/CMBW-maps/melee/1v1/Work in Progress/(2)Nightfall.scx and b/CMBW-maps/melee/1v1/Work in Progress/(2)Nightfall.scx differ
diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft
index a8e21a91..dbfaa544 100644
Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ
diff --git a/patchnotes.md b/patchnotes.md
index 33e15863..7c946f9d 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -12,6 +12,7 @@ Patch goals include:
 - [Pr0totype #26 - The Wild Worlds...](https://youtu.be/TgiH2EBvXBo)
 - [Ascension Format Explainer](https://youtu.be/kl0RlFWqvXU)
 - [Pr0totype #27 - For the Faithful](https://youtu.be/n6jupKt7wQg)
+- [Pr0totype #28 - How Far We've Come](https://youtu.be/cimvhnWc1U4)
 
 ## General
 - Vision update timer has been sped up significantly (c. Veeq7 and DF)
@@ -21,6 +22,9 @@ Patch goals include:
 ## Tilesets
 - The following tiles now provide a height difference:
 	- Jungle: Swamp, sunken jungle
+- The following tiles were added:
+	- Ashworld: Magma to crushed rock cliff
+	- Desert: Cooled lava to dirt (all levels), compound to cooled lava (level 1)
 - The following tiles were deprecated and are now removed:
 	- Jungle: Sunken jungle cliffs for temple and dirt
 
@@ -140,6 +144,7 @@ Patch goals include:
 	- Armor now 3, from 4
 - [Penumbra](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/penumbra):
 	- Weapon armor penetration now 4, from 0
+	- Now collides with Cataphracts, Paladins, and Architects
 - [Wraith](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/wraith):
 	- Time cost now 28, from 25
 	- Sight range now 6, from 7
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 81d95c3b..84143b1d 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ