diff --git a/Enhancements/Splatoon_AnisotropicFiltering/rules.txt b/Enhancements/Splatoon_AnisotropicFiltering/rules.txt
deleted file mode 100644
index 737212a3..00000000
--- a/Enhancements/Splatoon_AnisotropicFiltering/rules.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[Definition]
-titleIds = 0005000010176900,0005000010176A00,0005000010162B00
-name = Anisotropic Filtering
-path = "Splatoon/Enhancements/Anisotropic Filtering"
-description = Requires Cemu 1.21.3 or above|Allows adjustment of anisotropic filtering on geometry.|Has a minimal performance impact.
-version = 6
-
-[Default]
-$anisotropy = 1
-
-[Preset]
-name = 1x
-category = Filtering Level
-
-[Preset]
-name = 2x
-category = Filtering Level
-$anisotropy = 2
-
-[Preset]
-name = 4x
-category = Filtering Level
-$anisotropy = 4
-
-[Preset]
-name = 8x
-category = Filtering Level
-$anisotropy = 8
-
-[Preset]
-name = 16x
-category = Filtering Level
-$anisotropy = 16
-
-[TextureRedefine]
-formats = 0x31,0x34,0x35,0x235,0x431,0x433
-overwriteAnisotropy = $anisotropy
diff --git a/Enhancements/Splatoon_Shadows/rules.txt b/Enhancements/Splatoon_Shadows/rules.txt
deleted file mode 100644
index 1c116112..00000000
--- a/Enhancements/Splatoon_Shadows/rules.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-[Definition]
-titleIds = 0005000010176900,0005000010176A00,0005000010162B00
-name = Shadow Resolution
-path = "Splatoon/Graphics/Shadow Resolution"
-description = Note: Increasing shadow resolution is known to increase VRAM usage directly. Lowering this might give you a good boost in performance if you're limited on VRAM but makes shadows blockier. Medium is the original resolution. Made by Slashiee.
-version = 4
-
-[Preset]
-name = Medium (100%, Default)
-$shadowRes = 1
-
-[Preset]
-name = Low (50%)
-$shadowRes = 0.5
-
-[Preset]
-name = High (200%)
-$shadowRes = 2
-
-[Preset]
-name = Ultra (300%)
-$shadowRes = 3
-
-[Preset]
-name = Extreme (400%, Unstable)
-$shadowRes = 4
-
-[TextureRedefine] # Shadows
-width = 2048
-height = 2048
-formats = 0x5
-overwriteWidth = $shadowRes * 2048
-overwriteHeight = $shadowRes * 2048
-
-[TextureRedefine] # Squid Sisters Shadows
-width = 1664
-height = 1648
-formats = 0x5
-overwriteWidth = $shadowRes * 1664
-overwriteHeight = $shadowRes * 1648
-
-[TextureRedefine] # Squid Sisters Shadows
-width = 1640
-height = 1640
-formats = 0x5
-overwriteWidth = $shadowRes * 1640
-overwriteHeight = $shadowRes * 1640
-
-[TextureRedefine] # Performance Shadows
-width = 1024
-height = 1024
-formats = 0x5
-overwriteWidth = $shadowRes * 1024
-overwriteHeight = $shadowRes * 1024
diff --git a/Enhancements/Splatoon_Bloom/34eaf9e211e76379_00000000000003c9_ps.txt b/src/Splatoon/Enhancements/Bloom/34eaf9e211e76379_00000000000003c9_ps.txt
similarity index 100%
rename from Enhancements/Splatoon_Bloom/34eaf9e211e76379_00000000000003c9_ps.txt
rename to src/Splatoon/Enhancements/Bloom/34eaf9e211e76379_00000000000003c9_ps.txt
diff --git a/Enhancements/Splatoon_Bloom/rules.txt b/src/Splatoon/Enhancements/Bloom/rules.txt
similarity index 75%
rename from Enhancements/Splatoon_Bloom/rules.txt
rename to src/Splatoon/Enhancements/Bloom/rules.txt
index e2c86a4a..e6c2b549 100644
--- a/Enhancements/Splatoon_Bloom/rules.txt
+++ b/src/Splatoon/Enhancements/Bloom/rules.txt
@@ -2,11 +2,10 @@
 titleIds = 0005000010176900,0005000010176A00,0005000010162B00
 name = Bloom Adjustment
 path = "Splatoon/Enhancements/Bloom Adjustment"
-description = Allows you to adjust how strong the bloom is. Full amount is the default intensity of bloom. Made by Slashiee.
-version = 4
+description = Allows you to adjust how strong the bloom is. Full amount is the default intensity of bloom.|Made by Slashiee.
+version = 6
 
-[Preset]
-name = Full Amount (Default)
+[Default]
 $bloom = 1
 
 [Preset]
@@ -20,3 +19,7 @@ $bloom = 0.25
 [Preset]
 name = Half Amount
 $bloom = 0.5
+
+[Preset]
+name = Full Amount
+default = 1
diff --git a/Enhancements/Splatoon_NoVignette/bfe12dca99a601f2_0000000000000000_vs.txt b/src/Splatoon/Enhancements/NoVignette/bfe12dca99a601f2_0000000000000000_vs.txt
similarity index 100%
rename from Enhancements/Splatoon_NoVignette/bfe12dca99a601f2_0000000000000000_vs.txt
rename to src/Splatoon/Enhancements/NoVignette/bfe12dca99a601f2_0000000000000000_vs.txt
diff --git a/Enhancements/Splatoon_NoVignette/rules.txt b/src/Splatoon/Enhancements/NoVignette/rules.txt
similarity index 65%
rename from Enhancements/Splatoon_NoVignette/rules.txt
rename to src/Splatoon/Enhancements/NoVignette/rules.txt
index cb7abf27..478e9f5a 100644
--- a/Enhancements/Splatoon_NoVignette/rules.txt
+++ b/src/Splatoon/Enhancements/NoVignette/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 0005000010176900,0005000010176A00,0005000010162B00
 name = No Vignette
 path = "Splatoon/Enhancements/No Vignette"
-description = Removes the game's vignette. Made by Slashiee.
-version = 4
+description = Removes the game's vignette.|Made by Slashiee.
+version = 6
diff --git a/Resolutions/Splatoon_Resolution/0b9b8f5dfa16ad58_0000000000000000_vs.txt b/src/Splatoon/Graphics/0b9b8f5dfa16ad58_0000000000000000_vs.txt
similarity index 100%
rename from Resolutions/Splatoon_Resolution/0b9b8f5dfa16ad58_0000000000000000_vs.txt
rename to src/Splatoon/Graphics/0b9b8f5dfa16ad58_0000000000000000_vs.txt
diff --git a/Resolutions/Splatoon_Resolution/5c1761d13feccdff_0000000000000000_vs.txt b/src/Splatoon/Graphics/5c1761d13feccdff_0000000000000000_vs.txt
similarity index 100%
rename from Resolutions/Splatoon_Resolution/5c1761d13feccdff_0000000000000000_vs.txt
rename to src/Splatoon/Graphics/5c1761d13feccdff_0000000000000000_vs.txt
diff --git a/Resolutions/Splatoon_Resolution/6f5412f28bd716e8_0000000000000000_vs.txt b/src/Splatoon/Graphics/6f5412f28bd716e8_0000000000000000_vs.txt
similarity index 100%
rename from Resolutions/Splatoon_Resolution/6f5412f28bd716e8_0000000000000000_vs.txt
rename to src/Splatoon/Graphics/6f5412f28bd716e8_0000000000000000_vs.txt
diff --git a/Resolutions/Splatoon_Resolution/a0bda935c83e6f2a_0000000000000000_vs.txt b/src/Splatoon/Graphics/a0bda935c83e6f2a_0000000000000000_vs.txt
similarity index 100%
rename from Resolutions/Splatoon_Resolution/a0bda935c83e6f2a_0000000000000000_vs.txt
rename to src/Splatoon/Graphics/a0bda935c83e6f2a_0000000000000000_vs.txt
diff --git a/Resolutions/Splatoon_Resolution/ae5bf21625f134f3_0000000000000000_vs.txt b/src/Splatoon/Graphics/ae5bf21625f134f3_0000000000000000_vs.txt
similarity index 100%
rename from Resolutions/Splatoon_Resolution/ae5bf21625f134f3_0000000000000000_vs.txt
rename to src/Splatoon/Graphics/ae5bf21625f134f3_0000000000000000_vs.txt
diff --git a/Enhancements/Splatoon_Shadows/b4196905d6fff2bb_0000000000001e69_ps.txt b/src/Splatoon/Graphics/b4196905d6fff2bb_0000000000001e69_ps.txt
similarity index 99%
rename from Enhancements/Splatoon_Shadows/b4196905d6fff2bb_0000000000001e69_ps.txt
rename to src/Splatoon/Graphics/b4196905d6fff2bb_0000000000001e69_ps.txt
index 621f139b..756e9c64 100644
--- a/Enhancements/Splatoon_Shadows/b4196905d6fff2bb_0000000000001e69_ps.txt
+++ b/src/Splatoon/Graphics/b4196905d6fff2bb_0000000000001e69_ps.txt
@@ -20,7 +20,7 @@
 
 // shader b4196905d6fff2bb
 // Used for: Fixing high-res shadows on models at end-screen of campaign/matches
-const float resScale = $shadowRes;
+const float resScale = $shadowQuality;
 
 #ifdef VULKAN
 layout(set = 1, binding = 3) uniform ufBlock
diff --git a/Resolutions/Splatoon_Resolution/fc3e63a2007625f8_0000000000000000_vs.txt b/src/Splatoon/Graphics/fc3e63a2007625f8_0000000000000000_vs.txt
similarity index 100%
rename from Resolutions/Splatoon_Resolution/fc3e63a2007625f8_0000000000000000_vs.txt
rename to src/Splatoon/Graphics/fc3e63a2007625f8_0000000000000000_vs.txt
diff --git a/Resolutions/Splatoon_Resolution/patches.txt b/src/Splatoon/Graphics/patches.txt
similarity index 100%
rename from Resolutions/Splatoon_Resolution/patches.txt
rename to src/Splatoon/Graphics/patches.txt
diff --git a/Resolutions/Splatoon_Resolution/rules.txt b/src/Splatoon/Graphics/rules.txt
similarity index 64%
rename from Resolutions/Splatoon_Resolution/rules.txt
rename to src/Splatoon/Graphics/rules.txt
index 59825c1a..dbb1a3ce 100644
--- a/Resolutions/Splatoon_Resolution/rules.txt
+++ b/src/Splatoon/Graphics/rules.txt
@@ -1,164 +1,336 @@
 [Definition]
 titleIds = 0005000010176900,0005000010176A00,0005000010162B00
-name = Resolution
-path = "Splatoon/Graphics/Resolution"
-description = Changes the resolution of the game. Made by Slashiee and Xalphenos.
-version = 4
+name = Graphics
+path = "Splatoon/Graphics"
+description = Allows you to change the game's TV resolution, gamepad resolution, shadow quality, and anisotropic filtering quality.|Made by Slashiee and Xalphenos.
+version = 6
 
-[Preset]
-name = 1280x720 (Default)
+[Default]
 $width = 1280
 $height = 720
+$padWidth = 854
+$padHeight = 480
 $gameWidth = 1280
 $gameHeight = 720
+$gamePadWidth = 854
+$gamePadHeight = 480
+$shadowQuality = 1
+$anisotropy = 1
 
-# Performance
+# TV Resolution
 
 [Preset]
 name = 320x180
+category = TV Resolution
 $width = 320
 $height = 180
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 640x360
+category = TV Resolution
 $width = 640
 $height = 360
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 854x480
+category = TV Resolution
 $width = 854
 $height = 480
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 960x540
+category = TV Resolution
 $width = 960
 $height = 540
-$gameWidth = 1280
-$gameHeight = 720
 
-# Common HD Resolutions
+[Preset]
+name = 1280x720
+category = TV Resolution
+default = 1
 
 [Preset]
 name = 1600x900
+category = TV Resolution
 $width = 1600
 $height = 900
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 1920x1080
+category = TV Resolution
 $width = 1920
 $height = 1080
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 2560x1440
+category = TV Resolution
 $width = 2560
 $height = 1440
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 3200x1800
+category = TV Resolution
 $width = 3200
 $height = 1800
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 3840x2160
+category = TV Resolution
 $width = 3840
 $height = 2160
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 5120x2880
+category = TV Resolution
 $width = 5120
 $height = 2880
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 7680x4320
+category = TV Resolution
 $width = 7680
 $height = 4320
-$gameWidth = 1280
-$gameHeight = 720
-
-# Common Ultrawide Resolutions
 
 [Preset]
-name = 2560x1080 (Ultrawide)
+name = 2560x1080 (21:9)
+category = TV Resolution
 $width = 2560
 $height = 1080
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
-name = 3440x1440 (Ultrawide)
+name = 3440x1440 (21:9)
+category = TV Resolution
 $width = 3440
 $height = 1440
-$gameWidth = 1280
-$gameHeight = 720
-
-# Common 16:10 Resolutions
 
 [Preset]
 name = 1440x900 (16:10)
+category = TV Resolution
 $width = 1440
 $height = 900
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 1680x1050 (16:10)
+category = TV Resolution
 $width = 1680
 $height = 1050
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 1920x1200 (16:10)
+category = TV Resolution
 $width = 1920
 $height = 1200
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 2560x1600 (16:10)
+category = TV Resolution
 $width = 2560
 $height = 1600
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 2880x1800 (16:10)
+category = TV Resolution
 $width = 2880
 $height = 1800
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 3840x2400 (16:10)
+category = TV Resolution
 $width = 3840
 $height = 2400
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 5120x3200 (16:10)
+category = TV Resolution
 $width = 5120
 $height = 3200
-$gameWidth = 1280
-$gameHeight = 720
+
+# Gamepad Resolution
+
+[Preset]
+name = 320x180
+category = Gamepad Resolution
+$padWidth = 320
+$padHeight = 180
+
+[Preset]
+name = 640x360
+category = Gamepad Resolution
+$padWidth = 640
+$padHeight = 360
+
+[Preset]
+name = 854x480
+category = Gamepad Resolution
+default = 1
+
+[Preset]
+name = 960x540
+category = Gamepad Resolution
+$padWidth = 960
+$padHeight = 540
+
+[Preset]
+name = 1280x720
+category = Gamepad Resolution
+$padWidth = 1280
+$padHeight = 720
+
+[Preset]
+name = 1600x900
+category = Gamepad Resolution
+$padWidth = 1600
+$padHeight = 900
+
+[Preset]
+name = 1920x1080
+category = Gamepad Resolution
+$padWidth = 1920
+$padHeight = 1080
+
+[Preset]
+name = 2560x1440
+category = Gamepad Resolution
+$padWidth = 2560
+$padHeight = 1440
+
+[Preset]
+name = 3200x1800
+category = Gamepad Resolution
+$padWidth = 3200
+$padHeight = 1800
+
+[Preset]
+name = 3840x2160
+category = Gamepad Resolution
+$padWidth = 3840
+$padHeight = 2160
+
+[Preset]
+name = 5120x2880
+category = Gamepad Resolution
+$padWidth = 5120
+$padHeight = 2880
+
+[Preset]
+name = 7680x4320
+category = Gamepad Resolution
+$padWidth = 7680
+$padHeight = 4320
+
+[Preset]
+name = 2560x1080 (21:9)
+category = Gamepad Resolution
+$padWidth = 2560
+$padHeight = 1080
+
+[Preset]
+name = 3440x1440 (21:9)
+category = Gamepad Resolution
+$padWidth = 3440
+$padHeight = 1440
+
+[Preset]
+name = 1440x900 (16:10)
+category = Gamepad Resolution
+$padWidth = 1440
+$padHeight = 900
+
+[Preset]
+name = 1680x1050 (16:10)
+category = Gamepad Resolution
+$padWidth = 1680
+$padHeight = 1050
+
+[Preset]
+name = 1920x1200 (16:10)
+category = Gamepad Resolution
+$padWidth = 1920
+$padHeight = 1200
+
+[Preset]
+name = 2560x1600 (16:10)
+category = Gamepad Resolution
+$padWidth = 2560
+$padHeight = 1600
+
+[Preset]
+name = 2880x1800 (16:10)
+category = Gamepad Resolution
+$padWidth = 2880
+$padHeight = 1800
+
+[Preset]
+name = 3840x2400 (16:10)
+category = Gamepad Resolution
+$padWidth = 3840
+$padHeight = 2400
+
+[Preset]
+name = 5120x3200 (16:10)
+category = Gamepad Resolution
+$padWidth = 5120
+$padHeight = 3200
+
+# Shadow Quality
+
+[Preset]
+name = Low
+category = Shadow Quality
+$shadowQuality = 0.5
+
+[Preset]
+name = Medium
+category = Shadow Quality
+default = 1
+
+[Preset]
+name = High
+category = Shadow Quality
+$shadowQuality = 2
+
+[Preset]
+name = Ultra
+category = Shadow Quality
+$shadowQuality = 3
+
+[Preset]
+name = Extreme
+category = Shadow Quality
+$shadowQuality = 4
+
+# Anisotropic Filtering Quality
+
+[Preset]
+name = 1x
+category = Anisotropic Filtering Quality
+default = 1
+
+[Preset]
+name = 2x
+category = Anisotropic Filtering Quality
+$anisotropy = 2
+
+[Preset]
+name = 4x
+category = Anisotropic Filtering Quality
+$anisotropy = 4
+
+[Preset]
+name = 8x
+category = Anisotropic Filtering Quality
+$anisotropy = 8
+
+[Preset]
+name = 16x
+category = Anisotropic Filtering Quality
+$anisotropy = 16
+
+# Anisotropic Filtering
+
+[TextureRedefine]
+tileModesExcluded = 0x1 # ignore cpu processed textures
+formatsExcluded = 0x1,0x19,0x1a,0x1f,0x33,0x122,0x806,0x80e,0x816,0x81e,0x820,0x823 # ignore viewports and cubemaps
+overwriteAnisotropy = $anisotropy
 
 # TV
 
@@ -572,72 +744,72 @@ overwriteHeight = ($height / $gameHeight) * 252
 [TextureRedefine]
 width = 864
 height = 480
-overwriteWidth = ($width / $gameWidth) * 864
-overwriteHeight = ($height / $gameHeight) * 480
+overwriteWidth = ($padWidth / $gamePadWidth) * 864
+overwriteHeight = ($padHeight / $gamePadHeight) * 480
 
 [TextureRedefine]
 width = 854
 height = 480
-overwriteWidth = ($width / $gameWidth) * 854
-overwriteHeight = ($height / $gameHeight) * 480
+overwriteWidth = ($padWidth / $gamePadWidth) * 854
+overwriteHeight = ($padHeight / $gamePadHeight) * 480
 
 [TextureRedefine]
 width = 848
 height = 480
-overwriteWidth = ($width / $gameWidth) * 848
-overwriteHeight = ($height / $gameHeight) * 480
+overwriteWidth = ($padWidth / $gamePadWidth) * 848
+overwriteHeight = ($padHeight / $gamePadHeight) * 480
 
 # Gamepad Blur
 
 [TextureRedefine]
 width = 448
 height = 240
-overwriteWidth = ($width / $gameWidth) * 448
-overwriteHeight = ($height / $gameHeight) * 240
+overwriteWidth = ($padWidth / $gamePadWidth) * 448
+overwriteHeight = ($padHeight / $gamePadHeight) * 240
 
 [TextureRedefine]
 width = 424
 height = 240
-overwriteWidth = ($width / $gameWidth) * 424
-overwriteHeight = ($height / $gameHeight) * 240
+overwriteWidth = ($padWidth / $gamePadWidth) * 424
+overwriteHeight = ($padHeight / $gamePadHeight) * 240
 
 # Gamepad Bloom
 
 [TextureRedefine]
 width = 224
 height = 128
-overwriteWidth = ($width / $gameWidth) * 224
-overwriteHeight = ($height / $gameHeight) * 128
+overwriteWidth = ($padWidth / $gamePadWidth) * 224
+overwriteHeight = ($padHeight / $gamePadHeight) * 128
 
 [TextureRedefine]
 width = 212
 height = 120
-overwriteWidth = ($width / $gameWidth) * 212
-overwriteHeight = ($height / $gameHeight) * 120
+overwriteWidth = ($padWidth / $gamePadWidth) * 212
+overwriteHeight = ($padHeight / $gamePadHeight) * 120
 
 [TextureRedefine]
 width = 106
 height = 60
-overwriteWidth = ($width / $gameWidth) * 106
-overwriteHeight = ($height / $gameHeight) * 60
+overwriteWidth = ($padWidth / $gamePadWidth) * 106
+overwriteHeight = ($padHeight / $gamePadHeight) * 60
 
 [TextureRedefine]
 width = 53
 height = 30
-overwriteWidth = ($width / $gameWidth) * 53
-overwriteHeight = ($height / $gameHeight) * 30
+overwriteWidth = ($padWidth / $gamePadWidth) * 53
+overwriteHeight = ($padHeight / $gamePadHeight) * 30
 
 [TextureRedefine]
 width = 26
 height = 15
-overwriteWidth = ($width / $gameWidth) * 26
-overwriteHeight = ($height / $gameHeight) * 15
+overwriteWidth = ($padWidth / $gamePadWidth) * 26
+overwriteHeight = ($padHeight / $gamePadHeight) * 15
 
 [TextureRedefine]
 width = 13
 height = 7
-overwriteWidth = ($width / $gameWidth) * 13
-overwriteHeight = ($height / $gameHeight) * 7
+overwriteWidth = ($padWidth / $gamePadWidth) * 13
+overwriteHeight = ($padHeight / $gamePadHeight) * 7
 
 # Multiplayer Player Icon
 
@@ -646,3 +818,33 @@ width = 256
 height = 256
 formats = 0x1a
 overwriteFormat = 0x1f
+
+# Shadows
+
+[TextureRedefine] # Shadows
+width = 2048
+height = 2048
+formats = 0x5
+overwriteWidth = $shadowQuality * 2048
+overwriteHeight = $shadowQuality * 2048
+
+[TextureRedefine] # Squid Sisters Shadows
+width = 1664
+height = 1648
+formats = 0x5
+overwriteWidth = $shadowQuality * 1664
+overwriteHeight = $shadowQuality * 1648
+
+[TextureRedefine] # Squid Sisters Shadows
+width = 1640
+height = 1640
+formats = 0x5
+overwriteWidth = $shadowQuality * 1640
+overwriteHeight = $shadowQuality * 1640
+
+[TextureRedefine] # Performance Shadows
+width = 1024
+height = 1024
+formats = 0x5
+overwriteWidth = $shadowQuality * 1024
+overwriteHeight = $shadowQuality * 1024
diff --git a/Mods/Splatoon_!NoHUD/patches.txt b/src/Splatoon/Mods/!NoHUD/patches.txt
similarity index 100%
rename from Mods/Splatoon_!NoHUD/patches.txt
rename to src/Splatoon/Mods/!NoHUD/patches.txt
diff --git a/Mods/Splatoon_!NoHUD/rules.txt b/src/Splatoon/Mods/!NoHUD/rules.txt
similarity index 63%
rename from Mods/Splatoon_!NoHUD/rules.txt
rename to src/Splatoon/Mods/!NoHUD/rules.txt
index 955b47e9..0a3cd7f4 100644
--- a/Mods/Splatoon_!NoHUD/rules.txt
+++ b/src/Splatoon/Mods/!NoHUD/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 0005000010176900,0005000010176A00,0005000010162B00
 name = No HUD
 path = "Splatoon/Mods/No HUD"
-description = Removes the HUD from the game. Made by Xalphenos and Slashiee.
-version = 4
+description = Removes the HUD from the game.|Made by Xalphenos and Slashiee.
+version = 6
diff --git a/Mods/Splatoon_60FPSPlaza/patches.txt b/src/Splatoon/Mods/60FPSPlaza/patches.txt
similarity index 100%
rename from Mods/Splatoon_60FPSPlaza/patches.txt
rename to src/Splatoon/Mods/60FPSPlaza/patches.txt
diff --git a/Mods/Splatoon_60FPSPlaza/rules.txt b/src/Splatoon/Mods/60FPSPlaza/rules.txt
similarity index 72%
rename from Mods/Splatoon_60FPSPlaza/rules.txt
rename to src/Splatoon/Mods/60FPSPlaza/rules.txt
index 640fcf43..16bf3594 100644
--- a/Mods/Splatoon_60FPSPlaza/rules.txt
+++ b/src/Splatoon/Mods/60FPSPlaza/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 0005000010176900,0005000010176A00,0005000010162B00
 name = 60FPS Plaza
 path = "Splatoon/Mods/60FPS Plaza"
-description = Important: This patches the plaza to run at 60FPS. Getting under 60FPS will slow down the game's speed. Made by Exzap.
-version = 4
+description = Important: This patches the plaza to run at 60FPS. Getting under 60FPS will slow down the game's speed.|Made by Exzap.
+version = 6
diff --git a/Mods/Splatoon_MapSwap/patches.txt b/src/Splatoon/Mods/MapSwap/patches.txt
similarity index 100%
rename from Mods/Splatoon_MapSwap/patches.txt
rename to src/Splatoon/Mods/MapSwap/patches.txt
diff --git a/Mods/Splatoon_MapSwap/rules.txt b/src/Splatoon/Mods/MapSwap/rules.txt
similarity index 63%
rename from Mods/Splatoon_MapSwap/rules.txt
rename to src/Splatoon/Mods/MapSwap/rules.txt
index 06ae0c44..eeb10ff7 100644
--- a/Mods/Splatoon_MapSwap/rules.txt
+++ b/src/Splatoon/Mods/MapSwap/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 0005000010176900,0005000010176A00,0005000010162B00
 name = Map Swap
 path = "Splatoon/Mods/Map Swap"
-description = Read patches.txt for more information. Made by Slashiee.
-version = 4
+description = Read patches.txt for more information.|Made by Slashiee.
+version = 6
diff --git a/Mods/Splatoon_Octohax/patches.txt b/src/Splatoon/Mods/Octohax/patches.txt
similarity index 100%
rename from Mods/Splatoon_Octohax/patches.txt
rename to src/Splatoon/Mods/Octohax/patches.txt
diff --git a/Mods/Splatoon_Octohax/rules.txt b/src/Splatoon/Mods/Octohax/rules.txt
similarity index 64%
rename from Mods/Splatoon_Octohax/rules.txt
rename to src/Splatoon/Mods/Octohax/rules.txt
index 7f09950b..ac105fba 100644
--- a/Mods/Splatoon_Octohax/rules.txt
+++ b/src/Splatoon/Mods/Octohax/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 0005000010176900,0005000010176A00,0005000010162B00
 name = Octohax
 path = "Splatoon/Mods/Octohax"
-description = Replaces the female Inkling with the Octoling. Made by Slashiee.
-version = 4
+description = Replaces the female Inkling with the Octoling.|Made by Slashiee.
+version = 6
diff --git a/Mods/Splatoon_SquidSisterSwap/patches.txt b/src/Splatoon/Mods/SquidSisterSwap/patches.txt
similarity index 100%
rename from Mods/Splatoon_SquidSisterSwap/patches.txt
rename to src/Splatoon/Mods/SquidSisterSwap/patches.txt
diff --git a/Mods/Splatoon_SquidSisterSwap/rules.txt b/src/Splatoon/Mods/SquidSisterSwap/rules.txt
similarity index 80%
rename from Mods/Splatoon_SquidSisterSwap/rules.txt
rename to src/Splatoon/Mods/SquidSisterSwap/rules.txt
index b8aefaab..0541b1c4 100644
--- a/Mods/Splatoon_SquidSisterSwap/rules.txt
+++ b/src/Splatoon/Mods/SquidSisterSwap/rules.txt
@@ -2,18 +2,20 @@
 titleIds = 0005000010176900,0005000010176A00,0005000010162B00
 name = Squid Sister Swap
 path = "Splatoon/Mods/Squid Sister Swap"
-description = Allows you to swap the Squid Sisters. Made by Slashiee.
-version = 4
+description = Allows you to swap the Squid Sisters.|Made by Slashiee.
+version = 6
+
+[Default]
+$callieLetter = 65
+$marieLetter = 66
 
 [Preset]
 name = Callie over Marie
-$callieLetter = 65
 $marieLetter = 65
 
 [Preset]
 name = Marie over Callie
 $callieLetter = 66
-$marieLetter = 66
 
 [Preset]
 name = Swapped