diff --git a/Data/Sys/GameSettings/DLS.ini b/Data/Sys/GameSettings/DLS.ini
index 2d2895716ad..a09d5bb36e9 100644
--- a/Data/Sys/GameSettings/DLS.ini
+++ b/Data/Sys/GameSettings/DLS.ini
@@ -23,7 +23,6 @@ EmulationIssues =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
-SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
 EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/G5T.ini b/Data/Sys/GameSettings/G5T.ini
index b8729163988..b30f613bfed 100644
--- a/Data/Sys/GameSettings/G5T.ini
+++ b/Data/Sys/GameSettings/G5T.ini
@@ -25,8 +25,5 @@ PH_ExtraParam = 0
 PH_ZNear =
 PH_ZFar =
 
-[Video_Hacks]
-EFBToTextureEnable = False
-
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/G6W.ini b/Data/Sys/GameSettings/G6W.ini
index cd75f4f5795..70d6afbb747 100644
--- a/Data/Sys/GameSettings/G6W.ini
+++ b/Data/Sys/GameSettings/G6W.ini
@@ -25,5 +25,5 @@ PH_ExtraParam = 0
 PH_ZNear =
 PH_ZFar =
 
-[Video_Hacks]
-EFBToTextureEnable = False
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GAC.ini b/Data/Sys/GameSettings/GAC.ini
index beca1e7a38e..8d8f467164b 100644
--- a/Data/Sys/GameSettings/GAC.ini
+++ b/Data/Sys/GameSettings/GAC.ini
@@ -2,10 +2,12 @@
 
 [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.
@@ -16,3 +18,5 @@ EmulationStateId = 4
 [ActionReplay]
 # Add action replay cheats here.
 
+[DSP]
+EnableJIT = True
diff --git a/Data/Sys/GameSettings/GFF.ini b/Data/Sys/GameSettings/GFF.ini
index 359d2eda231..35ab188bfd8 100644
--- a/Data/Sys/GameSettings/GFF.ini
+++ b/Data/Sys/GameSettings/GFF.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up (r7422)
+EmulationIssues = Needs real xfb for videos to show up.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GGR.ini b/Data/Sys/GameSettings/GGR.ini
index 86d8f43ee38..a6c955cea3c 100644
--- a/Data/Sys/GameSettings/GGR.ini
+++ b/Data/Sys/GameSettings/GGR.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs Real Xfb to show videos. Graphic glitches (r6945)
+EmulationIssues = Needs Real Xfb to show videos. Graphic glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GJN.ini b/Data/Sys/GameSettings/GJN.ini
index b8896f7df13..122aed90eab 100644
--- a/Data/Sys/GameSettings/GJN.ini
+++ b/Data/Sys/GameSettings/GJN.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Black screen
-EmulationStateId = 3
+EmulationIssues = Needs real xfb for the videos to display.
+EmulationStateId = 4
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,3 +17,6 @@ EmulationStateId = 3
 [ActionReplay]
 # Add action replay cheats here.
 
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GK7.ini b/Data/Sys/GameSettings/GK7.ini
index 547d703201c..f42bd2b5c83 100644
--- a/Data/Sys/GameSettings/GK7.ini
+++ b/Data/Sys/GameSettings/GK7.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Tested with (r6801)
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GMH.ini b/Data/Sys/GameSettings/GMH.ini
index 31ee8831f26..18519f97822 100644
--- a/Data/Sys/GameSettings/GMH.ini
+++ b/Data/Sys/GameSettings/GMH.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real Xfb for videos to show up (r6945)
+EmulationIssues = Needs real Xfb for videos to show up.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GMI.ini b/Data/Sys/GameSettings/GMI.ini
index 4b2fa471679..c1694fea1db 100644
--- a/Data/Sys/GameSettings/GMI.ini
+++ b/Data/Sys/GameSettings/GMI.ini
@@ -5,8 +5,8 @@
 
 [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).
+EmulationStateId = 4
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -29,6 +29,3 @@ PH_ZFar =
 UseXFB = True
 UseRealXFB = False
 
-[Video_Hacks]
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/GP2.ini b/Data/Sys/GameSettings/GP2.ini
index a851838a94e..20f683f6abe 100644
--- a/Data/Sys/GameSettings/GP2.ini
+++ b/Data/Sys/GameSettings/GP2.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs Real xfb for the videos to show up(r6651)
+EmulationIssues = Needs real xfb for the videos to show up.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GP8.ini b/Data/Sys/GameSettings/GP8.ini
index 5b3469a4719..1c4d92c7dcf 100644
--- a/Data/Sys/GameSettings/GP8.ini
+++ b/Data/Sys/GameSettings/GP8.ini
@@ -2,11 +2,12 @@
 
 [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 =
+EmulationIssues = Slow audio with HLE.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -25,3 +26,5 @@ PH_ExtraParam = 0
 PH_ZNear =
 PH_ZFar =
 
+[DSP]
+EnableJIT = True
diff --git a/Data/Sys/GameSettings/GPT.ini b/Data/Sys/GameSettings/GPT.ini
index 6cc81159511..4d3dddb1a69 100644
--- a/Data/Sys/GameSettings/GPT.ini
+++ b/Data/Sys/GameSettings/GPT.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for videos to show up(r6898)
+EmulationIssues = Needs Real Xfb for videos to show up.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GRK.ini b/Data/Sys/GameSettings/GRK.ini
index 43a22a9bf6a..fd9f6f9c543 100644
--- a/Data/Sys/GameSettings/GRK.ini
+++ b/Data/Sys/GameSettings/GRK.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use Directx11 plugin (r6651)
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -27,7 +27,6 @@ PH_ZFar =
 
 [Video_Settings]
 UseXFB = True
-
 UseRealXFB = False
 SafeTextureCacheColorSamples = 512
 
diff --git a/Data/Sys/GameSettings/GSA.ini b/Data/Sys/GameSettings/GSA.ini
index ec9d9369ef4..040a85b7793 100644
--- a/Data/Sys/GameSettings/GSA.ini
+++ b/Data/Sys/GameSettings/GSA.ini
@@ -5,7 +5,7 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Use dx11 plugin(r6477)
+EmulationIssues =
 EmulationStateId = 4
 
 [OnLoad]
diff --git a/Data/Sys/GameSettings/GT6.ini b/Data/Sys/GameSettings/GT6.ini
index 1d39514ca5c..0c61f21f4ed 100644
--- a/Data/Sys/GameSettings/GT6.ini
+++ b/Data/Sys/GameSettings/GT6.ini
@@ -30,6 +30,5 @@ UseXFB = True
 UseRealXFB = False
 
 [Video_Hacks]
-EFBToTextureEnable = False
 EFBAccessEnable = False
 
diff --git a/Data/Sys/GameSettings/GT6E70.ini b/Data/Sys/GameSettings/GT6E70.ini
index ab7f39ffc7b..6e9cef02f7e 100644
--- a/Data/Sys/GameSettings/GT6E70.ini
+++ b/Data/Sys/GameSettings/GT6E70.ini
@@ -62,6 +62,5 @@ UseXFB = True
 UseRealXFB = False
 
 [Video_Hacks]
-EFBToTextureEnable = False
 EFBAccessEnable = False
 
diff --git a/Data/Sys/GameSettings/JAC.ini b/Data/Sys/GameSettings/JAC.ini
index 551abd06ec2..f60ffcb1bac 100644
--- a/Data/Sys/GameSettings/JAC.ini
+++ b/Data/Sys/GameSettings/JAC.ini
@@ -2,7 +2,6 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-FPRF = True
 ProgressiveScan = True
 
 [EmuState]
diff --git a/Data/Sys/GameSettings/R5W.ini b/Data/Sys/GameSettings/R5W.ini
index 5a81795bd41..90461e9993e 100644
--- a/Data/Sys/GameSettings/R5W.ini
+++ b/Data/Sys/GameSettings/R5W.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Flashlight glitches (r6521)
+EmulationIssues = Flashlight glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/R96.ini b/Data/Sys/GameSettings/R96.ini
index fa19f5ab56d..76c30532fe9 100644
--- a/Data/Sys/GameSettings/R96.ini
+++ b/Data/Sys/GameSettings/R96.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
-EmulationIssues = Disable PAL60 (EuRGB60) mode in general settings-> wii tab for the game to run (r7446)
+EmulationIssues = Disable PAL60 (EuRGB60) mode in general settings-> wii tab for the game to run.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/RPB.ini b/Data/Sys/GameSettings/RPB.ini
index 33e1651c1a3..4a3bcb79ae0 100644
--- a/Data/Sys/GameSettings/RPB.ini
+++ b/Data/Sys/GameSettings/RPB.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs texture cache set to "Safe"(r6906).
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/RQR.ini b/Data/Sys/GameSettings/RQR.ini
index 1248c7e484d..e71e5ba0520 100644
--- a/Data/Sys/GameSettings/RQR.ini
+++ b/Data/Sys/GameSettings/RQR.ini
@@ -7,7 +7,7 @@ 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).
+EmulationIssues = Needs single core to run properly.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/RT4.ini b/Data/Sys/GameSettings/RT4.ini
index 9bfe23e17cd..b2c0cb18a68 100644
--- a/Data/Sys/GameSettings/RT4.ini
+++ b/Data/Sys/GameSettings/RT4.ini
@@ -5,7 +5,7 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs emulating format changes (r6871)
+EmulationIssues = 
 EmulationStateId = 4
 
 [OnLoad]
diff --git a/Data/Sys/GameSettings/RWS.ini b/Data/Sys/GameSettings/RWS.ini
index 16c547534d9..abf31fd62f1 100644
--- a/Data/Sys/GameSettings/RWS.ini
+++ b/Data/Sys/GameSettings/RWS.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs emulating format changes (r6871)
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/S2W.ini b/Data/Sys/GameSettings/S2W.ini
index f9bb22ba09a..253b65a4332 100644
--- a/Data/Sys/GameSettings/S2W.ini
+++ b/Data/Sys/GameSettings/S2W.ini
@@ -6,7 +6,7 @@
 [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)
+EmulationIssues = Use direct3d for less glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/S75.ini b/Data/Sys/GameSettings/S75.ini
index c62859415c3..17195c1c557 100644
--- a/Data/Sys/GameSettings/S75.ini
+++ b/Data/Sys/GameSettings/S75.ini
@@ -5,7 +5,7 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Skip any errors at startup and use integral efb scale (r6682)
+EmulationIssues = Skip any errors at startup and use integral efb scale.
 EmulationStateId = 4
 
 [OnLoad]
diff --git a/Data/Sys/GameSettings/STK.ini b/Data/Sys/GameSettings/STK.ini
index c6032fc21df..9719680fc03 100644
--- a/Data/Sys/GameSettings/STK.ini
+++ b/Data/Sys/GameSettings/STK.ini
@@ -5,7 +5,7 @@
 
 [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)
+EmulationIssues = Disable GC controllers if you want to use a wiimote instead.
 EmulationStateId = 5
 
 [OnLoad]
diff --git a/Data/Sys/GameSettings/SXC.ini b/Data/Sys/GameSettings/SXC.ini
index dd4d4687e94..03bb9d154e8 100644
--- a/Data/Sys/GameSettings/SXC.ini
+++ b/Data/Sys/GameSettings/SXC.ini
@@ -6,7 +6,7 @@
 [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)
+EmulationIssues = Create a guitar profile and use that instead of wiimote controls.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/SZA.ini b/Data/Sys/GameSettings/SZA.ini
index 1a829bb7222..0279bed2e15 100644
--- a/Data/Sys/GameSettings/SZA.ini
+++ b/Data/Sys/GameSettings/SZA.ini
@@ -6,7 +6,7 @@
 [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)
+EmulationIssues = Create a guitar profile and use that instead of wiimote controls.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/UGP.ini b/Data/Sys/GameSettings/UGP.ini
index d3cbad242db..40b450f48d5 100644
--- a/Data/Sys/GameSettings/UGP.ini
+++ b/Data/Sys/GameSettings/UGP.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 2
-EmulationIssues = No GameBoy Player Device (r7574)
+EmulationIssues = No GameBoy Player Device.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/WSL.ini b/Data/Sys/GameSettings/WSL.ini
index a0d507d41bd..494947e958a 100644
--- a/Data/Sys/GameSettings/WSL.ini
+++ b/Data/Sys/GameSettings/WSL.ini
@@ -5,7 +5,7 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs efb to ram otherwise character is invisible in the light.
+EmulationIssues = Needs efb to ram otherwise character is invincible in the light.
 EmulationStateId = 4
 
 [OnLoad]