diff --git a/Enhancement/MK8_AARemoval/815b44e6e90fd27d_00000000000003c9_ps_source.txt b/Enhancement/MK8_AARemoval/815b44e6e90fd27d_00000000000003c9_ps_source.txt
deleted file mode 100644
index 0dff4254..00000000
--- a/Enhancement/MK8_AARemoval/815b44e6e90fd27d_00000000000003c9_ps_source.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-#version 400
-#extension GL_ARB_texture_gather : enable
-// shader 815b44e6e90fd27d
-uniform ivec4 uf_remappedPS[4];
-uniform sampler2D textureUnitPS0;// Tex0 addr 0xf49b1000 res 1280x720x1 dim 1 tm: 4 format 0019 compSel: 0 1 2 3 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler0 ClampX/Y/Z: 2 2 2 border: 1
-uniform sampler2D textureUnitPS1;// Tex1 addr 0xf4240800 res 1280x720x1 dim 1 tm: 4 format 0001 compSel: 0 4 4 5 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler1 ClampX/Y/Z: 2 2 2 border: 1
-in vec4 passParameter0;
-layout(location = 0) out vec4 passPixelColor0;
-int clampFI32(int v)
-{
-if( v == 0x7FFFFFFF )
-	return floatBitsToInt(1.0);
-else if( v == 0xFFFFFFFF )
-	return floatBitsToInt(0.0);
-return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0));
-}
-float mul_nonIEEE(float a, float b){ if( a == 0.0 || b == 0.0 ) return 0.0; return a*b; }
-void main()
-{
-ivec4 R0i = ivec4(0);
-ivec4 R1i = ivec4(0);
-ivec4 R2i = ivec4(0);
-ivec4 R3i = ivec4(0);
-ivec4 R4i = ivec4(0);
-ivec4 R123i = ivec4(0);
-ivec4 R126i = ivec4(0);
-ivec4 R127i = ivec4(0);
-int backupReg0i, backupReg1i, backupReg2i, backupReg3i, backupReg4i;
-float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f;
-ivec4 PV0i = ivec4(0), PV1i = ivec4(0);
-int PS0i = 0, PS1i = 0;
-ivec4 tempi = ivec4(0);
-float tempResultf;
-int tempResulti;
-ivec4 ARi = ivec4(0);
-bool predResult = true;
-bool activeMaskStack[31];
-bool activeMaskStackC[32];
-int activeMaskIndex = 0;
-activeMaskStack[0] = true;
-activeMaskStackC[0] = true;
-activeMaskStackC[1] = true;
-int loopStuckCounter = 0;
-vec3 cubeMapSTM;
-int cubeMapFaceId;
-R0i = floatBitsToInt(passParameter0);
-//R1i.xyzw = floatBitsToInt(textureGather(textureUnitPS1, intBitsToFloat(R0i.xy)).xyzw);
-R2i.xyzw = floatBitsToInt(texture(textureUnitPS0, intBitsToFloat(R0i.xy)).xyzw);
-passPixelColor0 = vec4(intBitsToFloat(R2i.x), intBitsToFloat(R2i.y), intBitsToFloat(R2i.z), intBitsToFloat(R2i.w));
-}
diff --git a/Enhancement/MK8_AARemoval/8e1337dde42fd224_00000000000003c9_ps.txt b/Enhancement/MK8_AARemoval/8e1337dde42fd224_00000000000003c9_ps.txt
new file mode 100644
index 00000000..39677c23
--- /dev/null
+++ b/Enhancement/MK8_AARemoval/8e1337dde42fd224_00000000000003c9_ps.txt
@@ -0,0 +1,163 @@
+#version 420
+#extension GL_ARB_texture_gather : enable
+// shader 8e1337dde42fd224
+uniform ivec4 uf_remappedPS[4];
+layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf49b1000 res 1280x720x1 dim 1 tm: 4 format 0019 compSel: 0 1 2 3 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler0 ClampX/Y/Z: 2 2 2 border: 1
+layout(binding = 1) uniform sampler2D textureUnitPS1;// Tex1 addr 0xf4240800 res 1280x720x1 dim 1 tm: 4 format 0001 compSel: 0 4 4 5 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler1 ClampX/Y/Z: 2 2 2 border: 1
+layout(location = 0) in vec4 passParameterSem2;
+layout(location = 0) out vec4 passPixelColor0;
+uniform vec2 uf_fragCoordScale;
+int clampFI32(int v)
+{
+if( v == 0x7FFFFFFF )
+	return floatBitsToInt(1.0);
+else if( v == 0xFFFFFFFF )
+	return floatBitsToInt(0.0);
+return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0));
+}
+float mul_nonIEEE(float a, float b){ if( a == 0.0 || b == 0.0 ) return 0.0; return a*b; }
+void main()
+{
+vec4 R0f = vec4(0.0);
+vec4 R1f = vec4(0.0);
+vec4 R2f = vec4(0.0);
+vec4 R3f = vec4(0.0);
+vec4 R4f = vec4(0.0);
+vec4 R123f = vec4(0.0);
+vec4 R126f = vec4(0.0);
+vec4 R127f = vec4(0.0);
+float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f;
+vec4 PV0f = vec4(0.0), PV1f = vec4(0.0);
+float PS0f = 0.0, PS1f = 0.0;
+vec4 tempf = vec4(0.0);
+float tempResultf;
+int tempResulti;
+ivec4 ARi = ivec4(0);
+bool predResult = true;
+bool activeMaskStack[2];
+bool activeMaskStackC[3];
+activeMaskStack[0] = false;
+activeMaskStackC[0] = false;
+activeMaskStackC[1] = false;
+activeMaskStack[0] = true;
+activeMaskStackC[0] = true;
+activeMaskStackC[1] = true;
+vec3 cubeMapSTM;
+int cubeMapFaceId;
+R0f = passParameterSem2;
+if( activeMaskStackC[1] == true ) {
+//R1f.xyzw = (textureGather(textureUnitPS1, R0f.xy).wzxy);
+R2f.xyzw = (texture(textureUnitPS0, R0f.xy).xyzw);
+}
+if( activeMaskStackC[1] == true ) {
+activeMaskStack[1] = activeMaskStack[0];
+activeMaskStackC[2] = activeMaskStackC[1];
+// 0
+PV0f.x = R1f.y + R1f.x;
+R127f.y = intBitsToFloat(uf_remappedPS[0].z) * 0.25;
+PV0f.z = R1f.w + -(R1f.x);
+PV0f.w = R1f.z + -(R1f.y);
+R127f.z = mul_nonIEEE(R2f.x, intBitsToFloat(uf_remappedPS[1].x));
+PS0f = R127f.z;
+// 1
+R127f.x = PV0f.w + -(PV0f.z);
+PV1f.x = R127f.x;
+R126f.y = PV0f.w + PV0f.z;
+PV1f.y = R126f.y;
+PV1f.z = R1f.z + PV0f.x;
+R127f.w = min(R1f.z, R1f.x);
+R126f.w = min(R1f.w, R1f.y);
+PS1f = R126f.w;
+// 2
+PV0f.x = R1f.w + PV1f.z;
+PV0f.y = max(PV1f.x, -(PV1f.x));
+PV0f.z = max(PV1f.y, -(PV1f.y));
+PV0f.w = max(R1f.z, R1f.x);
+PS0f = max(R1f.w, R1f.y);
+// 3
+PV1f.x = min(PV0f.z, PV0f.y);
+R123f.y = (R2f.y * intBitsToFloat(uf_remappedPS[1].y) + R127f.z);
+PV1f.y = R123f.y;
+PV1f.z = min(R127f.w, R126f.w);
+R123f.w = (R127f.y * PV0f.x + intBitsToFloat(uf_remappedPS[0].w));
+PV1f.w = R123f.w;
+PS1f = max(PV0f.w, PS0f);
+// 4
+PV0f.x = mul_nonIEEE(PS1f, intBitsToFloat(uf_remappedPS[2].x));
+PV0f.y = max(PV1f.y, PS1f);
+PV0f.z = min(PV1f.y, PV1f.z);
+PV0f.w = max(PV1f.w, PV1f.x);
+// 5
+R3f.x = max(PV0f.x, intBitsToFloat(uf_remappedPS[2].y));
+R3f.y = -(PV0f.z) + PV0f.y;
+PS1f = 1.0 / PV0f.w;
+// 6
+PV0f.x = mul_nonIEEE(R127f.x, PS1f);
+PV0f.y = mul_nonIEEE(R126f.y, PS1f);
+// 7
+PV1f.z = max(PV0f.x, -(intBitsToFloat(uf_remappedPS[0].y)));
+PV1f.w = max(PV0f.y, -(intBitsToFloat(uf_remappedPS[0].y)));
+// 8
+R1f.x = min(PV1f.w, intBitsToFloat(uf_remappedPS[0].y));
+R1f.y = min(PV1f.z, intBitsToFloat(uf_remappedPS[0].y));
+// 9
+predResult = (R3f.y > R3f.x);
+activeMaskStack[1] = predResult;
+activeMaskStackC[2] = predResult == true && activeMaskStackC[1] == true;
+}
+else {
+activeMaskStack[1] = false;
+activeMaskStackC[2] = false;
+}
+if( activeMaskStackC[2] == true ) {
+// 0
+R3f.x = (R1f.x * -(intBitsToFloat(uf_remappedPS[3].z)) + R0f.x);
+R3f.y = (R1f.y * -(intBitsToFloat(uf_remappedPS[3].w)) + R0f.y);
+R0f.z = (R1f.x * intBitsToFloat(uf_remappedPS[3].x) + R0f.x);
+R0f.w = (R1f.y * intBitsToFloat(uf_remappedPS[3].y) + R0f.y);
+R3f.z = (R1f.x * intBitsToFloat(uf_remappedPS[3].z) + R0f.x);
+PS0f = R3f.z;
+// 1
+R4f.x = (R1f.x * -(intBitsToFloat(uf_remappedPS[3].x)) + R0f.x);
+R4f.y = (R1f.y * -(intBitsToFloat(uf_remappedPS[3].y)) + R0f.y);
+R3f.w = (R1f.y * intBitsToFloat(uf_remappedPS[3].w) + R0f.y);
+}
+if( activeMaskStackC[2] == true ) {
+R1f.xyzw = (texture(textureUnitPS0, R0f.zw).xyzw);
+R0f.xyzw = (texture(textureUnitPS0, R3f.zw).xyzw);
+R3f.xyzw = (texture(textureUnitPS0, R3f.xy).xyzw);
+R2f.xyzw = (texture(textureUnitPS0, R4f.xy).xyzw);
+}
+if( activeMaskStackC[2] == true ) {
+// 0
+R127f.x = R0f.w + R1f.w;
+R127f.x /= 2.0;
+R127f.y = R0f.z + R1f.z;
+R127f.y /= 2.0;
+R127f.z = R0f.y + R1f.y;
+R127f.z /= 2.0;
+R127f.w = R0f.x + R1f.x;
+R127f.w /= 2.0;
+// 1
+PV1f.x = R2f.w + R3f.w;
+PV1f.x /= 2.0;
+PV1f.y = R2f.z + R3f.z;
+PV1f.y /= 2.0;
+PV1f.z = R2f.y + R3f.y;
+PV1f.z /= 2.0;
+PV1f.w = R2f.x + R3f.x;
+PV1f.w /= 2.0;
+// 2
+R2f.x = R127f.w + PV1f.w;
+R2f.x /= 2.0;
+R2f.y = R127f.z + PV1f.z;
+R2f.y /= 2.0;
+R2f.z = R127f.y + PV1f.y;
+R2f.z /= 2.0;
+R2f.w = R127f.x + PV1f.x;
+R2f.w /= 2.0;
+}
+activeMaskStackC[1] = activeMaskStack[0] == true && activeMaskStackC[0] == true;
+// export
+passPixelColor0 = vec4(R2f.x, R2f.y, R2f.z, R2f.w);
+}
diff --git a/Enhancement/MK8_AARemoval/rules.txt b/Enhancement/MK8_AARemoval/rules.txt
index 9784d4a8..8ab553b5 100644
--- a/Enhancement/MK8_AARemoval/rules.txt
+++ b/Enhancement/MK8_AARemoval/rules.txt
@@ -1,3 +1,4 @@
 [Definition]
 titleIds = 000500001010ec00,000500001010ed00,000500001010eb00,ffffffff85887bc1
-name = "Mario Kart 8 - No Anti-Aliasing"
\ No newline at end of file
+name = "Mario Kart 8 - No Anti-Aliasing"
+version = 2
\ No newline at end of file
diff --git a/Workaround/XCX_AdjustableBloom/3cc7e98f78c258b4_00000000000003ca_ps.txt b/Workaround/XCX_AdjustableBrightness/3cc7e98f78c258b4_00000000000003ca_ps.txt
similarity index 100%
rename from Workaround/XCX_AdjustableBloom/3cc7e98f78c258b4_00000000000003ca_ps.txt
rename to Workaround/XCX_AdjustableBrightness/3cc7e98f78c258b4_00000000000003ca_ps.txt
diff --git a/Workaround/XCX_AdjustableBloom/rules.txt b/Workaround/XCX_AdjustableBrightness/rules.txt
similarity index 57%
rename from Workaround/XCX_AdjustableBloom/rules.txt
rename to Workaround/XCX_AdjustableBrightness/rules.txt
index 0d24fcad..0e7c2419 100644
--- a/Workaround/XCX_AdjustableBloom/rules.txt
+++ b/Workaround/XCX_AdjustableBrightness/rules.txt
@@ -1,4 +1,4 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00,ffffffff0cd546a9
-name = "Xenoblade Chronicles X - Adjustable Bloom"
+name = "Xenoblade Chronicles X - Adjustable Brightness"
 version = 2
\ No newline at end of file