diff --git a/Data/Sys/GameSettings/G8W.ini b/Data/Sys/GameSettings/G8W.ini
index a6c29036a2..ba7ba51d5a 100644
--- a/Data/Sys/GameSettings/G8W.ini
+++ b/Data/Sys/GameSettings/G8W.ini
@@ -2,12 +2,12 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-SkipIdle = False
+SyncOnSkipIdle = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Idle skipping slows down the game.
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,10 +18,3 @@ EmulationIssues = Idle skipping slows down the game.
 [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/G9R.ini b/Data/Sys/GameSettings/G9R.ini
index 92d286dc14..98ba156d16 100644
--- a/Data/Sys/GameSettings/G9R.ini
+++ b/Data/Sys/GameSettings/G9R.ini
@@ -2,11 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-SkipIdle = 0
+SyncOnSkipIdle = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Idle skipping can cause speed issues.
+EmulationIssues = 
 EmulationStateId = 4
 
 [OnLoad]
diff --git a/Data/Sys/GameSettings/GDE.ini b/Data/Sys/GameSettings/GDE.ini
index 89472b78eb..3eaee55ab4 100644
--- a/Data/Sys/GameSettings/GDE.ini
+++ b/Data/Sys/GameSettings/GDE.ini
@@ -2,7 +2,6 @@
 
 [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.
@@ -18,14 +17,6 @@ EmulationIssues =
 [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/GE4.ini b/Data/Sys/GameSettings/GE4.ini
index 49e6063346..1a9eb68393 100644
--- a/Data/Sys/GameSettings/GE4.ini
+++ b/Data/Sys/GameSettings/GE4.ini
@@ -2,12 +2,12 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-SkipIdle = 0
+SyncOnSkipIdle = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Idleskipping causes speed issues(menus,etc.)
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,11 +18,5 @@ EmulationIssues = Idleskipping causes speed issues(menus,etc.)
 [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/GHK.ini b/Data/Sys/GameSettings/GHK.ini
index 4b1d458edd..d080170051 100644
--- a/Data/Sys/GameSettings/GHK.ini
+++ b/Data/Sys/GameSettings/GHK.ini
@@ -1,20 +1,19 @@
 # GHKD7D, GHKE7D, GHKF7D, GHKP7D, GHKS7D - The Hulk
+
 [Core]
 # Values set here will override the main Dolphin settings.
-SkipIdle = 0
+SyncOnSkipIdle = False
+
 [EmuState]
 # The Emulation State. 1 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/GVL.ini b/Data/Sys/GameSettings/GVL.ini
index 771569b845..cc32e3d7bc 100644
--- a/Data/Sys/GameSettings/GVL.ini
+++ b/Data/Sys/GameSettings/GVL.ini
@@ -2,12 +2,12 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-SkipIdle = 0
+SyncOnSkipIdle = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Idleskipping if enabled will cause speed issues.
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,11 +18,3 @@ EmulationIssues = Idleskipping if enabled will cause speed issues.
 [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/NAK.ini b/Data/Sys/GameSettings/NAK.ini
index 1aa01ac6eb..35215e4334 100644
--- a/Data/Sys/GameSettings/NAK.ini
+++ b/Data/Sys/GameSettings/NAK.ini
@@ -1,12 +1,12 @@
-# NAKE01, NAKP01 - Pokémon Snap
+# NAKE01, NAKP01 - Pokemon Snap
 
 [Core]
 # 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 = Game can't recognize taken pictures. Progressing is impossible
+EmulationStateId = 4
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -16,5 +16,6 @@ EmulationIssues = Game can't recognize taken pictures. Progressing is impossible
 
 [ActionReplay]
 # Add action replay cheats here.
+
 [Video_Hacks]
 EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/R5D.ini b/Data/Sys/GameSettings/R5D.ini
index 860763676d..9f3b16626a 100644
--- a/Data/Sys/GameSettings/R5D.ini
+++ b/Data/Sys/GameSettings/R5D.ini
@@ -2,12 +2,12 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-SkipIdle = 0
+SyncOnSkipIdle = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Idle skipping causes speed issues.
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -16,15 +16,4 @@ EmulationIssues = Idle skipping causes speed issues.
 # Add memory patches to be applied every frame 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]
-
+# Add action replay cheats here.
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/R8J.ini b/Data/Sys/GameSettings/R8J.ini
index b433e3b50f..910b4b6046 100644
--- a/Data/Sys/GameSettings/R8J.ini
+++ b/Data/Sys/GameSettings/R8J.ini
@@ -2,12 +2,12 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-SkipIdle = False
+SyncOnSkipIdle = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Idle skipping slows down the game
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,14 +17,3 @@ EmulationIssues = Idle skipping slows down the game
 
 [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/RB7.ini b/Data/Sys/GameSettings/RB7.ini
new file mode 100644
index 0000000000..c667812250
--- /dev/null
+++ b/Data/Sys/GameSettings/RB7.ini
@@ -0,0 +1,19 @@
+# RB7E54, RB7P54 - Bully: Scholarship Edition
+
+[Core]
+# Values set here will override the main Dolphin settings.
+FastDiscSpeed = 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.
diff --git a/Data/Sys/GameSettings/RBH.ini b/Data/Sys/GameSettings/RBH.ini
index 631bdcb3df..5fc0d699ba 100644
--- a/Data/Sys/GameSettings/RBH.ini
+++ b/Data/Sys/GameSettings/RBH.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues =
+EmulationIssues = Needs efb from cpu access for proper lighting.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,16 +17,8 @@ EmulationIssues =
 [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]
-
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/RBW.ini b/Data/Sys/GameSettings/RBW.ini
index 4aa5adec5e..208bd1031a 100644
--- a/Data/Sys/GameSettings/RBW.ini
+++ b/Data/Sys/GameSettings/RBW.ini
@@ -2,12 +2,12 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-SkipIdle = False
+SyncOnSkipIdle = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Idle skipping slows down the game.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,12 +17,3 @@ EmulationIssues = Idle skipping slows down the game.
 
 [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/RPJ.ini b/Data/Sys/GameSettings/RPJ.ini
index f422b9232b..8100204151 100644
--- a/Data/Sys/GameSettings/RPJ.ini
+++ b/Data/Sys/GameSettings/RPJ.ini
@@ -2,6 +2,7 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
+FastDiscSpeed = True
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
@@ -17,16 +18,5 @@ EmulationStateId = 4
 [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/SIL.ini b/Data/Sys/GameSettings/SIL.ini
index 6576766201..f9ccb4a646 100644
--- a/Data/Sys/GameSettings/SIL.ini
+++ b/Data/Sys/GameSettings/SIL.ini
@@ -2,12 +2,12 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-SkipIdle = 0
+SyncOnSkipIdle = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Idleskipping causes speed issues(menus,etc.)
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,14 +18,6 @@ EmulationIssues = Idleskipping causes speed issues(menus,etc.)
 [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/SX8.ini b/Data/Sys/GameSettings/SX8.ini
index 44b32637cb..8652398ad5 100644
--- a/Data/Sys/GameSettings/SX8.ini
+++ b/Data/Sys/GameSettings/SX8.ini
@@ -2,12 +2,12 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-SkipIdle = 0
+SyncOnSkipIdle = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Idle skipping causes drop in performance.
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,14 +18,6 @@ EmulationIssues = Idle skipping causes drop in performance.
 [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