diff --git a/home/user/.bashrc b/home/user/.bashrc
index 00eaec8..6d6a10d 100644
--- a/home/user/.bashrc
+++ b/home/user/.bashrc
@@ -2,10 +2,10 @@
 # .bashrc by TheK4n
 # https://github.com/TheK4n/dotfiles
 
-if command -v tmux &>/dev/null && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ] && [ "$(tty)" != "/dev/tty3" ] && [[ -z "$SSH_CLIENT" ]]; then
+if command -v tmux &>/dev/null && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ] && [ "$(tty)" != "/dev/tty3" ]; then
     exec tmux
 fi
 
 if [ -f "$HOME/.config/bash/sourcer" ]; then
-    source $HOME/.config/bash/sourcer
+    source "$HOME/.config/bash/sourcer"
 fi
\ No newline at end of file
diff --git a/home/user/.config/tmux/remote.conf b/home/user/.config/tmux/remote.conf
new file mode 100644
index 0000000..3bffdd9
--- /dev/null
+++ b/home/user/.config/tmux/remote.conf
@@ -0,0 +1,2 @@
+
+# Tmux remote config
\ No newline at end of file
diff --git a/home/user/.config/tmux/tmux.conf b/home/user/.config/tmux/tmux.conf
index eeeb268..0d392f4 100644
--- a/home/user/.config/tmux/tmux.conf
+++ b/home/user/.config/tmux/tmux.conf
@@ -5,4 +5,6 @@ source-file "$HOME/.config/tmux/options.conf"
 source-file "$HOME/.config/tmux/style.conf"
 source-file "$HOME/.config/tmux/plugins.conf"
 
+if-shell 'test -n "$SSH_CLIENT"' 'source-file "$HOME/.config/tmux/remote.conf"'
+
 run -b "$HOME/.config/tmux/plugins/tpm/tpm"
\ No newline at end of file
diff --git a/home/user/.config/zsh/.zshrc b/home/user/.config/zsh/.zshrc
index f7d62f4..6288dd3 100644
--- a/home/user/.config/zsh/.zshrc
+++ b/home/user/.config/zsh/.zshrc
@@ -1,7 +1,7 @@
 # .zshrc by TheK4n
 # https://github.com/TheK4n/dotfiles
 
-if command -v tmux &>/dev/null && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ] && [ "$(tty)" != "/dev/tty3" ] && [[ -z "$SSH_CLIENT" ]]; then
+if command -v tmux &>/dev/null && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ] && [ "$(tty)" != "/dev/tty3" ]; then
     exec tmux
 fi