diff --git a/Assets/settings-default.json b/Assets/settings-default.json
index 7db66303..2d2a2d2d 100644
--- a/Assets/settings-default.json
+++ b/Assets/settings-default.json
@@ -1,5 +1,5 @@
 {
-  "settingsVersion": 12,
+  "settingsVersion": 13,
   "bar": {
     "position": "top",
     "backgroundOpacity": 1,
@@ -92,6 +92,7 @@
     "directory": "",
     "enableMultiMonitorDirectories": false,
     "setWallpaperOnAllMonitors": true,
+    "defaultWallpaper": "",
     "fillMode": "crop",
     "fillColor": "#000000",
     "randomEnabled": false,
@@ -162,9 +163,10 @@
     "useWallpaperColors": false,
     "predefinedScheme": "Noctalia (default)",
     "darkMode": true,
-    "matugenSchemeType": "scheme-fruit-salad"
+    "matugenSchemeType": "scheme-fruit-salad",
+    "generateTemplatesForPredefined": true
   },
-  "matugen": {
+  "templates": {
     "gtk": false,
     "qt": false,
     "kitty": false,
diff --git a/Commons/Settings.qml b/Commons/Settings.qml
index ee7cbabf..3c12b05a 100644
--- a/Commons/Settings.qml
+++ b/Commons/Settings.qml
@@ -27,8 +27,6 @@ Singleton {
   property string settingsFile: Quickshell.env("NOCTALIA_SETTINGS_FILE") || (configDir + "settings.json")
 
   property string defaultLocation: "Tokyo"
-  property string defaultWallpaper: Quickshell.shellDir + "/Assets/Wallpaper/noctalia.png"
-
   property string defaultAvatar: Quickshell.env("HOME") + "/.face"
   property string defaultVideosDirectory: Quickshell.env("HOME") + "/Videos"
   property string defaultWallpapersDirectory: Quickshell.env("HOME") + "/Pictures/Wallpapers"
@@ -60,6 +58,7 @@ Singleton {
     adapter.general.avatarImage = defaultAvatar
     adapter.screenRecorder.directory = defaultVideosDirectory
     adapter.wallpaper.directory = defaultWallpapersDirectory
+    adapter.wallpaper.defaultWallpaper = Quickshell.shellDir + "/Assets/Wallpaper/noctalia.png"
 
     // Set the adapter to the settingsFileView to trigger the real settings load
     settingsFileView.adapter = adapter
@@ -129,7 +128,7 @@ Singleton {
   JsonAdapter {
     id: adapter
 
-    property int settingsVersion: 12
+    property int settingsVersion: 13
 
     // bar
     property JsonObject bar: JsonObject {
@@ -220,6 +219,7 @@ Singleton {
       property string directory: ""
       property bool enableMultiMonitorDirectories: false
       property bool setWallpaperOnAllMonitors: true
+      property string defaultWallpaper: ""
       property string fillMode: "crop"
       property color fillColor: "#000000"
       property bool randomEnabled: false
diff --git a/Services/WallpaperService.qml b/Services/WallpaperService.qml
index 46869ff2..c60f2eba 100644
--- a/Services/WallpaperService.qml
+++ b/Services/WallpaperService.qml
@@ -224,7 +224,7 @@ Singleton {
   // -------------------------------------------------------------------
   // Get specific monitor wallpaper - now from cache
   function getWallpaper(screenName) {
-    return currentWallpapers[screenName] || Settings.defaultWallpaper
+    return currentWallpapers[screenName] || Settings.data.wallpaper.defaultWallpaper
   }
 
   // -------------------------------------------------------------------