diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 2131cf65..cb3a5f62 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -37,8 +37,8 @@ in ''
   }
 
   general {
-      gaps_in = 2.5
-      gaps_out = 5
+      gaps_in = 5
+      gaps_out = 10
       border_size = 1
       cursor_inactive_timeout = 5
       layout = dwindle
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 467f3da5..d69dbea7 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -1,13 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [
-    ./wlogout/default.nix
-    ./waybar/default.nix
-    ./gtk.nix
-    ./mako.nix
-    ./rofi.nix
-  ];
+  imports = [ ./waybar/default.nix ./gtk.nix ./mako.nix ./rofi.nix ];
   services = {
     avizo.enable = true;
     syncthing.enable = true;
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index 3ca436c1..23e34f66 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -93,12 +93,10 @@
       };
       pulseaudio = {
         scroll-step = 5;
-        format = "{icon} {format_source}";
-        format-bluetooth = "{icon} {format_source}";
-        format-bluetooth-muted = "󰝟 {icon} {format_source}";
-        format-muted = "󰝟 {format_source}";
-        format-source = "󰍬";
-        format-source-muted = "󰍭";
+        format = "{volume}% {icon} {format_source}";
+        format-muted = " 󰝟 {format_source}";
+        format-source = "{volume}% 󰍬";
+        format-source-muted = " 󰍭";
         format-icons = {
           headphone = "󰋋";
           hands-free = "󰥰";
diff --git a/home/hyprland/waybar/style.css b/home/hyprland/waybar/style.css
index 31cd143b..f472410a 100644
--- a/home/hyprland/waybar/style.css
+++ b/home/hyprland/waybar/style.css
@@ -8,7 +8,7 @@ window > box {
     color: @base05;
     background: alpha(@base00, 0.5);
     box-shadow: inset 0 0 0 1px alpha(@base03, 0.1), 0 0 0 1px alpha(@base00, 0.5);
-    margin: 5px 5px 0px;
+    margin: 10px 10px 0px;
     padding: 0px;
     border: 1px solid @base03;
     border-radius: 10px;
diff --git a/system/desktop.nix b/system/desktop.nix
index d2b743b8..d32f6518 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -30,6 +30,7 @@
     bluetooth.enable = true;
   };
   services = {
+    accounts-daemon.enable = true;
     dbus.packages = with pkgs; [ gcr ];
     gnome.gnome-keyring.enable = true;
     pipewire = {
diff --git a/system/hyprland.nix b/system/hyprland.nix
index a66397ba..f50be280 100644
--- a/system/hyprland.nix
+++ b/system/hyprland.nix
@@ -25,6 +25,7 @@
   };
   services = {
     blueman.enable = true;
+    udisks2.enable = true;
     gvfs.enable = true;
     tumbler.enable = true;
     xserver.displayManager.defaultSession = "hyprland";