diff --git a/conky/conky.conf b/.config/conky/conky.conf
similarity index 100%
rename from conky/conky.conf
rename to .config/conky/conky.conf
diff --git a/conky/launch.sh b/.config/conky/launch.sh
similarity index 100%
rename from conky/launch.sh
rename to .config/conky/launch.sh
diff --git a/conky/todo.conf b/.config/conky/todo.conf
similarity index 100%
rename from conky/todo.conf
rename to .config/conky/todo.conf
diff --git a/dunst/dunstrc b/.config/dunst/dunstrc
similarity index 100%
rename from dunst/dunstrc
rename to .config/dunst/dunstrc
diff --git a/dunst/launch b/.config/dunst/launch
similarity index 100%
rename from dunst/launch
rename to .config/dunst/launch
diff --git a/neofetch/config.conf b/.config/neofetch/config.conf
similarity index 100%
rename from neofetch/config.conf
rename to .config/neofetch/config.conf
diff --git a/neofetch/icon.png b/.config/neofetch/icon.png
similarity index 100%
rename from neofetch/icon.png
rename to .config/neofetch/icon.png
diff --git a/nvim/.netrwhist b/.config/nvim/.netrwhist
similarity index 100%
rename from nvim/.netrwhist
rename to .config/nvim/.netrwhist
diff --git a/nvim/autoload/plug.vim b/.config/nvim/autoload/plug.vim
similarity index 100%
rename from nvim/autoload/plug.vim
rename to .config/nvim/autoload/plug.vim
diff --git a/nvim/colors/111015.vim b/.config/nvim/colors/111015.vim
similarity index 100%
rename from nvim/colors/111015.vim
rename to .config/nvim/colors/111015.vim
diff --git a/nvim/colors/Greymatters.vim b/.config/nvim/colors/Greymatters.vim
similarity index 100%
rename from nvim/colors/Greymatters.vim
rename to .config/nvim/colors/Greymatters.vim
diff --git a/nvim/init.vim b/.config/nvim/init.vim
similarity index 100%
rename from nvim/init.vim
rename to .config/nvim/init.vim
diff --git a/picom/config b/.config/picom/config
similarity index 100%
rename from picom/config
rename to .config/picom/config
diff --git a/picom/launch b/.config/picom/launch
similarity index 100%
rename from picom/launch
rename to .config/picom/launch
diff --git a/picom/picom.conf b/.config/picom/picom.conf
similarity index 100%
rename from picom/picom.conf
rename to .config/picom/picom.conf
diff --git a/polybar/config b/.config/polybar/config
similarity index 100%
rename from polybar/config
rename to .config/polybar/config
diff --git a/polybar/launch b/.config/polybar/launch
similarity index 100%
rename from polybar/launch
rename to .config/polybar/launch
diff --git a/polybar/scripts/check-all-updates.sh b/.config/polybar/scripts/check-all-updates.sh
similarity index 100%
rename from polybar/scripts/check-all-updates.sh
rename to .config/polybar/scripts/check-all-updates.sh
diff --git a/polybar/scripts/cmus.sh b/.config/polybar/scripts/cmus.sh
similarity index 100%
rename from polybar/scripts/cmus.sh
rename to .config/polybar/scripts/cmus.sh
diff --git a/polybar/scripts/pavolume.sh b/.config/polybar/scripts/pavolume.sh
similarity index 100%
rename from polybar/scripts/pavolume.sh
rename to .config/polybar/scripts/pavolume.sh
diff --git a/polybar/scripts/updates.sh b/.config/polybar/scripts/updates.sh
similarity index 100%
rename from polybar/scripts/updates.sh
rename to .config/polybar/scripts/updates.sh
diff --git a/ranger/rc.conf b/.config/ranger/rc.conf
similarity index 100%
rename from ranger/rc.conf
rename to .config/ranger/rc.conf
diff --git a/rofi/config.rasi b/.config/rofi/config.rasi
similarity index 100%
rename from rofi/config.rasi
rename to .config/rofi/config.rasi
diff --git a/rofi/dunst.rasi b/.config/rofi/dunst.rasi
similarity index 100%
rename from rofi/dunst.rasi
rename to .config/rofi/dunst.rasi
diff --git a/rofi/onedark.rasi b/.config/rofi/onedark.rasi
similarity index 100%
rename from rofi/onedark.rasi
rename to .config/rofi/onedark.rasi
diff --git a/.gitignore b/.gitignore
index a5c9c1c..b7dee09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-nvim/plugged/
+.config/nvim/plugged/
diff --git a/.zshrc b/.zshrc
index 5f84eec..70f96a3 100644
--- a/.zshrc
+++ b/.zshrc
@@ -8,7 +8,7 @@ export ZSH="/home/elal/.oh-my-zsh"
 # load a random theme each time oh-my-zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
 # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-ZSH_THEME="almtech"
+ZSH_THEME="minimal"
 # Good themes:
 # afowler
 # bira
diff --git a/copydots.sh b/copydots.sh
index 8ce22d1..a540388 100755
--- a/copydots.sh
+++ b/copydots.sh
@@ -1,16 +1,18 @@
 #!/bin/bash
 
 repoPath=$HOME/Projects/linux/dotfiles
+cfgPath=$repoPath/.config
 
 # All those things
-cp -r $HOME/.config/rofi $repoPath
-cp -r $HOME/.config/conky $repoPath
-cp -r $HOME/.config/polybar $repoPath
-cp -r $HOME/.config/neofetch $repoPath
-cp -r $HOME/.config/ranger $repoPath
-cp -r $HOME/.config/dunst $repoPath
-cp -r $HOME/.config/picom $repoPath
-cp -r $HOME/.config/nvim $repoPath
+cp -r $HOME/.config/rofi $cfgPath
+cp -r $HOME/.config/conky $cfgPath
+cp -r $HOME/.config/polybar $cfgPath
+cp -r $HOME/.config/neofetch $cfgPath
+cp -r $HOME/.config/ranger $cfgPath
+cp -r $HOME/.config/dunst $cfgPath
+cp -r $HOME/.config/picom $cfgPath
+cp -r $HOME/.config/nvim $cfgPath
+rm -rf $cfgPath/nvim/plugged
 
 # Wallpaper
 rm $repoPath/wallpaper.jpg; cp $HOME/.wallpaper.jpg $repoPath/wallpaper.jpg
@@ -25,5 +27,3 @@ cp $HOME/.Xresources $repoPath/.Xresources
 # Vim
 cp $HOME/.vimrc $repoPath/vimrc
 
-# ST-luke
-cp $HOME/Projects/linux/st-luke/config.h $repoPath/luke-st_config.h
diff --git a/zsh-themes/minimal.zsh-theme b/zsh-themes/minimal.zsh-theme
new file mode 100644
index 0000000..1f8cc73
--- /dev/null
+++ b/zsh-themes/minimal.zsh-theme
@@ -0,0 +1,8 @@
+function prompt_char {
+	if [ $UID -eq 0 ]; then echo "#"; else echo $; fi
+}
+
+PROMPT='%{$reset_color%}%{$fg_bold[white]%}$(prompt_char)$(git_prompt_info)> %{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" ("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"