diff --git a/home/programs/ghostty/default.nix b/home/programs/ghostty/default.nix
index c56957e..172424a 100644
--- a/home/programs/ghostty/default.nix
+++ b/home/programs/ghostty/default.nix
@@ -5,6 +5,7 @@
     enableZshIntegration = true;
     settings = {
       window-padding-x = 10;
+      confirm-close-surface = false;
       window-padding-y = 10;
       keybind = [
         "ctrl+j=goto_split:left"
diff --git a/home/programs/nvf/default.nix b/home/programs/nvf/default.nix
index 0eea0ff..a7f0d8c 100644
--- a/home/programs/nvf/default.nix
+++ b/home/programs/nvf/default.nix
@@ -17,11 +17,5 @@
 
   programs.nvf = {
     enable = true;
-    settings.vim = {
-      startPlugins = [
-        # TODO: Change to ghostty
-        pkgs.vimPlugins.vim-kitty-navigator
-      ];
-    };
   };
 }
diff --git a/home/programs/nvf/keymaps.nix b/home/programs/nvf/keymaps.nix
index ed34631..30622a8 100644
--- a/home/programs/nvf/keymaps.nix
+++ b/home/programs/nvf/keymaps.nix
@@ -32,33 +32,7 @@
         desc = "Next Buffer";
       }
 
-      # Kitty navigator
-      {
-        key = "<C-h>";
-        mode = "n";
-        silent = true;
-        action = "<cmd>KittyNavigateLeft<cr>";
-      }
-      {
-        key = "<C-j>";
-        mode = "n";
-        silent = true;
-        action = "<cmd>KittyNavigateDown<cr>";
-      }
-      {
-        key = "<C-k>";
-        mode = "n";
-        silent = true;
-        action = "<cmd>KittyNavigateUp<cr>";
-      }
-      {
-        key = "<C-l>";
-        mode = "n";
-        silent = true;
-        action = "<cmd>KittyNavigateRight<cr>";
-      }
-
-      # Disable Arrow Keys in Normal Mode
+      # Disable Arrow Keys in Normal Mode and Middle click
       {
         key = "<Up>";
         mode = "n";
@@ -87,6 +61,24 @@
         action = "<Nop>";
         desc = "Disable Right Arrow";
       }
+      {
+        key = "<MiddleMouse>";
+        mode = ["n" "i" "v"]; # Normal, Insert, Visual
+        action = "<nop>"; # No Operation
+        silent = true;
+      }
+      {
+        key = "<2-MiddleMouse>"; # Désactive aussi le double clic molette
+        mode = ["n" "i" "v"];
+        action = "<nop>";
+        silent = true;
+      }
+      {
+        key = "<3-MiddleMouse>"; # Désactive aussi le double clic molette
+        mode = ["n" "i" "v"];
+        action = "<nop>";
+        silent = true;
+      }
 
       # UI
       {
diff --git a/home/system/caelestia-shell/launcher.nix b/home/system/caelestia-shell/launcher.nix
index 149f59a..8a51316 100644
--- a/home/system/caelestia-shell/launcher.nix
+++ b/home/system/caelestia-shell/launcher.nix
@@ -1,8 +1,8 @@
 {
   programs.caelestia.settings = {
     session.commands = {
-      logout = ["loginctl" "terminate-user" ""];
       shutdown = ["systemctl" "poweroff"];
+      logout = ["loginctl" "lock-session"];
       hibernate = ["systemctl" "hibernate"];
       reboot = ["systemctl" "reboot"];
     };
diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix
index 9b75b1e..1620d53 100644
--- a/home/system/hyprland/default.nix
+++ b/home/system/hyprland/default.nix
@@ -139,10 +139,15 @@ in {
       gesture = "3, horizontal, workspace";
 
       windowrule = [
+        "match:class .*, suppress_event maximize"
+
+        "match:class brave-browser, fullscreen_state 0 2"
+        "match:class brave-browser, sync_fullscreen 0"
+
         "match:class proton-authenticator, float on"
-        "match:class proton-authenticator, suppress_event maximize"
         "match:class proton-authenticator, center on"
         "match:class proton-authenticator, size 500 400"
+
         "match:class protonvpn-app, float on"
         "match:class protonvpn-app, center on"
         "match:class protonvpn-app, size 500 400"
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index de1aadc..2cb9d5d 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -51,6 +51,8 @@
       calibre # Ebooks
       swappy # Screenshot tool
       pinta # Image editor
+      notesnook
+      element-desktop
 
       # Dev
       go