diff --git a/Preformance/XCX_360p/rules.txt b/Preformance/XCX_360p/rules.txt
index f2e9a93d..c859fcef 100644
--- a/Preformance/XCX_360p/rules.txt
+++ b/Preformance/XCX_360p/rules.txt
@@ -19,10 +19,4 @@ overwriteHeight = 540
 width = 854
 height = 480
 overwriteWidth = 427
-overwriteHeight = 240
-
-[TextureRedefine] # AMD GCN4 workaround
-width = 320
-height = 180
-overwriteWidth = 0
-overwriteHeight = 0
\ No newline at end of file
+overwriteHeight = 240
\ No newline at end of file
diff --git a/Quality - Gamepad/XCX_1080pGamepad/rules.txt b/Quality - Gamepad/XCX_1080pGamepad/rules.txt
index b0b14424..1da2baaf 100644
--- a/Quality - Gamepad/XCX_1080pGamepad/rules.txt	
+++ b/Quality - Gamepad/XCX_1080pGamepad/rules.txt	
@@ -19,10 +19,4 @@ overwriteHeight = 540
 width = 854
 height = 480
 overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # AMD GCN4 workaround
-width = 320
-height = 180
-overwriteWidth = 0
-overwriteHeight = 0
\ No newline at end of file
+overwriteHeight = 1080
\ No newline at end of file
diff --git a/Quality - Gamepad/XCX_1440pGamepad/rules.txt b/Quality - Gamepad/XCX_1440pGamepad/rules.txt
index bd932e12..7295c1b2 100644
--- a/Quality - Gamepad/XCX_1440pGamepad/rules.txt	
+++ b/Quality - Gamepad/XCX_1440pGamepad/rules.txt	
@@ -19,10 +19,4 @@ overwriteHeight = 720
 width = 854
 height = 480
 overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # AMD GCN4 workaround
-width = 320
-height = 180
-overwriteWidth = 0
-overwriteHeight = 0
\ No newline at end of file
+overwriteHeight = 1440
\ No newline at end of file
diff --git a/Quality - Gamepad/XCX_2160pGamepad/rules.txt b/Quality - Gamepad/XCX_2160pGamepad/rules.txt
index 926436d6..9b17bb70 100644
--- a/Quality - Gamepad/XCX_2160pGamepad/rules.txt	
+++ b/Quality - Gamepad/XCX_2160pGamepad/rules.txt	
@@ -19,10 +19,4 @@ overwriteHeight = 1080
 width = 854
 height = 480
 overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # AMD GCN4 workaround
-width = 320
-height = 180
-overwriteWidth = 0
-overwriteHeight = 0
\ No newline at end of file
+overwriteHeight = 2160
\ No newline at end of file
diff --git a/Quality/XCX_1080p/rules.txt b/Quality/XCX_1080p/rules.txt
index 9122caa6..ebcd518c 100644
--- a/Quality/XCX_1080p/rules.txt
+++ b/Quality/XCX_1080p/rules.txt
@@ -13,10 +13,4 @@ width = 640
 height = 360
 formatsExcluded = 0x41A # exclude obvious textures
 overwriteWidth = 960
-overwriteHeight = 540
-
-[TextureRedefine] # AMD GCN4 workaround
-width = 320
-height = 180
-overwriteWidth = 0
-overwriteHeight = 0
\ No newline at end of file
+overwriteHeight = 540
\ No newline at end of file
diff --git a/Quality/XCX_1440p/rules.txt b/Quality/XCX_1440p/rules.txt
index 4119cddb..d6f6c2cc 100644
--- a/Quality/XCX_1440p/rules.txt
+++ b/Quality/XCX_1440p/rules.txt
@@ -13,10 +13,4 @@ width = 640
 height = 360
 formatsExcluded = 0x41A # exclude obvious textures
 overwriteWidth = 1280
-overwriteHeight = 720
-
-[TextureRedefine] # AMD GCN4 workaround
-width = 320
-height = 180
-overwriteWidth = 0
-overwriteHeight = 0
\ No newline at end of file
+overwriteHeight = 720
\ No newline at end of file
diff --git a/Quality/XCX_2160p/rules.txt b/Quality/XCX_2160p/rules.txt
index b5697964..007455e2 100644
--- a/Quality/XCX_2160p/rules.txt
+++ b/Quality/XCX_2160p/rules.txt
@@ -13,10 +13,4 @@ width = 640
 height = 360
 formatsExcluded = 0x41A # exclude obvious textures
 overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # AMD GCN4 workaround
-width = 320
-height = 180
-overwriteWidth = 0
-overwriteHeight = 0
\ No newline at end of file
+overwriteHeight = 1080
\ No newline at end of file
diff --git a/Workarounds/XCX_AMDGCN4/rules.txt b/Workarounds/XCX_AMDGCN4/rules.txt
new file mode 100644
index 00000000..d36237b4
--- /dev/null
+++ b/Workarounds/XCX_AMDGCN4/rules.txt
@@ -0,0 +1,9 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - AMD GCN4 workaround"
+
+[TextureRedefine]
+width = 320
+height = 180
+overwriteWidth = 0
+overwriteHeight = 0
\ No newline at end of file