diff --git a/Bayonetta2_1080p/rules.txt b/Bayonetta2_1080p/rules.txt
index 2a878b57..2d77e4e9 100644
--- a/Bayonetta2_1080p/rules.txt
+++ b/Bayonetta2_1080p/rules.txt
@@ -6,10 +6,4 @@ name = "Bayonetta 2 - 1080p"
 width = 1280
 height = 720
 overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 1920
 overwriteHeight = 1080
\ No newline at end of file
diff --git a/Bayonetta2_1440p/rules.txt b/Bayonetta2_1440p/rules.txt
index 9ced4ac7..82ad8f2b 100644
--- a/Bayonetta2_1440p/rules.txt
+++ b/Bayonetta2_1440p/rules.txt
@@ -6,10 +6,4 @@ name = "Bayonetta 2 - 1440p (2K)"
 width = 1280
 height = 720
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 2560
 overwriteHeight = 1440
\ No newline at end of file
diff --git a/Bayonetta2_2160p/rules.txt b/Bayonetta2_2160p/rules.txt
index 9cf22fb3..83fa1fba 100644
--- a/Bayonetta2_2160p/rules.txt
+++ b/Bayonetta2_2160p/rules.txt
@@ -2,14 +2,8 @@
 titleIds = 0005000010172600,0005000010172700,000500001011b900
 name = "Bayonetta 2 - 2160p (4K)"
 
-[TextureRedefine] # tv
+[TextureRedefine] #tv
 width = 1280
 height = 720
 overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 3840
 overwriteHeight = 2160
\ No newline at end of file
diff --git a/NSMBU_1080p/rules.txt b/NSMBU_1080p/rules.txt
index 4a966f23..a3b40912 100644
--- a/NSMBU_1080p/rules.txt
+++ b/NSMBU_1080p/rules.txt
@@ -6,10 +6,4 @@ name = "New Super Mario Bros. U + New Super Luigi U - 1080p"
 width = 1280
 height = 720
 overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 1920
 overwriteHeight = 1080
\ No newline at end of file
diff --git a/NSMBU_1440p/rules.txt b/NSMBU_1440p/rules.txt
index 6f54713b..fc846139 100644
--- a/NSMBU_1440p/rules.txt
+++ b/NSMBU_1440p/rules.txt
@@ -6,10 +6,4 @@ name = "New Super Mario Bros. U + New Super Luigi U - 1440p (2K)"
 width = 1280
 height = 720
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 2560
 overwriteHeight = 1440
\ No newline at end of file
diff --git a/NSMBU_2160p/rules.txt b/NSMBU_2160p/rules.txt
index 59fdb5a8..e9d5f73c 100644
--- a/NSMBU_2160p/rules.txt
+++ b/NSMBU_2160p/rules.txt
@@ -6,10 +6,4 @@ name = "New Super Mario Bros. U + New Super Luigi U - 2160p (4K)"
 width = 1280
 height = 720
 overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 3840
 overwriteHeight = 2160
\ No newline at end of file
diff --git a/NintendoLand_1080p/rules.txt b/NintendoLand_1080p/rules.txt
index f8725a27..9984da0d 100644
--- a/NintendoLand_1080p/rules.txt
+++ b/NintendoLand_1080p/rules.txt
@@ -8,10 +8,4 @@ height = 720
 # formatsExcluded = 0x01A # exclude the intro background texture
 # currently disabled, for some reason the game never upscales with the exclusion
 overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 1920
 overwriteHeight = 1080
\ No newline at end of file
diff --git a/NintendoLand_1440p/rules.txt b/NintendoLand_1440p/rules.txt
index f9b72f6e..d976eb36 100644
--- a/NintendoLand_1440p/rules.txt
+++ b/NintendoLand_1440p/rules.txt
@@ -8,10 +8,4 @@ height = 720
 # formatsExcluded = 0x01A # exclude the intro background texture
 # currently disabled, for some reason the game never upscales with the exclusion
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 2560
 overwriteHeight = 1440
\ No newline at end of file
diff --git a/NintendoLand_2160p/rules.txt b/NintendoLand_2160p/rules.txt
index eeebaaea..8850d3b8 100644
--- a/NintendoLand_2160p/rules.txt
+++ b/NintendoLand_2160p/rules.txt
@@ -8,10 +8,4 @@ height = 720
 # formatsExcluded = 0x01A # exclude the intro background texture
 # currently disabled, for some reason the game never upscales with the exclusion
 overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 3840
 overwriteHeight = 2160
\ No newline at end of file
diff --git a/Pikmin3_1080p/rules.txt b/Pikmin3_1080p/rules.txt
index c4776cf2..01358ac9 100644
--- a/Pikmin3_1080p/rules.txt
+++ b/Pikmin3_1080p/rules.txt
@@ -6,10 +6,4 @@ name = "Pikmin 3 - 1080p"
 width = 1280
 height = 720
 overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 1920
 overwriteHeight = 1080
\ No newline at end of file
diff --git a/Pikmin3_1440p/rules.txt b/Pikmin3_1440p/rules.txt
index 028de3d5..dd276a54 100644
--- a/Pikmin3_1440p/rules.txt
+++ b/Pikmin3_1440p/rules.txt
@@ -6,10 +6,4 @@ name = "Pikmin 3 - 1440p (2K)"
 width = 1280
 height = 720
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 2560
 overwriteHeight = 1440
\ No newline at end of file
diff --git a/Pikmin3_2160p/rules.txt b/Pikmin3_2160p/rules.txt
index 1e7abadd..3188c9de 100644
--- a/Pikmin3_2160p/rules.txt
+++ b/Pikmin3_2160p/rules.txt
@@ -6,10 +6,4 @@ name = "Pikmin 3 - 2160p (4K)"
 width = 1280
 height = 720
 overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 3840
 overwriteHeight = 2160
\ No newline at end of file
diff --git a/README.md b/README.md
index aa3a2e0d..f088025c 100644
--- a/README.md
+++ b/README.md
@@ -1,47 +1,31 @@
 # Supported Games
--Bayonetta 2 (1080p, 1440p, 2160p)
 
--Captain Toad: Treasure Tracker (1080p, 1440p, 2160p)
-
--Donkey Kong Country: Tropical Freeze (1080p, 1440p, 2160p)
-
--Mario Kart 8 (1080p, 1440p, 2160p)
-
--New Super Luigi U (1080p, 1440p, 2160p)
-
--New Super Mario Bros. U (1080p, 1440p, 2160p)
-
--Nintendo Land (1080p, 1440p, 2160p)
-
--Pikmin 3 (1080p, 1440p, 2160p)
-
--Splatoon (1080p, 1440p, 2160p)
-
--Super Mario 3D World (1080p, 1440p, 2160p)
-
--Super Mario Maker (720p Gamepad)
-
--Super Smash Bros. (1440p, 2160p)
-
--The Wind Waker HD (1080p Gamepad, 1440p, 2160p)
-
--Twilight Princess HD (1080p Gamepad, 1440p, 2160p)
-
--Xenoblade Chronicles X (1080p, 1440p, 2160p)
-
--Yoshi's Woolly World (1080p, 1440p, 2160p)
+- Bayonetta 2 (1080p, 1440p, 2160p)
+- Captain Toad: Treasure Tracker (1080p, 1440p, 2160p)
+- Donkey Kong Country: Tropical Freeze (1080p, 1440p, 2160p)
+- Mario Kart 8 (1080p, 1440p, 2160p)
+- New Super Luigi U (1080p, 1440p, 2160p)
+- New Super Mario Bros. U (1080p, 1440p, 2160p)
+- Nintendo Land (1080p, 1440p, 2160p)
+- Pikmin 3 (1080p, 1440p, 2160p)
+- Splatoon (1080p, 1440p, 2160p)
+- Super Mario 3D World (1080p, 1440p, 2160p)
+- Super Smash Bros. (1440p, 2160p)
+- The Wind Waker HD (1440p, 2160p)
+- Twilight Princess HD (1440p, 2160p)
+- Xenoblade Chronicles X (1080p, 1440p, 2160p)
+- Yoshi's Woolly World (1080p, 1440p, 2160p)
 
 #Issues
--Donkey Kong Country: Tropical Freeze
+Donkey Kong Country: Tropical Freeze
 
-Water does not appear correctly
+- Water does not appear correctly
 
--Nintendo Land
+Nintendo Land
 
-Title screen is completely white
+- Title screen is completely white
+- Gamepad screen is blurry during attraction gameplay
 
-Gamepad screen is blurry during attraction gameplay
+Splatoon
 
--Splatoon
-
-Squid Sisters screen is blurry
\ No newline at end of file
+- Squid Sisters screen is blurry
\ No newline at end of file
diff --git a/Splatoon_1080p/rules.txt b/Splatoon_1080p/rules.txt
index cdb418be..92374e5d 100644
--- a/Splatoon_1080p/rules.txt
+++ b/Splatoon_1080p/rules.txt
@@ -6,10 +6,4 @@ name = "Splatoon - 1080p"
 width = 1280
 height = 720
 overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 1920
 overwriteHeight = 1080
\ No newline at end of file
diff --git a/Splatoon_1440p/rules.txt b/Splatoon_1440p/rules.txt
index e28ecb3e..b484c0f7 100644
--- a/Splatoon_1440p/rules.txt
+++ b/Splatoon_1440p/rules.txt
@@ -6,10 +6,4 @@ name = "Splatoon - 1440p (2K)"
 width = 1280
 height = 720
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 2560
 overwriteHeight = 1440
\ No newline at end of file
diff --git a/Splatoon_2160p/rules.txt b/Splatoon_2160p/rules.txt
index 4cbf0035..9ca837ca 100644
--- a/Splatoon_2160p/rules.txt
+++ b/Splatoon_2160p/rules.txt
@@ -6,10 +6,4 @@ name = "Splatoon - 2160p (4K)"
 width = 1280
 height = 720
 overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 3840
 overwriteHeight = 2160
\ No newline at end of file
diff --git a/SuperMario3DWorld_1080p/rules.txt b/SuperMario3DWorld_1080p/rules.txt
index b5a7e587..ba411065 100644
--- a/SuperMario3DWorld_1080p/rules.txt
+++ b/SuperMario3DWorld_1080p/rules.txt
@@ -7,10 +7,4 @@ width = 1280
 height = 720
 formatsExcluded = 0x41A,0x034 # exclude the intro background texture
 overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 1920
 overwriteHeight = 1080
\ No newline at end of file
diff --git a/SuperMario3DWorld_1440p/rules.txt b/SuperMario3DWorld_1440p/rules.txt
index 2ea9a74f..223dc852 100644
--- a/SuperMario3DWorld_1440p/rules.txt
+++ b/SuperMario3DWorld_1440p/rules.txt
@@ -7,10 +7,4 @@ width = 1280
 height = 720
 formatsExcluded = 0x41A,0x034 # exclude the intro background texture
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 2560
 overwriteHeight = 1440
\ No newline at end of file
diff --git a/SuperMario3DWorld_2160p/rules.txt b/SuperMario3DWorld_2160p/rules.txt
index 1383e1de..3f052b76 100644
--- a/SuperMario3DWorld_2160p/rules.txt
+++ b/SuperMario3DWorld_2160p/rules.txt
@@ -7,10 +7,4 @@ width = 1280
 height = 720
 formatsExcluded = 0x41A,0x034 # exclude the intro background texture
 overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 3840
 overwriteHeight = 2160
\ No newline at end of file
diff --git a/SuperMarioMaker_720pGamepad/rules.txt b/SuperMarioMaker_720pGamepad/rules.txt
deleted file mode 100644
index 081de723..00000000
--- a/SuperMarioMaker_720pGamepad/rules.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-[Definition]
-titleIds = 000500001018DC00,000500001018DD00,000500001018DB00
-name = "Super Mario Maker - 720p (Gamepad)"
-
-[TextureRedefine]
-width = 854
-height = 480
-overwriteWidth = 1280
-overwriteHeight = 720
\ No newline at end of file
diff --git a/TheWindWaker_1080pGamepad/rules.txt b/TheWindWaker_1080pGamepad/rules.txt
deleted file mode 100644
index 7b34da39..00000000
--- a/TheWindWaker_1080pGamepad/rules.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-[Definition]
-titleIds = 0005000010143400,0005000010143600,0005000010143500
-name = "The Wind Waker HD - 1080p (Gamepad)"
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 1920
-overwriteHeight = 1080
\ No newline at end of file
diff --git a/TheWindWaker_1440p/rules.txt b/TheWindWaker_1440p/rules.txt
index a0461f0b..fe0eaf3d 100644
--- a/TheWindWaker_1440p/rules.txt
+++ b/TheWindWaker_1440p/rules.txt
@@ -6,10 +6,4 @@ name = "The Wind Waker HD - 1440p (2K)"
 width = 1920
 height = 1080
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 2560
 overwriteHeight = 1440
\ No newline at end of file
diff --git a/TheWindWaker_2160p/rules.txt b/TheWindWaker_2160p/rules.txt
index 813af947..0e5be3ae 100644
--- a/TheWindWaker_2160p/rules.txt
+++ b/TheWindWaker_2160p/rules.txt
@@ -6,10 +6,4 @@ name = "The Wind Waker HD - 2160p (4K)"
 width = 1920
 height = 1080
 overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 3840
 overwriteHeight = 2160
\ No newline at end of file
diff --git a/TropicalFreeze_1080p/rules.txt b/TropicalFreeze_1080p/rules.txt
index 3039dfb2..78b8b7bf 100644
--- a/TropicalFreeze_1080p/rules.txt
+++ b/TropicalFreeze_1080p/rules.txt
@@ -7,10 +7,4 @@ width = 1280
 height = 720
 formatsExcluded = 0x031 # exclude the intro background texture
 overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 1920
 overwriteHeight = 1080
\ No newline at end of file
diff --git a/TropicalFreeze_1440p/rules.txt b/TropicalFreeze_1440p/rules.txt
index 81d0fc51..8dea302a 100644
--- a/TropicalFreeze_1440p/rules.txt
+++ b/TropicalFreeze_1440p/rules.txt
@@ -7,10 +7,4 @@ width = 1280
 height = 720
 formatsExcluded = 0x031 # exclude the intro background texture
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 2560
 overwriteHeight = 1440
\ No newline at end of file
diff --git a/TropicalFreeze_2160p/rules.txt b/TropicalFreeze_2160p/rules.txt
index 7ce9dcc2..cb3a60e6 100644
--- a/TropicalFreeze_2160p/rules.txt
+++ b/TropicalFreeze_2160p/rules.txt
@@ -7,10 +7,4 @@ width = 1280
 height = 720
 formatsExcluded = 0x031 # exclude the intro background texture
 overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 3840
 overwriteHeight = 2160
\ No newline at end of file
diff --git a/TwilightPrincess_1080pGamepad/rules.txt b/TwilightPrincess_1080pGamepad/rules.txt
deleted file mode 100644
index b4c9ba33..00000000
--- a/TwilightPrincess_1080pGamepad/rules.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-[Definition]
-titleIds = 000500001019C800,000500001019E600,000500001019E500
-name = "Twilight Princess HD - 1080p (Gamepad)"
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 1920
-overwriteHeight = 1080
\ No newline at end of file
diff --git a/TwilightPrincess_1440p/rules.txt b/TwilightPrincess_1440p/rules.txt
index ab400908..d7646db0 100644
--- a/TwilightPrincess_1440p/rules.txt
+++ b/TwilightPrincess_1440p/rules.txt
@@ -6,10 +6,4 @@ name = "Twilight Princess HD - 1440p (2K)"
 width = 1920
 height = 1080
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 2560
 overwriteHeight = 1440
\ No newline at end of file
diff --git a/TwilightPrincess_2160p/rules.txt b/TwilightPrincess_2160p/rules.txt
index 2c8a8bfa..28197eac 100644
--- a/TwilightPrincess_2160p/rules.txt
+++ b/TwilightPrincess_2160p/rules.txt
@@ -6,10 +6,4 @@ name = "Twilight Princess HD - 2160p (4K)"
 width = 1920
 height = 1080
 overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 3840
 overwriteHeight = 2160
\ No newline at end of file
diff --git a/XCX_1080p/rules.txt b/XCX_1080p/rules.txt
index 24e80eed..5db38358 100644
--- a/XCX_1080p/rules.txt
+++ b/XCX_1080p/rules.txt
@@ -6,10 +6,4 @@ name = "Xenoblade Chronicles X - 1080p"
 width = 1280
 height = 720
 overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 1920
 overwriteHeight = 1080
\ No newline at end of file
diff --git a/XCX_1440p/rules.txt b/XCX_1440p/rules.txt
index 41d5d007..c0a94154 100644
--- a/XCX_1440p/rules.txt
+++ b/XCX_1440p/rules.txt
@@ -6,10 +6,4 @@ name = "Xenoblade Chronicles X - 1440p (2K)"
 width = 1280
 height = 720
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 2560
 overwriteHeight = 1440
\ No newline at end of file
diff --git a/XCX_2160p/rules.txt b/XCX_2160p/rules.txt
index 031b6f88..4394d739 100644
--- a/XCX_2160p/rules.txt
+++ b/XCX_2160p/rules.txt
@@ -6,10 +6,4 @@ name = "Xenoblade Chronicles X - 2160p (4K)"
 width = 1280
 height = 720
 overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 3840
 overwriteHeight = 2160
\ No newline at end of file
diff --git a/Yoshi_1080p/rules.txt b/Yoshi_1080p/rules.txt
index cad29b69..104baf08 100644
--- a/Yoshi_1080p/rules.txt
+++ b/Yoshi_1080p/rules.txt
@@ -6,10 +6,4 @@ name = "Yoshi's Woolly World - 1080p"
 width = 1280
 height = 720
 overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 1920
 overwriteHeight = 1080
\ No newline at end of file
diff --git a/Yoshi_1440p/rules.txt b/Yoshi_1440p/rules.txt
index d3c52dd7..1fcdeb49 100644
--- a/Yoshi_1440p/rules.txt
+++ b/Yoshi_1440p/rules.txt
@@ -6,10 +6,4 @@ name = "Yoshi's Woolly World - 1440p (2K)"
 width = 1280
 height = 720
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 2560
 overwriteHeight = 1440
\ No newline at end of file
diff --git a/Yoshi_2160p/rules.txt b/Yoshi_2160p/rules.txt
index 3fab80a2..3227da31 100644
--- a/Yoshi_2160p/rules.txt
+++ b/Yoshi_2160p/rules.txt
@@ -6,10 +6,4 @@ name = "Yoshi's Woolly World - 2160p (4K)"
 width = 1280
 height = 720
 overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 3840
 overwriteHeight = 2160
\ No newline at end of file