diff --git a/configs/ghostty/config b/configs/ghostty/config
index 4d1ff59..fa8602d 100644
--- a/configs/ghostty/config
+++ b/configs/ghostty/config
@@ -1,7 +1,10 @@
-theme = catppuccin-macchiato
+theme = Catppuccin Macchiato
+font-family = JetBrainsMono Nerd Font
 
 # Common
 
+keybind = global:ctrl+shift+x=toggle_quick_terminal
+
 keybind = ctrl+space>o=write_selection_file:open
 keybind = ctrl+space>shift+o=write_selection_file:paste
 
diff --git a/configs/kitty/quick-access-terminal.conf b/configs/kitty/quick-access-terminal.conf
new file mode 100644
index 0000000..3d3949b
--- /dev/null
+++ b/configs/kitty/quick-access-terminal.conf
@@ -0,0 +1,120 @@
+lines 30
+
+#: The number of lines shown in the panel. Ignored for background,
+#: centered, and vertical panels. If it has the suffix px then it sets
+#: the height of the panel in pixels instead of lines.
+
+columns 200
+
+#: The number of columns shown in the panel. Ignored for background,
+#: centered, and horizontal panels. If it has the suffix px then it
+#: sets the width of the panel in pixels instead of columns.
+
+edge top
+
+#: Which edge of the screen to place the panel on. Note that some
+#: window managers (such as i3) do not support placing docked windows
+#: on the left and right edges. The value background means make the
+#: panel the "desktop wallpaper". Note that when using sway if you set
+#: a background in your sway config it will cover the background drawn
+#: using this kitten. Additionally, there are three more values:
+#: center, center-sized and none. The value center anchors the panel
+#: to all sides and covers the entire display (on macOS the part of
+#: the display not covered by titlebar and dock). The panel can be
+#: shrunk and placed using the margin parameters. The value none
+#: anchors the panel to the top left corner and should be placed using
+#: the margin parameters. Its size is set by lines and columns. The
+#: value center-sized is just like none except that the panel is
+#: centered instead of in the top left corner and the margins have no
+#: effect.
+
+background_opacity 1
+
+#: The background opacity of the window. This works the same as the
+#: kitty option of the same name, it is present here as it has a
+#: different default value for the quick access terminal.
+
+# hide_on_focus_loss no
+
+#: Hide the window when it loses keyboard focus automatically. Using
+#: this option will force focus_policy to on-demand.
+
+# grab_keyboard no
+
+#: 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
+#: modal window. How well this works depends on the OS/window
+#: manager/desktop environment. On Wayland it works only if the
+#: compositor implements the inhibit-keyboard-shortcuts protocol
+#: <https://wayland.app/protocols/keyboard-shortcuts-inhibit-
+#: unstable-v1>. On macOS Apple doesn't allow applications to grab the
+#: keyboard without special permissions, so it doesn't work.
+
+margin_left 50
+
+#: Set the left margin for the panel, in pixels. Has no effect for
+#: right edge panels. Only works on macOS and Wayland compositors that
+#: supports the wlr layer shell protocol.
+
+margin_right 50
+
+#: Set the right margin for the panel, in pixels. Has no effect for
+#: left edge panels. Only works on macOS and Wayland compositors that
+#: supports the wlr layer shell protocol.
+
+margin_top 10
+
+#: Set the top margin for the panel, in pixels. Has no effect for
+#: bottom edge panels. Only works on macOS and Wayland compositors
+#: that supports the wlr layer shell protocol.
+
+# margin_bottom 0
+
+#: Set the bottom margin for the panel, in pixels. Has no effect for
+#: top edge panels. Only works on macOS and Wayland compositors that
+#: supports the wlr layer shell protocol.
+
+# kitty_conf
+
+#: Path to config file to use for kitty when drawing the window. Can
+#: be specified multiple times. By default, the normal kitty.conf is
+#: used. Relative paths are resolved with respect to the kitty config
+#: directory.
+
+kitty_override window_padding_width=0 8
+
+#: Override individual kitty configuration options, can be specified
+#: multiple times. Syntax: kitty_override name=value. For example:
+#: kitty_override font_size=20.
+
+app_id kitty-quick-access
+
+#: On Wayland set the namespace of the layer shell surface. On X11 set
+#: the WM_CLASS assigned to the quick access window. (Linux only)
+
+# output_name
+
+#: The panel can only be displayed on a single monitor (output) at a
+#: time. This allows you to specify which output is used, by name. If
+#: not specified the compositor will choose an output automatically,
+#: typically the last output the user interacted with or the primary
+#: monitor. Run kitten panel --output-name list to get a list of
+#: available outputs. Use listjson for a json encoded output. Note
+#: that on Wayland the output can only be set at panel creation time,
+#: it cannot be changed after creation, nor is there anyway to display
+#: a single panel on all outputs. Please complain to the Wayland
+#: developers about this.
+
+# start_as_hidden no
+
+#: Whether to start the quick access terminal hidden. Useful if you
+#: are starting it as part of system startup.
+
+# focus_policy exclusive
+
+#: On a Wayland compositor that supports the wlr layer shell protocol,
+#: specify the focus policy for keyboard interactivity with the panel.
+#: Please refer to the wlr layer shell protocol documentation for more
+#: details. Note that different Wayland compositors behave very
+#: differently with exclusive, your mileage may vary. On macOS,
+#: exclusive and on-demand are currently the same.
diff --git a/configs/lazygit/config.yml b/configs/lazygit/config.yml
index d596e42..2d38e28 100644
--- a/configs/lazygit/config.yml
+++ b/configs/lazygit/config.yml
@@ -155,18 +155,18 @@ gui:
 # Config relating to git
 git:
   # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md
-  paging:
-    # Value of the --color arg in the git diff command. Some pagers want this to be set to 'always' and some want it set to 'never'
-    colorArg: always
-    # e.g.
-    # diff-so-fancy
-    # delta --dark --paging=never
-    # ydiff -p cat -s --wrap --width={{columnWidth}}
-    pager: ""
-    # If true, Lazygit will use whatever pager is specified in `$GIT_PAGER`, `$PAGER`, or your *git config*. If the pager ends with something like ` | less` we will strip that part out, because less doesn't play nice with our rendering approach. If the custom pager uses less under the hood, that will also break rendering (hence the `--paging=never` flag for the `delta` pager).
-    useConfig: true
-    # e.g. 'difft --color=always'
-    externalDiffCommand: ""
+  pagers:
+    - # Value of the --color arg in the git diff command. Some pagers want this to be set to 'always' and some want it set to 'never'
+      colorArg: always
+      # e.g.
+      # diff-so-fancy
+      # delta --dark --paging=never
+      # ydiff -p cat -s --wrap --width={{columnWidth}}
+      pager: ""
+      # If true, Lazygit will use whatever pager is specified in `$GIT_PAGER`, `$PAGER`, or your *git config*. If the pager ends with something like ` | less` we will strip that part out, because less doesn't play nice with our rendering approach. If the custom pager uses less under the hood, that will also break rendering (hence the `--paging=never` flag for the `delta` pager).
+      useConfig: true
+      # e.g. 'difft --color=always'
+      externalDiffCommand: ""
   # Config relating to committing
   commit:
     # If true, pass '--signoff' flag when committing
@@ -406,7 +406,7 @@ keybinding:
     viewResetOptions: D
     fetch: f
     toggleTreeView: '`'
-    openMergeTool: M
+    openMergeOptions: M
     openStatusFilter: <c-b>
     copyFileInfoToClipboard: "y"
   branches:
diff --git a/configs/niri/config.kdl b/configs/niri/config.kdl
index 9581911..c33f17d 100644
--- a/configs/niri/config.kdl
+++ b/configs/niri/config.kdl
@@ -38,6 +38,16 @@ window-rule {
   geometry-corner-radius 4
   clip-to-geometry true
 }
+layer-rule {
+  match namespace="kitty-quick-access"
+  geometry-corner-radius 12
+  shadow {
+    on
+    spread 10
+    softness 20
+    offset x=-10 y=10
+  }
+}
 // ╭─────────────────────────────────────────────────────────╮
 // │                     Auto Start Apps                     │
 // ╰─────────────────────────────────────────────────────────╯
@@ -83,6 +93,12 @@ binds {
   Mod+Return hotkey-overlay-title="Open a Terminal: kitty" {
     spawn "kitty"
   }
+  Mod+Shift+Return hotkey-overlay-title="Open Quick Terminal" {
+    spawn "kitten" "quick_access_terminal"
+  }
+  Mod+Shift+E hotkey-overlay-title="Open Code Editor" {
+    spawn-sh "kitten quick_access_terminal --instance-group editor-choice fish -c \"zeditor (zoxide query -i)\""
+  }
   Mod+D hotkey-overlay-title="Run an Application: Rofi" {
     spawn "rofi" "-show" "drun" "-run-command" "uwsm app -- {cmd}"
   }
@@ -381,10 +397,6 @@ binds {
   Mod+Escape allow-inhibiting=false {
     toggle-keyboard-shortcuts-inhibit
   }
-  // The quit action will show a confirmation dialog to avoid accidental exits.
-  Mod+Shift+E {
-    quit
-  }
   Ctrl+Alt+Delete {
     quit
   }