diff --git a/fonts.conf b/.config/fontconfig/fonts.conf
similarity index 100%
rename from fonts.conf
rename to .config/fontconfig/fonts.conf
diff --git a/i3/config b/.config/i3/config
similarity index 97%
rename from i3/config
rename to .config/i3/config
index 0d0ea50..ce2a2a3 100644
--- a/i3/config
+++ b/.config/i3/config
@@ -213,9 +213,9 @@ exec thunar --daemon
 exec --no-startup-id xautolock -time 5 -locker 'i3lock -i ~/.lockscreen/`ls /home/bauer/lockscreens | shuf -n 1` -t -f'
 
 # Pulse Audio controls
-bindsym --release XF86AudioLowerVolume exec --no-startup-id amixer -D pulse sset Master 5%- #decrease sound volume
-bindsym --release XF86AudioRaiseVolume exec --no-startup-id amixer -D pulse sset Master 5%+ #increase sound volume
-bindsym --release XF86AudioMute exec --no-startup-id amixer -D pulse sset Master toggle # mute sound
+bindsym --release XF86AudioLowerVolume exec --no-startup-id amixer  sset Master 5%- #decrease sound volume
+bindsym --release XF86AudioRaiseVolume exec --no-startup-id amixer  sset Master 5%+ #increase sound volume
+bindsym --release XF86AudioMute exec --no-startup-id amixer sset Master toggle # mute sound
 
 # Sreen brightness controls
 bindsym XF86MonBrightnessUp exec xbacklight -inc 20 # increase screen brightness
diff --git a/i3/config_laptop b/.config/i3/config_laptop
similarity index 100%
rename from i3/config_laptop
rename to .config/i3/config_laptop
diff --git a/i3/i3blocks.conf b/.config/i3/i3blocks.conf
similarity index 100%
rename from i3/i3blocks.conf
rename to .config/i3/i3blocks.conf
diff --git a/i3/i3log b/.config/i3/i3log
similarity index 100%
rename from i3/i3log
rename to .config/i3/i3log
diff --git a/i3/scripts/change_monitor.sh b/.config/i3/scripts/change_monitor.sh
similarity index 100%
rename from i3/scripts/change_monitor.sh
rename to .config/i3/scripts/change_monitor.sh
diff --git a/i3/scripts/cpu_usage b/.config/i3/scripts/cpu_usage
similarity index 100%
rename from i3/scripts/cpu_usage
rename to .config/i3/scripts/cpu_usage
diff --git a/i3/scripts/current_track b/.config/i3/scripts/current_track
similarity index 100%
rename from i3/scripts/current_track
rename to .config/i3/scripts/current_track
diff --git a/i3/scripts/disk b/.config/i3/scripts/disk
similarity index 100%
rename from i3/scripts/disk
rename to .config/i3/scripts/disk
diff --git a/i3/scripts/exit_menu b/.config/i3/scripts/exit_menu
similarity index 100%
rename from i3/scripts/exit_menu
rename to .config/i3/scripts/exit_menu
diff --git a/i3/scripts/gpu b/.config/i3/scripts/gpu
similarity index 100%
rename from i3/scripts/gpu
rename to .config/i3/scripts/gpu
diff --git a/i3/scripts/keyboard_layout b/.config/i3/scripts/keyboard_layout
similarity index 100%
rename from i3/scripts/keyboard_layout
rename to .config/i3/scripts/keyboard_layout
diff --git a/i3/scripts/load_average b/.config/i3/scripts/load_average
similarity index 100%
rename from i3/scripts/load_average
rename to .config/i3/scripts/load_average
diff --git a/i3/scripts/memory b/.config/i3/scripts/memory
similarity index 100%
rename from i3/scripts/memory
rename to .config/i3/scripts/memory
diff --git a/i3/scripts/openvpn b/.config/i3/scripts/openvpn
similarity index 100%
rename from i3/scripts/openvpn
rename to .config/i3/scripts/openvpn
diff --git a/i3/scripts/shutdown_menu b/.config/i3/scripts/shutdown_menu
similarity index 100%
rename from i3/scripts/shutdown_menu
rename to .config/i3/scripts/shutdown_menu
diff --git a/i3/scripts/song.awk b/.config/i3/scripts/song.awk
similarity index 100%
rename from i3/scripts/song.awk
rename to .config/i3/scripts/song.awk
diff --git a/i3/scripts/spotify.py b/.config/i3/scripts/spotify.py
similarity index 100%
rename from i3/scripts/spotify.py
rename to .config/i3/scripts/spotify.py
diff --git a/i3/scripts/spotify_control b/.config/i3/scripts/spotify_control
similarity index 100%
rename from i3/scripts/spotify_control
rename to .config/i3/scripts/spotify_control
diff --git a/i3/scripts/spotify_control.bck b/.config/i3/scripts/spotify_control.bck
similarity index 100%
rename from i3/scripts/spotify_control.bck
rename to .config/i3/scripts/spotify_control.bck
diff --git a/i3/scripts/ssd b/.config/i3/scripts/ssd
similarity index 100%
rename from i3/scripts/ssd
rename to .config/i3/scripts/ssd
diff --git a/i3/scripts/tmux b/.config/i3/scripts/tmux
similarity index 100%
rename from i3/scripts/tmux
rename to .config/i3/scripts/tmux
diff --git a/i3/scripts/volume b/.config/i3/scripts/volume
similarity index 100%
rename from i3/scripts/volume
rename to .config/i3/scripts/volume
diff --git a/i3/scripts/volume-pulseaudio b/.config/i3/scripts/volume-pulseaudio
similarity index 100%
rename from i3/scripts/volume-pulseaudio
rename to .config/i3/scripts/volume-pulseaudio
diff --git a/i3/scripts/volume_1 b/.config/i3/scripts/volume_1
similarity index 100%
rename from i3/scripts/volume_1
rename to .config/i3/scripts/volume_1
diff --git a/i3/session b/.config/i3/session
similarity index 100%
rename from i3/session
rename to .config/i3/session
diff --git a/i3/workspace-9.json b/.config/i3/workspace-9.json
similarity index 100%
rename from i3/workspace-9.json
rename to .config/i3/workspace-9.json
diff --git a/.config/polybar/.config.swp b/.config/polybar/.config.swp
new file mode 100644
index 0000000..fcedf66
Binary files /dev/null and b/.config/polybar/.config.swp differ
diff --git a/polybar/config b/.config/polybar/config
similarity index 97%
rename from polybar/config
rename to .config/polybar/config
index a1fd71c..fd4ebdf 100644
--- a/polybar/config
+++ b/.config/polybar/config
@@ -199,15 +199,16 @@ format-prefix-foreground = ${colors.foreground-alt}
 format-underline = #f90000
 label =  %percentage%%
 format = <label> <ramp-coreload>
-ramp-coreload-0 = ▁
-ramp-coreload-1 = ▂
-ramp-coreload-2 = ▃
-ramp-coreload-3 = ▄
-ramp-coreload-4 = ▅
-ramp-coreload-5 = ▆
-ramp-coreload-6 = ▇
-ramp-coreload-7 = █
-
+ramp-coreload-0 = -
+ramp-coreload-1 = 1
+ramp-coreload-2 = 2
+ramp-coreload-3 = 3
+ramp-coreload-4 = 4
+ramp-coreload-5 = 5
+ramp-coreload-6 = 6
+ramp-coreload-7 = 7
+ramp-coreload-8 = 8
+ramp-coreload-9 = 9
 
 [module/memory]
 type = internal/memory
diff --git a/polybar/config_laptop b/.config/polybar/config_laptop
similarity index 100%
rename from polybar/config_laptop
rename to .config/polybar/config_laptop
diff --git a/polybar/gpu.sh b/.config/polybar/gpu.sh
similarity index 100%
rename from polybar/gpu.sh
rename to .config/polybar/gpu.sh
diff --git a/polybar/polybar.sh b/.config/polybar/polybar.sh
similarity index 100%
rename from polybar/polybar.sh
rename to .config/polybar/polybar.sh
diff --git a/polybar/polybar_laptop.sh b/.config/polybar/polybar_laptop.sh
similarity index 100%
rename from polybar/polybar_laptop.sh
rename to .config/polybar/polybar_laptop.sh
diff --git a/polybar/spotify.py b/.config/polybar/spotify.py
similarity index 100%
rename from polybar/spotify.py
rename to .config/polybar/spotify.py
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..478428d
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,5 @@
+# This is Git's per-user configuration file.
+[user]
+# Please adapt and uncomment the following lines:
+	name = Daniel Bauer
+	email = bauer@cbs.tu-darmstadt.de
diff --git a/.pymol/.pymol b/.pymol/.pymol
new file mode 120000
index 0000000..210ed3d
--- /dev/null
+++ b/.pymol/.pymol
@@ -0,0 +1 @@
+/home/bauer/dotfiles/.pymol
\ No newline at end of file
diff --git a/.vim/.vim b/.vim/.vim
new file mode 120000
index 0000000..2a8b1ea
--- /dev/null
+++ b/.vim/.vim
@@ -0,0 +1 @@
+/home/bauer/dotfiles/.vim
\ No newline at end of file
diff --git a/.zim b/.zim
new file mode 160000
index 0000000..872926c
--- /dev/null
+++ b/.zim
@@ -0,0 +1 @@
+Subproject commit 872926c84c0461958144210a5b7c8b363f9b4334
diff --git a/shell/.zimrc b/.zimrc
similarity index 78%
rename from shell/.zimrc
rename to .zimrc
index 19597e6..3cc218b 100644
--- a/shell/.zimrc
+++ b/.zimrc
@@ -25,7 +25,20 @@ zssh_ids=(id_ed25519)
 #
 
 # Set your desired prompt here
-#
+POWERLEVEL9K_DIR_DEFAULT_BACKGROUND='black'
+POWERLEVEL9K_DIR_DEFAULT_FOREGROUND='009'
+POWERLEVEL9K_CONTEXT_DEFAULT_BACKGROUND='black'
+POWERLEVEL9K_CONTEXT_DEFAULT_FOREGROUND='009'
+DEFAULT_USER=bauer
+POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context  dir vcs anaconda)
+POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(background_jobs status time)
+
+# Anaconda
+POWERLEVEL9K_ANACONDA_RIGHT_DELIMITER='>'
+POWERLEVEL9K_ANACONDA_LEFT_DELIMITER='<'
+POWERLEVEL9K_ANACONDA_BACKGROUND='24'
+POWERLEVEL9K_ANACONDA_FOREGROUND='111'
+
 POWERLEVEL9K_PROMPT_ON_NEWLINE=true
 zprompt_theme='powerlevel9k'
 #zprompt_theme='eriner'
diff --git a/shell/.zshrc b/.zshrc
similarity index 85%
rename from shell/.zshrc
rename to .zshrc
index d21f13c..58074dd 100644
--- a/shell/.zshrc
+++ b/.zshrc
@@ -22,9 +22,14 @@ export BROWSER="firefox"
 export PAGER='most'
 
 source ~/.zshrc_functions
-source ~/.zshrc_local
+if [ -f $HOME/.zshrc_local ]; 
+then
+source $HOME/.zshrc_local
+fi
 
 # alter path
+export PATH="/opt/pymol:${PATH}"
+export PATH="$HOME/anaconda3/bin:${PATH}" # binaries
 export PATH="$HOME/bin:${PATH}" # binaries
 export PATH="$HOME/scripts:${PATH}" # scripts
 export PATH="$HOME/.local/bin:${PATH}" # python executeables
diff --git a/shell/.zshrc_functions b/.zshrc_functions
similarity index 100%
rename from shell/.zshrc_functions
rename to .zshrc_functions
diff --git a/shell/.zshrc_local_bioinfo4 b/.zshrc_local_bioinfo4
similarity index 100%
rename from shell/.zshrc_local_bioinfo4
rename to .zshrc_local_bioinfo4
diff --git a/shell/.zshrc_local_t460s b/.zshrc_local_t460s
similarity index 100%
rename from shell/.zshrc_local_t460s
rename to .zshrc_local_t460s
diff --git a/shell/.zshrc_t460s b/.zshrc_t460s
similarity index 100%
rename from shell/.zshrc_t460s
rename to .zshrc_t460s
diff --git a/dotfiles_setup.sh b/dotfiles_setup.sh
new file mode 100755
index 0000000..1770d40
--- /dev/null
+++ b/dotfiles_setup.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+dir="${HOME}/dotfiles"
+conffolder="${HOME}/.config"
+
+dotfiles=("matplotlibrc" ".pymolrc" ".pymol" ".vimrc" ".vim" ".vimrc" ".zshrc" ".zshrc_functions" ".zim" ".zimrc" ".gitconfig")
+for dotfile in "${dotfiles[@]}"; do
+	ln -sf $dir/$dotfile ${HOME}/${dotfile}
+done
+
+# fonts
+mkdir -p .config/fontconfig
+ln -sf $dir/.config/fontconfig/fonts.conf $conffolder/fontconfig/fonts.conf