diff --git a/.gitignore b/.gitignore
index 301d47e..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +0,0 @@
-flake.lock
diff --git a/data/theme.nix b/data/theme.nix
index 9f04a0c..b8c4683 100644
--- a/data/theme.nix
+++ b/data/theme.nix
@@ -19,6 +19,6 @@ in
     cream = "#fefcf3";
     aqua = "#689d6a";
     black = "#282828";
-    white = "#ebdbb2";
+    white = "#fcf8e6";
   };
 }
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..1db243e
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,181 @@
+{
+  "nodes": {
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1753140376,
+        "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
+    "emacs-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1754068288,
+        "narHash": "sha256-OWBCKYRqFD/WFcMGitxoT4QiTV/q4o4gosIH6vwTV+c=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "a2c4e31c1f77ddc72342af1ab4f90847d46e1cc6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1754085240,
+        "narHash": "sha256-kVHCrTWEe8B1thAhFag1bk4QPY0ZP45V9vPbrwPHoNo=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "e102920c1becb114645c6f92fe14edc0b05cc229",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1753749649,
+        "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1751274312,
+        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1753939845,
+        "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "94def634a20494ee057c76998843c015909d6311",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1753939845,
+        "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "94def634a20494ee057c76998843c015909d6311",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nur": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1754092202,
+        "narHash": "sha256-GrmUYcws8Tos6Ubu018qFzAWVs4OpN5f+PgkVnLou7c=",
+        "owner": "nix-community",
+        "repo": "nur",
+        "rev": "fa00a3de3b2ef6f1d6ee9f07dd4a31d6a5b91ac6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nur",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "disko": "disko",
+        "emacs-overlay": "emacs-overlay",
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nur": "nur"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/home/waybar.nix b/home/waybar.nix
index c2869bc..0ee653f 100644
--- a/home/waybar.nix
+++ b/home/waybar.nix
@@ -25,6 +25,7 @@ in let
           on-click = "pavucontrol";
         };
         background = theme.normal.yellow;
+        color = theme.extra.white;
       }
       {
         name = "network";
@@ -41,6 +42,7 @@ SSID: {essid} {frequency}'';
           format-icons = ["󰤯" "󰤟" "󰤢" "󰤥" "󰤨"];
         };
         background = theme.normal.green;
+        color = theme.extra.white;
       }
       {
         name = "custom/vpn";
@@ -57,6 +59,7 @@ SSID: {essid} {frequency}'';
           disconnected.color = theme.normal.yellow;
         };
         background = theme.extra.teal;
+        color = theme.extra.white;
       }
     ]
     ++ (if (super-config.has_battery) then [{
@@ -75,6 +78,7 @@ SSID: {essid} {frequency}'';
         format-icons = ["" "" "" "" ""];
       };
       background = theme.extra.aqua;
+      color = theme.extra.white;
     }] else [])
     ++ [
       {
@@ -83,6 +87,7 @@ SSID: {essid} {frequency}'';
           format = "{}% ";
         };
         background = theme.extra.brown;
+        color = theme.extra.white;
       }
       {
         name = "memory";
@@ -90,6 +95,7 @@ SSID: {essid} {frequency}'';
           format = "{}% ";
         };
         background = theme.extra.darkbrown;
+        color = theme.extra.white;
       }
       {
         name = "temperature";
@@ -100,6 +106,7 @@ SSID: {essid} {frequency}'';
           format-icons = ["" "" ""];
         };
         background = theme.extra.darkerbrown;
+        color = theme.extra.white;
       }
       {
         name = "clock";
@@ -121,11 +128,13 @@ SSID: {essid} {frequency}'';
           };
         };
         background = theme.normal.black;
+        color = theme.normal.white;
       }
       {
         name = "tray";
         config = { spacing = 10; };
         background = theme.normal.white;
+        color = theme.normal.black;
       }
     ];
 
diff --git a/system/default.nix b/system/default.nix
index 10996a1..dd21781 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -47,8 +47,6 @@
     sudo.wheelNeedsPassword = false; # Allow sudo without password
   };
 
-  programs.dconf.enable = true;
-
   fonts = {
     enableDefaultPackages = true;
     packages = with pkgs; [
diff --git a/user/default.nix b/user/default.nix
index abfeb6f..7304c69 100644
--- a/user/default.nix
+++ b/user/default.nix
@@ -16,8 +16,10 @@ in {
   };
   
   programs.zsh.enable = true;
+  programs.dconf.enable = true;
 
   services = {
+    udisks2.enable = true;
     greetd = {
       enable = true;
       settings = {