diff --git a/roles/tmux/templates/controller.tmux.conf.j2 b/roles/tmux/templates/controller.tmux.conf.j2
index 6bbc3a3..429a343 100644
--- a/roles/tmux/templates/controller.tmux.conf.j2
+++ b/roles/tmux/templates/controller.tmux.conf.j2
@@ -17,7 +17,7 @@ set pane-border-fg colour237
 set pane-active-border-fg colour27
 
 # Tweak currently highlighted window ('active')
-setw window-status-current-fg colour236
+setw window-status-current-fg colour255
 setw window-status-current-bg colour27
 setw window-status-current-format " #F[#W] "
 setw window-status-current-attr none
diff --git a/roles/tmux/templates/tmux.conf.j2 b/roles/tmux/templates/tmux.conf.j2
index 791afa3..cfac24a 100644
--- a/roles/tmux/templates/tmux.conf.j2
+++ b/roles/tmux/templates/tmux.conf.j2
@@ -12,8 +12,8 @@ set set-titles on
 set set-titles-string "tmux: [#H] [#S] [#W:#D #I:#P]"
 
 # Change pane colors
-set pane-border-fg colour237
-set pane-active-border-fg colour199
+set -g pane-border-fg colour237
+set -g pane-active-border-fg colour199
 
 # Tweak currently active window
 setw window-status-current-fg colour236
@@ -36,5 +36,7 @@ set status-right '[FFKA: #(ip addr show freifunk | grep inet6 | grep -v fe80 | c
 # Refresh status bar every 2s
 set status-interval 2
 
+set -g mouse on
+
 # Initialize tmux-plugin-manager
 run '~/.tmux/plugins/tpm/tpm'
diff --git a/roles/vim/tasks/.main.yml.swp b/roles/vim/tasks/.main.yml.swp
deleted file mode 100644
index 14be621..0000000
Binary files a/roles/vim/tasks/.main.yml.swp and /dev/null differ