diff --git a/.tmux.conf b/.tmux.conf
index d65e572..aaf7a65 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -187,6 +187,16 @@ run 'cut -c3- ~/.tmux.conf | sh -s apply_configuration'
 #       tmux_conf_theme_display_panes_colour=${tmux_conf_theme_display_panes_colour:-colour39}                # light blue
 #       tmux set -g display-panes-active-colour $tmux_conf_theme_display_panes_active_colour \; set -g display-panes-colour $tmux_conf_theme_display_panes_colour
 #
+#       tmux_conf_theme_highlight_focused_pane=${tmux_conf_theme_highlight_focused_pane:-disabled}
+#       tmux_conf_theme_focused_pane_fg=${tmux_conf_theme_focused_pane_fg:-default}   # default
+#       tmux_conf_theme_focused_pane_bg=${tmux_conf_theme_focused_pane_bg:-colour23}  # dark blue/green
+#       highlight_focused_pane_enabled=$( ([ x"$tmux_conf_theme_highlight_focused_pane" = x"enabled" ] || [ -z "$tmux_conf_theme_highlight_focused_pane" ]) && echo "true" || echo "false" )
+#       if [ x"$highlight_focused_pane_enabled" = x"true" ] ; then
+#         tmux setw -g window-active-style "fg=$tmux_conf_theme_focused_pane_fg,bg=$tmux_conf_theme_focused_pane_bg"
+#       else
+#         tmux setw -g window-active-style default
+#       fi
+#
 #       # messages
 #       tmux_conf_theme_message_fg=${tmux_conf_theme_message_fg:-colour16}  # black
 #       tmux_conf_theme_message_bg=${tmux_conf_theme_message_bg:-colour226} # yellow
diff --git a/.tmux.conf.local b/.tmux.conf.local
index 921303b..ae7ed98 100644
--- a/.tmux.conf.local
+++ b/.tmux.conf.local
@@ -71,6 +71,12 @@ tmux_conf_theme_hostname=enabled
 #tmux_conf_theme_hostname=disabled
 #tmux_conf_theme_hostname=ssh
 
+# highlight focuse pane, possible values are:
+#   - enabled
+#   - disabled
+tmux_conf_theme_highlight_focused_pane=disabled
+#tmux_conf_theme_highlight_focused_pane=enabled
+
 # should new windows retain current path, possible values are:
 #   - true
 #   - false
@@ -83,7 +89,9 @@ tmux_conf_new_windows_retain_current_path=false
 tmux_conf_new_panes_retain_current_path=true
 #tmux_conf_new_panes_retain_current_path=false
 
-# prompt for session name when creating a new session
+# prompt for session name when creating a new session, possible values are:
+#   - true
+#   - false
 tmux_conf_new_session_prompt=false
 #tmux_conf_new_session_prompt=true
 
diff --git a/README.md b/README.md
index 08052db..3616e99 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ Features
  - mouse mode toggle with `<prefix> m`
  - automatic usage of `reattach-to-user-namespace` if available
  - laptop battery status
+ - optional highlight of focused pane (tmux `2.1`+)
  - configurable new windows and panes behavior (optionally retain current path)
  - [Facebook PathPicker][] integration if available
  - [Urlview][] integration if available
@@ -241,6 +242,18 @@ The possible values for `tmux_conf_theme_username` and
 When you set `tmux_conf_theme_username` or `tmux_conf_theme_hostname` to `ssh`,
 information is displayed only if you're inside an SSH session.
 
+### Configuring highlighting of the focused pane
+
+To highlight the focused pane, edit the `~/.tmux.conf.local` file (`<prefix> e`)
+and adjust the `tmux_conf_theme_highlight_focused_pane` variable:
+
+    tmux_conf_theme_highlight_focused_pane=enabled
+
+The possible values for `tmux_conf_theme_highlight_focused_pane` variable are
+`disabled` (default) or `enabled`.
+
+This feature is only available from tmux `2.1`.
+
 ### Configuring new windows and new panes creation
 
 To configure whether creating new windows and new panes retains the current
@@ -282,12 +295,12 @@ It is possible to use this configuration under Cygwin within Mintty, however
 support for Unicode symbols and emojis lacks behind Mac and Linux.
 
 Particularly, Mintty's text rendering is implemented with GDI which has
-limitations: 
+limitations:
 
 - color emojis are only available through DirectWrite starting with Windows 8.1
 - display double width symbols, like the battery discharging symbol indicator
   (U+1F50B) is buggy
-  
+
 As a consequence, under Cygwin, the battery charging (⚡ U+26A1) status indicator
 is rendered as a monochrome lightning bolt instead of a colorful emoji while the
 discharging (🔋 U+1F50B) one is simply disabled.