diff --git a/Data/Sys/GameSettings/301E01.ini b/Data/Sys/GameSettings/301E01.ini
new file mode 100644
index 00000000000..80a022bf81b
--- /dev/null
+++ b/Data/Sys/GameSettings/301E01.ini
@@ -0,0 +1,20 @@
+# 301E01 - GameCube Service Disc
+
+[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 = Certain tests may soft-lock
+
+[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]
diff --git a/Data/Sys/GameSettings/D85E01.ini b/Data/Sys/GameSettings/D85E01.ini
new file mode 100644
index 00000000000..656ae41ad96
--- /dev/null
+++ b/Data/Sys/GameSettings/D85E01.ini
@@ -0,0 +1,23 @@
+# D85E01 - Multi Game Demo Disk 12
+
+[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 = 4
+EmulationIssues = Videos run at low FPS
+
+[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
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/DLSE64.ini b/Data/Sys/GameSettings/DLSE64.ini
index bfdaeca2157..8a8b118f12c 100644
--- a/Data/Sys/GameSettings/DLSE64.ini
+++ b/Data/Sys/GameSettings/DLSE64.ini
@@ -6,8 +6,8 @@ MMU = 1
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
 EmulationStateId = 3
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/DLSP64.ini b/Data/Sys/GameSettings/DLSP64.ini
index 0e89e0f28f7..2ab4bcdbf4a 100644
--- a/Data/Sys/GameSettings/DLSP64.ini
+++ b/Data/Sys/GameSettings/DLSP64.ini
@@ -6,8 +6,8 @@ MMU = 1
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
 EmulationStateId = 3
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/DTLX01.ini b/Data/Sys/GameSettings/DTLX01.ini
index 7fd49f3833e..69a32f5febf 100644
--- a/Data/Sys/GameSettings/DTLX01.ini
+++ b/Data/Sys/GameSettings/DTLX01.ini
@@ -6,6 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/DVDXDV.ini b/Data/Sys/GameSettings/DVDXDV.ini
index 3495ea45094..d30f9d5d1ea 100644
--- a/Data/Sys/GameSettings/DVDXDV.ini
+++ b/Data/Sys/GameSettings/DVDXDV.ini
@@ -5,6 +5,7 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
 EmulationIssues =
 
 [OnLoad]
diff --git a/Data/Sys/GameSettings/FA6E01.ini b/Data/Sys/GameSettings/FA6E01.ini
index a15c01589fc..79d10feed78 100644
--- a/Data/Sys/GameSettings/FA6E01.ini
+++ b/Data/Sys/GameSettings/FA6E01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FA6P01.ini b/Data/Sys/GameSettings/FA6P01.ini
index ef70e2a9745..e683d8923ec 100644
--- a/Data/Sys/GameSettings/FA6P01.ini
+++ b/Data/Sys/GameSettings/FA6P01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FA7E01.ini b/Data/Sys/GameSettings/FA7E01.ini
index 90b2c65326d..ac66ec7466f 100644
--- a/Data/Sys/GameSettings/FA7E01.ini
+++ b/Data/Sys/GameSettings/FA7E01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FA7P01.ini b/Data/Sys/GameSettings/FA7P01.ini
index fb68cf087e6..0345733c23b 100644
--- a/Data/Sys/GameSettings/FA7P01.ini
+++ b/Data/Sys/GameSettings/FA7P01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FA8E01.ini b/Data/Sys/GameSettings/FA8E01.ini
index dc34ed4b51e..f4b3e596ca9 100644
--- a/Data/Sys/GameSettings/FA8E01.ini
+++ b/Data/Sys/GameSettings/FA8E01.ini
@@ -1,12 +1,12 @@
-# FA8E01 - Kirby's Adventure
+# FA8E01 - Kirby's Adventure [NES]
 
 [Core]
 # Values set here will override the main dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FA8F01.ini b/Data/Sys/GameSettings/FA8F01.ini
index 8aaf9fc6ccb..66b27281232 100644
--- a/Data/Sys/GameSettings/FA8F01.ini
+++ b/Data/Sys/GameSettings/FA8F01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FA8P01.ini b/Data/Sys/GameSettings/FA8P01.ini
index 898d3a0d6c9..caef04d7c48 100644
--- a/Data/Sys/GameSettings/FA8P01.ini
+++ b/Data/Sys/GameSettings/FA8P01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FA9E01.ini b/Data/Sys/GameSettings/FA9E01.ini
index 0da22ac4bef..6e7864d4f7a 100644
--- a/Data/Sys/GameSettings/FA9E01.ini
+++ b/Data/Sys/GameSettings/FA9E01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FAAE01.ini b/Data/Sys/GameSettings/FAAE01.ini
index 1d0fbc89c0f..9d03bee13d0 100644
--- a/Data/Sys/GameSettings/FAAE01.ini
+++ b/Data/Sys/GameSettings/FAAE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FAAP01.ini b/Data/Sys/GameSettings/FAAP01.ini
index 17f9b2f5e13..272bb635d90 100644
--- a/Data/Sys/GameSettings/FAAP01.ini
+++ b/Data/Sys/GameSettings/FAAP01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FAGE01.ini b/Data/Sys/GameSettings/FAGE01.ini
index a8529a6f59d..e0ea0807860 100644
--- a/Data/Sys/GameSettings/FAGE01.ini
+++ b/Data/Sys/GameSettings/FAGE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FAGP01.ini b/Data/Sys/GameSettings/FAGP01.ini
index 8d5ce50ee55..0d56442f5d5 100644
--- a/Data/Sys/GameSettings/FAGP01.ini
+++ b/Data/Sys/GameSettings/FAGP01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FAHE01.ini b/Data/Sys/GameSettings/FAHE01.ini
index aa5018208db..71388015d69 100644
--- a/Data/Sys/GameSettings/FAHE01.ini
+++ b/Data/Sys/GameSettings/FAHE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FANE01.ini b/Data/Sys/GameSettings/FANE01.ini
index 10a5fc4e56b..930378a11c4 100644
--- a/Data/Sys/GameSettings/FANE01.ini
+++ b/Data/Sys/GameSettings/FANE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FAQN01.ini b/Data/Sys/GameSettings/FAQN01.ini
index 1a3c11532e2..29a991028db 100644
--- a/Data/Sys/GameSettings/FAQN01.ini
+++ b/Data/Sys/GameSettings/FAQN01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FBCE01.ini b/Data/Sys/GameSettings/FBCE01.ini
index b545c4b6be1..db0cbf847b2 100644
--- a/Data/Sys/GameSettings/FBCE01.ini
+++ b/Data/Sys/GameSettings/FBCE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FBDE01.ini b/Data/Sys/GameSettings/FBDE01.ini
index 4ceee837465..194d6960ed8 100644
--- a/Data/Sys/GameSettings/FBDE01.ini
+++ b/Data/Sys/GameSettings/FBDE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FBDP01.ini b/Data/Sys/GameSettings/FBDP01.ini
index 690a37d0fa1..d423b54e235 100644
--- a/Data/Sys/GameSettings/FBDP01.ini
+++ b/Data/Sys/GameSettings/FBDP01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FBEE01.ini b/Data/Sys/GameSettings/FBEE01.ini
index 6a5edb51974..29746c3a32a 100644
--- a/Data/Sys/GameSettings/FBEE01.ini
+++ b/Data/Sys/GameSettings/FBEE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FBEP01.ini b/Data/Sys/GameSettings/FBEP01.ini
index 5da1cc2bc3d..4fa8c180f64 100644
--- a/Data/Sys/GameSettings/FBEP01.ini
+++ b/Data/Sys/GameSettings/FBEP01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FBIE01.ini b/Data/Sys/GameSettings/FBIE01.ini
index 26dd5a9ae15..465c7f9e667 100644
--- a/Data/Sys/GameSettings/FBIE01.ini
+++ b/Data/Sys/GameSettings/FBIE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FBIP01.ini b/Data/Sys/GameSettings/FBIP01.ini
index 14126f418b1..47967b66aac 100644
--- a/Data/Sys/GameSettings/FBIP01.ini
+++ b/Data/Sys/GameSettings/FBIP01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FBJE01.ini b/Data/Sys/GameSettings/FBJE01.ini
index d4ff42c84cc..4df8d4f51fe 100644
--- a/Data/Sys/GameSettings/FBJE01.ini
+++ b/Data/Sys/GameSettings/FBJE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FBJP01.ini b/Data/Sys/GameSettings/FBJP01.ini
index 4665761dc0f..34d60feb08f 100644
--- a/Data/Sys/GameSettings/FBJP01.ini
+++ b/Data/Sys/GameSettings/FBJP01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FBNE01.ini b/Data/Sys/GameSettings/FBNE01.ini
index 2a1c766135f..a5b7bccb9a9 100644
--- a/Data/Sys/GameSettings/FBNE01.ini
+++ b/Data/Sys/GameSettings/FBNE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FBUE01.ini b/Data/Sys/GameSettings/FBUE01.ini
index 28495b98b34..c20629ee290 100644
--- a/Data/Sys/GameSettings/FBUE01.ini
+++ b/Data/Sys/GameSettings/FBUE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FBUP01.ini b/Data/Sys/GameSettings/FBUP01.ini
index 2cf13dc70e3..4eb9897ebfe 100644
--- a/Data/Sys/GameSettings/FBUP01.ini
+++ b/Data/Sys/GameSettings/FBUP01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FBYP01.ini b/Data/Sys/GameSettings/FBYP01.ini
index 1b80fc7bf15..5435c241a57 100644
--- a/Data/Sys/GameSettings/FBYP01.ini
+++ b/Data/Sys/GameSettings/FBYP01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FBZE01.ini b/Data/Sys/GameSettings/FBZE01.ini
index 047aed972f7..ba6b00e298a 100644
--- a/Data/Sys/GameSettings/FBZE01.ini
+++ b/Data/Sys/GameSettings/FBZE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FCAE01.ini b/Data/Sys/GameSettings/FCAE01.ini
index 7da77641153..d9c8227965f 100644
--- a/Data/Sys/GameSettings/FCAE01.ini
+++ b/Data/Sys/GameSettings/FCAE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FCQE01.ini b/Data/Sys/GameSettings/FCQE01.ini
index ef72cf82643..afacca54082 100644
--- a/Data/Sys/GameSettings/FCQE01.ini
+++ b/Data/Sys/GameSettings/FCQE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FCWE01.ini b/Data/Sys/GameSettings/FCWE01.ini
index 2785c600594..eec135642e2 100644
--- a/Data/Sys/GameSettings/FCWE01.ini
+++ b/Data/Sys/GameSettings/FCWE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FCWP01.ini b/Data/Sys/GameSettings/FCWP01.ini
index 0d85cc06109..ab0a919f3fe 100644
--- a/Data/Sys/GameSettings/FCWP01.ini
+++ b/Data/Sys/GameSettings/FCWP01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FCYE01.ini b/Data/Sys/GameSettings/FCYE01.ini
index cc03b7a15d1..cb59cfb4e0f 100644
--- a/Data/Sys/GameSettings/FCYE01.ini
+++ b/Data/Sys/GameSettings/FCYE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FCYP01.ini b/Data/Sys/GameSettings/FCYP01.ini
index 1c0a435c547..84a0354cb28 100644
--- a/Data/Sys/GameSettings/FCYP01.ini
+++ b/Data/Sys/GameSettings/FCYP01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FCZE01.ini b/Data/Sys/GameSettings/FCZE01.ini
index c9aa9d7c3a5..423e6f1f9d8 100644
--- a/Data/Sys/GameSettings/FCZE01.ini
+++ b/Data/Sys/GameSettings/FCZE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FD2E01.ini b/Data/Sys/GameSettings/FD2E01.ini
index 14b25449955..523f5f4c1d5 100644
--- a/Data/Sys/GameSettings/FD2E01.ini
+++ b/Data/Sys/GameSettings/FD2E01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FD2P01.ini b/Data/Sys/GameSettings/FD2P01.ini
index 26e9f2b07c7..d4bfa871344 100644
--- a/Data/Sys/GameSettings/FD2P01.ini
+++ b/Data/Sys/GameSettings/FD2P01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FD6E01.ini b/Data/Sys/GameSettings/FD6E01.ini
index d9149a7a4e0..fcbb621b45d 100644
--- a/Data/Sys/GameSettings/FD6E01.ini
+++ b/Data/Sys/GameSettings/FD6E01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FDGE01.ini b/Data/Sys/GameSettings/FDGE01.ini
index 8745588c866..df6f7d50590 100644
--- a/Data/Sys/GameSettings/FDGE01.ini
+++ b/Data/Sys/GameSettings/FDGE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FDNE01.ini b/Data/Sys/GameSettings/FDNE01.ini
index afd073de97d..817b374097e 100644
--- a/Data/Sys/GameSettings/FDNE01.ini
+++ b/Data/Sys/GameSettings/FDNE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FDOE01.ini b/Data/Sys/GameSettings/FDOE01.ini
index 6c0e805124c..a7781af7726 100644
--- a/Data/Sys/GameSettings/FDOE01.ini
+++ b/Data/Sys/GameSettings/FDOE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FDQE01.ini b/Data/Sys/GameSettings/FDQE01.ini
index c7961b145ca..0aaf0e7a009 100644
--- a/Data/Sys/GameSettings/FDQE01.ini
+++ b/Data/Sys/GameSettings/FDQE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FEMN01.ini b/Data/Sys/GameSettings/FEMN01.ini
index 112f91840d8..fa2a9ddbc26 100644
--- a/Data/Sys/GameSettings/FEMN01.ini
+++ b/Data/Sys/GameSettings/FEMN01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FFLE01.ini b/Data/Sys/GameSettings/FFLE01.ini
index c9de46a9deb..50b99bfd684 100644
--- a/Data/Sys/GameSettings/FFLE01.ini
+++ b/Data/Sys/GameSettings/FFLE01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/G2CE52.ini b/Data/Sys/GameSettings/G2CE52.ini
index bb2545f7452..25126b19ba9 100644
--- a/Data/Sys/GameSettings/G2CE52.ini
+++ b/Data/Sys/GameSettings/G2CE52.ini
@@ -1,11 +1,12 @@
 # G2CE52 - TC2 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.
 EmulationStateId = 3
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/G2MEAB.ini b/Data/Sys/GameSettings/G2MEAB.ini
new file mode 100644
index 00000000000..69d09bf6e3b
--- /dev/null
+++ b/Data/Sys/GameSettings/G2MEAB.ini
@@ -0,0 +1,19 @@
+# G2MEAB - Metroid Prime 3 E3 Beta
+
+[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 = 1
+EmulationIssues = REALRAM_SIZE must be set to 0x8000000
+
+[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.
+
diff --git a/Data/Sys/GameSettings/G2TP52.ini b/Data/Sys/GameSettings/G2TP52.ini
new file mode 100644
index 00000000000..6cbe0cab6f0
--- /dev/null
+++ b/Data/Sys/GameSettings/G2TP52.ini
@@ -0,0 +1,27 @@
+# G2TP52 - Tony Hawk's Underground 2
+
+[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 =
+
+[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 =
+
diff --git a/Data/Sys/GameSettings/G3DP6L.ini b/Data/Sys/GameSettings/G3DP6L.ini
index 74aa1a99426..bf551fe24e6 100644
--- a/Data/Sys/GameSettings/G3DP6L.ini
+++ b/Data/Sys/GameSettings/G3DP6L.ini
@@ -6,6 +6,7 @@
 [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.
diff --git a/Data/Sys/GameSettings/GAME5H.ini b/Data/Sys/GameSettings/GAME5H.ini
index 6682988aa1d..ca44a9dd470 100644
--- a/Data/Sys/GameSettings/GAME5H.ini
+++ b/Data/Sys/GameSettings/GAME5H.ini
@@ -6,6 +6,7 @@
 [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.
diff --git a/Data/Sys/GameSettings/GBLP52.ini b/Data/Sys/GameSettings/GBLP52.ini
index 1d2149350a4..344f5b06695 100644
--- a/Data/Sys/GameSettings/GBLP52.ini
+++ b/Data/Sys/GameSettings/GBLP52.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for videos to display.
 EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to display.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GBMP7F.ini b/Data/Sys/GameSettings/GBMP7F.ini
index e2eb90fe8d5..3be70cf0479 100644
--- a/Data/Sys/GameSettings/GBMP7F.ini
+++ b/Data/Sys/GameSettings/GBMP7F.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up.
+EmulationIssues = Needs real xfb for videos to display.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GBVE41.ini b/Data/Sys/GameSettings/GBVE41.ini
index 27305dff3eb..24f36f885c7 100644
--- a/Data/Sys/GameSettings/GBVE41.ini
+++ b/Data/Sys/GameSettings/GBVE41.ini
@@ -7,7 +7,7 @@ DSPHLE = False
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs Real xfb for videos to show up. Slow audio with HLE.
+EmulationIssues = Needs Real xfb for videos to display. Slow audio with HLE.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GBVP41.ini b/Data/Sys/GameSettings/GBVP41.ini
index a0f1bc68f49..a52e3a93f50 100644
--- a/Data/Sys/GameSettings/GBVP41.ini
+++ b/Data/Sys/GameSettings/GBVP41.ini
@@ -7,7 +7,7 @@ DSPHLE = False
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs Real xfb for videos to show up. Slow audio with HLE.
+EmulationIssues = Needs Real xfb for videos to display. Slow audio with HLE.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GDVP6L.ini b/Data/Sys/GameSettings/GDVP6L.ini
index ca75f8c5a37..2d07917be8e 100644
--- a/Data/Sys/GameSettings/GDVP6L.ini
+++ b/Data/Sys/GameSettings/GDVP6L.ini
@@ -1,3 +1,4 @@
+
 # GDVP6L - Driven
 
 [Core]
diff --git a/Data/Sys/GameSettings/GDXEA4.ini b/Data/Sys/GameSettings/GDXEA4.ini
index 333f159d572..f14521a1045 100644
--- a/Data/Sys/GameSettings/GDXEA4.ini
+++ b/Data/Sys/GameSettings/GDXEA4.ini
@@ -1,6 +1,10 @@
 # GDXEA4 - Disney Sports Skateboarding
 
 [Core]
-# This game does not work properly with large memorycards, use a 251 block card
-# see http://www.nintendo.com/consumer/memorycard1019.jsp
+# Values set here will override the main Dolphin settings.
 MemoryCard251 = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId =
+EmulationIssues = This game does not work properly with large memorycards, use a 251 block card. See http://www.nintendo.com/consumer/memorycard1019.jsp
diff --git a/Data/Sys/GameSettings/GDXJA4.ini b/Data/Sys/GameSettings/GDXJA4.ini
index d2bb4ab662d..813fc9f09cd 100644
--- a/Data/Sys/GameSettings/GDXJA4.ini
+++ b/Data/Sys/GameSettings/GDXJA4.ini
@@ -1,6 +1,10 @@
 # GDXJA4 - Disney Sports Skateboarding
 
 [Core]
-# This game does not work properly with large memorycards, use a 251 block card
-# see http://www.nintendo.com/consumer/memorycard1019.jsp
+# Values set here will override the main Dolphin settings.
 MemoryCard251 = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId =
+EmulationIssues = This game does not work properly with large memorycards, use a 251 block card. See http://www.nintendo.com/consumer/memorycard1019.jsp
diff --git a/Data/Sys/GameSettings/GDXPA4.ini b/Data/Sys/GameSettings/GDXPA4.ini
index 59d32e08a80..95429b8e4a1 100644
--- a/Data/Sys/GameSettings/GDXPA4.ini
+++ b/Data/Sys/GameSettings/GDXPA4.ini
@@ -1,6 +1,10 @@
 # GDXPA4 - Disney Sports Skateboarding
 
 [Core]
-# This game does not work properly with large memorycards, use a 251 block card
-# see http://www.nintendo.com/consumer/memorycard1019.jsp
+# Values set here will override the main Dolphin settings.
 MemoryCard251 = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId =
+EmulationIssues = This game does not work properly with large memorycards, use a 251 block card. See http://www.nintendo.com/consumer/memorycard1019.jsp
diff --git a/Data/Sys/GameSettings/GEME7F.ini b/Data/Sys/GameSettings/GEME7F.ini
index c082463de67..1f54dcf0581 100644
--- a/Data/Sys/GameSettings/GEME7F.ini
+++ b/Data/Sys/GameSettings/GEME7F.ini
@@ -6,6 +6,7 @@
 [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.
diff --git a/Data/Sys/GameSettings/GFZJ8P.ini b/Data/Sys/GameSettings/GFZJ8P.ini
new file mode 100644
index 00000000000..59ce9d7f58d
--- /dev/null
+++ b/Data/Sys/GameSettings/GFZJ8P.ini
@@ -0,0 +1,24 @@
+# GFZJ8P - F-Zero AX
+
+[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 = 1
+EmulationIssues = Crashes on startup (Triforce game)
+
+[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]
+# Add memory patches to be applied every frame here.
+
+[Video_Settings]
+
diff --git a/Data/Sys/GameSettings/GGPE01.ini b/Data/Sys/GameSettings/GGPE01.ini
new file mode 100644
index 00000000000..83efda95ce0
--- /dev/null
+++ b/Data/Sys/GameSettings/GGPE01.ini
@@ -0,0 +1,24 @@
+# GGPE01 - Mario Kart GP
+
+[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 = 1
+EmulationIssues = Crashes on startup (Triforce game)
+
+[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]
+# Add memory patches to be applied every frame here.
+
+[Video_Settings]
+
diff --git a/Data/Sys/GameSettings/GGPE02.ini b/Data/Sys/GameSettings/GGPE02.ini
new file mode 100644
index 00000000000..efb6e74996b
--- /dev/null
+++ b/Data/Sys/GameSettings/GGPE02.ini
@@ -0,0 +1,24 @@
+# GGPE02 - Mario Kart GP 2
+
+[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 = 1
+EmulationIssues = Crashes on startup (Triforce game)
+
+[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]
+# Add memory patches to be applied every frame here.
+
+[Video_Settings]
+
diff --git a/Data/Sys/GameSettings/GICH78.ini b/Data/Sys/GameSettings/GICH78.ini
index c0f6cd238a4..acca76bd0e2 100644
--- a/Data/Sys/GameSettings/GICH78.ini
+++ b/Data/Sys/GameSettings/GICH78.ini
@@ -5,6 +5,7 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId =
 EmulationIssues =
 
 [OnLoad]
diff --git a/Data/Sys/GameSettings/GINX69.ini b/Data/Sys/GameSettings/GINX69.ini
index 29113828ca2..8eb2072c704 100644
--- a/Data/Sys/GameSettings/GINX69.ini
+++ b/Data/Sys/GameSettings/GINX69.ini
@@ -6,6 +6,7 @@
 [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.
diff --git a/Data/Sys/GameSettings/GIVE4Z.ini b/Data/Sys/GameSettings/GIVE4Z.ini
index 619c43b2ffd..033f5c1af9b 100644
--- a/Data/Sys/GameSettings/GIVE4Z.ini
+++ b/Data/Sys/GameSettings/GIVE4Z.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
 EmulationStateId = 3
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GJSJ18.ini b/Data/Sys/GameSettings/GJSJ18.ini
index bfc2673e72b..a16cb202e5d 100644
--- a/Data/Sys/GameSettings/GJSJ18.ini
+++ b/Data/Sys/GameSettings/GJSJ18.ini
@@ -6,6 +6,7 @@
 [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.
diff --git a/Data/Sys/GameSettings/GK2D52.ini b/Data/Sys/GameSettings/GK2D52.ini
index d8267fbc926..424af0e29bf 100644
--- a/Data/Sys/GameSettings/GK2D52.ini
+++ b/Data/Sys/GameSettings/GK2D52.ini
@@ -1,11 +1,15 @@
 # GK2D52 - Spider-Man 2
 [Core]
 MMU = 1
+
 [EmuState]
 EmulationStateId = 4
 EmulationIssues = Slow because it needs mmu to run.
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -13,6 +17,7 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GK2E52.ini b/Data/Sys/GameSettings/GK2E52.ini
index 23d53c182b9..a1bd42e2b59 100644
--- a/Data/Sys/GameSettings/GK2E52.ini
+++ b/Data/Sys/GameSettings/GK2E52.ini
@@ -1,11 +1,16 @@
 # GK2E52 - Spider-Man 2
+
 [Core]
 MMU = 1
+
 [EmuState]
 EmulationStateId = 4
 EmulationIssues = Slow because it needs mmu to run.
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -13,6 +18,7 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GK2F52.ini b/Data/Sys/GameSettings/GK2F52.ini
index 0b05c6d2013..e398a35c298 100644
--- a/Data/Sys/GameSettings/GK2F52.ini
+++ b/Data/Sys/GameSettings/GK2F52.ini
@@ -1,11 +1,15 @@
 # GK2F52 - Spider-Man 2
 [Core]
 MMU = 1
+
 [EmuState]
 EmulationStateId = 4
 EmulationIssues = Slow because it needs mmu to run.
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -13,6 +17,7 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GK2I52.ini b/Data/Sys/GameSettings/GK2I52.ini
index 0f733aac78d..34aadec6c0d 100644
--- a/Data/Sys/GameSettings/GK2I52.ini
+++ b/Data/Sys/GameSettings/GK2I52.ini
@@ -1,11 +1,16 @@
 # GK2I52 - Spider-Man 2
+
 [Core]
 MMU = 1
+
 [EmuState]
 EmulationStateId = 4
 EmulationIssues = Slow because it needs mmu to run.
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -13,6 +18,7 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GK2P52.ini b/Data/Sys/GameSettings/GK2P52.ini
index 32d0de3b031..e6799395e2c 100644
--- a/Data/Sys/GameSettings/GK2P52.ini
+++ b/Data/Sys/GameSettings/GK2P52.ini
@@ -1,11 +1,16 @@
 # GK2P52 - Spider-Man 2
+
 [Core]
 MMU = 1
+
 [EmuState]
 EmulationStateId = 4
 EmulationIssues = Slow because it needs mmu to run.
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -13,6 +18,7 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GKAE8P.ini b/Data/Sys/GameSettings/GKAE8P.ini
index 4c9fbe6405e..b4a9dafa404 100644
--- a/Data/Sys/GameSettings/GKAE8P.ini
+++ b/Data/Sys/GameSettings/GKAE8P.ini
@@ -6,6 +6,7 @@
 [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.
diff --git a/Data/Sys/GameSettings/GKNEB2.ini b/Data/Sys/GameSettings/GKNEB2.ini
index 0c6156d7077..1288967643d 100644
--- a/Data/Sys/GameSettings/GKNEB2.ini
+++ b/Data/Sys/GameSettings/GKNEB2.ini
@@ -5,6 +5,7 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId =
 EmulationIssues =
 
 [OnLoad]
diff --git a/Data/Sys/GameSettings/GKSP52.ini b/Data/Sys/GameSettings/GKSP52.ini
index 29c1323038f..39e9f710ebd 100644
--- a/Data/Sys/GameSettings/GKSP52.ini
+++ b/Data/Sys/GameSettings/GKSP52.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for the videos to work.
 EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to work.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GKSX52.ini b/Data/Sys/GameSettings/GKSX52.ini
index 44b7d4b6ac3..aa22fa9280c 100644
--- a/Data/Sys/GameSettings/GKSX52.ini
+++ b/Data/Sys/GameSettings/GKSX52.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for the videos to work.
 EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to work.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GKTJA4.ini b/Data/Sys/GameSettings/GKTJA4.ini
index c0c4923a062..b037d638eb8 100644
--- a/Data/Sys/GameSettings/GKTJA4.ini
+++ b/Data/Sys/GameSettings/GKTJA4.ini
@@ -6,6 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 2
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GKZP9G.ini b/Data/Sys/GameSettings/GKZP9G.ini
index 004c205099c..554c6d5a0ba 100644
--- a/Data/Sys/GameSettings/GKZP9G.ini
+++ b/Data/Sys/GameSettings/GKZP9G.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for the videos to work.
 EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to work.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GLRE64.ini b/Data/Sys/GameSettings/GLRE64.ini
index 3b6c0321676..465778899b4 100644
--- a/Data/Sys/GameSettings/GLRE64.ini
+++ b/Data/Sys/GameSettings/GLRE64.ini
@@ -6,8 +6,8 @@ MMU = 1
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
 EmulationStateId = 3
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GMBE8P.ini b/Data/Sys/GameSettings/GMBE8P.ini
index 735c2122315..0bee51c94bc 100644
--- a/Data/Sys/GameSettings/GMBE8P.ini
+++ b/Data/Sys/GameSettings/GMBE8P.ini
@@ -3,7 +3,6 @@
 [Core]
 # Values set here will override the main dolphin settings.
 FPRF = True
-# Values set here will override the main dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
diff --git a/Data/Sys/GameSettings/GPXE01.ini b/Data/Sys/GameSettings/GPXE01.ini
new file mode 100644
index 00000000000..9a0e2421b2a
--- /dev/null
+++ b/Data/Sys/GameSettings/GPXE01.ini
@@ -0,0 +1,19 @@
+# GPXE01 - POKeMON BOX RUBY&SAPPHIRE
+
+[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 = 2
+EmulationIssues =
+
+[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.
+
diff --git a/Data/Sys/GameSettings/GPXP01.ini b/Data/Sys/GameSettings/GPXP01.ini
index e66ab1cbd0b..e1c0fa2e156 100644
--- a/Data/Sys/GameSettings/GPXP01.ini
+++ b/Data/Sys/GameSettings/GPXP01.ini
@@ -6,6 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 2
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GVS46E.ini b/Data/Sys/GameSettings/GVS46E.ini
new file mode 100644
index 00000000000..36cdea121d5
--- /dev/null
+++ b/Data/Sys/GameSettings/GVS46E.ini
@@ -0,0 +1,24 @@
+# GVS46E - Virtua Striker 4 Ver. 2006 (Export)
+
+[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 = 1
+EmulationIssues = Crashes on startup (Triforce game)
+
+[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]
+# Add memory patches to be applied every frame here.
+
+[Video_Settings]
+
diff --git a/Data/Sys/GameSettings/GVS46J.ini b/Data/Sys/GameSettings/GVS46J.ini
new file mode 100644
index 00000000000..f45ffca5945
--- /dev/null
+++ b/Data/Sys/GameSettings/GVS46J.ini
@@ -0,0 +1,24 @@
+# GVS46J - Virtua Striker 4 Ver. 2006 (Japan)
+
+[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 = 1
+EmulationIssues = Crashes on startup (Triforce game)
+
+[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]
+# Add memory patches to be applied every frame here.
+
+[Video_Settings]
+
diff --git a/Data/Sys/GameSettings/GZ2E01.ini b/Data/Sys/GameSettings/GZ2E01.ini
index 914dc2860a0..56f5219e126 100644
--- a/Data/Sys/GameSettings/GZ2E01.ini
+++ b/Data/Sys/GameSettings/GZ2E01.ini
@@ -1,4 +1,4 @@
-# GZ2E01 - The Legend of Zelda: Twilight Princess
+# GZ2E01 - The Legend of Zelda: Twilight Princess [GC]
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Enable the patch "Hyrule Field Speed Hack" in iso properties for a speed boost.
+EmulationIssues = Enable the "Hyrule Field Speed Hack" patch in iso properties for a speed boost.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GZ2J01.ini b/Data/Sys/GameSettings/GZ2J01.ini
index 6c980dea6c1..03727ce5d96 100644
--- a/Data/Sys/GameSettings/GZ2J01.ini
+++ b/Data/Sys/GameSettings/GZ2J01.ini
@@ -1,4 +1,4 @@
-# GZ2J01 - The Legend of Zelda: Twilight Princess
+# GZ2J01 - The Legend of Zelda: Twilight Princess [GC]
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GZ2P01.ini b/Data/Sys/GameSettings/GZ2P01.ini
index 05940a713ef..79557d3294d 100644
--- a/Data/Sys/GameSettings/GZ2P01.ini
+++ b/Data/Sys/GameSettings/GZ2P01.ini
@@ -1,4 +1,4 @@
-# GZ2P01 - The Legend of Zelda Twilight Princess
+# GZ2P01 - The Legend of Zelda: Twilight Princess [GC]
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Enable the patch "Hyrule Field Speed Hack" in iso properties for a speed boost.
+EmulationIssues = Enable the "Hyrule Field Speed Hack" patch in iso properties for a speed boost.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/HABA01.ini b/Data/Sys/GameSettings/HABA01.ini
new file mode 100644
index 00000000000..3bf145aaab9
--- /dev/null
+++ b/Data/Sys/GameSettings/HABA01.ini
@@ -0,0 +1,22 @@
+# HABA01 - Wii Shop Channel
+
+[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 = Will not connect. Uses WiiConnect24.
+
+[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]
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/HABK01.ini b/Data/Sys/GameSettings/HABK01.ini
new file mode 100644
index 00000000000..11f33e524fb
--- /dev/null
+++ b/Data/Sys/GameSettings/HABK01.ini
@@ -0,0 +1,22 @@
+# HABK01 - Wii Shop Channel
+
+[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 = Will not connect. Uses WiiConnect24.
+
+[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]
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/HADJ01.ini b/Data/Sys/GameSettings/HADJ01.ini
new file mode 100644
index 00000000000..eedaa60518f
--- /dev/null
+++ b/Data/Sys/GameSettings/HADJ01.ini
@@ -0,0 +1,23 @@
+# HADJ01 - Internet Channel
+
+[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 = 4
+EmulationIssues = Low FPS on first run while save data is created
+
+[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
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/HADP01.ini b/Data/Sys/GameSettings/HADP01.ini
new file mode 100644
index 00000000000..2bb5bcc8eb4
--- /dev/null
+++ b/Data/Sys/GameSettings/HADP01.ini
@@ -0,0 +1,23 @@
+# HADP01 - Internet Channel
+
+[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 = 4
+EmulationIssues = Low FPS on first run while save data is created
+
+[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
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/HATE01.ini b/Data/Sys/GameSettings/HATE01.ini
new file mode 100644
index 00000000000..4ff45b44fcd
--- /dev/null
+++ b/Data/Sys/GameSettings/HATE01.ini
@@ -0,0 +1,24 @@
+# HATE01 - Nintendo Channel
+
+[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 = 1
+EmulationIssues =
+
+[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]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/HAWE01.ini b/Data/Sys/GameSettings/HAWE01.ini
new file mode 100644
index 00000000000..ffa8396fcc8
--- /dev/null
+++ b/Data/Sys/GameSettings/HAWE01.ini
@@ -0,0 +1,22 @@
+# HAWE01 - Metroid Prime 3 Preview Channel
+
+[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 = 4
+EmulationIssues = Uses WiiConnect24
+
+[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
+
diff --git a/Data/Sys/GameSettings/HCDJ01.ini b/Data/Sys/GameSettings/HCDJ01.ini
new file mode 100644
index 00000000000..864a1370857
--- /dev/null
+++ b/Data/Sys/GameSettings/HCDJ01.ini
@@ -0,0 +1,22 @@
+# HCDJ01 - Digicam Print Channel
+
+[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 = 2
+EmulationIssues =
+
+[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]
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/HCFP01.ini b/Data/Sys/GameSettings/HCFP01.ini
new file mode 100644
index 00000000000..8aa22cd7d2d
--- /dev/null
+++ b/Data/Sys/GameSettings/HCFP01.ini
@@ -0,0 +1,22 @@
+# HCFP01 - Wii Speak Channel
+
+[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 = No support for Wii Speak Microphone
+
+[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]
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/HCLEXN.ini b/Data/Sys/GameSettings/HCLEXN.ini
new file mode 100644
index 00000000000..5fd4966ef59
--- /dev/null
+++ b/Data/Sys/GameSettings/HCLEXN.ini
@@ -0,0 +1,25 @@
+# HCLEXN - Netflix
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues =
+
+[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]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/HCQEXB.ini b/Data/Sys/GameSettings/HCQEXB.ini
new file mode 100644
index 00000000000..cc5d380d3a5
--- /dev/null
+++ b/Data/Sys/GameSettings/HCQEXB.ini
@@ -0,0 +1,22 @@
+# HCQEXB - Hulu Plus
+
+[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 = Unable to connect to internet
+
+[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]
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/HCSE01.ini b/Data/Sys/GameSettings/HCSE01.ini
new file mode 100644
index 00000000000..556f55760a2
--- /dev/null
+++ b/Data/Sys/GameSettings/HCSE01.ini
@@ -0,0 +1,24 @@
+# HCSE01 - Wii U Transfer Tool
+
+[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 = 1
+EmulationIssues =
+
+[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]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/LACJ8P.ini b/Data/Sys/GameSettings/LACJ8P.ini
new file mode 100644
index 00000000000..69a25822ca7
--- /dev/null
+++ b/Data/Sys/GameSettings/LACJ8P.ini
@@ -0,0 +1,24 @@
+# LACJ8P - Wonder Boy
+
+[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 = 4
+EmulationIssues = 
+
+[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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LADJ8P.ini b/Data/Sys/GameSettings/LADJ8P.ini
new file mode 100644
index 00000000000..ef3df845977
--- /dev/null
+++ b/Data/Sys/GameSettings/LADJ8P.ini
@@ -0,0 +1,26 @@
+# LADJ8P - Phantasy Star
+
+[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 = 4
+EmulationIssues = 
+
+[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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAGJ8P.ini b/Data/Sys/GameSettings/LAGJ8P.ini
new file mode 100644
index 00000000000..bb93f7c9f8b
--- /dev/null
+++ b/Data/Sys/GameSettings/LAGJ8P.ini
@@ -0,0 +1,24 @@
+# LAGJ8P - Sonic The Hedgehog
+
+[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 = 4
+EmulationIssues = 
+
+[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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAKJ8P.ini b/Data/Sys/GameSettings/LAKJ8P.ini
new file mode 100644
index 00000000000..bb9de331ed5
--- /dev/null
+++ b/Data/Sys/GameSettings/LAKJ8P.ini
@@ -0,0 +1,26 @@
+# LAKJ8P - Wonder Boy II
+
+[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 = 4
+EmulationIssues = 
+
+[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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAMJ8P.ini b/Data/Sys/GameSettings/LAMJ8P.ini
new file mode 100644
index 00000000000..60bcbede0a4
--- /dev/null
+++ b/Data/Sys/GameSettings/LAMJ8P.ini
@@ -0,0 +1,24 @@
+# LAMJ8P - Sonic Chaos
+
+[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 = 4
+EmulationIssues = 
+
+[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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MCDE8P.ini b/Data/Sys/GameSettings/MCDE8P.ini
new file mode 100644
index 00000000000..ed7d8d23007
--- /dev/null
+++ b/Data/Sys/GameSettings/MCDE8P.ini
@@ -0,0 +1,27 @@
+# MCDE8P - Sonic & Knuckles
+
+[Core]
+# Values set here will override the main dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+
+[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]
+# Add memory patches to be applied every frame here.
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/R6YPH3.ini b/Data/Sys/GameSettings/R6YPH3.ini
index fa5bc550a38..1ad74de5c1a 100644
--- a/Data/Sys/GameSettings/R6YPH3.ini
+++ b/Data/Sys/GameSettings/R6YPH3.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
 EmulationStateId = 0
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/RGWX41.ini b/Data/Sys/GameSettings/RGWX41.ini
new file mode 100644
index 00000000000..fe8ca79dd1b
--- /dev/null
+++ b/Data/Sys/GameSettings/RGWX41.ini
@@ -0,0 +1,22 @@
+# RGQX41 - Rabbids Channel
+
+[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 = 1
+EmulationIssues = 
+
+[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]
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/RZDE01.ini b/Data/Sys/GameSettings/RZDE01.ini
index 73f22b5952d..8549dd3a50c 100644
--- a/Data/Sys/GameSettings/RZDE01.ini
+++ b/Data/Sys/GameSettings/RZDE01.ini
@@ -1,4 +1,4 @@
-# RZDE01 - The Legend of Zelda: Twilight Princess
+# RZDE01 - The Legend of Zelda: Twilight Princess [Wii]
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Enable the patch "Hyrule Field Speed Hack" in iso properties for a speed boost.
+EmulationIssues = Enable the "Hyrule Field Speed Hack" patch in iso properties for a speed boost.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/RZDJ01.ini b/Data/Sys/GameSettings/RZDJ01.ini
index 2e3aa6fe292..248988d6c48 100644
--- a/Data/Sys/GameSettings/RZDJ01.ini
+++ b/Data/Sys/GameSettings/RZDJ01.ini
@@ -1,4 +1,4 @@
-# RZDJ01 - The Legend of Zelda: Twilight Princess
+# RZDJ01 - The Legend of Zelda: Twilight Princess [Wii]
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RZDK01.ini b/Data/Sys/GameSettings/RZDK01.ini
index 411989b8713..716faa9b684 100644
--- a/Data/Sys/GameSettings/RZDK01.ini
+++ b/Data/Sys/GameSettings/RZDK01.ini
@@ -1,4 +1,4 @@
-# RZDK01 - The Legend of Zelda: Twilight Princess
+# RZDK01 - The Legend of Zelda: Twilight Princess [Wii]
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RZDP01.ini b/Data/Sys/GameSettings/RZDP01.ini
index 16d9626628a..7ebbc167dd5 100644
--- a/Data/Sys/GameSettings/RZDP01.ini
+++ b/Data/Sys/GameSettings/RZDP01.ini
@@ -1,4 +1,4 @@
-# RZDP01 - The Legend of Zelda Twilight Princess
+# RZDP01 - The Legend of Zelda: Twilight Princess [Wii]
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Enable the patch "Hyrule Field Speed Hack" in iso properties for a speed boost.
+EmulationIssues = Enable the "Hyrule Field Speed Hack" patch in iso properties for a speed boost.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/SAWE52.ini b/Data/Sys/GameSettings/SAWE52.ini
new file mode 100644
index 00000000000..57817481ae5
--- /dev/null
+++ b/Data/Sys/GameSettings/SAWE52.ini
@@ -0,0 +1,21 @@
+# SAWE52 - Angry Birds Trilogy
+
+[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 = 4
+EmulationIssues =
+[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]
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/SBXEWR.ini b/Data/Sys/GameSettings/SBXEWR.ini
new file mode 100644
index 00000000000..2091f4b1a4f
--- /dev/null
+++ b/Data/Sys/GameSettings/SBXEWR.ini
@@ -0,0 +1,24 @@
+# SBXEWR - The Bachelor the Video Game
+
+[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 = Wiimote cursor misaligned
+
+[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]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/SDAE5G.ini b/Data/Sys/GameSettings/SDAE5G.ini
new file mode 100644
index 00000000000..5832d12fbbd
--- /dev/null
+++ b/Data/Sys/GameSettings/SDAE5G.ini
@@ -0,0 +1,23 @@
+# WSDAE5G - Daring Game for Girls
+
+[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 = 4
+
+[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]
+# Add memory patches to be applied every frame here.
+
+[Video_Settings]
+
diff --git a/Data/Sys/GameSettings/SJBE52.ini b/Data/Sys/GameSettings/SJBE52.ini
index 28e5acc2536..52c60579ab0 100644
--- a/Data/Sys/GameSettings/SJBE52.ini
+++ b/Data/Sys/GameSettings/SJBE52.ini
@@ -6,8 +6,8 @@ BlockMerging = 1
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Disable the gamecube controller or the wiimote to not have conflicts (r6480)
 EmulationStateId = 4
+EmulationIssues = Disable the gamecube controller or the wiimote to not have conflicts
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/SJBJ01.ini b/Data/Sys/GameSettings/SJBJ01.ini
index 4fe057a6041..de8ce8357a3 100644
--- a/Data/Sys/GameSettings/SJBJ01.ini
+++ b/Data/Sys/GameSettings/SJBJ01.ini
@@ -6,8 +6,8 @@ BlockMerging = 1
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Disable the gamecube controller or the wiimote to not have conflicts (r6480)
 EmulationStateId = 4
+EmulationIssues = Disable the gamecube controller or the wiimote to not have conflicts
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/SJBP52.ini b/Data/Sys/GameSettings/SJBP52.ini
index da58fb081a6..cca6c14da47 100644
--- a/Data/Sys/GameSettings/SJBP52.ini
+++ b/Data/Sys/GameSettings/SJBP52.ini
@@ -6,8 +6,8 @@ BlockMerging = 1
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Disable the gamecube controller or the wiimote to not have conflicts (r6480)
 EmulationStateId = 4
+EmulationIssues = Disable the gamecube controller or the wiimote to not have conflicts
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/SJDY41.ini b/Data/Sys/GameSettings/SJDY41.ini
index df5b7b8fc44..754148366ad 100644
--- a/Data/Sys/GameSettings/SJDY41.ini
+++ b/Data/Sys/GameSettings/SJDY41.ini
@@ -1,14 +1,20 @@
 # SJDY41 - Just Dance 3
+
 [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 = 5
 EmulationIssues = 
+
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -16,5 +22,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Enhancements]
 MaxAnisotropy = 0
diff --git a/Data/Sys/GameSettings/SJXD41.ini b/Data/Sys/GameSettings/SJXD41.ini
index 31586b5e5d5..b6d40ca3027 100644
--- a/Data/Sys/GameSettings/SJXD41.ini
+++ b/Data/Sys/GameSettings/SJXD41.ini
@@ -1,14 +1,20 @@
 # SJXD41 - Just Dance 4
+
 [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 = 5
 EmulationIssues = 
+
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -16,5 +22,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Enhancements]
 MaxAnisotropy = 0
diff --git a/Data/Sys/GameSettings/SL2J01.ini b/Data/Sys/GameSettings/SL2J01.ini
index c11d5e7298f..629e1214e27 100644
--- a/Data/Sys/GameSettings/SL2J01.ini
+++ b/Data/Sys/GameSettings/SL2J01.ini
@@ -1,10 +1,19 @@
 # SL2J01 - Zero: Shinku no Chou
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+
+[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 = 4
 EmulationIssues = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -12,7 +21,9 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Gecko]
+
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/SMNK01.ini b/Data/Sys/GameSettings/SMNK01.ini
index 6dfccb6269c..af27e6c7a5e 100644
--- a/Data/Sys/GameSettings/SMNK01.ini
+++ b/Data/Sys/GameSettings/SMNK01.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Enable EFB to RAM for the coins to spin (it will cause a big slowdown).
 EmulationStateId = 4
+EmulationIssues = Enable EFB to RAM for the coins to spin (it will cause a big slowdown).
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/SOUJ01.ini b/Data/Sys/GameSettings/SOUJ01.ini
index dde7a09b181..c63bd034b47 100644
--- a/Data/Sys/GameSettings/SOUJ01.ini
+++ b/Data/Sys/GameSettings/SOUJ01.ini
@@ -1,14 +1,20 @@
 # SOUJ01 - The Legend of Zelda Skyward Sword
+
 [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 = 4
 EmulationIssues = Needs real wiimote and motion plus. Time stone transition needs Fast Depth off. 
+
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -16,8 +22,10 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Hacks]
 EFBAccessEnable = True
 EFBEmulateFormatChanges = True
+
 [Video_Settings]
 FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/SOUK01.ini b/Data/Sys/GameSettings/SOUK01.ini
index 18d3f4352e6..b804346cb6a 100644
--- a/Data/Sys/GameSettings/SOUK01.ini
+++ b/Data/Sys/GameSettings/SOUK01.ini
@@ -1,14 +1,19 @@
 # SOUK01 - The Legend of Zelda Skyward Sword
 [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 = 4
 EmulationIssues = Needs real wiimote and motion plus. Time stone transition needs Fast Depth off. 
+
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -16,8 +21,10 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Hacks]
 EFBAccessEnable = True
 EFBEmulateFormatChanges = True
+
 [Video_Settings]
 FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/WAIEHZ.ini b/Data/Sys/GameSettings/WAIEHZ.ini
new file mode 100644
index 00000000000..39f5fc5674b
--- /dev/null
+++ b/Data/Sys/GameSettings/WAIEHZ.ini
@@ -0,0 +1,23 @@
+# WAIEHZ - 101-in-1 Explosive Megamix
+
+[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 = 5
+
+[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]
+# Add memory patches to be applied every frame here.
+
+[Video_Settings]
+
diff --git a/Data/Sys/GameSettings/WC6EUP.ini b/Data/Sys/GameSettings/WC6EUP.ini
index 62567fa8d14..30260bcccfa 100644
--- a/Data/Sys/GameSettings/WC6EUP.ini
+++ b/Data/Sys/GameSettings/WC6EUP.ini
@@ -1,14 +1,20 @@
 # WC6EUP - Chronos Twins DX
+
 [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 = 4
 EmulationIssues = Disable EuRGB60 mode
+
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -16,6 +22,7 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WCHEJS.ini b/Data/Sys/GameSettings/WCHEJS.ini
index 2d36a7ca61d..dc66ba99524 100644
--- a/Data/Sys/GameSettings/WCHEJS.ini
+++ b/Data/Sys/GameSettings/WCHEJS.ini
@@ -1,10 +1,15 @@
 # WCHEJS - Chess Challenge!
+
 [Core]
+
 [EmuState]
 EmulationStateId = 4
 EmulationIssues = 
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -12,10 +17,12 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Hacks]
 EFBEmulateFormatChanges = True
 EFBToTextureEnable = False
 EFBCopyEnable = True
+
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WCZEXK.ini b/Data/Sys/GameSettings/WCZEXK.ini
new file mode 100644
index 00000000000..73ccd76bbd2
--- /dev/null
+++ b/Data/Sys/GameSettings/WCZEXK.ini
@@ -0,0 +1,22 @@
+# WCZEXK - ColorZ
+
+[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 = Wiimote cursor misaligned
+
+[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]
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/WERP18.ini b/Data/Sys/GameSettings/WERP18.ini
index 62dc91427ce..a5c80581f07 100644
--- a/Data/Sys/GameSettings/WERP18.ini
+++ b/Data/Sys/GameSettings/WERP18.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
 EmulationStateId = 4
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/WFLE01.ini b/Data/Sys/GameSettings/WFLE01.ini
index b5e7489086a..c392bfbfc6b 100644
--- a/Data/Sys/GameSettings/WFLE01.ini
+++ b/Data/Sys/GameSettings/WFLE01.ini
@@ -1,10 +1,15 @@
 # WFLE01 - Fluidity
+
 [Core]
+
 [EmuState]
 EmulationStateId = 5
 EmulationIssues = 
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -12,5 +17,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/WKDEGN.ini b/Data/Sys/GameSettings/WKDEGN.ini
index 052138328fa..823461b0cd9 100644
--- a/Data/Sys/GameSettings/WKDEGN.ini
+++ b/Data/Sys/GameSettings/WKDEGN.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = 
 EmulationStateId = 4
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/WLEELU.ini b/Data/Sys/GameSettings/WLEELU.ini
index b09fbbb3bf6..283245cc705 100644
--- a/Data/Sys/GameSettings/WLEELU.ini
+++ b/Data/Sys/GameSettings/WLEELU.ini
@@ -1,10 +1,15 @@
 # WLEELU - PooYoos Episode 1
+
 [Core]
+
 [EmuState]
 EmulationStateId = 4
 EmulationIssues = 
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -12,6 +17,7 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WLNELU.ini b/Data/Sys/GameSettings/WLNELU.ini
index dc755d36713..7b4f945b070 100644
--- a/Data/Sys/GameSettings/WLNELU.ini
+++ b/Data/Sys/GameSettings/WLNELU.ini
@@ -1,10 +1,15 @@
 # WLNELU - PooYoos Episode 2
+
 [Core]
+
 [EmuState]
 EmulationStateId = 4
 EmulationIssues = 
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -12,6 +17,7 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WRIEGD.ini b/Data/Sys/GameSettings/WRIEGD.ini
index 58b8b25bfdf..3109eb04d82 100644
--- a/Data/Sys/GameSettings/WRIEGD.ini
+++ b/Data/Sys/GameSettings/WRIEGD.ini
@@ -1,10 +1,15 @@
 # WRIEGD - RAINBOW ISLANDS T.A.
+
 [Core]
+
 [EmuState]
 EmulationStateId = 4
 EmulationIssues = 
+
 [OnFrame]
+
 [ActionReplay]
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -12,6 +17,7 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/WSREQT.ini b/Data/Sys/GameSettings/WSREQT.ini
index d61c847438b..8fad93f820c 100644
--- a/Data/Sys/GameSettings/WSREQT.ini
+++ b/Data/Sys/GameSettings/WSREQT.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
 EmulationStateId = 4
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/WTEELU.ini b/Data/Sys/GameSettings/WTEELU.ini
index 289c72bd9df..78568029a18 100644
--- a/Data/Sys/GameSettings/WTEELU.ini
+++ b/Data/Sys/GameSettings/WTEELU.ini
@@ -1,10 +1,22 @@
 # WTEELU - Tales of Elastic Boy Mission 1
+
 [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 = 4
-EmulationIssues = 
+EmulationIssues =
+
+[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
@@ -12,9 +24,11 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
+
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/WTKEGL.ini b/Data/Sys/GameSettings/WTKEGL.ini
index fffe3a11c2f..bddc5c3441c 100644
--- a/Data/Sys/GameSettings/WTKEGL.ini
+++ b/Data/Sys/GameSettings/WTKEGL.ini
@@ -1,14 +1,22 @@
 # WTKEGL - TV Show King 2
+
 [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 = 4
 EmulationIssues = 
+
 [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
@@ -16,5 +24,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/WTXPJS.ini b/Data/Sys/GameSettings/WTXPJS.ini
index 70fb7a24f0d..73ac9b78b30 100644
--- a/Data/Sys/GameSettings/WTXPJS.ini
+++ b/Data/Sys/GameSettings/WTXPJS.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
 EmulationStateId = 4
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/WWAEQT.ini b/Data/Sys/GameSettings/WWAEQT.ini
index ea83645cd2e..6efac7e7ea0 100644
--- a/Data/Sys/GameSettings/WWAEQT.ini
+++ b/Data/Sys/GameSettings/WWAEQT.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
 EmulationStateId = 4
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/WXBEA4.ini b/Data/Sys/GameSettings/WXBEA4.ini
index 6db7604fba5..d5bd4e8dfb8 100644
--- a/Data/Sys/GameSettings/WXBEA4.ini
+++ b/Data/Sys/GameSettings/WXBEA4.ini
@@ -1,10 +1,21 @@
 # WXBEA4 - Ben 10 Alien Force
+
 [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 = 4
-EmulationIssues = 
+EmulationIssues =
+[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
@@ -12,5 +23,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/WXPEYV.ini b/Data/Sys/GameSettings/WXPEYV.ini
index 1601e67d459..f462faf0e62 100644
--- a/Data/Sys/GameSettings/WXPEYV.ini
+++ b/Data/Sys/GameSettings/WXPEYV.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
 EmulationStateId = 4
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/WXREE9.ini b/Data/Sys/GameSettings/WXREE9.ini
index 42c04829ba6..1e1d78494c4 100644
--- a/Data/Sys/GameSettings/WXREE9.ini
+++ b/Data/Sys/GameSettings/WXREE9.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
 EmulationStateId = 4
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/WYMEFJ.ini b/Data/Sys/GameSettings/WYMEFJ.ini
new file mode 100644
index 00000000000..887d4fbf9cb
--- /dev/null
+++ b/Data/Sys/GameSettings/WYMEFJ.ini
@@ -0,0 +1,25 @@
+# WYMEFJ - Yummy Yummy Cooking Jam
+
+[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 = 1
+EmulationIssues = Crashes after warning screen
+
+[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
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False