diff --git a/Enhancement/MK8_0AARemoval/8e1337dde42fd224_00000000000003c9_ps.txt b/Enhancement/MarioKart8_0AARemoval/8e1337dde42fd224_00000000000003c9_ps.txt
similarity index 100%
rename from Enhancement/MK8_0AARemoval/8e1337dde42fd224_00000000000003c9_ps.txt
rename to Enhancement/MarioKart8_0AARemoval/8e1337dde42fd224_00000000000003c9_ps.txt
diff --git a/Enhancement/MK8_0AARemoval/rules.txt b/Enhancement/MarioKart8_0AARemoval/rules.txt
similarity index 100%
rename from Enhancement/MK8_0AARemoval/rules.txt
rename to Enhancement/MarioKart8_0AARemoval/rules.txt
diff --git a/Enhancement/MK8_AdjustableBloom/e90feef2bca6cb2e_00000000000003c9_ps.txt b/Enhancement/MarioKart8_AdjustableBloom/e90feef2bca6cb2e_00000000000003c9_ps.txt
similarity index 100%
rename from Enhancement/MK8_AdjustableBloom/e90feef2bca6cb2e_00000000000003c9_ps.txt
rename to Enhancement/MarioKart8_AdjustableBloom/e90feef2bca6cb2e_00000000000003c9_ps.txt
diff --git a/Enhancement/MK8_AdjustableBloom/rules.txt b/Enhancement/MarioKart8_AdjustableBloom/rules.txt
similarity index 100%
rename from Enhancement/MK8_AdjustableBloom/rules.txt
rename to Enhancement/MarioKart8_AdjustableBloom/rules.txt
diff --git a/Enhancement/MK8_HighResShadows/rules.txt b/Enhancement/MarioKart8_HighResShadows/rules.txt
similarity index 100%
rename from Enhancement/MK8_HighResShadows/rules.txt
rename to Enhancement/MarioKart8_HighResShadows/rules.txt
diff --git a/Enthusiast/MK8_2880p/rules.txt b/Enthusiast/MK8_2880p/rules.txt
deleted file mode 100644
index 4be3d08f..00000000
--- a/Enthusiast/MK8_2880p/rules.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-[Definition]
-titleIds = 000500001010ec00,000500001010ed00,000500001010eb00,ffffffff85887bc1
-name = "Mario Kart 8 - 5120x2880"
-version = 2
-
-# Main Screen Resolution
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x41A,0x431 # exclude the intro background texture, race end background
-overwriteWidth = 5120
-overwriteHeight = 2880
-
-# Half Res Alpha (and DOF)
-[TextureRedefine]
-width = 640
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 2560
-overwriteHeight = 1440
-
-# Quarter Res Alpha (motion blur effect around edges of screen)
-[TextureRedefine]
-width = 320
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 720
-
-# Multiplayer-Mode Resolution (2p)
-[TextureRedefine]
-width = 640
-height = 720
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 2560
-overwriteHeight = 2880
-
-# Multiplayer-Mode Resolution half-res (2p)
-[TextureRedefine]
-width = 320
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 1440
-
-# Multiplayer-Mode Quarter Res Alpha (2p)
-[TextureRedefine]
-width = 160
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 640
-overwriteHeight = 720
-
-# MKTV output
-[TextureRedefine]
-width = 960
-height = 540
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 3840
-overwriteHeight = 2160
-
-# MKTV internal render targets
-[TextureRedefine]
-width = 960
-height = 536
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 3840
-overwriteHeight = 2144
-
-# MKTV half res alpha
-[TextureRedefine]
-width = 480
-height = 268
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1920
-overwriteHeight = 1074
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 2562
-#overwriteHeight = 1440
\ No newline at end of file
diff --git a/Enthusiast/MK8_4320p/rules.txt b/Enthusiast/MK8_4320p/rules.txt
deleted file mode 100644
index fc5a6738..00000000
--- a/Enthusiast/MK8_4320p/rules.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-[Definition]
-titleIds = 000500001010ec00,000500001010ed00,000500001010eb00,ffffffff85887bc1
-name = "Mario Kart 8 - 7680x4320"
-version = 2
-
-# Main Screen Resolution
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x41A,0x431 # exclude the intro background texture, race end background
-overwriteWidth = 7680
-overwriteHeight = 4320
-
-# Half Res Alpha (and DOF)
-[TextureRedefine]
-width = 640
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 3840
-overwriteHeight = 2160
-
-# Quarter Res Alpha (motion blur effect around edges of screen)
-[TextureRedefine]
-width = 320
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1920
-overwriteHeight = 1080
-
-# Multiplayer-Mode Resolution (2p)
-[TextureRedefine]
-width = 640
-height = 720
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 3840
-overwriteHeight = 4320
-
-# Multiplayer-Mode Resolution half-res (2p)
-[TextureRedefine]
-width = 320
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1920
-overwriteHeight = 2160
-
-# Multiplayer-Mode Quarter Res Alpha (2p)
-[TextureRedefine]
-width = 160
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 960
-overwriteHeight = 1080
-
-# MKTV output
-[TextureRedefine]
-width = 960
-height = 540
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 5760
-overwriteHeight = 3240
-
-# MKTV internal render targets
-[TextureRedefine]
-width = 960
-height = 536
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 5760
-overwriteHeight = 3216
-
-# MKTV half res alpha
-[TextureRedefine]
-width = 480
-height = 268
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 2880
-overwriteHeight = 1608
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 2562
-#overwriteHeight = 1440
\ No newline at end of file
diff --git a/Enthusiast/MK8_5760p/rules.txt b/Enthusiast/MK8_5760p/rules.txt
deleted file mode 100644
index d9f8d4d5..00000000
--- a/Enthusiast/MK8_5760p/rules.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-[Definition]
-titleIds = 000500001010ec00,000500001010ed00,000500001010eb00,ffffffff85887bc1
-name = "Mario Kart 8 - 10240x5760"
-version = 2
-
-# Main Screen Resolution
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x41A,0x431 # exclude the intro background texture, race end background
-overwriteWidth = 10240
-overwriteHeight = 5760
-
-# Half Res Alpha (and DOF)
-[TextureRedefine]
-width = 640
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 5120
-overwriteHeight = 2880
-
-# Quarter Res Alpha (motion blur effect around edges of screen)
-[TextureRedefine]
-width = 320
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 2560
-overwriteHeight = 1440
-
-# Multiplayer-Mode Resolution (2p)
-[TextureRedefine]
-width = 640
-height = 720
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 5120
-overwriteHeight = 5760
-
-# Multiplayer-Mode Resolution half-res (2p)
-[TextureRedefine]
-width = 320
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 2560
-overwriteHeight = 2880
-
-# Multiplayer-Mode Quarter Res Alpha (2p)
-[TextureRedefine]
-width = 160
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 1440
-
-# MKTV output
-[TextureRedefine]
-width = 960
-height = 540
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 7680
-overwriteHeight = 4320
-
-# MKTV internal render targets
-[TextureRedefine]
-width = 960
-height = 536
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 7680
-overwriteHeight = 4288
-
-# MKTV half res alpha
-[TextureRedefine]
-width = 480
-height = 268
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 3840
-overwriteHeight = 2144
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 2562
-#overwriteHeight = 1440
\ No newline at end of file
diff --git a/Modifications/MK8_TheVoid/patches.txt b/Modifications/MarioKart8_TheVoid/patches.txt
similarity index 100%
rename from Modifications/MK8_TheVoid/patches.txt
rename to Modifications/MarioKart8_TheVoid/patches.txt
diff --git a/Modifications/MK8_TheVoid/rules.txt b/Modifications/MarioKart8_TheVoid/rules.txt
similarity index 100%
rename from Modifications/MK8_TheVoid/rules.txt
rename to Modifications/MarioKart8_TheVoid/rules.txt
diff --git a/Performance/MK8_360p/rules.txt b/Performance/MK8_360p/rules.txt
deleted file mode 100644
index 61a3e7eb..00000000
--- a/Performance/MK8_360p/rules.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-[Definition]
-titleIds = 000500001010ec00,000500001010ed00,000500001010eb00,ffffffff85887bc1
-name = "Mario Kart 8 - 640x360"
-version = 2
-
-# Main Screen Resolution
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x41A,0x431 # exclude the intro background texture, race end background
-overwriteWidth = 640
-overwriteHeight = 360
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 427
-overwriteHeight = 240
-
-# Half Res Alpha (and DOF)
-[TextureRedefine]
-width = 640
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 320
-overwriteHeight = 180
-
-# Quarter Res Alpha (motion blur effect around edges of screen)
-[TextureRedefine]
-width = 320
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 160
-overwriteHeight = 90
-
-# Multiplayer-Mode Resolution (2p)
-[TextureRedefine]
-width = 640
-height = 720
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 480
-overwriteHeight = 360
-
-# Multiplayer-Mode Half Res Alpha (2p)
-[TextureRedefine]
-width = 320
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 240
-overwriteHeight = 180
-
-# Multiplayer-Mode Quarter Res Alpha (2p)
-[TextureRedefine]
-width = 160
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 120
-overwriteHeight = 90
-
-# MKTV screen
-[TextureRedefine]
-width = 960
-height = 540
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 480
-overwriteHeight = 270
-
-# MKTV internal render targets
-[TextureRedefine]
-width = 960
-height = 536
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 480
-overwriteHeight = 268
-
-# MKTV half res alpha
-[TextureRedefine]
-width = 480
-height = 268
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 240
-overwriteHeight = 134
-
-[TextureRedefine] # shadows
-width = 1024
-height = 1024
-formats = 0x005
-overwriteWidth = 512
-overwriteHeight = 512
\ No newline at end of file
diff --git a/Performance/MK8_540p/rules.txt b/Performance/MK8_540p/rules.txt
deleted file mode 100644
index 48b6280d..00000000
--- a/Performance/MK8_540p/rules.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-[Definition]
-titleIds = 000500001010ec00,000500001010ed00,000500001010eb00,ffffffff85887bc1
-name = "Mario Kart 8 - 960x540"
-version = 2
-
-# Main Screen Resolution
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x41A,0x431 # exclude the intro background texture, race end background
-overwriteWidth = 960
-overwriteHeight = 540
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 427
-overwriteHeight = 240
-
-# Half Res Alpha (and DOF)
-[TextureRedefine]
-width = 640
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 480
-overwriteHeight = 270
-
-# Quarter Res Alpha (motion blur effect around edges of screen)
-[TextureRedefine]
-width = 320
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 240
-overwriteHeight = 135
-
-# Multiplayer-Mode Resolution (2p)
-[TextureRedefine]
-width = 640
-height = 720
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 480
-overwriteHeight = 540
-
-# Multiplayer-Mode Half Res Alpha (2p)
-[TextureRedefine]
-width = 320
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 240
-overwriteHeight = 270
-
-# Multiplayer-Mode Quarter Res Alpha (2p)
-[TextureRedefine]
-width = 160
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 120
-overwriteHeight = 135
-
-# MKTV screen
-[TextureRedefine]
-width = 960
-height = 540
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 720
-overwriteHeight = 405
-
-# MKTV internal render targets
-[TextureRedefine]
-width = 960
-height = 536
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 720
-overwriteHeight = 402
-
-# MKTV half res alpha
-[TextureRedefine]
-width = 480
-height = 268
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 360
-overwriteHeight = 201
-
-[TextureRedefine] # shadows
-width = 1024
-height = 1024
-formats = 0x005
-overwriteWidth = 512
-overwriteHeight = 512
\ No newline at end of file
diff --git a/Quality/MK8_1080pUW/rules.txt b/Quality/MK8_1080pUW/rules.txt
deleted file mode 100644
index 72ccbfc7..00000000
--- a/Quality/MK8_1080pUW/rules.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-[Definition]
-titleIds = 000500001010ec00,000500001010ed00,000500001010eb00,ffffffff85887bc1
-name = "Mario Kart 8 - 2560x1080 (21:9)"
-version = 2
-
-# Main Screen Resolution
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x41A,0x431 # exclude the intro background texture, race end background
-overwriteWidth = 2560
-overwriteHeight = 1080
-
-# Half Res Alpha (and DOF)
-[TextureRedefine]
-width = 640
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 540
-
-# Quarter Res Alpha (motion blur effect around edges of screen)
-[TextureRedefine]
-width = 320
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 640
-overwriteHeight = 270
-
-# Multiplayer-Mode Resolution (2p)
-[TextureRedefine]
-width = 640
-height = 720
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 1080
-
-# Multiplayer-Mode Half Res Alpha (2p)
-[TextureRedefine]
-width = 320
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 640
-overwriteHeight = 540
-
-# Multiplayer-Mode Quarter Res Alpha (2p)
-[TextureRedefine]
-width = 160
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 320
-overwriteHeight = 270
-
-# MKTV screen
-[TextureRedefine]
-width = 960
-height = 540
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1920
-overwriteHeight = 810
-
-# MKTV internal render targets
-[TextureRedefine]
-width = 960
-height = 536
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1920
-overwriteHeight = 804
-
-# MKTV half res alpha
-[TextureRedefine]
-width = 480
-height = 268
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 960
-overwriteHeight = 402
-
-# MKTV quarter res alpha
-[TextureRedefine]
-width = 240
-height = 134
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 480
-overwriteHeight = 201
\ No newline at end of file
diff --git a/Quality/MK8_1440p/rules.txt b/Quality/MK8_1440p/rules.txt
deleted file mode 100644
index 367afbd5..00000000
--- a/Quality/MK8_1440p/rules.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-[Definition]
-titleIds = 000500001010ec00,000500001010ed00,000500001010eb00,ffffffff85887bc1
-name = "Mario Kart 8 - 2560x1440"
-version = 2
-
-# Main Screen Resolution
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x41A,0x431 # exclude the intro background texture, race end background
-overwriteWidth = 2560
-overwriteHeight = 1440
-
-# Half Res Alpha (and DOF)
-[TextureRedefine]
-width = 640
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 720
-
-# Quarter Res Alpha (motion blur effect around edges of screen)
-[TextureRedefine]
-width = 320
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 640
-overwriteHeight = 360
-
-# Multiplayer-Mode Resolution (2p)
-[TextureRedefine]
-width = 640
-height = 720
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 1440
-
-# Multiplayer-Mode Half Res Alpha (2p)
-[TextureRedefine]
-width = 320
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 640
-overwriteHeight = 720
-
-# Multiplayer-Mode Quarter Res Alpha (2p)
-[TextureRedefine]
-width = 160
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 320
-overwriteHeight = 360
-
-# MKTV screen
-[TextureRedefine]
-width = 960
-height = 540
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1920
-overwriteHeight = 1080
-
-# MKTV internal render targets
-[TextureRedefine]
-width = 960
-height = 536
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1920
-overwriteHeight = 1072
-
-# MKTV half res alpha
-[TextureRedefine]
-width = 480
-height = 268
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 960
-overwriteHeight = 536
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/MK8_1800p/rules.txt b/Quality/MK8_1800p/rules.txt
deleted file mode 100644
index 69cef9ec..00000000
--- a/Quality/MK8_1800p/rules.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-[Definition]
-titleIds = 000500001010ec00,000500001010ed00,000500001010eb00,ffffffff85887bc1
-name = "Mario Kart 8 - 3200x1800"
-version = 2
-
-# Main Screen Resolution
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x41A,0x431 # exclude the intro background texture, race end background
-overwriteWidth = 3200
-overwriteHeight = 1800
-
-# Half Res Alpha (and DOF)
-[TextureRedefine]
-width = 640
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1600
-overwriteHeight = 900
-
-# Quarter Res Alpha (motion blur effect around edges of screen)
-[TextureRedefine]
-width = 320
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 800
-overwriteHeight = 450
-
-# Multiplayer-Mode Resolution (2p)
-[TextureRedefine]
-width = 640
-height = 720
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1600
-overwriteHeight = 1800
-
-# Multiplayer-Mode Half Res Alpha (2p)
-[TextureRedefine]
-width = 320
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 800
-overwriteHeight = 900
-
-# Multiplayer-Mode Quarter Res Alpha (2p)
-[TextureRedefine]
-width = 160
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 400
-overwriteHeight = 450
-
-# MKTV screen
-[TextureRedefine]
-width = 960
-height = 540
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 2400
-overwriteHeight = 1350
-
-# MKTV internal render targets
-[TextureRedefine]
-width = 960
-height = 536
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 2400
-overwriteHeight = 1340
-
-# MKTV half res alpha
-[TextureRedefine]
-width = 480
-height = 268
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1200
-overwriteHeight = 670
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/MK8_2160p/rules.txt b/Quality/MK8_2160p/rules.txt
deleted file mode 100644
index 92b11f69..00000000
--- a/Quality/MK8_2160p/rules.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-[Definition]
-titleIds = 000500001010ec00,000500001010ed00,000500001010eb00,ffffffff85887bc1
-name = "Mario Kart 8 - 3840x2160"
-version = 2
-
-# Main Screen Resolution
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x41A,0x431 # exclude the intro background texture, race end background
-overwriteWidth = 3840
-overwriteHeight = 2160
-
-# Half Res Alpha (and DOF)
-[TextureRedefine]
-width = 640
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine]
-width = 640
-height = 320
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1920
-overwriteHeight = 960
-
-# Quarter Res Alpha (motion blur effect around edges of screen)
-[TextureRedefine]
-width = 320
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 960
-overwriteHeight = 540
-
-# Multiplayer-Mode Resolution (2p)
-[TextureRedefine]
-width = 640
-height = 720
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1920
-overwriteHeight = 2160
-
-# Multiplayer-Mode Half Res Alpha (2p)
-[TextureRedefine]
-width = 320
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 960
-overwriteHeight = 1080
-
-# Multiplayer-Mode Quarter Res Alpha (2p)
-[TextureRedefine]
-width = 160
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 480
-overwriteHeight = 540
-
-# MKTV output
-[TextureRedefine]
-width = 960
-height = 540
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 2880
-overwriteHeight = 1620
-
-# MKTV internal render targets
-[TextureRedefine]
-width = 960
-height = 536
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 2880
-overwriteHeight = 1608
-
-# MKTV half res alpha
-[TextureRedefine]
-width = 480
-height = 268
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1440
-overwriteHeight = 804
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/MK8_2160pUW/patches.txt b/Quality/MK8_2160pUW/patches.txt
deleted file mode 100644
index 2e5a1d9d..00000000
--- a/Quality/MK8_2160pUW/patches.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-[MK8AspectVer1]
-moduleMatches = 0x2A2DC82C
-0x10097D94 = .float 2.370
-0x100F3430 = .float 2.370
-
-#aspect scaling
-codeCaveSize = 0x18
-
-_scaleAspect = 0x00000004
-0x00000000 = .float 1.333333
-_scaleAddr = 0x00000000
-0x00000004 = fdivs f9, f13, f12
-0x00000008 = lis r7, _scaleAddr@ha
-0x0000000C = lfs f12, _scaleAddr@l(r7)
-0x00000010 = fmuls f7, f9, f12
-0x00000014 = blr
-
-#replace math with branch
-0x02416760 = bla _scaleAspect
-
-[MK8AspectVer2]
-moduleMatches = 0x62A5F023
-0x1009E9DC = .float 2.370
-0x100FC030 = .float 2.370
-
-#aspect scaling
-codeCaveSize = 0x18
-
-_scaleAspect = 0x00000004
-0x00000000 = .float 1.333333
-_scaleAddr = 0x00000000
-0x00000004 = fdivs f9, f13, f12
-0x00000008 = lis r7, _scaleAddr@ha
-0x0000000C = lfs f12, _scaleAddr@l(r7)
-0x00000010 = fmuls f7, f9, f12
-0x00000014 = blr
-
-#replace math with branch
-0x024376D4 = bla _scaleAspect
-
-[MK8AspectVer3]
-moduleMatches = 0xBA6B1E20
-0x100AC25C = .float 2.370
-0x1010A730 = .float 2.370
-
-#aspect scaling
-codeCaveSize = 0x18
-
-_scaleAspect = 0x00000004
-0x00000000 = .float 1.333333
-_scaleAddr = 0x00000000
-0x00000004 = fdivs f9, f13, f12
-0x00000008 = lis r7, _scaleAddr@ha
-0x0000000C = lfs f12, _scaleAddr@l(r7)
-0x00000010 = fmuls f7, f9, f12
-0x00000014 = blr
-
-#replace math with branch
-0x024642E8 = bla _scaleAspect
-
-[MK8AspectVer4]
-moduleMatches = 0x1D398493
-0x100C359C = .float 2.370
-0x10121D30 = .float 2.370
-
-#aspect scaling
-codeCaveSize = 0x18
-
-_scaleAspect = 0x00000004
-0x00000000 = .float 1.333333
-_scaleAddr = 0x00000000
-0x00000004 = fdivs f9, f13, f12
-0x00000008 = lis r7, _scaleAddr@ha
-0x0000000C = lfs f12, _scaleAddr@l(r7)
-0x00000010 = fmuls f7, f9, f12
-0x00000014 = blr
-
-#replace math with branch
-0x024AEBEC = bla _scaleAspect
-
-[MK8AspectVer4_1]
-moduleMatches = 0xD09700CE
-0x100C359C = .float 2.370
-0x10121E30 = .float 2.370
-
-#aspect scaling
-codeCaveSize = 0x18
-
-_scaleAspect = 0x00000004
-0x00000000 = .float 1.333333
-_scaleAddr = 0x00000000
-0x00000004 = fdivs f9, f13, f12
-0x00000008 = lis r7, _scaleAddr@ha
-0x0000000C = lfs f12, _scaleAddr@l(r7)
-0x00000010 = fmuls f7, f9, f12
-0x00000014 = blr
-
-#replace math with branch
-0x024AEBEC = bla _scaleAspect
diff --git a/Quality/MK8_2160pUW/rules.txt b/Quality/MK8_2160pUW/rules.txt
deleted file mode 100644
index e959dc5e..00000000
--- a/Quality/MK8_2160pUW/rules.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-[Definition]
-titleIds = 000500001010ec00,000500001010ed00,000500001010eb00,ffffffff85887bc1
-name = "Mario Kart 8 - 5120x2160 (21:9)"
-version = 2
-
-# Main Screen Resolution
-[TextureRedefine]
-width = 1280
-height = 720
-formatsExcluded = 0x41A,0x431 # exclude the intro background texture, race end background
-overwriteWidth = 5120
-overwriteHeight = 2160
-
-# Half Res Alpha (and DOF)
-[TextureRedefine]
-width = 640
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 2560
-overwriteHeight = 1080
-
-# Quarter Res Alpha (motion blur effect around edges of screen)
-[TextureRedefine]
-width = 320
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 540
-
-# Multiplayer-Mode Resolution (2p)
-[TextureRedefine]
-width = 640
-height = 720
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 2560
-overwriteHeight = 2160
-
-# Multiplayer-Mode Half Res Alpha (2p)
-[TextureRedefine]
-width = 320
-height = 360
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 1080
-
-# Multiplayer-Mode Quarter Res Alpha (2p)
-[TextureRedefine]
-width = 160
-height = 180
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 640
-overwriteHeight = 540
-
-# MKTV screen
-[TextureRedefine]
-width = 960
-height = 540
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 3840
-overwriteHeight = 1620
-
-# MKTV internal render targets
-[TextureRedefine]
-width = 960
-height = 536
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 3840
-overwriteHeight = 1608
-
-# MKTV half res alpha
-[TextureRedefine]
-width = 480
-height = 268
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1920
-overwriteHeight = 804
-
-# MKTV quarter res alpha
-[TextureRedefine]
-width = 240
-height = 134
-formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 960
-overwriteHeight = 402
\ No newline at end of file
diff --git a/Quality/MK8_1080pUW/patches.txt b/Source/MarioKart8/patches.txt
similarity index 78%
rename from Quality/MK8_1080pUW/patches.txt
rename to Source/MarioKart8/patches.txt
index 2e5a1d9d..6d55f823 100644
--- a/Quality/MK8_1080pUW/patches.txt
+++ b/Source/MarioKart8/patches.txt
@@ -1,7 +1,18 @@
+<?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, '.', '');
+?>
 [MK8AspectVer1]
 moduleMatches = 0x2A2DC82C
-0x10097D94 = .float 2.370
-0x100F3430 = .float 2.370
+0x10097D94 = .float <?=$aspect?> 
+0x100F3430 = .float <?=$aspect?> 
 
 #aspect scaling
 codeCaveSize = 0x18
@@ -20,8 +31,8 @@ _scaleAddr = 0x00000000
 
 [MK8AspectVer2]
 moduleMatches = 0x62A5F023
-0x1009E9DC = .float 2.370
-0x100FC030 = .float 2.370
+0x1009E9DC = .float <?=$aspect?> 
+0x100FC030 = .float <?=$aspect?> 
 
 #aspect scaling
 codeCaveSize = 0x18
@@ -40,8 +51,8 @@ _scaleAddr = 0x00000000
 
 [MK8AspectVer3]
 moduleMatches = 0xBA6B1E20
-0x100AC25C = .float 2.370
-0x1010A730 = .float 2.370
+0x100AC25C = .float <?=$aspect?> 
+0x1010A730 = .float <?=$aspect?> 
 
 #aspect scaling
 codeCaveSize = 0x18
@@ -60,8 +71,8 @@ _scaleAddr = 0x00000000
 
 [MK8AspectVer4]
 moduleMatches = 0x1D398493
-0x100C359C = .float 2.370
-0x10121D30 = .float 2.370
+0x100C359C = .float <?=$aspect?> 
+0x10121D30 = .float <?=$aspect?> 
 
 #aspect scaling
 codeCaveSize = 0x18
@@ -80,8 +91,8 @@ _scaleAddr = 0x00000000
 
 [MK8AspectVer4_1]
 moduleMatches = 0xD09700CE
-0x100C359C = .float 2.370
-0x10121E30 = .float 2.370
+0x100C359C = .float <?=$aspect?> 
+0x10121E30 = .float <?=$aspect?> 
 
 #aspect scaling
 codeCaveSize = 0x18
diff --git a/Quality/MK8_1080p/rules.txt b/Source/MarioKart8/rules.txt
similarity index 52%
rename from Quality/MK8_1080p/rules.txt
rename to Source/MarioKart8/rules.txt
index 9199898c..b0784622 100644
--- a/Quality/MK8_1080p/rules.txt
+++ b/Source/MarioKart8/rules.txt
@@ -1,6 +1,18 @@
+<?php
+$fullWidth = $argv[1];
+$fullHeight = $argv[2];
+$scaleFactorX = $fullWidth / 1280.0;
+$scaleFactorY = $fullHeight / 720.0;
+
+$title = $fullWidth . "x" . $fullHeight;
+
+$aspect = $fullWidth / (float)$fullHeight;
+if (round($aspect*10) == 23 || round($aspect*10) == 24)
+	$title = $title . " (21:9)";
+?>
 [Definition]
 titleIds = 000500001010ec00,000500001010ed00,000500001010eb00,ffffffff85887bc1
-name = "Mario Kart 8 - 1920x1080"
+name = "Mario Kart 8 - <?=$title?>"
 version = 2
 
 # Main Screen Resolution
@@ -8,84 +20,77 @@ version = 2
 width = 1280
 height = 720
 formatsExcluded = 0x41A,0x431 # exclude the intro background texture, race end background
-overwriteWidth = 1920
-overwriteHeight = 1080
+overwriteWidth = <?=round($scaleFactorX*1280)?> 
+overwriteHeight = <?=round($scaleFactorY*720)?> 
 
 # Half Res Alpha (and DOF)
 [TextureRedefine]
 width = 640
 height = 360
 formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 960
-overwriteHeight = 540
+overwriteWidth = <?=round($scaleFactorX*640)?> 
+overwriteHeight = <?=round($scaleFactorY*360)?> 
 
 # Quarter Res Alpha (motion blur effect around edges of screen)
 [TextureRedefine]
 width = 320
 height = 180
 formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 480
-overwriteHeight = 270
+overwriteWidth = <?=round($scaleFactorX*320)?> 
+overwriteHeight = <?=round($scaleFactorY*180)?> 
 
 # Multiplayer-Mode Resolution (2p)
 [TextureRedefine]
 width = 640
 height = 720
 formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 960
-overwriteHeight = 1080
+overwriteWidth = <?=round($scaleFactorX*640)?> 
+overwriteHeight = <?=round($scaleFactorY*720)?> 
 
 # Multiplayer-Mode Half Res Alpha (2p)
 [TextureRedefine]
 width = 320
 height = 360
 formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 480
-overwriteHeight = 540
+overwriteWidth = <?=round($scaleFactorX*320)?> 
+overwriteHeight = <?=round($scaleFactorY*640)?> 
 
 # Multiplayer-Mode Quarter Res Alpha (2p)
 [TextureRedefine]
 width = 160
 height = 180
 formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 240
-overwriteHeight = 270
+overwriteWidth = <?=round($scaleFactorX*160)?> 
+overwriteHeight = <?=round($scaleFactorY*180)?> 
 
 # MKTV screen
 [TextureRedefine]
 width = 960
 height = 540
 formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1440
-overwriteHeight = 810
+overwriteWidth = <?=round($scaleFactorX*960)?> 
+overwriteHeight = <?=round($scaleFactorY*540)?> 
 
 # MKTV internal render targets
 [TextureRedefine]
 width = 960
 height = 536
 formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 1440
-overwriteHeight = 804
+overwriteWidth = <?=round($scaleFactorX*960)?> 
+overwriteHeight = <?=round($scaleFactorY*536)?> 
 
 # MKTV half res alpha
 [TextureRedefine]
 width = 480
 height = 268
 formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 720
-overwriteHeight = 402
+overwriteWidth = <?=round($scaleFactorX*960)?> 
+overwriteHeight = <?=round($scaleFactorY*268)?> 
 
 # MKTV quarter res alpha
 [TextureRedefine]
 width = 240
 height = 134
 formatsExcluded = 0x41A # exclude obvious textures
-overwriteWidth = 360
-overwriteHeight = 201
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
+overwriteWidth = <?=round($scaleFactorX*240)?> 
+overwriteHeight = <?=round($scaleFactorY*134)?> 
\ No newline at end of file
diff --git a/build.sh b/build.sh
index c2749bfd..715d104b 100644
--- a/build.sh
+++ b/build.sh
@@ -95,6 +95,19 @@ build_dir "Source/HyruleWarriors" "Quality/HyruleWarriors_1800p" 3200 1800
 build_dir "Source/HyruleWarriors" "Quality/HyruleWarriors_2160p" 3840 2160
 build_dir "Source/HyruleWarriors" "Quality/HyruleWarriors_2160pUW" 5120 2160
 build_dir "Source/HyruleWarriors" "Quality/HyruleWarriors_900p" 1600 900
+build_dir "Source/MarioKart8" "Enthusiast/MarioKart8_2880p" 5120 2880
+build_dir "Source/MarioKart8" "Enthusiast/MarioKart8_4320p" 7680 4320
+build_dir "Source/MarioKart8" "Enthusiast/MarioKart8_5760p" 10240 5760
+build_dir "Source/MarioKart8" "Performance/MarioKart8_360p" 640 360
+build_dir "Source/MarioKart8" "Performance/MarioKart8_540p" 960 540
+build_dir "Source/MarioKart8" "Quality/MarioKart8_1080p" 1920 1080
+build_dir "Source/MarioKart8" "Quality/MarioKart8_1080pUW" 2560 1080
+build_dir "Source/MarioKart8" "Quality/MarioKart8_1440p" 2560 1440
+build_dir "Source/MarioKart8" "Quality/MarioKart8_1440pUW" 3440 1440
+build_dir "Source/MarioKart8" "Quality/MarioKart8_1800p" 3200 1800
+build_dir "Source/MarioKart8" "Quality/MarioKart8_2160p" 3840 2160
+build_dir "Source/MarioKart8" "Quality/MarioKart8_2160pUW" 5120 2160
+build_dir "Source/MarioKart8" "Quality/MarioKart8_900p" 1600 900
 build_dir "Source/Splatoon" "Enthusiast/Splatoon_2880p" 5120 2880
 build_dir "Source/Splatoon" "Enthusiast/Splatoon_4320p" 7680 4320
 build_dir "Source/Splatoon" "Enthusiast/Splatoon_5760p" 10240 5760