diff --git a/README.md b/README.md
index 7dcfbc7..f9afb09 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,7 @@ Settings: **Esc → Advanced Options**.
 - Free Slots
 - Improved Castbar
 - Item Rarity Borders
+- Item Rarity Glows
 - Movable Unit Frames
 - Nameplate Class Colors
 - Nameplate Castbar
@@ -56,14 +57,15 @@ Other modules can also benefit indirectly from ClassicAPI through shared ShaguTw
 
 ## ⚙️ Modules
 
-### Action Bar & Combat
+### Action Bar
 
 - Auto Dismount
 - Auto Stance
 - Actionbar Range Color
 - Cooldown Numbers
+- Hide Gryphons
 - Improved Castbar
-- No Toggle
+- No Toggle Auto-Attack
 - Reduced Actionbar
 
 ### Unit Frames
@@ -83,11 +85,12 @@ Other modules can also benefit indirectly from ClassicAPI through shared ShaguTw
 - Nameplate Class Colors
 - Nameplate Castbar
 
-### Items & Tooltips
+### Tooltip & Items
 
 - Equip Compare
 - Free Slots
 - Item Rarity Borders
+- Item Rarity Glows
 - Sell Junk
 - Tooltip Details
 - Vendor Values
@@ -111,17 +114,24 @@ Other modules can also benefit indirectly from ClassicAPI through shared ShaguTw
 - WorldMap Coordinates
 - WorldMap Window
 
-### General
+### Loot
+
+- Improved Roll Frames
+- Loot Cursor
+
+### Interface
 
 - Darkened UI
 - Hide Errors
-- Hide Gryphons
-- Improved Roll Frames
-- Loot Cursor
-- Skip Gossip Text
 - Smaller Error Frame
 - XP Bar Text
 
+### General
+
+- Super WoW Compatibility
+- Turtle WoW Compatibility
+- Skip Gossip Text
+
 ## 🔧 Compatibility
 
 - ClassicAPI integration
diff --git a/mods/dark-ui-elements.lua b/mods/dark-ui-elements.lua
index cb8d342..a16f8c9 100644
--- a/mods/dark-ui-elements.lua
+++ b/mods/dark-ui-elements.lua
@@ -8,6 +8,7 @@ local module = ShaguTweaks:register({
   title = T["Darkened UI"],
   description = T["Turns the entire interface into darker colors."],
   expansions = { ["vanilla"] = true },
+  category = T["Interface"],
   enabled = nil,
   config = {
     ["darkmode.color"] = { r = .3, g = .3, b = .3, a = .9 }
diff --git a/mods/hide-errors.lua b/mods/hide-errors.lua
index 1260073..fa9572f 100644
--- a/mods/hide-errors.lua
+++ b/mods/hide-errors.lua
@@ -4,6 +4,7 @@ local module = ShaguTweaks:register({
   title = T["Hide Errors"],
   description = T["Hides and ignores all Lua errors produced by broken addons."],
   expansions = { ["vanilla"] = true },
+  category = T["Interface"],
   enabled = nil,
 })
 
diff --git a/mods/improved-roll-frames.lua b/mods/improved-roll-frames.lua
index 7f9a3e4..8799282 100644
--- a/mods/improved-roll-frames.lua
+++ b/mods/improved-roll-frames.lua
@@ -4,7 +4,7 @@ local module = ShaguTweaks:register({
     title = T["Improved Roll Frames"],
     description = T["Smaller roll frames with roll tracking."],
     expansions = { ["vanilla"] = true },
-    category = T["General"],
+    category = T["Loot"],
     enabled = nil,
   })
 
diff --git a/mods/loot-cursor.lua b/mods/loot-cursor.lua
index f4e2bee..4b9ce95 100644
--- a/mods/loot-cursor.lua
+++ b/mods/loot-cursor.lua
@@ -5,7 +5,7 @@ local module = ShaguTweaks:register({
   title = T["Loot Cursor"],
   description = T["Positions the loot window directly under your cursor so you can loot without moving your mouse."],
   expansions = { ["vanilla"] = true },
-  category = T["General"],
+  category = T["Loot"],
   enabled = true,
   order = 44,
 })
diff --git a/mods/minimap-clean.lua b/mods/minimap-clean.lua
index 4636006..fee3813 100644
--- a/mods/minimap-clean.lua
+++ b/mods/minimap-clean.lua
@@ -4,7 +4,7 @@ local module = ShaguTweaks:register({
   title = T["Minimap Clean"],
   description = T["Hides minimap addon buttons automatically when the cursor leaves the minimap area."],
   expansions = { ["vanilla"] = true },
-  category = T["World & MiniMap"],
+  category = T["Minimap & World Map"],
   enabled = false,
 })
 
diff --git a/mods/minimap-clock.lua b/mods/minimap-clock.lua
index 5325efd..b5d4b25 100644
--- a/mods/minimap-clock.lua
+++ b/mods/minimap-clock.lua
@@ -5,7 +5,7 @@ local module = ShaguTweaks:register({
   title = T["MiniMap Clock"],
   description = T["Adds a small 24h clock to the mini map."],
   expansions = { ["vanilla"] = true },
-  category = T["World & MiniMap"],
+  category = T["Minimap & World Map"],
   enabled = true,
 })
 
diff --git a/mods/minimap-square.lua b/mods/minimap-square.lua
index d515c7f..d7bd79a 100644
--- a/mods/minimap-square.lua
+++ b/mods/minimap-square.lua
@@ -4,7 +4,7 @@ local module = ShaguTweaks:register({
   title = T["MiniMap Square"],
   description = T["Draw the mini map in a squared shape instead of a round one."],
   expansions = { ["vanilla"] = true },
-  category = T["World & MiniMap"],
+  category = T["Minimap & World Map"],
   enabled = nil,
   config = {
     ["minimap.size"] = 144,
diff --git a/mods/minimap-tracking.lua b/mods/minimap-tracking.lua
index 4a9ea00..956323c 100644
--- a/mods/minimap-tracking.lua
+++ b/mods/minimap-tracking.lua
@@ -5,7 +5,7 @@ local module = ShaguTweaks:register({
   title = T["Hide Tracking Icon"],
   description = T["Hides the tracking icon from the minimap."],
   expansions = { ["vanilla"] = true },
-  category = T["World & MiniMap"],
+  category = T["Minimap & World Map"],
   enabled = true,
   order = 74,
 })
diff --git a/mods/minimap-tweaks.lua b/mods/minimap-tweaks.lua
index 7f5305d..7d02391 100644
--- a/mods/minimap-tweaks.lua
+++ b/mods/minimap-tweaks.lua
@@ -5,7 +5,7 @@ local module = ShaguTweaks:register({
   title = T["MiniMap Tweaks"],
   description = T["Hides unnecessary mini map buttons and allows to zoom using the mouse wheel."],
   expansions = { ["vanilla"] = true },
-  category = T["World & MiniMap"],
+  category = T["Minimap & World Map"],
   enabled = true,
 })
 
diff --git a/mods/minimap-zoom.lua b/mods/minimap-zoom.lua
index 52469a2..9262415 100644
--- a/mods/minimap-zoom.lua
+++ b/mods/minimap-zoom.lua
@@ -4,7 +4,7 @@ local module = ShaguTweaks:register({
   title = T["Enlarged Minimap"],
   description = T["Increases the minimap size and shifts buff icons left to prevent overlap."],
   expansions = { ["vanilla"] = true },
-  category = T["World & MiniMap"],
+  category = T["Minimap & World Map"],
   enabled = false,
   order = 73,
   config = {
diff --git a/mods/smaller-errors-frame.lua b/mods/smaller-errors-frame.lua
index bcfee31..5c41b38 100644
--- a/mods/smaller-errors-frame.lua
+++ b/mods/smaller-errors-frame.lua
@@ -4,7 +4,7 @@ local module = ShaguTweaks:register({
   title = T["Smaller Error Frame"],
   description = T["Resizes the error frame to 1 line instead of 3."],
   expansions = { ["vanilla"] = true },
-  category = T["General"],
+  category = T["Interface"],
   enabled = nil,
 })
 
diff --git a/mods/worldmap-colors.lua b/mods/worldmap-colors.lua
index b5cfe95..b62d654 100644
--- a/mods/worldmap-colors.lua
+++ b/mods/worldmap-colors.lua
@@ -5,7 +5,7 @@ local module = ShaguTweaks:register({
   title = T["WorldMap Class Colors"],
   description = T["Show class colored circles on world and battlefield map."],
   expansions = { ["vanilla"] = true },
-  category = T["World & MiniMap"],
+  category = T["Minimap & World Map"],
   enabled = true,
 })
 
diff --git a/mods/worldmap-coordinates.lua b/mods/worldmap-coordinates.lua
index bbfd557..aa0f0d5 100644
--- a/mods/worldmap-coordinates.lua
+++ b/mods/worldmap-coordinates.lua
@@ -5,7 +5,7 @@ local module = ShaguTweaks:register({
   title = T["WorldMap Coordinates"],
   description = T["Adds coordinates to the bottom of the World Map."],
   expansions = { ["vanilla"] = true },
-  category = T["World & MiniMap"],
+  category = T["Minimap & World Map"],
   enabled = true,
 })
 
diff --git a/mods/worldmap-window.lua b/mods/worldmap-window.lua
index b5c46e9..3c4f1dd 100644
--- a/mods/worldmap-window.lua
+++ b/mods/worldmap-window.lua
@@ -7,7 +7,7 @@ local module = ShaguTweaks:register({
   title = T["WorldMap Window"],
   description = T["Turns the world map into a movable window. The map can be scaled with <Ctrl> + Mousewheel."],
   expansions = { ["vanilla"] = true },
-  category = T["World & MiniMap"],
+  category = T["Minimap & World Map"],
   enabled = true,
 })
 
diff --git a/mods/xpbar-text.lua b/mods/xpbar-text.lua
index 203046b..d6b2a99 100644
--- a/mods/xpbar-text.lua
+++ b/mods/xpbar-text.lua
@@ -4,7 +4,7 @@ local module = ShaguTweaks:register({
   title = T["XP Bar Text"],
   description = T["Always shows current XP and rested bonus percentage directly on the experience bar."],
   expansions = { ["vanilla"] = true },
-  category = T["Action Bar"],
+  category = T["Interface"],
   enabled = true,
   order = 70,
 })