diff --git a/configs/containers/systemd/dev-dbui.container b/configs/containers/systemd/dev-dbui.container
index 259e832..f40b5f3 100644
--- a/configs/containers/systemd/dev-dbui.container
+++ b/configs/containers/systemd/dev-dbui.container
@@ -1,6 +1,6 @@
 [Container]
 Image=docker.io/adminneoorg/adminneo
-AutoUpdate=registry
+# AutoUpdate=registry
 Network=host
 Environment=NEO_THEME=default
 Environment=NEO_COLOR_VARIANT=green
diff --git a/configs/niri/base/keys.kdl b/configs/niri/base/keys.kdl
index 3eab11b..246f0a4 100644
--- a/configs/niri/base/keys.kdl
+++ b/configs/niri/base/keys.kdl
@@ -1,12 +1,9 @@
 binds {
-  Mod+F1 {
-    show-hotkey-overlay
+  //#"System"
+  Mod+F1 hotkey-overlay-title="Show keybindings" {
+    spawn-sh "qs -c noctalia-shell ipc call plugin:keybind-cheatsheet toggle"
   }
-  //
-  // ╭─────────────────────────────────────────────────────────╮
-  // │                        Launchers                        │
-  // ╰─────────────────────────────────────────────────────────╯
-  //
+  // #"Applications"
   Mod+Return hotkey-overlay-title="Open Terminal" {
     spawn "kitty"
   }
@@ -16,11 +13,7 @@ binds {
   Mod+D hotkey-overlay-title="Launcher" {
     spawn "qs" "ipc" "-c" "noctalia-shell" "call" "launcher" "toggle"
   }
-  //
-  // ╭─────────────────────────────────────────────────────────╮
-  // │                         Layout                          │
-  // ╰─────────────────────────────────────────────────────────╯
-  //
+  // #"Layout"
   Mod+R {
     switch-preset-column-width
   }
@@ -36,198 +29,158 @@ binds {
   Mod+C {
     center-column
   }
-  //
-  // ╭─────────────────────────────────────────────────────────╮
-  // │                    Window Management                    │
-  // ╰─────────────────────────────────────────────────────────╯
-  //
+  Mod+Shift+Space {
+    toggle-window-floating
+  }
+  Mod+Alt+Left hotkey-overlay-title="Move in/out of column" {
+    consume-or-expel-window-left
+  }
+  Mod+Alt+Right hotkey-overlay-title="Move in/out of column" {
+    consume-or-expel-window-right
+  }
+  Mod+Alt+H hotkey-overlay-title=null {
+    consume-or-expel-window-left
+  }
+  Mod+Alt+L hotkey-overlay-title=null {
+    consume-or-expel-window-right
+  }
+  // #"Window Management"
   Mod+W repeat=false {
     toggle-overview
   }
   Mod+Shift+Q repeat=false {
     close-window
   }
-  //
-  // ── Change focus ────────────────────────────────────────────────────
-  //
-  Mod+Tab {
+  // #"Focus"
+  Mod+Tab hotkey-overlay-title=null {
     focus-column-right-or-first
   }
-  Mod+shift+Tab {
+  Mod+shift+Tab hotkey-overlay-title=null {
     focus-column-left-or-last
   }
-  Mod+Left {
+  Mod+Left hotkey-overlay-title=null {
     focus-column-left
   }
-  Mod+Down {
+  Mod+Down hotkey-overlay-title=null {
     focus-window-or-workspace-down
   }
-  Mod+Up {
+  Mod+Up hotkey-overlay-title=null {
     focus-window-or-workspace-up
   }
-  Mod+Right {
+  Mod+Right hotkey-overlay-title=null {
     focus-column-or-monitor-right
   }
-  Mod+Ctrl+Left {
-    consume-or-expel-window-left
-  }
-  Mod+Ctrl+Right {
-    consume-or-expel-window-right
-  }
-  Mod+Alt+Left {
-    consume-window-into-column
-  }
-  Mod+Alt+Right {
-    expel-window-from-column
-  }
-  Mod+H {
+  Mod+H hotkey-overlay-title=null {
     focus-column-or-monitor-left
   }
-  Mod+J {
+  Mod+J hotkey-overlay-title=null {
     focus-window-or-workspace-down
   }
-  Mod+K {
+  Mod+K hotkey-overlay-title=null {
     focus-window-or-workspace-up
   }
-  Mod+L {
+  Mod+L hotkey-overlay-title=null {
     focus-column-or-monitor-right
   }
-  Mod+Ctrl+H {
-    consume-or-expel-window-left
-  }
-  Mod+Ctrl+L {
-    consume-or-expel-window-right
-  }
-  Mod+Alt+H {
-    consume-window-into-column
-  }
-  Mod+Alt+L {
-    expel-window-from-column
-  }
-  Mod+WheelScrollDown cooldown-ms=150 {
+  Mod+WheelScrollDown hotkey-overlay-title="Focus right" {
     focus-column-right
   }
-  Mod+WheelScrollUp cooldown-ms=150 {
+  Mod+WheelScrollUp hotkey-overlay-title="Focus left" {
     focus-column-left
   }
-  Mod+Space {
+  // #"Focus"
+  Mod+WheelScrollLeft hotkey-overlay-title="Focus workspace down" {
+    focus-workspace-down
+  }
+  // #"Focus"
+  Mod+WheelScrollRight hotkey-overlay-title="Focus workspace up" {
+    focus-workspace-up
+  }
+  Mod+Space hotkey-overlay-title="Toggle focus floating" {
     switch-focus-between-floating-and-tiling
   }
-  //
-  // ── Move windows ────────────────────────────────────────────────────
-  //
-  Mod+Shift+Left {
-    move-column-left
+  // #"Move Windows"
+  Mod+Shift+Left hotkey-overlay-title=null {
+    move-column-left-or-to-monitor-left
   }
-  Mod+Shift+Down {
+  Mod+Shift+Down hotkey-overlay-title=null {
     move-window-down-or-to-workspace-down
   }
-  Mod+Shift+Up {
+  Mod+Shift+Up hotkey-overlay-title=null {
     move-window-up-or-to-workspace-up
   }
-  Mod+Shift+Right {
-    move-column-right
+  Mod+Shift+Right hotkey-overlay-title=null {
+    move-column-right-or-to-monitor-right
   }
-  Mod+Shift+H {
-    move-column-left
+  Mod+Shift+H hotkey-overlay-title=null {
+    move-column-left-or-to-monitor-left
   }
-  Mod+Shift+J {
+  Mod+Shift+J hotkey-overlay-title=null {
     move-window-down-or-to-workspace-down
   }
-  Mod+Shift+K {
+  Mod+Shift+K hotkey-overlay-title=null {
     move-window-up-or-to-workspace-up
   }
-  Mod+Shift+L {
-    move-column-right
+  Mod+Shift+L hotkey-overlay-title=null {
+    move-column-right-or-to-monitor-right
   }
-  Mod+Ctrl+WheelScrollDown cooldown-ms=150 {
-    move-column-to-workspace-down
-  }
-  Mod+Ctrl+WheelScrollUp cooldown-ms=150 {
-    move-column-to-workspace-up
-  }
-  Mod+WheelScrollRight {
-    focus-column-right
-  }
-  Mod+WheelScrollLeft {
-    focus-column-left
-  }
-  Mod+Ctrl+WheelScrollRight {
-    move-column-right
-  }
-  Mod+Ctrl+WheelScrollLeft {
-    move-column-left
-  }
-  Mod+Ctrl+Shift+WheelScrollDown {
-    move-column-right
-  }
-  Mod+Ctrl+Shift+WheelScrollUp {
-    move-column-left
-  }
-  Mod+Shift+Space {
-    toggle-window-floating
-  }
-  //
-  // ╭─────────────────────────────────────────────────────────╮
-  // │                       Workspaces                        │
-  // ╰─────────────────────────────────────────────────────────╯
-  //
-  Mod+Bar {
+  // #"Workspace Navigation"
+  Mod+Bar hotkey-overlay-title=null {
     // Switches focus between the current and the previous workspace.
     focus-workspace-previous
   }
-  Mod+1 {
+  Mod+1 hotkey-overlay-title=null {
     focus-workspace 1
   }
-  Mod+2 {
+  Mod+2 hotkey-overlay-title=null {
     focus-workspace 2
   }
-  Mod+3 {
+  Mod+3 hotkey-overlay-title=null {
     focus-workspace 3
   }
-  Mod+4 {
+  Mod+4 hotkey-overlay-title=null {
     focus-workspace 4
   }
-  Mod+5 {
+  Mod+5 hotkey-overlay-title=null {
     focus-workspace 5
   }
-  Mod+6 {
+  Mod+6 hotkey-overlay-title=null {
     focus-workspace 6
   }
-  Mod+7 {
+  Mod+7 hotkey-overlay-title=null {
     focus-workspace 7
   }
-  Mod+8 {
+  Mod+8 hotkey-overlay-title=null {
     focus-workspace 8
   }
-  Mod+9 {
+  Mod+9 hotkey-overlay-title=null {
     focus-workspace 9
   }
-  Mod+Shift+1 {
+  Mod+Shift+1 hotkey-overlay-title=null {
     move-window-to-workspace 1
   }
-  Mod+Shift+2 {
+  Mod+Shift+2 hotkey-overlay-title=null {
     move-window-to-workspace 2
   }
-  Mod+Shift+3 {
+  Mod+Shift+3 hotkey-overlay-title=null {
     move-window-to-workspace 3
   }
-  Mod+Shift+4 {
+  Mod+Shift+4 hotkey-overlay-title=null {
     move-window-to-workspace 4
   }
-  Mod+Shift+5 {
+  Mod+Shift+5 hotkey-overlay-title=null {
     move-window-to-workspace 5
   }
-  Mod+Shift+6 {
+  Mod+Shift+6 hotkey-overlay-title=null {
     move-window-to-workspace 6
   }
-  Mod+Shift+7 {
+  Mod+Shift+7 hotkey-overlay-title=null {
     move-window-to-workspace 7
   }
-  Mod+Shift+8 {
+  Mod+Shift+8 hotkey-overlay-title=null {
     move-window-to-workspace 8
   }
-  Mod+Shift+9 {
+  Mod+Shift+9 hotkey-overlay-title=null {
     move-window-to-workspace 9
   }
   Mod+Shift+WheelScrollDown cooldown-ms=150 {
@@ -236,11 +189,7 @@ binds {
   Mod+Shift+WheelScrollUp cooldown-ms=150 {
     focus-workspace-up
   }
-  //
-  // ╭─────────────────────────────────────────────────────────╮
-  // │                         Volume                          │
-  // ╰─────────────────────────────────────────────────────────╯
-  //
+  // #"System"
   XF86AudioRaiseVolume allow-when-locked=true {
     spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.025+"
   }
@@ -253,37 +202,35 @@ binds {
   XF86AudioMicMute allow-when-locked=true {
     spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
   }
-  //
-  // ╭─────────────────────────────────────────────────────────╮
-  // │                       Brightness                        │
-  // ╰─────────────────────────────────────────────────────────╯
-  //
   XF86MonBrightnessUp allow-when-locked=true {
     spawn "brightnessctl" "--class=backlight" "set" "+10%"
   }
   XF86MonBrightnessDown allow-when-locked=true {
     spawn "brightnessctl" "--class=backlight" "set" "10%-"
   }
-  Print {
-    screenshot
+  // #"Screenshots"
+  Print hotkey-overlay-title="Screenshot" {
+    screenshot show-pointer=false
   }
-  Shift+Print {
-    screenshot-window
+  Shift+Print hotkey-overlay-title="Screenshot & Edit" {
+    spawn-sh "niri msg action screenshot && wl-paste -t image/png | swappy -f -"
   }
-  Shift+Ctrl+Print hotkey-overlay-title="Edit image in Clipboard" {
-    spawn-sh "wl-paste | swappy -f -"
+  Ctrl+Print hotkey-overlay-title="Edit image in clipboard" {
+    spawn-sh "wl-paste -t image/png | swappy -f -"
   }
-  // Applications such as remote-desktop clients and software KVM switches may
-  // request that niri stops processing the keyboard shortcuts defined here
-  // so they may, for example, forward the key presses as-is to a remote machine.
-  // It's a good idea to bind an escape hatch to toggle the inhibitor,
-  // so a buggy application can't hold your session hostage.
-  //
-  // The allow-inhibiting=false property can be applied to other binds as well,
-  // which ensures niri always processes them, even when an inhibitor is active.
-  Mod+Escape allow-inhibiting=false {
+  // #"System"
+  Mod+Escape allow-inhibiting=false hotkey-overlay-title="Toggle shortcuts inhibition" {
+    // Applications such as remote-desktop clients and software KVM switches may
+    // request that niri stops processing the keyboard shortcuts defined here
+    // so they may, for example, forward the key presses as-is to a remote machine.
+    // It's a good idea to bind an escape hatch to toggle the inhibitor,
+    // so a buggy application can't hold your session hostage.
+    //
+    // The allow-inhibiting=false property can be applied to other binds as well,
+    // which ensures niri always processes them, even when an inhibitor is active.
     toggle-keyboard-shortcuts-inhibit
   }
+  // #"System"
   Ctrl+Alt+Delete {
     quit
   }
diff --git a/configs/noctalia/plugins.json b/configs/noctalia/plugins.json
index 1457257..4af50cd 100644
--- a/configs/noctalia/plugins.json
+++ b/configs/noctalia/plugins.json
@@ -22,6 +22,10 @@
         "tailscale": {
             "enabled": true,
             "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
+        },
+        "translator": {
+            "enabled": true,
+            "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
         }
     },
     "version": 2
diff --git a/configs/noctalia/settings.json b/configs/noctalia/settings.json
index 527d3a2..651bc05 100644
--- a/configs/noctalia/settings.json
+++ b/configs/noctalia/settings.json
@@ -311,6 +311,9 @@
                 {
                     "id": "Bluetooth"
                 },
+                {
+                    "id": "PowerProfile"
+                },
                 {
                     "id": "WallpaperSelector"
                 }
@@ -319,9 +322,6 @@
                 {
                     "id": "Notifications"
                 },
-                {
-                    "id": "PowerProfile"
-                },
                 {
                     "id": "KeepAwake"
                 },
@@ -337,6 +337,16 @@
                     "onMiddleClicked": "",
                     "onRightClicked": "",
                     "stateChecksJson": "[]"
+                },
+                {
+                    "enableOnStateLogic": false,
+                    "generalTooltipText": "Screenshot",
+                    "icon": "camera",
+                    "id": "CustomButton",
+                    "onClicked": "qs -c noctalia-shell ipc call controlCenter toggle && sleep 0.5 && niri msg action screenshot",
+                    "onMiddleClicked": "",
+                    "onRightClicked": "qs -c noctalia-shell ipc call controlCenter toggle && sleep 0.5 && niri msg action screenshot && wl-paste -t image/png | swappy -f -",
+                    "stateChecksJson": "[]"
                 }
             ]
         }
@@ -353,7 +363,7 @@
         "colorizeIcons": false,
         "deadOpacity": 0.6,
         "displayMode": "auto_hide",
-        "enabled": false,
+        "enabled": true,
         "floatingRatio": 1,
         "inactiveIndicators": false,
         "monitors": [
diff --git a/configs/zed/keymap.json b/configs/zed/keymap.json
index b5f6f3d..c491465 100644
--- a/configs/zed/keymap.json
+++ b/configs/zed/keymap.json
@@ -44,7 +44,8 @@
 
 			"space f w": "pane::DeploySearch", // Search word under cursor
 
-			"space r r": "task::Spawn",
+			"space r r": "editor::SpawnNearestTask",
+			"space r R": "task::Spawn",
 
 			// Go to file with `gf`
 			"g f": "editor::OpenExcerpts",
@@ -78,6 +79,8 @@
 			],
 			"space g j": "editor::GoToHunk",
 			"space g k": "editor::GoToPreviousHunk",
+			"space g r": "git::Restore",
+			"space g R": "git::RestoreFile",
 
 			// + Buffers
 			// Switch between buffers
diff --git a/configs/zed/tasks.json b/configs/zed/tasks.json
index c1529b5..0e5c58c 100644
--- a/configs/zed/tasks.json
+++ b/configs/zed/tasks.json
@@ -2,6 +2,12 @@
 //
 // Example:
 [
+	{
+		"label": "Run dev",
+		"command": "just",
+		"args": ["dev"],
+		"tags": ["just-recipe"]
+	},
 	{
 		"label": "LazyGit",
 		"command": "lazygit",
@@ -15,6 +21,7 @@
 		"allow_concurrent_runs": true,
 		"use_new_terminal": true
 	},
+
 	{
 		"label": "Bun Test",
 		"command": "bun test",