diff --git a/configs/kitty/quick-access-terminal.conf b/configs/kitty/quick-access-terminal.conf
index 3d3949b..489d9a8 100644
--- a/configs/kitty/quick-access-terminal.conf
+++ b/configs/kitty/quick-access-terminal.conf
@@ -39,7 +39,7 @@ background_opacity 1
 #: Hide the window when it loses keyboard focus automatically. Using
 #: this option will force focus_policy to on-demand.
 
-# grab_keyboard no
+# grab_keyboard yes
 
 #: Grab the keyboard. This means global shortcuts defined in the OS
 #: will be passed to kitty instead. Useful if you want to create an OS
diff --git a/configs/niri/base/config.kdl b/configs/niri/base/config.kdl
index 399a3fe..4775239 100644
--- a/configs/niri/base/config.kdl
+++ b/configs/niri/base/config.kdl
@@ -1,6 +1,7 @@
 include "noctalia-shell.kdl"
 include "keys.kdl"
 include "options.kdl"
+include "rules.kdl"
 
 spawn-at-startup "./fix_float.py"
 spawn-at-startup "udieskie"
diff --git a/configs/niri/base/options.kdl b/configs/niri/base/options.kdl
index c7c58a1..80e19df 100644
--- a/configs/niri/base/options.kdl
+++ b/configs/niri/base/options.kdl
@@ -64,4 +64,6 @@ hotkey-overlay {
   skip-at-startup
 }
 screenshot-path null
+// try to hide client side decorations
+prefer-no-csd
 
diff --git a/configs/niri/base/rules.kdl b/configs/niri/base/rules.kdl
index 6c6bf46..2375bd2 100644
--- a/configs/niri/base/rules.kdl
+++ b/configs/niri/base/rules.kdl
@@ -1,28 +1,22 @@
 window-rule {
-  // This regular expression is intentionally made as specific as possible,
-  // since this is the default config, and we want no false positives.
-  // You can get away with just app-id="wezterm" f you want.
-  match app-id="^org\\.wezfurlong\\.wezterm$"
-  default-column-width {
-
-  }
-}
-// Floatin Windows
-window-rule {
+  // Floatin Windows
   match app-id="firefox$" title="^Picture-in-Picture$"
   match app-id="^brave-.*-Default$"
- // Extensions popup  open-floating true
+  match app-id="re.sonny.Junction"
+  match title="^Meet: .*" app-id="brave-browser"
+  // Extensions popup
+  open-floating true
+  clip-to-geometry false
 }
-// Full width window
 window-rule {
+  // Full width window
   match app-id="beekeeper-studio"
   open-maximized true
 }
 window-rule {
+  // Block from screen capture
   match app-id="^org\\.keepassxc\\.KeePassXC$"
   match app-id="^org\\.gnome\\.World\\.Secrets$"
-  // block-out-from "screen-capture"
-  // Use this instead if you want them visible on third-party screenshot tools.
   block-out-from "screencast"
 }
 window-rule {
@@ -32,10 +26,6 @@ window-rule {
     proportion 0.5
   }
 }
-window-rule {
-  match title="^Meet: .*" app-id="brave-browser"
-  open-floating true
-}
 window-rule {
   geometry-corner-radius 4
   clip-to-geometry true
diff --git a/configs/noctalia/plugins.json b/configs/noctalia/plugins.json
index 04a5604..1dacd70 100644
--- a/configs/noctalia/plugins.json
+++ b/configs/noctalia/plugins.json
@@ -10,6 +10,18 @@
         "kaomoji-provider": {
             "enabled": true,
             "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
+        },
+        "keybind-cheatsheet": {
+            "enabled": true,
+            "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
+        },
+        "pomodoro": {
+            "enabled": true,
+            "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
+        },
+        "tailscale": {
+            "enabled": true,
+            "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
         }
     },
     "version": 1
diff --git a/configs/noctalia/settings.json b/configs/noctalia/settings.json
index 93010af..dcb2a31 100644
--- a/configs/noctalia/settings.json
+++ b/configs/noctalia/settings.json
@@ -134,8 +134,7 @@
                     ]
                 },
                 {
-                    "iconColor": "none",
-                    "id": "WallpaperSelector"
+                    "id": "plugin:pomodoro"
                 },
                 {
                     "hideWhenZero": false,
@@ -145,6 +144,44 @@
                     "showUnreadBadge": true,
                     "unreadBadgeColor": "primary"
                 },
+                {
+                    "colorizeSystemIcon": "none",
+                    "enableColorization": false,
+                    "hideMode": "alwaysExpanded",
+                    "icon": "clipboard-search",
+                    "id": "CustomButton",
+                    "ipcIdentifier": "",
+                    "leftClickExec": "qs -c noctalia-shell ipc call launcher clipboard",
+                    "leftClickUpdateText": false,
+                    "maxTextLength": {
+                        "horizontal": 10,
+                        "vertical": 10
+                    },
+                    "middleClickExec": "",
+                    "middleClickUpdateText": false,
+                    "parseJson": false,
+                    "rightClickExec": "",
+                    "rightClickUpdateText": false,
+                    "showIcon": true,
+                    "textCollapse": "",
+                    "textCommand": "",
+                    "textIntervalMs": 3000,
+                    "textStream": false,
+                    "wheelDownExec": "",
+                    "wheelDownUpdateText": false,
+                    "wheelExec": "",
+                    "wheelMode": "unified",
+                    "wheelUpExec": "",
+                    "wheelUpUpdateText": false,
+                    "wheelUpdateText": false
+                },
+                {
+                    "iconColor": "none",
+                    "id": "WallpaperSelector"
+                },
+                {
+                    "id": "plugin:tailscale"
+                },
                 {
                     "displayMode": "onhover",
                     "iconColor": "none",
@@ -269,6 +306,16 @@
                 },
                 {
                     "id": "NightLight"
+                },
+                {
+                    "enableOnStateLogic": false,
+                    "generalTooltipText": "Keybind Cheatsheet",
+                    "icon": "keyboard",
+                    "id": "CustomButton",
+                    "onClicked": "qs -c noctalia-shell ipc call plugin:keybind-cheatsheet toggle",
+                    "onMiddleClicked": "",
+                    "onRightClicked": "",
+                    "stateChecksJson": "[]"
                 }
             ]
         }