diff --git a/Modifications/XCX_CollectiblesRange/patches.txt b/Modifications/XenobladeX_CollectiblesRange/patches.txt
similarity index 96%
rename from Modifications/XCX_CollectiblesRange/patches.txt
rename to Modifications/XenobladeX_CollectiblesRange/patches.txt
index ca248538..ae984cbe 100644
--- a/Modifications/XCX_CollectiblesRange/patches.txt
+++ b/Modifications/XenobladeX_CollectiblesRange/patches.txt
@@ -1,59 +1,59 @@
-[XCX_COLLECTIBLESRANGE] 
-moduleMatches = 0xF882D5CF, 0x30B6E091, 0x218F6E07 ; 1.0.1E, 1.0.2U, 1.0.0U
-
-codeCaveSize = 0xC0
-
-_itemRangeInner = 0x00000000
-0x00000000 = lis r5, 0x4250
-0x00000004 = addi r5, r5, 0x0000
-0x00000008 = stw r5, 0x4(r23)
-0x0000000C = lfs f10, 0x4(r23)
-0x00000010 = fadd f10, f9, f10
-0x00000014 = blr
-
-_itemHeightInner = 0x00000020
-0x00000020 = lis r5, 0x4250
-0x00000024 = addi r5, r5, 0x0000
-0x00000028 = stw r5, 0x4(r23)
-0x0000002C = lfs f12, 0x4(r23)
-0x00000030 = fadd f12, f10, f12
-0x00000034 = blr
-
-_itemRangeDoll = 0x00000040
-0x00000040 = lis r5, 0x4250
-0x00000044 = addi r5, r5, 0x0000
-0x00000048 = stw r5, 0x4(r23)
-0x0000004C = lfs f9, 0x4(r23)
-0x00000050 = fadd f9, f6, f9
-0x00000054 = blr
-
-_itemHeightDoll = 0x00000060
-0x00000060 = lis r5, 0x4250
-0x00000064 = addi r5, r5, 0x0000
-0x00000068 = stw r5, 0x4(r23)
-0x0000006C = lfs f10, 0x4(r23)
-0x00000070 = fadd f10, f7, f10
-0x00000074 = blr
-
-_itemRangeFlight = 0x00000080
-0x00000080 = lis r5, 0x4250
-0x00000084 = addi r5, r5, 0x0000
-0x00000088 = stw r5, 0x4(r23)
-0x0000008C = lfs f10, 0x4(r23)
-0x00000090 = fadd f10, f12, f10
-0x00000094 = blr
-
-_itemHeightFlight = 0x000000A0
-0x000000A0 = lis r5, 0x4250
-0x000000A4 = addi r5, r5, 0x0000
-0x000000A8 = stw r5, 0x4(r23)
-0x000000AC = lfs f0, 0x4(r23)
-0x000000B0 = fadd f0, f13, f0
-0x000000B4 = blr
-
-0x02389B80 = bla _itemRangeInner
-0x02389BB8 = bla _itemHeightInner
-0x02389C3C = bla _itemRangeDoll
-0x02389C74 = bla _itemHeightDoll
-0x02389CEC = bla _itemRangeFlight
-0x02389D30 = bla _itemHeightFlight
+[XCX_COLLECTIBLESRANGE] 
+moduleMatches = 0xF882D5CF, 0x30B6E091, 0x218F6E07 ; 1.0.1E, 1.0.2U, 1.0.0U
+
+codeCaveSize = 0xC0
+
+_itemRangeInner = 0x00000000
+0x00000000 = lis r5, 0x4250
+0x00000004 = addi r5, r5, 0x0000
+0x00000008 = stw r5, 0x4(r23)
+0x0000000C = lfs f10, 0x4(r23)
+0x00000010 = fadd f10, f9, f10
+0x00000014 = blr
+
+_itemHeightInner = 0x00000020
+0x00000020 = lis r5, 0x4250
+0x00000024 = addi r5, r5, 0x0000
+0x00000028 = stw r5, 0x4(r23)
+0x0000002C = lfs f12, 0x4(r23)
+0x00000030 = fadd f12, f10, f12
+0x00000034 = blr
+
+_itemRangeDoll = 0x00000040
+0x00000040 = lis r5, 0x4250
+0x00000044 = addi r5, r5, 0x0000
+0x00000048 = stw r5, 0x4(r23)
+0x0000004C = lfs f9, 0x4(r23)
+0x00000050 = fadd f9, f6, f9
+0x00000054 = blr
+
+_itemHeightDoll = 0x00000060
+0x00000060 = lis r5, 0x4250
+0x00000064 = addi r5, r5, 0x0000
+0x00000068 = stw r5, 0x4(r23)
+0x0000006C = lfs f10, 0x4(r23)
+0x00000070 = fadd f10, f7, f10
+0x00000074 = blr
+
+_itemRangeFlight = 0x00000080
+0x00000080 = lis r5, 0x4250
+0x00000084 = addi r5, r5, 0x0000
+0x00000088 = stw r5, 0x4(r23)
+0x0000008C = lfs f10, 0x4(r23)
+0x00000090 = fadd f10, f12, f10
+0x00000094 = blr
+
+_itemHeightFlight = 0x000000A0
+0x000000A0 = lis r5, 0x4250
+0x000000A4 = addi r5, r5, 0x0000
+0x000000A8 = stw r5, 0x4(r23)
+0x000000AC = lfs f0, 0x4(r23)
+0x000000B0 = fadd f0, f13, f0
+0x000000B4 = blr
+
+0x02389B80 = bla _itemRangeInner
+0x02389BB8 = bla _itemHeightInner
+0x02389C3C = bla _itemRangeDoll
+0x02389C74 = bla _itemHeightDoll
+0x02389CEC = bla _itemRangeFlight
+0x02389D30 = bla _itemHeightFlight
diff --git a/Modifications/XCX_CollectiblesRange/rules.txt b/Modifications/XenobladeX_CollectiblesRange/rules.txt
similarity index 91%
rename from Modifications/XCX_CollectiblesRange/rules.txt
rename to Modifications/XenobladeX_CollectiblesRange/rules.txt
index 6df379ac..55501ad2 100644
--- a/Modifications/XCX_CollectiblesRange/rules.txt
+++ b/Modifications/XenobladeX_CollectiblesRange/rules.txt
@@ -1,4 +1,4 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - Collectibles Range"
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Collectibles Range"
 version=2
\ No newline at end of file
diff --git a/Modifications/XCX_CustomDropRatio/patches.txt b/Modifications/XenobladeX_CustomDropRatio/patches.txt
similarity index 97%
rename from Modifications/XCX_CustomDropRatio/patches.txt
rename to Modifications/XenobladeX_CustomDropRatio/patches.txt
index 9ff1dcb1..86d5af9c 100644
--- a/Modifications/XCX_CustomDropRatio/patches.txt
+++ b/Modifications/XenobladeX_CustomDropRatio/patches.txt
@@ -1,21 +1,21 @@
-[XCX_CUSTOMDROPRATIO]
-moduleMatches = 0xF882D5CF, 0x30B6E091, 0x218F6E07 ; 1.0.1E, 1.0.2U, 1.0.0U
-
-codeCaveSize = 0x20
-
-; Uncomment those TWO lines to affect the chest chance to appear
-;0x021AADB8 = li r3, 3 ; 0 = no drop, 1 = always gold, 2 = always silver, 3 = always bronze
-;0x021AADBC = blr
-
-_minDropRate = 0x00000000
-0x00000000 = cmpwi r31, 100 ; all items with drop ratio less than this value will have a new drop ratio set at line 0x00000010
-0x00000008 = blt .+0x8
-0x0000000C = b .+0x8
-0x00000010 = li r31, 100 ; new drop ratio
-0x00000014 = cmpw r3, r31
-0x00000018 = blr
-
-0x021AF5DC = bla _minDropRate ; modify drop ratio for gold chests
-0x021AF5F8 = bla _minDropRate ; modify drop ratio for silver chests
-0x021AF614 = bla _minDropRate ; modify drop ratio for bronze chests
-
+[XCX_CUSTOMDROPRATIO]
+moduleMatches = 0xF882D5CF, 0x30B6E091, 0x218F6E07 ; 1.0.1E, 1.0.2U, 1.0.0U
+
+codeCaveSize = 0x20
+
+; Uncomment those TWO lines to affect the chest chance to appear
+;0x021AADB8 = li r3, 3 ; 0 = no drop, 1 = always gold, 2 = always silver, 3 = always bronze
+;0x021AADBC = blr
+
+_minDropRate = 0x00000000
+0x00000000 = cmpwi r31, 100 ; all items with drop ratio less than this value will have a new drop ratio set at line 0x00000010
+0x00000008 = blt .+0x8
+0x0000000C = b .+0x8
+0x00000010 = li r31, 100 ; new drop ratio
+0x00000014 = cmpw r3, r31
+0x00000018 = blr
+
+0x021AF5DC = bla _minDropRate ; modify drop ratio for gold chests
+0x021AF5F8 = bla _minDropRate ; modify drop ratio for silver chests
+0x021AF614 = bla _minDropRate ; modify drop ratio for bronze chests
+
diff --git a/Modifications/XCX_CustomDropRatio/rules.txt b/Modifications/XenobladeX_CustomDropRatio/rules.txt
similarity index 91%
rename from Modifications/XCX_CustomDropRatio/rules.txt
rename to Modifications/XenobladeX_CustomDropRatio/rules.txt
index 6c747277..8da7f83e 100644
--- a/Modifications/XCX_CustomDropRatio/rules.txt
+++ b/Modifications/XenobladeX_CustomDropRatio/rules.txt
@@ -1,4 +1,4 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - Custom Drop Ratio"
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Custom Drop Ratio"
 version=2
\ No newline at end of file
diff --git a/Performance/TropicalFreeze_360p/rules.txt b/Performance/TropicalFreeze_360p/rules.txt
deleted file mode 100644
index 8a0235c0..00000000
--- a/Performance/TropicalFreeze_360p/rules.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-[Definition]
-titleIds = 0005000010137F00,0005000010138300,0005000010144800
-name = "Donkey Kong Country: Tropical Freeze - 640x360"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-tileModesExcluded = 0x001
-formatsExcluded = 0x031 # exclude the intro background texture
-overwriteWidth = 640
-overwriteHeight = 360
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 427
-overwriteHeight = 240
\ No newline at end of file
diff --git a/Performance/TropicalFreeze_540p/rules.txt b/Performance/TropicalFreeze_540p/rules.txt
deleted file mode 100644
index f97ab4bb..00000000
--- a/Performance/TropicalFreeze_540p/rules.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-[Definition]
-titleIds = 0005000010137F00,0005000010138300,0005000010144800
-name = "Donkey Kong Country: Tropical Freeze - 960x540"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-tileModesExcluded = 0x001
-formatsExcluded = 0x031 # exclude the intro background texture
-overwriteWidth = 960
-overwriteHeight = 540
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 427
-overwriteHeight = 240
\ No newline at end of file
diff --git a/Quality/TropicalFreeze_1080p/rules.txt b/Quality/TropicalFreeze_1080p/rules.txt
deleted file mode 100644
index 2d4e4973..00000000
--- a/Quality/TropicalFreeze_1080p/rules.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-[Definition]
-titleIds = 0005000010137F00,0005000010138300,0005000010144800
-name = "Donkey Kong Country: Tropical Freeze - 1920x1080"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-tileModesExcluded = 0x001
-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/Quality/TropicalFreeze_1080pUW/patches.txt b/Quality/TropicalFreeze_1080pUW/patches.txt
deleted file mode 100644
index 0b004552..00000000
--- a/Quality/TropicalFreeze_1080pUW/patches.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-[TropicalFreeze2]
-moduleMatches = 0x4FF15DD2
-0x10018498 = .float 2.370
-0x10094758 = .float 2.370
-
-[TropicalFreeze16]
-moduleMatches = 0xA37C99E1
-0x100184A8 = .float 2.370
-0x100946F8 = .float 2.370
\ No newline at end of file
diff --git a/Quality/TropicalFreeze_1080pUW/rules.txt b/Quality/TropicalFreeze_1080pUW/rules.txt
deleted file mode 100644
index 66b63789..00000000
--- a/Quality/TropicalFreeze_1080pUW/rules.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-[Definition]
-titleIds = 0005000010137F00,0005000010138300,0005000010144800
-name = "Donkey Kong Country: Tropical Freeze - 2560x1080 (21:9)" # 
-version = 2
-		
-[TextureRedefine] # game rendering resolution
-width = 1280
-height = 720	
-tileModesExcluded = 0x001
-formatsExcluded = 0x41A # exclude the intro background texture 		
-overwriteWidth = 2560
-overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/TropicalFreeze_1440p/rules.txt b/Quality/TropicalFreeze_1440p/rules.txt
deleted file mode 100644
index 796dc2e9..00000000
--- a/Quality/TropicalFreeze_1440p/rules.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-[Definition]
-titleIds = 0005000010137F00,0005000010138300,0005000010144800
-name = "Donkey Kong Country: Tropical Freeze - 2560x1440"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-tileModesExcluded = 0x001
-formatsExcluded = 0x031 # exclude the intro background texture
-overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-
-width = 854
-height = 480
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/TropicalFreeze_1800p/rules.txt b/Quality/TropicalFreeze_1800p/rules.txt
deleted file mode 100644
index 04d5a0ae..00000000
--- a/Quality/TropicalFreeze_1800p/rules.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-[Definition]
-titleIds = 0005000010137F00,0005000010138300,0005000010144800
-name = "Donkey Kong Country: Tropical Freeze - 3200x1800"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-tileModesExcluded = 0x001
-formatsExcluded = 0x031 # exclude the intro background texture
-overwriteWidth = 3200
-overwriteHeight = 1800
-
-[TextureRedefine] # gamepad
-
-width = 854
-height = 480
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/TropicalFreeze_2160p/rules.txt b/Quality/TropicalFreeze_2160p/rules.txt
deleted file mode 100644
index 19474c0b..00000000
--- a/Quality/TropicalFreeze_2160p/rules.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-[Definition]
-titleIds = 0005000010137F00,0005000010138300,0005000010144800
-name = "Donkey Kong Country: Tropical Freeze - 3840x2160"
-version = 2
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-tileModesExcluded = 0x001
-formatsExcluded = 0x031 # exclude the intro background texture
-overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-
-width = 854
-height = 480
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/TropicalFreeze_2160pUW/patches.txt b/Quality/TropicalFreeze_2160pUW/patches.txt
deleted file mode 100644
index 0b004552..00000000
--- a/Quality/TropicalFreeze_2160pUW/patches.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-[TropicalFreeze2]
-moduleMatches = 0x4FF15DD2
-0x10018498 = .float 2.370
-0x10094758 = .float 2.370
-
-[TropicalFreeze16]
-moduleMatches = 0xA37C99E1
-0x100184A8 = .float 2.370
-0x100946F8 = .float 2.370
\ No newline at end of file
diff --git a/Quality/TropicalFreeze_2160pUW/rules.txt b/Quality/TropicalFreeze_2160pUW/rules.txt
deleted file mode 100644
index 1253dc3c..00000000
--- a/Quality/TropicalFreeze_2160pUW/rules.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-[Definition]
-titleIds = 0005000010137F00,0005000010138300,0005000010144800
-name = "Donkey Kong Country: Tropical Freeze - 5120x2160 (21:9)" # 
-version = 2
-		
-[TextureRedefine] # game rendering resolution
-width = 1280
-height = 720	
-tileModesExcluded = 0x001
-formatsExcluded = 0x41A # exclude the intro background texture 		
-overwriteWidth = 5120
-overwriteHeight = 2160
\ No newline at end of file
diff --git a/Source/TropicalFreeze/patches.txt b/Source/TropicalFreeze/patches.txt
new file mode 100644
index 00000000..e3f9731c
--- /dev/null
+++ b/Source/TropicalFreeze/patches.txt
@@ -0,0 +1,20 @@
+<?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, '.', '');
+?>
+[TropicalFreeze2]
+moduleMatches = 0x4FF15DD2
+0x10018498 = .float <?=$aspect?> 
+0x10094758 = .float <?=$aspect?> 
+
+[TropicalFreeze16]
+moduleMatches = 0xA37C99E1
+0x100184A8 = .float <?=$aspect?> 
+0x100946F8 = .float <?=$aspect?> 
\ No newline at end of file
diff --git a/Source/TropicalFreeze/rules.txt b/Source/TropicalFreeze/rules.txt
new file mode 100644
index 00000000..a39eb7e3
--- /dev/null
+++ b/Source/TropicalFreeze/rules.txt
@@ -0,0 +1,21 @@
+<?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 = 0005000010137F00,0005000010138300,0005000010144800
+name = "Donkey Kong Country: Tropical Freeze - <?=$title?>"
+version = 2
+
+[TextureRedefine] # game rendering resolution
+width = 1280
+height = 720
+tileModesExcluded = 0x001
+formatsExcluded = 0x41A # exclude the intro background texture	
+overwriteWidth = <?=round($scaleFactorX*1280)?> 
+overwriteHeight = <?=round($scaleFactorY*720)?> 
diff --git a/build.sh b/build.sh
index 4d017d48..66b7e3b6 100644
--- a/build.sh
+++ b/build.sh
@@ -99,6 +99,7 @@ std_respack "SonicLostWorld" "${res16by9[@]}" "${res21by9[@]}"
 std_respack "Splatoon" "${res16by9[@]}" "${res21by9[@]}"
 std_respack "SuperMario3DWorld" "${res16by9[@]}" "${res21by9[@]}"
 std_respack "SuperSmashBros" "${res16by9[@]}"
+std_respack "TropicalFreeze" "${res16by9[@]}" "${res21by9[@]}"
 std_respack "TwilightPrincessHD" "${res16by9[@]}"
 std_respack "WindWakerHD" "${res16by9[@]}" "${res21by9[@]}"
 std_respack "WoollyWorld" "${res16by9[@]}" "${res21by9[@]}"