diff --git a/i3wm/config b/i3wm/config
index ef0e357..a1cc3e2 100644
--- a/i3wm/config
+++ b/i3wm/config
@@ -13,8 +13,7 @@
 #############################################
 
 # font
-set $font "pango:Droid Sans Mono 10"
-#set $font "pagno:Droid Sans Mono for Powerline 10"
+set $font "pango:Roboto Mono for Powerline 11"
 font $font
 
 # floating modifier
@@ -42,12 +41,9 @@ new_window pixel 3
 # 
 
 # sound softkeys management
-#bindsym XF86AudioRaiseVolume    exec ~/.i3/util/volnotid.sh up
-#bindsym XF86AudioLowerVolume    exec ~/.i3/util/volnotid.sh down
-#bindsym XF86AudioMute           exec ~/.i3/util/volnotid.sh mute
-bindsym XF86AudioRaiseVolume    exec amixer -q sset Master 5%+ unmute && killall -SIGUSR1 i3status
-bindsym XF86AudioLowerVolume    exec amixer -q sset Master 5%- unmute && killall -SIGUSR1 i3status
-bindsym XF86AudioMute           exec amixer -q sset Master toggle && killall -SIGUSR1 i3status
+bindsym XF86AudioRaiseVolume    exec ~/.i3/util/volnotid.sh down
+bindsym XF86AudioLowerVolume    exec ~/.i3/util/volnotid.sh up
+bindsym XF86AudioMute           exec ~/.i3/util/volnotid.sh mute
 
 # display brightness management
 bindsym XF86MonBrightnessUp     exec "xbacklight +10"
@@ -57,28 +53,27 @@ bindsym XF86MonBrightnessDown   exec "xbacklight -10"
 bindym XF86WebCam               exec /bin/cheese
 
 # lenovo Key wifi-menu
-bindsym XF86Launch1             exec  urxvt -e sh -c "sudo wifi-menu wlp3s0"
+bindsym XF86Launch1             exec urxvt -e sh -c "sudo wifi-menu wlp3s0"
 
 # jauth two factor authenticator
 bindsym $mod+F1                 exec /opt/JAuth/authenticator.sh google
 bindsym $mod+F2                 exec /opt/JAuth/authenticator.sh facebook
 bindsym $mod+F3                 exec /opt/JAuth/authenticator.sh dropbox
+bindsym $mod+F4                 exec --no-startup-id "gnome-screenshot -w"
 
 # start dmenu-launcher
 bindsym $mod+d                  exec ~/.i3/util/i3dmenu-wrapper.sh
 
 # lock i3 with i3lock
-#bindsym $mod+Shift+x           exec i3lock -c 000000
-bindsym $mod+Shift+x            exec ~/.i3/util/i3blur.py
+bindsym $mod+Shift+x            exec i3lock-fancy
 
 #############################################
 #                  Keymaps                  #
 #############################################
 
 # start terminal
-#bindsym $mod+Return             exec --no-startup-id gnome-terminal
-#bindsym $mod+Return             exec --no-startup-id urxvt
-bindsym $mod+Return             exec --no-startup-id urxvtc
+bindsym $mod+Return             exec --no-startup-id urxvt
+#bindsym $mod+Return             exec --no-startup-id urxvtc
 
 # kill focused window
 bindsym $mod+Shift+q            kill
@@ -86,14 +81,14 @@ bindsym $mod+Shift+q            kill
 # change focus vim Style
 bindsym $mod+h                  focus left
 bindsym $mod+l                  focus right
-bindsym $mod+j                  focus up
-bindsym $mod+k                  focus down
+bindsym $mod+k                  focus up
+bindsym $mod+j                  focus down
 
 # move focused window vim Style
 bindsym $mod+Shift+h            move left
 bindsym $mod+Shift+l            move right
-bindsym $mod+Shift+j            move up
-bindsym $mod+Shift+k            move down
+bindsym $mod+Shift+k            move up
+bindsym $mod+Shift+j            move down
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Shift+Left         move left
@@ -201,10 +196,11 @@ set $DARKGREY       #1f1f1f
 set $DARKRED        #9b0e0e
 
 # Solarized colorscheme
-#set $BACKGROUND     #002b36
+set $IMPORTANT      #43d5f2
 set $BACKGROUND     #1c5b98
 set $FOREGROUND     #93a1a1
 set $LIGHTGREY      #dc322f
+set $LIGHTBLUE      #75aaff
 set $GREEN          #b0cc54
 set $BROWN          #b58900
 set $BLUE           #268bd2
@@ -252,17 +248,17 @@ bar {
 #        urgent_workspace   $DARKBROWN   $DARKBROWN  $LIGHTBROWN
 #  }
 
-# Solarized colorscheme
+    # Solarized colorscheme
     colors {
-        statusline  $GREEN
+        statusline  $LIGHTBLUE
         background  $BACKGROUND
         separator   $MAGENTA
 
         # name             #border     #bg         #text
-        focused_workspace  $MAGENTA    $BACKGROUND $GREEN
-        active_workspace   $BACKGROUND $BACKGROUND $GREEN
-        inactive_workspace $BACKGROUND $BACKGROUND $GREEN
-        urgent_workspace   $BACKGROUND $BACKGROUND $GREEN
+        focused_workspace  $LIGHTBLUE  $BACKGROUND $LIGHTBLUE
+        active_workspace   $BACKGROUND $BACKGROUND $LIGHTBLUE
+        inactive_workspace $BACKGROUND $BACKGROUND $LIGHTBLUE
+        urgent_workspace   $BACKGROUND $BACKGROUND $LIGHTBLUE
   }
 }
 
@@ -275,17 +271,14 @@ for_window [class="Thunar"]         floating enable
 for_window [class="Nautilus"]       floating enable
 for_window [class="GParted"]        floating enable
 for_window [class="Gedit"]          floating enable
-for_window [class="Evince"]         floating enable
-for_window [class="Telegram"]       floating enable
 for_window [class="teamspeak3"]     floating enable
 for_window [class="rhythmbox"]      floating enable
-for_window [class="LibreOffice"]    floating enable
 for_window [class="JAuth"]          floating enable
 for_window [class="plecs"]          floating enable
 
 # 0px Border 
 #for_window [class="chrome"]         border none
-#for_window [class="Firefox"]        border none
+for_window [class="Firefox"]        border none
 
 # 1px Border
 #for_window [class="URxvt" ]         border 1pixel
@@ -294,31 +287,34 @@ for_window [class="plecs"]          floating enable
 #            auto start with i3             #
 #############################################
 
+# composite manager
+exec --no-startup-id compton -cCGfb -m1 -D3 --xrender-sync --xrender-sync-fence
+
 # terminal daemon
-exec --no-startup-id urxvtd --quiet --opendisplay --fork
+#exec --no-startup-id urxvtd -q -f -o
 
 # pidgin chat cliente
 exec --no-startup-id pidgin
 
 # less eye pain
-exec --no-startup-id redshift-gtk
-exec --no-startup-id compton -cCGbD 10
+#exec --no-startup-id redshift-gtk
 
 # no beep!
 exec --no-startup-id xset b off
 
 # set dpi for my monitor
-#exec --no-startup-id xrandr --dpi 81
-
-# set mouse accel
-exec --no-startup-id xset m 1/4 1
-
-# numlock on by default
-#exec --no-startup-id numlockx on
+exec --no-startup-id xrandr --dpi 81
 
 # nm-applet (yehhh vpn ...)
-exec --no-startup-id nm-applet
+#exec --no-startup-id nm-applet
+
+# dunst for notifications and volnoti daemon
+exec --no-startup-id dunst -conf ~/.dunstrc
+exec --no-startup-id volnoti
+
+# Drop all the boxes!
+#exec dropbox start
 
 # wallpapers
 #exec --no-startup-id ~/.i3/util/wallpapers.sh
-exec --no-startup-id feh --bg-scale ~/.wallpapers/puzzle1.png
+exec --no-startup-id feh --bg-fill ~/.wallpapers/puzzle2.png
diff --git a/i3wm/i3status.conf b/i3wm/i3status.conf
index fb1425b..8ebc75a 100644
--- a/i3wm/i3status.conf
+++ b/i3wm/i3status.conf
@@ -1,78 +1,55 @@
-########################################
-#  _ ____      _        _              #
-# (_)___ \    | |      | |             #
-#  _  __) |___| |_ __ _| |_ _   _ ___  #
-# | ||__ </ __| __/ _` | __| | | / __| #
-# | |___) \__ \ || (_| | |_| |_| \__ \ #
-# |_|____/|___/\__\__,_|\__|\__,_|___/ #
-#                                      #
-########################################
-#
-# i3status configuration file.
-# see "man i3status" for documentation.
-#
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s: ß
-# If the above line is not correctly displayed, fix your editor first!
-
 general {
-        colors = true
-        interval = 1
+    colors = true
+    interval = 1
+    output_format = i3bar
+    color_good = "#4ff243"
+    color_degraded = "#8c7f22"
+    color_bad = "#9b0e0e"
 }
 
-order += "battery 0"
-order += "disk /home"
 order += "disk /"
+order += "disk /home"
 order += "wireless wlp1s0"
 order += "ethernet enp0s31f6"
-order += "cpu_temperature 0"
+order += "cpu_usage"
+order += "battery 0"
 order += "volume master"
 order += "tztime local"
 
 wireless wlp1s0 {
-        format_up = "📡 (%quality @ %essid, %bitrate) %ip"
-        format_down = "📡 down"
+    format_up = " WiFi: %ip %quality %essid %bitrate "
+    format_down = " WiFi: (/) "
 }
 
 ethernet enp0s31f6 {
-        format_up = "🔌  %ip (%speed)"
-        format_down = "🔌  down"
+    format_up = " LAN: %ip %speed "
+    format_down = " LAN: (/) "
 }
 
 battery 0 {
-        format = "%status %percentage (%remaining @ %consumption)"
-        format_down = "No battery"
-        last_full_capacity = false # true: relative capaciy, false: true capacity left
-        status_chr = "⚇ CHR"
-        status_bat = "⚡ BAT"
-        status_full = "☻ FULL"
-        path = "/sys/class/power_supply/BAT%d/uevent"
-        threshold_type = time
-        low_threshold = 10
+    format = " Power: %status %percentage %remaining left "
+    path = "/sys/class/power_supply/BAT0/uevent"
+    low_threshold = 20
 }
 
 tztime local {
-        format = " 📅  %d-%m-%Y 🕑  %H:%M:%S"
+    format = " Date: %m/%d/%y  Time: %H:%M "
 }
 
-cpu_temperature 0 {
-    format = "🌡 %degrees °C"
-    max_threshold = 70
-    path = "/sys/devices/platform/coretemp.0/hwmon/hwmon1/temp1_input"
-}
-
-disk "/home" {
-    format = "/home %free"
-    prefix_type = "binary"
+cpu_usage {
+    format = " CPU: %usage "
 }
 
 disk "/" {
-    format = "root %free"
-    prefix_type = "binary"
+    format = " root: %free "
+}
+
+disk "/home" {
+    format = " /home: %free "
 }
 
 volume master {
-    format = "♪ %volume"
+    format = " Vol: %volume "
     device = "default"
     mixer = "Master"
     mixer_idx = 0
diff --git a/i3wm/util/i3dmenu-wrapper.sh b/i3wm/util/i3dmenu-wrapper.sh
index eec3d42..b9614d9 100755
--- a/i3wm/util/i3dmenu-wrapper.sh
+++ b/i3wm/util/i3dmenu-wrapper.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BG="#002b36"
+BG="#1c5b98"
 FG="#93a1a1"
 SBG="#6c71c4"
 SFG="#93a1a1"
diff --git a/i3wm/util/volnotid.sh b/i3wm/util/volnotid.sh
index 9e7e32e..d78545d 100755
--- a/i3wm/util/volnotid.sh
+++ b/i3wm/util/volnotid.sh
@@ -18,29 +18,29 @@
 #
 
 VOLUME=$(amixer get Master | grep Mono: | sed 's|[^[]*\[\([0-9]*\).*|\1|')
-VALUE=3dB
+VALUE=1%
 MUTE=0
 
 case "$1" in
   "up")
     # Increase Volume
     [[ "$VOLUME" -eq 100 ]] && VALUE=0
-    amixer -q set Master $VALUE+ unmute && killall -SIGUSR1 i3status
+    amixer -q sset Master $VALUE+ unmute && killall -SIGUSR1 i3status
     MUTE=0
     ;;
   "down")
     # Decrease Volume
-    amixer -q set Master $VALUE- unmute && killall -SIGUSR1 i3status
+    amixer -q sset Master $VALUE- unmute && killall -SIGUSR1 i3status
     MUTE=0
     # If the Volume is already 0, then mute
     if [ "$VOLUME" == "0" ]; then
         MUTE=1
-        amixer -q set Master toggle && killall -SIGUSR1 i3status
+        amixer -q sset Master toggle && killall -SIGUSR1 i3status
     fi
     ;;
   "mute")
     # Mute
-    amixer -q set Master toggle && killall -SIGUSR1 i3status
+    amixer -q sset Master toggle && killall -SIGUSR1 i3status
     MUTE=1
     ;;
 esac
diff --git a/urxvt/Xdefaults b/urxvt/Xdefaults
index 721cbda..7f05200 100644
--- a/urxvt/Xdefaults
+++ b/urxvt/Xdefaults
@@ -8,19 +8,18 @@
 #                              #
 ################################
 
-# Real transparency         -> needs composite manager
-URxvt.depth:                32
-URxvt.background:           rgba:0000/0000/0200/1fff
-#URxvt.shading:              30
+# Real transparency             -> needs composite manager
+URxvt.depth:                    32
+URxvt.background:               rgba:0000/0000/0200/cfff
+URxvt.shading:                  30
 
-URxvt.tintColor:            White
-URxvt.saveLines:            9000000
-URxvt.foreground:           Grey
+URxvt.tintColor:                White
+URxvt.saveLines:                9000000
+URxvt.foreground:               Grey
 
-# Fonts                     For Powerlinefonts: https://github.com/powerline/fonts (Arch linux -> AUR)
-URxvt.font:                 xft:Ubuntu mono:medium:size=12,xft:Ubuntu Mono derivative Powerline:pixelsize=12
-xterm.faceName:             xft:Ubuntu mono:medium:size=12,xft:Ubuntu Mono derivative Powerline:pixelsize=12
-#URxvt.font:                 xft:DejaVu Sans Mono:medium:size=12,xft:DejaVu Sans Mono for Powerline:pixelsize=12
+# Fonts                         For Powerlinefonts: https://github.com/powerline/fonts (Arch linux -> AUR)
+#URxvt.font:                    xft:DejaVu Sans Mono:medium:size=12,xft:DejaVu Sans Mono for Powerline:pixelsize=12
+URxvt.font:                     xft:Roboto Mono for Powerline:antialias=true:medium:pixelsize=14
 
 # Misc configurations
 URxvt.colorUL:                  #4682B4
@@ -34,13 +33,20 @@ URxvt.tabbed.secondaryScroll:   true
 URxvt.inheritPixmap:            true 
 
 # Scroll behavior, don't scroll with output
-URxvt.scrollBar:            false
-URxvt.secondaryScroll:      true
-URxvt.scrollTtyOutput:      false
-URxvt.scrollWithBuffer:     true
-URxvt.scrollTtyKeypress:    true
+URxvt.scrollBar:                false
+URxvt.secondaryScroll:          true
+URxvt.scrollTtyOutput:          false
+URxvt.scrollWithBuffer:         true
+URxvt.scrollTtyKeypress:        true
 
 # Clickable urls
-URxvt.perl-ext-common:      default,matcher
-URxvt.url-launcher:         /usr/bin/xdg-open
-URxvt.matcher.button:       1
+URxvt.perl-ext-common:          default,matcher
+URxvt.url-launcher:             /usr/bin/xdg-open
+URxvt.matcher.button:           1
+
+# Change Fontsize on the fly (needs urxvt-resize-font)
+URxvt.perl-ext-common:          resize-font
+URxvt.resize-font.smaller:      C-Down
+URxvt.resize-font.bigger:       C-Up
+URxvt.iso14755:                 false
+URxvt.iso14755_52:              false
diff --git a/vim/vimrc b/vim/vimrc
index 962a558..9356d9b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -46,19 +46,19 @@ call vundle#begin()
     Plugin 'nanotech/jellybeans.vim'
     
     " Super easy commenting, toggle comments etc "
-    Plugin 'scrooloose/nerdcommenter'
+    "Plugin 'scrooloose/nerdcommenter'
     
-    " Autoclose (, " etc "
+    " Autoclose
     "Plugin 'Townk/vim-autoclose'
     
     " Git wrapper inside Vim "
-    Plugin 'tpope/vim-fugitive'
+    "Plugin 'tpope/vim-fugitive'
     
     "Handle surround chars like "
     "Plugin 'tpope/vim-surround'
     
     " Vim signs (:h signs) for modified lines based off VCS (e.g. Git) "
-    Plugin 'mhinz/vim-signify'
+    "Plugin 'mhinz/vim-signify'
 " Finish Vundle stuff "
 call vundle#end()
 
diff --git a/zsh/zshrc b/zsh/zshrc
index 42f896c..9358723 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -21,7 +21,9 @@ setopt hist_ignore_all_dups
 setopt hist_ignore_space
 
 # Promptstyle
-prompt walters
+#prompt walters
+#PROMPT='%F{red}%n%f@%F{blue}%m%f %F{yellow}%1~%f %# '
+#RPROMPT='[%F{yellow}%?%f]'
 
 # Autocomplete stuff
 zstyle ':completion:*' menu select
@@ -118,8 +120,10 @@ setopt autopushd pushdsilent pushdtohome
 setopt pushdignoredups
 setopt pushdminus
 setopt nohashdirs
-#source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 rehash
 
-source <(oc completion zsh)
+LS_COLORS=$LS_COLORS:'di=1;37:' ; export LS_COLORS
+
+#source <(oc completion zsh)
 export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting