diff --git a/Enhancements/DonkeyKongTropicalFreeze_-AARemoval/10ccf0cc1234d069_00000000000003c9_ps.txt b/Enhancements/DonkeyKongTropicalFreeze_!AARemoval/10ccf0cc1234d069_00000000000003c9_ps.txt
similarity index 100%
rename from Enhancements/DonkeyKongTropicalFreeze_-AARemoval/10ccf0cc1234d069_00000000000003c9_ps.txt
rename to Enhancements/DonkeyKongTropicalFreeze_!AARemoval/10ccf0cc1234d069_00000000000003c9_ps.txt
diff --git a/Enhancements/DonkeyKongTropicalFreeze_-AARemoval/bafe6c9c37bfca4d_00000000000003c9_ps.txt b/Enhancements/DonkeyKongTropicalFreeze_!AARemoval/bafe6c9c37bfca4d_00000000000003c9_ps.txt
similarity index 100%
rename from Enhancements/DonkeyKongTropicalFreeze_-AARemoval/bafe6c9c37bfca4d_00000000000003c9_ps.txt
rename to Enhancements/DonkeyKongTropicalFreeze_!AARemoval/bafe6c9c37bfca4d_00000000000003c9_ps.txt
diff --git a/Enhancements/DonkeyKongTropicalFreeze_-AARemoval/rules.txt b/Enhancements/DonkeyKongTropicalFreeze_!AARemoval/rules.txt
similarity index 100%
rename from Enhancements/DonkeyKongTropicalFreeze_-AARemoval/rules.txt
rename to Enhancements/DonkeyKongTropicalFreeze_!AARemoval/rules.txt
diff --git a/Enhancements/XenobladeX_Enhancement_FancyFX/5eb82314ffb8484e_00000000000007f9_ps.txt b/Enhancements/XenobladeX_FancyFX/5eb82314ffb8484e_00000000000007f9_ps.txt
similarity index 100%
rename from Enhancements/XenobladeX_Enhancement_FancyFX/5eb82314ffb8484e_00000000000007f9_ps.txt
rename to Enhancements/XenobladeX_FancyFX/5eb82314ffb8484e_00000000000007f9_ps.txt
diff --git a/Enhancements/XenobladeX_Enhancement_FancyFX/840947e29015aa9a_00000000000003c9_ps.txt b/Enhancements/XenobladeX_FancyFX/840947e29015aa9a_00000000000003c9_ps.txt
similarity index 100%
rename from Enhancements/XenobladeX_Enhancement_FancyFX/840947e29015aa9a_00000000000003c9_ps.txt
rename to Enhancements/XenobladeX_FancyFX/840947e29015aa9a_00000000000003c9_ps.txt
diff --git a/Enhancements/XenobladeX_Enhancement_FancyFX/_810cde937ebbdf9f_000000000000000f_ps.txt b/Enhancements/XenobladeX_FancyFX/_810cde937ebbdf9f_000000000000000f_ps.txt
similarity index 100%
rename from Enhancements/XenobladeX_Enhancement_FancyFX/_810cde937ebbdf9f_000000000000000f_ps.txt
rename to Enhancements/XenobladeX_FancyFX/_810cde937ebbdf9f_000000000000000f_ps.txt
diff --git a/Enhancements/XenobladeX_Enhancement_FancyFX/_b253dca415790207_0000000000000079_ps.txt b/Enhancements/XenobladeX_FancyFX/_b253dca415790207_0000000000000079_ps.txt
similarity index 100%
rename from Enhancements/XenobladeX_Enhancement_FancyFX/_b253dca415790207_0000000000000079_ps.txt
rename to Enhancements/XenobladeX_FancyFX/_b253dca415790207_0000000000000079_ps.txt
diff --git a/Enhancements/XenobladeX_Enhancement_FancyFX/_ed70de7fe7542f87_00000000000003c9_ps.txt b/Enhancements/XenobladeX_FancyFX/_ed70de7fe7542f87_00000000000003c9_ps.txt
similarity index 100%
rename from Enhancements/XenobladeX_Enhancement_FancyFX/_ed70de7fe7542f87_00000000000003c9_ps.txt
rename to Enhancements/XenobladeX_FancyFX/_ed70de7fe7542f87_00000000000003c9_ps.txt
diff --git a/Enhancements/XenobladeX_Enhancement_FancyFX/b3fb199c73caa796_00000000000003c9_ps.txt b/Enhancements/XenobladeX_FancyFX/b3fb199c73caa796_00000000000003c9_ps.txt
similarity index 100%
rename from Enhancements/XenobladeX_Enhancement_FancyFX/b3fb199c73caa796_00000000000003c9_ps.txt
rename to Enhancements/XenobladeX_FancyFX/b3fb199c73caa796_00000000000003c9_ps.txt
diff --git a/Enhancements/XenobladeX_Enhancement_FancyFX/d8e69e8df8c227f5_00000000000003c9_ps.txt b/Enhancements/XenobladeX_FancyFX/d8e69e8df8c227f5_00000000000003c9_ps.txt
similarity index 100%
rename from Enhancements/XenobladeX_Enhancement_FancyFX/d8e69e8df8c227f5_00000000000003c9_ps.txt
rename to Enhancements/XenobladeX_FancyFX/d8e69e8df8c227f5_00000000000003c9_ps.txt
diff --git a/Enhancements/XenobladeX_Enhancement_FancyFX/e412d30f981be3b5_0000000000000000_vs.txt b/Enhancements/XenobladeX_FancyFX/e412d30f981be3b5_0000000000000000_vs.txt
similarity index 100%
rename from Enhancements/XenobladeX_Enhancement_FancyFX/e412d30f981be3b5_0000000000000000_vs.txt
rename to Enhancements/XenobladeX_FancyFX/e412d30f981be3b5_0000000000000000_vs.txt
diff --git a/Enhancements/XenobladeX_Enhancement_FancyFX/rules.txt b/Enhancements/XenobladeX_FancyFX/rules.txt
similarity index 89%
rename from Enhancements/XenobladeX_Enhancement_FancyFX/rules.txt
rename to Enhancements/XenobladeX_FancyFX/rules.txt
index cd816120..7ea694dd 100644
--- a/Enhancements/XenobladeX_Enhancement_FancyFX/rules.txt
+++ b/Enhancements/XenobladeX_FancyFX/rules.txt
@@ -1,7 +1,7 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = Fancy gfx # I would have called this RTX on, but Nvidia has trademarked it ;)
-path = "Xenoblade Chronicles X/Enhancements/Fancy fx" 
+name = Fancy GFX # I would have called this RTX on, but Nvidia has trademarked it ;)
+path = "Xenoblade Chronicles X/Enhancements/Fancy FX" 
 description = Pretty blur, de-band sky, re-align cinematic etc, maintained on Nvidia.   
 version = 3
 
diff --git a/Mods/BreathOfTheWild_FPS++/rules.txt b/Mods/BreathOfTheWild_FPS++/rules.txt
index b6060fa9..269fcd0c 100644
--- a/Mods/BreathOfTheWild_FPS++/rules.txt
+++ b/Mods/BreathOfTheWild_FPS++/rules.txt
@@ -13,7 +13,6 @@ $targetFPS:int = 60
 name = 30FPS (ideal for 240/120/60Hz displays)
 $targetFPS:int = 30
 
-
 [Preset]
 name = 40FPS (ideal for 240/120/60Hz displays)
 $targetFPS:int = 40
diff --git a/Resolutions/FatalFrameProjectZero_Resolution/patches.txt b/Resolutions/FatalFrameProjectZero_Resolution/patches.txt
index 97fb05f4..43d68909 100644
--- a/Resolutions/FatalFrameProjectZero_Resolution/patches.txt
+++ b/Resolutions/FatalFrameProjectZero_Resolution/patches.txt
@@ -1,5 +1,5 @@
 [USAFatalFrameV0]
-moduleMatches = 0xE93B31F6; Vanilla Patch
+moduleMatches = 0xE93B31F6
 
 codeCaveSize = 0x4
 
@@ -12,11 +12,7 @@ _pointSpriteSize = 0x00000000
 
 
 [EuropeProjectZeroV0]
-moduleMatches = 0xB54DBEB0; Vanilla Patch
-moduleMatches = 0x5A9D6D31; Uncensored Patch 1
-moduleMatches = 0x360FA109; Uncensored Patch 2
-moduleMatches = 0x9D96F19B; Uncensored Patch 3
-moduleMatches = 0x81551809; Uncensored Patch 4
+moduleMatches = 0xB54DBEB0, 0x5A9D6D31, 0x360FA109, 0x9D96F19B, 0x81551809 # Vanilla, Uncensored Patches
 
 codeCaveSize = 0x4
 
@@ -28,8 +24,7 @@ _pointSpriteSize = 0x00000000
 0x026CF514 = lwz r6, _pointSpriteSize@l(r12)
 
 [JapanZeroV0]
-moduleMatches = 0xA86AA5B2; Vanilla Patch
-moduleMatches = 0x52992DCD; ? Patch
+moduleMatches = 0xA86AA5B2, 0x52992DCD # Vanilla, Unknown Patch
 
 codeCaveSize = 0x4