From 02c824f327594c8ff7b492aef866a04bcccf83d6 Mon Sep 17 00:00:00 2001
From: Milan <milanhekje@gmail.com>
Date: Tue, 3 Oct 2017 20:54:50 +0200
Subject: [PATCH] Pulled recent changes, made mergeable with Slashiee's master,
 fixed Cemu 1.10.0 support

Cemu 1.10.0 made some changes which are causing the blur radius to be less on Cemu 1.10.0 due to a blur layer which changed size (for Mario kart 8). Can't do much about it. I used Cemu 1.10.0 as a guideline, but backwards compatibility is still here.
---
 .../cb0e6e8cbec4502a_0000000000000079_ps.txt  |  4 +-
 .../cb0e6e8cbec4502a_0000000000000079_ps.txt  |  4 +-
 .../cb0e6e8cbec4502a_0000000000000079_ps.txt  |  4 +-
 .../4727ccdea05045d0_0000000000000079_ps.txt  |  2 +-
 .../6dc0532bfaf19019_0000000000000079_ps.txt  |  3 +-
 .../4727ccdea05045d0_0000000000000079_ps.txt  |  2 +-
 .../6dc0532bfaf19019_0000000000000079_ps.txt  |  3 +-
 .../4727ccdea05045d0_0000000000000079_ps.txt  |  2 +-
 .../6dc0532bfaf19019_0000000000000079_ps.txt  |  3 +-
 .../45d85f1d25e7d0de_0000000000000079_ps.txt  |  3 +-
 .../4dc5fdeced670c5e_0000000000000079_ps.txt  |  2 +-
 Enthusiast/Splatoon_2880p/rules.txt           | 53 +++++------------
 .../45d85f1d25e7d0de_0000000000000079_ps.txt  |  3 +-
 .../4dc5fdeced670c5e_0000000000000079_ps.txt  |  2 +-
 Enthusiast/Splatoon_4320p/rules.txt           | 57 ++++++-------------
 .../45d85f1d25e7d0de_0000000000000079_ps.txt  |  3 +-
 .../4dc5fdeced670c5e_0000000000000079_ps.txt  |  2 +-
 Enthusiast/Splatoon_5760p/rules.txt           | 57 ++++++-------------
 .../cb0e6e8cbec4502a_0000000000000079_ps.txt  |  4 +-
 .../cb0e6e8cbec4502a_0000000000000079_ps.txt  |  4 +-
 .../cb0e6e8cbec4502a_0000000000000079_ps.txt  |  4 +-
 .../cb0e6e8cbec4502a_0000000000000079_ps.txt  | 22 ++++---
 .../cb0e6e8cbec4502a_0000000000000079_ps.txt  | 22 ++++---
 .../cb0e6e8cbec4502a_0000000000000079_ps.txt  | 22 ++++---
 .../cb0e6e8cbec4502a_0000000000000079_ps.txt  | 22 ++++---
 .../4727ccdea05045d0_0000000000000079_ps.txt  |  2 +-
 .../6dc0532bfaf19019_0000000000000079_ps.txt  |  3 +-
 .../4727ccdea05045d0_0000000000000079_ps.txt  |  2 +-
 .../6dc0532bfaf19019_0000000000000079_ps.txt  |  3 +-
 .../4727ccdea05045d0_0000000000000079_ps.txt  |  2 +-
 .../6dc0532bfaf19019_0000000000000079_ps.txt  |  3 +-
 .../4727ccdea05045d0_0000000000000079_ps.txt  |  2 +-
 .../6dc0532bfaf19019_0000000000000079_ps.txt  |  2 +-
 .../4727ccdea05045d0_0000000000000079_ps.txt  |  2 +-
 .../6dc0532bfaf19019_0000000000000079_ps.txt  |  2 +-
 Quality/MK8_2160p/rules.txt                   | 12 +---
 .../4727ccdea05045d0_0000000000000079_ps.txt  |  2 +-
 .../6dc0532bfaf19019_0000000000000079_ps.txt  |  3 +-
 Quality/Splatoon_1080p/rules.txt              | 29 +---------
 .../45d85f1d25e7d0de_0000000000000079_ps.txt  |  3 +-
 .../4dc5fdeced670c5e_0000000000000079_ps.txt  |  2 +-
 Quality/Splatoon_1080pUW/rules.txt            | 29 +---------
 .../45d85f1d25e7d0de_0000000000000079_ps.txt  |  3 +-
 .../4dc5fdeced670c5e_0000000000000079_ps.txt  |  2 +-
 Quality/Splatoon_1440p/rules.txt              | 29 +---------
 .../45d85f1d25e7d0de_0000000000000079_ps.txt  |  3 +-
 .../4dc5fdeced670c5e_0000000000000079_ps.txt  |  2 +-
 Quality/Splatoon_1800p/rules.txt              | 29 +---------
 .../45d85f1d25e7d0de_0000000000000079_ps.txt  |  3 +-
 .../4dc5fdeced670c5e_0000000000000079_ps.txt  |  2 +-
 Quality/Splatoon_2160p/rules.txt              | 38 +------------
 51 files changed, 155 insertions(+), 368 deletions(-)

diff --git a/Enthusiast/BreathOfTheWild_2880p/cb0e6e8cbec4502a_0000000000000079_ps.txt b/Enthusiast/BreathOfTheWild_2880p/cb0e6e8cbec4502a_0000000000000079_ps.txt
index 697cb6d7..328aa41b 100644
--- a/Enthusiast/BreathOfTheWild_2880p/cb0e6e8cbec4502a_0000000000000079_ps.txt
+++ b/Enthusiast/BreathOfTheWild_2880p/cb0e6e8cbec4502a_0000000000000079_ps.txt
@@ -24,7 +24,6 @@ vec2 res = vec2( float(ires.x), float(ires.y) );
 int r = int(floor(2.0 / uf_fragCoordScale.y + 0.5));
 vec4 R1f = vec4(0.0);
 float count = 0.0;
-
 for( int x=-r; x<=r; x++ ) {
 	for( int y=-r; y<=r; y++ ) {
 		if( pow(x,2) + pow(y,2) <= pow(r,2) ) {
@@ -34,4 +33,5 @@ for( int x=-r; x<=r; x++ ) {
 		}
 	}
 passPixelColor0 = R1f/count;
-}
\ No newline at end of file
+}
+
diff --git a/Enthusiast/BreathOfTheWild_4320p/cb0e6e8cbec4502a_0000000000000079_ps.txt b/Enthusiast/BreathOfTheWild_4320p/cb0e6e8cbec4502a_0000000000000079_ps.txt
index 697cb6d7..328aa41b 100644
--- a/Enthusiast/BreathOfTheWild_4320p/cb0e6e8cbec4502a_0000000000000079_ps.txt
+++ b/Enthusiast/BreathOfTheWild_4320p/cb0e6e8cbec4502a_0000000000000079_ps.txt
@@ -24,7 +24,6 @@ vec2 res = vec2( float(ires.x), float(ires.y) );
 int r = int(floor(2.0 / uf_fragCoordScale.y + 0.5));
 vec4 R1f = vec4(0.0);
 float count = 0.0;
-
 for( int x=-r; x<=r; x++ ) {
 	for( int y=-r; y<=r; y++ ) {
 		if( pow(x,2) + pow(y,2) <= pow(r,2) ) {
@@ -34,4 +33,5 @@ for( int x=-r; x<=r; x++ ) {
 		}
 	}
 passPixelColor0 = R1f/count;
-}
\ No newline at end of file
+}
+
diff --git a/Enthusiast/BreathOfTheWild_5760p/cb0e6e8cbec4502a_0000000000000079_ps.txt b/Enthusiast/BreathOfTheWild_5760p/cb0e6e8cbec4502a_0000000000000079_ps.txt
index 697cb6d7..328aa41b 100644
--- a/Enthusiast/BreathOfTheWild_5760p/cb0e6e8cbec4502a_0000000000000079_ps.txt
+++ b/Enthusiast/BreathOfTheWild_5760p/cb0e6e8cbec4502a_0000000000000079_ps.txt
@@ -24,7 +24,6 @@ vec2 res = vec2( float(ires.x), float(ires.y) );
 int r = int(floor(2.0 / uf_fragCoordScale.y + 0.5));
 vec4 R1f = vec4(0.0);
 float count = 0.0;
-
 for( int x=-r; x<=r; x++ ) {
 	for( int y=-r; y<=r; y++ ) {
 		if( pow(x,2) + pow(y,2) <= pow(r,2) ) {
@@ -34,4 +33,5 @@ for( int x=-r; x<=r; x++ ) {
 		}
 	}
 passPixelColor0 = R1f/count;
-}
\ No newline at end of file
+}
+
diff --git a/Enthusiast/MK8_2880p/4727ccdea05045d0_0000000000000079_ps.txt b/Enthusiast/MK8_2880p/4727ccdea05045d0_0000000000000079_ps.txt
index 60575b23..4865cfe2 100644
--- a/Enthusiast/MK8_2880p/4727ccdea05045d0_0000000000000079_ps.txt
+++ b/Enthusiast/MK8_2880p/4727ccdea05045d0_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Enthusiast/MK8_2880p/6dc0532bfaf19019_0000000000000079_ps.txt b/Enthusiast/MK8_2880p/6dc0532bfaf19019_0000000000000079_ps.txt
index 878eef04..bdd61599 100644
--- a/Enthusiast/MK8_2880p/6dc0532bfaf19019_0000000000000079_ps.txt
+++ b/Enthusiast/MK8_2880p/6dc0532bfaf19019_0000000000000079_ps.txt
@@ -4,6 +4,7 @@
 // Used for: Vertical Blur
 const float blurFactor = 1.0; //Higher is less blur
 
+
 // Implementation of http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 layout(binding = 0) uniform sampler2D textureUnitPS0;
 layout(location = 0) in vec4 passParameterSem0;
@@ -14,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Enthusiast/MK8_4320p/4727ccdea05045d0_0000000000000079_ps.txt b/Enthusiast/MK8_4320p/4727ccdea05045d0_0000000000000079_ps.txt
index 60575b23..4865cfe2 100644
--- a/Enthusiast/MK8_4320p/4727ccdea05045d0_0000000000000079_ps.txt
+++ b/Enthusiast/MK8_4320p/4727ccdea05045d0_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Enthusiast/MK8_4320p/6dc0532bfaf19019_0000000000000079_ps.txt b/Enthusiast/MK8_4320p/6dc0532bfaf19019_0000000000000079_ps.txt
index 878eef04..bdd61599 100644
--- a/Enthusiast/MK8_4320p/6dc0532bfaf19019_0000000000000079_ps.txt
+++ b/Enthusiast/MK8_4320p/6dc0532bfaf19019_0000000000000079_ps.txt
@@ -4,6 +4,7 @@
 // Used for: Vertical Blur
 const float blurFactor = 1.0; //Higher is less blur
 
+
 // Implementation of http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 layout(binding = 0) uniform sampler2D textureUnitPS0;
 layout(location = 0) in vec4 passParameterSem0;
@@ -14,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Enthusiast/MK8_5760p/4727ccdea05045d0_0000000000000079_ps.txt b/Enthusiast/MK8_5760p/4727ccdea05045d0_0000000000000079_ps.txt
index 60575b23..4865cfe2 100644
--- a/Enthusiast/MK8_5760p/4727ccdea05045d0_0000000000000079_ps.txt
+++ b/Enthusiast/MK8_5760p/4727ccdea05045d0_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Enthusiast/MK8_5760p/6dc0532bfaf19019_0000000000000079_ps.txt b/Enthusiast/MK8_5760p/6dc0532bfaf19019_0000000000000079_ps.txt
index 878eef04..bdd61599 100644
--- a/Enthusiast/MK8_5760p/6dc0532bfaf19019_0000000000000079_ps.txt
+++ b/Enthusiast/MK8_5760p/6dc0532bfaf19019_0000000000000079_ps.txt
@@ -4,6 +4,7 @@
 // Used for: Vertical Blur
 const float blurFactor = 1.0; //Higher is less blur
 
+
 // Implementation of http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 layout(binding = 0) uniform sampler2D textureUnitPS0;
 layout(location = 0) in vec4 passParameterSem0;
@@ -14,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Enthusiast/Splatoon_2880p/45d85f1d25e7d0de_0000000000000079_ps.txt b/Enthusiast/Splatoon_2880p/45d85f1d25e7d0de_0000000000000079_ps.txt
index e9162537..9fe7817e 100644
--- a/Enthusiast/Splatoon_2880p/45d85f1d25e7d0de_0000000000000079_ps.txt
+++ b/Enthusiast/Splatoon_2880p/45d85f1d25e7d0de_0000000000000079_ps.txt
@@ -4,6 +4,7 @@
 // Used for: Vertical Blur
 const float blurFactor = 1.0; //Higher is less blur
 
+
 // Implementation of http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 layout(binding = 0) uniform sampler2D textureUnitPS0;
 layout(location = 0) in vec4 passParameterSem0;
@@ -14,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Enthusiast/Splatoon_2880p/4dc5fdeced670c5e_0000000000000079_ps.txt b/Enthusiast/Splatoon_2880p/4dc5fdeced670c5e_0000000000000079_ps.txt
index 87aef259..dff2978b 100644
--- a/Enthusiast/Splatoon_2880p/4dc5fdeced670c5e_0000000000000079_ps.txt
+++ b/Enthusiast/Splatoon_2880p/4dc5fdeced670c5e_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Enthusiast/Splatoon_2880p/rules.txt b/Enthusiast/Splatoon_2880p/rules.txt
index f82a224d..e3ff8e10 100644
--- a/Enthusiast/Splatoon_2880p/rules.txt
+++ b/Enthusiast/Splatoon_2880p/rules.txt
@@ -6,45 +6,34 @@ version = 2
 [TextureRedefine] # tv
 width = 1280
 height = 720
-formatsExcluded = 0x816
-overwriteWidth = 5120
-overwriteHeight = 2880
-
-[TextureRedefine] # tv (increased depth)
-width = 1280
-height = 720
-formats = 0x816
-overwriteFormat = 0x823
 overwriteWidth = 5120
 overwriteHeight = 2880
 
 [TextureRedefine] # half-res alpha
 width = 640
 height = 360
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
-overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # half-res alpha (increased depth)
-width = 640
-height = 360
-formats = 0x816
-overwriteFormat = 0x823
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 2560
 overwriteHeight = 1440
 
 [TextureRedefine] # quarter-res alpha
 width = 320
 height = 180
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 1280
 overwriteHeight = 720
 
-[TextureRedefine] # quarter-res alpha (increased depth)
-width = 320
-height = 180
-formats = 0x816
-overwriteFormat = 0x823
+[TextureRedefine] # half-res alpha (gamepad)
+width = 427
+height = 240
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
+overwriteWidth = 1280
+overwriteHeight = 720
+
+[TextureRedefine] # half-res alpha (multiplayer)
+width = 424
+height = 240
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 1280
 overwriteHeight = 720
 
@@ -64,18 +53,4 @@ overwriteHeight = 1440
 width = 848
 height = 480
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # half-res alpha (gamepad)
-width = 427
-height = 240
-formatsExcluded = 0x41A,0x431 # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 720
-
-[TextureRedefine] # half-res alpha (multiplayer)
-width = 424
-height = 240
-formatsExcluded = 0x41A,0x431 # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 720
\ No newline at end of file
+overwriteHeight = 1440
\ No newline at end of file
diff --git a/Enthusiast/Splatoon_4320p/45d85f1d25e7d0de_0000000000000079_ps.txt b/Enthusiast/Splatoon_4320p/45d85f1d25e7d0de_0000000000000079_ps.txt
index e9162537..9fe7817e 100644
--- a/Enthusiast/Splatoon_4320p/45d85f1d25e7d0de_0000000000000079_ps.txt
+++ b/Enthusiast/Splatoon_4320p/45d85f1d25e7d0de_0000000000000079_ps.txt
@@ -4,6 +4,7 @@
 // Used for: Vertical Blur
 const float blurFactor = 1.0; //Higher is less blur
 
+
 // Implementation of http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 layout(binding = 0) uniform sampler2D textureUnitPS0;
 layout(location = 0) in vec4 passParameterSem0;
@@ -14,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Enthusiast/Splatoon_4320p/4dc5fdeced670c5e_0000000000000079_ps.txt b/Enthusiast/Splatoon_4320p/4dc5fdeced670c5e_0000000000000079_ps.txt
index 87aef259..dff2978b 100644
--- a/Enthusiast/Splatoon_4320p/4dc5fdeced670c5e_0000000000000079_ps.txt
+++ b/Enthusiast/Splatoon_4320p/4dc5fdeced670c5e_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Enthusiast/Splatoon_4320p/rules.txt b/Enthusiast/Splatoon_4320p/rules.txt
index 068e1635..bd237aed 100644
--- a/Enthusiast/Splatoon_4320p/rules.txt
+++ b/Enthusiast/Splatoon_4320p/rules.txt
@@ -6,47 +6,36 @@ version = 2
 [TextureRedefine] # tv
 width = 1280
 height = 720
-formatsExcluded = 0x816
-overwriteWidth = 7680
-overwriteHeight = 4320
-
-[TextureRedefine] # tv (increased depth)
-width = 1280
-height = 720
-formats = 0x816
-overwriteFormat = 0x823
 overwriteWidth = 7680
 overwriteHeight = 4320
 
 [TextureRedefine] # half-res alpha
 width = 640
 height = 360
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
-overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # half-res alpha (increased depth)
-width = 640
-height = 360
-formats = 0x816
-overwriteFormat = 0x823
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 3840
 overwriteHeight = 2160
 
 [TextureRedefine] # quarter-res alpha
 width = 320
 height = 180
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 1920
 overwriteHeight = 1080
 
-[TextureRedefine] # quarter-res alpha (increased depth)
-width = 320
-height = 180
-formats = 0x816
-overwriteFormat = 0x823
-overwriteWidth = 1920
-overwriteHeight = 1080
+[TextureRedefine] # half-res alpha (gamepad)
+width = 427
+height = 240
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
+overwriteWidth = 1280
+overwriteHeight = 720
+
+[TextureRedefine] # half-res alpha (multiplayer)
+width = 424
+height = 240
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
+overwriteWidth = 1280
+overwriteHeight = 720
 
 [TextureRedefine] # squid sisters
 width = 1024
@@ -64,18 +53,4 @@ overwriteHeight = 1440
 width = 848
 height = 480
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # half-res alpha (gamepad)
-width = 427
-height = 240
-formatsExcluded = 0x41A,0x431 # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 720
-
-[TextureRedefine] # half-res alpha (multiplayer)
-width = 424
-height = 240
-formatsExcluded = 0x41A,0x431 # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 720
\ No newline at end of file
+overwriteHeight = 1440
\ No newline at end of file
diff --git a/Enthusiast/Splatoon_5760p/45d85f1d25e7d0de_0000000000000079_ps.txt b/Enthusiast/Splatoon_5760p/45d85f1d25e7d0de_0000000000000079_ps.txt
index e9162537..9fe7817e 100644
--- a/Enthusiast/Splatoon_5760p/45d85f1d25e7d0de_0000000000000079_ps.txt
+++ b/Enthusiast/Splatoon_5760p/45d85f1d25e7d0de_0000000000000079_ps.txt
@@ -4,6 +4,7 @@
 // Used for: Vertical Blur
 const float blurFactor = 1.0; //Higher is less blur
 
+
 // Implementation of http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 layout(binding = 0) uniform sampler2D textureUnitPS0;
 layout(location = 0) in vec4 passParameterSem0;
@@ -14,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Enthusiast/Splatoon_5760p/4dc5fdeced670c5e_0000000000000079_ps.txt b/Enthusiast/Splatoon_5760p/4dc5fdeced670c5e_0000000000000079_ps.txt
index 87aef259..dff2978b 100644
--- a/Enthusiast/Splatoon_5760p/4dc5fdeced670c5e_0000000000000079_ps.txt
+++ b/Enthusiast/Splatoon_5760p/4dc5fdeced670c5e_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Enthusiast/Splatoon_5760p/rules.txt b/Enthusiast/Splatoon_5760p/rules.txt
index b6e39c91..2f754182 100644
--- a/Enthusiast/Splatoon_5760p/rules.txt
+++ b/Enthusiast/Splatoon_5760p/rules.txt
@@ -6,47 +6,36 @@ version = 2
 [TextureRedefine] # tv
 width = 1280
 height = 720
-formatsExcluded = 0x816
-overwriteWidth = 10240
-overwriteHeight = 5760
-
-[TextureRedefine] # tv (increased depth)
-width = 1280
-height = 720
-formats = 0x816
-overwriteFormat = 0x823
 overwriteWidth = 10240
 overwriteHeight = 5760
 
 [TextureRedefine] # half-res alpha
 width = 640
 height = 360
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
-overwriteWidth = 5120
-overwriteHeight = 2880
-
-[TextureRedefine] # half-res alpha (increased depth)
-width = 640
-height = 360
-formats = 0x816
-overwriteFormat = 0x823
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 5120
 overwriteHeight = 2880
 
 [TextureRedefine] # quarter-res alpha
 width = 320
 height = 180
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 2560
 overwriteHeight = 1440
 
-[TextureRedefine] # quarter-res alpha (increased depth)
-width = 320
-height = 180
-formats = 0x816
-overwriteFormat = 0x823
-overwriteWidth = 2560
-overwriteHeight = 1440
+[TextureRedefine] # half-res alpha (gamepad)
+width = 427
+height = 240
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
+overwriteWidth = 1280
+overwriteHeight = 720
+
+[TextureRedefine] # half-res alpha (multiplayer)
+width = 424
+height = 240
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
+overwriteWidth = 1280
+overwriteHeight = 720
 
 [TextureRedefine] # squid sisters
 width = 1024
@@ -64,18 +53,4 @@ overwriteHeight = 1440
 width = 848
 height = 480
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # half-res alpha (gamepad)
-width = 427
-height = 240
-formatsExcluded = 0x41A,0x431 # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 720
-
-[TextureRedefine] # half-res alpha (multiplayer)
-width = 424
-height = 240
-formatsExcluded = 0x41A,0x431 # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 720
\ No newline at end of file
+overwriteHeight = 1440
\ No newline at end of file
diff --git a/Quality/BreathOfTheWild_1080p/cb0e6e8cbec4502a_0000000000000079_ps.txt b/Quality/BreathOfTheWild_1080p/cb0e6e8cbec4502a_0000000000000079_ps.txt
index 697cb6d7..328aa41b 100644
--- a/Quality/BreathOfTheWild_1080p/cb0e6e8cbec4502a_0000000000000079_ps.txt
+++ b/Quality/BreathOfTheWild_1080p/cb0e6e8cbec4502a_0000000000000079_ps.txt
@@ -24,7 +24,6 @@ vec2 res = vec2( float(ires.x), float(ires.y) );
 int r = int(floor(2.0 / uf_fragCoordScale.y + 0.5));
 vec4 R1f = vec4(0.0);
 float count = 0.0;
-
 for( int x=-r; x<=r; x++ ) {
 	for( int y=-r; y<=r; y++ ) {
 		if( pow(x,2) + pow(y,2) <= pow(r,2) ) {
@@ -34,4 +33,5 @@ for( int x=-r; x<=r; x++ ) {
 		}
 	}
 passPixelColor0 = R1f/count;
-}
\ No newline at end of file
+}
+
diff --git a/Quality/BreathOfTheWild_1080pUW/cb0e6e8cbec4502a_0000000000000079_ps.txt b/Quality/BreathOfTheWild_1080pUW/cb0e6e8cbec4502a_0000000000000079_ps.txt
index 697cb6d7..328aa41b 100644
--- a/Quality/BreathOfTheWild_1080pUW/cb0e6e8cbec4502a_0000000000000079_ps.txt
+++ b/Quality/BreathOfTheWild_1080pUW/cb0e6e8cbec4502a_0000000000000079_ps.txt
@@ -24,7 +24,6 @@ vec2 res = vec2( float(ires.x), float(ires.y) );
 int r = int(floor(2.0 / uf_fragCoordScale.y + 0.5));
 vec4 R1f = vec4(0.0);
 float count = 0.0;
-
 for( int x=-r; x<=r; x++ ) {
 	for( int y=-r; y<=r; y++ ) {
 		if( pow(x,2) + pow(y,2) <= pow(r,2) ) {
@@ -34,4 +33,5 @@ for( int x=-r; x<=r; x++ ) {
 		}
 	}
 passPixelColor0 = R1f/count;
-}
\ No newline at end of file
+}
+
diff --git a/Quality/BreathOfTheWild_1440p/cb0e6e8cbec4502a_0000000000000079_ps.txt b/Quality/BreathOfTheWild_1440p/cb0e6e8cbec4502a_0000000000000079_ps.txt
index 697cb6d7..328aa41b 100644
--- a/Quality/BreathOfTheWild_1440p/cb0e6e8cbec4502a_0000000000000079_ps.txt
+++ b/Quality/BreathOfTheWild_1440p/cb0e6e8cbec4502a_0000000000000079_ps.txt
@@ -24,7 +24,6 @@ vec2 res = vec2( float(ires.x), float(ires.y) );
 int r = int(floor(2.0 / uf_fragCoordScale.y + 0.5));
 vec4 R1f = vec4(0.0);
 float count = 0.0;
-
 for( int x=-r; x<=r; x++ ) {
 	for( int y=-r; y<=r; y++ ) {
 		if( pow(x,2) + pow(y,2) <= pow(r,2) ) {
@@ -34,4 +33,5 @@ for( int x=-r; x<=r; x++ ) {
 		}
 	}
 passPixelColor0 = R1f/count;
-}
\ No newline at end of file
+}
+
diff --git a/Quality/BreathOfTheWild_1440pUW/cb0e6e8cbec4502a_0000000000000079_ps.txt b/Quality/BreathOfTheWild_1440pUW/cb0e6e8cbec4502a_0000000000000079_ps.txt
index c2dcd4df..328aa41b 100644
--- a/Quality/BreathOfTheWild_1440pUW/cb0e6e8cbec4502a_0000000000000079_ps.txt
+++ b/Quality/BreathOfTheWild_1440pUW/cb0e6e8cbec4502a_0000000000000079_ps.txt
@@ -23,17 +23,15 @@ ivec2 ires = textureSize(textureUnitPS0,0);
 vec2 res = vec2( float(ires.x), float(ires.y) );
 int r = int(floor(2.0 / uf_fragCoordScale.y + 0.5));
 vec4 R1f = vec4(0.0);
-
-for (int i=0; i<r; i++) {
-	float m = (1-r)/2 + float(i);
-	for (int k=0; k<r; k++){
-		float n = (1-r)/2 + float(k);
-		R1f += texture( textureUnitPS0, R0f+ vec2(m,n) * 2.0 /res )/(pow(r,2)-4); //assume 2px offset as well
+float count = 0.0;
+for( int x=-r; x<=r; x++ ) {
+	for( int y=-r; y<=r; y++ ) {
+		if( pow(x,2) + pow(y,2) <= pow(r,2) ) {
+			R1f += texture( textureUnitPS0, R0f + vec2(x,y)/res );
+			count += 1.0;
+			}
 		}
 	}
-R1f -= texture( textureUnitPS0, R0f+ vec2((1-r)/2,(1-r)/2) * 2.0 /res )/(pow(r,2)-4);
-R1f -= texture( textureUnitPS0, R0f+ vec2((1-r)/2,(r-1)/2) * 2.0 /res )/(pow(r,2)-4);
-R1f -= texture( textureUnitPS0, R0f+ vec2((r-1)/2,(1-r)/2) * 2.0 /res )/(pow(r,2)-4);
-R1f -= texture( textureUnitPS0, R0f+ vec2((r-1)/2,(r-1)/2) * 2.0 /res )/(pow(r,2)-4); //workaround, less like a square, needs proper bokeh
-passPixelColor0 = R1f;
-}
\ No newline at end of file
+passPixelColor0 = R1f/count;
+}
+
diff --git a/Quality/BreathOfTheWild_1800p/cb0e6e8cbec4502a_0000000000000079_ps.txt b/Quality/BreathOfTheWild_1800p/cb0e6e8cbec4502a_0000000000000079_ps.txt
index c2dcd4df..328aa41b 100644
--- a/Quality/BreathOfTheWild_1800p/cb0e6e8cbec4502a_0000000000000079_ps.txt
+++ b/Quality/BreathOfTheWild_1800p/cb0e6e8cbec4502a_0000000000000079_ps.txt
@@ -23,17 +23,15 @@ ivec2 ires = textureSize(textureUnitPS0,0);
 vec2 res = vec2( float(ires.x), float(ires.y) );
 int r = int(floor(2.0 / uf_fragCoordScale.y + 0.5));
 vec4 R1f = vec4(0.0);
-
-for (int i=0; i<r; i++) {
-	float m = (1-r)/2 + float(i);
-	for (int k=0; k<r; k++){
-		float n = (1-r)/2 + float(k);
-		R1f += texture( textureUnitPS0, R0f+ vec2(m,n) * 2.0 /res )/(pow(r,2)-4); //assume 2px offset as well
+float count = 0.0;
+for( int x=-r; x<=r; x++ ) {
+	for( int y=-r; y<=r; y++ ) {
+		if( pow(x,2) + pow(y,2) <= pow(r,2) ) {
+			R1f += texture( textureUnitPS0, R0f + vec2(x,y)/res );
+			count += 1.0;
+			}
 		}
 	}
-R1f -= texture( textureUnitPS0, R0f+ vec2((1-r)/2,(1-r)/2) * 2.0 /res )/(pow(r,2)-4);
-R1f -= texture( textureUnitPS0, R0f+ vec2((1-r)/2,(r-1)/2) * 2.0 /res )/(pow(r,2)-4);
-R1f -= texture( textureUnitPS0, R0f+ vec2((r-1)/2,(1-r)/2) * 2.0 /res )/(pow(r,2)-4);
-R1f -= texture( textureUnitPS0, R0f+ vec2((r-1)/2,(r-1)/2) * 2.0 /res )/(pow(r,2)-4); //workaround, less like a square, needs proper bokeh
-passPixelColor0 = R1f;
-}
\ No newline at end of file
+passPixelColor0 = R1f/count;
+}
+
diff --git a/Quality/BreathOfTheWild_2160p/cb0e6e8cbec4502a_0000000000000079_ps.txt b/Quality/BreathOfTheWild_2160p/cb0e6e8cbec4502a_0000000000000079_ps.txt
index c2dcd4df..328aa41b 100644
--- a/Quality/BreathOfTheWild_2160p/cb0e6e8cbec4502a_0000000000000079_ps.txt
+++ b/Quality/BreathOfTheWild_2160p/cb0e6e8cbec4502a_0000000000000079_ps.txt
@@ -23,17 +23,15 @@ ivec2 ires = textureSize(textureUnitPS0,0);
 vec2 res = vec2( float(ires.x), float(ires.y) );
 int r = int(floor(2.0 / uf_fragCoordScale.y + 0.5));
 vec4 R1f = vec4(0.0);
-
-for (int i=0; i<r; i++) {
-	float m = (1-r)/2 + float(i);
-	for (int k=0; k<r; k++){
-		float n = (1-r)/2 + float(k);
-		R1f += texture( textureUnitPS0, R0f+ vec2(m,n) * 2.0 /res )/(pow(r,2)-4); //assume 2px offset as well
+float count = 0.0;
+for( int x=-r; x<=r; x++ ) {
+	for( int y=-r; y<=r; y++ ) {
+		if( pow(x,2) + pow(y,2) <= pow(r,2) ) {
+			R1f += texture( textureUnitPS0, R0f + vec2(x,y)/res );
+			count += 1.0;
+			}
 		}
 	}
-R1f -= texture( textureUnitPS0, R0f+ vec2((1-r)/2,(1-r)/2) * 2.0 /res )/(pow(r,2)-4);
-R1f -= texture( textureUnitPS0, R0f+ vec2((1-r)/2,(r-1)/2) * 2.0 /res )/(pow(r,2)-4);
-R1f -= texture( textureUnitPS0, R0f+ vec2((r-1)/2,(1-r)/2) * 2.0 /res )/(pow(r,2)-4);
-R1f -= texture( textureUnitPS0, R0f+ vec2((r-1)/2,(r-1)/2) * 2.0 /res )/(pow(r,2)-4); //workaround, less like a square, needs proper bokeh
-passPixelColor0 = R1f;
-}
\ No newline at end of file
+passPixelColor0 = R1f/count;
+}
+
diff --git a/Quality/BreathOfTheWild_2160pUW/cb0e6e8cbec4502a_0000000000000079_ps.txt b/Quality/BreathOfTheWild_2160pUW/cb0e6e8cbec4502a_0000000000000079_ps.txt
index c2dcd4df..328aa41b 100644
--- a/Quality/BreathOfTheWild_2160pUW/cb0e6e8cbec4502a_0000000000000079_ps.txt
+++ b/Quality/BreathOfTheWild_2160pUW/cb0e6e8cbec4502a_0000000000000079_ps.txt
@@ -23,17 +23,15 @@ ivec2 ires = textureSize(textureUnitPS0,0);
 vec2 res = vec2( float(ires.x), float(ires.y) );
 int r = int(floor(2.0 / uf_fragCoordScale.y + 0.5));
 vec4 R1f = vec4(0.0);
-
-for (int i=0; i<r; i++) {
-	float m = (1-r)/2 + float(i);
-	for (int k=0; k<r; k++){
-		float n = (1-r)/2 + float(k);
-		R1f += texture( textureUnitPS0, R0f+ vec2(m,n) * 2.0 /res )/(pow(r,2)-4); //assume 2px offset as well
+float count = 0.0;
+for( int x=-r; x<=r; x++ ) {
+	for( int y=-r; y<=r; y++ ) {
+		if( pow(x,2) + pow(y,2) <= pow(r,2) ) {
+			R1f += texture( textureUnitPS0, R0f + vec2(x,y)/res );
+			count += 1.0;
+			}
 		}
 	}
-R1f -= texture( textureUnitPS0, R0f+ vec2((1-r)/2,(1-r)/2) * 2.0 /res )/(pow(r,2)-4);
-R1f -= texture( textureUnitPS0, R0f+ vec2((1-r)/2,(r-1)/2) * 2.0 /res )/(pow(r,2)-4);
-R1f -= texture( textureUnitPS0, R0f+ vec2((r-1)/2,(1-r)/2) * 2.0 /res )/(pow(r,2)-4);
-R1f -= texture( textureUnitPS0, R0f+ vec2((r-1)/2,(r-1)/2) * 2.0 /res )/(pow(r,2)-4); //workaround, less like a square, needs proper bokeh
-passPixelColor0 = R1f;
-}
\ No newline at end of file
+passPixelColor0 = R1f/count;
+}
+
diff --git a/Quality/MK8_1080p/4727ccdea05045d0_0000000000000079_ps.txt b/Quality/MK8_1080p/4727ccdea05045d0_0000000000000079_ps.txt
index 60575b23..4865cfe2 100644
--- a/Quality/MK8_1080p/4727ccdea05045d0_0000000000000079_ps.txt
+++ b/Quality/MK8_1080p/4727ccdea05045d0_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/MK8_1080p/6dc0532bfaf19019_0000000000000079_ps.txt b/Quality/MK8_1080p/6dc0532bfaf19019_0000000000000079_ps.txt
index 878eef04..bdd61599 100644
--- a/Quality/MK8_1080p/6dc0532bfaf19019_0000000000000079_ps.txt
+++ b/Quality/MK8_1080p/6dc0532bfaf19019_0000000000000079_ps.txt
@@ -4,6 +4,7 @@
 // Used for: Vertical Blur
 const float blurFactor = 1.0; //Higher is less blur
 
+
 // Implementation of http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 layout(binding = 0) uniform sampler2D textureUnitPS0;
 layout(location = 0) in vec4 passParameterSem0;
@@ -14,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/MK8_1080pUW/4727ccdea05045d0_0000000000000079_ps.txt b/Quality/MK8_1080pUW/4727ccdea05045d0_0000000000000079_ps.txt
index 60575b23..4865cfe2 100644
--- a/Quality/MK8_1080pUW/4727ccdea05045d0_0000000000000079_ps.txt
+++ b/Quality/MK8_1080pUW/4727ccdea05045d0_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/MK8_1080pUW/6dc0532bfaf19019_0000000000000079_ps.txt b/Quality/MK8_1080pUW/6dc0532bfaf19019_0000000000000079_ps.txt
index 878eef04..bdd61599 100644
--- a/Quality/MK8_1080pUW/6dc0532bfaf19019_0000000000000079_ps.txt
+++ b/Quality/MK8_1080pUW/6dc0532bfaf19019_0000000000000079_ps.txt
@@ -4,6 +4,7 @@
 // Used for: Vertical Blur
 const float blurFactor = 1.0; //Higher is less blur
 
+
 // Implementation of http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 layout(binding = 0) uniform sampler2D textureUnitPS0;
 layout(location = 0) in vec4 passParameterSem0;
@@ -14,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/MK8_1440p/4727ccdea05045d0_0000000000000079_ps.txt b/Quality/MK8_1440p/4727ccdea05045d0_0000000000000079_ps.txt
index 60575b23..4865cfe2 100644
--- a/Quality/MK8_1440p/4727ccdea05045d0_0000000000000079_ps.txt
+++ b/Quality/MK8_1440p/4727ccdea05045d0_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/MK8_1440p/6dc0532bfaf19019_0000000000000079_ps.txt b/Quality/MK8_1440p/6dc0532bfaf19019_0000000000000079_ps.txt
index 878eef04..bdd61599 100644
--- a/Quality/MK8_1440p/6dc0532bfaf19019_0000000000000079_ps.txt
+++ b/Quality/MK8_1440p/6dc0532bfaf19019_0000000000000079_ps.txt
@@ -4,6 +4,7 @@
 // Used for: Vertical Blur
 const float blurFactor = 1.0; //Higher is less blur
 
+
 // Implementation of http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 layout(binding = 0) uniform sampler2D textureUnitPS0;
 layout(location = 0) in vec4 passParameterSem0;
@@ -14,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/MK8_1800p/4727ccdea05045d0_0000000000000079_ps.txt b/Quality/MK8_1800p/4727ccdea05045d0_0000000000000079_ps.txt
index 60575b23..4865cfe2 100644
--- a/Quality/MK8_1800p/4727ccdea05045d0_0000000000000079_ps.txt
+++ b/Quality/MK8_1800p/4727ccdea05045d0_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/MK8_1800p/6dc0532bfaf19019_0000000000000079_ps.txt b/Quality/MK8_1800p/6dc0532bfaf19019_0000000000000079_ps.txt
index c351511b..bdd61599 100644
--- a/Quality/MK8_1800p/6dc0532bfaf19019_0000000000000079_ps.txt
+++ b/Quality/MK8_1800p/6dc0532bfaf19019_0000000000000079_ps.txt
@@ -15,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/MK8_2160p/4727ccdea05045d0_0000000000000079_ps.txt b/Quality/MK8_2160p/4727ccdea05045d0_0000000000000079_ps.txt
index 60575b23..4865cfe2 100644
--- a/Quality/MK8_2160p/4727ccdea05045d0_0000000000000079_ps.txt
+++ b/Quality/MK8_2160p/4727ccdea05045d0_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/MK8_2160p/6dc0532bfaf19019_0000000000000079_ps.txt b/Quality/MK8_2160p/6dc0532bfaf19019_0000000000000079_ps.txt
index c351511b..bdd61599 100644
--- a/Quality/MK8_2160p/6dc0532bfaf19019_0000000000000079_ps.txt
+++ b/Quality/MK8_2160p/6dc0532bfaf19019_0000000000000079_ps.txt
@@ -15,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/MK8_2160p/rules.txt b/Quality/MK8_2160p/rules.txt
index c77f6092..92b11f69 100644
--- a/Quality/MK8_2160p/rules.txt
+++ b/Quality/MK8_2160p/rules.txt
@@ -3,21 +3,11 @@ titleIds = 000500001010ec00,000500001010ed00,000500001010eb00,ffffffff85887bc1
 name = "Mario Kart 8 - 3840x2160"
 version = 2
 
-# Main Screen Resolution better color depth
-[TextureRedefine] 
-width = 1280
-height = 720
-formats = 0x19,0x1a
-overwriteFormat = 0x1f
-tileModesExcluded = 0x001
-overwriteWidth = 3840
-overwriteHeight = 2160
-
 # Main Screen Resolution
 [TextureRedefine]
 width = 1280
 height = 720
-formatsExcluded = 0x41A,0x431,0x19,0x1a # exclude the intro background texture, race end background
+formatsExcluded = 0x41A,0x431 # exclude the intro background texture, race end background
 overwriteWidth = 3840
 overwriteHeight = 2160
 
diff --git a/Quality/MK8_2160pUW/4727ccdea05045d0_0000000000000079_ps.txt b/Quality/MK8_2160pUW/4727ccdea05045d0_0000000000000079_ps.txt
index 60575b23..4865cfe2 100644
--- a/Quality/MK8_2160pUW/4727ccdea05045d0_0000000000000079_ps.txt
+++ b/Quality/MK8_2160pUW/4727ccdea05045d0_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/MK8_2160pUW/6dc0532bfaf19019_0000000000000079_ps.txt b/Quality/MK8_2160pUW/6dc0532bfaf19019_0000000000000079_ps.txt
index 878eef04..bdd61599 100644
--- a/Quality/MK8_2160pUW/6dc0532bfaf19019_0000000000000079_ps.txt
+++ b/Quality/MK8_2160pUW/6dc0532bfaf19019_0000000000000079_ps.txt
@@ -4,6 +4,7 @@
 // Used for: Vertical Blur
 const float blurFactor = 1.0; //Higher is less blur
 
+
 // Implementation of http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 layout(binding = 0) uniform sampler2D textureUnitPS0;
 layout(location = 0) in vec4 passParameterSem0;
@@ -14,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/Splatoon_1080p/rules.txt b/Quality/Splatoon_1080p/rules.txt
index 4eef338a..cc62b2e0 100644
--- a/Quality/Splatoon_1080p/rules.txt
+++ b/Quality/Splatoon_1080p/rules.txt
@@ -6,45 +6,20 @@ version = 2
 [TextureRedefine] # tv
 width = 1280
 height = 720
-formatsExcluded = 0x816
-overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # tv (increased depth)
-width = 1280
-height = 720
-formats = 0x816
-overwriteFormat = 0x823
 overwriteWidth = 1920
 overwriteHeight = 1080
 
 [TextureRedefine] # half-res alpha
 width = 640
 height = 360
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
-overwriteWidth = 960
-overwriteHeight = 540
-
-[TextureRedefine] # half-res alpha (increased depth)
-width = 640
-height = 360
-formats = 0x816
-overwriteFormat = 0x823
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 960
 overwriteHeight = 540
 
 [TextureRedefine] # quarter-res alpha
 width = 320
 height = 180
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
-overwriteWidth = 480
-overwriteHeight = 270
-
-[TextureRedefine] # quarter-res alpha (increased depth)
-width = 320
-height = 180
-formats = 0x816
-overwriteFormat = 0x823
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 480
 overwriteHeight = 270
 
diff --git a/Quality/Splatoon_1080pUW/45d85f1d25e7d0de_0000000000000079_ps.txt b/Quality/Splatoon_1080pUW/45d85f1d25e7d0de_0000000000000079_ps.txt
index e9162537..9fe7817e 100644
--- a/Quality/Splatoon_1080pUW/45d85f1d25e7d0de_0000000000000079_ps.txt
+++ b/Quality/Splatoon_1080pUW/45d85f1d25e7d0de_0000000000000079_ps.txt
@@ -4,6 +4,7 @@
 // Used for: Vertical Blur
 const float blurFactor = 1.0; //Higher is less blur
 
+
 // Implementation of http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 layout(binding = 0) uniform sampler2D textureUnitPS0;
 layout(location = 0) in vec4 passParameterSem0;
@@ -14,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/Splatoon_1080pUW/4dc5fdeced670c5e_0000000000000079_ps.txt b/Quality/Splatoon_1080pUW/4dc5fdeced670c5e_0000000000000079_ps.txt
index 87aef259..dff2978b 100644
--- a/Quality/Splatoon_1080pUW/4dc5fdeced670c5e_0000000000000079_ps.txt
+++ b/Quality/Splatoon_1080pUW/4dc5fdeced670c5e_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/Splatoon_1080pUW/rules.txt b/Quality/Splatoon_1080pUW/rules.txt
index 0f86ae51..2c190e30 100644
--- a/Quality/Splatoon_1080pUW/rules.txt
+++ b/Quality/Splatoon_1080pUW/rules.txt
@@ -6,45 +6,20 @@ version = 2
 [TextureRedefine] # tv
 width = 1280
 height = 720
-formatsExcluded = 0x816
-overwriteWidth = 2560
-overwriteHeight = 1080
-
-[TextureRedefine] # tv (increased depth)
-width = 1280
-height = 720
-formats = 0x816
-overwriteFormat = 0x823
 overwriteWidth = 2560
 overwriteHeight = 1080
 
 [TextureRedefine] # half-res alpha
 width = 640
 height = 360
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 540
-
-[TextureRedefine] # half-res alpha (increased depth)
-width = 640
-height = 360
-formats = 0x816
-overwriteFormat = 0x823
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 1280
 overwriteHeight = 540
 
 [TextureRedefine] # quarter-res alpha
 width = 320
 height = 180
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
-overwriteWidth = 640
-overwriteHeight = 270
-
-[TextureRedefine] # quarter-res alpha (increased depth)
-width = 320
-height = 180
-formats = 0x816
-overwriteFormat = 0x823
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 640
 overwriteHeight = 270
 
diff --git a/Quality/Splatoon_1440p/45d85f1d25e7d0de_0000000000000079_ps.txt b/Quality/Splatoon_1440p/45d85f1d25e7d0de_0000000000000079_ps.txt
index e9162537..9fe7817e 100644
--- a/Quality/Splatoon_1440p/45d85f1d25e7d0de_0000000000000079_ps.txt
+++ b/Quality/Splatoon_1440p/45d85f1d25e7d0de_0000000000000079_ps.txt
@@ -4,6 +4,7 @@
 // Used for: Vertical Blur
 const float blurFactor = 1.0; //Higher is less blur
 
+
 // Implementation of http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 layout(binding = 0) uniform sampler2D textureUnitPS0;
 layout(location = 0) in vec4 passParameterSem0;
@@ -14,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/Splatoon_1440p/4dc5fdeced670c5e_0000000000000079_ps.txt b/Quality/Splatoon_1440p/4dc5fdeced670c5e_0000000000000079_ps.txt
index 87aef259..dff2978b 100644
--- a/Quality/Splatoon_1440p/4dc5fdeced670c5e_0000000000000079_ps.txt
+++ b/Quality/Splatoon_1440p/4dc5fdeced670c5e_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/Splatoon_1440p/rules.txt b/Quality/Splatoon_1440p/rules.txt
index 39609041..31c2e47a 100644
--- a/Quality/Splatoon_1440p/rules.txt
+++ b/Quality/Splatoon_1440p/rules.txt
@@ -6,45 +6,20 @@ version = 2
 [TextureRedefine] # tv
 width = 1280
 height = 720
-formatsExcluded = 0x816
-overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # tv (increased depth)
-width = 1280
-height = 720
-formats = 0x816
-overwriteFormat = 0x823
 overwriteWidth = 2560
 overwriteHeight = 1440
 
 [TextureRedefine] # half-res alpha
 width = 640
 height = 360
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
-overwriteWidth = 1280
-overwriteHeight = 720
-
-[TextureRedefine] # half-res alpha (increased depth)
-width = 640
-height = 360
-formats = 0x816
-overwriteFormat = 0x823
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 1280
 overwriteHeight = 720
 
 [TextureRedefine] # quarter-res alpha
 width = 320
 height = 180
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
-overwriteWidth = 640
-overwriteHeight = 360
-
-[TextureRedefine] # quarter-res alpha (increased depth)
-width = 320
-height = 180
-formats = 0x816
-overwriteFormat = 0x823
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 640
 overwriteHeight = 360
 
diff --git a/Quality/Splatoon_1800p/45d85f1d25e7d0de_0000000000000079_ps.txt b/Quality/Splatoon_1800p/45d85f1d25e7d0de_0000000000000079_ps.txt
index e9162537..9fe7817e 100644
--- a/Quality/Splatoon_1800p/45d85f1d25e7d0de_0000000000000079_ps.txt
+++ b/Quality/Splatoon_1800p/45d85f1d25e7d0de_0000000000000079_ps.txt
@@ -4,6 +4,7 @@
 // Used for: Vertical Blur
 const float blurFactor = 1.0; //Higher is less blur
 
+
 // Implementation of http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 layout(binding = 0) uniform sampler2D textureUnitPS0;
 layout(location = 0) in vec4 passParameterSem0;
@@ -14,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/Splatoon_1800p/4dc5fdeced670c5e_0000000000000079_ps.txt b/Quality/Splatoon_1800p/4dc5fdeced670c5e_0000000000000079_ps.txt
index 87aef259..dff2978b 100644
--- a/Quality/Splatoon_1800p/4dc5fdeced670c5e_0000000000000079_ps.txt
+++ b/Quality/Splatoon_1800p/4dc5fdeced670c5e_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/Splatoon_1800p/rules.txt b/Quality/Splatoon_1800p/rules.txt
index 104dbedc..59e6c4ef 100644
--- a/Quality/Splatoon_1800p/rules.txt
+++ b/Quality/Splatoon_1800p/rules.txt
@@ -6,45 +6,20 @@ version = 2
 [TextureRedefine] # tv
 width = 1280
 height = 720
-formatsExcluded = 0x816
-overwriteWidth = 3200
-overwriteHeight = 1800
-
-[TextureRedefine] # tv (increased depth)
-width = 1280
-height = 720
-formats = 0x816
-overwriteFormat = 0x823
 overwriteWidth = 3200
 overwriteHeight = 1800
 
 [TextureRedefine] # half-res alpha
 width = 640
 height = 360
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
-overwriteWidth = 1600
-overwriteHeight = 900
-
-[TextureRedefine] # half-res alpha (increased depth)
-width = 640
-height = 360
-formats = 0x816
-overwriteFormat = 0x823
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 1600
 overwriteHeight = 900
 
 [TextureRedefine] # quarter-res alpha
 width = 320
 height = 180
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
-overwriteWidth = 800
-overwriteHeight = 450
-
-[TextureRedefine] # quarter-res alpha (increased depth)
-width = 320
-height = 180
-formats = 0x816
-overwriteFormat = 0x823
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 800
 overwriteHeight = 450
 
diff --git a/Quality/Splatoon_2160p/45d85f1d25e7d0de_0000000000000079_ps.txt b/Quality/Splatoon_2160p/45d85f1d25e7d0de_0000000000000079_ps.txt
index e9162537..9fe7817e 100644
--- a/Quality/Splatoon_2160p/45d85f1d25e7d0de_0000000000000079_ps.txt
+++ b/Quality/Splatoon_2160p/45d85f1d25e7d0de_0000000000000079_ps.txt
@@ -4,6 +4,7 @@
 // Used for: Vertical Blur
 const float blurFactor = 1.0; //Higher is less blur
 
+
 // Implementation of http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 layout(binding = 0) uniform sampler2D textureUnitPS0;
 layout(location = 0) in vec4 passParameterSem0;
@@ -14,7 +15,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/Splatoon_2160p/4dc5fdeced670c5e_0000000000000079_ps.txt b/Quality/Splatoon_2160p/4dc5fdeced670c5e_0000000000000079_ps.txt
index 87aef259..dff2978b 100644
--- a/Quality/Splatoon_2160p/4dc5fdeced670c5e_0000000000000079_ps.txt
+++ b/Quality/Splatoon_2160p/4dc5fdeced670c5e_0000000000000079_ps.txt
@@ -14,7 +14,7 @@ uniform float weight[] = float[](0.18571429, 0.28870130, 0.10363636, 0.01480519)
 uniform float offset[] = float[](0.00000000, 1.42105263, 3.31578947, 5.21052632);
 
 ivec2 inputRes = textureSize(textureUnitPS0, 0);
-vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y)*uf_fragCoordScale);
+vec2 outputRes = vec2(float(inputRes.x), float(inputRes.y));
 vec2 scale = outputRes * blurFactor;
 void main()
 {
diff --git a/Quality/Splatoon_2160p/rules.txt b/Quality/Splatoon_2160p/rules.txt
index d84c2acd..da1c807e 100644
--- a/Quality/Splatoon_2160p/rules.txt
+++ b/Quality/Splatoon_2160p/rules.txt
@@ -6,54 +6,20 @@ version = 2
 [TextureRedefine] # tv
 width = 1280
 height = 720
-formatsExcluded = 0x816,0x19,0x1a
-overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] #TV
-width = 1280
-height = 720
-formats = 0x19,0x1a
-overwriteFormat = 0x1f
-tileModesExcluded = 0x001
-overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # tv (increased depth)
-width = 1280
-height = 720
-formats = 0x816
-overwriteFormat = 0x823
 overwriteWidth = 3840
 overwriteHeight = 2160
 
 [TextureRedefine] # half-res alpha
 width = 640
 height = 360
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
-overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # half-res alpha (increased depth)
-width = 640
-height = 360
-formats = 0x816
-overwriteFormat = 0x823
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 1920
 overwriteHeight = 1080
 
 [TextureRedefine] # quarter-res alpha
 width = 320
 height = 180
-formatsExcluded = 0x41A,0x431,0x816 # exclude obvious textures
-overwriteWidth = 960
-overwriteHeight = 540
-
-[TextureRedefine] # quarter-res alpha (increased depth)
-width = 320
-height = 180
-formats = 0x816
-overwriteFormat = 0x823
+formatsExcluded = 0x41A,0x431 # exclude obvious textures
 overwriteWidth = 960
 overwriteHeight = 540