diff --git a/modules/user/hyprland.nix b/modules/user/hyprland.nix
index 9b5ed64..0db336e 100644
--- a/modules/user/hyprland.nix
+++ b/modules/user/hyprland.nix
@@ -30,25 +30,26 @@
     
     package = inputs.hyprland.packages.${pkgs.system}.hyprland;
     plugins = with inputs.hyprland-plugins.packages.${pkgs.system}; [
-      hyprbars
+      # hyprbars  # Version mismatch
     ];
 
     settings = {
       "$mainMod" = "SUPER";
 
-      env = [
-        "LIBVA_DRIVER_NAME,nvidia"
-        "__GLX_VENDOR_LIBRARY_NAME,nvidia"
-        "GBM_BACKEND,nvidia"
+      ecosystem = {
+        no_donation_nag = true;
+        no_update_news = true;
+      };
 
+      env = [
         "XDG_SESSION_TYPE,wayland"
         "QT_QPA_PLATFORM,wayland"
 
         "XDG_CURRENT_DESKTOP,Hyprland"
         "XDG_SESSION_DESKTOP,Hyprland"
 
-        "WLR_NO_HARDWARE_CURSORS,1"
-        "XCURSOR_SIZE,36"
+        "XCURSOR_SIZE, ${toString config.stylix.cursor.size}"
+        "XCURSOR_THEME, ${config.stylix.cursor.name}"
 
         "XDG_SCREENSHOTS_DIR,~/screens"
       ];
@@ -60,10 +61,14 @@
         enable_stdout_logs = true;
       };
 
+      misc = {
+        focus_on_activate = true;
+      };
+
       input = {
         kb_layout = "us,ru";
-        kb_variant = "lang";
         kb_options = "grp:caps_toggle";
+        numlock_by_default = true;
 
         follow_mouse = 1;
 
@@ -71,21 +76,29 @@
           natural_scroll = false;
         };
 
-        sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
+        sensitivity = 0;
       };
 
-      windowrule = [
-        "float, ^(imv)$"
-        "float, ^(feh)$"
-        "float, ^(mpv)$"
-        "float, ^(nmtui)$"
-        "float, title:^(Список друзей)"
-        "move onscreen cursor -50% -50%, ^(xdragon)$"
+      gestures = {
+        workspace_swipe_invert = true;
+        workspace_swipe_distance = 200;
+        workspace_swipe_forever = true;
+      };
+
+      gesture = [
+        "3, horizontal, workspace"
       ];
 
-      windowrulev2 = [
-        "float, class:(clipse)"
-        "size 622 652, class:(clipse)"
+      windowrule = [
+        "float, class:^(imv)$"
+        "float, class:^(feh)$"
+        "float, class:^(mpv)$"
+        "float, title:^(Список друзей)"
+        "move onscreen cursor -50% -50%, class:^(xdragon)$"
+        "float, title:(nmtui)"
+        "float, title:(pulsemixer)"
+        "float, title:(clipse)"
+        "size 622 652, title:(clipse)"
       ];
 
       exec-once = [
@@ -98,12 +111,12 @@
       ];
 
       bind = [
-        "$mainMod, V, exec, kitty --class clipse -e clipse"
+        "$mainMod, V, exec, ghostty --title=clipse -e clipse"
 
-        "$mainMod, Return, exec, kitty"
+        "$mainMod, Return, exec, ghostty"
         "$mainMod, Q, killactive,"
         "$mainMod, M, exit,"
-        "$mainMod, E, exec, kitty -e sh -c yazi"
+        "$mainMod, E, exec, ghostty -e sh -c yazi"
         "$mainMod, F, togglefloating,"
         "$mainMod, D, exec, wofi --show drun"
         "$mainMod, P, pseudo, # dwindle"
@@ -158,18 +171,23 @@
         "$mainMod, mouse_up, workspace, e-1"
 
         # Keyboard backlight
-        "$mainMod, F3, exec, brightnessctl -d *::kbd_backlight set +33%"
-        "$mainMod, F2, exec, brightnessctl -d *::kbd_backlight set 33%-"
+        "$mainMod, F3, exec, ${lib.getExe pkgs.brightnessctl} -d *::kbd_backlight set +33%"
+        "$mainMod, F2, exec, ${lib.getExe pkgs.brightnessctl} -d *::kbd_backlight set 33%-"
 
         # Volume and Media Control
-        ", XF86AudioRaiseVolume, exec, pamixer -i 5 "
-        ", XF86AudioLowerVolume, exec, pamixer -d 5 "
         ", XF86AudioMute, exec, pamixer -t"
         ", XF86AudioMicMute, exec, pamixer --default-source -m"
+        ", XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} play-pause"
+        ", XF86AudioPrev, exec, ${lib.getExe pkgs.playerctl} position 5-"
+        ", XF86AudioNext, exec, ${lib.getExe pkgs.playerctl} position 5+"
+
+        ", XF86Explorer, exec, ghostty -e sh -c yazi"
+        ", XF86Mail, exec, thunderbird"
+        ", XF86WWW, exec, google-chrome-stable"  # TODO: Replace hard-code to some variable
         
         # Brightness control
-        ", XF86MonBrightnessDown, exec, brightnessctl set 5%- "
-        ", XF86MonBrightnessUp, exec, brightnessctl set +5% "
+        ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} set 5%- "
+        ", XF86MonBrightnessUp,   exec, ${lib.getExe pkgs.brightnessctl} set +5% "
 
         # Waybar
         "$mainMod, B, exec, pkill -SIGUSR1 waybar"
@@ -178,6 +196,16 @@
         "$mainMod, W, exec, ${lib.getExe wallpaper_changer}"
       ];
 
+      binde = [
+        ", XF86AudioRaiseVolume, exec, pamixer -i 5 "
+        ", XF86AudioLowerVolume, exec, pamixer -d 5 "
+      ];
+
+      bindo = [
+        ", XF86AudioPrev, exec, ${lib.getExe pkgs.playerctl} previous"
+        ", XF86AudioNext, exec, ${lib.getExe pkgs.playerctl} next"
+      ];
+
       # Move/resize windows with mainMod + LMB/RMB and dragging
       bindm = [
         "$mainMod, mouse:272, movewindow"
diff --git a/modules/user/zsh.nix b/modules/user/zsh.nix
index 35e2266..73bc8e9 100644
--- a/modules/user/zsh.nix
+++ b/modules/user/zsh.nix
@@ -1,6 +1,8 @@
-{ config, ... }: {
+{ config, pkgs, ... }: {
+  home.packages = [ pkgs.nh ];
   programs = {
-  zoxide.enable = true;
+    zoxide.enable = true;
+    fzf.enable = true;
 
   starship = {
       enable = true;
@@ -53,11 +55,11 @@
         let
           flakeDir = "~/nix";
         in {
-        rb = "sudo nixos-rebuild switch --flake ${flakeDir}";
+        rb = "nh os switch ${flakeDir}";
         upd = "nix flake update ${flakeDir}";
         upg = "sudo nixos-rebuild switch --upgrade --flake ${flakeDir}";
 
-        hms = "home-manager switch --flake ${flakeDir}";
+        hms = "nh home switch ${flakeDir}";
 
         conf = "$EDITOR ${flakeDir}/nixos/hosts/$(hostname)/configuration.nix";
         pkgs = "$EDITOR ${flakeDir}/nixos/packages.nix";
@@ -65,8 +67,9 @@
         ll = "ls -l";
         se = "sudoedit";
         ff = "fastfetch";
-        cat = "bat";
+        cat = "${pkgs.lib.getExe pkgs.bat}";
         cd = "z";
+        lg = "lazygit";
 
         rebuild = "sudo nixos-rebuild switch --flake ~/.config/f#WhiteRaven";
         deleteGenerations = "sudo nix-collect-garbage -d";
@@ -90,11 +93,15 @@
         
       };
 
-      initExtra = ''
-        if [ -z "''${WAYLAND_DISPLAY}" ] && [ "''${XDG_VTNR}" -eq 1 ]; then
-          dbus-run-session Hyprland
-        fi
+      initContent = ''
         eval "$(zoxide init zsh)"
+        eval "$(nh completions zsh)"
+        source "$(fzf-share)/key-bindings.zsh"
+        source "$(fzf-share)/completion.zsh"
+      '';
+
+      envExtra = ''
+        TERM=xterm-256color
       '';
 
       history.size = 10000;
diff --git a/user/kirill/modules/hyprland.nix b/user/kirill/modules/hyprland.nix
index bb209ca..b98b07e 100644
--- a/user/kirill/modules/hyprland.nix
+++ b/user/kirill/modules/hyprland.nix
@@ -13,19 +13,14 @@
     colors = config.lib.stylix.colors;
   in {
     settings = {
-      monitor = [
-        "DP-3, 3440x1440@165.00Hz, auto-right, 1"
-        # "HDMI-A-1, 3840x2160@60.00Hz, auto-left, 2"
-        "HDMI-A-1, disabled"
-        ",preferred,auto,1"
-      ];
+      monitor = ",preferred,auto,1";
 
       general = {
         gaps_in = 5;
-        gaps_out = 20;
+        gaps_out = 10;
         border_size = 3;
-        "col.active_border" = "rgba(${colors.base0C}ee) rgba(${colors.base0B}ee) 45deg";
-        "col.inactive_border" = "rgba(${colors.base05}aa)";
+        "col.active_border" = lib.mkForce "rgba(${colors.base0C}ee) rgba(${colors.base0B}ee) 45deg";
+        "col.inactive_border" = lib.mkForce "rgba(${colors.base05}aa)";
 
         layout = "dwindle";
       };
@@ -44,7 +39,6 @@
           enabled = true;
           range = 4;
           render_power = 3;
-          color = "rgba(1a1a1aee)";
         };
       };
 
@@ -70,26 +64,15 @@
 
       master.new_status = "master";
 
-      gestures = {
-        workspace_swipe = true;
-        workspace_swipe_fingers = 3;
-        workspace_swipe_invert = true;
-        workspace_swipe_distance = 200;
-        workspace_swipe_forever = true;
-      };
-
       misc = {
         animate_manual_resizes = true;
         animate_mouse_windowdragging = true;
         enable_swallow = true;
-        render_ahead_of_time = false;
-        disable_hyprland_logo = false;
       };
 
       bind = [
-        "    , Print, exec, grimblast --notify --freeze copy output"
-        "CTRL, Print, exec, grimblast --notify --freeze copy area"
-        "ALT , Print, exec, grimblast --notify --freeze copy active"
+        ''$mainMod Shift, S, exec, grimblast --notify --freeze copy area''
+        '', F11, exec, ghostty -e sh -c "hyprlock"''
       ];
     };
   };