diff --git a/functions/alias.zsh b/functions/alias.zsh
index 98e0a809..5fb00b05 100644
--- a/functions/alias.zsh
+++ b/functions/alias.zsh
@@ -98,16 +98,6 @@ if ! check-bool "$DISABLE_COLOR"; then
   fi
 fi
 
-# Terminal Multiplexer
-alias sl="screen -list"
-alias sr="screen -a -A -U -D -R"
-alias sn="screen -U -S"
-
-if (( $+commands[tmux] )); then
-  alias tl="tmux list-sessions"
-  alias ta="tmux attach-session"
-fi
-
 # Miscellaneous
 (( $+commands[ack] )) && alias afind='ack -il'
 (( $+commands[ebuild] )) && alias ebuild='nocorrect ebuild'
diff --git a/plugins/screen/screen.plugin.zsh b/plugins/screen/screen.plugin.zsh
new file mode 100644
index 00000000..52c16fd5
--- /dev/null
+++ b/plugins/screen/screen.plugin.zsh
@@ -0,0 +1,23 @@
+# ------------------------------------------------------------------------------
+#          FILE:  screen.plugin.zsh
+#   DESCRIPTION:  oh-my-zsh plugin file.
+#        AUTHOR:  Sorin Ionescu <sorin.ionescu@gmail.com>
+#       VERSION:  1.0.0
+# ------------------------------------------------------------------------------
+
+# Aliases
+alias sl="screen -list"
+alias sr="screen -a -A -U -D -R"
+alias sn="screen -U -S"
+
+# Auto
+if (( $SHLVL == 1 )) && ! check-bool "$DISABLE_AUTO_SCREEN"; then
+  (( SHLVL += 1 )) && export SHLVL
+  session="$(screen -list 2> /dev/null | sed '1d;$d' | awk '{print $1}' | head -1)"
+  if [[ -n "$session" ]]; then
+    exec screen -x "$session"
+  else
+    exec screen -a -A -U -D -R -m "$SHELL" -l
+  fi
+fi
+
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
new file mode 100644
index 00000000..8d50296e
--- /dev/null
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#          FILE:  tmux.plugin.zsh
+#   DESCRIPTION:  oh-my-zsh plugin file.
+#        AUTHOR:  Sorin Ionescu <sorin.ionescu@gmail.com>
+#       VERSION:  1.0.0
+# ------------------------------------------------------------------------------
+
+# Aliases
+alias tl="tmux list-sessions"
+alias ta="tmux attach-session"
+
+# Auto
+if (( $SHLVL == 1 )) && ! check-bool "$DISABLE_AUTO_TMUX"; then
+  (( SHLVL += 1 )) && export SHLVL
+  session="$(tmux list-sessions 2> /dev/null | cut -d':' -f1 | head -1)"
+  if [[ -n "$session" ]]; then
+    exec tmux attach-session -t "$session"
+  else
+    exec tmux new-session "$SHELL -l"
+  fi
+fi
+