diff --git a/Modules/Settings/Tabs/ColorSchemeTab.qml b/Modules/Settings/Tabs/ColorSchemeTab.qml
index 00419fd3..8a132d92 100644
--- a/Modules/Settings/Tabs/ColorSchemeTab.qml
+++ b/Modules/Settings/Tabs/ColorSchemeTab.qml
@@ -79,7 +79,7 @@ ColumnLayout {
       if (exitCode === 0) {
         // Matugen exists, enable it
         Settings.data.colorSchemes.useWallpaperColors = true
-        MatugenService.generateFromWallpaper()
+        AppThemeService.generateFromWallpaper()
         ToastService.showNotice(I18n.tr("settings.color-scheme.color-source.use-wallpaper-colors.label"), I18n.tr("toast.wallpaper-colors.enabled"))
       } else {
         // Matugen not found
@@ -196,7 +196,7 @@ ColumnLayout {
     onSelected: key => {
                   Settings.data.colorSchemes.matugenSchemeType = key
                   if (Settings.data.colorSchemes.useWallpaperColors) {
-                    MatugenService.generateFromWallpaper()
+                    AppThemeService.generateFromWallpaper()
                   }
                 }
   }
@@ -392,7 +392,7 @@ ColumnLayout {
         onToggled: checked => {
                      Settings.data.templates.gtk = checked
                      if (Settings.data.colorSchemes.useWallpaperColors)
-                     MatugenService.generateFromWallpaper()
+                     AppThemeService.generateFromWallpaper()
                    }
       }
 
@@ -405,7 +405,7 @@ ColumnLayout {
         onToggled: checked => {
                      Settings.data.templates.qt = checked
                      if (Settings.data.colorSchemes.useWallpaperColors)
-                     MatugenService.generateFromWallpaper()
+                     AppThemeService.generateFromWallpaper()
                    }
       }
     }
@@ -431,7 +431,7 @@ ColumnLayout {
                      if (ProgramCheckerService.kittyAvailable) {
                        Settings.data.templates.kitty = checked
                        if (Settings.data.colorSchemes.useWallpaperColors)
-                       MatugenService.generateFromWallpaper()
+                       AppThemeService.generateFromWallpaper()
                      }
                    }
       }
@@ -450,7 +450,7 @@ ColumnLayout {
                      if (ProgramCheckerService.ghosttyAvailable) {
                        Settings.data.templates.ghostty = checked
                        if (Settings.data.colorSchemes.useWallpaperColors)
-                       MatugenService.generateFromWallpaper()
+                       AppThemeService.generateFromWallpaper()
                      }
                    }
       }
@@ -469,7 +469,7 @@ ColumnLayout {
                      if (ProgramCheckerService.footAvailable) {
                        Settings.data.templates.foot = checked
                        if (Settings.data.colorSchemes.useWallpaperColors)
-                       MatugenService.generateFromWallpaper()
+                       AppThemeService.generateFromWallpaper()
                      }
                    }
       }
@@ -496,7 +496,7 @@ ColumnLayout {
                      if (ProgramCheckerService.fuzzelAvailable) {
                        Settings.data.templates.fuzzel = checked
                        if (Settings.data.colorSchemes.useWallpaperColors)
-                       MatugenService.generateFromWallpaper()
+                       AppThemeService.generateFromWallpaper()
                      }
                    }
       }
@@ -515,7 +515,7 @@ ColumnLayout {
                      if (ProgramCheckerService.vesktopAvailable) {
                        Settings.data.templates.vesktop = checked
                        if (Settings.data.colorSchemes.useWallpaperColors)
-                       MatugenService.generateFromWallpaper()
+                       AppThemeService.generateFromWallpaper()
                      }
                    }
       }
@@ -534,7 +534,7 @@ ColumnLayout {
                      if (ProgramCheckerService.pywalfoxAvailable) {
                        Settings.data.templates.pywalfox = checked
                        if (Settings.data.colorSchemes.useWallpaperColors)
-                       MatugenService.generateFromWallpaper()
+                       AppThemeService.generateFromWallpaper()
                      }
                    }
       }
@@ -554,7 +554,7 @@ ColumnLayout {
         onToggled: checked => {
                      Settings.data.templates.enableUserTemplates = checked
                      if (Settings.data.colorSchemes.useWallpaperColors)
-                     MatugenService.generateFromWallpaper()
+                     AppThemeService.generateFromWallpaper()
                    }
       }
     }
diff --git a/Services/MatugenService.qml b/Services/AppThemeService.qml
similarity index 96%
rename from Services/MatugenService.qml
rename to Services/AppThemeService.qml
index 218a6662..fc54ed19 100644
--- a/Services/MatugenService.qml
+++ b/Services/AppThemeService.qml
@@ -64,7 +64,7 @@ Singleton {
                                                     })
 
   function init() {
-    Logger.log("Matugen", "Service started")
+    Logger.log("AppThemeService", "Service started")
   }
 
   Connections {
@@ -79,7 +79,7 @@ Singleton {
   Connections {
     target: Settings.data.colorSchemes
     function onDarkModeChanged() {
-      Logger.log("Matugen", "Detected dark mode change")
+      Logger.log("AppThemeService", "Detected dark mode change")
       if (Settings.data.colorSchemes.useWallpaperColors) {
         generateFromWallpaper()
       }
@@ -90,11 +90,11 @@ Singleton {
   // Wallpaper Colors Generation
   // --------------------------------------------------------------------------------
   function generateFromWallpaper() {
-    Logger.log("Matugen", "Generating from wallpaper on screen:", Screen.name)
+    Logger.log("AppThemeService", "Generating from wallpaper on screen:", Screen.name)
 
     const wp = WallpaperService.getWallpaper(Screen.name).replace(/'/g, "'\\''")
     if (!wp) {
-      Logger.error("Matugen", "No wallpaper found")
+      Logger.error("AppThemeService", "No wallpaper found")
       return
     }
 
@@ -126,7 +126,7 @@ Singleton {
   //  Instead, we use 'sed' to apply a custom palette to the existing matugen templates.
   // --------------------------------------------------------------------------------
   function generateFromPredefinedScheme(schemeData) {
-    Logger.log("Matugen", "Generating templates from predefined color scheme")
+    Logger.log("AppThemeService", "Generating templates from predefined color scheme")
 
     handleTerminalThemes()
 
@@ -333,7 +333,7 @@ Singleton {
     stderr: StdioCollector {
       onStreamFinished: {
         if (this.text) {
-          Logger.warn("MatugenService", "GenerateProcess stderr:", this.text)
+          Logger.warn("AppThemeService", "GenerateProcess stderr:", this.text)
         }
       }
     }
@@ -345,7 +345,7 @@ Singleton {
     stderr: StdioCollector {
       onStreamFinished: {
         if (this.text) {
-          Logger.warn("MatugenService", "CopyProcess stderr:", this.text)
+          Logger.warn("AppThemeService", "CopyProcess stderr:", this.text)
         }
       }
     }
diff --git a/Services/ColorSchemeService.qml b/Services/ColorSchemeService.qml
index 34a5324a..a211b4af 100644
--- a/Services/ColorSchemeService.qml
+++ b/Services/ColorSchemeService.qml
@@ -151,7 +151,7 @@ Singleton {
 
         // Generate Matugen templates if any are enabled and setting allows it
         if (Settings.data.colorSchemes.generateTemplatesForPredefined && hasEnabledMatugenTemplates()) {
-          MatugenService.generateFromPredefinedScheme(data)
+          AppThemeService.generateFromPredefinedScheme(data)
         }
       } catch (e) {
         Logger.error("ColorScheme", "Failed to parse scheme JSON:", path, e)
diff --git a/Services/MatugenTemplates.qml b/Services/MatugenTemplates.qml
index 09c0f56a..b50450bc 100644
--- a/Services/MatugenTemplates.qml
+++ b/Services/MatugenTemplates.qml
@@ -64,7 +64,7 @@ Singleton {
         lines.push("\n[templates." + terminal.name + "]")
         lines.push('input_path = "' + Quickshell.shellDir + '/Assets/MatugenTemplates/' + terminal.path + '"')
         lines.push('output_path = "' + terminal.output + '"')
-        lines.push('post_hook = "' + MatugenService.colorsApplyScript + " " + terminal.name + '"')
+        lines.push('post_hook = "' + AppThemeService.colorsApplyScript + " " + terminal.name + '"')
       }
     })
   }
@@ -99,7 +99,7 @@ Singleton {
                               "output": "~/.config/fuzzel/themes/noctalia"
                             }],
                           "input": "fuzzel.conf",
-                          "postHook": MatugenService.colorsApplyScript + " fuzzel"
+                          "postHook": AppThemeService.colorsApplyScript + " fuzzel"
                         }, {
                           "name": "pywalfox",
                           "templates": [{
@@ -107,7 +107,7 @@ Singleton {
                               "output": "~/.cache/wal/colors.json"
                             }],
                           "input": "pywalfox.json",
-                          "postHook": MatugenService.colorsApplyScript + " pywalfox"
+                          "postHook": AppThemeService.colorsApplyScript + " pywalfox"
                         }, {
                           "name": "vesktop",
                           "templates": [{
diff --git a/shell.qml b/shell.qml
index 6696a1b5..a32b7b40 100644
--- a/shell.qml
+++ b/shell.qml
@@ -82,7 +82,7 @@ ShellRoot {
 
         Logger.log("Shell", "---------------------------")
         WallpaperService.init()
-        MatugenService.init()
+        AppThemeService.init()
         ColorSchemeService.init()
         BarWidgetRegistry.init()
         LocationService.init()