diff --git a/home/hypridle/default.nix b/home/hypridle/default.nix
new file mode 100644
index 0000000..772676c
--- /dev/null
+++ b/home/hypridle/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  pkgs,
+  osConfig,
+  ...
+}:
+lib.mkIf osConfig.programs.hyprland.enable {
+  services.hypridle = {
+    enable = true;
+    settings = {
+      general = {
+        lock_cmd = "pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock";
+        before_sleep_cmd = "loginctl lock-session";
+        after_sleep_cmd = "hyprctl dispatch dpms on";
+      };
+
+      listener = [
+        {
+          timeout = 300; # 5min
+          on-timeout = "loginctl lock-session"; # lock screen when timeout has passed
+        }
+        {
+          timeout = 330; # 5.5min
+          on-timeout = "hyprctl dispatch dpms off"; # screen off when timeout has passed
+          on-resume = "hyprctl dispatch dpms on"; # screen on when activity is detected after timeout has fired.
+        }
+        {
+          timeout = 1800; # 30min
+          on-timeout = "systemctl suspend"; # suspend pc
+        }
+      ];
+    };
+  };
+}
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index e5fba08..2f58683 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -23,7 +23,9 @@ lib.mkIf osConfig.programs.hyprland.enable {
         "${pkgs.kdeconnect}/bin/kdeconnect-indicator"
         "${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"
         "${pkgs.waybar}/bin/waybar"
-        #"${pkgs.wl-clipboard}/bin/wl-paste --watch ${pkgs.cliphist}/bin/cliphist store -max-items 10"
+        "${pkgs.keepassxc}/bin/keepassxc"
+        "${pkgs.wl-clipboard}/bin/wl-paste --watch ${pkgs.cliphist}/bin/cliphist store -max-items 10"
+        (lib.mkIf config.services.hypridle.enable "${pkgs.hypridle}/bin/hypridle")
       ];
 
       general = {
diff --git a/home/waybar/config.nix b/home/waybar/config.nix
index 421f618..7b0bd8d 100644
--- a/home/waybar/config.nix
+++ b/home/waybar/config.nix
@@ -1,11 +1,17 @@
 {
+  position = "top";
+  layer = "top";
+  reload_style_on_change = true;
   modules-left = [
     "tray"
     "privacy"
     "clock"
     "sway/mode"
   ];
-  modules-center = [ "sway/workspaces" ];
+  modules-center = [
+    "sway/workspaces"
+    "hyprland/workspaces"
+  ];
   modules-right = [
     "backlight"
     "pulseaudio"
@@ -111,7 +117,6 @@
       deactivated = "";
     };
   };
-  layer = "bottom";
   memory = {
     format = " {}%";
     interval = 30;
@@ -122,7 +127,6 @@
     format-wifi = "{essid} ({signalStrength}%) ";
     on-click = "alacritty -t nmtui -e nmtui";
   };
-  position = "top";
   privacy = {
     icon-size = 18;
     icon-spacing = 4;
@@ -178,6 +182,10 @@
     disable-scroll = true;
     format = "{name}";
   };
+  "hyprland/workspaces" = {
+    all-outputs = true;
+    format = "{name}";
+  };
   tray = {
     icon-size = 18;
     show-passive-items = false;
diff --git a/home/waybar/style.scss b/home/waybar/style.scss
index 0e75374..0c91745 100644
--- a/home/waybar/style.scss
+++ b/home/waybar/style.scss
@@ -62,6 +62,7 @@ window#waybar.hidden {
   background-color: rgba(13, 214, 250, 0.4);
 
   button {
+    color: white;
     padding: 1px 5px;
   }
 
@@ -72,6 +73,14 @@ window#waybar.hidden {
   button.focused {
     background-color: rgba(50, 194, 219, 0.7);
   }
+
+  button.active {
+    background-color: rgba(80, 194, 219, 0.7);
+  }
+
+  button.urgent {
+    background-color: rgba(255, 0, 0, 0.7);
+  }
 }
 
 #network {
diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix
index fb393f7..131fa09 100644
--- a/hosts/brontes/configuration.nix
+++ b/hosts/brontes/configuration.nix
@@ -17,6 +17,8 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = hostname;
+  hardware.bluetooth.enable = true;
+  hardware.bluetooth.powerOnBoot = true;
   services.blueman.enable = true;
 
   services.greetd = {
@@ -29,6 +31,14 @@
       default_session = initial_session;
     };
   };
+  xdg.portal = {
+    enable = true;
+    config.common.default = "*";
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-gtk
+      xdg-desktop-portal-hyprland
+    ];
+  };
 
   services.pipewire = {
     enable = true;
diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix
index 8981055..3485294 100644
--- a/hosts/brontes/home.nix
+++ b/hosts/brontes/home.nix
@@ -17,6 +17,7 @@
       ../../home/waybar
       ../../home/hyprland
       ../../home/hyprlock
+      ../../home/hypridle
     ];
 
     programs.direnv = {
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index 04ce893..d3c0af2 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -30,6 +30,8 @@ in
 
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
+  services.blueman.enable = true;
+
   hardware.graphics.enable = true;
 
   # Configure keymap in X11
@@ -43,7 +45,6 @@ in
     powerKey = "hibernate";
   };
 
-  services.blueman.enable = true;
   systemd.sleep.extraConfig = ''
     HibernateDelaySec=1200
   '';