diff --git a/.Xmodmap b/.Xmodmap
new file mode 100644
index 0000000..2c21414
--- /dev/null
+++ b/.Xmodmap
@@ -0,0 +1,3 @@
+remove Lock = Caps_Lock
+keysym Caps_Lock = Escape
+add Lock = Caps_Lock
diff --git a/.bashrc b/.bashrc
index 41d7466..ae6e393 100644
--- a/.bashrc
+++ b/.bashrc
@@ -116,14 +116,15 @@ if ! shopt -oq posix; then
   fi
 fi
 
-gpgconf --kill gpg-agent
-gpg-agent --daemon
-export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh
+export SSH_AUTH_SOCK="$(gpgconf --list-dir socketdir)/S.gpg-agent.ssh"
+export GPG_TTY=$(tty)
 
 export EDITOR=nvim
 export TERMINAL=gnome-terminal
 
 export PATH=$HOME/bin:$HOME/.local/bin:$PATH:~/JUCE
+export JUCE_PATH=~/JUCE
+export FRUT_PATH=~/FRUT
 
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 export CXXFLAGS='-std=c++14'
diff --git a/.config/polybar/i3 b/.config/polybar/i3
new file mode 120000
index 0000000..0ea598f
--- /dev/null
+++ b/.config/polybar/i3
@@ -0,0 +1 @@
+/home/dustvoice/Projects/dotfiles/.config/i3
\ No newline at end of file
diff --git a/.config/polybar/nitrogen b/.config/polybar/nitrogen
new file mode 120000
index 0000000..7872105
--- /dev/null
+++ b/.config/polybar/nitrogen
@@ -0,0 +1 @@
+/home/dustvoice/Projects/dotfiles/.config/nitrogen
\ No newline at end of file
diff --git a/.gitconfig b/.gitconfig
index 4641d79..5abf720 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -8,3 +8,5 @@
 	default = simple
 [commit]
 	gpgsign = true
+[gpg]
+	program = gpg2
diff --git a/.gnupg/sshcontrol b/.gnupg/sshcontrol
new file mode 100644
index 0000000..61edfdf
--- /dev/null
+++ b/.gnupg/sshcontrol
@@ -0,0 +1 @@
+26AACF211BE8A6FB4383ACF626B1D4394551CB84
diff --git a/.xinitrc b/.xinitrc
new file mode 100644
index 0000000..565d107
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+ for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+  [ -x "$f" ] && . "$f"
+ done
+ unset f
+fi
+
+setxkbmap de nodeadkeys
+
+[ -f ~/.Xmodmap ] && xmodmap ~/.Xmodmap
+
+exec i3
diff --git a/.zshrc b/.zshrc
index 3767c23..239be3c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -3,18 +3,63 @@ HISTSIZE=1000
 SAVEHIST=10000
 setopt appendhistory
 
-source .vim.zsh
+bindkey -v
 
-# export MANPATH="/usr/local/man:$MANPATH"
+terminfo_down_sc=$terminfo[cud1]$terminfo[cud1]$terminfo[cuu1]$terminfo[cuu1]$terminfo[sc]$terminfo[cud1]$terminfo[cud1]
+#terminfo_down_sc=$terminfo[cud1]$terminfo[cuu1]$terminfo[sc]$terminfo[cud1]
+
+function insert-mode () { echo "%S%F{cyan} -- INSERT -- %f%s" }
+function normal-mode () { echo "%S%F{green} -- NORMAL -- %f%s" }
+
+precmd () {
+    PS1="%{$terminfo_down_sc$VI_MODE$terminfo[rc]%}%F{magenta}%n%f@%F{yellow}%m%f %F{green}%~%f %(!.#.$) "
+}
+
+function zle-keymap-select () {
+    VI_KEYMAP=$KEYMAP
+
+    case ${VI_KEYMAP} in
+        (vicmd)         VI_MODE="$(normal-mode)" ;;
+        (main|viins)    VI_MODE="$(insert-mode)" ;;
+        (*)             VI_MODE="$(insert-mode)" ;;
+    esac
+
+    [[ -n "$VI_MODE_KEEP_CURSOR" ]] || if [[ "$VI_KEYMAP" == "vicmd" ]]; then
+        print -n '\e[1 q'
+    else
+        print -n '\e[5 q'
+    fi
+
+    PS1="%{$terminfo_down_sc$VI_MODE$terminfo[rc]%}%F{magenta}%n%f@%F{yellow}%m%f %B%F{cyan}%~%f%b %(!.#.$) "
+
+    zle reset-prompt
+    zle -R
+}
+
+function zle-line-init() {
+    zle -K viins
+}
+
+preexec () { print -rn -- $terminfo[el]; }
+
+zle -N zle-line-init
+zle -N zle-keymap-select
+
+function _vi_mode_reset_cursor() {
+    [[ -n "$VI_MODE_KEEP_CURSOR" ]] || print -n '\e[1 q'
+}
+autoload -U add-zsh-hook
+add-zsh-hook preexec _vi_mode_reset_cursor
+
+export KEYTIMEOUT=1
+
+alias ll='ls -alF'
+alias la='ls -A'
+alias l='ls -CF'
 
 # You may need to manually set your language environment
 # export LANG=en_US.UTF-8
 
-export EDITOR='nvim'
-
-# Compilation flags
-export ARCHFLAGS="-arch x86_64"
-
 # Set personal aliases, overriding those provided by oh-my-zsh libs,
 # plugins, and themes. Aliases can be placed here, though oh-my-zsh
 # users are encouraged to define aliases within the ZSH_CUSTOM folder.
@@ -26,11 +71,14 @@ export ARCHFLAGS="-arch x86_64"
 
 export SSH_AUTH_SOCK="$(gpgconf --list-dir socketdir)/S.gpg-agent.ssh"
 export GPG_TTY=$(tty)
+gpg-connect-agent updatestartuptty /bye
 
 export EDITOR=nvim
 export TERMINAL=gnome-terminal
 
 export PATH=$HOME/bin:$HOME/.local/bin:$PATH:~/JUCE
+export JUCE_PATH=~/JUCE
+export FRUT_PATH=~/FRUT
 
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 export CXXFLAGS='-std=c++14'