diff --git a/plugins/screen/init.zsh b/plugins/screen/init.zsh
index 02f914e3..791ea306 100644
--- a/plugins/screen/init.zsh
+++ b/plugins/screen/init.zsh
@@ -1,19 +1,31 @@
 #
-# Defines GNU Screen aliases and provides for auto launching it at startup.
+# Defines GNU Screen aliases and provides for auto launching it at start-up.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
+# Usage:
+#   To auto start it, add the following to zshrc:
+#
+#     # Auto launch GNU Screen at start-up.
+#     zstyle -t ':omz:plugin:screen:auto' start 'yes'
+#
 
 # Aliases
 alias sl="screen -list"
 alias sn="screen -U -S"
 alias sr="screen -a -A -U -D -R"
 
-# Auto
-if (( $SHLVL == 1 )) && is-true "$AUTO_SCREEN"; then
+# Auto Start
+if (( $SHLVL == 1 )) && zstyle -t ':omz:plugin:screen:auto' start; then
   (( SHLVL += 1 )) && export SHLVL
-  session="$(screen -list 2> /dev/null | sed '1d;$d' | awk '{print $1}' | head -1)"
+
+  session="$(
+    screen -list 2> /dev/null \
+      | sed '1d;$d' \
+      | awk '{print $1}' \
+      | head -1)"
+
   if [[ -n "$session" ]]; then
     exec screen -x "$session"
   else
diff --git a/plugins/tmux/init.zsh b/plugins/tmux/init.zsh
index e04d25cb..d0c7988e 100644
--- a/plugins/tmux/init.zsh
+++ b/plugins/tmux/init.zsh
@@ -1,18 +1,29 @@
 #
-# Defines tmux aliases and provides for auto launching it at startup.
+# Defines tmux aliases and provides for auto launching it at start-up.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
+# Usage:
+#   To auto start it, add the following to zshrc:
+#
+#     # Auto launch tmux at start-up.
+#     zstyle -t ':omz:plugin:tmux:auto' start 'yes'
+#
 
 # Aliases
 alias ta="tmux attach-session"
 alias tl="tmux list-sessions"
 
-# Auto
-if (( $SHLVL == 1 )) && is-true "$AUTO_TMUX"; then
+# Auto Start
+if (( $SHLVL == 1 )) && zstyle -t ':omz:plugin:tmux:auto' start; then
   (( SHLVL += 1 )) && export SHLVL
-  session="$(tmux list-sessions 2> /dev/null | cut -d':' -f1 | head -1)"
+
+  session="$(
+    tmux list-sessions 2> /dev/null \
+      | cut -d':' -f1 \
+      | head -1)"
+
   if [[ -n "$session" ]]; then
     exec tmux attach-session -t "$session"
   else