diff --git a/hammerspoon/hosts/hati.lua b/hammerspoon/hosts/hati.lua
index c89786c..49f3b1e 100644
--- a/hammerspoon/hosts/hati.lua
+++ b/hammerspoon/hosts/hati.lua
@@ -5,6 +5,7 @@ local obj = {}
 --------------------------------------------------------------------------------
 
 local apptoggle = require('app_toggle')
+local apphider = require('app_hider')
 
 local function init_hotkeys()
   hs.hotkey.bind({ 'cmd', 'alt', 'ctrl' }, 'S', apptoggle.showAppInfo)
@@ -34,6 +35,10 @@ local function init_hotkeys()
   apptoggle:bind({ 'cmd', 'ctrl' }, '1',
     { 'Code', '/Applications/Visual Studio Code.app' }
   )
+
+  -- Use Warp as my primary terminal application.
+  apptoggle:bind({ 'cmd', 'ctrl' }, 'R', { 'Warp' })
+  apphider:autoHide('Warp') -- auto-hide Warp when it loses focus
 end
 
 --------------------------------------------------------------------------------
diff --git a/warp/keybindings.yaml b/warp/keybindings.yaml
index 31eb08c..96ac47c 100644
--- a/warp/keybindings.yaml
+++ b/warp/keybindings.yaml
@@ -1,4 +1,5 @@
 ---
+"editor_view:insert_nonexpanding_space": none
 "editor_view:move_backward_one_word": alt-b
 "editor_view:move_forward_one_word": alt-f
 "pane_group:navigate_down": alt-k
@@ -7,3 +8,4 @@
 "pane_group:navigate_up": alt-i
 "terminal:executing_command_move_cursor_word_left": alt-b
 "terminal:executing_command_move_cursor_word_right": alt-f
+"workspace:toggle_ai_assistant": none
diff --git a/warp/themes/iTerm2_theme.yaml b/warp/themes/iTerm2_theme.yaml
new file mode 100644
index 0000000..b5d8274
--- /dev/null
+++ b/warp/themes/iTerm2_theme.yaml
@@ -0,0 +1,37 @@
+---
+background: "#000000"
+accent: "#5696d5"
+foreground: "#ffffff"
+cursor: "#ffffff"
+details:
+  custom:
+    main_text_opacity: 90
+    sub_text_opacity: 60
+    hint_text_opacity: 40
+    disabled_text_opacity: 20
+    foreground_button_opacity: 30
+    accent_button_opacity: 0
+    button_hover_opacity: 10
+    button_click_opacity: 20
+    keybinding_row_overlay_opacity: 40
+    welcome_tips_completion_overlay_opacity: 90
+terminal_colors:
+  normal:
+    black: "#000000"
+    red: "#cf5041"
+    green: "#8bba48"
+    yellow: "#c3a643"
+    blue: "#37689f"
+    magenta: "#9b589d"
+    cyan: "#69b8cb"
+    white: "#cccccc"
+  bright:
+    black: "#686a66"
+    red: "#ed3a2c"
+    green: "#96cf4d"
+    yellow: "#fdeb61"
+    blue: "#5696d5"
+    magenta: "#9d6aa5"
+    cyan: "#75cee3"
+    white: "#f5f5f5"
+name: Imported iTerm Theme