diff --git a/Data/Sys/GameSettings/G2ME01.ini b/Data/Sys/GameSettings/G2ME01.ini
index eec49ceb49..77398c1169 100644
--- a/Data/Sys/GameSettings/G2ME01.ini
+++ b/Data/Sys/GameSettings/G2ME01.ini
@@ -1,7 +1,7 @@
 # G2ME01 - Metroid Prime 2 Echoes
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
@@ -161,7 +161,3 @@ SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True
 EFBToTextureEnable = False
-
-[Speedhacks]
-0x803758bc=400
-
diff --git a/Data/Sys/GameSettings/G2MJ01.ini b/Data/Sys/GameSettings/G2MJ01.ini
new file mode 100644
index 0000000000..6f65410f46
--- /dev/null
+++ b/Data/Sys/GameSettings/G2MJ01.ini
@@ -0,0 +1,33 @@
+# G2MJ01 - Metroid Prime 2: Dark Echoes
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/G2MP01.ini b/Data/Sys/GameSettings/G2MP01.ini
index 8ad2c86871..b46a4bd4ea 100644
--- a/Data/Sys/GameSettings/G2MP01.ini
+++ b/Data/Sys/GameSettings/G2MP01.ini
@@ -1,7 +1,7 @@
 # G2MP01 - Metroid Prime 2 Echoes
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
@@ -160,7 +160,3 @@ SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True
 EFBToTextureEnable = False
-
-[Speedhacks]
-0x80375c68=400
-
diff --git a/Data/Sys/GameSettings/GFEE01.ini b/Data/Sys/GameSettings/GFEE01.ini
index 3a42b7af5d..7291ba1d30 100644
--- a/Data/Sys/GameSettings/GFEE01.ini
+++ b/Data/Sys/GameSettings/GFEE01.ini
@@ -1,7 +1,7 @@
 # GFEE01 - FIRE EMBLEM GC US
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
@@ -41,6 +41,3 @@ $Max Movement(IKE)
 [Video]
 ProjectionHack = 0
 
-[Speedhacks]
-0x8020a51c=500
-
diff --git a/Data/Sys/GameSettings/GFEJ01.ini b/Data/Sys/GameSettings/GFEJ01.ini
index d8dec58b5e..ce27a7c4f7 100644
--- a/Data/Sys/GameSettings/GFEJ01.ini
+++ b/Data/Sys/GameSettings/GFEJ01.ini
@@ -1,7 +1,7 @@
 # GFEJ01 - FIRE EMBLEM GC JAP
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
@@ -17,6 +17,4 @@ EmulationIssues =
 [ActionReplay]
 # Add action replay cheats here.
 
-[Speedhacks]
-0x80204ce8=500
 
diff --git a/Data/Sys/GameSettings/GFEP01.ini b/Data/Sys/GameSettings/GFEP01.ini
index 77a8de00d0..7ae09bd746 100644
--- a/Data/Sys/GameSettings/GFEP01.ini
+++ b/Data/Sys/GameSettings/GFEP01.ini
@@ -1,8 +1,7 @@
 # GFEE01 - FIRE EMBLEM GC EU
 
 [Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 0
+# Values set here will override the main Dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
@@ -20,7 +19,3 @@ EmulationIssues =
 
 [Video]
 ProjectionHack = 0
-
-[Speedhacks]
-0x80213278=500
-
diff --git a/Data/Sys/GameSettings/GM8E01.ini b/Data/Sys/GameSettings/GM8E01.ini
index 8b26df7c14..4e3ba9f3de 100644
--- a/Data/Sys/GameSettings/GM8E01.ini
+++ b/Data/Sys/GameSettings/GM8E01.ini
@@ -1,13 +1,12 @@
 # GM8E01 - Metroid Prime
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Heat Visor doesn't work correctly, some graphics bugs, boss music doesn't play
-EmulationIssues =
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -109,6 +108,3 @@ SafeTextureCacheColorSamples = 512
 EFBCopyEnable = True
 EFBToTextureEnable = False
 
-[Speedhacks]
-0x80384b1c=400
-
diff --git a/Data/Sys/GameSettings/GM8J01.ini b/Data/Sys/GameSettings/GM8J01.ini
index 6999338dc5..ed5c29ff31 100644
--- a/Data/Sys/GameSettings/GM8J01.ini
+++ b/Data/Sys/GameSettings/GM8J01.ini
@@ -1,12 +1,12 @@
 # GM8E01 - Metroid Prime
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues="Heat Visor doesn't work correctly, some graphics bugs, boss music doesn't play"
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -31,7 +31,3 @@ SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True
 EFBToTextureEnable = False
-
-[Speedhacks]
-0x803708f8=400
-
diff --git a/Data/Sys/GameSettings/GM8P01.ini b/Data/Sys/GameSettings/GM8P01.ini
index faa5855be3..c600fee212 100644
--- a/Data/Sys/GameSettings/GM8P01.ini
+++ b/Data/Sys/GameSettings/GM8P01.ini
@@ -1,11 +1,12 @@
 # GM8P01 - Metroid Prime
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -30,7 +31,3 @@ SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True
 EFBToTextureEnable = False
-
-[Speedhacks]
-0x8036eba0=400
-
diff --git a/Data/Sys/GameSettings/GOBE4Z.ini b/Data/Sys/GameSettings/GOBE4Z.ini
index 19c844ea7a..08f323109f 100644
--- a/Data/Sys/GameSettings/GOBE4Z.ini
+++ b/Data/Sys/GameSettings/GOBE4Z.ini
@@ -1,7 +1,7 @@
 # GOBE4Z - Bad Boys Miami Takedown
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 DSPHLE = False
 
 [EmuState]
diff --git a/Data/Sys/GameSettings/GOBP7N.ini b/Data/Sys/GameSettings/GOBP7N.ini
index 56ab8d8392..38b5d441b5 100644
--- a/Data/Sys/GameSettings/GOBP7N.ini
+++ b/Data/Sys/GameSettings/GOBP7N.ini
@@ -1,7 +1,7 @@
 # GOBP7N - Bad Boys II
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 DSPHLE = False
 
 [EmuState]
diff --git a/Data/Sys/GameSettings/GOWD69.ini b/Data/Sys/GameSettings/GOWD69.ini
index 580474420e..160e4db186 100644
--- a/Data/Sys/GameSettings/GOWD69.ini
+++ b/Data/Sys/GameSettings/GOWD69.ini
@@ -1,7 +1,7 @@
 # GOWD69 - NFS Most Wanted
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 MMU = 1
 
 [EmuState]
diff --git a/Data/Sys/GameSettings/GOWE69.ini b/Data/Sys/GameSettings/GOWE69.ini
index ad04160176..e667efaa7c 100644
--- a/Data/Sys/GameSettings/GOWE69.ini
+++ b/Data/Sys/GameSettings/GOWE69.ini
@@ -1,7 +1,7 @@
 # GOWE69 - NFS Most Wanted
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 MMU = 1
 
 [EmuState]
diff --git a/Data/Sys/GameSettings/GOWF69.ini b/Data/Sys/GameSettings/GOWF69.ini
index e4b811fabe..d858f9d879 100644
--- a/Data/Sys/GameSettings/GOWF69.ini
+++ b/Data/Sys/GameSettings/GOWF69.ini
@@ -1,7 +1,7 @@
 # GOWF69 - NFS Most Wanted
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 MMU = 1
 
 [EmuState]
diff --git a/Data/Sys/GameSettings/GOWJ69.ini b/Data/Sys/GameSettings/GOWJ69.ini
index 95de590895..0c28cdc3ad 100644
--- a/Data/Sys/GameSettings/GOWJ69.ini
+++ b/Data/Sys/GameSettings/GOWJ69.ini
@@ -1,7 +1,7 @@
 # GOWJ69 - NFS Most Wanted
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 MMU = 1
 
 [EmuState]
diff --git a/Data/Sys/GameSettings/GOWP69.ini b/Data/Sys/GameSettings/GOWP69.ini
index 7cc0a4cd32..e556de51a8 100644
--- a/Data/Sys/GameSettings/GOWP69.ini
+++ b/Data/Sys/GameSettings/GOWP69.ini
@@ -1,7 +1,7 @@
 # GOWP69 - NFS Most Wanted
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 MMU = 1
 
 [EmuState]
diff --git a/Data/Sys/GameSettings/RFEP01.ini b/Data/Sys/GameSettings/RFEP01.ini
index c4e34f4c93..f8f3f6f6a2 100644
--- a/Data/Sys/GameSettings/RFEP01.ini
+++ b/Data/Sys/GameSettings/RFEP01.ini
@@ -24,7 +24,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear =
 PH_ZFar =
-
-[Speedhacks]
-0x80006e00=800
-