diff --git a/.tmux.conf b/.tmux.conf
index 9ceaa61..1bf77f6 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1196,7 +1196,7 @@ run 'cut -c3- ~/.tmux.conf | sh -s _apply_configuration'
 #   _battery_info
 #   if [ "$charge" != 0 ]; then
 #     case "$status_left $status_right" in
-#       *'#{?battery_status'*|*'#{?battery_bar'*|*'#{?battery_hbar'*|*'#{?battery_vbar'*|*'#{?battery_percentage'*)
+#       *'#{battery_'*|*'#{?battery_'*)
 #         status_left=$(echo "$status_left" | sed -E \
 #           -e 's/#\{(\?)?battery_bar/#\{\1@battery_bar/g' \
 #           -e 's/#\{(\?)?battery_hbar/#\{\1@battery_hbar/g' \
@@ -1243,7 +1243,7 @@ run 'cut -c3- ~/.tmux.conf | sh -s _apply_configuration'
 #
 #   _pkillf 'cut -c3- ~/\.tmux\.conf \| sh -s _uptime'
 #   case "$status_left $status_right" in
-#     *'#{?uptime_d'*|*'#{?uptime_h'*|*'#{?uptime_m'*|*'#{?uptime_s'*)
+#     *'#{uptime_'*|*'#{?uptime_'*)
 #       status_left=$(echo "$status_left" | sed -E \
 #         -e 's/#\{(\?)?uptime_y/#\{\1@uptime_y/g' \
 #         -e 's/#\{(\?)?uptime_d/#\{\1@uptime_d/g' \
@@ -1276,7 +1276,7 @@ run 'cut -c3- ~/.tmux.conf | sh -s _apply_configuration'
 #
 #   _pkillf 'cut -c3- ~/\.tmux\.conf \| sh -s _loadavg'
 #   case "$status_left $status_right" in
-#     *'#{?loadavg'*)
+#     *'#{loadavg'*|*'#{?loadavg'*)
 #       status_left=$(echo "$status_left" | sed -E \
 #         -e 's/#\{(\?)?loadavg/#\{\1@loadavg/g')
 #       status_right=$(echo "$status_right" | sed -E \