diff --git a/home/programs/hyprland.nix b/home/programs/hyprland.nix
index d9abf41..677ecf4 100644
--- a/home/programs/hyprland.nix
+++ b/home/programs/hyprland.nix
@@ -54,48 +54,61 @@ in {
         ];
       };
       bind = [
-        "${modifier}, h, movefocus,l"
-        "${modifier}, l, movefocus,r"
-        "${modifier},       j,     layoutmsg,cyclenext"
-        "${modifier},       k,     layoutmsg,cycleprev"
-        "${modifier},       space, layoutmsg,swapwithmaster master"
-        "${modifier},       F,     fullscreen,"
-        "${modifier},       V,     togglefloating,"
-        "${modifier},       W,     layoutmsg, orientationprev"
-        "${modifier}_SHIFT, W,     layoutmsg, orientationnext"
-        "${modifier}_SHIFT, V,     togglegroup,"
-        "${modifier}_SHIFT, h,     changegroupactive,b"
-        "${modifier}_SHIFT, h,     moveintogroup,l"
-        "${modifier}_SHIFT, l,     moveintogroup,r"
-        "${modifier}_SHIFT, l,     changegroupactive,f"
-        "${modifier},       Y,     togglespecialworkspace"
-        "${modifier}_SHIFT, Y,     movetoworkspace, special"
-        "${modifier}_SHIFT, X,     killactive"
-        "${modifier},       slash, focuswindow, brave-browser"
-        "${modifier},       n,     focuswindow, Logseq"
-        "${modifier}, R, submap, resize"
-        "${modifier},1,workspace,1"
-        "${modifier},2,workspace,2"
-        "${modifier},3,workspace,3"
-        "${modifier},4,workspace,4"
-        "${modifier},5,workspace,5"
-        "${modifier},6,workspace,6"
-        "${modifier},7,workspace,7"
-        "${modifier},8,workspace,8"
-        "${modifier},9,workspace,9"
-        "${modifier},0,workspace,10"
-        "${modifier},left,workspace,r-1"
-        "${modifier},right,workspace,r+1"
-        "${modifier}_SHIFT,1,movetoworkspace,1"
-        "${modifier}_SHIFT,2,movetoworkspace,2"
-        "${modifier}_SHIFT,3,movetoworkspace,3"
-        "${modifier}_SHIFT,4,movetoworkspace,4"
-        "${modifier}_SHIFT,5,movetoworkspace,5"
-        "${modifier}_SHIFT,6,movetoworkspace,6"
-        "${modifier}_SHIFT,7,movetoworkspace,7"
-        "${modifier}_SHIFT,8,movetoworkspace,8"
-        "${modifier}_SHIFT,9,movetoworkspace,9"
-        "${modifier}_SHIFT,0,movetoworkspace,10"
+
+# movement
+        "${modifier}, h, movefocus, l"
+        "${modifier}, l, movefocus, r"
+        "${modifier}, j, layoutmsg, cyclenext"
+        "${modifier}, k, layoutmsg, cycleprev"
+
+# window management
+        "${modifier}, F,       fullscreen,"
+        "${modifier}, V,       togglefloating,"
+        "${modifier}_SHIFT, X, killactive"
+
+# master layout
+        "${modifier}, space,   layoutmsg,swapwithmaster master"
+        "${modifier}, W,       layoutmsg, orientationprev"
+        "${modifier}_SHIFT, W, layoutmsg, orientationnext"
+
+# window grouping
+        "${modifier}_SHIFT, V, togglegroup,"
+        "${modifier}_SHIFT, j, changegroupactive,b"
+        "${modifier}_SHIFT, k, changegroupactive,f"
+        "${modifier}_SHIFT, h, moveintogroup,l"
+        "${modifier}_SHIFT, l, moveintogroup,r"
+
+# scratch buffer
+        "${modifier}, Y,       togglespecialworkspace"
+        "${modifier}_SHIFT, Y, movetoworkspace, special"
+
+# applications
+        "${modifier}, slash, focuswindow, brave-browser"
+        "${modifier}, n,     focuswindow, Logseq"
+
+# workspaces
+        "${modifier}, 1,        workspace,1"
+        "${modifier}, 2,        workspace,2"
+        "${modifier}, 3,        workspace,3"
+        "${modifier}, 4,        workspace,4"
+        "${modifier}, 5,        workspace,5"
+        "${modifier}, 6,        workspace,6"
+        "${modifier}, 7,        workspace,7"
+        "${modifier}, 8,        workspace,8"
+        "${modifier}, 9,        workspace,9"
+        "${modifier}, 0,        workspace,10"
+        "${modifier}, left,     workspace,r-1"
+        "${modifier}, right,    workspace,r+1"
+        "${modifier}_SHIFT, 1,  movetoworkspace,1"
+        "${modifier}_SHIFT, 2,  movetoworkspace,2"
+        "${modifier}_SHIFT, 3,  movetoworkspace,3"
+        "${modifier}_SHIFT, 4,  movetoworkspace,4"
+        "${modifier}_SHIFT, 5,  movetoworkspace,5"
+        "${modifier}_SHIFT, 6,  movetoworkspace,6"
+        "${modifier}_SHIFT, 7,  movetoworkspace,7"
+        "${modifier}_SHIFT, 8,  movetoworkspace,8"
+        "${modifier}_SHIFT, 9,  movetoworkspace,9"
+        "${modifier}_SHIFT, 0,  movetoworkspace,10"
       ];
       bindm = [
         "${modifier}, mouse:272, movewindow"
@@ -126,7 +139,7 @@ in {
         gaps_out = 10;
         resize_on_border = true;
         layout = "master";
-        # "col.active_border" = "rgb(FFFF00) rgb(00FFFF) rgb(FF00FF)";
+        "col.active_border" = lib.mkForce "rgb(FFFF00) rgb(00FFFF) rgb(FF00FF)";
         border_size = lib.mkDefault 5;
       };
       master = {
@@ -140,6 +153,8 @@ in {
     };
     # https://wiki.hyprland.org/Configuring/Variables/
     extraConfig = ''
+      bind = ${modifier}, R, submap, resize
+
       submap = resize
         binde = ,right,resizeactive,10 0
         binde = ,left,resizeactive,-10 0
diff --git a/home/programs/waybar.nix b/home/programs/waybar.nix
index 71946f0..f17c8a8 100644
--- a/home/programs/waybar.nix
+++ b/home/programs/waybar.nix
@@ -1,12 +1,13 @@
 {pkgs, ...}: {
   programs.waybar = {
     enable = true;
+    systemd.enable = true;
     settings = {
       mainBar = {
         layer = "top";
         position = "top";
         height = 36;
-        modules-right = ["mpris" "pulseaudio" "clock" "tray" "battery"];
+        modules-right = ["idle_inhibitor" "mpris" "pulseaudio" "clock" "tray" "battery"];
         clock = {
           format = "📅 {:%a %b-%d %I:%M %p}";
         };
@@ -39,9 +40,5 @@
         };
       };
     };
-    systemd = {
-      enable = true;
-      target = "graphical-session.target";
-    };
   };
 }