diff --git a/Data/User/GameConfig/GF8E69.ini b/Data/User/GameConfig/GF8E69.ini
index 858a62d3d8..5fa4328270 100644
--- a/Data/User/GameConfig/GF8E69.ini
+++ b/Data/User/GameConfig/GF8E69.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = 
+EmulationIssues = The videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 $Master Code
@@ -40,3 +40,9 @@ $Away Team Never Scores
 00416F8C 00000000
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
diff --git a/Data/User/GameConfig/GF8P69.ini b/Data/User/GameConfig/GF8P69.ini
new file mode 100644
index 0000000000..3d6f730434
--- /dev/null
+++ b/Data/User/GameConfig/GF8P69.ini
@@ -0,0 +1,16 @@
+# GF8P69 - FIFA Street
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = The videos are messed up, skip them.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
diff --git a/Data/User/GameConfig/GOSE41.ini b/Data/User/GameConfig/GOSE41.ini
index 4682f2275c..adc124119f 100644
--- a/Data/User/GameConfig/GOSE41.ini
+++ b/Data/User/GameConfig/GOSE41.ini
@@ -1,9 +1,11 @@
 # GOSE41 - Open Season
 [Core] Values set here will override the main dolphin settings.
-TLBHack = 1
+MMU = 1
+FastDiscSpeed = 1
+BlockMerging = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues = Severe graphic issues.
+EmulationStateId = 4
+EmulationIssues = Needs MMU (Slow).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GOSP41.ini b/Data/User/GameConfig/GOSP41.ini
index 40fc6ad1f1..cb12055384 100644
--- a/Data/User/GameConfig/GOSP41.ini
+++ b/Data/User/GameConfig/GOSP41.ini
@@ -1,9 +1,11 @@
 # GOSP41 - Open Season
 [Core] Values set here will override the main dolphin settings.
-TLBHack = 1
+MMU = 1
+FastDiscSpeed = 1
+BlockMerging = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues = Severe graphic issues.
+EmulationStateId = 4
+EmulationIssues = Needs MMU (Slow).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GOSX41.ini b/Data/User/GameConfig/GOSX41.ini
index 92662f0a4c..8790cdfd8c 100644
--- a/Data/User/GameConfig/GOSX41.ini
+++ b/Data/User/GameConfig/GOSX41.ini
@@ -1,9 +1,11 @@
 # GOSX41 - Open Season
 [Core] Values set here will override the main dolphin settings.
-TLBHack = 1
+MMU = 1
+FastDiscSpeed = 1
+BlockMerging = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues = Severe graphic issues.
+EmulationStateId = 4
+EmulationIssues = Needs MMU (Slow).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/PH_PRESETS.ini b/Data/User/GameConfig/PH_PRESETS.ini
index 8d82d00790..f5e7a4aacf 100644
--- a/Data/User/GameConfig/PH_PRESETS.ini
+++ b/Data/User/GameConfig/PH_PRESETS.ini
@@ -33,7 +33,7 @@ PH_ExtraParam = 1
 
 [5]
 Title = Tales of Symphonia GC
-PH_ZNear = 0.0002
+PH_ZNear = 0.00026
 
 
 # ---------------------------------------------------
diff --git a/Data/User/GameConfig/R22E01.ini b/Data/User/GameConfig/R22E01.ini
index dfe3542671..c494ee5e12 100644
--- a/Data/User/GameConfig/R22E01.ini
+++ b/Data/User/GameConfig/R22E01.ini
@@ -17,5 +17,4 @@ PH_ZFar =
 SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/R22J01.ini b/Data/User/GameConfig/R22J01.ini
index c38ff20966..94aeac02f3 100644
--- a/Data/User/GameConfig/R22J01.ini
+++ b/Data/User/GameConfig/R22J01.ini
@@ -17,5 +17,4 @@ PH_ZFar =
 SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/R22P01.ini b/Data/User/GameConfig/R22P01.ini
index 6153cb0d06..8fb637216f 100644
--- a/Data/User/GameConfig/R22P01.ini
+++ b/Data/User/GameConfig/R22P01.ini
@@ -17,5 +17,4 @@ PH_ZFar =
 SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/R3ME01.ini b/Data/User/GameConfig/R3ME01.ini
index 312d6a15f1..4c891c14b1 100644
--- a/Data/User/GameConfig/R3ME01.ini
+++ b/Data/User/GameConfig/R3ME01.ini
@@ -1,20 +1,19 @@
-# R3ME01 - 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 EuRGB60(PAL60) to avoid a black bar appearing.
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-[Wii]
-DisableWiimoteSpeaker = 1
+# R3ME01 - 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 EuRGB60(PAL60) to avoid a black bar appearing.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+[Wii]

diff --git a/Data/User/GameConfig/R3MP01.ini b/Data/User/GameConfig/R3MP01.ini
index 291ac8df38..71938b821a 100644
--- a/Data/User/GameConfig/R3MP01.ini
+++ b/Data/User/GameConfig/R3MP01.ini
@@ -1,20 +1,19 @@
-# 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 EuRGB60(PAL60) to avoid a black bar appearing.
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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 EuRGB60(PAL60) to avoid a black bar appearing.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+[Wii]

diff --git a/Data/User/GameConfig/R4QE01.ini b/Data/User/GameConfig/R4QE01.ini
index 3ae6cb283a..e822d53161 100644
--- a/Data/User/GameConfig/R4QE01.ini
+++ b/Data/User/GameConfig/R4QE01.ini
@@ -1,20 +1,19 @@
-# 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 = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Enhancements]
-[Video_Hacks]
-DlistCachingEnable = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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 = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Enhancements]
+[Video_Hacks]
+DlistCachingEnable = False
+[Wii]

diff --git a/Data/User/GameConfig/R4QJ01.ini b/Data/User/GameConfig/R4QJ01.ini
index d97cc37c84..14bef2a3e5 100644
--- a/Data/User/GameConfig/R4QJ01.ini
+++ b/Data/User/GameConfig/R4QJ01.ini
@@ -1,20 +1,19 @@
-# R4QJ01 - 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 = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Enhancements]
-[Video_Hacks]
-DlistCachingEnable = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# R4QJ01 - 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 = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Enhancements]
+[Video_Hacks]
+DlistCachingEnable = False
+[Wii]

diff --git a/Data/User/GameConfig/R4QK01.ini b/Data/User/GameConfig/R4QK01.ini
index 2c45a961a0..2fb7675fd4 100644
--- a/Data/User/GameConfig/R4QK01.ini
+++ b/Data/User/GameConfig/R4QK01.ini
@@ -1,20 +1,19 @@
-# R4QK01 - Mario Power Soccer
-[Core] 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 = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Enhancements]
-[Video_Hacks]
-DlistCachingEnable = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# R4QK01 - Mario Power Soccer
+[Core] 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 = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Enhancements]
+[Video_Hacks]
+DlistCachingEnable = False
+[Wii]

diff --git a/Data/User/GameConfig/R4QP01.ini b/Data/User/GameConfig/R4QP01.ini
index 8ec96e8cf3..54fa2ec234 100644
--- a/Data/User/GameConfig/R4QP01.ini
+++ b/Data/User/GameConfig/R4QP01.ini
@@ -1,20 +1,19 @@
-# R4QP01 - 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 = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Enhancements]
-[Video_Hacks]
-DlistCachingEnable = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# R4QP01 - 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 = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Enhancements]
+[Video_Hacks]
+DlistCachingEnable = False
+[Wii]

diff --git a/Data/User/GameConfig/R5WEA4.ini b/Data/User/GameConfig/R5WEA4.ini
index 315f7f340a..48b1c5cd12 100644
--- a/Data/User/GameConfig/R5WEA4.ini
+++ b/Data/User/GameConfig/R5WEA4.ini
@@ -15,5 +15,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]

 SafeTextureCacheColorSamples = 512
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/R5WJA4.ini b/Data/User/GameConfig/R5WJA4.ini
index 30a983b648..25d6076a05 100644
--- a/Data/User/GameConfig/R5WJA4.ini
+++ b/Data/User/GameConfig/R5WJA4.ini
@@ -15,5 +15,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]

 SafeTextureCacheColorSamples = 512
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/R7PE01.ini b/Data/User/GameConfig/R7PE01.ini
index 1a052239ae..244ccc1db3 100644
--- a/Data/User/GameConfig/R7PE01.ini
+++ b/Data/User/GameConfig/R7PE01.ini
@@ -1,19 +1,18 @@
-# R7PE01 - 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 = Disable "Use EuRGB60 (PAL60) mode" in the wii configuration tab for the game to run
-[OnFrame] Add memory patches to be applied every frame here.
-+$Patch
-0x8011E0F8:dword:0x4E800020
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+# R7PE01 - 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 = Disable "Use EuRGB60 (PAL60) mode" in the wii configuration tab for the game to run
+[OnFrame] Add memory patches to be applied every frame here.
++$Patch
+0x8011E0F8:dword:0x4E800020
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Wii]

diff --git a/Data/User/GameConfig/R7PP01.ini b/Data/User/GameConfig/R7PP01.ini
index 302bd1e965..a0113b7415 100644
--- a/Data/User/GameConfig/R7PP01.ini
+++ b/Data/User/GameConfig/R7PP01.ini
@@ -1,13 +1,12 @@
-# R7PP01 - Punch Out
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = 
-EmulationStateId = 5
-[OnFrame] Add memory patches to be applied every frame here.
-+$Patch
-0x8011F1CC:dword:0x4E800020
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-[Wii]
-DisableWiimoteSpeaker = 1
+# R7PP01 - Punch Out
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 5
+[OnFrame] Add memory patches to be applied every frame here.
++$Patch
+0x8011F1CC:dword:0x4E800020
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+[Wii]

diff --git a/Data/User/GameConfig/RBWE01.ini b/Data/User/GameConfig/RBWE01.ini
index 9e8d586cf4..a2cad6ff7d 100644
--- a/Data/User/GameConfig/RBWE01.ini
+++ b/Data/User/GameConfig/RBWE01.ini
@@ -1,18 +1,17 @@
-# RBWE01 - Battalion Wars 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 LLE audio for proper sound.
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Enhancements]
-[Wii]
-DisableWiimoteSpeaker = 1
+# RBWE01 - Battalion Wars 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 LLE audio for proper sound.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Enhancements]
+[Wii]

diff --git a/Data/User/GameConfig/RBWJ01.ini b/Data/User/GameConfig/RBWJ01.ini
index bf95ff65c8..0d799c74fa 100644
--- a/Data/User/GameConfig/RBWJ01.ini
+++ b/Data/User/GameConfig/RBWJ01.ini
@@ -1,18 +1,17 @@
-# RBWJ01 - Totsugeki Famicom Wars vs.
-[Core] Values set 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 LLE audio for proper sound.
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Enhancements]
-[Wii]
-DisableWiimoteSpeaker = 1
+# RBWJ01 - Totsugeki Famicom Wars vs.
+[Core] Values set 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 LLE audio for proper sound.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Enhancements]
+[Wii]

diff --git a/Data/User/GameConfig/RBWP01.ini b/Data/User/GameConfig/RBWP01.ini
index f6282130a5..5422388866 100644
--- a/Data/User/GameConfig/RBWP01.ini
+++ b/Data/User/GameConfig/RBWP01.ini
@@ -1,18 +1,17 @@
-# RBWP01 - Battalion Wars 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 LLE audio for proper sound.
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Enhancements]
-[Wii]
-DisableWiimoteSpeaker = 1
+# RBWP01 - Battalion Wars 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 LLE audio for proper sound.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Enhancements]
+[Wii]

diff --git a/Data/User/GameConfig/RCJE8P.ini b/Data/User/GameConfig/RCJE8P.ini
index 845f08de77..79280a5609 100644
--- a/Data/User/GameConfig/RCJE8P.ini
+++ b/Data/User/GameConfig/RCJE8P.ini
@@ -24,6 +24,5 @@ PH_ZFar =
 [Video_Enhancements]
 ForceFiltering = False
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Hacks]
 DlistCachingEnable = False
diff --git a/Data/User/GameConfig/RCJP8P.ini b/Data/User/GameConfig/RCJP8P.ini
index 6d82c897e5..5a242b5e4e 100644
--- a/Data/User/GameConfig/RCJP8P.ini
+++ b/Data/User/GameConfig/RCJP8P.ini
@@ -18,6 +18,5 @@ PH_ZFar =
 [Video_Enhancements]
 ForceFiltering = False
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Hacks]
 DlistCachingEnable = False
diff --git a/Data/User/GameConfig/RD2E41.ini b/Data/User/GameConfig/RD2E41.ini
index a93f6359e6..92ca3f53b5 100644
--- a/Data/User/GameConfig/RD2E41.ini
+++ b/Data/User/GameConfig/RD2E41.ini
@@ -1,17 +1,16 @@
-# RD2E41 - 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 = 4
-EmulationIssues = Needs real wiimote and motion plus.
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+# RD2E41 - 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 = 4
+EmulationIssues = Needs real wiimote and motion plus.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Wii]

diff --git a/Data/User/GameConfig/RD2J41.ini b/Data/User/GameConfig/RD2J41.ini
index 8fccc41c35..2042a71430 100644
--- a/Data/User/GameConfig/RD2J41.ini
+++ b/Data/User/GameConfig/RD2J41.ini
@@ -1,17 +1,16 @@
-# 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 = 4
-EmulationIssues = Needs real wiimote and motion plus.
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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 = 4
+EmulationIssues = Needs real wiimote and motion plus.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Wii]

diff --git a/Data/User/GameConfig/RD2K41.ini b/Data/User/GameConfig/RD2K41.ini
index aa0e90f2b2..93123fa871 100644
--- a/Data/User/GameConfig/RD2K41.ini
+++ b/Data/User/GameConfig/RD2K41.ini
@@ -1,17 +1,16 @@
-# 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 = 4
-EmulationIssues = Needs real wiimote and motion plus.
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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 = 4
+EmulationIssues = Needs real wiimote and motion plus.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Wii]

diff --git a/Data/User/GameConfig/RD2P41.ini b/Data/User/GameConfig/RD2P41.ini
index 7cbf91b22d..8a7e5f7541 100644
--- a/Data/User/GameConfig/RD2P41.ini
+++ b/Data/User/GameConfig/RD2P41.ini
@@ -1,17 +1,16 @@
-# 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 = 4
-EmulationIssues = Needs real wiimote and motion plus.
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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 = 4
+EmulationIssues = Needs real wiimote and motion plus.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Wii]

diff --git a/Data/User/GameConfig/RD2X41.ini b/Data/User/GameConfig/RD2X41.ini
index 6748136cad..53f0716869 100644
--- a/Data/User/GameConfig/RD2X41.ini
+++ b/Data/User/GameConfig/RD2X41.ini
@@ -1,17 +1,16 @@
-# 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 = 4
-EmulationIssues = Needs real wiimote and motion plus.
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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 = 4
+EmulationIssues = Needs real wiimote and motion plus.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Wii]

diff --git a/Data/User/GameConfig/RHDE8P.ini b/Data/User/GameConfig/RHDE8P.ini
index b49ec93cb8..31d7a2f620 100644
--- a/Data/User/GameConfig/RHDE8P.ini
+++ b/Data/User/GameConfig/RHDE8P.ini
@@ -1,20 +1,19 @@
-# RHDE8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# RHDE8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+[Wii]

diff --git a/Data/User/GameConfig/RHDJ8P.ini b/Data/User/GameConfig/RHDJ8P.ini
index 63e818f737..014c94aaba 100644
--- a/Data/User/GameConfig/RHDJ8P.ini
+++ b/Data/User/GameConfig/RHDJ8P.ini
@@ -1,20 +1,19 @@
-# RHDJ8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# RHDJ8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+[Wii]

diff --git a/Data/User/GameConfig/RHDP8P.ini b/Data/User/GameConfig/RHDP8P.ini
index e932c173fb..6183ad8422 100644
--- a/Data/User/GameConfig/RHDP8P.ini
+++ b/Data/User/GameConfig/RHDP8P.ini
@@ -1,20 +1,19 @@
-# RHDP8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# RHDP8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+[Wii]

diff --git a/Data/User/GameConfig/RHOE8P.ini b/Data/User/GameConfig/RHOE8P.ini
index c28f341fb6..55d697ca52 100644
--- a/Data/User/GameConfig/RHOE8P.ini
+++ b/Data/User/GameConfig/RHOE8P.ini
@@ -1,39 +1,38 @@
-# RHOE8P - 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 = 4
-EmulationIssues = Use dx11 plugin (r6945)
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-$Infinte Bomb Usage after Getting 1 [g6flavor]
-04159D1C 60000000
-$If Score Increase, MAX [ZiT]
-C2142134 00000002
-3CA03B9B 38A5C9FF
-90A60178 00000000
-$Infinite LIFE [ZiT]
-04130ED4 60000000
-$Infinite Bullet [ZiT]
-04159FAC 907D0720
-$CASH MAX [ZiT]
-C214B118 00000002
-3CA03B9B 38A5C9FF
-90A300D8 00000000
-$CASH MAX [ZiT]
-C214B110 00000002
-3CA03B9B 38A5C9FF
-90A300DC 00000000
-$If Score Increase, MAX [ZiT]
-C2152674 00000002
-3CA03B9B 38A5C9FF
-90B60178 00000000
-[Wii]
-DisableWiimoteSpeaker = 1
+# RHOE8P - 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 = 4
+EmulationIssues = Use dx11 plugin (r6945)
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+$Infinte Bomb Usage after Getting 1 [g6flavor]
+04159D1C 60000000
+$If Score Increase, MAX [ZiT]
+C2142134 00000002
+3CA03B9B 38A5C9FF
+90A60178 00000000
+$Infinite LIFE [ZiT]
+04130ED4 60000000
+$Infinite Bullet [ZiT]
+04159FAC 907D0720
+$CASH MAX [ZiT]
+C214B118 00000002
+3CA03B9B 38A5C9FF
+90A300D8 00000000
+$CASH MAX [ZiT]
+C214B110 00000002
+3CA03B9B 38A5C9FF
+90A300DC 00000000
+$If Score Increase, MAX [ZiT]
+C2152674 00000002
+3CA03B9B 38A5C9FF
+90B60178 00000000
+[Wii]

diff --git a/Data/User/GameConfig/RHOJ8P.ini b/Data/User/GameConfig/RHOJ8P.ini
index 3e23f6605c..2eb65c9fc9 100644
--- a/Data/User/GameConfig/RHOJ8P.ini
+++ b/Data/User/GameConfig/RHOJ8P.ini
@@ -1,12 +1,11 @@
-# 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 = 4
-EmulationIssues = Use dx11 plugin (r6945)
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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 = 4
+EmulationIssues = Use dx11 plugin (r6945)
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+[Gecko]
+[Wii]

diff --git a/Data/User/GameConfig/RHOP8P.ini b/Data/User/GameConfig/RHOP8P.ini
index 8e9d0e879d..85a8e2770a 100644
--- a/Data/User/GameConfig/RHOP8P.ini
+++ b/Data/User/GameConfig/RHOP8P.ini
@@ -1,12 +1,11 @@
-# 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 = 4
-EmulationIssues = Use dx11 plugin (r6945)
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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 = 4
+EmulationIssues = Use dx11 plugin (r6945)
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+[Gecko]
+[Wii]

diff --git a/Data/User/GameConfig/RLGE64.ini b/Data/User/GameConfig/RLGE64.ini
index 505df3c17d..5e66cda379 100644
--- a/Data/User/GameConfig/RLGE64.ini
+++ b/Data/User/GameConfig/RLGE64.ini
@@ -6,7 +6,6 @@ EmulationIssues =
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/RLGJ52.ini b/Data/User/GameConfig/RLGJ52.ini
index 52b8648072..37b4f728d1 100644
--- a/Data/User/GameConfig/RLGJ52.ini
+++ b/Data/User/GameConfig/RLGJ52.ini
@@ -6,7 +6,6 @@ EmulationIssues =
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/RLGP64.ini b/Data/User/GameConfig/RLGP64.ini
index f82d202584..6404bf0a77 100644
--- a/Data/User/GameConfig/RLGP64.ini
+++ b/Data/User/GameConfig/RLGP64.ini
@@ -6,7 +6,6 @@ EmulationIssues =
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/RM3E01.ini b/Data/User/GameConfig/RM3E01.ini
index cb87db9070..182660bd97 100644
--- a/Data/User/GameConfig/RM3E01.ini
+++ b/Data/User/GameConfig/RM3E01.ini
@@ -21,6 +21,5 @@ SafeTextureCacheColorSamples = 512
 EFBToTextureEnable = False
 EFBCopyEnable = True
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Hacks]
 EFBEmulateFormatChanges = True
diff --git a/Data/User/GameConfig/RM3J01.ini b/Data/User/GameConfig/RM3J01.ini
index 97a88c4c69..50c84d87a9 100644
--- a/Data/User/GameConfig/RM3J01.ini
+++ b/Data/User/GameConfig/RM3J01.ini
@@ -21,6 +21,5 @@ SafeTextureCacheColorSamples = 512
 EFBToTextureEnable = False
 EFBCopyEnable = True
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Hacks]
 EFBEmulateFormatChanges = True
diff --git a/Data/User/GameConfig/RM3P01.ini b/Data/User/GameConfig/RM3P01.ini
index 093afc15db..0832325938 100644
--- a/Data/User/GameConfig/RM3P01.ini
+++ b/Data/User/GameConfig/RM3P01.ini
@@ -23,6 +23,5 @@ SafeTextureCacheColorSamples = 512
 EFBToTextureEnable = False
 EFBCopyEnable = True
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Hacks]
 EFBEmulateFormatChanges = True
diff --git a/Data/User/GameConfig/RQREXJ.ini b/Data/User/GameConfig/RQREXJ.ini
index 91a35e540d..48d52b4320 100644
--- a/Data/User/GameConfig/RQREXJ.ini
+++ b/Data/User/GameConfig/RQREXJ.ini
@@ -16,5 +16,4 @@ EmulationIssues = Needs single core to run properly(r7436).
 [OnFrame]
 [ActionReplay]
 [Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/RQRJAF.ini b/Data/User/GameConfig/RQRJAF.ini
index c647c4acee..7ae768c3b4 100644
--- a/Data/User/GameConfig/RQRJAF.ini
+++ b/Data/User/GameConfig/RQRJAF.ini
@@ -16,5 +16,4 @@ EmulationIssues = Needs single core to run properly(r7436).
 [OnFrame]
 [ActionReplay]
 [Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/RQRPAF.ini b/Data/User/GameConfig/RQRPAF.ini
index 8052e6084b..752c0fa2bd 100644
--- a/Data/User/GameConfig/RQRPAF.ini
+++ b/Data/User/GameConfig/RQRPAF.ini
@@ -16,5 +16,4 @@ EmulationIssues = Needs single core to run properly(r7436).
 [OnFrame]
 [ActionReplay]
 [Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/RRKE70.ini b/Data/User/GameConfig/RRKE70.ini
index 621b0dfd09..ebb3188d0b 100644
--- a/Data/User/GameConfig/RRKE70.ini
+++ b/Data/User/GameConfig/RRKE70.ini
@@ -16,5 +16,4 @@ EmulationIssues =
 [Gecko]
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/RRKP70.ini b/Data/User/GameConfig/RRKP70.ini
index c5fc07ede3..e69e07f92e 100644
--- a/Data/User/GameConfig/RRKP70.ini
+++ b/Data/User/GameConfig/RRKP70.ini
@@ -16,5 +16,4 @@ EmulationIssues =
 [Gecko]
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/RTZE08.ini b/Data/User/GameConfig/RTZE08.ini
index ff41b71a06..27524e8236 100644
--- a/Data/User/GameConfig/RTZE08.ini
+++ b/Data/User/GameConfig/RTZE08.ini
@@ -1,20 +1,19 @@
-# 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
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+[Wii]

diff --git a/Data/User/GameConfig/RTZJ08.ini b/Data/User/GameConfig/RTZJ08.ini
index 5a62e2c8ca..6a5aa8d6ee 100644
--- a/Data/User/GameConfig/RTZJ08.ini
+++ b/Data/User/GameConfig/RTZJ08.ini
@@ -1,20 +1,19 @@
-# 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
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+[Wii]

diff --git a/Data/User/GameConfig/RTZK08.ini b/Data/User/GameConfig/RTZK08.ini
index 6a7d00e753..ec333d6bce 100644
--- a/Data/User/GameConfig/RTZK08.ini
+++ b/Data/User/GameConfig/RTZK08.ini
@@ -1,20 +1,19 @@
-# 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
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+[Wii]

diff --git a/Data/User/GameConfig/RTZP08.ini b/Data/User/GameConfig/RTZP08.ini
index 8add9d2869..f3b0834049 100644
--- a/Data/User/GameConfig/RTZP08.ini
+++ b/Data/User/GameConfig/RTZP08.ini
@@ -1,20 +1,19 @@
-# 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
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+[Wii]

diff --git a/Data/User/GameConfig/RZJD69.ini b/Data/User/GameConfig/RZJD69.ini
index 671318fd38..848dcba860 100644
--- a/Data/User/GameConfig/RZJD69.ini
+++ b/Data/User/GameConfig/RZJD69.ini
@@ -17,5 +17,4 @@ PH_ZFar =
 [Video_Settings]

 SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/RZJE69.ini b/Data/User/GameConfig/RZJE69.ini
index a37d3f9223..c48c837a27 100644
--- a/Data/User/GameConfig/RZJE69.ini
+++ b/Data/User/GameConfig/RZJE69.ini
@@ -17,5 +17,4 @@ PH_ZFar =
 [Video_Settings]

 SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/RZJJ13.ini b/Data/User/GameConfig/RZJJ13.ini
index d109d22a98..24aa98035b 100644
--- a/Data/User/GameConfig/RZJJ13.ini
+++ b/Data/User/GameConfig/RZJJ13.ini
@@ -17,5 +17,4 @@ PH_ZFar =
 [Video_Settings]

 SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/RZJP69.ini b/Data/User/GameConfig/RZJP69.ini
index 63b230b1da..9fa88eb843 100644
--- a/Data/User/GameConfig/RZJP69.ini
+++ b/Data/User/GameConfig/RZJP69.ini
@@ -31,6 +31,5 @@ $Rapid Fire [TNTkryzt]
 [Video_Settings]

 SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

 
diff --git a/Data/User/GameConfig/RZZE8P.ini b/Data/User/GameConfig/RZZE8P.ini
index 31859ef891..9c74320a0b 100644
--- a/Data/User/GameConfig/RZZE8P.ini
+++ b/Data/User/GameConfig/RZZE8P.ini
@@ -1,17 +1,16 @@
-# 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 = 5
-EmulationIssues = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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 = 5
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Wii]

diff --git a/Data/User/GameConfig/RZZJEL.ini b/Data/User/GameConfig/RZZJEL.ini
index 0e6a08334a..6ace0cb90c 100644
--- a/Data/User/GameConfig/RZZJEL.ini
+++ b/Data/User/GameConfig/RZZJEL.ini
@@ -1,17 +1,16 @@
-# 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 = 5
-EmulationIssues = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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 = 5
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Wii]

diff --git a/Data/User/GameConfig/RZZP8P.ini b/Data/User/GameConfig/RZZP8P.ini
index 6dc117c26f..ac5bed9812 100644
--- a/Data/User/GameConfig/RZZP8P.ini
+++ b/Data/User/GameConfig/RZZP8P.ini
@@ -1,17 +1,16 @@
-# 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 = 5
-EmulationIssues = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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 = 5
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Wii]

diff --git a/Data/User/GameConfig/SC2E8P.ini b/Data/User/GameConfig/SC2E8P.ini
index ff46b91be8..998d51859d 100644
--- a/Data/User/GameConfig/SC2E8P.ini
+++ b/Data/User/GameConfig/SC2E8P.ini
@@ -1,21 +1,20 @@
-# SC2E8P - Conduit 2
-[Core]
-BlockMerging = 1
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Gecko]
-[Video_Hacks]
-DlistCachingEnable = False
-[Video_Settings]
-[Wii]
-DisableWiimoteSpeaker = 1
+# SC2E8P - Conduit 2
+[Core]
+BlockMerging = 1
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Gecko]
+[Video_Hacks]
+DlistCachingEnable = False
+[Video_Settings]
+[Wii]

diff --git a/Data/User/GameConfig/SC2P8P.ini b/Data/User/GameConfig/SC2P8P.ini
index a065f8a096..b9f5c5989c 100644
--- a/Data/User/GameConfig/SC2P8P.ini
+++ b/Data/User/GameConfig/SC2P8P.ini
@@ -1,70 +1,69 @@
-# SC2P8P - Conduit 2
-[Core]
-BlockMerging = 1
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Gecko]
-$Undead Invincibility Mode [Bully@Wiiplaza]
-F6000001 80008100
-8001002C 90180000
-D200000C 00000006
-2C110035 40820020
-2C0800F4 40820018
-2C0300A0 40820010
-3C007FFF 6000FFFF
-90040000 80040000
-60000000 00000000
-E0000000 80008000
-**Offline Only*
-**You are completely untouchable*
-*Picture -> http://imageshack.us/photo/my-images/684/sc2p8p008.png/
-$Inf. Ammo [Bully@Wiiplaza]
-F6000001 80008100
-80640000 80050000
-D2000008 00000003
-2C110021 4082000C
-38600000 7C030050
-60000000 00000000
-E0000000 80008000
-**Offline Only*
-$No Flashwhite [Bully@Wiiplaza]
-F6000001 80008100
-EC210032 93C10008
-14000114 60000000
-E0000000 80008000
-$Inf. Money [Bully@Wiiplaza]
-F6000001 80008100
-7C003A14 38E70001
-D2000010 00000004
-2C11002F 40820014
-2C0401A8 4082000C
-3D807FFF 7D84012E
-7C04002E 00000000
-E0000000 80008000
-$Profile One Name Changer Jedi Hack & [Mitch]
-0487E2D4 XXXXXXXX
-0487E2D8 XXXXXXXX
-0487E2DC XXXXXXXX
-$Profile Two Name Changer Jedi Hack & [Mitch]
-0487E320 0000XXXX
-0487E324 XXXXXXXX
-0487E328 XXXXXXXX
-0487E32C XXXX0000
-$Profile Three Name Changer Jedi Hack & [Mitch]
-0487E370 XXXXXXXX
-0487E374 XXXXXXXX
-[Video_Hacks]
-DlistCachingEnable = False
-[Video_Settings]
-[Wii]
-DisableWiimoteSpeaker = 1
+# SC2P8P - Conduit 2
+[Core]
+BlockMerging = 1
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Gecko]
+$Undead Invincibility Mode [Bully@Wiiplaza]
+F6000001 80008100
+8001002C 90180000
+D200000C 00000006
+2C110035 40820020
+2C0800F4 40820018
+2C0300A0 40820010
+3C007FFF 6000FFFF
+90040000 80040000
+60000000 00000000
+E0000000 80008000
+**Offline Only*
+**You are completely untouchable*
+*Picture -> http://imageshack.us/photo/my-images/684/sc2p8p008.png/
+$Inf. Ammo [Bully@Wiiplaza]
+F6000001 80008100
+80640000 80050000
+D2000008 00000003
+2C110021 4082000C
+38600000 7C030050
+60000000 00000000
+E0000000 80008000
+**Offline Only*
+$No Flashwhite [Bully@Wiiplaza]
+F6000001 80008100
+EC210032 93C10008
+14000114 60000000
+E0000000 80008000
+$Inf. Money [Bully@Wiiplaza]
+F6000001 80008100
+7C003A14 38E70001
+D2000010 00000004
+2C11002F 40820014
+2C0401A8 4082000C
+3D807FFF 7D84012E
+7C04002E 00000000
+E0000000 80008000
+$Profile One Name Changer Jedi Hack & [Mitch]
+0487E2D4 XXXXXXXX
+0487E2D8 XXXXXXXX
+0487E2DC XXXXXXXX
+$Profile Two Name Changer Jedi Hack & [Mitch]
+0487E320 0000XXXX
+0487E324 XXXXXXXX
+0487E328 XXXXXXXX
+0487E32C XXXX0000
+$Profile Three Name Changer Jedi Hack & [Mitch]
+0487E370 XXXXXXXX
+0487E374 XXXXXXXX
+[Video_Hacks]
+DlistCachingEnable = False
+[Video_Settings]
+[Wii]

diff --git a/Data/User/GameConfig/SD2E41.ini b/Data/User/GameConfig/SD2E41.ini
index 179c13afb9..ae90ff5196 100644
--- a/Data/User/GameConfig/SD2E41.ini
+++ b/Data/User/GameConfig/SD2E41.ini
@@ -16,5 +16,4 @@ EmulationIssues =
 [OnFrame]
 [ActionReplay]
 [Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SD2J01.ini b/Data/User/GameConfig/SD2J01.ini
index f29168a46c..3285e7c75a 100644
--- a/Data/User/GameConfig/SD2J01.ini
+++ b/Data/User/GameConfig/SD2J01.ini
@@ -16,5 +16,4 @@ EmulationIssues =
 [OnFrame]
 [ActionReplay]
 [Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SD2P41.ini b/Data/User/GameConfig/SD2P41.ini
index 744a354aaf..2111a3c298 100644
--- a/Data/User/GameConfig/SD2P41.ini
+++ b/Data/User/GameConfig/SD2P41.ini
@@ -16,5 +16,4 @@ EmulationIssues =
 [OnFrame]
 [ActionReplay]
 [Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SD2Y41.ini b/Data/User/GameConfig/SD2Y41.ini
index 9daa079aac..59c9fb666b 100644
--- a/Data/User/GameConfig/SD2Y41.ini
+++ b/Data/User/GameConfig/SD2Y41.ini
@@ -16,5 +16,4 @@ EmulationIssues =
 [OnFrame]
 [ActionReplay]
 [Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SEME4Q.ini b/Data/User/GameConfig/SEME4Q.ini
index 7e340985b3..48056894b9 100644
--- a/Data/User/GameConfig/SEME4Q.ini
+++ b/Data/User/GameConfig/SEME4Q.ini
@@ -20,5 +20,4 @@ SafeTextureCacheColorSamples = 0
 ForceFiltering = False
 [Video_Hacks]
 DlistCachingEnable = False
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SEMJ01.ini b/Data/User/GameConfig/SEMJ01.ini
index 7dc481ea34..f0740ca7a3 100644
--- a/Data/User/GameConfig/SEMJ01.ini
+++ b/Data/User/GameConfig/SEMJ01.ini
@@ -20,5 +20,4 @@ SafeTextureCacheColorSamples = 0
 ForceFiltering = False
 [Video_Hacks]
 DlistCachingEnable = False
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SEMP4Q.ini b/Data/User/GameConfig/SEMP4Q.ini
index fa1afc01c2..f425547cf4 100644
--- a/Data/User/GameConfig/SEMP4Q.ini
+++ b/Data/User/GameConfig/SEMP4Q.ini
@@ -20,5 +20,4 @@ SafeTextureCacheColorSamples = 0
 ForceFiltering = False
 [Video_Hacks]
 DlistCachingEnable = False
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SEMX4Q.ini b/Data/User/GameConfig/SEMX4Q.ini
index b4c56197ea..43232806a2 100644
--- a/Data/User/GameConfig/SEMX4Q.ini
+++ b/Data/User/GameConfig/SEMX4Q.ini
@@ -20,5 +20,4 @@ SafeTextureCacheColorSamples = 0
 ForceFiltering = False
 [Video_Hacks]
 DlistCachingEnable = False
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SEMY4Q.ini b/Data/User/GameConfig/SEMY4Q.ini
index 5d8798227d..817f8387e0 100644
--- a/Data/User/GameConfig/SEMY4Q.ini
+++ b/Data/User/GameConfig/SEMY4Q.ini
@@ -20,5 +20,4 @@ SafeTextureCacheColorSamples = 0
 ForceFiltering = False
 [Video_Hacks]
 DlistCachingEnable = False
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SEMZ4Q.ini b/Data/User/GameConfig/SEMZ4Q.ini
index eecaa23166..515a1bd029 100644
--- a/Data/User/GameConfig/SEMZ4Q.ini
+++ b/Data/User/GameConfig/SEMZ4Q.ini
@@ -20,5 +20,4 @@ SafeTextureCacheColorSamples = 0
 ForceFiltering = False
 [Video_Hacks]
 DlistCachingEnable = False
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SERE4Q.ini b/Data/User/GameConfig/SERE4Q.ini
index ef5f4edfb2..fbc9fa9d3c 100644
--- a/Data/User/GameConfig/SERE4Q.ini
+++ b/Data/User/GameConfig/SERE4Q.ini
@@ -16,5 +16,4 @@ PH_ZFar =
 [Video_Settings]
 EFBScale = 1

 SafeTextureCacheColorSamples = 0
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SERF4Q.ini b/Data/User/GameConfig/SERF4Q.ini
index b03abcf0e9..cd2fca395e 100644
--- a/Data/User/GameConfig/SERF4Q.ini
+++ b/Data/User/GameConfig/SERF4Q.ini
@@ -16,5 +16,4 @@ PH_ZFar =
 [Video_Settings]
 EFBScale = 1

 SafeTextureCacheColorSamples = 0
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SERP4Q.ini b/Data/User/GameConfig/SERP4Q.ini
index e57bb14704..7e332b8bcd 100644
--- a/Data/User/GameConfig/SERP4Q.ini
+++ b/Data/User/GameConfig/SERP4Q.ini
@@ -16,5 +16,4 @@ PH_ZFar =
 [Video_Settings]
 EFBScale = 1

 SafeTextureCacheColorSamples = 0
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SF8E01.ini b/Data/User/GameConfig/SF8E01.ini
index e8e185cda9..bb2bce7406 100644
--- a/Data/User/GameConfig/SF8E01.ini
+++ b/Data/User/GameConfig/SF8E01.ini
@@ -16,5 +16,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]

 SafeTextureCacheColorSamples = 512
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SF8J01.ini b/Data/User/GameConfig/SF8J01.ini
index bc0b0c2ba5..1f3ef9bb85 100644
--- a/Data/User/GameConfig/SF8J01.ini
+++ b/Data/User/GameConfig/SF8J01.ini
@@ -16,5 +16,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]

 SafeTextureCacheColorSamples = 512
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SF8P01.ini b/Data/User/GameConfig/SF8P01.ini
index 41a5957888..e17f5f4247 100644
--- a/Data/User/GameConfig/SF8P01.ini
+++ b/Data/User/GameConfig/SF8P01.ini
@@ -16,5 +16,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]

 SafeTextureCacheColorSamples = 512
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SFIE01.ini b/Data/User/GameConfig/SFIE01.ini
index 867859d8c4..7475f94fca 100644
--- a/Data/User/GameConfig/SFIE01.ini
+++ b/Data/User/GameConfig/SFIE01.ini
@@ -6,7 +6,6 @@ EmulationIssues = Needs real xfb for videos to show up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SFIP01.ini b/Data/User/GameConfig/SFIP01.ini
index 8a198d4fe8..114906aac3 100644
--- a/Data/User/GameConfig/SFIP01.ini
+++ b/Data/User/GameConfig/SFIP01.ini
@@ -6,7 +6,6 @@ EmulationIssues = Needs real xfb for videos to show up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SHLPA4.ini b/Data/User/GameConfig/SHLPA4.ini
index ce64ff21e1..b9eebf93c5 100644
--- a/Data/User/GameConfig/SHLPA4.ini
+++ b/Data/User/GameConfig/SHLPA4.ini
@@ -15,5 +15,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]

 SafeTextureCacheColorSamples = 512
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SJDE41.ini b/Data/User/GameConfig/SJDE41.ini
index 1e16ddd21f..64b712f81d 100644
--- a/Data/User/GameConfig/SJDE41.ini
+++ b/Data/User/GameConfig/SJDE41.ini
@@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SJDP41.ini b/Data/User/GameConfig/SJDP41.ini
index 53f65d5704..450a81c4f8 100644
--- a/Data/User/GameConfig/SJDP41.ini
+++ b/Data/User/GameConfig/SJDP41.ini
@@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SJDY41.ini b/Data/User/GameConfig/SJDY41.ini
index 107abedfd2..74584766c3 100644
--- a/Data/User/GameConfig/SJDY41.ini
+++ b/Data/User/GameConfig/SJDY41.ini
@@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SJDZ41.ini b/Data/User/GameConfig/SJDZ41.ini
index 53f65d5704..450a81c4f8 100644
--- a/Data/User/GameConfig/SJDZ41.ini
+++ b/Data/User/GameConfig/SJDZ41.ini
@@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SMOE41.ini b/Data/User/GameConfig/SMOE41.ini
index 15dc5a693e..3c61475544 100644
--- a/Data/User/GameConfig/SMOE41.ini
+++ b/Data/User/GameConfig/SMOE41.ini
@@ -1,21 +1,20 @@
-# SMOE41 - 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 = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed.
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-[Video_Enhancements]
-MaxAnisotropy = 0
-[Wii]
-DisableWiimoteSpeaker = 1
+# SMOE41 - 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 = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+[Video_Enhancements]
+MaxAnisotropy = 0
+[Wii]

diff --git a/Data/User/GameConfig/SMOP41.ini b/Data/User/GameConfig/SMOP41.ini
index 6095cd9174..b9f913a639 100644
--- a/Data/User/GameConfig/SMOP41.ini
+++ b/Data/User/GameConfig/SMOP41.ini
@@ -1,21 +1,20 @@
-# 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 = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed.
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-[Video_Enhancements]
-MaxAnisotropy = 0
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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 = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+[Video_Enhancements]
+MaxAnisotropy = 0
+[Wii]

diff --git a/Data/User/GameConfig/SMOX41.ini b/Data/User/GameConfig/SMOX41.ini
index 88ba03da1c..929a58f076 100644
--- a/Data/User/GameConfig/SMOX41.ini
+++ b/Data/User/GameConfig/SMOX41.ini
@@ -1,21 +1,20 @@
-# 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 = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed.
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-[Video_Enhancements]
-MaxAnisotropy = 0
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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 = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+[Video_Enhancements]
+MaxAnisotropy = 0
+[Wii]

diff --git a/Data/User/GameConfig/SO3EE9.ini b/Data/User/GameConfig/SO3EE9.ini
index f8da896a23..c359fede43 100644
--- a/Data/User/GameConfig/SO3EE9.ini
+++ b/Data/User/GameConfig/SO3EE9.ini
@@ -6,7 +6,6 @@ EmulationIssues = Direct 3d 11 fixes some texture glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SO3J99.ini b/Data/User/GameConfig/SO3J99.ini
index 2ad57e3af2..e29dca5b96 100644
--- a/Data/User/GameConfig/SO3J99.ini
+++ b/Data/User/GameConfig/SO3J99.ini
@@ -6,7 +6,6 @@ EmulationIssues = Direct 3d 11 fixes some texture glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SOJE41.ini b/Data/User/GameConfig/SOJE41.ini
index 183a8823ca..af6d49b785 100644
--- a/Data/User/GameConfig/SOJE41.ini
+++ b/Data/User/GameConfig/SOJE41.ini
@@ -1,17 +1,16 @@
-# SOJE41 - 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 = 4
-EmulationIssues = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+# SOJE41 - 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 = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 1
+PH_SZNear = 1
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Wii]

diff --git a/Data/User/GameConfig/SOJP41.ini b/Data/User/GameConfig/SOJP41.ini
index 2c835fe6e2..fca55f9117 100644
--- a/Data/User/GameConfig/SOJP41.ini
+++ b/Data/User/GameConfig/SOJP41.ini
@@ -1,17 +1,16 @@
-# 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 = 4
-EmulationIssues = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+# 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 = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 1
+PH_SZNear = 1
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Wii]

diff --git a/Data/User/GameConfig/SOUE01.ini b/Data/User/GameConfig/SOUE01.ini
index 8461821933..7e37e04936 100644
--- a/Data/User/GameConfig/SOUE01.ini
+++ b/Data/User/GameConfig/SOUE01.ini
@@ -17,5 +17,4 @@ PH_ZFar =
 EFBAccessEnable = True
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Settings]


diff --git a/Data/User/GameConfig/SOUJ01.ini b/Data/User/GameConfig/SOUJ01.ini
index ede7d81148..b02302e15c 100644
--- a/Data/User/GameConfig/SOUJ01.ini
+++ b/Data/User/GameConfig/SOUJ01.ini
@@ -17,5 +17,4 @@ PH_ZFar =
 EFBAccessEnable = True
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Settings]


diff --git a/Data/User/GameConfig/SOUK01.ini b/Data/User/GameConfig/SOUK01.ini
index 512bd21408..201ec99315 100644
--- a/Data/User/GameConfig/SOUK01.ini
+++ b/Data/User/GameConfig/SOUK01.ini
@@ -17,5 +17,4 @@ PH_ZFar =
 EFBAccessEnable = True
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Settings]


diff --git a/Data/User/GameConfig/SOUP01.ini b/Data/User/GameConfig/SOUP01.ini
index 1b6e47096f..eab4d6b442 100644
--- a/Data/User/GameConfig/SOUP01.ini
+++ b/Data/User/GameConfig/SOUP01.ini
@@ -17,5 +17,4 @@ PH_ZFar =
 EFBAccessEnable = True
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Settings]


diff --git a/Data/User/GameConfig/SRQE41.ini b/Data/User/GameConfig/SRQE41.ini
index 5060189327..e923433ee8 100644
--- a/Data/User/GameConfig/SRQE41.ini
+++ b/Data/User/GameConfig/SRQE41.ini
@@ -14,6 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Hacks]
 DlistCachingEnable = False
diff --git a/Data/User/GameConfig/SRQP41.ini b/Data/User/GameConfig/SRQP41.ini
index f360aef050..c1001990b1 100644
--- a/Data/User/GameConfig/SRQP41.ini
+++ b/Data/User/GameConfig/SRQP41.ini
@@ -14,6 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Hacks]
 DlistCachingEnable = False
diff --git a/Data/User/GameConfig/SX3J01.ini b/Data/User/GameConfig/SX3J01.ini
index 276118af1a..3aef192f00 100644
--- a/Data/User/GameConfig/SX3J01.ini
+++ b/Data/User/GameConfig/SX3J01.ini
@@ -15,5 +15,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]

 SafeTextureCacheColorSamples = 0
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]

diff --git a/Data/User/GameConfig/SX3P01.ini b/Data/User/GameConfig/SX3P01.ini
index 94b5c6ef16..a753975414 100644
--- a/Data/User/GameConfig/SX3P01.ini
+++ b/Data/User/GameConfig/SX3P01.ini
@@ -15,5 +15,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]

 SafeTextureCacheColorSamples = 0
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]