diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index 8e3a674..cd6e5db 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -1,8 +1,39 @@
+################################################################################
+# Options
+################################################################################
+set  -g  base-index         1       # start window numbering from 1
+set  -g  history-limit      20000   # remember longer history
+set  -gs escape-time        50      # avoid delays with ESC in vim
+set  -gs repeat-time        1000    # allow 1 second for multiple commands
+set  -s  focus-events       on      # pass focus events from terminal to applications
+setw -g  automatic-rename   on      # automatically rename windows
+setw -g  mouse              on      # enable mouse support
+setw -g  pane-base-index    1       # start pane numbering from 1
+
+# Start non-login shells for new panes/windows.
+# https://wiki.archlinux.org/title/Tmux#Start_a_non-login_shell
+set -g default-command "${SHELL}"
+
+# Set $TERM, force 256 colors, and enable italics.
+# https://github.com/tmux/tmux/wiki/FAQ#how-do-i-use-a-256-colour-terminal
+# https://github.com/tmux/tmux/wiki/FAQ#i-dont-see-italics-or-italics-and-reverse-are-the-wrong-way-round
+set -g default-terminal 'tmux-256color'
+
+# Report true color support to programs.
+# https://github.com/tmux/tmux/wiki/FAQ#how-do-i-use-rgb-colour
+set -ga terminal-overrides ',*-256col*:Tc'
+
+# The shell will increment SHLVL by one when it is started -> unsetting this
+# variable here removes any memory of nesting before tmux was executed and will
+# cause shells to start with level 1 again within the session.
+set-environment -gu SHLVL
+
 set -g prefix C-space
 
-#
+################################################################################
 # Key bindings
-#
+################################################################################
+unbind  C-b
 bind    C-space send-prefix
 bind    R       source-file "$XDG_CONFIG_HOME/tmux/tmux.conf"\; display "RELOADED"
 bind    v       copy-mode
@@ -69,39 +100,9 @@ bind    -T copy-mode-vi v   send-keys -X begin-selection
 bind    -T copy-mode-vi y   send-keys -X copy-selection
 unbind  -T copy-mode-vi MouseDragEnd1Pane  # Stay in copy mode on drag end.
 
-#
-# General
-#
-set  -s  focus-events       on      # pass focus events from terminal to applications
-set  -gs escape-time        50      # avoid delays with ESC in vim
-set  -gs repeat-time        1000    # allow 1 second for multiple commands
-set  -g  base-index         1       # start window numbering from 1
-set  -g  history-limit      20000   # remember longer history
-setw -g  automatic-rename   on      # automatically rename windows
-setw -g  mouse              on      # enable mouse support
-setw -g  pane-base-index    1       # start pane numbering from 1
-
-# Start non-login shells for new panes/windows.
-# https://wiki.archlinux.org/title/Tmux#Start_a_non-login_shell
-set -g default-command "${SHELL}"
-
-# Set $TERM, force 256 colors, and enable italics.
-# https://github.com/tmux/tmux/wiki/FAQ#how-do-i-use-a-256-colour-terminal
-# https://github.com/tmux/tmux/wiki/FAQ#i-dont-see-italics-or-italics-and-reverse-are-the-wrong-way-round
-set -g default-terminal 'tmux-256color'
-
-# Report true color support to programs.
-# https://github.com/tmux/tmux/wiki/FAQ#how-do-i-use-rgb-colour
-set -ga terminal-overrides ',*-256col*:Tc'
-
-# The shell will increment SHLVL by one when it is started -> unsetting this
-# variable here removes any memory of nesting before tmux was executed and will
-# cause shells to start with level 1 again within the session.
-set-environment -gu SHLVL
-
-#
-# Style (status list, colors, ...)
-#
+################################################################################
+# Style
+################################################################################
 set  -g pane-border-style           fg=black
 set  -g pane-active-border-style    fg=brightblue
 set  -g message-style               fg=brightwhite,bg=black