diff --git a/Makefile b/Makefile
index edef593..7052677 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ lint:
 
 .PHONY: test
 test: needs-build
-	cd test && go test -v ./...
+	cd test && go test -count=1 -v ./...
 
 .PHONY: needs-build
 needs-build:
diff --git a/basic.tmuxtheme b/basic.tmuxtheme
index 30a2575..d89d06a 100644
--- a/basic.tmuxtheme
+++ b/basic.tmuxtheme
@@ -2,15 +2,41 @@
 # Basic theme
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Theme options
 set -goq  @theme-clock-mode-colour red
diff --git a/powerline/block/blue.tmuxtheme b/powerline/block/blue.tmuxtheme
index c44479c..398eaf4 100644
--- a/powerline/block/blue.tmuxtheme
+++ b/powerline/block/blue.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour24
diff --git a/powerline/block/cyan.tmuxtheme b/powerline/block/cyan.tmuxtheme
index efc53ba..c2493f0 100644
--- a/powerline/block/cyan.tmuxtheme
+++ b/powerline/block/cyan.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour39
diff --git a/powerline/block/gray.tmuxtheme b/powerline/block/gray.tmuxtheme
index ca795ee..5055f93 100644
--- a/powerline/block/gray.tmuxtheme
+++ b/powerline/block/gray.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour245
diff --git a/powerline/block/green.tmuxtheme b/powerline/block/green.tmuxtheme
index 4085010..bac0704 100644
--- a/powerline/block/green.tmuxtheme
+++ b/powerline/block/green.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour100
diff --git a/powerline/block/magenta.tmuxtheme b/powerline/block/magenta.tmuxtheme
index a5aaebc..36a49ed 100644
--- a/powerline/block/magenta.tmuxtheme
+++ b/powerline/block/magenta.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour125
diff --git a/powerline/block/orange.tmuxtheme b/powerline/block/orange.tmuxtheme
index 1399368..78fe383 100644
--- a/powerline/block/orange.tmuxtheme
+++ b/powerline/block/orange.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour130
diff --git a/powerline/block/purple.tmuxtheme b/powerline/block/purple.tmuxtheme
index fe603a6..12a07b5 100644
--- a/powerline/block/purple.tmuxtheme
+++ b/powerline/block/purple.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour90
diff --git a/powerline/block/red.tmuxtheme b/powerline/block/red.tmuxtheme
index 187259f..155ca0c 100644
--- a/powerline/block/red.tmuxtheme
+++ b/powerline/block/red.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour88
diff --git a/powerline/block/yellow.tmuxtheme b/powerline/block/yellow.tmuxtheme
index 91276d4..c811f63 100644
--- a/powerline/block/yellow.tmuxtheme
+++ b/powerline/block/yellow.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour227
diff --git a/powerline/default/blue.tmuxtheme b/powerline/default/blue.tmuxtheme
index faa327b..ecadc44 100644
--- a/powerline/default/blue.tmuxtheme
+++ b/powerline/default/blue.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour24
diff --git a/powerline/default/cyan.tmuxtheme b/powerline/default/cyan.tmuxtheme
index b0d0e79..39b42fe 100644
--- a/powerline/default/cyan.tmuxtheme
+++ b/powerline/default/cyan.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour39
diff --git a/powerline/default/gray.tmuxtheme b/powerline/default/gray.tmuxtheme
index 5e0f7ea..4494afb 100644
--- a/powerline/default/gray.tmuxtheme
+++ b/powerline/default/gray.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour245
diff --git a/powerline/default/green.tmuxtheme b/powerline/default/green.tmuxtheme
index 81ecaa3..f88ef43 100644
--- a/powerline/default/green.tmuxtheme
+++ b/powerline/default/green.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour100
diff --git a/powerline/default/magenta.tmuxtheme b/powerline/default/magenta.tmuxtheme
index a784c01..e051de1 100644
--- a/powerline/default/magenta.tmuxtheme
+++ b/powerline/default/magenta.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour125
diff --git a/powerline/default/orange.tmuxtheme b/powerline/default/orange.tmuxtheme
index 569d41c..1b10f36 100644
--- a/powerline/default/orange.tmuxtheme
+++ b/powerline/default/orange.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour130
diff --git a/powerline/default/purple.tmuxtheme b/powerline/default/purple.tmuxtheme
index 6db0b49..b184f1c 100644
--- a/powerline/default/purple.tmuxtheme
+++ b/powerline/default/purple.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour90
diff --git a/powerline/default/red.tmuxtheme b/powerline/default/red.tmuxtheme
index a94fa60..1bb0633 100644
--- a/powerline/default/red.tmuxtheme
+++ b/powerline/default/red.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour88
diff --git a/powerline/default/yellow.tmuxtheme b/powerline/default/yellow.tmuxtheme
index a89dce5..f087ebd 100644
--- a/powerline/default/yellow.tmuxtheme
+++ b/powerline/default/yellow.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour227
diff --git a/powerline/double/blue.tmuxtheme b/powerline/double/blue.tmuxtheme
index 71bc690..d396c0e 100644
--- a/powerline/double/blue.tmuxtheme
+++ b/powerline/double/blue.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour24
diff --git a/powerline/double/cyan.tmuxtheme b/powerline/double/cyan.tmuxtheme
index 246b8d0..476ea33 100644
--- a/powerline/double/cyan.tmuxtheme
+++ b/powerline/double/cyan.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour39
diff --git a/powerline/double/green.tmuxtheme b/powerline/double/green.tmuxtheme
index 3c88b72..822a359 100644
--- a/powerline/double/green.tmuxtheme
+++ b/powerline/double/green.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour100
diff --git a/powerline/double/magenta.tmuxtheme b/powerline/double/magenta.tmuxtheme
index 3ea37c8..0c30fc0 100644
--- a/powerline/double/magenta.tmuxtheme
+++ b/powerline/double/magenta.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour125
diff --git a/powerline/double/orange.tmuxtheme b/powerline/double/orange.tmuxtheme
index 2c551dd..355f970 100644
--- a/powerline/double/orange.tmuxtheme
+++ b/powerline/double/orange.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour130
diff --git a/powerline/double/purple.tmuxtheme b/powerline/double/purple.tmuxtheme
index 13b2e33..451e75e 100644
--- a/powerline/double/purple.tmuxtheme
+++ b/powerline/double/purple.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour90
diff --git a/powerline/double/red.tmuxtheme b/powerline/double/red.tmuxtheme
index 4beae3a..aefb126 100644
--- a/powerline/double/red.tmuxtheme
+++ b/powerline/double/red.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour88
diff --git a/powerline/double/yellow.tmuxtheme b/powerline/double/yellow.tmuxtheme
index bd38df9..b14aa8f 100644
--- a/powerline/double/yellow.tmuxtheme
+++ b/powerline/double/yellow.tmuxtheme
@@ -8,15 +8,41 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options
+# 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 ""
+
+# 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}"
 
 # Powerline color options
 set -goq  @powerline-color-main-1 colour227
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
index f56ecdd..3dd3139 100644
--- a/src/basic.tmuxtheme
+++ b/src/basic.tmuxtheme
@@ -2,15 +2,33 @@
 # Basic theme
 #
 
-# Themepack format options
+# 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
diff --git a/src/powerline/_formats.tmuxsh b/src/powerline/_formats.tmuxsh
index 3ca36b6..a220936 100644
--- a/src/powerline/_formats.tmuxsh
+++ b/src/powerline/_formats.tmuxsh
@@ -1,9 +1,27 @@
-# Themepack format options
+# 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/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/powerline_block_test.go b/test/powerline_block_test.go
index 3250b58..98d6404 100644
--- a/test/powerline_block_test.go
+++ b/test/powerline_block_test.go
@@ -7,87 +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()
 
-		out, err := tm.Exec("source-file", tt.filename)
-		assert.NoErrorf(t, err,
-			`%s: Failed to load theme: %s`, tt.filename, out)
+		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 ",
@@ -99,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 2998da2..7a70492 100644
--- a/test/powerline_default_test.go
+++ b/test/powerline_default_test.go
@@ -7,87 +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()
 
-		out, err := tm.Exec("source-file", tt.filename)
-		assert.NoErrorf(t, err,
-			`%s: Failed to load theme: %s`, tt.filename, out)
+		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=" + tt.color2 + ",bg=black",
+			"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 ",
@@ -99,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 132c806..fdfea8d 100644
--- a/test/powerline_double_test.go
+++ b/test/powerline_double_test.go
@@ -7,85 +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()
 
-		out, err := tm.Exec("source-file", tt.filename)
-		assert.NoErrorf(t, err,
-			`%s: Failed to load theme: %s`, tt.filename, out)
+		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=" + tt.color2 + ",bg=black",
+			"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",
@@ -94,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 bfec97b..886ac2a 100644
--- a/test/setup_test.go
+++ b/test/setup_test.go
@@ -53,10 +53,7 @@ func tmuxHasOptions(t *testing.T, theme string, s tmux.Scope, m tmux.Options) {
 			_, ok := opts[k]
 			assert.Truef(t, ok, `Key "%s" is not available in %s`, k, theme)
 			if ok {
-				assert.Equalf(t,
-					v, opts[k],
-					`Key "%s" in "%s"`, k, theme,
-				)
+				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"