diff --git a/Services/ColorSchemes.qml b/Services/ColorSchemes.qml
index 6144322..d8c3638 100644
--- a/Services/ColorSchemes.qml
+++ b/Services/ColorSchemes.qml
@@ -14,8 +14,6 @@ Singleton {
   }
 
   property var schemes: []
-  property string baseDirectory: "file://" + Quickshell.shellDir + "/Assets/ColorSchemes"
-  // //property string currentScheme: Settings.data.wallpaper.current
   property bool scanning: false
 
   function loadColorSchemes() {
@@ -24,7 +22,7 @@ Singleton {
     schemes = []
     // Unsetting, then setting the folder will re-trigger the parsing!
     folderModel.folder = ""
-    folderModel.folder = baseDirectory
+    folderModel.folder = "file://" + Quickshell.shellDir + "/Assets/ColorSchemes"
   }
 
   FolderListModel {
@@ -36,7 +34,7 @@ Singleton {
       if (status === FolderListModel.Ready) {
         var files = []
         for (var i = 0; i < count; i++) {
-          var filepath = baseDirectory + "/" + get(i, "fileName")
+          var filepath = folderModel.folder + "/" + get(i, "fileName")
           files.push(filepath)
         }
         schemes = files
diff --git a/Services/Wallpapers.qml b/Services/Wallpapers.qml
index 71fa8a5..e3a1895 100644
--- a/Services/Wallpapers.qml
+++ b/Services/Wallpapers.qml
@@ -120,8 +120,7 @@ Singleton {
       if (status === FolderListModel.Ready) {
         var files = []
         for (var i = 0; i < count; i++) {
-          var filepath = (Settings.data.wallpaper.directory !== undefined ? Settings.data.wallpaper.directory : "") + "/" + get(
-            i, "fileName")
+          var filepath = folderModel.folder + "/" + get(i, "fileName")
           files.push(filepath)
         }
         wallpaperList = files