diff --git a/lua/plugins/astrocore.lua b/lua/plugins/astrocore.lua
index 22a4963..8c3ba80 100644
--- a/lua/plugins/astrocore.lua
+++ b/lua/plugins/astrocore.lua
@@ -574,7 +574,7 @@ return {
         ["<C-a>C"] = { "<cmd>ClaudeCode --resume<cr>", desc = "Resume Claude" },
         ["<C-a>c"] = { "<cmd>ClaudeCode --continue<cr>", desc = "Continue Claude" },
         ["<C-a>m"] = { "<cmd>ClaudeCodeSelectModel<cr>", desc = "Select Claude model" },
-        ["<C-a>b"] = { "<cmd>ClaudeCodeAdd %<cr>", desc = "Add current buffer" },
+        ["<C-a>a"] = { "<cmd>ClaudeCodeAdd %<cr>", desc = "Add current buffer" },
         ["<C-y>"] = { "<cmd>ClaudeCodeDiffAccept<cr>", desc = "Accept diff" },
         ["<C-n>"] = { "<cmd>ClaudeCodeDiffDeny<cr>", desc = "Deny diff" },
         -- UI Toggles with Snacks
@@ -718,10 +718,13 @@ return {
       t = {
         ["<C-t><C-t>"] = { terminals.mk_toggle, desc = "Taskfile Toggle" },
         ["<C-e>"] = { "<Cmd>Neotree toggle<CR>", desc = "Open Explorer" },
+        -- Paste from system clipboard
+        ["<C-p>"] = { "<cmd>ClaudeCodePaste<cr>", desc = "Paste from system clipboard" },
         ["<C-b>f"] = {
           function() require("snacks").picker.buffers() end,
           desc = "Find buffers",
         },
+        ["<C-j><C-j>"] = { function() terminals.scratch_toggle() end, desc = "Open Scratch Terminal" },
         -- Exit terminal mode and close window
         ["<C-q>"] = {
           function()
diff --git a/lua/plugins/astroui.lua b/lua/plugins/astroui.lua
index a4e9005..33eb4cb 100644
--- a/lua/plugins/astroui.lua
+++ b/lua/plugins/astroui.lua
@@ -1,6 +1,44 @@
 return {
   {
     "AstroNvim/astroui",
+    dependencies = {
+      {
+        "nvim-focus/focus.nvim",
+        version = false,
+        opts = {
+          enable = true,
+          commands = true,
+          autoresize = {
+            enable = true,
+            width = 0,
+            height = 0,
+            minwidth = 0,
+            minheight = 0,
+            focusedwindow_minwidth = 0,
+            focusedwindow_minheight = 0,
+            height_quickfix = 10,
+          },
+          split = {
+            bufnew = false,
+            tmux = false,
+          },
+          ui = {
+            number = false,
+            relativenumber = false,
+            hybridnumber = false,
+            absolutenumber_unfocussed = false,
+            cursorline = true,
+            cursorcolumn = false,
+            colorcolumn = {
+              enable = false,
+              list = "+1",
+            },
+            signcolumn = true,
+            winhighlight = false,
+          },
+        },
+      },
+    },
     ---@type AstroUIOpts
     opts = {
       colorscheme = "cyberdream",