diff --git a/.gitea/ISSUE_TEMPLATE.md b/.gitea/ISSUE_TEMPLATE.md
index 87e0dcb..8785e7d 100644
--- a/.gitea/ISSUE_TEMPLATE.md
+++ b/.gitea/ISSUE_TEMPLATE.md
@@ -65,4 +65,8 @@ in place.
 
 - [ ] Aerospace
 - [ ] Alfred
+- [ ] Safari
+  - [ ] Tab layout: Compact (Settings -> Tabs)
+  - [ ] Show features for web developers (Settings -> Advanced)
+- [ ] OrbStack
 - [ ] Tailscale
diff --git a/dev/macos.yml b/dev/macos.yml
index b6c1df8..0a9792e 100644
--- a/dev/macos.yml
+++ b/dev/macos.yml
@@ -2,29 +2,6 @@
   hosts: all
   tasks:
 
-    - name: Create ~/Library directories
-      ansible.builtin.file:
-        path: ~/Library/{{ item }}
-        state: directory
-        mode: '0755'
-      loop:
-        - Colors
-        - Dictionaries
-        - KeyBindings
-
-    - name: Symlink Emacs-style keybindings for OS X
-      ansible.builtin.file:
-        src: ~/.dotfiles/macos/DefaultKeyBinding.dict
-        dest: ~/Library/KeyBindings/DefaultKeyBinding.dict
-        state: link
-
-    - name: Symlink OS X colors palettes
-      ansible.builtin.file:
-        src: "{{ item }}"
-        dest: ~/Library/Colors/{{ item | basename }}
-        state: link
-      with_fileglob: ~/.dotfiles/macos/colors/*
-
     - name: Install Webster's 1913 dictionary
       ansible.builtin.copy:
         src: ~/.dotfiles/macos/websters-1913.dictionary/
diff --git a/local/Brewfile b/local/Brewfile
index 708bec7..38d56e3 100644
--- a/local/Brewfile
+++ b/local/Brewfile
@@ -1,9 +1,7 @@
 tap "kejadlen/tap", "https://git.kejadlen.dev/alpha/homebrew-tap.git"
 
 tap "homebrew/bundle"
-tap "homebrew/cask"
 tap "homebrew/command-not-found"
-tap "homebrew/core"
 tap "homebrew/services"
 
 brew "aider"
@@ -34,7 +32,6 @@ brew "terraform"
 brew "tmux"
 brew "ykman"
 brew "yt-dlp"
-brew "z.lua"
 brew "z3"
 brew "zoxide"
 brew "zsh"
diff --git a/local/macos.yml b/local/macos.yml
index 0156096..76274c4 100644
--- a/local/macos.yml
+++ b/local/macos.yml
@@ -2,7 +2,36 @@
   hosts: macos
   tasks:
     - name: Homebrew bundle
-      ansible.builtin.command: brew bundle --cleanup --file=~/src/boxen/local/Brewfile --no-lock
+      ansible.builtin.command: |
+        brew bundle
+          --file=~/src/boxen/local/Brewfile
+          --no-lock
+
+- tags: jujutsu
+  hosts: macos
+  tasks:
+    - name: Register Jujutsu config location
+      ansible.builtin.command: jj config path --user
+      register: jj_config_path_user
+      changed_when: false
+
+    - name: Make sure Jujutsu config dir exists
+      ansible.builtin.file:
+        dest: "{{ path | dirname }}"
+        state: directory
+        mode: "0700"
+      vars:
+        path: "{{ jj_config_path_user.stdout }}"
+
+    - name: Symlink Jujutsu config
+      ansible.builtin.file:
+        src: ~/.config/jj/config.toml
+        dest: "{{ dest }}"
+        state: link
+      vars:
+        dest: "{{ jj_config_path_user.stdout }}"
+
+    # TODO Initialize ~/src/boxen to use jj
 
 - import_playbook: defaults.yml
 
@@ -37,28 +66,32 @@
     - name: Restart dock
       ansible.builtin.command: killall Dock
 
-- tags: jujutsu
+- tags: library
   hosts: macos
   tasks:
-    - name: Register Jujutsu config location
-      ansible.builtin.command: jj config path --user
-      register: jj_config_path_user
-      changed_when: false
 
-    - name: Make sure Jujutsu config dir exists
+    - name: Create ~/Library directories
       ansible.builtin.file:
-        dest: "{{ path | dirname }}"
+        path: ~/Library/{{ item }}
         state: directory
-        mode: "0700"
-      vars:
-        path: "{{ jj_config_path_user.stdout }}"
+        mode: '0755'
+      loop:
+        - Colors
+        - Dictionaries
+        - KeyBindings
 
-    - name: Symlink Jujutsu config
+    - name: Symlink Emacs-style keybindings for OS X
       ansible.builtin.file:
-        src: ~/.config/jj/config.toml
-        dest: "{{ dest }}"
+        src: ~/.dotfiles/macos/DefaultKeyBinding.dict
+        dest: ~/Library/KeyBindings/DefaultKeyBinding.dict
         state: link
-      vars:
-        dest: "{{ jj_config_path_user.stdout }}"
+
+    - name: Symlink OS X colors palettes
+      ansible.builtin.file:
+        src: "{{ item }}"
+        dest: ~/Library/Colors/{{ item | basename }}
+        state: link
+      with_fileglob: ~/.dotfiles/macos/colors/*
+
 
 # vim: set ft=yaml.ansible