Merge branch 'master' into patch-1

README.md

@@ -25,10 +25,11 @@ A pack of various themes for Tmux.
 
 You can pick and choose a theme via `.tmux.conf` option:
 
-- `set -g @themepack 'block/blue'` (default)
-- `set -g @themepack 'block/cyan'`
-- `set -g @themepack 'default/gray'`
-- `set -g @themepack 'double/magenta'`
+- `set -g @themepack 'basic'` (default)
+- `set -g @themepack 'powerline/block/blue'`
+- `set -g @themepack 'powerline/block/cyan'`
+- `set -g @themepack 'powerline/default/gray'`
+- `set -g @themepack 'powerline/double/magenta'`
 - `...`
 
 ## Themes

powerline/block/gray.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour245
 set -g window-status-current-fg colour232
 
 # Window with activity status
-set -g window-status-activity-bg colour243 # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

powerline/block/magenta.tmuxtheme

@@ -32,7 +32,7 @@ set -g window-status-format " #I:#W#F "
 set -g window-status-current-format " #I:#W#F "
 
 # Current window status
-set -g window-status-current-bg colour89
+set -g window-status-current-bg colour90
 set -g window-status-current-fg colour232
 
 # Window with activity status
@@ -51,18 +51,18 @@ set -g pane-border-fg colour238
 
 # Active pane border
 set -g pane-active-border-bg default
-set -g pane-active-border-fg colour89
+set -g pane-active-border-fg colour90
 
 # Pane number indicator
 set -g display-panes-colour colour233
 set -g display-panes-active-colour colour245
 
 # Clock mode
-set -g clock-mode-colour colour89
+set -g clock-mode-colour colour90
 set -g clock-mode-style 24
 
 # Message
-set -g message-bg colour89
+set -g message-bg colour90
 set -g message-fg black
 
 # Command message

powerline/default/blue.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour100
 set -g window-status-current-fg colour235
 
 # Window with activity status
-set -g window-status-activity-bg colour31  # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

powerline/default/cyan.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour39
 set -g window-status-current-fg colour235
 
 # Window with activity status
-set -g window-status-activity-bg colour75 # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

powerline/default/green.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour100
 set -g window-status-current-fg colour235
 
 # Window with activity status
-set -g window-status-activity-bg colour107 # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

powerline/default/magenta.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour125
 set -g window-status-current-fg colour235
 
 # Window with activity status
-set -g window-status-activity-bg colour141 # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

powerline/default/orange.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour130
 set -g window-status-current-fg colour235
 
 # Window with activity status
-set -g window-status-activity-bg colour130 # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

powerline/default/red.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour88
 set -g window-status-current-fg colour16
 
 # Window with activity status
-set -g window-status-activity-bg colour88  # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

powerline/default/yellow.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour227
 set -g window-status-current-fg colour235
 
 # Window with activity status
-set -g window-status-activity-bg colour229 # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

powerline/double/blue.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour24
 set -g window-status-current-fg colour233
 
 # Window with activity status
-set -g window-status-activity-bg colour31  # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

powerline/double/cyan.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour39
 set -g window-status-current-fg colour235
 
 # Window with activity status
-set -g window-status-activity-bg colour75 # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

powerline/double/green.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour100
 set -g window-status-current-fg colour235
 
 # Window with activity status
-set -g window-status-activity-bg colour107 # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

powerline/double/magenta.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour125
 set -g window-status-current-fg colour235
 
 # Window with activity status
-set -g window-status-activity-bg colour141 # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

powerline/double/orange.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour130
 set -g window-status-current-fg colour235
 
 # Window with activity status
-set -g window-status-activity-bg colour130 # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

powerline/double/red.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour88
 set -g window-status-current-fg colour16
 
 # Window with activity status
-set -g window-status-activity-bg colour88  # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

powerline/double/yellow.tmuxtheme

@@ -36,7 +36,7 @@ set -g window-status-current-bg colour227
 set -g window-status-current-fg colour235
 
 # Window with activity status
-set -g window-status-activity-bg colour229 # fg and bg are flipped here due to
+set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
 set -g window-status-activity-fg colour233 # a bug in tmux
 
 # Window separator

themepack.tmux

@@ -3,21 +3,27 @@
 CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 theme_option="@themepack"
-default_theme='block/blue'
+default_theme='basic'
 
 get_tmux_option() {
-	local option="$1"
-	local default_value="$2"
-	local option_value="$(tmux show-option -gqv "$option")"
-	if [ -z "$option_value" ]; then
-		echo "$default_value"
-	else
-		echo "$option_value"
-	fi
+  local option="$1"
+  local default_value="$2"
+  local option_value="$(tmux show-option -gqv "$option")"
+
+  if [ -n "$option_value" ]; then
+    echo "$option_value"
+  else
+    echo "$default_value"
+  fi
 }
 
 main() {
-	local theme="$(get_tmux_option "$theme_option" "$default_theme")"
-	tmux source-file "$CURRENT_DIR/powerline/${theme}.tmuxtheme"
+  local theme="$(get_tmux_option "$theme_option" "$default_theme")"
+  if [ -f "$CURRENT_DIR/${theme}.tmuxtheme" ]; then
+    tmux source-file "$CURRENT_DIR/${theme}.tmuxtheme"
+  else
+    tmux source-file "$CURRENT_DIR/powerline/${theme}.tmuxtheme"
+  fi
 }
+
 main