diff --git a/Quality/HyruleWarriors_1080p/rules.txt b/Quality/HyruleWarriors_1080p/rules.txt
deleted file mode 100644
index 85f09b1d..00000000
--- a/Quality/HyruleWarriors_1080p/rules.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-[Definition]
-titleIds = 000500001017D800,000500001017D900,000500001017CD00
-name = "Hyrule Warriors - 1920x1080"
-version = 2
-
-[TextureRedefine] #Game Resolution
-width = 1280
-height = 720
-formatsExcluded = 0x431,0x433
-tileModesExcluded = 0x001
-overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] #Only saw depth in Nsight
-width = 640
-height = 360
-tileModesExcluded = 0x001
-overwriteWidth = 960
-overwriteHeight = 540
-
-[TextureRedefine] #Lighting?
-width = 322
-height = 182
-overwriteWidth = 483
-overwriteHeight = 273
-
-[TextureRedefine] #Dupe of Main Game
-width = 320
-height = 180
-overwriteWidth = 480
-overwriteHeight = 270
-
-[TextureRedefine] #Lighting Blur?
-width = 162
-height = 92
-overwriteWidth = 243
-overwriteHeight = 138
-
-[TextureRedefine] #Lighting Blur?
-width = 160
-height = 90
-overwriteWidth = 240
-overwriteHeight = 135
-
-#[TextureRedefine] #Shadows?
-#width = 1024
-#height = 2048
-#formats = 0x005
-#overwriteWidth = 2048
-#overwriteHeight = 4096
-
-#[TextureRedefine] #Dupe of Main Game?
-#width = 64
-#height = 64
-#formats = 0x005
-#overwriteWidth = 96
-#overwriteHeight = 96
-
-#[TextureRedefine] #Dupe of Main Game?
-#width = 16
-#height = 16
-#formats = 0x005
-#overwriteWidth = 24
-#overwriteHeight = 24
-
-#[TextureRedefine] #Dupe of Main Game?
-#width = 4
-#height = 4
-#formats = 0x005
-#overwriteWidth = 6
-#overwriteHeight = 6
-
-#[TextureRedefine] #Dupe of Main Game?
-#width = 1
-#height = 1
-#formats = 0x005
-#overwriteWidth = 2
-#overwriteHeight = 2
\ No newline at end of file
diff --git a/Quality/HyruleWarriors_1440p/rules.txt b/Quality/HyruleWarriors_1440p/rules.txt
deleted file mode 100644
index f68f8b6a..00000000
--- a/Quality/HyruleWarriors_1440p/rules.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-[Definition]
-titleIds = 000500001017D800,000500001017D900,000500001017CD00
-name = "Hyrule Warriors - 2560x1440"
-version = 2
-
-[TextureRedefine] #Game Resolution
-width = 1280
-height = 720
-formatsExcluded = 0x431,0x433
-tileModesExcluded = 0x001
-overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] #Only saw depth in Nsight
-width = 640
-height = 360
-tileModesExcluded = 0x001
-overwriteWidth = 1280
-overwriteHeight = 720
-
-[TextureRedefine] #Lighting?
-width = 322
-height = 182
-overwriteWidth = 644
-overwriteHeight = 364
-
-[TextureRedefine] #Dupe of Main Game
-width = 320
-height = 180
-overwriteWidth = 640
-overwriteHeight = 360
-
-[TextureRedefine] #Lighting Blur?
-width = 162
-height = 92
-overwriteWidth = 324
-overwriteHeight = 184
-
-[TextureRedefine] #Lighting Blur?
-width = 160
-height = 90
-overwriteWidth = 320
-overwriteHeight = 180
-
-#[TextureRedefine] #Shadows?
-#width = 1024
-#height = 2048
-#formats = 0x005
-#overwriteWidth = 2048
-#overwriteHeight = 4096
-
-#[TextureRedefine] #Dupe of Main Game?
-#width = 64
-#height = 64
-#formats = 0x005
-#overwriteWidth = 128
-#overwriteHeight = 128
-
-#[TextureRedefine] #Dupe of Main Game?
-#width = 16
-#height = 16
-#formats = 0x005
-#overwriteWidth = 32
-#overwriteHeight = 32
-
-#[TextureRedefine] #Dupe of Main Game?
-#width = 4
-#height = 4
-#formats = 0x005
-#overwriteWidth = 8
-#overwriteHeight = 8
-
-#[TextureRedefine] #Dupe of Main Game?
-#width = 1
-#height = 1
-#formats = 0x005
-#overwriteWidth = 2
-#overwriteHeight = 2
\ No newline at end of file
diff --git a/Quality/HyruleWarriors_2160p/rules.txt b/Quality/HyruleWarriors_2160p/rules.txt
deleted file mode 100644
index 24c45c14..00000000
--- a/Quality/HyruleWarriors_2160p/rules.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-[Definition]
-titleIds = 000500001017D800,000500001017D900,000500001017CD00
-name = "Hyrule Warriors - 3840x2160"
-version = 2
-
-[TextureRedefine] #Game Resolution
-width = 1280
-height = 720
-formatsExcluded = 0x431,0x433
-tileModesExcluded = 0x001
-overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] #Only saw depth in Nsight
-width = 640
-height = 360
-tileModesExcluded = 0x001
-overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] #Lighting?
-width = 322
-height = 182
-overwriteWidth = 966
-overwriteHeight = 546
-
-[TextureRedefine] #Dupe of Main Game
-width = 320
-height = 180
-overwriteWidth = 960
-overwriteHeight = 540
-
-[TextureRedefine] #Lighting Blur?
-width = 162
-height = 92
-overwriteWidth = 486
-overwriteHeight = 276
-
-[TextureRedefine] #Lighting Blur?
-width = 160
-height = 90
-overwriteWidth = 480
-overwriteHeight = 270
-
-#[TextureRedefine] #Shadows?
-#width = 1024
-#height = 2048
-#formats = 0x005
-#overwriteWidth = 2048
-#overwriteHeight = 4096
-
-[TextureRedefine] #Dupe of Main Game?
-width = 64
-height = 64
-formats = 0x005
-overwriteWidth = 192
-overwriteHeight = 192
-
-[TextureRedefine] #Dupe of Main Game?
-width = 16
-height = 16
-formats = 0x005
-overwriteWidth = 48
-overwriteHeight = 48
-
-[TextureRedefine] #Dupe of Main Game?
-width = 4
-height = 4
-formats = 0x005
-overwriteWidth = 12
-overwriteHeight = 12
-
-[TextureRedefine] #Dupe of Main Game?
-width = 1
-height = 1
-formats = 0x005
-overwriteWidth = 3
-overwriteHeight = 3
\ No newline at end of file
diff --git a/Source/Bayonetta/rules.txt b/Source/Bayonetta/rules.txt
index a94dc3a8..825dde24 100644
--- a/Source/Bayonetta/rules.txt
+++ b/Source/Bayonetta/rules.txt
@@ -16,7 +16,7 @@ width = 1280
 height = 720
 tileModesExcluded = 0x001 # Excludes FMV B&W layer (only viewable with rajkosto's implementation)
 overwriteWidth = <?=round($scaleFactorX*1280)?> 
-overwriteHeight = <?=round($scaleFactorY*1280)?> 
+overwriteHeight = <?=round($scaleFactorY*720)?> 
 
 [TextureRedefine]#half-res
 width = 640
diff --git a/Source/Bayonetta2/rules.txt b/Source/Bayonetta2/rules.txt
index 12977392..178cc844 100644
--- a/Source/Bayonetta2/rules.txt
+++ b/Source/Bayonetta2/rules.txt
@@ -16,7 +16,7 @@ width = 1280
 height = 720
 tileModesExcluded = 0x001 # Excludes FMV B&W layer (only viewable with rajkosto's implementation)
 overwriteWidth = <?=round($scaleFactorX*1280)?> 
-overwriteHeight = <?=round($scaleFactorY*1280)?> 
+overwriteHeight = <?=round($scaleFactorY*720)?> 
 
 [TextureRedefine]#half-res
 width = 640
diff --git a/Source/HyruleWarriors/rules.txt b/Source/HyruleWarriors/rules.txt
new file mode 100644
index 00000000..1cc098ce
--- /dev/null
+++ b/Source/HyruleWarriors/rules.txt
@@ -0,0 +1,86 @@
+<?php
+$fullWidth = $argv[1];
+$fullHeight = $argv[2];
+$scaleFactorX = $fullWidth / 1280.0;
+$scaleFactorY = $fullHeight / 720.0;
+
+$title = $fullWidth . "x" . $fullHeight;
+?>
+[Definition]
+titleIds = 000500001017D800,000500001017D900,000500001017CD00
+name = "Hyrule Warriors - <?=$title?>"
+version = 2
+
+[TextureRedefine] #Game Resolution
+width = 1280
+height = 720
+formatsExcluded = 0x431,0x433
+tileModesExcluded = 0x001
+overwriteWidth = <?=round($scaleFactorX*1280)?> 
+overwriteHeight = <?=round($scaleFactorY*720)?> 
+
+[TextureRedefine] #Only saw depth in Nsight
+width = 640
+height = 360
+tileModesExcluded = 0x001
+overwriteWidth = <?=round($scaleFactorX*640)?> 
+overwriteHeight = <?=round($scaleFactorY*360)?> 
+
+[TextureRedefine] #Lighting?
+width = 322
+height = 182
+overwriteWidth = <?=round($scaleFactorX*322)?> 
+overwriteHeight = <?=round($scaleFactorY*182)?> 
+
+[TextureRedefine] #Dupe of Main Game
+width = 320
+height = 180
+overwriteWidth = <?=round($scaleFactorX*320)?> 
+overwriteHeight = <?=round($scaleFactorY*180)?> 
+
+[TextureRedefine] #Lighting Blur?
+width = 162
+height = 92
+overwriteWidth = <?=round($scaleFactorX*162)?> 
+overwriteHeight = <?=round($scaleFactorY*92)?> 
+
+[TextureRedefine] #Lighting Blur?
+width = 160
+height = 90
+overwriteWidth = <?=round($scaleFactorX*160)?> 
+overwriteHeight = <?=round($scaleFactorY*90)?> 
+
+#[TextureRedefine] #Shadows?
+#width = 1024
+#height = 2048
+#formats = 0x005
+#overwriteWidth = <?=round($scaleFactorY*1024)?> 
+#overwriteHeight = <?=round($scaleFactorY*2048)?> 
+
+#[TextureRedefine] #Dupe of Main Game?
+#width = 64
+#height = 64
+#formats = 0x005
+#overwriteWidth = <?=round($scaleFactorY*64)?> 
+#overwriteHeight = <?=round($scaleFactorY*64)?> 
+
+#[TextureRedefine] #Dupe of Main Game?
+#width = 16
+#height = 16
+#formats = 0x005
+#overwriteWidth = <?=round($scaleFactorY*16)?> 
+#overwriteHeight = <?=round($scaleFactorY*16)?> 
+
+#[TextureRedefine] #Dupe of Main Game?
+#width = 4
+#height = 4
+#formats = 0x005
+#overwriteWidth = <?=round($scaleFactorY*6)?> 
+#overwriteHeight = <?=round($scaleFactorY*6)?> 
+
+#[TextureRedefine] #Dupe of Main Game?
+#width = 1
+#height = 1
+#formats = 0x005
+#overwriteWidth = <?=round($scaleFactorY*1)?> 
+#overwriteHeight = <?=round($scaleFactorY*1)?> 
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 5ea6befd..c2749bfd 100644
--- a/build.sh
+++ b/build.sh
@@ -82,6 +82,19 @@ build_dir "Source/CaptainToad" "Quality/CaptainToad_1800p" 3200 1800
 build_dir "Source/CaptainToad" "Quality/CaptainToad_2160p" 3840 2160
 build_dir "Source/CaptainToad" "Quality/CaptainToad_2160pUW" 5120 2160
 build_dir "Source/CaptainToad" "Quality/CaptainToad_900p" 1600 900
+build_dir "Source/HyruleWarriors" "Enthusiast/HyruleWarriors_2880p" 5120 2880
+build_dir "Source/HyruleWarriors" "Enthusiast/HyruleWarriors_4320p" 7680 4320
+build_dir "Source/HyruleWarriors" "Enthusiast/HyruleWarriors_5760p" 10240 5760
+build_dir "Source/HyruleWarriors" "Performance/HyruleWarriors_360p" 640 360
+build_dir "Source/HyruleWarriors" "Performance/HyruleWarriors_540p" 960 540
+build_dir "Source/HyruleWarriors" "Quality/HyruleWarriors_1080p" 1920 1080
+build_dir "Source/HyruleWarriors" "Quality/HyruleWarriors_1080pUW" 2560 1080
+build_dir "Source/HyruleWarriors" "Quality/HyruleWarriors_1440p" 2560 1440
+build_dir "Source/HyruleWarriors" "Quality/HyruleWarriors_1440pUW" 3440 1440
+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/Splatoon" "Enthusiast/Splatoon_2880p" 5120 2880
 build_dir "Source/Splatoon" "Enthusiast/Splatoon_4320p" 7680 4320
 build_dir "Source/Splatoon" "Enthusiast/Splatoon_5760p" 10240 5760