diff --git a/dot_config/git/config.d/encrypted_work.age b/dot_config/git/config.d/encrypted_work.age
deleted file mode 100644
index 26be3df..0000000
--- a/dot_config/git/config.d/encrypted_work.age
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwUTFyVUg4VmFtbEVnNXkw
-eHVJczNDdHViaDlyc0owZi9QNmNBS3U0YkY0ClNEd1hmWnBPQ3pTRnZpaWFCdEQ4
-SUZncEpMdkpnRWVjUy9FbFdLZkJ6Wk0KLS0tIENsNkFlalBWNnYxcVF4VnNTbkd1
-VWV4ZHNIWUpiek56bFdaK2R2TzkwSXcK1+UZP1EGZsQM1OiEbmRRb/6X1RjQiAdK
-ZA4dN4s84E0zJYDeIDU7U6AVi+GM8yeNvMDcEavkHtYgFGiFrZ2WspAaBlCm8RXw
-u9SAaxRwfD1pqRnZVPxxlP6JUmdV3BfzM5L2ifAauXczXKjXWbVWU/7zXGDChKvz
-jFySos+dEcLX7opddonoJxe3S/TtYuKk18gQuVx/YF9t
------END AGE ENCRYPTED FILE-----
diff --git a/dot_config/git/config.d/encrypted_work.config.age b/dot_config/git/config.d/encrypted_work.config.age
new file mode 100644
index 0000000..44d6e86
--- /dev/null
+++ b/dot_config/git/config.d/encrypted_work.config.age
@@ -0,0 +1,9 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBneVFnSzZOK2JCcFh1djFO
+eit4VXdZZVZFaXQ1S2d5TTJOK3N2U0J6UmlJCkZ5RXZDOHpaUzdZOUpWUWlBK3pJ
+Y3I1aThmT1lJN25lZ0FMbU1mTDNlVmsKLS0tIHNOeHlDQVZnalFCOGRoaXgyd1Bt
+Y2ovVVFONHRxalJFUlpjYWx5Q0dJSFUKl4EUSvr6t7Jzwx0t78rU0cXgzJbiBG+n
++2RPqf0Ow/9pjFJWJWAtxxMr/5uK56GQsm/tGjOdhXlf+1Q/aiffOOj+6jq/U9vd
+yZfvC0Z67NwpZW+pMyAT/HyifZUWk4F/pT9IOaTE3QouPpSixFz3ad2B3VGPqilB
+Do7jGpwzyXE5AwGMcIEFe1wFjACKW2Q0xj/gh17RLK8q
+-----END AGE ENCRYPTED FILE-----
diff --git a/dot_config/tmux/plugins/executable_macos-color-workaround.tmpl b/dot_config/tmux/plugins/executable_macos-color-workaround.tmpl
deleted file mode 100644
index 5774cc7..0000000
--- a/dot_config/tmux/plugins/executable_macos-color-workaround.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
-# chezmoi:template:left-delimiter=#{{
-#{{- /* vim: set filetype=bash: */ -}}
-#{{- if and (lookPath "tmux") (eq .chezmoi.os "darwin") -}}
-#!/usr/bin/env bash
-
-if [ "$(uname -s)" == "Darwin" ]; then
-    exit 0
-fi
-
-tmux set default-terminal "tmux-256color"
-tmux set terminal-overrides ",xterm-256color:Tc"
-#{{- end }}
diff --git a/dot_config/tmux/tmux.conf.tmpl b/dot_config/tmux/tmux.conf.tmpl
index e04ee37..d818407 100644
--- a/dot_config/tmux/tmux.conf.tmpl
+++ b/dot_config/tmux/tmux.conf.tmpl
@@ -40,7 +40,8 @@ set-option -g default-shell "#{{ lookPath "nu" | replace .chezmoi.homeDir "$HOME
 # Colors
 ################################################################################
 #{{ if eq .chezmoi.os "darwin" -}}
-run $XDG_CONFIG_HOME/tmux/plugins/macos-color-workaround
+set default-terminal "tmux-256color"
+set terminal-overrides ",xterm-256color:Tc"
 #{{ end }}
 set -g status-fg white
 set -g status-bg black
@@ -55,14 +56,19 @@ unbind [
 bind Escape copy-mode
 unbind p
 bind p paste-buffer
-bind-key -T copy-mode-vi 'v' send -X begin-selection
-bind-key -T copy-mode-vi 'y' send -X copy-selection
-bind-key -T copy-mode-vi 'q' send -X rectangle-toggle
+bind -T copy-mode-vi 'v' send -X begin-selection
+bind -T copy-mode-vi 'y' send -X copy-selection
+bind -T copy-mode-vi 'q' send -X rectangle-toggle
 
 # Make switch session shortcut repeatable
 bind -r ( switch-client -p
 bind -r ) switch-client -n
 
+#{{- if lookPath "fzf" -}}
+unbind f
+bind f display-popup -E "tmux list-sessions | sed -E 's/:.*$//' | grep -v \"^$(tmux display-message -p '#S')\$\" | fzf --reverse | xargs tmux switch-client -t"
+#{{ end }}
+
 # Reload config with prefix r
 bind r source-file $XDG_CONFIG_HOME/tmux/tmux.conf \; display "Reloaded"