diff --git a/.ssh/config b/.ssh/config
index 70fb072..56192a1 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -29,10 +29,17 @@ Host buche_tmux
     RequestTTY yes
     RemoteCommand tmux attach-session -t default_ssh || tmux new-session -s default_ssh
 
-Host erle_tmux
-    HostName erle
+Host erle
+    HostName localhost
     User dirk
-    Port 22
+    Port 2022
+    ProxyJump firewall
+
+Host erle_tmux
+    HostName localhost
+    User dirk
+    Port 2022
+    ProxyJump firewall
     RequestTTY yes
     RemoteCommand tmux attach-session -t default_ssh || tmux new-session -s default_ssh
 
diff --git a/.zshrc.d/add_defaults b/.zshrc.d/add_defaults
deleted file mode 100755
index f195554..0000000
--- a/.zshrc.d/add_defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-ln -vs __available__/bin.zsh
-ln -vs __available__/less.zsh
-ln -vs __available__/ctools.zsh
-ln -vs __available__/hostname_welcome.zsh
-ln -vs __available__/prompt_color.zsh
-ln -vs __available__/prompt_autosuggest.zsh
-ln -vs __available__/prompt_kali.zsh
-ln -vs __available__/todo.zsh
-
diff --git a/.zshrc.d/__available__/backup_data.zsh b/.zshrc.d/backup_data.zsh
similarity index 100%
rename from .zshrc.d/__available__/backup_data.zsh
rename to .zshrc.d/backup_data.zsh
diff --git a/.zshrc.d/__available__/bell-none.zsh b/.zshrc.d/bell-none.zsh
similarity index 100%
rename from .zshrc.d/__available__/bell-none.zsh
rename to .zshrc.d/bell-none.zsh
diff --git a/.zshrc.d/__available__/bin.zsh b/.zshrc.d/bin.zsh
similarity index 100%
rename from .zshrc.d/__available__/bin.zsh
rename to .zshrc.d/bin.zsh
diff --git a/.zshrc.d/__available__/ctools.zsh b/.zshrc.d/ctools.zsh
similarity index 100%
rename from .zshrc.d/__available__/ctools.zsh
rename to .zshrc.d/ctools.zsh
diff --git a/.zshrc.d/__available__/dd.zsh b/.zshrc.d/dd.zsh
similarity index 100%
rename from .zshrc.d/__available__/dd.zsh
rename to .zshrc.d/dd.zsh
diff --git a/.zshrc.d/__available__/hostname_welcome.zsh b/.zshrc.d/hostname_welcome.zsh
similarity index 100%
rename from .zshrc.d/__available__/hostname_welcome.zsh
rename to .zshrc.d/hostname_welcome.zsh
diff --git a/.zshrc.d/__available__/less.zsh b/.zshrc.d/less.zsh
similarity index 100%
rename from .zshrc.d/__available__/less.zsh
rename to .zshrc.d/less.zsh
diff --git a/.zshrc.d/__available__/neofetch.zsh b/.zshrc.d/neofetch.zsh
similarity index 100%
rename from .zshrc.d/__available__/neofetch.zsh
rename to .zshrc.d/neofetch.zsh
diff --git a/.zshrc.d/__available__/prompt_adam1.zsh b/.zshrc.d/prompt_adam1.zsh
similarity index 100%
rename from .zshrc.d/__available__/prompt_adam1.zsh
rename to .zshrc.d/prompt_adam1.zsh
diff --git a/.zshrc.d/__available__/prompt_autosuggest.zsh b/.zshrc.d/prompt_autosuggest.zsh
similarity index 100%
rename from .zshrc.d/__available__/prompt_autosuggest.zsh
rename to .zshrc.d/prompt_autosuggest.zsh
diff --git a/.zshrc.d/__available__/prompt_color.zsh b/.zshrc.d/prompt_color.zsh
similarity index 100%
rename from .zshrc.d/__available__/prompt_color.zsh
rename to .zshrc.d/prompt_color.zsh
diff --git a/.zshrc.d/__available__/prompt_kali.zsh b/.zshrc.d/prompt_kali.zsh
similarity index 100%
rename from .zshrc.d/__available__/prompt_kali.zsh
rename to .zshrc.d/prompt_kali.zsh
diff --git a/.zshrc.d/__available__/prompt_powerline.zsh b/.zshrc.d/prompt_powerline.zsh
similarity index 100%
rename from .zshrc.d/__available__/prompt_powerline.zsh
rename to .zshrc.d/prompt_powerline.zsh
diff --git a/.zshrc.d/__available__/ssh.zsh b/.zshrc.d/ssh.zsh
similarity index 100%
rename from .zshrc.d/__available__/ssh.zsh
rename to .zshrc.d/ssh.zsh
diff --git a/.zshrc.d/__available__/tmux.zsh b/.zshrc.d/tmux.zsh
similarity index 100%
rename from .zshrc.d/__available__/tmux.zsh
rename to .zshrc.d/tmux.zsh
diff --git a/.zshrc.d/__available__/todo.zsh b/.zshrc.d/todo.zsh
similarity index 100%
rename from .zshrc.d/__available__/todo.zsh
rename to .zshrc.d/todo.zsh
diff --git a/add_bash b/add_bash
deleted file mode 100755
index c529b9f..0000000
--- a/add_bash
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/zsh
-#
-SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-
-if [[ (-e ~/.bashrc.d) ]]; then
-    echo "A bash configuration already exists (~/.bashrc.d)"
-    echo "Remove this configuration and start the script again"
-else
-    echo "Creating base link"
-    ln -vs $SCRIPTPATH/.bashrc.d ~/.bashrc.d
-fi
-
-GS=`grep .bashrc.d ~/.bashrc`
-if [ ${#GS} -eq 0 ]; then
-    echo "Adding execution of scripts in ~.bashrc.d"
-    cat ~/.bashrc.d/BASHRC_ADDON >> ~/.bashrc
-fi
diff --git a/add_bin b/add_bin
deleted file mode 100755
index 3cdbb3b..0000000
--- a/add_bin
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/zsh
-#
-SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-
-if [[ (-e ~/bin) ]]; then
-    echo "A ssh configuration already exists (~/bin)"
-    echo "Remove this configuration and start the script again"
-else
-    echo "Creating link"
-    ln -vs $SCRIPTPATH/bin ~/bin
-fi
-
diff --git a/add_nemo_config b/add_nemo_config
deleted file mode 100755
index 0d22dc7..0000000
--- a/add_nemo_config
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/zsh
-#
-SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-
-if [[ (-e ~/.nemo.json) ]]; then
-    echo "A nemo configuration already exists (~/.nemo.json)"
-    echo "Remove this configuration and start the script again"
-else
-    echo "Creating link"
-    ln -vs $SCRIPTPATH/.nemo.json ~/
-fi
-
diff --git a/add_powerline b/add_powerline
deleted file mode 100755
index f0550be..0000000
--- a/add_powerline
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/zsh
-#
-SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-
-if [[ (-e ~/.config/powerline) ]]; then
-    echo "A powerline configuration already exists (~/.config/powerline)"
-    echo "Remove this configuration and start the script again"
-else
-    echo "Creating link"
-    ln -vs $SCRIPTPATH/.config/powerline ~/.config/powerline
-fi
-
diff --git a/add_ssh_config b/add_ssh_config
deleted file mode 100755
index 58e4ab2..0000000
--- a/add_ssh_config
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/zsh
-#
-SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-
-if [[ (-e ~/.ssh/config) ]]; then
-    echo "A ssh configuration already exists (~/.ssh/config)"
-    echo "Remove this configuration and start the script again"
-else
-    echo "Creating link"
-    ln -vs $SCRIPTPATH/.ssh/config ~/.ssh/config
-fi
-
diff --git a/add_tmux b/add_tmux
deleted file mode 100755
index 6a7fcab..0000000
--- a/add_tmux
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/zsh
-#
-SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-
-if [[ (-e ~/.tmux.conf) ]]; then
-    echo "A tmux configuration already exists (~/.tmux.conf)"
-    echo "Remove this configuration and start the script again"
-else
-    echo "Creating link"
-    ln -vs $SCRIPTPATH/.tmux.conf ~/.tmux.conf
-fi
-
diff --git a/add_vim b/add_vim
deleted file mode 100755
index c2bf8f2..0000000
--- a/add_vim
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/zsh
-#
-SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-
-
-if [[ ! -e ~/.vim ]]; then
-    mkdir -v ~/.vim
-fi
-
-if [[ ! -e ~/.cache/vim ]]; then
-    mkdir -v ~/.cache/vim
-fi
-
-if [[ (-e ~/.vimrc || -e ~/.vim/skeletons) ]]; then
-    echo "A vim configuration already exists (~/.vimrc or ~/.vim/skeletons)"
-    echo "Remove this configuration and start the script again"
-else
-    echo "Creating base links"
-    ln -vs $SCRIPTPATH/.vimrc ~/.vimrc
-    ln -vs $SCRIPTPATH/.vim/skeletons ~/.vim/skeletons
-fi
diff --git a/add_zshrc b/add_zshrc
deleted file mode 100755
index 5eaf5fc..0000000
--- a/add_zshrc
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/zsh
-#
-SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-
-if [[ (-e ~/.zshrc || -e ~/.zshrc.d) ]]; then
-    echo "A zsh configuration already exists (~/.zshrc or ~/.zshrc.d)"
-    echo "Remove this configuration and start the script again"
-else
-    echo "Creating base links"
-    ln -vs $SCRIPTPATH/.zshrc ~/.zshrc
-    ln -vs $SCRIPTPATH/.zshrc.d ~/.zshrc.d
-fi
-
diff --git a/my_defaults b/my_defaults
deleted file mode 100755
index 839c779..0000000
--- a/my_defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-
-# general configurations
-./add_bin
-./add_nemo_config
-./add_ssh_config
-./add_tmux
-./add_vim
-./add_zshrc
-
-# zshrc.d configurations
-./.zshrc.d/add_defaults
-
diff --git a/root_defaults b/root_defaults
deleted file mode 100755
index 8574f77..0000000
--- a/root_defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-
-# general configurations
-./add_bin
-./add_tmux
-./add_vim
-./add_zshrc
-
-# zshrc.d configurations
-./.zshrc.d/add_defaults
-