diff --git a/Enhancements/RiseOfLyric_Shadows/rules.txt b/Enhancements/RiseOfLyric_Shadows/rules.txt
deleted file mode 100644
index 09705dc2..00000000
--- a/Enhancements/RiseOfLyric_Shadows/rules.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-[Definition]
-titleIds = 0005000010175B00,0005000010177800,0005000010191F00
-name = Shadow Resolution
-path = "Sonic Boom: Rise of Lyric/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 M&&M.
-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 = 256
-height = 256
-formats = 0x80e,0x11
-overwriteWidth = $shadowRes * 256
-overwriteHeight = $shadowRes * 256
diff --git a/Mods/RiseOfLyric_Uncapped/rules.txt b/Mods/RiseOfLyric_Uncapped/rules.txt
deleted file mode 100644
index 07f72af6..00000000
--- a/Mods/RiseOfLyric_Uncapped/rules.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-[Definition]
-titleIds = 0005000010175B00,0005000010177800,0005000010191F00
-name = Uncapped Framerate
-path = "Sonic Boom: Rise of Lyric/Mods/Uncapped Framerate"
-description = This patches out the framerate cap that the game has in place. Performance may increase from changing the recompiler to be dual or triple core. Made by M&&M.
-version = 4
-
-[Preset]
-name = 60FPS (ideal for 240/120/60Hz displays)
-$targetFPS:int = 60
-
-[Preset]
-name = 30FPS (ideal for 240/120/60Hz displays)
-$targetFPS:int = 30
-
-[Preset]
-name = 40FPS (ideal for 240/120/60Hz displays)
-$targetFPS:int = 40
-
-[Preset]
-name = 20FPS (ideal for 240/120/60Hz displays)
-$targetFPS:int = 20
-
-[Preset]
-name = 33FPS (ideal for 165Hz displays)
-$targetFPS:int = 33
-
-[Preset]
-name = 48FPS (ideal for 144Hz displays)
-$targetFPS:int = 48
-
-[Preset]
-name = 55FPS (ideal for 165Hz displays)
-$targetFPS:int = 55
-
-[Preset]
-name = 72FPS (ideal for 144Hz displays)
-$targetFPS:int = 72
-
-[Preset]
-name = 75FPS (ideal for 75Hz displays)
-$targetFPS:int = 75
-
-[Preset]
-name = 120FPS (ideal for 240/120/60Hz displays)
-$targetFPS:int = 120
-
-[Preset]
-name = 144FPS (ideal for 144Hz displays)
-$targetFPS:int = 144
-
-[Preset]
-name = 165FPS (ideal for 165Hz displays)
-$targetFPS:int = 165
-
-[Control]
-vsyncFrequency = $targetFPS
diff --git a/Resolutions/RiseOfLyric_Resolution/rules.txt b/Resolutions/RiseOfLyric_Resolution/rules.txt
deleted file mode 100644
index 0bb37d54..00000000
--- a/Resolutions/RiseOfLyric_Resolution/rules.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-[Definition]
-titleIds = 0005000010175B00,0005000010177800,0005000010191F00
-name = Resolution
-path = "Sonic Boom: Rise of Lyric/Graphics/Resolution"
-description = Changes the resolution of the game. Made by M&&M.
-version = 4
-
-[Preset]
-name = 1280x720 (Default)
-$width = 1280
-$height = 720
-$gameWidth = 1280
-$gameHeight = 720
-
-// Performance
-
-[Preset]
-name = 320x180
-$width = 320
-$height = 180
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 640x360
-$width = 640
-$height = 360
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 960x540
-$width = 960
-$height = 540
-$gameWidth = 1280
-$gameHeight = 720
-
-// Common HD Resolutions
-
-[Preset]
-name = 1600x900
-$width = 1600
-$height = 900
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 1920x1080
-$width = 1920
-$height = 1080
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 2560x1440
-$width = 2560
-$height = 1440
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 3200x1800
-$width = 3200
-$height = 1800
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 3840x2160
-$width = 3840
-$height = 2160
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 5120x2880
-$width = 5120
-$height = 2880
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 7680x4320
-$width = 7680
-$height = 4320
-$gameWidth = 1280
-$gameHeight = 720
-
-[TextureRedefine] # Game Resolution
-width = 1280
-height = 720
-formatsExcluded = 0x31
-tileModesExcluded = 0x001
-overwriteWidth = ($width / $gameWidth) * 1280
-overwriteHeight = ($height / $gameHeight) * 720
-
-[TextureRedefine] # Gamepad Resolution
-width = 864
-height = 480
-overwriteWidth = ($width / $gameWidth) * 864
-overwriteHeight = ($height / $gameHeight) * 480
-
-[TextureRedefine] # Gamepad Resolution
-width = 854
-height = 480
-overwriteWidth = ($width / $gameWidth) * 854
-overwriteHeight = ($height / $gameHeight) * 480
-
-[TextureRedefine] # Bloom Resolution
-width = 320
-height = 192
-overwriteWidth = ($width / $gameWidth) * 320
-overwriteHeight = ($height / $gameHeight) * 192
-
-[TextureRedefine] # Bloom Resolution
-width = 320
-height = 180
-overwriteWidth = ($width / $gameWidth) * 320
-overwriteHeight = ($height / $gameHeight) * 180
-
-[TextureRedefine] # ???
-width = 64
-height = 64
-formats = 0x810
-overwriteWidth = ($width / $gameWidth) * 64
-overwriteHeight = ($height / $gameHeight) * 64
-
-// scaling causes overbloom
-
-#[TextureRedefine]
-#width = 32
-#height = 16
-#formats = 0x810
-#overwriteWidth = ($width / $gameWidth) * 32
-#overwriteHeight = ($height / $gameHeight) * 16
-
-#[TextureRedefine]
-#width = 16
-#height = 16
-#formats = 0x810
-#overwriteWidth = ($width / $gameWidth) * 16
-#overwriteHeight = ($height / $gameHeight) * 16
-
-#[TextureRedefine]
-#width = 8
-#height = 8
-#formats = 0x810
-#overwriteWidth = ($width / $gameWidth) * 8
-#overwriteHeight = ($height / $gameHeight) * 8
-
-#[TextureRedefine]
-#width = 4
-#height = 4
-#formats = 0x810
-#overwriteWidth = ($width / $gameWidth) * 4
-#overwriteHeight = ($height / $gameHeight) * 4
-
-#[TextureRedefine]
-#width = 1
-#height = 1
-#formats = 0x810
-#overwriteWidth = ($width / $gameWidth) * 1
-#overwriteHeight = ($height / $gameHeight) * 1
diff --git a/src/SonicBoomRiseOfLyric/Graphics/rules.txt b/src/SonicBoomRiseOfLyric/Graphics/rules.txt
new file mode 100644
index 00000000..36566365
--- /dev/null
+++ b/src/SonicBoomRiseOfLyric/Graphics/rules.txt
@@ -0,0 +1,319 @@
+[Definition]
+titleIds = 0005000010175B00,0005000010177800,0005000010191F00
+name = Graphic Options
+path = "Sonic Boom: Rise of Lyric/Graphics"
+description = Allows you to change the game's TV resolution, gamepad resolution, shadow quality and anisotropic filtering quality.||Made by M&&M.
+version = 6
+
+[Default]
+$width = 1280
+$height = 720
+$padWidth = 854
+$padHeight = 480
+$gameWidth = 1280
+$gameHeight = 720
+$gamePadWidth = 854
+$gamePadHeight = 480
+$shadowQuality = 1
+$anisotropy = 1
+
+
+# TV Resolution
+
+[Preset]
+category = TV Resolution
+name = 320x180
+$width = 320
+$height = 180
+
+[Preset]
+category = TV Resolution
+name = 640x360
+$width = 640
+$height = 360
+
+[Preset]
+category = TV Resolution
+name = 854x480
+$width = 854
+$height = 480
+
+[Preset]
+category = TV Resolution
+name = 960x540
+$width = 960
+$height = 540
+
+[Preset]
+category = TV Resolution
+name = 1280x720
+default = 1
+
+[Preset]
+category = TV Resolution
+name = 1600x900
+$width = 1600
+$height = 900
+
+[Preset]
+category = TV Resolution
+name = 1920x1080
+$width = 1920
+$height = 1080
+
+[Preset]
+category = TV Resolution
+name = 2560x1440
+$width = 2560
+$height = 1440
+
+[Preset]
+category = TV Resolution
+name = 3200x1800
+$width = 3200
+$height = 1800
+
+[Preset]
+category = TV Resolution
+name = 3840x2160
+$width = 3840
+$height = 2160
+
+[Preset]
+category = TV Resolution
+name = 5120x2880
+$width = 5120
+$height = 2880
+
+[Preset]
+category = TV Resolution
+name = 7680x4320
+$width = 7680
+$height = 4320
+
+
+# Gamepad Resolution
+
+[Preset]
+category = Gamepad Resolution
+name = 320x180
+$padWidth = 320
+$padHeight = 180
+
+[Preset]
+category = Gamepad Resolution
+name = 640x360
+$padWidth = 640
+$padHeight = 360
+
+[Preset]
+category = Gamepad Resolution
+name = 854x480
+default = 1
+
+[Preset]
+category = Gamepad Resolution
+name = 960x540
+$padWidth = 960
+$padHeight = 540
+
+[Preset]
+category = Gamepad Resolution
+name = 1280x720
+$padWidth = 1280
+$padHeight = 720
+
+[Preset]
+category = Gamepad Resolution
+name = 1600x900
+$padWidth = 1600
+$padHeight = 900
+
+[Preset]
+category = Gamepad Resolution
+name = 1920x1080
+$padWidth = 1920
+$padHeight = 1080
+
+[Preset]
+category = Gamepad Resolution
+name = 2560x1440
+$padWidth = 2560
+$padHeight = 1440
+
+[Preset]
+category = Gamepad Resolution
+name = 3200x1800
+$padWidth = 3200
+$padHeight = 1800
+
+[Preset]
+category = Gamepad Resolution
+name = 3840x2160
+$padWidth = 3840
+$padHeight = 2160
+
+[Preset]
+category = Gamepad Resolution
+name = 5120x2880
+$padWidth = 5120
+$padHeight = 2880
+
+[Preset]
+category = Gamepad Resolution
+name = 7680x4320
+$padWidth = 7680
+$padHeight = 4320
+
+# 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,0x122,0x806,0x80e,0x816,0x81e,0x820,0x823 # ignore viewports and cubemaps
+overwriteAnisotropy = $anisotropy
+
+
+# Texture Redefines
+
+[TextureRedefine] # Game Resolution
+width = 1280
+height = 720
+formatsExcluded = 0x31
+tileModesExcluded = 0x001
+overwriteWidth = ($width / $gameWidth) * 1280
+overwriteHeight = ($height / $gameHeight) * 720
+
+[TextureRedefine] # Gamepad Resolution
+width = 864
+height = 480
+overwriteWidth = ($padWidth/$gamePadWidth) * 864
+overwriteHeight = ($padHeight/$gamePadHeight) * 480
+
+[TextureRedefine] # Gamepad Resolution
+width = 854
+height = 480
+overwriteWidth = ($padWidth/$gamePadWidth) * 854
+overwriteHeight = ($padHeight/$gamePadHeight) * 480
+
+[TextureRedefine] # Bloom Resolution
+width = 320
+height = 192
+overwriteWidth = ($width / $gameWidth) * 320
+overwriteHeight = ($height / $gameHeight) * 192
+
+[TextureRedefine] # Bloom Resolution
+width = 320
+height = 180
+overwriteWidth = ($width / $gameWidth) * 320
+overwriteHeight = ($height / $gameHeight) * 180
+
+[TextureRedefine] # unknown
+width = 64
+height = 64
+formats = 0x810
+overwriteWidth = ($width / $gameWidth) * 64
+overwriteHeight = ($height / $gameHeight) * 64
+
+# scaling these causes overbloom
+# might be avoidable via using depth
+
+#[TextureRedefine]
+#width = 32
+#height = 16
+#formats = 0x810
+#overwriteWidth = ($width / $gameWidth) * 32
+#overwriteHeight = ($height / $gameHeight) * 16
+
+#[TextureRedefine]
+#width = 16
+#height = 16
+#formats = 0x810
+#overwriteWidth = ($width / $gameWidth) * 16
+#overwriteHeight = ($height / $gameHeight) * 16
+
+#[TextureRedefine]
+#width = 8
+#height = 8
+#formats = 0x810
+#overwriteWidth = ($width / $gameWidth) * 8
+#overwriteHeight = ($height / $gameHeight) * 8
+
+#[TextureRedefine]
+#width = 4
+#height = 4
+#formats = 0x810
+#overwriteWidth = ($width / $gameWidth) * 4
+#overwriteHeight = ($height / $gameHeight) * 4
+
+#[TextureRedefine]
+#width = 1
+#height = 1
+#formats = 0x810
+#overwriteWidth = ($width / $gameWidth) * 1
+#overwriteHeight = ($height / $gameHeight) * 1
+
+
+# Shadow Scaling
+
+[TextureRedefine]
+width = 256
+height = 256
+formats = 0x80e,0x11
+overwriteWidth = $shadowQuality * 256
+overwriteHeight = $shadowQuality * 256
diff --git a/Mods/RiseOfLyric_Uncapped/patches.txt b/src/SonicBoomRiseOfLyric/Mods/UncappedFramerate/patches.txt
similarity index 100%
rename from Mods/RiseOfLyric_Uncapped/patches.txt
rename to src/SonicBoomRiseOfLyric/Mods/UncappedFramerate/patches.txt
diff --git a/src/SonicBoomRiseOfLyric/Mods/UncappedFramerate/rules.txt b/src/SonicBoomRiseOfLyric/Mods/UncappedFramerate/rules.txt
new file mode 100644
index 00000000..62a06ea3
--- /dev/null
+++ b/src/SonicBoomRiseOfLyric/Mods/UncappedFramerate/rules.txt
@@ -0,0 +1,69 @@
+[Definition]
+titleIds = 0005000010175B00,0005000010177800,0005000010191F00
+name = Uncapped Framerate
+path = "Sonic Boom: Rise of Lyric/Mods/Uncapped Framerate"
+description = This patches out the framerate cap that the game has in place.||Made by M&&M.
+version = 6
+
+[Default]
+$fpsLimit = 60
+
+# Simple FPS Limit
+
+[Preset]
+name = 240FPS Limit
+category = FPS Limit
+$fpsLimit = 240
+
+[Preset]
+name = 165FPS Limit
+category = FPS Limit
+$fpsLimit = 165
+
+[Preset]
+name = 144FPS Limit
+category = FPS Limit
+$fpsLimit = 144
+
+[Preset]
+name = 120FPS Limit
+category = FPS Limit
+$fpsLimit = 120
+
+[Preset]
+name = 90FPS Limit
+category = FPS Limit
+$fpsLimit = 90
+
+[Preset]
+name = 75FPS Limit
+category = FPS Limit
+$fpsLimit = 75
+
+[Preset]
+name = 72FPS Limit
+category = FPS Limit
+$fpsLimit = 72
+
+[Preset]
+name = 60FPS Limit (Default)
+category = FPS Limit
+default = 1
+
+[Preset]
+name = 45FPS Limit
+category = FPS Limit
+$fpsLimit = 45
+
+[Preset]
+name = 30FPS Limit
+category = FPS Limit
+$fpsLimit = 30
+
+[Preset]
+name = 20FPS Limit
+category = FPS Limit
+$fpsLimit = 20
+
+[Control]
+vsyncFrequency = $fpsLimit