diff --git a/Resolutions/WiiU_FriendList_Resolution/rules.txt b/Resolutions/WiiU_FriendList_Resolution/rules.txt
deleted file mode 100644
index 8d5401aa..00000000
--- a/Resolutions/WiiU_FriendList_Resolution/rules.txt
+++ /dev/null
@@ -1,139 +0,0 @@
-[Definition]
-titleIds = 000500301001500A,000500301001510A,000500301001520A
-name = Resolution
-path = "Wii U/Friend List/Graphics/Resolution"
-description = Changes the resolution of the application. Made by M&&M.
-version = 4
-
-[Preset]
-name = 1280x720 (Default)
-$width = 1280
-$height = 720
-$gameWidth = 1280
-$gameHeight = 720
-
-# Performance
-
-[Preset]
-name = 320x180
-$width = 320
-$height = 180
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 640x360
-$width = 640
-$height = 360
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 854x480
-$width = 854
-$height = 480
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 960x540
-$width = 960
-$height = 540
-$gameWidth = 1280
-$gameHeight = 720
-
-# Common HD Resolutions
-
-[Preset]
-name = 1600x900
-$width = 1600
-$height = 900
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 1920x1080
-$width = 1920
-$height = 1080
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 2560x1440
-$width = 2560
-$height = 1440
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 3200x1800
-$width = 3200
-$height = 1800
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 3840x2160
-$width = 3840
-$height = 2160
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 5120x2880
-$width = 5120
-$height = 2880
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 7680x4320
-$width = 7680
-$height = 4320
-$gameWidth = 1280
-$gameHeight = 720
-
-[TextureRedefine]
-width = 1280
-height = 720
-overwriteWidth = ($width / $gameWidth) * 1280
-overwriteHeight = ($height / $gameHeight) * 720
-
-[TextureRedefine]
-width = 864
-height = 480
-overwriteWidth = ($width / $gameWidth) * 864
-overwriteHeight = ($height / $gameHeight) * 480
-
-[TextureRedefine]
-width = 854
-height = 480
-overwriteWidth = ($width / $gameWidth) * 854
-overwriteHeight = ($height / $gameHeight) * 480
-
-[TextureRedefine]
-width = 848
-height = 480
-overwriteWidth = ($width / $gameWidth) * 848
-overwriteHeight = ($height / $gameHeight) * 480
-
-[TextureRedefine]
-width = 256
-height = 256
-formats = 0x1a,0x80e
-overwriteWidth = ($width / $gameWidth) * 256
-overwriteHeight = ($height / $gameHeight) * 256
-
-[TextureRedefine]
-width = 192
-height = 192
-formats = 0x1a,0x41a
-overwriteWidth = ($width / $gameWidth) * 192
-overwriteHeight = ($height / $gameHeight) * 192
-
-[TextureRedefine]
-width = 128
-height = 128
-formats = 0x1a,0x41a
-overwriteWidth = ($width / $gameWidth) * 128
-overwriteHeight = ($height / $gameHeight) * 128
diff --git a/Resolutions/WiiU_InternetBrowser_Resolution/rules.txt b/Resolutions/WiiU_InternetBrowser_Resolution/rules.txt
deleted file mode 100644
index d14d8ad6..00000000
--- a/Resolutions/WiiU_InternetBrowser_Resolution/rules.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-[Definition]
-titleIds = 000500301001200A,000500301001210A,000500301001220A
-name = Resolution
-path = "Wii U/Internet Browser/Graphics/Resolution"
-description = Changes the resolution of the application. Made by M&&M.
-version = 4
-
-[Preset]
-name = 1280x720 (Default)
-$width = 1280
-$height = 720
-$gameWidth = 1280
-$gameHeight = 720
-
-# Performance
-
-[Preset]
-name = 320x180
-$width = 320
-$height = 180
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 640x360
-$width = 640
-$height = 360
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 854x480
-$width = 854
-$height = 480
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 960x540
-$width = 960
-$height = 540
-$gameWidth = 1280
-$gameHeight = 720
-
-# Common HD Resolutions
-
-[Preset]
-name = 1600x900
-$width = 1600
-$height = 900
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 1920x1080
-$width = 1920
-$height = 1080
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 2560x1440
-$width = 2560
-$height = 1440
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 3200x1800
-$width = 3200
-$height = 1800
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 3840x2160
-$width = 3840
-$height = 2160
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 5120x2880
-$width = 5120
-$height = 2880
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 7680x4320
-$width = 7680
-$height = 4320
-$gameWidth = 1280
-$gameHeight = 720
-
-[TextureRedefine]
-width = 1280
-height = 720
-tileModesExcluded = 0x1
-overwriteWidth = ($width / $gameWidth) * 1280
-overwriteHeight = ($height / $gameHeight) * 720
-
-[TextureRedefine]
-width = 896
-height = 480
-overwriteWidth = ($width / $gameWidth) * 896
-overwriteHeight = ($height / $gameHeight) * 480
-
-[TextureRedefine]
-width = 864
-height = 480
-overwriteWidth = ($width / $gameWidth) * 864
-overwriteHeight = ($height / $gameHeight) * 480
-
-[TextureRedefine]
-width = 854
-height = 480
-overwriteWidth = ($width / $gameWidth) * 854
-overwriteHeight = ($height / $gameHeight) * 480
diff --git a/Resolutions/WiiU_Menu_Resolution/rules.txt b/Resolutions/WiiU_Menu_Resolution/rules.txt
deleted file mode 100644
index 0d1b0945..00000000
--- a/Resolutions/WiiU_Menu_Resolution/rules.txt
+++ /dev/null
@@ -1,199 +0,0 @@
-[Definition]
-titleIds = 0005001010040000,0005001010040100,0005001010040200
-name = Resolution
-path = "Wii U/Menu/Graphics/Resolution"
-description = Changes the resolution of the application. Made by M&&M.
-version = 4
-
-[Preset]
-name = 1280x720 (Default)
-$width = 1280
-$height = 720
-$gameWidth = 1280
-$gameHeight = 720
-
-# Performance
-
-[Preset]
-name = 320x180
-$width = 320
-$height = 180
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 640x360
-$width = 640
-$height = 360
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 854x480
-$width = 854
-$height = 480
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 960x540
-$width = 960
-$height = 540
-$gameWidth = 1280
-$gameHeight = 720
-
-# Common HD Resolutions
-
-[Preset]
-name = 1600x900
-$width = 1600
-$height = 900
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 1920x1080
-$width = 1920
-$height = 1080
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 2560x1440
-$width = 2560
-$height = 1440
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 3200x1800
-$width = 3200
-$height = 1800
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 3840x2160
-$width = 3840
-$height = 2160
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 5120x2880
-$width = 5120
-$height = 2880
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 7680x4320
-$width = 7680
-$height = 4320
-$gameWidth = 1280
-$gameHeight = 720
-
-[TextureRedefine]
-width = 1280
-height = 720
-formats = 0x1,0x1a,0x41a,0x80e,0x816
-overwriteWidth = ($width / $gameWidth) * 1280
-overwriteHeight = ($height / $gameHeight) * 720
-
-[TextureRedefine]
-width = 640
-height = 368
-formats = 0x1,0x1a,0x80e,0x816
-overwriteWidth = ($width / $gameWidth) * 640
-overwriteHeight = ($height / $gameHeight) * 368
-
-[TextureRedefine]
-width = 640
-height = 360
-formats = 0x1,0x1a,0x80e,0x816
-overwriteWidth = ($width / $gameWidth) * 640
-overwriteHeight = ($height / $gameHeight) * 360
-
-[TextureRedefine]
-width = 512
-height = 256
-formats = 0x816
-overwriteWidth = ($width / $gameWidth) * 512
-overwriteHeight = ($height / $gameHeight) * 256
-
-[TextureRedefine]
-width = 320
-height = 192
-formats = 0x816
-overwriteWidth = ($width / $gameWidth) * 320
-overwriteHeight = ($height / $gameHeight) * 192
-
-[TextureRedefine]
-width = 320
-height = 180
-formats = 0x816
-overwriteWidth = ($width / $gameWidth) * 320
-overwriteHeight = ($height / $gameHeight) * 180
-
-[TextureRedefine]
-width = 256
-height = 128
-formats = 0x816
-overwriteWidth = ($width / $gameWidth) * 256
-overwriteHeight = ($height / $gameHeight) * 128
-
-[TextureRedefine]
-width = 160
-height = 96
-formats = 0x1a
-overwriteWidth = ($width / $gameWidth) * 160
-overwriteHeight = ($height / $gameHeight) * 96
-
-[TextureRedefine]
-width = 160
-height = 90
-formats = 0x1a
-overwriteWidth = ($width / $gameWidth) * 160
-overwriteHeight = ($height / $gameHeight) * 90
-
-[TextureRedefine]
-width = 128
-height = 64
-formats = 0x1a,0x816
-overwriteWidth = ($width / $gameWidth) * 128
-overwriteHeight = ($height / $gameHeight) * 64
-
-[TextureRedefine]
-width = 106
-height = 60
-formats = 0x1a
-overwriteWidth = ($width / $gameWidth) * 106
-overwriteHeight = ($height / $gameHeight) * 60
-
-[TextureRedefine]
-width = 864
-height = 480
-formats = 0x1a,0x41a
-overwriteWidth = ($width / $gameWidth) * 864
-overwriteHeight = ($height / $gameHeight) * 480
-
-[TextureRedefine]
-width = 854
-height = 480
-formats = 0x1a,0x41a
-overwriteWidth = ($width / $gameWidth) * 854
-overwriteHeight = ($height / $gameHeight) * 480
-
-[TextureRedefine]
-width = 448
-height = 240
-formats = 0x1a
-overwriteWidth = ($width / $gameWidth) * 448
-overwriteHeight = ($height / $gameHeight) * 240
-
-[TextureRedefine]
-width = 427
-height = 240
-formats = 0x1a
-overwriteWidth = ($width / $gameWidth) * 427
-overwriteHeight = ($height / $gameHeight) * 240
diff --git a/src/WiiU/FriendList/Graphics/rules.txt b/src/WiiU/FriendList/Graphics/rules.txt
new file mode 100644
index 00000000..f7b85f72
--- /dev/null
+++ b/src/WiiU/FriendList/Graphics/rules.txt
@@ -0,0 +1,189 @@
+[Definition]
+titleIds = 000500301001500A,000500301001510A,000500301001520A
+name = TV Resolution and Gamepad Resolution
+path = "Wii U/Friend List/Graphics"
+description = Changes the TV resolution and Gamepad resolution of the application.||Made by M&&M.
+version = 7
+
+[Default]
+$width = 1280
+$height = 720
+$padWidth = 854
+$padHeight = 480
+$gameWidth = 1280
+$gameHeight = 720
+$gamePadWidth = 854
+$gamePadHeight = 480
+
+
+# TV Resolution
+
+[Preset]
+category = TV Resolution
+name = 640x360
+$width = 640
+$height = 360
+
+[Preset]
+category = TV Resolution
+name = 960x540
+$width = 960
+$height = 540
+
+[Preset]
+category = TV Resolution
+name = 1280x720 (Default)
+default = 1
+
+[Preset]
+category = TV Resolution
+name = 1600x900
+$width = 1600
+$height = 900
+
+[Preset]
+category = TV Resolution
+name = 1920x1080
+$width = 1920
+$height = 1080
+
+[Preset]
+category = TV Resolution
+name = 2560x1440
+$width = 2560
+$height = 1440
+
+[Preset]
+category = TV Resolution
+name = 3200x1800
+$width = 3200
+$height = 1800
+
+[Preset]
+category = TV Resolution
+name = 3840x2160
+$width = 3840
+$height = 2160
+
+[Preset]
+category = TV Resolution
+name = 5120x2880
+$width = 5120
+$height = 2880
+
+[Preset]
+category = TV Resolution
+name = 7680x4320
+$width = 7680
+$height = 4320
+
+
+# Gamepad Resolution
+
+[Preset]
+category = Gamepad Resolution
+name = 640x360
+$padWidth = 640
+$padHeight = 360
+
+[Preset]
+name = 854x480 (Default)
+category = Gamepad Resolution
+default = 1
+
+[Preset]
+category = Gamepad Resolution
+name = 960x540
+$padWidth = 960
+$padHeight = 540
+
+[Preset]
+category = Gamepad Resolution
+name = 1600x900
+$padWidth = 1600
+$padHeight = 900
+
+[Preset]
+category = Gamepad Resolution
+name = 1920x1080
+$padWidth = 1920
+$padHeight = 1080
+
+[Preset]
+category = Gamepad Resolution
+name = 2560x1440
+$padWidth = 2560
+$padHeight = 1440
+
+[Preset]
+category = Gamepad Resolution
+name = 3200x1800
+$padWidth = 3200
+$padHeight = 1800
+
+[Preset]
+category = Gamepad Resolution
+name = 3840x2160
+$padWidth = 3840
+$padHeight = 2160
+
+[Preset]
+category = Gamepad Resolution
+name = 5120x2880
+$padWidth = 5120
+$padHeight = 2880
+
+[Preset]
+category = Gamepad Resolution
+name = 7680x4320
+$padWidth = 7680
+$padHeight = 4320
+
+
+
+# Texture Redefines
+
+[TextureRedefine]
+width = 1280
+height = 720
+overwriteWidth = ($width/$gameWidth) * 1280
+overwriteHeight = ($height/$gameHeight) * 720
+
+[TextureRedefine]
+width = 864
+height = 480
+overwriteWidth = ($padWidth/$gamePadWidth) * 864
+overwriteHeight = ($padHeight/$gamePadHeight) * 480
+
+[TextureRedefine]
+width = 854
+height = 480
+overwriteWidth = ($padWidth/$gamePadWidth) * 854
+overwriteHeight = ($padHeight/$gamePadHeight) * 480
+
+[TextureRedefine]
+width = 848
+height = 480
+overwriteWidth = ($width/$gameWidth) * 848
+overwriteHeight = ($height/$gameHeight) * 480
+
+[TextureRedefine]
+width = 256
+height = 256
+formats = 0x1a,0x80e
+overwriteWidth = ($width/$gameWidth) * 256
+overwriteHeight = ($height/$gameHeight) * 256
+
+[TextureRedefine]
+width = 192
+height = 192
+formats = 0x1a,0x41a
+overwriteWidth = ($width/$gameWidth) * 192
+overwriteHeight = ($height/$gameHeight) * 192
+
+[TextureRedefine]
+width = 128
+height = 128
+formats = 0x1a,0x41a
+overwriteWidth = ($width/$gameWidth) * 128
+overwriteHeight = ($height/$gameHeight) * 128
diff --git a/src/WiiU/InternetBrowser/Graphics/rules.txt b/src/WiiU/InternetBrowser/Graphics/rules.txt
new file mode 100644
index 00000000..ca57a2f8
--- /dev/null
+++ b/src/WiiU/InternetBrowser/Graphics/rules.txt
@@ -0,0 +1,103 @@
+[Definition]
+titleIds = 000500301001200A,000500301001210A,000500301001220A
+name = App Resolution
+path = "Wii U/Internet Browser/Graphics"
+description = Changes the resolution of the application.||Made by M&&M.
+version = 7
+
+[Default]
+$width = 1280
+$height = 720
+$gameWidth = 1280
+$gameHeight = 720
+
+
+# Resolution
+
+[Preset]
+category = Resolution
+name = 640x360
+$width = 640
+$height = 360
+
+[Preset]
+category = Resolution
+name = 960x540
+$width = 960
+$height = 540
+
+[Preset]
+category = Resolution
+name = 1280x720 (Default)
+default = 1
+
+[Preset]
+category = Resolution
+name = 1600x900
+$width = 1600
+$height = 900
+
+[Preset]
+category = Resolution
+name = 1920x1080
+$width = 1920
+$height = 1080
+
+[Preset]
+category = Resolution
+name = 2560x1440
+$width = 2560
+$height = 1440
+
+[Preset]
+category = Resolution
+name = 3200x1800
+$width = 3200
+$height = 1800
+
+[Preset]
+category = Resolution
+name = 3840x2160
+$width = 3840
+$height = 2160
+
+[Preset]
+category = Resolution
+name = 5120x2880
+$width = 5120
+$height = 2880
+
+[Preset]
+category = Resolution
+name = 7680x4320
+$width = 7680
+$height = 4320
+
+
+
+# Texture Redefines
+
+[TextureRedefine]
+width = 1280
+height = 720
+tileModesExcluded = 0x1
+overwriteWidth = ($width/$gameWidth) * 1280
+overwriteHeight = ($height/$gameHeight) * 720
+
+[TextureRedefine]
+width = 896
+height = 480
+overwriteWidth = ($width/$gameWidth) * 896
+overwriteHeight = ($height/$gameHeight) * 480
+
+[TextureRedefine]
+width = 864
+height = 480
+overwriteWidth = ($width/$gameWidth) * 864
+overwriteHeight = ($height/$gameHeight) * 480
+
+[TextureRedefine]
+width = 854
+height = 480
+overwriteWidth = ($width/$gameWidth) * 854
+overwriteHeight = ($height/$gameHeight) * 480
diff --git a/src/WiiU/Menu/Graphics/rules.txt b/src/WiiU/Menu/Graphics/rules.txt
new file mode 100644
index 00000000..cc16b625
--- /dev/null
+++ b/src/WiiU/Menu/Graphics/rules.txt
@@ -0,0 +1,249 @@
+[Definition]
+titleIds = 0005001010040000,0005001010040100,0005001010040200
+name = TV Resolution and Gamepad Resolution
+path = "Wii U/Menu/Graphics"
+description = Changes the TV resolution and Gamepad resolution of the application.||Made by M&&M.
+version = 7
+
+[Default]
+$width = 1280
+$height = 720
+$padWidth = 854
+$padHeight = 480
+$gameWidth = 1280
+$gameHeight = 720
+$gamePadWidth = 854
+$gamePadHeight = 480
+
+
+# TV Resolution
+
+[Preset]
+category = TV Resolution
+name = 640x360
+$width = 640
+$height = 360
+
+[Preset]
+category = TV Resolution
+name = 960x540
+$width = 960
+$height = 540
+
+[Preset]
+category = TV Resolution
+name = 1280x720 (Default)
+default = 1
+
+[Preset]
+category = TV Resolution
+name = 1600x900
+$width = 1600
+$height = 900
+
+[Preset]
+category = TV Resolution
+name = 1920x1080
+$width = 1920
+$height = 1080
+
+[Preset]
+category = TV Resolution
+name = 2560x1440
+$width = 2560
+$height = 1440
+
+[Preset]
+category = TV Resolution
+name = 3200x1800
+$width = 3200
+$height = 1800
+
+[Preset]
+category = TV Resolution
+name = 3840x2160
+$width = 3840
+$height = 2160
+
+[Preset]
+category = TV Resolution
+name = 5120x2880
+$width = 5120
+$height = 2880
+
+[Preset]
+category = TV Resolution
+name = 7680x4320
+$width = 7680
+$height = 4320
+
+
+# Gamepad Resolution
+
+[Preset]
+category = Gamepad Resolution
+name = 640x360
+$padWidth = 640
+$padHeight = 360
+
+[Preset]
+name = 854x480 (Default)
+category = Gamepad Resolution
+default = 1
+
+[Preset]
+category = Gamepad Resolution
+name = 960x540
+$padWidth = 960
+$padHeight = 540
+
+[Preset]
+category = Gamepad Resolution
+name = 1600x900
+$padWidth = 1600
+$padHeight = 900
+
+[Preset]
+category = Gamepad Resolution
+name = 1920x1080
+$padWidth = 1920
+$padHeight = 1080
+
+[Preset]
+category = Gamepad Resolution
+name = 2560x1440
+$padWidth = 2560
+$padHeight = 1440
+
+[Preset]
+category = Gamepad Resolution
+name = 3200x1800
+$padWidth = 3200
+$padHeight = 1800
+
+[Preset]
+category = Gamepad Resolution
+name = 3840x2160
+$padWidth = 3840
+$padHeight = 2160
+
+[Preset]
+category = Gamepad Resolution
+name = 5120x2880
+$padWidth = 5120
+$padHeight = 2880
+
+[Preset]
+category = Gamepad Resolution
+name = 7680x4320
+$padWidth = 7680
+$padHeight = 4320
+
+
+
+# Texture Redefines
+
+[TextureRedefine]
+width = 1280
+height = 720
+formats = 0x1,0x1a,0x41a,0x80e,0x816
+overwriteWidth = ($width/$gameWidth) * 1280
+overwriteHeight = ($height/$gameHeight) * 720
+
+[TextureRedefine]
+width = 640
+height = 368
+formats = 0x1,0x1a,0x80e,0x816
+overwriteWidth = ($width/$gameWidth) * 640
+overwriteHeight = ($height/$gameHeight) * 368
+
+[TextureRedefine]
+width = 640
+height = 360
+formats = 0x1,0x1a,0x80e,0x816
+overwriteWidth = ($width/$gameWidth) * 640
+overwriteHeight = ($height/$gameHeight) * 360
+
+[TextureRedefine]
+width = 512
+height = 256
+formats = 0x816
+overwriteWidth = ($width/$gameWidth) * 512
+overwriteHeight = ($height/$gameHeight) * 256
+
+[TextureRedefine]
+width = 320
+height = 192
+formats = 0x816
+overwriteWidth = ($width/$gameWidth) * 320
+overwriteHeight = ($height/$gameHeight) * 192
+
+[TextureRedefine]
+width = 320
+height = 180
+formats = 0x816
+overwriteWidth = ($width/$gameWidth) * 320
+overwriteHeight = ($height/$gameHeight) * 180
+
+[TextureRedefine]
+width = 256
+height = 128
+formats = 0x816
+overwriteWidth = ($width/$gameWidth) * 256
+overwriteHeight = ($height/$gameHeight) * 128
+
+[TextureRedefine]
+width = 160
+height = 96
+formats = 0x1a
+overwriteWidth = ($width/$gameWidth) * 160
+overwriteHeight = ($height/$gameHeight) * 96
+
+[TextureRedefine]
+width = 160
+height = 90
+formats = 0x1a
+overwriteWidth = ($width/$gameWidth) * 160
+overwriteHeight = ($height/$gameHeight) * 90
+
+[TextureRedefine]
+width = 128
+height = 64
+formats = 0x1a,0x816
+overwriteWidth = ($width/$gameWidth) * 128
+overwriteHeight = ($height/$gameHeight) * 64
+
+[TextureRedefine]
+width = 106
+height = 60
+formats = 0x1a
+overwriteWidth = ($width/$gameWidth) * 106
+overwriteHeight = ($height/$gameHeight) * 60
+
+[TextureRedefine]
+width = 864
+height = 480
+formats = 0x1a,0x41a
+overwriteWidth = ($padWidth/$gamePadWidth) * 864
+overwriteHeight = ($padHeight/$gamePadHeight) * 480
+
+[TextureRedefine]
+width = 854
+height = 480
+formats = 0x1a,0x41a
+overwriteWidth = ($padWidth/$gamePadWidth) * 854
+overwriteHeight = ($padHeight/$gamePadHeight) * 480
+
+[TextureRedefine]
+width = 448
+height = 240
+formats = 0x1a
+overwriteWidth = ($width/$gameWidth) * 448
+overwriteHeight = ($height/$gameHeight) * 240
+
+[TextureRedefine]
+width = 427
+height = 240
+formats = 0x1a
+overwriteWidth = ($width/$gameWidth) * 427
+overwriteHeight = ($height/$gameHeight) * 240
diff --git a/Workarounds/WiiU_eShop_RemoveGrayOverlay/fcd26205b94e11ca_000000000000001f_ps.txt b/src/WiiU/eShop/Workarounds/RemoveGrayOverlay/fcd26205b94e11ca_000000000000001f_ps.txt
similarity index 100%
rename from Workarounds/WiiU_eShop_RemoveGrayOverlay/fcd26205b94e11ca_000000000000001f_ps.txt
rename to src/WiiU/eShop/Workarounds/RemoveGrayOverlay/fcd26205b94e11ca_000000000000001f_ps.txt
diff --git a/Workarounds/WiiU_eShop_RemoveGrayOverlay/fcd26205b94e11ca_0000000000000079_ps.txt b/src/WiiU/eShop/Workarounds/RemoveGrayOverlay/fcd26205b94e11ca_0000000000000079_ps.txt
similarity index 100%
rename from Workarounds/WiiU_eShop_RemoveGrayOverlay/fcd26205b94e11ca_0000000000000079_ps.txt
rename to src/WiiU/eShop/Workarounds/RemoveGrayOverlay/fcd26205b94e11ca_0000000000000079_ps.txt
diff --git a/Workarounds/WiiU_eShop_RemoveGrayOverlay/rules.txt b/src/WiiU/eShop/Workarounds/RemoveGrayOverlay/rules.txt
similarity index 85%
rename from Workarounds/WiiU_eShop_RemoveGrayOverlay/rules.txt
rename to src/WiiU/eShop/Workarounds/RemoveGrayOverlay/rules.txt
index 01e108c5..a57c494f 100644
--- a/Workarounds/WiiU_eShop_RemoveGrayOverlay/rules.txt
+++ b/src/WiiU/eShop/Workarounds/RemoveGrayOverlay/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 000500301001400a,000500301001410a,000500301001420a
 name = Remove Gray Overlay
 path = "Wii U/Nintendo eShop/Workarounds/Remove Gray Overlay"
-description = Hides the gray overlay covering the lower half of the screen. Made by Exzap.
-version = 4
+description = Hides the gray overlay covering the lower half of the screen.||Made by Exzap.
+version = 7