diff --git a/Data/Sys/GameSettings/GMSE01.ini b/Data/Sys/GameSettings/GMSE01.ini
index 1b126de8bc..17e184b610 100644
--- a/Data/Sys/GameSettings/GMSE01.ini
+++ b/Data/Sys/GameSettings/GMSE01.ini
@@ -8,19 +8,15 @@
 
 [ActionReplay]
 # Add action replay cheats here.
-$Open all levels and nozzles (not working?)
+$Open all levels and nozzles
 04570958 FFFFFFFF
 0457095C FFFFFFFF
-$8 red coins(press L & B) (not working?)
-0A3FBBF4 00000240
-025709DE 00000008
+$8 Red Coins on Gain
+041BE42C 38A00008
 $Infinite hover time
 042640BC 60000000
-$Infinite water
-04263F58 38002710
-042635B0 60000000
-$Infinite health (not working?)
-424057F4 00040009
+$Infinite health
+04243838 3BE00000
 $Infinite Jetpack
 0426C330 60000000
 $Infinite Hose
@@ -38,25 +34,6 @@ $Test Level
 043E9710 00000C01
 $Low Gravity
 4240E12C 05003E00
-$Jesus Mode A.K.A. Walk on Water D-Pad Up/Down = On/Off (not supported yet)
-04002F00 3C608041
-04002F04 8063E12C
-04002F08 80C3FFCC
-04002F0C 2C060000
-04002F10 4D820020
-04002F14 C2660008
-04002F18 EE852824
-04002F1C EE93A02A
-04002F20 FC019840
-04002F24 4C800020
-04002F28 FC20A090
-04002F2C 38C00008
-04002F30 90C30248
-04002F34 4E800020
-0A404454 00000008
-04189854 4BE796AC
-0A404454 00000004
-04189854 4E800020
 $Do Not Have To Move Before Triple Jump
 4240E10C 06B00000
 $Spin Jump Gravity - Really Slow Fall
@@ -93,20 +70,6 @@ $Warped camera view
 044176A8 3E000000
 $Poorly Shaded Mario
 044176FC 00000000
-# Press the buttons below to switch to another nozzle. You must have your nozzle set to squirt for it to work
-# B+D-Pad Up: Rocket Nozzle
-# B+D-Pad Left: Turbo Nozzle
-# B+D-Pad Right: Hover Nozzle
-# B+D-PadDown: Jump Nozzle
-$Nozzle Modifier
-0A404454 00000208
-04269F50 3BE00001
-0A404454 00000204
-04269F50 3BE00002
-0A404454 00000201
-04269F50 3BE00005
-0A404454 00000202
-04269F50 3BE00004
 $Always Green Yoshi
 405F3A90 04AE4C00
 $Hold B To Run Super Fast
@@ -132,8 +95,86 @@ $D-Pad Left For Normal Mario
 4240E12C 4DE63F80
 4240E12C 4DE83F80
 00000000 40000000
-$Widescreen Heat Wave Fix [YoshiOG1]
-043AA050 3F2AAAAB
-043AA05C BF2AAAAB
-043AA060 3F2AAAAB
-043AA070 3FAAAAAB
+[Gecko]
+$Improved Jesus Mode  A.K.A Walk on Water DPad Up/Down = On/Off
+28404454 FFF70008
+C224F134 0000000A
+A8030000 2C000101
+4082000C 60008000
+B0030000 2C000102
+4082000C 60008000
+B0030000 2C000103
+4082000C 60008000
+B0030000 2C000100
+4082000C 60008000
+B0030000 7C030378
+60000000 00000000
+E2000001 80008000
+28404454 FFFB0004
+0424F134 A0630000
+E2000001 80008000
+$Infinite Water
+C2141DD8 00000002
+3B002710 93131C80
+60000000 00000000
+$Widescreen
+04416758 44480000
+044123E8 442F0000
+04416620 442F0000
+04176AA4 C002B83C
+0429B974 C002B83C
+04176C40 C002B83C
+04176FF4 C002B83C
+04177198 C002B83C
+04412408 3FE38E39
+04416B74 3F9A7643
+0429610C 380002EA
+042960A0 3860FF96
+C214EF74 00000002
+3B20FFA9 93380004
+931F0140 00000000
+C214EE24 00000002
+3B20FFA9 93380004
+931F0108 00000000
+C214F09C 00000002
+3860FFA9 90780004
+931F0160 00000000
+C214F308 00000002
+3BA00251 93B80004
+931F02F8 00000000
+C214F70C 00000002
+3860FFA9 90780004
+931F0400 00000000
+C214F830 00000002
+3860FFA9 90780004
+931F042C 00000000
+C214F93C 00000002
+3860FFA9 90780004
+931F0450 00000000
+C214D8EC 00000002
+38800251 9081056C
+807F02A0 00000000
+0414E7D4 3880023C
+C22CB330 00000004
+2C00019F 40820008
+38000203 2C00018D
+40820008 380001F1
+901F0014 00000000
+C2156004 00000004
+809F0018 38A0EC78
+90A40014 7CA500D0
+90A4001C 38800000
+60000000 00000000
+C214F114 00000002
+3BA00258 93B80004
+931F01C4 00000000
+C2363138 00000009
+80ED8D08 800701E8
+540C24B6 2C030000
+41820030 7C032A14
+7C006000 41820024
+5580F87E 7C601850
+1C630003 1CA50003
+7C631670 54A5F0BE
+7C630194 7C630214
+60000000 00000000
diff --git a/Data/Sys/GameSettings/GMSP01.ini b/Data/Sys/GameSettings/GMSP01.ini
index 1758b1e47b..bc569efebb 100644
--- a/Data/Sys/GameSettings/GMSP01.ini
+++ b/Data/Sys/GameSettings/GMSP01.ini
@@ -9,55 +9,99 @@
 [ActionReplay]
 # Add action replay cheats here.
 $99 Lives
-00E60ADE 18000000
 00570967 00000063
 $Infinite Health
-00E60ADF 18000000
 424057F4 00040009
-$Infinite water
-00E6151F 18000000
-04263F58 38002710
-042635B0 60000000
 $Infinite hover time
-00E61520 18000000
 042640BC 60000000
-$8 Red coins (Press L+B)
-00E61642 18000000
-0A3FBBF4 00000240
-025709DE 00000008
+$8 Red Coins on Gain
+041B62E4 38A00008
 $Open Levels/Nozzles
-00E60AE0 18000000
 04570958 FFFFFFFF
 0457095C FFFFFFFF
 $All Shines
-00E60AE1 18000000
 045708E8 FFFFFFFF
 045708EC FFFFFFFF
 045708F0 FFFFFFFF
 $Low Gravity
-00E60AE2 18000000
 424057F4 05003E00
 $Low Spin Gravity
-00E60AE3 18000000
 424057F4 050A3200
 $Super Spin
-00E60AE4 18000000
 424057F4 09423200
 $Super Speed
-00E60AE5 18000000
 424057F4 06E44200
 $Breath Underwater
-00E60AE6 18000000
 424057F4 08967FFF
 $Have Sunshine Shirt
-00E60AE7 18000000
 424057F4 00000010
 $Any Fruit Opens Yoshi Eggs
-00E66B5B 18000000
 041B47B8 60000000
 $Yoshi Loves Water
-00E66B5C 18000000
 0426837C 4E800020
-$Widescreen Heat Wave Fix
-F0N5-B36H-HZDVX
-6GRT-TJHW-8MR45
+[Gecko]
+$Widescreen
+0440DCB0 44480000
+04409930 442F0000
+0440DB78 442F0000
+0416CA6C C002B6A4
+04293850 C002B6A4
+0416CC08 C002B6A4
+0416CFBC C002B6A4
+0416D160 C002B6A4
+04409950 3FE38E39
+0440E0D4 3F9A7643
+0428DFA4 380002EA
+0428DF38 3860FF96
+C2143C04 00000002
+3B20FFA9 93380004
+931F0140 00000000
+C2143AB4 00000002
+3B20FFA9 93380004
+931F0108 00000000
+C2143D2C 00000002
+3860FFA9 90780004
+931F0160 00000000
+C2143F98 00000002
+3BA00251 93B80004
+931F02F8 00000000
+C214439C 00000002
+3860FFA9 90780004
+931F0400 00000000
+C21444C0 00000002
+3860FFA9 90780004
+931F042C 00000000
+C21445CC 00000002
+3860FFA9 90780004
+931F0450 00000000
+C214257C 00000002
+38800251 9081056C
+807F02A0 00000000
+04143464 3880023C
+C22C33C4 00000004
+2C00019F 40820008
+38000203 2C00018D
+40820008 380001F1
+901F0014 00000000
+C214B020 00000004
+809F0018 38A0EC78
+90A40014 7CA500D0
+90A4001C 38800000
+60000000 00000000
+C2143DA4 00000002
+3BA00258 93B80004
+931F01C4 00000000
+C235B358 00000009
+80ED8CC8 800701E8
+540C24B6 2C030000
+41820030 7C032A14
+7C006000 41820024
+5580F87E 7C601850
+1C630003 1CA50003
+7C631670 54A5F0BE
+7C630194 7C630214
+60000000 00000000
+$Full Water Tank
+C21369EC 00000002
+3B002710 93131C80
+60000000 00000000