diff --git a/.config/awesome/btheme/README b/.config/awesome/btheme/README
new file mode 100644
index 0000000..1ddb349
--- /dev/null
+++ b/.config/awesome/btheme/README
@@ -0,0 +1,3 @@
+Background images:
+    Mikael Eriksson <mikael_eriksson@miffe.org>
+    Licensed under CC-BY-SA-3.0
diff --git a/.config/awesome/btheme/background.png b/.config/awesome/btheme/background.png
new file mode 100644
index 0000000..8f52b6b
Binary files /dev/null and b/.config/awesome/btheme/background.png differ
diff --git a/.config/awesome/btheme/background_white.png b/.config/awesome/btheme/background_white.png
new file mode 100644
index 0000000..bb0c5d0
Binary files /dev/null and b/.config/awesome/btheme/background_white.png differ
diff --git a/.config/awesome/btheme/layouts/dwindle.png b/.config/awesome/btheme/layouts/dwindle.png
new file mode 100644
index 0000000..943ece5
Binary files /dev/null and b/.config/awesome/btheme/layouts/dwindle.png differ
diff --git a/.config/awesome/btheme/layouts/dwindlew.png b/.config/awesome/btheme/layouts/dwindlew.png
new file mode 100644
index 0000000..36de1ba
Binary files /dev/null and b/.config/awesome/btheme/layouts/dwindlew.png differ
diff --git a/.config/awesome/btheme/layouts/fairh.png b/.config/awesome/btheme/layouts/fairh.png
new file mode 100644
index 0000000..65eadec
Binary files /dev/null and b/.config/awesome/btheme/layouts/fairh.png differ
diff --git a/.config/awesome/btheme/layouts/fairhw.png b/.config/awesome/btheme/layouts/fairhw.png
new file mode 100644
index 0000000..539fdd3
Binary files /dev/null and b/.config/awesome/btheme/layouts/fairhw.png differ
diff --git a/.config/awesome/btheme/layouts/fairv.png b/.config/awesome/btheme/layouts/fairv.png
new file mode 100644
index 0000000..9f43b58
Binary files /dev/null and b/.config/awesome/btheme/layouts/fairv.png differ
diff --git a/.config/awesome/btheme/layouts/fairvw.png b/.config/awesome/btheme/layouts/fairvw.png
new file mode 100644
index 0000000..6efef72
Binary files /dev/null and b/.config/awesome/btheme/layouts/fairvw.png differ
diff --git a/.config/awesome/btheme/layouts/floating.png b/.config/awesome/btheme/layouts/floating.png
new file mode 100644
index 0000000..cbc7804
Binary files /dev/null and b/.config/awesome/btheme/layouts/floating.png differ
diff --git a/.config/awesome/btheme/layouts/floatingw.png b/.config/awesome/btheme/layouts/floatingw.png
new file mode 100644
index 0000000..7ddf7ae
Binary files /dev/null and b/.config/awesome/btheme/layouts/floatingw.png differ
diff --git a/.config/awesome/btheme/layouts/fullscreen.png b/.config/awesome/btheme/layouts/fullscreen.png
new file mode 100644
index 0000000..8f0dbf8
Binary files /dev/null and b/.config/awesome/btheme/layouts/fullscreen.png differ
diff --git a/.config/awesome/btheme/layouts/fullscreenw.png b/.config/awesome/btheme/layouts/fullscreenw.png
new file mode 100644
index 0000000..b88939b
Binary files /dev/null and b/.config/awesome/btheme/layouts/fullscreenw.png differ
diff --git a/.config/awesome/btheme/layouts/magnifier.png b/.config/awesome/btheme/layouts/magnifier.png
new file mode 100644
index 0000000..0df4982
Binary files /dev/null and b/.config/awesome/btheme/layouts/magnifier.png differ
diff --git a/.config/awesome/btheme/layouts/magnifierw.png b/.config/awesome/btheme/layouts/magnifierw.png
new file mode 100644
index 0000000..db3b0b2
Binary files /dev/null and b/.config/awesome/btheme/layouts/magnifierw.png differ
diff --git a/.config/awesome/btheme/layouts/max.png b/.config/awesome/btheme/layouts/max.png
new file mode 100644
index 0000000..ccc22cf
Binary files /dev/null and b/.config/awesome/btheme/layouts/max.png differ
diff --git a/.config/awesome/btheme/layouts/maxw.png b/.config/awesome/btheme/layouts/maxw.png
new file mode 100644
index 0000000..1ab2785
Binary files /dev/null and b/.config/awesome/btheme/layouts/maxw.png differ
diff --git a/.config/awesome/btheme/layouts/spiral.png b/.config/awesome/btheme/layouts/spiral.png
new file mode 100644
index 0000000..a24faf5
Binary files /dev/null and b/.config/awesome/btheme/layouts/spiral.png differ
diff --git a/.config/awesome/btheme/layouts/spiralw.png b/.config/awesome/btheme/layouts/spiralw.png
new file mode 100644
index 0000000..f34ceb0
Binary files /dev/null and b/.config/awesome/btheme/layouts/spiralw.png differ
diff --git a/.config/awesome/btheme/layouts/tile.png b/.config/awesome/btheme/layouts/tile.png
new file mode 100644
index 0000000..071a385
Binary files /dev/null and b/.config/awesome/btheme/layouts/tile.png differ
diff --git a/.config/awesome/btheme/layouts/tilebottom.png b/.config/awesome/btheme/layouts/tilebottom.png
new file mode 100644
index 0000000..31eb533
Binary files /dev/null and b/.config/awesome/btheme/layouts/tilebottom.png differ
diff --git a/.config/awesome/btheme/layouts/tilebottomw.png b/.config/awesome/btheme/layouts/tilebottomw.png
new file mode 100644
index 0000000..ee337af
Binary files /dev/null and b/.config/awesome/btheme/layouts/tilebottomw.png differ
diff --git a/.config/awesome/btheme/layouts/tileleft.png b/.config/awesome/btheme/layouts/tileleft.png
new file mode 100644
index 0000000..ab55e08
Binary files /dev/null and b/.config/awesome/btheme/layouts/tileleft.png differ
diff --git a/.config/awesome/btheme/layouts/tileleftw.png b/.config/awesome/btheme/layouts/tileleftw.png
new file mode 100644
index 0000000..c18e7b4
Binary files /dev/null and b/.config/awesome/btheme/layouts/tileleftw.png differ
diff --git a/.config/awesome/btheme/layouts/tiletop.png b/.config/awesome/btheme/layouts/tiletop.png
new file mode 100644
index 0000000..c7e4c07
Binary files /dev/null and b/.config/awesome/btheme/layouts/tiletop.png differ
diff --git a/.config/awesome/btheme/layouts/tiletopw.png b/.config/awesome/btheme/layouts/tiletopw.png
new file mode 100644
index 0000000..2669cbf
Binary files /dev/null and b/.config/awesome/btheme/layouts/tiletopw.png differ
diff --git a/.config/awesome/btheme/layouts/tilew.png b/.config/awesome/btheme/layouts/tilew.png
new file mode 100644
index 0000000..c722a35
Binary files /dev/null and b/.config/awesome/btheme/layouts/tilew.png differ
diff --git a/.config/awesome/btheme/submenu.png b/.config/awesome/btheme/submenu.png
new file mode 100644
index 0000000..8b5f24a
Binary files /dev/null and b/.config/awesome/btheme/submenu.png differ
diff --git a/.config/awesome/btheme/taglist/squarefw.png b/.config/awesome/btheme/taglist/squarefw.png
new file mode 100644
index 0000000..192e870
Binary files /dev/null and b/.config/awesome/btheme/taglist/squarefw.png differ
diff --git a/.config/awesome/btheme/taglist/squarew.png b/.config/awesome/btheme/taglist/squarew.png
new file mode 100644
index 0000000..1f5dfb0
Binary files /dev/null and b/.config/awesome/btheme/taglist/squarew.png differ
diff --git a/.config/awesome/btheme/tasklist/floating.png b/.config/awesome/btheme/tasklist/floating.png
new file mode 100644
index 0000000..f29e7f5
Binary files /dev/null and b/.config/awesome/btheme/tasklist/floating.png differ
diff --git a/.config/awesome/btheme/tasklist/floatingw.png b/.config/awesome/btheme/tasklist/floatingw.png
new file mode 100644
index 0000000..eb802ae
Binary files /dev/null and b/.config/awesome/btheme/tasklist/floatingw.png differ
diff --git a/.config/awesome/btheme/theme.lua b/.config/awesome/btheme/theme.lua
new file mode 100644
index 0000000..242ab8f
--- /dev/null
+++ b/.config/awesome/btheme/theme.lua
@@ -0,0 +1,99 @@
+------------------------------------------
+-- Barak's Almost-Default awesome theme --
+------------------------------------------
+home = os.getenv("HOME")
+confdir = home .. "/.config/awesome"
+themedir = confdir .. "/btheme"
+
+theme = {}
+
+theme.font          = "Ubuntu 10"
+
+theme.bg_normal     = "#222222"
+theme.bg_focus      = "#535d6c"
+theme.bg_urgent     = "#ff0000"
+theme.bg_minimize   = "#444444"
+
+theme.fg_normal     = "#aaaaaa"
+theme.fg_focus      = "#ffffff"
+theme.fg_urgent     = "#ffffff"
+theme.fg_minimize   = "#ffffff"
+
+theme.border_width  = "2"
+theme.border_normal = "#222222"
+theme.border_focus  = "#00bfff"
+theme.border_marked = "#91231c"
+
+-- There are other variable sets
+-- overriding the default one when
+-- defined, the sets are:
+-- [taglist|tasklist]_[bg|fg]_[focus|urgent]
+-- titlebar_[bg|fg]_[normal|focus]
+-- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
+-- mouse_finder_[color|timeout|animate_timeout|radius|factor]
+-- Example:
+--theme.taglist_bg_focus = "#ff0000"
+
+-- Display the taglist squares
+theme.taglist_squares_sel   = confdir .. "/taglist/squarefw.png"
+theme.taglist_squares_unsel = confdir .. "/taglist/squarew.png"
+
+theme.tasklist_floating_icon = confdir .. "/tasklist/floatingw.png"
+
+-- Variables set for theming the menu:
+-- menu_[bg|fg]_[normal|focus]
+-- menu_[border_color|border_width]
+theme.menu_submenu_icon = confdir .. "/submenu.png"
+theme.menu_height = "24"
+theme.menu_width  = "100"
+
+-- You can add as many variables as
+-- you wish and access them by using
+-- beautiful.variable in your rc.lua
+--theme.bg_widget = "#cc0000"
+
+-- Define the image to load
+theme.titlebar_close_button_normal = confdir .. "/titlebar/close_normal.png"
+theme.titlebar_close_button_focus  = confdir .. "/titlebar/close_focus.png"
+
+theme.titlebar_ontop_button_normal_inactive = confdir .. "/titlebar/ontop_normal_inactive.png"
+theme.titlebar_ontop_button_focus_inactive  = confdir .. "/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_active = confdir .. "/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_active  = confdir .. "/titlebar/ontop_focus_active.png"
+
+theme.titlebar_sticky_button_normal_inactive = confdir .. "/titlebar/sticky_normal_inactive.png"
+theme.titlebar_sticky_button_focus_inactive  = confdir .. "/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_active = confdir .. "/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_active  = confdir .. "/titlebar/sticky_focus_active.png"
+
+theme.titlebar_floating_button_normal_inactive = confdir .. "/titlebar/floating_normal_inactive.png"
+theme.titlebar_floating_button_focus_inactive  = confdir .. "/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_active = confdir .. "/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_active  = confdir .. "/titlebar/floating_focus_active.png"
+
+theme.titlebar_maximized_button_normal_inactive = confdir .. "/titlebar/maximized_normal_inactive.png"
+theme.titlebar_maximized_button_focus_inactive  = confdir .. "/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_active = confdir .. "/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_active  = confdir .. "/titlebar/maximized_focus_active.png"
+
+-- You can use your own command to set your wallpaper
+theme.wallpaper_cmd = { }
+
+-- You can use your own layout icons like this:
+theme.layout_fairh = confdir .. "/layouts/fairhw.png"
+theme.layout_fairv = confdir .. "/layouts/fairvw.png"
+theme.layout_floating  = confdir .. "/layouts/floatingw.png"
+theme.layout_magnifier = confdir .. "/layouts/magnifierw.png"
+theme.layout_max = confdir .. "/layouts/maxw.png"
+theme.layout_fullscreen = confdir .. "/layouts/fullscreenw.png"
+theme.layout_tilebottom = confdir .. "/layouts/tilebottomw.png"
+theme.layout_tileleft   = confdir .. "/layouts/tileleftw.png"
+theme.layout_tile = confdir .. "/layouts/tilew.png"
+theme.layout_tiletop = confdir .. "/layouts/tiletopw.png"
+theme.layout_spiral  = confdir .. "/layouts/spiralw.png"
+theme.layout_dwindle = confdir .. "/layouts/dwindlew.png"
+
+theme.awesome_icon = "/usr/share/awesome/icons/awesome16.png"
+
+return theme
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/.config/awesome/btheme/titlebar/close_focus.png b/.config/awesome/btheme/titlebar/close_focus.png
new file mode 100644
index 0000000..288c3c0
Binary files /dev/null and b/.config/awesome/btheme/titlebar/close_focus.png differ
diff --git a/.config/awesome/btheme/titlebar/close_normal.png b/.config/awesome/btheme/titlebar/close_normal.png
new file mode 100644
index 0000000..61e16f3
Binary files /dev/null and b/.config/awesome/btheme/titlebar/close_normal.png differ
diff --git a/.config/awesome/btheme/titlebar/floating_focus_active.png b/.config/awesome/btheme/titlebar/floating_focus_active.png
new file mode 100644
index 0000000..da4e1ea
Binary files /dev/null and b/.config/awesome/btheme/titlebar/floating_focus_active.png differ
diff --git a/.config/awesome/btheme/titlebar/floating_focus_inactive.png b/.config/awesome/btheme/titlebar/floating_focus_inactive.png
new file mode 100644
index 0000000..ce11be4
Binary files /dev/null and b/.config/awesome/btheme/titlebar/floating_focus_inactive.png differ
diff --git a/.config/awesome/btheme/titlebar/floating_normal_active.png b/.config/awesome/btheme/titlebar/floating_normal_active.png
new file mode 100644
index 0000000..ed9caf2
Binary files /dev/null and b/.config/awesome/btheme/titlebar/floating_normal_active.png differ
diff --git a/.config/awesome/btheme/titlebar/floating_normal_inactive.png b/.config/awesome/btheme/titlebar/floating_normal_inactive.png
new file mode 100644
index 0000000..2044e9d
Binary files /dev/null and b/.config/awesome/btheme/titlebar/floating_normal_inactive.png differ
diff --git a/.config/awesome/btheme/titlebar/maximized_focus_active.png b/.config/awesome/btheme/titlebar/maximized_focus_active.png
new file mode 100644
index 0000000..e4148f1
Binary files /dev/null and b/.config/awesome/btheme/titlebar/maximized_focus_active.png differ
diff --git a/.config/awesome/btheme/titlebar/maximized_focus_inactive.png b/.config/awesome/btheme/titlebar/maximized_focus_inactive.png
new file mode 100644
index 0000000..8288dff
Binary files /dev/null and b/.config/awesome/btheme/titlebar/maximized_focus_inactive.png differ
diff --git a/.config/awesome/btheme/titlebar/maximized_normal_active.png b/.config/awesome/btheme/titlebar/maximized_normal_active.png
new file mode 100644
index 0000000..7db7d50
Binary files /dev/null and b/.config/awesome/btheme/titlebar/maximized_normal_active.png differ
diff --git a/.config/awesome/btheme/titlebar/maximized_normal_inactive.png b/.config/awesome/btheme/titlebar/maximized_normal_inactive.png
new file mode 100644
index 0000000..ddaf02d
Binary files /dev/null and b/.config/awesome/btheme/titlebar/maximized_normal_inactive.png differ
diff --git a/.config/awesome/btheme/titlebar/ontop_focus_active.png b/.config/awesome/btheme/titlebar/ontop_focus_active.png
new file mode 100644
index 0000000..0ba8625
Binary files /dev/null and b/.config/awesome/btheme/titlebar/ontop_focus_active.png differ
diff --git a/.config/awesome/btheme/titlebar/ontop_focus_inactive.png b/.config/awesome/btheme/titlebar/ontop_focus_inactive.png
new file mode 100644
index 0000000..b655c46
Binary files /dev/null and b/.config/awesome/btheme/titlebar/ontop_focus_inactive.png differ
diff --git a/.config/awesome/btheme/titlebar/ontop_normal_active.png b/.config/awesome/btheme/titlebar/ontop_normal_active.png
new file mode 100644
index 0000000..cf4cda5
Binary files /dev/null and b/.config/awesome/btheme/titlebar/ontop_normal_active.png differ
diff --git a/.config/awesome/btheme/titlebar/ontop_normal_inactive.png b/.config/awesome/btheme/titlebar/ontop_normal_inactive.png
new file mode 100644
index 0000000..bd323f0
Binary files /dev/null and b/.config/awesome/btheme/titlebar/ontop_normal_inactive.png differ
diff --git a/.config/awesome/btheme/titlebar/sticky_focus_active.png b/.config/awesome/btheme/titlebar/sticky_focus_active.png
new file mode 100644
index 0000000..1106399
Binary files /dev/null and b/.config/awesome/btheme/titlebar/sticky_focus_active.png differ
diff --git a/.config/awesome/btheme/titlebar/sticky_focus_inactive.png b/.config/awesome/btheme/titlebar/sticky_focus_inactive.png
new file mode 100644
index 0000000..ef2b78e
Binary files /dev/null and b/.config/awesome/btheme/titlebar/sticky_focus_inactive.png differ
diff --git a/.config/awesome/btheme/titlebar/sticky_normal_active.png b/.config/awesome/btheme/titlebar/sticky_normal_active.png
new file mode 100644
index 0000000..31c7972
Binary files /dev/null and b/.config/awesome/btheme/titlebar/sticky_normal_active.png differ
diff --git a/.config/awesome/btheme/titlebar/sticky_normal_inactive.png b/.config/awesome/btheme/titlebar/sticky_normal_inactive.png
new file mode 100644
index 0000000..ea6c275
Binary files /dev/null and b/.config/awesome/btheme/titlebar/sticky_normal_inactive.png differ
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index a0e9644..348764b 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -2,6 +2,7 @@
 require("awful")
 require("awful.autofocus")
 require("awful.rules")
+require("awful.util")
 -- Theme handling library
 require("beautiful")
 -- Notification library
@@ -32,14 +33,21 @@ do
     end)
 end
 -- }}}
+--
+-- Paths
+--
+home = os.getenv("HOME")
+confdir = home .. "/.config/awesome"
 
+--
 -- {{{ Variable definitions
 -- Themes define colours, icons, and wallpapers
-beautiful.init("/usr/share/awesome/themes/default/theme.lua")
-beautiful.border_width = "2"
-beautiful.border_normal = "#222222"
-beautiful.border_focus = "#00bfff"
-beautiful.font = "sans 12"
+--beautiful.init("/usr/share/awesome/themes/default/theme.lua")
+beautiful.init(confdir .. "/btheme/theme.lua")
+--beautiful.border_width = "2"
+--beautiful.border_normal = "#222222"
+--beautiful.border_focus = "#00bfff"
+--beautiful.font = "sans 12"
 naughty.config.default_preset.font = "Inconsolata 14"
 
 -- This is used later as the default terminal and editor to run.
diff --git a/.vim/bundle/VimOrganizer b/.vim/bundle/VimOrganizer
index 77fe790..ce15d1a 160000
--- a/.vim/bundle/VimOrganizer
+++ b/.vim/bundle/VimOrganizer
@@ -1 +1 @@
-Subproject commit 77fe79056f2c2aaf0e87bf3ccea8a73f51a096a7
+Subproject commit ce15d1acdad51c3bdb9d7537f0fd36bcf9685e32
diff --git a/.vim/bundle/command-t b/.vim/bundle/command-t
index d30099c..8866bbc 160000
--- a/.vim/bundle/command-t
+++ b/.vim/bundle/command-t
@@ -1 +1 @@
-Subproject commit d30099cac79dfdbc4a16d8279c5a2304b1494b2c
+Subproject commit 8866bbc0e18a981889b3431790caf47432f38cf4
diff --git a/.vim/bundle/lusty b/.vim/bundle/lusty
index c504654..6118864 160000
--- a/.vim/bundle/lusty
+++ b/.vim/bundle/lusty
@@ -1 +1 @@
-Subproject commit c504654f37adbeeebc31796eea3ba828429dfb40
+Subproject commit 6118864a4d84521028e8079317f838cef1c32869
diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree
index 40d05ac..eaf1973 160000
--- a/.vim/bundle/nerdtree
+++ b/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 40d05ace57fb51cc2c2b2e9eb81c4832ed291630
+Subproject commit eaf19734e73dbaa5b30f10591079043b0eba0aab
diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic
index 78f345b..6f214cb 160000
--- a/.vim/bundle/syntastic
+++ b/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 78f345bab3865159596ffeeaaffd580e82716edd
+Subproject commit 6f214cbb6d42256031aaa9670cf9ea7358e18431
diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive
index f6d93b8..618d884 160000
--- a/.vim/bundle/vim-fugitive
+++ b/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit f6d93b8788b57990a2669b2408004c0086d6a878
+Subproject commit 618d884562f2b99fa62e3fb90e3531bf17396efa
diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter
index 989ad9b..935184b 160000
--- a/.vim/bundle/vim-gitgutter
+++ b/.vim/bundle/vim-gitgutter
@@ -1 +1 @@
-Subproject commit 989ad9b0fba141806175248f30c383957bfd89df
+Subproject commit 935184bd1806e37c1e3319c7f7f3ae94ef5a5313
diff --git a/.xinitrc b/.xinitrc
new file mode 100644
index 0000000..d769f5c
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+xrdb -merge .Xdefaults &
+
+gnome-settings-daemon & 
+eval $(cat ~/.fehbg) &
+synapse -s &
+nm-applet &
+gnome-volume-manager &
+
+exec awesome
diff --git a/.xsession b/.xsession
new file mode 120000
index 0000000..03280df
--- /dev/null
+++ b/.xsession
@@ -0,0 +1 @@
+.xinitrc
\ No newline at end of file