diff --git a/Data/Sys/GameSettings/E7J.ini b/Data/Sys/GameSettings/E78.ini
similarity index 55%
rename from Data/Sys/GameSettings/E7J.ini
rename to Data/Sys/GameSettings/E78.ini
index f80fc8e1c0..40284eacda 100644
--- a/Data/Sys/GameSettings/E7J.ini
+++ b/Data/Sys/GameSettings/E78.ini
@@ -13,4 +13,13 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
-EFBToTextureEnable = False
+EFBEmulateFormatChanges = True
+# Solves minor graphical issues when starting level and game over screen
+#EFBToTextureEnable = False
+
+[Video_Settings]
+MSAA = 0
+
+[Video_Enhancements]
+ForceFiltering = False
+ForceTrueColor = False
diff --git a/Data/Sys/GameSettings/G3Q.ini b/Data/Sys/GameSettings/G3Q.ini
index 1fab4cd625..efe5b5fce4 100644
--- a/Data/Sys/GameSettings/G3Q.ini
+++ b/Data/Sys/GameSettings/G3Q.ini
@@ -13,7 +13,7 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
-ImmediateXFBEnable = False
+VertexRounding = True
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GNI.ini b/Data/Sys/GameSettings/GNI.ini
index 6682620f10..036070e53d 100644
--- a/Data/Sys/GameSettings/GNI.ini
+++ b/Data/Sys/GameSettings/GNI.ini
@@ -13,4 +13,4 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
-ImmediateXFBEnable = False
+VertexRounding = True
diff --git a/Data/Sys/GameSettings/RHF.ini b/Data/Sys/GameSettings/RHF.ini
index a3bea1d0f1..dd320227b3 100644
--- a/Data/Sys/GameSettings/RHF.ini
+++ b/Data/Sys/GameSettings/RHF.ini
@@ -1,6 +1,9 @@
 # RHFE5D, RHFP5D - Happy Feet
 
+[Core]
+# Values set here will override the main Dolphin settings.
+# The JIT cache causes problems with emulated icache invalidation in this game resulting in areas failing to load
+DisableICache = True
+
 [Video_Settings]
 SuggestedAspectRatio = 2
-# The JIT cache causes problems with emulated icache invalidation in this game resulting in a crash on starting the game
-DisableICache = True