diff --git a/Colors.qml b/Colors.qml
new file mode 100644
index 0000000..0e0a638
--- /dev/null
+++ b/Colors.qml
@@ -0,0 +1,29 @@
+pragma Singleton
+import QtQuick
+import Quickshell
+
+Singleton {
+    id: customColors
+    // Core Backgrounds
+    readonly property color background: "#1A1B26"
+    readonly property color foreground: "#C0CAF5"
+    readonly property color cursor: "#C0CAF5"
+
+    // The 16 Colors of the Apocalypse
+    readonly property color color0: "#414868"
+    readonly property color color1: "#F7768E"
+    readonly property color color2: "#9ECE6A"
+    readonly property color color3: "#E0AF68"
+    readonly property color color4: "#7AA2F7"
+    readonly property color color5: "#BB9AF7"
+    readonly property color color6: "#7DCFFF"
+    readonly property color color7: "#A9B1D6"
+    readonly property color color8: "#414868"
+    readonly property color color9: "#F7768E"
+    readonly property color color10: "#9ECE6A"
+    readonly property color color11: "#E0AF68"
+    readonly property color color12: "#7AA2F7"
+    readonly property color color13: "#BB9AF7"
+    readonly property color color14: "#7DCFFF"
+    readonly property color color15: "#C0CAF5"
+}
diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml
index 01d494d..70d4e68 100644
--- a/modules/bar/Bar.qml
+++ b/modules/bar/Bar.qml
@@ -36,6 +36,7 @@ PanelWindow {
         spacing: 30
         anchors.right: parent.right
         anchors.verticalCenter: parent.verticalCenter
+        Battery {}
         Volume {}
         PowerProfiles {}
         SystemTray {
diff --git a/modules/notifications/NotiPopup.qml b/modules/notifications/NotiPopup.qml
index 3ca36d1..8c13c1a 100644
--- a/modules/notifications/NotiPopup.qml
+++ b/modules/notifications/NotiPopup.qml
@@ -11,6 +11,7 @@ import "../settings/"
 
 WlrLayershell {
     id: root
+    required property var modelData
     screen: {
         // Iterate through all connected Quickshell screens
         for (let i = 0; i < Quickshell.screens.length; i++) {
diff --git a/modules/settings/Settings.qml b/modules/settings/Settings.qml
index f79c320..7d41764 100644
--- a/modules/settings/Settings.qml
+++ b/modules/settings/Settings.qml
@@ -4,26 +4,27 @@ import QtQuick
 import Quickshell
 import Quickshell.Io
 
-Singleton {
+FileView {
+    id: settingsView
+    path: "/home/lucy/.cache/quickshell_settings.json"
 
-    FileView {
-        path: "/home/lucy/.cache/quickshell_settings.json"
+    watchChanges: true
+    onAdapterChanged: writeAdapter()
 
-        watchChanges: true
-        onAdapterChanged: writeAdapter()
-        onFileChanged: reload()
+    adapter: JsonAdapter {
+        id: jsonAdapter
+        property string currentWall: ""
+        property string wallDir: "/home/lucy/.walls/"
+        property string font: "SFMono Nerd Font Propo"
+        property real fontSize: 14
 
-        JsonAdapter {
-            id: adapter
-            property string lastWallpaper
-            property string wallDir
-            property string font
-            property real fontSize: 14
-        }
+        onCurrentWallChanged: settingsView.writeAdapter()
+        onWallDirChanged: settingsView.writeAdapter()
+        onFontChanged: settingsView.writeAdapter()
+        onFontSizeChanged: settingsView.writeAdapter()
     }
-
-    property alias currentWall: adapter.lastWallpaper
-    property alias font: adapter.font
-    property alias fontSize: adapter.fontSize
-    property alias wallDir: adapter.wallDir
+    property alias currentWall: jsonAdapter.currentWall
+    property alias font: jsonAdapter.font
+    property alias fontSize: jsonAdapter.fontSize
+    property alias wallDir: jsonAdapter.wallDir
 }
diff --git a/modules/wallpaper/WallSwitcher.qml b/modules/wallpaper/WallSwitcher.qml
index 8c8bfec..60a4ea0 100644
--- a/modules/wallpaper/WallSwitcher.qml
+++ b/modules/wallpaper/WallSwitcher.qml
@@ -41,7 +41,7 @@ FloatingWindow {
     // 1. The File Scanner
     FolderListModel {
         id: folderModel
-        folder: Settings.wallDir // <--- Your stash!
+        folder: "file://" + Settings.wallDir // <--- Your stash!
         nameFilters: ["*.png", "*.jpg", "*.jpeg"]
         showDirs: false
     }
@@ -86,6 +86,7 @@ FloatingWindow {
                 onClicked: {
                     let cleanPath = parent.modelData.fileUrl.toString().replace("file://", "");
                     Settings.currentWall = parent.modelData.fileUrl.toString();
+                    console.log(Settings.currentWall);
                 }
             }
         }