diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0f68809..50ca2ae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,4 +31,6 @@ jobs:
           ./configure && make && sudo make install
           cd ..
       - name: Run all tests
+        env:
+          TMUX_VERSION: ${{ matrix.tmux_version }}
         run: make test
diff --git a/Makefile b/Makefile
index fbd1a18..7052677 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,31 @@
-default: test
+BUILDER := bin/build-theme
+THEME_SRC := $(shell find src -name '*.tmuxtheme')
+INCLUDES := $(shell find src -name '*.tmuxsh')
+THEMES := $(patsubst src/%,%,$(THEME_SRC))
+TESTS := $(addsuffix .test,$(THEMES))
+
+.PHONY: build
+build: $(THEMES)
+
+.PHONY: clean
+clean:
+	rm $(shell find * -name "*.tmuxtheme" -not -path "src/*")
 
 .PHONY: lint
 lint:
 	cd test && golangci-lint run -v
 
 .PHONY: test
-test:
-	cd test && go test -v
+test: needs-build
+	cd test && go test -count=1 -v ./...
+
+.PHONY: needs-build
+needs-build:
+	$(foreach file,$(THEMES), \
+		$(BUILDER) "src/$(file)" | diff -q "$(file)" - && \
+	) true
+
+$(THEMES): %.tmuxtheme: src/%.tmuxtheme $(INCLUDES)
+	$(BUILDER) "src/$@" "$@"
+
+$(TESTS): %.test: src/%.test
diff --git a/README.md b/README.md
index aed759c..f5fde5b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # Tmux Themepack
 
-A pack of various themes for Tmux.
-
+A pack of various themes for Tmux for 2.6 or later.
 
 ## Installation
 
@@ -177,23 +176,29 @@ left side.
 
 ![powerline-double-yellow](https://github.com/jimeh/tmux-themepack-previews/raw/1.0.0/powerline/double/yellow-preview.png)
 
+## Customizing
 
-## Tips
+All themes are built with overridable custom @-prefixed Tmux options, which
+means that any part of a theme can be easily customized.
 
-- Use different themes/colors on different machines by using some sort of
-  wrapper around launching Tmux.
+To customize a theme, simply look at the source to see the list of Tmux options
+with names beginning with a `@`, and simply set the desired option in your
+`tmux.conf` before the theme is loaded.
 
+## Development / Contributing
 
-## Contributing
+If you want to contribute a theme, please have them use custom @-prefixed Tmux
+options like existing themes, so they can be customized the same way.
 
-If you decide to contribute your own tmux themes, please try to base it on the
-`default.tmuxtheme` theme. This ensures that switching between themes works as
-it should and completely overwrites all settings from previous themes.
+New themes should be created under the `src` folder with a `.tmuxtheme`
+extension. Please have a look at existing themes to see how files can be
+included and shared between themes.
 
-If it's not possible to base your theme on my default one, something is probably
-missing from it. So please contribute a fix to the default theme too in that
-case :)
+To build all themes, just run `make build` from the root of the project.
 
+All themes also have unit tests which can be found under the `test`
+directory. They are written in [Go](https://golang.org/), but hopefully easy to
+understand. To run all tests, just run `make test` from the root of the project.
 
 ## License
 
diff --git a/basic.tmuxtheme b/basic.tmuxtheme
index c99652c..d89d06a 100644
--- a/basic.tmuxtheme
+++ b/basic.tmuxtheme
@@ -1,54 +1,99 @@
-# Status update interval
-set -g status-interval 1
+#
+# Basic theme
+#
 
-# Basic status bar colors
-set -g status-style bg=black,fg=cyan
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#I"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "#H"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%H:%M:%S"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "%d-%b-%y"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Left side of status bar
-set -g status-left-style bg=black,fg=green
-set -g status-left-length 40
-set -g status-left "#S #[fg=white]» #[fg=yellow]#I #[fg=cyan]#P"
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Right side of status bar
-set -g status-right-style bg=black,fg=cyan
-set -g status-right-length 40
-set -g status-right "#H #[fg=white]« #[fg=yellow]%H:%M:%S #[fg=green]%d-%b-%y"
+# Theme options
+set -goq  @theme-clock-mode-colour red
+set -goq  @theme-clock-mode-style 24
+set -goq  @theme-display-panes-active-colour default
+set -goq  @theme-display-panes-colour default
+set -goq  @theme-message-bg default
+set -goq  @theme-message-command-bg default
+set -goq  @theme-message-command-fg default
+set -goq  @theme-message-fg default
+set -goq  @theme-mode-bg red
+set -goq  @theme-mode-fg default
+set -goq  @theme-pane-active-border-bg default
+set -goq  @theme-pane-active-border-fg green
+set -goq  @theme-pane-border-bg default
+set -goq  @theme-pane-border-fg default
+set -goq  @theme-status-bg black
+set -goq  @theme-status-fg cyan
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#{@themepack-status-left-area-left-format} #[fg=white]» #[fg=yellow]#{@themepack-status-left-area-middle-format} #[fg=cyan]#{@themepack-status-left-area-right-format}"
+set -goq  @theme-status-left-bg black
+set -goq  @theme-status-left-fg green
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#{@themepack-status-right-area-left-format} #[fg=white]« #[fg=yellow]#{@themepack-status-right-area-middle-format} #[fg=green]#{@themepack-status-right-area-right-format}"
+set -goq  @theme-status-right-bg black
+set -goq  @theme-status-right-fg cyan
+set -goq  @theme-status-right-length 40
+set -goq  @theme-window-status-activity-bg black
+set -goq  @theme-window-status-activity-fg yellow
+set -goq  @theme-window-status-current-bg red
+set -goq  @theme-window-status-current-fg black
+set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
+set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
+set -goq  @theme-window-status-separator ""
 
-# Window status
-set -g window-status-format " #I:#W#F "
-set -g window-status-current-format " #I:#W#F "
-
-# Current window status
-set -g window-status-current-style bg=red,fg=black
-
-# Window with activity status
-set -g window-status-activity-style bg=black,fg=yellow
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=default
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=green
-
-# Pane number indicator
-set -g display-panes-colour default
-set -g display-panes-active-colour default
-
-# Clock mode
-set -g clock-mode-colour red
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=default,fg=default
-
-# Command message
-set -g message-command-style bg=default,fg=default
-
-# Mode
-set -g mode-style bg=red,fg=default
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/bin/build-theme b/bin/build-theme
new file mode 100755
index 0000000..216852f
--- /dev/null
+++ b/bin/build-theme
@@ -0,0 +1,107 @@
+#! /usr/bin/env bash
+#set -e
+shopt -s extglob
+[ -n "$BUILD_THEME_DEBUG" ] && set -x
+
+trim() {
+  local string="$*"
+  string="${string#"${string%%[![:space:]]*}"}"
+  string="${string%"${string##*[![:space:]]}"}"
+  echo -n "$string"
+}
+
+find-included() {
+  local needle source dir found
+  needle="$1"
+  source="$2"
+  dir="$(dirname "$source")"
+  found=""
+
+  if [[ "${needle:0:1}" == "/" ]]; then
+    echo "$needle"
+    return 0
+  fi
+
+  while [ -z "$found" ] && [[ ! "$dir" =~ ^(\/|\.|\.\.)$ ]]; do
+    if [ -f "${dir}/${needle}" ]; then
+      found="${dir}/${needle}"
+    elif [ -f "${dir}/${needle}.tmuxsh" ]; then
+      found="${dir}/${needle}.tmuxsh"
+    elif [ -f "${dir}/${needle}.tmuxtheme" ]; then
+      found="${dir}/${needle}.tmuxtheme"
+    else
+      dir="$(dirname "$dir")"
+    fi
+  done
+
+  if [ -z "$found" ]; then
+    echo "ERROR: Could not find \"$needle\" to include in \"$source\"" 1>&2
+    return 1
+  else
+    # echo "INFO: Found \"$needle\" to include in \"$source\"" 1>&2
+    echo "$found"
+    return 0
+  fi
+}
+
+build-theme() {
+  local source target output file line included err
+  source="$1"
+  target="$2"
+  output=""
+  err="0"
+
+  while IFS= read -r line; do
+    if [[ "$line" =~ ^#=\ *include\ \"(.+)\".*$ ]]; then
+      if file="$(find-included "${BASH_REMATCH[1]}" "$source")"; then
+        if included="$(build-theme "${file}")"; then
+          output="${output}${included}
+"
+        else
+          err="1"
+        fi
+      else
+        err="1"
+      fi
+    else
+      output="${output}${line}
+"
+    fi
+  done < "$source"
+
+  if [ "$err" != "0" ]; then
+    return "$err"
+  elif [ -z "$target" ]; then
+    echo "$(trim "$output")"
+  else
+    mkdir -p "$(dirname "$target")"
+    echo "$(trim "$output")" > "$target"
+  fi
+}
+
+help() {
+  echo "usage: build-theme <source-file> [<target-file>]"
+  echo ""
+  echo "Arguments:"
+  echo "  <source-file>  - The theme file to build."
+  echo "  <target-file>  - Write output to specified file. If not given, print"
+  echo "                   output to STDOUT."
+}
+
+main() {
+  local source="$1"
+  local target="$2"
+
+  if [ -z "$source" ]; then
+    help
+    exit 1
+  elif [[ " $* " =~ ^.*\ (-h|--help)\ .*$ ]]; then
+    help
+  else
+    build-theme "$source" "$target"
+    return "$?"
+  fi
+}
+
+main "$@"
+exit "$?"
diff --git a/default.tmuxtheme b/default.tmuxtheme
index 6dda2f7..a326893 100644
--- a/default.tmuxtheme
+++ b/default.tmuxtheme
@@ -6,57 +6,62 @@
 # as a template for creating new themes, and as a way to reset a running Tmux
 # server's style to it's defaults.
 
-# Status update interval
-set -g status-interval 15
+# Theme options
+set -goq @theme-clock-mode-colour blue
+set -goq @theme-clock-mode-style 24
+set -goq @theme-display-panes-active-colour red
+set -goq @theme-display-panes-colour blue
+set -goq @theme-message-bg yellow
+set -goq @theme-message-command-bg green
+set -goq @theme-message-command-fg black
+set -goq @theme-message-fg black
+set -goq @theme-mode-bg yellow
+set -goq @theme-mode-fg black
+set -goq @theme-pane-active-border-bg default
+set -goq @theme-pane-active-border-fg green
+set -goq @theme-pane-border-bg default
+set -goq @theme-pane-border-fg white
+set -goq @theme-status-bg green
+set -goq @theme-status-fg black
+set -goq @theme-status-interval 15
+set -goq @theme-status-justify left
+set -goq @theme-status-left "[#S] "
+set -goq @theme-status-left-bg green
+set -goq @theme-status-left-fg black
+set -goq @theme-status-left-length 40
+set -goq @theme-status-right " \"#H\" %H:%M %d-%b-%y"
+set -goq @theme-status-right-bg green
+set -goq @theme-status-right-fg black
+set -goq @theme-status-right-length 40
+set -goq @theme-window-status-activity-bg black
+set -goq @theme-window-status-activity-fg green
+set -goq @theme-window-status-current-bg green
+set -goq @theme-window-status-current-fg black
+set -goq @theme-window-status-current-format "#I:#W#F"
+set -goq @theme-window-status-format "#I:#W#F"
+set -goq @theme-window-status-separator " "
 
-# Basic status bar colors
-set -g status-style bg=green,fg=black
-
-# Left side of status bar
-set -g status-left-style bg=green,fg=black
-set -g status-left-length 10
-set -g status-left "[#S]"
-
-# Right side of status bar
-set -g status-right-style bg=green,fg=black
-set -g status-right-length 40
-set -g status-right "\"#H\" %H:%M %d-%b-%y"
-
-# Window status
-set -g window-status-format "#I:#W#F"
-set -g window-status-current-format "#I:#W#F"
-
-# Current window status
-set -g window-status-current-style bg=green,fg=black
-
-# Window with activity status
-set -g window-status-activity-style bg=black,fg=green
-
-# Window separator
-set -g window-status-separator " "
-
-# Window status alignment
-set -g status-justify left
-
-# Pane border
-set -g pane-border-style bg=default,fg=white
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=green
-
-# Pane number indicator
-set -g display-panes-colour blue
-set -g display-panes-active-colour red
-
-# Clock mode
-set -g clock-mode-colour blue
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=yellow,fg=black
-
-# Command message
-set -g message-command-style bg=green,fg=black
-
-# Mode
-set -g mode-style bg=yellow,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/block/blue.tmuxtheme b/powerline/block/blue.tmuxtheme
index b65cc73..398eaf4 100644
--- a/powerline/block/blue.tmuxtheme
+++ b/powerline/block/blue.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Blue Block - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Blue Block - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour24,bold] #S #[fg=colour24,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour24
+set -goq  @powerline-color-main-2 colour33
+set -goq  @powerline-color-main-3 colour31
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline Block Override
+set -goqF @powerline-color-activity-1 "#{@powerline-color-main-3}"
 
-# Window status
-set -g window-status-format " #I:#W#F "
-set -g window-status-current-format " #I:#W#F "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour24,fg=black
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-main-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-black-1}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
+set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour31
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour24
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour24
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour24,fg=black
-
-# Command message
-set -g message-command-style bg=colour24,fg=black
-
-# Mode
-set -g mode-style bg=colour24,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/block/cyan.tmuxtheme b/powerline/block/cyan.tmuxtheme
index 7a64929..c2493f0 100644
--- a/powerline/block/cyan.tmuxtheme
+++ b/powerline/block/cyan.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Cyan Block - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Cyan Block - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour39,bold] #S #[fg=colour39,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour39
+set -goq  @powerline-color-main-2 colour81
+set -goq  @powerline-color-main-3 colour75
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline Block Override
+set -goqF @powerline-color-activity-1 "#{@powerline-color-main-3}"
 
-# Window status
-set -g window-status-format " #I:#W#F "
-set -g window-status-current-format " #I:#W#F "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour39,fg=black
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-main-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-black-1}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
+set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour75
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour39
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour39
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour39,fg=black
-
-# Command message
-set -g message-command-style bg=colour39,fg=black
-
-# Mode
-set -g mode-style bg=colour39,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/block/gray.tmuxtheme b/powerline/block/gray.tmuxtheme
index b30baec..5055f93 100644
--- a/powerline/block/gray.tmuxtheme
+++ b/powerline/block/gray.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Gray Block - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Gray Block - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour245,bold] #S #[fg=colour245,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour245
+set -goq  @powerline-color-main-2 colour250
+set -goq  @powerline-color-main-3 colour245
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline Block Override
+set -goqF @powerline-color-activity-1 "#{@powerline-color-main-3}"
 
-# Window status
-set -g window-status-format " #I:#W#F "
-set -g window-status-current-format " #I:#W#F "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour245,fg=black
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-main-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-black-1}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
+set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour245
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour245
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour245,fg=black
-
-# Command message
-set -g message-command-style bg=colour245,fg=black
-
-# Mode
-set -g mode-style bg=colour245,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/block/green.tmuxtheme b/powerline/block/green.tmuxtheme
index a4488a9..bac0704 100644
--- a/powerline/block/green.tmuxtheme
+++ b/powerline/block/green.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Green Block - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Green Block - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour100,bold] #S #[fg=colour100,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour100
+set -goq  @powerline-color-main-2 colour190
+set -goq  @powerline-color-main-3 colour107
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline Block Override
+set -goqF @powerline-color-activity-1 "#{@powerline-color-main-3}"
 
-# Window status
-set -g window-status-format " #I:#W#F "
-set -g window-status-current-format " #I:#W#F "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=black
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-main-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-black-1}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
+set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour107
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour100
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour100
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour100,fg=black
-
-# Command message
-set -g message-command-style bg=colour100,fg=black
-
-# Mode
-set -g mode-style bg=colour100,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/block/magenta.tmuxtheme b/powerline/block/magenta.tmuxtheme
index b42b690..36a49ed 100644
--- a/powerline/block/magenta.tmuxtheme
+++ b/powerline/block/magenta.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Magenta Block - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Magenta Block - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour125,bold] #S #[fg=colour125,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour125
+set -goq  @powerline-color-main-2 colour127
+set -goq  @powerline-color-main-3 colour129
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline Block Override
+set -goqF @powerline-color-activity-1 "#{@powerline-color-main-3}"
 
-# Window status
-set -g window-status-format " #I:#W#F "
-set -g window-status-current-format " #I:#W#F "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour125,fg=black
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-main-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-black-1}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
+set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour129
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour125
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour125
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour125,fg=black
-
-# Command message
-set -g message-command-style bg=colour125,fg=black
-
-# Mode
-set -g mode-style bg=colour125,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/block/orange.tmuxtheme b/powerline/block/orange.tmuxtheme
index 6bf3e44..78fe383 100644
--- a/powerline/block/orange.tmuxtheme
+++ b/powerline/block/orange.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Orange Block - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Orange Block - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour130,bold] #S #[fg=colour130,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour130
+set -goq  @powerline-color-main-2 colour166
+set -goq  @powerline-color-main-3 colour130
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline Block Override
+set -goqF @powerline-color-activity-1 "#{@powerline-color-main-3}"
 
-# Window status
-set -g window-status-format " #I:#W#F "
-set -g window-status-current-format " #I:#W#F "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour130,fg=black
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-main-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-black-1}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
+set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour130
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour130
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour130
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour130,fg=black
-
-# Command message
-set -g message-command-style bg=colour130,fg=black
-
-# Mode
-set -g mode-style bg=colour130,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/block/purple.tmuxtheme b/powerline/block/purple.tmuxtheme
index 7ec2406..12a07b5 100644
--- a/powerline/block/purple.tmuxtheme
+++ b/powerline/block/purple.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Purple Block - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Purple Block - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour90,bold] #S #[fg=colour90,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour90
+set -goq  @powerline-color-main-2 colour129
+set -goq  @powerline-color-main-3 colour141
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline Block Override
+set -goqF @powerline-color-activity-1 "#{@powerline-color-main-3}"
 
-# Window status
-set -g window-status-format " #I:#W#F "
-set -g window-status-current-format " #I:#W#F "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour90,fg=black
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-main-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-black-1}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
+set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour141
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour90
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour90
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour90,fg=black
-
-# Command message
-set -g message-command-style bg=colour90,fg=black
-
-# Mode
-set -g mode-style bg=colour90,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/block/red.tmuxtheme b/powerline/block/red.tmuxtheme
index a0aee26..155ca0c 100644
--- a/powerline/block/red.tmuxtheme
+++ b/powerline/block/red.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Red Block - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Red Block - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour88,bold] #S #[fg=colour88,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour88
+set -goq  @powerline-color-main-2 colour160
+set -goq  @powerline-color-main-3 colour124
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline Block Override
+set -goqF @powerline-color-activity-1 "#{@powerline-color-main-3}"
 
-# Window status
-set -g window-status-format " #I:#W#F "
-set -g window-status-current-format " #I:#W#F "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour88,fg=black
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-main-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-black-1}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
+set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour124
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour88
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour88
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour88,fg=black
-
-# Command message
-set -g message-command-style bg=colour88,fg=black
-
-# Mode
-set -g mode-style bg=colour88,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/block/yellow.tmuxtheme b/powerline/block/yellow.tmuxtheme
index d80d962..c811f63 100644
--- a/powerline/block/yellow.tmuxtheme
+++ b/powerline/block/yellow.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Yellow Block - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Yellow Block - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour227,bold] #S #[fg=colour227,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour227
+set -goq  @powerline-color-main-2 colour227
+set -goq  @powerline-color-main-3 colour229
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline Block Override
+set -goqF @powerline-color-activity-1 "#{@powerline-color-main-3}"
 
-# Window status
-set -g window-status-format " #I:#W#F "
-set -g window-status-current-format " #I:#W#F "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour227,fg=black
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-main-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-black-1}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
+set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour229
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour227
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour227
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour227,fg=black
-
-# Command message
-set -g message-command-style bg=colour227,fg=black
-
-# Mode
-set -g mode-style bg=colour227,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/default/blue.tmuxtheme b/powerline/default/blue.tmuxtheme
index f5cb1bc..ecadc44 100644
--- a/powerline/default/blue.tmuxtheme
+++ b/powerline/default/blue.tmuxtheme
@@ -1,64 +1,138 @@
 #
-# Powerline Blue - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Blue - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour24,bold] #S #[fg=colour24,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour24
+set -goq  @powerline-color-main-2 colour33
+set -goq  @powerline-color-main-3 colour31
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour33,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
-
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour24
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour24
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour24,fg=black
-
-# Command message
-set -g message-command-style bg=colour24,fg=black
-
-# Mode
-set -g mode-style bg=colour24,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/default/cyan.tmuxtheme b/powerline/default/cyan.tmuxtheme
index 0987bc9..39b42fe 100644
--- a/powerline/default/cyan.tmuxtheme
+++ b/powerline/default/cyan.tmuxtheme
@@ -1,64 +1,138 @@
 #
-# Powerline Cyan - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Cyan - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour39,bold] #S #[fg=colour39,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour39
+set -goq  @powerline-color-main-2 colour81
+set -goq  @powerline-color-main-3 colour75
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour81,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
-
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour39
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour39
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour39,fg=black
-
-# Command message
-set -g message-command-style bg=colour39,fg=black
-
-# Mode
-set -g mode-style bg=colour39,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/default/gray.tmuxtheme b/powerline/default/gray.tmuxtheme
index 2f9f0e1..4494afb 100644
--- a/powerline/default/gray.tmuxtheme
+++ b/powerline/default/gray.tmuxtheme
@@ -1,64 +1,138 @@
 #
-# Powerline Gray - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Gray - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour245,bold] #S #[fg=colour245,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour245
+set -goq  @powerline-color-main-2 colour250
+set -goq  @powerline-color-main-3 colour245
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour250,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
-
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour245
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour245
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour245,fg=black
-
-# Command message
-set -g message-command-style bg=colour245,fg=black
-
-# Mode
-set -g mode-style bg=colour245,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/default/green.tmuxtheme b/powerline/default/green.tmuxtheme
index b16c5b2..f88ef43 100644
--- a/powerline/default/green.tmuxtheme
+++ b/powerline/default/green.tmuxtheme
@@ -1,64 +1,138 @@
 #
-# Powerline Green - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Green - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour100,bold] #S #[fg=colour100,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour100
+set -goq  @powerline-color-main-2 colour190
+set -goq  @powerline-color-main-3 colour107
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour190,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
-
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour100
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour100
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour100,fg=black
-
-# Command message
-set -g message-command-style bg=colour100,fg=black
-
-# Mode
-set -g mode-style bg=colour100,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/default/magenta.tmuxtheme b/powerline/default/magenta.tmuxtheme
index 34897ca..e051de1 100644
--- a/powerline/default/magenta.tmuxtheme
+++ b/powerline/default/magenta.tmuxtheme
@@ -1,64 +1,138 @@
 #
-# Powerline Magenta - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Magenta - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour125,bold] #S #[fg=colour125,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour125
+set -goq  @powerline-color-main-2 colour127
+set -goq  @powerline-color-main-3 colour129
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour127,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
-
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour125
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour125
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour125,fg=black
-
-# Command message
-set -g message-command-style bg=colour125,fg=black
-
-# Mode
-set -g mode-style bg=colour125,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/default/orange.tmuxtheme b/powerline/default/orange.tmuxtheme
index 29bab59..1b10f36 100644
--- a/powerline/default/orange.tmuxtheme
+++ b/powerline/default/orange.tmuxtheme
@@ -1,64 +1,138 @@
 #
-# Powerline Orange - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Orange - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour130,bold] #S #[fg=colour130,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour130
+set -goq  @powerline-color-main-2 colour166
+set -goq  @powerline-color-main-3 colour130
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour166,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
-
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour130
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour130
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour130,fg=black
-
-# Command message
-set -g message-command-style bg=colour130,fg=black
-
-# Mode
-set -g mode-style bg=colour130,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/default/purple.tmuxtheme b/powerline/default/purple.tmuxtheme
index 3441c76..b184f1c 100644
--- a/powerline/default/purple.tmuxtheme
+++ b/powerline/default/purple.tmuxtheme
@@ -1,64 +1,138 @@
 #
-# Powerline Purple - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Purple - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour90,bold] #S #[fg=colour90,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour90
+set -goq  @powerline-color-main-2 colour129
+set -goq  @powerline-color-main-3 colour141
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour129,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
-
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour90
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour90
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour90,fg=black
-
-# Command message
-set -g message-command-style bg=colour90,fg=black
-
-# Mode
-set -g mode-style bg=colour90,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/default/red.tmuxtheme b/powerline/default/red.tmuxtheme
index f04adfd..1bb0633 100644
--- a/powerline/default/red.tmuxtheme
+++ b/powerline/default/red.tmuxtheme
@@ -1,64 +1,138 @@
 #
-# Powerline Red - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Red - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour88,bold] #S #[fg=colour88,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour88
+set -goq  @powerline-color-main-2 colour160
+set -goq  @powerline-color-main-3 colour124
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour160,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
-
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour88
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour88
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour88,fg=black
-
-# Command message
-set -g message-command-style bg=colour88,fg=black
-
-# Mode
-set -g mode-style bg=colour88,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/default/yellow.tmuxtheme b/powerline/default/yellow.tmuxtheme
index 978d10f..f087ebd 100644
--- a/powerline/default/yellow.tmuxtheme
+++ b/powerline/default/yellow.tmuxtheme
@@ -1,64 +1,138 @@
 #
-# Powerline Yellow - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Yellow - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour227,bold] #S #[fg=colour227,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour227
+set -goq  @powerline-color-main-2 colour227
+set -goq  @powerline-color-main-3 colour229
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]#[fg=colour233,bg=colour245,bold] #H "
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour227,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
-
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour227
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour227
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour227,fg=black
-
-# Command message
-set -g message-command-style bg=colour227,fg=black
-
-# Mode
-set -g mode-style bg=colour227,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/double/blue.tmuxtheme b/powerline/double/blue.tmuxtheme
index 0eda8f9..d396c0e 100644
--- a/powerline/double/blue.tmuxtheme
+++ b/powerline/double/blue.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Double Blue - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Double Blue - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour24,bold] #S #[fg=colour24,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour24
+set -goq  @powerline-color-main-2 colour33
+set -goq  @powerline-color-main-3 colour31
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour24,bg=colour240]#[fg=colour233,bg=colour24,bold] #H "
+# Powerline Double Override
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-main-1}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour33,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour24
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour24
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour24,fg=black
-
-# Command message
-set -g message-command-style bg=colour24,fg=black
-
-# Mode
-set -g mode-style bg=colour24,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/double/cyan.tmuxtheme b/powerline/double/cyan.tmuxtheme
index e5349af..476ea33 100644
--- a/powerline/double/cyan.tmuxtheme
+++ b/powerline/double/cyan.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Double Cyan - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Double Cyan - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour39,bold] #S #[fg=colour39,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour39
+set -goq  @powerline-color-main-2 colour81
+set -goq  @powerline-color-main-3 colour75
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour39,bg=colour240]#[fg=colour233,bg=colour39,bold] #H "
+# Powerline Double Override
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-main-1}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour81,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour39
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour39
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour39,fg=black
-
-# Command message
-set -g message-command-style bg=colour39,fg=black
-
-# Mode
-set -g mode-style bg=colour39,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/double/green.tmuxtheme b/powerline/double/green.tmuxtheme
index 7a8909c..822a359 100644
--- a/powerline/double/green.tmuxtheme
+++ b/powerline/double/green.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Double Green - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Double Green - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour100,bold] #S #[fg=colour100,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour100
+set -goq  @powerline-color-main-2 colour190
+set -goq  @powerline-color-main-3 colour107
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour100,bg=colour240]#[fg=colour233,bg=colour100,bold] #H "
+# Powerline Double Override
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-main-1}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour190,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour100
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour100
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour100,fg=black
-
-# Command message
-set -g message-command-style bg=colour100,fg=black
-
-# Mode
-set -g mode-style bg=colour100,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/double/magenta.tmuxtheme b/powerline/double/magenta.tmuxtheme
index d9d8ac0..0c30fc0 100644
--- a/powerline/double/magenta.tmuxtheme
+++ b/powerline/double/magenta.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Double Magenta - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Double Magenta - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour125,bold] #S #[fg=colour125,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour125
+set -goq  @powerline-color-main-2 colour127
+set -goq  @powerline-color-main-3 colour129
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour125,bg=colour240]#[fg=colour233,bg=colour125,bold] #H "
+# Powerline Double Override
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-main-1}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour127,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour125
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour125
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour125,fg=black
-
-# Command message
-set -g message-command-style bg=colour125,fg=black
-
-# Mode
-set -g mode-style bg=colour125,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/double/orange.tmuxtheme b/powerline/double/orange.tmuxtheme
index 88cc0a9..355f970 100644
--- a/powerline/double/orange.tmuxtheme
+++ b/powerline/double/orange.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Double Orange - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Double Orange - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour130,bold] #S #[fg=colour130,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour130
+set -goq  @powerline-color-main-2 colour166
+set -goq  @powerline-color-main-3 colour130
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour130,bg=colour240]#[fg=colour233,bg=colour130,bold] #H "
+# Powerline Double Override
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-main-1}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour166,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour130
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour130
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour130,fg=black
-
-# Command message
-set -g message-command-style bg=colour130,fg=black
-
-# Mode
-set -g mode-style bg=colour130,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/double/purple.tmuxtheme b/powerline/double/purple.tmuxtheme
index 38615b3..451e75e 100644
--- a/powerline/double/purple.tmuxtheme
+++ b/powerline/double/purple.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Double Purple - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Double Purple - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour90,bold] #S #[fg=colour90,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour90
+set -goq  @powerline-color-main-2 colour129
+set -goq  @powerline-color-main-3 colour141
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour90,bg=colour240]#[fg=colour233,bg=colour90,bold] #H "
+# Powerline Double Override
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-main-1}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour129,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour90
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour90
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour90,fg=black
-
-# Command message
-set -g message-command-style bg=colour90,fg=black
-
-# Mode
-set -g mode-style bg=colour90,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/double/red.tmuxtheme b/powerline/double/red.tmuxtheme
index c234b9f..aefb126 100644
--- a/powerline/double/red.tmuxtheme
+++ b/powerline/double/red.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Double Red - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Double Red - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour88,bold] #S #[fg=colour88,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour88
+set -goq  @powerline-color-main-2 colour160
+set -goq  @powerline-color-main-3 colour124
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour88,bg=colour240]#[fg=colour233,bg=colour88,bold] #H "
+# Powerline Double Override
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-main-1}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour160,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour88
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour88
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour88,fg=black
-
-# Command message
-set -g message-command-style bg=colour88,fg=black
-
-# Mode
-set -g mode-style bg=colour88,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/powerline/double/yellow.tmuxtheme b/powerline/double/yellow.tmuxtheme
index 6234126..b14aa8f 100644
--- a/powerline/double/yellow.tmuxtheme
+++ b/powerline/double/yellow.tmuxtheme
@@ -1,64 +1,141 @@
 #
-# Powerline Double Yellow - Tmux Theme
-# Created by Jim Myhrberg <contact@jimeh.me>.
+# Powerline Double Yellow - Tmux Themepack
+# https://github.com/jimeh/tmux-themepack
 #
-# Inspired by vim-powerline: https://github.com/Lokaltog/powerline
+# Inspired by vim-powerline: https://github.com/powerline/powerline
 #
 # Requires terminal to be using a powerline compatible font, find one here:
-# https://github.com/Lokaltog/powerline-fonts
+# https://github.com/powerline/fonts
 #
 
-# Status update interval
-set -g status-interval 1
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
 
-# Basic status bar colors
-set -g status-style fg=colour240,bg=colour233
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
-# Left side of status bar
-set -g status-left-style bg=colour233,fg=colour243
-set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour227,bold] #S #[fg=colour227,bg=colour240,nobold]#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]"
+# Powerline color options
+set -goq  @powerline-color-main-1 colour227
+set -goq  @powerline-color-main-2 colour227
+set -goq  @powerline-color-main-3 colour229
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
 
-# Right side of status bar
-set -g status-right-style bg=colour233,fg=colour243
-set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour227,bg=colour240]#[fg=colour233,bg=colour227,bold] #H "
+# Powerline Double Override
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-main-1}"
 
-# Window status
-set -g window-status-format "  #I:#W#F  "
-set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour227,nobold] #I:#W#F #[fg=colour233,bg=black,nobold]"
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
 
-# Current window status
-set -g window-status-current-style bg=colour100,fg=colour235
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
 
-# Window with activity status
-set -g window-status-activity-style bg=colour233,fg=colour245
-
-# Window separator
-set -g window-status-separator ""
-
-# Window status alignment
-set -g status-justify centre
-
-# Pane border
-set -g pane-border-style bg=default,fg=colour238
-
-# Active pane border
-set -g pane-active-border-style bg=default,fg=colour227
-
-# Pane number indicator
-set -g display-panes-colour colour233
-set -g display-panes-active-colour colour245
-
-# Clock mode
-set -g clock-mode-colour colour227
-set -g clock-mode-style 24
-
-# Message
-set -g message-style bg=colour227,fg=black
-
-# Command message
-set -g message-command-style bg=colour227,fg=black
-
-# Mode
-set -g mode-style bg=colour227,fg=black
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/src/_apply.tmuxsh b/src/_apply.tmuxsh
new file mode 100644
index 0000000..14ec46a
--- /dev/null
+++ b/src/_apply.tmuxsh
@@ -0,0 +1,24 @@
+# Apply theme options
+set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
+set -gF display-panes-colour "#{@theme-display-panes-colour}"
+set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
+set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
+set -gF status-interval "#{@theme-status-interval}"
+set -gF status-justify "#{@theme-status-justify}"
+set -gF status-left "#{@theme-status-left}"
+set -gF status-left-length "#{@theme-status-left-length}"
+set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
+set -gF status-right "#{@theme-status-right}"
+set -gF status-right-length "#{@theme-status-right-length}"
+set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
+set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
+set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
+set -gwF clock-mode-style "#{@theme-clock-mode-style}"
+set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"
+set -gwF pane-active-border-style "fg=#{@theme-pane-active-border-fg},bg=#{@theme-pane-active-border-bg}"
+set -gwF pane-border-style "fg=#{@theme-pane-border-fg},bg=#{@theme-pane-border-bg}"
+set -gwF window-status-activity-style "fg=#{@theme-window-status-activity-fg},bg=#{@theme-window-status-activity-bg}"
+set -gwF window-status-current-format "#{@theme-window-status-current-format}"
+set -gwF window-status-current-style "fg=#{@theme-window-status-current-fg},bg=#{@theme-window-status-current-bg}"
+set -gwF window-status-format "#{@theme-window-status-format}"
+set -gwF window-status-separator "#{@theme-window-status-separator}"
diff --git a/src/_formats_combine.tmuxsh b/src/_formats_combine.tmuxsh
new file mode 100644
index 0000000..d1e983f
--- /dev/null
+++ b/src/_formats_combine.tmuxsh
@@ -0,0 +1,9 @@
+# Themepack format options - combine prefixes, formats, and suffixes
+set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
+set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
+set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"
+set -gqF @themepack-status-right-area-left-format "#{@themepack-status-right-area-left-prefix}#{@themepack-status-right-area-left-format}#{@themepack-status-right-area-left-suffix}"
+set -gqF @themepack-status-right-area-middle-format "#{@themepack-status-right-area-middle-prefix}#{@themepack-status-right-area-middle-format}#{@themepack-status-right-area-middle-suffix}"
+set -gqF @themepack-status-right-area-right-format "#{@themepack-status-right-area-right-prefix}#{@themepack-status-right-area-right-format}#{@themepack-status-right-area-right-suffix}"
+set -gqF @themepack-window-status-current-format "#{@themepack-window-status-current-prefix}#{@themepack-window-status-current-format}#{@themepack-window-status-current-suffix}"
+set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
diff --git a/src/basic.tmuxtheme b/src/basic.tmuxtheme
new file mode 100644
index 0000000..3dd3139
--- /dev/null
+++ b/src/basic.tmuxtheme
@@ -0,0 +1,68 @@
+#
+# Basic theme
+#
+
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#I"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "#H"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%H:%M:%S"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "%d-%b-%y"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
+
+#= include "_formats_combine"
+
+# Theme options
+set -goq  @theme-clock-mode-colour red
+set -goq  @theme-clock-mode-style 24
+set -goq  @theme-display-panes-active-colour default
+set -goq  @theme-display-panes-colour default
+set -goq  @theme-message-bg default
+set -goq  @theme-message-command-bg default
+set -goq  @theme-message-command-fg default
+set -goq  @theme-message-fg default
+set -goq  @theme-mode-bg red
+set -goq  @theme-mode-fg default
+set -goq  @theme-pane-active-border-bg default
+set -goq  @theme-pane-active-border-fg green
+set -goq  @theme-pane-border-bg default
+set -goq  @theme-pane-border-fg default
+set -goq  @theme-status-bg black
+set -goq  @theme-status-fg cyan
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#{@themepack-status-left-area-left-format} #[fg=white]» #[fg=yellow]#{@themepack-status-left-area-middle-format} #[fg=cyan]#{@themepack-status-left-area-right-format}"
+set -goq  @theme-status-left-bg black
+set -goq  @theme-status-left-fg green
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#{@themepack-status-right-area-left-format} #[fg=white]« #[fg=yellow]#{@themepack-status-right-area-middle-format} #[fg=green]#{@themepack-status-right-area-right-format}"
+set -goq  @theme-status-right-bg black
+set -goq  @theme-status-right-fg cyan
+set -goq  @theme-status-right-length 40
+set -goq  @theme-window-status-activity-bg black
+set -goq  @theme-window-status-activity-fg yellow
+set -goq  @theme-window-status-current-bg red
+set -goq  @theme-window-status-current-fg black
+set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
+set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
+set -goq  @theme-window-status-separator ""
+
+#= include "_apply"
diff --git a/src/default.tmuxtheme b/src/default.tmuxtheme
new file mode 100644
index 0000000..8442312
--- /dev/null
+++ b/src/default.tmuxtheme
@@ -0,0 +1,44 @@
+#
+# Default Tmux Theme
+#
+
+# This theme matches Tmux's default style as closely as possible. It functions
+# as a template for creating new themes, and as a way to reset a running Tmux
+# server's style to it's defaults.
+
+# Theme options
+set -goq @theme-clock-mode-colour blue
+set -goq @theme-clock-mode-style 24
+set -goq @theme-display-panes-active-colour red
+set -goq @theme-display-panes-colour blue
+set -goq @theme-message-bg yellow
+set -goq @theme-message-command-bg green
+set -goq @theme-message-command-fg black
+set -goq @theme-message-fg black
+set -goq @theme-mode-bg yellow
+set -goq @theme-mode-fg black
+set -goq @theme-pane-active-border-bg default
+set -goq @theme-pane-active-border-fg green
+set -goq @theme-pane-border-bg default
+set -goq @theme-pane-border-fg white
+set -goq @theme-status-bg green
+set -goq @theme-status-fg black
+set -goq @theme-status-interval 15
+set -goq @theme-status-justify left
+set -goq @theme-status-left "[#S] "
+set -goq @theme-status-left-bg green
+set -goq @theme-status-left-fg black
+set -goq @theme-status-left-length 40
+set -goq @theme-status-right " \"#H\" %H:%M %d-%b-%y"
+set -goq @theme-status-right-bg green
+set -goq @theme-status-right-fg black
+set -goq @theme-status-right-length 40
+set -goq @theme-window-status-activity-bg black
+set -goq @theme-window-status-activity-fg green
+set -goq @theme-window-status-current-bg green
+set -goq @theme-window-status-current-fg black
+set -goq @theme-window-status-current-format "#I:#W#F"
+set -goq @theme-window-status-format "#I:#W#F"
+set -goq @theme-window-status-separator " "
+
+#= include "_apply"
diff --git a/src/powerline/_colors/base.tmuxsh b/src/powerline/_colors/base.tmuxsh
new file mode 100644
index 0000000..1c5dd66
--- /dev/null
+++ b/src/powerline/_colors/base.tmuxsh
@@ -0,0 +1,7 @@
+set -goq  @powerline-color-black-1 black
+set -goq  @powerline-color-grey-1 colour233
+set -goq  @powerline-color-grey-2 colour235
+set -goq  @powerline-color-grey-3 colour238
+set -goq  @powerline-color-grey-4 colour240
+set -goq  @powerline-color-grey-5 colour243
+set -goq  @powerline-color-grey-6 colour245
diff --git a/src/powerline/_colors/blue.tmuxsh b/src/powerline/_colors/blue.tmuxsh
new file mode 100644
index 0000000..a5be84a
--- /dev/null
+++ b/src/powerline/_colors/blue.tmuxsh
@@ -0,0 +1,3 @@
+set -goq  @powerline-color-main-1 colour24
+set -goq  @powerline-color-main-2 colour33
+set -goq  @powerline-color-main-3 colour31
diff --git a/src/powerline/_colors/cyan.tmuxsh b/src/powerline/_colors/cyan.tmuxsh
new file mode 100644
index 0000000..aeabe4e
--- /dev/null
+++ b/src/powerline/_colors/cyan.tmuxsh
@@ -0,0 +1,3 @@
+set -goq  @powerline-color-main-1 colour39
+set -goq  @powerline-color-main-2 colour81
+set -goq  @powerline-color-main-3 colour75
diff --git a/src/powerline/_colors/gray.tmuxsh b/src/powerline/_colors/gray.tmuxsh
new file mode 100644
index 0000000..349f181
--- /dev/null
+++ b/src/powerline/_colors/gray.tmuxsh
@@ -0,0 +1,3 @@
+set -goq  @powerline-color-main-1 colour245
+set -goq  @powerline-color-main-2 colour250
+set -goq  @powerline-color-main-3 colour245
diff --git a/src/powerline/_colors/green.tmuxsh b/src/powerline/_colors/green.tmuxsh
new file mode 100644
index 0000000..c0fe6ce
--- /dev/null
+++ b/src/powerline/_colors/green.tmuxsh
@@ -0,0 +1,3 @@
+set -goq  @powerline-color-main-1 colour100
+set -goq  @powerline-color-main-2 colour190
+set -goq  @powerline-color-main-3 colour107
diff --git a/src/powerline/_colors/magenta.tmuxsh b/src/powerline/_colors/magenta.tmuxsh
new file mode 100644
index 0000000..3f2c17d
--- /dev/null
+++ b/src/powerline/_colors/magenta.tmuxsh
@@ -0,0 +1,3 @@
+set -goq  @powerline-color-main-1 colour125
+set -goq  @powerline-color-main-2 colour127
+set -goq  @powerline-color-main-3 colour129
diff --git a/src/powerline/_colors/orange.tmuxsh b/src/powerline/_colors/orange.tmuxsh
new file mode 100644
index 0000000..43d8983
--- /dev/null
+++ b/src/powerline/_colors/orange.tmuxsh
@@ -0,0 +1,3 @@
+set -goq  @powerline-color-main-1 colour130
+set -goq  @powerline-color-main-2 colour166
+set -goq  @powerline-color-main-3 colour130
diff --git a/src/powerline/_colors/purple.tmuxsh b/src/powerline/_colors/purple.tmuxsh
new file mode 100644
index 0000000..8df5f64
--- /dev/null
+++ b/src/powerline/_colors/purple.tmuxsh
@@ -0,0 +1,3 @@
+set -goq  @powerline-color-main-1 colour90
+set -goq  @powerline-color-main-2 colour129
+set -goq  @powerline-color-main-3 colour141
diff --git a/src/powerline/_colors/red.tmuxsh b/src/powerline/_colors/red.tmuxsh
new file mode 100644
index 0000000..2542732
--- /dev/null
+++ b/src/powerline/_colors/red.tmuxsh
@@ -0,0 +1,3 @@
+set -goq  @powerline-color-main-1 colour88
+set -goq  @powerline-color-main-2 colour160
+set -goq  @powerline-color-main-3 colour124
diff --git a/src/powerline/_colors/yellow.tmuxsh b/src/powerline/_colors/yellow.tmuxsh
new file mode 100644
index 0000000..81192e4
--- /dev/null
+++ b/src/powerline/_colors/yellow.tmuxsh
@@ -0,0 +1,3 @@
+set -goq  @powerline-color-main-1 colour227
+set -goq  @powerline-color-main-2 colour227
+set -goq  @powerline-color-main-3 colour229
diff --git a/src/powerline/_formats.tmuxsh b/src/powerline/_formats.tmuxsh
new file mode 100644
index 0000000..a220936
--- /dev/null
+++ b/src/powerline/_formats.tmuxsh
@@ -0,0 +1,27 @@
+# Themepack format options - Overrideable
+set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-left-prefix ""
+set -goq @themepack-status-left-area-left-suffix ""
+set -goq @themepack-status-left-area-middle-format "#(whoami)"
+set -goq @themepack-status-left-area-middle-prefix ""
+set -goq @themepack-status-left-area-middle-suffix ""
+set -goq @themepack-status-left-area-right-format "#I:#P"
+set -goq @themepack-status-left-area-right-prefix ""
+set -goq @themepack-status-left-area-right-suffix ""
+set -goq @themepack-status-right-area-left-format "%H:%M:%S"
+set -goq @themepack-status-right-area-left-prefix ""
+set -goq @themepack-status-right-area-left-suffix ""
+set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
+set -goq @themepack-status-right-area-middle-prefix ""
+set -goq @themepack-status-right-area-middle-suffix ""
+set -goq @themepack-status-right-area-right-format "#H"
+set -goq @themepack-status-right-area-right-prefix ""
+set -goq @themepack-status-right-area-right-suffix ""
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-current-prefix ""
+set -goq @themepack-window-status-current-suffix ""
+set -goq @themepack-window-status-format "#I:#W#F"
+set -goq @themepack-window-status-prefix ""
+set -goq @themepack-window-status-suffix ""
+
+#= include "_formats_combine"
diff --git a/src/powerline/_info.tmuxsh b/src/powerline/_info.tmuxsh
new file mode 100644
index 0000000..2578b86
--- /dev/null
+++ b/src/powerline/_info.tmuxsh
@@ -0,0 +1,7 @@
+# https://github.com/jimeh/tmux-themepack
+#
+# Inspired by vim-powerline: https://github.com/powerline/powerline
+#
+# Requires terminal to be using a powerline compatible font, find one here:
+# https://github.com/powerline/fonts
+#
diff --git a/src/powerline/_powerline-options.tmuxsh b/src/powerline/_powerline-options.tmuxsh
new file mode 100644
index 0000000..1a94f41
--- /dev/null
+++ b/src/powerline/_powerline-options.tmuxsh
@@ -0,0 +1,20 @@
+# Powerline options
+set -goqF @powerline-color-activity-1 "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-fg "#{@powerline-color-grey-4}"
+set -goqF @powerline-status-left-area-left-bg "#{@powerline-color-main-1}"
+set -goqF @powerline-status-left-area-left-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-left-area-right-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-left-area-right-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-left-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-left-fg "#{@powerline-color-grey-5}"
+set -goqF @powerline-status-right-area-left-bg "#{@powerline-color-grey-2}"
+set -goqF @powerline-status-right-area-left-fg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-bg "#{@powerline-status-fg}"
+set -goqF @powerline-status-right-area-middle-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-grey-6}"
+set -goqF @powerline-status-right-area-right-fg "#{@powerline-status-bg}"
+set -goqF @powerline-status-right-bg "#{@powerline-color-grey-1}"
+set -goqF @powerline-status-right-fg "#{@powerline-color-grey-5}"
diff --git a/src/powerline/_theme-options.tmuxsh b/src/powerline/_theme-options.tmuxsh
new file mode 100644
index 0000000..3ff114a
--- /dev/null
+++ b/src/powerline/_theme-options.tmuxsh
@@ -0,0 +1,27 @@
+# Theme options
+set -goqF @theme-clock-mode-colour "#{@powerline-color-main-1}"
+set -goq  @theme-clock-mode-style 24
+set -goqF @theme-display-panes-active-colour "#{@powerline-color-grey-6}"
+set -goqF @theme-display-panes-colour "#{@powerline-color-grey-1}"
+set -goqF @theme-message-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-bg "#{@powerline-color-main-1}"
+set -goqF @theme-message-command-fg "#{@powerline-color-black-1}"
+set -goqF @theme-message-fg "#{@powerline-color-black-1}"
+set -goqF @theme-mode-bg "#{@powerline-color-main-1}"
+set -goqF @theme-mode-fg "#{@powerline-color-black-1}"
+set -goq  @theme-pane-active-border-bg default
+set -goqF @theme-pane-active-border-fg "#{@powerline-color-main-1}"
+set -goq  @theme-pane-border-bg default
+set -goqF @theme-pane-border-fg "#{@powerline-color-grey-3}"
+set -goqF @theme-status-bg "#{@powerline-status-bg}"
+set -goqF @theme-status-fg "#{@powerline-status-fg}"
+set -goq  @theme-status-interval 1
+set -goq  @theme-status-justify centre
+set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
+set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
+set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
+set -goq  @theme-status-left-length 40
+set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
+set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
+set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
+set -goq  @theme-status-right-length 150
diff --git a/src/powerline/_window-status-block.tmuxsh b/src/powerline/_window-status-block.tmuxsh
new file mode 100644
index 0000000..e3de21a
--- /dev/null
+++ b/src/powerline/_window-status-block.tmuxsh
@@ -0,0 +1,7 @@
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-main-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-black-1}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
+set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
diff --git a/src/powerline/_window-status-default.tmuxsh b/src/powerline/_window-status-default.tmuxsh
new file mode 100644
index 0000000..bebc2c3
--- /dev/null
+++ b/src/powerline/_window-status-default.tmuxsh
@@ -0,0 +1,7 @@
+set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
+set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
+set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
+set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
+set -goq  @theme-window-status-separator ""
+set -goqF @theme-window-status-format "  #{@themepack-window-status-format}  "
+set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"
diff --git a/src/powerline/block/_base.tmuxsh b/src/powerline/block/_base.tmuxsh
new file mode 100644
index 0000000..6369c20
--- /dev/null
+++ b/src/powerline/block/_base.tmuxsh
@@ -0,0 +1,11 @@
+#= include "powerline/_colors/base"
+
+# Powerline Block Override
+set -goqF @powerline-color-activity-1 "#{@powerline-color-main-3}"
+
+#= include "powerline/_powerline-options"
+
+#= include "powerline/_theme-options"
+#= include "powerline/_window-status-block"
+
+#= include "_apply"
diff --git a/src/powerline/block/blue.tmuxtheme b/src/powerline/block/blue.tmuxtheme
new file mode 100644
index 0000000..f3bf2f2
--- /dev/null
+++ b/src/powerline/block/blue.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Blue Block - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/blue"
+#= include "powerline/block/_base"
diff --git a/src/powerline/block/cyan.tmuxtheme b/src/powerline/block/cyan.tmuxtheme
new file mode 100644
index 0000000..9143fa6
--- /dev/null
+++ b/src/powerline/block/cyan.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Cyan Block - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/cyan"
+#= include "powerline/block/_base"
diff --git a/src/powerline/block/gray.tmuxtheme b/src/powerline/block/gray.tmuxtheme
new file mode 100644
index 0000000..c827caf
--- /dev/null
+++ b/src/powerline/block/gray.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Gray Block - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/gray"
+#= include "powerline/block/_base"
diff --git a/src/powerline/block/green.tmuxtheme b/src/powerline/block/green.tmuxtheme
new file mode 100644
index 0000000..784fbc5
--- /dev/null
+++ b/src/powerline/block/green.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Green Block - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/green"
+#= include "powerline/block/_base"
diff --git a/src/powerline/block/magenta.tmuxtheme b/src/powerline/block/magenta.tmuxtheme
new file mode 100644
index 0000000..a8b32cf
--- /dev/null
+++ b/src/powerline/block/magenta.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Magenta Block - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/magenta"
+#= include "powerline/block/_base"
diff --git a/src/powerline/block/orange.tmuxtheme b/src/powerline/block/orange.tmuxtheme
new file mode 100644
index 0000000..56b8bac
--- /dev/null
+++ b/src/powerline/block/orange.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Orange Block - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/orange"
+#= include "powerline/block/_base"
diff --git a/src/powerline/block/purple.tmuxtheme b/src/powerline/block/purple.tmuxtheme
new file mode 100644
index 0000000..1a8c314
--- /dev/null
+++ b/src/powerline/block/purple.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Purple Block - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/purple"
+#= include "powerline/block/_base"
diff --git a/src/powerline/block/red.tmuxtheme b/src/powerline/block/red.tmuxtheme
new file mode 100644
index 0000000..68c9f70
--- /dev/null
+++ b/src/powerline/block/red.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Red Block - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/red"
+#= include "powerline/block/_base"
diff --git a/src/powerline/block/yellow.tmuxtheme b/src/powerline/block/yellow.tmuxtheme
new file mode 100644
index 0000000..a0eb1d9
--- /dev/null
+++ b/src/powerline/block/yellow.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Yellow Block - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/yellow"
+#= include "powerline/block/_base"
diff --git a/src/powerline/default/_base.tmuxsh b/src/powerline/default/_base.tmuxsh
new file mode 100644
index 0000000..4da3f10
--- /dev/null
+++ b/src/powerline/default/_base.tmuxsh
@@ -0,0 +1,8 @@
+#= include "powerline/_colors/base"
+
+#= include "powerline/_powerline-options"
+
+#= include "powerline/_theme-options"
+#= include "powerline/_window-status-default"
+
+#= include "_apply"
diff --git a/src/powerline/default/blue.tmuxtheme b/src/powerline/default/blue.tmuxtheme
new file mode 100644
index 0000000..e7f6499
--- /dev/null
+++ b/src/powerline/default/blue.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Blue - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/blue"
+#= include "powerline/default/_base"
diff --git a/src/powerline/default/cyan.tmuxtheme b/src/powerline/default/cyan.tmuxtheme
new file mode 100644
index 0000000..9d29fdb
--- /dev/null
+++ b/src/powerline/default/cyan.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Cyan - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/cyan"
+#= include "powerline/default/_base"
diff --git a/src/powerline/default/gray.tmuxtheme b/src/powerline/default/gray.tmuxtheme
new file mode 100644
index 0000000..33ab1ff
--- /dev/null
+++ b/src/powerline/default/gray.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Gray - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/gray"
+#= include "powerline/default/_base"
diff --git a/src/powerline/default/green.tmuxtheme b/src/powerline/default/green.tmuxtheme
new file mode 100644
index 0000000..4ade04c
--- /dev/null
+++ b/src/powerline/default/green.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Green - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/green"
+#= include "powerline/default/_base"
diff --git a/src/powerline/default/magenta.tmuxtheme b/src/powerline/default/magenta.tmuxtheme
new file mode 100644
index 0000000..4d02e21
--- /dev/null
+++ b/src/powerline/default/magenta.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Magenta - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/magenta"
+#= include "powerline/default/_base"
diff --git a/src/powerline/default/orange.tmuxtheme b/src/powerline/default/orange.tmuxtheme
new file mode 100644
index 0000000..82b682d
--- /dev/null
+++ b/src/powerline/default/orange.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Orange - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/orange"
+#= include "powerline/default/_base"
diff --git a/src/powerline/default/purple.tmuxtheme b/src/powerline/default/purple.tmuxtheme
new file mode 100644
index 0000000..cd2dc47
--- /dev/null
+++ b/src/powerline/default/purple.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Purple - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/purple"
+#= include "powerline/default/_base"
diff --git a/src/powerline/default/red.tmuxtheme b/src/powerline/default/red.tmuxtheme
new file mode 100644
index 0000000..b1aa583
--- /dev/null
+++ b/src/powerline/default/red.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Red - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/red"
+#= include "powerline/default/_base"
diff --git a/src/powerline/default/yellow.tmuxtheme b/src/powerline/default/yellow.tmuxtheme
new file mode 100644
index 0000000..b655b6f
--- /dev/null
+++ b/src/powerline/default/yellow.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Yellow - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/yellow"
+#= include "powerline/default/_base"
diff --git a/src/powerline/double/_base.tmuxsh b/src/powerline/double/_base.tmuxsh
new file mode 100644
index 0000000..4d0de41
--- /dev/null
+++ b/src/powerline/double/_base.tmuxsh
@@ -0,0 +1,11 @@
+#= include "powerline/_colors/base"
+
+# Powerline Double Override
+set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-main-1}"
+
+#= include "powerline/_powerline-options"
+
+#= include "powerline/_theme-options"
+#= include "powerline/_window-status-default"
+
+#= include "_apply"
diff --git a/src/powerline/double/blue.tmuxtheme b/src/powerline/double/blue.tmuxtheme
new file mode 100644
index 0000000..9057837
--- /dev/null
+++ b/src/powerline/double/blue.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Double Blue - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/blue"
+#= include "powerline/double/_base"
diff --git a/src/powerline/double/cyan.tmuxtheme b/src/powerline/double/cyan.tmuxtheme
new file mode 100644
index 0000000..6610f17
--- /dev/null
+++ b/src/powerline/double/cyan.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Double Cyan - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/cyan"
+#= include "powerline/double/_base"
diff --git a/src/powerline/double/green.tmuxtheme b/src/powerline/double/green.tmuxtheme
new file mode 100644
index 0000000..9713c0f
--- /dev/null
+++ b/src/powerline/double/green.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Double Green - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/green"
+#= include "powerline/double/_base"
diff --git a/src/powerline/double/magenta.tmuxtheme b/src/powerline/double/magenta.tmuxtheme
new file mode 100644
index 0000000..3ecec4a
--- /dev/null
+++ b/src/powerline/double/magenta.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Double Magenta - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/magenta"
+#= include "powerline/double/_base"
diff --git a/src/powerline/double/orange.tmuxtheme b/src/powerline/double/orange.tmuxtheme
new file mode 100644
index 0000000..1ed13d1
--- /dev/null
+++ b/src/powerline/double/orange.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Double Orange - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/orange"
+#= include "powerline/double/_base"
diff --git a/src/powerline/double/purple.tmuxtheme b/src/powerline/double/purple.tmuxtheme
new file mode 100644
index 0000000..b141e64
--- /dev/null
+++ b/src/powerline/double/purple.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Double Purple - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/purple"
+#= include "powerline/double/_base"
diff --git a/src/powerline/double/red.tmuxtheme b/src/powerline/double/red.tmuxtheme
new file mode 100644
index 0000000..e08a779
--- /dev/null
+++ b/src/powerline/double/red.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Double Red - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/red"
+#= include "powerline/double/_base"
diff --git a/src/powerline/double/yellow.tmuxtheme b/src/powerline/double/yellow.tmuxtheme
new file mode 100644
index 0000000..27b0c4b
--- /dev/null
+++ b/src/powerline/double/yellow.tmuxtheme
@@ -0,0 +1,9 @@
+#
+# Powerline Double Yellow - Tmux Themepack
+#= include "powerline/_info"
+
+#= include "powerline/_formats"
+
+# Powerline color options
+#= include "powerline/_colors/yellow"
+#= include "powerline/double/_base"
diff --git a/test/basic_test.go b/test/basic_test.go
index 7f0f80a..d061c10 100644
--- a/test/basic_test.go
+++ b/test/basic_test.go
@@ -45,3 +45,34 @@ func TestBasicTheme(t *testing.T) {
 		"status-style":                "fg=cyan,bg=black",
 	})
 }
+
+func TestBasicCustomizability(t *testing.T) {
+	name := "basic"
+	filename := "../" + name + ".tmuxtheme"
+
+	tmuxSetup()
+
+	out, err := tm.Exec("source-file", "tmux-custom-overrides.conf")
+	assert.NoErrorf(t, err, `%s: Failed to load overrides: %s`, name, out)
+
+	out, err = tm.Exec("source-file", filename)
+	assert.NoErrorf(t, err, `%s: Failed to load theme: %s`, name, out)
+
+	opts, err := tm.GetOptions(tmux.GlobalSession)
+	assert.NoError(t, err)
+	assert.Contains(t, opts["status-left"], "LLP:LLF:LLS")
+	assert.Contains(t, opts["status-left"], "LMP:LMF:LMS")
+	assert.Contains(t, opts["status-left"], "LRP:LRF:LRS")
+	assert.Contains(t, opts["status-right"], "RLP:RLF:RLS")
+	assert.Contains(t, opts["status-right"], "RMP:RMF:RMS")
+	assert.Contains(t, opts["status-right"], "RRP:RRF:RRS")
+
+	opts, err = tm.GetOptions(tmux.GlobalWindow)
+	assert.NoError(t, err)
+	assert.Contains(t, opts["window-status-current-format"],
+		"WSCP:WSCF:WSCS")
+	assert.Contains(t, opts["window-status-format"],
+		"WSP:WSF:WSS")
+
+	tmuxTearDown()
+}
diff --git a/test/default_test.go b/test/default_test.go
index 73c397b..09a7dd9 100644
--- a/test/default_test.go
+++ b/test/default_test.go
@@ -35,10 +35,10 @@ func TestDefaultTheme(t *testing.T) {
 		"message-style":               "fg=black,bg=yellow",
 		"status-interval":             "15",
 		"status-justify":              "left",
-		"status-left":                 "[#S]",
-		"status-left-length":          "10",
+		"status-left":                 "[#S] ",
+		"status-left-length":          "40",
 		"status-left-style":           "fg=black,bg=green",
-		"status-right":                "\"#H\" %H:%M %d-%b-%y",
+		"status-right":                " \"#H\" %H:%M %d-%b-%y",
 		"status-right-length":         "40",
 		"status-right-style":          "fg=black,bg=green",
 		"status-style":                "fg=black,bg=green",
diff --git a/test/powerline_block_test.go b/test/powerline_block_test.go
index 423380d..98d6404 100644
--- a/test/powerline_block_test.go
+++ b/test/powerline_block_test.go
@@ -7,86 +7,53 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestPowerlineBlockThemes(t *testing.T) {
-	tests := []struct {
-		filename string
-		color1   string
-		color2   string
-	}{
-		{
-			filename: "../powerline/block/blue.tmuxtheme",
-			color1:   "colour24",
-			color2:   "colour31",
-		},
-		{
-			filename: "../powerline/block/cyan.tmuxtheme",
-			color1:   "colour39",
-			color2:   "colour75",
-		},
-		{
-			filename: "../powerline/block/gray.tmuxtheme",
-			color1:   "colour245",
-			color2:   "colour245",
-		},
-		{
-			filename: "../powerline/block/green.tmuxtheme",
-			color1:   "colour100",
-			color2:   "colour107",
-		},
-		{
-			filename: "../powerline/block/magenta.tmuxtheme",
-			color1:   "colour125",
-			color2:   "colour129",
-		},
-		{
-			filename: "../powerline/block/orange.tmuxtheme",
-			color1:   "colour130",
-			color2:   "colour130",
-		},
-		{
-			filename: "../powerline/block/purple.tmuxtheme",
-			color1:   "colour90",
-			color2:   "colour141",
-		},
-		{
-			filename: "../powerline/block/red.tmuxtheme",
-			color1:   "colour88",
-			color2:   "colour124",
-		},
-		{
-			filename: "../powerline/block/yellow.tmuxtheme",
-			color1:   "colour227",
-			color2:   "colour229",
-		},
-	}
+var powerlineBlockNames = []string{
+	"blue",
+	"cyan",
+	"gray",
+	"green",
+	"magenta",
+	"orange",
+	"purple",
+	"red",
+	"yellow",
+}
+
+func TestPowerlineBlockThemes(t *testing.T) {
+	for _, name := range powerlineBlockNames {
+		filename := "../powerline/block/" + name + ".tmuxtheme"
+		c := powerlineColors[name]
 
-	for _, tt := range tests {
 		tmuxSetup()
 
-		_, err := tm.Exec("source-file", tt.filename)
-		assert.NoErrorf(t, err, `%s: Failed to load theme`, tt.filename)
+		out, err := tm.Exec("source-file", filename)
+		assert.NoErrorf(t, err, `%s: Failed to load theme: %s`, filename, out)
 
-		tmuxHasOptions(t, tt.filename, tmux.GlobalWindow, tmux.Options{
-			"clock-mode-colour":            tt.color1,
+		if err != nil {
+			continue
+		}
+
+		tmuxHasOptions(t, filename, tmux.GlobalWindow, tmux.Options{
+			"clock-mode-colour":            c.color1,
 			"clock-mode-style":             "24",
-			"mode-style":                   "fg=black,bg=" + tt.color1,
-			"pane-active-border-style":     "fg=" + tt.color1,
+			"mode-style":                   "fg=black,bg=" + c.color1,
+			"pane-active-border-style":     "fg=" + c.color1,
 			"pane-border-style":            "fg=colour238",
-			"window-status-activity-style": "fg=" + tt.color2 + ",bg=colour233",
+			"window-status-activity-style": "fg=" + c.color3 + ",bg=colour233",
 			"window-status-current-format": " #I:#W#F ",
-			"window-status-current-style":  "fg=black,bg=" + tt.color1,
+			"window-status-current-style":  "fg=black,bg=" + c.color1,
 			"window-status-format":         " #I:#W#F ",
 			"window-status-separator":      "",
 		})
 
-		tmuxHasOptions(t, tt.filename, tmux.GlobalSession, tmux.Options{
+		tmuxHasOptions(t, filename, tmux.GlobalSession, tmux.Options{
 			"display-panes-active-colour": "colour245",
 			"display-panes-colour":        "colour233",
-			"message-command-style":       "fg=black,bg=" + tt.color1,
-			"message-style":               "fg=black,bg=" + tt.color1,
+			"message-command-style":       "fg=black,bg=" + c.color1,
+			"message-style":               "fg=black,bg=" + c.color1,
 			"status-interval":             "1",
 			"status-justify":              "centre",
-			"status-left":                 "#[fg=colour233,bg=" + tt.color1 + ",bold] #S #[fg=" + tt.color1 + ",bg=colour240,nobold]\ue0b0#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]\ue0b0#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]\ue0b0",
+			"status-left":                 "#[fg=colour233,bg=" + c.color1 + ",bold] #S #[fg=" + c.color1 + ",bg=colour240,nobold]\ue0b0#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]\ue0b0#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]\ue0b0",
 			"status-left-length":          "40",
 			"status-left-style":           "fg=colour243,bg=colour233",
 			"status-right":                "#[fg=colour235,bg=colour233]\ue0b2#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]\ue0b2#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]\ue0b2#[fg=colour233,bg=colour245,bold] #H ",
@@ -98,3 +65,34 @@ func TestPowerlineBlockThemes(t *testing.T) {
 		tmuxTearDown()
 	}
 }
+
+func TestPowerlineBlockCustomizability(t *testing.T) {
+	for _, name := range powerlineBlockNames {
+		filename := "../powerline/block/" + name + ".tmuxtheme"
+
+		tmuxSetup()
+
+		out, err := tm.Exec("source-file", "tmux-custom-overrides.conf")
+		assert.NoErrorf(t, err, `%s: Failed to load overrides: %s`, name, out)
+
+		out, err = tm.Exec("source-file", filename)
+		assert.NoErrorf(t, err, `%s: Failed to load theme: %s`, name, out)
+
+		opts, err := tm.GetOptions(tmux.GlobalSession)
+		assert.NoError(t, err)
+		assert.Contains(t, opts["status-left"], "LLP:LLF:LLS")
+		assert.Contains(t, opts["status-left"], "LMP:LMF:LMS")
+		assert.Contains(t, opts["status-left"], "LRP:LRF:LRS")
+		assert.Contains(t, opts["status-right"], "RLP:RLF:RLS")
+		assert.Contains(t, opts["status-right"], "RMP:RMF:RMS")
+		assert.Contains(t, opts["status-right"], "RRP:RRF:RRS")
+
+		opts, err = tm.GetOptions(tmux.GlobalWindow)
+		assert.NoError(t, err)
+		assert.Contains(t, opts["window-status-current-format"],
+			"WSCP:WSCF:WSCS")
+		assert.Contains(t, opts["window-status-format"], "WSP:WSF:WSS")
+
+		tmuxTearDown()
+	}
+}
diff --git a/test/powerline_default_test.go b/test/powerline_default_test.go
index 08acab6..7a70492 100644
--- a/test/powerline_default_test.go
+++ b/test/powerline_default_test.go
@@ -7,86 +7,53 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestPowerlineDefaultThemes(t *testing.T) {
-	tests := []struct {
-		filename string
-		color1   string
-		color2   string
-	}{
-		{
-			filename: "../powerline/default/blue.tmuxtheme",
-			color1:   "colour24",
-			color2:   "colour33",
-		},
-		{
-			filename: "../powerline/default/cyan.tmuxtheme",
-			color1:   "colour39",
-			color2:   "colour81",
-		},
-		{
-			filename: "../powerline/default/gray.tmuxtheme",
-			color1:   "colour245",
-			color2:   "colour250",
-		},
-		{
-			filename: "../powerline/default/green.tmuxtheme",
-			color1:   "colour100",
-			color2:   "colour190",
-		},
-		{
-			filename: "../powerline/default/magenta.tmuxtheme",
-			color1:   "colour125",
-			color2:   "colour127",
-		},
-		{
-			filename: "../powerline/default/orange.tmuxtheme",
-			color1:   "colour130",
-			color2:   "colour166",
-		},
-		{
-			filename: "../powerline/default/purple.tmuxtheme",
-			color1:   "colour90",
-			color2:   "colour129",
-		},
-		{
-			filename: "../powerline/default/red.tmuxtheme",
-			color1:   "colour88",
-			color2:   "colour160",
-		},
-		{
-			filename: "../powerline/default/yellow.tmuxtheme",
-			color1:   "colour227",
-			color2:   "colour227",
-		},
-	}
+var powerlineDefaultNames = []string{
+	"blue",
+	"cyan",
+	"gray",
+	"green",
+	"magenta",
+	"orange",
+	"purple",
+	"red",
+	"yellow",
+}
+
+func TestPowerlineDefaultThemes(t *testing.T) {
+	for _, name := range powerlineDefaultNames {
+		filename := "../powerline/default/" + name + ".tmuxtheme"
+		c := powerlineColors[name]
 
-	for _, tt := range tests {
 		tmuxSetup()
 
-		_, err := tm.Exec("source-file", tt.filename)
-		assert.NoErrorf(t, err, `%s: Failed to load theme`, tt.filename)
+		out, err := tm.Exec("source-file", filename)
+		assert.NoErrorf(t, err, `%s: Failed to load theme: %s`, name, out)
 
-		tmuxHasOptions(t, tt.filename, tmux.GlobalWindow, tmux.Options{
-			"clock-mode-colour":            tt.color1,
+		if err != nil {
+			continue
+		}
+
+		tmuxHasOptions(t, name, tmux.GlobalWindow, tmux.Options{
+			"clock-mode-colour":            c.color1,
 			"clock-mode-style":             "24",
-			"mode-style":                   "fg=black,bg=" + tt.color1,
-			"pane-active-border-style":     "fg=" + tt.color1,
+			"mode-style":                   "fg=black,bg=" + c.color1,
+			"pane-active-border-style":     "fg=" + c.color1,
 			"pane-border-style":            "fg=colour238",
 			"window-status-activity-style": "fg=colour245,bg=colour233",
-			"window-status-current-format": "#[fg=colour233,bg=black]\ue0b0#[fg=" + tt.color2 + ",nobold] #I:#W#F #[fg=colour233,bg=black,nobold]\ue0b2",
-			"window-status-current-style":  "fg=colour235,bg=colour100",
+			"window-status-current-format": "#[fg=colour233,bg=black]\ue0b0#[fg=" + c.color2 + ",nobold] #I:#W#F #[fg=colour233,bg=black,nobold]\ue0b2",
+			"window-status-current-style":  "fg=" + c.color2 + ",bg=black",
 			"window-status-format":         "  #I:#W#F  ",
 			"window-status-separator":      "",
 		})
 
-		tmuxHasOptions(t, tt.filename, tmux.GlobalSession, tmux.Options{
+		tmuxHasOptions(t, name, tmux.GlobalSession, tmux.Options{
 			"display-panes-active-colour": "colour245",
 			"display-panes-colour":        "colour233",
-			"message-command-style":       "fg=black,bg=" + tt.color1,
-			"message-style":               "fg=black,bg=" + tt.color1,
+			"message-command-style":       "fg=black,bg=" + c.color1,
+			"message-style":               "fg=black,bg=" + c.color1,
 			"status-interval":             "1",
 			"status-justify":              "centre",
-			"status-left":                 "#[fg=colour233,bg=" + tt.color1 + ",bold] #S #[fg=" + tt.color1 + ",bg=colour240,nobold]\ue0b0#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]\ue0b0#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]\ue0b0",
+			"status-left":                 "#[fg=colour233,bg=" + c.color1 + ",bold] #S #[fg=" + c.color1 + ",bg=colour240,nobold]\ue0b0#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]\ue0b0#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]\ue0b0",
 			"status-left-length":          "40",
 			"status-left-style":           "fg=colour243,bg=colour233",
 			"status-right":                "#[fg=colour235,bg=colour233]\ue0b2#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]\ue0b2#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]\ue0b2#[fg=colour233,bg=colour245,bold] #H ",
@@ -98,3 +65,34 @@ func TestPowerlineDefaultThemes(t *testing.T) {
 		tmuxTearDown()
 	}
 }
+
+func TestPowerlineDefaultCustomizability(t *testing.T) {
+	for _, name := range powerlineDefaultNames {
+		filename := "../powerline/default/" + name + ".tmuxtheme"
+
+		tmuxSetup()
+
+		out, err := tm.Exec("source-file", "tmux-custom-overrides.conf")
+		assert.NoErrorf(t, err, `%s: Failed to load overrides: %s`, name, out)
+
+		out, err = tm.Exec("source-file", filename)
+		assert.NoErrorf(t, err, `%s: Failed to load theme: %s`, name, out)
+
+		opts, err := tm.GetOptions(tmux.GlobalSession)
+		assert.NoError(t, err)
+		assert.Contains(t, opts["status-left"], "LLP:LLF:LLS")
+		assert.Contains(t, opts["status-left"], "LMP:LMF:LMS")
+		assert.Contains(t, opts["status-left"], "LRP:LRF:LRS")
+		assert.Contains(t, opts["status-right"], "RLP:RLF:RLS")
+		assert.Contains(t, opts["status-right"], "RMP:RMF:RMS")
+		assert.Contains(t, opts["status-right"], "RRP:RRF:RRS")
+
+		opts, err = tm.GetOptions(tmux.GlobalWindow)
+		assert.NoError(t, err)
+		assert.Contains(t, opts["window-status-current-format"],
+			"WSCP:WSCF:WSCS")
+		assert.Contains(t, opts["window-status-format"], "WSP:WSF:WSS")
+
+		tmuxTearDown()
+	}
+}
diff --git a/test/powerline_double_test.go b/test/powerline_double_test.go
index 69849fa..fdfea8d 100644
--- a/test/powerline_double_test.go
+++ b/test/powerline_double_test.go
@@ -7,84 +7,55 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestPowerlineDoubleThemes(t *testing.T) {
-	tests := []struct {
-		filename string
-		color1   string
-		color2   string
-	}{
-		{
-			filename: "../powerline/double/blue.tmuxtheme",
-			color1:   "colour24",
-			color2:   "colour33",
-		},
-		{
-			filename: "../powerline/double/cyan.tmuxtheme",
-			color1:   "colour39",
-			color2:   "colour81",
-		},
-		{
-			filename: "../powerline/double/green.tmuxtheme",
-			color1:   "colour100",
-			color2:   "colour190",
-		},
-		{
-			filename: "../powerline/double/magenta.tmuxtheme",
-			color1:   "colour125",
-			color2:   "colour127",
-		},
-		{
-			filename: "../powerline/double/orange.tmuxtheme",
-			color1:   "colour130",
-			color2:   "colour166",
-		},
-		{
-			filename: "../powerline/double/purple.tmuxtheme",
-			color1:   "colour90",
-			color2:   "colour129",
-		},
-		{
-			filename: "../powerline/double/red.tmuxtheme",
-			color1:   "colour88",
-			color2:   "colour160",
-		},
-		{
-			filename: "../powerline/double/yellow.tmuxtheme",
-			color1:   "colour227",
-			color2:   "colour227",
-		},
-	}
+var powerlineDoubleNames = []string{
+	"blue",
+	"cyan",
+	"green",
+	"magenta",
+	"orange",
+	"purple",
+	"red",
+	"yellow",
+}
+
+func TestPowerlineDoubleThemes(t *testing.T) {
+	for _, name := range powerlineDoubleNames {
+		filename := "../powerline/double/" + name + ".tmuxtheme"
+		c := powerlineColors[name]
 
-	for _, tt := range tests {
 		tmuxSetup()
 
-		_, err := tm.Exec("source-file", tt.filename)
-		assert.NoErrorf(t, err, `%s: Failed to load theme`, tt.filename)
+		out, err := tm.Exec("source-file", filename)
+		assert.NoErrorf(t, err, `%s: Failed to load theme: %s`, filename, out)
 
-		tmuxHasOptions(t, tt.filename, tmux.GlobalWindow, tmux.Options{
-			"clock-mode-colour":            tt.color1,
+		if err != nil {
+			continue
+		}
+
+		tmuxHasOptions(t, filename, tmux.GlobalWindow, tmux.Options{
+			"clock-mode-colour":            c.color1,
 			"clock-mode-style":             "24",
-			"mode-style":                   "fg=black,bg=" + tt.color1,
-			"pane-active-border-style":     "fg=" + tt.color1,
+			"mode-style":                   "fg=black,bg=" + c.color1,
+			"pane-active-border-style":     "fg=" + c.color1,
 			"pane-border-style":            "fg=colour238",
 			"window-status-activity-style": "fg=colour245,bg=colour233",
-			"window-status-current-format": "#[fg=colour233,bg=black]\ue0b0#[fg=" + tt.color2 + ",nobold] #I:#W#F #[fg=colour233,bg=black,nobold]\ue0b2",
-			"window-status-current-style":  "fg=colour235,bg=colour100",
+			"window-status-current-format": "#[fg=colour233,bg=black]\ue0b0#[fg=" + c.color2 + ",nobold] #I:#W#F #[fg=colour233,bg=black,nobold]\ue0b2",
+			"window-status-current-style":  "fg=" + c.color2 + ",bg=black",
 			"window-status-format":         "  #I:#W#F  ",
 			"window-status-separator":      "",
 		})
 
-		tmuxHasOptions(t, tt.filename, tmux.GlobalSession, tmux.Options{
+		tmuxHasOptions(t, filename, tmux.GlobalSession, tmux.Options{
 			"display-panes-active-colour": "colour245",
 			"display-panes-colour":        "colour233",
-			"message-command-style":       "fg=black,bg=" + tt.color1,
-			"message-style":               "fg=black,bg=" + tt.color1,
+			"message-command-style":       "fg=black,bg=" + c.color1,
+			"message-style":               "fg=black,bg=" + c.color1,
 			"status-interval":             "1",
 			"status-justify":              "centre",
-			"status-left":                 "#[fg=colour233,bg=" + tt.color1 + ",bold] #S #[fg=" + tt.color1 + ",bg=colour240,nobold]\ue0b0#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]\ue0b0#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]\ue0b0",
+			"status-left":                 "#[fg=colour233,bg=" + c.color1 + ",bold] #S #[fg=" + c.color1 + ",bg=colour240,nobold]\ue0b0#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]\ue0b0#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]\ue0b0",
 			"status-left-length":          "40",
 			"status-left-style":           "fg=colour243,bg=colour233",
-			"status-right":                "#[fg=colour235,bg=colour233]\ue0b2#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]\ue0b2#[fg=colour233,bg=colour240] %d-%b-%y #[fg=" + tt.color1 + ",bg=colour240]\ue0b2#[fg=colour233,bg=" + tt.color1 + ",bold] #H ",
+			"status-right":                "#[fg=colour235,bg=colour233]\ue0b2#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]\ue0b2#[fg=colour233,bg=colour240] %d-%b-%y #[fg=" + c.color1 + ",bg=colour240]\ue0b2#[fg=colour233,bg=" + c.color1 + ",bold] #H ",
 			"status-right-length":         "150",
 			"status-right-style":          "fg=colour243,bg=colour233",
 			"status-style":                "fg=colour240,bg=colour233",
@@ -93,3 +64,34 @@ func TestPowerlineDoubleThemes(t *testing.T) {
 		tmuxTearDown()
 	}
 }
+
+func TestPowerlineDoubleCustomizability(t *testing.T) {
+	for _, name := range powerlineDoubleNames {
+		filename := "../powerline/double/" + name + ".tmuxtheme"
+
+		tmuxSetup()
+
+		out, err := tm.Exec("source-file", "tmux-custom-overrides.conf")
+		assert.NoErrorf(t, err, `%s: Failed to load overrides: %s`, name, out)
+
+		out, err = tm.Exec("source-file", filename)
+		assert.NoErrorf(t, err, `%s: Failed to load theme: %s`, name, out)
+
+		opts, err := tm.GetOptions(tmux.GlobalSession)
+		assert.NoError(t, err)
+		assert.Contains(t, opts["status-left"], "LLP:LLF:LLS")
+		assert.Contains(t, opts["status-left"], "LMP:LMF:LMS")
+		assert.Contains(t, opts["status-left"], "LRP:LRF:LRS")
+		assert.Contains(t, opts["status-right"], "RLP:RLF:RLS")
+		assert.Contains(t, opts["status-right"], "RMP:RMF:RMS")
+		assert.Contains(t, opts["status-right"], "RRP:RRF:RRS")
+
+		opts, err = tm.GetOptions(tmux.GlobalWindow)
+		assert.NoError(t, err)
+		assert.Contains(t, opts["window-status-current-format"],
+			"WSCP:WSCF:WSCS")
+		assert.Contains(t, opts["window-status-format"], "WSP:WSF:WSS")
+
+		tmuxTearDown()
+	}
+}
diff --git a/test/powerline_test.go b/test/powerline_test.go
new file mode 100644
index 0000000..88a9442
--- /dev/null
+++ b/test/powerline_test.go
@@ -0,0 +1,54 @@
+package test
+
+var powerlineColors = map[string]struct {
+	filename string
+	color1   string
+	color2   string
+	color3   string
+}{
+	"blue": {
+		color1: "colour24",
+		color2: "colour33",
+		color3: "colour31",
+	},
+	"cyan": {
+		color1: "colour39",
+		color2: "colour81",
+		color3: "colour75",
+	},
+	"gray": {
+		color1: "colour245",
+		color2: "colour250",
+		color3: "colour245",
+	},
+	"green": {
+		color1: "colour100",
+		color2: "colour190",
+		color3: "colour107",
+	},
+	"magenta": {
+		color1: "colour125",
+		color2: "colour127",
+		color3: "colour129",
+	},
+	"orange": {
+		color1: "colour130",
+		color2: "colour166",
+		color3: "colour130",
+	},
+	"purple": {
+		color1: "colour90",
+		color2: "colour129",
+		color3: "colour141",
+	},
+	"red": {
+		color1: "colour88",
+		color2: "colour160",
+		color3: "colour124",
+	},
+	"yellow": {
+		color1: "colour227",
+		color2: "colour227",
+		color3: "colour229",
+	},
+}
diff --git a/test/setup_test.go b/test/setup_test.go
index 43a4aed..886ac2a 100644
--- a/test/setup_test.go
+++ b/test/setup_test.go
@@ -51,12 +51,9 @@ func tmuxHasOptions(t *testing.T, theme string, s tmux.Scope, m tmux.Options) {
 	if err == nil {
 		for k, v := range m {
 			_, ok := opts[k]
-			assert.Truef(t, ok, `%s: Key "%s" is not available`, theme, k)
+			assert.Truef(t, ok, `Key "%s" is not available in %s`, k, theme)
 			if ok {
-				assert.Equalf(t,
-					v, opts[k],
-					`%s: Key "%s" is not "%s"`, theme, k, v,
-				)
+				assert.Equalf(t, v, opts[k], `Key "%s" in "%s"`, k, theme)
 			}
 		}
 	}
diff --git a/test/tmux-custom-overrides.conf b/test/tmux-custom-overrides.conf
new file mode 100644
index 0000000..f37a2af
--- /dev/null
+++ b/test/tmux-custom-overrides.conf
@@ -0,0 +1,24 @@
+set -g @themepack-status-left-area-left-format ":LLF:"
+set -g @themepack-status-left-area-left-prefix "LLP"
+set -g @themepack-status-left-area-left-suffix "LLS"
+set -g @themepack-status-left-area-middle-format ":LMF:"
+set -g @themepack-status-left-area-middle-prefix "LMP"
+set -g @themepack-status-left-area-middle-suffix "LMS"
+set -g @themepack-status-left-area-right-format ":LRF:"
+set -g @themepack-status-left-area-right-prefix "LRP"
+set -g @themepack-status-left-area-right-suffix "LRS"
+set -g @themepack-status-right-area-left-format ":RLF:"
+set -g @themepack-status-right-area-left-prefix "RLP"
+set -g @themepack-status-right-area-left-suffix "RLS"
+set -g @themepack-status-right-area-middle-format ":RMF:"
+set -g @themepack-status-right-area-middle-prefix "RMP"
+set -g @themepack-status-right-area-middle-suffix "RMS"
+set -g @themepack-status-right-area-right-format ":RRF:"
+set -g @themepack-status-right-area-right-prefix "RRP"
+set -g @themepack-status-right-area-right-suffix "RRS"
+set -g @themepack-window-status-current-format ":WSCF:"
+set -g @themepack-window-status-current-prefix "WSCP"
+set -g @themepack-window-status-current-suffix "WSCS"
+set -g @themepack-window-status-format ":WSF:"
+set -g @themepack-window-status-prefix "WSP"
+set -g @themepack-window-status-suffix "WSS"
diff --git a/themepack.tmux b/themepack.tmux
index dd2a455..c1a1889 100755
--- a/themepack.tmux
+++ b/themepack.tmux
@@ -2,23 +2,23 @@
 
 CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-theme_option="@themepack"
-default_theme='basic'
+get-tmux-option() {
+  local option value default
+  option="$1"
+  default="$2"
+  value="$(tmux show-option -gqv "$option")"
 
-get_tmux_option() {
-  local option="$1"
-  local default_value="$2"
-  local option_value="$(tmux show-option -gqv "$option")"
-
-  if [ -n "$option_value" ]; then
-    echo "$option_value"
+  if [ -n "$value" ]; then
+    echo "$value"
   else
-    echo "$default_value"
+    echo "$default"
   fi
 }
 
 main() {
-  local theme="$(get_tmux_option "$theme_option" "$default_theme")"
+  local theme
+  theme="$(get-tmux-option "@themepack" "basic")"
+
   if [ -f "$CURRENT_DIR/${theme}.tmuxtheme" ]; then
     tmux source-file "$CURRENT_DIR/${theme}.tmuxtheme"
   else
@@ -26,4 +26,4 @@ main() {
   fi
 }
 
-main
+main "$@"