diff --git a/Data/Sys/GameSettings/D43.ini b/Data/Sys/GameSettings/D43.ini
new file mode 100644
index 0000000000..0512180608
--- /dev/null
+++ b/Data/Sys/GameSettings/D43.ini
@@ -0,0 +1,22 @@
+# D43E01, D43J01, D43P01, D43U01 - ZELDA OCARINA MULTI PACK
+
+[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
+
diff --git a/Data/Sys/GameSettings/D43E01.ini b/Data/Sys/GameSettings/D43E01.ini
deleted file mode 100644
index f90d827925..0000000000
--- a/Data/Sys/GameSettings/D43E01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# D43E01 - ZELDA OCARINA MULTI PACK
-
-[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 = Minor video glitches when pausing
-
-[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/G2MJ01.ini b/Data/Sys/GameSettings/G2M.ini
similarity index 92%
rename from Data/Sys/GameSettings/G2MJ01.ini
rename to Data/Sys/GameSettings/G2M.ini
index b06c0198eb..56be67d1de 100644
--- a/Data/Sys/GameSettings/G2MJ01.ini
+++ b/Data/Sys/GameSettings/G2M.ini
@@ -1,4 +1,4 @@
-# G2MJ01 - Metroid Prime 2: Dark Echoes
+# G2ME01, G2MJ01, G2MP01 - Metroid Prime 2: Echoes
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/G2ME01.ini b/Data/Sys/GameSettings/G2ME01.ini
index 6246c65a77..f132f06336 100644
--- a/Data/Sys/GameSettings/G2ME01.ini
+++ b/Data/Sys/GameSettings/G2ME01.ini
@@ -1,4 +1,4 @@
-# G2ME01 - Metroid Prime 2 Echoes
+# G2ME01 - Metroid Prime 2: Echoes
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/G2MP01.ini b/Data/Sys/GameSettings/G2MP01.ini
index cf0ef61a93..87505df0af 100644
--- a/Data/Sys/GameSettings/G2MP01.ini
+++ b/Data/Sys/GameSettings/G2MP01.ini
@@ -1,4 +1,4 @@
-# G2MP01 - Metroid Prime 2 Echoes
+# G2MP01 - Metroid Prime 2: Echoes
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/G4QJ01.ini b/Data/Sys/GameSettings/G4Q.ini
similarity index 88%
rename from Data/Sys/GameSettings/G4QJ01.ini
rename to Data/Sys/GameSettings/G4Q.ini
index 20046c584e..83fa2a82e0 100644
--- a/Data/Sys/GameSettings/G4QJ01.ini
+++ b/Data/Sys/GameSettings/G4Q.ini
@@ -1,4 +1,4 @@
-# G4QJ01 - Super Mario Strikers
+# G4QE01, G4QJ01, G4QP01 - Super Mario Strikers
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GAVP78.ini b/Data/Sys/GameSettings/G4S.ini
similarity index 90%
rename from Data/Sys/GameSettings/GAVP78.ini
rename to Data/Sys/GameSettings/G4S.ini
index 053c0b7b75..42fef4e486 100644
--- a/Data/Sys/GameSettings/GAVP78.ini
+++ b/Data/Sys/GameSettings/G4S.ini
@@ -1,4 +1,4 @@
-# GAVP78 - Avatar: The Legend of Aang
+# G4SE01, G4SP01 - The Legend of Zelda: Four Swords
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G4SP01.ini b/Data/Sys/GameSettings/G4SP01.ini
index 0969b3e4cc..14885e27ea 100644
--- a/Data/Sys/GameSettings/G4SP01.ini
+++ b/Data/Sys/GameSettings/G4SP01.ini
@@ -1,4 +1,4 @@
-# G4SP01 - The Legend of Zelda: Four Swords FOR NINTENDO GAMECUBE
+# G4SP01 - The Legend of Zelda: Four Swords
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G8MP01.ini b/Data/Sys/GameSettings/G8M.ini
similarity index 91%
rename from Data/Sys/GameSettings/G8MP01.ini
rename to Data/Sys/GameSettings/G8M.ini
index 8d87044fbe..b383321014 100644
--- a/Data/Sys/GameSettings/G8MP01.ini
+++ b/Data/Sys/GameSettings/G8M.ini
@@ -1,4 +1,4 @@
-# G8MP01 - Paper Mario
+# G8ME01, G8MJ01, G8MP01 - Paper Mario
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G8MJ01.ini b/Data/Sys/GameSettings/G8MJ01.ini
deleted file mode 100644
index e7cf5853d2..0000000000
--- a/Data/Sys/GameSettings/G8MJ01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# G8MJ01 - Paper Mario
-
-[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 Efb to Ram for BBox (proper graphics).
-
-[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_Hacks]
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/G8WE01.ini b/Data/Sys/GameSettings/G8W.ini
similarity index 93%
rename from Data/Sys/GameSettings/G8WE01.ini
rename to Data/Sys/GameSettings/G8W.ini
index 26566ee6fb..a99aad03e8 100644
--- a/Data/Sys/GameSettings/G8WE01.ini
+++ b/Data/Sys/GameSettings/G8W.ini
@@ -1,4 +1,4 @@
-# G8WE01 - Battalion Wars
+# G8WE01, G8WP01 - Battalion Wars
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GAFU01.ini b/Data/Sys/GameSettings/GAF.ini
similarity index 91%
rename from Data/Sys/GameSettings/GAFU01.ini
rename to Data/Sys/GameSettings/GAF.ini
index 71c16b8b6d..68e5a8ac35 100644
--- a/Data/Sys/GameSettings/GAFU01.ini
+++ b/Data/Sys/GameSettings/GAF.ini
@@ -1,4 +1,4 @@
-# GAFU01 - Animal Crossing
+# GAFJ01, GAFP01, GAFU01 - Doubutsu no Mori Plus
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GALJ01.ini b/Data/Sys/GameSettings/GAL.ini
similarity index 90%
rename from Data/Sys/GameSettings/GALJ01.ini
rename to Data/Sys/GameSettings/GAL.ini
index 9767faf6fe..93be4b4634 100644
--- a/Data/Sys/GameSettings/GALJ01.ini
+++ b/Data/Sys/GameSettings/GAL.ini
@@ -1,4 +1,4 @@
-# GALJ01 - Super Smash Bros Melee
+# GALE01, GALJ01, GALP01 - Super Smash Bros Melee
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GALE01.ini b/Data/Sys/GameSettings/GALE01.ini
deleted file mode 100644
index 0792d7b99c..0000000000
--- a/Data/Sys/GameSettings/GALE01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GALE01 - Super Smash Bros Melee
-
-[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]
-# Add memory patches to be applied every frame here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
diff --git a/Data/Sys/GameSettings/GATE51.ini b/Data/Sys/GameSettings/GAT.ini
similarity index 89%
rename from Data/Sys/GameSettings/GATE51.ini
rename to Data/Sys/GameSettings/GAT.ini
index 15b3859501..57278a7a23 100644
--- a/Data/Sys/GameSettings/GATE51.ini
+++ b/Data/Sys/GameSettings/GAT.ini
@@ -1,4 +1,4 @@
-# GATE51 - ATV: Quad Power Racing 2
+# GATE51, GATP51 - ATV: Quad Power Racing 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GAUJ08.ini b/Data/Sys/GameSettings/GAU.ini
similarity index 93%
rename from Data/Sys/GameSettings/GAUJ08.ini
rename to Data/Sys/GameSettings/GAU.ini
index b47a266889..99ddfe2056 100644
--- a/Data/Sys/GameSettings/GAUJ08.ini
+++ b/Data/Sys/GameSettings/GAU.ini
@@ -1,4 +1,4 @@
-# GAUJ08 - auto modellista
+# GAUE08, GAUJ08 - auto modellista
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GAVY78.ini b/Data/Sys/GameSettings/GAV.ini
similarity index 90%
rename from Data/Sys/GameSettings/GAVY78.ini
rename to Data/Sys/GameSettings/GAV.ini
index ca38b9188b..f63b64f2d3 100644
--- a/Data/Sys/GameSettings/GAVY78.ini
+++ b/Data/Sys/GameSettings/GAV.ini
@@ -1,4 +1,4 @@
-# GAVE78 - Avatar: The Legend of Aang
+# GAVE78, GAVP78, GAVY78 - Avatar: The Legend of Aang
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GAVE78.ini b/Data/Sys/GameSettings/GAVE78.ini
deleted file mode 100644
index 4b65e4b597..0000000000
--- a/Data/Sys/GameSettings/GAVE78.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# GAVE78 - Avatar 06
-
-[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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GBZE08.ini b/Data/Sys/GameSettings/GB4.ini
similarity index 92%
rename from Data/Sys/GameSettings/GBZE08.ini
rename to Data/Sys/GameSettings/GB4.ini
index d57888957c..efbb0dc8c2 100644
--- a/Data/Sys/GameSettings/GBZE08.ini
+++ b/Data/Sys/GameSettings/GB4.ini
@@ -1,4 +1,4 @@
-# GBZE08 - Resident Evil 0
+# GB4E51, GB4P51 - Burnout 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GG4E08.ini b/Data/Sys/GameSettings/GBD.ini
similarity index 92%
rename from Data/Sys/GameSettings/GG4E08.ini
rename to Data/Sys/GameSettings/GBD.ini
index d0d9fb673d..3e75727873 100644
--- a/Data/Sys/GameSettings/GG4E08.ini
+++ b/Data/Sys/GameSettings/GBD.ini
@@ -1,4 +1,4 @@
-# GG4E08 - GotchaForceUsa
+# GBDE5G, GBDS7D - BloodRayne
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GBGP7D.ini b/Data/Sys/GameSettings/GBG.ini
similarity index 90%
rename from Data/Sys/GameSettings/GBGP7D.ini
rename to Data/Sys/GameSettings/GBG.ini
index 6d315ae7ea..4137d239ac 100644
--- a/Data/Sys/GameSettings/GBGP7D.ini
+++ b/Data/Sys/GameSettings/GBG.ini
@@ -1,4 +1,4 @@
-# GBGP7D - Bomberman Generation
+# GBGE5G, GBGP7D - Bomberman Generation
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GBGE5G.ini b/Data/Sys/GameSettings/GBGE5G.ini
deleted file mode 100644
index 092c310836..0000000000
--- a/Data/Sys/GameSettings/GBGE5G.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GBGE5G - Bomberman Generation
-
-[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 =
-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]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GBMP7F.ini b/Data/Sys/GameSettings/GBL.ini
similarity index 91%
rename from Data/Sys/GameSettings/GBMP7F.ini
rename to Data/Sys/GameSettings/GBL.ini
index 3be70cf047..bee5382556 100644
--- a/Data/Sys/GameSettings/GBMP7F.ini
+++ b/Data/Sys/GameSettings/GBL.ini
@@ -1,4 +1,4 @@
-# GBMP7F - BATMAN: DARK TOMORROW
+# GBLE52, GBLP52 - BLOODY ROAR(R): PRIMAL FURY
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GBLE52.ini b/Data/Sys/GameSettings/GBLE52.ini
deleted file mode 100644
index 03f1df8809..0000000000
--- a/Data/Sys/GameSettings/GBLE52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBLE52 - BLOODY ROAR(R): PRIMAL FURY
-
-[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 = Needs real xfb for videos to display.
-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]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBLP52.ini b/Data/Sys/GameSettings/GBLP52.ini
deleted file mode 100644
index 344f5b0669..0000000000
--- a/Data/Sys/GameSettings/GBLP52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBLP52 - BLOODY ROAR(R): PRIMAL FURY
-
-[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 xfb for videos to display.
-
-[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]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBLPGL.ini b/Data/Sys/GameSettings/GBLPGL.ini
index 3d287e9b9e..e6d473b292 100644
--- a/Data/Sys/GameSettings/GBLPGL.ini
+++ b/Data/Sys/GameSettings/GBLPGL.ini
@@ -1,4 +1,5 @@
 # GBLPGL - GAMECUBE "EL TORITO" BOOTLOADER
+# Because this title has a weird ID, properties are inherited from GBL.ini (Bloody Roar: Primal Fury)!
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -6,6 +7,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/GBMJ28.ini b/Data/Sys/GameSettings/GBM.ini
similarity index 91%
rename from Data/Sys/GameSettings/GBMJ28.ini
rename to Data/Sys/GameSettings/GBM.ini
index b0d0e2c1fa..0cb711ea54 100644
--- a/Data/Sys/GameSettings/GBMJ28.ini
+++ b/Data/Sys/GameSettings/GBM.ini
@@ -1,4 +1,4 @@
-# GBMJ28 - BATMAN: DARK TOMORROW
+# GBME7F, GBMJ28, GBMP7F - BATMAN: DARK TOMORROW
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GBME7F.ini b/Data/Sys/GameSettings/GBME7F.ini
deleted file mode 100644
index 77aa5998d6..0000000000
--- a/Data/Sys/GameSettings/GBME7F.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBME7F - BATMAN: DARK TOMORROW
-
-[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 xfb for videos to show up.
-
-[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]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBVE41.ini b/Data/Sys/GameSettings/GBV.ini
similarity index 94%
rename from Data/Sys/GameSettings/GBVE41.ini
rename to Data/Sys/GameSettings/GBV.ini
index 24f36f885c..7d5d8df656 100644
--- a/Data/Sys/GameSettings/GBVE41.ini
+++ b/Data/Sys/GameSettings/GBV.ini
@@ -1,4 +1,4 @@
-# GBVE41 - Batman: Vengeance
+# GBVE41, GBVP41 - Batman: Vengeance
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GBVP41.ini b/Data/Sys/GameSettings/GBVP41.ini
deleted file mode 100644
index a52e3a93f5..0000000000
--- a/Data/Sys/GameSettings/GBVP41.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GBVP41 - Batman Vengeance
-
-[Core]
-# Values set here will override the main dolphin settings.
-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 display. Slow audio with HLE.
-
-[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]
-UseXFB = True
-UseRealXFB = True
-
-[DSP]
-EnableJIT = True
diff --git a/Data/Sys/GameSettings/GXLP52.ini b/Data/Sys/GameSettings/GBZ.ini
similarity index 91%
rename from Data/Sys/GameSettings/GXLP52.ini
rename to Data/Sys/GameSettings/GBZ.ini
index 1cc038f17b..8818542396 100644
--- a/Data/Sys/GameSettings/GXLP52.ini
+++ b/Data/Sys/GameSettings/GBZ.ini
@@ -1,4 +1,4 @@
-# GXLP52 - X-Men: Legends
+# GBZE08, GBZP08 - Resident Evil 0
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GBDE5G.ini b/Data/Sys/GameSettings/GCB.ini
similarity index 85%
rename from Data/Sys/GameSettings/GBDE5G.ini
rename to Data/Sys/GameSettings/GCB.ini
index f79647e4c6..a8b1075447 100644
--- a/Data/Sys/GameSettings/GBDE5G.ini
+++ b/Data/Sys/GameSettings/GCB.ini
@@ -1,4 +1,4 @@
-# GBDE5G - BloodRayne
+# GCBE7D, GCBP7D - Crash Bandicoot: The Wrath of Cortex
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -6,7 +6,6 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sometimes slow
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GCBE7D.ini b/Data/Sys/GameSettings/GCBE7D.ini
deleted file mode 100644
index cf44141fa5..0000000000
--- a/Data/Sys/GameSettings/GCBE7D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GCBE7D - Crash Bandicoot:The Wrath of Cortex
-
-[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 = May be slow
-
-[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/GCCJ01.ini b/Data/Sys/GameSettings/GCC.ini
similarity index 88%
rename from Data/Sys/GameSettings/GCCJ01.ini
rename to Data/Sys/GameSettings/GCC.ini
index b755e51275..fa2a58a656 100644
--- a/Data/Sys/GameSettings/GCCJ01.ini
+++ b/Data/Sys/GameSettings/GCC.ini
@@ -1,4 +1,4 @@
-# GCCJ01 - FINAL FANTASY Crystal Chronicles
+# GCCE01, GCCJ01, GCCJGC, GCCP01 - FINAL FANTASY Crystal Chronicles
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GCCJGC.ini b/Data/Sys/GameSettings/GCCJGC.ini
deleted file mode 100644
index 99b8a2ee9d..0000000000
--- a/Data/Sys/GameSettings/GCCJGC.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GCCJGC - FINAL FANTASY Crystal Chronicles
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/GCNP7D.ini b/Data/Sys/GameSettings/GCN.ini
similarity index 89%
rename from Data/Sys/GameSettings/GCNP7D.ini
rename to Data/Sys/GameSettings/GCN.ini
index 5fe74cf2e2..04207699c8 100644
--- a/Data/Sys/GameSettings/GCNP7D.ini
+++ b/Data/Sys/GameSettings/GCN.ini
@@ -1,8 +1,7 @@
-# GCNP7D - Crash Nitro Kart
+# GCNE7D, GCNP7D - Crash Nitro Kart
 
 [Core]
 # Values set here will override the main dolphin settings.
-Patch Region = 0x7e000000
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
diff --git a/Data/Sys/GameSettings/GCNE7D.ini b/Data/Sys/GameSettings/GCNE7D.ini
deleted file mode 100644
index 60bcab08a7..0000000000
--- a/Data/Sys/GameSettings/GCNE7D.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GCNE7D - Crash Nitro Kart
-
-[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 "Panic Handlers". Needs "Real Xfb" to display videos.
-
-[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]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GD9P69.ini b/Data/Sys/GameSettings/GCO.ini
similarity index 93%
rename from Data/Sys/GameSettings/GD9P69.ini
rename to Data/Sys/GameSettings/GCO.ini
index f274cdfeb0..3139414b4a 100644
--- a/Data/Sys/GameSettings/GD9P69.ini
+++ b/Data/Sys/GameSettings/GCO.ini
@@ -1,4 +1,4 @@
-# GD9P69 - Drome Racers
+# GCOE52 - Call of Duty
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GCOE52.ini b/Data/Sys/GameSettings/GCOE52.ini
deleted file mode 100644
index d363f2831b..0000000000
--- a/Data/Sys/GameSettings/GCOE52.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GCOE52 - Call of Duty
-
-[Core]
-# Values set here will override the main dolphin settings.
-Patch region = 0x7e000004
-
-[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.
-
diff --git a/Data/Sys/GameSettings/GCOPDV.ini b/Data/Sys/GameSettings/GCOPDV.ini
index 0ee25eba63..f84a36fda5 100644
--- a/Data/Sys/GameSettings/GCOPDV.ini
+++ b/Data/Sys/GameSettings/GCOPDV.ini
@@ -1,4 +1,5 @@
 # GCOPDV - GCOS MultiGame DVD (C) GCOS TEAM
+# Because this title has a weird ID, properties are inherited from GCO.ini (Call of Duty)!
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GWZE01.ini b/Data/Sys/GameSettings/GCQ.ini
similarity index 87%
rename from Data/Sys/GameSettings/GWZE01.ini
rename to Data/Sys/GameSettings/GCQ.ini
index 336bd80bd0..af0b0e7a3f 100644
--- a/Data/Sys/GameSettings/GWZE01.ini
+++ b/Data/Sys/GameSettings/GCQ.ini
@@ -1,4 +1,4 @@
-# GWZE01 - Dance Dance Revolution: Mario Mix for US
+# GCQE7D, GCQP7D - Buffy: Chaos Bleeds
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GCQP7D.ini b/Data/Sys/GameSettings/GCQP7D.ini
deleted file mode 100644
index 069cb59637..0000000000
--- a/Data/Sys/GameSettings/GCQP7D.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GCQP7D - Buffy: Chaos Bleeds
-
-[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.
-
diff --git a/Data/Sys/GameSettings/GHAP08.ini b/Data/Sys/GameSettings/GCT.ini
similarity index 91%
rename from Data/Sys/GameSettings/GHAP08.ini
rename to Data/Sys/GameSettings/GCT.ini
index 55a4532ee5..a59fd0baae 100644
--- a/Data/Sys/GameSettings/GHAP08.ini
+++ b/Data/Sys/GameSettings/GCT.ini
@@ -1,4 +1,4 @@
-# GHAP08 - Resident Evil 2
+# GCTE51, GCTP51 - Crazy Taxi
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GCTP51.ini b/Data/Sys/GameSettings/GCTP51.ini
deleted file mode 100644
index 0fc382cada..0000000000
--- a/Data/Sys/GameSettings/GCTP51.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GCTP51 - Crazy Taxi
-
-[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 =
-
-[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/GD6EB2.ini b/Data/Sys/GameSettings/GD6.ini
similarity index 89%
rename from Data/Sys/GameSettings/GD6EB2.ini
rename to Data/Sys/GameSettings/GD6.ini
index 610aef6791..6ca33c532c 100644
--- a/Data/Sys/GameSettings/GD6EB2.ini
+++ b/Data/Sys/GameSettings/GD6.ini
@@ -1,4 +1,4 @@
-# GD6EB2 - Digimon Rumble Arena 2
+# GD6EB2, GD6P70 - Digimon Rumble Arena 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GD9.ini b/Data/Sys/GameSettings/GD9.ini
new file mode 100644
index 0000000000..95efcbdcf2
--- /dev/null
+++ b/Data/Sys/GameSettings/GD9.ini
@@ -0,0 +1,19 @@
+# GD9E69, GD9P69 - Drome Racers
+
+[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.
+
diff --git a/Data/Sys/GameSettings/GD9E69.ini b/Data/Sys/GameSettings/GD9E69.ini
deleted file mode 100644
index f88b436560..0000000000
--- a/Data/Sys/GameSettings/GD9E69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GD9E69 - Drome Racers
-
-[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 = May be slow
-
-[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/GDFE5D.ini b/Data/Sys/GameSettings/GDF.ini
similarity index 82%
rename from Data/Sys/GameSettings/GDFE5D.ini
rename to Data/Sys/GameSettings/GDF.ini
index e95b3c4ca3..62d791a222 100644
--- a/Data/Sys/GameSettings/GDFE5D.ini
+++ b/Data/Sys/GameSettings/GDF.ini
@@ -1,4 +1,4 @@
-# GDFE5D - Defender
+# GDFE5D, GDFP5D - Defender
 
 [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 = 3
-EmulationIssues = Alot GFX Glitches/Bugs
+EmulationIssues = A lot of graphics glitches
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GDIP7D.ini b/Data/Sys/GameSettings/GDI.ini
similarity index 90%
rename from Data/Sys/GameSettings/GDIP7D.ini
rename to Data/Sys/GameSettings/GDI.ini
index 8bf3c76095..78544e2ba0 100644
--- a/Data/Sys/GameSettings/GDIP7D.ini
+++ b/Data/Sys/GameSettings/GDI.ini
@@ -1,4 +1,4 @@
-# GDIP7D - Die Hard Vendetta
+# GDIE7D, GDIP7D - Die Hard Vendetta
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GDIE7D.ini b/Data/Sys/GameSettings/GDIE7D.ini
deleted file mode 100644
index ec7059a0bd..0000000000
--- a/Data/Sys/GameSettings/GDIE7D.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GDIE7D - Die Hard Vendetta
-
-[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
-
diff --git a/Data/Sys/GameSettings/GDTP69.ini b/Data/Sys/GameSettings/GDT.ini
similarity index 92%
rename from Data/Sys/GameSettings/GDTP69.ini
rename to Data/Sys/GameSettings/GDT.ini
index 67857f4fa8..7d536c658c 100644
--- a/Data/Sys/GameSettings/GDTP69.ini
+++ b/Data/Sys/GameSettings/GDT.ini
@@ -1,4 +1,4 @@
-# GDTP69 - Def Jam VENDETTA
+# GDTE69, GDTP69 - Def Jam VENDETTA
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GDVP6L.ini b/Data/Sys/GameSettings/GDV.ini
similarity index 93%
rename from Data/Sys/GameSettings/GDVP6L.ini
rename to Data/Sys/GameSettings/GDV.ini
index 2d07917be8..483486fdae 100644
--- a/Data/Sys/GameSettings/GDVP6L.ini
+++ b/Data/Sys/GameSettings/GDV.ini
@@ -1,5 +1,4 @@
-
-# GDVP6L - Driven
+# GDVE6L, GDVP6L - Driven
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GDVE6L.ini b/Data/Sys/GameSettings/GDVE6L.ini
deleted file mode 100644
index 292392d5a2..0000000000
--- a/Data/Sys/GameSettings/GDVE6L.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GDVE6L - Driven
-
-[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 = Can crash
-
-[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/GCCP01.ini b/Data/Sys/GameSettings/GF7.ini
similarity index 76%
rename from Data/Sys/GameSettings/GCCP01.ini
rename to Data/Sys/GameSettings/GF7.ini
index fde6040740..e8f6eeb012 100644
--- a/Data/Sys/GameSettings/GCCP01.ini
+++ b/Data/Sys/GameSettings/GF7.ini
@@ -1,12 +1,13 @@
-# GCCP01 - FINAL FANTASY Crystal Chronicles
+# GF7E01, GF7P01 - STARFOX ASSAULT
 
 [Core]
 # Values set here will override the main dolphin settings.
+FPRF = True
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues =
+EmulationIssues = EFB must be an integer (integral, 1x, 2x, 3x).
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -26,8 +27,10 @@ PH_ZNear =
 PH_ZFar =
 
 [Video_Settings]
+EFBScale = -1
+
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
-EFBEmulateFormatChanges = True
+EFBToTextureEnable = False
 
diff --git a/Data/Sys/GameSettings/GF8P69.ini b/Data/Sys/GameSettings/GF8.ini
similarity index 93%
rename from Data/Sys/GameSettings/GF8P69.ini
rename to Data/Sys/GameSettings/GF8.ini
index c865400c8c..d0ff3cdfeb 100644
--- a/Data/Sys/GameSettings/GF8P69.ini
+++ b/Data/Sys/GameSettings/GF8.ini
@@ -1,4 +1,4 @@
-# GF8P69 - FIFA Street
+# GF8E69, GF8P69 - FIFA Street
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GFEJ01.ini b/Data/Sys/GameSettings/GFE.ini
similarity index 89%
rename from Data/Sys/GameSettings/GFEJ01.ini
rename to Data/Sys/GameSettings/GFE.ini
index ce27a7c4f7..c1c4ed04da 100644
--- a/Data/Sys/GameSettings/GFEJ01.ini
+++ b/Data/Sys/GameSettings/GFE.ini
@@ -1,4 +1,4 @@
-# GFEJ01 - FIRE EMBLEM GC JAP
+# GFEE01, GFEJ01, GFEP01 - FIRE EMBLEM GC
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GFEE01.ini b/Data/Sys/GameSettings/GFEE01.ini
index 7291ba1d30..30ca9887eb 100644
--- a/Data/Sys/GameSettings/GFEE01.ini
+++ b/Data/Sys/GameSettings/GFEE01.ini
@@ -1,4 +1,4 @@
-# GFEE01 - FIRE EMBLEM GC US
+# GFEE01 - FIRE EMBLEM GC
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GFEP01.ini b/Data/Sys/GameSettings/GFEP01.ini
deleted file mode 100644
index 7ae09bd746..0000000000
--- a/Data/Sys/GameSettings/GFEP01.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# GFEE01 - FIRE EMBLEM GC EU
-
-[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
diff --git a/Data/Sys/GameSettings/G4QP01.ini b/Data/Sys/GameSettings/GFT.ini
similarity index 89%
rename from Data/Sys/GameSettings/G4QP01.ini
rename to Data/Sys/GameSettings/GFT.ini
index e0f88f9a3a..176b38fc58 100644
--- a/Data/Sys/GameSettings/G4QP01.ini
+++ b/Data/Sys/GameSettings/GFT.ini
@@ -1,4 +1,4 @@
-# G4QP01 - Mario Smash Football
+# GFTE01, GFTP01 - Mario Golf Toadstool Tour
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GFTE01.ini b/Data/Sys/GameSettings/GFTE01.ini
deleted file mode 100644
index 3f3ba97745..0000000000
--- a/Data/Sys/GameSettings/GFTE01.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# GFTE01 - MarioGolf Toadstool Tour
-
-[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
diff --git a/Data/Sys/GameSettings/GFTP01.ini b/Data/Sys/GameSettings/GFTP01.ini
deleted file mode 100644
index 7d1cd1471b..0000000000
--- a/Data/Sys/GameSettings/GFTP01.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# GFTP01 - MarioGolf Toadstool Tour
-
-[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 = Graphical glitches
-
-[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/GFYP69.ini b/Data/Sys/GameSettings/GFY.ini
similarity index 92%
rename from Data/Sys/GameSettings/GFYP69.ini
rename to Data/Sys/GameSettings/GFY.ini
index a860ab52a4..3e02de07ff 100644
--- a/Data/Sys/GameSettings/GFYP69.ini
+++ b/Data/Sys/GameSettings/GFY.ini
@@ -1,4 +1,4 @@
-# GFYP69 - FIFA Street 2
+# GFYE69, GFYP69 - FIFA Street 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/JACP01.ini b/Data/Sys/GameSettings/GFZ.ini
similarity index 74%
rename from Data/Sys/GameSettings/JACP01.ini
rename to Data/Sys/GameSettings/GFZ.ini
index 4bded5dfc0..5ea6f7d3cd 100644
--- a/Data/Sys/GameSettings/JACP01.ini
+++ b/Data/Sys/GameSettings/GFZ.ini
@@ -1,4 +1,5 @@
-# JACP01 - F-Zero
+# GFZE01, GFZJ01, GFZP01 - F-Zero GX
+# GFZJ8P - F-Zero AX
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -7,7 +8,7 @@ FPRF = True
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues =
+EmulationIssues = Needs Synchronize GPU thread for stability.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -23,6 +24,6 @@ ProjectionHack = 0
 PH_SZNear = 0
 PH_SZFar = 0
 PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
+PH_ZNear = 
+PH_ZFar = 
 
diff --git a/Data/Sys/GameSettings/GFZE01.ini b/Data/Sys/GameSettings/GFZE01.ini
index ef5ee26473..e90c43a027 100644
--- a/Data/Sys/GameSettings/GFZE01.ini
+++ b/Data/Sys/GameSettings/GFZE01.ini
@@ -1,4 +1,4 @@
-# GFZE01 - F-ZERO GX (US Version)
+# GFZE01 - F-Zero GX
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GFZJ01.ini b/Data/Sys/GameSettings/GFZJ01.ini
index 699aeb8efc..1aff70bece 100644
--- a/Data/Sys/GameSettings/GFZJ01.ini
+++ b/Data/Sys/GameSettings/GFZJ01.ini
@@ -1,4 +1,4 @@
-# GFZJ01 - F-ZERO GX
+# GFZJ01 - F-Zero GX
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GFZJ8P.ini b/Data/Sys/GameSettings/GFZJ8P.ini
index 59ce9d7f58..bf85eaaa36 100644
--- a/Data/Sys/GameSettings/GFZJ8P.ini
+++ b/Data/Sys/GameSettings/GFZJ8P.ini
@@ -1,7 +1,9 @@
 # GFZJ8P - F-Zero AX
+# Because Triforce games have weird IDs, properties are inherited from GFZ.ini (F-Zero GX)!
 
 [Core]
 # Values set here will override the main dolphin settings.
+FPRF = True
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
@@ -18,7 +20,10 @@ EmulationIssues = Crashes on startup (Triforce game)
 # Add action replay cheats here.
 
 [Video]
-# Add memory patches to be applied every frame here.
-
-[Video_Settings]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 
diff --git a/Data/Sys/GameSettings/GFZP01.ini b/Data/Sys/GameSettings/GFZP01.ini
index 89d9b7833a..64bdc34931 100644
--- a/Data/Sys/GameSettings/GFZP01.ini
+++ b/Data/Sys/GameSettings/GFZP01.ini
@@ -1,4 +1,4 @@
-# GFZP01 - F-ZERO GX (PAL)
+# GFZP01 - F-Zero GX
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GG4.ini b/Data/Sys/GameSettings/GG4.ini
new file mode 100644
index 0000000000..a6f7b18ca6
--- /dev/null
+++ b/Data/Sys/GameSettings/GG4.ini
@@ -0,0 +1,19 @@
+# GG4E08, GG4P08 - GOTCHA 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 =
+
+[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/GGCE0A.ini b/Data/Sys/GameSettings/GGC.ini
similarity index 100%
rename from Data/Sys/GameSettings/GGCE0A.ini
rename to Data/Sys/GameSettings/GGC.ini
diff --git a/Data/Sys/GameSettings/GGCOSD.ini b/Data/Sys/GameSettings/GGCOSD.ini
index a0dc9be610..c52eddacd0 100644
--- a/Data/Sys/GameSettings/GGCOSD.ini
+++ b/Data/Sys/GameSettings/GGCOSD.ini
@@ -1,4 +1,5 @@
 # GGCOSD - GCOS MultiGame DVD (C) GCOS TEAM
+# Because this title has a weird ID, properties are inherited from GGC.ini (Goblin Commander)!
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GGP.ini b/Data/Sys/GameSettings/GGP.ini
index 533a8fe8b2..5b23cbe21b 100644
--- a/Data/Sys/GameSettings/GGP.ini
+++ b/Data/Sys/GameSettings/GGP.ini
@@ -1,12 +1,11 @@
-# GGPE01, GGPE02 - Mario Kart GP
+# GGPJB2 - SD Gundam Gashapon Wars
 
 [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)
+EmulationStateId = 4
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,8 +16,3 @@ EmulationIssues = Crashes on startup (Triforce game)
 [ActionReplay]
 # Add action replay cheats here.
 
-[Video]
-# Add memory patches to be applied every frame here.
-
-[Video_Settings]
-
diff --git a/Data/Sys/GameSettings/G4SE01.ini b/Data/Sys/GameSettings/GGPE01.ini
similarity index 57%
rename from Data/Sys/GameSettings/G4SE01.ini
rename to Data/Sys/GameSettings/GGPE01.ini
index ddd5f8b23d..c726035ddf 100644
--- a/Data/Sys/GameSettings/G4SE01.ini
+++ b/Data/Sys/GameSettings/GGPE01.ini
@@ -1,12 +1,13 @@
-# G4SE01 - The Legend of Zelda: Four Swords FOR NINTENDO GAMECUBE
+# GGPE01 - Mario Kart GP
+# Because Triforce games have weird IDs, properties are inherited from GGP.ini (SD Gundam Gashapon Wars)!
 
 [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 =
+EmulationStateId = 1
+EmulationIssues = Crashes on startup (Triforce game)
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,13 +19,7 @@ EmulationIssues =
 # Add action replay cheats here.
 
 [Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
+# Add memory patches to be applied every frame here.
 
 [Video_Settings]
-SafeTextureCacheColorSamples = 512
 
diff --git a/Data/Sys/GameSettings/GGPE02.ini b/Data/Sys/GameSettings/GGPE02.ini
new file mode 100644
index 0000000000..57180e13aa
--- /dev/null
+++ b/Data/Sys/GameSettings/GGPE02.ini
@@ -0,0 +1,25 @@
+# GGPE02 - Mario Kart GP 2
+# Because Triforce games have weird IDs, properties are inherited from GGP.ini (SD Gundam Gashapon Wars)!
+
+[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/GAFP01.ini b/Data/Sys/GameSettings/GGS.ini
similarity index 89%
rename from Data/Sys/GameSettings/GAFP01.ini
rename to Data/Sys/GameSettings/GGS.ini
index 5870da1fa6..dce505671d 100644
--- a/Data/Sys/GameSettings/GAFP01.ini
+++ b/Data/Sys/GameSettings/GGS.ini
@@ -1,4 +1,4 @@
-# GAFP01 - Animal Crossing
+# GGSEA4, GGSJA4, GGSPA4 - METAL GEAR SOLID THE TWIN SNAKES
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GGSEA4.ini b/Data/Sys/GameSettings/GGSEA4.ini
deleted file mode 100644
index 26cdebe3ea..0000000000
--- a/Data/Sys/GameSettings/GGSEA4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GGSEA4 - METAL GEAR SOLID THE TWIN SNAKES
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GGSJA4.ini b/Data/Sys/GameSettings/GGSJA4.ini
deleted file mode 100644
index 7f5c3d5c53..0000000000
--- a/Data/Sys/GameSettings/GGSJA4.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GGSJA4 - METAL GEAR SOLID THE TWIN SNAKES
-
-[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.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GCTE51.ini b/Data/Sys/GameSettings/GGT.ini
similarity index 91%
rename from Data/Sys/GameSettings/GCTE51.ini
rename to Data/Sys/GameSettings/GGT.ini
index 8a0591560e..787f960aa0 100644
--- a/Data/Sys/GameSettings/GCTE51.ini
+++ b/Data/Sys/GameSettings/GGT.ini
@@ -1,4 +1,4 @@
-# GCTE51 - Crazy Taxi
+# GGTE01, GGTP01 - ChibiRobo!
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GD6P70.ini b/Data/Sys/GameSettings/GHA.ini
similarity index 90%
rename from Data/Sys/GameSettings/GD6P70.ini
rename to Data/Sys/GameSettings/GHA.ini
index c3e2f09ca3..3a4d082c42 100644
--- a/Data/Sys/GameSettings/GD6P70.ini
+++ b/Data/Sys/GameSettings/GHA.ini
@@ -1,4 +1,4 @@
-# GD6P70 - Digimon Rumble Arena 2
+# GHAE08, GHAP08 - Resident Evil 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GHM.ini b/Data/Sys/GameSettings/GHM.ini
index 3ea2a68b74..b1055c86ae 100644
--- a/Data/Sys/GameSettings/GHM.ini
+++ b/Data/Sys/GameSettings/GHM.ini
@@ -1,4 +1,4 @@
-# GHMD4F, GHMF4F, GHMP4F - Hitman 2: Silent Assassin
+# GHMD4F, GHME4F, GHMF4F, GHMP4F - Hitman 2: Silent Assassin
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GHV.ini b/Data/Sys/GameSettings/GHV.ini
new file mode 100644
index 0000000000..71b87f9345
--- /dev/null
+++ b/Data/Sys/GameSettings/GHV.ini
@@ -0,0 +1,19 @@
+# GHVE08, GHVP08 - Disney's Hide & Sneak
+
+[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.
+
diff --git a/Data/Sys/GameSettings/GHVP08.ini b/Data/Sys/GameSettings/GHVP08.ini
deleted file mode 100644
index c2585140a9..0000000000
--- a/Data/Sys/GameSettings/GHVP08.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GHVP08 - Disney's Hide & Sneak
-
-[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.
-
diff --git a/Data/Sys/GameSettings/GIC.ini b/Data/Sys/GameSettings/GIC.ini
index 09b69e78b1..ff616e5614 100644
--- a/Data/Sys/GameSettings/GIC.ini
+++ b/Data/Sys/GameSettings/GIC.ini
@@ -1,4 +1,4 @@
-# GICD78, GICF78, GICJG9, GICP78 - The Incredibles
+# GICD78, GICE78, GICF78, GICH78, GICJG9, GICP78 - The Incredibles
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GICH78.ini b/Data/Sys/GameSettings/GICH78.ini
deleted file mode 100644
index 730418f0c6..0000000000
--- a/Data/Sys/GameSettings/GICH78.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# GICH78 - The Incredibles
-
-[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 =
-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_Hacks]
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GIKP70.ini b/Data/Sys/GameSettings/GIK.ini
similarity index 92%
rename from Data/Sys/GameSettings/GIKP70.ini
rename to Data/Sys/GameSettings/GIK.ini
index 63fbc94fc8..db0c168c93 100644
--- a/Data/Sys/GameSettings/GIKP70.ini
+++ b/Data/Sys/GameSettings/GIK.ini
@@ -1,4 +1,4 @@
-# GIKP70 - IKARUGA
+# GIKE70, GIKP70 - IKARUGA
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GIKE70.ini b/Data/Sys/GameSettings/GIKE70.ini
deleted file mode 100644
index f149fe5cc2..0000000000
--- a/Data/Sys/GameSettings/GIKE70.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GIKE70 - IKARUGA
-
-[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]
-# 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/GIN.ini b/Data/Sys/GameSettings/GIN.ini
new file mode 100644
index 0000000000..4780fe0daa
--- /dev/null
+++ b/Data/Sys/GameSettings/GIN.ini
@@ -0,0 +1,19 @@
+# GINE69, GINX69 - Batman
+
+[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 = FPS drops to 20 in some areas (don't know if this is normal)
+
+[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/GINE69.ini b/Data/Sys/GameSettings/GINE69.ini
index a410b60f12..2d4102130e 100644
--- a/Data/Sys/GameSettings/GINE69.ini
+++ b/Data/Sys/GameSettings/GINE69.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = FPS drops to 20 in some areas(don't know if this is normal)
+EmulationIssues = FPS drops to 20 in some areas (don't know if this is normal)
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GK4J01.ini b/Data/Sys/GameSettings/GK4.ini
similarity index 88%
rename from Data/Sys/GameSettings/GK4J01.ini
rename to Data/Sys/GameSettings/GK4.ini
index bd1e43e9b3..30275cf3ef 100644
--- a/Data/Sys/GameSettings/GK4J01.ini
+++ b/Data/Sys/GameSettings/GK4.ini
@@ -1,4 +1,4 @@
-# GK4J01 - Baten Kaitos II: Hajimari no Tsubasa to Kamigami no Shishi
+# GK4E01, GK4J01 - Baten Kaitos Origins
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GKBPAF.ini b/Data/Sys/GameSettings/GKB.ini
similarity index 88%
rename from Data/Sys/GameSettings/GKBPAF.ini
rename to Data/Sys/GameSettings/GKB.ini
index 9f41bf9919..da0064b0e4 100644
--- a/Data/Sys/GameSettings/GKBPAF.ini
+++ b/Data/Sys/GameSettings/GKB.ini
@@ -1,4 +1,4 @@
-# GKBPAF - Baten Kaitos Eternal Wings and the Lost Ocean
+# GKBEAF, GKBJAF, GKBPAF - Baten Kaitos Eternal Wings and the Lost Ocean
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GKBJAF.ini b/Data/Sys/GameSettings/GKBJAF.ini
deleted file mode 100644
index 829aa45850..0000000000
--- a/Data/Sys/GameSettings/GKBJAF.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# GKBJAF - Baten Kaitos: Owaranai Tsubasa to Ushinawareta Umi
-
-[Core]
-# Values set here will override the main dolphin settings.
-CPUThread = 0
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = False
-EFBToTextureEnable = False
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/GKSE52.ini b/Data/Sys/GameSettings/GKS.ini
similarity index 89%
rename from Data/Sys/GameSettings/GKSE52.ini
rename to Data/Sys/GameSettings/GKS.ini
index 29322e21d2..6da61f60b5 100644
--- a/Data/Sys/GameSettings/GKSE52.ini
+++ b/Data/Sys/GameSettings/GKS.ini
@@ -1,12 +1,12 @@
-# GKSE52 - Kelly Slater's Pro Surfer
+# GKSE52, GKSP52, GKSX52 - Kelly Slater's Pro Surfer
 
 [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 = 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/GKSP52.ini b/Data/Sys/GameSettings/GKSP52.ini
deleted file mode 100644
index 39e9f710eb..0000000000
--- a/Data/Sys/GameSettings/GKSP52.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GKSP52 - Kelly Slater's Pro Surfer
-
-[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 xfb for the videos to work.
-
-[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_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GKSX52.ini b/Data/Sys/GameSettings/GKSX52.ini
deleted file mode 100644
index aa22fa9280..0000000000
--- a/Data/Sys/GameSettings/GKSX52.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GKSX52 - Kelly Slater's Pro Surfer
-
-[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 xfb for the videos to work.
-
-[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_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GKZ.ini b/Data/Sys/GameSettings/GKZ.ini
index c66744f379..eec939b45c 100644
--- a/Data/Sys/GameSettings/GKZ.ini
+++ b/Data/Sys/GameSettings/GKZ.ini
@@ -1,4 +1,4 @@
-# GKZD9G, GKZE9G, GKZF9G, GKZP54 - Codename: Kids Next Door
+# GKZD9G, GKZE9G, GKZF9G, GKZP54, GKZP9G - Codename: Kids Next Door
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GKZP9G.ini b/Data/Sys/GameSettings/GKZP9G.ini
deleted file mode 100644
index 554c6d5a0b..0000000000
--- a/Data/Sys/GameSettings/GKZP9G.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GKZP9G - Codename: Kids Next Door
-
-[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 xfb for the videos to work.
-
-[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_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GGTP01.ini b/Data/Sys/GameSettings/GLE.ini
similarity index 90%
rename from Data/Sys/GameSettings/GGTP01.ini
rename to Data/Sys/GameSettings/GLE.ini
index b9c70301a4..7ddc2e0685 100644
--- a/Data/Sys/GameSettings/GGTP01.ini
+++ b/Data/Sys/GameSettings/GLE.ini
@@ -1,4 +1,4 @@
-# GGTP01 - ChibiRobo!
+# GLEE08, GLEP08 - Resident Evil 3
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GLEE08.ini b/Data/Sys/GameSettings/GLEE08.ini
deleted file mode 100644
index ff7cd32d8f..0000000000
--- a/Data/Sys/GameSettings/GLEE08.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GLEE08 - Resident Evil 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 = 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.
-
diff --git a/Data/Sys/GameSettings/GLEP08.ini b/Data/Sys/GameSettings/GLEP08.ini
deleted file mode 100644
index 2bbc01969d..0000000000
--- a/Data/Sys/GameSettings/GLEP08.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GLEP08 - Resident Evil 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 = 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.
-
diff --git a/Data/Sys/GameSettings/D43U01.ini b/Data/Sys/GameSettings/GLM.ini
similarity index 89%
rename from Data/Sys/GameSettings/D43U01.ini
rename to Data/Sys/GameSettings/GLM.ini
index a7055cf4a3..ea61b1e207 100644
--- a/Data/Sys/GameSettings/D43U01.ini
+++ b/Data/Sys/GameSettings/GLM.ini
@@ -1,4 +1,4 @@
-# D43U01 - ZELDA OCARINA MULTI PACK
+# GLME01, GLMJ01, GLMJ01 - LUIGI'S MANSION
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -19,4 +19,3 @@ EmulationIssues =
 
 [Video]
 ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GLN.ini b/Data/Sys/GameSettings/GLN.ini
new file mode 100644
index 0000000000..14e67084f4
--- /dev/null
+++ b/Data/Sys/GameSettings/GLN.ini
@@ -0,0 +1,27 @@
+# GLNE69, GLNP69 - Looney Tunes Back In Action
+
+[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
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GDFP5D.ini b/Data/Sys/GameSettings/GLO.ini
similarity index 90%
rename from Data/Sys/GameSettings/GDFP5D.ini
rename to Data/Sys/GameSettings/GLO.ini
index b2a93e6d1d..ec0730fe62 100644
--- a/Data/Sys/GameSettings/GDFP5D.ini
+++ b/Data/Sys/GameSettings/GLO.ini
@@ -1,4 +1,4 @@
-# GDFP5D - Defender
+# GLOE69, GLOP69 - The Two Towers
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GM4J01.ini b/Data/Sys/GameSettings/GM4.ini
similarity index 89%
rename from Data/Sys/GameSettings/GM4J01.ini
rename to Data/Sys/GameSettings/GM4.ini
index 8186407306..178c8ef222 100644
--- a/Data/Sys/GameSettings/GM4J01.ini
+++ b/Data/Sys/GameSettings/GM4.ini
@@ -1,4 +1,4 @@
-# GM4J01 - Mario Kart: Double Dash!!
+# GM4E01, GM4J01, GM4P01 - Mario Kart: Double Dash!!
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GM8J01.ini b/Data/Sys/GameSettings/GM8.ini
similarity index 92%
rename from Data/Sys/GameSettings/GM8J01.ini
rename to Data/Sys/GameSettings/GM8.ini
index 81d3c52a92..6b77f49f4e 100644
--- a/Data/Sys/GameSettings/GM8J01.ini
+++ b/Data/Sys/GameSettings/GM8.ini
@@ -1,4 +1,4 @@
-# GM8E01 - Metroid Prime
+# GM8E01, GM8J01, GM8P01 - Metroid Prime
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GM8P01.ini b/Data/Sys/GameSettings/GM8P01.ini
deleted file mode 100644
index b42a6c1138..0000000000
--- a/Data/Sys/GameSettings/GM8P01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GM8P01 - Metroid Prime
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/RSMP8P.ini b/Data/Sys/GameSettings/GMB.ini
similarity index 89%
rename from Data/Sys/GameSettings/RSMP8P.ini
rename to Data/Sys/GameSettings/GMB.ini
index f8fadf4e87..677a0b9257 100644
--- a/Data/Sys/GameSettings/RSMP8P.ini
+++ b/Data/Sys/GameSettings/GMB.ini
@@ -1,4 +1,4 @@
-# RSMP8P - SUPER MONKEY BALL BANANA BLITZ
+# GMBE8P, GMBJ8P, GMBP8P - Super Monkey Ball
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GMBE8P.ini b/Data/Sys/GameSettings/GMBE8P.ini
deleted file mode 100644
index 0bee51c94b..0000000000
--- a/Data/Sys/GameSettings/GMBE8P.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GMBE8P - Super Monkey Ball (U)
-
-[Core]
-# Values set here will override the main dolphin settings.
-FPRF = True
-
-[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
-
diff --git a/Data/Sys/GameSettings/GMBJ8P.ini b/Data/Sys/GameSettings/GMBJ8P.ini
deleted file mode 100644
index 73d5dcddcd..0000000000
--- a/Data/Sys/GameSettings/GMBJ8P.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GMBJ8P - Super Monkey Ball
-
-[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.
-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
diff --git a/Data/Sys/GameSettings/GMBP8P.ini b/Data/Sys/GameSettings/GMBP8P.ini
deleted file mode 100644
index 21c3140ade..0000000000
--- a/Data/Sys/GameSettings/GMBP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# GMBP8P - Super Monkey Ball (PAL)
-
-[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.
-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
-
diff --git a/Data/Sys/GameSettings/GLMJ01.ini b/Data/Sys/GameSettings/GMP.ini
similarity index 90%
rename from Data/Sys/GameSettings/GLMJ01.ini
rename to Data/Sys/GameSettings/GMP.ini
index ad6d9bf5ab..3da7abff3f 100644
--- a/Data/Sys/GameSettings/GLMJ01.ini
+++ b/Data/Sys/GameSettings/GMP.ini
@@ -1,4 +1,4 @@
-# GLMJ01 - LUIGI'S MANSION
+# GMPE01, GMPJ01, GMPP01 - Mario Party 4
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GMPJ01.ini b/Data/Sys/GameSettings/GMPJ01.ini
deleted file mode 100644
index 60afbffeff..0000000000
--- a/Data/Sys/GameSettings/GMPJ01.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# GMPJ01 - Mario Party 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 = 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
diff --git a/Data/Sys/GameSettings/GMSJ01.ini b/Data/Sys/GameSettings/GMS.ini
similarity index 92%
rename from Data/Sys/GameSettings/GMSJ01.ini
rename to Data/Sys/GameSettings/GMS.ini
index fb689d6927..4cd50c6bcf 100644
--- a/Data/Sys/GameSettings/GMSJ01.ini
+++ b/Data/Sys/GameSettings/GMS.ini
@@ -1,4 +1,4 @@
-# GMSJ01 - Super Mario Sunshine
+# GMSE01, GMSJ01, GMSP01 - Super Mario Sunshine
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GMXJB2.ini b/Data/Sys/GameSettings/GMX.ini
similarity index 92%
rename from Data/Sys/GameSettings/GMXJB2.ini
rename to Data/Sys/GameSettings/GMX.ini
index 8b714a3428..1c63129f02 100644
--- a/Data/Sys/GameSettings/GMXJB2.ini
+++ b/Data/Sys/GameSettings/GMX.ini
@@ -1,4 +1,4 @@
-# GMXJB2 - Enter The Matrix
+# GMXE70, GMXJB2, GMXP70 - Enter The Matrix
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GMXP70.ini b/Data/Sys/GameSettings/GMXP70.ini
deleted file mode 100644
index b100edef18..0000000000
--- a/Data/Sys/GameSettings/GMXP70.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GMXP70 - Enter The Matrix
-
-[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 xfb for the videos to display.
-
-[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_Hacks]
-EFBToTextureEnable = False
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GN5E69.ini b/Data/Sys/GameSettings/GN5.ini
similarity index 94%
rename from Data/Sys/GameSettings/GN5E69.ini
rename to Data/Sys/GameSettings/GN5.ini
index 6553c10114..31fb74d5b4 100644
--- a/Data/Sys/GameSettings/GN5E69.ini
+++ b/Data/Sys/GameSettings/GN5.ini
@@ -1,4 +1,4 @@
-# GN5E69 - NHL 2005
+# GN5E69, GN5P69 - NHL 2005
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -24,4 +24,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear =
 PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GNHP5d.ini b/Data/Sys/GameSettings/GNH.ini
similarity index 93%
rename from Data/Sys/GameSettings/GNHP5d.ini
rename to Data/Sys/GameSettings/GNH.ini
index de3c0387ff..7e611e3c94 100644
--- a/Data/Sys/GameSettings/GNHP5d.ini
+++ b/Data/Sys/GameSettings/GNH.ini
@@ -1,4 +1,4 @@
-# GNHP5d - NHL HITZ 2002
+# GNHE5D, GNHP5D - NHL HITZ 2002
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GLNP69.ini b/Data/Sys/GameSettings/GNW.ini
similarity index 91%
rename from Data/Sys/GameSettings/GLNP69.ini
rename to Data/Sys/GameSettings/GNW.ini
index df31a28854..12c5f028a5 100644
--- a/Data/Sys/GameSettings/GLNP69.ini
+++ b/Data/Sys/GameSettings/GNW.ini
@@ -1,4 +1,4 @@
-# GLNP69 - Looney Tunes Back In Action
+# GNWE69, GNWP69 - Def Jam Fight For NY
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GLOP69.ini b/Data/Sys/GameSettings/GO7.ini
similarity index 85%
rename from Data/Sys/GameSettings/GLOP69.ini
rename to Data/Sys/GameSettings/GO7.ini
index beb2da0c45..fddf08bcde 100644
--- a/Data/Sys/GameSettings/GLOP69.ini
+++ b/Data/Sys/GameSettings/GO7.ini
@@ -1,4 +1,4 @@
-# GLOP69 - The Two Towers
+# GO7E69, GO7F69, GO7P69 - James Bond 007(tm): NightFire(tm)
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -16,7 +16,3 @@ EmulationIssues =
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GO7E69.ini b/Data/Sys/GameSettings/GO7E69.ini
index e293f3e4ad..b4f0797b24 100644
--- a/Data/Sys/GameSettings/GO7E69.ini
+++ b/Data/Sys/GameSettings/GO7E69.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Levels involving vehicles crash the emulator.
 EmulationStateId = 3
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GO7F69.ini b/Data/Sys/GameSettings/GO7F69.ini
index fdac6d9f33..ce8e825fff 100644
--- a/Data/Sys/GameSettings/GO7F69.ini
+++ b/Data/Sys/GameSettings/GO7F69.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = needs optimize quantizers off
-EmulationStateId = 5
+EmulationStateId = 3
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GO7P69.ini b/Data/Sys/GameSettings/GO7P69.ini
index 796d7590e5..42624c6cfc 100644
--- a/Data/Sys/GameSettings/GO7P69.ini
+++ b/Data/Sys/GameSettings/GO7P69.ini
@@ -5,7 +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/GCBP7D.ini b/Data/Sys/GameSettings/GOP.ini
similarity index 87%
rename from Data/Sys/GameSettings/GCBP7D.ini
rename to Data/Sys/GameSettings/GOP.ini
index c11ea1e3d9..8620347f23 100644
--- a/Data/Sys/GameSettings/GCBP7D.ini
+++ b/Data/Sys/GameSettings/GOP.ini
@@ -1,4 +1,4 @@
-# GCBP7D - Crash Bandicoot:The Wrath of Cortex
+# GOPEB2, GOPJB2 - ONE PIECE GRAND BATTLE RUSH
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GOPEB2.ini b/Data/Sys/GameSettings/GOPEB2.ini
deleted file mode 100644
index d965f88649..0000000000
--- a/Data/Sys/GameSettings/GOPEB2.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GOPEB2 - ONE PIECE GRAND BATTLE
-
-[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.
-
diff --git a/Data/Sys/GameSettings/GOPJB2.ini b/Data/Sys/GameSettings/GOPJB2.ini
deleted file mode 100644
index f09531025b..0000000000
--- a/Data/Sys/GameSettings/GOPJB2.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GOPJB2 - ONE PIECE GRAND BATTLE RUSH
-
-[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.
-
diff --git a/Data/Sys/GameSettings/GP5P01.ini b/Data/Sys/GameSettings/GP5.ini
similarity index 92%
rename from Data/Sys/GameSettings/GP5P01.ini
rename to Data/Sys/GameSettings/GP5.ini
index 91f53f9826..10077d40ed 100644
--- a/Data/Sys/GameSettings/GP5P01.ini
+++ b/Data/Sys/GameSettings/GP5.ini
@@ -1,4 +1,4 @@
-# GP5P01 - Mario Party 5
+# GP5E01, GP5J01, GP5P01 - Mario Party 5
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GP5J01.ini b/Data/Sys/GameSettings/GP5J01.ini
deleted file mode 100644
index d13b1497ff..0000000000
--- a/Data/Sys/GameSettings/GP5J01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GP5J01 - Mario Party 5
-
-[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]
-# 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_Hacks]
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/GP7J01.ini b/Data/Sys/GameSettings/GP7.ini
similarity index 91%
rename from Data/Sys/GameSettings/GP7J01.ini
rename to Data/Sys/GameSettings/GP7.ini
index 679e57374c..505b85a8a0 100644
--- a/Data/Sys/GameSettings/GP7J01.ini
+++ b/Data/Sys/GameSettings/GP7.ini
@@ -1,4 +1,4 @@
-# GP7J01 - Mario Party 7
+# GP7E01, GP7J01, GP7P01 - Mario Party 7
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GPIJ01.ini b/Data/Sys/GameSettings/GPI.ini
similarity index 91%
rename from Data/Sys/GameSettings/GPIJ01.ini
rename to Data/Sys/GameSettings/GPI.ini
index b2e2075b30..a4fed63461 100644
--- a/Data/Sys/GameSettings/GPIJ01.ini
+++ b/Data/Sys/GameSettings/GPI.ini
@@ -1,4 +1,4 @@
-# GPIJ01 - Pikmin
+# GPIE01, GPIJ01, GPIP01 - Pikmin
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GGPJB2.ini b/Data/Sys/GameSettings/GPN.ini
similarity index 92%
rename from Data/Sys/GameSettings/GGPJB2.ini
rename to Data/Sys/GameSettings/GPN.ini
index 97e5d77a35..a463193a37 100644
--- a/Data/Sys/GameSettings/GGPJB2.ini
+++ b/Data/Sys/GameSettings/GPN.ini
@@ -1,4 +1,4 @@
-# GGPJB2 - SD GUNDAM1
+# GPNE08, GPNP08 - P.N.03
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GPNE08.ini b/Data/Sys/GameSettings/GPNE08.ini
deleted file mode 100644
index 7bfbca1a30..0000000000
--- a/Data/Sys/GameSettings/GPNE08.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GPNE08 - P.N.03
-
-[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.
-
diff --git a/Data/Sys/GameSettings/GAFJ01.ini b/Data/Sys/GameSettings/GPO.ini
similarity index 89%
rename from Data/Sys/GameSettings/GAFJ01.ini
rename to Data/Sys/GameSettings/GPO.ini
index dff5e663b7..7c69bf4021 100644
--- a/Data/Sys/GameSettings/GAFJ01.ini
+++ b/Data/Sys/GameSettings/GPO.ini
@@ -1,4 +1,4 @@
-# GAFJ01 - Doubutsu no Mori Plus
+# GPOE8P, GPOJ8P, GPOP8P - PHANTASY STAR ONLINE EPISODE I&II
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GPOJ8P.ini b/Data/Sys/GameSettings/GPOJ8P.ini
deleted file mode 100644
index a7dc099f11..0000000000
--- a/Data/Sys/GameSettings/GPOJ8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GPOJ8P - PHANTASY STAR ONLINE EPISODE I&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
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GPOP8P.ini b/Data/Sys/GameSettings/GPOP8P.ini
index 144a5a0749..4c27ae2407 100644
--- a/Data/Sys/GameSettings/GPOP8P.ini
+++ b/Data/Sys/GameSettings/GPOP8P.ini
@@ -1,4 +1,4 @@
-# GPOP8P - PSO EPISODE I&II
+# GPOP8P - PHANTASY STAR ONLINE EPISODE I&II
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GPSE8P.ini b/Data/Sys/GameSettings/GPS.ini
similarity index 91%
rename from Data/Sys/GameSettings/GPSE8P.ini
rename to Data/Sys/GameSettings/GPS.ini
index cb14858c2f..f9a8840813 100644
--- a/Data/Sys/GameSettings/GPSE8P.ini
+++ b/Data/Sys/GameSettings/GPS.ini
@@ -1,4 +1,4 @@
-# GPSE8P - PSO CARD BATTLE
+# GPSE8P, GPSP8P - PHANTASY STAR ONLINE EPISODE III
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GN5P69.ini b/Data/Sys/GameSettings/GPV.ini
similarity index 90%
rename from Data/Sys/GameSettings/GN5P69.ini
rename to Data/Sys/GameSettings/GPV.ini
index 1d1c90c376..7fb8cdf2a7 100644
--- a/Data/Sys/GameSettings/GN5P69.ini
+++ b/Data/Sys/GameSettings/GPV.ini
@@ -1,4 +1,4 @@
-# GN5P69 - NHL 2005
+# GPVE01, GPVJ01, GPVP01 - PIKMIN2 for GAMECUBE
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GPVJ01.ini b/Data/Sys/GameSettings/GPVJ01.ini
deleted file mode 100644
index 873253ecc9..0000000000
--- a/Data/Sys/GameSettings/GPVJ01.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GPVJ01 - PIKMIN2 for GAMECUBE
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
diff --git a/Data/Sys/GameSettings/GPVP01.ini b/Data/Sys/GameSettings/GPVP01.ini
deleted file mode 100644
index 5d6635412f..0000000000
--- a/Data/Sys/GameSettings/GPVP01.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GPVP01 - PIKMIN2 for GAMECUBE
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
diff --git a/Data/Sys/GameSettings/GPX.ini b/Data/Sys/GameSettings/GPX.ini
index e6ecd59847..fe94b2c10b 100644
--- a/Data/Sys/GameSettings/GPX.ini
+++ b/Data/Sys/GameSettings/GPX.ini
@@ -1,4 +1,4 @@
-# GPXE01, GPXP01 - POKeMON BOX RUBY&SAPPHIRE
+# GPXE01, GPXJ01, GPXP01 - POKeMON BOX RUBY&SAPPHIRE
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GPXJ01.ini b/Data/Sys/GameSettings/GPXJ01.ini
deleted file mode 100644
index ab4233ccb2..0000000000
--- a/Data/Sys/GameSettings/GPXJ01.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GPXJ01 - 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
-
-[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/GQC.ini b/Data/Sys/GameSettings/GQC.ini
index 24ed6c2903..eeeae0f739 100644
--- a/Data/Sys/GameSettings/GQC.ini
+++ b/Data/Sys/GameSettings/GQC.ini
@@ -1,4 +1,4 @@
-# GQCD52, GQCE52, GQCF52, GQCP52, GQCS52 - Call of Duty 2: Big Red One
+# GQCD52, GQCE52, GQCF52, GQCI52, GQCP52, GQCS52 - Call of Duty 2: Big Red One
 [Core]
 # Values set here will override the main dolphin settings.
 MMU = 1
diff --git a/Data/Sys/GameSettings/GQCI52.ini b/Data/Sys/GameSettings/GQCI52.ini
deleted file mode 100644
index 5c4a86a220..0000000000
--- a/Data/Sys/GameSettings/GQCI52.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GQCI52 - Call of Duty 2: Big Red One
-[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.
-EmulationIssues = Slow because it needs mmu to run.
-EmulationStateId = 4
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Geck
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/GQS.ini b/Data/Sys/GameSettings/GQS.ini
index 1af03fc1ee..b9119d79d8 100644
--- a/Data/Sys/GameSettings/GQS.ini
+++ b/Data/Sys/GameSettings/GQS.ini
@@ -1,4 +1,4 @@
-# GQSDAF, GQSFAF, GQSPAF - TALES OF SYMPHONIA
+# GQSDAF, GQSEAF, GQSFAF, GQSPAF - TALES OF SYMPHONIA
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/D43P01.ini b/Data/Sys/GameSettings/GRE.ini
similarity index 88%
rename from Data/Sys/GameSettings/D43P01.ini
rename to Data/Sys/GameSettings/GRE.ini
index 498437161f..3f6827667d 100644
--- a/Data/Sys/GameSettings/D43P01.ini
+++ b/Data/Sys/GameSettings/GRE.ini
@@ -1,4 +1,4 @@
-# D43P01 - The Legend of Zelda: Ocarina of Time
+# GREE08, GREP08 - MEGAMAN NETWORK TRANSMISSION
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GREP08.ini b/Data/Sys/GameSettings/GREP08.ini
deleted file mode 100644
index 83f669465e..0000000000
--- a/Data/Sys/GameSettings/GREP08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GREP08 - MEGAMAN NETWORK TRANSMISSION
-
-[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
-
diff --git a/Data/Sys/GameSettings/GRHP41.ini b/Data/Sys/GameSettings/GRH.ini
similarity index 91%
rename from Data/Sys/GameSettings/GRHP41.ini
rename to Data/Sys/GameSettings/GRH.ini
index 238f5b95f6..b1ac1533ea 100644
--- a/Data/Sys/GameSettings/GRHP41.ini
+++ b/Data/Sys/GameSettings/GRH.ini
@@ -1,4 +1,4 @@
-# GRHP41 - RAYMAN 3 HOODLUM HAVOC
+# GRHE41, GRHP41 - RAYMAN 3 HOODLUM HAVOC
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GRHE41.ini b/Data/Sys/GameSettings/GRHE41.ini
deleted file mode 100644
index 12a276a16b..0000000000
--- a/Data/Sys/GameSettings/GRHE41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GRHE41 - RAYMAN 3 HOODLUM HAVOC
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GSN.ini b/Data/Sys/GameSettings/GSN.ini
new file mode 100644
index 0000000000..5525b2b1d5
--- /dev/null
+++ b/Data/Sys/GameSettings/GSN.ini
@@ -0,0 +1,18 @@
+# GSNE8P, GSNP8P - Sonic Adventure 2 Battle
+
+[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]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/GSO.ini b/Data/Sys/GameSettings/GSO.ini
index 52dbb9a836..74731fbee6 100644
--- a/Data/Sys/GameSettings/GSO.ini
+++ b/Data/Sys/GameSettings/GSO.ini
@@ -1,4 +1,4 @@
-# GSOE8P, GSOP8P - Sonic Mega Collection (US)
+# GSOE8P, GSOJ8P, GSOP8P - Sonic Mega Collection (US)
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GSOJ8P.ini b/Data/Sys/GameSettings/GSOJ8P.ini
deleted file mode 100644
index b8f6e66fe0..0000000000
--- a/Data/Sys/GameSettings/GSOJ8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GSOJ8P - Sonic Mega Collection
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GSSJ8P.ini b/Data/Sys/GameSettings/GSS.ini
similarity index 91%
rename from Data/Sys/GameSettings/GSSJ8P.ini
rename to Data/Sys/GameSettings/GSS.ini
index f03370e8b5..917a7cfb02 100644
--- a/Data/Sys/GameSettings/GSSJ8P.ini
+++ b/Data/Sys/GameSettings/GSS.ini
@@ -1,4 +1,4 @@
-# GSSJ8P - Sega Soccer Slam
+# GSSE8P, GSSJ8P, GSSP70, GSSP8P - Sega Soccer Slam
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GSSP70.ini b/Data/Sys/GameSettings/GSSP70.ini
deleted file mode 100644
index e3cf8194f4..0000000000
--- a/Data/Sys/GameSettings/GSSP70.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GSSP70 - Sega Soccer Slam
-
-[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 = Needs real xfb for the videos to display.
-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]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GSSP8P.ini b/Data/Sys/GameSettings/GSSP8P.ini
deleted file mode 100644
index 9f198332a2..0000000000
--- a/Data/Sys/GameSettings/GSSP8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GSSP8P - Sega Soccer Slam
-
-[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 = Needs real xfb for the videos to display.
-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]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GLOE69.ini b/Data/Sys/GameSettings/GST.ini
similarity index 91%
rename from Data/Sys/GameSettings/GLOE69.ini
rename to Data/Sys/GameSettings/GST.ini
index d8f0e95a4f..e1036d4177 100644
--- a/Data/Sys/GameSettings/GLOE69.ini
+++ b/Data/Sys/GameSettings/GST.ini
@@ -1,4 +1,4 @@
-# GLOE69 - The Two Towers
+# GSTE69, GSTP69 - SSX Tricky
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GSTE69.ini b/Data/Sys/GameSettings/GSTE69.ini
deleted file mode 100644
index 2a14d28c11..0000000000
--- a/Data/Sys/GameSettings/GSTE69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GSTE69 - SSX Tricky
-
-[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
-
-[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/GSTP69.ini b/Data/Sys/GameSettings/GSTP69.ini
deleted file mode 100644
index 1ba6dc6ebe..0000000000
--- a/Data/Sys/GameSettings/GSTP69.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GSTP69 - SSX Tricky
-
-[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
-
diff --git a/Data/Sys/GameSettings/GTE.ini b/Data/Sys/GameSettings/GTE.ini
new file mode 100644
index 0000000000..60c94cb090
--- /dev/null
+++ b/Data/Sys/GameSettings/GTE.ini
@@ -0,0 +1,20 @@
+# GTEE01, GTEP01 - 1080: Avalanche
+
+[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_Hacks]
+
diff --git a/Data/Sys/GameSettings/GTSP4F.ini b/Data/Sys/GameSettings/GTS.ini
similarity index 93%
rename from Data/Sys/GameSettings/GTSP4F.ini
rename to Data/Sys/GameSettings/GTS.ini
index e121c7f8f0..e742c97f3a 100644
--- a/Data/Sys/GameSettings/GTSP4F.ini
+++ b/Data/Sys/GameSettings/GTS.ini
@@ -1,4 +1,4 @@
-# GTSP4F - TimeSplitters 2
+# GTSE4F, GTSP4F - TimeSplitters 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GUNP5D.ini b/Data/Sys/GameSettings/GUN.ini
similarity index 91%
rename from Data/Sys/GameSettings/GUNP5D.ini
rename to Data/Sys/GameSettings/GUN.ini
index 783788c7d8..8e9c72906a 100644
--- a/Data/Sys/GameSettings/GUNP5D.ini
+++ b/Data/Sys/GameSettings/GUN.ini
@@ -1,4 +1,4 @@
-# GUNP5D - Gauntlet - Dark Legacy
+# GUNE5D, GUNP5D - Gauntlet - Dark Legacy
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GUT.ini b/Data/Sys/GameSettings/GUT.ini
index f52348b0af..8c6efcbab1 100644
--- a/Data/Sys/GameSettings/GUT.ini
+++ b/Data/Sys/GameSettings/GUT.ini
@@ -1,4 +1,4 @@
-# GUTD52, GUTF52, GUTI52, GUTJC0, GUTP52, GUTS52 - Ultimate Spider-Man
+# GUTD52, GUTE52, GUTF52, GUTI52, GUTJC0, GUTP52, GUTS52 - Ultimate Spider-Man
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GUTE52.ini b/Data/Sys/GameSettings/GUTE52.ini
deleted file mode 100644
index 685738f72e..0000000000
--- a/Data/Sys/GameSettings/GUTE52.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GUTE52 - Ultimate Spider-Man
-
-[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 = 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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GINX69.ini b/Data/Sys/GameSettings/GV3.ini
similarity index 92%
rename from Data/Sys/GameSettings/GINX69.ini
rename to Data/Sys/GameSettings/GV3.ini
index 8eb2072c70..a21f1bf607 100644
--- a/Data/Sys/GameSettings/GINX69.ini
+++ b/Data/Sys/GameSettings/GV3.ini
@@ -1,4 +1,4 @@
-# GINX69 - Batman
+# GV3E70, GV3P70 - V-Rally 3
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GV3E70.ini b/Data/Sys/GameSettings/GV3E70.ini
deleted file mode 100644
index 6b66b560a5..0000000000
--- a/Data/Sys/GameSettings/GV3E70.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GV3E70 - V-Rally 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 = 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.
-
diff --git a/Data/Sys/GameSettings/GV3P70.ini b/Data/Sys/GameSettings/GV3P70.ini
deleted file mode 100644
index 3fccc0f304..0000000000
--- a/Data/Sys/GameSettings/GV3P70.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GV3P70 - V-Rally 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 = 4
-EmulationIssues = slow
-
-[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/GVS.ini b/Data/Sys/GameSettings/GVS.ini
index 096735e89d..705fd819ea 100644
--- a/Data/Sys/GameSettings/GVS.ini
+++ b/Data/Sys/GameSettings/GVS.ini
@@ -1,12 +1,12 @@
-# GVS46E, GVS46J - Virtua Striker 4 Ver. 2006 (Export)
+# GVSE8P, GVSP8P - Virtua Striker 3 ver. 2002
 
 [Core]
 # Values set here will override the main dolphin settings.
+FPRF = True
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues = Crashes on startup (Triforce game)
+EmulationStateId = 4
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,8 +17,3 @@ EmulationIssues = Crashes on startup (Triforce game)
 [ActionReplay]
 # Add action replay cheats here.
 
-[Video]
-# Add memory patches to be applied every frame here.
-
-[Video_Settings]
-
diff --git a/Data/Sys/GameSettings/GVS46E.ini b/Data/Sys/GameSettings/GVS46E.ini
new file mode 100644
index 0000000000..11ec3c06dd
--- /dev/null
+++ b/Data/Sys/GameSettings/GVS46E.ini
@@ -0,0 +1,26 @@
+# GVS46E, GVS46J - Virtua Striker 4 ver. 2006
+# Because Triforce games have weird IDs, properties are inherited from GVS.ini (Virtua Striker 3 ver. 2002)!
+
+[Core]
+# Values set here will override the main dolphin settings.
+FPRF = True
+
+[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 0000000000..11ec3c06dd
--- /dev/null
+++ b/Data/Sys/GameSettings/GVS46J.ini
@@ -0,0 +1,26 @@
+# GVS46E, GVS46J - Virtua Striker 4 ver. 2006
+# Because Triforce games have weird IDs, properties are inherited from GVS.ini (Virtua Striker 3 ver. 2002)!
+
+[Core]
+# Values set here will override the main dolphin settings.
+FPRF = True
+
+[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/GVSE8P.ini b/Data/Sys/GameSettings/GVSE8P.ini
deleted file mode 100644
index 2ba4f8c31f..0000000000
--- a/Data/Sys/GameSettings/GVSE8P.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GVSE8P - Virtua Striker 2002
-
-[Core]
-# Values set here will override the main dolphin settings.
-FPRF = True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Ocassional Fifo crashes (r6477)
-
-[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/GVSP8P.ini b/Data/Sys/GameSettings/GVSP8P.ini
deleted file mode 100644
index 7766be8fb9..0000000000
--- a/Data/Sys/GameSettings/GVSP8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GVSP8P - Virtua Striker 3 ver.2002
-
-[Core]
-# Values set here will override the main dolphin settings.
-FPRF = True
-
-[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.
-
diff --git a/Data/Sys/GameSettings/GWE.ini b/Data/Sys/GameSettings/GWE.ini
index 564a4debcf..dcaaca73b8 100644
--- a/Data/Sys/GameSettings/GWE.ini
+++ b/Data/Sys/GameSettings/GWE.ini
@@ -1,4 +1,4 @@
-# GWEE51, GWEJB0 - 18 Wheeler
+# GWEE51, GWEJB0, GWEP8P - 18 Wheeler
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GWEP8P.ini b/Data/Sys/GameSettings/GWEP8P.ini
deleted file mode 100644
index 4a1ad80595..0000000000
--- a/Data/Sys/GameSettings/GWEP8P.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GWEP8P - 18 Wheeler
-
-[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.
-
diff --git a/Data/Sys/GameSettings/GBDS7D.ini b/Data/Sys/GameSettings/GWK.ini
similarity index 92%
rename from Data/Sys/GameSettings/GBDS7D.ini
rename to Data/Sys/GameSettings/GWK.ini
index eed81abc2e..de94403eba 100644
--- a/Data/Sys/GameSettings/GBDS7D.ini
+++ b/Data/Sys/GameSettings/GWK.ini
@@ -1,4 +1,4 @@
-# GBDS7D - BloodRayne
+# GWKE41, GWKP41 - King Kong
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GWKE41.ini b/Data/Sys/GameSettings/GWKE41.ini
deleted file mode 100644
index 36c564d09b..0000000000
--- a/Data/Sys/GameSettings/GWKE41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GWKE41 - King Kong
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GWKP41.ini b/Data/Sys/GameSettings/GWKP41.ini
deleted file mode 100644
index e4710c7f7f..0000000000
--- a/Data/Sys/GameSettings/GWKP41.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GWKP41 - King Kong
-
-[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.
-
diff --git a/Data/Sys/GameSettings/GWLX6L.ini b/Data/Sys/GameSettings/GWL.ini
similarity index 92%
rename from Data/Sys/GameSettings/GWLX6L.ini
rename to Data/Sys/GameSettings/GWL.ini
index b21852bedd..52afb70cc9 100644
--- a/Data/Sys/GameSettings/GWLX6L.ini
+++ b/Data/Sys/GameSettings/GWL.ini
@@ -1,4 +1,4 @@
-# GWLX6L - Project Zoo
+# GWLE6L, GWLX6L - Project Zoo
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GWLE6L.ini b/Data/Sys/GameSettings/GWLE6L.ini
deleted file mode 100644
index de3a9017ef..0000000000
--- a/Data/Sys/GameSettings/GWLE6L.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GWLE6L - Project Zoo
-
-[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.
-$Bypass FIFO reset
-0x8028EF00:dword:0x48000638
-
-[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/GHAE08.ini b/Data/Sys/GameSettings/GWR.ini
similarity index 91%
rename from Data/Sys/GameSettings/GHAE08.ini
rename to Data/Sys/GameSettings/GWR.ini
index 813a623c32..04ccd7e1fd 100644
--- a/Data/Sys/GameSettings/GHAE08.ini
+++ b/Data/Sys/GameSettings/GWR.ini
@@ -1,4 +1,4 @@
-# GHAE08 - RESIDENT EVIL2
+# GWRE01, GWRP01 - WAVE RACE / BLUE STORM
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GWWE01.ini b/Data/Sys/GameSettings/GWW.ini
similarity index 93%
rename from Data/Sys/GameSettings/GWWE01.ini
rename to Data/Sys/GameSettings/GWW.ini
index 7452028914..8c178e6ef8 100644
--- a/Data/Sys/GameSettings/GWWE01.ini
+++ b/Data/Sys/GameSettings/GWW.ini
@@ -1,4 +1,4 @@
-# GWWE01 - WARIO WORLD
+# GWWE01, GWWP01 - WARIO WORLD
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GWYX41.ini b/Data/Sys/GameSettings/GWYX41.ini
deleted file mode 100644
index f8fda92596..0000000000
--- a/Data/Sys/GameSettings/GWYX41.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GWYE41, GWYX41 - Tom Clancy's Splinter Cell Double Agent
-
-[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 = 4
-EmulationIssues = Videos require real XFB.
-
-[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
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GWZP01.ini b/Data/Sys/GameSettings/GWZ.ini
similarity index 86%
rename from Data/Sys/GameSettings/GWZP01.ini
rename to Data/Sys/GameSettings/GWZ.ini
index 62dada6357..840ae72595 100644
--- a/Data/Sys/GameSettings/GWZP01.ini
+++ b/Data/Sys/GameSettings/GWZ.ini
@@ -1,4 +1,4 @@
-# GWZP01 - Dancing Stage: Mario Mix for EU
+# GWZE01, GWZP01 - Dance Dance Revolution: Mario Mix
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GXE.ini b/Data/Sys/GameSettings/GXE.ini
index de059b8922..cc9dd7467a 100644
--- a/Data/Sys/GameSettings/GXE.ini
+++ b/Data/Sys/GameSettings/GXE.ini
@@ -1,4 +1,4 @@
-# GXEE8P, GXEJ8P - Sonic Riders
+# GXEE8P, GXEJ8P, GXEP8P - Sonic Riders
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GXEP8P.ini b/Data/Sys/GameSettings/GXEP8P.ini
deleted file mode 100644
index a021d795d3..0000000000
--- a/Data/Sys/GameSettings/GXEP8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GXEP8P - Sonic Riders
-
-[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 =
-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.
-
diff --git a/Data/Sys/GameSettings/GMPP01.ini b/Data/Sys/GameSettings/GXL.ini
similarity index 91%
rename from Data/Sys/GameSettings/GMPP01.ini
rename to Data/Sys/GameSettings/GXL.ini
index f37169fd18..da7016e8ae 100644
--- a/Data/Sys/GameSettings/GMPP01.ini
+++ b/Data/Sys/GameSettings/GXL.ini
@@ -1,4 +1,4 @@
-# GMPP01 - Mario Party 4
+# GXLE52, GXLP52 - X-Men: Legends
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GXLE52.ini b/Data/Sys/GameSettings/GXLE52.ini
deleted file mode 100644
index 14087c0629..0000000000
--- a/Data/Sys/GameSettings/GXLE52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GXLE52 - X-Men: Legends
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GXS.ini b/Data/Sys/GameSettings/GXS.ini
index ce58e29b1a..e371150d20 100644
--- a/Data/Sys/GameSettings/GXS.ini
+++ b/Data/Sys/GameSettings/GXS.ini
@@ -1,4 +1,4 @@
-# GXSE8P, GXSP6W - Sonic Adventure DX
+# GXSE8P, GXSP6W, GXSP8P - Sonic Adventure DX
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GZ2.ini b/Data/Sys/GameSettings/GZ2.ini
new file mode 100644
index 0000000000..b1918a86ae
--- /dev/null
+++ b/Data/Sys/GameSettings/GZ2.ini
@@ -0,0 +1,26 @@
+# GZ2E01, GZ2J01, GZ2P01 - The Legend of Zelda: Twilight Princess [GC]
+
+[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
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
diff --git a/Data/Sys/GameSettings/GZ2J01.ini b/Data/Sys/GameSettings/GZ2J01.ini
deleted file mode 100644
index 994cfacca0..0000000000
--- a/Data/Sys/GameSettings/GZ2J01.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GZ2J01 - The Legend of Zelda: Twilight Princess [GC]
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
diff --git a/Data/Sys/GameSettings/GZ3.ini b/Data/Sys/GameSettings/GZ3.ini
new file mode 100644
index 0000000000..bbc8667ff7
--- /dev/null
+++ b/Data/Sys/GameSettings/GZ3.ini
@@ -0,0 +1,19 @@
+# GZ3EB2, GZ3PB2 - Dragon Ball Z Budokai 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.
+
diff --git a/Data/Sys/GameSettings/GZ3PB2.ini b/Data/Sys/GameSettings/GZ3PB2.ini
deleted file mode 100644
index bfcff271a4..0000000000
--- a/Data/Sys/GameSettings/GZ3PB2.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GZ3PB2 - Dragon Ball Z Budokai 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.
-
diff --git a/Data/Sys/GameSettings/SBDP08.ini b/Data/Sys/GameSettings/GZL.ini
similarity index 82%
rename from Data/Sys/GameSettings/SBDP08.ini
rename to Data/Sys/GameSettings/GZL.ini
index 7be9512de1..36bf99bcaf 100644
--- a/Data/Sys/GameSettings/SBDP08.ini
+++ b/Data/Sys/GameSettings/GZL.ini
@@ -1,12 +1,12 @@
-# SBDP08 - RESIDENT EVIL THE DARKSIDE CHRONICLES
+# GZLE01, GZLJ01, GZLP01 - The Legend of Zelda The Wind Waker
 
 [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 =
 EmulationStateId = 4
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -25,8 +25,9 @@ PH_ExtraParam = 0
 PH_ZNear =
 PH_ZFar =
 
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
 [Video_Hacks]
+EFBAccessEnable = True
 EFBToTextureEnable = False
+
+[Video_Settings]
+FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/GZPE70.ini b/Data/Sys/GameSettings/GZP.ini
similarity index 96%
rename from Data/Sys/GameSettings/GZPE70.ini
rename to Data/Sys/GameSettings/GZP.ini
index 86e2bc6de5..99e10ccba0 100644
--- a/Data/Sys/GameSettings/GZPE70.ini
+++ b/Data/Sys/GameSettings/GZP.ini
@@ -1,4 +1,4 @@
-# GZPE70 - Zapper
+# GZPE70, GZPP70- Zapper
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GZPP70.ini b/Data/Sys/GameSettings/GZPP70.ini
deleted file mode 100644
index d9d23409c5..0000000000
--- a/Data/Sys/GameSettings/GZPP70.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# GZPP70 - Zapper
-
-[Core]
-# Values set here will override the main dolphin settings.
-DSPHLE = False
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display. Slow audio with HLE.
-
-[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]
-UseXFB = True
-UseRealXFB = True
-
-[DSP]
-EnableJIT = True
-
diff --git a/Data/Sys/GameSettings/HADJ01.ini b/Data/Sys/GameSettings/HAD.ini
similarity index 74%
rename from Data/Sys/GameSettings/HADJ01.ini
rename to Data/Sys/GameSettings/HAD.ini
index eedaa60518..14e2cfde05 100644
--- a/Data/Sys/GameSettings/HADJ01.ini
+++ b/Data/Sys/GameSettings/HAD.ini
@@ -1,4 +1,4 @@
-# HADJ01 - Internet Channel
+# HADE01, HADJ01, HADP01 - Internet Channel
 
 [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 = Low FPS on first run while save data is created
+EmulationIssues = If using a hard drive, low FPS on first run while save data is created
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/HADE01.ini b/Data/Sys/GameSettings/HADE01.ini
deleted file mode 100644
index 07ae1c7654..0000000000
--- a/Data/Sys/GameSettings/HADE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# HADE01 - 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.
-EmulationIssues =
-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]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/HADP01.ini b/Data/Sys/GameSettings/HADP01.ini
deleted file mode 100644
index 2bb5bcc8eb..0000000000
--- a/Data/Sys/GameSettings/HADP01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/HCFP01.ini b/Data/Sys/GameSettings/HCF.ini
similarity index 87%
rename from Data/Sys/GameSettings/HCFP01.ini
rename to Data/Sys/GameSettings/HCF.ini
index 8aa22cd7d2..46b362eeba 100644
--- a/Data/Sys/GameSettings/HCFP01.ini
+++ b/Data/Sys/GameSettings/HCF.ini
@@ -1,4 +1,4 @@
-# HCFP01 - Wii Speak Channel
+# HCFE01, HCFP01 - Wii Speak Channel
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -16,7 +16,3 @@ EmulationIssues = No support for Wii Speak Microphone
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-
-[Video_Settings]
diff --git a/Data/Sys/GameSettings/HCFE01.ini b/Data/Sys/GameSettings/HCFE01.ini
deleted file mode 100644
index e41bdb51fc..0000000000
--- a/Data/Sys/GameSettings/HCFE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# HCFE01 - 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 = Not 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/JAC.ini b/Data/Sys/GameSettings/JAC.ini
new file mode 100644
index 0000000000..25439d6e5a
--- /dev/null
+++ b/Data/Sys/GameSettings/JAC.ini
@@ -0,0 +1,27 @@
+# JACE01, JACP01 - F-Zero
+
+[Core]
+# Values set here will override the main dolphin settings.
+FPRF = True
+ProgressiveScan = True
+
+[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/JBKE01.ini b/Data/Sys/GameSettings/JBK.ini
similarity index 90%
rename from Data/Sys/GameSettings/JBKE01.ini
rename to Data/Sys/GameSettings/JBK.ini
index 85ba4cb39b..efca5b1707 100644
--- a/Data/Sys/GameSettings/JBKE01.ini
+++ b/Data/Sys/GameSettings/JBK.ini
@@ -1,4 +1,4 @@
-# JBKE01 - Breath of Fire II
+# JBKE01, JBKP01 - Breath of Fire II
 
 [Core]
 ProgressiveScan = True
diff --git a/Data/Sys/GameSettings/JBKP01.ini b/Data/Sys/GameSettings/JBKP01.ini
deleted file mode 100644
index a2cb04bad0..0000000000
--- a/Data/Sys/GameSettings/JBKP01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# JBKP01 -
-
-[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 = 0
-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/MA7.ini b/Data/Sys/GameSettings/MA7.ini
new file mode 100644
index 0000000000..c7685fd5b3
--- /dev/null
+++ b/Data/Sys/GameSettings/MA7.ini
@@ -0,0 +1,25 @@
+# MA7E8P, MA7P8P - Shining Darkness
+
+[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.
+EmulationIssues = 
+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]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MA7P8P.ini b/Data/Sys/GameSettings/MA7P8P.ini
deleted file mode 100644
index 33f07e9158..0000000000
--- a/Data/Sys/GameSettings/MA7P8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MA7P8P - Shining Darkness
-
-[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 = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAA.ini b/Data/Sys/GameSettings/MAA.ini
new file mode 100644
index 0000000000..7038c2ab3b
--- /dev/null
+++ b/Data/Sys/GameSettings/MAA.ini
@@ -0,0 +1,25 @@
+# MAAE8P, MAAP8P - Altered Beast
+
+[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.
+EmulationIssues = 
+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]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAAP8P.ini b/Data/Sys/GameSettings/MAAP8P.ini
deleted file mode 100644
index 03283c6c6e..0000000000
--- a/Data/Sys/GameSettings/MAAP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MAAP8P - Altered Beast
-
-[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 = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAAE8P.ini b/Data/Sys/GameSettings/MAB.ini
similarity index 94%
rename from Data/Sys/GameSettings/MAAE8P.ini
rename to Data/Sys/GameSettings/MAB.ini
index a2d06a27d5..c8e5dc108b 100644
--- a/Data/Sys/GameSettings/MAAE8P.ini
+++ b/Data/Sys/GameSettings/MAB.ini
@@ -1,4 +1,4 @@
-# MAAE8P - Altered Beast
+# MABE8P, MABP8P - Columns
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/MABP8P.ini b/Data/Sys/GameSettings/MABP8P.ini
deleted file mode 100644
index 56db33841c..0000000000
--- a/Data/Sys/GameSettings/MABP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MABP8P - Columns
-
-[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 = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAC.ini b/Data/Sys/GameSettings/MAC.ini
new file mode 100644
index 0000000000..c90f0d964e
--- /dev/null
+++ b/Data/Sys/GameSettings/MAC.ini
@@ -0,0 +1,25 @@
+# MACE8P, MACP8P - Dr. Robotnik
+
+[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.
+EmulationIssues = 
+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]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MACE8P.ini b/Data/Sys/GameSettings/MACE8P.ini
deleted file mode 100644
index 616407cf88..0000000000
--- a/Data/Sys/GameSettings/MACE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MACE8P - Dr. Robotnik
-
-[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.
-EmulationIssues = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MACP8P.ini b/Data/Sys/GameSettings/MACP8P.ini
deleted file mode 100644
index ef52e7acb2..0000000000
--- a/Data/Sys/GameSettings/MACP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MACP8P - Dr. Robotnik
-
-[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 = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAF.ini b/Data/Sys/GameSettings/MAF.ini
new file mode 100644
index 0000000000..3d4b7e6e36
--- /dev/null
+++ b/Data/Sys/GameSettings/MAF.ini
@@ -0,0 +1,25 @@
+# MAFE8P, MAFP8P - Gunstar Heroes
+
+[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.
+EmulationIssues = 
+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]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAFE8P.ini b/Data/Sys/GameSettings/MAFE8P.ini
deleted file mode 100644
index 726dac3b35..0000000000
--- a/Data/Sys/GameSettings/MAFE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAFE8P - Gunstar Heroes
-
-[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.
-EmulationIssues = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAFP8P.ini b/Data/Sys/GameSettings/MAFP8P.ini
deleted file mode 100644
index 5ead67799d..0000000000
--- a/Data/Sys/GameSettings/MAFP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MAFP8P - Gunstar Heroes
-
-[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 = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MABE8P.ini b/Data/Sys/GameSettings/MAG.ini
similarity index 94%
rename from Data/Sys/GameSettings/MABE8P.ini
rename to Data/Sys/GameSettings/MAG.ini
index d40786e203..9bf66570d7 100644
--- a/Data/Sys/GameSettings/MABE8P.ini
+++ b/Data/Sys/GameSettings/MAG.ini
@@ -1,4 +1,4 @@
-# MABE8P - Columns
+# MAGE8P, MAGP8P - Ristar
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/MAGE8P.ini b/Data/Sys/GameSettings/MAGE8P.ini
deleted file mode 100644
index 47a9b8f7da..0000000000
--- a/Data/Sys/GameSettings/MAGE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAGE8P - Ristar
-
-[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.
-EmulationIssues = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAGP8P.ini b/Data/Sys/GameSettings/MAGP8P.ini
deleted file mode 100644
index 299d5bd14b..0000000000
--- a/Data/Sys/GameSettings/MAGP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MAGP8P - Ristar
-
-[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 = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAH.ini b/Data/Sys/GameSettings/MAH.ini
new file mode 100644
index 0000000000..12f58d630c
--- /dev/null
+++ b/Data/Sys/GameSettings/MAH.ini
@@ -0,0 +1,25 @@
+# MAHE8P, MAHP8P - Sonic the Hedgehog
+
+[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.
+EmulationIssues = 
+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]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAHE8P.ini b/Data/Sys/GameSettings/MAHE8P.ini
deleted file mode 100644
index ddda2c536d..0000000000
--- a/Data/Sys/GameSettings/MAHE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAHE8P - Sonic the Hedgehog
-
-[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.
-EmulationIssues = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAHP8P.ini b/Data/Sys/GameSettings/MAHP8P.ini
deleted file mode 100644
index 602731e50b..0000000000
--- a/Data/Sys/GameSettings/MAHP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MAHP8P - 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.
-EmulationIssues = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAI.ini b/Data/Sys/GameSettings/MAI.ini
new file mode 100644
index 0000000000..6cc376f46b
--- /dev/null
+++ b/Data/Sys/GameSettings/MAI.ini
@@ -0,0 +1,25 @@
+# MAIE8P, MAIP8P - Space Harrier II
+
+[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.
+EmulationIssues = 
+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]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAIE8P.ini b/Data/Sys/GameSettings/MAIE8P.ini
deleted file mode 100644
index 7b262b3bca..0000000000
--- a/Data/Sys/GameSettings/MAIE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAIE8P - Space Harrier II
-
-[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.
-EmulationIssues = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAIP8P.ini b/Data/Sys/GameSettings/MAIP8P.ini
deleted file mode 100644
index 29559334bc..0000000000
--- a/Data/Sys/GameSettings/MAIP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MAIP8P - Space Harrier 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.
-EmulationIssues = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAJ.ini b/Data/Sys/GameSettings/MAJ.ini
new file mode 100644
index 0000000000..11bb49b827
--- /dev/null
+++ b/Data/Sys/GameSettings/MAJ.ini
@@ -0,0 +1,25 @@
+# MAJE8P, MAJP8P - ToeJam & Earl
+
+[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.
+EmulationIssues = 
+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]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAJE8P.ini b/Data/Sys/GameSettings/MAJE8P.ini
deleted file mode 100644
index 169f5be514..0000000000
--- a/Data/Sys/GameSettings/MAJE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAJE8P - ToeJam & Earl
-
-[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.
-EmulationIssues = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAJP8P.ini b/Data/Sys/GameSettings/MAJP8P.ini
deleted file mode 100644
index ccfd74c78a..0000000000
--- a/Data/Sys/GameSettings/MAJP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MAJP8P - ToeJam & Earl
-
-[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 = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MA7E8P.ini b/Data/Sys/GameSettings/MAP.ini
similarity index 93%
rename from Data/Sys/GameSettings/MA7E8P.ini
rename to Data/Sys/GameSettings/MAP.ini
index 5bd4486ed2..26040aca17 100644
--- a/Data/Sys/GameSettings/MA7E8P.ini
+++ b/Data/Sys/GameSettings/MAP.ini
@@ -1,4 +1,4 @@
-# MA7E8P - Shining Darkness
+# MAPE8P, MAPP8P - Comix Zone
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/MAPE8P.ini b/Data/Sys/GameSettings/MAPE8P.ini
deleted file mode 100644
index 4245935ed6..0000000000
--- a/Data/Sys/GameSettings/MAPE8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MAPE8P - Comix Zone
-
-[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 = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAPP8P.ini b/Data/Sys/GameSettings/MAPP8P.ini
deleted file mode 100644
index 9edf59241e..0000000000
--- a/Data/Sys/GameSettings/MAPP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAPP8P - Comix Zone
-
-[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.
-EmulationIssues = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JACE01.ini b/Data/Sys/GameSettings/MAX.ini
similarity index 94%
rename from Data/Sys/GameSettings/JACE01.ini
rename to Data/Sys/GameSettings/MAX.ini
index e0adeddb56..9bddc444df 100644
--- a/Data/Sys/GameSettings/JACE01.ini
+++ b/Data/Sys/GameSettings/MAX.ini
@@ -1,4 +1,4 @@
-# JACE01 - F-Zero
+# MAXE8P, MAXP8P - Alex Kidd
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/MAXE8P.ini b/Data/Sys/GameSettings/MAXE8P.ini
deleted file mode 100644
index 1ff5daaabe..0000000000
--- a/Data/Sys/GameSettings/MAXE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAXE8P - Alex Kidd
-
-[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.
-EmulationIssues = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAXP8P.ini b/Data/Sys/GameSettings/MAXP8P.ini
deleted file mode 100644
index 788ef9f000..0000000000
--- a/Data/Sys/GameSettings/MAXP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MAXP8P - Alex Kidd
-
-[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 = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBJ.ini b/Data/Sys/GameSettings/MBJ.ini
new file mode 100644
index 0000000000..56c4eb03f7
--- /dev/null
+++ b/Data/Sys/GameSettings/MBJ.ini
@@ -0,0 +1,25 @@
+# MBJE8P, MBJP8P - Ghouls 'n Ghosts
+
+[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.
+EmulationIssues = 
+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]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBJE8P.ini b/Data/Sys/GameSettings/MBJE8P.ini
deleted file mode 100644
index d0c26c71bc..0000000000
--- a/Data/Sys/GameSettings/MBJE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBJE8P - Ghouls'n Ghosts
-
-[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.
-EmulationIssues = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBJP8P.ini b/Data/Sys/GameSettings/MBJP8P.ini
deleted file mode 100644
index 9e2ccd8e20..0000000000
--- a/Data/Sys/GameSettings/MBJP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MBJP8P - Ghouls'n Ghosts
-
-[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 = 
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/W8CPXS.ini b/Data/Sys/GameSettings/NAA.ini
similarity index 91%
rename from Data/Sys/GameSettings/W8CPXS.ini
rename to Data/Sys/GameSettings/NAA.ini
index 8867f8459b..3788007e6a 100644
--- a/Data/Sys/GameSettings/W8CPXS.ini
+++ b/Data/Sys/GameSettings/NAA.ini
@@ -1,4 +1,4 @@
-# W8CPXS - BIT.TRIP CORE
+# NAAE01, NAAP01 - Super Mario 64
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/NAAE01.ini b/Data/Sys/GameSettings/NAAE01.ini
deleted file mode 100644
index 9e8f4f0e9e..0000000000
--- a/Data/Sys/GameSettings/NAAE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# NAAE01 - Super Mario 64
-
-[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 =
-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]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/NAAP01.ini b/Data/Sys/GameSettings/NAAP01.ini
deleted file mode 100644
index f06df82356..0000000000
--- a/Data/Sys/GameSettings/NAAP01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# NAAP01 - Super Mario 64
-
-[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 = Slow and no sound
-
-[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/PA7E18.ini b/Data/Sys/GameSettings/PA6.ini
similarity index 93%
rename from Data/Sys/GameSettings/PA7E18.ini
rename to Data/Sys/GameSettings/PA6.ini
index e8d18227c9..aef542e6dc 100644
--- a/Data/Sys/GameSettings/PA7E18.ini
+++ b/Data/Sys/GameSettings/PA6.ini
@@ -1,4 +1,4 @@
-# PA7E18 - Alien Crush
+# PA6E18, PA6P18 - Bloody Wolf
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/PA7.ini b/Data/Sys/GameSettings/PA7.ini
new file mode 100644
index 0000000000..273db10629
--- /dev/null
+++ b/Data/Sys/GameSettings/PA7.ini
@@ -0,0 +1,24 @@
+# PA7E18, PA7P18 - Alien Crush
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PA6E18.ini b/Data/Sys/GameSettings/PA9.ini
similarity index 92%
rename from Data/Sys/GameSettings/PA6E18.ini
rename to Data/Sys/GameSettings/PA9.ini
index 85c61a5747..ac0e1025a5 100644
--- a/Data/Sys/GameSettings/PA6E18.ini
+++ b/Data/Sys/GameSettings/PA9.ini
@@ -1,4 +1,4 @@
-# PA6E18 - Bloody Wolf
+# PA9E18, PA9P18 - SPLATTERHOUSE
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/PA9E18.ini b/Data/Sys/GameSettings/PA9E18.ini
deleted file mode 100644
index 29ced002ca..0000000000
--- a/Data/Sys/GameSettings/PA9E18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PA9E18 - SPLATTERHOUSE
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAA.ini b/Data/Sys/GameSettings/PAA.ini
new file mode 100644
index 0000000000..4249e2ca06
--- /dev/null
+++ b/Data/Sys/GameSettings/PAA.ini
@@ -0,0 +1,24 @@
+# PAAE18, PAAP18 - Bomberman'93
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAAE18.ini b/Data/Sys/GameSettings/PAAE18.ini
deleted file mode 100644
index fe25d563b7..0000000000
--- a/Data/Sys/GameSettings/PAAE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PAAE18 - Bomberman'93
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAB.ini b/Data/Sys/GameSettings/PAB.ini
new file mode 100644
index 0000000000..f77fe531cf
--- /dev/null
+++ b/Data/Sys/GameSettings/PAB.ini
@@ -0,0 +1,24 @@
+# PABE18, PABP18 - Bonk's Adventure
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PABE18.ini b/Data/Sys/GameSettings/PABE18.ini
deleted file mode 100644
index 827377c41c..0000000000
--- a/Data/Sys/GameSettings/PABE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PABE18 - Bonk's Adventure
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PABP18.ini b/Data/Sys/GameSettings/PABP18.ini
deleted file mode 100644
index 59859dab75..0000000000
--- a/Data/Sys/GameSettings/PABP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PABP18 - Bonk's Adventure
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAC.ini b/Data/Sys/GameSettings/PAC.ini
new file mode 100644
index 0000000000..6bb0fde4a2
--- /dev/null
+++ b/Data/Sys/GameSettings/PAC.ini
@@ -0,0 +1,24 @@
+# PACE18, PACP18 - Dungeon Explorer
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PACE18.ini b/Data/Sys/GameSettings/PACE18.ini
deleted file mode 100644
index de543cd4c6..0000000000
--- a/Data/Sys/GameSettings/PACE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PACE18 - Dungeon Explorer
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PACP18.ini b/Data/Sys/GameSettings/PACP18.ini
deleted file mode 100644
index f256b39ef0..0000000000
--- a/Data/Sys/GameSettings/PACP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PACP18 - Dungeon Explorer
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PA9P18.ini b/Data/Sys/GameSettings/PAD.ini
similarity index 94%
rename from Data/Sys/GameSettings/PA9P18.ini
rename to Data/Sys/GameSettings/PAD.ini
index 727d8e82d6..29513f67eb 100644
--- a/Data/Sys/GameSettings/PA9P18.ini
+++ b/Data/Sys/GameSettings/PAD.ini
@@ -1,4 +1,4 @@
-# PA9P18 - SPLATTERHOUSE
+# PADE18, PADP18 - R-TYPE
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/PADE18.ini b/Data/Sys/GameSettings/PADE18.ini
deleted file mode 100644
index 10861a7cfe..0000000000
--- a/Data/Sys/GameSettings/PADE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PADE18 - R-TYPE
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PADP18.ini b/Data/Sys/GameSettings/PADP18.ini
deleted file mode 100644
index 096647477c..0000000000
--- a/Data/Sys/GameSettings/PADP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PADP18 - R-TYPE
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAE.ini b/Data/Sys/GameSettings/PAE.ini
new file mode 100644
index 0000000000..65ddb041c0
--- /dev/null
+++ b/Data/Sys/GameSettings/PAE.ini
@@ -0,0 +1,24 @@
+# PAEE18, PAEP18 - Super Star Soldier
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAEE18.ini b/Data/Sys/GameSettings/PAEE18.ini
deleted file mode 100644
index 1cc725389f..0000000000
--- a/Data/Sys/GameSettings/PAEE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PAEE18 - Super Star Soldier
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAEP18.ini b/Data/Sys/GameSettings/PAEP18.ini
deleted file mode 100644
index b595d939d9..0000000000
--- a/Data/Sys/GameSettings/PAEP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PAEP18 - Super Star Soldier
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAF.ini b/Data/Sys/GameSettings/PAF.ini
new file mode 100644
index 0000000000..eb76df8863
--- /dev/null
+++ b/Data/Sys/GameSettings/PAF.ini
@@ -0,0 +1,24 @@
+# PAFE18, PAFP18 - Victory Run
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAFE18.ini b/Data/Sys/GameSettings/PAFE18.ini
deleted file mode 100644
index 1ec8bfed20..0000000000
--- a/Data/Sys/GameSettings/PAFE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PAFE18 - Victory Run
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAFP18.ini b/Data/Sys/GameSettings/PAFP18.ini
deleted file mode 100644
index 74d76849f3..0000000000
--- a/Data/Sys/GameSettings/PAFP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PAFP18 - Victory Run
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAH.ini b/Data/Sys/GameSettings/PAH.ini
new file mode 100644
index 0000000000..7783c11fb1
--- /dev/null
+++ b/Data/Sys/GameSettings/PAH.ini
@@ -0,0 +1,24 @@
+# PAHE18, PAHP18 - BATTLE LODE RUNNER
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAHE18.ini b/Data/Sys/GameSettings/PAHE18.ini
deleted file mode 100644
index 313ddb82a2..0000000000
--- a/Data/Sys/GameSettings/PAHE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PAHE18 - BATTLE LODE RUNNER
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAHP18.ini b/Data/Sys/GameSettings/PAHP18.ini
deleted file mode 100644
index a34bfed4ca..0000000000
--- a/Data/Sys/GameSettings/PAHP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PAHP18 - BATTLE LODE RUNNER
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAI.ini b/Data/Sys/GameSettings/PAI.ini
new file mode 100644
index 0000000000..fa472f7bcf
--- /dev/null
+++ b/Data/Sys/GameSettings/PAI.ini
@@ -0,0 +1,24 @@
+# PAIE18, PAIP18 - New Adventure Island
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAIE18.ini b/Data/Sys/GameSettings/PAIE18.ini
deleted file mode 100644
index 32155b6dc5..0000000000
--- a/Data/Sys/GameSettings/PAIE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PAIE18 - New Adventure Island
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAIP18.ini b/Data/Sys/GameSettings/PAIP18.ini
deleted file mode 100644
index 302c97b94a..0000000000
--- a/Data/Sys/GameSettings/PAIP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PAIP18 - New Adventure Island
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAK.ini b/Data/Sys/GameSettings/PAK.ini
new file mode 100644
index 0000000000..20f47742d9
--- /dev/null
+++ b/Data/Sys/GameSettings/PAK.ini
@@ -0,0 +1,24 @@
+# PAKE18, PAKP18 - Dragon's Curse
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAKE18.ini b/Data/Sys/GameSettings/PAKE18.ini
deleted file mode 100644
index 9df28a7e90..0000000000
--- a/Data/Sys/GameSettings/PAKE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PAKE18 - Dragon's Curse
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAKP18.ini b/Data/Sys/GameSettings/PAKP18.ini
deleted file mode 100644
index e7d5b109a2..0000000000
--- a/Data/Sys/GameSettings/PAKP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PAKP18 - Dragon's Curse
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAL.ini b/Data/Sys/GameSettings/PAL.ini
new file mode 100644
index 0000000000..622c4cdc00
--- /dev/null
+++ b/Data/Sys/GameSettings/PAL.ini
@@ -0,0 +1,24 @@
+# PALE18, PALP18 - Soldier Blade
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PALE18.ini b/Data/Sys/GameSettings/PALE18.ini
deleted file mode 100644
index 20ce3f4d84..0000000000
--- a/Data/Sys/GameSettings/PALE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PALE18 - Soldier Blade
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PALP18.ini b/Data/Sys/GameSettings/PALP18.ini
deleted file mode 100644
index 9297db610b..0000000000
--- a/Data/Sys/GameSettings/PALP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PALP18 - Soldier Blade
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAAP18.ini b/Data/Sys/GameSettings/PAM.ini
similarity index 93%
rename from Data/Sys/GameSettings/PAAP18.ini
rename to Data/Sys/GameSettings/PAM.ini
index 8682d81921..9b53a7e5ba 100644
--- a/Data/Sys/GameSettings/PAAP18.ini
+++ b/Data/Sys/GameSettings/PAM.ini
@@ -1,4 +1,4 @@
-# PAAP18 - Bomberman'93
+# PAME18, PAMP18 - Neutopia
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/PAME18.ini b/Data/Sys/GameSettings/PAME18.ini
deleted file mode 100644
index f7bb2c7389..0000000000
--- a/Data/Sys/GameSettings/PAME18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PAME18 - Neutopia
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAMP18.ini b/Data/Sys/GameSettings/PAMP18.ini
deleted file mode 100644
index b2de7e5fa6..0000000000
--- a/Data/Sys/GameSettings/PAMP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PAMP18 - Neutopia
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAN.ini b/Data/Sys/GameSettings/PAN.ini
new file mode 100644
index 0000000000..350c21c506
--- /dev/null
+++ b/Data/Sys/GameSettings/PAN.ini
@@ -0,0 +1,24 @@
+# PANE18, PANP18 - Military Madness
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PANE18.ini b/Data/Sys/GameSettings/PANE18.ini
deleted file mode 100644
index bb959e8e62..0000000000
--- a/Data/Sys/GameSettings/PANE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PANE18 - Military Madness
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PANP18.ini b/Data/Sys/GameSettings/PANP18.ini
deleted file mode 100644
index 3fde7f44e7..0000000000
--- a/Data/Sys/GameSettings/PANP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PANP18 - Military Madness
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAV.ini b/Data/Sys/GameSettings/PAV.ini
new file mode 100644
index 0000000000..7c0c1a33f5
--- /dev/null
+++ b/Data/Sys/GameSettings/PAV.ini
@@ -0,0 +1,24 @@
+# PAVE18, PAVP18 - VIGILANTE
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAVE18.ini b/Data/Sys/GameSettings/PAVE18.ini
deleted file mode 100644
index cc8e66352e..0000000000
--- a/Data/Sys/GameSettings/PAVE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PAVE18 - VIGILANTE
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAVP18.ini b/Data/Sys/GameSettings/PAVP18.ini
deleted file mode 100644
index c91d6509c1..0000000000
--- a/Data/Sys/GameSettings/PAVP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PAVP18 - VIGILANTE
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAW.ini b/Data/Sys/GameSettings/PAW.ini
new file mode 100644
index 0000000000..7232148836
--- /dev/null
+++ b/Data/Sys/GameSettings/PAW.ini
@@ -0,0 +1,24 @@
+# PAWE18, PAWP18 - GALAGA '90
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAWE18.ini b/Data/Sys/GameSettings/PAWE18.ini
deleted file mode 100644
index 9dd80dbbaf..0000000000
--- a/Data/Sys/GameSettings/PAWE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PAWE18 - GALAGA '90
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAWP18.ini b/Data/Sys/GameSettings/PAWP18.ini
deleted file mode 100644
index 666c688e70..0000000000
--- a/Data/Sys/GameSettings/PAWP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PAWP18 - GALAGA '90
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB2.ini b/Data/Sys/GameSettings/PB2.ini
new file mode 100644
index 0000000000..9ac6746bdb
--- /dev/null
+++ b/Data/Sys/GameSettings/PB2.ini
@@ -0,0 +1,24 @@
+# PB2E18, PB2P18 - Neutopia II
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB2E18.ini b/Data/Sys/GameSettings/PB2E18.ini
deleted file mode 100644
index a1111e4de8..0000000000
--- a/Data/Sys/GameSettings/PB2E18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PB2E18 - Neutopia 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]
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB2P18.ini b/Data/Sys/GameSettings/PB2P18.ini
deleted file mode 100644
index bf5ccf49f4..0000000000
--- a/Data/Sys/GameSettings/PB2P18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PB2P18 - Neutopia II
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB3.ini b/Data/Sys/GameSettings/PB3.ini
new file mode 100644
index 0000000000..818ee3cfcd
--- /dev/null
+++ b/Data/Sys/GameSettings/PB3.ini
@@ -0,0 +1,24 @@
+# PB3E18, PB3P18 - Devil's Crush
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB3E18.ini b/Data/Sys/GameSettings/PB3E18.ini
deleted file mode 100644
index 287d644181..0000000000
--- a/Data/Sys/GameSettings/PB3E18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PB3E18 - Devil's Crush
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB3P18.ini b/Data/Sys/GameSettings/PB3P18.ini
deleted file mode 100644
index 79ea3680bd..0000000000
--- a/Data/Sys/GameSettings/PB3P18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PB3P18 - Devil's Crush
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB6.ini b/Data/Sys/GameSettings/PB6.ini
new file mode 100644
index 0000000000..3cb89a64c7
--- /dev/null
+++ b/Data/Sys/GameSettings/PB6.ini
@@ -0,0 +1,24 @@
+# PB6E18, PB6P18 - Cratermaze
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB6E18.ini b/Data/Sys/GameSettings/PB6E18.ini
deleted file mode 100644
index a5a73fdb2b..0000000000
--- a/Data/Sys/GameSettings/PB6E18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PB6E18 - Cratermaze
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB6P18.ini b/Data/Sys/GameSettings/PB6P18.ini
deleted file mode 100644
index 91532ae207..0000000000
--- a/Data/Sys/GameSettings/PB6P18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PB6P18 - Cratermaze
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB8.ini b/Data/Sys/GameSettings/PB8.ini
new file mode 100644
index 0000000000..0a8d04172f
--- /dev/null
+++ b/Data/Sys/GameSettings/PB8.ini
@@ -0,0 +1,24 @@
+# PB8E18, PB8P18 - Blazing Lazers
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB8E18.ini b/Data/Sys/GameSettings/PB8E18.ini
deleted file mode 100644
index ead9a961e1..0000000000
--- a/Data/Sys/GameSettings/PB8E18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PB8E18 - Blazing Lazers
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB8P18.ini b/Data/Sys/GameSettings/PB8P18.ini
deleted file mode 100644
index 9a36e7ba49..0000000000
--- a/Data/Sys/GameSettings/PB8P18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PB8P18 - Blazing Lazers
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PA6P18.ini b/Data/Sys/GameSettings/PB9.ini
similarity index 94%
rename from Data/Sys/GameSettings/PA6P18.ini
rename to Data/Sys/GameSettings/PB9.ini
index 16b648aa10..c71d629cc4 100644
--- a/Data/Sys/GameSettings/PA6P18.ini
+++ b/Data/Sys/GameSettings/PB9.ini
@@ -1,4 +1,4 @@
-# PA6P18 - Bloody Wolf
+# PB9E18, PB9P18 - W.S.C.
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/PB9E18.ini b/Data/Sys/GameSettings/PB9E18.ini
deleted file mode 100644
index 5eabe946b4..0000000000
--- a/Data/Sys/GameSettings/PB9E18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PB9E18 - W.S.C.
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB9P18.ini b/Data/Sys/GameSettings/PB9P18.ini
deleted file mode 100644
index a0986bda44..0000000000
--- a/Data/Sys/GameSettings/PB9P18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PB9P18 - W.S.C.
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBA.ini b/Data/Sys/GameSettings/PBA.ini
new file mode 100644
index 0000000000..6857914f27
--- /dev/null
+++ b/Data/Sys/GameSettings/PBA.ini
@@ -0,0 +1,24 @@
+# PBAE18, PBAP18 - DRAGON SPIRIT
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBAE18.ini b/Data/Sys/GameSettings/PBAE18.ini
deleted file mode 100644
index dfc538062c..0000000000
--- a/Data/Sys/GameSettings/PBAE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PBAE18 - DRAGON SPIRIT
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBAP18.ini b/Data/Sys/GameSettings/PBAP18.ini
deleted file mode 100644
index 29f992cf87..0000000000
--- a/Data/Sys/GameSettings/PBAP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PBAP18 - DRAGON SPIRIT
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBD.ini b/Data/Sys/GameSettings/PBD.ini
new file mode 100644
index 0000000000..dfe0c9b41f
--- /dev/null
+++ b/Data/Sys/GameSettings/PBD.ini
@@ -0,0 +1,24 @@
+# PBDE18, PBDP18 - Double Dungeons
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBDE18.ini b/Data/Sys/GameSettings/PBDE18.ini
deleted file mode 100644
index 79b89561d5..0000000000
--- a/Data/Sys/GameSettings/PBDE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PBDE18 - Double Dungeons
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBDP18.ini b/Data/Sys/GameSettings/PBDP18.ini
deleted file mode 100644
index 32fbfe7c19..0000000000
--- a/Data/Sys/GameSettings/PBDP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PBDP18 - Double Dungeons
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBE.ini b/Data/Sys/GameSettings/PBE.ini
new file mode 100644
index 0000000000..e83e4fde5b
--- /dev/null
+++ b/Data/Sys/GameSettings/PBE.ini
@@ -0,0 +1,24 @@
+# PBEE18, PBEP18 - Motoroader
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBEE18.ini b/Data/Sys/GameSettings/PBEE18.ini
deleted file mode 100644
index c411663d91..0000000000
--- a/Data/Sys/GameSettings/PBEE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PBEE18 - Motoroader
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBEP18.ini b/Data/Sys/GameSettings/PBEP18.ini
deleted file mode 100644
index 984a8a3ab0..0000000000
--- a/Data/Sys/GameSettings/PBEP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PBEP18 - Motoroader
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBH.ini b/Data/Sys/GameSettings/PBH.ini
new file mode 100644
index 0000000000..7a786440d0
--- /dev/null
+++ b/Data/Sys/GameSettings/PBH.ini
@@ -0,0 +1,24 @@
+# PBHE18, PBHP18 - Bonk's Revenge
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBHE18.ini b/Data/Sys/GameSettings/PBHE18.ini
deleted file mode 100644
index 391972ee5e..0000000000
--- a/Data/Sys/GameSettings/PBHE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PBHE18 - Bonk's Revenge
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBHP18.ini b/Data/Sys/GameSettings/PBHP18.ini
deleted file mode 100644
index 022bc2f797..0000000000
--- a/Data/Sys/GameSettings/PBHP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PBHP18 - Bonk's Revenge
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PA7P18.ini b/Data/Sys/GameSettings/PBI.ini
similarity index 94%
rename from Data/Sys/GameSettings/PA7P18.ini
rename to Data/Sys/GameSettings/PBI.ini
index 3b637108c6..532bf52096 100644
--- a/Data/Sys/GameSettings/PA7P18.ini
+++ b/Data/Sys/GameSettings/PBI.ini
@@ -1,4 +1,4 @@
-# PA7P18 - Alien Crush
+# PBIE18, PBIP18 - Bonk 3
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/PBIE18.ini b/Data/Sys/GameSettings/PBIE18.ini
deleted file mode 100644
index 26e9a06e28..0000000000
--- a/Data/Sys/GameSettings/PBIE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PBIE18 - Bonk 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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBIP18.ini b/Data/Sys/GameSettings/PBIP18.ini
deleted file mode 100644
index db9d9ddc68..0000000000
--- a/Data/Sys/GameSettings/PBIP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PBIP18 - Bonk 3
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBJ.ini b/Data/Sys/GameSettings/PBJ.ini
new file mode 100644
index 0000000000..f4c65a76af
--- /dev/null
+++ b/Data/Sys/GameSettings/PBJ.ini
@@ -0,0 +1,24 @@
+# PBJE18, PBJP18 - SAMURAI-GHOST
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBJE18.ini b/Data/Sys/GameSettings/PBJE18.ini
deleted file mode 100644
index dd65d75e63..0000000000
--- a/Data/Sys/GameSettings/PBJE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PBJE18 - SAMURAI-GHOST
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBJP18.ini b/Data/Sys/GameSettings/PBJP18.ini
deleted file mode 100644
index 3cbf80c29c..0000000000
--- a/Data/Sys/GameSettings/PBJP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PBJP18 - SAMURAI-GHOST
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBM.ini b/Data/Sys/GameSettings/PBM.ini
new file mode 100644
index 0000000000..6a9985678a
--- /dev/null
+++ b/Data/Sys/GameSettings/PBM.ini
@@ -0,0 +1,24 @@
+# PBME18, PBMP18 - LEGEND OF HERO TONMA
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBME18.ini b/Data/Sys/GameSettings/PBME18.ini
deleted file mode 100644
index 7ec3441c31..0000000000
--- a/Data/Sys/GameSettings/PBME18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PBME18 - LEGEND OF HERO TONMA
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBMP18.ini b/Data/Sys/GameSettings/PBMP18.ini
deleted file mode 100644
index d6d9240401..0000000000
--- a/Data/Sys/GameSettings/PBMP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PBMP18 - LEGEND OF HERO TONMA
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBN.ini b/Data/Sys/GameSettings/PBN.ini
new file mode 100644
index 0000000000..5474ae3fdb
--- /dev/null
+++ b/Data/Sys/GameSettings/PBN.ini
@@ -0,0 +1,24 @@
+# PBNE18, PBNP18 - Ninja Spirit
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBNE18.ini b/Data/Sys/GameSettings/PBNE18.ini
deleted file mode 100644
index 84b87780c3..0000000000
--- a/Data/Sys/GameSettings/PBNE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PBNE18 - Ninja Spirit
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBNP18.ini b/Data/Sys/GameSettings/PBNP18.ini
deleted file mode 100644
index 9d784b19b7..0000000000
--- a/Data/Sys/GameSettings/PBNP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PBNP18 - Ninja Spirit
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBS.ini b/Data/Sys/GameSettings/PBS.ini
new file mode 100644
index 0000000000..17211cf65b
--- /dev/null
+++ b/Data/Sys/GameSettings/PBS.ini
@@ -0,0 +1,24 @@
+# PBSE18, PBSP18 - Chew Man Fu
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBSE18.ini b/Data/Sys/GameSettings/PBSE18.ini
deleted file mode 100644
index 8e65f349b9..0000000000
--- a/Data/Sys/GameSettings/PBSE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PBSE18 - Chew Man Fu
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBSP18.ini b/Data/Sys/GameSettings/PBSP18.ini
deleted file mode 100644
index 8bcb78173b..0000000000
--- a/Data/Sys/GameSettings/PBSP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PBSP18 - Chew Man Fu
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBT.ini b/Data/Sys/GameSettings/PBT.ini
new file mode 100644
index 0000000000..eba7bc1200
--- /dev/null
+++ b/Data/Sys/GameSettings/PBT.ini
@@ -0,0 +1,24 @@
+# PBTE18, PBTP18 - China Warrior
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBTE18.ini b/Data/Sys/GameSettings/PBTE18.ini
deleted file mode 100644
index 3ed72a8b25..0000000000
--- a/Data/Sys/GameSettings/PBTE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PBTE18 - China Warrior
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBTP18.ini b/Data/Sys/GameSettings/PBTP18.ini
deleted file mode 100644
index e7f4b03578..0000000000
--- a/Data/Sys/GameSettings/PBTP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PBTP18 - China Warrior
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBW.ini b/Data/Sys/GameSettings/PBW.ini
new file mode 100644
index 0000000000..7d56cf9e76
--- /dev/null
+++ b/Data/Sys/GameSettings/PBW.ini
@@ -0,0 +1,24 @@
+# PBWE18, PBWP18 - Air "Zonk"
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBWE18.ini b/Data/Sys/GameSettings/PBWE18.ini
deleted file mode 100644
index 0d9f83c9a8..0000000000
--- a/Data/Sys/GameSettings/PBWE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PBWE18 - Air "Zonk"
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBWP18.ini b/Data/Sys/GameSettings/PBWP18.ini
deleted file mode 100644
index 1ca99e0b42..0000000000
--- a/Data/Sys/GameSettings/PBWP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PBWP18 - Air "Zonk"
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBX.ini b/Data/Sys/GameSettings/PBX.ini
new file mode 100644
index 0000000000..2902542abf
--- /dev/null
+++ b/Data/Sys/GameSettings/PBX.ini
@@ -0,0 +1,24 @@
+# PBXE18, PBXP18 - Shockman
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBXE18.ini b/Data/Sys/GameSettings/PBXE18.ini
deleted file mode 100644
index a599a6dea3..0000000000
--- a/Data/Sys/GameSettings/PBXE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PBXE18 - Shockman
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBXP18.ini b/Data/Sys/GameSettings/PBXP18.ini
deleted file mode 100644
index b83c064753..0000000000
--- a/Data/Sys/GameSettings/PBXP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PBXP18 - Shockman
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBZ.ini b/Data/Sys/GameSettings/PBZ.ini
new file mode 100644
index 0000000000..b0deb287eb
--- /dev/null
+++ b/Data/Sys/GameSettings/PBZ.ini
@@ -0,0 +1,24 @@
+# PBZE18, PBZP18 - J.J. & JEFF
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBZE18.ini b/Data/Sys/GameSettings/PBZE18.ini
deleted file mode 100644
index cd91140370..0000000000
--- a/Data/Sys/GameSettings/PBZE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PBZE18 - J.J. & JEFF
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBZP18.ini b/Data/Sys/GameSettings/PBZP18.ini
deleted file mode 100644
index 63ee188148..0000000000
--- a/Data/Sys/GameSettings/PBZP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PBZP18 - J.J. & JEFF
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCA.ini b/Data/Sys/GameSettings/PCA.ini
new file mode 100644
index 0000000000..b6c8742a92
--- /dev/null
+++ b/Data/Sys/GameSettings/PCA.ini
@@ -0,0 +1,24 @@
+# PCAE18, PCAP18 - Silent Debuggers
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCAE18.ini b/Data/Sys/GameSettings/PCAE18.ini
deleted file mode 100644
index 86e586c091..0000000000
--- a/Data/Sys/GameSettings/PCAE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PCAE18 - Silent Debuggers
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCAP18.ini b/Data/Sys/GameSettings/PCAP18.ini
deleted file mode 100644
index 42281640d7..0000000000
--- a/Data/Sys/GameSettings/PCAP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PCAP18 - Silent Debuggers
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCB.ini b/Data/Sys/GameSettings/PCB.ini
new file mode 100644
index 0000000000..cc3bdcbbda
--- /dev/null
+++ b/Data/Sys/GameSettings/PCB.ini
@@ -0,0 +1,24 @@
+# PCBE18, PCBP18 - Dead Moon
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCBE18.ini b/Data/Sys/GameSettings/PCBE18.ini
deleted file mode 100644
index 392334b633..0000000000
--- a/Data/Sys/GameSettings/PCBE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PCBE18 - Dead Moon
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCBP18.ini b/Data/Sys/GameSettings/PCBP18.ini
deleted file mode 100644
index 191c5e9b42..0000000000
--- a/Data/Sys/GameSettings/PCBP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PCBP18 - Dead Moon
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCE.ini b/Data/Sys/GameSettings/PCE.ini
new file mode 100644
index 0000000000..8c7ad174bc
--- /dev/null
+++ b/Data/Sys/GameSettings/PCE.ini
@@ -0,0 +1,24 @@
+# PCEE18, PCEP18 - Power Golf
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCEE18.ini b/Data/Sys/GameSettings/PCEE18.ini
deleted file mode 100644
index 42ce68790b..0000000000
--- a/Data/Sys/GameSettings/PCEE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PCEE18 - Power Golf
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCEP18.ini b/Data/Sys/GameSettings/PCEP18.ini
deleted file mode 100644
index 36ec2bd5fe..0000000000
--- a/Data/Sys/GameSettings/PCEP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PCEP18 - Power Golf
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCH.ini b/Data/Sys/GameSettings/PCH.ini
new file mode 100644
index 0000000000..9f6338ceb1
--- /dev/null
+++ b/Data/Sys/GameSettings/PCH.ini
@@ -0,0 +1,24 @@
+# PCHE18, PCHP18 - Drop Off
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCHE18.ini b/Data/Sys/GameSettings/PCHE18.ini
deleted file mode 100644
index dc8d6bfdf5..0000000000
--- a/Data/Sys/GameSettings/PCHE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PCHE18 - Drop Off
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCHP18.ini b/Data/Sys/GameSettings/PCHP18.ini
deleted file mode 100644
index 30694416b7..0000000000
--- a/Data/Sys/GameSettings/PCHP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PCHP18 - Drop Off
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCV.ini b/Data/Sys/GameSettings/PCV.ini
new file mode 100644
index 0000000000..887142d8ef
--- /dev/null
+++ b/Data/Sys/GameSettings/PCV.ini
@@ -0,0 +1,24 @@
+# PCVE18, PCVP18 - World Class Baseball
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCVE18.ini b/Data/Sys/GameSettings/PCVE18.ini
deleted file mode 100644
index 21b6093d41..0000000000
--- a/Data/Sys/GameSettings/PCVE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# PCVE18 - World Class Baseball
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCVP18.ini b/Data/Sys/GameSettings/PCVP18.ini
deleted file mode 100644
index cab034eb1d..0000000000
--- a/Data/Sys/GameSettings/PCVP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PCVP18 - World Class Baseball
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAF.ini b/Data/Sys/GameSettings/QAF.ini
new file mode 100644
index 0000000000..751774e61d
--- /dev/null
+++ b/Data/Sys/GameSettings/QAF.ini
@@ -0,0 +1,24 @@
+# QAFE18, QAFP18 - The Dynastic Hero
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAFE18.ini b/Data/Sys/GameSettings/QAFE18.ini
deleted file mode 100644
index ae05cf3cc2..0000000000
--- a/Data/Sys/GameSettings/QAFE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# QAFE18 - The Dynastic Hero
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAFP18.ini b/Data/Sys/GameSettings/QAFP18.ini
deleted file mode 100644
index 11510a54c8..0000000000
--- a/Data/Sys/GameSettings/QAFP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QAFP18 - The Dynastic Hero
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAG.ini b/Data/Sys/GameSettings/QAG.ini
new file mode 100644
index 0000000000..2964971d0d
--- /dev/null
+++ b/Data/Sys/GameSettings/QAG.ini
@@ -0,0 +1,24 @@
+# QAGE18, QAGP18 - Gate of Thunder
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAGE18.ini b/Data/Sys/GameSettings/QAGE18.ini
deleted file mode 100644
index 724bb63bd4..0000000000
--- a/Data/Sys/GameSettings/QAGE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# QAGE18 - Gate of Thunder
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAGP18.ini b/Data/Sys/GameSettings/QAGP18.ini
deleted file mode 100644
index f7d44db26e..0000000000
--- a/Data/Sys/GameSettings/QAGP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QAGP18 - Gate of Thunder
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAS.ini b/Data/Sys/GameSettings/QAS.ini
new file mode 100644
index 0000000000..75cae08565
--- /dev/null
+++ b/Data/Sys/GameSettings/QAS.ini
@@ -0,0 +1,24 @@
+# QASE18, QASP18 - Lords of Thunder
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QASE18.ini b/Data/Sys/GameSettings/QASE18.ini
deleted file mode 100644
index 98eb3e3c57..0000000000
--- a/Data/Sys/GameSettings/QASE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# QASE18 - Lords of Thunder
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QASP18.ini b/Data/Sys/GameSettings/QASP18.ini
deleted file mode 100644
index 2a11b0b0fc..0000000000
--- a/Data/Sys/GameSettings/QASP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QASP18 - Lords of Thunder
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAT.ini b/Data/Sys/GameSettings/QAT.ini
new file mode 100644
index 0000000000..0e7deacf26
--- /dev/null
+++ b/Data/Sys/GameSettings/QAT.ini
@@ -0,0 +1,24 @@
+# QATE18, QATP18 - Riot Zone
+
+[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 = 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]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QATE18.ini b/Data/Sys/GameSettings/QATE18.ini
deleted file mode 100644
index 9928c51320..0000000000
--- a/Data/Sys/GameSettings/QATE18.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# QATE18 - Riot Zone
-
-[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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QATP18.ini b/Data/Sys/GameSettings/QATP18.ini
deleted file mode 100644
index 12c6d6c864..0000000000
--- a/Data/Sys/GameSettings/QATP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QATP18 - Riot Zone
-
-[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 = 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]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/R2V.ini b/Data/Sys/GameSettings/R2V.ini
new file mode 100644
index 0000000000..cceb15c611
--- /dev/null
+++ b/Data/Sys/GameSettings/R2V.ini
@@ -0,0 +1,19 @@
+# R2VJ01, R2VP01 - Sin and Punishment 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.
+
diff --git a/Data/Sys/GameSettings/R2VJ01.ini b/Data/Sys/GameSettings/R2VJ01.ini
deleted file mode 100644
index 702c39e86f..0000000000
--- a/Data/Sys/GameSettings/R2VJ01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# R2VJ01 - Sin and Punishment 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.
-
diff --git a/Data/Sys/GameSettings/R2VP01.ini b/Data/Sys/GameSettings/R2VP01.ini
deleted file mode 100644
index c708e83d9f..0000000000
--- a/Data/Sys/GameSettings/R2VP01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# R2VP01 - Sin and Punishment 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
-
diff --git a/Data/Sys/GameSettings/R6YEXS.ini b/Data/Sys/GameSettings/R6Y.ini
similarity index 92%
rename from Data/Sys/GameSettings/R6YEXS.ini
rename to Data/Sys/GameSettings/R6Y.ini
index 6001933724..40d4cba37a 100644
--- a/Data/Sys/GameSettings/R6YEXS.ini
+++ b/Data/Sys/GameSettings/R6Y.ini
@@ -1,12 +1,12 @@
-# R6YEXS - Squeeballs Party
+# R6YEXS, R6YPH3 - Squeeballs Party
 
 [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 =
 EmulationStateId = 4
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/R6YPH3.ini b/Data/Sys/GameSettings/R6YPH3.ini
deleted file mode 100644
index 1ad74de5c1..0000000000
--- a/Data/Sys/GameSettings/R6YPH3.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# R6YPH3 - Squeeballs Party
-
-[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 = 0
-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 = 512
-
diff --git a/Data/Sys/GameSettings/R7EP8P.ini b/Data/Sys/GameSettings/R7E.ini
similarity index 90%
rename from Data/Sys/GameSettings/R7EP8P.ini
rename to Data/Sys/GameSettings/R7E.ini
index dc899341c7..10762d4cfe 100644
--- a/Data/Sys/GameSettings/R7EP8P.ini
+++ b/Data/Sys/GameSettings/R7E.ini
@@ -1,4 +1,4 @@
-# R7EP8P - NiGHTS: Journey of Dreams
+# R7EE8P, R7EJ8P, R7EP8P - NiGHTS: Journey of Dreams
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R7EE8P.ini b/Data/Sys/GameSettings/R7EE8P.ini
deleted file mode 100644
index a28a1b5afe..0000000000
--- a/Data/Sys/GameSettings/R7EE8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R7EE8P - NiGHTS: Journey of Dreams
-
-[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 = 
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/R7EJ8P.ini b/Data/Sys/GameSettings/R7EJ8P.ini
deleted file mode 100644
index 8504407edb..0000000000
--- a/Data/Sys/GameSettings/R7EJ8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R7EJ8P - NiGHTS: Journey of Dreams
-
-[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 = 
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/R7F.ini b/Data/Sys/GameSettings/R7F.ini
index fe3ce63ed0..a897bc5d24 100644
--- a/Data/Sys/GameSettings/R7F.ini
+++ b/Data/Sys/GameSettings/R7F.ini
@@ -1,4 +1,4 @@
-# R7FEGD, R7FPGD - FINAL FANTASY FABLES: Chocobo's Dungeon
+# R7FEGD, R7FJGD, R7FPGD - FINAL FANTASY FABLES: Chocobo's Dungeon
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R7FJGD.ini b/Data/Sys/GameSettings/R7FJGD.ini
deleted file mode 100644
index 934c03c366..0000000000
--- a/Data/Sys/GameSettings/R7FJGD.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# R7FJGD - FINAL FANTASY FABLES: Chocobo's Dungeon
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
diff --git a/Data/Sys/GameSettings/GB4P51.ini b/Data/Sys/GameSettings/R7P.ini
similarity index 94%
rename from Data/Sys/GameSettings/GB4P51.ini
rename to Data/Sys/GameSettings/R7P.ini
index b432e7c436..7d9b739491 100644
--- a/Data/Sys/GameSettings/GB4P51.ini
+++ b/Data/Sys/GameSettings/R7P.ini
@@ -1,12 +1,12 @@
-# GB4P51 - Burnout 2
+# R7PP01 - Punch Out
 
 [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 =
+EmulationStateId = 4
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/R8A.ini b/Data/Sys/GameSettings/R8A.ini
index 839fb7933d..5cc83f0ead 100644
--- a/Data/Sys/GameSettings/R8A.ini
+++ b/Data/Sys/GameSettings/R8A.ini
@@ -1,4 +1,4 @@
-# R8AE01, R8AP01 - Pokepark Wii
+# R8AE01, R8AJ01, R8AP01 - PokéPark Wii
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R8AJ01.ini b/Data/Sys/GameSettings/R8AJ01.ini
deleted file mode 100644
index 085c17d5c9..0000000000
--- a/Data/Sys/GameSettings/R8AJ01.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# R8AJ01 - Pokepark Wii
-
-[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 = NPCs sporadically disappear. Needs Efb to Ram for photos.
-
-[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_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/R8PK01.ini b/Data/Sys/GameSettings/R8P.ini
similarity index 89%
rename from Data/Sys/GameSettings/R8PK01.ini
rename to Data/Sys/GameSettings/R8P.ini
index 193af9a1b2..7e5a97367a 100644
--- a/Data/Sys/GameSettings/R8PK01.ini
+++ b/Data/Sys/GameSettings/R8P.ini
@@ -1,4 +1,4 @@
-# R8PK01 - SUPER PAPER MARIO
+# R8PE01, R8PJ01, R8PK01, R8PP01 - SUPER PAPER MARIO
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R8PE01.ini b/Data/Sys/GameSettings/R8PE01.ini
deleted file mode 100644
index 876e7486fe..0000000000
--- a/Data/Sys/GameSettings/R8PE01.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# R8PE01 - SUPER PAPER MARIO
-
-[Core]
-# Values set here will override the main dolphin settings.
-AccurateFCMP = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
-
-[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_Hacks]
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/R8PJ01.ini b/Data/Sys/GameSettings/R8PJ01.ini
deleted file mode 100644
index bb8ed3b68a..0000000000
--- a/Data/Sys/GameSettings/R8PJ01.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# R8PJ01 - SUPER PAPER MARIO
-
-[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 = Needs Efb to Ram for BBox (proper graphics).
-
-[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_Hacks]
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/R8PP01.ini b/Data/Sys/GameSettings/R8PP01.ini
deleted file mode 100644
index 005a9191b9..0000000000
--- a/Data/Sys/GameSettings/R8PP01.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# R8PP01 - SUPER PAPER MARIO
-
-[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 = Needs Efb to Ram for BBox (proper graphics).
-
-[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_Hacks]
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/RB4.ini b/Data/Sys/GameSettings/RB4.ini
new file mode 100644
index 0000000000..e8cfe6f195
--- /dev/null
+++ b/Data/Sys/GameSettings/RB4.ini
@@ -0,0 +1,19 @@
+# RB4E08, RB4P08 - resident evil 4 Wii edition
+
+[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.
+
diff --git a/Data/Sys/GameSettings/RB4E08.ini b/Data/Sys/GameSettings/RB4E08.ini
deleted file mode 100644
index 622ac46b6e..0000000000
--- a/Data/Sys/GameSettings/RB4E08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RB4E08 - resident evil 4 Wii edition (E)
-
-[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 = To avoid some texture errors, use the Opengl plugin(r6436)
-
-[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/RB4P08.ini b/Data/Sys/GameSettings/RB4P08.ini
deleted file mode 100644
index c588dd9135..0000000000
--- a/Data/Sys/GameSettings/RB4P08.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RB4P08 - resident evil 4 Wii edition (P)
-
-[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.
-
diff --git a/Data/Sys/GameSettings/RBU.ini b/Data/Sys/GameSettings/RBU.ini
new file mode 100644
index 0000000000..38349c94aa
--- /dev/null
+++ b/Data/Sys/GameSettings/RBU.ini
@@ -0,0 +1,27 @@
+# RBUE08, RBUP08 - Resident Evil The Umbrella Chronicles
+
+[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
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RBUE08.ini b/Data/Sys/GameSettings/RBUE08.ini
deleted file mode 100644
index 71056bb08f..0000000000
--- a/Data/Sys/GameSettings/RBUE08.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RBUE08 - Resident Evil The Umbrella Chronicles
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RBUP08.ini b/Data/Sys/GameSettings/RBUP08.ini
deleted file mode 100644
index 99d9507061..0000000000
--- a/Data/Sys/GameSettings/RBUP08.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RBUP08 - Resident Evil The Umbrella Chronicles
-
-[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 = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.1
-
diff --git a/Data/Sys/GameSettings/RBW.ini b/Data/Sys/GameSettings/RBW.ini
index 328621d102..f9b9795639 100644
--- a/Data/Sys/GameSettings/RBW.ini
+++ b/Data/Sys/GameSettings/RBW.ini
@@ -1,4 +1,4 @@
-# RBWE01, RBWP01 - Battalion Wars 2
+# RBWE01, RBWJ01, RBWP01 - Battalion Wars 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RBWJ01.ini b/Data/Sys/GameSettings/RBWJ01.ini
deleted file mode 100644
index c048d63778..0000000000
--- a/Data/Sys/GameSettings/RBWJ01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RBWJ01 - Totsugeki Famicom Wars vs.
-
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = False
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Idle skipping slows down the 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]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
diff --git a/Data/Sys/GameSettings/RCJP8P.ini b/Data/Sys/GameSettings/RCJ.ini
similarity index 94%
rename from Data/Sys/GameSettings/RCJP8P.ini
rename to Data/Sys/GameSettings/RCJ.ini
index 6bbcea526f..859cf16b3e 100644
--- a/Data/Sys/GameSettings/RCJP8P.ini
+++ b/Data/Sys/GameSettings/RCJ.ini
@@ -1,4 +1,4 @@
-# RCJP8P - The Conduit
+# RCJE8P, RCJP8P - The Conduit
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GNWP69.ini b/Data/Sys/GameSettings/RDQ.ini
similarity index 91%
rename from Data/Sys/GameSettings/GNWP69.ini
rename to Data/Sys/GameSettings/RDQ.ini
index c91f9fd416..6574b29189 100644
--- a/Data/Sys/GameSettings/GNWP69.ini
+++ b/Data/Sys/GameSettings/RDQ.ini
@@ -1,4 +1,4 @@
-# GNWP69 - Def Jam Fight For NY
+# RDQEGD, RDQJGD - DRAGON QUEST SWORDS
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -24,4 +24,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear =
 PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RDQEGD.ini b/Data/Sys/GameSettings/RDQEGD.ini
deleted file mode 100644
index 6b7916e78d..0000000000
--- a/Data/Sys/GameSettings/RDQEGD.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RDQEGD - DRAGON QUEST SWORDS
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RDQJGD.ini b/Data/Sys/GameSettings/RDQJGD.ini
deleted file mode 100644
index 7ce8f0d78d..0000000000
--- a/Data/Sys/GameSettings/RDQJGD.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# RDQJGD - DRAGON QUEST SWORDS
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
diff --git a/Data/Sys/GameSettings/RDSPAF.ini b/Data/Sys/GameSettings/RDS.ini
similarity index 87%
rename from Data/Sys/GameSettings/RDSPAF.ini
rename to Data/Sys/GameSettings/RDS.ini
index 426a3eb15f..455dc7b1d5 100644
--- a/Data/Sys/GameSettings/RDSPAF.ini
+++ b/Data/Sys/GameSettings/RDS.ini
@@ -1,4 +1,4 @@
-# RDSPAF - Dragon Ball Z Budokai Tenkaichi 3
+# RDSEAF, RDSJAF, RDSPAF - Dragon Ball Z Budokai Tenkaichi 3
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RDSE70.ini b/Data/Sys/GameSettings/RDSE70.ini
deleted file mode 100644
index 753702b3a4..0000000000
--- a/Data/Sys/GameSettings/RDSE70.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RDSE70 - Dragon Ball Z Budokai Tenkaichi 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.
-EmulationIssues =
-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]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RDSJAF.ini b/Data/Sys/GameSettings/RDSJAF.ini
deleted file mode 100644
index 4c96fd2539..0000000000
--- a/Data/Sys/GameSettings/RDSJAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RDSJAF - Dragon Ball Z Sparking METEOR
-
-[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 =
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RELS01.ini b/Data/Sys/GameSettings/RELS01.ini
deleted file mode 100644
index a3a184914d..0000000000
--- a/Data/Sys/GameSettings/RELS01.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# RELS01 - The Legend of Zelda: Collector's Edition(Majora's Mask)
-
-[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.
-$loophack_ZOOT
-0x80683804:word:0x60000000
-$loophack_ZMM
-0x8068C324:word:0x60000000
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/REN.ini b/Data/Sys/GameSettings/REN.ini
index cc96dac8e2..95ef458188 100644
--- a/Data/Sys/GameSettings/REN.ini
+++ b/Data/Sys/GameSettings/REN.ini
@@ -1,4 +1,4 @@
-# RENE8P, RENJ8P - Sonic and the Black Knight
+# RENE8P, RENJ8P, RENP8P - Sonic and the Black Knight
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RENP8P.ini b/Data/Sys/GameSettings/RENP8P.ini
deleted file mode 100644
index f6c5802ecd..0000000000
--- a/Data/Sys/GameSettings/RENP8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RENP8P - Sonic and the Black Knight
-
-[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 = Very Darkness ingame
-
-[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/RFE.ini b/Data/Sys/GameSettings/RFE.ini
index 5273439073..19e872f994 100644
--- a/Data/Sys/GameSettings/RFE.ini
+++ b/Data/Sys/GameSettings/RFE.ini
@@ -1,4 +1,4 @@
-# RFEE01, RFEJ01 - FIRE EMBLEM 10 USA
+# RFEE01, RFEJ01, RFEP01 - FIRE EMBLEM 10
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RFEP01.ini b/Data/Sys/GameSettings/RFEP01.ini
deleted file mode 100644
index f8f3f6f6a2..0000000000
--- a/Data/Sys/GameSettings/RFEP01.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# RFEP01 - FIRE EMBLEM 10 EUR
-
-[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 = Disable gamecube controller or wiimote to not have conflicts.
-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]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
diff --git a/Data/Sys/GameSettings/RHDJ8P.ini b/Data/Sys/GameSettings/RHD.ini
similarity index 87%
rename from Data/Sys/GameSettings/RHDJ8P.ini
rename to Data/Sys/GameSettings/RHD.ini
index 6bdc197c3d..a194ac3635 100644
--- a/Data/Sys/GameSettings/RHDJ8P.ini
+++ b/Data/Sys/GameSettings/RHD.ini
@@ -1,4 +1,4 @@
-# RHDJ8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
+# RHDE8P, RHDJ8P, RHDP8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RHDE8P.ini b/Data/Sys/GameSettings/RHDE8P.ini
deleted file mode 100644
index e43f82b924..0000000000
--- a/Data/Sys/GameSettings/RHDE8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# RHDE8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
-
-[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]
-# 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/RHDP8P.ini b/Data/Sys/GameSettings/RHDP8P.ini
deleted file mode 100644
index fc96b7c717..0000000000
--- a/Data/Sys/GameSettings/RHDP8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RHDP8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
-
-[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]
-# 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/RIN.ini b/Data/Sys/GameSettings/RIN.ini
new file mode 100644
index 0000000000..3be2c91edd
--- /dev/null
+++ b/Data/Sys/GameSettings/RIN.ini
@@ -0,0 +1,19 @@
+# RINE08, RINP08 - DEADRISING
+
+[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.
+
diff --git a/Data/Sys/GameSettings/RINE08.ini b/Data/Sys/GameSettings/RINE08.ini
deleted file mode 100644
index e6bf0a9c95..0000000000
--- a/Data/Sys/GameSettings/RINE08.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RINE08 - DEADRISING
-
-[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.
-
diff --git a/Data/Sys/GameSettings/RINP08.ini b/Data/Sys/GameSettings/RINP08.ini
deleted file mode 100644
index 9ce49b6a67..0000000000
--- a/Data/Sys/GameSettings/RINP08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RINP08 - DEADRISING
-
-[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 = Can't load saves
-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]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RKD.ini b/Data/Sys/GameSettings/RKD.ini
index 48d81a0db2..a0f9ca8d99 100644
--- a/Data/Sys/GameSettings/RKD.ini
+++ b/Data/Sys/GameSettings/RKD.ini
@@ -1,4 +1,4 @@
-# RKDEEB, RKDJEB, RKDPEB - Trauma Center SO
+# RKDEEB, RKDJEB, RKDP01, RKDPEB - Trauma Center SO
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RKDP01.ini b/Data/Sys/GameSettings/RKDP01.ini
deleted file mode 100644
index 072d9ac478..0000000000
--- a/Data/Sys/GameSettings/RKDP01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RKDP01 - Caduceus Z
-
-[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]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RM3.ini b/Data/Sys/GameSettings/RM3.ini
index d741f1f81e..917c6a3ff6 100644
--- a/Data/Sys/GameSettings/RM3.ini
+++ b/Data/Sys/GameSettings/RM3.ini
@@ -1,4 +1,4 @@
-# RM3E01, RM3J01 - Metroid Prime 3: Corruption
+# RM3E01, RM3J01, RM3P01 - Metroid Prime 3: Corruption
 [Core]
 # Values set here will override the main dolphin settings.
 [EmuState]
diff --git a/Data/Sys/GameSettings/RM3P01.ini b/Data/Sys/GameSettings/RM3P01.ini
index 09824f42c3..f360823d25 100644
--- a/Data/Sys/GameSettings/RM3P01.ini
+++ b/Data/Sys/GameSettings/RM3P01.ini
@@ -1,5 +1,4 @@
 # RM3P01 - Metroid Prime 3: Corruption
-
 [Core]
 # Values set here will override the main dolphin settings.
 [EmuState]
diff --git a/Data/Sys/GameSettings/RMAP01.ini b/Data/Sys/GameSettings/RMA.ini
similarity index 89%
rename from Data/Sys/GameSettings/RMAP01.ini
rename to Data/Sys/GameSettings/RMA.ini
index b16d110eab..fa10a5c780 100644
--- a/Data/Sys/GameSettings/RMAP01.ini
+++ b/Data/Sys/GameSettings/RMA.ini
@@ -1,4 +1,4 @@
-# RMAP01 - MarioTennisGC(Wii Version)
+# RMAE01, RMAP01 - MarioTennisGC(Wii Version)
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RMAE01.ini b/Data/Sys/GameSettings/RMAE01.ini
deleted file mode 100644
index b92661c17a..0000000000
--- a/Data/Sys/GameSettings/RMAE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RMAE01 - MarioTennisGC(Wii Version)
-
-[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 = Starts in tournament mode
-
-[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/GKBEAF.ini b/Data/Sys/GameSettings/RMH.ini
similarity index 78%
rename from Data/Sys/GameSettings/GKBEAF.ini
rename to Data/Sys/GameSettings/RMH.ini
index 6cc6f578e9..a9a432911c 100644
--- a/Data/Sys/GameSettings/GKBEAF.ini
+++ b/Data/Sys/GameSettings/RMH.ini
@@ -1,13 +1,12 @@
-# GKBEAF - Baten Kaitos Eternal Wings and the Lost Ocean
+# RMHE08, RMHJ08, RMHP08 - Monster Hunter Tri
 
 [Core]
 # Values set here will override the main dolphin settings.
-CPUThread = 0
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Skip efb access from cpu needs to be enabled for direct 3d to have playable speeds.
 EmulationStateId = 4
-EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -26,11 +25,11 @@ PH_ExtraParam = 0
 PH_ZNear =
 PH_ZFar =
 
-[Video_Hacks]
-EFBAccessEnable = False
-EFBToTextureEnable = False
-
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
 
+[Video_Hacks]
+EFBAccessEnable = False
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/RMHJ08.ini b/Data/Sys/GameSettings/RMHJ08.ini
index 977a1828c8..4c2e28bb05 100644
--- a/Data/Sys/GameSettings/RMHJ08.ini
+++ b/Data/Sys/GameSettings/RMHJ08.ini
@@ -13,6 +13,7 @@ EmulationStateId = 4
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
+$Bloom OFF
 0x805DD6D4:dword:0x60000000
 0x805DD6D8:dword:0x60000000
 0x805DD6DC:dword:0x60000000
diff --git a/Data/Sys/GameSettings/RMLEH4.ini b/Data/Sys/GameSettings/RML.ini
similarity index 89%
rename from Data/Sys/GameSettings/RMLEH4.ini
rename to Data/Sys/GameSettings/RML.ini
index 1d675976a5..4172f1e83d 100644
--- a/Data/Sys/GameSettings/RMLEH4.ini
+++ b/Data/Sys/GameSettings/RML.ini
@@ -1,4 +1,4 @@
-# RMLEH4 - METAL SLUG Anthology
+# RMLEH4, RMLJH4, RMLK52, RMLP7U, RMLJH4 - METAL SLUG Anthology
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -28,4 +28,3 @@ PH_ZFar =
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RMLJH4.ini b/Data/Sys/GameSettings/RMLJH4.ini
deleted file mode 100644
index c803857633..0000000000
--- a/Data/Sys/GameSettings/RMLJH4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMLJH4 - Metal Slug Complete
-
-[Core]
-# Values set here will override the main dolphin settings.
-CPUThread = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Dual core causes random texture corruption.
-
-[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
diff --git a/Data/Sys/GameSettings/RMLK52.ini b/Data/Sys/GameSettings/RMLK52.ini
deleted file mode 100644
index ca193b4df5..0000000000
--- a/Data/Sys/GameSettings/RMLK52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMLK52 - Metal Slug Complete
-
-[Core]
-# Values set here will override the main dolphin settings.
-CPUThread = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Dual core causes random texture corruption.
-
-[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
diff --git a/Data/Sys/GameSettings/RMLP7U.ini b/Data/Sys/GameSettings/RMLP7U.ini
deleted file mode 100644
index 0b5f86a7bf..0000000000
--- a/Data/Sys/GameSettings/RMLP7U.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMLP7U - METAL SLUG Anthology
-
-[Core]
-# Values set here will override the main dolphin settings.
-CPUThread = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Dual core causes random texture corruption.
-
-[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
diff --git a/Data/Sys/GameSettings/RMLPH4.ini b/Data/Sys/GameSettings/RMLPH4.ini
deleted file mode 100644
index 37bce5e538..0000000000
--- a/Data/Sys/GameSettings/RMLPH4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMLPH4 - METAL SLUG Anthology
-
-[Core]
-# Values set here will override the main dolphin settings.
-CPUThread = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Dual core causes random texture corruption.
-
-[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
diff --git a/Data/Sys/GameSettings/RNHP99.ini b/Data/Sys/GameSettings/RNH.ini
similarity index 92%
rename from Data/Sys/GameSettings/RNHP99.ini
rename to Data/Sys/GameSettings/RNH.ini
index 782b5b6db0..366bcda834 100644
--- a/Data/Sys/GameSettings/RNHP99.ini
+++ b/Data/Sys/GameSettings/RNH.ini
@@ -1,4 +1,4 @@
-# RNHP99 - NO MORE HEROES
+# RNHE41, RNHP99 - NO MORE HEROES
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -16,6 +16,3 @@ EmulationIssues = Small graphical glitch with light saber (light stays at the sa
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-
diff --git a/Data/Sys/GameSettings/RNHE41.ini b/Data/Sys/GameSettings/RNHE41.ini
index 8c90e68c9a..5c2c061783 100644
--- a/Data/Sys/GameSettings/RNHE41.ini
+++ b/Data/Sys/GameSettings/RNHE41.ini
@@ -17,14 +17,6 @@ EmulationIssues = Small graphical glitch with light saber (light stays at the sa
 [ActionReplay]
 # Add action replay cheats here.
 
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
 [Speedhacks]
 0x8035bc9c=700
 
diff --git a/Data/Sys/GameSettings/RO3J99.ini b/Data/Sys/GameSettings/RO3.ini
similarity index 90%
rename from Data/Sys/GameSettings/RO3J99.ini
rename to Data/Sys/GameSettings/RO3.ini
index 9834676c7c..e2b830b1a4 100644
--- a/Data/Sys/GameSettings/RO3J99.ini
+++ b/Data/Sys/GameSettings/RO3.ini
@@ -1,4 +1,4 @@
-# RO3J99 - Little King's Story
+# RO3EXJ, RO3J99, RO3P99 - Little King's Story
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RO3EXJ.ini b/Data/Sys/GameSettings/RO3EXJ.ini
deleted file mode 100644
index 36c1342331..0000000000
--- a/Data/Sys/GameSettings/RO3EXJ.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RO3EXJ - Little King's Story
-
-[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 =
-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]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RO3P99.ini b/Data/Sys/GameSettings/RO3P99.ini
deleted file mode 100644
index 67e93793e7..0000000000
--- a/Data/Sys/GameSettings/RO3P99.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# RO3P99 - Little King's Story
-
-[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 =
-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]
-ProjectionHack = 0
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RSM.ini b/Data/Sys/GameSettings/RSM.ini
index 14add78ce2..3b3c4b33a2 100644
--- a/Data/Sys/GameSettings/RSM.ini
+++ b/Data/Sys/GameSettings/RSM.ini
@@ -1,4 +1,4 @@
-# RSME8P, RSMJ8P - SUPER MONKEY BALL BANANA BLITZ
+# RSME8P, RSMJ8P, RSMP8P - SUPER MONKEY BALL BANANA BLITZ
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GATP51.ini b/Data/Sys/GameSettings/RSR.ini
similarity index 87%
rename from Data/Sys/GameSettings/GATP51.ini
rename to Data/Sys/GameSettings/RSR.ini
index 413a02f9f8..c792ef9778 100644
--- a/Data/Sys/GameSettings/GATP51.ini
+++ b/Data/Sys/GameSettings/RSR.ini
@@ -1,4 +1,4 @@
-# GATP51 - ATV: Quad Power Racing 2
+# RSRE8P, RSRP8P - SONIC AND THE SECRET RINGS
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RSRE8P.ini b/Data/Sys/GameSettings/RSRE8P.ini
deleted file mode 100644
index cc8911678a..0000000000
--- a/Data/Sys/GameSettings/RSRE8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RSRE8P - SONIC AND THE SECRET RINGS
-
-[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.
-
diff --git a/Data/Sys/GameSettings/RSRP8P.ini b/Data/Sys/GameSettings/RSRP8P.ini
deleted file mode 100644
index 1f4d85608c..0000000000
--- a/Data/Sys/GameSettings/RSRP8P.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RSRP8P - SONIC AND THE SECRET RINGS
-
-[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.
-
diff --git a/Data/Sys/GameSettings/RSVJ8P.ini b/Data/Sys/GameSettings/RSV.ini
similarity index 89%
rename from Data/Sys/GameSettings/RSVJ8P.ini
rename to Data/Sys/GameSettings/RSV.ini
index 93f8a0ecd0..383f0a7ef6 100644
--- a/Data/Sys/GameSettings/RSVJ8P.ini
+++ b/Data/Sys/GameSettings/RSV.ini
@@ -1,4 +1,4 @@
-# RSVJ8P - Sonic World Adventure
+# RSVE8P, RSVJ8P, RSVP8P - Sonic Unleashed
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RSVE8P.ini b/Data/Sys/GameSettings/RSVE8P.ini
deleted file mode 100644
index c16e3d8e99..0000000000
--- a/Data/Sys/GameSettings/RSVE8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RSVE8P - Sonic Unleashed
-
-[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 = 1
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.99998
-
diff --git a/Data/Sys/GameSettings/RSVP8P.ini b/Data/Sys/GameSettings/RSVP8P.ini
deleted file mode 100644
index 6ecae0d662..0000000000
--- a/Data/Sys/GameSettings/RSVP8P.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RSVP8P - Sonic Unleashed
-
-[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
-
diff --git a/Data/Sys/GameSettings/RT5.ini b/Data/Sys/GameSettings/RT5.ini
new file mode 100644
index 0000000000..eda535b436
--- /dev/null
+++ b/Data/Sys/GameSettings/RT5.ini
@@ -0,0 +1,19 @@
+# RT5E8P, RT5P8P - Sega Superstar Tennis
+
+[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.
+
diff --git a/Data/Sys/GameSettings/RT5E8P.ini b/Data/Sys/GameSettings/RT5E8P.ini
deleted file mode 100644
index d7180cb8bc..0000000000
--- a/Data/Sys/GameSettings/RT5E8P.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RT5E8P - Sega Superstar Tennis
-
-[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
-
diff --git a/Data/Sys/GameSettings/RT5P8P.ini b/Data/Sys/GameSettings/RT5P8P.ini
deleted file mode 100644
index d06f80beb7..0000000000
--- a/Data/Sys/GameSettings/RT5P8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RT5P8P - Sega Superstar Tennis
-
-[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.
-
diff --git a/Data/Sys/GameSettings/RVSP69.ini b/Data/Sys/GameSettings/RVS.ini
similarity index 92%
rename from Data/Sys/GameSettings/RVSP69.ini
rename to Data/Sys/GameSettings/RVS.ini
index 3e19b96ff1..2aa12f2c95 100644
--- a/Data/Sys/GameSettings/RVSP69.ini
+++ b/Data/Sys/GameSettings/RVS.ini
@@ -1,4 +1,4 @@
-# RVSP69 - Skate It
+# RVSE69, RVSP69 - Skate It
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RVSE69.ini b/Data/Sys/GameSettings/RVSE69.ini
deleted file mode 100644
index f20cf162f6..0000000000
--- a/Data/Sys/GameSettings/RVSE69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RVSE69 - Skate It
-
-[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 = Very slow
-
-[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/RZDK01.ini b/Data/Sys/GameSettings/RZD.ini
similarity index 85%
rename from Data/Sys/GameSettings/RZDK01.ini
rename to Data/Sys/GameSettings/RZD.ini
index 886c934155..c13e60faad 100644
--- a/Data/Sys/GameSettings/RZDK01.ini
+++ b/Data/Sys/GameSettings/RZD.ini
@@ -1,4 +1,4 @@
-# RZDK01 - The Legend of Zelda: Twilight Princess [Wii]
+# RZDE01, RZDJ01, RZDK01, RZDP01 - The Legend of Zelda: Twilight Princess [Wii]
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RZDE01.ini b/Data/Sys/GameSettings/RZDE01r0.ini
similarity index 61%
rename from Data/Sys/GameSettings/RZDE01.ini
rename to Data/Sys/GameSettings/RZDE01r0.ini
index 2e682c725f..2f0715218e 100644
--- a/Data/Sys/GameSettings/RZDE01.ini
+++ b/Data/Sys/GameSettings/RZDE01r0.ini
@@ -46,39 +46,6 @@ $Hyrule Field Speed Hack
 0x80040EC4:dword:0x60000000
 0x80040EE0:dword:0x60000000
 
-$Hyrule Field Speed Hack v2 by TheWearyGamer (use it if the other one doesn't work)
-0x80040C38:dword:0x60000000
-0x80040C54:dword:0x60000000
-0x80040C6C:dword:0x60000000
-0x80040C88:dword:0x60000000
-
-0x80040C88:dword:0x60000000
-0x80040C8C:dword:0x60000000
-0x80040C90:dword:0x60000000
-0x80040C94:dword:0x60000000
-0x80040C98:dword:0x60000000
-0x80040C9C:dword:0x60000000
-0x80040CA0:dword:0x60000000
-0x80040CA4:dword:0x60000000
-0x80040CA8:dword:0x60000000
-0x80040CAC:dword:0x60000000
-0x80040CB0:dword:0x60000000
-0x80040CB4:dword:0x60000000
-0x80040CB8:dword:0x60000000
-0x80040CBC:dword:0x60000000
-0x80040CC0:dword:0x60000000
-0x80040CC4:dword:0x60000000
-0x80040CC8:dword:0x60000000
-0x80040CCC:dword:0x60000000
-0x80040CD0:dword:0x60000000
-0x80040CD4:dword:0x60000000
-0x80040CD8:dword:0x60000000
-
-0x80040CE0:dword:0x60000000
-0x80040CFC:dword:0x60000000
-0x80040D14:dword:0x60000000
-0x80040D30:dword:0x60000000
-
 [ActionReplay]
 # Add action replay cheats here.
 
diff --git a/Data/Sys/GameSettings/RZDE01r2.ini b/Data/Sys/GameSettings/RZDE01r2.ini
new file mode 100644
index 0000000000..656e0869a5
--- /dev/null
+++ b/Data/Sys/GameSettings/RZDE01r2.ini
@@ -0,0 +1,61 @@
+# RZDE01 - The Legend of Zelda: Twilight Princess [Wii]
+
+[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 = 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.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+$Hyrule Field Speed Hack
+0x80040C38:dword:0x60000000
+0x80040C54:dword:0x60000000
+0x80040C6C:dword:0x60000000
+0x80040C88:dword:0x60000000
+
+0x80040C88:dword:0x60000000
+0x80040C8C:dword:0x60000000
+0x80040C90:dword:0x60000000
+0x80040C94:dword:0x60000000
+0x80040C98:dword:0x60000000
+0x80040C9C:dword:0x60000000
+0x80040CA0:dword:0x60000000
+0x80040CA4:dword:0x60000000
+0x80040CA8:dword:0x60000000
+0x80040CAC:dword:0x60000000
+0x80040CB0:dword:0x60000000
+0x80040CB4:dword:0x60000000
+0x80040CB8:dword:0x60000000
+0x80040CBC:dword:0x60000000
+0x80040CC0:dword:0x60000000
+0x80040CC4:dword:0x60000000
+0x80040CC8:dword:0x60000000
+0x80040CCC:dword:0x60000000
+0x80040CD0:dword:0x60000000
+0x80040CD4:dword:0x60000000
+0x80040CD8:dword:0x60000000
+
+0x80040CE0:dword:0x60000000
+0x80040CFC:dword:0x60000000
+0x80040D14:dword:0x60000000
+0x80040D30:dword:0x60000000
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/RZDJ01.ini b/Data/Sys/GameSettings/RZDJ01.ini
index e4b55d9e66..eb0e2beb6a 100644
--- a/Data/Sys/GameSettings/RZDJ01.ini
+++ b/Data/Sys/GameSettings/RZDJ01.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues =
+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/RZJ.ini b/Data/Sys/GameSettings/RZJ.ini
index d5ec4019c9..68813a32c7 100644
--- a/Data/Sys/GameSettings/RZJ.ini
+++ b/Data/Sys/GameSettings/RZJ.ini
@@ -1,4 +1,4 @@
-# RZJD69, RZJE69, RZJJ13 - DeadSpace
+# RZJD69, RZJE69, RZJJ13, RZJP69 - DeadSpace
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/S59.ini b/Data/Sys/GameSettings/S59.ini
index aceed179f9..c492a8a3ab 100644
--- a/Data/Sys/GameSettings/S59.ini
+++ b/Data/Sys/GameSettings/S59.ini
@@ -1,4 +1,4 @@
-# S59E01, S59P01 - SAMURAI WARRIORS 3
+# S59E01, S59JC8, S59P01 - SAMURAI WARRIORS 3
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/S59JC8.ini b/Data/Sys/GameSettings/S59JC8.ini
deleted file mode 100644
index a6817bcee3..0000000000
--- a/Data/Sys/GameSettings/S59JC8.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# S59JC8 - Sengoku Musou 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.
-EmulationIssues =
-EmulationStateId = 3
-
-[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 = 512
-FastDepthCalc = False
-
diff --git a/Data/Sys/GameSettings/S75E69.ini b/Data/Sys/GameSettings/S75.ini
similarity index 94%
rename from Data/Sys/GameSettings/S75E69.ini
rename to Data/Sys/GameSettings/S75.ini
index 0d08e7075a..a040770f84 100644
--- a/Data/Sys/GameSettings/S75E69.ini
+++ b/Data/Sys/GameSettings/S75.ini
@@ -1,4 +1,4 @@
-# S75E69 - Monopoly Streets
+# S75E69, S75P69 - Monopoly Streets
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/S75P69.ini b/Data/Sys/GameSettings/S75P69.ini
deleted file mode 100644
index ca758a4f81..0000000000
--- a/Data/Sys/GameSettings/S75P69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# S75P69 - Monopoly Streets
-
-[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 = Skip any errors at startup and use integral efb scale (r6682)
-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]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
diff --git a/Data/Sys/GameSettings/SAKENS.ini b/Data/Sys/GameSettings/SAK.ini
similarity index 90%
rename from Data/Sys/GameSettings/SAKENS.ini
rename to Data/Sys/GameSettings/SAK.ini
index 29e922d3a1..b01bad6231 100644
--- a/Data/Sys/GameSettings/SAKENS.ini
+++ b/Data/Sys/GameSettings/SAK.ini
@@ -1,4 +1,4 @@
-# SAKENS - Sakura Wars: So Long, My Love
+# SAKENS, SAKPNS - Sakura Wars: So Long, My Love
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/SAKPNS.ini b/Data/Sys/GameSettings/SAKPNS.ini
deleted file mode 100644
index 4026816d2d..0000000000
--- a/Data/Sys/GameSettings/SAKPNS.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# SAKPNS - Sakura Wars: So Long, My Love
-
-[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]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SB4E01.ini b/Data/Sys/GameSettings/SB4.ini
similarity index 91%
rename from Data/Sys/GameSettings/SB4E01.ini
rename to Data/Sys/GameSettings/SB4.ini
index 718e7efcdd..820e56ca2d 100644
--- a/Data/Sys/GameSettings/SB4E01.ini
+++ b/Data/Sys/GameSettings/SB4.ini
@@ -1,4 +1,4 @@
-# SB4E01 - SUPER MARIO GALAXY MORE
+# SB4E01, SB4J01, SB4P01 - SUPER MARIO GALAXY 2
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -27,4 +27,3 @@ PH_ZFar =
 
 [Video_Hacks]
 EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/SB4J01.ini b/Data/Sys/GameSettings/SB4J01.ini
deleted file mode 100644
index 79b6adc7a2..0000000000
--- a/Data/Sys/GameSettings/SB4J01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# SB4J01 - SUPER MARIO GALAXY MORE
-
-[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 Efb Access from CPU.
-
-[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_Hacks]
-EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/SB4P01.ini b/Data/Sys/GameSettings/SB4P01.ini
deleted file mode 100644
index 26824b1ea1..0000000000
--- a/Data/Sys/GameSettings/SB4P01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# SB4P01 - SUPER MARIO GALAXY MORE
-
-[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 Efb Access from CPU.
-
-[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_Hacks]
-EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/SBD.ini b/Data/Sys/GameSettings/SBD.ini
index 58d1edc626..4bdc4046a9 100644
--- a/Data/Sys/GameSettings/SBD.ini
+++ b/Data/Sys/GameSettings/SBD.ini
@@ -1,4 +1,4 @@
-# SBDE08, SBDJ08, SBDK08 - RESIDENT EVIL THE DARKSIDE CHRONICLES
+# SBDE08, SBDJ08, SBDK08, SBDP08 - RESIDENT EVIL THE DARKSIDE CHRONICLES
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GP7P01.ini b/Data/Sys/GameSettings/SC2.ini
similarity index 89%
rename from Data/Sys/GameSettings/GP7P01.ini
rename to Data/Sys/GameSettings/SC2.ini
index 6758a148d2..6ac9ee36b5 100644
--- a/Data/Sys/GameSettings/GP7P01.ini
+++ b/Data/Sys/GameSettings/SC2.ini
@@ -1,11 +1,11 @@
-# GP7P01 - Mario Party 7
+# SC2E8P, SC2P8P - Conduit 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
+EmulationStateId = 3
 EmulationIssues =
 
 [OnLoad]
diff --git a/Data/Sys/GameSettings/SC2E8P.ini b/Data/Sys/GameSettings/SC2E8P.ini
index 051f1807fc..a74ceda130 100644
--- a/Data/Sys/GameSettings/SC2E8P.ini
+++ b/Data/Sys/GameSettings/SC2E8P.ini
@@ -1,4 +1,4 @@
-# SC2E8P - Conduit 2
+# SC2P8P - Conduit 2
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -16,6 +16,55 @@ EmulationIssues =
 
 [ActionReplay]
 # Add action replay cheats here.
+$Undead Invincibility Mode [Bully@Wiiplaza]
+F6000001 80008100
+8001002C 90180000
+D200000C 00000006
+2C110035 40820020
+2C0800F4 40820018
+2C0300A0 40820010
+3C007FFF 6000FFFF
+90040000 80040000
+60000000 00000000
+E0000000 80008000
+**Offline Only*
+**You are completely untouchable*
+*Picture -> http://imageshack.us/photo/my-images/684/sc2p8p008.png/
+$Inf. Ammo [Bully@Wiiplaza]
+F6000001 80008100
+80640000 80050000
+D2000008 00000003
+2C110021 4082000C
+38600000 7C030050
+60000000 00000000
+E0000000 80008000
+**Offline Only*
+$No Flashwhite [Bully@Wiiplaza]
+F6000001 80008100
+EC210032 93C10008
+14000114 60000000
+E0000000 80008000
+$Inf. Money [Bully@Wiiplaza]
+F6000001 80008100
+7C003A14 38E70001
+D2000010 00000004
+2C11002F 40820014
+2C0401A8 4082000C
+3D807FFF 7D84012E
+7C04002E 00000000
+E0000000 80008000
+$Profile One Name Changer Jedi Hack & [Mitch]
+0487E2D4 XXXXXXXX
+0487E2D8 XXXXXXXX
+0487E2DC XXXXXXXX
+$Profile Two Name Changer Jedi Hack & [Mitch]
+0487E320 0000XXXX
+0487E324 XXXXXXXX
+0487E328 XXXXXXXX
+0487E32C XXXX0000
+$Profile Three Name Changer Jedi Hack & [Mitch]
+0487E370 XXXXXXXX
+0487E374 XXXXXXXX
 
 [Video]
 ProjectionHack = 0
diff --git a/Data/Sys/GameSettings/SC2P8P.ini b/Data/Sys/GameSettings/SC2P8P.ini
deleted file mode 100644
index a74ceda130..0000000000
--- a/Data/Sys/GameSettings/SC2P8P.ini
+++ /dev/null
@@ -1,78 +0,0 @@
-# SC2P8P - Conduit 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.
-$Undead Invincibility Mode [Bully@Wiiplaza]
-F6000001 80008100
-8001002C 90180000
-D200000C 00000006
-2C110035 40820020
-2C0800F4 40820018
-2C0300A0 40820010
-3C007FFF 6000FFFF
-90040000 80040000
-60000000 00000000
-E0000000 80008000
-**Offline Only*
-**You are completely untouchable*
-*Picture -> http://imageshack.us/photo/my-images/684/sc2p8p008.png/
-$Inf. Ammo [Bully@Wiiplaza]
-F6000001 80008100
-80640000 80050000
-D2000008 00000003
-2C110021 4082000C
-38600000 7C030050
-60000000 00000000
-E0000000 80008000
-**Offline Only*
-$No Flashwhite [Bully@Wiiplaza]
-F6000001 80008100
-EC210032 93C10008
-14000114 60000000
-E0000000 80008000
-$Inf. Money [Bully@Wiiplaza]
-F6000001 80008100
-7C003A14 38E70001
-D2000010 00000004
-2C11002F 40820014
-2C0401A8 4082000C
-3D807FFF 7D84012E
-7C04002E 00000000
-E0000000 80008000
-$Profile One Name Changer Jedi Hack & [Mitch]
-0487E2D4 XXXXXXXX
-0487E2D8 XXXXXXXX
-0487E2DC XXXXXXXX
-$Profile Two Name Changer Jedi Hack & [Mitch]
-0487E320 0000XXXX
-0487E324 XXXXXXXX
-0487E328 XXXXXXXX
-0487E32C XXXX0000
-$Profile Three Name Changer Jedi Hack & [Mitch]
-0487E370 XXXXXXXX
-0487E374 XXXXXXXX
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/SC7.ini b/Data/Sys/GameSettings/SC7.ini
index f3e646a28c..ba4b2d6cf4 100644
--- a/Data/Sys/GameSettings/SC7.ini
+++ b/Data/Sys/GameSettings/SC7.ini
@@ -1,4 +1,4 @@
-# SC7D52, SC7F52, SC7P52, SC7S52 - Call of Duty: Black Ops
+# SC7D52, SC7E52, SC7F52, SC7I52, SC7P52, SC7S52 - Call of Duty: Black Ops
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SC7E52.ini b/Data/Sys/GameSettings/SC7E52.ini
deleted file mode 100644
index e652918c6f..0000000000
--- a/Data/Sys/GameSettings/SC7E52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SC7E52 - Call of Duty: Black Ops
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SC7I52.ini b/Data/Sys/GameSettings/SC7I52.ini
deleted file mode 100644
index 9d26a71555..0000000000
--- a/Data/Sys/GameSettings/SC7I52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SC7I52 - Call of Duty: Black Ops
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
-
diff --git a/Data/Sys/GameSettings/SEA.ini b/Data/Sys/GameSettings/SEA.ini
index 8f8f21b393..183a3a513b 100644
--- a/Data/Sys/GameSettings/SEA.ini
+++ b/Data/Sys/GameSettings/SEA.ini
@@ -1,4 +1,4 @@
-# SEAE69, SEAP69 - EA Sports Active: More Workouts
+# SEAE69, SEAJ13, SEAP69 - EA Sports Active: More Workouts
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SEAJ13.ini b/Data/Sys/GameSettings/SEAJ13.ini
deleted file mode 100644
index b38274c168..0000000000
--- a/Data/Sys/GameSettings/SEAJ13.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# SEAJ13 - EA Sports Active: More Workouts
-
-[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 = 0
-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 = 512
-
-[Video_Enhancements]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/GHVE08.ini b/Data/Sys/GameSettings/SFW.ini
similarity index 91%
rename from Data/Sys/GameSettings/GHVE08.ini
rename to Data/Sys/GameSettings/SFW.ini
index dafa9d6f71..048f2458dd 100644
--- a/Data/Sys/GameSettings/GHVE08.ini
+++ b/Data/Sys/GameSettings/SFW.ini
@@ -1,4 +1,4 @@
-# GHVE08 - Disney's Hide & Sneak
+# SFWE69, SFWP69 - World Cup 2010
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SFWE69.ini b/Data/Sys/GameSettings/SFWE69.ini
deleted file mode 100644
index 7a267d9e8b..0000000000
--- a/Data/Sys/GameSettings/SFWE69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# SFWE69 - World Cup 2010
-
-[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.
-
diff --git a/Data/Sys/GameSettings/SFWP69.ini b/Data/Sys/GameSettings/SFWP69.ini
deleted file mode 100644
index 87d012c580..0000000000
--- a/Data/Sys/GameSettings/SFWP69.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SFWP69 - World Cup 2010
-
-[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 = Lacks HLE Sound
-
-[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_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SJB.ini b/Data/Sys/GameSettings/SJB.ini
index 45f94b4c5b..9fdd063f0d 100644
--- a/Data/Sys/GameSettings/SJB.ini
+++ b/Data/Sys/GameSettings/SJB.ini
@@ -1,4 +1,4 @@
-# SJBE52, SJBP52 - GoldenEye007
+# SJBE52, SJBJ01, SJBP52 - GoldenEye007
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SJBJ01.ini b/Data/Sys/GameSettings/SJBJ01.ini
deleted file mode 100644
index 7cd33f1778..0000000000
--- a/Data/Sys/GameSettings/SJBJ01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# SJBJ01 - GoldenEye007
-
-[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 the gamecube controller or the wiimote to not have conflicts
-
-[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_Hacks]
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/SJD.ini b/Data/Sys/GameSettings/SJD.ini
index d8fd89e9f1..d2aab4a186 100644
--- a/Data/Sys/GameSettings/SJD.ini
+++ b/Data/Sys/GameSettings/SJD.ini
@@ -1,4 +1,4 @@
-# SJDE41, SJDP41 - Just Dance 3
+# SJDE41, SJDP41, SJDY41 - Just Dance 3
 [Core]
 # Values set here will override the main dolphin settings.
 [EmuState]
diff --git a/Data/Sys/GameSettings/SJDP41.ini b/Data/Sys/GameSettings/SJDP41.ini
deleted file mode 100644
index cfe8d58c98..0000000000
--- a/Data/Sys/GameSettings/SJDP41.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# SJDP41 - 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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SJDY41.ini b/Data/Sys/GameSettings/SJX.ini
similarity index 91%
rename from Data/Sys/GameSettings/SJDY41.ini
rename to Data/Sys/GameSettings/SJX.ini
index 754148366a..de725e9e9e 100644
--- a/Data/Sys/GameSettings/SJDY41.ini
+++ b/Data/Sys/GameSettings/SJX.ini
@@ -1,4 +1,4 @@
-# SJDY41 - Just Dance 3
+# SJXD41, SJXE41, SJXP41 - Just Dance 4
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SJXD41.ini b/Data/Sys/GameSettings/SJXD41.ini
deleted file mode 100644
index b6d40ca302..0000000000
--- a/Data/Sys/GameSettings/SJXD41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-
-[Video_Enhancements]
-MaxAnisotropy = 0
diff --git a/Data/Sys/GameSettings/SJXE41.ini b/Data/Sys/GameSettings/SJXE41.ini
deleted file mode 100644
index 5834e3e951..0000000000
--- a/Data/Sys/GameSettings/SJXE41.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# SJXE41 - 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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-MaxAnisotropy = 0
diff --git a/Data/Sys/GameSettings/SJXP41.ini b/Data/Sys/GameSettings/SJXP41.ini
deleted file mode 100644
index abf0264ef6..0000000000
--- a/Data/Sys/GameSettings/SJXP41.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# SJXP41 - 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
-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/SL2.ini
similarity index 92%
rename from Data/Sys/GameSettings/SL2J01.ini
rename to Data/Sys/GameSettings/SL2.ini
index e40978d29f..2df0575865 100644
--- a/Data/Sys/GameSettings/SL2J01.ini
+++ b/Data/Sys/GameSettings/SL2.ini
@@ -1,4 +1,4 @@
-# SL2J01 - Zero: Shinku no Chou
+# SL2J01, SL2P01 - Project Zero 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SL2P01.ini b/Data/Sys/GameSettings/SL2P01.ini
deleted file mode 100644
index 01e3c6d580..0000000000
--- a/Data/Sys/GameSettings/SL2P01.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# SL2P01 - Project Zero 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 = 
-[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 = 
-[Gecko]
-[Video_Hacks]
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/SMFE4Q.ini b/Data/Sys/GameSettings/SMF.ini
similarity index 89%
rename from Data/Sys/GameSettings/SMFE4Q.ini
rename to Data/Sys/GameSettings/SMF.ini
index 69e1270a0e..e3874329e0 100644
--- a/Data/Sys/GameSettings/SMFE4Q.ini
+++ b/Data/Sys/GameSettings/SMF.ini
@@ -1,4 +1,4 @@
-# SMFE4Q - Phineas and Ferb Across the 2nd Dimension
+# SMFE4Q, SMFP4Q - Phineas and Ferb Across the 2nd Dimension
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SMFP4Q.ini b/Data/Sys/GameSettings/SMFP4Q.ini
deleted file mode 100644
index cc350b1440..0000000000
--- a/Data/Sys/GameSettings/SMFP4Q.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SMFP4Q - Phineas and Ferb Across the 2nd Dimension
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/SMNJ01.ini b/Data/Sys/GameSettings/SMN.ini
similarity index 89%
rename from Data/Sys/GameSettings/SMNJ01.ini
rename to Data/Sys/GameSettings/SMN.ini
index d08999247b..984b05ed64 100644
--- a/Data/Sys/GameSettings/SMNJ01.ini
+++ b/Data/Sys/GameSettings/SMN.ini
@@ -1,4 +1,4 @@
-# SMNJ01 - New SUPER MARIO BROS. Wii
+# SMNE01, SMNJ01, SMNK01, SMNP01, SMNW01 - New SUPER MARIO BROS. Wii
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SMNK01.ini b/Data/Sys/GameSettings/SMNK01.ini
deleted file mode 100644
index af27e6c7a5..0000000000
--- a/Data/Sys/GameSettings/SMNK01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SMNK01 - New SUPER MARIO BROS. Wii
-
-[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 = 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.
-
-[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]
-
diff --git a/Data/Sys/GameSettings/SMNW01.ini b/Data/Sys/GameSettings/SMNW01.ini
deleted file mode 100644
index 3c7cfc4184..0000000000
--- a/Data/Sys/GameSettings/SMNW01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SMNW01 - New SUPER MARIO BROS. Wii
-
-[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 = Enable EFB to RAM for the coins to spin (it will cause a big slowdown).
-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]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/SNJP69.ini b/Data/Sys/GameSettings/SNJ.ini
similarity index 94%
rename from Data/Sys/GameSettings/SNJP69.ini
rename to Data/Sys/GameSettings/SNJ.ini
index 39078c74be..8bf7ddba17 100644
--- a/Data/Sys/GameSettings/SNJP69.ini
+++ b/Data/Sys/GameSettings/SNJ.ini
@@ -1,4 +1,4 @@
-# SNJP69 - NBA JAM
+# SNJE69, SNJP69 - NBA JAM
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SNJE69.ini b/Data/Sys/GameSettings/SNJE69.ini
index c496950b46..dd6a05ebde 100644
--- a/Data/Sys/GameSettings/SNJE69.ini
+++ b/Data/Sys/GameSettings/SNJE69.ini
@@ -16,14 +16,6 @@ EmulationStateId = 4
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
 $Score 999-000 ( 1 and B Button ) [ZiT]
 281ADCC0 00000600
 42000000 92000000
@@ -42,6 +34,14 @@ $Time Stop ( - and B Button on/off ) [ZiT]
 CC000000 00000000
 04521C84 D01D0040
 
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 
diff --git a/Data/Sys/GameSettings/SO3EE9.ini b/Data/Sys/GameSettings/SO3.ini
similarity index 90%
rename from Data/Sys/GameSettings/SO3EE9.ini
rename to Data/Sys/GameSettings/SO3.ini
index 57d28f4e63..961947ba5c 100644
--- a/Data/Sys/GameSettings/SO3EE9.ini
+++ b/Data/Sys/GameSettings/SO3.ini
@@ -1,4 +1,4 @@
-# SO3EE9 - Rune Factory: Tides of Destiny
+# SO3EE9, SO3J99 - Rune Factory: Tides of Destiny
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SO3J99.ini b/Data/Sys/GameSettings/SO3J99.ini
deleted file mode 100644
index 400c6d127e..0000000000
--- a/Data/Sys/GameSettings/SO3J99.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# SO3J99 - Rune Factory Oceans
-
-[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]
-# 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_Hacks]
diff --git a/Data/Sys/GameSettings/SOUJ01.ini b/Data/Sys/GameSettings/SOU.ini
similarity index 88%
rename from Data/Sys/GameSettings/SOUJ01.ini
rename to Data/Sys/GameSettings/SOU.ini
index c63bd034b4..e71e34203e 100644
--- a/Data/Sys/GameSettings/SOUJ01.ini
+++ b/Data/Sys/GameSettings/SOU.ini
@@ -1,4 +1,4 @@
-# SOUJ01 - The Legend of Zelda Skyward Sword
+# SOUE01, SOUJ01, SOUK01, SOUP01 - The Legend of Zelda Skyward Sword
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SOUE01.ini b/Data/Sys/GameSettings/SOUE01.ini
deleted file mode 100644
index ecbeff4546..0000000000
--- a/Data/Sys/GameSettings/SOUE01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# SOUE01 - 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
-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
deleted file mode 100644
index b804346cb6..0000000000
--- a/Data/Sys/GameSettings/SOUK01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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
-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/SOUP01.ini b/Data/Sys/GameSettings/SOUP01.ini
deleted file mode 100644
index 59afe90551..0000000000
--- a/Data/Sys/GameSettings/SOUP01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# SOUP01 - 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
-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/SVVEG9.ini b/Data/Sys/GameSettings/SVV.ini
similarity index 91%
rename from Data/Sys/GameSettings/SVVEG9.ini
rename to Data/Sys/GameSettings/SVV.ini
index 38f6ecaed7..0bcf9dc4cf 100644
--- a/Data/Sys/GameSettings/SVVEG9.ini
+++ b/Data/Sys/GameSettings/SVV.ini
@@ -1,4 +1,4 @@
-# SVVEG9 - The Croods Prehistoric Party
+# SVVEG9, SVVPAF - The Croods Prehistoric Party
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SVVPAF.ini b/Data/Sys/GameSettings/SVVPAF.ini
deleted file mode 100644
index 1b3f553997..0000000000
--- a/Data/Sys/GameSettings/SVVPAF.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SVVPAF - The Croods Prehistoric Party
-
-[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
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/W2GP08.ini b/Data/Sys/GameSettings/W2G.ini
similarity index 81%
rename from Data/Sys/GameSettings/W2GP08.ini
rename to Data/Sys/GameSettings/W2G.ini
index 56990dee85..df0b62cafb 100644
--- a/Data/Sys/GameSettings/W2GP08.ini
+++ b/Data/Sys/GameSettings/W2G.ini
@@ -1,4 +1,4 @@
-# W2GP08 - Phoenix Wright Ace Attorney Justice For All
+# W2GE08, W2GP08 - Phoenix Wright Ace Attorney Justice For All
 [Core]
 [EmuState]
 EmulationStateId = 4
diff --git a/Data/Sys/GameSettings/W2GE08.ini b/Data/Sys/GameSettings/W2GE08.ini
deleted file mode 100644
index 590fe26bae..0000000000
--- a/Data/Sys/GameSettings/W2GE08.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# W2GE08 - Phoenix Wright Ace Attorney Justice For All
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/W3GE08.ini b/Data/Sys/GameSettings/W3G.ini
similarity index 79%
rename from Data/Sys/GameSettings/W3GE08.ini
rename to Data/Sys/GameSettings/W3G.ini
index 422fc8f4c1..11b1590fa0 100644
--- a/Data/Sys/GameSettings/W3GE08.ini
+++ b/Data/Sys/GameSettings/W3G.ini
@@ -1,4 +1,4 @@
-# W3GE08 - Phoenix Wright Ace Attorney Trials and Tribulations
+# W3GE08, W3GP08 - Phoenix Wright Ace Attorney Trials and Tribulations
 [Core]
 [EmuState]
 EmulationStateId = 4
diff --git a/Data/Sys/GameSettings/W3GP08.ini b/Data/Sys/GameSettings/W3GP08.ini
deleted file mode 100644
index 72b60de292..0000000000
--- a/Data/Sys/GameSettings/W3GP08.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# W3GP08 - Phoenix Wright Ace Attorney Trials and Tribulations
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GCQE7D.ini b/Data/Sys/GameSettings/W8C.ini
similarity index 91%
rename from Data/Sys/GameSettings/GCQE7D.ini
rename to Data/Sys/GameSettings/W8C.ini
index 1f35d92307..849d31414a 100644
--- a/Data/Sys/GameSettings/GCQE7D.ini
+++ b/Data/Sys/GameSettings/W8C.ini
@@ -1,4 +1,4 @@
-# GCQE7D - Buffy: Chaos Bleeds
+# W8CEXS, W8CPXS - BIT.TRIP CORE
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/W8CEXS.ini b/Data/Sys/GameSettings/W8CEXS.ini
deleted file mode 100644
index aded4dfc56..0000000000
--- a/Data/Sys/GameSettings/W8CEXS.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# W8CEXS - BIT.TRIP CORE
-
-[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]
-# 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/WMBP01.ini b/Data/Sys/GameSettings/WMB.ini
similarity index 93%
rename from Data/Sys/GameSettings/WMBP01.ini
rename to Data/Sys/GameSettings/WMB.ini
index 0bcfc00bca..3d08ac3d07 100644
--- a/Data/Sys/GameSettings/WMBP01.ini
+++ b/Data/Sys/GameSettings/WMB.ini
@@ -1,4 +1,4 @@
-# WMBP01 - MaBoShi
+# WMBE01, WMBP01 - Maboshi's Arcade
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/WMBE01.ini b/Data/Sys/GameSettings/WMBE01.ini
deleted file mode 100644
index 893e5af29c..0000000000
--- a/Data/Sys/GameSettings/WMBE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WMBE01 - Maboshi's Arcade
-
-[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 =
-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_Settings]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WRIPGD.ini b/Data/Sys/GameSettings/WRI.ini
similarity index 91%
rename from Data/Sys/GameSettings/WRIPGD.ini
rename to Data/Sys/GameSettings/WRI.ini
index fbedf90925..1e78df0bd2 100644
--- a/Data/Sys/GameSettings/WRIPGD.ini
+++ b/Data/Sys/GameSettings/WRI.ini
@@ -1,4 +1,4 @@
-# WRIPGD - RAINBOW ISLANDS T.A.
+# WRIEGD, WRIPGD - RAINBOW ISLANDS T.A.
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/WRIEGD.ini b/Data/Sys/GameSettings/WRIEGD.ini
deleted file mode 100644
index 231e4d9912..0000000000
--- a/Data/Sys/GameSettings/WRIEGD.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WRIEGD - RAINBOW ISLANDS T.A.
-
-[Core]
-
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnFrame]
-
-[ActionReplay]
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-
-[Video_Hacks]
-EFBToTextureEnable = False