diff --git a/020_djmount.sh b/020_djmount.sh
index 32453ea..6e60e8e 100755
--- a/020_djmount.sh
+++ b/020_djmount.sh
@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 apt-get install -y djmount
 
-DJMOUNT_DIR=~/dlna
+DEST=/etc/skel
+DJMOUNT_DIR=${DEST}/dlna
 mkdir -p ${DJMOUNT_DIR}
 
-mkdir -p ~/.config/autostart
-bash -c "cat > ~/.config/autostart/djmount.desktop" <<EOF
+mkdir -p ${DEST}/.config/autostart
+bash -c "cat > ${DEST}/.config/autostart/djmount.desktop" <<EOF
 [Desktop Entry]
 Encoding=UTF-8
 Version=0.71
@@ -17,7 +18,7 @@ StartupNotify=false
 Terminal=false
 Hidden=false
 EOF
-chmod +x ~/.config/autostart/djmount.desktop
+chmod +x ${DEST}/.config/autostart/djmount.desktop
 
 bash -c "cat > /usr/share/applications/djmount.desktop" <<'EOF'
 [Desktop Entry]
@@ -33,8 +34,8 @@ Hidden=false
 EOF
 #chmod +x /usr/share/applications/djmount.desktop
 
-mkdir -p ~/.local/share/applications
-bash -c "cat > ~/.local/share/applications/djmount.desktop"  <<EOF
+mkdir -p ${DEST}/.local/share/applications
+bash -c "cat > ${DEST}/.local/share/applications/djmount.desktop"  <<EOF
 [Desktop Entry]
 Encoding=UTF-8
 Version=0.71
@@ -46,5 +47,5 @@ StartupNotify=false
 Terminal=false
 Hidden=false
 EOF
-chmod +x ~/.local/share/applications/djmount.desktop
+chmod +x ${DEST}/.local/share/applications/djmount.desktop
 
diff --git a/020_grc.sh b/020_grc.sh
index b1ea5cf..ceeb032 100755
--- a/020_grc.sh
+++ b/020_grc.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 apt-get -y install grc
-ALIAS_HOME=~/.zsh_aliases.d/
+
+DEST=/etc/skel
+ALIAS_HOME=${DEST}/.zsh_aliases.d/
 ALIAS_FILE=${ALIAS_HOME}/003_grc.sh
 
 mkdir -p ${ALIAS_HOME}
diff --git a/020_neovim.sh b/020_neovim.sh
index f2c3358..6275f04 100755
--- a/020_neovim.sh
+++ b/020_neovim.sh
@@ -10,19 +10,19 @@ apt-get install -y #python-neovim python3-neovim
 #pip2 install --user --upgrade neovim
 #pip3 install --user --upgrade neovim
 
+DEST=/etc/skel
 
-
-#ln -sfr ~/.vim ~/.config/nvim
-mkdir -p ~/.config/nvim
-mkdir -p ~/.config/nvim/bundle
-mkdir -p ~/.config/nvim/colors
-git clone https://github.com/VundleVim/Vundle.vim.git ~/.config/nvim/bundle/Vundle.vim
+#ln -sfr ${DEST}/.vim ${DEST}/.config/nvim
+mkdir -p ${DEST}/.config/nvim
+mkdir -p ${DEST}/.config/nvim/bundle
+mkdir -p ${DEST}/.config/nvim/colors
+git clone https://github.com/VundleVim/Vundle.vim.git ${DEST}/.config/nvim/bundle/Vundle.vim
 
 # https://github.com/Netherdrake/Dotfiles/blob/master/config/nvim/init.vim
-#ln -sfr ~/.vimrc ~/.config/nvim/init.vim
+#ln -sfr ${DEST}/.vimrc ${DEST}/.config/nvim/init.vim
 
-# wget -c --directory-prefix ~/.config/nvim https://raw.githubusercontent.com/Netherdrake/Dotfiles/master/config/nvim/init.vim
-cat > ~/.config/nvim/init.vim << 'EOF'
+# wget -c --directory-prefix ${DEST}/.config/nvim https://raw.githubusercontent.com/Netherdrake/Dotfiles/master/config/nvim/init.vim
+cat > ${DEST}/.config/nvim/init.vim << 'EOF'
 """"""""""""""""""""""""""""""""
 "
 " PACKAGE MANAGEMENT
diff --git a/020_powerline-bash.sh b/020_powerline-bash.sh
index bee56c9..9b0ffcb 100755
--- a/020_powerline-bash.sh
+++ b/020_powerline-bash.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 apt-get -y install powerline 
+
+DEST=/etc/skel
 bash -c "cat > /etc/profile.d/powerline.sh" <<EOF
 if [ -f $(which powerline-daemon) ]; then
   powerline-daemon -q
@@ -9,8 +11,8 @@ if [ -f $(which powerline-daemon) ]; then
 fi
 EOF
 
-mkdir -p ~/.config/powerline
-bash -c "cat > ~/.config/powerline/config.json" <<EOF 
+mkdir -p ${DEST}/.config/powerline
+bash -c "cat > ${DEST}/.config/powerline/config.json" <<EOF 
 {
     "ext": {
         "shell": {
diff --git a/020_rox-filer.sh b/020_rox-filer.sh
index c9187c6..8a776e3 100755
--- a/020_rox-filer.sh
+++ b/020_rox-filer.sh
@@ -3,7 +3,8 @@
 apt-get -y install rox-filer
 apt-get -y install xmlstarlet
 
-ROXFILER_HOME=$HOME/.config/rox.sourceforce.net
+DEST=/etc/skel
+ROXFILER_HOME=${DEST}/.config/rox.sourceforce.net
 MIMETYPES=${ROXFILER_HOME}/MIME-types
 mkdir -p ${ROXFILER_HOME}/ROX-Filer/
 mkdir -p ${MIMETYPES}
diff --git a/020_shellcheck.sh b/020_shellcheck.sh
index da8442a..978e1eb 100755
--- a/020_shellcheck.sh
+++ b/020_shellcheck.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 apt-get install shellcheck
 
+DEST=/etc/skel
 # Works with shellcheck 0.7.0 onward
-cat > ${HOME}/.shellcheckrc<<EOF
+cat > ${DEST}/.shellcheckrc<<EOF
 disable=SC1117
 EOF
 
@@ -12,7 +13,7 @@ EOF
 #
 #cabal install shellcheck
 #
-#ln -s ~/.cabal/bin/shellcheck ~/bin/shellcheck
+#ln -s ${DEST}/.cabal/bin/shellcheck ${DEST}/bin/shellcheck
 #
 #EXCLUDE_CODE_LIST="SC1090,SC1091,SC2154,SC2001,SC2002"
 #
diff --git a/020_slim.sh b/020_slim.sh
index a09a252..a263c4d 100755
--- a/020_slim.sh
+++ b/020_slim.sh
@@ -2,6 +2,8 @@
 # Set enlightenment as the default session.
 apt-get install -y slim
 
+DEST=/etc/skel
+
 ## /etc/slim.conf
 # login_cmd	exec /bin/bash -login /etc/X11/Xsession %session
 # sessiondir	/usr/share/xsessions/ # contains enlightenment.desktop:Exec=/usr/bin/enlightenment and xfce.desktop:Exec=startxfce4
@@ -13,10 +15,10 @@ USER_NAME=default
 #sed -i "s/^.*auto_login.*/auto_login\          no/"                        	/etc/slim.conf && \
 sed -i "s/^.*auto_login.*/auto_login\          yes/"                       	/etc/slim.conf && \
 
-sed -i "s|^.*login_cmd.*|login_cmd exec /bin/sh - ~/.xinitrc \%session|" 		/etc/slim.conf && \
+sed -i "s|^.*login_cmd.*|login_cmd exec /bin/sh - ~/.xinitrc \%session|" 	/etc/slim.conf && \
 sed -i "s/^.*default_user.*/default_user\ ${USER_NAME}/"  			/etc/slim.conf && \
 
-cat > ~/.xinitrc <<'EOF'
+cat > ${DEST}/.xinitrc <<'EOF'
 DEFAULT_SESSION=enlightenment_start
 
 case $session in
diff --git a/020_tmux.sh b/020_tmux.sh
index af5cb4b..45866ac 100755
--- a/020_tmux.sh
+++ b/020_tmux.sh
@@ -4,10 +4,11 @@ apt-get install -y tmux
 apt-get install -y tmux-plugin-manager
 apt-get install -y tmuxp  # uses python rather than ruby used by tmuxinator.
 
+DEST=/etc/skel
 # https://github.com/Netherdrake/Dotfiles/tree/master/config/tmux
 # wget -c --directory-prefix ~/.config/tmux/ https://raw.githubusercontent.com/Netherdrake/Dotfiles/master/config/tmux/default.sh
 mkdir -p ~/.config/tmux
-cat > ~/.config/tmux/default.sh << 'EOF'
+cat > ${DEST}/.config/tmux/default.sh << 'EOF'
 # Default Theme
 TMUX_POWERLINE_SEPARATOR_LEFT_BOLD=""
 TMUX_POWERLINE_SEPARATOR_LEFT_THIN=""
@@ -75,9 +76,9 @@ if [ -z $TMUX_POWERLINE_RIGHT_STATUS_SEGMENTS ]; then
 fi
 EOF
 
-# wget -c --directory-prefix ~/.config/tmux/ https://raw.githubusercontent.com/Netherdrake/Dotfiles/master/config/tmux/tmux.conf
+# wget -c --directory-prefix ${DEST}/.config/tmux/ https://raw.githubusercontent.com/Netherdrake/Dotfiles/master/config/tmux/tmux.conf
 
-cat > ~/.config/tmux/tmux.conf << 'EOF'
+cat > ${DEST}/.config/tmux/tmux.conf << 'EOF'
 source /usr/share/powerline/bindings/tmux/powerline_tmux_1.9_plus.conf
 # set-option -g default-shell /bin/fish
 set-option -g default-shell "/usr/bin/zsh"
@@ -173,14 +174,14 @@ set -g pane-active-border-fg colour069 # 24 blue
 tpm'
 EOF
 
-#mkdir -p ~/.zshrc.d/
-#echo "source /usr/share/zsh/vendor_completions/_tmuxinator" > ~/.zshrc.d/006_tmuxinator.zsh
+#mkdir -p ${DEST}/.zshrc.d/
+#echo "source /usr/share/zsh/vendor_completions/_tmuxinator" > ${DEST}/.zshrc.d/006_tmuxinator.zsh
 
-mkdir -p ~/.tmux/plugins/tpm
-mkdir -p ~/.tmux/.tmuxp
+mkdir -p ${DEST}/.tmux/plugins/tpm
+mkdir -p ${DEST}/.tmux/.tmuxp
 
-#cat > ~/.config/tmux/tmux.conf << 'EOF'
-cat > ~/.tmux.conf << 'EOF'
+#cat > ${DEST}/.config/tmux/tmux.conf << 'EOF'
+cat > ${DEST}/.tmux.conf << 'EOF'
 
 # List of plugins
 set -g @plugin 'tmux-plugins/tpm'
@@ -198,8 +199,8 @@ EOF
 
 
 #https://github.com/caiogondim/maglev
-#cat > ~/.config/tmux/tmux.conf << 'EOF'
-cat > ~/.tmux.conf << 'EOF'
+#cat > ${DEST}/.config/tmux/tmux.conf << 'EOF'
+cat > ${DEST}/.tmux.conf << 'EOF'
 
 # Start windows and panes at 1, not 0
 set -g base-index 1
diff --git a/020_torbrowser.sh b/020_torbrowser.sh
index f5ff0e1..6b75c76 100755
--- a/020_torbrowser.sh
+++ b/020_torbrowser.sh
@@ -1,17 +1,21 @@
 #!/usr/bin/env bash
 #!/bin/bash
 
-TBB_VERSION=9.0.4
-WORKDIR=//var/tmp
-HOMEDIR=/opt
+#TBB_VERSION=9.0.4
+#WORKDIR=/var/tmp
+#HOMEDIR=/opt
 
-cd ${WORKDIR}
-wget -c https://dist.torproject.org/torbrowser/${TBB_VERSION}/tor-browser-linux64-${TBB_VERSION}_en-US.tar.xz
+#cd ${WORKDIR}
+#wget -c https://dist.torproject.org/torbrowser/${TBB_VERSION}/tor-browser-linux64-${TBB_VERSION}_en-US.tar.xz
+#
+#cd ${HOMEDIR}
+#tar xf  ${WORKDIR}/tor-browser-linux64-${TBB_VERSION}_en-US.tar.xz
+#
+#mkdir -p ~/Desktop
+#cp ${HOMEDIR}/tor-browser_en-US/start-tor-browser.desktop ${DEST}/Desktop/tor-browser.desktop
+##cp ${HOMEDIR}/tor-browser_en-US/start-tor-browser.desktop /usr/share/applications/
+#chmod +x ~/Desktop/tor-browser.desktop
 
-cd ${HOMEDIR}
-tar xf  ${WORKDIR}/tor-browser-linux64-${TBB_VERSION}_en-US.tar.xz
+# Move to using torbrowser-launcher - if unavailable use build_deb_from_dsc.sh
 
-mkdir -p ~/Desktop
-cp ${HOMEDIR}/tor-browser_en-US/start-tor-browser.desktop ~/Desktop/tor-browser.desktop
-#cp ${HOMEDIR}/tor-browser_en-US/start-tor-browser.desktop /usr/share/applications/
-chmod +x ~/Desktop/tor-browser.desktop
+apt-get install -y torbrowser-launcher
diff --git a/020_vim.sh b/020_vim.sh
index 9adf464..66fc8fb 100755
--- a/020_vim.sh
+++ b/020_vim.sh
@@ -2,19 +2,20 @@
 set +x
 apt-get install -y powerline #vim-airline vim-airline-themes
 
+DEST=/etc/skel
 sed -i -e 's/"syntax on/syntax on/' /etc/vim/vimrc
 sed -i -e 's/"set background=dark/set background=dark/' /etc/vim/vimrc
 
 # Macros
 # Format json
-cat > $HOME/.vimrc << 'EOF'
+cat > ${DEST}/.vimrc << 'EOF'
 
 " Format json
 nmap =j  :%!python -m json.tool<CR>
 EOF
 
 # vimrc additions
-cat > $HOME/.vimrc << 'EOF'
+cat > ${DEST}/.vimrc << 'EOF'
 
 " enable syntax highlighting
 syntax enable
@@ -351,16 +352,16 @@ au BufRead,BufNewFile *.py,*.pyw,*.c,*.h match BadWhitespace /\s\+$/lib
 
 
 EOF
-cat $HOME/.vimrc_pending
+cat ${DEST}/.vimrc_pending
 
 # append the existing vimrc to the plugin additions
-cat $HOME/.vimrc >> $HOME/.vimrc_pending
+cat ${DEST}/.vimrc >> ${DEST}/.vimrc_pending
 
 # copy it back to the vimrc
-cp $HOME/.vimrc_pending $HOME/.vimrc	
+cp ${DEST}/.vimrc_pending ${DEST}/.vimrc	
 #mv $HOME/.vimrc_pending $HOME/.vimrc	
 
-cat $HOME/.vimrc
+cat ${DEST}/.vimrc
 vim +PluginInstall +qall
 
 # Install YouCompleteMe support
diff --git a/020_zsh.sh b/020_zsh.sh
index 00e905e..50a04a3 100755
--- a/020_zsh.sh
+++ b/020_zsh.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+echo "Broken, incomplete or untested."
+exit 1
 ## Completions for Debian 9.0 - may be included in zgen
 #
 #sudo bash -c "cat > /etc/apt/sources.list.d/shells:zsh-users:zsh-completions.list" << 'EOF'