diff --git a/Enthusiast/TheWindWaker_2880p/rules.txt b/Enthusiast/TheWindWaker_2880p/rules.txt
deleted file mode 100644
index 6031f4ac..00000000
--- a/Enthusiast/TheWindWaker_2880p/rules.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-[Definition]
-titleIds = 0005000010143400,0005000010143600,0005000010143500
-name = "The Wind Waker HD - 5120x2880"
-version = 2
-
-[TextureRedefine] # tv
-width = 1920
-height = 1080
-formatsExcluded = 0x41A # exclude the intro background texture 
-overwriteWidth = 5120
-overwriteHeight = 2880
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 2562
-overwriteHeight = 1440
\ No newline at end of file
diff --git a/Enthusiast/TheWindWaker_4320p/rules.txt b/Enthusiast/TheWindWaker_4320p/rules.txt
deleted file mode 100644
index 77c6964f..00000000
--- a/Enthusiast/TheWindWaker_4320p/rules.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-[Definition]# EUR, USA, JPN titles	
-titleIds =  0005000010143400,0005000010143600,0005000010143500 #	
-name = "The Wind Waker HD - 7680x4320"
-version = 2
-	
-[TextureRedefine] # game rendering resolution. 	#Change this value
-width =	1920
-height = 1080
-formatsExcluded = 0x41A # exclude the intro background texture 	
-overwriteWidth = 7680
-overwriteHeight = 4320
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-
-overwriteWidth = 2560
-
-overwriteHeight = 1440
diff --git a/Enthusiast/TheWindWaker_5760p/rules.txt b/Enthusiast/TheWindWaker_5760p/rules.txt
deleted file mode 100644
index cb4d5b67..00000000
--- a/Enthusiast/TheWindWaker_5760p/rules.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-[Definition]
-titleIds = 0005000010143400,0005000010143600,0005000010143500
-name = "The Wind Waker HD - 10240x5760"
-version = 2
-
-[TextureRedefine] # tv
-width = 1920
-height = 1080
-formatsExcluded = 0x41A # exclude the intro background texture 
-overwriteWidth = 10240
-overwriteHeight = 5760
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 2562
-overwriteHeight = 1440
\ No newline at end of file
diff --git a/Performance/TheWindWaker_360p/rules.txt b/Performance/TheWindWaker_360p/rules.txt
deleted file mode 100644
index d6c05a47..00000000
--- a/Performance/TheWindWaker_360p/rules.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-[Definition]
-titleIds = 0005000010143400,0005000010143600,0005000010143500
-name = "The Wind Waker HD - 640x360"
-version = 2
-
-[TextureRedefine] # tv
-width = 1920
-height = 1080
-formatsExcluded = 0x41A # 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/TheWindWaker_540p/rules.txt b/Performance/TheWindWaker_540p/rules.txt
deleted file mode 100644
index 7437fd50..00000000
--- a/Performance/TheWindWaker_540p/rules.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-[Definition]
-titleIds = 0005000010143400,0005000010143600,0005000010143500
-name = "The Wind Waker HD - 960x540"
-version = 2
-
-[TextureRedefine] # tv
-width = 1920
-height = 1080
-formatsExcluded = 0x41A # 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/Performance/TheWindWaker_720p/rules.txt b/Performance/TheWindWaker_720p/rules.txt
deleted file mode 100644
index 4538daaf..00000000
--- a/Performance/TheWindWaker_720p/rules.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-[Definition]
-titleIds = 0005000010143400,0005000010143600,0005000010143500
-name = "The Wind Waker HD - 1280x720"
-version = 2
-
-[TextureRedefine] # tv
-width = 1920
-height = 1080
-formatsExcluded = 0x41A # exclude the intro background texture 
-overwriteWidth = 1280
-overwriteHeight = 720
diff --git a/Quality/TheWindWaker_1080pUW/patches.txt b/Quality/TheWindWaker_1080pUW/patches.txt
deleted file mode 100644
index 05c4a1b3..00000000
--- a/Quality/TheWindWaker_1080pUW/patches.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-[WWHDAspectEUR]
-moduleMatches = 0xB7E748DE
-0x1004AAF0 = .float 2.370
-0x101417E0 = .float 2.370
-0x101658A8 = .float 2.370
-
-[WWHDAspectJAP]
-moduleMatches = 0x74BD3F6A
-0x1004AAF0 = .float 2.370
-0x101417F8 = .float 2.370
-0x101658C0 = .float 2.370
-
-[WWHDAspectUSA]
-moduleMatches = 0x475BD29F
-0x1004AAF0 = .float 2.370
-0x101417D0 = .float 2.370
-0x10165898 = .float 2.370
\ No newline at end of file
diff --git a/Quality/TheWindWaker_1080pUW/rules.txt b/Quality/TheWindWaker_1080pUW/rules.txt
deleted file mode 100644
index 361a5637..00000000
--- a/Quality/TheWindWaker_1080pUW/rules.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-[Definition]# EUR, USA, JPN titles		
-titleIds =  0005000010143400,0005000010143600,0005000010143500 #		
-name = "The Wind Waker HD - 2560x1080 (21:9)"
-version = 2	
-		
-[TextureRedefine] # game rendering resolution
-width = 1920	
-height = 1080	
-formatsExcluded = 0x41A # exclude the intro background texture 		
-overwriteWidth = 2560 
-overwriteHeight = 1080 
-
-[TextureRedefine] # gamepad rendering resolution
-width = 854
-height = 480	
-overwriteWidth = 2560 
-overwriteHeight = 1080 
\ No newline at end of file
diff --git a/Quality/TheWindWaker_1440p/rules.txt b/Quality/TheWindWaker_1440p/rules.txt
deleted file mode 100644
index 0340aa24..00000000
--- a/Quality/TheWindWaker_1440p/rules.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-[Definition]# EUR, USA, JPN titles	
-titleIds =  0005000010143400,0005000010143600,0005000010143500 #	
-name = "The Wind Waker HD - 2560x1440"
-version = 2
-	
-[TextureRedefine] # TV
-width =	1920
-height = 1080
-formatsExcluded = 0x41A # exclude the intro background texture 	
-overwriteWidth = 2560
-overwriteHeight = 1440
-	
-#[TextureRedefine] # Blur, bloom	
-#width = 960
-#height = 540
-#formatsExcluded = 	
-#overwriteWidth = 1280
-#overwriteHeight = 720
-	
-#[TextureRedefine] # AO	
-#width = 240
-#height = 135
-#formatsExcluded =	
-#overwriteWidth = 320
-#overwriteHeight = 180
-	
-#[TextureRedefine] # AO	
-#width = 480
-#height = 240
-#formatsExcluded =	
-#overwriteWidth = 640
-#overwriteHeight = 320
-
-[TextureRedefine] # gamepad
-
-width = 854
-height = 480
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/TheWindWaker_1800p/rules.txt b/Quality/TheWindWaker_1800p/rules.txt
deleted file mode 100644
index a60b4777..00000000
--- a/Quality/TheWindWaker_1800p/rules.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-[Definition]
-titleIds =  0005000010143400,0005000010143600,0005000010143500
-name = "The Wind Waker HD - 3200x1800"
-version = 2
-	
-[TextureRedefine] # TV
-width =	1920
-height = 1080
-formatsExcluded = 0x41A # exclude the intro background texture 	
-overwriteWidth = 3200
-overwriteHeight = 1800
-	
-#[TextureRedefine] # Blur, bloom	
-#width = 960
-#height = 540
-#overwriteWidth = 1600
-#overwriteHeight = 900
-	
-#[TextureRedefine] # AO	
-#width = 240
-#height = 135
-#overwriteWidth = 400
-#overwriteHeight = 225
-	
-#[TextureRedefine] # AO	
-#width = 480
-#height = 240
-#overwriteWidth = 800
-#overwriteHeight = 400
-
-[TextureRedefine] # gamepad
-
-width = 854
-height = 480
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/TheWindWaker_2160p/rules.txt b/Quality/TheWindWaker_2160p/rules.txt
deleted file mode 100644
index 3f6f36ee..00000000
--- a/Quality/TheWindWaker_2160p/rules.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-[Definition]# EUR, USA, JPN titles	
-titleIds =  0005000010143400,0005000010143600,0005000010143500 #	
-name = "The Wind Waker HD - 3840x2160"
-version = 2
-	
-[TextureRedefine] # game rendering resolution. 	#Change this value
-width =	1920
-height = 1080
-formatsExcluded = 0x41A # exclude the intro background texture 	
-overwriteWidth = 3840
-overwriteHeight = 2160
-	
-#[TextureRedefine] # Blur, bloom	
-#width = 960
-#height = 540
-#formatsExcluded = 	
-#overwriteWidth = 1920
-#overwriteHeight = 1080
-	
-#[TextureRedefine] # AO	
-#width = 240
-#height = 135
-#formatsExcluded =	
-#overwriteWidth = 480
-#overwriteHeight = 270
-	
-#[TextureRedefine] # AO	
-#width =480
-#height =240
-#formatsExcluded =	
-#overwriteWidth = 960
-#overwriteHeight = 480
-
-[TextureRedefine] # gamepad
-
-width = 854
-height = 480
-#overwriteWidth = 1920
-#overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality/TheWindWaker_2160pUW/patches.txt b/Quality/TheWindWaker_2160pUW/patches.txt
deleted file mode 100644
index 05c4a1b3..00000000
--- a/Quality/TheWindWaker_2160pUW/patches.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-[WWHDAspectEUR]
-moduleMatches = 0xB7E748DE
-0x1004AAF0 = .float 2.370
-0x101417E0 = .float 2.370
-0x101658A8 = .float 2.370
-
-[WWHDAspectJAP]
-moduleMatches = 0x74BD3F6A
-0x1004AAF0 = .float 2.370
-0x101417F8 = .float 2.370
-0x101658C0 = .float 2.370
-
-[WWHDAspectUSA]
-moduleMatches = 0x475BD29F
-0x1004AAF0 = .float 2.370
-0x101417D0 = .float 2.370
-0x10165898 = .float 2.370
\ No newline at end of file
diff --git a/Quality/TheWindWaker_2160pUW/rules.txt b/Quality/TheWindWaker_2160pUW/rules.txt
deleted file mode 100644
index 9eafce98..00000000
--- a/Quality/TheWindWaker_2160pUW/rules.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-[Definition]# EUR, USA, JPN titles		
-titleIds =  0005000010143400,0005000010143600,0005000010143500 #		
-name = "The Wind Waker HD - 5120x2160 (21:9)"
-version = 2	
-		
-[TextureRedefine] # game rendering resolution
-width = 1920	
-height = 1080	
-formatsExcluded = 0x41A # exclude the intro background texture 		
-overwriteWidth = 5120
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad rendering resolution
-width = 854
-height = 480	
-overwriteWidth = 5120
-overwriteHeight = 2160
\ No newline at end of file
diff --git a/Source/ColorSplash/rules.txt b/Source/ColorSplash/rules.txt
index 1c79aba9..a0fd17e9 100644
--- a/Source/ColorSplash/rules.txt
+++ b/Source/ColorSplash/rules.txt
@@ -2,15 +2,13 @@
 include 'Source/functions.php';
 $fullWidth = $argv[1];
 $fullHeight = $argv[2];
-$halfWidth = $fullWidth / 2;
-$halfHeight = $fullHeight / 2;
-$quarterWidth = $fullWidth / 4;
-$quarterHeight = $fullHeight / 4;
+$scaleFactorX = $fullWidth / 1280.0;
+$scaleFactorY = $fullHeight / 720.0;
 
 $title = get_title($fullWidth, $fullHeight);
 ?>
 [Definition]
-titleIds = 500001f600900,500001f600a00,500001f600b00
+titleIds = 000500001F600900,000500001F600A00,000500001F600B00
 name = "Paper Mario: Color Splash - <?=$title?>"
 version = 2
 
@@ -19,5 +17,5 @@ width = 1280
 height = 720
 formatsExcluded = 0x431
 tileModesExcluded = 0x001
-overwriteWidth = <?=$fullWidth?> 
-overwriteHeight = <?=$fullHeight?> 
\ No newline at end of file
+overwriteWidth = <?=round($scaleFactorX*1280)?> 
+overwriteHeight = <?=round($scaleFactorY*720)?> 
diff --git a/Source/KirbyRainbowCurse/rules.txt b/Source/KirbyRainbowCurse/rules.txt
index e8e1c847..af31795e 100644
--- a/Source/KirbyRainbowCurse/rules.txt
+++ b/Source/KirbyRainbowCurse/rules.txt
@@ -8,7 +8,7 @@ $scaleFactorY = $fullHeight / 720.0;
 $title = get_title($fullWidth, $fullHeight);
 ?>
 [Definition]
-titleIds = 00050000101abc00,
+titleIds = 00050000101ABC00
 name = "Kirby and the Rainbow Curse - <?=$title?>"
 version = 2
 
diff --git a/Source/MarioKart8/rules.txt b/Source/MarioKart8/rules.txt
index 6d228d55..f4821523 100644
--- a/Source/MarioKart8/rules.txt
+++ b/Source/MarioKart8/rules.txt
@@ -8,7 +8,7 @@ $scaleFactorY = $fullHeight / 720.0;
 $title = get_title($fullWidth, $fullHeight);
 ?>
 [Definition]
-titleIds = 000500001010ec00,000500001010ed00,000500001010eb00,ffffffff85887bc1
+titleIds = 000500001010EC00,000500001010ED00,000500001010EB00
 name = "Mario Kart 8 - <?=$title?>"
 version = 2
 
diff --git a/Source/SuperSmashBros/rules.txt b/Source/SuperSmashBros/rules.txt
index 1481ce4e..6a4c55e2 100644
--- a/Source/SuperSmashBros/rules.txt
+++ b/Source/SuperSmashBros/rules.txt
@@ -8,7 +8,7 @@ $scaleFactorY = $fullHeight / 1080.0;
 $title = get_title($fullWidth, $fullHeight);
 ?>
 [Definition]
-titleIds = 0005000010110E00,0005000010145000,0005000010144F00,ffffffffd72e798a
+titleIds = 0005000010110E00,0005000010145000,0005000010144F00
 name = "Super Smash Bros. for Wii U - <?=$title?>"
 version = 2
 
@@ -82,4 +82,4 @@ overwriteHeight = <?=round($scaleFactorY*210)?>
 width = 854
 height = 480
 #overwriteWidth = <?=round($scaleFactorX*1920)?> 
-#overwriteHeight = <?=round($scaleFactorY*1080)?> 
\ No newline at end of file
+#overwriteHeight = <?=round($scaleFactorY*1080)?> 
diff --git a/Source/WindWakerHD/patches.txt b/Source/WindWakerHD/patches.txt
new file mode 100644
index 00000000..fd5a4dff
--- /dev/null
+++ b/Source/WindWakerHD/patches.txt
@@ -0,0 +1,28 @@
+<?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, '.', '');
+?>
+[WWHDAspectEUR]
+moduleMatches = 0xB7E748DE
+0x1004AAF0 = .float <?=$aspect?> 
+0x101417E0 = .float <?=$aspect?> 
+0x101658A8 = .float <?=$aspect?> 
+
+[WWHDAspectJAP]
+moduleMatches = 0x74BD3F6A
+0x1004AAF0 = .float <?=$aspect?> 
+0x101417F8 = .float <?=$aspect?> 
+0x101658C0 = .float <?=$aspect?> 
+
+[WWHDAspectUSA]
+moduleMatches = 0x475BD29F
+0x1004AAF0 = .float <?=$aspect?> 
+0x101417D0 = .float <?=$aspect?> 
+0x10165898 = .float <?=$aspect?> 
diff --git a/Source/WindWakerHD/rules.txt b/Source/WindWakerHD/rules.txt
new file mode 100644
index 00000000..e842a391
--- /dev/null
+++ b/Source/WindWakerHD/rules.txt
@@ -0,0 +1,26 @@
+<?php
+include 'Source/functions.php';
+$fullWidth = $argv[1];
+$fullHeight = $argv[2];
+$scaleFactorX = $fullWidth / 1920.0;
+$scaleFactorY = $fullHeight / 1080.0;
+
+$title = get_title($fullWidth, $fullHeight);
+?>
+[Definition]
+titleIds = 0005000010143400,0005000010143600,0005000010143500
+name = "The Legend of Zelda: The Wind Waker HD - <?=$title?>"
+version = 2
+
+[TextureRedefine] # game rendering resolution
+width = 1920
+height = 1080
+formatsExcluded = 0x41A # exclude the intro background texture
+overwriteWidth = <?=round($scaleFactorX*1920)?> 
+overwriteHeight = <?=round($scaleFactorY*1080)?> 
+
+[TextureRedefine] # gamepad rendering resolution
+width = 854
+height = 480
+overwriteWidth = <?=round($scaleFactorX*1920)?> 
+overwriteHeight = <?=round($scaleFactorY*1080)?> 
diff --git a/build.sh b/build.sh
index 66ecc9d4..72102ba4 100644
--- a/build.sh
+++ b/build.sh
@@ -98,3 +98,4 @@ std_respack "SonicLostWorld" "${res16by9[@]}" "${res21by9[@]}"
 std_respack "Splatoon" "${res16by9[@]}" "${res21by9[@]}"
 std_respack "SuperMario3DWorld" "${res16by9[@]}" "${res21by9[@]}"
 std_respack "SuperSmashBros" "${res16by9[@]}"
+std_respack "WindWakerHD" "${res16by9[@]}" "${res21by9[@]}"