diff --git a/Enhancement/HighResGamepad/rules.txt b/Enhancement/HighResGamepad/rules.txt
deleted file mode 100644
index 89d4203d..00000000
--- a/Enhancement/HighResGamepad/rules.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-[Definition]
-titleIds = 0 # Replace 0 with game title ids here
-name = "Higher Quality Gamepad"
-version = 2
-
-[TextureRedefine]
-width = 854
-height = 480
-overwriteWidth = 1708
-overwriteHeight = 960
\ No newline at end of file
diff --git a/Enhancement/Smash_HighResShadows/rules.txt b/Enhancement/SuperSmashBros_HighResShadows/rules.txt
similarity index 100%
rename from Enhancement/Smash_HighResShadows/rules.txt
rename to Enhancement/SuperSmashBros_HighResShadows/rules.txt
diff --git a/Enhancement/TwilightPrincess_0AARemoval/c14019840473ff86_00000000000003c9_ps.txt b/Enhancement/TwilightPrincessHD_0AARemoval/c14019840473ff86_00000000000003c9_ps.txt
similarity index 100%
rename from Enhancement/TwilightPrincess_0AARemoval/c14019840473ff86_00000000000003c9_ps.txt
rename to Enhancement/TwilightPrincessHD_0AARemoval/c14019840473ff86_00000000000003c9_ps.txt
diff --git a/Enhancement/TwilightPrincess_0AARemoval/rules.txt b/Enhancement/TwilightPrincessHD_0AARemoval/rules.txt
similarity index 100%
rename from Enhancement/TwilightPrincess_0AARemoval/rules.txt
rename to Enhancement/TwilightPrincessHD_0AARemoval/rules.txt
diff --git a/Enhancement/TwilightPrincess_Bloom/95a5a89d62998e0d_0000000000000079_ps.txt b/Enhancement/TwilightPrincessHD_Bloom/95a5a89d62998e0d_0000000000000079_ps.txt
similarity index 100%
rename from Enhancement/TwilightPrincess_Bloom/95a5a89d62998e0d_0000000000000079_ps.txt
rename to Enhancement/TwilightPrincessHD_Bloom/95a5a89d62998e0d_0000000000000079_ps.txt
diff --git a/Enhancement/TwilightPrincess_Bloom/c612390d4c70f430_0000000000000079_ps.txt b/Enhancement/TwilightPrincessHD_Bloom/c612390d4c70f430_0000000000000079_ps.txt
similarity index 100%
rename from Enhancement/TwilightPrincess_Bloom/c612390d4c70f430_0000000000000079_ps.txt
rename to Enhancement/TwilightPrincessHD_Bloom/c612390d4c70f430_0000000000000079_ps.txt
diff --git a/Enhancement/TwilightPrincess_Bloom/rules.txt b/Enhancement/TwilightPrincessHD_Bloom/rules.txt
similarity index 100%
rename from Enhancement/TwilightPrincess_Bloom/rules.txt
rename to Enhancement/TwilightPrincessHD_Bloom/rules.txt
diff --git a/Enhancement/TwilightPrincess_HighResShadows/rules.txt b/Enhancement/TwilightPrincessHD_HighResShadows/rules.txt
similarity index 100%
rename from Enhancement/TwilightPrincess_HighResShadows/rules.txt
rename to Enhancement/TwilightPrincessHD_HighResShadows/rules.txt
diff --git a/Enhancement/TheWindWaker_0AARemoval/ff71dcd2ad4defdc_00000000000003c9_ps.txt b/Enhancement/WindWakerHD_0AARemoval/ff71dcd2ad4defdc_00000000000003c9_ps.txt
similarity index 100%
rename from Enhancement/TheWindWaker_0AARemoval/ff71dcd2ad4defdc_00000000000003c9_ps.txt
rename to Enhancement/WindWakerHD_0AARemoval/ff71dcd2ad4defdc_00000000000003c9_ps.txt
diff --git a/Enhancement/TheWindWaker_0AARemoval/rules.txt b/Enhancement/WindWakerHD_0AARemoval/rules.txt
similarity index 100%
rename from Enhancement/TheWindWaker_0AARemoval/rules.txt
rename to Enhancement/WindWakerHD_0AARemoval/rules.txt
diff --git a/Enhancement/TheWindWaker_AdjustableBloom/960d3ef6662043c7_0000000000000079_ps.txt b/Enhancement/WindWakerHD_AdjustableBloom/960d3ef6662043c7_0000000000000079_ps.txt
similarity index 100%
rename from Enhancement/TheWindWaker_AdjustableBloom/960d3ef6662043c7_0000000000000079_ps.txt
rename to Enhancement/WindWakerHD_AdjustableBloom/960d3ef6662043c7_0000000000000079_ps.txt
diff --git a/Enhancement/TheWindWaker_AdjustableBloom/rules.txt b/Enhancement/WindWakerHD_AdjustableBloom/rules.txt
similarity index 100%
rename from Enhancement/TheWindWaker_AdjustableBloom/rules.txt
rename to Enhancement/WindWakerHD_AdjustableBloom/rules.txt
diff --git a/Enhancement/TheWindWaker_HighResShadows/rules.txt b/Enhancement/WindWakerHD_HighResShadows/rules.txt
similarity index 100%
rename from Enhancement/TheWindWaker_HighResShadows/rules.txt
rename to Enhancement/WindWakerHD_HighResShadows/rules.txt
diff --git a/Enhancement/XCX_0AARemoval/59df1c7e1806366c_00000000000003c9_ps.txt b/Enhancement/XenobladeX_0AARemoval/59df1c7e1806366c_00000000000003c9_ps.txt
similarity index 100%
rename from Enhancement/XCX_0AARemoval/59df1c7e1806366c_00000000000003c9_ps.txt
rename to Enhancement/XenobladeX_0AARemoval/59df1c7e1806366c_00000000000003c9_ps.txt
diff --git a/Enhancement/XCX_0AARemoval/rules.txt b/Enhancement/XenobladeX_0AARemoval/rules.txt
similarity index 100%
rename from Enhancement/XCX_0AARemoval/rules.txt
rename to Enhancement/XenobladeX_0AARemoval/rules.txt
diff --git a/Enhancement/XCX_HighResShadows/rules.txt b/Enhancement/XenobladeX_HighResShadows/rules.txt
similarity index 100%
rename from Enhancement/XCX_HighResShadows/rules.txt
rename to Enhancement/XenobladeX_HighResShadows/rules.txt
diff --git a/Enhancement/XCX_NoOfflineTag/rules.txt b/Enhancement/XenobladeX_NoOfflineTag/rules.txt
similarity index 100%
rename from Enhancement/XCX_NoOfflineTag/rules.txt
rename to Enhancement/XenobladeX_NoOfflineTag/rules.txt
diff --git a/Performance/Pokken_360p/rules.txt b/Performance/Pokken_360p/rules.txt
deleted file mode 100644
index 13be4a45..00000000
--- a/Performance/Pokken_360p/rules.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-[Definition]
-titleIds = 50000101df400,00050002101DF401
-name = "Pokken Tournament - 640x360"
-version = 2
-
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x033
-tileModesExcluded = 0x001
-overwriteWidth = 640
-overwriteHeight = 360
-
-[TextureRedefine]
-width = 960
-height = 720
-overwriteWidth = 480
-overwriteHeight = 360
\ No newline at end of file
diff --git a/Performance/Pokken_540p/rules.txt b/Performance/Pokken_540p/rules.txt
deleted file mode 100644
index 1dcb526a..00000000
--- a/Performance/Pokken_540p/rules.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-[Definition]
-titleIds = 50000101df400,00050002101DF401
-name = "Pokken Tournament - 960x540"
-version = 2
-
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x033
-tileModesExcluded = 0x001
-overwriteWidth = 960
-overwriteHeight = 540
-
-[TextureRedefine]
-width = 960
-height = 720
-overwriteWidth = 720
-overwriteHeight = 540
\ No newline at end of file
diff --git a/Quality/Pokken_1080p/rules.txt b/Quality/Pokken_1080p/rules.txt
deleted file mode 100644
index fdba56ee..00000000
--- a/Quality/Pokken_1080p/rules.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-[Definition]
-titleIds = 50000101df400,00050002101DF401
-name = "Pokken Tournament - 1920x1080"
-version = 2
-
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x033
-tileModesExcluded = 0x001
-overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine]
-width = 960
-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/Quality/Pokken_1440p/rules.txt b/Quality/Pokken_1440p/rules.txt
deleted file mode 100644
index 0105d3bb..00000000
--- a/Quality/Pokken_1440p/rules.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-[Definition]
-titleIds = 50000101df400,00050002101DF401
-name = "Pokken Tournament - 2560x1440"
-version = 2
-
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x033
-tileModesExcluded = 0x001
-overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine]
-width = 960
-height = 720
-overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/Pokken_1800p/rules.txt b/Quality/Pokken_1800p/rules.txt
deleted file mode 100644
index 1a916415..00000000
--- a/Quality/Pokken_1800p/rules.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-[Definition]
-titleIds = 50000101df400,00050002101DF401
-name = "Pokken Tournament - 3200x1800"
-version = 2
-
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x033 # Excludes FMV B&W layer (only viewable with rajkosto's implementation)
-tileModesExcluded = 0x001
-overwriteWidth = 3200
-overwriteHeight = 1800
-
-[TextureRedefine]
-width = 960
-height = 720
-overwriteWidth = 3200
-overwriteHeight = 1800
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/Pokken_2160p/rules.txt b/Quality/Pokken_2160p/rules.txt
deleted file mode 100644
index 8105ebb7..00000000
--- a/Quality/Pokken_2160p/rules.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-[Definition]
-titleIds = 50000101df400,00050002101DF401
-name = "Pokken Tournament - 3840x2160"
-version = 2
-
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x033 # Excludes FMV B&W layer (only viewable with rajkosto's implementation)
-tileModesExcluded = 0x001
-overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine]
-width = 960
-height = 720
-overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/XCX_1080p/rules.txt b/Quality/XCX_1080p/rules.txt
deleted file mode 100644
index 64412137..00000000
--- a/Quality/XCX_1080p/rules.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00,ffffffff0cd546a9
-name = "Xenoblade Chronicles X - 1920x1080"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-tileModesExcluded = 0x001
-overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # half-res alpha
-width = 640
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-tileModesExcluded = 0x001
-overwriteWidth = 960
-overwriteHeight = 540
-
-[TextureRedefine] # q-res alpha (Previously not added due to potential conflict, please remove rule when using Xeno GCN4 workaround)
-width = 320
-height = 180
-overwriteWidth = 480
-overwriteHeight = 270
-
-[TextureRedefine] # Gear menu
-width = 1024
-height = 720
-overwriteWidth = 1536
-overwriteHeight = 1080
-
-[TextureRedefine] # Fog
-width =	426
-height = 240
-overwriteWidth = 639
-overwriteHeight = 360
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 1920
-#overwriteHeight = 1080
-
-// vvvv credits to Getdls & GITech vvvv //
-
-[TextureRedefine] # Sun, Light Sources (plants, armor etc)
-width =	512
-height = 288
-overwriteWidth = 768
-overwriteHeight = 432
-
-[TextureRedefine] # "God rays" size (not quality), lens reflections.
-width =	256
-height = 144
-overwriteWidth = 384
-overwriteHeight = 216
-
-#[TextureRedefine]# Probe glow. Does not increase sample amount, only scales up
-#width = 160
-#height = 90
-#formatsExcluded = 0x816  #fix probe glow
-#overwriteWidth = 240
-#overwriteHeight = 135
-	
-#[TextureRedefine]# Probe Beacon glow.
-#width = 80
-#height = 46
-#formatsExcluded = 0x816  #fix probe glow
-#overwriteWidth = 120
-#overwriteHeight = 104
\ No newline at end of file
diff --git a/Quality/XCX_1080pUW/rules.txt b/Quality/XCX_1080pUW/rules.txt
deleted file mode 100644
index 0e939e94..00000000
--- a/Quality/XCX_1080pUW/rules.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00,ffffffff0cd546a9
-name = "Xenoblade Chronicles X - 2560x1080 (21:9)"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-tileModesExcluded = 0x001
-overwriteWidth = 2560
-overwriteHeight = 1080
-
-[TextureRedefine] # half-res alpha
-width = 640
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-tileModesExcluded = 0x001
-overwriteWidth = 1280
-overwriteHeight = 540
-
-[TextureRedefine] # q-res alpha (Previously not added due to potential conflict, please remove rule when using Xeno GCN4 workaround)
-width = 320
-height = 180
-overwriteWidth = 640
-overwriteHeight = 270
-
-[TextureRedefine] # Gear menu
-width = 1024
-height = 720
-overwriteWidth = 2048
-overwriteHeight = 1080
-
-[TextureRedefine] # Fog
-width =	426
-height = 240
-overwriteWidth = 852
-overwriteHeight = 360
-
-// vvvv credits to Getdls & GITech vvvv //
-
-[TextureRedefine] # Sun, Light Sources (plants, armor etc)
-width =	512
-height = 288
-overwriteWidth = 1024
-overwriteHeight = 432
-
-[TextureRedefine] # "God rays" size (not quality), lens reflections.
-width =	256
-height = 144
-overwriteWidth = 512
-overwriteHeight = 216
-
-#[TextureRedefine]# Probe glow. Does not increase sample amount, only scales up
-#width = 160
-#height = 90
-#formatsExcluded = 0x816  #fix probe glow
-#overwriteWidth = 320
-#overwriteHeight = 135
-	
-#[TextureRedefine]# Probe Beacon glow.
-#width = 80
-#height = 46
-#formatsExcluded = 0x816  #fix probe glow
-#overwriteWidth = 160
-#overwriteHeight = 104
\ No newline at end of file
diff --git a/Quality/XCX_1440p/rules.txt b/Quality/XCX_1440p/rules.txt
deleted file mode 100644
index 3462ff39..00000000
--- a/Quality/XCX_1440p/rules.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00,ffffffff0cd546a9
-name = "Xenoblade Chronicles X - 2560x1440"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-tileModesExcluded = 0x001
-overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # half-res alpha
-width = 640
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-tileModesExcluded = 0x001
-overwriteWidth = 1280
-overwriteHeight = 720
-
-[TextureRedefine] # q-res alpha (Previously not added due to potential conflict, please remove rule when using Xeno GCN4 workaround)
-width = 320
-height = 180
-overwriteWidth = 642
-overwriteHeight = 362
-
-[TextureRedefine] # Gear menu
-width = 1024
-height = 720
-overwriteWidth = 2048
-overwriteHeight = 1440
-
-[TextureRedefine] # Fog
-width =	426
-height = 240
-overwriteWidth = 852
-overwriteHeight = 480
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 1920
-#overwriteHeight = 1080
-
-// vvvv credits to Getdls & GITech vvvv //
-
-[TextureRedefine] # Sun, Light Sources (plants, armor etc)
-width =	512
-height = 288
-overwriteWidth = 1024
-overwriteHeight = 576
-
-[TextureRedefine] # "God rays" size (not quality), lens reflections.
-width =	256
-height = 144
-overwriteWidth = 513
-overwriteHeight = 290
-
-#[TextureRedefine]# Probe glow. Does not increase sample amount, only scales up
-#width = 160
-#height = 90
-#formatsExcluded = 0x816  #fix probe glow
-#overwriteWidth = 322
-#overwriteHeight = 180
-	
-#[TextureRedefine]# Probe Beacon glow.
-#width = 80
-#height = 46
-#formatsExcluded = 0x816  #fix probe glow
-#overwriteWidth = 161
-#overwriteHeight = 90
\ No newline at end of file
diff --git a/Quality/XCX_1800p/rules.txt b/Quality/XCX_1800p/rules.txt
deleted file mode 100644
index 2b2bc37c..00000000
--- a/Quality/XCX_1800p/rules.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00,ffffffff0cd546a9
-name = "Xenoblade Chronicles X - 3200x1800"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-tileModesExcluded = 0x001
-overwriteWidth = 3200
-overwriteHeight = 1800
-
-[TextureRedefine] # half-res alpha
-width = 640
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-tileModesExcluded = 0x001
-overwriteWidth = 1600
-overwriteHeight = 900
-
-[TextureRedefine] # q-res alpha (Previously not added due to potential conflict, please remove rule when using Xeno GCN4 workaround)
-width = 320
-height = 180
-overwriteWidth = 800
-overwriteHeight = 450
-
-[TextureRedefine] # Gear menu
-width = 1024
-height = 720
-overwriteWidth = 2560
-overwriteHeight = 1800
-
-[TextureRedefine] # Fog
-width =	426
-height = 240
-overwriteWidth = 1065
-overwriteHeight = 600
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 1920
-#overwriteHeight = 1080
-
-// vvvv credits to Getdls & GITech vvvv //
-
-[TextureRedefine] # Sun, Light Sources (plants, armor etc)
-width =	512
-height = 288
-overwriteWidth = 1280
-overwriteHeight = 720
-
-[TextureRedefine] # "God rays" size (not quality), lens reflections.
-width =	256
-height = 144
-overwriteWidth = 640
-overwriteHeight = 360
-
-#[TextureRedefine]# Probe glow. Does not increase sample amount, only scales up
-#width = 160
-#height = 90
-#formatsExcluded = 0x816  #fix probe glow
-#overwriteWidth = 400
-#overwriteHeight = 225
-	
-#[TextureRedefine]# Probe Beacon glow.
-#width = 80
-#height = 46
-#formatsExcluded = 0x816  #fix probe glow
-#overwriteWidth = 200
-#overwriteHeight = 112
\ No newline at end of file
diff --git a/Quality/XCX_2160p/rules.txt b/Quality/XCX_2160p/rules.txt
deleted file mode 100644
index beb0a819..00000000
--- a/Quality/XCX_2160p/rules.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00,ffffffff0cd546a9
-name = "Xenoblade Chronicles X - 3840x2160"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-tileModesExcluded = 0x001	#intro FMV background
-overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # half-res alpha 
-width = 640
-height = 360
-formatsExcluded = 0x41A,0x033,0x432 # exclude obvious textures, dialog fade screen, XCX LogoNLA 
-tileModesExcluded = 0x001
-overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # q-res alpha (Previously not added due to potential conflict, please remove rule when using Xeno GCN4 workaround)
-width = 320
-height = 180
-overwriteWidth = 960
-overwriteHeight = 540
-
-[TextureRedefine] # Gear menu
-width = 1024
-height = 720
-overwriteWidth = 3072
-overwriteHeight = 2160
-
-#[TextureRedefine] # Fog
-#width =	426
-#height = 240
-#overwriteWidth = 1280
-#overwriteHeight = 720
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 1920
-#overwriteHeight = 1080
-
-
-// vvvv credits to Getdls & GITech vvvv //
-
-[TextureRedefine] # Sun, Light Sources (plants, armor etc)
-width =	512
-height = 288
-overwriteWidth = 1536
-overwriteHeight = 864
-
-[TextureRedefine] # "God rays" size (not quality), lens reflections.
-width =	256
-height = 144
-overwriteWidth = 768
-overwriteHeight = 432
-
-#[TextureRedefine]# Probe glow. Does not increase sample amount, only scales up
-#width = 160
-#height = 90
-#formatsExcluded = 0x816  #fix probe glow
-#overwriteWidth = 480
-#overwriteHeight = 270
-	
-#[TextureRedefine]# Probe Beacon glow.
-#width = 80
-#height = 46
-#formatsExcluded = 0x816  #fix probe glow
-#overwriteWidth = 240
-#overwriteHeight = 135
\ No newline at end of file
diff --git a/Quality/Yoshi_1080p/rules.txt b/Quality/Yoshi_1080p/rules.txt
deleted file mode 100644
index 5ee76670..00000000
--- a/Quality/Yoshi_1080p/rules.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-[Definition]
-titleIds = 0005000010131F00,0005000010184E00,0005000010184D00
-name = "Yoshi's Woolly World - 1920x1080"
-version = 2
-
-[TextureRedefine] # tv
-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/Quality/Yoshi_1080pUW/patches.txt b/Quality/Yoshi_1080pUW/patches.txt
deleted file mode 100644
index c206ba40..00000000
--- a/Quality/Yoshi_1080pUW/patches.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-[WoollyUW]
-moduleMatches = 0x363CA665
-0x10274058 = .float 2.37 ;world map
-0x10001A44 = .float 2.37 ;ingame
\ No newline at end of file
diff --git a/Quality/Yoshi_1080pUW/rules.txt b/Quality/Yoshi_1080pUW/rules.txt
deleted file mode 100644
index e2243413..00000000
--- a/Quality/Yoshi_1080pUW/rules.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-[Definition]
-titleIds = 0005000010131F00,0005000010184E00,0005000010184D00
-name = "Yoshi's Woolly World - 2560x1080 (21:9)"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-overwriteWidth = 2560
-overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/Yoshi_1440p/rules.txt b/Quality/Yoshi_1440p/rules.txt
deleted file mode 100644
index 3b7179dc..00000000
--- a/Quality/Yoshi_1440p/rules.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-[Definition]
-titleIds = 0005000010131F00,0005000010184E00,0005000010184D00
-name = "Yoshi's Woolly World - 2560x1440"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/Yoshi_1800p/rules.txt b/Quality/Yoshi_1800p/rules.txt
deleted file mode 100644
index 43e842f9..00000000
--- a/Quality/Yoshi_1800p/rules.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-[Definition]
-titleIds = 0005000010131F00,0005000010184E00,0005000010184D00
-name = "Yoshi's Woolly World - 3200x1800"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-overwriteWidth = 3200
-overwriteHeight = 1800
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/Yoshi_2160p/rules.txt b/Quality/Yoshi_2160p/rules.txt
deleted file mode 100644
index 086b5bfa..00000000
--- a/Quality/Yoshi_2160p/rules.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-[Definition]
-titleIds = 0005000010131F00,0005000010184E00,0005000010184D00
-name = "Yoshi's Woolly World - 3840x2160"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/Yoshi_2160pUW/patches.txt b/Quality/Yoshi_2160pUW/patches.txt
deleted file mode 100644
index c206ba40..00000000
--- a/Quality/Yoshi_2160pUW/patches.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-[WoollyUW]
-moduleMatches = 0x363CA665
-0x10274058 = .float 2.37 ;world map
-0x10001A44 = .float 2.37 ;ingame
\ No newline at end of file
diff --git a/Quality/Yoshi_2160pUW/rules.txt b/Quality/Yoshi_2160pUW/rules.txt
deleted file mode 100644
index 4b94ad0b..00000000
--- a/Quality/Yoshi_2160pUW/rules.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-[Definition]
-titleIds = 0005000010131F00,0005000010184E00,0005000010184D00
-name = "Yoshi's Woolly World - 5120x2160 (21:9)"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-overwriteWidth = 5120
-overwriteHeight = 2160
\ No newline at end of file
diff --git a/Source/PokkenTournament/rules.txt b/Source/PokkenTournament/rules.txt
new file mode 100644
index 00000000..f7fba29b
--- /dev/null
+++ b/Source/PokkenTournament/rules.txt
@@ -0,0 +1,33 @@
+<?php
+include 'Source/functions.php';
+$fullWidth = $argv[1];
+$fullHeight = $argv[2];
+$scaleFactorX = $fullWidth / 1280.0;
+$scaleFactorY = $fullHeight / 720.0;
+
+$title = get_title($fullWidth, $fullHeight);
+?>
+[Definition]
+titleIds = 00050000101DF400,00050002101DF401
+name = "Pokken Tournament - <?=$title?>"
+version = 2
+
+[TextureRedefine]
+width = 1280
+height = 720
+formatsExcluded = 0x033
+tileModesExcluded = 0x001
+overwriteWidth = <?=round($scaleFactorX*1280)?> 
+overwriteHeight = <?=round($scaleFactorY*720)?> 
+
+[TextureRedefine]
+width = 960
+height = 720
+overwriteWidth = <?=round($scaleFactorX*1280)?> 
+overwriteHeight = <?=round($scaleFactorY*720)?> 
+
+[TextureRedefine] # gamepad
+width = 854
+height = 480
+#overwriteWidth = <?=round($scaleFactorX*1280)?> 
+#overwriteHeight = <?=round($scaleFactorY*720)?> 
diff --git a/Source/WoollyWorld/patches.txt b/Source/WoollyWorld/patches.txt
new file mode 100644
index 00000000..1264dc0e
--- /dev/null
+++ b/Source/WoollyWorld/patches.txt
@@ -0,0 +1,15 @@
+<?php
+$width = $argv[1];
+$height = $argv[2];
+
+$aspect = $width / (float)$height;
+
+if (round($aspect*100.0) == 178)
+	exit(1);
+
+$aspect = number_format((float)$aspect, 3, '.', '');
+?>
+[WoollyUW]
+moduleMatches = 0x363CA665
+0x10274058 = .float <?=$aspect?> 
+0x10001A44 = .float <?=$aspect?> 
diff --git a/Source/WoollyWorld/rules.txt b/Source/WoollyWorld/rules.txt
new file mode 100644
index 00000000..6e7ce4fd
--- /dev/null
+++ b/Source/WoollyWorld/rules.txt
@@ -0,0 +1,19 @@
+<?php
+include 'Source/functions.php';
+$fullWidth = $argv[1];
+$fullHeight = $argv[2];
+$scaleFactorX = $fullWidth / 1280.0;
+$scaleFactorY = $fullHeight / 720.0;
+
+$title = get_title($fullWidth, $fullHeight);
+?>
+[Definition]
+titleIds = 0005000010131F00,0005000010184E00,0005000010184D00
+name = "Yoshi's Woolly World - <?=$title?>"
+version = 2
+
+[TextureRedefine] # tv
+width = 1280
+height = 720
+overwriteWidth = <?=round($scaleFactorX*1280)?> 
+overwriteHeight = <?=round($scaleFactorY*720)?> 
diff --git a/Quality/XCX_1080pUW/patches.txt b/Source/XenobladeX/patches.txt
similarity index 71%
rename from Quality/XCX_1080pUW/patches.txt
rename to Source/XenobladeX/patches.txt
index a8966317..c1f80ec8 100644
--- a/Quality/XCX_1080pUW/patches.txt
+++ b/Source/XenobladeX/patches.txt
@@ -1,8 +1,19 @@
+<?php
+$width = $argv[1];
+$height = $argv[2];
+
+$aspect = $width / (float)$height;
+
+if (round($aspect*100.0) == 178)
+	exit(1);
+
+$aspect = number_format((float)$aspect, 3, '.', '');
+?>
 [XCXAspectV100U_V101U]
 moduleMatches = 2878856811, 0x676EB33E
 
 # rodata constants
-0x1003E754 = .float 2.370
+0x1003E754 = .float <?=$aspect?> 
 _aspectAddr = 0x1003E754
 
 # 3d Aspect
@@ -13,7 +24,7 @@ _aspectAddr = 0x1003E754
 moduleMatches = 0x30B6E091
 
 #rodata constants
-0x1003E754 = .float 2.370
+0x1003E754 = .float <?=$aspect?> 
 _aspectAddr = 0x1003E754
 
 # 3d Aspect
@@ -24,7 +35,7 @@ _aspectAddr = 0x1003E754
 moduleMatches = 0x218F6E07, 0xF882D5CF
 
 # rodata constants
-0x1003E754 = .float 2.370
+0x1003E754 = .float <?=$aspect?> 
 _aspectAddr = 0x1003E754
 
 # 3d Aspect
@@ -35,7 +46,7 @@ _aspectAddr = 0x1003E754
 moduleMatches = 0x785CA8A9
 
 #rodata constants
-0x1003E6C4 = .float 2.370
+0x1003E6C4 = .float <?=$aspect?> 
 _aspectAddr = 0x1003E6C4
 
 # 3d Aspect
@@ -46,7 +57,7 @@ _aspectAddr = 0x1003E6C4
 moduleMatches = 0x8780C48F
 
 #rodata constants
-0x1003E714 = .float 2.370
+0x1003E714 = .float <?=$aspect?> 
 _aspectAddr = 0x1003E714
 
 # 3d Aspect
@@ -57,9 +68,9 @@ _aspectAddr = 0x1003E714
 moduleMatches = 0x7672271D
 
 #rodata constants
-0x1003E714 = .float 2.370
+0x1003E714 = .float <?=$aspect?> 
 _aspectAddr = 0x1003E714
 
 # 3d Aspect
 0x0315BE7C = lis r7, _aspectAddr@ha
-0x0315BE80 = lfs f13, _aspectAddr@l(r7)
\ No newline at end of file
+0x0315BE80 = lfs f13, _aspectAddr@l(r7)
diff --git a/Source/XenobladeX/rules.txt b/Source/XenobladeX/rules.txt
new file mode 100644
index 00000000..a6ae7305
--- /dev/null
+++ b/Source/XenobladeX/rules.txt
@@ -0,0 +1,74 @@
+<?php
+include 'Source/functions.php';
+$fullWidth = $argv[1];
+$fullHeight = $argv[2];
+$scaleFactorX = $fullWidth / 1280.0;
+$scaleFactorY = $fullHeight / 720.0;
+
+$title = get_title($fullWidth, $fullHeight);
+?>
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - <?=$title?>"
+version = 2
+
+[TextureRedefine] # tv
+width = 1280
+height = 720
+tileModesExcluded = 0x001
+overwriteWidth = <?=round($scaleFactorX*1280)?> 
+overwriteHeight = <?=round($scaleFactorY*720)?> 
+
+[TextureRedefine] # half-res alpha
+width = 640
+height = 360
+formatsExcluded = 0x41A # exclude obvious textures
+tileModesExcluded = 0x001
+overwriteWidth = <?=round($scaleFactorX*640)?> 
+overwriteHeight = <?=round($scaleFactorY*360)?> 
+
+[TextureRedefine] # q-res alpha (Previously not added due to potential conflict, please remove rule when using Xeno GCN4 workaround)
+width = 320
+height = 180
+overwriteWidth = <?=round($scaleFactorX*320)?> 
+overwriteHeight = <?=round($scaleFactorY*180)?> 
+
+[TextureRedefine] # Gear menu
+width = 1024
+height = 720
+overwriteWidth = <?=round($scaleFactorX*1024)?> 
+overwriteHeight = <?=round($scaleFactorY*720)?> 
+
+[TextureRedefine] # Fog
+width =	426
+height = 240
+overwriteWidth = <?=round($scaleFactorX*426)?> 
+overwriteHeight = <?=round($scaleFactorY*240)?> 
+
+// vvvv credits to Getdls & GITech vvvv //
+
+[TextureRedefine] # Sun, Light Sources (plants, armor etc)
+width =	512
+height = 288
+overwriteWidth = <?=round($scaleFactorX*512)?> 
+overwriteHeight = <?=round($scaleFactorY*288)?> 
+
+[TextureRedefine] # "God rays" size (not quality), lens reflections.
+width =	256
+height = 144
+overwriteWidth = <?=round($scaleFactorX*256)?> 
+overwriteHeight = <?=round($scaleFactorY*144)?> 
+
+[TextureRedefine]# Probe glow. Does not increase sample amount, only scales up
+width = 160
+height = 90
+formatsExcluded = 0x816  #fix probe glow
+#overwriteWidth = <?=round($scaleFactorX*160)?> 
+#overwriteHeight = <?=round($scaleFactorY*90)?> 
+	
+[TextureRedefine]# Probe Beacon glow.
+width = 80
+height = 46
+formatsExcluded = 0x816  #fix probe glow
+#overwriteWidth = <?=round($scaleFactorX*80)?> 
+#overwriteHeight = <?=round($scaleFactorY*46)?> 
diff --git a/Workaround/Smash_PixelMess/rules.txt b/Workaround/SuperSmashBros_PixelMess/rules.txt
similarity index 75%
rename from Workaround/Smash_PixelMess/rules.txt
rename to Workaround/SuperSmashBros_PixelMess/rules.txt
index 816a2769..cfb3eb6e 100644
--- a/Workaround/Smash_PixelMess/rules.txt
+++ b/Workaround/SuperSmashBros_PixelMess/rules.txt
@@ -1,5 +1,5 @@
 [Definition]
-titleIds = 0005000010110E00,0005000010145000,0005000010144F00,ffffffffd72e798a
+titleIds = 0005000010110E00,0005000010145000,0005000010144F00
 name = "Super Smash Bros. - Pixel Mess"
 version = 2
 # A screenshot can be seen here: https://cdn.discordapp.com/attachments/286429969104764928/335077383847673857/unknown.png
diff --git a/Workaround/XCX_AMDGCN4/rules.txt b/Workaround/XenobladeX_AMDGCN4/rules.txt
similarity index 100%
rename from Workaround/XCX_AMDGCN4/rules.txt
rename to Workaround/XenobladeX_AMDGCN4/rules.txt
diff --git a/Workaround/XCX_AdjustableBrightness/3cc7e98f78c258b4_00000000000003ca_ps.txt b/Workaround/XenobladeX_AdjustableBrightness/3cc7e98f78c258b4_00000000000003ca_ps.txt
similarity index 100%
rename from Workaround/XCX_AdjustableBrightness/3cc7e98f78c258b4_00000000000003ca_ps.txt
rename to Workaround/XenobladeX_AdjustableBrightness/3cc7e98f78c258b4_00000000000003ca_ps.txt
diff --git a/Workaround/XCX_AdjustableBrightness/rules.txt b/Workaround/XenobladeX_AdjustableBrightness/rules.txt
similarity index 100%
rename from Workaround/XCX_AdjustableBrightness/rules.txt
rename to Workaround/XenobladeX_AdjustableBrightness/rules.txt
diff --git a/build.sh b/build.sh
index 72102ba4..97bf9aee 100644
--- a/build.sh
+++ b/build.sh
@@ -94,8 +94,11 @@ std_respack "HyruleWarriors" "${res16by9[@]}" "${res21by9[@]}"
 std_respack "KirbyRainbowCurse" "${res16by9[@]}"
 std_respack "MarioKart8" "${res16by9[@]}" "${res21by9[@]}"
 std_respack "MarioTennis" "${res16by9[@]}"
+std_respack "PokkenTournament" "${res16by9[@]}"
 std_respack "SonicLostWorld" "${res16by9[@]}" "${res21by9[@]}"
 std_respack "Splatoon" "${res16by9[@]}" "${res21by9[@]}"
 std_respack "SuperMario3DWorld" "${res16by9[@]}" "${res21by9[@]}"
 std_respack "SuperSmashBros" "${res16by9[@]}"
 std_respack "WindWakerHD" "${res16by9[@]}" "${res21by9[@]}"
+std_respack "WoollyWorld" "${res16by9[@]}" "${res21by9[@]}"
+std_respack "XenobladeX" "${res16by9[@]}" "${res21by9[@]}"