diff --git a/Modules/Settings/SettingsPanel.qml b/Modules/Settings/SettingsPanel.qml
index d8645ba..61387d6 100644
--- a/Modules/Settings/SettingsPanel.qml
+++ b/Modules/Settings/SettingsPanel.qml
@@ -318,17 +318,17 @@ NLoader {
                 Layout.fillHeight: true
                 currentIndex: currentTabIndex
 
-                Tabs.General {}
-                Tabs.Bar {}
-                Tabs.Audio {}
-                Tabs.Display {}
-                Tabs.Network {}
-                Tabs.TimeWeather {}
-                Tabs.ColorScheme {}
-                Tabs.Wallpaper {}
-                Tabs.WallpaperSelector {}
-                Tabs.ScreenRecorder {}
-                Tabs.About {}
+                Tabs.GeneralTab {}
+                Tabs.BarTab {}
+                Tabs.AudioTab {}
+                Tabs.DisplayTab {}
+                Tabs.NetworkTab {}
+                Tabs.TimeWeatherTab {}
+                Tabs.ColorSchemeTab {}
+                Tabs.WallpaperTab {}
+                Tabs.WallpaperSelectorTab {}
+                Tabs.ScreenRecorderTab {}
+                Tabs.AboutTab {}
               }
             }
           }
diff --git a/Modules/Settings/Tabs/About.qml b/Modules/Settings/Tabs/AboutTab.qml
similarity index 100%
rename from Modules/Settings/Tabs/About.qml
rename to Modules/Settings/Tabs/AboutTab.qml
diff --git a/Modules/Settings/Tabs/Audio.qml b/Modules/Settings/Tabs/AudioTab.qml
similarity index 100%
rename from Modules/Settings/Tabs/Audio.qml
rename to Modules/Settings/Tabs/AudioTab.qml
diff --git a/Modules/Settings/Tabs/Bar.qml b/Modules/Settings/Tabs/BarTab.qml
similarity index 100%
rename from Modules/Settings/Tabs/Bar.qml
rename to Modules/Settings/Tabs/BarTab.qml
diff --git a/Modules/Settings/Tabs/ColorScheme.qml b/Modules/Settings/Tabs/ColorSchemeTab.qml
similarity index 69%
rename from Modules/Settings/Tabs/ColorScheme.qml
rename to Modules/Settings/Tabs/ColorSchemeTab.qml
index 7e95a97..3783d5f 100644
--- a/Modules/Settings/Tabs/ColorScheme.qml
+++ b/Modules/Settings/Tabs/ColorSchemeTab.qml
@@ -9,6 +9,12 @@ ColumnLayout {
 
   spacing: 0
 
+  // Component.onCompleted: {
+  //   console.log("[ColorSchemes] Service initialized")
+  //   ColorScheme.loadColorSchemes()
+  // }
+
+
   // property var colorSchemes: [{
   //     "label": "Generated from Wallpaper (Matugen required)"
   //   }, {
@@ -24,7 +30,6 @@ ColumnLayout {
   //     "label": "Rosé Pine",
   //     "file": "rosepine.json"
   //   }]
-
   ScrollView {
     id: scrollView
 
@@ -56,18 +61,22 @@ ColumnLayout {
         }
 
         ButtonGroup {
-          id: schemes
+          id: schemesGroup
         }
 
-        // Repeater {
-        //   model: root.colorSchemes
-        //   ButtonGroup.group: schemes
-        //   NRadioButton {
-        //     // checked: Audio.sink?.id === modelData.id
-        //     //onClicked: Audio.setAudioSink(modelData)
-        //     text: modelData.label
-        //   }
-        // }
+        Repeater {
+          model: ColorSchemes.schemes
+          delegate: NRadioButton {
+            ButtonGroup.group: schemesGroup
+            // checked: Audio.sink?.id === modelData.id
+            //onClicked: Audio.setAudioSink(modelData)
+            text: {
+              console.log(modelData.fileName) 
+              return modelData.fileName
+            }
+          }
+          
+        }
       }
     }
   }
diff --git a/Modules/Settings/Tabs/Display.qml b/Modules/Settings/Tabs/DisplayTab.qml
similarity index 100%
rename from Modules/Settings/Tabs/Display.qml
rename to Modules/Settings/Tabs/DisplayTab.qml
diff --git a/Modules/Settings/Tabs/General.qml b/Modules/Settings/Tabs/GeneralTab.qml
similarity index 100%
rename from Modules/Settings/Tabs/General.qml
rename to Modules/Settings/Tabs/GeneralTab.qml
diff --git a/Modules/Settings/Tabs/Network.qml b/Modules/Settings/Tabs/NetworkTab.qml
similarity index 100%
rename from Modules/Settings/Tabs/Network.qml
rename to Modules/Settings/Tabs/NetworkTab.qml
diff --git a/Modules/Settings/Tabs/ScreenRecorder.qml b/Modules/Settings/Tabs/ScreenRecorderTab.qml
similarity index 100%
rename from Modules/Settings/Tabs/ScreenRecorder.qml
rename to Modules/Settings/Tabs/ScreenRecorderTab.qml
diff --git a/Modules/Settings/Tabs/TimeWeather.qml b/Modules/Settings/Tabs/TimeWeatherTab.qml
similarity index 100%
rename from Modules/Settings/Tabs/TimeWeather.qml
rename to Modules/Settings/Tabs/TimeWeatherTab.qml
diff --git a/Modules/Settings/Tabs/WallpaperSelector.qml b/Modules/Settings/Tabs/WallpaperSelectorTab.qml
similarity index 100%
rename from Modules/Settings/Tabs/WallpaperSelector.qml
rename to Modules/Settings/Tabs/WallpaperSelectorTab.qml
diff --git a/Modules/Settings/Tabs/Wallpaper.qml b/Modules/Settings/Tabs/WallpaperTab.qml
similarity index 100%
rename from Modules/Settings/Tabs/Wallpaper.qml
rename to Modules/Settings/Tabs/WallpaperTab.qml
diff --git a/Services/ColorSchemes.qml b/Services/ColorSchemes.qml
new file mode 100644
index 0000000..e879a65
--- /dev/null
+++ b/Services/ColorSchemes.qml
@@ -0,0 +1,49 @@
+pragma Singleton
+
+import QtQuick
+import Qt.labs.folderlistmodel
+import Quickshell
+import Quickshell.Io
+
+Singleton {
+  id: root
+
+  // Component.onCompleted: {
+  //   console.log("[ColorSchemes] Service initialized")
+  //   loadColorSchemes()
+  // }
+
+  // property var schemes: []
+  // //property string currentScheme: Settings.data.wallpaper.current
+  // property bool scanning: false
+
+  // function loadColorSchemes() {
+  //   scanning = true
+  //   schemes = []
+  //   // Unsetting, then setting the folder will re-trigger the parsing!
+  //   folderModel.folder = ""
+  //   folderModel.folder = "file://" + Quickshell.shellDir + "/Assets/Matugen/ColorSchemes"
+  // }
+
+  // FolderListModel {
+  //   id: folderModel
+  //   nameFilters: ["*.json"]
+  //   showDirs: false
+  //   sortField: FolderListModel.Name
+  //   onStatusChanged: {
+  //     console.log("sasfjsaflkhfkjhasf")
+  //     if (status === FolderListModel.Ready) {
+  //       var files = []
+  //       for (var i = 0; i < count; i++) {
+  //         console.log(get(i, "fileName"))
+  //         // var filepath = (Settings.data.wallpaper.directory !== undefined ? Settings.data.wallpaper.directory : "") + "/" + get(
+  //         //   i, "fileName")
+  //         // files.push(filepath)
+  //       }
+  //       schemes = files
+  //       scanning = false
+  //       console.log(schemes)
+  //     }
+  //   }
+  // }
+}