diff --git a/home/hosts/gunter/default.nix b/home/hosts/gunter/default.nix
index ea28305..9e6dc4f 100644
--- a/home/hosts/gunter/default.nix
+++ b/home/hosts/gunter/default.nix
@@ -23,6 +23,7 @@
           ../../packages
           ../../programs/dunst
           ../../programs/git
+          ../../programs/gtk
           ../../programs/firefox
           ../../programs/kitty
           ../../programs/obs-studio
diff --git a/home/hosts/magicman/default.nix b/home/hosts/magicman/default.nix
index 8ead350..35695f7 100644
--- a/home/hosts/magicman/default.nix
+++ b/home/hosts/magicman/default.nix
@@ -26,6 +26,7 @@
           ../../programs/tmux
           ../../programs/dunst
           ../../programs/kitty
+          ../../programs/gtk
           ../../programs/rofi
           ../../programs/obs-studio
           ../../programs/vscode
diff --git a/home/hyprland/cursor.nix b/home/hyprland/cursor.nix
index ef279c2..15153e5 100644
--- a/home/hyprland/cursor.nix
+++ b/home/hyprland/cursor.nix
@@ -9,5 +9,4 @@
     size = 32;
   };
 
-  gtk.enable = true;
 }
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index 6cfdd9b..1693330 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -24,15 +24,9 @@ in
   sops.secrets."radarr_base_url" = { };
   sops.secrets."radarr_api_key" = { };
 
-  xdg.configFile."waybar/macchiato.css" = {
-    source =
-      pkgs.fetchFromGitHub {
-        owner = "catppuccin";
-        repo = "waybar";
-        rev = "f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff";
-        sha256 = "WLJMA2X20E5PCPg0ZPtSop0bfmu+pLImP9t8A8V4QK8=";
-      }
-      + "/themes/macchiato.css";
+  catppuccin.waybar = {
+    enable = true;
+    flavor = "macchiato";
   };
 
   programs.waybar = {
@@ -42,7 +36,6 @@ in
       target = "graphical-session.target";
     };
     style = ''
-      @import "macchiato.css";
       * {
         border: none;
         font-family: "JetbrainsMono Nerd Font";
@@ -137,6 +130,7 @@ in
       #pulseaudio,
       #network,
       #battery,
+      #disk,
       #custom-powermenu,
       #custom-arrhist {
         padding-left: 12px;
@@ -164,6 +158,7 @@ in
             (lib.mkIf (withArrhist) "custom/arrhist")
             "pulseaudio"
             "pulseaudio#microphone"
+            "disk"
             "memory"
             "cpu"
             (lib.mkIf (withBattery) "battery")
@@ -217,6 +212,15 @@ in
             "interval" = 3;
             "format" = " {usage}%";
           };
+          "disk" = {
+            "interval" = 30;
+            "format" = "󰋊 {percentage_used}%";
+            "path" = "/";
+            "tooltip-format" = "{used} / {total}";
+            "states" = {
+              "warning" = 85;
+            };
+          };
           "tray" = {
             "icon-size" = 15;
             "spacing" = 6;
diff --git a/home/programs/gtk/default.nix b/home/programs/gtk/default.nix
new file mode 100644
index 0000000..e5e0cf1
--- /dev/null
+++ b/home/programs/gtk/default.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  gtk = {
+    enable = true;
+    theme = {
+      name = "catppuccin-macchiato-blue-standard";
+      package = pkgs.catppuccin-gtk.override {
+        variant = "macchiato";
+        accents = [ "blue" ];
+      };
+    };
+  };
+}