diff --git a/Enhancements/DonkeyKongTropicalFreeze_!AARemoval/rules.txt b/Enhancements/DonkeyKongTropicalFreeze_!AARemoval/rules.txt
deleted file mode 100644
index 9ff815f2c..000000000
--- a/Enhancements/DonkeyKongTropicalFreeze_!AARemoval/rules.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[Definition]
-titleIds = 0005000010137F00,0005000010138300,0005000010144800
-name = AA Removal
-path = "Donkey Kong Country: Tropical Freeze/Enhancements/AA Removal" 
-description = Removes AA, no performance gain. Used for clean look or injecting external AA.
-version = 4
diff --git a/Resolutions/DonkeyKongTropicalFreeze_Resolution/rules.txt b/Resolutions/DonkeyKongTropicalFreeze_Resolution/rules.txt
deleted file mode 100644
index 4f63d1ee2..000000000
--- a/Resolutions/DonkeyKongTropicalFreeze_Resolution/rules.txt
+++ /dev/null
@@ -1,220 +0,0 @@
-[Definition]
-titleIds = 0005000010137F00,0005000010138300,0005000010144800
-name = Resolution
-path = "Donkey Kong Country: Tropical Freeze/Graphics/Resolution"
-description = Changes the resolution of the game. Made by getdls and Skalfate.
-version = 4
-
-[Preset]
-name = 1280x720 (Default)
-$width = 1280
-$height = 720
-$gameWidth = 1280
-$gameHeight = 720
-
-# Performance
-
-[Preset]
-name = 640x360
-$width = 640
-$height = 360
-$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
-
-# Common Ultrawide Resolutions
-
-[Preset]
-name = 2560x1080 (Ultrawide)
-$width = 2560
-$height = 1080
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 3440x1440 (Ultrawide)
-$width = 3440
-$height = 1440
-$gameWidth = 1280
-$gameHeight = 720
-
-# Common Super Ultrawide Resolutions
-
-[Preset]
-name = 3840x1080 (Super Ultrawide)
-$width = 3440
-$height = 1080
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 5120x1440 (Super Ultrawide)
-$width = 5120
-$height = 1440
-$gameWidth = 1280
-$gameHeight = 720
-
-# Format Textures:
-# - 0x001=Color-Red8
-# - 0x011=Depth24_Stencil8
-# - 0x01a=Color-RGBA8
-# - 0x80e=Depth32
-
-# Main Game Renderer
-[TextureRedefine]
-width = 1280
-height = 720
-formats = 0x001,0x011,0x01a,0x80e
-tileModesExcluded = 0x001 # For Video Playback
-overwriteWidth = ($width/$gameWidth) * 1280
-overwriteHeight = ($height/$gameHeight) * 720
-
-# Loading Screen Dk Running
-[TextureRedefine]
-width = 1280
-height = 256
-formats = 0x01a,0x80e
-overwriteWidth = ($width/$gameWidth) * 1280
-overwriteHeight = ($height/$gameHeight) * 256
-
-# GamePad
-[TextureRedefine]
-width = 864
-height = 480
-formats = 0x01a
-overwriteWidth = ($width/$gameWidth) * 864
-overwriteHeight = ($height/$gameHeight) * 480
-
-# GamePad
-[TextureRedefine]
-width = 854
-height = 480
-formats = 0x01a
-overwriteWidth = ($width/$gameWidth) * 854
-overwriteHeight = ($height/$gameHeight) * 480
-
-# Half-Res
-[TextureRedefine]
-width = 640
-height = 368
-formats = 0x01a,0x80e
-formatsExcluded = 0x007
-overwriteWidth = ($width/$gameWidth) * 640
-overwriteHeight = ($height/$gameHeight) * 368
-
-# Half-Res
-[TextureRedefine]
-width = 640
-height = 360
-formats = 0x01a,0x80e
-tileModesExcluded = 0x001 # 0x007 half res hold color data and is used for video playback
-overwriteWidth = ($width/$gameWidth) * 640
-overwriteHeight = ($height/$gameHeight) * 360
-
-# 1/4 Res
-[TextureRedefine]
-width = 320
-height = 192
-formats = 0x01a
-overwriteWidth = ($width/$gameWidth) * 320
-overwriteHeight = ($height/$gameHeight) * 192
-
-# 1/4 Res
-[TextureRedefine]
-width = 320
-height = 180
-formats = 0x01a
-overwriteWidth = ($width/$gameWidth) * 320
-overwriteHeight = ($height/$gameHeight) * 180
-
-# In-game UI Top left screen
-[TextureRedefine]
-width = 320
-height = 128
-formats = 0x01a,0x011
-overwriteWidth = ($width/$gameWidth) * 320
-overwriteHeight = ($height/$gameHeight) * 128
-
-# 1/4 Res
-[TextureRedefine]
-width = 160
-height = 96
-formats = 0x01a
-overwriteWidth = ($width/$gameWidth) * 160
-overwriteHeight = ($height/$gameHeight) * 96
-
-# 1/4 Res
-[TextureRedefine]
-width = 160
-height = 90
-formats = 0x01a
-overwriteWidth = ($width/$gameWidth) * 160
-overwriteHeight = ($height/$gameHeight) * 90
-
-
-# Additonal GUI Textures
-
-# Donkey Kong's Face
-[TextureRedefine]
-width = 96
-height = 108
-formats = 0x01a
-overwriteWidth = ($width/$gameWidth) * 96
-overwriteHeight = ($height/$gameHeight) * 108
diff --git a/src/DKCTropicalFreeze/Cheats/DKC_BananaMult/patch_infbanana.asm b/src/DKCTropicalFreeze/Cheats/DKC_BananaMult/patch_infbanana.asm
index 45cc75bc1..604ebd2f1 100644
--- a/src/DKCTropicalFreeze/Cheats/DKC_BananaMult/patch_infbanana.asm
+++ b/src/DKCTropicalFreeze/Cheats/DKC_BananaMult/patch_infbanana.asm
@@ -1,5 +1,5 @@
 [DKCTF_MultBanana]
-moduleMatches = 0xA37C99E1, 0x4FF15DD2 ; (EU/NA/JP)v16, (EU/NA/JP)v2
+moduleMatches = 0xA37C99E1, 0x4FF15DD2 ; v16(EU/NA/JP), v2(EU/NA/JP)
 .origin = codecave
 
 _addBananaMultCheat:
@@ -17,9 +17,9 @@ or r4, r29, r29
 blr
 
 [DKCTF_MultBanana_v16]
-moduleMatches = 0xA37C99E1 ; (EU/NA/JP)v16
+moduleMatches = 0xA37C99E1 ; v16(EU/NA/JP)
 0x020A5974 = bla _addBananaMultCheat
 
 [DKCTF_MultBanana_v2]
-moduleMatches = 0x4FF15DD2 ; (EU/NA/JP)v2
+moduleMatches = 0x4FF15DD2 ; v2(EU/NA/JP)
 0x020A5908 = bla _addBananaMultCheat
diff --git a/src/DKCTropicalFreeze/Cheats/DKC_CoinMult/patch_infcoins.asm b/src/DKCTropicalFreeze/Cheats/DKC_CoinMult/patch_infcoins.asm
index e3ea45e7b..bd923f651 100644
--- a/src/DKCTropicalFreeze/Cheats/DKC_CoinMult/patch_infcoins.asm
+++ b/src/DKCTropicalFreeze/Cheats/DKC_CoinMult/patch_infcoins.asm
@@ -1,5 +1,5 @@
 [DKCTF_MultCoins]
-moduleMatches = 0xA37C99E1, 0x4FF15DD2 ; (EU/NA/JP)v16, (EU/NA/JP)v2
+moduleMatches = 0xA37C99E1, 0x4FF15DD2 ; v16(EU/NA/JP), v2(EU/NA/JP)
 .origin = codecave
 
 _addCoinsMultCheat:
@@ -14,9 +14,9 @@ _addCoinsMultCheatExit:
 blr
 
 [DKCTF_MultCoins_v16]
-moduleMatches = 0xA37C99E1 ; (EU/NA/JP)v16
+moduleMatches = 0xA37C99E1 ; v16(EU/NA/JP)
 0x020A5970 = bla _addCoinsMultCheat
 
 [DKCTF_MultCoins_v2]
-moduleMatches = 0x4FF15DD2 ; (EU/NA/JP)v2
+moduleMatches = 0x4FF15DD2 ; v2(EU/NA/JP)
 0x020A5904 = bla _addCoinsMultCheat
diff --git a/src/DKCTropicalFreeze/Cheats/DKC_LivesMult/patch_inflives.asm b/src/DKCTropicalFreeze/Cheats/DKC_LivesMult/patch_inflives.asm
index 4ef618b95..c66e4cddc 100644
--- a/src/DKCTropicalFreeze/Cheats/DKC_LivesMult/patch_inflives.asm
+++ b/src/DKCTropicalFreeze/Cheats/DKC_LivesMult/patch_inflives.asm
@@ -1,5 +1,5 @@
 [DKCTF_MultLives]
-moduleMatches = 0xA37C99E1, 0x4FF15DD2 ; (EU/NA/JP)v16, (EU/NA/JP)v2
+moduleMatches = 0xA37C99E1, 0x4FF15DD2 ; v16(EU/NA/JP), v2(EU/NA/JP)
 .origin = codecave
 
 _addLivesMultCheat:
@@ -15,9 +15,9 @@ or r3, r27, r27
 blr
 
 [DKCTF_MultLives_NAv16]
-moduleMatches = 0xA37C99E1 ; (EU/NA/JP)v16
+moduleMatches = 0xA37C99E1 ; v16(EU/NA/JP)
 0x020A5978 = bla _addLivesMultCheat
 
 [DKCTF_MultLives_NAv2]
-moduleMatches = 0x4FF15DD2 ; (EU/NA/JP)v2
+moduleMatches = 0x4FF15DD2 ; v2(EU/NA/JP)
 0x020A590C = bla _addLivesMultCheat
diff --git a/Enhancements/DonkeyKongTropicalFreeze_!AARemoval/10ccf0cc1234d069_00000000000003c9_ps.txt b/src/DKCTropicalFreeze/Enhancements/AARemoval/10ccf0cc1234d069_00000000000003c9_ps.txt
similarity index 99%
rename from Enhancements/DonkeyKongTropicalFreeze_!AARemoval/10ccf0cc1234d069_00000000000003c9_ps.txt
rename to src/DKCTropicalFreeze/Enhancements/AARemoval/10ccf0cc1234d069_00000000000003c9_ps.txt
index 9fa2b34b2..9e51cb08d 100644
--- a/Enhancements/DonkeyKongTropicalFreeze_!AARemoval/10ccf0cc1234d069_00000000000003c9_ps.txt
+++ b/src/DKCTropicalFreeze/Enhancements/AARemoval/10ccf0cc1234d069_00000000000003c9_ps.txt
@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #ifdef VULKAN
 #define ATTR_LAYOUT(__vkSet, __location) layout(set = __vkSet, location = __location)
diff --git a/Enhancements/DonkeyKongTropicalFreeze_!AARemoval/bafe6c9c37bfca4d_00000000000003c9_ps.txt b/src/DKCTropicalFreeze/Enhancements/AARemoval/bafe6c9c37bfca4d_00000000000003c9_ps.txt
similarity index 99%
rename from Enhancements/DonkeyKongTropicalFreeze_!AARemoval/bafe6c9c37bfca4d_00000000000003c9_ps.txt
rename to src/DKCTropicalFreeze/Enhancements/AARemoval/bafe6c9c37bfca4d_00000000000003c9_ps.txt
index 81126872d..ee6ca40c7 100644
--- a/Enhancements/DonkeyKongTropicalFreeze_!AARemoval/bafe6c9c37bfca4d_00000000000003c9_ps.txt
+++ b/src/DKCTropicalFreeze/Enhancements/AARemoval/bafe6c9c37bfca4d_00000000000003c9_ps.txt
@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #ifdef VULKAN
 #define ATTR_LAYOUT(__vkSet, __location) layout(set = __vkSet, location = __location)
@@ -75,5 +75,4 @@ activeMaskStackC[0] = true;
 activeMaskStackC[1] = true;
 vec3 cubeMapSTM;
 int cubeMapFaceId;
-
 }
diff --git a/src/DKCTropicalFreeze/Enhancements/AARemoval/rules.txt b/src/DKCTropicalFreeze/Enhancements/AARemoval/rules.txt
new file mode 100644
index 000000000..40bd6cb02
--- /dev/null
+++ b/src/DKCTropicalFreeze/Enhancements/AARemoval/rules.txt
@@ -0,0 +1,7 @@
+[Definition]
+titleIds = 0005000010137F00,0005000010138300,0005000010144800
+name = Remove Anti-Aliasing
+path = "Donkey Kong Country: Tropical Freeze/Enhancements/Remove AA"
+description = Dissable the game's Anti-aliasing. No performance gain.
+#Credits: Skalfate
+version = 6
diff --git a/Resolutions/DonkeyKongTropicalFreeze_Resolution/patches.txt b/src/DKCTropicalFreeze/Graphics/patch_resolution.asm
similarity index 52%
rename from Resolutions/DonkeyKongTropicalFreeze_Resolution/patches.txt
rename to src/DKCTropicalFreeze/Graphics/patch_resolution.asm
index 392ea0ccf..3218cef8e 100644
--- a/Resolutions/DonkeyKongTropicalFreeze_Resolution/patches.txt
+++ b/src/DKCTropicalFreeze/Graphics/patch_resolution.asm
@@ -1,9 +1,9 @@
-[DKTropicalFreeze2]
-moduleMatches = 0x4FF15DD2
-0x10018498 = .float $width/$height
-0x10094758 = .float $width/$height
-
-[DKTropicalFreeze16]
-moduleMatches = 0xA37C99E1
+[DKCTF_Resolution_v16]
+moduleMatches = 0xA37C99E1 ; v16(EU/NA/JP)
 0x100184A8 = .float $width/$height
 0x100946F8 = .float $width/$height
+
+[DKCTF_Resolution_v2]
+moduleMatches = 0x4FF15DD2 ; v2(EU/NA/JP)
+0x10018498 = .float $width/$height
+0x10094758 = .float $width/$height
diff --git a/src/DKCTropicalFreeze/Graphics/rules.txt b/src/DKCTropicalFreeze/Graphics/rules.txt
new file mode 100644
index 000000000..cc4d3ce9f
--- /dev/null
+++ b/src/DKCTropicalFreeze/Graphics/rules.txt
@@ -0,0 +1,341 @@
+[Definition]
+titleIds = 0005000010137F00,0005000010138300,0005000010144800
+name = Graphics Settings
+path = "Donkey Kong Country: Tropical Freeze/Graphics"
+description = Changes the resolution of the game.|Made by getdls and Skalfate.
+#Credits: getdls, Skalfate
+version = 6
+
+[Default]
+$width = 1280
+$height = 720
+$padWidth = 854
+$padHeight = 480
+$gameWidth = 1280
+$gameHeight = 720
+$gamePadWidth = 854
+$gamePadHeight = 480
+
+# TV Resolution
+
+[Preset]
+category = TV Resolution
+name = 320x180
+$width = 320
+$height = 180
+
+[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
+
+[Preset]
+category = TV Resolution
+name = 1680x1050 (16:10)
+$width = 1680
+$height = 1050
+
+[Preset]
+category = TV Resolution
+name = 1920x1200 (16:10)
+$width = 1920
+$height = 1200
+
+[Preset]
+category = TV Resolution
+name = 2560x1080 (21:9)
+$width = 2560
+$height = 1080
+
+[Preset]
+category = TV Resolution
+name = 3440x1440 (21:9)
+$width = 3440
+$height = 1440
+
+[Preset]
+category = TV Resolution
+name = 5120x2160 (21:9)
+$width = 5120
+$height = 2160
+
+[Preset]
+category = TV Resolution
+name = 3840x1080 (32:9)
+$width = 3840
+$height = 1080
+
+[Preset]
+category = TV Resolution
+name = 5120×1440 (32:9)
+$width = 5120
+$height = 1440
+
+
+# Gamepad Resolution
+
+[Preset]
+category = Gamepad Resolution
+name = 640x360
+$padWidth = 640
+$padHeight = 360
+
+[Preset]
+category = Gamepad Resolution
+name = 854x480 (Default)
+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
+
+[Preset]
+category = Gamepad Resolution
+name = 1680x1050 (16:10)
+$padWidth = 1680
+$padHeight = 1050
+
+[Preset]
+category = Gamepad Resolution
+name = 1920x1200 (16:10)
+$padWidth = 1920
+$padHeight = 1200
+
+[Preset]
+category = Gamepad Resolution
+name = 2560x1080 (21:9)
+$padWidth = 2560
+$padHeight = 1080
+
+[Preset]
+category = Gamepad Resolution
+name = 3440x1440 (21:9)
+$padWidth = 3440
+$padHeight = 1440
+
+[Preset]
+category = Gamepad Resolution
+name = 5120x2160 (21:9)
+$padWidth = 5120
+$padHeight = 2160
+
+[Preset]
+category = Gamepad Resolution
+name = 3840x1080 (32:9)
+$padWidth = 3840
+$padHeight = 1080
+
+[Preset]
+category = Gamepad Resolution
+name = 5120×1440 (32:9)
+$padWidth = 5120
+$padHeight = 1440
+
+
+# Texture Redefines
+
+# Texture Formats Legend:
+# - 0x001=Color-Red8
+# - 0x011=Depth24_Stencil8
+# - 0x01a=Color-RGBA8
+# - 0x80e=Depth32
+
+# Main Game Renderer
+[TextureRedefine]
+width = 1280
+height = 720
+formats = 0x001,0x011,0x01a,0x80e
+tileModesExcluded = 0x001 # For Video Playback
+overwriteWidth = ($width/$gameWidth) * 1280
+overwriteHeight = ($height/$gameHeight) * 720
+
+# Loading Screen DK Running
+[TextureRedefine]
+width = 1280
+height = 256
+formats = 0x01a,0x80e
+overwriteWidth = ($width/$gameWidth) * 1280
+overwriteHeight = ($height/$gameHeight) * 256
+
+# GamePad
+[TextureRedefine]
+width = 864
+height = 480
+formats = 0x01a
+overwriteWidth = ($padWidth/$gamePadWidth) * 864
+overwriteHeight = ($padHeight/$gamePadHeight) * 480
+
+# GamePad
+[TextureRedefine]
+width = 854
+height = 480
+formats = 0x01a
+overwriteWidth = ($padWidth/$gamePadWidth) * 854
+overwriteHeight = ($padHeight/$gamePadHeight) * 480
+
+# Half-Res
+[TextureRedefine]
+width = 640
+height = 368
+formats = 0x01a,0x80e
+formatsExcluded = 0x007
+overwriteWidth = ($width/$gameWidth) * 640
+overwriteHeight = ($height/$gameHeight) * 368
+
+# Half-Res
+[TextureRedefine]
+width = 640
+height = 360
+formats = 0x01a,0x80e
+tileModesExcluded = 0x001 # 0x007 half res hold color data and is used for video playback
+overwriteWidth = ($width/$gameWidth) * 640
+overwriteHeight = ($height/$gameHeight) * 360
+
+# 1/4 Res
+[TextureRedefine]
+width = 320
+height = 192
+formats = 0x01a
+overwriteWidth = ($width/$gameWidth) * 320
+overwriteHeight = ($height/$gameHeight) * 192
+
+# 1/4 Res
+[TextureRedefine]
+width = 320
+height = 180
+formats = 0x01a
+overwriteWidth = ($width/$gameWidth) * 320
+overwriteHeight = ($height/$gameHeight) * 180
+
+# In-game UI Top-left screen
+[TextureRedefine]
+width = 320
+height = 128
+formats = 0x01a,0x011
+overwriteWidth = ($width/$gameWidth) * 320
+overwriteHeight = ($height/$gameHeight) * 128
+
+# 1/4 Res
+[TextureRedefine]
+width = 160
+height = 96
+formats = 0x01a
+overwriteWidth = ($width/$gameWidth) * 160
+overwriteHeight = ($height/$gameHeight) * 96
+
+# 1/4 Res
+[TextureRedefine]
+width = 160
+height = 90
+formats = 0x01a
+overwriteWidth = ($width/$gameWidth) * 160
+overwriteHeight = ($height/$gameHeight) * 90
+
+
+# Additonal GUI Textures
+
+# Donkey Kong's Face
+[TextureRedefine]
+width = 96
+height = 108
+formats = 0x01a
+overwriteWidth = ($width/$gameWidth) * 96
+overwriteHeight = ($height/$gameHeight) * 108