diff --git a/Data/Sys/GameSettings/DLSE64.ini b/Data/Sys/GameSettings/DLS.ini
similarity index 84%
rename from Data/Sys/GameSettings/DLSE64.ini
rename to Data/Sys/GameSettings/DLS.ini
index 8a8b118f12..3a10cd39bd 100644
--- a/Data/Sys/GameSettings/DLSE64.ini
+++ b/Data/Sys/GameSettings/DLS.ini
@@ -1,4 +1,4 @@
-# DLSE64 - Star Wars: Rogue Squadron III: Rebel Strike: Limited Edition Bonus Disc (Demo)
+# DLSE64, DLSP64 - Star Wars: Rogue Squadron III: Rebel Strike: Limited Edition Bonus Disc (Demo)
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/DLSP64.ini b/Data/Sys/GameSettings/DLSP64.ini
deleted file mode 100644
index 2ab4bcdbf4..0000000000
--- a/Data/Sys/GameSettings/DLSP64.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# DLSP64 - Star Wars: Rogue Squadron III: Rebel Strike: Limited Edition Bonus Disc (Demo)
-
-[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 = 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]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/FA6.ini b/Data/Sys/GameSettings/FA6.ini
new file mode 100644
index 0000000000..0b99fb4baa
--- /dev/null
+++ b/Data/Sys/GameSettings/FA6.ini
@@ -0,0 +1,33 @@
+# FA6E01, FA6P01 - Donkey Kong Jr. Math
+
+[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 = Texture filtering will cause 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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FA7E01.ini b/Data/Sys/GameSettings/FA7.ini
similarity index 96%
rename from Data/Sys/GameSettings/FA7E01.ini
rename to Data/Sys/GameSettings/FA7.ini
index ac66ec7466..af1470dde9 100644
--- a/Data/Sys/GameSettings/FA7E01.ini
+++ b/Data/Sys/GameSettings/FA7.ini
@@ -1,4 +1,4 @@
-# FA7E01 - Yoshi
+# FA7E01, FA7P01 - Yoshi
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/FA8.ini b/Data/Sys/GameSettings/FA8.ini
new file mode 100644
index 0000000000..2332c02b28
--- /dev/null
+++ b/Data/Sys/GameSettings/FA8.ini
@@ -0,0 +1,33 @@
+# FA8E01, FA8F01, FA8P01 - Kirby's Adventure [NES]
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause 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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FA8E01.ini b/Data/Sys/GameSettings/FA8E01.ini
deleted file mode 100644
index f4b3e596ca..0000000000
--- a/Data/Sys/GameSettings/FA8E01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FA8E01 - Kirby's Adventure [NES]
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FABE01.ini b/Data/Sys/GameSettings/FAA.ini
similarity index 94%
rename from Data/Sys/GameSettings/FABE01.ini
rename to Data/Sys/GameSettings/FAA.ini
index e61e7d44f5..09e96aee55 100644
--- a/Data/Sys/GameSettings/FABE01.ini
+++ b/Data/Sys/GameSettings/FAA.ini
@@ -1,12 +1,12 @@
-# FABE01 - Donkey Kong Jr.
+# FAAE01, FAAP01 - Donkey 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.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FAAP01.ini b/Data/Sys/GameSettings/FAB.ini
similarity index 94%
rename from Data/Sys/GameSettings/FAAP01.ini
rename to Data/Sys/GameSettings/FAB.ini
index 272bb635d9..3f4329fac9 100644
--- a/Data/Sys/GameSettings/FAAP01.ini
+++ b/Data/Sys/GameSettings/FAB.ini
@@ -1,12 +1,12 @@
-# FAAP01 - Donkey Kong
+# FABE01, FABP01 - Donkey Kong Jr.
 
 [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 = Texture filtering will cause glitches.
+EmulationStateId = 4
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FAG.ini b/Data/Sys/GameSettings/FAG.ini
new file mode 100644
index 0000000000..5cddea93cd
--- /dev/null
+++ b/Data/Sys/GameSettings/FAG.ini
@@ -0,0 +1,29 @@
+# FAGE01, FAGP01 - Super Mario Bros.
+
+[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 = Texture filtering will cause 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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+EFBScale = 2
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAGE01.ini b/Data/Sys/GameSettings/FAGE01.ini
deleted file mode 100644
index e0ea080786..0000000000
--- a/Data/Sys/GameSettings/FAGE01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# FAGE01 - Super Mario Bros.
-
-[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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-EFBScale = 2
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAGP01.ini b/Data/Sys/GameSettings/FAGP01.ini
deleted file mode 100644
index 0d56442f5d..0000000000
--- a/Data/Sys/GameSettings/FAGP01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# FAGP01 - Super Mario Bros.
-
-[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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-EFBScale = 2
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAKE01.ini b/Data/Sys/GameSettings/FAK.ini
similarity index 93%
rename from Data/Sys/GameSettings/FAKE01.ini
rename to Data/Sys/GameSettings/FAK.ini
index e56fb9564f..a14f07e13a 100644
--- a/Data/Sys/GameSettings/FAKE01.ini
+++ b/Data/Sys/GameSettings/FAK.ini
@@ -1,4 +1,4 @@
-# FAKE01 - The Legend of Zelda
+# FAKE01, FAKP01 - The Legend of Zelda
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/FAKP01.ini b/Data/Sys/GameSettings/FAKP01.ini
deleted file mode 100644
index ce832befb6..0000000000
--- a/Data/Sys/GameSettings/FAKP01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# FAKP01 - The Legend of Zelda
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FABP01.ini b/Data/Sys/GameSettings/FAL.ini
similarity index 95%
rename from Data/Sys/GameSettings/FABP01.ini
rename to Data/Sys/GameSettings/FAL.ini
index e1a641de1e..14e1b1b45b 100644
--- a/Data/Sys/GameSettings/FABP01.ini
+++ b/Data/Sys/GameSettings/FAL.ini
@@ -1,4 +1,4 @@
-# FABP01 - Donkey Kong Jr.
+# FALE01, FALP01 - Baseball
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/FALE01.ini b/Data/Sys/GameSettings/FALE01.ini
deleted file mode 100644
index c0b332ee4e..0000000000
--- a/Data/Sys/GameSettings/FALE01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# FALE01 - 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.
-EmulationIssues = Texture filtering will cause glitches.
-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 = 512
-EFBScale = 2
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FALP01.ini b/Data/Sys/GameSettings/FALP01.ini
deleted file mode 100644
index 3faa0982fe..0000000000
--- a/Data/Sys/GameSettings/FALP01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# FALP01 - 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.
-EmulationIssues = Texture filtering will cause glitches.
-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 = 512
-EFBScale = 2
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAAE01.ini b/Data/Sys/GameSettings/FAO.ini
similarity index 94%
rename from Data/Sys/GameSettings/FAAE01.ini
rename to Data/Sys/GameSettings/FAO.ini
index 9d03bee13d..d854f257ee 100644
--- a/Data/Sys/GameSettings/FAAE01.ini
+++ b/Data/Sys/GameSettings/FAO.ini
@@ -1,12 +1,12 @@
-# FAAE01 - Donkey Kong
+# FAOE01, FAOP01 - Solomon's Key
 
 [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 = Texture filtering will cause glitches.
+EmulationStateId = 4
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FAOE01.ini b/Data/Sys/GameSettings/FAOE01.ini
deleted file mode 100644
index 878b833af4..0000000000
--- a/Data/Sys/GameSettings/FAOE01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# FAOE01 - Solomon's Key
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAOP01.ini b/Data/Sys/GameSettings/FAOP01.ini
deleted file mode 100644
index 1e61777605..0000000000
--- a/Data/Sys/GameSettings/FAOP01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# FAOP01 - Solomon's Key
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAP.ini b/Data/Sys/GameSettings/FAP.ini
new file mode 100644
index 0000000000..aeaaf94c6d
--- /dev/null
+++ b/Data/Sys/GameSettings/FAP.ini
@@ -0,0 +1,33 @@
+# FAPE01, FAPP01 - NES Open Tour. 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.
+EmulationIssues = Texture filtering will cause glitches.
+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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAPE01.ini b/Data/Sys/GameSettings/FAPE01.ini
deleted file mode 100644
index a2735c5241..0000000000
--- a/Data/Sys/GameSettings/FAPE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FAPE01 - NES Open Tour. 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.
-EmulationIssues = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAPP01.ini b/Data/Sys/GameSettings/FAPP01.ini
deleted file mode 100644
index 70c8f77962..0000000000
--- a/Data/Sys/GameSettings/FAPP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FAPP01 - NES Open Tour. 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.
-EmulationIssues = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FASE01.ini b/Data/Sys/GameSettings/FAS.ini
similarity index 95%
rename from Data/Sys/GameSettings/FASE01.ini
rename to Data/Sys/GameSettings/FAS.ini
index b5fbb8edb5..9bba9805d7 100644
--- a/Data/Sys/GameSettings/FASE01.ini
+++ b/Data/Sys/GameSettings/FAS.ini
@@ -1,4 +1,4 @@
-# FASE01 - Xevious
+# FASE01, FASP01 - Xevious
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/FASP01.ini b/Data/Sys/GameSettings/FASP01.ini
deleted file mode 100644
index c08ab59ad9..0000000000
--- a/Data/Sys/GameSettings/FASP01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# FASP01 - Xevious
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FA7P01.ini b/Data/Sys/GameSettings/FAX.ini
similarity index 95%
rename from Data/Sys/GameSettings/FA7P01.ini
rename to Data/Sys/GameSettings/FAX.ini
index 0345733c23..1ba16c2f99 100644
--- a/Data/Sys/GameSettings/FA7P01.ini
+++ b/Data/Sys/GameSettings/FAX.ini
@@ -1,12 +1,12 @@
-# FA7P01 - Mario & Yoshi
+# FAXE01, FAXP01 - Pac-Man
 
 [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 = Texture filtering will cause glitches.
+EmulationStateId = 4
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FA8P01.ini b/Data/Sys/GameSettings/FB4.ini
similarity index 95%
rename from Data/Sys/GameSettings/FA8P01.ini
rename to Data/Sys/GameSettings/FB4.ini
index caef04d7c4..939aafec9b 100644
--- a/Data/Sys/GameSettings/FA8P01.ini
+++ b/Data/Sys/GameSettings/FB4.ini
@@ -1,12 +1,12 @@
-# FA8P01 - Kirby's Adventure
+# FB4E01, FB4P01 - Lunar Pool
 
 [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 = Texture filtering will cause glitches.
+EmulationStateId = 4
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FB4E01.ini b/Data/Sys/GameSettings/FB4E01.ini
deleted file mode 100644
index 2828f389d2..0000000000
--- a/Data/Sys/GameSettings/FB4E01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FB4E01 - Lunar Pool
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FB4P01.ini b/Data/Sys/GameSettings/FB4P01.ini
deleted file mode 100644
index c14e221cd6..0000000000
--- a/Data/Sys/GameSettings/FB4P01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FB4P01 - Lunar Pool
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBB.ini b/Data/Sys/GameSettings/FBB.ini
new file mode 100644
index 0000000000..125e5ad752
--- /dev/null
+++ b/Data/Sys/GameSettings/FBB.ini
@@ -0,0 +1,33 @@
+# FBBE01, FBBP01 - Mach Rider
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBBE01.ini b/Data/Sys/GameSettings/FBBE01.ini
deleted file mode 100644
index d4053c8c62..0000000000
--- a/Data/Sys/GameSettings/FBBE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBBE01 - Mach Rider
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBBP01.ini b/Data/Sys/GameSettings/FBBP01.ini
deleted file mode 100644
index 7a8a0da1fd..0000000000
--- a/Data/Sys/GameSettings/FBBP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBBP01 - Mach Rider
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBD.ini b/Data/Sys/GameSettings/FBD.ini
new file mode 100644
index 0000000000..f354ce1c61
--- /dev/null
+++ b/Data/Sys/GameSettings/FBD.ini
@@ -0,0 +1,33 @@
+# FBDE01, FBDP01 - Kid Icarus
+
+[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 = Texture filtering will cause 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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBDE01.ini b/Data/Sys/GameSettings/FBDE01.ini
deleted file mode 100644
index 194d6960ed..0000000000
--- a/Data/Sys/GameSettings/FBDE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBDE01 - Kid Icarus
-
-[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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBDP01.ini b/Data/Sys/GameSettings/FBDP01.ini
deleted file mode 100644
index d423b54e23..0000000000
--- a/Data/Sys/GameSettings/FBDP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBDP01 - Kid Icarus
-
-[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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBE.ini b/Data/Sys/GameSettings/FBE.ini
new file mode 100644
index 0000000000..a96401b747
--- /dev/null
+++ b/Data/Sys/GameSettings/FBE.ini
@@ -0,0 +1,33 @@
+# FBEE01, FBEP01 - Ice Climber
+
+[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 = Texture filtering will cause 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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBEE01.ini b/Data/Sys/GameSettings/FBEE01.ini
deleted file mode 100644
index 29746c3a32..0000000000
--- a/Data/Sys/GameSettings/FBEE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBEE01 - Ice Climber
-
-[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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBEP01.ini b/Data/Sys/GameSettings/FBEP01.ini
deleted file mode 100644
index 4fa8c180f6..0000000000
--- a/Data/Sys/GameSettings/FBEP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBEP01 - Ice Climber
-
-[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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBH.ini b/Data/Sys/GameSettings/FBH.ini
new file mode 100644
index 0000000000..68c929e9ac
--- /dev/null
+++ b/Data/Sys/GameSettings/FBH.ini
@@ -0,0 +1,33 @@
+# FBHE01, FBHJ01, FBHP01 - Castlevania
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBHE01.ini b/Data/Sys/GameSettings/FBHE01.ini
deleted file mode 100644
index 1c2f3d4707..0000000000
--- a/Data/Sys/GameSettings/FBHE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBHE01 - Castlevania
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBHJ01.ini b/Data/Sys/GameSettings/FBHJ01.ini
deleted file mode 100644
index 1e8d64f8fb..0000000000
--- a/Data/Sys/GameSettings/FBHJ01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBHJ01 - Castlevania
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBHP01.ini b/Data/Sys/GameSettings/FBHP01.ini
deleted file mode 100644
index 77a1c6a9a4..0000000000
--- a/Data/Sys/GameSettings/FBHP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBHP01 - Castlevania
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBI.ini b/Data/Sys/GameSettings/FBI.ini
new file mode 100644
index 0000000000..bc41d0a7ef
--- /dev/null
+++ b/Data/Sys/GameSettings/FBI.ini
@@ -0,0 +1,33 @@
+# FBIE01, FBIP01 - 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 = Texture filtering will cause 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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBIE01.ini b/Data/Sys/GameSettings/FBIE01.ini
deleted file mode 100644
index 465c7f9e66..0000000000
--- a/Data/Sys/GameSettings/FBIE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBIE01 - 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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBIP01.ini b/Data/Sys/GameSettings/FBIP01.ini
deleted file mode 100644
index 47967b66aa..0000000000
--- a/Data/Sys/GameSettings/FBIP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBIP01 - 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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBJ.ini b/Data/Sys/GameSettings/FBJ.ini
new file mode 100644
index 0000000000..1e55ff8580
--- /dev/null
+++ b/Data/Sys/GameSettings/FBJ.ini
@@ -0,0 +1,33 @@
+# FBJE01, FBJP01 - Mighty Bomb Jack
+
+[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 = Texture filtering will cause 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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBJE01.ini b/Data/Sys/GameSettings/FBJE01.ini
deleted file mode 100644
index 4df8d4f51f..0000000000
--- a/Data/Sys/GameSettings/FBJE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBJE01 - Mighty Bomb Jack
-
-[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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBJP01.ini b/Data/Sys/GameSettings/FBJP01.ini
deleted file mode 100644
index 34d60feb08..0000000000
--- a/Data/Sys/GameSettings/FBJP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBJP01 - Mighty Bomb Jack
-
-[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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBL.ini b/Data/Sys/GameSettings/FBL.ini
new file mode 100644
index 0000000000..096a92f95b
--- /dev/null
+++ b/Data/Sys/GameSettings/FBL.ini
@@ -0,0 +1,33 @@
+# FBLE01, FBLM01 - 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.
+EmulationIssues = Texture filtering will cause glitches.
+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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBLE01.ini b/Data/Sys/GameSettings/FBLE01.ini
deleted file mode 100644
index d0eddfe0e9..0000000000
--- a/Data/Sys/GameSettings/FBLE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBLE01 - 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.
-EmulationIssues = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBLM01.ini b/Data/Sys/GameSettings/FBLM01.ini
deleted file mode 100644
index 558f31bed6..0000000000
--- a/Data/Sys/GameSettings/FBLM01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBLM01 - 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.
-EmulationIssues = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBR.ini b/Data/Sys/GameSettings/FBR.ini
new file mode 100644
index 0000000000..45ce6b6577
--- /dev/null
+++ b/Data/Sys/GameSettings/FBR.ini
@@ -0,0 +1,33 @@
+# FBRE01, FBRJ01, FBRP01 - Galaga
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBRE01.ini b/Data/Sys/GameSettings/FBRE01.ini
deleted file mode 100644
index 8108594695..0000000000
--- a/Data/Sys/GameSettings/FBRE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBRE01 - Galaga
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBRJ01.ini b/Data/Sys/GameSettings/FBRJ01.ini
deleted file mode 100644
index 63e804ef02..0000000000
--- a/Data/Sys/GameSettings/FBRJ01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBRJ01 - Galaga
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBRP01.ini b/Data/Sys/GameSettings/FBRP01.ini
deleted file mode 100644
index f27bed8fe6..0000000000
--- a/Data/Sys/GameSettings/FBRP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBRP01 - Galaga
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBS.ini b/Data/Sys/GameSettings/FBS.ini
new file mode 100644
index 0000000000..4d8f78d441
--- /dev/null
+++ b/Data/Sys/GameSettings/FBS.ini
@@ -0,0 +1,33 @@
+# FBSE01, FBSM01 - Milon's Secret Castle
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBSE01.ini b/Data/Sys/GameSettings/FBSE01.ini
deleted file mode 100644
index 272e5aec09..0000000000
--- a/Data/Sys/GameSettings/FBSE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBSE01 - Milon's Secret Castle
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBSM01.ini b/Data/Sys/GameSettings/FBSM01.ini
deleted file mode 100644
index bb3e213a8e..0000000000
--- a/Data/Sys/GameSettings/FBSM01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBSM01 - Milon's Secret Castle
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBU.ini b/Data/Sys/GameSettings/FBU.ini
new file mode 100644
index 0000000000..6e1900b386
--- /dev/null
+++ b/Data/Sys/GameSettings/FBU.ini
@@ -0,0 +1,33 @@
+# FBUE01, FBUP01 - Adventures of Lolo
+
+[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 = Texture filtering will cause 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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBUE01.ini b/Data/Sys/GameSettings/FBUE01.ini
deleted file mode 100644
index c20629ee29..0000000000
--- a/Data/Sys/GameSettings/FBUE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBUE01 - Adventures of Lolo
-
-[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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBUP01.ini b/Data/Sys/GameSettings/FBUP01.ini
deleted file mode 100644
index 4eb9897ebf..0000000000
--- a/Data/Sys/GameSettings/FBUP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FBUP01 - Adventures of Lolo
-
-[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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FA6P01.ini b/Data/Sys/GameSettings/FC3.ini
similarity index 94%
rename from Data/Sys/GameSettings/FA6P01.ini
rename to Data/Sys/GameSettings/FC3.ini
index e683d8923e..3a456859aa 100644
--- a/Data/Sys/GameSettings/FA6P01.ini
+++ b/Data/Sys/GameSettings/FC3.ini
@@ -1,12 +1,12 @@
-# FA6P01 - Donkey Kong Jr. Math
+# FC3E01, FC3P01 - Bubble Bobble
 
 [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 = Texture filtering will cause glitches.
+EmulationStateId = 4
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FC3E01.ini b/Data/Sys/GameSettings/FC3E01.ini
deleted file mode 100644
index 110d69ea1d..0000000000
--- a/Data/Sys/GameSettings/FC3E01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FC3E01 - Bubble Bobble
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FC3P01.ini b/Data/Sys/GameSettings/FC3P01.ini
deleted file mode 100644
index fa00afc88c..0000000000
--- a/Data/Sys/GameSettings/FC3P01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FC3P01 - Bubble Bobble
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FC6.ini b/Data/Sys/GameSettings/FC6.ini
new file mode 100644
index 0000000000..7f69ba44a9
--- /dev/null
+++ b/Data/Sys/GameSettings/FC6.ini
@@ -0,0 +1,33 @@
+# FC6E01, FC6P01 - StarTropics
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FC6E01.ini b/Data/Sys/GameSettings/FC6E01.ini
deleted file mode 100644
index dc9445f2fb..0000000000
--- a/Data/Sys/GameSettings/FC6E01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FC6E01 - StarTropics
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FC6P01.ini b/Data/Sys/GameSettings/FC6P01.ini
deleted file mode 100644
index d3b7e214d8..0000000000
--- a/Data/Sys/GameSettings/FC6P01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FC6P01 - StarTropics
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FC8.ini b/Data/Sys/GameSettings/FC8.ini
new file mode 100644
index 0000000000..a1626fdd8e
--- /dev/null
+++ b/Data/Sys/GameSettings/FC8.ini
@@ -0,0 +1,33 @@
+# FC8E01, FC8J01, FC8P01 - Castlevania 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 = Texture filtering will cause glitches.
+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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FC8E01.ini b/Data/Sys/GameSettings/FC8E01.ini
deleted file mode 100644
index d1966e7430..0000000000
--- a/Data/Sys/GameSettings/FC8E01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FC8E01 - Castlevania 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 = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FC8J01.ini b/Data/Sys/GameSettings/FC8J01.ini
deleted file mode 100644
index d965c1fed6..0000000000
--- a/Data/Sys/GameSettings/FC8J01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FC8J01 - Castlevania 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 = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FC8P01.ini b/Data/Sys/GameSettings/FC8P01.ini
deleted file mode 100644
index 30fad9ad58..0000000000
--- a/Data/Sys/GameSettings/FC8P01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FC8P01 - Castlevania 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 = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCP.ini b/Data/Sys/GameSettings/FCP.ini
new file mode 100644
index 0000000000..7b93f0cc99
--- /dev/null
+++ b/Data/Sys/GameSettings/FCP.ini
@@ -0,0 +1,33 @@
+# FCPE01, FCPP01 - Balloon Fight
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCPE01.ini b/Data/Sys/GameSettings/FCPE01.ini
deleted file mode 100644
index 7c23f38ecb..0000000000
--- a/Data/Sys/GameSettings/FCPE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCPE01 - Balloon Fight
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCPP01.ini b/Data/Sys/GameSettings/FCPP01.ini
deleted file mode 100644
index 404fb21957..0000000000
--- a/Data/Sys/GameSettings/FCPP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCPP01 - Balloon Fight
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCRE01.ini b/Data/Sys/GameSettings/FCR.ini
similarity index 94%
rename from Data/Sys/GameSettings/FCRE01.ini
rename to Data/Sys/GameSettings/FCR.ini
index 0ccc652486..37ef659c59 100644
--- a/Data/Sys/GameSettings/FCRE01.ini
+++ b/Data/Sys/GameSettings/FCR.ini
@@ -1,4 +1,4 @@
-# FCRE01 - Adventure Island
+# FCRE01, FCRP01 - Adventure Island
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/FCRP01.ini b/Data/Sys/GameSettings/FCRP01.ini
deleted file mode 100644
index 7f8862be89..0000000000
--- a/Data/Sys/GameSettings/FCRP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCRP01 - 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.
-EmulationIssues = Texture filtering will cause glitches.
-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 = 512
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAXE01.ini b/Data/Sys/GameSettings/FCS.ini
similarity index 95%
rename from Data/Sys/GameSettings/FAXE01.ini
rename to Data/Sys/GameSettings/FCS.ini
index bb372d3530..d0cb3e932e 100644
--- a/Data/Sys/GameSettings/FAXE01.ini
+++ b/Data/Sys/GameSettings/FCS.ini
@@ -1,4 +1,4 @@
-# FAXE01 - Pac-Man
+# FCSE01, FCSP01 - Super C
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/FCSE01.ini b/Data/Sys/GameSettings/FCSE01.ini
deleted file mode 100644
index 8a5d09e32a..0000000000
--- a/Data/Sys/GameSettings/FCSE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCSE01 - Super 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.
-EmulationIssues = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCSP01.ini b/Data/Sys/GameSettings/FCSP01.ini
deleted file mode 100644
index a2733026bd..0000000000
--- a/Data/Sys/GameSettings/FCSP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCSP01 - Probotector II: Return of the Evil Forces
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCT.ini b/Data/Sys/GameSettings/FCT.ini
new file mode 100644
index 0000000000..b1ce140d02
--- /dev/null
+++ b/Data/Sys/GameSettings/FCT.ini
@@ -0,0 +1,33 @@
+# FCTE01, FCTJ01, FCTP01 - Mega Man
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCTE01.ini b/Data/Sys/GameSettings/FCTE01.ini
deleted file mode 100644
index ffc99a138c..0000000000
--- a/Data/Sys/GameSettings/FCTE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCTE01 - Mega Man
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCTJ01.ini b/Data/Sys/GameSettings/FCTJ01.ini
deleted file mode 100644
index a508192a8a..0000000000
--- a/Data/Sys/GameSettings/FCTJ01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCTJ01 - Mega Man
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCTP01.ini b/Data/Sys/GameSettings/FCTP01.ini
deleted file mode 100644
index 1e7427bd86..0000000000
--- a/Data/Sys/GameSettings/FCTP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCTP01 - Mega Man
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCU.ini b/Data/Sys/GameSettings/FCU.ini
new file mode 100644
index 0000000000..c94793e2c4
--- /dev/null
+++ b/Data/Sys/GameSettings/FCU.ini
@@ -0,0 +1,33 @@
+# FCUE01, FCUP01 - Volleyball
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCUE01.ini b/Data/Sys/GameSettings/FCUE01.ini
deleted file mode 100644
index 41e5488cec..0000000000
--- a/Data/Sys/GameSettings/FCUE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCUE01 - Volleyball
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCUP01.ini b/Data/Sys/GameSettings/FCUP01.ini
deleted file mode 100644
index d4ca7b1aeb..0000000000
--- a/Data/Sys/GameSettings/FCUP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCUP01 - Volleyball
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCV.ini b/Data/Sys/GameSettings/FCV.ini
new file mode 100644
index 0000000000..f7b1f94cb5
--- /dev/null
+++ b/Data/Sys/GameSettings/FCV.ini
@@ -0,0 +1,33 @@
+# FCVE01, FCVP01 - Wrecking Crew
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCVE01.ini b/Data/Sys/GameSettings/FCVE01.ini
deleted file mode 100644
index 5f4bb62525..0000000000
--- a/Data/Sys/GameSettings/FCVE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCVE01 - Wrecking Crew
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCVP01.ini b/Data/Sys/GameSettings/FCVP01.ini
deleted file mode 100644
index 5f4f38c405..0000000000
--- a/Data/Sys/GameSettings/FCVP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCVP01 - Wrecking Crew
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCW.ini b/Data/Sys/GameSettings/FCW.ini
new file mode 100644
index 0000000000..09957e9c34
--- /dev/null
+++ b/Data/Sys/GameSettings/FCW.ini
@@ -0,0 +1,33 @@
+# FCWE01, FCWP01 - Super Mario Bros. 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 = Texture filtering will cause 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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCWE01.ini b/Data/Sys/GameSettings/FCWE01.ini
deleted file mode 100644
index eec135642e..0000000000
--- a/Data/Sys/GameSettings/FCWE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCWE01 - Super Mario Bros. 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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCWP01.ini b/Data/Sys/GameSettings/FCWP01.ini
deleted file mode 100644
index ab0a919f3f..0000000000
--- a/Data/Sys/GameSettings/FCWP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCWP01 - Super Mario Bros. 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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCY.ini b/Data/Sys/GameSettings/FCY.ini
new file mode 100644
index 0000000000..acd5aa63c9
--- /dev/null
+++ b/Data/Sys/GameSettings/FCY.ini
@@ -0,0 +1,33 @@
+# FCYE01, FCYP01 - Yoshi's Cookie
+
+[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 = Texture filtering will cause 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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCYE01.ini b/Data/Sys/GameSettings/FCYE01.ini
deleted file mode 100644
index cb59cfb4e0..0000000000
--- a/Data/Sys/GameSettings/FCYE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCYE01 - Yoshi's Cookie
-
-[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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCYP01.ini b/Data/Sys/GameSettings/FCYP01.ini
deleted file mode 100644
index 84a0354cb2..0000000000
--- a/Data/Sys/GameSettings/FCYP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FCYP01 - Yoshi's Cookie
-
-[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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FD2.ini b/Data/Sys/GameSettings/FD2.ini
new file mode 100644
index 0000000000..68ce28cb6d
--- /dev/null
+++ b/Data/Sys/GameSettings/FD2.ini
@@ -0,0 +1,33 @@
+# FD2E01, FD2P01 - Double Dragon
+
+[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 = Texture filtering will cause 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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FD2E01.ini b/Data/Sys/GameSettings/FD2E01.ini
deleted file mode 100644
index 523f5f4c1d..0000000000
--- a/Data/Sys/GameSettings/FD2E01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FD2E01 - Double Dragon
-
-[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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FD2P01.ini b/Data/Sys/GameSettings/FD2P01.ini
deleted file mode 100644
index d4bfa87134..0000000000
--- a/Data/Sys/GameSettings/FD2P01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FD2P01 - Double Dragon
-
-[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 = Texture filtering will cause 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FD7.ini b/Data/Sys/GameSettings/FD7.ini
new file mode 100644
index 0000000000..1cc5674dfe
--- /dev/null
+++ b/Data/Sys/GameSettings/FD7.ini
@@ -0,0 +1,33 @@
+# FD7E01, FD7J01, FD7P01 - Mega Man 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 = Texture filtering will cause glitches.
+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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FD7E01.ini b/Data/Sys/GameSettings/FD7E01.ini
deleted file mode 100644
index 68a5379e01..0000000000
--- a/Data/Sys/GameSettings/FD7E01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FD7E01 - Mega Man 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 = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FD7J01.ini b/Data/Sys/GameSettings/FD7J01.ini
deleted file mode 100644
index 88f9271aa6..0000000000
--- a/Data/Sys/GameSettings/FD7J01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FD7J01 - Mega Man 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 = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FD7P01.ini b/Data/Sys/GameSettings/FD7P01.ini
deleted file mode 100644
index 9c1e029645..0000000000
--- a/Data/Sys/GameSettings/FD7P01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FD7P01 - Mega Man 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 = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FA8F01.ini b/Data/Sys/GameSettings/FDA.ini
similarity index 95%
rename from Data/Sys/GameSettings/FA8F01.ini
rename to Data/Sys/GameSettings/FDA.ini
index 66b2728123..019cab39ff 100644
--- a/Data/Sys/GameSettings/FA8F01.ini
+++ b/Data/Sys/GameSettings/FDA.ini
@@ -1,12 +1,12 @@
-# FA8F01 - Kirby's Adventure
+# FDAE01, FDAM01 - Spelunker
 
 [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 = Texture filtering will cause glitches.
+EmulationStateId = 4
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FDAE01.ini b/Data/Sys/GameSettings/FDAE01.ini
deleted file mode 100644
index ee499fd977..0000000000
--- a/Data/Sys/GameSettings/FDAE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FDAE01 - Spelunker
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDAM01.ini b/Data/Sys/GameSettings/FDAM01.ini
deleted file mode 100644
index 008c73d0ce..0000000000
--- a/Data/Sys/GameSettings/FDAM01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FDAM01 - Spelunker
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDP.ini b/Data/Sys/GameSettings/FDP.ini
new file mode 100644
index 0000000000..9b1e3ac7be
--- /dev/null
+++ b/Data/Sys/GameSettings/FDP.ini
@@ -0,0 +1,33 @@
+# FDPE01, FDPP01 - Blades of Steel
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDPE01.ini b/Data/Sys/GameSettings/FDPE01.ini
deleted file mode 100644
index 63b1d952eb..0000000000
--- a/Data/Sys/GameSettings/FDPE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FDPE01 - Blades of Steel
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDPP01.ini b/Data/Sys/GameSettings/FDPP01.ini
deleted file mode 100644
index f815522033..0000000000
--- a/Data/Sys/GameSettings/FDPP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FDPP01 - Blades of Steel
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDV.ini b/Data/Sys/GameSettings/FDV.ini
new file mode 100644
index 0000000000..65d06dc9ac
--- /dev/null
+++ b/Data/Sys/GameSettings/FDV.ini
@@ -0,0 +1,33 @@
+# FDVE01, FDVP01 - River City Ransom
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDVE01.ini b/Data/Sys/GameSettings/FDVE01.ini
deleted file mode 100644
index aead663adf..0000000000
--- a/Data/Sys/GameSettings/FDVE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FDVE01 - River City Ransom
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDVP01.ini b/Data/Sys/GameSettings/FDVP01.ini
deleted file mode 100644
index 744a03beba..0000000000
--- a/Data/Sys/GameSettings/FDVP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FDVP01 - Street Gangs
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAXP01.ini b/Data/Sys/GameSettings/FED.ini
similarity index 95%
rename from Data/Sys/GameSettings/FAXP01.ini
rename to Data/Sys/GameSettings/FED.ini
index ae6dc81409..bb0c2f6807 100644
--- a/Data/Sys/GameSettings/FAXP01.ini
+++ b/Data/Sys/GameSettings/FED.ini
@@ -1,4 +1,4 @@
-# FAXP01 - Pac-Man
+# FEDL01, FEDN01 - DIG DUG
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/FEDL01.ini b/Data/Sys/GameSettings/FEDL01.ini
deleted file mode 100644
index 0584f39720..0000000000
--- a/Data/Sys/GameSettings/FEDL01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FEDL01 - DIG DUG
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEDN01.ini b/Data/Sys/GameSettings/FEDN01.ini
deleted file mode 100644
index c4bb431873..0000000000
--- a/Data/Sys/GameSettings/FEDN01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FEDN01 - DIG DUG
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEI.ini b/Data/Sys/GameSettings/FEI.ini
new file mode 100644
index 0000000000..0553adbbf7
--- /dev/null
+++ b/Data/Sys/GameSettings/FEI.ini
@@ -0,0 +1,33 @@
+# FEIE01, FEIP01 - City Connection
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEIE01.ini b/Data/Sys/GameSettings/FEIE01.ini
deleted file mode 100644
index 13a2da0ca7..0000000000
--- a/Data/Sys/GameSettings/FEIE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FEIE01 - City Connection
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEIP01.ini b/Data/Sys/GameSettings/FEIP01.ini
deleted file mode 100644
index 224ac7b0f1..0000000000
--- a/Data/Sys/GameSettings/FEIP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FEIP01 - City Connection
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEQ.ini b/Data/Sys/GameSettings/FEQ.ini
new file mode 100644
index 0000000000..0ef9fe4d2c
--- /dev/null
+++ b/Data/Sys/GameSettings/FEQ.ini
@@ -0,0 +1,33 @@
+# FEQE01, FEQJ01, FEQP01 - Castlevania III
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEQE01.ini b/Data/Sys/GameSettings/FEQE01.ini
deleted file mode 100644
index 5c14daa96e..0000000000
--- a/Data/Sys/GameSettings/FEQE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FEQE01 - Castlevania III
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEQJ01.ini b/Data/Sys/GameSettings/FEQJ01.ini
deleted file mode 100644
index d5c7fa05d6..0000000000
--- a/Data/Sys/GameSettings/FEQJ01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FEQJ01 - Castlevania III
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEQP01.ini b/Data/Sys/GameSettings/FEQP01.ini
deleted file mode 100644
index 727211019d..0000000000
--- a/Data/Sys/GameSettings/FEQP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FEQP01 - Castlevania III
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FER.ini b/Data/Sys/GameSettings/FER.ini
new file mode 100644
index 0000000000..276b06b950
--- /dev/null
+++ b/Data/Sys/GameSettings/FER.ini
@@ -0,0 +1,33 @@
+# FERE01, FERM01 - StarTropics 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 = Texture filtering will cause glitches.
+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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FERE01.ini b/Data/Sys/GameSettings/FERE01.ini
deleted file mode 100644
index d1344bd879..0000000000
--- a/Data/Sys/GameSettings/FERE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FERE01 - StarTropics 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 = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FERM01.ini b/Data/Sys/GameSettings/FERM01.ini
deleted file mode 100644
index 917f07fd9a..0000000000
--- a/Data/Sys/GameSettings/FERM01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FERM01 - StarTropics 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 = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FA6E01.ini b/Data/Sys/GameSettings/FES.ini
similarity index 95%
rename from Data/Sys/GameSettings/FA6E01.ini
rename to Data/Sys/GameSettings/FES.ini
index 79d10feed7..c6e1f9e77d 100644
--- a/Data/Sys/GameSettings/FA6E01.ini
+++ b/Data/Sys/GameSettings/FES.ini
@@ -1,12 +1,12 @@
-# FA6E01 - Donkey Kong Jr. Math
+# FESE01, FESP01 - Clu Clu Land
 
 [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 = Texture filtering will cause glitches.
+EmulationStateId = 4
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/FESE01.ini b/Data/Sys/GameSettings/FESE01.ini
deleted file mode 100644
index 316ea598bf..0000000000
--- a/Data/Sys/GameSettings/FESE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FESE01 - Clu Clu Land
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FESP01.ini b/Data/Sys/GameSettings/FESP01.ini
deleted file mode 100644
index 36667e282b..0000000000
--- a/Data/Sys/GameSettings/FESP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FESP01 - Clu Clu Land
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEU.ini b/Data/Sys/GameSettings/FEU.ini
new file mode 100644
index 0000000000..f2dfafae4b
--- /dev/null
+++ b/Data/Sys/GameSettings/FEU.ini
@@ -0,0 +1,33 @@
+# FEUE01, FEUP01 - Donkey Kong 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 = Texture filtering will cause glitches.
+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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEUE01.ini b/Data/Sys/GameSettings/FEUE01.ini
deleted file mode 100644
index 0e18db663d..0000000000
--- a/Data/Sys/GameSettings/FEUE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FEUE01 - Donkey Kong 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 = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEUP01.ini b/Data/Sys/GameSettings/FEUP01.ini
deleted file mode 100644
index 247569c876..0000000000
--- a/Data/Sys/GameSettings/FEUP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FEUP01 - Donkey Kong 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 = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFA.ini b/Data/Sys/GameSettings/FFA.ini
new file mode 100644
index 0000000000..857f2c1b6c
--- /dev/null
+++ b/Data/Sys/GameSettings/FFA.ini
@@ -0,0 +1,33 @@
+# FFAE01, FFAM01 - Final Fantasy
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFAE01.ini b/Data/Sys/GameSettings/FFAE01.ini
deleted file mode 100644
index c4d9bed496..0000000000
--- a/Data/Sys/GameSettings/FFAE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FFAE01 - Final Fantasy
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFAM01.ini b/Data/Sys/GameSettings/FFAM01.ini
deleted file mode 100644
index d2929c86c8..0000000000
--- a/Data/Sys/GameSettings/FFAM01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FFAM01 - Final Fantasy
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFE.ini b/Data/Sys/GameSettings/FFE.ini
new file mode 100644
index 0000000000..4f59af1c15
--- /dev/null
+++ b/Data/Sys/GameSettings/FFE.ini
@@ -0,0 +1,33 @@
+# FFEE01, FFEP01 - A Boy and His Blob
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFEE01.ini b/Data/Sys/GameSettings/FFEE01.ini
deleted file mode 100644
index 01bab05ac2..0000000000
--- a/Data/Sys/GameSettings/FFEE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FFEE01 - A Boy and His Blob
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFEP01.ini b/Data/Sys/GameSettings/FFEP01.ini
deleted file mode 100644
index 42f7a90598..0000000000
--- a/Data/Sys/GameSettings/FFEP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FFEP01 - A Boy and His Blob
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFM.ini b/Data/Sys/GameSettings/FFM.ini
new file mode 100644
index 0000000000..1e90ce876b
--- /dev/null
+++ b/Data/Sys/GameSettings/FFM.ini
@@ -0,0 +1,33 @@
+# FFME01, FFMP01 - Blaster Master
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFME01.ini b/Data/Sys/GameSettings/FFME01.ini
deleted file mode 100644
index b19fab64df..0000000000
--- a/Data/Sys/GameSettings/FFME01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FFME01 - Blaster Master
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFMP01.ini b/Data/Sys/GameSettings/FFMP01.ini
deleted file mode 100644
index 5aa7d2f5cc..0000000000
--- a/Data/Sys/GameSettings/FFMP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FFMP01 - Blaster Master
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFN.ini b/Data/Sys/GameSettings/FFN.ini
new file mode 100644
index 0000000000..4d945c366c
--- /dev/null
+++ b/Data/Sys/GameSettings/FFN.ini
@@ -0,0 +1,33 @@
+# FFNE01, FFNJ01, FFNP01 - Mega Man 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.
+EmulationIssues = Texture filtering will cause glitches.
+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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFNE01.ini b/Data/Sys/GameSettings/FFNE01.ini
deleted file mode 100644
index 2ab15c79d6..0000000000
--- a/Data/Sys/GameSettings/FFNE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FFNE01 - Mega Man 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.
-EmulationIssues = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFNJ01.ini b/Data/Sys/GameSettings/FFNJ01.ini
deleted file mode 100644
index b59af5af20..0000000000
--- a/Data/Sys/GameSettings/FFNJ01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FFNJ01 - Mega Man 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.
-EmulationIssues = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFNP01.ini b/Data/Sys/GameSettings/FFNP01.ini
deleted file mode 100644
index 3f562c3008..0000000000
--- a/Data/Sys/GameSettings/FFNP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FFNP01 - Mega Man 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.
-EmulationIssues = Texture filtering will cause glitches.
-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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFQ.ini b/Data/Sys/GameSettings/FFQ.ini
new file mode 100644
index 0000000000..4e2efa9998
--- /dev/null
+++ b/Data/Sys/GameSettings/FFQ.ini
@@ -0,0 +1,33 @@
+# FFQE01, FFQM01 - Shadow of the Ninja
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches 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
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFQE01.ini b/Data/Sys/GameSettings/FFQE01.ini
deleted file mode 100644
index 8906ccd6c8..0000000000
--- a/Data/Sys/GameSettings/FFQE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FFQE01 - Shadow of the Ninja
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFQM01.ini b/Data/Sys/GameSettings/FFQM01.ini
deleted file mode 100644
index 4bb87e0bb9..0000000000
--- a/Data/Sys/GameSettings/FFQM01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# FFQM01 - Shadow of the Ninja
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches 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
-EFBScale = 2
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/G6TE5G.ini b/Data/Sys/GameSettings/G2O.ini
similarity index 95%
rename from Data/Sys/GameSettings/G6TE5G.ini
rename to Data/Sys/GameSettings/G2O.ini
index 1d03726cf6..e35825ff80 100644
--- a/Data/Sys/GameSettings/G6TE5G.ini
+++ b/Data/Sys/GameSettings/G2O.ini
@@ -1,4 +1,4 @@
-# G6TE5G - Teen Titans
+# G2OE41, G2OP41 - PoP:WW
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G2TE52.ini b/Data/Sys/GameSettings/G2T.ini
similarity index 90%
rename from Data/Sys/GameSettings/G2TE52.ini
rename to Data/Sys/GameSettings/G2T.ini
index 9802ca585f..79272325e4 100644
--- a/Data/Sys/GameSettings/G2TE52.ini
+++ b/Data/Sys/GameSettings/G2T.ini
@@ -1,4 +1,4 @@
-# G2TE52 - Tony Hawk's Underground 2
+# G2TE52, G2TP52 - Tony Hawk's Underground 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G2TP52.ini b/Data/Sys/GameSettings/G2TP52.ini
deleted file mode 100644
index 6cbe0cab6f..0000000000
--- a/Data/Sys/GameSettings/G2TP52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# G2TP52 - Tony Hawk's Underground 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/G2VE08.ini b/Data/Sys/GameSettings/G2V.ini
similarity index 93%
rename from Data/Sys/GameSettings/G2VE08.ini
rename to Data/Sys/GameSettings/G2V.ini
index edc895001e..9e8b2b5759 100644
--- a/Data/Sys/GameSettings/G2VE08.ini
+++ b/Data/Sys/GameSettings/G2V.ini
@@ -1,4 +1,4 @@
-# G2VE08 - Viewtiful Joe 2
+# G2VE08, G2VP08 - Viewtiful Joe 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G2VP08.ini b/Data/Sys/GameSettings/G2VP08.ini
deleted file mode 100644
index ebe59cdf0a..0000000000
--- a/Data/Sys/GameSettings/G2VP08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G2VP08 - Viewtiful Joe 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 = Needs xfb real 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/G2XE8P.ini b/Data/Sys/GameSettings/G2X.ini
similarity index 93%
rename from Data/Sys/GameSettings/G2XE8P.ini
rename to Data/Sys/GameSettings/G2X.ini
index e9c7554bfe..fa7883e770 100644
--- a/Data/Sys/GameSettings/G2XE8P.ini
+++ b/Data/Sys/GameSettings/G2X.ini
@@ -1,4 +1,4 @@
-# G2XE8P - SONIC GEMS COLLECTION
+# G2XE8P, G2XP8P - SONIC GEMS COLLECTION
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G2XP8P.ini b/Data/Sys/GameSettings/G2XP8P.ini
deleted file mode 100644
index dfaf672bb6..0000000000
--- a/Data/Sys/GameSettings/G2XP8P.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# G2XP8P - SONIC GEMS 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 = Everything playable with minor 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
-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/G3AP69.ini b/Data/Sys/GameSettings/G3A.ini
similarity index 87%
rename from Data/Sys/GameSettings/G3AP69.ini
rename to Data/Sys/GameSettings/G3A.ini
index b69ce26b8f..1ddd3a3ff4 100644
--- a/Data/Sys/GameSettings/G3AP69.ini
+++ b/Data/Sys/GameSettings/G3A.ini
@@ -1,4 +1,4 @@
-# G3AP69 - The Lord of the Rings, The Third Age
+# G3AD69, G3AE69, G3AF69, G3AP69 - The Lord of the Rings, The Third Age
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G3AE69.ini b/Data/Sys/GameSettings/G3AE69.ini
deleted file mode 100644
index 69054e48cb..0000000000
--- a/Data/Sys/GameSettings/G3AE69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# G3AE69 - The Lord of the Rings, The Third Age
-
-[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
-
diff --git a/Data/Sys/GameSettings/G3BP9G.ini b/Data/Sys/GameSettings/G3B.ini
similarity index 90%
rename from Data/Sys/GameSettings/G3BP9G.ini
rename to Data/Sys/GameSettings/G3B.ini
index 9fd3e79f33..42ff93ec70 100644
--- a/Data/Sys/GameSettings/G3BP9G.ini
+++ b/Data/Sys/GameSettings/G3B.ini
@@ -1,4 +1,4 @@
-# G3BP9G - Serious Sam: Next Encounter
+# G3BE9G, G3BP54, G3BP9G - Serious Sam: Next Encounter
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G3BE9G.ini b/Data/Sys/GameSettings/G3BE9G.ini
deleted file mode 100644
index c11e01c7d9..0000000000
--- a/Data/Sys/GameSettings/G3BE9G.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# G3BE9G - Serious Sam: Next Encounter
-
-[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 transition scenes.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/G3BP54.ini b/Data/Sys/GameSettings/G3BP54.ini
deleted file mode 100644
index 53a40028db..0000000000
--- a/Data/Sys/GameSettings/G3BP54.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# G3BP54 - Serious Sam: Next Encounter
-
-[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 transition scenes.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GRVEA4.ini b/Data/Sys/GameSettings/G3D.ini
similarity index 90%
rename from Data/Sys/GameSettings/GRVEA4.ini
rename to Data/Sys/GameSettings/G3D.ini
index fe8a448e49..2effb128bc 100644
--- a/Data/Sys/GameSettings/GRVEA4.ini
+++ b/Data/Sys/GameSettings/G3D.ini
@@ -1,4 +1,4 @@
-# GRVEA4 - RAVE MASTER
+# G3DE6L, G3DX6L - Carmen Sandiego
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G3FE69.ini b/Data/Sys/GameSettings/G3F.ini
similarity index 89%
rename from Data/Sys/GameSettings/G3FE69.ini
rename to Data/Sys/GameSettings/G3F.ini
index 0c0fcae7b6..9223796d66 100644
--- a/Data/Sys/GameSettings/G3FE69.ini
+++ b/Data/Sys/GameSettings/G3F.ini
@@ -1,4 +1,4 @@
-# G3FE69 - TimeSplitters Future Perfect
+# G3FE69, G3FP69 - TimeSplitters Future Perfect
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/G3FP69.ini b/Data/Sys/GameSettings/G3FP69.ini
deleted file mode 100644
index 8dca42f646..0000000000
--- a/Data/Sys/GameSettings/G3FP69.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# G3FP69 - TimeSplitters Future Perfect
-
-[Core]
-# Values set here will override the main Dolphin settings.
-MMU = 1
-BlockMerging = 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]
diff --git a/Data/Sys/GameSettings/G3RE52.ini b/Data/Sys/GameSettings/G3R.ini
similarity index 92%
rename from Data/Sys/GameSettings/G3RE52.ini
rename to Data/Sys/GameSettings/G3R.ini
index 8f93095bd3..b6b3771a9e 100644
--- a/Data/Sys/GameSettings/G3RE52.ini
+++ b/Data/Sys/GameSettings/G3R.ini
@@ -1,4 +1,4 @@
-# G3RE52 - Shrek 2
+# G3RD52, G3RE52, G3RF52, G3RP52 - Shrek 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G3RD52.ini b/Data/Sys/GameSettings/G3RD52.ini
deleted file mode 100644
index 9fcfa09ddc..0000000000
--- a/Data/Sys/GameSettings/G3RD52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# G3RD52 - Shrek 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 = 2
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/G3RF52.ini b/Data/Sys/GameSettings/G3RF52.ini
deleted file mode 100644
index 7316dd99bd..0000000000
--- a/Data/Sys/GameSettings/G3RF52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# G3RF52 - Shrek 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 = 2
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/G3RP52.ini b/Data/Sys/GameSettings/G3RP52.ini
deleted file mode 100644
index 00be94269c..0000000000
--- a/Data/Sys/GameSettings/G3RP52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# G3RP52 - Shrek 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 = 2
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/G3DX6L.ini b/Data/Sys/GameSettings/G3V.ini
similarity index 90%
rename from Data/Sys/GameSettings/G3DX6L.ini
rename to Data/Sys/GameSettings/G3V.ini
index c6e10acda6..813b2ec789 100644
--- a/Data/Sys/GameSettings/G3DX6L.ini
+++ b/Data/Sys/GameSettings/G3V.ini
@@ -1,8 +1,9 @@
-# G3DX6L - Carmen Sandiego
+# G3VE69, G3VP69 - NBA STREET V3
 
 [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
diff --git a/Data/Sys/GameSettings/G3VE69.ini b/Data/Sys/GameSettings/G3VE69.ini
deleted file mode 100644
index 7d0f00a23d..0000000000
--- a/Data/Sys/GameSettings/G3VE69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# G3VE69 - NBA STREET V3
-
-[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/G3VP69.ini b/Data/Sys/GameSettings/G3VP69.ini
deleted file mode 100644
index 6646fe812b..0000000000
--- a/Data/Sys/GameSettings/G3VP69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# G3VP69 - NBA STREET V3
-
-[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/G3XE52.ini b/Data/Sys/GameSettings/G3X.ini
similarity index 92%
rename from Data/Sys/GameSettings/G3XE52.ini
rename to Data/Sys/GameSettings/G3X.ini
index 958b1767e8..c3b9b315ef 100644
--- a/Data/Sys/GameSettings/G3XE52.ini
+++ b/Data/Sys/GameSettings/G3X.ini
@@ -1,4 +1,4 @@
-# G3XE52 - X-Men: The Official Game
+# G3XE52, G3XP52 - X-Men: The Official Game
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G4BP08.ini b/Data/Sys/GameSettings/G4B.ini
similarity index 89%
rename from Data/Sys/GameSettings/G4BP08.ini
rename to Data/Sys/GameSettings/G4B.ini
index 235331f535..30d547a725 100644
--- a/Data/Sys/GameSettings/G4BP08.ini
+++ b/Data/Sys/GameSettings/G4B.ini
@@ -1,4 +1,4 @@
-# G4BP08 - resident evil 4 game disc 1
+# G4BE08, G4BP08 - resident evil 4 game disc 1
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G4CE54.ini b/Data/Sys/GameSettings/G4C.ini
similarity index 89%
rename from Data/Sys/GameSettings/G4CE54.ini
rename to Data/Sys/GameSettings/G4C.ini
index 4787b540df..027c1fc95f 100644
--- a/Data/Sys/GameSettings/G4CE54.ini
+++ b/Data/Sys/GameSettings/G4C.ini
@@ -1,4 +1,4 @@
-# G4CE54 - Charlie and The Chocolate Factory
+# G4CE54, G4CP54 - Charlie and The Chocolate Factory
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G4CP54.ini b/Data/Sys/GameSettings/G4CP54.ini
deleted file mode 100644
index c31772dfca..0000000000
--- a/Data/Sys/GameSettings/G4CP54.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# G4CP54 - Charlie and The Chocolate Factory
-
-[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_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/G4F.ini b/Data/Sys/GameSettings/G4F.ini
new file mode 100644
index 0000000000..4e6ced5401
--- /dev/null
+++ b/Data/Sys/GameSettings/G4F.ini
@@ -0,0 +1,27 @@
+# G4FD69, G4FE69, G4FF69, G4FE69 - FIFA 07
+
+[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/G4ME69.ini b/Data/Sys/GameSettings/G4M.ini
similarity index 91%
rename from Data/Sys/GameSettings/G4ME69.ini
rename to Data/Sys/GameSettings/G4M.ini
index 3b7b51d029..9f426b636d 100644
--- a/Data/Sys/GameSettings/G4ME69.ini
+++ b/Data/Sys/GameSettings/G4M.ini
@@ -1,4 +1,4 @@
-# G4ME69 - The Sims: Bustin Out GameCube
+# G4ME69, G4MP69 - The Sims: Bustin Out GameCube
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GL7E64.ini b/Data/Sys/GameSettings/G4O.ini
similarity index 91%
rename from Data/Sys/GameSettings/GL7E64.ini
rename to Data/Sys/GameSettings/G4O.ini
index 426b08d039..ef4cb07fc7 100644
--- a/Data/Sys/GameSettings/GL7E64.ini
+++ b/Data/Sys/GameSettings/G4O.ini
@@ -1,4 +1,4 @@
-# GL7E64 - StarWars Lego 2
+# G4OE69, G4OP69 - The Sims 2 Pets
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G4ZE69.ini b/Data/Sys/GameSettings/G4Z.ini
similarity index 90%
rename from Data/Sys/GameSettings/G4ZE69.ini
rename to Data/Sys/GameSettings/G4Z.ini
index 76c445213b..a6edad2c93 100644
--- a/Data/Sys/GameSettings/G4ZE69.ini
+++ b/Data/Sys/GameSettings/G4Z.ini
@@ -1,4 +1,4 @@
-# G4ZE69 - The Sims 2 GameCube
+# G4ZE69, G4ZP69 - The Sims 2 GameCube
 [Core]
 # Values set here will override the main dolphin settings.
 [EmuState]
diff --git a/Data/Sys/GameSettings/G4ZP69.ini b/Data/Sys/GameSettings/G4ZP69.ini
deleted file mode 100644
index 453fdc8bef..0000000000
--- a/Data/Sys/GameSettings/G4ZP69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# G4ZP69 - The Sims 2 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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/G5DP78.ini b/Data/Sys/GameSettings/G5D.ini
similarity index 91%
rename from Data/Sys/GameSettings/G5DP78.ini
rename to Data/Sys/GameSettings/G5D.ini
index c8ffebb5d0..189009b4a5 100644
--- a/Data/Sys/GameSettings/G5DP78.ini
+++ b/Data/Sys/GameSettings/G5D.ini
@@ -1,4 +1,4 @@
-# G5DP78 - Scooby-Doo! Unmasked
+# G5DE78, G5DP78 - Scooby-Doo! Unmasked
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G5NEAF.ini b/Data/Sys/GameSettings/G5N.ini
similarity index 91%
rename from Data/Sys/GameSettings/G5NEAF.ini
rename to Data/Sys/GameSettings/G5N.ini
index b8c392bcd9..1fdf574847 100644
--- a/Data/Sys/GameSettings/G5NEAF.ini
+++ b/Data/Sys/GameSettings/G5N.ini
@@ -1,4 +1,4 @@
-# G5NEAF - Namco Museum 50th Anniversary
+# G5NEAF, G5NP69 - Namco Museum 50th Anniversary
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G5NP69.ini b/Data/Sys/GameSettings/G5NP69.ini
deleted file mode 100644
index 775070cc3f..0000000000
--- a/Data/Sys/GameSettings/G5NP69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G5NP69 - Namco Museum 50th Anniversary
-
-[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/G5SP7D.ini b/Data/Sys/GameSettings/G5S.ini
similarity index 95%
rename from Data/Sys/GameSettings/G5SP7D.ini
rename to Data/Sys/GameSettings/G5S.ini
index b2f061548e..096e46036e 100644
--- a/Data/Sys/GameSettings/G5SP7D.ini
+++ b/Data/Sys/GameSettings/G5S.ini
@@ -1,4 +1,4 @@
-# G5SP7D - Spyro
+# G5SE7D, G5SP7D - Spyro
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G5SE7D.ini b/Data/Sys/GameSettings/G5SE7D.ini
deleted file mode 100644
index bf87146c77..0000000000
--- a/Data/Sys/GameSettings/G5SE7D.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G5SE7D - Spyro
-
-[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 proper lighting.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/G5TE69.ini b/Data/Sys/GameSettings/G5T.ini
similarity index 92%
rename from Data/Sys/GameSettings/G5TE69.ini
rename to Data/Sys/GameSettings/G5T.ini
index b0dd5c7e10..b3b619b469 100644
--- a/Data/Sys/GameSettings/G5TE69.ini
+++ b/Data/Sys/GameSettings/G5T.ini
@@ -1,4 +1,4 @@
-# G5TE69 - Tiger Woods PGA TOUR 2005
+# G5TE69, G5TP69 - Tiger Woods PGA TOUR 2005
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G5TP69.ini b/Data/Sys/GameSettings/G5TP69.ini
deleted file mode 100644
index 8991fcee38..0000000000
--- a/Data/Sys/GameSettings/G5TP69.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# G5TP69 - Tiger Woods PGA TOUR 2005
-
-[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_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/G6FE69.ini b/Data/Sys/GameSettings/G6F.ini
similarity index 86%
rename from Data/Sys/GameSettings/G6FE69.ini
rename to Data/Sys/GameSettings/G6F.ini
index d6a1f56570..42079f2af9 100644
--- a/Data/Sys/GameSettings/G6FE69.ini
+++ b/Data/Sys/GameSettings/G6F.ini
@@ -1,4 +1,4 @@
-# G6FE69 - 2006 FIFA World Cup
+# G6FD69, G6FE69, G6FF69, G6FP69 - 2006 FIFA World Cup
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G6FF69.ini b/Data/Sys/GameSettings/G6FF69.ini
deleted file mode 100644
index 12ea2fec34..0000000000
--- a/Data/Sys/GameSettings/G6FF69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# G6FF69 - 2006 FIFA World Cup
-
-[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/G6FP69.ini b/Data/Sys/GameSettings/G6FP69.ini
deleted file mode 100644
index 37dc967e69..0000000000
--- a/Data/Sys/GameSettings/G6FP69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# G6FP69 - 2006 FIFA World Cup
-
-[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/G6ME69.ini b/Data/Sys/GameSettings/G6M.ini
similarity index 92%
rename from Data/Sys/GameSettings/G6ME69.ini
rename to Data/Sys/GameSettings/G6M.ini
index 8d5b8c0763..7cf073d45d 100644
--- a/Data/Sys/GameSettings/G6ME69.ini
+++ b/Data/Sys/GameSettings/G6M.ini
@@ -1,4 +1,4 @@
-# G6ME69 - Madden NFL 06
+# G6ME69, G6MP69 - Madden NFL 06
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/G6MP69.ini b/Data/Sys/GameSettings/G6MP69.ini
deleted file mode 100644
index cc6e8751fd..0000000000
--- a/Data/Sys/GameSettings/G6MP69.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# G6MP69 - Madden NFL 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 = 4
-EmulationIssues = Needs real xfb for a couple of videos with logos during intro.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
diff --git a/Data/Sys/GameSettings/G4FP69.ini b/Data/Sys/GameSettings/G6N.ini
similarity index 93%
rename from Data/Sys/GameSettings/G4FP69.ini
rename to Data/Sys/GameSettings/G6N.ini
index af1ee0d4e5..d67d211ba4 100644
--- a/Data/Sys/GameSettings/G4FP69.ini
+++ b/Data/Sys/GameSettings/G6N.ini
@@ -1,12 +1,12 @@
-# G4FE69 - FIFA 07
+# G6NE69, G6NP69 - NBA LIVE 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 = 4
 EmulationIssues = 
+EmulationStateId = 4
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/G6NE69.ini b/Data/Sys/GameSettings/G6NE69.ini
deleted file mode 100644
index b93a8a2dd1..0000000000
--- a/Data/Sys/GameSettings/G6NE69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# G6NE69 - NBA LIVE 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.
-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 =
-
diff --git a/Data/Sys/GameSettings/G6NP69.ini b/Data/Sys/GameSettings/G6NP69.ini
deleted file mode 100644
index c8f28c376a..0000000000
--- a/Data/Sys/GameSettings/G6NP69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# G6NP69 - NBA LIVE 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.
-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 =
-
diff --git a/Data/Sys/GameSettings/G6TP5G.ini b/Data/Sys/GameSettings/G6T.ini
similarity index 94%
rename from Data/Sys/GameSettings/G6TP5G.ini
rename to Data/Sys/GameSettings/G6T.ini
index 442ba09586..d79092b93b 100644
--- a/Data/Sys/GameSettings/G6TP5G.ini
+++ b/Data/Sys/GameSettings/G6T.ini
@@ -1,4 +1,4 @@
-# G6TP5G - Teen Titans
+# G6TE5G, G6TP5G - Teen Titans
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G6WE69.ini b/Data/Sys/GameSettings/G6W.ini
similarity index 92%
rename from Data/Sys/GameSettings/G6WE69.ini
rename to Data/Sys/GameSettings/G6W.ini
index a9f9cef7e5..b7b7c3ffd5 100644
--- a/Data/Sys/GameSettings/G6WE69.ini
+++ b/Data/Sys/GameSettings/G6W.ini
@@ -1,4 +1,4 @@
-# G6WE69 - Tiger Woods PGA TOUR 06
+# G6WE69, G6WP69 - Tiger Woods PGA TOUR 06
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G6WP69.ini b/Data/Sys/GameSettings/G6WP69.ini
deleted file mode 100644
index 6aacb6c761..0000000000
--- a/Data/Sys/GameSettings/G6WP69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# G6WP69 - Tiger Woods PGA TOUR 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.
-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_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/G9RD7D.ini b/Data/Sys/GameSettings/G9R.ini
similarity index 87%
rename from Data/Sys/GameSettings/G9RD7D.ini
rename to Data/Sys/GameSettings/G9R.ini
index 93848f7469..729cb62f21 100644
--- a/Data/Sys/GameSettings/G9RD7D.ini
+++ b/Data/Sys/GameSettings/G9R.ini
@@ -1,4 +1,4 @@
-# G9RD7D - Crash Tag Team Racing
+# G9RD7D, G9RE7D, G9RF7D, G9RP7D - Crash Tag Team Racing
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G9RE7D.ini b/Data/Sys/GameSettings/G9RE7D.ini
deleted file mode 100644
index 1c5542c5cf..0000000000
--- a/Data/Sys/GameSettings/G9RE7D.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# G9RE7D - Crash Tag Team Racing
-
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Idle skipping can cause speed issues.
-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/G9RF7D.ini b/Data/Sys/GameSettings/G9RF7D.ini
deleted file mode 100644
index 9e8b3ff398..0000000000
--- a/Data/Sys/GameSettings/G9RF7D.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# G9RF7D - Crash Tag Team Racing
-
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Idle skipping can cause speed issues.
-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/G9RP7D.ini b/Data/Sys/GameSettings/G9RP7D.ini
deleted file mode 100644
index 4e36a423c8..0000000000
--- a/Data/Sys/GameSettings/G9RP7D.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# G9RP7D - Crash Tag Team Racing
-
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Idle skipping can cause speed issues.
-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/G9SE8P.ini b/Data/Sys/GameSettings/G9S.ini
similarity index 93%
rename from Data/Sys/GameSettings/G9SE8P.ini
rename to Data/Sys/GameSettings/G9S.ini
index a31485b3aa..8e49ac239d 100644
--- a/Data/Sys/GameSettings/G9SE8P.ini
+++ b/Data/Sys/GameSettings/G9S.ini
@@ -1,4 +1,4 @@
-# G9SE8P - SONIC HEROES
+# G9SE8P, G9SJ8P, G9SP8P - SONIC HEROES
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G9SJ8P.ini b/Data/Sys/GameSettings/G9SJ8P.ini
deleted file mode 100644
index 959ed384d9..0000000000
--- a/Data/Sys/GameSettings/G9SJ8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G9SJ8P - SONIC 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.
-EmulationStateId = 4
-EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with black textures 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 =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
diff --git a/Data/Sys/GameSettings/G9SP8P.ini b/Data/Sys/GameSettings/G9SP8P.ini
deleted file mode 100644
index dcadf7dda5..0000000000
--- a/Data/Sys/GameSettings/G9SP8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G9SP8P - SONIC 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.
-EmulationStateId = 4
-EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with black textures 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 =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
diff --git a/Data/Sys/GameSettings/G9TD52.ini b/Data/Sys/GameSettings/G9T.ini
similarity index 90%
rename from Data/Sys/GameSettings/G9TD52.ini
rename to Data/Sys/GameSettings/G9T.ini
index fa32aa2554..707135fa14 100644
--- a/Data/Sys/GameSettings/G9TD52.ini
+++ b/Data/Sys/GameSettings/G9T.ini
@@ -1,4 +1,4 @@
-# G9TD52 - Shark Tale
+# G9TD52, G9TE52, G9TF52, G9TI52, G9TP52 - Shark Tale
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G9TE52.ini b/Data/Sys/GameSettings/G9TE52.ini
deleted file mode 100644
index d85ea87aca..0000000000
--- a/Data/Sys/GameSettings/G9TE52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# G9TE52 - Shark Tale
-
-[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/G9TF52.ini b/Data/Sys/GameSettings/G9TF52.ini
deleted file mode 100644
index e85c2dd882..0000000000
--- a/Data/Sys/GameSettings/G9TF52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# G9TF52 - Shark Tale
-
-[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/G9TI52.ini b/Data/Sys/GameSettings/G9TI52.ini
deleted file mode 100644
index 98761ff488..0000000000
--- a/Data/Sys/GameSettings/G9TI52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# G9TI52 - Shark Tale
-
-[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/G9TP52.ini b/Data/Sys/GameSettings/G9TP52.ini
deleted file mode 100644
index af130717a6..0000000000
--- a/Data/Sys/GameSettings/G9TP52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# G9TP52 - Shark Tale
-
-[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/GAZ.ini b/Data/Sys/GameSettings/GAZ.ini
new file mode 100644
index 0000000000..3be4cc5102
--- /dev/null
+++ b/Data/Sys/GameSettings/GAZ.ini
@@ -0,0 +1,27 @@
+# GAZD69, GAZE69, GAZF69, GAZH69, GAZI69, GAZJ69, GAZM69, GAZP69, GAZS69 - Harry Potter : POA
+
+[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/GAZD69.ini b/Data/Sys/GameSettings/GAZD69.ini
deleted file mode 100644
index b64e635709..0000000000
--- a/Data/Sys/GameSettings/GAZD69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GAZD69 - Harry Potter : POA
-
-[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/GAZE69.ini b/Data/Sys/GameSettings/GAZE69.ini
deleted file mode 100644
index fbb520f09e..0000000000
--- a/Data/Sys/GameSettings/GAZE69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GAZE69 - Harry Potter : POA
-
-[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/GAZF69.ini b/Data/Sys/GameSettings/GAZF69.ini
deleted file mode 100644
index 92cda0bd00..0000000000
--- a/Data/Sys/GameSettings/GAZF69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GAZF69 - Harry Potter : POA
-
-[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/GAZH69.ini b/Data/Sys/GameSettings/GAZH69.ini
deleted file mode 100644
index fda2028220..0000000000
--- a/Data/Sys/GameSettings/GAZH69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GAZH69 - Harry Potter : POA
-
-[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/GAZI69.ini b/Data/Sys/GameSettings/GAZI69.ini
deleted file mode 100644
index 26c477a89b..0000000000
--- a/Data/Sys/GameSettings/GAZI69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GAZI69 - Harry Potter : POA
-
-[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/GAZJ69.ini b/Data/Sys/GameSettings/GAZJ69.ini
deleted file mode 100644
index 1b13322c6e..0000000000
--- a/Data/Sys/GameSettings/GAZJ69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GAZJ69 - Harry Potter to Azkaban no Shuujin
-
-[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/GAZM69.ini b/Data/Sys/GameSettings/GAZM69.ini
deleted file mode 100644
index bcaf8599b6..0000000000
--- a/Data/Sys/GameSettings/GAZM69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GAZM69 - Harry Potter : POA
-
-[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/GAZP69.ini b/Data/Sys/GameSettings/GAZP69.ini
deleted file mode 100644
index d1657c78ee..0000000000
--- a/Data/Sys/GameSettings/GAZP69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GAZP69 - Harry Potter : POA
-
-[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/GAZS69.ini b/Data/Sys/GameSettings/GAZS69.ini
deleted file mode 100644
index b8c463b4aa..0000000000
--- a/Data/Sys/GameSettings/GAZS69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GAZS69 - Harry Potter : POA
-
-[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/GB3E51.ini b/Data/Sys/GameSettings/GB3.ini
similarity index 93%
rename from Data/Sys/GameSettings/GB3E51.ini
rename to Data/Sys/GameSettings/GB3.ini
index 6163ac2a0b..f441058984 100644
--- a/Data/Sys/GameSettings/GB3E51.ini
+++ b/Data/Sys/GameSettings/GB3.ini
@@ -1,4 +1,4 @@
-# GB3E51 - BMX XXX
+# GB3E51, GB3P51 - BMX XXX
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GB3P51.ini b/Data/Sys/GameSettings/GB3P51.ini
deleted file mode 100644
index f2ad2de94e..0000000000
--- a/Data/Sys/GameSettings/GB3P51.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GB3P51 - BMX XXX
-
-[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 = 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.
-
-[DSP]
-EnableJIT = True
diff --git a/Data/Sys/GameSettings/GBHDC8.ini b/Data/Sys/GameSettings/GBH.ini
similarity index 92%
rename from Data/Sys/GameSettings/GBHDC8.ini
rename to Data/Sys/GameSettings/GBH.ini
index 95458c33de..bdc31df8bc 100644
--- a/Data/Sys/GameSettings/GBHDC8.ini
+++ b/Data/Sys/GameSettings/GBH.ini
@@ -1,4 +1,4 @@
-# GBHDC8 - Mystic Heroes
+# GBHDC8, GBHFC8, GBHPC8 - Mystic Heroes
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GBHFC8.ini b/Data/Sys/GameSettings/GBHFC8.ini
deleted file mode 100644
index b7da5c8cc9..0000000000
--- a/Data/Sys/GameSettings/GBHFC8.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBHFC8 - Mystic 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.
-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
-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/GBHPC8.ini b/Data/Sys/GameSettings/GBHPC8.ini
deleted file mode 100644
index fa41fa473b..0000000000
--- a/Data/Sys/GameSettings/GBHPC8.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBHPC8 - Mystic 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.
-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
-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/RDZP01.ini b/Data/Sys/GameSettings/GBI.ini
similarity index 93%
rename from Data/Sys/GameSettings/RDZP01.ini
rename to Data/Sys/GameSettings/GBI.ini
index 3e03796402..5f2f30392f 100644
--- a/Data/Sys/GameSettings/RDZP01.ini
+++ b/Data/Sys/GameSettings/GBI.ini
@@ -1,4 +1,4 @@
-# RDZP01 - Disaster
+# GBIE08, GBIP08 - Resident Evil
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GBSE8P.ini b/Data/Sys/GameSettings/GBS.ini
similarity index 93%
rename from Data/Sys/GameSettings/GBSE8P.ini
rename to Data/Sys/GameSettings/GBS.ini
index 1c7e346d8f..739b5f24f9 100644
--- a/Data/Sys/GameSettings/GBSE8P.ini
+++ b/Data/Sys/GameSettings/GBS.ini
@@ -1,4 +1,4 @@
-# GBSE8P - BEACH SPIKERS
+# GBSE8P, GBSP8P - BEACH SPIKERS
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GBSP8P.ini b/Data/Sys/GameSettings/GBSP8P.ini
deleted file mode 100644
index 6bbdbbfba3..0000000000
--- a/Data/Sys/GameSettings/GBSP8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBSP8P - BEACH SPIKERS
-
-[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
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-FastDepthCalc = False
-
diff --git a/Data/Sys/GameSettings/GBWF64.ini b/Data/Sys/GameSettings/GBW.ini
similarity index 90%
rename from Data/Sys/GameSettings/GBWF64.ini
rename to Data/Sys/GameSettings/GBW.ini
index dd17170e86..c34a9aa888 100644
--- a/Data/Sys/GameSettings/GBWF64.ini
+++ b/Data/Sys/GameSettings/GBW.ini
@@ -1,4 +1,4 @@
-# GBWF64 - Star Wars Bounty Hunter
+# GBWD64, GBWE64, GBWF64, GBWP64 - Star Wars Bounty Hunter
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GBWP64.ini b/Data/Sys/GameSettings/GBWP64.ini
deleted file mode 100644
index 86388351df..0000000000
--- a/Data/Sys/GameSettings/GBWP64.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBWP64 - Star Wars Bounty Hunter
-
-[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/GBXE51.ini b/Data/Sys/GameSettings/GBX.ini
similarity index 90%
rename from Data/Sys/GameSettings/GBXE51.ini
rename to Data/Sys/GameSettings/GBX.ini
index 9931df5fab..ec8e29758c 100644
--- a/Data/Sys/GameSettings/GBXE51.ini
+++ b/Data/Sys/GameSettings/GBX.ini
@@ -1,4 +1,4 @@
-# GBXE51 - Dave Mirra Freestyle Bmx2
+# GBXE51, GBXP51 - Dave Mirra Freestyle Bmx2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GBXP51.ini b/Data/Sys/GameSettings/GBXP51.ini
deleted file mode 100644
index f206ca1c97..0000000000
--- a/Data/Sys/GameSettings/GBXP51.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GBXP51 - Dave Mirra Freestyle Bmx2
-
-[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 = 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.
-
-[DSP]
-EnableJIT = True
-
diff --git a/Data/Sys/GameSettings/GC3.ini b/Data/Sys/GameSettings/GC3.ini
new file mode 100644
index 0000000000..abe9597968
--- /dev/null
+++ b/Data/Sys/GameSettings/GC3.ini
@@ -0,0 +1,27 @@
+# GC3D78, GC3E78, GC3F78, GC3P78 - Scooby-Doo!(tm) Mystery Mayhem
+
+[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/GC3D78.ini b/Data/Sys/GameSettings/GC3D78.ini
deleted file mode 100644
index 38354503c1..0000000000
--- a/Data/Sys/GameSettings/GC3D78.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GC3D78 - Scooby-Doo!(tm) Mystery Mayhem
-
-[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/GC3E78.ini b/Data/Sys/GameSettings/GC3E78.ini
deleted file mode 100644
index 0c2e24cfc8..0000000000
--- a/Data/Sys/GameSettings/GC3E78.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GC3E78 - Scooby-Doo!(tm) Mystery Mayhem
-
-[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/GC3F78.ini b/Data/Sys/GameSettings/GC3F78.ini
deleted file mode 100644
index ecbafd4d56..0000000000
--- a/Data/Sys/GameSettings/GC3F78.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GC3F78 - Scooby-Doo!(tm) Mystery Mayhem
-
-[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/GC3P78.ini b/Data/Sys/GameSettings/GC3P78.ini
deleted file mode 100644
index 1fa8eb8cac..0000000000
--- a/Data/Sys/GameSettings/GC3P78.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GC3P78 - Scooby-Doo!(tm) Mystery Mayhem
-
-[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/GC6E01.ini b/Data/Sys/GameSettings/GC6.ini
similarity index 93%
rename from Data/Sys/GameSettings/GC6E01.ini
rename to Data/Sys/GameSettings/GC6.ini
index 9509c45611..8dcf94f26b 100644
--- a/Data/Sys/GameSettings/GC6E01.ini
+++ b/Data/Sys/GameSettings/GC6.ini
@@ -1,4 +1,4 @@
-# GC6E01 - Pokemon Colosseum
+# GC6E01, GC6P01 - Pokemon Colosseum
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GC6P01.ini b/Data/Sys/GameSettings/GC6P01.ini
deleted file mode 100644
index d1d9e30759..0000000000
--- a/Data/Sys/GameSettings/GC6P01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GC6P01 - Pokemon Colosseum
-
-[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 = If EFB scale is not integral, serious texture glitches occur.
-
-[OnLoad]
-# Add memory patches 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
-
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/GCDP08.ini b/Data/Sys/GameSettings/GCD.ini
similarity index 92%
rename from Data/Sys/GameSettings/GCDP08.ini
rename to Data/Sys/GameSettings/GCD.ini
index c5ce39cdd5..a9b8030d94 100644
--- a/Data/Sys/GameSettings/GCDP08.ini
+++ b/Data/Sys/GameSettings/GCD.ini
@@ -1,4 +1,4 @@
-# GCDP08 - RESIDENT EVIL CVX
+# GCDE08, GCDJ08, GCDP08 - RESIDENT EVIL CVX
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GCDE08.ini b/Data/Sys/GameSettings/GCDE08.ini
deleted file mode 100644
index a4a19a33f1..0000000000
--- a/Data/Sys/GameSettings/GCDE08.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GCDE08 - RESIDENT EVIL CVX
-
-[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 = Per pixel lighting creates some lighting issues.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-EnablePixelLighting = False
diff --git a/Data/Sys/GameSettings/GCDJ08.ini b/Data/Sys/GameSettings/GCDJ08.ini
deleted file mode 100644
index 2c5909a40a..0000000000
--- a/Data/Sys/GameSettings/GCDJ08.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GCDJ08 - Biohazard: Code Veronica
-
-[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 = Per pixel lighting creates some lighting issues.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-EnablePixelLighting = False
diff --git a/Data/Sys/GameSettings/GCEE41.ini b/Data/Sys/GameSettings/GCE.ini
similarity index 85%
rename from Data/Sys/GameSettings/GCEE41.ini
rename to Data/Sys/GameSettings/GCE.ini
index eaec8d4ed8..c082da6352 100644
--- a/Data/Sys/GameSettings/GCEE41.ini
+++ b/Data/Sys/GameSettings/GCE.ini
@@ -1,4 +1,4 @@
-# GCEE41 - Tom Clancy's Splinter Cell
+# GCEE41, GCEP41 - Tom Clancy's Splinter Cell
 [Core]
 [EmuState]
 EmulationStateId = 4
diff --git a/Data/Sys/GameSettings/GCEP41.ini b/Data/Sys/GameSettings/GCEP41.ini
deleted file mode 100644
index fa0e6a37b7..0000000000
--- a/Data/Sys/GameSettings/GCEP41.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# GCEP41 - Tom Clancy's Splinter Cell
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[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/GCIE69.ini b/Data/Sys/GameSettings/GCI.ini
similarity index 89%
rename from Data/Sys/GameSettings/GCIE69.ini
rename to Data/Sys/GameSettings/GCI.ini
index f2ac2b7cfc..1c715ddb5c 100644
--- a/Data/Sys/GameSettings/GCIE69.ini
+++ b/Data/Sys/GameSettings/GCI.ini
@@ -1,4 +1,4 @@
-# GCIE69 - The Sims
+# GCIE69, GCIP69 - The Sims
 [Core]
 [EmuState]
 EmulationStateId = 4
diff --git a/Data/Sys/GameSettings/GCJE41.ini b/Data/Sys/GameSettings/GCJ.ini
similarity index 75%
rename from Data/Sys/GameSettings/GCJE41.ini
rename to Data/Sys/GameSettings/GCJ.ini
index 3a857f3a5c..3ab624e794 100644
--- a/Data/Sys/GameSettings/GCJE41.ini
+++ b/Data/Sys/GameSettings/GCJ.ini
@@ -1,4 +1,4 @@
-# GCJE41 - Tom Clancy's Splinter Cell Chaos Theory
+# GCJE41, GCJP41 - Tom Clancy's Splinter Cell Chaos Theory
 [Core]
 [EmuState]
 EmulationStateId = 3
diff --git a/Data/Sys/GameSettings/GCJP41.ini b/Data/Sys/GameSettings/GCJP41.ini
deleted file mode 100644
index 700be3097a..0000000000
--- a/Data/Sys/GameSettings/GCJP41.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-# GCJP41 - Tom Clancy's Splinter Cell Chaos Theory
-[Core]
-[EmuState]
-EmulationStateId = 3
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-
diff --git a/Data/Sys/GameSettings/GCPE6S.ini b/Data/Sys/GameSettings/GCP.ini
similarity index 95%
rename from Data/Sys/GameSettings/GCPE6S.ini
rename to Data/Sys/GameSettings/GCP.ini
index 52d4b867da..f9764a9345 100644
--- a/Data/Sys/GameSettings/GCPE6S.ini
+++ b/Data/Sys/GameSettings/GCP.ini
@@ -1,4 +1,4 @@
-# GCPE6S - CASPER
+# GCPE6S, GCPP6S - CASPER
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GCPP6S.ini b/Data/Sys/GameSettings/GCPP6S.ini
deleted file mode 100644
index 9de08ce440..0000000000
--- a/Data/Sys/GameSettings/GCPP6S.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GCPP6S - Casper Spirit Dimensions
-
-[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 appear.
-
-[OnLoad]
-# Add memory patches 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
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/GCZE69.ini b/Data/Sys/GameSettings/GCZ.ini
similarity index 94%
rename from Data/Sys/GameSettings/GCZE69.ini
rename to Data/Sys/GameSettings/GCZ.ini
index b8145ed739..6a2373124f 100644
--- a/Data/Sys/GameSettings/GCZE69.ini
+++ b/Data/Sys/GameSettings/GCZ.ini
@@ -1,4 +1,4 @@
-# GCZE69 - CATWOMAN
+# GCZE69, GCZP69 - CATWOMAN
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GCZP69.ini b/Data/Sys/GameSettings/GCZP69.ini
deleted file mode 100644
index 28139fdecd..0000000000
--- a/Data/Sys/GameSettings/GCZP69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GCZP69 - CATWOMAN
-
-[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
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GDGE7H.ini b/Data/Sys/GameSettings/GDG.ini
similarity index 93%
rename from Data/Sys/GameSettings/GDGE7H.ini
rename to Data/Sys/GameSettings/GDG.ini
index 89b5a3fe31..79a12f672e 100644
--- a/Data/Sys/GameSettings/GDGE7H.ini
+++ b/Data/Sys/GameSettings/GDG.ini
@@ -1,4 +1,4 @@
-# GDGE7H - Dragon's Lair 3D
+# GDGE7H, GDGP78 - Dragon's Lair 3D
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GDGP78.ini b/Data/Sys/GameSettings/GDGP78.ini
deleted file mode 100644
index cc7d5761a3..0000000000
--- a/Data/Sys/GameSettings/GDGP78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GDGP78 - Dragon's Lair 3D
-
-[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/GDKEA4.ini b/Data/Sys/GameSettings/GDK.ini
similarity index 91%
rename from Data/Sys/GameSettings/GDKEA4.ini
rename to Data/Sys/GameSettings/GDK.ini
index 51dd69d584..f3bc24ceff 100644
--- a/Data/Sys/GameSettings/GDKEA4.ini
+++ b/Data/Sys/GameSettings/GDK.ini
@@ -1,4 +1,4 @@
-# GDKEA4 - Disney Sports: Soccer
+# GDKEA4, GDKJA4, GDKEA4 - Disney Sports: Soccer
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GDKJA4.ini b/Data/Sys/GameSettings/GDKJA4.ini
deleted file mode 100644
index d4081aed62..0000000000
--- a/Data/Sys/GameSettings/GDKJA4.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GDKJA4 - Disney Sports: Soccer
-
-[Core]
-# Values set here will override the main dolphin settings.
-# This game does not work properly with large memorycards, use a 251 block card
-# see http://www.nintendo.com/consumer/memorycard1019.jsp
-MemoryCard251 = True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Need Projection Before R945
-
-[OnLoad]
-# Add memory 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/GDKPA4.ini b/Data/Sys/GameSettings/GDKPA4.ini
deleted file mode 100644
index 2468e34537..0000000000
--- a/Data/Sys/GameSettings/GDKPA4.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GDKEA4 - Disney Sports: Football (Soccer)
-
-[Core]
-# Values set here will override the main dolphin settings.
-# This game does not work properly with large memorycards, use a 251 block card
-# see http://www.nintendo.com/consumer/memorycard1019.jsp
-MemoryCard251 = True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Need Projection Before R945
-
-[OnLoad]
-# Add memory 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/GDME01.ini b/Data/Sys/GameSettings/GDM.ini
similarity index 82%
rename from Data/Sys/GameSettings/GDME01.ini
rename to Data/Sys/GameSettings/GDM.ini
index df46e9ea4c..76d42bdb30 100644
--- a/Data/Sys/GameSettings/GDME01.ini
+++ b/Data/Sys/GameSettings/GDM.ini
@@ -1,4 +1,4 @@
-# GDME01 - Disney's Magical Mirror starring Mickey Mouse
+# GDME01, GDMJ01, GDMP01 - Disney's Magical Mirror starring Mickey Mouse
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GDMJ01.ini b/Data/Sys/GameSettings/GDMJ01.ini
deleted file mode 100644
index b47afdf538..0000000000
--- a/Data/Sys/GameSettings/GDMJ01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GDMJ01 - Disney's Mickey Mouse no Fushigi na Kagami
-
-[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.
-
diff --git a/Data/Sys/GameSettings/GDMP01.ini b/Data/Sys/GameSettings/GDMP01.ini
deleted file mode 100644
index c8028e4c64..0000000000
--- a/Data/Sys/GameSettings/GDMP01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GDMP01 - Disney's Magical Mirror starring Mickey Mouse
-
-[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.
-
diff --git a/Data/Sys/GameSettings/GDQP6S.ini b/Data/Sys/GameSettings/GDQ.ini
similarity index 93%
rename from Data/Sys/GameSettings/GDQP6S.ini
rename to Data/Sys/GameSettings/GDQ.ini
index 4361c5f20c..af58b17032 100644
--- a/Data/Sys/GameSettings/GDQP6S.ini
+++ b/Data/Sys/GameSettings/GDQ.ini
@@ -1,4 +1,4 @@
-# GDQP6S - Darkened Skye
+# GDQE6S, GDQP6S - Darkened Skye
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GDQE6S.ini b/Data/Sys/GameSettings/GDQE6S.ini
deleted file mode 100644
index f40cb5c4b1..0000000000
--- a/Data/Sys/GameSettings/GDQE6S.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# GDQE6S - Darkened Skye
-
-[Core]
-# Values set here will override the main dolphin settings.
-# This game does not work properly with large memorycards, use a 251 block card
-# see http://www.nintendo.com/consumer/memorycard1019.jsp
-MemoryCard251 = True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-
-[OnLoad]
-# Add memory 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/GDSE78.ini b/Data/Sys/GameSettings/GDS.ini
similarity index 94%
rename from Data/Sys/GameSettings/GDSE78.ini
rename to Data/Sys/GameSettings/GDS.ini
index 0a0d7d0cc5..8f27016ad7 100644
--- a/Data/Sys/GameSettings/GDSE78.ini
+++ b/Data/Sys/GameSettings/GDS.ini
@@ -1,4 +1,4 @@
-# GDSE78 - Dark Summit
+# GDSE78, GDSP78 - Dark Summit
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GDXEA4.ini b/Data/Sys/GameSettings/GDX.ini
similarity index 85%
rename from Data/Sys/GameSettings/GDXEA4.ini
rename to Data/Sys/GameSettings/GDX.ini
index f14521a104..cfa4b12e8d 100644
--- a/Data/Sys/GameSettings/GDXEA4.ini
+++ b/Data/Sys/GameSettings/GDX.ini
@@ -1,4 +1,4 @@
-# GDXEA4 - Disney Sports Skateboarding
+# GDXEA4, GDXJA4, GDXPA4 - Disney Sports Skateboarding
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GDXJA4.ini b/Data/Sys/GameSettings/GDXJA4.ini
deleted file mode 100644
index 813fc9f09c..0000000000
--- a/Data/Sys/GameSettings/GDXJA4.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-# GDXJA4 - Disney Sports Skateboarding
-
-[Core]
-# Values set here will override the main Dolphin settings.
-MemoryCard251 = True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId =
-EmulationIssues = This game does not work properly with large memorycards, use a 251 block card. See http://www.nintendo.com/consumer/memorycard1019.jsp
diff --git a/Data/Sys/GameSettings/GDXPA4.ini b/Data/Sys/GameSettings/GDXPA4.ini
deleted file mode 100644
index 95429b8e4a..0000000000
--- a/Data/Sys/GameSettings/GDXPA4.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-# GDXPA4 - Disney Sports Skateboarding
-
-[Core]
-# Values set here will override the main Dolphin settings.
-MemoryCard251 = True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId =
-EmulationIssues = This game does not work properly with large memorycards, use a 251 block card. See http://www.nintendo.com/consumer/memorycard1019.jsp
diff --git a/Data/Sys/GameSettings/GEAE8P.ini b/Data/Sys/GameSettings/GEA.ini
similarity index 92%
rename from Data/Sys/GameSettings/GEAE8P.ini
rename to Data/Sys/GameSettings/GEA.ini
index 327d9974ac..296ae178df 100644
--- a/Data/Sys/GameSettings/GEAE8P.ini
+++ b/Data/Sys/GameSettings/GEA.ini
@@ -1,4 +1,4 @@
-# GEAE8P - Skies of Arcadia Legends
+# GEAE8P, GEAP8P - Skies of Arcadia Legends
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GEAP8P.ini b/Data/Sys/GameSettings/GEAP8P.ini
deleted file mode 100644
index 3ad9bc241e..0000000000
--- a/Data/Sys/GameSettings/GEAP8P.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GEAP8P - Skies of Arcadia 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 = 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 = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GEDE01.ini b/Data/Sys/GameSettings/GED.ini
similarity index 93%
rename from Data/Sys/GameSettings/GEDE01.ini
rename to Data/Sys/GameSettings/GED.ini
index 752ec4c63d..dc5e9f4e2f 100644
--- a/Data/Sys/GameSettings/GEDE01.ini
+++ b/Data/Sys/GameSettings/GED.ini
@@ -1,4 +1,4 @@
-# GEDE01 - Eternal Darkness
+# GEDE01, GEDP01 - Eternal Darkness
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GEN.ini b/Data/Sys/GameSettings/GEN.ini
new file mode 100644
index 0000000000..8df3db7f52
--- /dev/null
+++ b/Data/Sys/GameSettings/GEN.ini
@@ -0,0 +1,30 @@
+# GEND69, GENE69, GENP69, GENS69 - 007: Everything or Nothing
+
+[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]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GEND69.ini b/Data/Sys/GameSettings/GEND69.ini
deleted file mode 100644
index 927ae7c835..0000000000
--- a/Data/Sys/GameSettings/GEND69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GEND69 - 007: Everything or Nothing
-
-[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]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GENE69.ini b/Data/Sys/GameSettings/GENE69.ini
deleted file mode 100644
index 3be6ef4402..0000000000
--- a/Data/Sys/GameSettings/GENE69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GENE69 - 007: Everything or Nothing
-
-[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]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GENP69.ini b/Data/Sys/GameSettings/GENP69.ini
deleted file mode 100644
index 65edd97f75..0000000000
--- a/Data/Sys/GameSettings/GENP69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GENP69 - 007: Everything or Nothing
-
-[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]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GENS69.ini b/Data/Sys/GameSettings/GENS69.ini
deleted file mode 100644
index fdb751f119..0000000000
--- a/Data/Sys/GameSettings/GENS69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GENS69 - 007: Everything or Nothing
-
-[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]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GEOE08.ini b/Data/Sys/GameSettings/GEO.ini
similarity index 93%
rename from Data/Sys/GameSettings/GEOE08.ini
rename to Data/Sys/GameSettings/GEO.ini
index 1cc77cd5df..23a69615e6 100644
--- a/Data/Sys/GameSettings/GEOE08.ini
+++ b/Data/Sys/GameSettings/GEO.ini
@@ -1,4 +1,4 @@
-# GEOE08 - CAPCOM VS. SNK 2  EO
+# GEOE08, GEOP08 - CAPCOM VS. SNK 2  EO
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GEOP08.ini b/Data/Sys/GameSettings/GEOP08.ini
deleted file mode 100644
index 566d1a9799..0000000000
--- a/Data/Sys/GameSettings/GEOP08.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GEOP08 - CAPCOM VS. SNK 2  EO
-
-[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
-EFBScale = -1
diff --git a/Data/Sys/GameSettings/G2OE41.ini b/Data/Sys/GameSettings/GEZ.ini
similarity index 94%
rename from Data/Sys/GameSettings/G2OE41.ini
rename to Data/Sys/GameSettings/GEZ.ini
index 92dba2c5ae..a2026d1894 100644
--- a/Data/Sys/GameSettings/G2OE41.ini
+++ b/Data/Sys/GameSettings/GEZ.ini
@@ -1,12 +1,12 @@
-# G2OE41 - PoP:WW
+# GEZE8P, GEZP8P - BillyHatcher
 
 [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/GEZE8P.ini b/Data/Sys/GameSettings/GEZE8P.ini
deleted file mode 100644
index dd4a2cacfd..0000000000
--- a/Data/Sys/GameSettings/GEZE8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GEZE8P - BillyHatcher
-
-[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]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GEZP8P.ini b/Data/Sys/GameSettings/GEZP8P.ini
deleted file mode 100644
index 579f691298..0000000000
--- a/Data/Sys/GameSettings/GEZP8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GEZP8P - BillyHatcher
-
-[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]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GFDD69.ini b/Data/Sys/GameSettings/GF4.ini
similarity index 92%
rename from Data/Sys/GameSettings/GFDD69.ini
rename to Data/Sys/GameSettings/GF4.ini
index 2ce4c7abc6..9aa8947055 100644
--- a/Data/Sys/GameSettings/GFDD69.ini
+++ b/Data/Sys/GameSettings/GF4.ini
@@ -1,12 +1,12 @@
-# GFDD69 - Freedom Fighters
+# GF4E52, GF4F52, GF4P52 - Fantastic Four
 
 [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/G4FE69.ini b/Data/Sys/GameSettings/GF6.ini
similarity index 94%
rename from Data/Sys/GameSettings/G4FE69.ini
rename to Data/Sys/GameSettings/GF6.ini
index af1ee0d4e5..7dac806b06 100644
--- a/Data/Sys/GameSettings/G4FE69.ini
+++ b/Data/Sys/GameSettings/GF6.ini
@@ -1,4 +1,4 @@
-# G4FE69 - FIFA 07
+# GF6E69, GF6F69 - FIFA 06
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GF6E69.ini b/Data/Sys/GameSettings/GF6E69.ini
deleted file mode 100644
index a96e25211f..0000000000
--- a/Data/Sys/GameSettings/GF6E69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GF6E69 - FIFA 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 = 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/GF6F69.ini b/Data/Sys/GameSettings/GF6F69.ini
deleted file mode 100644
index 61eaf02a1b..0000000000
--- a/Data/Sys/GameSettings/GF6F69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GF6F69 - FIFA 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 = 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/GFA.ini b/Data/Sys/GameSettings/GFA.ini
new file mode 100644
index 0000000000..312d56ae0e
--- /dev/null
+++ b/Data/Sys/GameSettings/GFA.ini
@@ -0,0 +1,27 @@
+# GFAD69, GFAE69, GFAP69, GFAS69 - FIFA 2003
+
+[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/GFAD69.ini b/Data/Sys/GameSettings/GFAD69.ini
deleted file mode 100644
index 704aa1915a..0000000000
--- a/Data/Sys/GameSettings/GFAD69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GFAD69 - FIFA 2003
-
-[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/GFAE69.ini b/Data/Sys/GameSettings/GFAE69.ini
deleted file mode 100644
index 0e25264f58..0000000000
--- a/Data/Sys/GameSettings/GFAE69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GFAE69 - FIFA 2003
-
-[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/GFAP69.ini b/Data/Sys/GameSettings/GFAP69.ini
deleted file mode 100644
index 5199999b43..0000000000
--- a/Data/Sys/GameSettings/GFAP69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GFAP69 - FIFA 2003
-
-[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/GFAS69.ini b/Data/Sys/GameSettings/GFAS69.ini
deleted file mode 100644
index ccb54c89a3..0000000000
--- a/Data/Sys/GameSettings/GFAS69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GFAS69 - FIFA 2003
-
-[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/GF4F52.ini b/Data/Sys/GameSettings/GFD.ini
similarity index 93%
rename from Data/Sys/GameSettings/GF4F52.ini
rename to Data/Sys/GameSettings/GFD.ini
index 780e066765..fc4e01c58c 100644
--- a/Data/Sys/GameSettings/GF4F52.ini
+++ b/Data/Sys/GameSettings/GFD.ini
@@ -1,12 +1,12 @@
-# GF4F52 - Fantastic Four
+# GFDD69, GFDE69 - Freedom Fighters
 
 [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/GFDE69.ini b/Data/Sys/GameSettings/GFDE69.ini
deleted file mode 100644
index 2159035b28..0000000000
--- a/Data/Sys/GameSettings/GFDE69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GFDE69 - Freedom Fighters
-
-[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/GFGEA4.ini b/Data/Sys/GameSettings/GFG.ini
similarity index 93%
rename from Data/Sys/GameSettings/GFGEA4.ini
rename to Data/Sys/GameSettings/GFG.ini
index ad0106cd32..0f8a20c08d 100644
--- a/Data/Sys/GameSettings/GFGEA4.ini
+++ b/Data/Sys/GameSettings/GFG.ini
@@ -1,4 +1,4 @@
-# GFGEA4 - Frogger Beyond
+# GFGEA4, GFGPA4 - Frogger Beyond
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GFGPA4.ini b/Data/Sys/GameSettings/GFGPA4.ini
deleted file mode 100644
index a92a668ec3..0000000000
--- a/Data/Sys/GameSettings/GFGPA4.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GFGPA4 - Frogger Beyond
-
-[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.
-
-[DSP]
-EnableJIT = True
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GGEE41.ini b/Data/Sys/GameSettings/GGE.ini
similarity index 91%
rename from Data/Sys/GameSettings/GGEE41.ini
rename to Data/Sys/GameSettings/GGE.ini
index 70c3635a3b..d940099086 100644
--- a/Data/Sys/GameSettings/GGEE41.ini
+++ b/Data/Sys/GameSettings/GGE.ini
@@ -1,4 +1,4 @@
-# GGEE41 - Beyond Good and Evil
+# GGEE41, GGEP41, GGEY41 - Beyond Good and Evil
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GGEP41.ini b/Data/Sys/GameSettings/GGEP41.ini
deleted file mode 100644
index 0c60e996c9..0000000000
--- a/Data/Sys/GameSettings/GGEP41.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GGEP41 - Beyond Good and Evil
-
-[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]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/GGEY41.ini b/Data/Sys/GameSettings/GGEY41.ini
deleted file mode 100644
index e5a698aac7..0000000000
--- a/Data/Sys/GameSettings/GGEY41.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GGEY41 - Beyond Good and Evil
-
-[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]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/GGPE01.ini b/Data/Sys/GameSettings/GGP.ini
similarity index 93%
rename from Data/Sys/GameSettings/GGPE01.ini
rename to Data/Sys/GameSettings/GGP.ini
index 83efda95ce..533a8fe8b2 100644
--- a/Data/Sys/GameSettings/GGPE01.ini
+++ b/Data/Sys/GameSettings/GGP.ini
@@ -1,4 +1,4 @@
-# GGPE01 - Mario Kart GP
+# GGPE01, GGPE02 - Mario Kart GP
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GGVP78.ini b/Data/Sys/GameSettings/GGV.ini
similarity index 80%
rename from Data/Sys/GameSettings/GGVP78.ini
rename to Data/Sys/GameSettings/GGV.ini
index 13b6e320c6..1e4da96fdc 100644
--- a/Data/Sys/GameSettings/GGVP78.ini
+++ b/Data/Sys/GameSettings/GGV.ini
@@ -1,4 +1,4 @@
-# GGVP78 - The SpongeBob SquarePants Movie
+# GGVD78, GGVE78, GGVP78, GGVX78 - The SpongeBob SquarePants Movie
 [Core]
 [EmuState]
 EmulationStateId = 4
diff --git a/Data/Sys/GameSettings/GGVD78.ini b/Data/Sys/GameSettings/GGVD78.ini
deleted file mode 100644
index afa39b5ff4..0000000000
--- a/Data/Sys/GameSettings/GGVD78.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GGVD78 - The SpongeBob SquarePants Movie
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GGVE78.ini b/Data/Sys/GameSettings/GGVE78.ini
deleted file mode 100644
index 116dd30fe5..0000000000
--- a/Data/Sys/GameSettings/GGVE78.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GGVE78 - The SpongeBob SquarePants Movie
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GGVX78.ini b/Data/Sys/GameSettings/GGVX78.ini
deleted file mode 100644
index 0c04afc3ac..0000000000
--- a/Data/Sys/GameSettings/GGVX78.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GGVX78 - The SpongeBob SquarePants Movie
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GGYE41.ini b/Data/Sys/GameSettings/GGY.ini
similarity index 95%
rename from Data/Sys/GameSettings/GGYE41.ini
rename to Data/Sys/GameSettings/GGY.ini
index 279e6db50e..729ec852af 100644
--- a/Data/Sys/GameSettings/GGYE41.ini
+++ b/Data/Sys/GameSettings/GGY.ini
@@ -1,4 +1,4 @@
-# GGYE41 - GR2GC
+# GGYE41, GGYP41 - GR2GC
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GGYP41.ini b/Data/Sys/GameSettings/GGYP41.ini
deleted file mode 100644
index 2699c3a60f..0000000000
--- a/Data/Sys/GameSettings/GGYP41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GGYP41 - GR2GC
-
-[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 = 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
-
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GGZE52.ini b/Data/Sys/GameSettings/GGZ.ini
similarity index 94%
rename from Data/Sys/GameSettings/GGZE52.ini
rename to Data/Sys/GameSettings/GGZ.ini
index 086790a1b6..73f34d6783 100644
--- a/Data/Sys/GameSettings/GGZE52.ini
+++ b/Data/Sys/GameSettings/GGZ.ini
@@ -1,4 +1,4 @@
-# GGZE52 - Madagascar
+# GGZE52, GGZX52 - Madagascar
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GGZX52.ini b/Data/Sys/GameSettings/GGZX52.ini
deleted file mode 100644
index 28c7c18360..0000000000
--- a/Data/Sys/GameSettings/GGZX52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GGZX52 - Madagascar
-
-[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 = GFX glitches.
-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_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/GH2P69.ini b/Data/Sys/GameSettings/GH2.ini
similarity index 94%
rename from Data/Sys/GameSettings/GH2P69.ini
rename to Data/Sys/GameSettings/GH2.ini
index 4c07595209..260158d33c 100644
--- a/Data/Sys/GameSettings/GH2P69.ini
+++ b/Data/Sys/GameSettings/GH2.ini
@@ -1,4 +1,4 @@
-# GH2P69 - NFS: HP2
+# GH2E69, GH2P69 - NFS: HP2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GH2E69.ini b/Data/Sys/GameSettings/GH2E69.ini
deleted file mode 100644
index 2fc7176116..0000000000
--- a/Data/Sys/GameSettings/GH2E69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GH2E69 - NFS: HP2
-
-[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 = The game is 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.
-
-[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/G3AD69.ini b/Data/Sys/GameSettings/GH4.ini
similarity index 80%
rename from Data/Sys/GameSettings/G3AD69.ini
rename to Data/Sys/GameSettings/GH4.ini
index cf4b9acdda..0841856b35 100644
--- a/Data/Sys/GameSettings/G3AD69.ini
+++ b/Data/Sys/GameSettings/GH4.ini
@@ -1,4 +1,4 @@
-# G3AD69 - The Lord of the Rings, The Third Age
+# GH4D69, GH4E69, GH4F69, GH4H69, GH4I69, GH4J69, GH4M69, GH4P69, GH4S69 - Harry Potter and the Goblet of Fire
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -25,6 +25,3 @@ PH_ExtraParam = 0
 PH_ZNear =
 PH_ZFar =
 
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/GH4D69.ini b/Data/Sys/GameSettings/GH4D69.ini
deleted file mode 100644
index de5c9f1b98..0000000000
--- a/Data/Sys/GameSettings/GH4D69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GH4D69 - Harry Potter and the Goblet of Fire
-
-[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/GH4E69.ini b/Data/Sys/GameSettings/GH4E69.ini
deleted file mode 100644
index 5938d2efb2..0000000000
--- a/Data/Sys/GameSettings/GH4E69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GH4E69 - Harry Potter and the Goblet of Fire
-
-[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/GH4F69.ini b/Data/Sys/GameSettings/GH4F69.ini
deleted file mode 100644
index 1a2fa86a5c..0000000000
--- a/Data/Sys/GameSettings/GH4F69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GH4F69 - Harry Potter and the Goblet of Fire
-
-[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/GH4H69.ini b/Data/Sys/GameSettings/GH4H69.ini
deleted file mode 100644
index 0e88b167a0..0000000000
--- a/Data/Sys/GameSettings/GH4H69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GH4H69 - Harry Potter and the Goblet of Fire
-
-[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/GH4I69.ini b/Data/Sys/GameSettings/GH4I69.ini
deleted file mode 100644
index c4834b3b4f..0000000000
--- a/Data/Sys/GameSettings/GH4I69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GH4I69 - Harry Potter and the Goblet of Fire
-
-[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/GH4J69.ini b/Data/Sys/GameSettings/GH4J69.ini
deleted file mode 100644
index 3a92bec423..0000000000
--- a/Data/Sys/GameSettings/GH4J69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GH4J69 - Harry Potter to Honoo no Goblet
-
-[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/GH4M69.ini b/Data/Sys/GameSettings/GH4M69.ini
deleted file mode 100644
index 6e81a26b2a..0000000000
--- a/Data/Sys/GameSettings/GH4M69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GH4M69 - Harry Potter and the Goblet of Fire
-
-[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/GH4P69.ini b/Data/Sys/GameSettings/GH4P69.ini
deleted file mode 100644
index 892fd355ab..0000000000
--- a/Data/Sys/GameSettings/GH4P69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GH4P69 - Harry Potter and the Goblet of Fire
-
-[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/GH4S69.ini b/Data/Sys/GameSettings/GH4S69.ini
deleted file mode 100644
index cc2344b32d..0000000000
--- a/Data/Sys/GameSettings/GH4S69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GH4S69 - Harry Potter and the Goblet of Fire
-
-[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/GH5F52.ini b/Data/Sys/GameSettings/GH5.ini
similarity index 87%
rename from Data/Sys/GameSettings/GH5F52.ini
rename to Data/Sys/GameSettings/GH5.ini
index 33a85233a1..6e9ce1199a 100644
--- a/Data/Sys/GameSettings/GH5F52.ini
+++ b/Data/Sys/GameSettings/GH5.ini
@@ -1,4 +1,4 @@
-# GH5F52 - Over The Hedge
+# GH5D52, GH5E52, GH5F52, GH5P52 - Over The Hedge
 [Core]
 # Values set here will override the main dolphin settings.
 [EmuState]
diff --git a/Data/Sys/GameSettings/GH5D52.ini b/Data/Sys/GameSettings/GH5D52.ini
deleted file mode 100644
index bc8057d07b..0000000000
--- a/Data/Sys/GameSettings/GH5D52.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GH5D52 - Over The Hedge
-[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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GH5E52.ini b/Data/Sys/GameSettings/GH5E52.ini
deleted file mode 100644
index 2da1efd0ce..0000000000
--- a/Data/Sys/GameSettings/GH5E52.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GH5E52 - Over The Hedge
-[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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GN6P69.ini b/Data/Sys/GameSettings/GHB.ini
similarity index 93%
rename from Data/Sys/GameSettings/GN6P69.ini
rename to Data/Sys/GameSettings/GHB.ini
index 851faff226..ce9270b6a4 100644
--- a/Data/Sys/GameSettings/GN6P69.ini
+++ b/Data/Sys/GameSettings/GHB.ini
@@ -1,4 +1,4 @@
-# GN6P69 - NHL06
+# GHBE7D, GHBP7D - The Hobbit
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GHBE7D.ini b/Data/Sys/GameSettings/GHBE7D.ini
deleted file mode 100644
index 2aecdfb881..0000000000
--- a/Data/Sys/GameSettings/GHBE7D.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GHBE7D - The Hobbit
-
-[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/GHBP7D.ini b/Data/Sys/GameSettings/GHBP7D.ini
deleted file mode 100644
index 543f57c6ad..0000000000
--- a/Data/Sys/GameSettings/GHBP7D.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GHBP7D - The Hobbit
-
-[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/GHCE4Q.ini b/Data/Sys/GameSettings/GHC.ini
similarity index 92%
rename from Data/Sys/GameSettings/GHCE4Q.ini
rename to Data/Sys/GameSettings/GHC.ini
index a7091afae6..eca0e1d03e 100644
--- a/Data/Sys/GameSettings/GHCE4Q.ini
+++ b/Data/Sys/GameSettings/GHC.ini
@@ -1,4 +1,4 @@
-# GHCE4Q - Chicken Little
+# GHCE4Q, GHCF4Q - Chicken Little
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GHKF7D.ini b/Data/Sys/GameSettings/GHK.ini
similarity index 87%
rename from Data/Sys/GameSettings/GHKF7D.ini
rename to Data/Sys/GameSettings/GHK.ini
index db9d0be912..cce753a3f1 100644
--- a/Data/Sys/GameSettings/GHKF7D.ini
+++ b/Data/Sys/GameSettings/GHK.ini
@@ -1,4 +1,4 @@
-# GHKF7D - The Hulk
+# GHKD7D, GHKE7D, GHKF7D, GHKP7D, GHKS7D - The Hulk
 [Core]
 # Values set here will override the main dolphin settings.
 SkipIdle = 0
diff --git a/Data/Sys/GameSettings/GHKD7D.ini b/Data/Sys/GameSettings/GHKD7D.ini
deleted file mode 100644
index b4455ba7ab..0000000000
--- a/Data/Sys/GameSettings/GHKD7D.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GHKD7D - The Hulk
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GHKE7D.ini b/Data/Sys/GameSettings/GHKE7D.ini
deleted file mode 100644
index f05ed77d36..0000000000
--- a/Data/Sys/GameSettings/GHKE7D.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GHKE7D - The Hulk
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GHKP7D.ini b/Data/Sys/GameSettings/GHKP7D.ini
deleted file mode 100644
index 7a65532cb9..0000000000
--- a/Data/Sys/GameSettings/GHKP7D.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GHKP7D - The Hulk
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GHKS7D.ini b/Data/Sys/GameSettings/GHKS7D.ini
deleted file mode 100644
index 5e420e6865..0000000000
--- a/Data/Sys/GameSettings/GHKS7D.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GHKS7D - The Hulk
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GHL.ini b/Data/Sys/GameSettings/GHL.ini
new file mode 100644
index 0000000000..65a09f983e
--- /dev/null
+++ b/Data/Sys/GameSettings/GHL.ini
@@ -0,0 +1,27 @@
+# GHLE69, GHLJ69, GHLP69, GHLX69, GHLY69, GHLZ69 - Harry Potter and the Sorcerer's Stone
+
+[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/GHLE69.ini b/Data/Sys/GameSettings/GHLE69.ini
deleted file mode 100644
index 588d2cdbf3..0000000000
--- a/Data/Sys/GameSettings/GHLE69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GHLE69 - Harry Potter and the Sorcerer's Stone
-
-[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/GHLJ69.ini b/Data/Sys/GameSettings/GHLJ69.ini
deleted file mode 100644
index b766ab468d..0000000000
--- a/Data/Sys/GameSettings/GHLJ69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GHLJ69 - Harry Potter to Kenja no Ishi
-
-[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/GHLP69.ini b/Data/Sys/GameSettings/GHLP69.ini
deleted file mode 100644
index 3213e59fa3..0000000000
--- a/Data/Sys/GameSettings/GHLP69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GHLP69 - Harry Potter and the Philosopher's Stone
-
-[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/GHLX69.ini b/Data/Sys/GameSettings/GHLX69.ini
deleted file mode 100644
index 8831460f15..0000000000
--- a/Data/Sys/GameSettings/GHLX69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GHLX69 - Harry Potter and the Sorcerer's Stone
-
-[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/GHLY69.ini b/Data/Sys/GameSettings/GHLY69.ini
deleted file mode 100644
index facc48766d..0000000000
--- a/Data/Sys/GameSettings/GHLY69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GHLY69 - Harry Potter and the Sorcerer's Stone
-
-[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/GHLZ69.ini b/Data/Sys/GameSettings/GHLZ69.ini
deleted file mode 100644
index 5500c0e112..0000000000
--- a/Data/Sys/GameSettings/GHLZ69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GHLZ69 - Harry Potter and the Sorcerer's Stone
-
-[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/GHMD4F.ini b/Data/Sys/GameSettings/GHM.ini
similarity index 89%
rename from Data/Sys/GameSettings/GHMD4F.ini
rename to Data/Sys/GameSettings/GHM.ini
index 0f860071f3..3ea2a68b74 100644
--- a/Data/Sys/GameSettings/GHMD4F.ini
+++ b/Data/Sys/GameSettings/GHM.ini
@@ -1,4 +1,4 @@
-# GHMD4F - Hitman 2: Silent Assassin
+# GHMD4F, GHMF4F, GHMP4F - Hitman 2: Silent Assassin
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GHMP4F.ini b/Data/Sys/GameSettings/GHMP4F.ini
deleted file mode 100644
index 2b1e117232..0000000000
--- a/Data/Sys/GameSettings/GHMP4F.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GHMP4F - Hitman 2: Silent Assassin
-
-[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/GNED78.ini b/Data/Sys/GameSettings/GHN.ini
similarity index 91%
rename from Data/Sys/GameSettings/GNED78.ini
rename to Data/Sys/GameSettings/GHN.ini
index 317761c127..50798f5151 100644
--- a/Data/Sys/GameSettings/GNED78.ini
+++ b/Data/Sys/GameSettings/GHN.ini
@@ -1,4 +1,4 @@
-# GNED78 - Finding Nemo
+# GHNE71, GHNX71 - Hunter: The Reckoning
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GHNE71.ini b/Data/Sys/GameSettings/GHNE71.ini
deleted file mode 100644
index fa603507dd..0000000000
--- a/Data/Sys/GameSettings/GHNE71.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GHNE71 - Hunter: The Reckoning
-
-[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 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_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GHNX71.ini b/Data/Sys/GameSettings/GHNX71.ini
deleted file mode 100644
index 33084f79e9..0000000000
--- a/Data/Sys/GameSettings/GHNX71.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GHNX71 - Hunter: The Reckoning
-
-[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 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_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GHQ.ini b/Data/Sys/GameSettings/GHQ.ini
new file mode 100644
index 0000000000..89fb89263a
--- /dev/null
+++ b/Data/Sys/GameSettings/GHQ.ini
@@ -0,0 +1,31 @@
+# GHQE7D, GHQP7D - The Simpsons Hit & 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]
+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/GHQE7D.ini b/Data/Sys/GameSettings/GHQE7D.ini
deleted file mode 100644
index 0ebe5db872..0000000000
--- a/Data/Sys/GameSettings/GHQE7D.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GHQE7D - The Simpsons Hit & 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]
-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/GHQP7D.ini b/Data/Sys/GameSettings/GHQP7D.ini
deleted file mode 100644
index e4e84a9677..0000000000
--- a/Data/Sys/GameSettings/GHQP7D.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GHQP7D - The Simpsons Hit & 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]
-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/GHSE69.ini b/Data/Sys/GameSettings/GHS.ini
similarity index 89%
rename from Data/Sys/GameSettings/GHSE69.ini
rename to Data/Sys/GameSettings/GHS.ini
index 98fca29d18..a2dad8e0a4 100644
--- a/Data/Sys/GameSettings/GHSE69.ini
+++ b/Data/Sys/GameSettings/GHS.ini
@@ -1,4 +1,4 @@
-# GHSE69 - Harry Potter COS
+# GHSE69, GHSJ69, GHSP69, GHSX69, GHSY69 - Harry Potter COS
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GHSJ69.ini b/Data/Sys/GameSettings/GHSJ69.ini
deleted file mode 100644
index a1691782a9..0000000000
--- a/Data/Sys/GameSettings/GHSJ69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GHSJ69 - Harry Potter to Himitsu no Heya
-
-[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/GHSP69.ini b/Data/Sys/GameSettings/GHSP69.ini
deleted file mode 100644
index 9b81e723ce..0000000000
--- a/Data/Sys/GameSettings/GHSP69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GHSP69 - Harry Potter: Chamber Of Secrets
-
-[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/GHSX69.ini b/Data/Sys/GameSettings/GHSX69.ini
deleted file mode 100644
index fd8578f1dc..0000000000
--- a/Data/Sys/GameSettings/GHSX69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GHSX69 - Harry Potter: Chamber Of Secrets
-
-[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/GHSY69.ini b/Data/Sys/GameSettings/GHSY69.ini
deleted file mode 100644
index c2d54fd34b..0000000000
--- a/Data/Sys/GameSettings/GHSY69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GHSY69 - Harry Potter COS
-
-[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/GHU.ini b/Data/Sys/GameSettings/GHU.ini
new file mode 100644
index 0000000000..e498461dbe
--- /dev/null
+++ b/Data/Sys/GameSettings/GHU.ini
@@ -0,0 +1,20 @@
+# GHUE7D, GHUF7D, GHUP7D - The Incredible Hulk:Ultimate Destruction
+
+[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/GHUE7D.ini b/Data/Sys/GameSettings/GHUE7D.ini
deleted file mode 100644
index 1f9058530c..0000000000
--- a/Data/Sys/GameSettings/GHUE7D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GHUE7D - The Incredible Hulk:Ultimate Destruction
-
-[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/GHUF7D.ini b/Data/Sys/GameSettings/GHUF7D.ini
deleted file mode 100644
index 6e6bb71b7f..0000000000
--- a/Data/Sys/GameSettings/GHUF7D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GHUF7D - The Incredible Hulk:Ultimate Destruction
-
-[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/GHUP7D.ini b/Data/Sys/GameSettings/GHUP7D.ini
deleted file mode 100644
index cbb6d37fc1..0000000000
--- a/Data/Sys/GameSettings/GHUP7D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GHUP7D - The Incredible Hulk:Ultimate Destruction
-
-[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/GT4D52.ini b/Data/Sys/GameSettings/GIA.ini
similarity index 90%
rename from Data/Sys/GameSettings/GT4D52.ini
rename to Data/Sys/GameSettings/GIA.ini
index 25e55b1d98..095a987ecd 100644
--- a/Data/Sys/GameSettings/GT4D52.ini
+++ b/Data/Sys/GameSettings/GIA.ini
@@ -1,4 +1,4 @@
-# GT4D52 - Tony Hawk's Pro Skater 4
+# GIAE7D, GIAP7D - Ice Age 2 The Meltdown
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GIAP7D.ini b/Data/Sys/GameSettings/GIAP7D.ini
deleted file mode 100644
index 286780ac44..0000000000
--- a/Data/Sys/GameSettings/GIAP7D.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GIAP7D - Ice Age 2 The Meltdown
-
-[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_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GICJG9.ini b/Data/Sys/GameSettings/GIC.ini
similarity index 88%
rename from Data/Sys/GameSettings/GICJG9.ini
rename to Data/Sys/GameSettings/GIC.ini
index 9287ba5367..a81e59cc8c 100644
--- a/Data/Sys/GameSettings/GICJG9.ini
+++ b/Data/Sys/GameSettings/GIC.ini
@@ -1,4 +1,4 @@
-# GICJG9 - The Incredibles
+# GICD78, GICF78, GICJG9, GICP78 - The Incredibles
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GICD78.ini b/Data/Sys/GameSettings/GICD78.ini
deleted file mode 100644
index 6c47ce9c7f..0000000000
--- a/Data/Sys/GameSettings/GICD78.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# GICD78 - 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.
-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]
-EFBCopyEnable = True
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GICF78.ini b/Data/Sys/GameSettings/GICF78.ini
deleted file mode 100644
index f7bb7b5982..0000000000
--- a/Data/Sys/GameSettings/GICF78.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# GICF78 - 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.
-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]
-EFBCopyEnable = True
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GICP78.ini b/Data/Sys/GameSettings/GICP78.ini
deleted file mode 100644
index d14bdabbf7..0000000000
--- a/Data/Sys/GameSettings/GICP78.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# GICP78 - 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.
-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]
-EFBCopyEnable = True
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GILE51.ini b/Data/Sys/GameSettings/GIL.ini
similarity index 93%
rename from Data/Sys/GameSettings/GILE51.ini
rename to Data/Sys/GameSettings/GIL.ini
index fc6c7ed72a..7624354666 100644
--- a/Data/Sys/GameSettings/GILE51.ini
+++ b/Data/Sys/GameSettings/GIL.ini
@@ -1,4 +1,4 @@
-# GILE51 - Aggressive Inline
+# GILE51, GILP51 - Aggressive Inline
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GILP51.ini b/Data/Sys/GameSettings/GILP51.ini
deleted file mode 100644
index 91032c387a..0000000000
--- a/Data/Sys/GameSettings/GILP51.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GILP51 - Aggressive Inline
-
-[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 = 5
-EmulationIssues = 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]
-SafeTextureCacheColorSamples = 512
-
-[DSP]
-EnableJIT = True
diff --git a/Data/Sys/GameSettings/GISE36.ini b/Data/Sys/GameSettings/GIS.ini
similarity index 92%
rename from Data/Sys/GameSettings/GISE36.ini
rename to Data/Sys/GameSettings/GIS.ini
index e8fe98fb89..741ded3110 100644
--- a/Data/Sys/GameSettings/GISE36.ini
+++ b/Data/Sys/GameSettings/GIS.ini
@@ -1,4 +1,4 @@
-# GISE36 - Second Sight
+# GISE36, GISP36 - Second Sight
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RTNE41.ini b/Data/Sys/GameSettings/GIT.ini
similarity index 94%
rename from Data/Sys/GameSettings/RTNE41.ini
rename to Data/Sys/GameSettings/GIT.ini
index 9ed00b8e6d..81267f7657 100644
--- a/Data/Sys/GameSettings/RTNE41.ini
+++ b/Data/Sys/GameSettings/GIT.ini
@@ -1,12 +1,12 @@
-# RTNE41 - Tenchu
+# GITE01, GITP01 - Geist
 
 [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 = 3
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GITE01.ini b/Data/Sys/GameSettings/GITE01.ini
deleted file mode 100644
index 05b7ce08d2..0000000000
--- a/Data/Sys/GameSettings/GITE01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GITE01 - Geist
-
-[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
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GITP01.ini b/Data/Sys/GameSettings/GITP01.ini
deleted file mode 100644
index dfbea8c948..0000000000
--- a/Data/Sys/GameSettings/GITP01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GITP01 - Geist
-
-[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
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GJKD52.ini b/Data/Sys/GameSettings/GJK.ini
similarity index 85%
rename from Data/Sys/GameSettings/GJKD52.ini
rename to Data/Sys/GameSettings/GJK.ini
index 0007f5b1c3..9a2a1dfc6a 100644
--- a/Data/Sys/GameSettings/GJKD52.ini
+++ b/Data/Sys/GameSettings/GJK.ini
@@ -1,4 +1,4 @@
-# GJKD52 - Jedi Knight II: Jedi Outcast
+# GJKD52, GJKE52, GJKF52, GJKP52 - Jedi Knight II: Jedi Outcast
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GJKE52.ini b/Data/Sys/GameSettings/GJKE52.ini
deleted file mode 100644
index ecabf3348d..0000000000
--- a/Data/Sys/GameSettings/GJKE52.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GJKE52 - Jedi Knight II: Jedi Outcast
-
-[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_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GJKF52.ini b/Data/Sys/GameSettings/GJKF52.ini
deleted file mode 100644
index 021607d303..0000000000
--- a/Data/Sys/GameSettings/GJKF52.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GJKF52 - Jedi Knight II: Jedi Outcast
-
-[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_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GJKP52.ini b/Data/Sys/GameSettings/GJKP52.ini
deleted file mode 100644
index 42e8bd5fef..0000000000
--- a/Data/Sys/GameSettings/GJKP52.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GJKP52 - Jedi Knight II: Jedi Outcast
-
-[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_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GJUF78.ini b/Data/Sys/GameSettings/GJU.ini
similarity index 89%
rename from Data/Sys/GameSettings/GJUF78.ini
rename to Data/Sys/GameSettings/GJU.ini
index dcbc8cce5a..0a35dc34b0 100644
--- a/Data/Sys/GameSettings/GJUF78.ini
+++ b/Data/Sys/GameSettings/GJU.ini
@@ -1,4 +1,4 @@
-# GJUF78 - Tak and the Power of Juju
+# GJUD78, GJUF78 - Tak and the Power of Juju
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G4FD69.ini b/Data/Sys/GameSettings/GJX.ini
similarity index 94%
rename from Data/Sys/GameSettings/G4FD69.ini
rename to Data/Sys/GameSettings/GJX.ini
index 18e964b9ca..446927d55f 100644
--- a/Data/Sys/GameSettings/G4FD69.ini
+++ b/Data/Sys/GameSettings/GJX.ini
@@ -1,4 +1,4 @@
-# G4FD69 - FIFA 07
+# GJXE51, GJXP51 - Vexx
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GJXE51.ini b/Data/Sys/GameSettings/GJXE51.ini
deleted file mode 100644
index e0196e7065..0000000000
--- a/Data/Sys/GameSettings/GJXE51.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GJXE51 - Vexx
-
-[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/GJXP51.ini b/Data/Sys/GameSettings/GJXP51.ini
deleted file mode 100644
index 380b210ceb..0000000000
--- a/Data/Sys/GameSettings/GJXP51.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GJXP51 - Vexx
-
-[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/GK2F52.ini b/Data/Sys/GameSettings/GK2.ini
similarity index 81%
rename from Data/Sys/GameSettings/GK2F52.ini
rename to Data/Sys/GameSettings/GK2.ini
index c0f6096a61..9bf214024c 100644
--- a/Data/Sys/GameSettings/GK2F52.ini
+++ b/Data/Sys/GameSettings/GK2.ini
@@ -1,4 +1,4 @@
-# GK2F52 - Spider-Man 2
+# GK2D52, GK2E52, GK2F52, GK2I52, GK2P52 - Spider-Man 2
 
 [Core]
 MMU = 1
diff --git a/Data/Sys/GameSettings/GK2D52.ini b/Data/Sys/GameSettings/GK2D52.ini
deleted file mode 100644
index f218396deb..0000000000
--- a/Data/Sys/GameSettings/GK2D52.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# GK2D52 - Spider-Man 2
-
-[Core]
-MMU = 1
-
-[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
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GK2E52.ini b/Data/Sys/GameSettings/GK2E52.ini
deleted file mode 100644
index 367d91810d..0000000000
--- a/Data/Sys/GameSettings/GK2E52.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# GK2E52 - Spider-Man 2
-
-[Core]
-MMU = 1
-
-[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
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GK2I52.ini b/Data/Sys/GameSettings/GK2I52.ini
deleted file mode 100644
index b5123fe792..0000000000
--- a/Data/Sys/GameSettings/GK2I52.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# GK2I52 - Spider-Man 2
-
-[Core]
-MMU = 1
-
-[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
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GK2P52.ini b/Data/Sys/GameSettings/GK2P52.ini
deleted file mode 100644
index f2931b170e..0000000000
--- a/Data/Sys/GameSettings/GK2P52.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# GK2P52 - Spider-Man 2
-
-[Core]
-MMU = 1
-
-[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
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/G2OP41.ini b/Data/Sys/GameSettings/GK5.ini
similarity index 93%
rename from Data/Sys/GameSettings/G2OP41.ini
rename to Data/Sys/GameSettings/GK5.ini
index 49c1bab989..5e2f2c679d 100644
--- a/Data/Sys/GameSettings/G2OP41.ini
+++ b/Data/Sys/GameSettings/GK5.ini
@@ -1,4 +1,4 @@
-# G2OP41 - PoP:WW
+# GK5E78, GK5X78 - Monster House
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GK5E78.ini b/Data/Sys/GameSettings/GK5E78.ini
deleted file mode 100644
index 7fd5ed3c0c..0000000000
--- a/Data/Sys/GameSettings/GK5E78.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GK5E78 - Monster House
-
-[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/GK5X78.ini b/Data/Sys/GameSettings/GK5X78.ini
deleted file mode 100644
index 1ea3a2d7f1..0000000000
--- a/Data/Sys/GameSettings/GK5X78.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GK5X78 - Monster House
-
-[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/GK7E08.ini b/Data/Sys/GameSettings/GK7.ini
similarity index 93%
rename from Data/Sys/GameSettings/GK7E08.ini
rename to Data/Sys/GameSettings/GK7.ini
index ea2a96fe7c..7941a579bc 100644
--- a/Data/Sys/GameSettings/GK7E08.ini
+++ b/Data/Sys/GameSettings/GK7.ini
@@ -1,4 +1,4 @@
-# GK7E08 - Killer7 Disk1
+# GK7E08, GK7P08 - Killer7 Disk1
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GK7P08.ini b/Data/Sys/GameSettings/GK7P08.ini
deleted file mode 100644
index afed097df4..0000000000
--- a/Data/Sys/GameSettings/GK7P08.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GK7P08 - Killer7 Disk1
-
-[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 = Tested with (r6801)
-
-[OnLoad]
-# Add memory patches 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/GKHEA4.ini b/Data/Sys/GameSettings/GKH.ini
similarity index 93%
rename from Data/Sys/GameSettings/GKHEA4.ini
rename to Data/Sys/GameSettings/GKH.ini
index 3a4e8993d4..eadc6d925d 100644
--- a/Data/Sys/GameSettings/GKHEA4.ini
+++ b/Data/Sys/GameSettings/GKH.ini
@@ -1,4 +1,4 @@
-# GKHEA4 - King Arthur
+# GKHEA4, GKHPA4 - King Arthur
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GKHPA4.ini b/Data/Sys/GameSettings/GKHPA4.ini
deleted file mode 100644
index 7166e588d4..0000000000
--- a/Data/Sys/GameSettings/GKHPA4.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# GKHPA4 - King Arthur
-
-[Core]
-# Values set here will override the main Dolphin settings.
-BlockMerging = 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]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/G3XP52.ini b/Data/Sys/GameSettings/GKL.ini
similarity index 82%
rename from Data/Sys/GameSettings/G3XP52.ini
rename to Data/Sys/GameSettings/GKL.ini
index 3d901f6846..995b088719 100644
--- a/Data/Sys/GameSettings/G3XP52.ini
+++ b/Data/Sys/GameSettings/GKL.ini
@@ -1,8 +1,7 @@
-# G3XP52 - X-Men: The Official Game
+# GKLD69, GKLE69, GKLF69, GKLI69, GKLJ69, GKLP69, GKLS69 - The Lord of the Rings; The Return of the King
 
 [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.
diff --git a/Data/Sys/GameSettings/GKLD69.ini b/Data/Sys/GameSettings/GKLD69.ini
deleted file mode 100644
index fa46fc6efb..0000000000
--- a/Data/Sys/GameSettings/GKLD69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GKLD69 - The Lord of the Rings; The Return of the King
-
-[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 = 512
-
diff --git a/Data/Sys/GameSettings/GKLE69.ini b/Data/Sys/GameSettings/GKLE69.ini
deleted file mode 100644
index c30cdfc982..0000000000
--- a/Data/Sys/GameSettings/GKLE69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GKLE69 - The Lord of the Rings; The Return of the King
-
-[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 = 512
-
diff --git a/Data/Sys/GameSettings/GKLF69.ini b/Data/Sys/GameSettings/GKLF69.ini
deleted file mode 100644
index a00f76420e..0000000000
--- a/Data/Sys/GameSettings/GKLF69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GKLF69 - The Lord of the Rings; The Return of the King
-
-[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 = 512
-
diff --git a/Data/Sys/GameSettings/GKLI69.ini b/Data/Sys/GameSettings/GKLI69.ini
deleted file mode 100644
index ae6e52d941..0000000000
--- a/Data/Sys/GameSettings/GKLI69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GKLI69 - The Lord of the Rings; The Return of the King
-
-[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 = 512
-
diff --git a/Data/Sys/GameSettings/GKLJ69.ini b/Data/Sys/GameSettings/GKLJ69.ini
deleted file mode 100644
index f7ae9a5c02..0000000000
--- a/Data/Sys/GameSettings/GKLJ69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GKLJ69 - The Lord of the Rings; The Return of the King
-
-[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 = 512
-
diff --git a/Data/Sys/GameSettings/GKLP69.ini b/Data/Sys/GameSettings/GKLP69.ini
deleted file mode 100644
index 9e44c35816..0000000000
--- a/Data/Sys/GameSettings/GKLP69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GKLP69 - The Lord of the Rings; The Return of the King
-
-[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 = 512
-
diff --git a/Data/Sys/GameSettings/GKLS69.ini b/Data/Sys/GameSettings/GKLS69.ini
deleted file mode 100644
index a115fb1352..0000000000
--- a/Data/Sys/GameSettings/GKLS69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GKLS69 - The Lord of the Rings; The Return of the King
-
-[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 = 512
-
diff --git a/Data/Sys/GameSettings/GKMP41.ini b/Data/Sys/GameSettings/GKM.ini
similarity index 89%
rename from Data/Sys/GameSettings/GKMP41.ini
rename to Data/Sys/GameSettings/GKM.ini
index 80807c8c56..a6965a013d 100644
--- a/Data/Sys/GameSettings/GKMP41.ini
+++ b/Data/Sys/GameSettings/GKM.ini
@@ -1,4 +1,4 @@
-# GKMP41 - Prince of Persia The Two Thrones
+# GKME41, GKMP41 - Prince of Persia The Two Thrones
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GKME41.ini b/Data/Sys/GameSettings/GKO.ini
similarity index 90%
rename from Data/Sys/GameSettings/GKME41.ini
rename to Data/Sys/GameSettings/GKO.ini
index 190f35ce11..0b5c01d5af 100644
--- a/Data/Sys/GameSettings/GKME41.ini
+++ b/Data/Sys/GameSettings/GKO.ini
@@ -1,4 +1,4 @@
-# GKME41 - Prince of Persia The Two Thrones
+# GKOE70, GKOP6V, GKOP70 - Kao the kangaroo
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GKYJ01.ini b/Data/Sys/GameSettings/GKY.ini
similarity index 92%
rename from Data/Sys/GameSettings/GKYJ01.ini
rename to Data/Sys/GameSettings/GKY.ini
index a69ec033ad..ea91b05771 100644
--- a/Data/Sys/GameSettings/GKYJ01.ini
+++ b/Data/Sys/GameSettings/GKY.ini
@@ -1,4 +1,4 @@
-# GKYJ01 - Kirby Air Ride
+# GKYE01, GKYJ01, GKYP01 - Kirby Air Ride
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GKZD9G.ini b/Data/Sys/GameSettings/GKZ.ini
similarity index 88%
rename from Data/Sys/GameSettings/GKZD9G.ini
rename to Data/Sys/GameSettings/GKZ.ini
index 4bcd28da5c..c66744f379 100644
--- a/Data/Sys/GameSettings/GKZD9G.ini
+++ b/Data/Sys/GameSettings/GKZ.ini
@@ -1,4 +1,4 @@
-# GKZD9G - Codename: Kids Next Door
+# GKZD9G, GKZE9G, GKZF9G, GKZP54 - Codename: Kids Next Door
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GKZE9G.ini b/Data/Sys/GameSettings/GKZE9G.ini
deleted file mode 100644
index f5e8b8765a..0000000000
--- a/Data/Sys/GameSettings/GKZE9G.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GKZE9G - 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.
-EmulationIssues = Needs real xfb for the videos to work.
-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 = True
diff --git a/Data/Sys/GameSettings/GKZF9G.ini b/Data/Sys/GameSettings/GKZF9G.ini
deleted file mode 100644
index 55258d2ed6..0000000000
--- a/Data/Sys/GameSettings/GKZF9G.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GKZF9G - 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.
-EmulationIssues = Needs real xfb for the videos to work.
-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 = True
diff --git a/Data/Sys/GameSettings/GKZP54.ini b/Data/Sys/GameSettings/GKZP54.ini
deleted file mode 100644
index 7400b8113e..0000000000
--- a/Data/Sys/GameSettings/GKZP54.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GKZP54 - 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.
-EmulationIssues = Needs real xfb for the videos to work.
-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 = True
diff --git a/Data/Sys/GameSettings/GL7P64.ini b/Data/Sys/GameSettings/GL7.ini
similarity index 91%
rename from Data/Sys/GameSettings/GL7P64.ini
rename to Data/Sys/GameSettings/GL7.ini
index cd71aaaf5e..3d3c62e2e7 100644
--- a/Data/Sys/GameSettings/GL7P64.ini
+++ b/Data/Sys/GameSettings/GL7.ini
@@ -1,4 +1,4 @@
-# GL7P64 - StarWars Lego 2
+# GL7E64, GL7P64 - StarWars Lego 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GL8E4F.ini b/Data/Sys/GameSettings/GL8.ini
similarity index 92%
rename from Data/Sys/GameSettings/GL8E4F.ini
rename to Data/Sys/GameSettings/GL8.ini
index 75a0bf3f1f..7e8da7a1d9 100644
--- a/Data/Sys/GameSettings/GL8E4F.ini
+++ b/Data/Sys/GameSettings/GL8.ini
@@ -1,4 +1,4 @@
-# GL8E4F - Tomb Raider: Legend
+# GL8E4F, GL8F4F - Tomb Raider: Legend
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GL8F4F.ini b/Data/Sys/GameSettings/GL8F4F.ini
deleted file mode 100644
index 28317f5e31..0000000000
--- a/Data/Sys/GameSettings/GL8F4F.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GL8F4F - Tomb Raider: Legend
-
-[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 = Sound little crappy
-
-[OnLoad]
-# Add memory patches 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/GLCE52.ini b/Data/Sys/GameSettings/GLC.ini
similarity index 95%
rename from Data/Sys/GameSettings/GLCE52.ini
rename to Data/Sys/GameSettings/GLC.ini
index 827d71a70c..46e46da0ab 100644
--- a/Data/Sys/GameSettings/GLCE52.ini
+++ b/Data/Sys/GameSettings/GLC.ini
@@ -1,4 +1,4 @@
-# GLCE52 - Lemony Snicket
+# GLCE52, GLCF52 - Lemony Snicket
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GLCF52.ini b/Data/Sys/GameSettings/GLCF52.ini
deleted file mode 100644
index a726e5ab2a..0000000000
--- a/Data/Sys/GameSettings/GLCF52.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-# GLCF52 - Lemony Snicket
-
-[Core]
-# Values set here will override the main dolphin settings.
-CPUThread = 1
-SkipIdle = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Still encountering slowdowns, but no major issues so far.
-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
-DstAlphaPass = True
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = True
-
diff --git a/Data/Sys/GameSettings/GLRD64.ini b/Data/Sys/GameSettings/GLR.ini
similarity index 86%
rename from Data/Sys/GameSettings/GLRD64.ini
rename to Data/Sys/GameSettings/GLR.ini
index b651c8f3d0..7881b06f5a 100644
--- a/Data/Sys/GameSettings/GLRD64.ini
+++ b/Data/Sys/GameSettings/GLR.ini
@@ -1,4 +1,4 @@
-# GLRD64 - Star Wars - Rogue Squadron III - Rebel Strike
+# GLRD64, GLRF64, GLRJ13, GLRP64 - Star Wars - Rogue Squadron III - Rebel Strike
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GLRF64.ini b/Data/Sys/GameSettings/GLRF64.ini
deleted file mode 100644
index 22172e5cda..0000000000
--- a/Data/Sys/GameSettings/GLRF64.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GLRF64 - Star Wars - Rogue Squadron III - Rebel Strike
-
-[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 = Needs LLE audio for proper sound.
-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]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GLRJ13.ini b/Data/Sys/GameSettings/GLRJ13.ini
deleted file mode 100644
index a9f2bedd8a..0000000000
--- a/Data/Sys/GameSettings/GLRJ13.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GLRJ13 - Star Wars - Rogue Squadron III - Rebel Strike
-
-[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 = Needs LLE audio for proper sound.
-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]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GLRP64.ini b/Data/Sys/GameSettings/GLRP64.ini
deleted file mode 100644
index abd39266ed..0000000000
--- a/Data/Sys/GameSettings/GLRP64.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GLRP64 - Star Wars - Rogue Squadron III - Rebel Strike
-
-[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 = Needs LLE audio for proper sound.
-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]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GLSD64.ini b/Data/Sys/GameSettings/GLS.ini
similarity index 91%
rename from Data/Sys/GameSettings/GLSD64.ini
rename to Data/Sys/GameSettings/GLS.ini
index edb99f2b87..c436849592 100644
--- a/Data/Sys/GameSettings/GLSD64.ini
+++ b/Data/Sys/GameSettings/GLS.ini
@@ -1,4 +1,4 @@
-# GLSD64 - LucasArts Gladius
+# GLSD64, GLSE64, GLSF64, GLSP64 - LucasArts Gladius
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GLSE64.ini b/Data/Sys/GameSettings/GLSE64.ini
deleted file mode 100644
index ac031aee3a..0000000000
--- a/Data/Sys/GameSettings/GLSE64.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GLSE64 - LucasArts Gladius
-
-[Core]
-# Values set here will override the main dolphin settings.
-SyncGPU = 1
-
-[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
-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/GLSF64.ini b/Data/Sys/GameSettings/GLSF64.ini
deleted file mode 100644
index f3adbca976..0000000000
--- a/Data/Sys/GameSettings/GLSF64.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GLSF64 - LucasArts Gladius
-
-[Core]
-# Values set here will override the main dolphin settings.
-SyncGPU = 1
-
-[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
-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/GLSP64.ini b/Data/Sys/GameSettings/GLSP64.ini
deleted file mode 100644
index 4da5e9e78d..0000000000
--- a/Data/Sys/GameSettings/GLSP64.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GLSP64 - LucasArts Gladius
-
-[Core]
-# Values set here will override the main dolphin settings.
-SyncGPU = 1
-
-[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
-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/GLY.ini b/Data/Sys/GameSettings/GLY.ini
new file mode 100644
index 0000000000..79e99c850e
--- /dev/null
+++ b/Data/Sys/GameSettings/GLY.ini
@@ -0,0 +1,27 @@
+# GLYE69, GLYP69 - NBA LIVE 2005
+
+[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 =
+
diff --git a/Data/Sys/GameSettings/GLYE69.ini b/Data/Sys/GameSettings/GLYE69.ini
deleted file mode 100644
index 8f8141f0d2..0000000000
--- a/Data/Sys/GameSettings/GLYE69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GLYE69 - NBA LIVE 2005
-
-[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 =
-
diff --git a/Data/Sys/GameSettings/GLYP69.ini b/Data/Sys/GameSettings/GLYP69.ini
deleted file mode 100644
index bfcfaa9711..0000000000
--- a/Data/Sys/GameSettings/GLYP69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GLYP69 - NBA LIVE 2005
-
-[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 =
-
diff --git a/Data/Sys/GameSettings/G4OP69.ini b/Data/Sys/GameSettings/GLZ.ini
similarity index 88%
rename from Data/Sys/GameSettings/G4OP69.ini
rename to Data/Sys/GameSettings/GLZ.ini
index bbb4d4d48a..29747e5c73 100644
--- a/Data/Sys/GameSettings/G4OP69.ini
+++ b/Data/Sys/GameSettings/GLZ.ini
@@ -1,4 +1,4 @@
-# G4OP69 - The Sims 2 Pets
+# GLZE69, GLZF69 - 007 From Russia With Love
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GLZE69.ini b/Data/Sys/GameSettings/GLZE69.ini
deleted file mode 100644
index 7d3d25b7cf..0000000000
--- a/Data/Sys/GameSettings/GLZE69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GLZE69 - 007 From Russia With 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 = 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/GLZF69.ini b/Data/Sys/GameSettings/GLZF69.ini
deleted file mode 100644
index 6faa3b4eff..0000000000
--- a/Data/Sys/GameSettings/GLZF69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GLZF69 - 007 From Russia With 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 = 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/GM2E8P.ini b/Data/Sys/GameSettings/GM2.ini
similarity index 91%
rename from Data/Sys/GameSettings/GM2E8P.ini
rename to Data/Sys/GameSettings/GM2.ini
index f30e42467e..c668b1cf9e 100644
--- a/Data/Sys/GameSettings/GM2E8P.ini
+++ b/Data/Sys/GameSettings/GM2.ini
@@ -1,4 +1,4 @@
-# GM2E8P - SUPER MONKEY BALL 2
+# GM2E8P, GM2J8P, GM2P8P - SUPER MONKEY BALL 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GM2J8P.ini b/Data/Sys/GameSettings/GM2J8P.ini
deleted file mode 100644
index c91f184801..0000000000
--- a/Data/Sys/GameSettings/GM2J8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GM2J8P - SUPER MONKEY BALL 2
-
-[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 = Shadows need fast depth enabled.
-
-[OnLoad]
-# Add memory patches 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]
-FastDepthCalc = True
diff --git a/Data/Sys/GameSettings/GM2P8P.ini b/Data/Sys/GameSettings/GM2P8P.ini
deleted file mode 100644
index 20f56a849c..0000000000
--- a/Data/Sys/GameSettings/GM2P8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GM2P8P - SUPER MONKEY BALL 2
-
-[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 = Shadows need fast depth enabled.
-
-[OnLoad]
-# Add memory patches 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]
-FastDepthCalc = True
diff --git a/Data/Sys/GameSettings/GM3E69.ini b/Data/Sys/GameSettings/GM3.ini
similarity index 93%
rename from Data/Sys/GameSettings/GM3E69.ini
rename to Data/Sys/GameSettings/GM3.ini
index 7d1581fc0e..db9e8474b0 100644
--- a/Data/Sys/GameSettings/GM3E69.ini
+++ b/Data/Sys/GameSettings/GM3.ini
@@ -1,4 +1,4 @@
-# GM3E69 - Madden NFL 2003
+# GM3E69, GM3P69 - Madden NFL 2003
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GM5.ini b/Data/Sys/GameSettings/GM5.ini
new file mode 100644
index 0000000000..48b204518a
--- /dev/null
+++ b/Data/Sys/GameSettings/GM5.ini
@@ -0,0 +1,30 @@
+# GM5E7D, GM5F7D, GM5P7D - Metal Arms: Glitch in the System
+
+[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/GM5E7D.ini b/Data/Sys/GameSettings/GM5E7D.ini
deleted file mode 100644
index bb9b0213c2..0000000000
--- a/Data/Sys/GameSettings/GM5E7D.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GM5E7D - Metal Arms: Glitch in the System
-
-[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/GM5F7D.ini b/Data/Sys/GameSettings/GM5F7D.ini
deleted file mode 100644
index e0d32653a6..0000000000
--- a/Data/Sys/GameSettings/GM5F7D.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GM5F7D - Metal Arms: Glitch in the System
-
-[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/GM5P7D.ini b/Data/Sys/GameSettings/GM5P7D.ini
deleted file mode 100644
index 7b54fa13c5..0000000000
--- a/Data/Sys/GameSettings/GM5P7D.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GM5P7D - Metal Arms: Glitch in the System
-
-[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/GM6EE9.ini b/Data/Sys/GameSettings/GM6.ini
similarity index 90%
rename from Data/Sys/GameSettings/GM6EE9.ini
rename to Data/Sys/GameSettings/GM6.ini
index dd5928768a..c3c48410b7 100644
--- a/Data/Sys/GameSettings/GM6EE9.ini
+++ b/Data/Sys/GameSettings/GM6.ini
@@ -1,4 +1,4 @@
-# GM6EE9 - Medabots Infinity 4th Submission
+# GM6EE9, GM6PE9 - Medabots Infinity 4th Submission
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GM6PE9.ini b/Data/Sys/GameSettings/GM6PE9.ini
deleted file mode 100644
index 6c11c8762d..0000000000
--- a/Data/Sys/GameSettings/GM6PE9.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GM6PE9 - Medabots Infinity 4th Submission
-
-[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_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/GMHE52.ini b/Data/Sys/GameSettings/GMH.ini
similarity index 91%
rename from Data/Sys/GameSettings/GMHE52.ini
rename to Data/Sys/GameSettings/GMH.ini
index ae7a157833..5fccc32ca4 100644
--- a/Data/Sys/GameSettings/GMHE52.ini
+++ b/Data/Sys/GameSettings/GMH.ini
@@ -1,4 +1,4 @@
-# GMHE52 - Mat Hoffman's Pro BMX 2
+# GMHE52, GMHF52, GMHP52 - Mat Hoffman's Pro BMX 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GMHF52.ini b/Data/Sys/GameSettings/GMHF52.ini
deleted file mode 100644
index 310520006a..0000000000
--- a/Data/Sys/GameSettings/GMHF52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GMHF52 - Mat Hoffman's Pro BMX 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 = Needs real Xfb for videos to show up (r6945)
-
-[OnLoad]
-# Add memory patches 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/GMHP52.ini b/Data/Sys/GameSettings/GMHP52.ini
deleted file mode 100644
index b362a4fc89..0000000000
--- a/Data/Sys/GameSettings/GMHP52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GMHP52 - Mat Hoffman's Pro BMX 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 = Needs real Xfb for videos to show up (r6945)
-
-[OnLoad]
-# Add memory patches 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/GMIE70.ini b/Data/Sys/GameSettings/GMI.ini
similarity index 91%
rename from Data/Sys/GameSettings/GMIE70.ini
rename to Data/Sys/GameSettings/GMI.ini
index 7913cc6049..0d338ce5ec 100644
--- a/Data/Sys/GameSettings/GMIE70.ini
+++ b/Data/Sys/GameSettings/GMI.ini
@@ -1,4 +1,4 @@
-# GMIE70 - Mission: Impossible Operation Surma
+# GMIE70, GMIP70 - Mission: Impossible Operation Surma
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GMIP70.ini b/Data/Sys/GameSettings/GMIP70.ini
deleted file mode 100644
index f0b53a0619..0000000000
--- a/Data/Sys/GameSettings/GMIP70.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# GMIP70 - Mission: Impossible Operation Surma
-
-[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 = Needs Efb to Ram for Sonic Imager (gadgets).
-
-[OnLoad]
-# Add memory patches 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
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/GMNE78.ini b/Data/Sys/GameSettings/GMN.ini
similarity index 92%
rename from Data/Sys/GameSettings/GMNE78.ini
rename to Data/Sys/GameSettings/GMN.ini
index c4f119dfd4..c500b0ed2f 100644
--- a/Data/Sys/GameSettings/GMNE78.ini
+++ b/Data/Sys/GameSettings/GMN.ini
@@ -1,4 +1,4 @@
-# GMNE78 - Monsters, Inc. Scream Arena
+# GMNE78, GMNP78 - Monsters, Inc. Scream Arena
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GMNP78.ini b/Data/Sys/GameSettings/GMNP78.ini
deleted file mode 100644
index 44bfe59102..0000000000
--- a/Data/Sys/GameSettings/GMNP78.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GMNP78 - Monsters, Inc. Scream Arena
-
-[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 = Videos require real XFB, 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/GN6E69.ini b/Data/Sys/GameSettings/GN6.ini
similarity index 94%
rename from Data/Sys/GameSettings/GN6E69.ini
rename to Data/Sys/GameSettings/GN6.ini
index fa18b55b11..89d853d11d 100644
--- a/Data/Sys/GameSettings/GN6E69.ini
+++ b/Data/Sys/GameSettings/GN6.ini
@@ -1,4 +1,4 @@
-# GN6E69 - NHL06
+# GN6E69, GN6P69 - NHL06
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GN7E69.ini b/Data/Sys/GameSettings/GN7.ini
similarity index 93%
rename from Data/Sys/GameSettings/GN7E69.ini
rename to Data/Sys/GameSettings/GN7.ini
index 95691de8af..78011bddf6 100644
--- a/Data/Sys/GameSettings/GN7E69.ini
+++ b/Data/Sys/GameSettings/GN7.ini
@@ -1,4 +1,4 @@
-# GN7E69 - NFL STREET 2
+# GN7E69, GN7P69 - NFL STREET 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GN7P69.ini b/Data/Sys/GameSettings/GN7P69.ini
deleted file mode 100644
index 321033cf80..0000000000
--- a/Data/Sys/GameSettings/GN7P69.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GN7P69 - NFL STREET 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 = 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_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GN8.ini b/Data/Sys/GameSettings/GN8.ini
new file mode 100644
index 0000000000..30276477d5
--- /dev/null
+++ b/Data/Sys/GameSettings/GN8.ini
@@ -0,0 +1,27 @@
+# GN8E69, GN8P69 - NBA LIVE 2004
+
+[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/GN8E69.ini b/Data/Sys/GameSettings/GN8E69.ini
deleted file mode 100644
index 86e86ed4a8..0000000000
--- a/Data/Sys/GameSettings/GN8E69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GN8E69 - NBA LIVE 2004
-
-[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/GN8P69.ini b/Data/Sys/GameSettings/GN8P69.ini
deleted file mode 100644
index 5d38912db5..0000000000
--- a/Data/Sys/GameSettings/GN8P69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GN8P69 - NBA LIVE 2004
-
-[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/GNEE78.ini b/Data/Sys/GameSettings/GNE.ini
similarity index 88%
rename from Data/Sys/GameSettings/GNEE78.ini
rename to Data/Sys/GameSettings/GNE.ini
index af49d7e664..6c16456317 100644
--- a/Data/Sys/GameSettings/GNEE78.ini
+++ b/Data/Sys/GameSettings/GNE.ini
@@ -1,4 +1,4 @@
-# GNEE78 - Finding Nemo
+# GNED78, GNEE78, GNEF78, GNEP78, GNES78 - Finding Nemo
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GNEF78.ini b/Data/Sys/GameSettings/GNEF78.ini
deleted file mode 100644
index b0303ea9cf..0000000000
--- a/Data/Sys/GameSettings/GNEF78.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GNEF78 - Finding Nemo
-
-[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 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_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GNEP78.ini b/Data/Sys/GameSettings/GNEP78.ini
deleted file mode 100644
index 5bf28ebd07..0000000000
--- a/Data/Sys/GameSettings/GNEP78.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GNEP78 - Finding Nemo
-
-[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 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_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GNES78.ini b/Data/Sys/GameSettings/GNES78.ini
deleted file mode 100644
index b29379ab2e..0000000000
--- a/Data/Sys/GameSettings/GNES78.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GNES78 - Finding Nemo
-
-[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 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_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GNIEA4.ini b/Data/Sys/GameSettings/GNI.ini
similarity index 88%
rename from Data/Sys/GameSettings/GNIEA4.ini
rename to Data/Sys/GameSettings/GNI.ini
index ee567f0d28..dd21acd0db 100644
--- a/Data/Sys/GameSettings/GNIEA4.ini
+++ b/Data/Sys/GameSettings/GNI.ini
@@ -1,4 +1,4 @@
-# GNIEA4 - TMNT2
+# GNIEA4, GNIPA4 - TMNT2
 [Core]
 [EmuState]
 EmulationStateId = 4
diff --git a/Data/Sys/GameSettings/GNIPA4.ini b/Data/Sys/GameSettings/GNIPA4.ini
deleted file mode 100644
index 0a19f74784..0000000000
--- a/Data/Sys/GameSettings/GNIPA4.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-# GNIPA4 - TMNT2
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GNNE69.ini b/Data/Sys/GameSettings/GNN.ini
similarity index 94%
rename from Data/Sys/GameSettings/GNNE69.ini
rename to Data/Sys/GameSettings/GNN.ini
index f1bb8d9c7a..304145ef6b 100644
--- a/Data/Sys/GameSettings/GNNE69.ini
+++ b/Data/Sys/GameSettings/GNN.ini
@@ -1,4 +1,4 @@
-# GNNE69 - NFL Street
+# GNNE69, GNNP69 - NFL Street
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GNNP69.ini b/Data/Sys/GameSettings/GNNP69.ini
deleted file mode 100644
index 74fe733806..0000000000
--- a/Data/Sys/GameSettings/GNNP69.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GNNP69 - NFL Street
-
-[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_Settings]
-SafeTextureCacheColorSamples = 512
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GNZE69.ini b/Data/Sys/GameSettings/GNZ.ini
similarity index 91%
rename from Data/Sys/GameSettings/GNZE69.ini
rename to Data/Sys/GameSettings/GNZ.ini
index a63f112ba6..c60b52bdda 100644
--- a/Data/Sys/GameSettings/GNZE69.ini
+++ b/Data/Sys/GameSettings/GNZ.ini
@@ -1,4 +1,4 @@
-# GNZE69 - NBA STREET Vol.2
+# GNZE69, GNZP69 - NBA STREET Vol.2
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GNZP69.ini b/Data/Sys/GameSettings/GNZP69.ini
deleted file mode 100644
index 0a2dfbaeb3..0000000000
--- a/Data/Sys/GameSettings/GNZP69.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GNZP69 - NBA STREET Vol.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]
diff --git a/Data/Sys/GameSettings/GO2F4F.ini b/Data/Sys/GameSettings/GO2.ini
similarity index 92%
rename from Data/Sys/GameSettings/GO2F4F.ini
rename to Data/Sys/GameSettings/GO2.ini
index f0e9a84780..3935cc895a 100644
--- a/Data/Sys/GameSettings/GO2F4F.ini
+++ b/Data/Sys/GameSettings/GO2.ini
@@ -1,4 +1,4 @@
-# GO2F4F - Blood Omen 2
+# GO2D4F, GO2E4F, GO2F4F, GO2P4F - Blood Omen 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GO2D4F.ini b/Data/Sys/GameSettings/GO2D4F.ini
deleted file mode 100644
index 85fd9126f2..0000000000
--- a/Data/Sys/GameSettings/GO2D4F.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GO2D4F - Blood Omen 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 = Needs Real Xfb for the videos to display.Sky texture issues.
-
-[OnLoad]
-# Add memory patches 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/GO2E4F.ini b/Data/Sys/GameSettings/GO2E4F.ini
deleted file mode 100644
index 27d20a6fbf..0000000000
--- a/Data/Sys/GameSettings/GO2E4F.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GO2E4F - Blood Omen 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 = Needs Real Xfb for the videos to display.Sky texture issues.
-
-[OnLoad]
-# Add memory patches 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/GO2P4F.ini b/Data/Sys/GameSettings/GO2P4F.ini
deleted file mode 100644
index 012818a890..0000000000
--- a/Data/Sys/GameSettings/GO2P4F.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GO2P4F - Blood Omen 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 = Needs Real Xfb for the videos to display.Sky texture issues.
-
-[OnLoad]
-# Add memory patches 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/GOBE4Z.ini b/Data/Sys/GameSettings/GOB.ini
similarity index 90%
rename from Data/Sys/GameSettings/GOBE4Z.ini
rename to Data/Sys/GameSettings/GOB.ini
index 08f323109f..884d708529 100644
--- a/Data/Sys/GameSettings/GOBE4Z.ini
+++ b/Data/Sys/GameSettings/GOB.ini
@@ -1,4 +1,4 @@
-# GOBE4Z - Bad Boys Miami Takedown
+# GOBE4Z, GOBP7N - Bad Boys Miami Takedown
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GOBP7N.ini b/Data/Sys/GameSettings/GOBP7N.ini
deleted file mode 100644
index 38b5d441b5..0000000000
--- a/Data/Sys/GameSettings/GOBP7N.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GOBP7N - Bad Boys II
-
-[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 = 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.
-
-[DSP]
-EnableJIT = True
diff --git a/Data/Sys/GameSettings/GOSE41.ini b/Data/Sys/GameSettings/GOS.ini
similarity index 92%
rename from Data/Sys/GameSettings/GOSE41.ini
rename to Data/Sys/GameSettings/GOS.ini
index 029aa16018..dcdde5ba67 100644
--- a/Data/Sys/GameSettings/GOSE41.ini
+++ b/Data/Sys/GameSettings/GOS.ini
@@ -1,4 +1,4 @@
-# GOSE41 - Open Season
+# GOSE41, GOSP41, GOSX41 - Open Season
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GOSX41.ini b/Data/Sys/GameSettings/GOSX41.ini
deleted file mode 100644
index b4f1a3539c..0000000000
--- a/Data/Sys/GameSettings/GOSX41.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GOSX41 - Open Season
-
-[Core]
-# Values set here will override the main Dolphin settings.
-MMU = 1
-BlockMerging = 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 =
-
diff --git a/Data/Sys/GameSettings/GOSP41.ini b/Data/Sys/GameSettings/GOW.ini
similarity index 88%
rename from Data/Sys/GameSettings/GOSP41.ini
rename to Data/Sys/GameSettings/GOW.ini
index b5a16d1fe1..7fb3ce8aab 100644
--- a/Data/Sys/GameSettings/GOSP41.ini
+++ b/Data/Sys/GameSettings/GOW.ini
@@ -1,9 +1,8 @@
-# GOSP41 - Open Season
+# GOWD69, GOWE69, GOWF69, GOWJ69, GOWP69 - NFS Most Wanted
 
 [Core]
 # Values set here will override the main Dolphin settings.
 MMU = 1
-BlockMerging = 1
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
diff --git a/Data/Sys/GameSettings/GOWD69.ini b/Data/Sys/GameSettings/GOWD69.ini
deleted file mode 100644
index 160e4db186..0000000000
--- a/Data/Sys/GameSettings/GOWD69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GOWD69 - NFS Most Wanted
-
-[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 =
-
diff --git a/Data/Sys/GameSettings/GOWE69.ini b/Data/Sys/GameSettings/GOWE69.ini
deleted file mode 100644
index e667efaa7c..0000000000
--- a/Data/Sys/GameSettings/GOWE69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GOWE69 - NFS Most Wanted
-
-[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 =
-
diff --git a/Data/Sys/GameSettings/GOWF69.ini b/Data/Sys/GameSettings/GOWF69.ini
deleted file mode 100644
index d858f9d879..0000000000
--- a/Data/Sys/GameSettings/GOWF69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GOWF69 - NFS Most Wanted
-
-[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 =
-
diff --git a/Data/Sys/GameSettings/GOWJ69.ini b/Data/Sys/GameSettings/GOWJ69.ini
deleted file mode 100644
index 0c28cdc3ad..0000000000
--- a/Data/Sys/GameSettings/GOWJ69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GOWJ69 - NFS Most Wanted
-
-[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 =
-
diff --git a/Data/Sys/GameSettings/GOWP69.ini b/Data/Sys/GameSettings/GOWP69.ini
deleted file mode 100644
index e556de51a8..0000000000
--- a/Data/Sys/GameSettings/GOWP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GOWP69 - NFS Most Wanted
-
-[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 =
-
diff --git a/Data/Sys/GameSettings/GOYD69.ini b/Data/Sys/GameSettings/GOY.ini
similarity index 89%
rename from Data/Sys/GameSettings/GOYD69.ini
rename to Data/Sys/GameSettings/GOY.ini
index 2f12d10da9..85d8407ef4 100644
--- a/Data/Sys/GameSettings/GOYD69.ini
+++ b/Data/Sys/GameSettings/GOY.ini
@@ -1,4 +1,4 @@
-# GOYD69 - GoldenEye Rogue Agent
+# GOYD69, GOYF69, GOYP69, GOYS69 - GoldenEye Rogue Agent
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GOYF69.ini b/Data/Sys/GameSettings/GOYF69.ini
deleted file mode 100644
index 3407b414f7..0000000000
--- a/Data/Sys/GameSettings/GOYF69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GOYF69 - GoldenEye Rogue Agent
-
-[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]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GOYP69.ini b/Data/Sys/GameSettings/GOYP69.ini
deleted file mode 100644
index 8c6b427381..0000000000
--- a/Data/Sys/GameSettings/GOYP69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GOYP69 - GoldenEye Rogue Agent
-
-[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]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GOYS69.ini b/Data/Sys/GameSettings/GOYS69.ini
deleted file mode 100644
index 7d388f2ba5..0000000000
--- a/Data/Sys/GameSettings/GOYS69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GOYS69 - GoldenEye Rogue Agent
-
-[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]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GP2E82.ini b/Data/Sys/GameSettings/GP2.ini
similarity index 93%
rename from Data/Sys/GameSettings/GP2E82.ini
rename to Data/Sys/GameSettings/GP2.ini
index 55980e4579..f19d1e099b 100644
--- a/Data/Sys/GameSettings/GP2E82.ini
+++ b/Data/Sys/GameSettings/GP2.ini
@@ -1,4 +1,4 @@
-# GP2E82 - Pac-Man World 2
+# GP2E82, GP2EAF - Pac-Man World 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GP2EAF.ini b/Data/Sys/GameSettings/GP2EAF.ini
deleted file mode 100644
index d6877bdea3..0000000000
--- a/Data/Sys/GameSettings/GP2EAF.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GP2EAF - Pac-Man World 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 = Needs Real xfb for the videos to show up(r6651)
-
-[OnLoad]
-# Add memory patches 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/GP6J01.ini b/Data/Sys/GameSettings/GP6.ini
similarity index 93%
rename from Data/Sys/GameSettings/GP6J01.ini
rename to Data/Sys/GameSettings/GP6.ini
index 31ba302fc2..8a1a36ec85 100644
--- a/Data/Sys/GameSettings/GP6J01.ini
+++ b/Data/Sys/GameSettings/GP6.ini
@@ -1,4 +1,4 @@
-# GP6J01 - Mario Party 6
+# GP6E01, GP6J01, GP6P01 - Mario Party 6
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GP6E01.ini b/Data/Sys/GameSettings/GP6E01.ini
deleted file mode 100644
index 51c566f38d..0000000000
--- a/Data/Sys/GameSettings/GP6E01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GP6E01 - Mario Party 6
-
-[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 = Mini games tour bus needs emulate format changes to preview the mini games.
-
-[OnLoad]
-# Add memory patches 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]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GP6P01.ini b/Data/Sys/GameSettings/GP6P01.ini
deleted file mode 100644
index 3a5837a6c7..0000000000
--- a/Data/Sys/GameSettings/GP6P01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GP6P01 - Mario Party 6
-
-[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 = Mini games tour bus needs emulate format changes to preview the mini games.
-
-[OnLoad]
-# Add memory patches 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]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GPAE01.ini b/Data/Sys/GameSettings/GPA.ini
similarity index 90%
rename from Data/Sys/GameSettings/GPAE01.ini
rename to Data/Sys/GameSettings/GPA.ini
index cb44815498..cbb17fabd7 100644
--- a/Data/Sys/GameSettings/GPAE01.ini
+++ b/Data/Sys/GameSettings/GPA.ini
@@ -1,4 +1,4 @@
-# GPAE01 - PokemonChannelMainDisk
+# GPAE01, GPAJ01, GPAP01, GPAU01 - PokemonChannelMainDisk
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GPAJ01.ini b/Data/Sys/GameSettings/GPAJ01.ini
deleted file mode 100644
index 93f929b070..0000000000
--- a/Data/Sys/GameSettings/GPAJ01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GPAJ01 - PokemonChannelMainDisk
-
-[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 painting.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GPAP01.ini b/Data/Sys/GameSettings/GPAP01.ini
deleted file mode 100644
index 7cd8c88357..0000000000
--- a/Data/Sys/GameSettings/GPAP01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GPAP01 - PokemonChannelMainDisk
-
-[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 painting.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GPAU01.ini b/Data/Sys/GameSettings/GPAU01.ini
deleted file mode 100644
index f7b8fa23be..0000000000
--- a/Data/Sys/GameSettings/GPAU01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GPAU01 - PokemonChannelMainDisk
-
-[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 painting.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GPH.ini b/Data/Sys/GameSettings/GPH.ini
new file mode 100644
index 0000000000..2a01e42528
--- /dev/null
+++ b/Data/Sys/GameSettings/GPH.ini
@@ -0,0 +1,25 @@
+# GPHD52, GPHE52, GPHP52 - Pitfall: The Lost Expedition
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GPHD52.ini b/Data/Sys/GameSettings/GPHD52.ini
deleted file mode 100644
index 044d2a54cb..0000000000
--- a/Data/Sys/GameSettings/GPHD52.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# GPHD52 - Pitfall: The Lost Expedition
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GPHE52.ini b/Data/Sys/GameSettings/GPHE52.ini
deleted file mode 100644
index 5944837ee2..0000000000
--- a/Data/Sys/GameSettings/GPHE52.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# GPHE52 - Pitfall: The Lost Expedition
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GPHP52.ini b/Data/Sys/GameSettings/GPHP52.ini
deleted file mode 100644
index 298a0905f5..0000000000
--- a/Data/Sys/GameSettings/GPHP52.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# GPHP52 - Pitfall: The Lost Expedition
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GPTE41.ini b/Data/Sys/GameSettings/GPT.ini
similarity index 90%
rename from Data/Sys/GameSettings/GPTE41.ini
rename to Data/Sys/GameSettings/GPT.ini
index 5450851213..9d492cef5b 100644
--- a/Data/Sys/GameSettings/GPTE41.ini
+++ b/Data/Sys/GameSettings/GPT.ini
@@ -1,4 +1,4 @@
-# GPTE41 - Prince of Persia : The Sands of Time
+# GPTE41, GPTP41 - Prince of Persia : The Sands of Time
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GPTP41.ini b/Data/Sys/GameSettings/GPTP41.ini
deleted file mode 100644
index f722cfb78f..0000000000
--- a/Data/Sys/GameSettings/GPTP41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GPTP41 - Prince of Persia : The Sands of Time
-
-[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(r6898)
-
-[OnLoad]
-# Add memory patches 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/GPXE01.ini b/Data/Sys/GameSettings/GPX.ini
similarity index 88%
rename from Data/Sys/GameSettings/GPXE01.ini
rename to Data/Sys/GameSettings/GPX.ini
index 9a0e2421b2..e6ecd59847 100644
--- a/Data/Sys/GameSettings/GPXE01.ini
+++ b/Data/Sys/GameSettings/GPX.ini
@@ -1,4 +1,4 @@
-# GPXE01 - POKeMON BOX RUBY&SAPPHIRE
+# GPXE01, GPXP01 - POKeMON BOX RUBY&SAPPHIRE
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GPXP01.ini b/Data/Sys/GameSettings/GPXP01.ini
deleted file mode 100644
index e1c0fa2e15..0000000000
--- a/Data/Sys/GameSettings/GPXP01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GPXP01 - POKeMON BOX RUBY&SAPPHIRE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GQCD52.ini b/Data/Sys/GameSettings/GQC.ini
similarity index 84%
rename from Data/Sys/GameSettings/GQCD52.ini
rename to Data/Sys/GameSettings/GQC.ini
index e69adf6d19..24ed6c2903 100644
--- a/Data/Sys/GameSettings/GQCD52.ini
+++ b/Data/Sys/GameSettings/GQC.ini
@@ -1,4 +1,4 @@
-# GQCD52 - Call of Duty 2: Big Red One
+# GQCD52, GQCE52, GQCF52, 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/GQCE52.ini b/Data/Sys/GameSettings/GQCE52.ini
deleted file mode 100644
index 8f3452a597..0000000000
--- a/Data/Sys/GameSettings/GQCE52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GQCE52 - 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 = 
diff --git a/Data/Sys/GameSettings/GQCF52.ini b/Data/Sys/GameSettings/GQCF52.ini
deleted file mode 100644
index da55f72b96..0000000000
--- a/Data/Sys/GameSettings/GQCF52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GQCF52 - 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 = 
diff --git a/Data/Sys/GameSettings/GQCP52.ini b/Data/Sys/GameSettings/GQCP52.ini
deleted file mode 100644
index 6c8850c4f1..0000000000
--- a/Data/Sys/GameSettings/GQCP52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GQCP52 - 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 = 
diff --git a/Data/Sys/GameSettings/GQCS52.ini b/Data/Sys/GameSettings/GQCS52.ini
deleted file mode 100644
index 1da24daea4..0000000000
--- a/Data/Sys/GameSettings/GQCS52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GQCS52 - 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 = 
diff --git a/Data/Sys/GameSettings/GCIP69.ini b/Data/Sys/GameSettings/GQQ.ini
similarity index 71%
rename from Data/Sys/GameSettings/GCIP69.ini
rename to Data/Sys/GameSettings/GQQ.ini
index 0f69c3638e..a9d3e09279 100644
--- a/Data/Sys/GameSettings/GCIP69.ini
+++ b/Data/Sys/GameSettings/GQQ.ini
@@ -1,4 +1,4 @@
-# GCIP69 - The Sims
+# GQQD78, GQQE78, GQQF78, GQQH78, GQQP78 - SpongeBob Lights, Camera, PANTS
 [Core]
 [EmuState]
 EmulationStateId = 4
@@ -13,5 +13,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/GQQD78.ini b/Data/Sys/GameSettings/GQQD78.ini
deleted file mode 100644
index d3a1d42b87..0000000000
--- a/Data/Sys/GameSettings/GQQD78.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-# GQQD78 - SpongeBob Lights, Camera, PANTS
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GQQE78.ini b/Data/Sys/GameSettings/GQQE78.ini
deleted file mode 100644
index 8a6627d684..0000000000
--- a/Data/Sys/GameSettings/GQQE78.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-# GQQE78 - SpongeBob Lights, Camera, PANTS
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GQQF78.ini b/Data/Sys/GameSettings/GQQF78.ini
deleted file mode 100644
index 1de632ae85..0000000000
--- a/Data/Sys/GameSettings/GQQF78.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-# GQQF78 - SpongeBob Lights, Camera, PANTS
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GQQH78.ini b/Data/Sys/GameSettings/GQQH78.ini
deleted file mode 100644
index 13875ac013..0000000000
--- a/Data/Sys/GameSettings/GQQH78.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-# GQQH78 - SpongeBob Lights, Camera, PANTS
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GQQP78.ini b/Data/Sys/GameSettings/GQQP78.ini
deleted file mode 100644
index 6d1583f10f..0000000000
--- a/Data/Sys/GameSettings/GQQP78.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-# GQQP78 - SpongeBob Lights, Camera, PANTS
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GQSDAF.ini b/Data/Sys/GameSettings/GQS.ini
similarity index 91%
rename from Data/Sys/GameSettings/GQSDAF.ini
rename to Data/Sys/GameSettings/GQS.ini
index 141d2521d4..1af03fc1ee 100644
--- a/Data/Sys/GameSettings/GQSDAF.ini
+++ b/Data/Sys/GameSettings/GQS.ini
@@ -1,4 +1,4 @@
-# GQSDAF - TALES OF SYMPHONIA
+# GQSDAF, GQSFAF, GQSPAF - TALES OF SYMPHONIA
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GQSFAF.ini b/Data/Sys/GameSettings/GQSFAF.ini
deleted file mode 100644
index 2e98d59b52..0000000000
--- a/Data/Sys/GameSettings/GQSFAF.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GQSFAF - TALES OF SYMPHONIA
-
-[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 = 0.5
-PH_ZFar = 1
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/GQSPAF.ini b/Data/Sys/GameSettings/GQSPAF.ini
deleted file mode 100644
index 230f6eb439..0000000000
--- a/Data/Sys/GameSettings/GQSPAF.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GQSPAF - TALES OF SYMPHONIA
-
-[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 = 0.5
-PH_ZFar = 1
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/GQW.ini b/Data/Sys/GameSettings/GQW.ini
new file mode 100644
index 0000000000..2f31ad6ff0
--- /dev/null
+++ b/Data/Sys/GameSettings/GQW.ini
@@ -0,0 +1,27 @@
+# GQWE69, GQWJ69, GQWP69, GQWX69 - Quidditch World Cup
+
+[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 =
+
diff --git a/Data/Sys/GameSettings/GQWE69.ini b/Data/Sys/GameSettings/GQWE69.ini
deleted file mode 100644
index ebcb4f5c3b..0000000000
--- a/Data/Sys/GameSettings/GQWE69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GQWE69 - Quidditch World Cup
-
-[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 =
-
diff --git a/Data/Sys/GameSettings/GQWJ69.ini b/Data/Sys/GameSettings/GQWJ69.ini
deleted file mode 100644
index c0c3f9b405..0000000000
--- a/Data/Sys/GameSettings/GQWJ69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GQWJ69 - Quidditch World Cup
-
-[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 =
-
diff --git a/Data/Sys/GameSettings/GQWP69.ini b/Data/Sys/GameSettings/GQWP69.ini
deleted file mode 100644
index cd4c8bbc3e..0000000000
--- a/Data/Sys/GameSettings/GQWP69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GQWP69 - Quidditch World Cup
-
-[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 =
-
diff --git a/Data/Sys/GameSettings/GQWX69.ini b/Data/Sys/GameSettings/GQWX69.ini
deleted file mode 100644
index 9c57e1b0c3..0000000000
--- a/Data/Sys/GameSettings/GQWX69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GQWX69 - Quidditch World Cup
-
-[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 =
-
diff --git a/Data/Sys/GameSettings/GM3P69.ini b/Data/Sys/GameSettings/GQX.ini
similarity index 93%
rename from Data/Sys/GameSettings/GM3P69.ini
rename to Data/Sys/GameSettings/GQX.ini
index c3cc688f88..9619970f66 100644
--- a/Data/Sys/GameSettings/GM3P69.ini
+++ b/Data/Sys/GameSettings/GQX.ini
@@ -1,4 +1,4 @@
-# GM3P69 - Madden NFL 2003
+# GQXE69, GQXP69 - Madden NFL 2004
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GQXE69.ini b/Data/Sys/GameSettings/GQXE69.ini
deleted file mode 100644
index 12d0453ff8..0000000000
--- a/Data/Sys/GameSettings/GQXE69.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GQXE69 - Madden NFL 2004
-
-[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. Shadow issues with fastdepth (D3D).
-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 = True
-FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/GQXP69.ini b/Data/Sys/GameSettings/GQXP69.ini
deleted file mode 100644
index fb32ffad70..0000000000
--- a/Data/Sys/GameSettings/GQXP69.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GQXP69 - Madden NFL 2004
-
-[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. Shadow issues with fastdepth (D3D).
-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 = True
-FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/GH5P52.ini b/Data/Sys/GameSettings/GR8.ini
similarity index 83%
rename from Data/Sys/GameSettings/GH5P52.ini
rename to Data/Sys/GameSettings/GR8.ini
index ede9dd2af3..6afaacfdc5 100644
--- a/Data/Sys/GameSettings/GH5P52.ini
+++ b/Data/Sys/GameSettings/GR8.ini
@@ -1,4 +1,4 @@
-# GH5P52 - Over The Hedge
+# GR8D69, GR8E69, GR8F69, GR8J69, GR8P69 - Medal of Honor Rising Sun
 [Core]
 # Values set here will override the main dolphin settings.
 [EmuState]
diff --git a/Data/Sys/GameSettings/GR8D69.ini b/Data/Sys/GameSettings/GR8D69.ini
deleted file mode 100644
index ef77bb6a52..0000000000
--- a/Data/Sys/GameSettings/GR8D69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GR8D69 - Medal of Honor Rising Sun
-[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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GR8E69.ini b/Data/Sys/GameSettings/GR8E69.ini
deleted file mode 100644
index deab146a70..0000000000
--- a/Data/Sys/GameSettings/GR8E69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GR8E69 - Medal of Honor Rising Sun
-[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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GR8F69.ini b/Data/Sys/GameSettings/GR8F69.ini
deleted file mode 100644
index bae3e7bdf6..0000000000
--- a/Data/Sys/GameSettings/GR8F69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GR8F69 - Medal of Honor Rising Sun
-[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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GR8J69.ini b/Data/Sys/GameSettings/GR8J69.ini
deleted file mode 100644
index 8df229141b..0000000000
--- a/Data/Sys/GameSettings/GR8J69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GR8J69 - Medal of Honor Rising Sun
-[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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GR8P69.ini b/Data/Sys/GameSettings/GR8P69.ini
deleted file mode 100644
index 842f6c13ef..0000000000
--- a/Data/Sys/GameSettings/GR8P69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GR8P69 - Medal of Honor Rising Sun
-[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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GDSP78.ini b/Data/Sys/GameSettings/GRB.ini
similarity index 93%
rename from Data/Sys/GameSettings/GDSP78.ini
rename to Data/Sys/GameSettings/GRB.ini
index 1305670fa3..d5846d8a96 100644
--- a/Data/Sys/GameSettings/GDSP78.ini
+++ b/Data/Sys/GameSettings/GRB.ini
@@ -1,4 +1,4 @@
-# GDSP78 - Dark Summit
+# GRBE6S, GRBP6S - Robotech: Battlecry
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GRBP6S.ini b/Data/Sys/GameSettings/GRBP6S.ini
deleted file mode 100644
index aa2904c6e5..0000000000
--- a/Data/Sys/GameSettings/GRBP6S.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GRBP6S - Robotech: Battlecry
-
-[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
-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/GRJP69.ini b/Data/Sys/GameSettings/GRJ.ini
similarity index 91%
rename from Data/Sys/GameSettings/GRJP69.ini
rename to Data/Sys/GameSettings/GRJ.ini
index 9a8be97e5f..9355f98fcc 100644
--- a/Data/Sys/GameSettings/GRJP69.ini
+++ b/Data/Sys/GameSettings/GRJ.ini
@@ -1,4 +1,4 @@
-# GRJP69 - R:RACING EVOLUTION
+# GRJEAF, GRJJAF, GRJP69 - R:RACING EVOLUTION
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GRJEAF.ini b/Data/Sys/GameSettings/GRJEAF.ini
deleted file mode 100644
index 674377262d..0000000000
--- a/Data/Sys/GameSettings/GRJEAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# GRJEAF - R:RACING EVOLUTION
-
-[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 = Efb to Ram is needed for video cutscenes.
-
-[OnLoad]
-# Add memory patches 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]
-EFBCopyEnable = True
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GRJJAF.ini b/Data/Sys/GameSettings/GRJJAF.ini
deleted file mode 100644
index 21a7854283..0000000000
--- a/Data/Sys/GameSettings/GRJJAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# GRJJAF - R:Racing Evolution: Life in the Fast Lane
-
-[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 = Efb to Ram is needed for video cutscenes.
-
-[OnLoad]
-# Add memory patches 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]
-EFBCopyEnable = True
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GRKE41.ini b/Data/Sys/GameSettings/GRK.ini
similarity index 95%
rename from Data/Sys/GameSettings/GRKE41.ini
rename to Data/Sys/GameSettings/GRK.ini
index 8bd0cc95a3..96e35cd198 100644
--- a/Data/Sys/GameSettings/GRKE41.ini
+++ b/Data/Sys/GameSettings/GRK.ini
@@ -1,4 +1,4 @@
-# GRKE41 - Rocky
+# GRKE41, GRKP7G - Rocky
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GRKP7G.ini b/Data/Sys/GameSettings/GRKP7G.ini
deleted file mode 100644
index 512f479e37..0000000000
--- a/Data/Sys/GameSettings/GRKP7G.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GRKP7G - Rocky
-
-[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 = Use Directx11 plugin (r6651)
-
-[OnLoad]
-# Add memory patches 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/G3DE6L.ini b/Data/Sys/GameSettings/GRV.ini
similarity index 91%
rename from Data/Sys/GameSettings/G3DE6L.ini
rename to Data/Sys/GameSettings/GRV.ini
index 724b3dcee9..c0a0bbb77d 100644
--- a/Data/Sys/GameSettings/G3DE6L.ini
+++ b/Data/Sys/GameSettings/GRV.ini
@@ -1,4 +1,4 @@
-# G3DE6L - Carmen Sandiego
+# GRVEA4, GRVJA4 - RAVE MASTER
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GRVJA4.ini b/Data/Sys/GameSettings/GRVJA4.ini
deleted file mode 100644
index f776bec5f3..0000000000
--- a/Data/Sys/GameSettings/GRVJA4.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GRVJA4 - GROOVE ADVENTURE RAVE
-
-[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/GS2D78.ini b/Data/Sys/GameSettings/GS2.ini
similarity index 92%
rename from Data/Sys/GameSettings/GS2D78.ini
rename to Data/Sys/GameSettings/GS2.ini
index 0a61f6ab17..e30987ca90 100644
--- a/Data/Sys/GameSettings/GS2D78.ini
+++ b/Data/Sys/GameSettings/GS2.ini
@@ -1,4 +1,4 @@
-# GS2D78 - Summoner 2
+# GS2D78, GS2E78, GS2F78, GS2P78 - Summoner 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GS2E78.ini b/Data/Sys/GameSettings/GS2E78.ini
deleted file mode 100644
index 92e103e91c..0000000000
--- a/Data/Sys/GameSettings/GS2E78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GS2E78 - Summoner 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 = 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
-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/GS2F78.ini b/Data/Sys/GameSettings/GS2F78.ini
deleted file mode 100644
index 12482fd18e..0000000000
--- a/Data/Sys/GameSettings/GS2F78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GS2F78 - Summoner 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 = 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
-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/GS2P78.ini b/Data/Sys/GameSettings/GS2P78.ini
deleted file mode 100644
index 90e9fe37bb..0000000000
--- a/Data/Sys/GameSettings/GS2P78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GS2P78 - Summoner 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 = 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
-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/GSAE01.ini b/Data/Sys/GameSettings/GSA.ini
similarity index 92%
rename from Data/Sys/GameSettings/GSAE01.ini
rename to Data/Sys/GameSettings/GSA.ini
index 03e40f9c66..713c307609 100644
--- a/Data/Sys/GameSettings/GSAE01.ini
+++ b/Data/Sys/GameSettings/GSA.ini
@@ -1,4 +1,4 @@
-# GSAE01 - Star Fox Adventures
+# GSAE01, GSAJ01 - Star Fox Adventures
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GSAJ01.ini b/Data/Sys/GameSettings/GSAJ01.ini
deleted file mode 100644
index aa18628e45..0000000000
--- a/Data/Sys/GameSettings/GSAJ01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GSAJ01 - Star Fox Adventures
-
-[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 = Use dx11 plugin(r6477)
-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/GSMD52.ini b/Data/Sys/GameSettings/GSM.ini
similarity index 90%
rename from Data/Sys/GameSettings/GSMD52.ini
rename to Data/Sys/GameSettings/GSM.ini
index fdb0f1b11f..3b317e640b 100644
--- a/Data/Sys/GameSettings/GSMD52.ini
+++ b/Data/Sys/GameSettings/GSM.ini
@@ -1,4 +1,4 @@
-# GSMD52 - Spider-Man
+# GSMD52, GSME52, GSMF52, GSMP52 - Spider-Man
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GSME52.ini b/Data/Sys/GameSettings/GSME52.ini
deleted file mode 100644
index e18c7012fc..0000000000
--- a/Data/Sys/GameSettings/GSME52.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# GSME52 - Spider-Man
-
-[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]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GSMF52.ini b/Data/Sys/GameSettings/GSMF52.ini
deleted file mode 100644
index b0646ebc3e..0000000000
--- a/Data/Sys/GameSettings/GSMF52.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# GSMF52 - Spider-Man
-
-[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]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GSMP52.ini b/Data/Sys/GameSettings/GSMP52.ini
deleted file mode 100644
index 74ae88803f..0000000000
--- a/Data/Sys/GameSettings/GSMP52.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# GSMP52 - Spider-Man
-
-[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]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GSOE8P.ini b/Data/Sys/GameSettings/GSO.ini
similarity index 92%
rename from Data/Sys/GameSettings/GSOE8P.ini
rename to Data/Sys/GameSettings/GSO.ini
index bbcfd76fbf..52dbb9a836 100644
--- a/Data/Sys/GameSettings/GSOE8P.ini
+++ b/Data/Sys/GameSettings/GSO.ini
@@ -1,4 +1,4 @@
-# GSOE8P - Sonic Mega Collection (US)
+# GSOE8P, GSOP8P - Sonic Mega Collection (US)
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GSOP8P.ini b/Data/Sys/GameSettings/GSOP8P.ini
deleted file mode 100644
index 92aa4c0e02..0000000000
--- a/Data/Sys/GameSettings/GSOP8P.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GSOP8P - Sonic Mega Collection (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
-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/GSQE78.ini b/Data/Sys/GameSettings/GSQ.ini
similarity index 85%
rename from Data/Sys/GameSettings/GSQE78.ini
rename to Data/Sys/GameSettings/GSQ.ini
index 69c2a8722c..aead7ac81e 100644
--- a/Data/Sys/GameSettings/GSQE78.ini
+++ b/Data/Sys/GameSettings/GSQ.ini
@@ -1,4 +1,4 @@
-# GSQE78 - SpongeBob SquarePants ROTFD
+# GSQE78, GSQP78 - SpongeBob SquarePants ROTFD
 [Core]
 [EmuState]
 EmulationStateId = 3
diff --git a/Data/Sys/GameSettings/GSQP78.ini b/Data/Sys/GameSettings/GSQP78.ini
deleted file mode 100644
index cc74ae9793..0000000000
--- a/Data/Sys/GameSettings/GSQP78.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GSQP78 - SpongeBob SquarePants ROTFD
-[Core]
-[EmuState]
-EmulationStateId = 3
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GSWD64.ini b/Data/Sys/GameSettings/GSW.ini
similarity index 86%
rename from Data/Sys/GameSettings/GSWD64.ini
rename to Data/Sys/GameSettings/GSW.ini
index eaec751808..05bda152ac 100644
--- a/Data/Sys/GameSettings/GSWD64.ini
+++ b/Data/Sys/GameSettings/GSW.ini
@@ -1,4 +1,4 @@
-# GSWD64 - Star Wars: Rogue Leader
+# GSWD64, GSWE64, GSWF64, GSWI64, GSWJ64, GSWP64, GSWS64 - Star Wars: Rogue Leader
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GSWE64.ini b/Data/Sys/GameSettings/GSWE64.ini
deleted file mode 100644
index 8adfd5be0b..0000000000
--- a/Data/Sys/GameSettings/GSWE64.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GSWE64 - Star Wars: Rogue Leader
-
-[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 = Needs LLE audio for proper sound.
-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]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/GSWF64.ini b/Data/Sys/GameSettings/GSWF64.ini
deleted file mode 100644
index b44f7a4f28..0000000000
--- a/Data/Sys/GameSettings/GSWF64.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GSWF64 - Star Wars: Rogue Leader
-
-[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 = Needs LLE audio for proper sound.
-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]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/GSWI64.ini b/Data/Sys/GameSettings/GSWI64.ini
deleted file mode 100644
index 7cb58750b8..0000000000
--- a/Data/Sys/GameSettings/GSWI64.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GSWI64 - Star Wars: Rogue Leader
-
-[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 = Needs LLE audio for proper sound.
-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]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/GSWJ64.ini b/Data/Sys/GameSettings/GSWJ64.ini
deleted file mode 100644
index 970bd13981..0000000000
--- a/Data/Sys/GameSettings/GSWJ64.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GSWJ64 - Star Wars: Rogue Leader
-
-[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 = Needs LLE audio for proper sound.
-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]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/GSWP64.ini b/Data/Sys/GameSettings/GSWP64.ini
deleted file mode 100644
index de78f111d3..0000000000
--- a/Data/Sys/GameSettings/GSWP64.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GSWP64 - Star Wars: Rogue Leader
-
-[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 = Needs LLE audio for proper sound.
-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]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/GSWS64.ini b/Data/Sys/GameSettings/GSWS64.ini
deleted file mode 100644
index 73af58e406..0000000000
--- a/Data/Sys/GameSettings/GSWS64.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GSWS64 - Star Wars: Rogue Leader
-
-[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 = Needs LLE audio for proper sound.
-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]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/GT3J52.ini b/Data/Sys/GameSettings/GT3.ini
similarity index 92%
rename from Data/Sys/GameSettings/GT3J52.ini
rename to Data/Sys/GameSettings/GT3.ini
index ecb1071e73..c8305d27df 100644
--- a/Data/Sys/GameSettings/GT3J52.ini
+++ b/Data/Sys/GameSettings/GT3.ini
@@ -1,4 +1,4 @@
-# GT3J52 - Tony Hawk's Pro Skater 3
+# GT3D52, GT3E52, GT3J52 - Tony Hawk's Pro Skater 3
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GT3D52.ini b/Data/Sys/GameSettings/GT3D52.ini
deleted file mode 100644
index fb3f545f8a..0000000000
--- a/Data/Sys/GameSettings/GT3D52.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GT3D52 - Tony Hawk's Pro Skater 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 = Needs real xfb for videos to display and Efb to RAM for proper shadows.
-
-[OnLoad]
-# Add memory patches 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
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GT3E52.ini b/Data/Sys/GameSettings/GT3E52.ini
deleted file mode 100644
index 3b927ea6ca..0000000000
--- a/Data/Sys/GameSettings/GT3E52.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GT3E52 - Tony Hawk's Pro Skater 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 = Needs real xfb for videos to display and Efb to RAM for proper shadows.
-
-[OnLoad]
-# Add memory patches 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
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GT4E52.ini b/Data/Sys/GameSettings/GT4.ini
similarity index 87%
rename from Data/Sys/GameSettings/GT4E52.ini
rename to Data/Sys/GameSettings/GT4.ini
index 4c3d483359..11fa3d20cb 100644
--- a/Data/Sys/GameSettings/GT4E52.ini
+++ b/Data/Sys/GameSettings/GT4.ini
@@ -1,4 +1,4 @@
-# GT4E52 - Tony Hawk's Pro Skater 4
+# GT4D52, GT4E52, GT4F52, GT4P52 - Tony Hawk's Pro Skater 4
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GT4F52.ini b/Data/Sys/GameSettings/GT4F52.ini
deleted file mode 100644
index c30970c8f6..0000000000
--- a/Data/Sys/GameSettings/GT4F52.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GT4F52 - Tony Hawk's Pro Skater 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_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GT4P52.ini b/Data/Sys/GameSettings/GT4P52.ini
deleted file mode 100644
index 2a7e1958f1..0000000000
--- a/Data/Sys/GameSettings/GT4P52.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GT4P52 - Tony Hawk's Pro Skater 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_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GT7X41.ini b/Data/Sys/GameSettings/GT7.ini
similarity index 89%
rename from Data/Sys/GameSettings/GT7X41.ini
rename to Data/Sys/GameSettings/GT7.ini
index 4781899664..5072784417 100644
--- a/Data/Sys/GameSettings/GT7X41.ini
+++ b/Data/Sys/GameSettings/GT7.ini
@@ -1,4 +1,4 @@
-# GT7X41 - TOM CLANCY'S SPLINTER CELL PANDORA TOMORROW
+# GT7E41, GT7P41, GT7X41 - TOM CLANCY'S SPLINTER CELL PANDORA TOMORROW
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GT7E41.ini b/Data/Sys/GameSettings/GT7E41.ini
deleted file mode 100644
index 674fa51983..0000000000
--- a/Data/Sys/GameSettings/GT7E41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GT7E41 - TOM CLANCY'S SPLINTER CELL PANDORA 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 = 3
-EmulationIssues = Videos need real XFB to show up and loading screens show garbage.
-
-[OnLoad]
-# Add memory patches 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
-
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GT7P41.ini b/Data/Sys/GameSettings/GT7P41.ini
deleted file mode 100644
index 08133cd37b..0000000000
--- a/Data/Sys/GameSettings/GT7P41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GT7P41 - TOM CLANCY'S SPLINTER CELL PANDORA 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 = 3
-EmulationIssues = Videos need real XFB to show up and loading screens show garbage.
-
-[OnLoad]
-# Add memory patches 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
-
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GTK.ini b/Data/Sys/GameSettings/GTK.ini
new file mode 100644
index 0000000000..70d271352d
--- /dev/null
+++ b/Data/Sys/GameSettings/GTK.ini
@@ -0,0 +1,30 @@
+# GTKE51, GTKP51 - Turok: Evolution
+
+[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/GTKE51.ini b/Data/Sys/GameSettings/GTKE51.ini
deleted file mode 100644
index 20bfb411cd..0000000000
--- a/Data/Sys/GameSettings/GTKE51.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GTKE51 - Turok: Evolution
-
-[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/GTKP51.ini b/Data/Sys/GameSettings/GTKP51.ini
deleted file mode 100644
index 1e84af4a7a..0000000000
--- a/Data/Sys/GameSettings/GTKP51.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GTKP51 - Turok: Evolution
-
-[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/GTLE52.ini b/Data/Sys/GameSettings/GTL.ini
similarity index 92%
rename from Data/Sys/GameSettings/GTLE52.ini
rename to Data/Sys/GameSettings/GTL.ini
index 028754f007..3aaa4f9045 100644
--- a/Data/Sys/GameSettings/GTLE52.ini
+++ b/Data/Sys/GameSettings/GTL.ini
@@ -1,4 +1,4 @@
-# GTLE52 - True Crime
+# GTLE52, GTLP52, GTLX52 - True Crime
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GTLP52.ini b/Data/Sys/GameSettings/GTLP52.ini
deleted file mode 100644
index 555b08aceb..0000000000
--- a/Data/Sys/GameSettings/GTLP52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GTLP52 - True Crime
-
-[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/GTLX52.ini b/Data/Sys/GameSettings/GTLX52.ini
deleted file mode 100644
index 1d276f5a5e..0000000000
--- a/Data/Sys/GameSettings/GTLX52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GTLX52 - True Crime
-
-[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/GTRE78.ini b/Data/Sys/GameSettings/GTR.ini
similarity index 89%
rename from Data/Sys/GameSettings/GTRE78.ini
rename to Data/Sys/GameSettings/GTR.ini
index e9b1cb2591..bfbaa47e63 100644
--- a/Data/Sys/GameSettings/GTRE78.ini
+++ b/Data/Sys/GameSettings/GTR.ini
@@ -1,4 +1,4 @@
-# GTRE78 - Tetris Worlds
+# GTRE78, GTRP78 - Tetris Worlds
 [Core]
 [EmuState]
 EmulationStateId = 4
diff --git a/Data/Sys/GameSettings/GTRP78.ini b/Data/Sys/GameSettings/GTRP78.ini
deleted file mode 100644
index 1722710375..0000000000
--- a/Data/Sys/GameSettings/GTRP78.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GTRP78 - Tetris Worlds
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-[Gecko]
diff --git a/Data/Sys/GameSettings/GTWE70.ini b/Data/Sys/GameSettings/GTW.ini
similarity index 94%
rename from Data/Sys/GameSettings/GTWE70.ini
rename to Data/Sys/GameSettings/GTW.ini
index 30f0b4503d..47b6ce59d8 100644
--- a/Data/Sys/GameSettings/GTWE70.ini
+++ b/Data/Sys/GameSettings/GTW.ini
@@ -1,4 +1,4 @@
-# GTWE70 - Taz Wanted
+# GTWE70, GTWP70 - Taz Wanted
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GTWP70.ini b/Data/Sys/GameSettings/GTWP70.ini
deleted file mode 100644
index df15619aad..0000000000
--- a/Data/Sys/GameSettings/GTWP70.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GTWP70 - Taz Wanted
-
-[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/GBIP08.ini b/Data/Sys/GameSettings/GTY.ini
similarity index 91%
rename from Data/Sys/GameSettings/GBIP08.ini
rename to Data/Sys/GameSettings/GTY.ini
index d5b9d2a683..1bb5a66c1f 100644
--- a/Data/Sys/GameSettings/GBIP08.ini
+++ b/Data/Sys/GameSettings/GTY.ini
@@ -1,4 +1,4 @@
-# GBIP08 - Resident Evil
+# GTYE69, GTYP69 - TY the Tasmanian Tiger
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -25,5 +25,3 @@ PH_ExtraParam = 0
 PH_ZNear =
 PH_ZFar =
 
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/GTYE69.ini b/Data/Sys/GameSettings/GTYE69.ini
deleted file mode 100644
index ec3e2e3155..0000000000
--- a/Data/Sys/GameSettings/GTYE69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GTYE69 - TY the Tasmanian Tiger
-
-[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/GTYP69.ini b/Data/Sys/GameSettings/GTYP69.ini
deleted file mode 100644
index 641b5a47d9..0000000000
--- a/Data/Sys/GameSettings/GTYP69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GTYP69 - TY the Tasmanian Tiger
-
-[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/GTZE41.ini b/Data/Sys/GameSettings/GTZ.ini
similarity index 93%
rename from Data/Sys/GameSettings/GTZE41.ini
rename to Data/Sys/GameSettings/GTZ.ini
index 27c823c9eb..a57c6c9367 100644
--- a/Data/Sys/GameSettings/GTZE41.ini
+++ b/Data/Sys/GameSettings/GTZ.ini
@@ -1,4 +1,4 @@
-# GTZE41 - DISNEY'S TARZAN
+# GTZE41, GTZP41 - DISNEY'S TARZAN
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GTZP41.ini b/Data/Sys/GameSettings/GTZP41.ini
deleted file mode 100644
index f4076e1607..0000000000
--- a/Data/Sys/GameSettings/GTZP41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GTZP41 - DISNEY'S TARZAN
-
-[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/GUB.ini b/Data/Sys/GameSettings/GUB.ini
new file mode 100644
index 0000000000..8018da2d7b
--- /dev/null
+++ b/Data/Sys/GameSettings/GUB.ini
@@ -0,0 +1,30 @@
+# GUBE69, GUBP69 - The Urbz 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 =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GUBE69.ini b/Data/Sys/GameSettings/GUBE69.ini
deleted file mode 100644
index 7ce1f69ad0..0000000000
--- a/Data/Sys/GameSettings/GUBE69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GUBE69 - The Urbz 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 =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GUBP69.ini b/Data/Sys/GameSettings/GUBP69.ini
deleted file mode 100644
index 6ad90bccb6..0000000000
--- a/Data/Sys/GameSettings/GUBP69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GUBP69 - The Urbz 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 =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GUME52.ini b/Data/Sys/GameSettings/GUM.ini
similarity index 95%
rename from Data/Sys/GameSettings/GUME52.ini
rename to Data/Sys/GameSettings/GUM.ini
index 978ca77ac1..4956cacd52 100644
--- a/Data/Sys/GameSettings/GUME52.ini
+++ b/Data/Sys/GameSettings/GUM.ini
@@ -1,4 +1,4 @@
-# GUME52 - Gun
+# GUME52, GUMP52 - Gun
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GUMP52.ini b/Data/Sys/GameSettings/GUMP52.ini
deleted file mode 100644
index 67e0bdd3d3..0000000000
--- a/Data/Sys/GameSettings/GUMP52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GUMP52 - Gun
-
-[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 = 
-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/GUPP8P.ini b/Data/Sys/GameSettings/GUP.ini
similarity index 91%
rename from Data/Sys/GameSettings/GUPP8P.ini
rename to Data/Sys/GameSettings/GUP.ini
index ad786bb97d..61ddebe3d1 100644
--- a/Data/Sys/GameSettings/GUPP8P.ini
+++ b/Data/Sys/GameSettings/GUP.ini
@@ -1,4 +1,4 @@
-# GUPP8P - SHADOW THE HEDGEHOG
+# GUPE8P, GUPJ8P, GUPP8P - SHADOW THE HEDGEHOG
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GUPE8P.ini b/Data/Sys/GameSettings/GUPE8P.ini
deleted file mode 100644
index 042dc50d6f..0000000000
--- a/Data/Sys/GameSettings/GUPE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# GUPE8P - SHADOW THE HEDGEHOG
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 2P mode is playable only with EFB to RAM.
-
-[OnLoad]
-# Add memory patches 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]
-EFBCopyEnable = True
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GUPJ8P.ini b/Data/Sys/GameSettings/GUPJ8P.ini
deleted file mode 100644
index aaa4944a53..0000000000
--- a/Data/Sys/GameSettings/GUPJ8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# GUPJ8P - SHADOW THE HEDGEHOG
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 2P mode is playable only with EFB to RAM.
-
-[OnLoad]
-# Add memory patches 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]
-EFBCopyEnable = True
-EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GUTD52.ini b/Data/Sys/GameSettings/GUT.ini
similarity index 87%
rename from Data/Sys/GameSettings/GUTD52.ini
rename to Data/Sys/GameSettings/GUT.ini
index 3f5dedc272..f52348b0af 100644
--- a/Data/Sys/GameSettings/GUTD52.ini
+++ b/Data/Sys/GameSettings/GUT.ini
@@ -1,4 +1,4 @@
-# GUTD52 - Ultimate Spider-Man
+# GUTD52, GUTF52, GUTI52, GUTJC0, GUTP52, GUTS52 - Ultimate Spider-Man
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GUTF52.ini b/Data/Sys/GameSettings/GUTF52.ini
deleted file mode 100644
index 360b02e515..0000000000
--- a/Data/Sys/GameSettings/GUTF52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GUTF52 - 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/GUTI52.ini b/Data/Sys/GameSettings/GUTI52.ini
deleted file mode 100644
index db1860968f..0000000000
--- a/Data/Sys/GameSettings/GUTI52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GUTI52 - 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/GUTJC0.ini b/Data/Sys/GameSettings/GUTJC0.ini
deleted file mode 100644
index c863b6928a..0000000000
--- a/Data/Sys/GameSettings/GUTJC0.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GUTJC0 - 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/GUTP52.ini b/Data/Sys/GameSettings/GUTP52.ini
deleted file mode 100644
index b4fc80fc0f..0000000000
--- a/Data/Sys/GameSettings/GUTP52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GUTP52 - 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/GUTS52.ini b/Data/Sys/GameSettings/GUTS52.ini
deleted file mode 100644
index ee3bcdab69..0000000000
--- a/Data/Sys/GameSettings/GUTS52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GUTS52 - 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/GUZE41.ini b/Data/Sys/GameSettings/GUZ.ini
similarity index 92%
rename from Data/Sys/GameSettings/GUZE41.ini
rename to Data/Sys/GameSettings/GUZ.ini
index 924360c11a..f5634142cf 100644
--- a/Data/Sys/GameSettings/GUZE41.ini
+++ b/Data/Sys/GameSettings/GUZ.ini
@@ -1,4 +1,4 @@
-# GUZE41 - Batman: Rise of Sin Tzu
+# GUZE41, GUZP41 - Batman: Rise of Sin Tzu
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GUZP41.ini b/Data/Sys/GameSettings/GUZP41.ini
deleted file mode 100644
index 8124787eb6..0000000000
--- a/Data/Sys/GameSettings/GUZP41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GUZP41 - Batman: Rise of Sin Tzu
-
-[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]
-UseRealXFB = True
-UseXFB = True
-
diff --git a/Data/Sys/GameSettings/GBWE64.ini b/Data/Sys/GameSettings/GVC.ini
similarity index 91%
rename from Data/Sys/GameSettings/GBWE64.ini
rename to Data/Sys/GameSettings/GVC.ini
index 38dcf080dc..289c8c4505 100644
--- a/Data/Sys/GameSettings/GBWE64.ini
+++ b/Data/Sys/GameSettings/GVC.ini
@@ -1,4 +1,4 @@
-# GBWE64 - Star Wars Bounty Hunter
+# GVCE08, GVCP08 - Viewtiful Joe Red Hot Rumble
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GVCE08.ini b/Data/Sys/GameSettings/GVCE08.ini
deleted file mode 100644
index 9c3d05e574..0000000000
--- a/Data/Sys/GameSettings/GVCE08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GVCE08 - Viewtiful Joe Red Hot Rumble
-
-[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/GVCP08.ini b/Data/Sys/GameSettings/GVCP08.ini
deleted file mode 100644
index a19c671f61..0000000000
--- a/Data/Sys/GameSettings/GVCP08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GVCP08 - Viewtiful Joe Red Hot Rumble
-
-[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/GBWD64.ini b/Data/Sys/GameSettings/GVJ.ini
similarity index 92%
rename from Data/Sys/GameSettings/GBWD64.ini
rename to Data/Sys/GameSettings/GVJ.ini
index f24a73d462..237ce571c8 100644
--- a/Data/Sys/GameSettings/GBWD64.ini
+++ b/Data/Sys/GameSettings/GVJ.ini
@@ -1,4 +1,4 @@
-# GBWD64 - Star Wars Bounty Hunter
+# GVJE08, GVJJ08, GVJP08 - VIEWTIFUL JOE
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GVJJ08.ini b/Data/Sys/GameSettings/GVJJ08.ini
deleted file mode 100644
index 983f0009ba..0000000000
--- a/Data/Sys/GameSettings/GVJJ08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GVJJ08 - VIEWTIFUL JOE
-
-[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/GVJP08.ini b/Data/Sys/GameSettings/GVJP08.ini
deleted file mode 100644
index 8d7898fe90..0000000000
--- a/Data/Sys/GameSettings/GVJP08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GVJP08 - VIEWTIFUL JOE
-
-[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/GVLD69.ini b/Data/Sys/GameSettings/GVL.ini
similarity index 87%
rename from Data/Sys/GameSettings/GVLD69.ini
rename to Data/Sys/GameSettings/GVL.ini
index 459a85240d..c2c2bbba5b 100644
--- a/Data/Sys/GameSettings/GVLD69.ini
+++ b/Data/Sys/GameSettings/GVL.ini
@@ -1,4 +1,4 @@
-# GVLD69 - Marvel Nemesis: Rise of the Imperfects
+# GVLD69, GVLE69, GVLF69, GVLE69 - Marvel Nemesis: Rise of the Imperfects
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GVLE69.ini b/Data/Sys/GameSettings/GVLE69.ini
deleted file mode 100644
index 0e9ae15231..0000000000
--- a/Data/Sys/GameSettings/GVLE69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GVLE69 - Marvel Nemesis: Rise of the Imperfects
-
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Idleskipping if enabled will cause speed issues.
-
-[OnLoad]
-# Add memory patches 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/GVLF69.ini b/Data/Sys/GameSettings/GVLF69.ini
deleted file mode 100644
index ae97ff9c8b..0000000000
--- a/Data/Sys/GameSettings/GVLF69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GVLF69 - Marvel Nemesis: Rise of the Imperfects
-
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Idleskipping if enabled will cause speed issues.
-
-[OnLoad]
-# Add memory patches 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/GVLP69.ini b/Data/Sys/GameSettings/GVLP69.ini
deleted file mode 100644
index 0e9ae15231..0000000000
--- a/Data/Sys/GameSettings/GVLP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GVLE69 - Marvel Nemesis: Rise of the Imperfects
-
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Idleskipping if enabled will cause speed issues.
-
-[OnLoad]
-# Add memory patches 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/GVJE08.ini b/Data/Sys/GameSettings/GVO.ini
similarity index 95%
rename from Data/Sys/GameSettings/GVJE08.ini
rename to Data/Sys/GameSettings/GVO.ini
index b89ac5f959..282f3d8278 100644
--- a/Data/Sys/GameSettings/GVJE08.ini
+++ b/Data/Sys/GameSettings/GVO.ini
@@ -1,4 +1,4 @@
-# GVJE08 - VIEWTIFUL JOE
+# GVOE69, GVOP69 - BIONICLE
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -28,4 +28,3 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GVOE69.ini b/Data/Sys/GameSettings/GVOE69.ini
deleted file mode 100644
index 096704a700..0000000000
--- a/Data/Sys/GameSettings/GVOE69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GVOE69 - BIONICLE
-
-[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/GVOP69.ini b/Data/Sys/GameSettings/GVOP69.ini
deleted file mode 100644
index d8ae26fd11..0000000000
--- a/Data/Sys/GameSettings/GVOP69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GVOP69 - BIONICLE
-
-[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/GGPE02.ini b/Data/Sys/GameSettings/GVS.ini
similarity index 89%
rename from Data/Sys/GameSettings/GGPE02.ini
rename to Data/Sys/GameSettings/GVS.ini
index efb6e74996..096735e89d 100644
--- a/Data/Sys/GameSettings/GGPE02.ini
+++ b/Data/Sys/GameSettings/GVS.ini
@@ -1,4 +1,4 @@
-# GGPE02 - Mario Kart GP 2
+# GVS46E, GVS46J - Virtua Striker 4 Ver. 2006 (Export)
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GVS46E.ini b/Data/Sys/GameSettings/GVS46E.ini
deleted file mode 100644
index 36cdea121d..0000000000
--- a/Data/Sys/GameSettings/GVS46E.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# GVS46E - Virtua Striker 4 Ver. 2006 (Export)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues = Crashes on startup (Triforce game)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-# Add memory patches to be applied every frame here.
-
-[Video_Settings]
-
diff --git a/Data/Sys/GameSettings/GVS46J.ini b/Data/Sys/GameSettings/GVS46J.ini
deleted file mode 100644
index f45ffca594..0000000000
--- a/Data/Sys/GameSettings/GVS46J.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# GVS46J - Virtua Striker 4 Ver. 2006 (Japan)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues = Crashes on startup (Triforce game)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-# Add memory patches to be applied every frame here.
-
-[Video_Settings]
-
diff --git a/Data/Sys/GameSettings/GW2E78.ini b/Data/Sys/GameSettings/GW2.ini
similarity index 92%
rename from Data/Sys/GameSettings/GW2E78.ini
rename to Data/Sys/GameSettings/GW2.ini
index 69950343ad..5af9f4324f 100644
--- a/Data/Sys/GameSettings/GW2E78.ini
+++ b/Data/Sys/GameSettings/GW2.ini
@@ -1,4 +1,4 @@
-# GW2E78 - WWE Day of Reckoning 2
+# GW2E78, GW2P78 - WWE Day of Reckoning 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/G4OE69.ini b/Data/Sys/GameSettings/GW3.ini
similarity index 90%
rename from Data/Sys/GameSettings/G4OE69.ini
rename to Data/Sys/GameSettings/GW3.ini
index ac040041b4..171e0c06a6 100644
--- a/Data/Sys/GameSettings/G4OE69.ini
+++ b/Data/Sys/GameSettings/GW3.ini
@@ -1,4 +1,4 @@
-# G4OE69 - The Sims 2 Pets
+# GW3E78, GW3P78 - WRESTLE MANIA X8
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GW3E78.ini b/Data/Sys/GameSettings/GW3E78.ini
deleted file mode 100644
index 26a355a201..0000000000
--- a/Data/Sys/GameSettings/GW3E78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GW3E78 - WRESTLE MANIA X8
-
-[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/GW3P78.ini b/Data/Sys/GameSettings/GW3P78.ini
deleted file mode 100644
index c273f4a88d..0000000000
--- a/Data/Sys/GameSettings/GW3P78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GW3P78 - WRESTLE MANIA X8
-
-[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/GW5.ini b/Data/Sys/GameSettings/GW5.ini
new file mode 100644
index 0000000000..24cb91521d
--- /dev/null
+++ b/Data/Sys/GameSettings/GW5.ini
@@ -0,0 +1,19 @@
+# GW5D69, GW5E69, GW5F69, GW5P69 - Need For Speed Carbon
+
+[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/GW5D69.ini b/Data/Sys/GameSettings/GW5D69.ini
deleted file mode 100644
index 95b6829beb..0000000000
--- a/Data/Sys/GameSettings/GW5D69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GW5D69 - Need For Speed Carbon
-
-[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/GW5E69.ini b/Data/Sys/GameSettings/GW5E69.ini
deleted file mode 100644
index 9f0faa8d44..0000000000
--- a/Data/Sys/GameSettings/GW5E69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GW5E69 - Need For Speed Carbon
-
-[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/GW5F69.ini b/Data/Sys/GameSettings/GW5F69.ini
deleted file mode 100644
index 5ba5314b17..0000000000
--- a/Data/Sys/GameSettings/GW5F69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GW5F69 - Need For Speed Carbon
-
-[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/GW5P69.ini b/Data/Sys/GameSettings/GW5P69.ini
deleted file mode 100644
index 49ad483ca7..0000000000
--- a/Data/Sys/GameSettings/GW5P69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GW5P69 - Need For Speed Carbon
-
-[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/GW7D69.ini b/Data/Sys/GameSettings/GW7.ini
similarity index 88%
rename from Data/Sys/GameSettings/GW7D69.ini
rename to Data/Sys/GameSettings/GW7.ini
index 3e5d642254..c52369ced2 100644
--- a/Data/Sys/GameSettings/GW7D69.ini
+++ b/Data/Sys/GameSettings/GW7.ini
@@ -1,4 +1,4 @@
-# GW7D69 - 007: Agent Under Fire (tm)
+# GW7D69, GW7E69, GW7F69, GW7P69 - 007: Agent Under Fire (tm)
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GW7E69.ini b/Data/Sys/GameSettings/GW7E69.ini
deleted file mode 100644
index 4984afe3b1..0000000000
--- a/Data/Sys/GameSettings/GW7E69.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# GW7E69 - 007: Agent Under Fire (tm)
-
-[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 video cutscenes 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_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GW7P69.ini b/Data/Sys/GameSettings/GW7P69.ini
deleted file mode 100644
index 1b649999f7..0000000000
--- a/Data/Sys/GameSettings/GW7P69.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# GW7P69 - 007: Agent Under Fire (tm)
-
-[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 video cutscenes 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_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GWA.ini b/Data/Sys/GameSettings/GWA.ini
new file mode 100644
index 0000000000..001bcb3a9d
--- /dev/null
+++ b/Data/Sys/GameSettings/GWA.ini
@@ -0,0 +1,27 @@
+# GWAE8P, GWAF8P, GWAP8P - Spartan: Total 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]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GWAE8P.ini b/Data/Sys/GameSettings/GWAE8P.ini
deleted file mode 100644
index 3849803f6a..0000000000
--- a/Data/Sys/GameSettings/GWAE8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GWAE8P - Spartan: Total 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]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GWAF8P.ini b/Data/Sys/GameSettings/GWAF8P.ini
deleted file mode 100644
index 0540f6a10e..0000000000
--- a/Data/Sys/GameSettings/GWAF8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GWAF8P - Spartan: Total 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]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GWAP8P.ini b/Data/Sys/GameSettings/GWAP8P.ini
deleted file mode 100644
index 534bd98e3e..0000000000
--- a/Data/Sys/GameSettings/GWAP8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GWAP8P - Spartan : Total  Warrior (TM)
-
-[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/GWEE51.ini b/Data/Sys/GameSettings/GWE.ini
similarity index 92%
rename from Data/Sys/GameSettings/GWEE51.ini
rename to Data/Sys/GameSettings/GWE.ini
index 718d310be3..564a4debcf 100644
--- a/Data/Sys/GameSettings/GWEE51.ini
+++ b/Data/Sys/GameSettings/GWE.ini
@@ -1,4 +1,4 @@
-# GWEE51 - 18 Wheeler
+# GWEE51, GWEJB0 - 18 Wheeler
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GWEJB0.ini b/Data/Sys/GameSettings/GWEJB0.ini
deleted file mode 100644
index b0e1804572..0000000000
--- a/Data/Sys/GameSettings/GWEJB0.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GWEJB0 - 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
-EmulationIssues = Bad 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/GW2P78.ini b/Data/Sys/GameSettings/GWP.ini
similarity index 91%
rename from Data/Sys/GameSettings/GW2P78.ini
rename to Data/Sys/GameSettings/GWP.ini
index 4face38d65..e1683c3377 100644
--- a/Data/Sys/GameSettings/GW2P78.ini
+++ b/Data/Sys/GameSettings/GWP.ini
@@ -1,4 +1,4 @@
-# GW2P78 - WWE Day of Reckoning 2
+# GWPE78, GWPJG2, GWPP78 - WWE Day of Reckoning
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GWPE78.ini b/Data/Sys/GameSettings/GWPE78.ini
deleted file mode 100644
index 97fcb54d0f..0000000000
--- a/Data/Sys/GameSettings/GWPE78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GWPE78 - WWE Day of Reckoning
-
-[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 created fighters.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GWPJG2.ini b/Data/Sys/GameSettings/GWPJG2.ini
deleted file mode 100644
index 766630e610..0000000000
--- a/Data/Sys/GameSettings/GWPJG2.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GWPJG2 - WWE Day of Reckoning
-
-[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 created fighters.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GWPP78.ini b/Data/Sys/GameSettings/GWPP78.ini
deleted file mode 100644
index 9e437ee488..0000000000
--- a/Data/Sys/GameSettings/GWPP78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GWPP78 - WWE Day of Reckoning
-
-[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 created fighters.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GWTEA4.ini b/Data/Sys/GameSettings/GWT.ini
similarity index 92%
rename from Data/Sys/GameSettings/GWTEA4.ini
rename to Data/Sys/GameSettings/GWT.ini
index 6dc4be578a..c10dbb4600 100644
--- a/Data/Sys/GameSettings/GWTEA4.ini
+++ b/Data/Sys/GameSettings/GWT.ini
@@ -1,4 +1,4 @@
-# GWTEA4 - WTA Tour Tennis
+# GWTEA4, GWTJA4, GWTPA4 - WTA Tour Tennis
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GWTJA4.ini b/Data/Sys/GameSettings/GWTJA4.ini
deleted file mode 100644
index e1bdab1746..0000000000
--- a/Data/Sys/GameSettings/GWTJA4.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# GWTJA4 - WTA Tour Tennis
-
-[Core]
-# Values set here will override the main dolphin settings.
-# This game does not work properly with large memorycards, use a 251 block card
-# see http://www.nintendo.com/consumer/memorycard1019.jsp
-MemoryCard251 = 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/GWTPA4.ini b/Data/Sys/GameSettings/GWTPA4.ini
deleted file mode 100644
index 4378a747ac..0000000000
--- a/Data/Sys/GameSettings/GWTPA4.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# GWTPA4 - WTA Tour Tennis
-
-[Core]
-# Values set here will override the main dolphin settings.
-# This game does not work properly with large memorycards, use a 251 block card
-# see http://www.nintendo.com/consumer/memorycard1019.jsp
-MemoryCard251 = 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/GWV.ini b/Data/Sys/GameSettings/GWV.ini
new file mode 100644
index 0000000000..5eb568ff90
--- /dev/null
+++ b/Data/Sys/GameSettings/GWV.ini
@@ -0,0 +1,22 @@
+# GWVE52, GWVP52, GWVX52 - X2 Wolverine'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]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GWVE52.ini b/Data/Sys/GameSettings/GWVE52.ini
deleted file mode 100644
index 6ab1de75c2..0000000000
--- a/Data/Sys/GameSettings/GWVE52.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GWVE52 - X2 Wolverine'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]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GWVP52.ini b/Data/Sys/GameSettings/GWVP52.ini
deleted file mode 100644
index 85160215a4..0000000000
--- a/Data/Sys/GameSettings/GWVP52.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GWVP52 - X-Men 2 Wolverine'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]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GWVX52.ini b/Data/Sys/GameSettings/GWVX52.ini
deleted file mode 100644
index d4cf06d71b..0000000000
--- a/Data/Sys/GameSettings/GWVX52.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GWVX52 - X-Men 2 Wolverine'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]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GX2.ini b/Data/Sys/GameSettings/GX2.ini
new file mode 100644
index 0000000000..8bc5b25cfc
--- /dev/null
+++ b/Data/Sys/GameSettings/GX2.ini
@@ -0,0 +1,27 @@
+# GX2E52, GX2P52 - X-Men Legends 2: Rise of Apocalypse
+
+[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/GX2E52.ini b/Data/Sys/GameSettings/GX2E52.ini
deleted file mode 100644
index bf6eebd5ca..0000000000
--- a/Data/Sys/GameSettings/GX2E52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GX2E52 - X-Men Legends 2: Rise of Apocalypse
-
-[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/GX2P52.ini b/Data/Sys/GameSettings/GX2P52.ini
deleted file mode 100644
index b613875d1a..0000000000
--- a/Data/Sys/GameSettings/GX2P52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GX2P52 - X-Men Legends 2: Rise of Apocalypse
-
-[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/GX3E41.ini b/Data/Sys/GameSettings/GX3.ini
similarity index 94%
rename from Data/Sys/GameSettings/GX3E41.ini
rename to Data/Sys/GameSettings/GX3.ini
index 615e2d11f7..eeed5f01a2 100644
--- a/Data/Sys/GameSettings/GX3E41.ini
+++ b/Data/Sys/GameSettings/GX3.ini
@@ -1,4 +1,4 @@
-# GX3E41 - XIII
+# GX3E41, GX3P41, GX3X41 - XIII
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GX3P41.ini b/Data/Sys/GameSettings/GX3P41.ini
deleted file mode 100644
index 2c60325a74..0000000000
--- a/Data/Sys/GameSettings/GX3P41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GX3P41 - XIII
-
-[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 = Needs real xfb for the 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/GX3X41.ini b/Data/Sys/GameSettings/GX3X41.ini
deleted file mode 100644
index 62e14a4d3d..0000000000
--- a/Data/Sys/GameSettings/GX3X41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GX3X41 - XIII
-
-[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 = Needs real xfb for the 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/GXBE69.ini b/Data/Sys/GameSettings/GXB.ini
similarity index 95%
rename from Data/Sys/GameSettings/GXBE69.ini
rename to Data/Sys/GameSettings/GXB.ini
index d89da30020..500cc02719 100644
--- a/Data/Sys/GameSettings/GXBE69.ini
+++ b/Data/Sys/GameSettings/GXB.ini
@@ -1,4 +1,4 @@
-# GXBE69 - SSX3
+# GXBE69, GXBP69 - SSX3
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GXBP69.ini b/Data/Sys/GameSettings/GXBP69.ini
deleted file mode 100644
index 9fb46faf56..0000000000
--- a/Data/Sys/GameSettings/GXBP69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GXBP69 - SSX3
-
-[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_Hacks]
-EFBAccessEnable = False
-
diff --git a/Data/Sys/GameSettings/G4FF69.ini b/Data/Sys/GameSettings/GXC.ini
similarity index 93%
rename from Data/Sys/GameSettings/G4FF69.ini
rename to Data/Sys/GameSettings/GXC.ini
index e79a5ad30a..c375e3ed7d 100644
--- a/Data/Sys/GameSettings/G4FF69.ini
+++ b/Data/Sys/GameSettings/GXC.ini
@@ -1,4 +1,4 @@
-# G4FF69 - FIFA 07
+# GXCE01, GXCJ01 - CustomRobo
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GXCE01.ini b/Data/Sys/GameSettings/GXCE01.ini
deleted file mode 100644
index 1b40bda6d7..0000000000
--- a/Data/Sys/GameSettings/GXCE01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GXCE01 - CustomRobo
-
-[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/GXCJ01.ini b/Data/Sys/GameSettings/GXCJ01.ini
deleted file mode 100644
index c251b14f5e..0000000000
--- a/Data/Sys/GameSettings/GXCJ01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GXCJ01 - CustomRobo
-
-[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/G6FD69.ini b/Data/Sys/GameSettings/GXE.ini
similarity index 91%
rename from Data/Sys/GameSettings/G6FD69.ini
rename to Data/Sys/GameSettings/GXE.ini
index 2bc535b9c5..de059b8922 100644
--- a/Data/Sys/GameSettings/G6FD69.ini
+++ b/Data/Sys/GameSettings/GXE.ini
@@ -1,12 +1,12 @@
-# G6FD69 - 2006 FIFA World Cup
+# GXEE8P, GXEJ8P - 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.
-EmulationStateId = 4
 EmulationIssues =
+EmulationStateId = 4
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GXEE8P.ini b/Data/Sys/GameSettings/GXEE8P.ini
deleted file mode 100644
index 5dd1dcacc6..0000000000
--- a/Data/Sys/GameSettings/GXEE8P.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GXEE8P - 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/GXEJ8P.ini b/Data/Sys/GameSettings/GXEJ8P.ini
deleted file mode 100644
index 64b2d648e0..0000000000
--- a/Data/Sys/GameSettings/GXEJ8P.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GXEJ8P - 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/GXF.ini b/Data/Sys/GameSettings/GXF.ini
new file mode 100644
index 0000000000..4d38dc18ba
--- /dev/null
+++ b/Data/Sys/GameSettings/GXF.ini
@@ -0,0 +1,27 @@
+# GXFE69, GXFF69, GXFP69 - FIFA Soccer 2004
+
+[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/GXFE69.ini b/Data/Sys/GameSettings/GXFE69.ini
deleted file mode 100644
index 05ee9244b5..0000000000
--- a/Data/Sys/GameSettings/GXFE69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GXFE69 - FIFA Soccer 2004
-
-[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/GXFF69.ini b/Data/Sys/GameSettings/GXFF69.ini
deleted file mode 100644
index 22757183de..0000000000
--- a/Data/Sys/GameSettings/GXFF69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GXFF69 - FIFA Soccer 2004
-
-[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/GXFP69.ini b/Data/Sys/GameSettings/GXFP69.ini
deleted file mode 100644
index 52c754caa4..0000000000
--- a/Data/Sys/GameSettings/GXFP69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GXFP69 - FIFA Soccer 2004
-
-[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/GRBE6S.ini b/Data/Sys/GameSettings/GXM.ini
similarity index 91%
rename from Data/Sys/GameSettings/GRBE6S.ini
rename to Data/Sys/GameSettings/GXM.ini
index 047f42a1e9..ed8fdb3c7f 100644
--- a/Data/Sys/GameSettings/GRBE6S.ini
+++ b/Data/Sys/GameSettings/GXM.ini
@@ -1,4 +1,4 @@
-# GRBE6S - Robotech: Battlecry
+# GXME52, GXMF52, GXMP52 - X-Men Next Dimension
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -28,4 +28,3 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GXME52.ini b/Data/Sys/GameSettings/GXME52.ini
deleted file mode 100644
index bdeecff7be..0000000000
--- a/Data/Sys/GameSettings/GXME52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GXME52 - X-Men Next 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 = 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
-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/GXMF52.ini b/Data/Sys/GameSettings/GXMF52.ini
deleted file mode 100644
index 1a5e3185b5..0000000000
--- a/Data/Sys/GameSettings/GXMF52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GXMF52 - X-Men Next 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 = 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
-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/GXMP52.ini b/Data/Sys/GameSettings/GXMP52.ini
deleted file mode 100644
index c7b4b99e36..0000000000
--- a/Data/Sys/GameSettings/GXMP52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GXMP52 - X-Men Next 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 = 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
-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/GXO.ini b/Data/Sys/GameSettings/GXO.ini
new file mode 100644
index 0000000000..6cdeca8091
--- /dev/null
+++ b/Data/Sys/GameSettings/GXO.ini
@@ -0,0 +1,27 @@
+# GXOE69, GXOX69 - SSX On 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
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GXOE69.ini b/Data/Sys/GameSettings/GXOE69.ini
deleted file mode 100644
index aafdf12016..0000000000
--- a/Data/Sys/GameSettings/GXOE69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GXOE69 - SSX On 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
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GXOX69.ini b/Data/Sys/GameSettings/GXOX69.ini
deleted file mode 100644
index 89529f8769..0000000000
--- a/Data/Sys/GameSettings/GXOX69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GXOX69 - SSX On 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
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GXSE8P.ini b/Data/Sys/GameSettings/GXS.ini
similarity index 92%
rename from Data/Sys/GameSettings/GXSE8P.ini
rename to Data/Sys/GameSettings/GXS.ini
index a0397cb21b..8dc7f856d0 100644
--- a/Data/Sys/GameSettings/GXSE8P.ini
+++ b/Data/Sys/GameSettings/GXS.ini
@@ -1,4 +1,4 @@
-# GXSE8P - Sonic Adventure DX
+# GXSE8P, GXSP6W - Sonic Adventure DX
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GXSP6W.ini b/Data/Sys/GameSettings/GXSP6W.ini
deleted file mode 100644
index b83ab2b1d2..0000000000
--- a/Data/Sys/GameSettings/GXSP6W.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# GXSP6W - Sonic Adventure DX
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = True
-
-[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_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GXXE01.ini b/Data/Sys/GameSettings/GXX.ini
similarity index 95%
rename from Data/Sys/GameSettings/GXXE01.ini
rename to Data/Sys/GameSettings/GXX.ini
index 258d114a9b..8b2fca9606 100644
--- a/Data/Sys/GameSettings/GXXE01.ini
+++ b/Data/Sys/GameSettings/GXX.ini
@@ -1,4 +1,4 @@
-# GXXE01 - POKeMON XD
+# GXXE01, GXXP01 - POKeMON XD
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GXXP01.ini b/Data/Sys/GameSettings/GXXP01.ini
deleted file mode 100644
index 047d81dca2..0000000000
--- a/Data/Sys/GameSettings/GXXP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GXXP01 - POKeMON XD
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = HLE music fades in and out. If EFB scale is not integral, 1x, 2x or 3x serious texture glitches occur
-
-[OnLoad]
-# Add memory patches 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
-
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/GYQE01.ini b/Data/Sys/GameSettings/GYQ.ini
similarity index 92%
rename from Data/Sys/GameSettings/GYQE01.ini
rename to Data/Sys/GameSettings/GYQ.ini
index f2eeac9819..af3f0e3f2d 100644
--- a/Data/Sys/GameSettings/GYQE01.ini
+++ b/Data/Sys/GameSettings/GYQ.ini
@@ -1,4 +1,4 @@
-# GYQE01 - Mario Superstar Baseball
+# GYQE01, GYQJ01, GYQP01 - Mario Superstar Baseball
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GYQJ01.ini b/Data/Sys/GameSettings/GYQJ01.ini
deleted file mode 100644
index 2241ed691f..0000000000
--- a/Data/Sys/GameSettings/GYQJ01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GYQJ01 - Super Mario Stadium for JP
-
-[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 = Player's shadow needs efb to ram and texture cache set to safe to appear properly.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GYQP01.ini b/Data/Sys/GameSettings/GYQP01.ini
deleted file mode 100644
index bbbe591b09..0000000000
--- a/Data/Sys/GameSettings/GYQP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GYQP01 - MARIO SUPERSTAR 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 = Player's shadow needs efb to ram and texture cache set to safe to appear properly.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GYTE69.ini b/Data/Sys/GameSettings/GYT.ini
similarity index 91%
rename from Data/Sys/GameSettings/GYTE69.ini
rename to Data/Sys/GameSettings/GYT.ini
index 16c744a9a2..c0730dbb28 100644
--- a/Data/Sys/GameSettings/GYTE69.ini
+++ b/Data/Sys/GameSettings/GYT.ini
@@ -1,4 +1,4 @@
-# GYTE69 - TY the Tasmanian Tiger 2
+# GYTE69, GYTP69 - TY the Tasmanian Tiger 2
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GYTP69.ini b/Data/Sys/GameSettings/GYTP69.ini
deleted file mode 100644
index 52ccd66a5a..0000000000
--- a/Data/Sys/GameSettings/GYTP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GYTP69 - TY the Tasmanian Tiger 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]
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/GYW.ini b/Data/Sys/GameSettings/GYW.ini
new file mode 100644
index 0000000000..1c1b7abb85
--- /dev/null
+++ b/Data/Sys/GameSettings/GYW.ini
@@ -0,0 +1,27 @@
+# GYWD41, GYWEE9, GYWP41 - Harvest Moon: A Wonderful Life
+
+[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/GYWD41.ini b/Data/Sys/GameSettings/GYWD41.ini
deleted file mode 100644
index b6d17de522..0000000000
--- a/Data/Sys/GameSettings/GYWD41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GYWD41 - Harvest Moon: A Wonderful Life
-
-[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/GYWEE9.ini b/Data/Sys/GameSettings/GYWEE9.ini
deleted file mode 100644
index 7c1b84e345..0000000000
--- a/Data/Sys/GameSettings/GYWEE9.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GYWEE9 - Harvest Moon: A Wonderful Life
-
-[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/GYWP41.ini b/Data/Sys/GameSettings/GYWP41.ini
deleted file mode 100644
index f95bd02d48..0000000000
--- a/Data/Sys/GameSettings/GYWP41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GYWP41 - Harvest Moon: A Wonderful Life
-
-[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/GZDE70.ini b/Data/Sys/GameSettings/GZD.ini
similarity index 86%
rename from Data/Sys/GameSettings/GZDE70.ini
rename to Data/Sys/GameSettings/GZD.ini
index 5fa7e9a21f..dcdec75c24 100644
--- a/Data/Sys/GameSettings/GZDE70.ini
+++ b/Data/Sys/GameSettings/GZD.ini
@@ -1,4 +1,4 @@
-# GZDE70 - Godzilla
+# GZDE70, GZDJ70, GZDP70 - Godzilla
 [Core]
 [EmuState]
 EmulationStateId = 4
diff --git a/Data/Sys/GameSettings/GZDJ70.ini b/Data/Sys/GameSettings/GZDJ70.ini
deleted file mode 100644
index c2498a8930..0000000000
--- a/Data/Sys/GameSettings/GZDJ70.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# GZDJ70 - Godzilla: Kaijuu Dairantou
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/GZDP70.ini b/Data/Sys/GameSettings/GZDP70.ini
deleted file mode 100644
index 4408fe60f4..0000000000
--- a/Data/Sys/GameSettings/GZDP70.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# GZDP70 - Godzilla
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/GZWE01.ini b/Data/Sys/GameSettings/GZW.ini
similarity index 90%
rename from Data/Sys/GameSettings/GZWE01.ini
rename to Data/Sys/GameSettings/GZW.ini
index 0d31a025e0..8313ce34aa 100644
--- a/Data/Sys/GameSettings/GZWE01.ini
+++ b/Data/Sys/GameSettings/GZW.ini
@@ -1,4 +1,4 @@
-# GZWE01 - WarioWare, Inc. Mega Party Games
+# GZWE01, GZWJ01, GZWP01 - WarioWare, Inc. Mega Party Games
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GZWJ01.ini b/Data/Sys/GameSettings/GZWJ01.ini
deleted file mode 100644
index e63f702a24..0000000000
--- a/Data/Sys/GameSettings/GZWJ01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GZWJ01 - Atumare!! made in wario
-
-[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
-EFBScale = -1
-
-[Video_Enhancements]
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/GZWP01.ini b/Data/Sys/GameSettings/GZWP01.ini
deleted file mode 100644
index e632a5f83f..0000000000
--- a/Data/Sys/GameSettings/GZWP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GZWP01 - WarioWare, Inc. Mega Party Games
-
-[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
-EFBScale = -1
-
-[Video_Enhancements]
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/HABA01.ini b/Data/Sys/GameSettings/HAB.ini
similarity index 92%
rename from Data/Sys/GameSettings/HABA01.ini
rename to Data/Sys/GameSettings/HAB.ini
index 3bf145aaab..1ee9ac0455 100644
--- a/Data/Sys/GameSettings/HABA01.ini
+++ b/Data/Sys/GameSettings/HAB.ini
@@ -1,4 +1,4 @@
-# HABA01 - Wii Shop Channel
+# HABA01, HABK01 - Wii Shop Channel
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/HABK01.ini b/Data/Sys/GameSettings/HABK01.ini
deleted file mode 100644
index 11f33e524f..0000000000
--- a/Data/Sys/GameSettings/HABK01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# HABK01 - Wii Shop Channel
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Will not connect. Uses WiiConnect24.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-
-[Video_Settings]
diff --git a/Data/Sys/GameSettings/LABE8P.ini b/Data/Sys/GameSettings/LAB.ini
similarity index 93%
rename from Data/Sys/GameSettings/LABE8P.ini
rename to Data/Sys/GameSettings/LAB.ini
index ca7648884a..2e99ed8a89 100644
--- a/Data/Sys/GameSettings/LABE8P.ini
+++ b/Data/Sys/GameSettings/LAB.ini
@@ -1,4 +1,4 @@
-# LABE8P - Fantasy Zone
+# LABE8P, LABP8P - Fantasy Zone
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/LAC.ini b/Data/Sys/GameSettings/LAC.ini
new file mode 100644
index 0000000000..a8bda8658a
--- /dev/null
+++ b/Data/Sys/GameSettings/LAC.ini
@@ -0,0 +1,24 @@
+# LACE8P, LACJ8P, LACP8P - Wonder Boy
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LACP8P.ini b/Data/Sys/GameSettings/LACP8P.ini
deleted file mode 100644
index 8bf72dbd73..0000000000
--- a/Data/Sys/GameSettings/LACP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# LACP8P - Wonder Boy
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAD.ini b/Data/Sys/GameSettings/LAD.ini
new file mode 100644
index 0000000000..9f7b0a036d
--- /dev/null
+++ b/Data/Sys/GameSettings/LAD.ini
@@ -0,0 +1,26 @@
+# LADE8P, LADJ8P, LADP8P - Phantasy Star
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LACE8P.ini b/Data/Sys/GameSettings/LAE.ini
similarity index 93%
rename from Data/Sys/GameSettings/LACE8P.ini
rename to Data/Sys/GameSettings/LAE.ini
index 8c8e6a1938..941d7db076 100644
--- a/Data/Sys/GameSettings/LACE8P.ini
+++ b/Data/Sys/GameSettings/LAE.ini
@@ -1,4 +1,4 @@
-# LACE8P - Wonder Boy
+# LAEE8P, LAEP8P - Alex Kidd
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/LAEE8P.ini b/Data/Sys/GameSettings/LAEE8P.ini
deleted file mode 100644
index 5c900b0795..0000000000
--- a/Data/Sys/GameSettings/LAEE8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# LAEE8P - 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.
-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/LAEP8P.ini b/Data/Sys/GameSettings/LAEP8P.ini
deleted file mode 100644
index 886ad57673..0000000000
--- a/Data/Sys/GameSettings/LAEP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# LAEP8P - 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.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LADJ8P.ini b/Data/Sys/GameSettings/LAF.ini
similarity index 93%
rename from Data/Sys/GameSettings/LADJ8P.ini
rename to Data/Sys/GameSettings/LAF.ini
index ef3df84597..18b094d90b 100644
--- a/Data/Sys/GameSettings/LADJ8P.ini
+++ b/Data/Sys/GameSettings/LAF.ini
@@ -1,4 +1,4 @@
-# LADJ8P - Phantasy Star
+# LAFN8P, LAFP8P - Secret Command
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/LAFP8P.ini b/Data/Sys/GameSettings/LAFP8P.ini
deleted file mode 100644
index deddd7fec4..0000000000
--- a/Data/Sys/GameSettings/LAFP8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# LAFP8P - Secret Command
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAG.ini b/Data/Sys/GameSettings/LAG.ini
new file mode 100644
index 0000000000..6a1a4c38dd
--- /dev/null
+++ b/Data/Sys/GameSettings/LAG.ini
@@ -0,0 +1,24 @@
+# LAGE8P, LAGJ8P, LAGP8P - Sonic The Hedgehog
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAGE8P.ini b/Data/Sys/GameSettings/LAGE8P.ini
deleted file mode 100644
index ef514b717d..0000000000
--- a/Data/Sys/GameSettings/LAGE8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# LAGE8P - Sonic The Hedgehog
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAGJ8P.ini b/Data/Sys/GameSettings/LAGJ8P.ini
deleted file mode 100644
index bb93f7c9f8..0000000000
--- a/Data/Sys/GameSettings/LAGJ8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# LAGJ8P - Sonic The Hedgehog
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAGP8P.ini b/Data/Sys/GameSettings/LAGP8P.ini
deleted file mode 100644
index 87909a98cb..0000000000
--- a/Data/Sys/GameSettings/LAGP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# LAGP8P - Sonic The Hedgehog
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LABP8P.ini b/Data/Sys/GameSettings/LAI.ini
similarity index 93%
rename from Data/Sys/GameSettings/LABP8P.ini
rename to Data/Sys/GameSettings/LAI.ini
index e3b6ad3c36..277ad84804 100644
--- a/Data/Sys/GameSettings/LABP8P.ini
+++ b/Data/Sys/GameSettings/LAI.ini
@@ -1,4 +1,4 @@
-# LABP8P - Fantasy Zone
+# LAIE8P, LAIP8P - Enduro Racer
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/LAIE8P.ini b/Data/Sys/GameSettings/LAIE8P.ini
deleted file mode 100644
index e529d100da..0000000000
--- a/Data/Sys/GameSettings/LAIE8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# LAIE8P - Enduro Racer
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAIP8P.ini b/Data/Sys/GameSettings/LAIP8P.ini
deleted file mode 100644
index c40ad3a37d..0000000000
--- a/Data/Sys/GameSettings/LAIP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# LAIP8P - Enduro Racer
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAJ.ini b/Data/Sys/GameSettings/LAJ.ini
new file mode 100644
index 0000000000..d276f93fc8
--- /dev/null
+++ b/Data/Sys/GameSettings/LAJ.ini
@@ -0,0 +1,24 @@
+# LAJE8P, LAJJ8P, LAJP8P - Sonic The Hedgehog 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
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAJE8P.ini b/Data/Sys/GameSettings/LAJE8P.ini
deleted file mode 100644
index 6f338547b3..0000000000
--- a/Data/Sys/GameSettings/LAJE8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# LAJE8P - Sonic The Hedgehog 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAJJ8P.ini b/Data/Sys/GameSettings/LAJJ8P.ini
deleted file mode 100644
index 3576c06efd..0000000000
--- a/Data/Sys/GameSettings/LAJJ8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# LAJJ8P - Sonic The Hedgehog 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAJP8P.ini b/Data/Sys/GameSettings/LAJP8P.ini
deleted file mode 100644
index 5b317ce94b..0000000000
--- a/Data/Sys/GameSettings/LAJP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# LAJP8P - Sonic The Hedgehog 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAK.ini b/Data/Sys/GameSettings/LAK.ini
new file mode 100644
index 0000000000..64fd220094
--- /dev/null
+++ b/Data/Sys/GameSettings/LAK.ini
@@ -0,0 +1,26 @@
+# LAKE8P, LAKJ8P, LAKP8P - Wonder Boy II
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAKE8P.ini b/Data/Sys/GameSettings/LAKE8P.ini
deleted file mode 100644
index 269bc74d8c..0000000000
--- a/Data/Sys/GameSettings/LAKE8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# LAKE8P - Wonder Boy II
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAKJ8P.ini b/Data/Sys/GameSettings/LAKJ8P.ini
deleted file mode 100644
index bb9de331ed..0000000000
--- a/Data/Sys/GameSettings/LAKJ8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# LAKJ8P - Wonder Boy II
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAKP8P.ini b/Data/Sys/GameSettings/LAKP8P.ini
deleted file mode 100644
index 388f5bd7f4..0000000000
--- a/Data/Sys/GameSettings/LAKP8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# LAKP8P - Wonder Boy II
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAL.ini b/Data/Sys/GameSettings/LAL.ini
new file mode 100644
index 0000000000..952dd53de7
--- /dev/null
+++ b/Data/Sys/GameSettings/LAL.ini
@@ -0,0 +1,26 @@
+# LALE8P, LALP8P - Fantasy Zone II
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LALE8P.ini b/Data/Sys/GameSettings/LALE8P.ini
deleted file mode 100644
index 78af618c9f..0000000000
--- a/Data/Sys/GameSettings/LALE8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# LALE8P - Fantasy Zone II
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LALP8P.ini b/Data/Sys/GameSettings/LALP8P.ini
deleted file mode 100644
index 2078109a46..0000000000
--- a/Data/Sys/GameSettings/LALP8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# LALP8P - Fantasy Zone II
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAM.ini b/Data/Sys/GameSettings/LAM.ini
new file mode 100644
index 0000000000..9dc2ca61b8
--- /dev/null
+++ b/Data/Sys/GameSettings/LAM.ini
@@ -0,0 +1,24 @@
+# LAME8P, LAMJ8P, LAMP8P - Sonic Chaos
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAME8P.ini b/Data/Sys/GameSettings/LAME8P.ini
deleted file mode 100644
index b0f6d1abd0..0000000000
--- a/Data/Sys/GameSettings/LAME8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# LAME8P - Sonic Chaos
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAMJ8P.ini b/Data/Sys/GameSettings/LAMJ8P.ini
deleted file mode 100644
index 60bcbede0a..0000000000
--- a/Data/Sys/GameSettings/LAMJ8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# LAMJ8P - Sonic Chaos
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAMP8P.ini b/Data/Sys/GameSettings/LAMP8P.ini
deleted file mode 100644
index 57798d3ca7..0000000000
--- a/Data/Sys/GameSettings/LAMP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# LAMP8P - Sonic Chaos
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LADP8P.ini b/Data/Sys/GameSettings/LAN.ini
similarity index 93%
rename from Data/Sys/GameSettings/LADP8P.ini
rename to Data/Sys/GameSettings/LAN.ini
index aec72411fa..1155e5dc4d 100644
--- a/Data/Sys/GameSettings/LADP8P.ini
+++ b/Data/Sys/GameSettings/LAN.ini
@@ -1,4 +1,4 @@
-# LADP8P - Phantasy Star
+# LANE8P, LANP8P - Alex Kidd: TLS
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/LANE8P.ini b/Data/Sys/GameSettings/LANE8P.ini
deleted file mode 100644
index 75612b6a0d..0000000000
--- a/Data/Sys/GameSettings/LANE8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# LANE8P - Alex Kidd: TLS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LANP8P.ini b/Data/Sys/GameSettings/LANP8P.ini
deleted file mode 100644
index 231dcfddbb..0000000000
--- a/Data/Sys/GameSettings/LANP8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# LANP8P - Alex Kidd: TLS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LADE8P.ini b/Data/Sys/GameSettings/LAO.ini
similarity index 94%
rename from Data/Sys/GameSettings/LADE8P.ini
rename to Data/Sys/GameSettings/LAO.ini
index c2c43a0268..031906b1fd 100644
--- a/Data/Sys/GameSettings/LADE8P.ini
+++ b/Data/Sys/GameSettings/LAO.ini
@@ -1,4 +1,4 @@
-# LADE8P - Phantasy Star
+# LAOE8P, LAOP8P - R-TYPE
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/LAOE8P.ini b/Data/Sys/GameSettings/LAOE8P.ini
deleted file mode 100644
index d9d3c8bd52..0000000000
--- a/Data/Sys/GameSettings/LAOE8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# LAOE8P - 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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAOP8P.ini b/Data/Sys/GameSettings/LAOP8P.ini
deleted file mode 100644
index 3e9d952ac9..0000000000
--- a/Data/Sys/GameSettings/LAOP8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# LAOP8P - 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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAFN8P.ini b/Data/Sys/GameSettings/LAP.ini
similarity index 93%
rename from Data/Sys/GameSettings/LAFN8P.ini
rename to Data/Sys/GameSettings/LAP.ini
index d002ac5025..9780600801 100644
--- a/Data/Sys/GameSettings/LAFN8P.ini
+++ b/Data/Sys/GameSettings/LAP.ini
@@ -1,4 +1,4 @@
-# LAFN8P - Secret Command
+# LAPE8P, LAPP8P - Wonder Boy III
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/LAPE8P.ini b/Data/Sys/GameSettings/LAPE8P.ini
deleted file mode 100644
index 0957cc3b4a..0000000000
--- a/Data/Sys/GameSettings/LAPE8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# LAPE8P - Wonder Boy III
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAPP8P.ini b/Data/Sys/GameSettings/LAPP8P.ini
deleted file mode 100644
index b5fd51e1c8..0000000000
--- a/Data/Sys/GameSettings/LAPP8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# LAPP8P - Wonder Boy III
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAQ.ini b/Data/Sys/GameSettings/LAQ.ini
new file mode 100644
index 0000000000..f2b8773aaf
--- /dev/null
+++ b/Data/Sys/GameSettings/LAQ.ini
@@ -0,0 +1,26 @@
+# LAQE8P, LAQP8P - Alex Kidd in SW
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAQE8P.ini b/Data/Sys/GameSettings/LAQE8P.ini
deleted file mode 100644
index dcd3af54c3..0000000000
--- a/Data/Sys/GameSettings/LAQE8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# LAQE8P - Alex Kidd in SW
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAQP8P.ini b/Data/Sys/GameSettings/LAQP8P.ini
deleted file mode 100644
index ea1604aacd..0000000000
--- a/Data/Sys/GameSettings/LAQP8P.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# LAQP8P - Alex Kidd in SW
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/MA6.ini b/Data/Sys/GameSettings/MA6.ini
new file mode 100644
index 0000000000..7da5ebefe7
--- /dev/null
+++ b/Data/Sys/GameSettings/MA6.ini
@@ -0,0 +1,25 @@
+# MA6E8P, MA6P8P - Streets of Rage 2
+
+[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/MA8.ini b/Data/Sys/GameSettings/MA8.ini
new file mode 100644
index 0000000000..f2c4e996ae
--- /dev/null
+++ b/Data/Sys/GameSettings/MA8.ini
@@ -0,0 +1,25 @@
+# MA8E8P, MA8P8P - Ecco the Dolphin 2
+
+[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/MAD.ini b/Data/Sys/GameSettings/MAD.ini
new file mode 100644
index 0000000000..1c836cad49
--- /dev/null
+++ b/Data/Sys/GameSettings/MAD.ini
@@ -0,0 +1,24 @@
+# MADE8P, MADP8P - Ecco the Dolphin
+
+[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/MADE8P.ini b/Data/Sys/GameSettings/MADE8P.ini
deleted file mode 100644
index afe96106ff..0000000000
--- a/Data/Sys/GameSettings/MADE8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MADE8P - Ecco the Dolphin
-
-[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/MADP8P.ini b/Data/Sys/GameSettings/MADP8P.ini
deleted file mode 100644
index 766a4c8940..0000000000
--- a/Data/Sys/GameSettings/MADP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MADP8P - Ecco the Dolphin
-
-[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/LACJ8P.ini b/Data/Sys/GameSettings/MAE.ini
similarity index 93%
rename from Data/Sys/GameSettings/LACJ8P.ini
rename to Data/Sys/GameSettings/MAE.ini
index 69a25822ca..d8df7536c7 100644
--- a/Data/Sys/GameSettings/LACJ8P.ini
+++ b/Data/Sys/GameSettings/MAE.ini
@@ -1,12 +1,12 @@
-# LACJ8P - Wonder Boy
+# MAEE8P, MAEP8P - Golden Axe
 
 [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/MAEE8P.ini b/Data/Sys/GameSettings/MAEE8P.ini
deleted file mode 100644
index 28a3422733..0000000000
--- a/Data/Sys/GameSettings/MAEE8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MAEE8P - Golden Axe
-
-[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/MAEP8P.ini b/Data/Sys/GameSettings/MAEP8P.ini
deleted file mode 100644
index 71d43d6f7a..0000000000
--- a/Data/Sys/GameSettings/MAEP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MAEP8P - Golden Axe
-
-[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/MAL.ini b/Data/Sys/GameSettings/MAL.ini
new file mode 100644
index 0000000000..d728ec28e4
--- /dev/null
+++ b/Data/Sys/GameSettings/MAL.ini
@@ -0,0 +1,24 @@
+# MALE8P, MALP8P - Bonanza Bros.
+
+[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/MALE8P.ini b/Data/Sys/GameSettings/MALE8P.ini
deleted file mode 100644
index ec805b6bd2..0000000000
--- a/Data/Sys/GameSettings/MALE8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MALE8P - Bonanza Bros.
-
-[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/MALP8P.ini b/Data/Sys/GameSettings/MALP8P.ini
deleted file mode 100644
index 0a78f5d313..0000000000
--- a/Data/Sys/GameSettings/MALP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MALP8P - Bonanza Bros.
-
-[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/MAM.ini b/Data/Sys/GameSettings/MAM.ini
new file mode 100644
index 0000000000..f1c1069d82
--- /dev/null
+++ b/Data/Sys/GameSettings/MAM.ini
@@ -0,0 +1,25 @@
+# MAME8P, MAMP8P - Sword of Vermilion
+
+[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/MAME8P.ini b/Data/Sys/GameSettings/MAME8P.ini
deleted file mode 100644
index a774bd45bc..0000000000
--- a/Data/Sys/GameSettings/MAME8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAME8P - Sword of Vermilion
-
-[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/MAMP8P.ini b/Data/Sys/GameSettings/MAMP8P.ini
deleted file mode 100644
index a595c39ec5..0000000000
--- a/Data/Sys/GameSettings/MAMP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAMP8P - Sword of Vermilion
-
-[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/MA6P8P.ini b/Data/Sys/GameSettings/MAN.ini
similarity index 93%
rename from Data/Sys/GameSettings/MA6P8P.ini
rename to Data/Sys/GameSettings/MAN.ini
index 0a29098332..e1e7f90882 100644
--- a/Data/Sys/GameSettings/MA6P8P.ini
+++ b/Data/Sys/GameSettings/MAN.ini
@@ -1,4 +1,4 @@
-# MA6P8P - Streets of Rage 2
+# MANE8P, MANP8P - Gain Ground
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/MANE8P.ini b/Data/Sys/GameSettings/MANE8P.ini
deleted file mode 100644
index 94e3a1993e..0000000000
--- a/Data/Sys/GameSettings/MANE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MANE8P - Gain Ground
-
-[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/MANP8P.ini b/Data/Sys/GameSettings/MANP8P.ini
deleted file mode 100644
index 6b19c33172..0000000000
--- a/Data/Sys/GameSettings/MANP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MANP8P - Gain Ground
-
-[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/MAO.ini b/Data/Sys/GameSettings/MAO.ini
new file mode 100644
index 0000000000..d51deebf0d
--- /dev/null
+++ b/Data/Sys/GameSettings/MAO.ini
@@ -0,0 +1,25 @@
+# MAOE8P, MAOP8P - Bio-Hazard Battle
+
+[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/MAOE8P.ini b/Data/Sys/GameSettings/MAOE8P.ini
deleted file mode 100644
index c580f48c23..0000000000
--- a/Data/Sys/GameSettings/MAOE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAOE8P - Bio-Hazard Battle
-
-[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/MAOP8P.ini b/Data/Sys/GameSettings/MAOP8P.ini
deleted file mode 100644
index ca0139d785..0000000000
--- a/Data/Sys/GameSettings/MAOP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAOP8P - Bio-Hazard Battle
-
-[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/MAQ.ini b/Data/Sys/GameSettings/MAQ.ini
new file mode 100644
index 0000000000..b8594d9909
--- /dev/null
+++ b/Data/Sys/GameSettings/MAQ.ini
@@ -0,0 +1,25 @@
+# MAQE8P, MAQP8P - Streets of Rage
+
+[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/MAQE8P.ini b/Data/Sys/GameSettings/MAQE8P.ini
deleted file mode 100644
index bd47828e2e..0000000000
--- a/Data/Sys/GameSettings/MAQE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAQE8P - Streets of Rage
-
-[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/MAQP8P.ini b/Data/Sys/GameSettings/MAQP8P.ini
deleted file mode 100644
index 1e517bc5d7..0000000000
--- a/Data/Sys/GameSettings/MAQP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAQP8P - Streets of Rage
-
-[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/MAR.ini b/Data/Sys/GameSettings/MAR.ini
new file mode 100644
index 0000000000..7b1055619e
--- /dev/null
+++ b/Data/Sys/GameSettings/MAR.ini
@@ -0,0 +1,25 @@
+# MARE8P, MARP8P - Beyond Oasis
+
+[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/MARE8P.ini b/Data/Sys/GameSettings/MARE8P.ini
deleted file mode 100644
index 05ba511328..0000000000
--- a/Data/Sys/GameSettings/MARE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MARE8P - Beyond Oasis
-
-[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/MARP8P.ini b/Data/Sys/GameSettings/MARP8P.ini
deleted file mode 100644
index b59517056e..0000000000
--- a/Data/Sys/GameSettings/MARP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MARP8P - The Story of Thor
-
-[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/MA6E8P.ini b/Data/Sys/GameSettings/MAS.ini
similarity index 94%
rename from Data/Sys/GameSettings/MA6E8P.ini
rename to Data/Sys/GameSettings/MAS.ini
index 0555a20623..e9e92d5fde 100644
--- a/Data/Sys/GameSettings/MA6E8P.ini
+++ b/Data/Sys/GameSettings/MAS.ini
@@ -1,4 +1,4 @@
-# MA6E8P - Streets of Rage 2
+# MASE8P, MASP8P - Vectorman
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/MASE8P.ini b/Data/Sys/GameSettings/MASE8P.ini
deleted file mode 100644
index 4f6ad6d8b9..0000000000
--- a/Data/Sys/GameSettings/MASE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MASE8P - Vectorman
-
-[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/MASP8P.ini b/Data/Sys/GameSettings/MASP8P.ini
deleted file mode 100644
index 14686ab5e9..0000000000
--- a/Data/Sys/GameSettings/MASP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MASP8P - Vectorman
-
-[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/MAT.ini b/Data/Sys/GameSettings/MAT.ini
new file mode 100644
index 0000000000..2dfb3cb5a2
--- /dev/null
+++ b/Data/Sys/GameSettings/MAT.ini
@@ -0,0 +1,25 @@
+# MATE8P, MATP8P - Sonic Spinball
+
+[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/MATE8P.ini b/Data/Sys/GameSettings/MATE8P.ini
deleted file mode 100644
index 171f92bb82..0000000000
--- a/Data/Sys/GameSettings/MATE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MATE8P - Sonic Spinball
-
-[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/MATP8P.ini b/Data/Sys/GameSettings/MATP8P.ini
deleted file mode 100644
index ba38756b79..0000000000
--- a/Data/Sys/GameSettings/MATP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MATP8P - Sonic Spinball
-
-[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/MAV.ini b/Data/Sys/GameSettings/MAV.ini
new file mode 100644
index 0000000000..91fbf3364b
--- /dev/null
+++ b/Data/Sys/GameSettings/MAV.ini
@@ -0,0 +1,24 @@
+# MAVE8P, MAVP8P - Wonder Boy in MW
+
+[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/MAVE8P.ini b/Data/Sys/GameSettings/MAVE8P.ini
deleted file mode 100644
index 1296f5e0e3..0000000000
--- a/Data/Sys/GameSettings/MAVE8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MAVE8P - Wonder Boy in MW
-
-[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/MAVP8P.ini b/Data/Sys/GameSettings/MAVP8P.ini
deleted file mode 100644
index 3a3538b7f6..0000000000
--- a/Data/Sys/GameSettings/MAVP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# MAVP8P - Wonder Boy in MW
-
-[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/MAW.ini b/Data/Sys/GameSettings/MAW.ini
new file mode 100644
index 0000000000..f2b2e23f6e
--- /dev/null
+++ b/Data/Sys/GameSettings/MAW.ini
@@ -0,0 +1,25 @@
+# MAWE8P, MAWP8P - Virtua Fighter 2
+
+[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/MAWE8P.ini b/Data/Sys/GameSettings/MAWE8P.ini
deleted file mode 100644
index e40d718b9e..0000000000
--- a/Data/Sys/GameSettings/MAWE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAWE8P - Virtua Fighter 2
-
-[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/MAWP8P.ini b/Data/Sys/GameSettings/MAWP8P.ini
deleted file mode 100644
index 19bff5a6eb..0000000000
--- a/Data/Sys/GameSettings/MAWP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAWP8P - Virtua Fighter 2
-
-[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/MA8E8P.ini b/Data/Sys/GameSettings/MAY.ini
similarity index 93%
rename from Data/Sys/GameSettings/MA8E8P.ini
rename to Data/Sys/GameSettings/MAY.ini
index 7fa0a5dffc..5d8dc3cc27 100644
--- a/Data/Sys/GameSettings/MA8E8P.ini
+++ b/Data/Sys/GameSettings/MAY.ini
@@ -1,4 +1,4 @@
-# MA8E8P - Ecco the Dolphin 2
+# MAYE8P, MAYP8P - Alien Storm
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/MAYE8P.ini b/Data/Sys/GameSettings/MAYE8P.ini
deleted file mode 100644
index d72d14d139..0000000000
--- a/Data/Sys/GameSettings/MAYE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAYE8P - Alien Storm
-
-[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/MAYP8P.ini b/Data/Sys/GameSettings/MAYP8P.ini
deleted file mode 100644
index 46399829f9..0000000000
--- a/Data/Sys/GameSettings/MAYP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAYP8P - Alien Storm
-
-[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/MAZ.ini b/Data/Sys/GameSettings/MAZ.ini
new file mode 100644
index 0000000000..ee4b2dbf75
--- /dev/null
+++ b/Data/Sys/GameSettings/MAZ.ini
@@ -0,0 +1,25 @@
+# MAZE8P, MAZP8P - ToeJam & Earl 2
+
+[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/MAZE8P.ini b/Data/Sys/GameSettings/MAZE8P.ini
deleted file mode 100644
index a037f48a4c..0000000000
--- a/Data/Sys/GameSettings/MAZE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAZE8P - ToeJam & Earl 2
-
-[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/MAZP8P.ini b/Data/Sys/GameSettings/MAZP8P.ini
deleted file mode 100644
index fafcef6ce0..0000000000
--- a/Data/Sys/GameSettings/MAZP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MAZP8P - ToeJam & Earl 2
-
-[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/MB8.ini b/Data/Sys/GameSettings/MB8.ini
new file mode 100644
index 0000000000..cd73bfcfd9
--- /dev/null
+++ b/Data/Sys/GameSettings/MB8.ini
@@ -0,0 +1,25 @@
+# MB8E8P, MB8P8P - Phantasy Star 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/MB8E8P.ini b/Data/Sys/GameSettings/MB8E8P.ini
deleted file mode 100644
index 686ee62d70..0000000000
--- a/Data/Sys/GameSettings/MB8E8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MB8E8P - Phantasy Star 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/MB8P8P.ini b/Data/Sys/GameSettings/MB8P8P.ini
deleted file mode 100644
index 7031adaaee..0000000000
--- a/Data/Sys/GameSettings/MB8P8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MB8P8P - Phantasy Star 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/MBB.ini b/Data/Sys/GameSettings/MBB.ini
new file mode 100644
index 0000000000..42f1a37cbe
--- /dev/null
+++ b/Data/Sys/GameSettings/MBB.ini
@@ -0,0 +1,25 @@
+# MBBE8P, MBBP8P - Sonic the Hedgehog 2
+
+[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/MBBE8P.ini b/Data/Sys/GameSettings/MBBE8P.ini
deleted file mode 100644
index 6545df463b..0000000000
--- a/Data/Sys/GameSettings/MBBE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBBE8P - Sonic the Hedgehog 2
-
-[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/MBBP8P.ini b/Data/Sys/GameSettings/MBBP8P.ini
deleted file mode 100644
index ccf597631f..0000000000
--- a/Data/Sys/GameSettings/MBBP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBBP8P - Sonic the Hedgehog 2
-
-[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/MBC.ini b/Data/Sys/GameSettings/MBC.ini
new file mode 100644
index 0000000000..342ac0b857
--- /dev/null
+++ b/Data/Sys/GameSettings/MBC.ini
@@ -0,0 +1,25 @@
+# MBCE8P, MBCP8P - Kid Chameleon
+
+[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/MBCE8P.ini b/Data/Sys/GameSettings/MBCE8P.ini
deleted file mode 100644
index 7faa2c77bf..0000000000
--- a/Data/Sys/GameSettings/MBCE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBCE8P - Kid Chameleon
-
-[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/MBCP8P.ini b/Data/Sys/GameSettings/MBCP8P.ini
deleted file mode 100644
index 6ac2ec59fb..0000000000
--- a/Data/Sys/GameSettings/MBCP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBCP8P - Kid Chameleon
-
-[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/MBD.ini b/Data/Sys/GameSettings/MBD.ini
new file mode 100644
index 0000000000..022ce9e59d
--- /dev/null
+++ b/Data/Sys/GameSettings/MBD.ini
@@ -0,0 +1,25 @@
+# MBDE8P, MBDP8P - Golden Axe 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/MBDE8P.ini b/Data/Sys/GameSettings/MBDE8P.ini
deleted file mode 100644
index d4fb7209b1..0000000000
--- a/Data/Sys/GameSettings/MBDE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBDE8P - Golden Axe 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/MBDP8P.ini b/Data/Sys/GameSettings/MBDP8P.ini
deleted file mode 100644
index b9c3ce1c70..0000000000
--- a/Data/Sys/GameSettings/MBDP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBDP8P - Golden Axe 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/MBE.ini b/Data/Sys/GameSettings/MBE.ini
new file mode 100644
index 0000000000..e55a754f00
--- /dev/null
+++ b/Data/Sys/GameSettings/MBE.ini
@@ -0,0 +1,25 @@
+# MBEE8P, MBEP8P - Shining Force
+
+[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/MBEE8P.ini b/Data/Sys/GameSettings/MBEE8P.ini
deleted file mode 100644
index 63d6565828..0000000000
--- a/Data/Sys/GameSettings/MBEE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBEE8P - Shining Force
-
-[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/MBEP8P.ini b/Data/Sys/GameSettings/MBEP8P.ini
deleted file mode 100644
index ebfeef70bb..0000000000
--- a/Data/Sys/GameSettings/MBEP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBEP8P - Shining Force
-
-[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/MA8P8P.ini b/Data/Sys/GameSettings/MBF.ini
similarity index 93%
rename from Data/Sys/GameSettings/MA8P8P.ini
rename to Data/Sys/GameSettings/MBF.ini
index 6bee220cfb..51bfc61933 100644
--- a/Data/Sys/GameSettings/MA8P8P.ini
+++ b/Data/Sys/GameSettings/MBF.ini
@@ -1,4 +1,4 @@
-# MA8P8P - Ecco the Dolphin 2
+# MBFE8P, MBFP8P - Shinobi III
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/MBFE8P.ini b/Data/Sys/GameSettings/MBFE8P.ini
deleted file mode 100644
index f2d29d8da0..0000000000
--- a/Data/Sys/GameSettings/MBFE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBFE8P - Shinobi III
-
-[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/MBFP8P.ini b/Data/Sys/GameSettings/MBFP8P.ini
deleted file mode 100644
index 4d957f4361..0000000000
--- a/Data/Sys/GameSettings/MBFP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBFP8P - Shinobi III
-
-[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/MBG.ini b/Data/Sys/GameSettings/MBG.ini
new file mode 100644
index 0000000000..56f2c7a7ff
--- /dev/null
+++ b/Data/Sys/GameSettings/MBG.ini
@@ -0,0 +1,25 @@
+# MBGE8P, MBGP8P - Dynamite Headdy
+
+[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/MBGE8P.ini b/Data/Sys/GameSettings/MBGE8P.ini
deleted file mode 100644
index c12e9210a6..0000000000
--- a/Data/Sys/GameSettings/MBGE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBGE8P - Dynamite Headdy
-
-[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/MBGP8P.ini b/Data/Sys/GameSettings/MBGP8P.ini
deleted file mode 100644
index 508cfb98ff..0000000000
--- a/Data/Sys/GameSettings/MBGP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBGP8P - Dynamite Headdy
-
-[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/MBI.ini b/Data/Sys/GameSettings/MBI.ini
new file mode 100644
index 0000000000..7352619da3
--- /dev/null
+++ b/Data/Sys/GameSettings/MBI.ini
@@ -0,0 +1,25 @@
+# MBIE8P, MBIP8P - Landstalker
+
+[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/MBIE8P.ini b/Data/Sys/GameSettings/MBIE8P.ini
deleted file mode 100644
index e5fa71351d..0000000000
--- a/Data/Sys/GameSettings/MBIE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBIE8P - Landstalker
-
-[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/MBIP8P.ini b/Data/Sys/GameSettings/MBIP8P.ini
deleted file mode 100644
index 1017675d38..0000000000
--- a/Data/Sys/GameSettings/MBIP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBIP8P - Landstalker
-
-[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/MBM.ini b/Data/Sys/GameSettings/MBM.ini
new file mode 100644
index 0000000000..0e9efe1d5b
--- /dev/null
+++ b/Data/Sys/GameSettings/MBM.ini
@@ -0,0 +1,25 @@
+# MBME8P, MBMP8P - Sonic the Hedgehog 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.
+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/MBME8P.ini b/Data/Sys/GameSettings/MBME8P.ini
deleted file mode 100644
index 2d15a9b1fb..0000000000
--- a/Data/Sys/GameSettings/MBME8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBME8P - Sonic the Hedgehog 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.
-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/MBMP8P.ini b/Data/Sys/GameSettings/MBMP8P.ini
deleted file mode 100644
index 1c2b8e8ae0..0000000000
--- a/Data/Sys/GameSettings/MBMP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBMP8P - Sonic the Hedgehog 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.
-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/MBO.ini b/Data/Sys/GameSettings/MBO.ini
new file mode 100644
index 0000000000..b03a0135a6
--- /dev/null
+++ b/Data/Sys/GameSettings/MBO.ini
@@ -0,0 +1,25 @@
+# MBOE8P, MBOP8P - Golden Axe III
+
+[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/MBOE8P.ini b/Data/Sys/GameSettings/MBOE8P.ini
deleted file mode 100644
index 436664439c..0000000000
--- a/Data/Sys/GameSettings/MBOE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBOE8P - Golden Axe III
-
-[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/MBOP8P.ini b/Data/Sys/GameSettings/MBOP8P.ini
deleted file mode 100644
index 7c87cbf7ef..0000000000
--- a/Data/Sys/GameSettings/MBOP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBOP8P - Golden Axe III
-
-[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/MBP.ini b/Data/Sys/GameSettings/MBP.ini
new file mode 100644
index 0000000000..63b6ef4534
--- /dev/null
+++ b/Data/Sys/GameSettings/MBP.ini
@@ -0,0 +1,25 @@
+# MBPE8P, MBPP8P - Super Thunder 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.
+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/MBPE8P.ini b/Data/Sys/GameSettings/MBPE8P.ini
deleted file mode 100644
index 32b12e606a..0000000000
--- a/Data/Sys/GameSettings/MBPE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBPE8P - Super Thunder 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.
-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/MBPP8P.ini b/Data/Sys/GameSettings/MBPP8P.ini
deleted file mode 100644
index 47ab032f11..0000000000
--- a/Data/Sys/GameSettings/MBPP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBPP8P - Super Thunder 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.
-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/MBQ.ini b/Data/Sys/GameSettings/MBQ.ini
new file mode 100644
index 0000000000..963661def1
--- /dev/null
+++ b/Data/Sys/GameSettings/MBQ.ini
@@ -0,0 +1,25 @@
+# MBQE8P, MBQP8P - Streets of Rage 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.
+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/MBQE8P.ini b/Data/Sys/GameSettings/MBQE8P.ini
deleted file mode 100644
index 7172caf526..0000000000
--- a/Data/Sys/GameSettings/MBQE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBQE8P - Streets of Rage 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.
-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/MBQP8P.ini b/Data/Sys/GameSettings/MBQP8P.ini
deleted file mode 100644
index 7c8353b01f..0000000000
--- a/Data/Sys/GameSettings/MBQP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBQP8P - Streets of Rage 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.
-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/MBR.ini b/Data/Sys/GameSettings/MBR.ini
new file mode 100644
index 0000000000..9750d7e295
--- /dev/null
+++ b/Data/Sys/GameSettings/MBR.ini
@@ -0,0 +1,25 @@
+# MBRE8P, MBRP8P - Rolling Thunder 2
+
+[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/MBRE8P.ini b/Data/Sys/GameSettings/MBRE8P.ini
deleted file mode 100644
index f474c66930..0000000000
--- a/Data/Sys/GameSettings/MBRE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBRE8P - Rolling Thunder 2
-
-[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/MBRP8P.ini b/Data/Sys/GameSettings/MBRP8P.ini
deleted file mode 100644
index 11ee255ea2..0000000000
--- a/Data/Sys/GameSettings/MBRP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBRP8P - Rolling Thunder 2
-
-[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/MBT.ini b/Data/Sys/GameSettings/MBT.ini
new file mode 100644
index 0000000000..8cc1c1a872
--- /dev/null
+++ b/Data/Sys/GameSettings/MBT.ini
@@ -0,0 +1,25 @@
+# MBTE8P, MBTP8P - Alien 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.
+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/MBTE8P.ini b/Data/Sys/GameSettings/MBTE8P.ini
deleted file mode 100644
index dd90c367b2..0000000000
--- a/Data/Sys/GameSettings/MBTE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBTE8P - Alien 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.
-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/MBTP8P.ini b/Data/Sys/GameSettings/MBTP8P.ini
deleted file mode 100644
index 8b6499a597..0000000000
--- a/Data/Sys/GameSettings/MBTP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBTP8P - Alien 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.
-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/MBU.ini b/Data/Sys/GameSettings/MBU.ini
new file mode 100644
index 0000000000..c937caa723
--- /dev/null
+++ b/Data/Sys/GameSettings/MBU.ini
@@ -0,0 +1,25 @@
+# MBUE8P, MBUP8P - Sonic 3D Blast
+
+[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/MBUE8P.ini b/Data/Sys/GameSettings/MBUE8P.ini
deleted file mode 100644
index 619b436dc5..0000000000
--- a/Data/Sys/GameSettings/MBUE8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBUE8P - Sonic 3D Blast
-
-[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/MBUP8P.ini b/Data/Sys/GameSettings/MBUP8P.ini
deleted file mode 100644
index d649ad3649..0000000000
--- a/Data/Sys/GameSettings/MBUP8P.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# MBUP8P - Sonic 3D
-
-[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/NAFE01.ini b/Data/Sys/GameSettings/NAF.ini
similarity index 94%
rename from Data/Sys/GameSettings/NAFE01.ini
rename to Data/Sys/GameSettings/NAF.ini
index 111c18eb8a..e2c6466ffc 100644
--- a/Data/Sys/GameSettings/NAFE01.ini
+++ b/Data/Sys/GameSettings/NAF.ini
@@ -1,4 +1,4 @@
-# NAFE01 - F-Zero X
+# NAFE01, NAFP01 - F-Zero X
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/NAFP01.ini b/Data/Sys/GameSettings/NAFP01.ini
deleted file mode 100644
index 6ffa91e5f7..0000000000
--- a/Data/Sys/GameSettings/NAFP01.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# NAFP01 - F-Zero X
-
-[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 to fix a bar of stretched pixels at the bottom of the screen.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/NAHE01.ini b/Data/Sys/GameSettings/NAH.ini
similarity index 83%
rename from Data/Sys/GameSettings/NAHE01.ini
rename to Data/Sys/GameSettings/NAH.ini
index a7031c2969..2c995f6930 100644
--- a/Data/Sys/GameSettings/NAHE01.ini
+++ b/Data/Sys/GameSettings/NAH.ini
@@ -1,4 +1,4 @@
-# NAHE01 - Yoshi's Story
+# NAHE01, NAHP01 - Yoshi's Story
 
 [Core]
 
diff --git a/Data/Sys/GameSettings/NAHP01.ini b/Data/Sys/GameSettings/NAHP01.ini
deleted file mode 100644
index 56ad4b74ca..0000000000
--- a/Data/Sys/GameSettings/NAHP01.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# NAHP01 - Yoshi's Story
-
-[Core]
-
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnFrame]
-
-[ActionReplay]
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAG.ini b/Data/Sys/GameSettings/PAG.ini
new file mode 100644
index 0000000000..39172f72bb
--- /dev/null
+++ b/Data/Sys/GameSettings/PAG.ini
@@ -0,0 +1,24 @@
+# PAGL18, PAGN18 - Bomberman'94
+
+[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/PAO.ini b/Data/Sys/GameSettings/PAO.ini
new file mode 100644
index 0000000000..e7ae31466e
--- /dev/null
+++ b/Data/Sys/GameSettings/PAO.ini
@@ -0,0 +1,24 @@
+# PAOL18, PAON18 - Final 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/PAR.ini b/Data/Sys/GameSettings/PAR.ini
new file mode 100644
index 0000000000..e5357f0fe2
--- /dev/null
+++ b/Data/Sys/GameSettings/PAR.ini
@@ -0,0 +1,24 @@
+# PARL18, PARN18 - DETANA TWIN BEE
+
+[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/PARL18.ini b/Data/Sys/GameSettings/PARL18.ini
deleted file mode 100644
index 1101d9b1bb..0000000000
--- a/Data/Sys/GameSettings/PARL18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PARL18 - DETANA TWIN BEE
-
-[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/PARN18.ini b/Data/Sys/GameSettings/PARN18.ini
deleted file mode 100644
index d3471c60b7..0000000000
--- a/Data/Sys/GameSettings/PARN18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PARN18 - DETANA TWIN BEE
-
-[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/PAGL18.ini b/Data/Sys/GameSettings/PC2.ini
similarity index 93%
rename from Data/Sys/GameSettings/PAGL18.ini
rename to Data/Sys/GameSettings/PC2.ini
index 48163e2662..d3060117ec 100644
--- a/Data/Sys/GameSettings/PAGL18.ini
+++ b/Data/Sys/GameSettings/PC2.ini
@@ -1,4 +1,4 @@
-# PAGL18 - Bomberman'94
+# PC2E18, PC2P18 - Chase H.Q.
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/PC2E18.ini b/Data/Sys/GameSettings/PC2E18.ini
deleted file mode 100644
index af2941e793..0000000000
--- a/Data/Sys/GameSettings/PC2E18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PC2E18 - Chase H.Q.
-
-[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/PC2P18.ini b/Data/Sys/GameSettings/PC2P18.ini
deleted file mode 100644
index d896b052fe..0000000000
--- a/Data/Sys/GameSettings/PC2P18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PC2P18 - Chase H.Q.
-
-[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/PAGN18.ini b/Data/Sys/GameSettings/PCO.ini
similarity index 93%
rename from Data/Sys/GameSettings/PAGN18.ini
rename to Data/Sys/GameSettings/PCO.ini
index dfa7cd807a..eaf8047e58 100644
--- a/Data/Sys/GameSettings/PAGN18.ini
+++ b/Data/Sys/GameSettings/PCO.ini
@@ -1,4 +1,4 @@
-# PAGN18 - Bomberman'94
+# PCOE18, PCOP18 - Psychosis
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/PCOE18.ini b/Data/Sys/GameSettings/PCOE18.ini
deleted file mode 100644
index b806b83a8e..0000000000
--- a/Data/Sys/GameSettings/PCOE18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PCOE18 - Psychosis
-
-[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/PCOP18.ini b/Data/Sys/GameSettings/PCOP18.ini
deleted file mode 100644
index 25fa68974e..0000000000
--- a/Data/Sys/GameSettings/PCOP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PCOP18 - Psychosis
-
-[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/PAON18.ini b/Data/Sys/GameSettings/PCR.ini
similarity index 93%
rename from Data/Sys/GameSettings/PAON18.ini
rename to Data/Sys/GameSettings/PCR.ini
index 71ce6d00ef..c5f31f0136 100644
--- a/Data/Sys/GameSettings/PAON18.ini
+++ b/Data/Sys/GameSettings/PCR.ini
@@ -1,4 +1,4 @@
-# PAON18 - Final Soldier
+# PCRL18, PCRN18 - Break In
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/PCRL18.ini b/Data/Sys/GameSettings/PCRL18.ini
deleted file mode 100644
index 30e82df8c0..0000000000
--- a/Data/Sys/GameSettings/PCRL18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PCRL18 - Break In
-
-[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/PCRN18.ini b/Data/Sys/GameSettings/PCRN18.ini
deleted file mode 100644
index 263f948350..0000000000
--- a/Data/Sys/GameSettings/PCRN18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PCRN18 - Break In
-
-[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/PCS.ini b/Data/Sys/GameSettings/PCS.ini
new file mode 100644
index 0000000000..d1a1694ce9
--- /dev/null
+++ b/Data/Sys/GameSettings/PCS.ini
@@ -0,0 +1,24 @@
+# PCSL18, PCSN18 - Digital Champ
+
+[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/PCSL18.ini b/Data/Sys/GameSettings/PCSL18.ini
deleted file mode 100644
index 66138070bd..0000000000
--- a/Data/Sys/GameSettings/PCSL18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PCSL18 - Digital Champ
-
-[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/PCSN18.ini b/Data/Sys/GameSettings/PCSN18.ini
deleted file mode 100644
index 7392d94803..0000000000
--- a/Data/Sys/GameSettings/PCSN18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PCSN18 - Digital Champ
-
-[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/PDJ.ini b/Data/Sys/GameSettings/PDJ.ini
new file mode 100644
index 0000000000..107d54b302
--- /dev/null
+++ b/Data/Sys/GameSettings/PDJ.ini
@@ -0,0 +1,24 @@
+# PDJL18, PDJN18 - Street Fighter II - Champion Edition
+
+[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/PDJL18.ini b/Data/Sys/GameSettings/PDJL18.ini
deleted file mode 100644
index 3a9aa090b0..0000000000
--- a/Data/Sys/GameSettings/PDJL18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PDJL18 - Street Fighter II - Champion Edition
-
-[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/PDJN18.ini b/Data/Sys/GameSettings/PDJN18.ini
deleted file mode 100644
index 50c5ed5b54..0000000000
--- a/Data/Sys/GameSettings/PDJN18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# PDJN18 - Street Fighter II - Champion Edition
-
-[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/PZLE01.ini b/Data/Sys/GameSettings/PZL.ini
similarity index 90%
rename from Data/Sys/GameSettings/PZLE01.ini
rename to Data/Sys/GameSettings/PZL.ini
index 6437f58443..bcd4a85880 100644
--- a/Data/Sys/GameSettings/PZLE01.ini
+++ b/Data/Sys/GameSettings/PZL.ini
@@ -1,4 +1,4 @@
-# PZLE01 - The Legend of Zelda: Collector's Edition
+# PZLE01, PZLJ01, PZLP01 - The Legend of Zelda: Collector's Edition
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/PZLJ01.ini b/Data/Sys/GameSettings/PZLJ01.ini
deleted file mode 100644
index 964bba60a9..0000000000
--- a/Data/Sys/GameSettings/PZLJ01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# PZLJ01 - The Legend of Zelda: Collector's Edition
-
-[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 = Hold B while booting the game to enable Progressive Scan for NES games.
-
-[OnLoad]
-# Add memory patches 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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/PZLP01.ini b/Data/Sys/GameSettings/PZLP01.ini
deleted file mode 100644
index 7696d0b6ad..0000000000
--- a/Data/Sys/GameSettings/PZLP01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# PZLP01 - The Legend of Zelda: Collector's Edition
-
-[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 = Hold B while booting the game to enable Progressive Scan for NES games.
-
-[OnLoad]
-# Add memory patches 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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
diff --git a/Data/Sys/GameSettings/QAA.ini b/Data/Sys/GameSettings/QAA.ini
new file mode 100644
index 0000000000..46ef58a261
--- /dev/null
+++ b/Data/Sys/GameSettings/QAA.ini
@@ -0,0 +1,24 @@
+# QAAE18, QAAP18 - Super 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/QAAE18.ini b/Data/Sys/GameSettings/QAAE18.ini
deleted file mode 100644
index d41aa8c493..0000000000
--- a/Data/Sys/GameSettings/QAAE18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QAAE18 - Super 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/QAAP18.ini b/Data/Sys/GameSettings/QAAP18.ini
deleted file mode 100644
index dfb82d8cdb..0000000000
--- a/Data/Sys/GameSettings/QAAP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QAAP18 - Super 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/QAB.ini b/Data/Sys/GameSettings/QAB.ini
new file mode 100644
index 0000000000..e4be804fa1
--- /dev/null
+++ b/Data/Sys/GameSettings/QAB.ini
@@ -0,0 +1,24 @@
+# QABE18, QABP18 - Ys Book I & 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/QABE18.ini b/Data/Sys/GameSettings/QABE18.ini
deleted file mode 100644
index cfba16d8fb..0000000000
--- a/Data/Sys/GameSettings/QABE18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QABE18 - Ys Book I & 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/QABP18.ini b/Data/Sys/GameSettings/QABP18.ini
deleted file mode 100644
index 34388242bd..0000000000
--- a/Data/Sys/GameSettings/QABP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QABP18 - Ys Book I & 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/PAOL18.ini b/Data/Sys/GameSettings/QAC.ini
similarity index 93%
rename from Data/Sys/GameSettings/PAOL18.ini
rename to Data/Sys/GameSettings/QAC.ini
index 4b2c735c6e..0e6cd40cd9 100644
--- a/Data/Sys/GameSettings/PAOL18.ini
+++ b/Data/Sys/GameSettings/QAC.ini
@@ -1,4 +1,4 @@
-# PAOL18 - Final Soldier
+# QACL18, QACN18 - Cho Aniki
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/QACL18.ini b/Data/Sys/GameSettings/QACL18.ini
deleted file mode 100644
index 979f2468c1..0000000000
--- a/Data/Sys/GameSettings/QACL18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QACL18 - Cho Aniki
-
-[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/QACN18.ini b/Data/Sys/GameSettings/QACN18.ini
deleted file mode 100644
index b0aa886c52..0000000000
--- a/Data/Sys/GameSettings/QACN18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QACN18 - Cho Aniki
-
-[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/QAD.ini b/Data/Sys/GameSettings/QAD.ini
new file mode 100644
index 0000000000..e0ab873f79
--- /dev/null
+++ b/Data/Sys/GameSettings/QAD.ini
@@ -0,0 +1,24 @@
+# QADL18, QADN18 - GRADIUS 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/QADL18.ini b/Data/Sys/GameSettings/QADL18.ini
deleted file mode 100644
index fa1df1b049..0000000000
--- a/Data/Sys/GameSettings/QADL18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QADL18 - GRADIUS 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/QADN18.ini b/Data/Sys/GameSettings/QADN18.ini
deleted file mode 100644
index 6b63be0721..0000000000
--- a/Data/Sys/GameSettings/QADN18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QADN18 - GRADIUS 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/QAP.ini b/Data/Sys/GameSettings/QAP.ini
new file mode 100644
index 0000000000..191050f420
--- /dev/null
+++ b/Data/Sys/GameSettings/QAP.ini
@@ -0,0 +1,24 @@
+# QAPL18, QAPN18 - CASTLEVANIA
+
+[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/QAPL18.ini b/Data/Sys/GameSettings/QAPL18.ini
deleted file mode 100644
index c1a6502905..0000000000
--- a/Data/Sys/GameSettings/QAPL18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QAPL18 - CASTLEVANIA
-
-[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/QAPN18.ini b/Data/Sys/GameSettings/QAPN18.ini
deleted file mode 100644
index c6174449f9..0000000000
--- a/Data/Sys/GameSettings/QAPN18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QAPN18 - CASTLEVANIA
-
-[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/QAW.ini b/Data/Sys/GameSettings/QAW.ini
new file mode 100644
index 0000000000..50b457de0c
--- /dev/null
+++ b/Data/Sys/GameSettings/QAW.ini
@@ -0,0 +1,24 @@
+# QAWL18, QAWN18 - Star Parodier
+
+[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/QAWL18.ini b/Data/Sys/GameSettings/QAWL18.ini
deleted file mode 100644
index de12c53438..0000000000
--- a/Data/Sys/GameSettings/QAWL18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QAWL18 - Star Parodier
-
-[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/QAWN18.ini b/Data/Sys/GameSettings/QAWN18.ini
deleted file mode 100644
index 73edf8c24a..0000000000
--- a/Data/Sys/GameSettings/QAWN18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QAWN18 - Star Parodier
-
-[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/QBB.ini b/Data/Sys/GameSettings/QBB.ini
new file mode 100644
index 0000000000..62c3da0e43
--- /dev/null
+++ b/Data/Sys/GameSettings/QBB.ini
@@ -0,0 +1,24 @@
+# QBBE18, QBBP18 - Fighting Street
+
+[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/QBBE18.ini b/Data/Sys/GameSettings/QBBE18.ini
deleted file mode 100644
index 6b81ee126d..0000000000
--- a/Data/Sys/GameSettings/QBBE18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QBBE18 - Fighting Street
-
-[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/QBBP18.ini b/Data/Sys/GameSettings/QBBP18.ini
deleted file mode 100644
index ed7d51f6e3..0000000000
--- a/Data/Sys/GameSettings/QBBP18.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# QBBP18 - Fighting Street
-
-[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/R22P01.ini b/Data/Sys/GameSettings/R22.ini
similarity index 93%
rename from Data/Sys/GameSettings/R22P01.ini
rename to Data/Sys/GameSettings/R22.ini
index 5d61aff337..293bcc62a9 100644
--- a/Data/Sys/GameSettings/R22P01.ini
+++ b/Data/Sys/GameSettings/R22.ini
@@ -1,4 +1,4 @@
-# R22P01 - FlingSmash
+# R22E01, R22J01, R22P01 - FlingSmash
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R22E01.ini b/Data/Sys/GameSettings/R22E01.ini
deleted file mode 100644
index 7fb6869086..0000000000
--- a/Data/Sys/GameSettings/R22E01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# R22E01 - FlingSmash
-
-[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.
-
-[OnLoad]
-# Add memory patches 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/R22J01.ini b/Data/Sys/GameSettings/R22J01.ini
deleted file mode 100644
index 14463c5666..0000000000
--- a/Data/Sys/GameSettings/R22J01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# R22J01 - Tataite Hazumu: Super Smash Ball Plus
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches 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/R2GJAF.ini b/Data/Sys/GameSettings/R2G.ini
similarity index 93%
rename from Data/Sys/GameSettings/R2GJAF.ini
rename to Data/Sys/GameSettings/R2G.ini
index 2649bdf1cf..cb5dc6716f 100644
--- a/Data/Sys/GameSettings/R2GJAF.ini
+++ b/Data/Sys/GameSettings/R2G.ini
@@ -1,4 +1,4 @@
-# R2GJAF - FRAGILE
+# R2GEXJ, R2GJAF, R2GP99 - FRAGILE DREAMS
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R2GEXJ.ini b/Data/Sys/GameSettings/R2GEXJ.ini
deleted file mode 100644
index b028b67fd1..0000000000
--- a/Data/Sys/GameSettings/R2GEXJ.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R2GEXJ - FRAGILE 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.
-EmulationIssues = Minimap needs emulate format changes to work.
-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
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/R2GP99.ini b/Data/Sys/GameSettings/R2GP99.ini
deleted file mode 100644
index 6b8a13c138..0000000000
--- a/Data/Sys/GameSettings/R2GP99.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R2GP99 - FRAGILE 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.
-EmulationIssues = Minimap needs emulate format changes to work.
-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
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/R3BE8P.ini b/Data/Sys/GameSettings/R3B.ini
similarity index 92%
rename from Data/Sys/GameSettings/R3BE8P.ini
rename to Data/Sys/GameSettings/R3B.ini
index f4d21c6642..30a1001544 100644
--- a/Data/Sys/GameSettings/R3BE8P.ini
+++ b/Data/Sys/GameSettings/R3B.ini
@@ -1,4 +1,4 @@
-# R3BE8P - SambaDeAmigo
+# R3BE8P, R3BJ8P, R3BP8P - SambaDeAmigo
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R3BJ8P.ini b/Data/Sys/GameSettings/R3BJ8P.ini
deleted file mode 100644
index b339e0c3fa..0000000000
--- a/Data/Sys/GameSettings/R3BJ8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R3BJ8P - SambaDeAmigo
-
-[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/R3DES5.ini b/Data/Sys/GameSettings/R3D.ini
similarity index 93%
rename from Data/Sys/GameSettings/R3DES5.ini
rename to Data/Sys/GameSettings/R3D.ini
index 7f795a06d8..d5fce81855 100644
--- a/Data/Sys/GameSettings/R3DES5.ini
+++ b/Data/Sys/GameSettings/R3D.ini
@@ -1,4 +1,4 @@
-# R3DES5 - Dream Pinball 3d
+# R3DES5, R3DPS5 - Dream Pinball 3d
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R3DPS5.ini b/Data/Sys/GameSettings/R3DPS5.ini
deleted file mode 100644
index f562dd4512..0000000000
--- a/Data/Sys/GameSettings/R3DPS5.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R3DPS5 - Dream Pinball 3d
-
-[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 = Automatic framelimit is problematic.
-
-[OnLoad]
-# Add memory patches 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/R3ME01.ini b/Data/Sys/GameSettings/R3M.ini
similarity index 93%
rename from Data/Sys/GameSettings/R3ME01.ini
rename to Data/Sys/GameSettings/R3M.ini
index a9006f9936..8157b4fec8 100644
--- a/Data/Sys/GameSettings/R3ME01.ini
+++ b/Data/Sys/GameSettings/R3M.ini
@@ -1,4 +1,4 @@
-# R3ME01 - Metroid Prime Trilogy
+# R3ME01, R3MP01 - Metroid Prime Trilogy
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R3MP01.ini b/Data/Sys/GameSettings/R3MP01.ini
deleted file mode 100644
index 755355c2d1..0000000000
--- a/Data/Sys/GameSettings/R3MP01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R3MP01 - Metroid Prime Trilogy
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Disable PAL60 (EuRGB60) to avoid a black bar appearing.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GKOP70.ini b/Data/Sys/GameSettings/R3N.ini
similarity index 91%
rename from Data/Sys/GameSettings/GKOP70.ini
rename to Data/Sys/GameSettings/R3N.ini
index 8378b910f8..7c23965be6 100644
--- a/Data/Sys/GameSettings/GKOP70.ini
+++ b/Data/Sys/GameSettings/R3N.ini
@@ -1,4 +1,4 @@
-# GKOP70 - Kao the kangaroo
+# R3NEXS, R3NPH3 - Guilty Gear XX AC Plus
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R3NEXS.ini b/Data/Sys/GameSettings/R3NEXS.ini
deleted file mode 100644
index 73752c2338..0000000000
--- a/Data/Sys/GameSettings/R3NEXS.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# R3NEXS - Guilty Gear XX AC Plus
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 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/R3NPH3.ini b/Data/Sys/GameSettings/R3NPH3.ini
deleted file mode 100644
index 969a58dd82..0000000000
--- a/Data/Sys/GameSettings/R3NPH3.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# R3NPH3 - Guilty Gear XX AC Plus
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 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/R3OP01.ini b/Data/Sys/GameSettings/R3O.ini
similarity index 92%
rename from Data/Sys/GameSettings/R3OP01.ini
rename to Data/Sys/GameSettings/R3O.ini
index b5039bdb24..ed75ecea85 100644
--- a/Data/Sys/GameSettings/R3OP01.ini
+++ b/Data/Sys/GameSettings/R3O.ini
@@ -1,4 +1,4 @@
-# R3OP01 - Metroid: Other M
+# R3OE01, R3OJ01, R3OP01 - Metroid: Other M
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R3OE01.ini b/Data/Sys/GameSettings/R3OE01.ini
deleted file mode 100644
index 787db9386d..0000000000
--- a/Data/Sys/GameSettings/R3OE01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# R3OE01 - Metroid: Other M
-
-[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 = 1
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/R3OJ01.ini b/Data/Sys/GameSettings/R3OJ01.ini
deleted file mode 100644
index 9e0e571385..0000000000
--- a/Data/Sys/GameSettings/R3OJ01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# R3OJ01 - Metroid: Other M
-
-[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 = 1
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/R3RE8P.ini b/Data/Sys/GameSettings/R3R.ini
similarity index 90%
rename from Data/Sys/GameSettings/R3RE8P.ini
rename to Data/Sys/GameSettings/R3R.ini
index 422735babf..b431ea7ff9 100644
--- a/Data/Sys/GameSettings/R3RE8P.ini
+++ b/Data/Sys/GameSettings/R3R.ini
@@ -1,4 +1,4 @@
-# R3RE8P - Sonic & Sega All-Stars Racing
+# R3RE8P, R3RP8P - Sonic & Sega All-Stars Racing
 [Core]
 # Values set here will override the main dolphin settings.
 [EmuState]
diff --git a/Data/Sys/GameSettings/R3RP8P.ini b/Data/Sys/GameSettings/R3RP8P.ini
deleted file mode 100644
index b49762b0f4..0000000000
--- a/Data/Sys/GameSettings/R3RP8P.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# R3RP8P - Sonic & Sega All-Stars Racing
-[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 = Use direct 3d 11 for less graphic glitches.
-[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]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/R4EP01.ini b/Data/Sys/GameSettings/R4E.ini
similarity index 90%
rename from Data/Sys/GameSettings/R4EP01.ini
rename to Data/Sys/GameSettings/R4E.ini
index f2458cf1c8..2240422433 100644
--- a/Data/Sys/GameSettings/R4EP01.ini
+++ b/Data/Sys/GameSettings/R4E.ini
@@ -1,4 +1,4 @@
-# R4EP01 - Endless Ocean 2
+# R4EE01, R4EJ01, R4EP01 - Endless Ocean Blue World
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R4EJ01.ini b/Data/Sys/GameSettings/R4EJ01.ini
deleted file mode 100644
index fc1158f709..0000000000
--- a/Data/Sys/GameSettings/R4EJ01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R4EJ01 - FOREVER BLUE 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GKYE01.ini b/Data/Sys/GameSettings/R4Q.ini
similarity index 88%
rename from Data/Sys/GameSettings/GKYE01.ini
rename to Data/Sys/GameSettings/R4Q.ini
index 107c8c7bd2..77ca71ff50 100644
--- a/Data/Sys/GameSettings/GKYE01.ini
+++ b/Data/Sys/GameSettings/R4Q.ini
@@ -1,4 +1,4 @@
-# GKYE01 - Kirby Air Ride
+# R4QE01, R4QJ01, R4QK01, R4QP01 - Mario Strikers Charged
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -26,5 +26,4 @@ PH_ZNear =
 PH_ZFar =
 
 [Video_Hacks]
-EFBEmulateFormatChanges = True
 
diff --git a/Data/Sys/GameSettings/R4QE01.ini b/Data/Sys/GameSettings/R4QE01.ini
deleted file mode 100644
index d6eaeb7ced..0000000000
--- a/Data/Sys/GameSettings/R4QE01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# R4QE01 - Mario Strikers Charged
-
-[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/R5IP4Q.ini b/Data/Sys/GameSettings/R5I.ini
similarity index 92%
rename from Data/Sys/GameSettings/R5IP4Q.ini
rename to Data/Sys/GameSettings/R5I.ini
index 5a7152b841..f1771af763 100644
--- a/Data/Sys/GameSettings/R5IP4Q.ini
+++ b/Data/Sys/GameSettings/R5I.ini
@@ -1,4 +1,4 @@
-# R5IP4Q - Toy Story Mania!
+# R5IE4Q, R5IP4Q, R5IX4Q - Toy Story Mania!
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R5IE4Q.ini b/Data/Sys/GameSettings/R5IE4Q.ini
deleted file mode 100644
index f9cc87dee4..0000000000
--- a/Data/Sys/GameSettings/R5IE4Q.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# R5IE4Q - Toy Story Mania!
-
-[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]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/R5IX4Q.ini b/Data/Sys/GameSettings/R5IX4Q.ini
deleted file mode 100644
index cb4375ece3..0000000000
--- a/Data/Sys/GameSettings/R5IX4Q.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# R5IX4Q - Toy Story Mania!
-
-[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]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/R5V.ini b/Data/Sys/GameSettings/R5V.ini
new file mode 100644
index 0000000000..7355fff75d
--- /dev/null
+++ b/Data/Sys/GameSettings/R5V.ini
@@ -0,0 +1,29 @@
+# R5VE41, R5VP41, R5VE41 - James Cameron's AVATAR
+
+[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_Hacks]
+
diff --git a/Data/Sys/GameSettings/R5VX41.ini b/Data/Sys/GameSettings/R5VX41.ini
deleted file mode 100644
index aede7537b6..0000000000
--- a/Data/Sys/GameSettings/R5VX41.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# R5VE41 - James Cameron's AVATAR
-
-[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_Hacks]
-
diff --git a/Data/Sys/GameSettings/R5WEA4.ini b/Data/Sys/GameSettings/R5W.ini
similarity index 91%
rename from Data/Sys/GameSettings/R5WEA4.ini
rename to Data/Sys/GameSettings/R5W.ini
index 57979f80ed..64deba8a8f 100644
--- a/Data/Sys/GameSettings/R5WEA4.ini
+++ b/Data/Sys/GameSettings/R5W.ini
@@ -1,4 +1,4 @@
-# R5WEA4 - Silent Hill: Shattered Memories
+# R5WEA4, R5WJA4 - Silent Hill: Shattered Memories
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R5WJA4.ini b/Data/Sys/GameSettings/R5WJA4.ini
deleted file mode 100644
index f714736ff6..0000000000
--- a/Data/Sys/GameSettings/R5WJA4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R5WJA4 - Silent Hill: Shattered Memories
-
-[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 = Flashlight glitches (r6521)
-
-[OnLoad]
-# Add memory patches 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/R64J01.ini b/Data/Sys/GameSettings/R64.ini
similarity index 90%
rename from Data/Sys/GameSettings/R64J01.ini
rename to Data/Sys/GameSettings/R64.ini
index cff783884b..a709d6e236 100644
--- a/Data/Sys/GameSettings/R64J01.ini
+++ b/Data/Sys/GameSettings/R64.ini
@@ -1,4 +1,4 @@
-# R64J01 - RVL Wii Music
+# R64E01, R64J01, R64K01, R64P01 - RVL Wii Music
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R6BJ78.ini b/Data/Sys/GameSettings/R6B.ini
similarity index 91%
rename from Data/Sys/GameSettings/R6BJ78.ini
rename to Data/Sys/GameSettings/R6B.ini
index ca9fee658f..a674322d1f 100644
--- a/Data/Sys/GameSettings/R6BJ78.ini
+++ b/Data/Sys/GameSettings/R6B.ini
@@ -1,4 +1,4 @@
-# R6BJ78 - Blob Colorful Na Kibou
+# R6BE78, R6BJ78, R6BK78, R6BP78, R6BX78 - de Blob
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R6BE78.ini b/Data/Sys/GameSettings/R6BE78.ini
deleted file mode 100644
index 93d3ecd1af..0000000000
--- a/Data/Sys/GameSettings/R6BE78.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R6BE78 - de Blob
-
-[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]
-ForceFiltering = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R6BK78.ini b/Data/Sys/GameSettings/R6BK78.ini
deleted file mode 100644
index daae7f6b76..0000000000
--- a/Data/Sys/GameSettings/R6BK78.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R6BK78 - de Blob
-
-[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]
-ForceFiltering = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R6BP78.ini b/Data/Sys/GameSettings/R6BP78.ini
deleted file mode 100644
index 6e349f9ffa..0000000000
--- a/Data/Sys/GameSettings/R6BP78.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R6BP78 - de Blob
-
-[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]
-ForceFiltering = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R6BX78.ini b/Data/Sys/GameSettings/R6BX78.ini
deleted file mode 100644
index b9d49a71dd..0000000000
--- a/Data/Sys/GameSettings/R6BX78.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R6BX78 - de Blob
-
-[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]
-ForceFiltering = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R6TEA4.ini b/Data/Sys/GameSettings/R6T.ini
similarity index 93%
rename from Data/Sys/GameSettings/R6TEA4.ini
rename to Data/Sys/GameSettings/R6T.ini
index ac8e216a7c..ab18fcb9b6 100644
--- a/Data/Sys/GameSettings/R6TEA4.ini
+++ b/Data/Sys/GameSettings/R6T.ini
@@ -1,4 +1,4 @@
-# R6TEA4 - Tornado Outbreak
+# R6TEA4, R6TPA4 - Tornado Outbreak
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R6TPA4.ini b/Data/Sys/GameSettings/R6TPA4.ini
deleted file mode 100644
index d6cbb316bc..0000000000
--- a/Data/Sys/GameSettings/R6TPA4.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# R6TPA4 - Tornado Outbreak
-
-[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 = Ending credits and images need normal safe texture cache setting.
-
-[OnLoad]
-# Add memory patches 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/R7F.ini b/Data/Sys/GameSettings/R7F.ini
new file mode 100644
index 0000000000..fe3ce63ed0
--- /dev/null
+++ b/Data/Sys/GameSettings/R7F.ini
@@ -0,0 +1,27 @@
+# R7FEGD, R7FPGD - 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/R7FEGD.ini b/Data/Sys/GameSettings/R7FEGD.ini
deleted file mode 100644
index 9b651d9478..0000000000
--- a/Data/Sys/GameSettings/R7FEGD.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# R7FEGD - 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/R7FPGD.ini b/Data/Sys/GameSettings/R7FPGD.ini
deleted file mode 100644
index 64d4354e22..0000000000
--- a/Data/Sys/GameSettings/R7FPGD.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# R7FPGD - 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/R7GEAF.ini b/Data/Sys/GameSettings/R7G.ini
similarity index 93%
rename from Data/Sys/GameSettings/R7GEAF.ini
rename to Data/Sys/GameSettings/R7G.ini
index 78d169b45e..b97fbff750 100644
--- a/Data/Sys/GameSettings/R7GEAF.ini
+++ b/Data/Sys/GameSettings/R7G.ini
@@ -1,4 +1,4 @@
-# R7GEAF - DragonBall
+# R7GEAF, R7GJAF, R7GPAF - DragonBall
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R7GJAF.ini b/Data/Sys/GameSettings/R7GJAF.ini
deleted file mode 100644
index 500472ac21..0000000000
--- a/Data/Sys/GameSettings/R7GJAF.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R7GJAF - Dragon Ball Tenkaichi Daibouken
-
-[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 = For a real wiimote to work you need to disable the gamecube controller in the settings.
-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/R7GPAF.ini b/Data/Sys/GameSettings/R7GPAF.ini
deleted file mode 100644
index b838ed2d70..0000000000
--- a/Data/Sys/GameSettings/R7GPAF.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R7GPAF - DragonBall
-
-[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 = For a real wiimote to work you need to disable the gamecube controller in the settings.
-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/R7XP69.ini b/Data/Sys/GameSettings/R7X.ini
similarity index 92%
rename from Data/Sys/GameSettings/R7XP69.ini
rename to Data/Sys/GameSettings/R7X.ini
index f89020907b..6ab35fac09 100644
--- a/Data/Sys/GameSettings/R7XP69.ini
+++ b/Data/Sys/GameSettings/R7X.ini
@@ -1,4 +1,4 @@
-# R7XP69 - Need for Speed: Nitro
+# R7XE69, R7XJ13, R7XP69 - Need for Speed: Nitro
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R7XE69.ini b/Data/Sys/GameSettings/R7XE69.ini
deleted file mode 100644
index b44362181b..0000000000
--- a/Data/Sys/GameSettings/R7XE69.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R7XE69 - Need for Speed: Nitro
-
-[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
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R7XJ13.ini b/Data/Sys/GameSettings/R7XJ13.ini
deleted file mode 100644
index 380e90c947..0000000000
--- a/Data/Sys/GameSettings/R7XJ13.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R7XJ13 - Need for Speed: Nitro
-
-[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
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/G3AF69.ini b/Data/Sys/GameSettings/R84.ini
similarity index 89%
rename from Data/Sys/GameSettings/G3AF69.ini
rename to Data/Sys/GameSettings/R84.ini
index 60a986e711..69b6a10963 100644
--- a/Data/Sys/GameSettings/G3AF69.ini
+++ b/Data/Sys/GameSettings/R84.ini
@@ -1,4 +1,4 @@
-# G3AF69 - The Lord of the Rings, The Third Age
+# R84EE9, R84J99, R84P99 - Harvest Moon Tree Of Tranquility
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R84EE9.ini b/Data/Sys/GameSettings/R84EE9.ini
deleted file mode 100644
index f58ab6d2fc..0000000000
--- a/Data/Sys/GameSettings/R84EE9.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R84EE9 - Harvest Moon Tree Of Tranquility
-
-[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
-
diff --git a/Data/Sys/GameSettings/R84P99.ini b/Data/Sys/GameSettings/R84P99.ini
deleted file mode 100644
index 7586c1cfc0..0000000000
--- a/Data/Sys/GameSettings/R84P99.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R84P99 - Harvest Moon Tree Of Tranquility
-
-[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
-
diff --git a/Data/Sys/GameSettings/R8AP01.ini b/Data/Sys/GameSettings/R8A.ini
similarity index 95%
rename from Data/Sys/GameSettings/R8AP01.ini
rename to Data/Sys/GameSettings/R8A.ini
index 6f0c34374f..a09f49628c 100644
--- a/Data/Sys/GameSettings/R8AP01.ini
+++ b/Data/Sys/GameSettings/R8A.ini
@@ -1,4 +1,4 @@
-# R8AP01 - PokePark Wii
+# R8AE01, R8AP01 - Pokepark Wii
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R8AE01.ini b/Data/Sys/GameSettings/R8AE01.ini
deleted file mode 100644
index 0946f768d0..0000000000
--- a/Data/Sys/GameSettings/R8AE01.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R8AE01 - 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]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R8D.ini b/Data/Sys/GameSettings/R8D.ini
new file mode 100644
index 0000000000..3897f121ff
--- /dev/null
+++ b/Data/Sys/GameSettings/R8D.ini
@@ -0,0 +1,27 @@
+# R8DEA4, R8DJA4, R8DPA4 - Yu-Gi-Oh! 5D's: Duel Transer
+
+[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/R8DEA4.ini b/Data/Sys/GameSettings/R8DEA4.ini
deleted file mode 100644
index dee7ceb6c8..0000000000
--- a/Data/Sys/GameSettings/R8DEA4.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# R8DEA4 - Yu-Gi-Oh! 5D's: Duel Transer
-
-[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/R8DJA4.ini b/Data/Sys/GameSettings/R8DJA4.ini
deleted file mode 100644
index 607a8ad615..0000000000
--- a/Data/Sys/GameSettings/R8DJA4.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# R8DJA4 - Yu-Gi-Oh! 5D's: Duel Transer
-
-[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/R8DPA4.ini b/Data/Sys/GameSettings/R8DPA4.ini
deleted file mode 100644
index e877e7061a..0000000000
--- a/Data/Sys/GameSettings/R8DPA4.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# R8DPA4 - Yugioh Sim 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
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/R8JPWR.ini b/Data/Sys/GameSettings/R8J.ini
similarity index 90%
rename from Data/Sys/GameSettings/R8JPWR.ini
rename to Data/Sys/GameSettings/R8J.ini
index 352a56f9c5..72533f69d3 100644
--- a/Data/Sys/GameSettings/R8JPWR.ini
+++ b/Data/Sys/GameSettings/R8J.ini
@@ -1,4 +1,4 @@
-# R8JPWR - Lord of the Rings: Aragorn's Quest
+# R8JEWR, R8JPWR - Lord of the Rings: Aragorn's Quest
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R8JEWR.ini b/Data/Sys/GameSettings/R8JEWR.ini
deleted file mode 100644
index 5beb22c058..0000000000
--- a/Data/Sys/GameSettings/R8JEWR.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R8JEWR - Lord of the Rings: Aragorn's Quest
-
-[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 = 3
-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 =
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/R8LE20.ini b/Data/Sys/GameSettings/R8L.ini
similarity index 93%
rename from Data/Sys/GameSettings/R8LE20.ini
rename to Data/Sys/GameSettings/R8L.ini
index 9a872909ec..1eb93dc112 100644
--- a/Data/Sys/GameSettings/R8LE20.ini
+++ b/Data/Sys/GameSettings/R8L.ini
@@ -1,4 +1,4 @@
-# R8LE20 - Chicken Blaster
+# R8LE20, R8LP7J - Chicken Blaster
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/R8LP7J.ini b/Data/Sys/GameSettings/R8LP7J.ini
deleted file mode 100644
index 4ebae4ce08..0000000000
--- a/Data/Sys/GameSettings/R8LP7J.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R8LP7J - Chicken Blaster
-
-[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 in order to be playable.
-
-[OnLoad]
-# Add memory patches 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/RBBP99.ini b/Data/Sys/GameSettings/RBB.ini
similarity index 92%
rename from Data/Sys/GameSettings/RBBP99.ini
rename to Data/Sys/GameSettings/RBB.ini
index 147f51ae95..fdf34c8bd8 100644
--- a/Data/Sys/GameSettings/RBBP99.ini
+++ b/Data/Sys/GameSettings/RBB.ini
@@ -1,4 +1,4 @@
-# RBBP99 - Bomberman Land
+# RBBE18, RBBJ18, RBBP99 - Bomberman Land
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RBHJ08.ini b/Data/Sys/GameSettings/RBH.ini
similarity index 88%
rename from Data/Sys/GameSettings/RBHJ08.ini
rename to Data/Sys/GameSettings/RBH.ini
index 98fb1d96df..f6a37db007 100644
--- a/Data/Sys/GameSettings/RBHJ08.ini
+++ b/Data/Sys/GameSettings/RBH.ini
@@ -1,4 +1,4 @@
-# RBHJ08 - Biohazard 0
+# RBHE08, RBHJ08, RBHP08 - Resident Evil Archives: Resident Evil Zero
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RBHE08.ini b/Data/Sys/GameSettings/RBHE08.ini
deleted file mode 100644
index 69baef053d..0000000000
--- a/Data/Sys/GameSettings/RBHE08.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# RBHE08 - Resident Evil Archives: Resident Evil Zero
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 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]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/RBHP08.ini b/Data/Sys/GameSettings/RBHP08.ini
deleted file mode 100644
index 84aac038e6..0000000000
--- a/Data/Sys/GameSettings/RBHP08.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# RBHP08 - Resident Evil Archives: Resident Evil Zero
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 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]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/RBI.ini b/Data/Sys/GameSettings/RBI.ini
new file mode 100644
index 0000000000..8ac7cfbcc1
--- /dev/null
+++ b/Data/Sys/GameSettings/RBI.ini
@@ -0,0 +1,29 @@
+# RBIEE9, RBIJ99, RBIP99 - Harvest Moon: Animal Parade
+
+[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_Hacks]
+
diff --git a/Data/Sys/GameSettings/RBIEE9.ini b/Data/Sys/GameSettings/RBIEE9.ini
deleted file mode 100644
index 54bc917b60..0000000000
--- a/Data/Sys/GameSettings/RBIEE9.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RBIEE9 - Harvest Moon: Animal Parade
-
-[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_Hacks]
-
diff --git a/Data/Sys/GameSettings/RBIJ99.ini b/Data/Sys/GameSettings/RBIJ99.ini
deleted file mode 100644
index 06a613ec41..0000000000
--- a/Data/Sys/GameSettings/RBIJ99.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RBIJ99 - Bokujou Monogatari Waku Waku Animal March
-
-[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_Hacks]
-
diff --git a/Data/Sys/GameSettings/RBIP99.ini b/Data/Sys/GameSettings/RBIP99.ini
deleted file mode 100644
index 23b5d5c5a5..0000000000
--- a/Data/Sys/GameSettings/RBIP99.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RBIP99 - Harvest Moon: Animal Parade
-
-[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_Hacks]
-
diff --git a/Data/Sys/GameSettings/R3BP8P.ini b/Data/Sys/GameSettings/RBR.ini
similarity index 89%
rename from Data/Sys/GameSettings/R3BP8P.ini
rename to Data/Sys/GameSettings/RBR.ini
index 1907b2e975..49db82c277 100644
--- a/Data/Sys/GameSettings/R3BP8P.ini
+++ b/Data/Sys/GameSettings/RBR.ini
@@ -1,4 +1,4 @@
-# R3BP8P - SambaDeAmigo
+# RBRE5G, RBRP5G, RBRX5G - Blast Works Build, Trade, Destroy
 
 [Core]
 # Values set here will override the main dolphin settings.
@@ -28,4 +28,3 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RBRE5G.ini b/Data/Sys/GameSettings/RBRE5G.ini
deleted file mode 100644
index d5eb264492..0000000000
--- a/Data/Sys/GameSettings/RBRE5G.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RBRE5G - Blast Works Build, Trade, Destroy
-
-[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/RBRP5G.ini b/Data/Sys/GameSettings/RBRP5G.ini
deleted file mode 100644
index 6086448137..0000000000
--- a/Data/Sys/GameSettings/RBRP5G.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RBRP5G - Blast Works Build, Trade, Destroy
-
-[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/RBRX5G.ini b/Data/Sys/GameSettings/RBRX5G.ini
deleted file mode 100644
index 213439f6e8..0000000000
--- a/Data/Sys/GameSettings/RBRX5G.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RBRX5G - Blast Works Build, Trade, Destroy
-
-[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/RBWE01.ini b/Data/Sys/GameSettings/RBW.ini
similarity index 93%
rename from Data/Sys/GameSettings/RBWE01.ini
rename to Data/Sys/GameSettings/RBW.ini
index fbe5ebfbfe..328621d102 100644
--- a/Data/Sys/GameSettings/RBWE01.ini
+++ b/Data/Sys/GameSettings/RBW.ini
@@ -1,4 +1,4 @@
-# RBWE01 - Battalion Wars 2
+# RBWE01, RBWP01 - Battalion Wars 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RBWP01.ini b/Data/Sys/GameSettings/RBWP01.ini
deleted file mode 100644
index 6f0ad1828d..0000000000
--- a/Data/Sys/GameSettings/RBWP01.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RBWP01 - Battalion Wars 2
-
-[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/GW7F69.ini b/Data/Sys/GameSettings/RCL.ini
similarity index 90%
rename from Data/Sys/GameSettings/GW7F69.ini
rename to Data/Sys/GameSettings/RCL.ini
index 2f4b002584..a4ee3949d5 100644
--- a/Data/Sys/GameSettings/GW7F69.ini
+++ b/Data/Sys/GameSettings/RCL.ini
@@ -1,4 +1,4 @@
-# GW7F69 - 007: Agent Under Fire (tm)
+# RCLE4Q, RCLP4Q - Chicken Little: Ace In Action
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RCLE4Q.ini b/Data/Sys/GameSettings/RCLE4Q.ini
deleted file mode 100644
index af67df29d5..0000000000
--- a/Data/Sys/GameSettings/RCLE4Q.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RCLE4Q - Chicken Little: Ace 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 = Needs real xfb for the video cutscenes 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_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/RCLP4Q.ini b/Data/Sys/GameSettings/RCLP4Q.ini
deleted file mode 100644
index 04ca653c5a..0000000000
--- a/Data/Sys/GameSettings/RCLP4Q.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RCLP4Q - Chicken Little: Ace 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 = Needs real xfb for the video cutscenes 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_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/RD2E41.ini b/Data/Sys/GameSettings/RD2.ini
similarity index 89%
rename from Data/Sys/GameSettings/RD2E41.ini
rename to Data/Sys/GameSettings/RD2.ini
index 15f526fbf8..0a15ae77d9 100644
--- a/Data/Sys/GameSettings/RD2E41.ini
+++ b/Data/Sys/GameSettings/RD2.ini
@@ -1,4 +1,4 @@
-# RD2E41 - Red Steel 2
+# RD2E41, RD2J41, RD2K41, RD2P41, RD2X41 - Red Steel 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RD2J41.ini b/Data/Sys/GameSettings/RD2J41.ini
deleted file mode 100644
index cb9acb0333..0000000000
--- a/Data/Sys/GameSettings/RD2J41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RD2J41 - Red Steel 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 = 5
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches 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/RD2K41.ini b/Data/Sys/GameSettings/RD2K41.ini
deleted file mode 100644
index 14bec203fb..0000000000
--- a/Data/Sys/GameSettings/RD2K41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RD2K41 - Red Steel 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 = 5
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches 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/RD2P41.ini b/Data/Sys/GameSettings/RD2P41.ini
deleted file mode 100644
index 16d6f8d778..0000000000
--- a/Data/Sys/GameSettings/RD2P41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RD2P41 - Red Steel 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 = 5
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches 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/RD2X41.ini b/Data/Sys/GameSettings/RD2X41.ini
deleted file mode 100644
index 0a69b78eae..0000000000
--- a/Data/Sys/GameSettings/RD2X41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RD2X41 - Red Steel 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 = 5
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches 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/GIAE7D.ini b/Data/Sys/GameSettings/RDF.ini
similarity index 87%
rename from Data/Sys/GameSettings/GIAE7D.ini
rename to Data/Sys/GameSettings/RDF.ini
index 51bef32bf8..01061668dd 100644
--- a/Data/Sys/GameSettings/GIAE7D.ini
+++ b/Data/Sys/GameSettings/RDF.ini
@@ -1,4 +1,4 @@
-# GIAE7D - Ice Age 2 The Meltdown
+# RDFE41, RDFP41 - Shaun White Snowboarding: Road Trip
 
 [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 = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,5 +17,5 @@ EmulationIssues =
 # Add action replay cheats here.
 
 [Video_Hacks]
-EFBCopyEnable = True
 EFBToTextureEnable = False
+EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RDFE41.ini b/Data/Sys/GameSettings/RDFE41.ini
deleted file mode 100644
index 5f3e0370e9..0000000000
--- a/Data/Sys/GameSettings/RDFE41.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# RDFE41 - Shaun White Snowboarding: Road Trip
-
-[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]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RDFP41.ini b/Data/Sys/GameSettings/RDFP41.ini
deleted file mode 100644
index 831f22452a..0000000000
--- a/Data/Sys/GameSettings/RDFP41.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# RDFP41 - Shaun White Snowboarding: Road Trip
-
-[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]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RDZJ01.ini b/Data/Sys/GameSettings/RDZ.ini
similarity index 94%
rename from Data/Sys/GameSettings/RDZJ01.ini
rename to Data/Sys/GameSettings/RDZ.ini
index 87813ecea4..e2df31a697 100644
--- a/Data/Sys/GameSettings/RDZJ01.ini
+++ b/Data/Sys/GameSettings/RDZ.ini
@@ -1,4 +1,4 @@
-# RDZJ01 - Disaster
+# RDZJ01, RDZP01 - Disaster
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/GBIE08.ini b/Data/Sys/GameSettings/RE4.ini
similarity index 91%
rename from Data/Sys/GameSettings/GBIE08.ini
rename to Data/Sys/GameSettings/RE4.ini
index b95d8fcf96..963f3da22d 100644
--- a/Data/Sys/GameSettings/GBIE08.ini
+++ b/Data/Sys/GameSettings/RE4.ini
@@ -1,4 +1,4 @@
-# GBIE08 - Resident Evil
+# RE4E08, RE4J08, RE4P08 - Resident Evil
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RE4E08.ini b/Data/Sys/GameSettings/RE4E08.ini
deleted file mode 100644
index 130d174e74..0000000000
--- a/Data/Sys/GameSettings/RE4E08.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RE4E08 - Resident Evil
-
-[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_Hacks]
-
diff --git a/Data/Sys/GameSettings/RE4J08.ini b/Data/Sys/GameSettings/RE4J08.ini
deleted file mode 100644
index 0d184b3359..0000000000
--- a/Data/Sys/GameSettings/RE4J08.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RE4J08 - Biohazard
-
-[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_Hacks]
-
diff --git a/Data/Sys/GameSettings/RE4P08.ini b/Data/Sys/GameSettings/RE4P08.ini
deleted file mode 100644
index 27f34be128..0000000000
--- a/Data/Sys/GameSettings/RE4P08.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RE4P08 - Resident Evil
-
-[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_Hacks]
-
diff --git a/Data/Sys/GameSettings/REDE41.ini b/Data/Sys/GameSettings/RED.ini
similarity index 92%
rename from Data/Sys/GameSettings/REDE41.ini
rename to Data/Sys/GameSettings/RED.ini
index 882a940a5a..1cccda7215 100644
--- a/Data/Sys/GameSettings/REDE41.ini
+++ b/Data/Sys/GameSettings/RED.ini
@@ -1,4 +1,4 @@
-# REDE41 - RedSteel NTSC
+# REDE41, REDJ41, REDP41 - RedSteel NTSC
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/REDJ41.ini b/Data/Sys/GameSettings/REDJ41.ini
deleted file mode 100644
index 9552ed8b5b..0000000000
--- a/Data/Sys/GameSettings/REDJ41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# REDJ41 - RedSteel NTSC
-
-[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 = Nunchuk doesn't work (both real and emulated).
-
-[OnLoad]
-# Add memory patches 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/REDP41.ini b/Data/Sys/GameSettings/REDP41.ini
deleted file mode 100644
index 2ee6119f43..0000000000
--- a/Data/Sys/GameSettings/REDP41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# REDP41 - RedSteel PAL
-
-[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 = Nunchuk doesn't work (both real and emulated).
-
-[OnLoad]
-# Add memory patches 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/RENE8P.ini b/Data/Sys/GameSettings/REN.ini
similarity index 90%
rename from Data/Sys/GameSettings/RENE8P.ini
rename to Data/Sys/GameSettings/REN.ini
index 91122bff40..cc96dac8e2 100644
--- a/Data/Sys/GameSettings/RENE8P.ini
+++ b/Data/Sys/GameSettings/REN.ini
@@ -1,4 +1,4 @@
-# RENE8P - Sonic and the Black Knight
+# RENE8P, RENJ8P - Sonic and the Black Knight
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RENJ8P.ini b/Data/Sys/GameSettings/RENJ8P.ini
deleted file mode 100644
index 56b7619a4e..0000000000
--- a/Data/Sys/GameSettings/RENJ8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RENJ8P - 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 =
-
-[OnLoad]
-# Add memory patches 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/RFBE01.ini b/Data/Sys/GameSettings/RFB.ini
similarity index 93%
rename from Data/Sys/GameSettings/RFBE01.ini
rename to Data/Sys/GameSettings/RFB.ini
index 9f6b8264da..a244a93cfd 100644
--- a/Data/Sys/GameSettings/RFBE01.ini
+++ b/Data/Sys/GameSettings/RFB.ini
@@ -1,4 +1,4 @@
-# RFBE01 - ENDLESS OCEAN
+# RFBE01, RFBJ01, RFBP01 - ENDLESS OCEAN
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RFBJ01.ini b/Data/Sys/GameSettings/RFBJ01.ini
deleted file mode 100644
index 13bbae2863..0000000000
--- a/Data/Sys/GameSettings/RFBJ01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RFBJ01 - Forever Blue
-
-[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 photos to be developed.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/RFBP01.ini b/Data/Sys/GameSettings/RFBP01.ini
deleted file mode 100644
index 5ad8915150..0000000000
--- a/Data/Sys/GameSettings/RFBP01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RFBP01 - ENDLESS OCEAN
-
-[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 photos to be developed.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/RFCJGD.ini b/Data/Sys/GameSettings/RFC.ini
similarity index 91%
rename from Data/Sys/GameSettings/RFCJGD.ini
rename to Data/Sys/GameSettings/RFC.ini
index 9426d843bb..b521ac440f 100644
--- a/Data/Sys/GameSettings/RFCJGD.ini
+++ b/Data/Sys/GameSettings/RFC.ini
@@ -1,4 +1,4 @@
-# RFCJGD - FFCC THE CRYSTAL BEARERS
+# RFCEGD, RFCJGD, RFCPGD - FFCC THE CRYSTAL BEARERS
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RFCEGD.ini b/Data/Sys/GameSettings/RFCEGD.ini
deleted file mode 100644
index 12bf95800e..0000000000
--- a/Data/Sys/GameSettings/RFCEGD.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RFCEGD - FFCC THE CRYSTAL BEARERS
-
-[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 = Turn off "use panic handlers". Water 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RFCPGD.ini b/Data/Sys/GameSettings/RFCPGD.ini
deleted file mode 100644
index 0905224f19..0000000000
--- a/Data/Sys/GameSettings/RFCPGD.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RFCPGD - FFCC THE CRYSTAL BEARERS
-
-[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 = Turn off "use panic handlers". Water 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RFEE01.ini b/Data/Sys/GameSettings/RFE.ini
similarity index 93%
rename from Data/Sys/GameSettings/RFEE01.ini
rename to Data/Sys/GameSettings/RFE.ini
index 088b09e10c..5273439073 100644
--- a/Data/Sys/GameSettings/RFEE01.ini
+++ b/Data/Sys/GameSettings/RFE.ini
@@ -1,4 +1,4 @@
-# RFEE01 - FIRE EMBLEM 10 USA
+# RFEE01, RFEJ01 - FIRE EMBLEM 10 USA
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RFEJ01.ini b/Data/Sys/GameSettings/RFEJ01.ini
deleted file mode 100644
index db81c6cfa4..0000000000
--- a/Data/Sys/GameSettings/RFEJ01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RFEJ01 - Fire Emblem Akatsuki No Megami
-
-[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/RFFJGD.ini b/Data/Sys/GameSettings/RFF.ini
similarity index 94%
rename from Data/Sys/GameSettings/RFFJGD.ini
rename to Data/Sys/GameSettings/RFF.ini
index 76c522738f..2bde08d5ac 100644
--- a/Data/Sys/GameSettings/RFFJGD.ini
+++ b/Data/Sys/GameSettings/RFF.ini
@@ -1,4 +1,4 @@
-# RFFJGD - FFCC EOT
+# RFFEGD, RFFJGD, RFFPGD - FFCC EOT
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RFFEGD.ini b/Data/Sys/GameSettings/RFFEGD.ini
deleted file mode 100644
index 1a01e6afce..0000000000
--- a/Data/Sys/GameSettings/RFFEGD.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RFFEGD - FFCC EOT
-
-[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 integral scaling for the black lines to disappear.
-
-[OnLoad]
-# Add memory patches 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
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RFFPGD.ini b/Data/Sys/GameSettings/RFFPGD.ini
deleted file mode 100644
index 1227196af0..0000000000
--- a/Data/Sys/GameSettings/RFFPGD.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RFFPGD - FFCC EOT
-
-[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 integral scaling for the black lines to disappear.
-
-[OnLoad]
-# Add memory patches 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
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RFSEEB.ini b/Data/Sys/GameSettings/RFS.ini
similarity index 92%
rename from Data/Sys/GameSettings/RFSEEB.ini
rename to Data/Sys/GameSettings/RFS.ini
index f6f1087029..ba649df7e6 100644
--- a/Data/Sys/GameSettings/RFSEEB.ini
+++ b/Data/Sys/GameSettings/RFS.ini
@@ -1,4 +1,4 @@
-# RFSEEB - Shiren The Wanderer
+# RFSEEB, RFSJ8P - Shiren The Wanderer
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RFSJ8P.ini b/Data/Sys/GameSettings/RFSJ8P.ini
deleted file mode 100644
index 93f06a4bfb..0000000000
--- a/Data/Sys/GameSettings/RFSJ8P.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RFSJ8P - Fushigi No Dungeon: Furai No Shiren 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 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 =
-
diff --git a/Data/Sys/GameSettings/RGWE41.ini b/Data/Sys/GameSettings/RGW.ini
similarity index 91%
rename from Data/Sys/GameSettings/RGWE41.ini
rename to Data/Sys/GameSettings/RGW.ini
index e6e6f593b0..9ddb02d1e2 100644
--- a/Data/Sys/GameSettings/RGWE41.ini
+++ b/Data/Sys/GameSettings/RGW.ini
@@ -1,4 +1,4 @@
-# RGWE41 - Rabbids Go Home
+# RGWE41, RGWJ41, RGWP41, RGWX41 - Rabbids Go Home
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/RGWJ41.ini b/Data/Sys/GameSettings/RGWJ41.ini
deleted file mode 100644
index 83cb6f1e9b..0000000000
--- a/Data/Sys/GameSettings/RGWJ41.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# RGWJ41 - Rabbids Go Home
-
-[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 = Efb to ram is needed for certain ingame functions but it will give a big speed hit.
-
-[OnLoad]
-# Add memory patches 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
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RGWP41.ini b/Data/Sys/GameSettings/RGWP41.ini
deleted file mode 100644
index 410147d101..0000000000
--- a/Data/Sys/GameSettings/RGWP41.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# RGWP41 - Rabbids Go Home
-
-[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 = Efb to ram is needed for certain ingame functions but it will give a big speed hit.
-
-[OnLoad]
-# Add memory patches 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
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RGWX41.ini b/Data/Sys/GameSettings/RGWX41.ini
deleted file mode 100644
index 970c24ae72..0000000000
--- a/Data/Sys/GameSettings/RGWX41.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# RGWX41 - Rabbids Go Home
-
-[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 = Efb to ram is needed for certain ingame functions but it will give a big speed hit.
-
-[OnLoad]
-# Add memory patches 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
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RH8E4F.ini b/Data/Sys/GameSettings/RH8.ini
similarity index 90%
rename from Data/Sys/GameSettings/RH8E4F.ini
rename to Data/Sys/GameSettings/RH8.ini
index 972bdb721a..62791a084a 100644
--- a/Data/Sys/GameSettings/RH8E4F.ini
+++ b/Data/Sys/GameSettings/RH8.ini
@@ -1,4 +1,4 @@
-# RH8E4F - Tomb Raider Underworld
+# RH8E4F, RH8JEL, RH8P4F, RH8X4F - Tomb Raider Underworld
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RH8JEL.ini b/Data/Sys/GameSettings/RH8JEL.ini
deleted file mode 100644
index 9fd16df9b6..0000000000
--- a/Data/Sys/GameSettings/RH8JEL.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RH8JEL - Tomb Raider Underworld
-
-[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
-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/RH8P4F.ini b/Data/Sys/GameSettings/RH8P4F.ini
deleted file mode 100644
index 1e8b87c2e5..0000000000
--- a/Data/Sys/GameSettings/RH8P4F.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RH8P4F - Tomb Raider Underworld
-
-[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
-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/RH8X4F.ini b/Data/Sys/GameSettings/RH8X4F.ini
deleted file mode 100644
index ea5f006619..0000000000
--- a/Data/Sys/GameSettings/RH8X4F.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RH8X4F - Tomb Raider Underworld
-
-[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
-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/R4QK01.ini b/Data/Sys/GameSettings/RHA.ini
similarity index 89%
rename from Data/Sys/GameSettings/R4QK01.ini
rename to Data/Sys/GameSettings/RHA.ini
index 8b315f3d19..1cb4f5c916 100644
--- a/Data/Sys/GameSettings/R4QK01.ini
+++ b/Data/Sys/GameSettings/RHA.ini
@@ -1,4 +1,4 @@
-# R4QK01 - Mario Power Soccer
+# RHAE01, RHAJ01, RHAK01, RHAP01, RHAW01 - Wii Play
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RHAE01.ini b/Data/Sys/GameSettings/RHAE01.ini
deleted file mode 100644
index c75bab0ddc..0000000000
--- a/Data/Sys/GameSettings/RHAE01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RHAE01 - Wii Play
-
-[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/RHAJ01.ini b/Data/Sys/GameSettings/RHAJ01.ini
deleted file mode 100644
index 0e9a5fc2a7..0000000000
--- a/Data/Sys/GameSettings/RHAJ01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RHAJ01 - Hajimete No 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 = 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/RHAK01.ini b/Data/Sys/GameSettings/RHAK01.ini
deleted file mode 100644
index 3be9e72d04..0000000000
--- a/Data/Sys/GameSettings/RHAK01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RHAK01 - Wii Play
-
-[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/RHAP01.ini b/Data/Sys/GameSettings/RHAP01.ini
deleted file mode 100644
index 432ddc508b..0000000000
--- a/Data/Sys/GameSettings/RHAP01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RHAP01 - PARTY PACK for REVOLUTION
-
-[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/RHAW01.ini b/Data/Sys/GameSettings/RHAW01.ini
deleted file mode 100644
index fc7d8a495b..0000000000
--- a/Data/Sys/GameSettings/RHAW01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RHAW01 - Wii Play
-
-[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/R4QJ01.ini b/Data/Sys/GameSettings/RHM.ini
similarity index 90%
rename from Data/Sys/GameSettings/R4QJ01.ini
rename to Data/Sys/GameSettings/RHM.ini
index 35b7404401..ccbe72b6a9 100644
--- a/Data/Sys/GameSettings/R4QJ01.ini
+++ b/Data/Sys/GameSettings/RHM.ini
@@ -1,4 +1,4 @@
-# R4QJ01 - Mario Strikers Charged
+# RHMEE9, RHMP99 - Harvest Moon: Magical Melody
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RHMEE9.ini b/Data/Sys/GameSettings/RHMEE9.ini
deleted file mode 100644
index 56a3c5f01f..0000000000
--- a/Data/Sys/GameSettings/RHMEE9.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RHMEE9 - Harvest Moon: Magical Melody
-
-[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/RHMP99.ini b/Data/Sys/GameSettings/RHMP99.ini
deleted file mode 100644
index f1c618ecf2..0000000000
--- a/Data/Sys/GameSettings/RHMP99.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RHMP99 - Harvest Moon: Magical Melody
-
-[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/RHOE8P.ini b/Data/Sys/GameSettings/RHO.ini
similarity index 88%
rename from Data/Sys/GameSettings/RHOE8P.ini
rename to Data/Sys/GameSettings/RHO.ini
index 8d8190877a..0b577226e6 100644
--- a/Data/Sys/GameSettings/RHOE8P.ini
+++ b/Data/Sys/GameSettings/RHO.ini
@@ -1,4 +1,4 @@
-# RHOE8P - House Of The Dead: OVERKILL
+# RHOE8P, RHOJ8P, RHOP8P - House Of The Dead: OVERKILL
 [Core]
 # Values set here will override the main dolphin settings.
 [EmuState]
diff --git a/Data/Sys/GameSettings/RHOJ8P.ini b/Data/Sys/GameSettings/RHOJ8P.ini
deleted file mode 100644
index bdef300ddf..0000000000
--- a/Data/Sys/GameSettings/RHOJ8P.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RHOJ8P - House Of The Dead: OVERKILL
-[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_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RHOP8P.ini b/Data/Sys/GameSettings/RHOP8P.ini
deleted file mode 100644
index fa314e84e4..0000000000
--- a/Data/Sys/GameSettings/RHOP8P.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RHOP8P - House Of The Dead: OVERKILL
-[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_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RIP.ini b/Data/Sys/GameSettings/RIP.ini
new file mode 100644
index 0000000000..632feb1b8e
--- /dev/null
+++ b/Data/Sys/GameSettings/RIP.ini
@@ -0,0 +1,25 @@
+# RIPEAF, RIPJAF, RIPPAF - ONEPIECE UNLIMITED 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]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/RIPEAF.ini b/Data/Sys/GameSettings/RIPEAF.ini
deleted file mode 100644
index 94542525e5..0000000000
--- a/Data/Sys/GameSettings/RIPEAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RIPEAF - ONEPIECE UNLIMITED 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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RIPJAF.ini b/Data/Sys/GameSettings/RIPJAF.ini
deleted file mode 100644
index 166bbb7195..0000000000
--- a/Data/Sys/GameSettings/RIPJAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RIPJAF - ONEPIECE UNLIMITED 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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RIPPAF.ini b/Data/Sys/GameSettings/RIPPAF.ini
deleted file mode 100644
index f03e75294a..0000000000
--- a/Data/Sys/GameSettings/RIPPAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RIPPAF - ONEPIECE UNLIMITED 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]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GKOE70.ini b/Data/Sys/GameSettings/RIU.ini
similarity index 88%
rename from Data/Sys/GameSettings/GKOE70.ini
rename to Data/Sys/GameSettings/RIU.ini
index afab7d0642..eb296c1457 100644
--- a/Data/Sys/GameSettings/GKOE70.ini
+++ b/Data/Sys/GameSettings/RIU.ini
@@ -1,4 +1,4 @@
-# GKOE70 - Kao the kangaroo
+# RIUJAF, RIUPAF - ONEPIECE UNLIMITED CRUISE EPISODE 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RIUJAF.ini b/Data/Sys/GameSettings/RIUJAF.ini
deleted file mode 100644
index 2d2b657b0c..0000000000
--- a/Data/Sys/GameSettings/RIUJAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RIUJAF - ONEPIECE UNLIMITED CRUISE EPISODE 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RIUPAF.ini b/Data/Sys/GameSettings/RIUPAF.ini
deleted file mode 100644
index d963186f73..0000000000
--- a/Data/Sys/GameSettings/RIUPAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RIUPAF - ONEPIECE UNLIMITED CRUISE EPISODE 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RKDEEB.ini b/Data/Sys/GameSettings/RK2.ini
similarity index 89%
rename from Data/Sys/GameSettings/RKDEEB.ini
rename to Data/Sys/GameSettings/RK2.ini
index 9bf02681ec..38cf1bc24c 100644
--- a/Data/Sys/GameSettings/RKDEEB.ini
+++ b/Data/Sys/GameSettings/RK2.ini
@@ -1,4 +1,4 @@
-# RKDEEB - Trauma Center SO
+# RK2EEB, RK2JEB, RK2P01 - TRAUMA CENTER NEW BLOOD
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RK2EEB.ini b/Data/Sys/GameSettings/RK2EEB.ini
deleted file mode 100644
index d5cea3b078..0000000000
--- a/Data/Sys/GameSettings/RK2EEB.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RK2EEB - TRAUMA CENTER NEW BLOOD
-
-[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/RK2JEB.ini b/Data/Sys/GameSettings/RK2JEB.ini
deleted file mode 100644
index 43838bb93d..0000000000
--- a/Data/Sys/GameSettings/RK2JEB.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RK2JEB - TRAUMA CENTER NEW BLOOD
-
-[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/RK2P01.ini b/Data/Sys/GameSettings/RKD.ini
similarity index 90%
rename from Data/Sys/GameSettings/RK2P01.ini
rename to Data/Sys/GameSettings/RKD.ini
index 00d58611c0..48d81a0db2 100644
--- a/Data/Sys/GameSettings/RK2P01.ini
+++ b/Data/Sys/GameSettings/RKD.ini
@@ -1,4 +1,4 @@
-# RK2P01 - TRAUMA CENTER NEW BLOOD
+# RKDEEB, RKDJEB, RKDPEB - Trauma Center SO
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RKDJEB.ini b/Data/Sys/GameSettings/RKDJEB.ini
deleted file mode 100644
index 7d30b0cb9f..0000000000
--- a/Data/Sys/GameSettings/RKDJEB.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RKDJEB - Trauma Center SO
-
-[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/RKDPEB.ini b/Data/Sys/GameSettings/RKDPEB.ini
deleted file mode 100644
index d2fae09fb2..0000000000
--- a/Data/Sys/GameSettings/RKDPEB.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RKDPEB - Trauma Center SO
-
-[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/GHMF4F.ini b/Data/Sys/GameSettings/RLG.ini
similarity index 88%
rename from Data/Sys/GameSettings/GHMF4F.ini
rename to Data/Sys/GameSettings/RLG.ini
index 3354795f4b..853b18113f 100644
--- a/Data/Sys/GameSettings/GHMF4F.ini
+++ b/Data/Sys/GameSettings/RLG.ini
@@ -1,12 +1,12 @@
-# GHMF4F - Hitman 2: Silent Assassin
+# RLGE64, RLGJ52, RLGP64 - LEGO Star Wars The Complete Saga
 
 [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
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/RLGE64.ini b/Data/Sys/GameSettings/RLGE64.ini
deleted file mode 100644
index 897b993ee6..0000000000
--- a/Data/Sys/GameSettings/RLGE64.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RLGE64 - LEGO Star Wars The Complete Saga
-
-[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/RLGJ52.ini b/Data/Sys/GameSettings/RLGJ52.ini
deleted file mode 100644
index 5eb7a5744c..0000000000
--- a/Data/Sys/GameSettings/RLGJ52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RLGJ52 - LEGO Star Wars The Complete Saga
-
-[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/RLGP64.ini b/Data/Sys/GameSettings/RLGP64.ini
deleted file mode 100644
index a0c73dfd03..0000000000
--- a/Data/Sys/GameSettings/RLGP64.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RLGP64 - LEGO Star Wars The Complete Saga
-
-[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/RM3E01.ini b/Data/Sys/GameSettings/RM3.ini
similarity index 90%
rename from Data/Sys/GameSettings/RM3E01.ini
rename to Data/Sys/GameSettings/RM3.ini
index c95b3d00d4..9d460a3973 100644
--- a/Data/Sys/GameSettings/RM3E01.ini
+++ b/Data/Sys/GameSettings/RM3.ini
@@ -1,4 +1,4 @@
-# RM3E01 - Metroid Prime 3: Corruption
+# RM3E01, RM3J01 - Metroid Prime 3: Corruption
 [Core]
 # Values set here will override the main dolphin settings.
 [EmuState]
diff --git a/Data/Sys/GameSettings/RM3J01.ini b/Data/Sys/GameSettings/RM3J01.ini
deleted file mode 100644
index 2e06a5b0bf..0000000000
--- a/Data/Sys/GameSettings/RM3J01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# RM3J01 - Metroid Prime 3: Corruption
-[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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RM8K01.ini b/Data/Sys/GameSettings/RM8.ini
similarity index 90%
rename from Data/Sys/GameSettings/RM8K01.ini
rename to Data/Sys/GameSettings/RM8.ini
index 4081abf01a..831545dc72 100644
--- a/Data/Sys/GameSettings/RM8K01.ini
+++ b/Data/Sys/GameSettings/RM8.ini
@@ -1,4 +1,4 @@
-# RM8K01 - Mario Party 8
+# RM8E01, RM8J01, RM8K01, RM8P01 - Mario Party 8
 [Core]
 # Values set here will override the main dolphin settings.
 [EmuState]
diff --git a/Data/Sys/GameSettings/RM8E01.ini b/Data/Sys/GameSettings/RM8E01.ini
deleted file mode 100644
index 9a3fb49407..0000000000
--- a/Data/Sys/GameSettings/RM8E01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# RM8E01 - Mario Party 8
-[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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-ForceFiltering = False
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RM8J01.ini b/Data/Sys/GameSettings/RM8J01.ini
deleted file mode 100644
index 5345cd96c1..0000000000
--- a/Data/Sys/GameSettings/RM8J01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# RM8J01 - Mario Party 8
-[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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-ForceFiltering = False
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RM8P01.ini b/Data/Sys/GameSettings/RM8P01.ini
deleted file mode 100644
index 755b487e5d..0000000000
--- a/Data/Sys/GameSettings/RM8P01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# RM8P01 - Mario Party 8
-[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]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-ForceFiltering = False
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/R64E01.ini b/Data/Sys/GameSettings/RMC.ini
similarity index 90%
rename from Data/Sys/GameSettings/R64E01.ini
rename to Data/Sys/GameSettings/RMC.ini
index d9cfe8f54c..ce7f8f4444 100644
--- a/Data/Sys/GameSettings/R64E01.ini
+++ b/Data/Sys/GameSettings/RMC.ini
@@ -1,4 +1,4 @@
-# R64E01 - RVL Wii Music
+# RMCE01, RMCJ01, RMCK01, RMCP01 - Mario Kart Wii
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RMCE01.ini b/Data/Sys/GameSettings/RMCE01.ini
deleted file mode 100644
index 282bb9385e..0000000000
--- a/Data/Sys/GameSettings/RMCE01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMCE01 - Mario Kart 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 =
-
-[OnLoad]
-# Add memory patches 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]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RMCJ01.ini b/Data/Sys/GameSettings/RMCJ01.ini
deleted file mode 100644
index d16270c912..0000000000
--- a/Data/Sys/GameSettings/RMCJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMCJ01 - Mario Kart 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 =
-
-[OnLoad]
-# Add memory patches 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]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RMCK01.ini b/Data/Sys/GameSettings/RMCK01.ini
deleted file mode 100644
index a3395b206a..0000000000
--- a/Data/Sys/GameSettings/RMCK01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMCK01 - Mario Kart 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 =
-
-[OnLoad]
-# Add memory patches 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]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RMCP01.ini b/Data/Sys/GameSettings/RMCP01.ini
deleted file mode 100644
index c2240f996b..0000000000
--- a/Data/Sys/GameSettings/RMCP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMCP01 - Mario Kart 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 =
-
-[OnLoad]
-# Add memory patches 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]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RMGK01.ini b/Data/Sys/GameSettings/RMG.ini
similarity index 90%
rename from Data/Sys/GameSettings/RMGK01.ini
rename to Data/Sys/GameSettings/RMG.ini
index 641656cb2b..ada303120e 100644
--- a/Data/Sys/GameSettings/RMGK01.ini
+++ b/Data/Sys/GameSettings/RMG.ini
@@ -1,4 +1,4 @@
-# RMGK01 - SUPER MARIO GALAXY
+# RMGE01, RMGJ01, RMGK01, RMGP01 - SUPER MARIO GALAXY
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RMGE01.ini b/Data/Sys/GameSettings/RMGE01.ini
deleted file mode 100644
index 25f30423bc..0000000000
--- a/Data/Sys/GameSettings/RMGE01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RMGE01 - SUPER MARIO GALAXY
-
-[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/RMGJ01.ini b/Data/Sys/GameSettings/RMGJ01.ini
deleted file mode 100644
index 14996d6239..0000000000
--- a/Data/Sys/GameSettings/RMGJ01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RMGJ01 - SUPER MARIO GALAXY
-
-[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/RMGP01.ini b/Data/Sys/GameSettings/RMGP01.ini
deleted file mode 100644
index 11151133ef..0000000000
--- a/Data/Sys/GameSettings/RMGP01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RMGP01 - SUPER MARIO GALAXY
-
-[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/RMKE01.ini b/Data/Sys/GameSettings/RMK.ini
similarity index 90%
rename from Data/Sys/GameSettings/RMKE01.ini
rename to Data/Sys/GameSettings/RMK.ini
index 7486ccb7e9..ac6f8ad742 100644
--- a/Data/Sys/GameSettings/RMKE01.ini
+++ b/Data/Sys/GameSettings/RMK.ini
@@ -1,4 +1,4 @@
-# RMKE01 - MARIO SPORTS MIX
+# RMKE01, RMKJ01, RMKP01 - MARIO SPORTS MIX
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RMKJ01.ini b/Data/Sys/GameSettings/RMKJ01.ini
deleted file mode 100644
index 0780e20b32..0000000000
--- a/Data/Sys/GameSettings/RMKJ01.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# RMKJ01 - MARIO SPORTS MIX
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RMKP01.ini b/Data/Sys/GameSettings/RMKP01.ini
deleted file mode 100644
index 1eee5258db..0000000000
--- a/Data/Sys/GameSettings/RMKP01.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# RMKP01 - MARIO SPORTS MIX
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RNEEDA.ini b/Data/Sys/GameSettings/RNE.ini
similarity index 85%
rename from Data/Sys/GameSettings/RNEEDA.ini
rename to Data/Sys/GameSettings/RNE.ini
index 002db3888a..9e83223ba7 100644
--- a/Data/Sys/GameSettings/RNEEDA.ini
+++ b/Data/Sys/GameSettings/RNE.ini
@@ -1,4 +1,4 @@
-# RNEEDA - NARUTO: Clash of Ninja Revolution 3
+# RNEEDA, RNEJDA, RNEPDA - NARUTO: Clash of Ninja Revolution 3
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RNEJDA.ini b/Data/Sys/GameSettings/RNEJDA.ini
deleted file mode 100644
index 84cbb82fde..0000000000
--- a/Data/Sys/GameSettings/RNEJDA.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RNEJDA - NARUTO GEKITOHNINJATAISEN EX3
-
-[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
-
diff --git a/Data/Sys/GameSettings/RNEPDA.ini b/Data/Sys/GameSettings/RNEPDA.ini
deleted file mode 100644
index 22869e6df4..0000000000
--- a/Data/Sys/GameSettings/RNEPDA.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RNEPDA - NARUTO: Clash of Ninja Revolution 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]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RNJE4F.ini b/Data/Sys/GameSettings/RNJ.ini
similarity index 92%
rename from Data/Sys/GameSettings/RNJE4F.ini
rename to Data/Sys/GameSettings/RNJ.ini
index 0bf5cb6c31..d4aee0e3d6 100644
--- a/Data/Sys/GameSettings/RNJE4F.ini
+++ b/Data/Sys/GameSettings/RNJ.ini
@@ -1,4 +1,4 @@
-# RNJE4F - Mini Ninjas
+# RNJE4F, RNJP4F - Mini Ninjas
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RNJP4F.ini b/Data/Sys/GameSettings/RNJP4F.ini
deleted file mode 100644
index f409085855..0000000000
--- a/Data/Sys/GameSettings/RNJP4F.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# RNJP4F - Mini Ninjas
-
-[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_Settings]
-FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/RNOP01.ini b/Data/Sys/GameSettings/RNO.ini
similarity index 92%
rename from Data/Sys/GameSettings/RNOP01.ini
rename to Data/Sys/GameSettings/RNO.ini
index 99cd73ec1b..2e5b145cbe 100644
--- a/Data/Sys/GameSettings/RNOP01.ini
+++ b/Data/Sys/GameSettings/RNO.ini
@@ -1,4 +1,4 @@
-# RNOP01 - Another Code:R
+# RNOJ01, RNOP01 - Another Code R Kioku no Tobira
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RNOJ01.ini b/Data/Sys/GameSettings/RNOJ01.ini
deleted file mode 100644
index 7db84b83e5..0000000000
--- a/Data/Sys/GameSettings/RNOJ01.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# RNOJ01 - Another Code R Kioku no Tobira
-
-[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 = Efb to Ram is needed for proper scene transition effect.
-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
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GF4E52.ini b/Data/Sys/GameSettings/RO9.ini
similarity index 94%
rename from Data/Sys/GameSettings/GF4E52.ini
rename to Data/Sys/GameSettings/RO9.ini
index 73e9c49ce9..b412c98a95 100644
--- a/Data/Sys/GameSettings/GF4E52.ini
+++ b/Data/Sys/GameSettings/RO9.ini
@@ -1,4 +1,4 @@
-# GF4E52 - Fantastic Four
+# RO9EFS, RO9PNK - Aqua Panic
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RO9EFS.ini b/Data/Sys/GameSettings/RO9EFS.ini
deleted file mode 100644
index 1f7363765c..0000000000
--- a/Data/Sys/GameSettings/RO9EFS.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RO9EFS - Aqua Panic
-
-[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/RO9PNK.ini b/Data/Sys/GameSettings/RO9PNK.ini
deleted file mode 100644
index 4300ade714..0000000000
--- a/Data/Sys/GameSettings/RO9PNK.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RO9PNK - Aqua Panic
-
-[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/ROAE36.ini b/Data/Sys/GameSettings/ROA.ini
similarity index 93%
rename from Data/Sys/GameSettings/ROAE36.ini
rename to Data/Sys/GameSettings/ROA.ini
index 6e7278c5d5..01f0b93e4d 100644
--- a/Data/Sys/GameSettings/ROAE36.ini
+++ b/Data/Sys/GameSettings/ROA.ini
@@ -1,4 +1,4 @@
-# ROAE36 - Overlord: Dark Legend
+# ROAE36, ROAP36 - Overlord: Dark Legend
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/ROAP36.ini b/Data/Sys/GameSettings/ROAP36.ini
deleted file mode 100644
index 2960d51fba..0000000000
--- a/Data/Sys/GameSettings/ROAP36.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# ROAP36 - Overlord: Dark Legend
-
-[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 = Accessing the map will crash the game (see issue 3953).
-
-[OnLoad]
-# Add memory patches 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/GKYP01.ini b/Data/Sys/GameSettings/ROD.ini
similarity index 89%
rename from Data/Sys/GameSettings/GKYP01.ini
rename to Data/Sys/GameSettings/ROD.ini
index 6b385b18df..e09924f1f7 100644
--- a/Data/Sys/GameSettings/GKYP01.ini
+++ b/Data/Sys/GameSettings/ROD.ini
@@ -1,4 +1,4 @@
-# GKYP01 - Kirby Air Ride
+# RODE01, RODJ01, RODK01, RODP01 - WarioWare: Smooth Moves
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RODE01.ini b/Data/Sys/GameSettings/RODE01.ini
deleted file mode 100644
index cbcb993212..0000000000
--- a/Data/Sys/GameSettings/RODE01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RODE01 - WarioWare: Smooth Moves
-
-[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]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RODJ01.ini b/Data/Sys/GameSettings/RODJ01.ini
deleted file mode 100644
index 0502597308..0000000000
--- a/Data/Sys/GameSettings/RODJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RODJ01 - WarioWare: Smooth Moves
-
-[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]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RODK01.ini b/Data/Sys/GameSettings/RODK01.ini
deleted file mode 100644
index e12d378e00..0000000000
--- a/Data/Sys/GameSettings/RODK01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RODK01 - WarioWare: Smooth Moves
-
-[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]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RODP01.ini b/Data/Sys/GameSettings/RODP01.ini
deleted file mode 100644
index 963f91bf98..0000000000
--- a/Data/Sys/GameSettings/RODP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RODP01 - WarioWare: Smooth Moves
-
-[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]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GEDP01.ini b/Data/Sys/GameSettings/ROL.ini
similarity index 86%
rename from Data/Sys/GameSettings/GEDP01.ini
rename to Data/Sys/GameSettings/ROL.ini
index 6b7e9f15ac..a0cec6ddde 100644
--- a/Data/Sys/GameSettings/GEDP01.ini
+++ b/Data/Sys/GameSettings/ROL.ini
@@ -1,4 +1,4 @@
-# GEDP01 - Eternal Darkness
+# ROLE8P, ROLJ01, ROLK01, ROLP8P - Mario & Sonic at the Olympic Winter Games
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/ROLE8P.ini b/Data/Sys/GameSettings/ROLE8P.ini
deleted file mode 100644
index 0c31b04899..0000000000
--- a/Data/Sys/GameSettings/ROLE8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# ROLE8P - Mario & Sonic at the Olympic Winter Games
-
-[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/ROLJ01.ini b/Data/Sys/GameSettings/ROLJ01.ini
deleted file mode 100644
index c35e8e8a92..0000000000
--- a/Data/Sys/GameSettings/ROLJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# ROLJ01 - Mario & Sonic at the Olympic Winter Games
-
-[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/ROLK01.ini b/Data/Sys/GameSettings/ROLK01.ini
deleted file mode 100644
index f8755bbcde..0000000000
--- a/Data/Sys/GameSettings/ROLK01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# ROLK01 - Mario & Sonic at the Olympic Winter Games
-
-[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/ROLP8P.ini b/Data/Sys/GameSettings/ROLP8P.ini
deleted file mode 100644
index abffb166bb..0000000000
--- a/Data/Sys/GameSettings/ROLP8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# ROLP8P - Mario & Sonic at the Olympic Winter Games
-
-[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/R64P01.ini b/Data/Sys/GameSettings/RON.ini
similarity index 88%
rename from Data/Sys/GameSettings/R64P01.ini
rename to Data/Sys/GameSettings/RON.ini
index fe5d4f09c4..9640dcaa51 100644
--- a/Data/Sys/GameSettings/R64P01.ini
+++ b/Data/Sys/GameSettings/RON.ini
@@ -1,4 +1,4 @@
-# R64P01 - RVL Wii Music
+# RONEG9, RONJG9, RONPG9 - Onechanbara: Bikini Zombie Slayers
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RONEG9.ini b/Data/Sys/GameSettings/RONEG9.ini
deleted file mode 100644
index 084aa1bef0..0000000000
--- a/Data/Sys/GameSettings/RONEG9.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RONEG9 - Onechanbara: Bikini Zombie Slayers
-
-[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_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RONJG9.ini b/Data/Sys/GameSettings/RONJG9.ini
deleted file mode 100644
index 495f7ef305..0000000000
--- a/Data/Sys/GameSettings/RONJG9.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RONJG9 - Onechanbara Revolution
-
-[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_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RONPG9.ini b/Data/Sys/GameSettings/RONPG9.ini
deleted file mode 100644
index 957cc0ce92..0000000000
--- a/Data/Sys/GameSettings/RONPG9.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RONPG9 - Onechanbara: Bikini Zombie Slayers
-
-[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_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GKOP6V.ini b/Data/Sys/GameSettings/ROU.ini
similarity index 88%
rename from Data/Sys/GameSettings/GKOP6V.ini
rename to Data/Sys/GameSettings/ROU.ini
index 488e15daf7..1e591e1e97 100644
--- a/Data/Sys/GameSettings/GKOP6V.ini
+++ b/Data/Sys/GameSettings/ROU.ini
@@ -1,4 +1,4 @@
-# GKOP6V - Kao the kangaroo
+# ROUJAF, ROUPAF - ONEPIECE UNLIMITED CRUISE EPISODE 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/ROUJAF.ini b/Data/Sys/GameSettings/ROUJAF.ini
deleted file mode 100644
index 05fb7caa6b..0000000000
--- a/Data/Sys/GameSettings/ROUJAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# ROUJAF - ONEPIECE UNLIMITED CRUISE EPISODE 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/ROUPAF.ini b/Data/Sys/GameSettings/ROUPAF.ini
deleted file mode 100644
index 668ee3e375..0000000000
--- a/Data/Sys/GameSettings/ROUPAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# ROUPAF - ONEPIECE UNLIMITED CRUISE EPISODE 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
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RPBE01.ini b/Data/Sys/GameSettings/RPB.ini
similarity index 91%
rename from Data/Sys/GameSettings/RPBE01.ini
rename to Data/Sys/GameSettings/RPB.ini
index eb8b54de0c..bdae6cedcc 100644
--- a/Data/Sys/GameSettings/RPBE01.ini
+++ b/Data/Sys/GameSettings/RPB.ini
@@ -1,4 +1,4 @@
-# RPBE01 - Pokemon Battle Revolution
+# RPBE01, RPBJ01, RPBP01 - Pokemon Battle Revolution
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RPBJ01.ini b/Data/Sys/GameSettings/RPBJ01.ini
deleted file mode 100644
index cc365fa653..0000000000
--- a/Data/Sys/GameSettings/RPBJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RPBJ01 - Pokemon Battle Revolution
-
-[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 texture cache set to "Safe"(r6906).
-
-[OnLoad]
-# Add memory patches 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/RPBP01.ini b/Data/Sys/GameSettings/RPBP01.ini
deleted file mode 100644
index a3194cd9ea..0000000000
--- a/Data/Sys/GameSettings/RPBP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RPBP01 - Pokemon Battle Revolution
-
-[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 texture cache set to "Safe"(r6906).
-
-[OnLoad]
-# Add memory patches 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/RPJE7U.ini b/Data/Sys/GameSettings/RPJ.ini
similarity index 93%
rename from Data/Sys/GameSettings/RPJE7U.ini
rename to Data/Sys/GameSettings/RPJ.ini
index 43b29cf6ab..0f1307d3e2 100644
--- a/Data/Sys/GameSettings/RPJE7U.ini
+++ b/Data/Sys/GameSettings/RPJ.ini
@@ -1,4 +1,4 @@
-# RPJE7U - ARC RISE FANTASIA
+# RPJE7U, RPJJ99 - ARC RISE FANTASIA
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RPJJ99.ini b/Data/Sys/GameSettings/RPJJ99.ini
deleted file mode 100644
index 22c655b054..0000000000
--- a/Data/Sys/GameSettings/RPJJ99.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# RPJJ99 - ARC RISE FANTASIA
-
-[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]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/RPOPC8.ini b/Data/Sys/GameSettings/RPO.ini
similarity index 94%
rename from Data/Sys/GameSettings/RPOPC8.ini
rename to Data/Sys/GameSettings/RPO.ini
index 1b2863ef93..479d793dda 100644
--- a/Data/Sys/GameSettings/RPOPC8.ini
+++ b/Data/Sys/GameSettings/RPO.ini
@@ -1,4 +1,4 @@
-# RPOPC8 - Opoona
+# RPOEC8, RPOJC8, RPOPC8 - Opoona
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RPOEC8.ini b/Data/Sys/GameSettings/RPOEC8.ini
deleted file mode 100644
index 936bd7f8dc..0000000000
--- a/Data/Sys/GameSettings/RPOEC8.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RPOEC8 - Opoona
-
-[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 = Jerky videos need safe cache.
-
-[OnLoad]
-# Add memory patches 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
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RPOJC8.ini b/Data/Sys/GameSettings/RPOJC8.ini
deleted file mode 100644
index e74c353855..0000000000
--- a/Data/Sys/GameSettings/RPOJC8.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RPOJC8 - Opoona
-
-[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 = Jerky videos need safe cache.
-
-[OnLoad]
-# Add memory patches 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
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RPWX41.ini b/Data/Sys/GameSettings/RPW.ini
similarity index 91%
rename from Data/Sys/GameSettings/RPWX41.ini
rename to Data/Sys/GameSettings/RPW.ini
index d592f3ad78..891221ef43 100644
--- a/Data/Sys/GameSettings/RPWX41.ini
+++ b/Data/Sys/GameSettings/RPW.ini
@@ -1,4 +1,4 @@
-# RPWX41 - Prince of Persia Forgotten Sands
+# RPWX41, RPWZ41 - Prince of Persia Forgotten Sands
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RPWZ41.ini b/Data/Sys/GameSettings/RPWZ41.ini
deleted file mode 100644
index aa5ba41a1c..0000000000
--- a/Data/Sys/GameSettings/RPWZ41.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RPWZ41 - Prince of Persia Forgotten Sands
-
-[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 = EFB to Ram is needed for proper shadows.
-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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RQ6EJJ.ini b/Data/Sys/GameSettings/RQ6.ini
similarity index 92%
rename from Data/Sys/GameSettings/RQ6EJJ.ini
rename to Data/Sys/GameSettings/RQ6.ini
index 8b57337eef..fcc583851e 100644
--- a/Data/Sys/GameSettings/RQ6EJJ.ini
+++ b/Data/Sys/GameSettings/RQ6.ini
@@ -1,4 +1,4 @@
-# RQ6EJJ - Cursed Mountain
+# RQ6EJJ, RQ6PKM, RQ6XKM - Cursed Mountain
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RQ6PKM.ini b/Data/Sys/GameSettings/RQ6PKM.ini
deleted file mode 100644
index 6ece888372..0000000000
--- a/Data/Sys/GameSettings/RQ6PKM.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RQ6PKM - Cursed Mountain
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Use direct 3d 11 for less 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
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/RQ6XKM.ini b/Data/Sys/GameSettings/RQ6XKM.ini
deleted file mode 100644
index 154861057c..0000000000
--- a/Data/Sys/GameSettings/RQ6XKM.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RQ6XKM - Cursed Mountain
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Use direct 3d 11 for less 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
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/RQREXJ.ini b/Data/Sys/GameSettings/RQR.ini
similarity index 91%
rename from Data/Sys/GameSettings/RQREXJ.ini
rename to Data/Sys/GameSettings/RQR.ini
index f2a575cafd..b7b999d655 100644
--- a/Data/Sys/GameSettings/RQREXJ.ini
+++ b/Data/Sys/GameSettings/RQR.ini
@@ -1,4 +1,4 @@
-# RQREXJ - The Sky Crawlers
+# RQREXJ, RQRJAF, RQRPAF - The Sky Crawlers
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RQRJAF.ini b/Data/Sys/GameSettings/RQRJAF.ini
deleted file mode 100644
index fe37b3a663..0000000000
--- a/Data/Sys/GameSettings/RQRJAF.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RQRJAF - The Sky Crawlers
-
-[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 = Needs single core to run properly(r7436).
-
-[OnLoad]
-# Add memory patches 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/RQRPAF.ini b/Data/Sys/GameSettings/RQRPAF.ini
deleted file mode 100644
index 1daed0c83b..0000000000
--- a/Data/Sys/GameSettings/RQRPAF.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RQRPAF - The Sky Crawlers
-
-[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 = Needs single core to run properly(r7436).
-
-[OnLoad]
-# Add memory patches 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/RRBE41.ini b/Data/Sys/GameSettings/RRB.ini
similarity index 91%
rename from Data/Sys/GameSettings/RRBE41.ini
rename to Data/Sys/GameSettings/RRB.ini
index 99902d304b..47589baa85 100644
--- a/Data/Sys/GameSettings/RRBE41.ini
+++ b/Data/Sys/GameSettings/RRB.ini
@@ -1,4 +1,4 @@
-# RRBE41 - Rayman Raving Rabbids
+# RRBE41, RRBJ41, RRBP41 - Rayman Raving Rabbids
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RRBJ41.ini b/Data/Sys/GameSettings/RRBJ41.ini
deleted file mode 100644
index e25ffcfb13..0000000000
--- a/Data/Sys/GameSettings/RRBJ41.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RRBJ41 - Rayman Raving Rabbids
-
-[Core]
-# Values set here will override the main dolphin settings.
-SyncGPU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Synchronise GPU thread for stability. Use direct3d11 for less 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
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RRBP41.ini b/Data/Sys/GameSettings/RRBP41.ini
deleted file mode 100644
index 01f06122dd..0000000000
--- a/Data/Sys/GameSettings/RRBP41.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RRBP41 - Rayman Raving Rabbids
-
-[Core]
-# Values set here will override the main dolphin settings.
-SyncGPU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Synchronise GPU thread for stability. Use direct3d11 for less 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
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RBBE18.ini b/Data/Sys/GameSettings/RRK.ini
similarity index 93%
rename from Data/Sys/GameSettings/RBBE18.ini
rename to Data/Sys/GameSettings/RRK.ini
index df8293a3a4..5df03e30c8 100644
--- a/Data/Sys/GameSettings/RBBE18.ini
+++ b/Data/Sys/GameSettings/RRK.ini
@@ -1,4 +1,4 @@
-# RBBE18 - Bomberman Land
+# RRKE70, RRKP70 - Alone In The Dark
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RRKE70.ini b/Data/Sys/GameSettings/RRKE70.ini
deleted file mode 100644
index 64b63f4aa0..0000000000
--- a/Data/Sys/GameSettings/RRKE70.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# RRKE70 - Alone In The Dark
-
-[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/RRKP70.ini b/Data/Sys/GameSettings/RRKP70.ini
deleted file mode 100644
index 5f38e5fca7..0000000000
--- a/Data/Sys/GameSettings/RRKP70.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# RRKP70 - Alone In The Dark
-
-[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/GF4P52.ini b/Data/Sys/GameSettings/RRZ.ini
similarity index 92%
rename from Data/Sys/GameSettings/GF4P52.ini
rename to Data/Sys/GameSettings/RRZ.ini
index cbb32a4a99..b4e8f79baa 100644
--- a/Data/Sys/GameSettings/GF4P52.ini
+++ b/Data/Sys/GameSettings/RRZ.ini
@@ -1,4 +1,4 @@
-# GF4P52 - Fantastic Four
+# RRZEGY, RRZPGY - Rubik's Puzzle World
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RRZEGY.ini b/Data/Sys/GameSettings/RRZEGY.ini
deleted file mode 100644
index 9fcc05b9ad..0000000000
--- a/Data/Sys/GameSettings/RRZEGY.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RRZEGY - Rubik's Puzzle World
-
-[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/RRZPGY.ini b/Data/Sys/GameSettings/RRZPGY.ini
deleted file mode 100644
index 613eeb106f..0000000000
--- a/Data/Sys/GameSettings/RRZPGY.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RRZPGY - Rubik's Puzzle World
-
-[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/R64K01.ini b/Data/Sys/GameSettings/RS5.ini
similarity index 90%
rename from Data/Sys/GameSettings/R64K01.ini
rename to Data/Sys/GameSettings/RS5.ini
index 3f913f80ea..ed88dd8ce1 100644
--- a/Data/Sys/GameSettings/R64K01.ini
+++ b/Data/Sys/GameSettings/RS5.ini
@@ -1,4 +1,4 @@
-# R64K01 - RVL Wii Music
+# RS5EC8, RS5JC8, RS5PC8 - SAMURAI WARRIORS KATANA
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RS5EC8.ini b/Data/Sys/GameSettings/RS5EC8.ini
deleted file mode 100644
index a8c73b7487..0000000000
--- a/Data/Sys/GameSettings/RS5EC8.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RS5EC8 - SAMURAI WARRIORS KATANA
-
-[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_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RS5JC8.ini b/Data/Sys/GameSettings/RS5JC8.ini
deleted file mode 100644
index c6069b95f1..0000000000
--- a/Data/Sys/GameSettings/RS5JC8.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RS5JC8 - Sengoku Musou KATANA
-
-[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_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RS5PC8.ini b/Data/Sys/GameSettings/RS5PC8.ini
deleted file mode 100644
index 23872b8d5c..0000000000
--- a/Data/Sys/GameSettings/RS5PC8.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RS5PC8 - SAMURAI WARRIORS KATANA
-
-[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_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RS9.ini b/Data/Sys/GameSettings/RS9.ini
new file mode 100644
index 0000000000..6ae85e6bee
--- /dev/null
+++ b/Data/Sys/GameSettings/RS9.ini
@@ -0,0 +1,19 @@
+# RS9E8P, RS9P8P - SONIC RIDERS ZERO GRAVITY
+
+[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/RS9E8P.ini b/Data/Sys/GameSettings/RS9E8P.ini
deleted file mode 100644
index 5cbe571485..0000000000
--- a/Data/Sys/GameSettings/RS9E8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RS9E8P - SONIC RIDERS ZERO GRAVITY
-
-[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/RS9P8P.ini b/Data/Sys/GameSettings/RS9P8P.ini
deleted file mode 100644
index cb6a3afecd..0000000000
--- a/Data/Sys/GameSettings/RS9P8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RS9P8P - SONIC RIDERS ZERO GRAVITY
-
-[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/RSBE01.ini b/Data/Sys/GameSettings/RSB.ini
similarity index 90%
rename from Data/Sys/GameSettings/RSBE01.ini
rename to Data/Sys/GameSettings/RSB.ini
index bad9e271c3..be0a7d8d02 100644
--- a/Data/Sys/GameSettings/RSBE01.ini
+++ b/Data/Sys/GameSettings/RSB.ini
@@ -1,4 +1,4 @@
-# RSBE01 - Super Smash Bros. Brawl
+# RSBE01, RSBJ01, RSBK01 - Super Smash Bros. Brawl
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/RSBJ01.ini b/Data/Sys/GameSettings/RSBJ01.ini
deleted file mode 100644
index e9b1cffe09..0000000000
--- a/Data/Sys/GameSettings/RSBJ01.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RSBJ01 - Super Smash Bros. Brawl
-
-[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 = Classic mode score report needs real xfb. Nes masterpieces and ingame screnshots need efb to ram, STC is needed too for masterpieces.
-
-[OnLoad]
-# Add memory 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/RSBK01.ini b/Data/Sys/GameSettings/RSBK01.ini
deleted file mode 100644
index 7020e859dd..0000000000
--- a/Data/Sys/GameSettings/RSBK01.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RSBK01 - Super Smash Bros. Brawl
-
-[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 = Classic mode score report needs real xfb. Nes masterpieces and ingame screnshots need efb to ram, STC is needed too for masterpieces.
-
-[OnLoad]
-# Add memory 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/RSFE7U.ini b/Data/Sys/GameSettings/RSF.ini
similarity index 90%
rename from Data/Sys/GameSettings/RSFE7U.ini
rename to Data/Sys/GameSettings/RSF.ini
index 8e7f0ce4bc..bebdc17e10 100644
--- a/Data/Sys/GameSettings/RSFE7U.ini
+++ b/Data/Sys/GameSettings/RSF.ini
@@ -1,4 +1,4 @@
-# RSFE7U - MURAMASA: THE DEMON BLADE
+# RSFE7U, RSFJ99, RSFP99 - MURAMASA: THE DEMON BLADE
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RSFJ99.ini b/Data/Sys/GameSettings/RSFJ99.ini
deleted file mode 100644
index 2aed6ff93d..0000000000
--- a/Data/Sys/GameSettings/RSFJ99.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RSFJ99 - Oboro Muramasa
-
-[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]
-EFBScale = -1
-
diff --git a/Data/Sys/GameSettings/RSFP99.ini b/Data/Sys/GameSettings/RSFP99.ini
deleted file mode 100644
index ac3998b8e9..0000000000
--- a/Data/Sys/GameSettings/RSFP99.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RSFP99 - MURAMASA: THE DEMON 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]
-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/RSHK69.ini b/Data/Sys/GameSettings/RSH.ini
similarity index 90%
rename from Data/Sys/GameSettings/RSHK69.ini
rename to Data/Sys/GameSettings/RSH.ini
index 24ab58a54e..c81b95feb2 100644
--- a/Data/Sys/GameSettings/RSHK69.ini
+++ b/Data/Sys/GameSettings/RSH.ini
@@ -1,4 +1,4 @@
-# RSHK69 - MySims Kingdom
+# RSHE69, RSHJ13, RSHK69, RSHP69 - MySims Kingdom
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/RSHE69.ini b/Data/Sys/GameSettings/RSHE69.ini
deleted file mode 100644
index febf3a1df0..0000000000
--- a/Data/Sys/GameSettings/RSHE69.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RSHE69 - MySims Kingdom
-
-[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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 3072
diff --git a/Data/Sys/GameSettings/RSHJ13.ini b/Data/Sys/GameSettings/RSHJ13.ini
deleted file mode 100644
index 9f6205bda8..0000000000
--- a/Data/Sys/GameSettings/RSHJ13.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RSHJ13 - MySims Kingdom
-
-[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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 3072
diff --git a/Data/Sys/GameSettings/RSHP69.ini b/Data/Sys/GameSettings/RSHP69.ini
deleted file mode 100644
index 9b373a8af9..0000000000
--- a/Data/Sys/GameSettings/RSHP69.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RSHP69 - MySims Kingdom
-
-[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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 3072
diff --git a/Data/Sys/GameSettings/RSIE69.ini b/Data/Sys/GameSettings/RSI.ini
similarity index 94%
rename from Data/Sys/GameSettings/RSIE69.ini
rename to Data/Sys/GameSettings/RSI.ini
index 28ad5e7d6e..0ed458dd71 100644
--- a/Data/Sys/GameSettings/RSIE69.ini
+++ b/Data/Sys/GameSettings/RSI.ini
@@ -1,4 +1,4 @@
-# RSIE69 - MySims
+# RSIE69, RSIJ13, RSIP69 - MySims
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RSIJ13.ini b/Data/Sys/GameSettings/RSIJ13.ini
deleted file mode 100644
index 70868f1339..0000000000
--- a/Data/Sys/GameSettings/RSIJ13.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RSIJ13 - Boku To Sim No Machi
-
-[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
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/RSIP69.ini b/Data/Sys/GameSettings/RSIP69.ini
deleted file mode 100644
index f9599be638..0000000000
--- a/Data/Sys/GameSettings/RSIP69.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RSIP69 - MySims
-
-[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
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/G4MP69.ini b/Data/Sys/GameSettings/RSL.ini
similarity index 90%
rename from Data/Sys/GameSettings/G4MP69.ini
rename to Data/Sys/GameSettings/RSL.ini
index b299c43c08..ddefe48411 100644
--- a/Data/Sys/GameSettings/G4MP69.ini
+++ b/Data/Sys/GameSettings/RSL.ini
@@ -1,4 +1,4 @@
-# G4MP69 - The Sims: Bustin Out GameCube
+# RSLEAF, RSLJAF, RSLKAF, RSLPAF - SOULCALIBUR Legends
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RSLEAF.ini b/Data/Sys/GameSettings/RSLEAF.ini
deleted file mode 100644
index ab426968f3..0000000000
--- a/Data/Sys/GameSettings/RSLEAF.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RSLEAF - SOULCALIBUR 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 =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RSLJAF.ini b/Data/Sys/GameSettings/RSLJAF.ini
deleted file mode 100644
index 95876f5e69..0000000000
--- a/Data/Sys/GameSettings/RSLJAF.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RSLJAF - SOULCALIBUR 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 =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RSLKAF.ini b/Data/Sys/GameSettings/RSLKAF.ini
deleted file mode 100644
index 59dd26bc8d..0000000000
--- a/Data/Sys/GameSettings/RSLKAF.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RSLKAF - SOULCALIBUR 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 =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RSLPAF.ini b/Data/Sys/GameSettings/RSLPAF.ini
deleted file mode 100644
index 2b01a5c4d2..0000000000
--- a/Data/Sys/GameSettings/RSLPAF.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RSLPAF - SOULCALIBUR 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 =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RSMJ8P.ini b/Data/Sys/GameSettings/RSM.ini
similarity index 88%
rename from Data/Sys/GameSettings/RSMJ8P.ini
rename to Data/Sys/GameSettings/RSM.ini
index 898dfe57d4..14add78ce2 100644
--- a/Data/Sys/GameSettings/RSMJ8P.ini
+++ b/Data/Sys/GameSettings/RSM.ini
@@ -1,4 +1,4 @@
-# RSMJ8P - SUPER MONKEY BALL BANANA BLITZ
+# RSME8P, RSMJ8P - SUPER MONKEY BALL BANANA BLITZ
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RSME8P.ini b/Data/Sys/GameSettings/RSME8P.ini
deleted file mode 100644
index 9c4ecb6a12..0000000000
--- a/Data/Sys/GameSettings/RSME8P.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RSME8P - SUPER MONKEY BALL BANANA BLITZ
-
-[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.
-
diff --git a/Data/Sys/GameSettings/RSNF69.ini b/Data/Sys/GameSettings/RSN.ini
similarity index 90%
rename from Data/Sys/GameSettings/RSNF69.ini
rename to Data/Sys/GameSettings/RSN.ini
index 278d78d288..a6ece563c6 100644
--- a/Data/Sys/GameSettings/RSNF69.ini
+++ b/Data/Sys/GameSettings/RSN.ini
@@ -1,4 +1,4 @@
-# RSNF69 - The Simpsons Game
+# RSND69, RSNE69, RSNF69, RSNP69, RSNX69 - The Simpsons Game
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/RSND69.ini b/Data/Sys/GameSettings/RSND69.ini
deleted file mode 100644
index 83c4d0af5c..0000000000
--- a/Data/Sys/GameSettings/RSND69.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RSND69 - The Simpsons Game
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Unstable with 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_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RSNE69.ini b/Data/Sys/GameSettings/RSNE69.ini
deleted file mode 100644
index e15a41fa09..0000000000
--- a/Data/Sys/GameSettings/RSNE69.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RSNE69 - The Simpsons Game
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Unstable with 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_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RSNP69.ini b/Data/Sys/GameSettings/RSNP69.ini
deleted file mode 100644
index 72d64e933c..0000000000
--- a/Data/Sys/GameSettings/RSNP69.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RSNP69 - The Simpsons Game
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Unstable with 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_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RSNX69.ini b/Data/Sys/GameSettings/RSNX69.ini
deleted file mode 100644
index 981064d27b..0000000000
--- a/Data/Sys/GameSettings/RSNX69.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RSNX69 - The Simpsons Game
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Unstable with 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_Enhancements]
-MaxAnisotropy = 0
-ForceFiltering = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RSPJ01.ini b/Data/Sys/GameSettings/RSP.ini
similarity index 90%
rename from Data/Sys/GameSettings/RSPJ01.ini
rename to Data/Sys/GameSettings/RSP.ini
index c365686121..3e8902a165 100644
--- a/Data/Sys/GameSettings/RSPJ01.ini
+++ b/Data/Sys/GameSettings/RSP.ini
@@ -1,4 +1,4 @@
-# RSPJ01 - SPORTS PACK for REVOLUTION
+# RSPE01, RSPJ01, RSPP01 - Wii Sports
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RSPP01.ini b/Data/Sys/GameSettings/RSPP01.ini
deleted file mode 100644
index 78d5c78d25..0000000000
--- a/Data/Sys/GameSettings/RSPP01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RSPP01 - SPORTS PACK for REVOLUTION
-
-[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
-
diff --git a/Data/Sys/GameSettings/RSXJ13.ini b/Data/Sys/GameSettings/RSX.ini
similarity index 93%
rename from Data/Sys/GameSettings/RSXJ13.ini
rename to Data/Sys/GameSettings/RSX.ini
index 11ed8e40ea..836022d51c 100644
--- a/Data/Sys/GameSettings/RSXJ13.ini
+++ b/Data/Sys/GameSettings/RSX.ini
@@ -1,4 +1,4 @@
-# RSXJ13 - SSX Blur
+# RSXE69, RSXJ13, RSXK69, RSXP69 - SSX Blur
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RSXE69.ini b/Data/Sys/GameSettings/RSXE69.ini
deleted file mode 100644
index e4b6061b6b..0000000000
--- a/Data/Sys/GameSettings/RSXE69.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RSXE69 - SSX Blur
-
-[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 Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
-
-[OnLoad]
-# Add memory patches 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
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/RSXK69.ini b/Data/Sys/GameSettings/RSXK69.ini
deleted file mode 100644
index de43814a21..0000000000
--- a/Data/Sys/GameSettings/RSXK69.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RSXK69 - SSX Blur
-
-[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 Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
-
-[OnLoad]
-# Add memory patches 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
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/RSXP69.ini b/Data/Sys/GameSettings/RSXP69.ini
deleted file mode 100644
index 84904587b3..0000000000
--- a/Data/Sys/GameSettings/RSXP69.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RSXP69 - SSX 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 = Needs Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
-
-[OnLoad]
-# Add memory patches 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
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/RT3E54.ini b/Data/Sys/GameSettings/RT3.ini
similarity index 78%
rename from Data/Sys/GameSettings/RT3E54.ini
rename to Data/Sys/GameSettings/RT3.ini
index 8311ae7234..9f87dbdd75 100644
--- a/Data/Sys/GameSettings/RT3E54.ini
+++ b/Data/Sys/GameSettings/RT3.ini
@@ -1,4 +1,4 @@
-# RT3E54 - Rockstar Games presents Table Tennis
+# RT3E54, RT3JEL, RT3P54 - Rockstar Games presents Table Tennis
 [Core]
 [EmuState]
 EmulationStateId = 3
diff --git a/Data/Sys/GameSettings/RT3JEL.ini b/Data/Sys/GameSettings/RT3JEL.ini
deleted file mode 100644
index 63007e740a..0000000000
--- a/Data/Sys/GameSettings/RT3JEL.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# RT3JEL - Rockstar Games presents Table Tennis
-[Core]
-[EmuState]
-EmulationStateId = 3
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[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/RT3P54.ini b/Data/Sys/GameSettings/RT3P54.ini
deleted file mode 100644
index 9a4a5c9402..0000000000
--- a/Data/Sys/GameSettings/RT3P54.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# RT3P54 - Rockstar Games presents Table Tennis
-[Core]
-[EmuState]
-EmulationStateId = 3
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[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/RT4JAF.ini b/Data/Sys/GameSettings/RT4.ini
similarity index 88%
rename from Data/Sys/GameSettings/RT4JAF.ini
rename to Data/Sys/GameSettings/RT4.ini
index 40836caa13..5a3ff440e3 100644
--- a/Data/Sys/GameSettings/RT4JAF.ini
+++ b/Data/Sys/GameSettings/RT4.ini
@@ -1,4 +1,4 @@
-# RT4JAF - Tales Of Symphonia Ratatosk no Kishi
+# RT4EAF, RT4JAF, RT4PAF - Tales of Symphonia -Dawn of the new world-
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RT4PAF.ini b/Data/Sys/GameSettings/RT4PAF.ini
deleted file mode 100644
index cba434f490..0000000000
--- a/Data/Sys/GameSettings/RT4PAF.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RT4PAF - Tales of Symphonia -Dawn of the new world-
-
-[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 emulating format changes (r6871)
-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_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RTME41.ini b/Data/Sys/GameSettings/RTM.ini
similarity index 95%
rename from Data/Sys/GameSettings/RTME41.ini
rename to Data/Sys/GameSettings/RTM.ini
index d844520c77..7ad2c91d3f 100644
--- a/Data/Sys/GameSettings/RTME41.ini
+++ b/Data/Sys/GameSettings/RTM.ini
@@ -1,4 +1,4 @@
-# RTME41 - TMNT
+# RTME41, RTMP41 - TMNT
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RTMP41.ini b/Data/Sys/GameSettings/RTMP41.ini
deleted file mode 100644
index da324711b0..0000000000
--- a/Data/Sys/GameSettings/RTMP41.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RTMP41 - TMNT
-
-[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 = Fog emulation creates problems with the game (see issue 4922).
-
-[OnLoad]
-# Add memory patches 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]
-DisableFog = True
-
diff --git a/Data/Sys/GameSettings/GHCF4Q.ini b/Data/Sys/GameSettings/RTN.ini
similarity index 92%
rename from Data/Sys/GameSettings/GHCF4Q.ini
rename to Data/Sys/GameSettings/RTN.ini
index c2fbd1b96e..686c5ff7ae 100644
--- a/Data/Sys/GameSettings/GHCF4Q.ini
+++ b/Data/Sys/GameSettings/RTN.ini
@@ -1,4 +1,4 @@
-# GHCF4Q - Chicken Little
+# RTNE41, RTNJCQ, RTNP41 - Tenchu
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RTNJCQ.ini b/Data/Sys/GameSettings/RTNJCQ.ini
deleted file mode 100644
index 8f0dbb34c1..0000000000
--- a/Data/Sys/GameSettings/RTNJCQ.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RTNJCQ - Tenchu 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 = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RTNP41.ini b/Data/Sys/GameSettings/RTNP41.ini
deleted file mode 100644
index 01a166ea51..0000000000
--- a/Data/Sys/GameSettings/RTNP41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RTNP41 - Tenchu
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RTZ.ini b/Data/Sys/GameSettings/RTZ.ini
new file mode 100644
index 0000000000..556a43948c
--- /dev/null
+++ b/Data/Sys/GameSettings/RTZ.ini
@@ -0,0 +1,31 @@
+# RTZE08, RTZJ08, RTZK08, RTZP08 - Zack and Wiki: Quest for Barbaros' Treasure
+
+[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/RTZE08.ini b/Data/Sys/GameSettings/RTZE08.ini
deleted file mode 100644
index 3f2d1662d6..0000000000
--- a/Data/Sys/GameSettings/RTZE08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RTZE08 - Zack and Wiki: Quest for Barbaros' Treasure
-
-[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/RTZJ08.ini b/Data/Sys/GameSettings/RTZJ08.ini
deleted file mode 100644
index 1878932462..0000000000
--- a/Data/Sys/GameSettings/RTZJ08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RTZJ08 - Zack and Wiki: Quest for Barbaros' Treasure
-
-[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/RTZK08.ini b/Data/Sys/GameSettings/RTZK08.ini
deleted file mode 100644
index e4b9ba2889..0000000000
--- a/Data/Sys/GameSettings/RTZK08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RTZK08 - Zack and Wiki: Quest for Barbaros' Treasure
-
-[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/RTZP08.ini b/Data/Sys/GameSettings/RTZP08.ini
deleted file mode 100644
index d32451f265..0000000000
--- a/Data/Sys/GameSettings/RTZP08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RTZP08 - Zack and Wiki: Quest for Barbaros' Treasure
-
-[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/RUUE01.ini b/Data/Sys/GameSettings/RUU.ini
similarity index 88%
rename from Data/Sys/GameSettings/RUUE01.ini
rename to Data/Sys/GameSettings/RUU.ini
index 1625ea981e..92699835b3 100644
--- a/Data/Sys/GameSettings/RUUE01.ini
+++ b/Data/Sys/GameSettings/RUU.ini
@@ -1,4 +1,4 @@
-# RUUE01 - Animal Crossing Wii
+# RUUE01, RUUJ01, RUUK01, RUUP01 - Animal Crossing Wii
 [Core]
 # Values set here will override the main dolphin settings.
 [EmuState]
diff --git a/Data/Sys/GameSettings/RUUJ01.ini b/Data/Sys/GameSettings/RUUJ01.ini
deleted file mode 100644
index 294412f3d2..0000000000
--- a/Data/Sys/GameSettings/RUUJ01.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# RUUJ01 - Animal Crossing 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 = 
-[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]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RUUK01.ini b/Data/Sys/GameSettings/RUUK01.ini
deleted file mode 100644
index b12b52cfd2..0000000000
--- a/Data/Sys/GameSettings/RUUK01.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# RUUK01 - Animal Crossing 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 = 
-[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]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RUUP01.ini b/Data/Sys/GameSettings/RUUP01.ini
deleted file mode 100644
index b1c4cb4cde..0000000000
--- a/Data/Sys/GameSettings/RUUP01.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# RUUP01 - Animal Crossing 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 = 
-[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]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RVKEXJ.ini b/Data/Sys/GameSettings/RVK.ini
similarity index 91%
rename from Data/Sys/GameSettings/RVKEXJ.ini
rename to Data/Sys/GameSettings/RVK.ini
index ffe181bffd..8d4eb9a2e0 100644
--- a/Data/Sys/GameSettings/RVKEXJ.ini
+++ b/Data/Sys/GameSettings/RVK.ini
@@ -1,4 +1,4 @@
-# RVKEXJ - VALHALLA KNIGHTS
+# RVKEXJ, RVKP99 - VALHALLA KNIGHTS
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RVKP99.ini b/Data/Sys/GameSettings/RVKP99.ini
deleted file mode 100644
index c7b63afcbc..0000000000
--- a/Data/Sys/GameSettings/RVKP99.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RVKP99 - ELDAR SAGA
-
-[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
-
diff --git a/Data/Sys/GameSettings/R5VP41.ini b/Data/Sys/GameSettings/RWR.ini
similarity index 91%
rename from Data/Sys/GameSettings/R5VP41.ini
rename to Data/Sys/GameSettings/RWR.ini
index bee1525b04..cdb07b8ee3 100644
--- a/Data/Sys/GameSettings/R5VP41.ini
+++ b/Data/Sys/GameSettings/RWR.ini
@@ -1,4 +1,4 @@
-# R5VP41 - James Cameron's AVATAR
+# RWRE4F, RWRP4F - Wacky Races: Crash & Dash
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RWRE4F.ini b/Data/Sys/GameSettings/RWRE4F.ini
deleted file mode 100644
index eb17135e89..0000000000
--- a/Data/Sys/GameSettings/RWRE4F.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RWRE4F - Wacky Races: Crash & Dash
-
-[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_Hacks]
-
diff --git a/Data/Sys/GameSettings/RWRP4F.ini b/Data/Sys/GameSettings/RWRP4F.ini
deleted file mode 100644
index 07f774018e..0000000000
--- a/Data/Sys/GameSettings/RWRP4F.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RWRP4F - Wacky Races: Crash & Dash
-
-[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_Hacks]
-
diff --git a/Data/Sys/GameSettings/RT4EAF.ini b/Data/Sys/GameSettings/RWS.ini
similarity index 88%
rename from Data/Sys/GameSettings/RT4EAF.ini
rename to Data/Sys/GameSettings/RWS.ini
index d127022079..201e7a69b2 100644
--- a/Data/Sys/GameSettings/RT4EAF.ini
+++ b/Data/Sys/GameSettings/RWS.ini
@@ -1,12 +1,12 @@
-# RT4EAF - Tales of Symphonia -Dawn of the new world-
+# RWSE8P, RWSJ01, RWSK01, RWSP8P - MARIO & SONIC At The OlympicGames
 
 [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 emulating format changes (r6871)
 EmulationStateId = 4
+EmulationIssues = Needs emulating format changes (r6871)
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/RWSE8P.ini b/Data/Sys/GameSettings/RWSE8P.ini
deleted file mode 100644
index a32dc9f78a..0000000000
--- a/Data/Sys/GameSettings/RWSE8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RWSE8P - MARIO & SONIC At The OlympicGames
-
-[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 emulating format changes (r6871)
-
-[OnLoad]
-# Add memory patches 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]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RWSJ01.ini b/Data/Sys/GameSettings/RWSJ01.ini
deleted file mode 100644
index 655759d260..0000000000
--- a/Data/Sys/GameSettings/RWSJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RWSJ01 - MARIO & SONIC At The OlympicGames
-
-[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 emulating format changes (r6871)
-
-[OnLoad]
-# Add memory patches 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]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RWSK01.ini b/Data/Sys/GameSettings/RWSK01.ini
deleted file mode 100644
index aec34e5629..0000000000
--- a/Data/Sys/GameSettings/RWSK01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RWSK01 - MARIO & SONIC At The OlympicGames
-
-[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 emulating format changes (r6871)
-
-[OnLoad]
-# Add memory patches 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]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RWSP8P.ini b/Data/Sys/GameSettings/RWSP8P.ini
deleted file mode 100644
index a61eab14c0..0000000000
--- a/Data/Sys/GameSettings/RWSP8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RWSP8P - MARIO & SONIC At The OlympicGames
-
-[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 emulating format changes (r6871)
-
-[OnLoad]
-# Add memory patches 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]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RX9.ini b/Data/Sys/GameSettings/RX9.ini
new file mode 100644
index 0000000000..0509534353
--- /dev/null
+++ b/Data/Sys/GameSettings/RX9.ini
@@ -0,0 +1,18 @@
+# RX9P69, RX9Y69 - Need for Speed(tm) Undercover
+
+[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/RX9P69.ini b/Data/Sys/GameSettings/RX9P69.ini
deleted file mode 100644
index 982d65ad4d..0000000000
--- a/Data/Sys/GameSettings/RX9P69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RX9P69 - Need for Speed(tm) Undercover
-
-[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/RX9Y69.ini b/Data/Sys/GameSettings/RX9Y69.ini
deleted file mode 100644
index 3344899a68..0000000000
--- a/Data/Sys/GameSettings/RX9Y69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RX9Y69 - Need for Speed(tm) Undercover
-
-[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/RXXE4Q.ini b/Data/Sys/GameSettings/RXX.ini
similarity index 92%
rename from Data/Sys/GameSettings/RXXE4Q.ini
rename to Data/Sys/GameSettings/RXX.ini
index 7a910902aa..b764b372cb 100644
--- a/Data/Sys/GameSettings/RXXE4Q.ini
+++ b/Data/Sys/GameSettings/RXX.ini
@@ -1,4 +1,4 @@
-# RXXE4Q - Spectrobes Origins
+# RXXE4Q, RXXJ4Q, RXXP4Q - Spectrobes Origins
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RXXJ4Q.ini b/Data/Sys/GameSettings/RXXJ4Q.ini
deleted file mode 100644
index 32cbc8a69a..0000000000
--- a/Data/Sys/GameSettings/RXXJ4Q.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RXXJ4Q - Spectrobes Origins
-
-[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
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RXXP4Q.ini b/Data/Sys/GameSettings/RXXP4Q.ini
deleted file mode 100644
index e04bea6662..0000000000
--- a/Data/Sys/GameSettings/RXXP4Q.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RXXP4Q - Spectrobes Origins
-
-[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
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RZJ.ini b/Data/Sys/GameSettings/RZJ.ini
new file mode 100644
index 0000000000..d5ec4019c9
--- /dev/null
+++ b/Data/Sys/GameSettings/RZJ.ini
@@ -0,0 +1,30 @@
+# RZJD69, RZJE69, RZJJ13 - DeadSpace
+
+[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/RZJD69.ini b/Data/Sys/GameSettings/RZJD69.ini
deleted file mode 100644
index bb8dac2865..0000000000
--- a/Data/Sys/GameSettings/RZJD69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RZJD69 - DeadSpace
-
-[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/RZJE69.ini b/Data/Sys/GameSettings/RZJE69.ini
deleted file mode 100644
index 795ad44fc7..0000000000
--- a/Data/Sys/GameSettings/RZJE69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RZJE69 - DeadSpace
-
-[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/RZJJ13.ini b/Data/Sys/GameSettings/RZJJ13.ini
deleted file mode 100644
index 0fa70d10f9..0000000000
--- a/Data/Sys/GameSettings/RZJJ13.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RZJJ13 - DeadSpace
-
-[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/RZOE78.ini b/Data/Sys/GameSettings/RZO.ini
similarity index 94%
rename from Data/Sys/GameSettings/RZOE78.ini
rename to Data/Sys/GameSettings/RZO.ini
index ff27456322..0da731cfdb 100644
--- a/Data/Sys/GameSettings/RZOE78.ini
+++ b/Data/Sys/GameSettings/RZO.ini
@@ -1,4 +1,4 @@
-# RZOE78 - World Of Zoo
+# RZOE78, RZOP78 - World Of Zoo
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RZOP78.ini b/Data/Sys/GameSettings/RZOP78.ini
deleted file mode 100644
index 609a2332d6..0000000000
--- a/Data/Sys/GameSettings/RZOP78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RZOP78 - World Of 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.
-
-[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 = 0
diff --git a/Data/Sys/GameSettings/GJUD78.ini b/Data/Sys/GameSettings/RZP.ini
similarity index 89%
rename from Data/Sys/GameSettings/GJUD78.ini
rename to Data/Sys/GameSettings/RZP.ini
index 3c3b3c32f3..3f8c51bc76 100644
--- a/Data/Sys/GameSettings/GJUD78.ini
+++ b/Data/Sys/GameSettings/RZP.ini
@@ -1,12 +1,12 @@
-# GJUD78 - Tak and the Power of Juju
+# RZPE01, RZPJ01 - LINKS CROSSBOW TRAINING
 
 [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
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/RZPE01.ini b/Data/Sys/GameSettings/RZPE01.ini
deleted file mode 100644
index f457f9a5e5..0000000000
--- a/Data/Sys/GameSettings/RZPE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RZPE01 - LINKS CROSSBOW TRAINING
-
-[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
-
diff --git a/Data/Sys/GameSettings/RZPJ01.ini b/Data/Sys/GameSettings/RZPJ01.ini
deleted file mode 100644
index 26fd150008..0000000000
--- a/Data/Sys/GameSettings/RZPJ01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RZPJ01 - LINKS CROSSBOW TRAINING
-
-[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
-
diff --git a/Data/Sys/GameSettings/RZTJ01.ini b/Data/Sys/GameSettings/RZT.ini
similarity index 87%
rename from Data/Sys/GameSettings/RZTJ01.ini
rename to Data/Sys/GameSettings/RZT.ini
index 5ac0a14309..d4588e1d32 100644
--- a/Data/Sys/GameSettings/RZTJ01.ini
+++ b/Data/Sys/GameSettings/RZT.ini
@@ -1,4 +1,4 @@
-# RZTJ01 - Wii Sports Resort
+# RZTE01, RZTJ01, RZTK01, RZTP01, RZTW01 - Wii Sports Resort
 [Core]
 # Values set here will override the main dolphin settings.
 [EmuState]
diff --git a/Data/Sys/GameSettings/RZTE01.ini b/Data/Sys/GameSettings/RZTE01.ini
deleted file mode 100644
index 195c944cf4..0000000000
--- a/Data/Sys/GameSettings/RZTE01.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RZTE01 - Wii Sports Resort
-[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.
-[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]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RZTK01.ini b/Data/Sys/GameSettings/RZTK01.ini
deleted file mode 100644
index 3a0d0e664f..0000000000
--- a/Data/Sys/GameSettings/RZTK01.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RZTK01 - Wii Sports Resort
-[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.
-[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]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RZTP01.ini b/Data/Sys/GameSettings/RZTP01.ini
deleted file mode 100644
index 461edb24e7..0000000000
--- a/Data/Sys/GameSettings/RZTP01.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RZTP01 - Wii Sports Resort
-[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.
-[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]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RZTW01.ini b/Data/Sys/GameSettings/RZTW01.ini
deleted file mode 100644
index d62c8f1919..0000000000
--- a/Data/Sys/GameSettings/RZTW01.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RZTW01 - Wii Sports Resort
-[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.
-[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]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/G5DE78.ini b/Data/Sys/GameSettings/RZZ.ini
similarity index 92%
rename from Data/Sys/GameSettings/G5DE78.ini
rename to Data/Sys/GameSettings/RZZ.ini
index 00c2d64666..6b67f20c9e 100644
--- a/Data/Sys/GameSettings/G5DE78.ini
+++ b/Data/Sys/GameSettings/RZZ.ini
@@ -1,4 +1,4 @@
-# G5DE78 - Scooby-Doo! Unmasked
+# RZZE8P, RZZJEL, RZZP8P - MADWORLD
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/RZZE8P.ini b/Data/Sys/GameSettings/RZZE8P.ini
deleted file mode 100644
index 9ed6cb8f8a..0000000000
--- a/Data/Sys/GameSettings/RZZE8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RZZE8P - MADWORLD
-
-[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/RZZJEL.ini b/Data/Sys/GameSettings/RZZJEL.ini
deleted file mode 100644
index af90b9e607..0000000000
--- a/Data/Sys/GameSettings/RZZJEL.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RZZJEL - MADWORLD
-
-[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/RZZP8P.ini b/Data/Sys/GameSettings/RZZP8P.ini
deleted file mode 100644
index a07ab2ab71..0000000000
--- a/Data/Sys/GameSettings/RZZP8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RZZP8P - MADWORLD
-
-[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/S2LE01.ini b/Data/Sys/GameSettings/S2L.ini
similarity index 93%
rename from Data/Sys/GameSettings/S2LE01.ini
rename to Data/Sys/GameSettings/S2L.ini
index 2b4782a2db..498901fb6d 100644
--- a/Data/Sys/GameSettings/S2LE01.ini
+++ b/Data/Sys/GameSettings/S2L.ini
@@ -1,4 +1,4 @@
-# S2LE01 - PokePark Wii2
+# S2LE01, S2LJ01, S2LP01 - PokePark Wii2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/S2LJ01.ini b/Data/Sys/GameSettings/S2LJ01.ini
deleted file mode 100644
index 879e24b88e..0000000000
--- a/Data/Sys/GameSettings/S2LJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# S2LJ01 - PokePark Wii2
-
-[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 to display photographs.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/S2LP01.ini b/Data/Sys/GameSettings/S2LP01.ini
deleted file mode 100644
index 34cc82f2da..0000000000
--- a/Data/Sys/GameSettings/S2LP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# S2LP01 - PokePark Wii2
-
-[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 to display photographs.
-
-[OnLoad]
-# Add memory patches 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
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/S2WP78.ini b/Data/Sys/GameSettings/S2W.ini
similarity index 94%
rename from Data/Sys/GameSettings/S2WP78.ini
rename to Data/Sys/GameSettings/S2W.ini
index 78a763b4a3..81fbd9ab4a 100644
--- a/Data/Sys/GameSettings/S2WP78.ini
+++ b/Data/Sys/GameSettings/S2W.ini
@@ -1,4 +1,4 @@
-# S2WP78 - WWE All Stars
+# S2WE78, S2WP78 - WWE All Stars
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/S2WE78.ini b/Data/Sys/GameSettings/S2WE78.ini
deleted file mode 100644
index 5ec119c8da..0000000000
--- a/Data/Sys/GameSettings/S2WE78.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# S2WE78 - WWE All Stars
-
-[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 = Use direct 3d 11 for less glitches(r7436)
-
-[OnLoad]
-# Add memory patches 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_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/S3BEWR.ini b/Data/Sys/GameSettings/S3B.ini
similarity index 91%
rename from Data/Sys/GameSettings/S3BEWR.ini
rename to Data/Sys/GameSettings/S3B.ini
index a8f4db033c..e6043baa32 100644
--- a/Data/Sys/GameSettings/S3BEWR.ini
+++ b/Data/Sys/GameSettings/S3B.ini
@@ -1,4 +1,4 @@
-# S3BEWR - Batman: The Brave and the Bold
+# S3BEWR, S3BPWR - Batman: The Brave and the Bold
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/S3BPWR.ini b/Data/Sys/GameSettings/S3BPWR.ini
deleted file mode 100644
index cc4328ce0c..0000000000
--- a/Data/Sys/GameSettings/S3BPWR.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# S3BPWR - Batman: The Brave and the Bold
-
-[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
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/S59E01.ini b/Data/Sys/GameSettings/S59.ini
similarity index 92%
rename from Data/Sys/GameSettings/S59E01.ini
rename to Data/Sys/GameSettings/S59.ini
index 99aa08fb7e..aceed179f9 100644
--- a/Data/Sys/GameSettings/S59E01.ini
+++ b/Data/Sys/GameSettings/S59.ini
@@ -1,4 +1,4 @@
-# S59E01 - SAMURAI WARRIORS 3
+# S59E01, S59P01 - SAMURAI WARRIORS 3
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/S59P01.ini b/Data/Sys/GameSettings/S59P01.ini
deleted file mode 100644
index 69880a289a..0000000000
--- a/Data/Sys/GameSettings/S59P01.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# S59P01 - SAMURAI WARRIORS 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 = 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 = 512
-FastDepthCalc = False
-
diff --git a/Data/Sys/GameSettings/S72J01.ini b/Data/Sys/GameSettings/S72.ini
similarity index 91%
rename from Data/Sys/GameSettings/S72J01.ini
rename to Data/Sys/GameSettings/S72.ini
index 96ff851e75..df0acd6565 100644
--- a/Data/Sys/GameSettings/S72J01.ini
+++ b/Data/Sys/GameSettings/S72.ini
@@ -1,4 +1,4 @@
-# S72J01 - Hoshi No Kirby: 20th Anniversary Edition
+# S72E01, S72J01 - Kirby's Dream Collection Special Edition
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/S72E01.ini b/Data/Sys/GameSettings/S72E01.ini
deleted file mode 100644
index 72af944914..0000000000
--- a/Data/Sys/GameSettings/S72E01.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-# S72E01 - Kirby's Dream Collection Special 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.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-SafeTextureCacheColorSamples = 0
-EFBScale = -1
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/SB3E08.ini b/Data/Sys/GameSettings/SB3.ini
similarity index 92%
rename from Data/Sys/GameSettings/SB3E08.ini
rename to Data/Sys/GameSettings/SB3.ini
index 12279b1bc9..2a7ee99c4b 100644
--- a/Data/Sys/GameSettings/SB3E08.ini
+++ b/Data/Sys/GameSettings/SB3.ini
@@ -1,4 +1,4 @@
-# SB3E08 - Sengoku BASARA
+# SB3E08, SB3J08, SB3P08 - Sengoku BASARA
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SB3J08.ini b/Data/Sys/GameSettings/SB3J08.ini
deleted file mode 100644
index 8e42713fff..0000000000
--- a/Data/Sys/GameSettings/SB3J08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SB3J08 - Sengoku BASARA
-
-[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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/SB3P08.ini b/Data/Sys/GameSettings/SB3P08.ini
deleted file mode 100644
index b03062b44d..0000000000
--- a/Data/Sys/GameSettings/SB3P08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SB3P08 - Sengoku BASARA
-
-[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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/SBDJ08.ini b/Data/Sys/GameSettings/SBD.ini
similarity index 89%
rename from Data/Sys/GameSettings/SBDJ08.ini
rename to Data/Sys/GameSettings/SBD.ini
index d9de80600b..5d18d2afe0 100644
--- a/Data/Sys/GameSettings/SBDJ08.ini
+++ b/Data/Sys/GameSettings/SBD.ini
@@ -1,4 +1,4 @@
-# SBDJ08 - RESIDENT EVIL THE DARKSIDE CHRONICLES
+# SBDE08, SBDJ08, SBDK08 - RESIDENT EVIL THE DARKSIDE CHRONICLES
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SBDE08.ini b/Data/Sys/GameSettings/SBDE08.ini
deleted file mode 100644
index de02823475..0000000000
--- a/Data/Sys/GameSettings/SBDE08.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# SBDE08 - RESIDENT EVIL THE DARKSIDE 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.
-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]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SBDK08.ini b/Data/Sys/GameSettings/SBDK08.ini
deleted file mode 100644
index df94feca04..0000000000
--- a/Data/Sys/GameSettings/SBDK08.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# SBDK08 - RESIDENT EVIL THE DARKSIDE 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.
-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]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R4QP01.ini b/Data/Sys/GameSettings/SC4.ini
similarity index 89%
rename from Data/Sys/GameSettings/R4QP01.ini
rename to Data/Sys/GameSettings/SC4.ini
index 3ff3624afe..d3771408c2 100644
--- a/Data/Sys/GameSettings/R4QP01.ini
+++ b/Data/Sys/GameSettings/SC4.ini
@@ -1,4 +1,4 @@
-# R4QP01 - Mario Strikers Charged
+# SC4E64, SC4P64 - LEGO Star Wars III: The Clone Wars
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SC4E64.ini b/Data/Sys/GameSettings/SC4E64.ini
deleted file mode 100644
index a44eefca8d..0000000000
--- a/Data/Sys/GameSettings/SC4E64.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# SC4E64 - LEGO Star Wars III: The Clone 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 = 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/SC4P64.ini b/Data/Sys/GameSettings/SC4P64.ini
deleted file mode 100644
index e6ec2487de..0000000000
--- a/Data/Sys/GameSettings/SC4P64.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# SC4P64 - LEGO Star Wars III: The Clone 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 = 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/SC7P52.ini b/Data/Sys/GameSettings/SC7.ini
similarity index 89%
rename from Data/Sys/GameSettings/SC7P52.ini
rename to Data/Sys/GameSettings/SC7.ini
index e3c422d7f0..f3e646a28c 100644
--- a/Data/Sys/GameSettings/SC7P52.ini
+++ b/Data/Sys/GameSettings/SC7.ini
@@ -1,4 +1,4 @@
-# SC7P52 - Call of Duty: Black Ops
+# SC7D52, SC7F52, SC7P52, SC7S52 - Call of Duty: Black Ops
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SC7D52.ini b/Data/Sys/GameSettings/SC7D52.ini
deleted file mode 100644
index 28edc95fdf..0000000000
--- a/Data/Sys/GameSettings/SC7D52.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# SC7D52 - 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/SC7F52.ini b/Data/Sys/GameSettings/SC7F52.ini
deleted file mode 100644
index 3238a95509..0000000000
--- a/Data/Sys/GameSettings/SC7F52.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# SC7F52 - 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/SC7S52.ini b/Data/Sys/GameSettings/SC7S52.ini
deleted file mode 100644
index 75da198439..0000000000
--- a/Data/Sys/GameSettings/SC7S52.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# SC7S52 - 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/SC8E01.ini b/Data/Sys/GameSettings/SC8.ini
similarity index 91%
rename from Data/Sys/GameSettings/SC8E01.ini
rename to Data/Sys/GameSettings/SC8.ini
index b54fef2319..2659bfdca0 100644
--- a/Data/Sys/GameSettings/SC8E01.ini
+++ b/Data/Sys/GameSettings/SC8.ini
@@ -1,4 +1,4 @@
-# SC8E01 - Wii Play: Motion
+# SC8E01, SC8J01, SC8P01 - Wii Play: Motion
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SC8J01.ini b/Data/Sys/GameSettings/SC8J01.ini
deleted file mode 100644
index ce965c2650..0000000000
--- a/Data/Sys/GameSettings/SC8J01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SC8J01 - Wii Play: Motion
-
-[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.
-
-[OnLoad]
-# Add memory patches 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/SC8P01.ini b/Data/Sys/GameSettings/SC8P01.ini
deleted file mode 100644
index cad529e227..0000000000
--- a/Data/Sys/GameSettings/SC8P01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SC8P01 - Wii Play: Motion
-
-[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.
-
-[OnLoad]
-# Add memory patches 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/RBBJ18.ini b/Data/Sys/GameSettings/SCA.ini
similarity index 93%
rename from Data/Sys/GameSettings/RBBJ18.ini
rename to Data/Sys/GameSettings/SCA.ini
index 1116862b8a..92d9d17cb8 100644
--- a/Data/Sys/GameSettings/RBBJ18.ini
+++ b/Data/Sys/GameSettings/SCA.ini
@@ -1,4 +1,4 @@
-# RBBJ18 - Bomberman Land
+# SCAE18, SCAJ18, SCAP18 - CALLING
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SCAE18.ini b/Data/Sys/GameSettings/SCAE18.ini
deleted file mode 100644
index 453a754042..0000000000
--- a/Data/Sys/GameSettings/SCAE18.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SCAE18 - CALLING
-
-[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/SCAJ18.ini b/Data/Sys/GameSettings/SCAJ18.ini
deleted file mode 100644
index e00617c60e..0000000000
--- a/Data/Sys/GameSettings/SCAJ18.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SCAJ18 - CALLING Kuroki Chakushin
-
-[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/SCAP18.ini b/Data/Sys/GameSettings/SCAP18.ini
deleted file mode 100644
index a176ce7627..0000000000
--- a/Data/Sys/GameSettings/SCAP18.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SCAP18 - CALLING
-
-[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/SCYE4Q.ini b/Data/Sys/GameSettings/SCY.ini
similarity index 89%
rename from Data/Sys/GameSettings/SCYE4Q.ini
rename to Data/Sys/GameSettings/SCY.ini
index d1a6e36bb3..6027d0f259 100644
--- a/Data/Sys/GameSettings/SCYE4Q.ini
+++ b/Data/Sys/GameSettings/SCY.ini
@@ -1,4 +1,4 @@
-# SCYE4Q - Cars 2
+# SCYE4Q, SCYP4Q, SCYX4Q, SCYY4Q, SCYZ4Q - Cars 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SCYP4Q.ini b/Data/Sys/GameSettings/SCYP4Q.ini
deleted file mode 100644
index 217d7da1d1..0000000000
--- a/Data/Sys/GameSettings/SCYP4Q.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SCYP4Q - Cars 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches 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/SCYX4Q.ini b/Data/Sys/GameSettings/SCYX4Q.ini
deleted file mode 100644
index 956afc5a82..0000000000
--- a/Data/Sys/GameSettings/SCYX4Q.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SCYX4Q - Cars 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches 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/SCYY4Q.ini b/Data/Sys/GameSettings/SCYY4Q.ini
deleted file mode 100644
index 17f535a077..0000000000
--- a/Data/Sys/GameSettings/SCYY4Q.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SCYY4Q - Cars 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches 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/SCYZ4Q.ini b/Data/Sys/GameSettings/SCYZ4Q.ini
deleted file mode 100644
index 29018bdd1a..0000000000
--- a/Data/Sys/GameSettings/SCYZ4Q.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SCYZ4Q - Cars 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches 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/SD2J01.ini b/Data/Sys/GameSettings/SD2.ini
similarity index 91%
rename from Data/Sys/GameSettings/SD2J01.ini
rename to Data/Sys/GameSettings/SD2.ini
index d131b44b30..8140df3ec9 100644
--- a/Data/Sys/GameSettings/SD2J01.ini
+++ b/Data/Sys/GameSettings/SD2.ini
@@ -1,4 +1,4 @@
-# SD2J01 - Just Dance 2
+# SD2E41, SD2J01, SD2P41, SD2Y41 - Just Dance 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SD2E41.ini b/Data/Sys/GameSettings/SD2E41.ini
deleted file mode 100644
index aebd761b81..0000000000
--- a/Data/Sys/GameSettings/SD2E41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SD2E41 - Just Dance 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 = 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_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SD2P41.ini b/Data/Sys/GameSettings/SD2P41.ini
deleted file mode 100644
index 990ff3fbb0..0000000000
--- a/Data/Sys/GameSettings/SD2P41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SD2P41 - Just Dance 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 = 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_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SD2Y41.ini b/Data/Sys/GameSettings/SD2Y41.ini
deleted file mode 100644
index 76d7038c9f..0000000000
--- a/Data/Sys/GameSettings/SD2Y41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SD2Y41 - Just Dance 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 = 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_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SDBP78.ini b/Data/Sys/GameSettings/SDB.ini
similarity index 94%
rename from Data/Sys/GameSettings/SDBP78.ini
rename to Data/Sys/GameSettings/SDB.ini
index 01cfa04645..527ca58373 100644
--- a/Data/Sys/GameSettings/SDBP78.ini
+++ b/Data/Sys/GameSettings/SDB.ini
@@ -1,4 +1,4 @@
-# SDBP78 - de Blob 2
+# SDBE78, SDBP78 - de Blob 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SDBE78.ini b/Data/Sys/GameSettings/SDBE78.ini
deleted file mode 100644
index df471f4d0a..0000000000
--- a/Data/Sys/GameSettings/SDBE78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SDBE78 - de Blob 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SG8EG9.ini b/Data/Sys/GameSettings/SDM.ini
similarity index 94%
rename from Data/Sys/GameSettings/SG8EG9.ini
rename to Data/Sys/GameSettings/SDM.ini
index 53dc722915..91907867ab 100644
--- a/Data/Sys/GameSettings/SG8EG9.ini
+++ b/Data/Sys/GameSettings/SDM.ini
@@ -1,4 +1,4 @@
-# SG8EG9 - Yogi Bear
+# SDMEG9, SDMPAF - Despicable Me
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SDMEG9.ini b/Data/Sys/GameSettings/SDMEG9.ini
deleted file mode 100644
index fc93a3e80d..0000000000
--- a/Data/Sys/GameSettings/SDMEG9.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# SDMEG9 - Despicable Me
-
-[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
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/SDNE41.ini b/Data/Sys/GameSettings/SDN.ini
similarity index 94%
rename from Data/Sys/GameSettings/SDNE41.ini
rename to Data/Sys/GameSettings/SDN.ini
index 500f76a985..495d0d1fb1 100644
--- a/Data/Sys/GameSettings/SDNE41.ini
+++ b/Data/Sys/GameSettings/SDN.ini
@@ -1,4 +1,4 @@
-# SDNE41 - Just Dance
+# SDNE41, SDNP41 - Just Dance
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SDNP41.ini b/Data/Sys/GameSettings/SDNP41.ini
deleted file mode 100644
index 8d143dc9c8..0000000000
--- a/Data/Sys/GameSettings/SDNP41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SDNP41 - Just Dance
-
-[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_Settings]
-EFBScale = -1
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SDWE18.ini b/Data/Sys/GameSettings/SDW.ini
similarity index 92%
rename from Data/Sys/GameSettings/SDWE18.ini
rename to Data/Sys/GameSettings/SDW.ini
index e93421b866..3e0ce13b8a 100644
--- a/Data/Sys/GameSettings/SDWE18.ini
+++ b/Data/Sys/GameSettings/SDW.ini
@@ -1,4 +1,4 @@
-# SDWE18 - A Shadow's Tale
+# SDWE18, SDWJ18, SDWP18 - A Shadow's Tale
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SDWJ18.ini b/Data/Sys/GameSettings/SDWJ18.ini
deleted file mode 100644
index 6702f2355c..0000000000
--- a/Data/Sys/GameSettings/SDWJ18.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SDWJ18 - Kage no Tou
-
-[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 efb to ram for proper shadows.
-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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SDWP18.ini b/Data/Sys/GameSettings/SDWP18.ini
deleted file mode 100644
index ed3c2ecbcf..0000000000
--- a/Data/Sys/GameSettings/SDWP18.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SDWP18 - A Shadow's Tale
-
-[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 efb to ram for proper shadows.
-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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SEAE69.ini b/Data/Sys/GameSettings/SEA.ini
similarity index 90%
rename from Data/Sys/GameSettings/SEAE69.ini
rename to Data/Sys/GameSettings/SEA.ini
index e8ec4c4a39..8f8f21b393 100644
--- a/Data/Sys/GameSettings/SEAE69.ini
+++ b/Data/Sys/GameSettings/SEA.ini
@@ -1,4 +1,4 @@
-# SEAE69 - EA Sports Active: More Workouts
+# SEAE69, SEAP69 - EA Sports Active: More Workouts
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SEAP69.ini b/Data/Sys/GameSettings/SEAP69.ini
deleted file mode 100644
index 918b2cd492..0000000000
--- a/Data/Sys/GameSettings/SEAP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# SEAP69 - 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 = 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
-
-[Video_Enhancements]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/SEMP4Q.ini b/Data/Sys/GameSettings/SEM.ini
similarity index 89%
rename from Data/Sys/GameSettings/SEMP4Q.ini
rename to Data/Sys/GameSettings/SEM.ini
index 0bf6ba1bd3..e67c843963 100644
--- a/Data/Sys/GameSettings/SEMP4Q.ini
+++ b/Data/Sys/GameSettings/SEM.ini
@@ -1,4 +1,4 @@
-# SEMP4Q - Disney Epic Mickey
+# SEME4Q, SEMJ01, SEMP4Q, SEMX4Q, SEMY4Q, SEMZ4Q - Disney Epic Mickey
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SEME4Q.ini b/Data/Sys/GameSettings/SEME4Q.ini
deleted file mode 100644
index af28064ebb..0000000000
--- a/Data/Sys/GameSettings/SEME4Q.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-# SEME4Q - Disney Epic Mickey
-
-[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 progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches 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
-SafeTextureCacheColorSamples = 0
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/SEMJ01.ini b/Data/Sys/GameSettings/SEMJ01.ini
deleted file mode 100644
index 2d908edcc7..0000000000
--- a/Data/Sys/GameSettings/SEMJ01.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-# SEMJ01 - Disney Epic Mickey: Mickey Mouse and the Magic Brush
-
-[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 progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches 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
-SafeTextureCacheColorSamples = 0
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/SEMX4Q.ini b/Data/Sys/GameSettings/SEMX4Q.ini
deleted file mode 100644
index 1bbbc4fcaa..0000000000
--- a/Data/Sys/GameSettings/SEMX4Q.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-# SEMX4Q - Disney Epic Mickey
-
-[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 progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches 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
-SafeTextureCacheColorSamples = 0
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/SEMY4Q.ini b/Data/Sys/GameSettings/SEMY4Q.ini
deleted file mode 100644
index f76b0accf9..0000000000
--- a/Data/Sys/GameSettings/SEMY4Q.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-# SEMY4Q - Disney Epic Mickey
-
-[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 progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches 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
-SafeTextureCacheColorSamples = 0
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/SEMZ4Q.ini b/Data/Sys/GameSettings/SEMZ4Q.ini
deleted file mode 100644
index 1f34b4a0b3..0000000000
--- a/Data/Sys/GameSettings/SEMZ4Q.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-# SEMZ4Q - Disney Epic Mickey
-
-[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 progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches 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
-SafeTextureCacheColorSamples = 0
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-
diff --git a/Data/Sys/GameSettings/SERE4Q.ini b/Data/Sys/GameSettings/SER.ini
similarity index 89%
rename from Data/Sys/GameSettings/SERE4Q.ini
rename to Data/Sys/GameSettings/SER.ini
index 527c7f4e46..70cfd19143 100644
--- a/Data/Sys/GameSettings/SERE4Q.ini
+++ b/Data/Sys/GameSettings/SER.ini
@@ -1,4 +1,4 @@
-# SERE4Q - Disney Epic Mickey 2: The Power of 2
+# SERE4Q, SERF4Q, SERP4Q - Disney Epic Mickey 2: The Power of 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SERF4Q.ini b/Data/Sys/GameSettings/SERF4Q.ini
deleted file mode 100644
index 35aecc502f..0000000000
--- a/Data/Sys/GameSettings/SERF4Q.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SERF4Q - Disney Epic Mickey 2: The Power of 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 = Enable progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches 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
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/SERP4Q.ini b/Data/Sys/GameSettings/SERP4Q.ini
deleted file mode 100644
index 9cf8859ec3..0000000000
--- a/Data/Sys/GameSettings/SERP4Q.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SERP4Q - Disney Epic Mickey 2: The Power of 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 = Enable progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches 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
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/SF8J01.ini b/Data/Sys/GameSettings/SF8.ini
similarity index 91%
rename from Data/Sys/GameSettings/SF8J01.ini
rename to Data/Sys/GameSettings/SF8.ini
index cb0c63a438..460e325c43 100644
--- a/Data/Sys/GameSettings/SF8J01.ini
+++ b/Data/Sys/GameSettings/SF8.ini
@@ -1,4 +1,4 @@
-# SF8J01 - Donkey Kong Country Returns
+# SF8E01, SF8J01, SF8P01 - Donkey Kong Country Returns
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SF8E01.ini b/Data/Sys/GameSettings/SF8E01.ini
deleted file mode 100644
index ca73bdf14d..0000000000
--- a/Data/Sys/GameSettings/SF8E01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SF8E01 - Donkey Kong Country Returns
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Sound crackling can be fixed by lle audio.
-
-[OnLoad]
-# Add memory patches 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/SF8P01.ini b/Data/Sys/GameSettings/SF8P01.ini
deleted file mode 100644
index c9cc83b421..0000000000
--- a/Data/Sys/GameSettings/SF8P01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SF8P01 - Donkey Kong Country Returns
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Sound crackling can be fixed by lle audio.
-
-[OnLoad]
-# Add memory patches 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/SFIE01.ini b/Data/Sys/GameSettings/SFI.ini
similarity index 90%
rename from Data/Sys/GameSettings/SFIE01.ini
rename to Data/Sys/GameSettings/SFI.ini
index 9b4220c76a..a222c215f6 100644
--- a/Data/Sys/GameSettings/SFIE01.ini
+++ b/Data/Sys/GameSettings/SFI.ini
@@ -1,4 +1,4 @@
-# SFIE01 - Mystery Case Files: The Malgrave Incident
+# SFIE01, SFIP01 - Mystery Case Files: The Malgrave Incident
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SFIP01.ini b/Data/Sys/GameSettings/SFIP01.ini
deleted file mode 100644
index 201278d20e..0000000000
--- a/Data/Sys/GameSettings/SFIP01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SFIP01 - Mystery Case Files: The Malgrave Incident
-
-[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]
-SafeTextureCacheColorSamples = 512
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/SDMPAF.ini b/Data/Sys/GameSettings/SG8.ini
similarity index 95%
rename from Data/Sys/GameSettings/SDMPAF.ini
rename to Data/Sys/GameSettings/SG8.ini
index 3031f4b502..91d8e18678 100644
--- a/Data/Sys/GameSettings/SDMPAF.ini
+++ b/Data/Sys/GameSettings/SG8.ini
@@ -1,4 +1,4 @@
-# SDMPAF - Despicable Me
+# SG8EG9, SG8PAF - Yogi Bear
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SG8PAF.ini b/Data/Sys/GameSettings/SG8PAF.ini
deleted file mode 100644
index 93f5bd5f52..0000000000
--- a/Data/Sys/GameSettings/SG8PAF.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# SG8PAF - Yogi Bear
-
-[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
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/SILE78.ini b/Data/Sys/GameSettings/SIL.ini
similarity index 93%
rename from Data/Sys/GameSettings/SILE78.ini
rename to Data/Sys/GameSettings/SIL.ini
index 43b5426cff..311ef909b2 100644
--- a/Data/Sys/GameSettings/SILE78.ini
+++ b/Data/Sys/GameSettings/SIL.ini
@@ -1,4 +1,4 @@
-# SILE78 - Worms Battle Islands
+# SILE78, SILP78 - Worms Battle Islands
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SILP78.ini b/Data/Sys/GameSettings/SILP78.ini
deleted file mode 100644
index 7e2d92984d..0000000000
--- a/Data/Sys/GameSettings/SILP78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SILP78 - Worms Battle Islands
-
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Idleskipping causes speed issues(menus,etc.)
-
-[OnLoad]
-# Add memory patches 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/SJBE52.ini b/Data/Sys/GameSettings/SJB.ini
similarity index 94%
rename from Data/Sys/GameSettings/SJBE52.ini
rename to Data/Sys/GameSettings/SJB.ini
index 52c60579ab..41532c0a78 100644
--- a/Data/Sys/GameSettings/SJBE52.ini
+++ b/Data/Sys/GameSettings/SJB.ini
@@ -1,4 +1,4 @@
-# SJBE52 - GoldenEye007
+# SJBE52, SJBP52 - GoldenEye007
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SJBP52.ini b/Data/Sys/GameSettings/SJBP52.ini
deleted file mode 100644
index cca6c14da4..0000000000
--- a/Data/Sys/GameSettings/SJBP52.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SJBP52 - GoldenEye007
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[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]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/SJDZ41.ini b/Data/Sys/GameSettings/SJD.ini
similarity index 92%
rename from Data/Sys/GameSettings/SJDZ41.ini
rename to Data/Sys/GameSettings/SJD.ini
index 2c36d68645..d8fd89e9f1 100644
--- a/Data/Sys/GameSettings/SJDZ41.ini
+++ b/Data/Sys/GameSettings/SJD.ini
@@ -1,4 +1,4 @@
-# SJDP41 - Just Dance 3
+# SJDE41, SJDP41 - Just Dance 3
 [Core]
 # Values set here will override the main dolphin settings.
 [EmuState]
diff --git a/Data/Sys/GameSettings/SJDE41.ini b/Data/Sys/GameSettings/SJDE41.ini
deleted file mode 100644
index 569690830e..0000000000
--- a/Data/Sys/GameSettings/SJDE41.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# SJDE41 - 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/SLSJ01.ini b/Data/Sys/GameSettings/SLS.ini
similarity index 93%
rename from Data/Sys/GameSettings/SLSJ01.ini
rename to Data/Sys/GameSettings/SLS.ini
index 268b72e373..c7b58561f9 100644
--- a/Data/Sys/GameSettings/SLSJ01.ini
+++ b/Data/Sys/GameSettings/SLS.ini
@@ -1,4 +1,4 @@
-# SLSJ01 - THE LAST STORY
+# SLSEXJ, SLSJ01, SLSP01 - THE LAST STORY
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SLSEXJ.ini b/Data/Sys/GameSettings/SLSEXJ.ini
deleted file mode 100644
index 85a5ef6b55..0000000000
--- a/Data/Sys/GameSettings/SLSEXJ.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SLSEXJ - THE LAST 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.
-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]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/SLSP01.ini b/Data/Sys/GameSettings/SLSP01.ini
deleted file mode 100644
index 57c5491c29..0000000000
--- a/Data/Sys/GameSettings/SLSP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SLSP01 - THE LAST 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.
-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]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/SMBE8P.ini b/Data/Sys/GameSettings/SMB.ini
similarity index 89%
rename from Data/Sys/GameSettings/SMBE8P.ini
rename to Data/Sys/GameSettings/SMB.ini
index ede0554051..d75477b1dc 100644
--- a/Data/Sys/GameSettings/SMBE8P.ini
+++ b/Data/Sys/GameSettings/SMB.ini
@@ -1,4 +1,4 @@
-# SMBE8P - SUPER MONKEY BALL STEP AND ROLL
+# SMBE8P, SMBP8P - SUPER MONKEY BALL STEP AND ROLL
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SMBP8P.ini b/Data/Sys/GameSettings/SMBP8P.ini
deleted file mode 100644
index 7069544b79..0000000000
--- a/Data/Sys/GameSettings/SMBP8P.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# SMBP8P - SUPER MONKEY BALL STEP AND ROLL
-
-[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 = disable dualcore, if there are (fifo) problems
-
-[OnLoad]
-# Add memory 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/SMOE41.ini b/Data/Sys/GameSettings/SMO.ini
similarity index 87%
rename from Data/Sys/GameSettings/SMOE41.ini
rename to Data/Sys/GameSettings/SMO.ini
index 3b988c5521..3d625662ea 100644
--- a/Data/Sys/GameSettings/SMOE41.ini
+++ b/Data/Sys/GameSettings/SMO.ini
@@ -1,4 +1,4 @@
-# SMOE41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION
+# SMOE41, SMOP41, SMOX41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SMOP41.ini b/Data/Sys/GameSettings/SMOP41.ini
deleted file mode 100644
index 08f3925042..0000000000
--- a/Data/Sys/GameSettings/SMOP41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SMOP41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL 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.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/SMOX41.ini b/Data/Sys/GameSettings/SMOX41.ini
deleted file mode 100644
index 65fc196129..0000000000
--- a/Data/Sys/GameSettings/SMOX41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SMOX41 - Michael Jackson The Experience: Walmart 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.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/SN4.ini b/Data/Sys/GameSettings/SN4.ini
new file mode 100644
index 0000000000..a2cfe34b0b
--- /dev/null
+++ b/Data/Sys/GameSettings/SN4.ini
@@ -0,0 +1,22 @@
+# SN4EDA, SN4JDA, SN4XGT - NARUTO SHIPPUDEN DRAGON BLADE 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
+
diff --git a/Data/Sys/GameSettings/SN4EDA.ini b/Data/Sys/GameSettings/SN4EDA.ini
deleted file mode 100644
index 387881d417..0000000000
--- a/Data/Sys/GameSettings/SN4EDA.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SN4EDA - NARUTO SHIPPUDEN DRAGON BLADE 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
-
diff --git a/Data/Sys/GameSettings/SN4JDA.ini b/Data/Sys/GameSettings/SN4JDA.ini
deleted file mode 100644
index 0392eb86ce..0000000000
--- a/Data/Sys/GameSettings/SN4JDA.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SN4JDA - Naruto Shippuuden Ryujinki
-
-[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/SN4XGT.ini b/Data/Sys/GameSettings/SN4XGT.ini
deleted file mode 100644
index 26708bc8dd..0000000000
--- a/Data/Sys/GameSettings/SN4XGT.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SN4XGT - NARUTO SHIPPUDEN DRAGON BLADE 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
-
diff --git a/Data/Sys/GameSettings/SNCE8P.ini b/Data/Sys/GameSettings/SNC.ini
similarity index 93%
rename from Data/Sys/GameSettings/SNCE8P.ini
rename to Data/Sys/GameSettings/SNC.ini
index 69212b2c2d..bc50a1971b 100644
--- a/Data/Sys/GameSettings/SNCE8P.ini
+++ b/Data/Sys/GameSettings/SNC.ini
@@ -1,4 +1,4 @@
-# SNCE8P - SONIC COLOURS
+# SNCE8P, SNCJ8P, SNCP8P - SONIC COLOURS
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SNCJ8P.ini b/Data/Sys/GameSettings/SNCJ8P.ini
deleted file mode 100644
index b4f8237443..0000000000
--- a/Data/Sys/GameSettings/SNCJ8P.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SNCJ8P - SONIC COLOURS
-
-[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 = Integral efb scale has less graphical glitches. Enable "Use PAL60 (EuRGB60) mode" for proper brightness level.
-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]
-EFBScale = -1
-
-[Video_Hacks]
-EFBAccessEnable = False
-
diff --git a/Data/Sys/GameSettings/SNCP8P.ini b/Data/Sys/GameSettings/SNCP8P.ini
deleted file mode 100644
index ec16ea3fe9..0000000000
--- a/Data/Sys/GameSettings/SNCP8P.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SNCP8P - SONIC COLOURS
-
-[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 = Integral efb scale has less graphical glitches. Enable "Use PAL60 (EuRGB60) mode" for proper brightness level.
-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]
-EFBScale = -1
-
-[Video_Hacks]
-EFBAccessEnable = False
-
diff --git a/Data/Sys/GameSettings/SNYEVZ.ini b/Data/Sys/GameSettings/SNY.ini
similarity index 77%
rename from Data/Sys/GameSettings/SNYEVZ.ini
rename to Data/Sys/GameSettings/SNY.ini
index baf1d3011d..951ba5b9e0 100644
--- a/Data/Sys/GameSettings/SNYEVZ.ini
+++ b/Data/Sys/GameSettings/SNY.ini
@@ -1,4 +1,4 @@
-# SNYEVZ - Monster High: 13 Wishes
+# SNYEVZ, SNYPVZ - Monster High: 13 Wishes
 
 [Core]
 
diff --git a/Data/Sys/GameSettings/SNYPVZ.ini b/Data/Sys/GameSettings/SNYPVZ.ini
deleted file mode 100644
index 2f5a68910b..0000000000
--- a/Data/Sys/GameSettings/SNYPVZ.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# SNYPVZ - Monster High: 13 Wishes
-
-[Core]
-
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnFrame]
-
-[ActionReplay]
-
-[Video]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/SOJE41.ini b/Data/Sys/GameSettings/SOJ.ini
similarity index 92%
rename from Data/Sys/GameSettings/SOJE41.ini
rename to Data/Sys/GameSettings/SOJ.ini
index 26569bc65a..f7f61401fa 100644
--- a/Data/Sys/GameSettings/SOJE41.ini
+++ b/Data/Sys/GameSettings/SOJ.ini
@@ -1,4 +1,4 @@
-# SOJE41 - Rayman Origins
+# SOJE41, SOJP41 - Rayman Origins
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SOJP41.ini b/Data/Sys/GameSettings/SOJP41.ini
deleted file mode 100644
index 1182d621b3..0000000000
--- a/Data/Sys/GameSettings/SOJP41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOJP41 - Rayman Origins
-
-[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/SSTEG9.ini b/Data/Sys/GameSettings/SOS.ini
similarity index 90%
rename from Data/Sys/GameSettings/SSTEG9.ini
rename to Data/Sys/GameSettings/SOS.ini
index 513d448abf..00d0ea761e 100644
--- a/Data/Sys/GameSettings/SSTEG9.ini
+++ b/Data/Sys/GameSettings/SOS.ini
@@ -1,4 +1,4 @@
-# SSTEG9 - Kid Adventures Sky Captain
+# SOSEG9, SOSPAF - Turbo: Super Stunt Squad
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SOSEG9.ini b/Data/Sys/GameSettings/SOSEG9.ini
deleted file mode 100644
index 422a99ab96..0000000000
--- a/Data/Sys/GameSettings/SOSEG9.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOSEG9 - Turbo: Super Stunt Squad
-
-[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]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/SOSPAF.ini b/Data/Sys/GameSettings/SOSPAF.ini
deleted file mode 100644
index 8e6caa5aa4..0000000000
--- a/Data/Sys/GameSettings/SOSPAF.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOSPAF - Turbo: Super Stunt Squad
-
-[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]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/SPDE52.ini b/Data/Sys/GameSettings/SPD.ini
similarity index 94%
rename from Data/Sys/GameSettings/SPDE52.ini
rename to Data/Sys/GameSettings/SPD.ini
index bb6d18c468..ba96522626 100644
--- a/Data/Sys/GameSettings/SPDE52.ini
+++ b/Data/Sys/GameSettings/SPD.ini
@@ -1,4 +1,4 @@
-# SPDE52 - Spider-Man™: SD
+# SPDE52, SPDP52 - Spider-Man™: SD
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SPDP52.ini b/Data/Sys/GameSettings/SPDP52.ini
deleted file mode 100644
index bc7e3480e3..0000000000
--- a/Data/Sys/GameSettings/SPDP52.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# SPDP52 - Spider-Man™: SD
-
-[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 = Graphic 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 = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 0.5
-PH_ZFar = 0.5
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SPV.ini b/Data/Sys/GameSettings/SPV.ini
new file mode 100644
index 0000000000..1f79044b0e
--- /dev/null
+++ b/Data/Sys/GameSettings/SPV.ini
@@ -0,0 +1,30 @@
+# SPVEA4, SPVPA4, SPVXA4, SPVYA4 - Pro Evolution Soccer 2011
+
+[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/SPVEA4.ini b/Data/Sys/GameSettings/SPVEA4.ini
deleted file mode 100644
index d8962fe126..0000000000
--- a/Data/Sys/GameSettings/SPVEA4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPVEA4 - Pro Evolution Soccer 2011
-
-[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/SPVPA4.ini b/Data/Sys/GameSettings/SPVPA4.ini
deleted file mode 100644
index 5c46af099d..0000000000
--- a/Data/Sys/GameSettings/SPVPA4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPVPA4 - Pro Evolution Soccer 2011
-
-[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/SPVXA4.ini b/Data/Sys/GameSettings/SPVXA4.ini
deleted file mode 100644
index 8a7c373c9a..0000000000
--- a/Data/Sys/GameSettings/SPVXA4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPVXA4 - Pro Evolution Soccer 2011
-
-[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/SPVYA4.ini b/Data/Sys/GameSettings/SPVYA4.ini
deleted file mode 100644
index 76c289de22..0000000000
--- a/Data/Sys/GameSettings/SPVYA4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPVYA4 - Pro Evolution Soccer 2011
-
-[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/SQM.ini b/Data/Sys/GameSettings/SQM.ini
new file mode 100644
index 0000000000..03580af837
--- /dev/null
+++ b/Data/Sys/GameSettings/SQM.ini
@@ -0,0 +1,27 @@
+# SQME52, SQMP52 - Spider-Man: Edge of Time
+
+[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/SQME52.ini b/Data/Sys/GameSettings/SQME52.ini
deleted file mode 100644
index b56c096765..0000000000
--- a/Data/Sys/GameSettings/SQME52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SQME52 - Spider-Man: Edge of Time
-
-[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/SQMP52.ini b/Data/Sys/GameSettings/SQMP52.ini
deleted file mode 100644
index 4883db1e38..0000000000
--- a/Data/Sys/GameSettings/SQMP52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SQMP52 - Spider-Man: Edge of Time
-
-[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/R5VE41.ini b/Data/Sys/GameSettings/SRQ.ini
similarity index 93%
rename from Data/Sys/GameSettings/R5VE41.ini
rename to Data/Sys/GameSettings/SRQ.ini
index aede7537b6..e00621d106 100644
--- a/Data/Sys/GameSettings/R5VE41.ini
+++ b/Data/Sys/GameSettings/SRQ.ini
@@ -1,4 +1,4 @@
-# R5VE41 - James Cameron's AVATAR
+# SRQE41, SRQP41 - Racquet Sports
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SRQE41.ini b/Data/Sys/GameSettings/SRQE41.ini
deleted file mode 100644
index 6cc354013f..0000000000
--- a/Data/Sys/GameSettings/SRQE41.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# SRQE41 - Racquet Sports
-
-[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_Hacks]
-
diff --git a/Data/Sys/GameSettings/SRQP41.ini b/Data/Sys/GameSettings/SRQP41.ini
deleted file mode 100644
index 22108772c1..0000000000
--- a/Data/Sys/GameSettings/SRQP41.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# SRQP41 - Racquet Sports
-
-[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_Hacks]
-
diff --git a/Data/Sys/GameSettings/SSQP01.ini b/Data/Sys/GameSettings/SSQ.ini
similarity index 93%
rename from Data/Sys/GameSettings/SSQP01.ini
rename to Data/Sys/GameSettings/SSQ.ini
index 9fd71d21ef..d8b4a813b8 100644
--- a/Data/Sys/GameSettings/SSQP01.ini
+++ b/Data/Sys/GameSettings/SSQ.ini
@@ -1,4 +1,4 @@
-# SSQP01 - Mario Party 9
+# SSQE01, SSQJ01, SSQP01 - Mario Party 9
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SSQE01.ini b/Data/Sys/GameSettings/SSQE01.ini
deleted file mode 100644
index 1ea6747e24..0000000000
--- a/Data/Sys/GameSettings/SSQE01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SSQE01 - Mario Party 9
-
-[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 = Flinger Painting minigame needs EFB to RAM to function properly.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SSQJ01.ini b/Data/Sys/GameSettings/SSQJ01.ini
deleted file mode 100644
index 0a65f75085..0000000000
--- a/Data/Sys/GameSettings/SSQJ01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SSQJ01 - Mario Party 9
-
-[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 = Flinger Painting minigame needs EFB to RAM to function properly.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SSRE20.ini b/Data/Sys/GameSettings/SSR.ini
similarity index 92%
rename from Data/Sys/GameSettings/SSRE20.ini
rename to Data/Sys/GameSettings/SSR.ini
index 5b449ff17d..3491d7196b 100644
--- a/Data/Sys/GameSettings/SSRE20.ini
+++ b/Data/Sys/GameSettings/SSR.ini
@@ -1,4 +1,4 @@
-# SSRE20 - Wild West Shootout
+# SSRE20, SSRPXT - Wild West Shootout
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SSRPXT.ini b/Data/Sys/GameSettings/SSRPXT.ini
deleted file mode 100644
index b5d2828d52..0000000000
--- a/Data/Sys/GameSettings/SSRPXT.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SSRPXT - Wild West Shootout
-
-[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 = True
-
diff --git a/Data/Sys/GameSettings/SSTPY5.ini b/Data/Sys/GameSettings/SST.ini
similarity index 90%
rename from Data/Sys/GameSettings/SSTPY5.ini
rename to Data/Sys/GameSettings/SST.ini
index b52daca744..832f97bbee 100644
--- a/Data/Sys/GameSettings/SSTPY5.ini
+++ b/Data/Sys/GameSettings/SST.ini
@@ -1,4 +1,4 @@
-# SSTPY5 - Stunt Flyer: Hero of the Skies
+# SSTEG9, SSTPY5 - Kid Adventures Sky Captain
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/STKE08.ini b/Data/Sys/GameSettings/STK.ini
similarity index 86%
rename from Data/Sys/GameSettings/STKE08.ini
rename to Data/Sys/GameSettings/STK.ini
index e7932aeabe..f90b1b42f1 100644
--- a/Data/Sys/GameSettings/STKE08.ini
+++ b/Data/Sys/GameSettings/STK.ini
@@ -1,4 +1,4 @@
-# STKE08 - TATSUNOKO VS. CAPCOM ULTIMATE ALL-STARS
+# STKE08, STKJ08, STKP08 - TATSUNOKO VS. CAPCOM ULTIMATE ALL-STARS
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/STKJ08.ini b/Data/Sys/GameSettings/STKJ08.ini
deleted file mode 100644
index 215a6747f1..0000000000
--- a/Data/Sys/GameSettings/STKJ08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# STKJ08 - TATSUNOKO VS. CAPCOM ULTIMATE ALL-STARS
-
-[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 GC controllers if you want to use wiimote(r6590)
-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/STKP08.ini b/Data/Sys/GameSettings/STKP08.ini
deleted file mode 100644
index d9f4046740..0000000000
--- a/Data/Sys/GameSettings/STKP08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# STKP08 - TATSUNOKO VS. CAPCOM ULTIMATE ALL-STARS
-
-[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 GC controllers if you want to use wiimote(r6590)
-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/STSE4Q.ini b/Data/Sys/GameSettings/STS.ini
similarity index 88%
rename from Data/Sys/GameSettings/STSE4Q.ini
rename to Data/Sys/GameSettings/STS.ini
index 8125789874..685f931232 100644
--- a/Data/Sys/GameSettings/STSE4Q.ini
+++ b/Data/Sys/GameSettings/STS.ini
@@ -1,4 +1,4 @@
-# STSE4Q - Toy Story 3
+# STSE4Q, STSP4Q, STSX4Q, STSY4Q, STSZ4Q - Toy Story 3
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/STSP4Q.ini b/Data/Sys/GameSettings/STSP4Q.ini
deleted file mode 100644
index 19577fd983..0000000000
--- a/Data/Sys/GameSettings/STSP4Q.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# STSP4Q - Toy Story 3
-
-[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 =
-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]
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/STSX4Q.ini b/Data/Sys/GameSettings/STSX4Q.ini
deleted file mode 100644
index 16b8528751..0000000000
--- a/Data/Sys/GameSettings/STSX4Q.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# STSX4Q - Toy Story 3
-
-[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 =
-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]
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/STSY4Q.ini b/Data/Sys/GameSettings/STSY4Q.ini
deleted file mode 100644
index 60c064eacb..0000000000
--- a/Data/Sys/GameSettings/STSY4Q.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# STSY4Q - Toy Story 3
-
-[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 =
-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]
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/STSZ4Q.ini b/Data/Sys/GameSettings/STSZ4Q.ini
deleted file mode 100644
index 149f1ba06c..0000000000
--- a/Data/Sys/GameSettings/STSZ4Q.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# STSZ4Q - Toy Story 3: Toy Box Special Edition
-
-[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 =
-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]
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/SU7PAF.ini b/Data/Sys/GameSettings/SU7.ini
similarity index 84%
rename from Data/Sys/GameSettings/SU7PAF.ini
rename to Data/Sys/GameSettings/SU7.ini
index d5186e8391..9cb04614fd 100644
--- a/Data/Sys/GameSettings/SU7PAF.ini
+++ b/Data/Sys/GameSettings/SU7.ini
@@ -1,4 +1,4 @@
-# SU7PAF - RISE OF THE GUARDIANS
+# SU7EG9, SU7PAF - RISE OF THE GUARDIANS
 [Core]
 [EmuState]
 EmulationStateId = 4
diff --git a/Data/Sys/GameSettings/SU7EG9.ini b/Data/Sys/GameSettings/SU7EG9.ini
deleted file mode 100644
index 3c376bc0fd..0000000000
--- a/Data/Sys/GameSettings/SU7EG9.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# SU7EG9 - RISE OF THE GUARDIANS
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[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/SUKE01.ini b/Data/Sys/GameSettings/SUK.ini
similarity index 93%
rename from Data/Sys/GameSettings/SUKE01.ini
rename to Data/Sys/GameSettings/SUK.ini
index a49d252c1d..fd55d0812c 100644
--- a/Data/Sys/GameSettings/SUKE01.ini
+++ b/Data/Sys/GameSettings/SUK.ini
@@ -1,4 +1,4 @@
-# SUKE01 - Kirby Wii
+# SUKE01, SUKJ01, SUKP01 - Kirby Wii
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SUKJ01.ini b/Data/Sys/GameSettings/SUKJ01.ini
deleted file mode 100644
index bd2a758de2..0000000000
--- a/Data/Sys/GameSettings/SUKJ01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SUKJ01 - Hoshi no Kirby 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 = Some minigames need XFB 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]
-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/SUKP01.ini b/Data/Sys/GameSettings/SUKP01.ini
deleted file mode 100644
index 4f935e0803..0000000000
--- a/Data/Sys/GameSettings/SUKP01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SUKP01 - Kirby's Adventure 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 = Some minigames need XFB 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]
-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/SVBP52.ini b/Data/Sys/GameSettings/SVB.ini
similarity index 94%
rename from Data/Sys/GameSettings/SVBP52.ini
rename to Data/Sys/GameSettings/SVB.ini
index d95eee7ab1..b3b119cda2 100644
--- a/Data/Sys/GameSettings/SVBP52.ini
+++ b/Data/Sys/GameSettings/SVB.ini
@@ -1,4 +1,4 @@
-# SVBP52 - Battleship
+# SVBE52, SVBP52 - Battleship
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SVBE52.ini b/Data/Sys/GameSettings/SVBE52.ini
deleted file mode 100644
index c06b73169f..0000000000
--- a/Data/Sys/GameSettings/SVBE52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SVBE52 - Battleship
-
-[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
-
diff --git a/Data/Sys/GameSettings/R4EE01.ini b/Data/Sys/GameSettings/SVM.ini
similarity index 91%
rename from Data/Sys/GameSettings/R4EE01.ini
rename to Data/Sys/GameSettings/SVM.ini
index e570295507..2192bac6aa 100644
--- a/Data/Sys/GameSettings/R4EE01.ini
+++ b/Data/Sys/GameSettings/SVM.ini
@@ -1,4 +1,4 @@
-# R4EE01 - Endless Ocean Blue World
+# SVME01, SVMJ01, SVMP01 - super mario collection
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SVME01.ini b/Data/Sys/GameSettings/SVME01.ini
deleted file mode 100644
index 24a4977588..0000000000
--- a/Data/Sys/GameSettings/SVME01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SVME01 - super mario 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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SVMJ01.ini b/Data/Sys/GameSettings/SVMJ01.ini
deleted file mode 100644
index 9dbc817aff..0000000000
--- a/Data/Sys/GameSettings/SVMJ01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SVMJ01 - super mario 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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SVMP01.ini b/Data/Sys/GameSettings/SVMP01.ini
deleted file mode 100644
index 0d13c23359..0000000000
--- a/Data/Sys/GameSettings/SVMP01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SVMP01 - Super Mario All-Stars : 25th Anniversary 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.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SVXE52.ini b/Data/Sys/GameSettings/SVX.ini
similarity index 88%
rename from Data/Sys/GameSettings/SVXE52.ini
rename to Data/Sys/GameSettings/SVX.ini
index 9919563f71..9462674834 100644
--- a/Data/Sys/GameSettings/SVXE52.ini
+++ b/Data/Sys/GameSettings/SVX.ini
@@ -1,4 +1,4 @@
-# SVXE52 - Skylanders: Swap Force
+# SVXE52, SVXF52, SVXI52, SVXP52, SVXY52 - Skylanders: Swap Force
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SVXF52.ini b/Data/Sys/GameSettings/SVXF52.ini
deleted file mode 100644
index fa5630a28d..0000000000
--- a/Data/Sys/GameSettings/SVXF52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SVXF52 - Skylanders: Swap 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 = 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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/SVXI52.ini b/Data/Sys/GameSettings/SVXI52.ini
deleted file mode 100644
index 148d4727cc..0000000000
--- a/Data/Sys/GameSettings/SVXI52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SVXI52 - Skylanders: Swap 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 = 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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/SVXP52.ini b/Data/Sys/GameSettings/SVXP52.ini
deleted file mode 100644
index 48c150024f..0000000000
--- a/Data/Sys/GameSettings/SVXP52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SVXP52 - Skylanders: Swap 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 = 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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/SVXY52.ini b/Data/Sys/GameSettings/SVXY52.ini
deleted file mode 100644
index 55a2f3a0fd..0000000000
--- a/Data/Sys/GameSettings/SVXY52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SVXY52 - Skylanders: Swap 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 = 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_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/SVZPVZ.ini b/Data/Sys/GameSettings/SVZ.ini
similarity index 89%
rename from Data/Sys/GameSettings/SVZPVZ.ini
rename to Data/Sys/GameSettings/SVZ.ini
index cf3783bb0f..afc023aed3 100644
--- a/Data/Sys/GameSettings/SVZPVZ.ini
+++ b/Data/Sys/GameSettings/SVZ.ini
@@ -1,4 +1,4 @@
-# SVZPVZ - How to Train Your Dragon 2
+# SVZEVZ, SVZPVZ - How to Train Your Dragon 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SVZEVZ.ini b/Data/Sys/GameSettings/SVZEVZ.ini
deleted file mode 100644
index ba04d5324b..0000000000
--- a/Data/Sys/GameSettings/SVZEVZ.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SVZEVZ - How to Train Your Dragon 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.
-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/R84J99.ini b/Data/Sys/GameSettings/SX3.ini
similarity index 93%
rename from Data/Sys/GameSettings/R84J99.ini
rename to Data/Sys/GameSettings/SX3.ini
index 37e755acd9..90d4332da0 100644
--- a/Data/Sys/GameSettings/R84J99.ini
+++ b/Data/Sys/GameSettings/SX3.ini
@@ -1,4 +1,4 @@
-# R84J99 - Bokujo for Wii
+# SX3J01, SX3P01 - Pandora s Tower
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SX3J01.ini b/Data/Sys/GameSettings/SX3J01.ini
deleted file mode 100644
index 9cf7a276e6..0000000000
--- a/Data/Sys/GameSettings/SX3J01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SX3J01 - Pandora s Tower
-
-[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
-
diff --git a/Data/Sys/GameSettings/SX3P01.ini b/Data/Sys/GameSettings/SX3P01.ini
deleted file mode 100644
index df783f97ea..0000000000
--- a/Data/Sys/GameSettings/SX3P01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SX3P01 - Pandora s Tower
-
-[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
-
diff --git a/Data/Sys/GameSettings/SX7E52.ini b/Data/Sys/GameSettings/SX7.ini
similarity index 90%
rename from Data/Sys/GameSettings/SX7E52.ini
rename to Data/Sys/GameSettings/SX7.ini
index f6e5901ecc..1dea6c236a 100644
--- a/Data/Sys/GameSettings/SX7E52.ini
+++ b/Data/Sys/GameSettings/SX7.ini
@@ -1,4 +1,4 @@
-# SX7E52 - Teenage Mutant Ninja Turtles
+# SX7E52, SX7P52 - Teenage Mutant Ninja Turtles
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/SX7P52.ini b/Data/Sys/GameSettings/SX7P52.ini
deleted file mode 100644
index 92760ed042..0000000000
--- a/Data/Sys/GameSettings/SX7P52.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# SX7P52 - Teenage Mutant Ninja Turtles
-
-[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 = Sound issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/SXCE52.ini b/Data/Sys/GameSettings/SXC.ini
similarity index 92%
rename from Data/Sys/GameSettings/SXCE52.ini
rename to Data/Sys/GameSettings/SXC.ini
index 1e4f1bd79d..a5a074f6e9 100644
--- a/Data/Sys/GameSettings/SXCE52.ini
+++ b/Data/Sys/GameSettings/SXC.ini
@@ -1,4 +1,4 @@
-# SXCE52 - Guitar Hero Smash Hits
+# SXCE52, SXCP52 - Guitar Hero Smash Hits
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SXCP52.ini b/Data/Sys/GameSettings/SXCP52.ini
deleted file mode 100644
index 052a5bdd97..0000000000
--- a/Data/Sys/GameSettings/SXCP52.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# SXCP52 - Guitar Hero Smash Hits
-
-[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 = Create a quitar profile and use that for controls instead of wiimote controls(r6575)
-
-[OnLoad]
-# Add memory patches 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/SZAE69.ini b/Data/Sys/GameSettings/SZA.ini
similarity index 93%
rename from Data/Sys/GameSettings/SZAE69.ini
rename to Data/Sys/GameSettings/SZA.ini
index 680a8cf260..e652d8401a 100644
--- a/Data/Sys/GameSettings/SZAE69.ini
+++ b/Data/Sys/GameSettings/SZA.ini
@@ -1,4 +1,4 @@
-# SZAE69 - Rock Band 2
+# SZAE69, SZAP69 - Rock Band 2
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SZAP69.ini b/Data/Sys/GameSettings/SZAP69.ini
deleted file mode 100644
index 91c013755a..0000000000
--- a/Data/Sys/GameSettings/SZAP69.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SZAP69 - Rock Band 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 = Config and use the quitar and drums, wiimote asks for a microphone otherwise.(r6575)
-
-[OnLoad]
-# Add memory patches 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/SZBE69.ini b/Data/Sys/GameSettings/SZB.ini
similarity index 95%
rename from Data/Sys/GameSettings/SZBE69.ini
rename to Data/Sys/GameSettings/SZB.ini
index bb9e1efc46..b0d5e2562a 100644
--- a/Data/Sys/GameSettings/SZBE69.ini
+++ b/Data/Sys/GameSettings/SZB.ini
@@ -1,4 +1,4 @@
-# SZBE69 - Rock Band 3
+# SZBE69, SZBP69 - Rock Band 3
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/SZBP69.ini b/Data/Sys/GameSettings/SZBP69.ini
deleted file mode 100644
index c712984785..0000000000
--- a/Data/Sys/GameSettings/SZBP69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SZBP69 - Rock Band 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 = 3
-EmulationIssues = If emu is running less than 100% it's EXTREMELY hard to hit notes. No mic, keyboard, or Pro instrument support yet.
-
-[OnLoad]
-# Add memory patches 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]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/UGPE01.ini b/Data/Sys/GameSettings/UGP.ini
similarity index 89%
rename from Data/Sys/GameSettings/UGPE01.ini
rename to Data/Sys/GameSettings/UGP.ini
index 95dcd43c14..f8d90a4895 100644
--- a/Data/Sys/GameSettings/UGPE01.ini
+++ b/Data/Sys/GameSettings/UGP.ini
@@ -1,4 +1,4 @@
-# UGPE01 - Game Boy Player Start-up Disc for US
+# UGPE01, UGPP01 - Game Boy Player Start-up Disc for US
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/UGPP01.ini b/Data/Sys/GameSettings/UGPP01.ini
deleted file mode 100644
index f5ec6ffb87..0000000000
--- a/Data/Sys/GameSettings/UGPP01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# UGPP01 - GAME BOY PLAYER
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues = No GameBoy Player Device (r7574)
-
-[OnLoad]
-# Add memory patches 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/G4BE08.ini b/Data/Sys/GameSettings/WDM.ini
similarity index 90%
rename from Data/Sys/GameSettings/G4BE08.ini
rename to Data/Sys/GameSettings/WDM.ini
index cd4bf707e4..c71e2ae8bb 100644
--- a/Data/Sys/GameSettings/G4BE08.ini
+++ b/Data/Sys/GameSettings/WDM.ini
@@ -1,4 +1,4 @@
-# G4BE08 - resident evil 4 game disc 1
+# WDME01, WDMP01 - Dr. Mario Online Rx
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/WDME01.ini b/Data/Sys/GameSettings/WDME01.ini
deleted file mode 100644
index badf4ea31d..0000000000
--- a/Data/Sys/GameSettings/WDME01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WDME01 - Dr. Mario Online Rx
-
-[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/WDMP01.ini b/Data/Sys/GameSettings/WDMP01.ini
deleted file mode 100644
index 78588cb780..0000000000
--- a/Data/Sys/GameSettings/WDMP01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WDMP01 - Dr. Mario & Germ Buster
-
-[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/GISP36.ini b/Data/Sys/GameSettings/WGD.ini
similarity index 91%
rename from Data/Sys/GameSettings/GISP36.ini
rename to Data/Sys/GameSettings/WGD.ini
index a2da382622..6a6b595966 100644
--- a/Data/Sys/GameSettings/GISP36.ini
+++ b/Data/Sys/GameSettings/WGD.ini
@@ -1,8 +1,7 @@
-# GISP36 - Second Sight
+# WGDEA4, WGDPA4 - GRADIUS REBIRTH
 
 [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.
diff --git a/Data/Sys/GameSettings/WGDEA4.ini b/Data/Sys/GameSettings/WGDEA4.ini
deleted file mode 100644
index 8ab3ece63f..0000000000
--- a/Data/Sys/GameSettings/WGDEA4.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WGDEA4 - GRADIUS REBIRTH
-
-[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/WGDPA4.ini b/Data/Sys/GameSettings/WGDPA4.ini
deleted file mode 100644
index b4bbf2f909..0000000000
--- a/Data/Sys/GameSettings/WGDPA4.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WGDPA4 - GRADIUS REBIRTH
-
-[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/RSPE01.ini b/Data/Sys/GameSettings/WGO.ini
similarity index 92%
rename from Data/Sys/GameSettings/RSPE01.ini
rename to Data/Sys/GameSettings/WGO.ini
index 87ee60228c..f4ee794392 100644
--- a/Data/Sys/GameSettings/RSPE01.ini
+++ b/Data/Sys/GameSettings/WGO.ini
@@ -1,4 +1,4 @@
-# RSPE01 - Wii Sports
+# WGOEWG, WGOPWG - World of Goo
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/WGOEWG.ini b/Data/Sys/GameSettings/WGOEWG.ini
deleted file mode 100644
index 91e3c1cc2f..0000000000
--- a/Data/Sys/GameSettings/WGOEWG.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WGOEWG - World of Goo
-
-[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
-
diff --git a/Data/Sys/GameSettings/WGSE08.ini b/Data/Sys/GameSettings/WGS.ini
similarity index 92%
rename from Data/Sys/GameSettings/WGSE08.ini
rename to Data/Sys/GameSettings/WGS.ini
index e6e02e3c44..469dd73e8e 100644
--- a/Data/Sys/GameSettings/WGSE08.ini
+++ b/Data/Sys/GameSettings/WGS.ini
@@ -1,4 +1,4 @@
-# WGSE08 - PWAA Ace Attorney
+# WGSE08, WGSP08 - PWAA Ace Attorney
 [Core]
 # Values set here will override the main dolphin settings.
 [EmuState]
diff --git a/Data/Sys/GameSettings/WGSP08.ini b/Data/Sys/GameSettings/WGSP08.ini
deleted file mode 100644
index 8bf5201a6b..0000000000
--- a/Data/Sys/GameSettings/WGSP08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WGSP08 - PWAA Ace Attorney
-[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]
-[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/WHWEFJ.ini b/Data/Sys/GameSettings/WHW.ini
similarity index 90%
rename from Data/Sys/GameSettings/WHWEFJ.ini
rename to Data/Sys/GameSettings/WHW.ini
index f281b7133f..7857ae007e 100644
--- a/Data/Sys/GameSettings/WHWEFJ.ini
+++ b/Data/Sys/GameSettings/WHW.ini
@@ -1,4 +1,4 @@
-# WHWEFJ - HoopWorld
+# WHWEFJ, WHWPFJ - HoopWorld
 [Core]
 [EmuState]
 EmulationStateId = 4
diff --git a/Data/Sys/GameSettings/WHWPFJ.ini b/Data/Sys/GameSettings/WHWPFJ.ini
deleted file mode 100644
index afaf2267c4..0000000000
--- a/Data/Sys/GameSettings/WHWPFJ.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# WHWPFJ - HoopWorld
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/WGOPWG.ini b/Data/Sys/GameSettings/WKT.ini
similarity index 91%
rename from Data/Sys/GameSettings/WGOPWG.ini
rename to Data/Sys/GameSettings/WKT.ini
index d7a1f3d9b9..2390984a91 100644
--- a/Data/Sys/GameSettings/WGOPWG.ini
+++ b/Data/Sys/GameSettings/WKT.ini
@@ -1,4 +1,4 @@
-# WGOPWG - World of Goo
+# WKTJA4, WKTPA4 - CONTRA REBIRTH
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/WKTJA4.ini b/Data/Sys/GameSettings/WKTJA4.ini
deleted file mode 100644
index cead9f6586..0000000000
--- a/Data/Sys/GameSettings/WKTJA4.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WKTJA4 - CONTRA REBIRTH
-
-[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
-
diff --git a/Data/Sys/GameSettings/WKTPA4.ini b/Data/Sys/GameSettings/WKTPA4.ini
deleted file mode 100644
index f2efe775a0..0000000000
--- a/Data/Sys/GameSettings/WKTPA4.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WKTPA4 - Contra ReBirth
-
-[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
-
diff --git a/Data/Sys/GameSettings/WPPJJF.ini b/Data/Sys/GameSettings/WPPJJF.ini
deleted file mode 100644
index f96286a43f..0000000000
--- a/Data/Sys/GameSettings/WPPJJF.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# WPPJJF - JM‰OÔóÝó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 = 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/WR9E08.ini b/Data/Sys/GameSettings/WR9.ini
similarity index 94%
rename from Data/Sys/GameSettings/WR9E08.ini
rename to Data/Sys/GameSettings/WR9.ini
index 9779b2c2a1..715462fa5b 100644
--- a/Data/Sys/GameSettings/WR9E08.ini
+++ b/Data/Sys/GameSettings/WR9.ini
@@ -1,4 +1,4 @@
-# WR9E08 - MEGA MAN 9
+# WR9E08, WR9P08 - MEGA MAN 9
 
 [Core]
 # Values set here will override the main dolphin settings.
diff --git a/Data/Sys/GameSettings/WR9P08.ini b/Data/Sys/GameSettings/WR9P08.ini
deleted file mode 100644
index d6f7b292f0..0000000000
--- a/Data/Sys/GameSettings/WR9P08.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# WR9P08 - MEGA MAN 9
-
-[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_Settings]
-UseXFB = True
-UseRealXFB = False
-EFBScale = 2
-
-SafeTextureCacheColorSamples = 512
-
diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp
index dfdfcf68b9..b61dea63dd 100644
--- a/Source/Core/Core/BootManager.cpp
+++ b/Source/Core/Core/BootManager.cpp
@@ -96,16 +96,7 @@ bool BootCore(const std::string& _rFilename)
 		return false;
 
 	// Load game specific settings
-	std::string unique_id = StartUp.GetUniqueID();
-	std::string revision_specific = StartUp.m_strRevisionSpecificUniqueID;
-	StartUp.m_strGameIniDefault = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + unique_id + ".ini";
-	if (revision_specific != "")
-		StartUp.m_strGameIniDefaultRevisionSpecific = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + revision_specific + ".ini";
-	else
-		StartUp.m_strGameIniDefaultRevisionSpecific = "";
-	StartUp.m_strGameIniLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + unique_id + ".ini";
-
-	if (unique_id.size() == 6)
+	if (StartUp.GetUniqueID().size() == 6)
 	{
 		IniFile game_ini = StartUp.LoadGameIni();
 
diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp
index aef85f9976..162dc06395 100644
--- a/Source/Core/Core/CoreParameter.cpp
+++ b/Source/Core/Core/CoreParameter.cpp
@@ -178,7 +178,7 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
 				}
 				m_strName = pVolume->GetName();
 				m_strUniqueID = pVolume->GetUniqueID();
-				m_strRevisionSpecificUniqueID = pVolume->GetRevisionSpecificUniqueID();
+				m_revision = pVolume->GetRevision();
 
 				// Check if we have a Wii disc
 				bWii = pVolume.get()->IsWiiDisc();
@@ -373,28 +373,60 @@ void SCoreStartupParameter::CheckMemcardPath(std::string& memcardPath, std::stri
 	}
 }
 
-IniFile SCoreStartupParameter::LoadGameIni() const
-{
-	IniFile game_ini;
-	game_ini.Load(m_strGameIniDefault);
-	if (m_strGameIniDefaultRevisionSpecific != "")
-		game_ini.Load(m_strGameIniDefaultRevisionSpecific, true);
-	game_ini.Load(m_strGameIniLocal, true);
-	return game_ini;
-}
-
 IniFile SCoreStartupParameter::LoadDefaultGameIni() const
 {
 	IniFile game_ini;
-	game_ini.Load(m_strGameIniDefault);
-	if (m_strGameIniDefaultRevisionSpecific != "")
-		game_ini.Load(m_strGameIniDefaultRevisionSpecific, true);
+	LoadGameIni(&game_ini, File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP, GetUniqueID(), m_revision);
 	return game_ini;
 }
 
 IniFile SCoreStartupParameter::LoadLocalGameIni() const
 {
 	IniFile game_ini;
-	game_ini.Load(m_strGameIniLocal);
+	LoadGameIni(&game_ini, File::GetUserPath(D_GAMESETTINGS_IDX), GetUniqueID(), m_revision);
 	return game_ini;
 }
+
+IniFile SCoreStartupParameter::LoadGameIni() const
+{
+	IniFile game_ini;
+	LoadGameIni(&game_ini, File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP, GetUniqueID(), m_revision);
+	LoadGameIni(&game_ini, File::GetUserPath(D_GAMESETTINGS_IDX), GetUniqueID(), m_revision);
+	return game_ini;
+}
+
+IniFile SCoreStartupParameter::LoadDefaultGameIni(const std::string& id, int revision)
+{
+	IniFile game_ini;
+	LoadGameIni(&game_ini, File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP, id, revision);
+	return game_ini;
+}
+
+IniFile SCoreStartupParameter::LoadLocalGameIni(const std::string& id, int revision)
+{
+	IniFile game_ini;
+	LoadGameIni(&game_ini, File::GetUserPath(D_GAMESETTINGS_IDX), id, revision);
+	return game_ini;
+}
+
+IniFile SCoreStartupParameter::LoadGameIni(const std::string& id, int revision)
+{
+	IniFile game_ini;
+	LoadGameIni(&game_ini, File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP, id, revision);
+	LoadGameIni(&game_ini, File::GetUserPath(D_GAMESETTINGS_IDX), id, revision);
+	return game_ini;
+}
+
+void SCoreStartupParameter::LoadGameIni(IniFile* game_ini, const std::string& path,
+                                        const std::string& id, int revision)
+{
+	// INIs that match all regions
+	if (id.size() >= 4)
+		game_ini->Load(path + id.substr(0, 3) + ".ini", true);
+
+	// Regular INIs
+	game_ini->Load(path + id + ".ini", true);
+
+	// INIs with specific revisions
+	game_ini->Load(path + id + StringFromFormat("r%d", revision) + ".ini", true);
+}
diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h
index 189eca524e..80ab3a628b 100644
--- a/Source/Core/Core/CoreParameter.h
+++ b/Source/Core/Core/CoreParameter.h
@@ -236,11 +236,8 @@ struct SCoreStartupParameter
 	std::string m_strDVDRoot;
 	std::string m_strApploader;
 	std::string m_strUniqueID;
-	std::string m_strRevisionSpecificUniqueID;
 	std::string m_strName;
-	std::string m_strGameIniDefault;
-	std::string m_strGameIniDefaultRevisionSpecific;
-	std::string m_strGameIniLocal;
+	int m_revision;
 
 	std::string m_perfDir;
 
@@ -251,7 +248,15 @@ struct SCoreStartupParameter
 	bool AutoSetup(EBootBS2 _BootBS2);
 	const std::string &GetUniqueID() const { return m_strUniqueID; }
 	void CheckMemcardPath(std::string& memcardPath, std::string gameRegion, bool isSlotA);
+
 	IniFile LoadDefaultGameIni() const;
 	IniFile LoadLocalGameIni() const;
 	IniFile LoadGameIni() const;
+
+	static IniFile LoadDefaultGameIni(const std::string& id, int revision);
+	static IniFile LoadLocalGameIni(const std::string& id, int revision);
+	static IniFile LoadGameIni(const std::string& id, int revision);
+
+private:
+	static void LoadGameIni(IniFile* game_ini, const std::string& path, const std::string& id, int revision);
 };
diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h
index 3cb115bf7a..4330bfc5de 100644
--- a/Source/Core/DiscIO/Volume.h
+++ b/Source/Core/DiscIO/Volume.h
@@ -28,7 +28,6 @@ public:
 		return std::unique_ptr<u8[]>();
 	}
 	virtual std::string GetUniqueID() const = 0;
-	virtual std::string GetRevisionSpecificUniqueID() const { return ""; }
 	virtual std::string GetMakerID() const = 0;
 	virtual int GetRevision() const { return 0; }
 	// TODO: eliminate?
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp
index 984a82ce3b..7d09fc234e 100644
--- a/Source/Core/DiscIO/VolumeGC.cpp
+++ b/Source/Core/DiscIO/VolumeGC.cpp
@@ -56,11 +56,6 @@ std::string CVolumeGC::GetUniqueID() const
 	return ID;
 }
 
-std::string CVolumeGC::GetRevisionSpecificUniqueID() const
-{
-	return GetUniqueID() + StringFromFormat("r%d", GetRevision());
-}
-
 IVolume::ECountry CVolumeGC::GetCountry() const
 {
 	if (!m_pReader)
diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h
index bc79e535c4..fef6a8ae69 100644
--- a/Source/Core/DiscIO/VolumeGC.h
+++ b/Source/Core/DiscIO/VolumeGC.h
@@ -25,7 +25,6 @@ public:
 	~CVolumeGC();
 	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt = false) const override;
 	std::string GetUniqueID() const override;
-	std::string GetRevisionSpecificUniqueID() const override;
 	std::string GetMakerID() const override;
 	int GetRevision() const override;
 	std::vector<std::string> GetNames() const override;
diff --git a/Source/Core/DolphinQt/GameList/GameFile.cpp b/Source/Core/DolphinQt/GameList/GameFile.cpp
index 141ce73304..b5487793a2 100644
--- a/Source/Core/DolphinQt/GameList/GameFile.cpp
+++ b/Source/Core/DolphinQt/GameList/GameFile.cpp
@@ -126,10 +126,7 @@ GameFile::GameFile(const QString& fileName)
 
 	if (m_valid)
 	{
-		IniFile ini;
-		ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + m_unique_id.toStdString() + ".ini");
-		ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_unique_id.toStdString() + ".ini", true);
-
+		IniFile ini = SCoreStartupParameter::LoadGameIni(m_unique_id.toStdString(), m_revision);
 		std::string issues_temp;
 		ini.GetIfExists("EmuState", "EmulationStateId", &m_emu_state);
 		ini.GetIfExists("EmuState", "EmulationIssues", &issues_temp);
diff --git a/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp b/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp
index 8fb895b1c7..5b2854686c 100644
--- a/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp
+++ b/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp
@@ -159,9 +159,10 @@ void wxCheatsWindow::OnEvent_Close(wxCloseEvent& ev)
 void wxCheatsWindow::UpdateGUI()
 {
 	// load code
-	m_gameini_default = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadDefaultGameIni();
-	m_gameini_local = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadLocalGameIni();
-	m_gameini_local_path = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIniLocal;
+	SCoreStartupParameter parameters = SConfig::GetInstance().m_LocalCoreStartupParameter;
+	m_gameini_default = parameters.LoadDefaultGameIni();
+	m_gameini_local = parameters.LoadLocalGameIni();
+	m_gameini_local_path = File::GetUserPath(D_GAMESETTINGS_IDX) + parameters.GetUniqueID() + ".ini";
 	Load_ARCodes();
 	Load_GeckoCodes();
 
diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp
index a055aa270d..df7bfe291d 100644
--- a/Source/Core/DolphinWX/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/GameListCtrl.cpp
@@ -462,24 +462,10 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
 		titlestxt.close();
 	}
 
-	std::string GameIni[3];
-	GameIni[0] = File::GetUserPath(D_GAMESETTINGS_IDX) + rISOFile.GetUniqueID() + ".ini";
-	GameIni[1] = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + rISOFile.GetUniqueID() + std::to_string(rISOFile.GetRevision()) + ".ini";
-	GameIni[2] = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + rISOFile.GetUniqueID() + ".ini";
 	std::string title;
-	IniFile gameini;
-	for (int i = 0; i < 3; ++i)
-	{
-		if (File::Exists(GameIni[i]))
-		{
-			gameini.Load(GameIni[i]);
-			if (gameini.GetIfExists("EmuState", "Title", &title))
-			{
-				name = title;
-				break;
-			}
-		}
-	}
+	IniFile gameini = SCoreStartupParameter::LoadGameIni(rISOFile.GetUniqueID(), rISOFile.GetRevision());
+	if (gameini.GetIfExists("EmuState", "Title", &title))
+		name = title;
 
 	SetItem(_Index, COLUMN_TITLE, StrToWxStr(name), -1);
 
diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp
index dd46734cd4..8587e62447 100644
--- a/Source/Core/DolphinWX/ISOFile.cpp
+++ b/Source/Core/DolphinWX/ISOFile.cpp
@@ -121,13 +121,9 @@ GameListItem::GameListItem(const std::string& _rFileName)
 
 	if (IsValid())
 	{
-		IniFile ini;
-		ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + m_UniqueID + ".ini");
-		ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_UniqueID + ".ini", true);
-
-		IniFile::Section* emu_state = ini.GetOrCreateSection("EmuState");
-		emu_state->Get("EmulationStateId", &m_emu_state);
-		emu_state->Get("EmulationIssues", &m_issues);
+		IniFile ini = SCoreStartupParameter::LoadGameIni(m_UniqueID, m_Revision);
+		ini.GetIfExists("EmuState", "EmulationStateId", &m_emu_state);
+		ini.GetIfExists("EmuState", "EmulationIssues", &m_issues);
 	}
 
 	if (!m_pImage.empty())
diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp
index 45b790aa36..579d2d59c2 100644
--- a/Source/Core/DolphinWX/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/ISOProperties.cpp
@@ -163,11 +163,9 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 		}
 	}
 
-	// Load game ini
+	// Is it really necessary to use GetTitleID in case GetUniqueID fails?
 	std::string _iniFilename = OpenISO->GetUniqueID();
-	std::string _iniFilenameRevisionSpecific = OpenISO->GetRevisionSpecificUniqueID();
-
-	if (!_iniFilename.length())
+	if (_iniFilename.empty())
 	{
 		u8 title_id[8];
 		if (OpenISO->GetTitleID(title_id))
@@ -176,14 +174,11 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 		}
 	}
 
+	// Load game INIs
 	GameIniFileDefault = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + _iniFilename + ".ini";
-	std::string GameIniFileDefaultRevisionSpecific = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + _iniFilenameRevisionSpecific + ".ini";
 	GameIniFileLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + _iniFilename + ".ini";
-
-	GameIniDefault.Load(GameIniFileDefault);
-	if (_iniFilenameRevisionSpecific != "")
-		GameIniDefault.Load(GameIniFileDefaultRevisionSpecific, true);
-	GameIniLocal.Load(GameIniFileLocal);
+	GameIniDefault = SCoreStartupParameter::LoadDefaultGameIni(_iniFilename, OpenISO->GetRevision());
+	GameIniLocal = SCoreStartupParameter::LoadLocalGameIni(_iniFilename, OpenISO->GetRevision());
 
 	// Setup GUI
 	OpenGameListItem = new GameListItem(fileName);
diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp
index 5920b39b99..da5bb5081a 100644
--- a/Source/Core/InputCommon/InputConfig.cpp
+++ b/Source/Core/InputCommon/InputConfig.cpp
@@ -17,7 +17,6 @@ InputConfig::~InputConfig()
 bool InputConfig::LoadConfig(bool isGC)
 {
 	IniFile inifile;
-	IniFile game_ini;
 	bool useProfile[MAX_BBMOTES] = {false, false, false, false, false};
 	std::string num[MAX_BBMOTES] = {"1", "2", "3", "4", "BB"};
 	std::string profile[MAX_BBMOTES];
@@ -37,8 +36,7 @@ bool InputConfig::LoadConfig(bool isGC)
 			path = "Profiles/Wiimote/";
 		}
 
-		game_ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini");
-		game_ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini", true);
+		IniFile game_ini = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadGameIni();
 		IniFile::Section* control_section = game_ini.GetOrCreateSection("Controls");
 
 		for (int i = 0; i < 4; i++)
@@ -53,7 +51,7 @@ bool InputConfig::LoadConfig(bool isGC)
 					}
 					else
 					{
-						// TODO: Having a PanicAlert for this is dumb.
+						// TODO: PanicAlert shouldn't be used for this.
 						PanicAlertT("Selected controller profile does not exist");
 					}
 				}