diff --git a/sh/tmux.sh b/sh/tmux.sh
index 0f1259d..5c00230 100644
--- a/sh/tmux.sh
+++ b/sh/tmux.sh
@@ -164,6 +164,13 @@ rwx_tmux_item_pane() {
 		"#{?pane_active,${RWX_TMUX_ACTIVE_FOREGROUND},${RWX_TMUX_ITEM_FOREGROUND}}"
 }
 
+rwx_tmux_item_session() {
+	rwx_tmux_item \
+		"#{session_name}" \
+		"#{?session_many_attached,${RWX_TMUX_SESSION_MANY},\
+#{?session_attached,${RWX_TMUX_SESSION_ONE},${RWX_TMUX_ITEM_FOREGROUND}}}"
+}
+
 rwx_tmux_item_user() {
 	rwx_tmux_item \
 		"#{user}" \
@@ -176,16 +183,6 @@ rwx_tmux_item_script() {
 	echo "#(sh -c \". ${script}; rwx_tmux_${name}\")"
 }
 
-rwx_tmux_item_session() {
-	printf "%s" "\
-#{?session_many_attached,${RWX_TMUX_SESSION_MANY},\
-#{?session_attached,${RWX_TMUX_SESSION_ONE},${RWX_TMUX_ITEM_FOREGROUND}}}\
-${RWX_TMUX_BORDER_BACKGROUND} \
-${RWX_TMUX_ITEM_BACKGROUND}#{session_name}\
-${RWX_TMUX_BORDER_BACKGROUND} \
-"
-}
-
 rwx_tmux_item_title() {
 	printf "%s" "\
 ${server}\
@@ -204,7 +201,7 @@ ${RWX_TMUX_TITLE_PATH}\
 
 rwx_tmux_item_window() {
 	printf "%s" "\
-#{?window_active,#[fg=green],\
+#{?window_active,${RWX_TMUX_ACTIVE_FOREGROUND},\
 #{?window_activity_flag,#[fg=red],${RWX_TMUX_ITEM_FOREGROUND}}}\
 \
 ${RWX_TMUX_BORDER_BACKGROUND}#{?window_zoomed_flag,\