diff --git a/Enhancement/TheWindWaker_AARemoval/ff71dcd2ad4defdc_00000000000003c9_ps.txt b/Enhancement/TheWindWaker_AARemoval/ff71dcd2ad4defdc_00000000000003c9_ps.txt
index 8cb87483..6b884d6a 100644
--- a/Enhancement/TheWindWaker_AARemoval/ff71dcd2ad4defdc_00000000000003c9_ps.txt
+++ b/Enhancement/TheWindWaker_AARemoval/ff71dcd2ad4defdc_00000000000003c9_ps.txt
@@ -1,6 +1,6 @@
 #version 420
 #extension GL_ARB_texture_gather : enable
-// shader ff71dcd2ad4defdc
+// shader ff71dcd2ad4defdc // AA removal cemu 1.8 Github version
 uniform ivec4 uf_remappedPS[4];
 layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf5807800 res 1920x1080x1 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 0xf4000800 res 1920x1080x1 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
@@ -44,8 +44,4 @@ activeMaskStackC[0] = true;
 activeMaskStackC[1] = true;
 vec3 cubeMapSTM;
 int cubeMapFaceId;
-R0f = passParameterSem2;
-//R1f.xyzw = (textureGather(textureUnitPS1, R0f.xy).wzxy);
-R2f.xyzw = (texture(textureUnitPS0, R0f.xy).xyzw);
-passPixelColor0 = R2f.xyzw;
 }
diff --git a/Enhancement/XCX_AARemoval/59df1c7e1806366c_00000000000003c9_ps.txt b/Enhancement/XCX_AARemoval/59df1c7e1806366c_00000000000003c9_ps.txt
new file mode 100644
index 00000000..cb168640
--- /dev/null
+++ b/Enhancement/XCX_AARemoval/59df1c7e1806366c_00000000000003c9_ps.txt
@@ -0,0 +1,48 @@
+#version 420
+#extension GL_ARB_texture_gather : enable
+// shader 59df1c7e1806366c // AA removal cemu 1.8 Github version
+uniform ivec4 uf_remappedPS[2];
+layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf4e12000 res 1280x720x1 dim 1 tm: 4 format 0001 compSel: 0 4 4 5 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler0 ClampX/Y/Z: 2 2 2 border: 0
+layout(binding = 1) uniform sampler2D textureUnitPS1;// Tex1 addr 0xf470a000 res 1280x720x1 dim 1 tm: 4 format 0816 compSel: 0 1 2 5 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler1 ClampX/Y/Z: 2 2 2 border: 0
+layout(location = 0) in vec4 passParameterSem0;
+layout(location = 1) in vec4 passParameterSem1;
+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){ return min(a*b,min(abs(a)*3.40282347E+38F,abs(b)*3.40282347E+38F)); }
+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;
+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[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;
+}
diff --git a/Enhancement/XCX_AARemoval/fb621fd19d12ca17_00000000000003c9_ps_source.txt b/Enhancement/XCX_AARemoval/fb621fd19d12ca17_00000000000003c9_ps_source.txt
deleted file mode 100644
index 55df8c8c..00000000
--- a/Enhancement/XCX_AARemoval/fb621fd19d12ca17_00000000000003c9_ps_source.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-#version 400
-#extension GL_ARB_texture_gather : enable
-// shader fb621fd19d12ca17 //porob
-uniform ivec4 uf_remappedPS[2];
-uniform sampler2D textureUnitPS0;// Tex0 addr 0xf4e12000 res 1280x720x1 dim 1 tm: 4 format 0001 compSel: 0 4 4 5 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler0 ClampX/Y/Z: 2 2 2 border: 0
-uniform sampler2D textureUnitPS1;// Tex1 addr 0xf470a000 res 1280x720x1 dim 1 tm: 4 format 0816 compSel: 0 1 2 5 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler1 ClampX/Y/Z: 2 2 2 border: 0
-in vec4 passParameter0;
-in vec4 passParameter1;
-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){ return min(a*b,min(abs(a)*3.40282347E+38F,abs(b)*3.40282347E+38F)); }
-void main()
-{
-discard;
-
-}
diff --git a/Enhancement/XCX_AARemoval/rules.txt b/Enhancement/XCX_AARemoval/rules.txt
index 1eb72330..8796b3c4 100644
--- a/Enhancement/XCX_AARemoval/rules.txt
+++ b/Enhancement/XCX_AARemoval/rules.txt
@@ -1,3 +1,4 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00,ffffffff0cd546a9
-name = "Xenoblade Chronicles X - No Anti-Aliasing" # As of 1.7.5 of Cemu no longer breaks ground textures (high gpu), only use this fix for AA. 
+name = "Xenoblade Chronicles X - AA Removal" # Cemu 1.8
+version = 2