diff --git a/.gitmodules b/.gitmodules
index ec11043..315c3ba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,9 +12,6 @@
 	path = zsh/plugins/code-activator
 	url = https://yage.io/zsh/code-activator
 	update = rebase
-[submodule "ssh-zsh"]
-	path = zsh/plugins/ssh
-	url = https://yage.io/zsh/ssh
 [submodule "scwrypts"]
 	path = zsh/plugins/scwrypts
 	url = https://yage.io/wrynegade/scwrypts.git
diff --git a/config/scwrypts/config.zsh b/config/scwrypts/config.zsh
index 3faf2c2..870c5e1 100644
--- a/config/scwrypts/config.zsh
+++ b/config/scwrypts/config.zsh
@@ -5,7 +5,8 @@
 SCWRYPTS_SHORTCUT=''     # CTRL + W
 SCWRYPTS_ENV_SHORTCUT='' # CTRL + /
 
-source "$HOME/.wryn/scwrypts/dotwryn.scwrypts.zsh"
+source "$HOME/.wryn/scwrypts/dotwryn/dotwryn.scwrypts.zsh"
+source "$HOME/.wryn/scwrypts/ssh/ssh.scwrypts.zsh"
 
 [ -f "$HOME/.config/scwrypts/config.local.zsh" ] \
 	&& source "$HOME/.config/scwrypts/config.local.zsh" 
diff --git a/config/scwrypts/dotfiles.zsh b/config/scwrypts/dotfiles.zsh
index e9f0733..83169c8 100644
--- a/config/scwrypts/dotfiles.zsh
+++ b/config/scwrypts/dotfiles.zsh
@@ -48,4 +48,10 @@ $DOTWRYN/config/scwrypts/environments/dotwryn/local.blaziken    scwrypts/environ
 $DOTWRYN/config/scwrypts/environments/dotwryn/local.butterfree  scwrypts/environments/dotwryn/local.butterfree
 $DOTWRYN/config/scwrypts/environments/dotwryn/local.gardevoir   scwrypts/environments/dotwryn/local.gardevoir
 $DOTWRYN/config/scwrypts/environments/dotwryn/local.umbreon     scwrypts/environments/dotwryn/local.umbreon
+$DOTWRYN/config/scwrypts/environments/remote/local			    scwrypts/environments/remote/local
+$DOTWRYN/config/scwrypts/environments/remote/local.altaria      scwrypts/environments/remote/local.altaria
+$DOTWRYN/config/scwrypts/environments/remote/local.blaziken     scwrypts/environments/remote/local.blaziken
+$DOTWRYN/config/scwrypts/environments/remote/local.butterfree   scwrypts/environments/remote/local.butterfree
+$DOTWRYN/config/scwrypts/environments/remote/local.gardevoir    scwrypts/environments/remote/local.gardevoir
+$DOTWRYN/config/scwrypts/environments/remote/local.umbreon      scwrypts/environments/remote/local.umbreon
 "
diff --git a/config/scwrypts/environments/remote/local b/config/scwrypts/environments/remote/local
new file mode 100644
index 0000000..0d1ae58
--- /dev/null
+++ b/config/scwrypts/environments/remote/local
@@ -0,0 +1,7 @@
+#!/bin/zsh
+#####################################################################
+### scwrypts runtime configuration (group 'remote') #################
+#####################################################################
+
+# session name for remote connection (default 'remote')
+export REMOTE_TMUX_SESSION=wryn
diff --git a/config/scwrypts/environments/remote/local.altaria b/config/scwrypts/environments/remote/local.altaria
new file mode 100644
index 0000000..4acf39e
--- /dev/null
+++ b/config/scwrypts/environments/remote/local.altaria
@@ -0,0 +1,7 @@
+#!/bin/zsh
+#####################################################################
+### scwrypts runtime configuration (group 'remote') #################
+#####################################################################
+
+# session name for remote connection (default 'remote')
+export REMOTE_TMUX_SESSION=wryn # from local
diff --git a/config/scwrypts/environments/remote/local.blaziken b/config/scwrypts/environments/remote/local.blaziken
new file mode 100644
index 0000000..4acf39e
--- /dev/null
+++ b/config/scwrypts/environments/remote/local.blaziken
@@ -0,0 +1,7 @@
+#!/bin/zsh
+#####################################################################
+### scwrypts runtime configuration (group 'remote') #################
+#####################################################################
+
+# session name for remote connection (default 'remote')
+export REMOTE_TMUX_SESSION=wryn # from local
diff --git a/config/scwrypts/environments/remote/local.butterfree b/config/scwrypts/environments/remote/local.butterfree
new file mode 100644
index 0000000..4acf39e
--- /dev/null
+++ b/config/scwrypts/environments/remote/local.butterfree
@@ -0,0 +1,7 @@
+#!/bin/zsh
+#####################################################################
+### scwrypts runtime configuration (group 'remote') #################
+#####################################################################
+
+# session name for remote connection (default 'remote')
+export REMOTE_TMUX_SESSION=wryn # from local
diff --git a/config/scwrypts/environments/remote/local.gardevoir b/config/scwrypts/environments/remote/local.gardevoir
new file mode 100644
index 0000000..4acf39e
--- /dev/null
+++ b/config/scwrypts/environments/remote/local.gardevoir
@@ -0,0 +1,7 @@
+#!/bin/zsh
+#####################################################################
+### scwrypts runtime configuration (group 'remote') #################
+#####################################################################
+
+# session name for remote connection (default 'remote')
+export REMOTE_TMUX_SESSION=wryn # from local
diff --git a/config/scwrypts/environments/remote/local.umbreon b/config/scwrypts/environments/remote/local.umbreon
new file mode 100644
index 0000000..4acf39e
--- /dev/null
+++ b/config/scwrypts/environments/remote/local.umbreon
@@ -0,0 +1,7 @@
+#!/bin/zsh
+#####################################################################
+### scwrypts runtime configuration (group 'remote') #################
+#####################################################################
+
+# session name for remote connection (default 'remote')
+export REMOTE_TMUX_SESSION=wryn # from local
diff --git a/scwrypts/ssh/.config/env.template b/scwrypts/ssh/.config/env.template
index f7df9c2..1eb4132 100644
--- a/scwrypts/ssh/.config/env.template
+++ b/scwrypts/ssh/.config/env.template
@@ -1 +1,2 @@
 #!/bin/zsh
+export REMOTE_TMUX_SESSION=
diff --git a/scwrypts/ssh/.config/env.template.descriptions b/scwrypts/ssh/.config/env.template.descriptions
index e69de29..90deb29 100644
--- a/scwrypts/ssh/.config/env.template.descriptions
+++ b/scwrypts/ssh/.config/env.template.descriptions
@@ -0,0 +1 @@
+REMOTE_TMUX_SESSION | session name for remote connection (default 'remote')
diff --git a/zsh/plugins/ssh b/zsh/plugins/ssh
deleted file mode 160000
index d03e697..0000000
--- a/zsh/plugins/ssh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d03e6974c63ce6bd02e237821e86a3e1a2adbb1b