diff --git a/modules/home/programs/hyprlock/default.nix b/modules/home/programs/hyprlock/default.nix
index 5cc69813..cfe796f3 100644
--- a/modules/home/programs/hyprlock/default.nix
+++ b/modules/home/programs/hyprlock/default.nix
@@ -1,24 +1,18 @@
 {
-  inputs,
-  pkgs,
   lib,
   osConfig,
   clib,
   ...
 }: let
-  inherit (lib) mkIf mkEnableOption;
+  inherit (lib) mkIf;
   cfg = osConfig.nixos.programs.hyprland;
 
-  hyprlockFlake = inputs.hyprlock.packages.${pkgs.system}.hyprlock;
-  # hyprlockPkg = pkgs.hyprlock;
-  #
   bg = osConfig.settings.theme.background;
   inherit (clib.theme.bgs) resolve;
 in {
   config = mkIf cfg.enable {
     programs.hyprlock = {
       enable = true;
-      package = hyprlockFlake;
       settings = {
         general = {
           # disable_loading_bar = true;
diff --git a/modules/home/services/hypridle/default.nix b/modules/home/services/hypridle/default.nix
index 12637c79..5b91e533 100644
--- a/modules/home/services/hypridle/default.nix
+++ b/modules/home/services/hypridle/default.nix
@@ -1,22 +1,14 @@
 {
   osConfig,
   lib,
-  pkgs,
-  inputs,
   ...
-}:
-let
+}: let
   inherit (lib) mkIf;
   cfg = osConfig.nixos.programs.hyprland;
-
-  hypridleFlake = inputs.hypridle.packages.${pkgs.system}.hypridle;
-  # hypridlePkg = pkgs.hypridle;
-in
-{
+in {
   config = mkIf cfg.enable {
     services.hypridle = {
       enable = true;
-      package = hypridleFlake;
       settings = {
         general = {
           lock_cmd = "hyprlock";
diff --git a/modules/home/services/hyprpaper/default.nix b/modules/home/services/hyprpaper/default.nix
index dac6688c..1710d202 100644
--- a/modules/home/services/hyprpaper/default.nix
+++ b/modules/home/services/hyprpaper/default.nix
@@ -1,7 +1,5 @@
 {
   lib,
-  pkgs,
-  inputs,
   osConfig,
   clib,
   ...
@@ -9,7 +7,6 @@
   inherit (lib) mkIf;
 
   cfg = osConfig.nixos.programs.hyprland;
-  hyprpaperFlake = inputs.hyprpaper.packages.${pkgs.system}.default;
   bg = osConfig.settings.theme.background;
   bgs = clib.theme.bgs;
 
@@ -35,7 +32,6 @@ in {
   config = mkIf cfg.enable {
     services.hyprpaper = {
       enable = true;
-      package = hyprpaperFlake;
 
       settings = {
         ipc = "on";
diff --git a/modules/server/services/homepage-dashboard/default.nix b/modules/server/services/homepage-dashboard/default.nix
index c4918e72..2f785890 100644
--- a/modules/server/services/homepage-dashboard/default.nix
+++ b/modules/server/services/homepage-dashboard/default.nix
@@ -24,6 +24,13 @@ in {
         environmentFile = config.age.secrets.homepageEnvironment.path;
 
         settings = {
+          color = "stone";
+          theme = "dark";
+          headerStyle = "clean";
+          statusStyle = "dot";
+          hideVersion = true;
+          useEqualHeights = true;
+
           layout = [
             {
               Glances = {
@@ -57,10 +64,6 @@ in {
               };
             }
           ];
-
-          headerStyle = "clean";
-          statusStyle = "dot";
-          hideVersion = "true";
         };
 
         widgets = [
@@ -125,72 +128,94 @@ in {
           ++ [
             {
               Glances = let
-                port = toString config.services.glances.port;
+                glancesShared = {
+                  type = "glances";
+                  url = "http://localhost:${toString config.services.glances.port}";
+                  chart = true;
+                  version = 4;
+                };
               in [
                 {
-                  Info = {
-                    widget = {
-                      type = "glances";
-                      url = "http://localhost:${port}";
-                      metric = "info";
-                      chart = false;
-                      version = 4;
-                    };
+                  Memory = {
+                    widget =
+                      glancesShared
+                      // {
+                        metric = "memory";
+                        refreshInterval = 2000;
+                        pointsLimit = 30;
+                      };
                   };
                 }
+                {
+                  "CPU Usage" = {
+                    widget =
+                      glancesShared
+                      // {
+                        metric = "cpu";
+                        refreshInterval = 2000;
+                        pointsLimit = 30;
+                      };
+                  };
+                }
+
                 {
                   "CPU Temp" = {
-                    widget = {
-                      type = "glances";
-                      url = "http://localhost:${port}";
-                      metric = "sensor:Tctl";
-                      chart = false;
-                      version = 4;
-                    };
+                    widget =
+                      glancesShared
+                      // {
+                        metric = "sensor:Tctl";
+                        refreshInterval = 5000;
+                        pointsLimit = 20;
+                      };
                   };
                 }
                 {
                   "GPU Radeon" = {
-                    widget = {
-                      type = "glances";
-                      url = "http://localhost:${port}";
-                      metric = "sensor:junction";
-                      chart = false;
-                      version = 4;
-                    };
+                    widget =
+                      glancesShared
+                      // {
+                        metric = "sensor:junction";
+                      };
                   };
                 }
                 {
                   "GPU Intel" = {
-                    widget = {
-                      type = "glances";
-                      url = "http://localhost:${port}";
-                      metric = "sensor:pkg";
-                      chart = false;
-                      version = 4;
-                    };
+                    widget =
+                      glancesShared
+                      // {
+                        metric = "sensor:pkg";
+                      };
                   };
                 }
+                {
+                  "ZFS Pool" = {
+                    widget =
+                      glancesShared
+                      // {
+                        metric = "fs:/mnt/data";
+                        refreshInterval = 30000;
+                        pointsLimit = 20;
+                        diskUnits = "bytes";
+                      };
+                  };
+                }
+
                 {
                   Processes = {
-                    widget = {
-                      type = "glances";
-                      url = "http://localhost:${port}";
-                      metric = "process";
-                      chart = false;
-                      version = 4;
-                    };
+                    widget =
+                      glancesShared
+                      // {
+                        metric = "process";
+                      };
                   };
                 }
                 {
                   Network = {
-                    widget = {
-                      type = "glances";
-                      url = "http://localhost:${port}";
-                      metric = "network:enp6s0";
-                      chart = false;
-                      version = 4;
-                    };
+                    widget =
+                      glancesShared
+                      // {
+                        metric = "network:enp6s0";
+                      };
                   };
                 }
               ];