diff --git a/dotfiles/bash/bash_profile b/dotfiles/bash/bash_profile
index 424d832..8360edb 100644
--- a/dotfiles/bash/bash_profile
+++ b/dotfiles/bash/bash_profile
@@ -1,13 +1,10 @@
 # ~/.bash_profile
 #
 
-[[ -f ~/.bashrc ]] && . ~/.bashrc
-
-[[ -x /usr/bin/vim ]] && export EDITOR="/usr/bin/vim"
-
 export PATH="$HOME/.local/bin:$PATH"
 export PATH="$PATH:$HOME/.cargo/bin"
 
-if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
-    exec startx
-fi
+[[ -f ~/.bashrc ]] && . ~/.bashrc
+
+# Load items that are common to bash and zsh
+[[ -f ~/SetupCockpit/dotfiles/shell/profile ]] && . ~/SetupCockpit/dotfiles/shell/profile
diff --git a/dotfiles/shell/aliases b/dotfiles/shell/aliases
index d462318..226843b 100644
--- a/dotfiles/shell/aliases
+++ b/dotfiles/shell/aliases
@@ -1,3 +1,5 @@
+# aliases common to bash and zsh
+
 alias lime2connect='ssh flyingscorpio@2px.info'
 
 alias rm='rm -I --preserve-root'
diff --git a/dotfiles/shell/profile b/dotfiles/shell/profile
new file mode 100644
index 0000000..195f72b
--- /dev/null
+++ b/dotfiles/shell/profile
@@ -0,0 +1,7 @@
+# items common to ~/.bash_profile and ~/.zprofile
+
+[[ -x /usr/bin/vim ]] && export EDITOR="/usr/bin/vim"
+
+if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
+    exec startx
+fi
diff --git a/dotfiles/zsh/zprofile b/dotfiles/zsh/zprofile
index 68a9bcb..be9fb38 100644
--- a/dotfiles/zsh/zprofile
+++ b/dotfiles/zsh/zprofile
@@ -3,7 +3,5 @@
 
 [[ -x /usr/bin/vim ]] && export EDITOR="/usr/bin/vim"
 
-
-if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
-    exec startx
-fi
+# Load items that are common to bash and zsh
+[[ -f ~/SetupCockpit/dotfiles/shell/profile ]] && source ~/SetupCockpit/dotfiles/shell/profile
diff --git a/dotfiles/zsh/zshrc b/dotfiles/zsh/zshrc
index 4670de0..a382e96 100644
--- a/dotfiles/zsh/zshrc
+++ b/dotfiles/zsh/zshrc
@@ -1,6 +1,10 @@
 # ~/.zshrc
 #
 
+
+stty stop undef # Disable ctrl-s to freeze terminal
+
+
 # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
 # Initialization code that may require console input (password prompts, [y/n]
 # confirmations, etc.) must go above this block; everything else may go below.