diff --git a/Data/Sys/GameSettings/GMPE01.ini b/Data/Sys/GameSettings/GMPE01.ini
index 0988617a5f..a276806f8b 100644
--- a/Data/Sys/GameSettings/GMPE01.ini
+++ b/Data/Sys/GameSettings/GMPE01.ini
@@ -144,6 +144,13 @@ E2000001 80008000
 *Unlocks Everything in the game.
 *Permanent once saved!
 
+$Awards Ceremony - Bonus Ztars [Tabitha]
+281D3CE2 0000004E
+04441D9C 3885FFFF
+04441D68 3803FFFF
+E2000001 80008000
+*Bonus stars take away a Star rather than awarding one
+
 $Board - Boo's Haunted Bash - Red Boo Always On [gamemasterplc]
 201D3CE0 0000005C
 0018FD08 00000000
@@ -176,30 +183,6 @@ $Board - Toad's Midway Madness - Teacups are Normal Junctions [gamemasterplc, Ta
 E2000001 80008000
 *Replaces the teacup junctions with normal junctions in Toad's Midway Madness.
 
-$Extra - 30Hz Gameplay [gamemasterplc]
-041D3B00 40000000
-041D3B04 00000002
-04035480 38600001
-C200592C 00000009
-3C808000 6084D01C
-7C8903A6 4E800421
-3C808000 60845B4C
-7C8903A6 4E800421
-38800000 908D8688
-908D868C 38600001
-3C808000 6084D01C
-7C8903A6 4E800421
-60000000 00000000
-*Game runs at 30Hz but still feel like 60FPS. Great for people with bad PCs
-*Can break certain minigames
-
-$Awards Ceremony - Bonus Ztars [Tabitha]
-281D3CE2 0000004E
-04441D9C 3885FFFF
-04441D68 3803FFFF
-E2000001 80008000
-*Bonus stars take away a Star rather than awarding one
-
 $Economy - Boo Coin Steals are Free [Tabitha]
 040A61DC 2C1E0000
 040A517C 2C030000
@@ -669,7 +652,7 @@ $Items - Use Multiple Items on the Same Turn [WolfGC64]
 001D3F44 000000FF
 *Use as many items as you want on a single turn!
 
-$Minigames - Battle Games - Always 50 Coins [Tabitha]
+$Minigame - Battle Games - Always 50 Coins [Tabitha]
 041D5DE0 32323232
 041D5DE4 32000000
 
@@ -754,3 +737,20 @@ C205BEF8 00000004
 
 $Turns - Press Z On Pause Menu to End Game [Ralf]
 040B11C4 40820014
+
+$Extra - 30Hz Gameplay [gamemasterplc]
+041D3B00 40000000
+041D3B04 00000002
+04035480 38600001
+C200592C 00000009
+3C808000 6084D01C
+7C8903A6 4E800421
+3C808000 60845B4C
+7C8903A6 4E800421
+38800000 908D8688
+908D868C 38600001
+3C808000 6084D01C
+7C8903A6 4E800421
+60000000 00000000
+*Game runs at 30Hz but still feel like 60FPS. Great for people with bad PCs
+*Can break certain minigames
diff --git a/Data/Sys/GameSettings/GP5E01.ini b/Data/Sys/GameSettings/GP5E01.ini
index 7ce2b6edef..960ede6aec 100644
--- a/Data/Sys/GameSettings/GP5E01.ini
+++ b/Data/Sys/GameSettings/GP5E01.ini
@@ -170,16 +170,6 @@ $Board - Undersea Dream - Seashell Event Always Gives Wiggler Capsule [Tabitha]
 $Capsules - Can Be Thrown Everywhere [gamemasterplc]
 040C56C0 38A0007F
 
-$Capsules - Cannot be Obtained [gamemasterplc]
-F6000001 80008180
-3BC50005 887E0000
-D2000004 00000002
-386000FF 987E0000
-60000000 00000000
-E0000000 80008000
-*Disables all usage of Capsules.
-*Capsules already on spaces will continue to exist.
-
 $Capsules – Obtain on Final Turn [gamemasterplc]
 F6000001 80008180
 7C040040 40820024
@@ -361,27 +351,6 @@ C208CC38 00000006
 2C030000 00000000
 *A minigame will appear on the Last Turn, since the game requires it to be able to end.
 
-$Minigame - Battle Games - Do Not Affect Minigame Star [gamemasterplc]
-2046d354 b0030022
-0446d350 60000000
-e2000001 80008000
-*Battle Minigames do not count towards the Mini-Game Star.
-
-$Minigame - Battle Games - Always 50 Coins [Tabitha]
-041CBFFC 00000032
-041CC000 00000032
-041CC004 00000032
-041C0008 00000032
-041C000C 00000032
-
-$Minigame - Duels - Same Space Duels Always Happen [Tabitha]
-04094740 60000000
-*Duels always happen if you are on the same space
-
-$Minigame - Duels - Same Space Duels Don't Happen [Tabitha]
-04094740 48000030
-*Duels never happen if you are on the same space.
-
 $Minigame - P1 Picks Minigames [gamemasterplc]
 C211D0E4 0000000F
 ABED862C 73FA0008
@@ -405,6 +374,27 @@ B00D8CD4 AAAD8CD4
 0411D0E0 60000000
 *Use D-Pad
 
+$Minigame - Battle Games - Do Not Affect Minigame Star [gamemasterplc]
+2046d354 b0030022
+0446d350 60000000
+e2000001 80008000
+*Battle Minigames do not count towards the Mini-Game Star.
+
+$Minigame - Battle Games - Always 50 Coins [Tabitha]
+041CBFFC 00000032
+041CC000 00000032
+041CC004 00000032
+041C0008 00000032
+041C000C 00000032
+
+$Minigame - Duels - Same Space Duels Always Happen [Tabitha]
+04094740 60000000
+*Duels always happen if you are on the same space
+
+$Minigame - Duels - Same Space Duels Don't Happen [Tabitha]
+04094740 48000030
+*Duels never happen if you are on the same space.
+
 $Minigame - Beam Team - 20 Second Timer [Airsola]
 20288860 00000025
 28467572 00000708