diff --git a/.vimrc b/.vimrc
index a79ab2f..5c04a81 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,3 +1,9 @@
+set rtp+=/usr/local/lib/python2.7/dist-packages/powerline/bindings/vim/  
+" Always show statusline 
+set laststatus=2  
+" Use 256 colours (Use this setting only if your terminal supports 256 colours) 
+set t_Co=256
+
 set nocompatible              " be iMproved, required
 set number
 
diff --git a/fonts.conf b/fonts.conf
new file mode 100644
index 0000000..79e56a2
--- /dev/null
+++ b/fonts.conf
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+  <match target="font">
+    <edit name="autohint" mode="assign"><bool>false</bool></edit>
+    <edit name="antialias" mode="assign"><bool>true</bool></edit>
+    <edit name="hinting" mode="assign"><bool>true</bool></edit>
+    <edit name="hintstyle" mode="assign"><const>hintslight</const></edit>
+    <edit name="lcdfilter" mode="assign"><const>lcddefault</const></edit>
+  </match>
+
+  <!-- Info:
+       xeffects thread:  http://forums.gentoo.org/viewtopic-t-511382.html
+       http://wiki.archlinux.org/index.php/XOrg_Font_Configuration
+       http://antigrain.com/research/font_rasterization/index.html
+       http://fontconfig.org/fontconfig-user.html
+  -->
+
+  <!-- http://bugs.gentoo.org/show_bug.cgi?id=130466 -->
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Noto Serif for Powerline</family>  
+      <family>Noto Serif</family>  
+      <family>Liberation Serif</family>
+      <family>DejaVu Serif</family>
+      <family>Bitstream Vera Serif</family>
+    </prefer>
+  </alias>
+
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+        <family>Noto Sans for Powerline</family>
+      <family>Noto Sans</family>
+      <family>Liberation Sans</family>
+      <family>DejaVu Sans</family>
+      <family>Verdana</family>
+      <family>Bitstream Vera Sans</family>
+      <family>Arial</family>
+    </prefer>
+  </alias>
+
+  <alias>
+    <family>monospace</family>
+    <prefer>
+        <family>Noto Mono for Powerline</family>
+      <family>Noto Mono</family>
+      <family>Liberation Mono</family>
+      <family>DejaVu Sans Mono</family>
+      <family>Bitstream Vera Sans Mono</family>
+    </prefer>
+  </alias>
+
+  <!-- Reject bitmap fonts in favour of Truetype, Postscript, etc. -->
+  <selectfont>
+    <rejectfont>
+      <pattern>
+        <patelt name="scalable">
+          <bool>false</bool>
+        </patelt>
+      </pattern>
+    </rejectfont>
+  </selectfont>
+
+  <match target="pattern">
+    <test qual="any" name="family"><string>fixed</string></test>
+    <edit name="family" mode="assign"><string>monospace</string></edit>
+  </match>
+
+  <!-- Avoid embedded bitmap for all fonts -->
+  <match target="font">
+    <edit name="embeddedbitmap"><bool>false</bool></edit>
+  </match>
+</fontconfig>
diff --git a/i3/.config.swp b/i3/.config.swp
deleted file mode 100644
index fd28b58..0000000
Binary files a/i3/.config.swp and /dev/null differ
diff --git a/i3/config b/i3/config
index 994ddf6..0d0ea50 100644
--- a/i3/config
+++ b/i3/config
@@ -180,10 +180,10 @@ new_window 1pixel
 
 exec_always --no-startup-id ~/.config/polybar/polybar.sh
 
-workspace $workspace1 output DVI-D-0
-workspace $workspace7 output HDMI-0 
-workspace $workspace8 output HDMI-0 
-workspace $workspace9 output HDMI-0 
+workspace $workspace1 output HDMI-0
+workspace $workspace7 output DP-0 
+workspace $workspace8 output DP-0 
+workspace $workspace9 output DP-0 
 
 
 for_window [window_role="pop-up"] floating enable
@@ -237,3 +237,4 @@ bindsym $mod+Shift+s exec --no-startup-id ~/.config/i3/scripts/change_monitor.sh
 exec --no-startup-id "i3-msg 'workspace 9; append_layout /home/bauer/.i3/workspace-9.json'"
 
 exec --no-startup-id nm-applet
+exec --no-startup-id xfsettingsd
diff --git a/polybar/config b/polybar/config
index acd5ada..a1fd71c 100644
--- a/polybar/config
+++ b/polybar/config
@@ -272,7 +272,7 @@ label = %time% %date%
 format =  <label>
 
 [module/volume]
-type = internal/pulseaudio
+type = internal/alsa
 format-volume = <label-volume> <bar-volume>
 label-volume = 
 label-volume-foreground = ${root.foreground}
diff --git a/shell/.zshrc b/shell/.zshrc
index fd37587..d21f13c 100644
--- a/shell/.zshrc
+++ b/shell/.zshrc
@@ -1,3 +1,7 @@
+if [ -f /usr/local/lib/python2.7/dist-packages/powerline/bindings/zsh/powerline.zsh ]; 
+then
+       	source /usr/local/lib/python2.7/dist-packages/powerline/bindings/zsh/powerline.zsh 
+fi
 
 
 #