diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 536108b8..61141d8b 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -55,13 +55,14 @@ do
                          in_error = false
                       end)
 end
-
+                        
 --------------------------------------------------------------------------------
 -- Themes define colours, icons, and wallpapers
 --------------------------------------------------------------------------------
 -- beautiful.init("/usr/share/awesome/themes/default/theme.lua")
 -- beautiful.init("/usr/share/awesome/themes/zenburn/theme.lua")
-beautiful.init(awful.util.getdir("config") .. "/themes/default/theme.lua")
+-- beautiful.init("/home/peter/.config/awesome/themes/custom/theme.lua")
+beautiful.init(awful.util.getdir("config") .. "/themes/custom/theme.lua")
 
 -- {{{ Wallpaper
 -- if beautiful.wallpaper then
diff --git a/.config/awesome/themes/custom/theme.lua b/.config/awesome/themes/custom/theme.lua
index 34f9efa3..8184239f 100644
--- a/.config/awesome/themes/custom/theme.lua
+++ b/.config/awesome/themes/custom/theme.lua
@@ -2,8 +2,6 @@
 -- Custom awesome theme --
 ---------------------------
 
-local configdir = awful.util.getdir("config") .. "/themes/custom/"
-
 theme = {}
 
 theme.font          = "sans 8"
@@ -19,11 +17,9 @@ theme.fg_focus      = "#ffffff"
 theme.fg_urgent     = "#ffffff"
 theme.fg_minimize   = "#ffffff"
 
-theme.border_width  = 1
-theme.border_normal = "#000000"
--- theme.border_normal = "#222222"
--- theme.border_focus  = "#BFBFBF"
-theme.border_focus  = "#535d6c"
+theme.border_width  = 2
+theme.border_normal = "#222222"
+theme.border_focus  = "#BFBFBF"
 theme.border_marked = "#91231c"
 
 -- There are other variable sets
@@ -37,13 +33,13 @@ theme.border_marked = "#91231c"
 --theme.taglist_bg_focus = "#ff0000"
 
 -- Display the taglist squares
-theme.taglist_squares_sel   = configdir .. "taglist/squarefw.png"
-theme.taglist_squares_unsel = configdir .. "taglist/squarew.png"
+theme.taglist_squares_sel   = "/usr/share/awesome/themes/default/taglist/squarefw.png"
+theme.taglist_squares_unsel = "/usr/share/awesome/themes/default/taglist/squarew.png"
 
 -- Variables set for theming the menu:
 -- menu_[bg|fg]_[normal|focus]
 -- menu_[border_color|border_width]
-theme.menu_submenu_icon = configdir .. "submenu.png"
+theme.menu_submenu_icon = "/usr/share/awesome/themes/default/submenu.png"
 theme.menu_height = 15
 theme.menu_width  = 100
 
@@ -53,44 +49,44 @@ theme.menu_width  = 100
 --theme.bg_widget = "#cc0000"
 
 -- Define the image to load
-theme.titlebar_close_button_normal = configdir .. "titlebar/close_normal.png"
-theme.titlebar_close_button_focus  = configdir .. "titlebar/close_focus.png"
+theme.titlebar_close_button_normal = "/usr/share/awesome/themes/default/titlebar/close_normal.png"
+theme.titlebar_close_button_focus  = "/usr/share/awesome/themes/default/titlebar/close_focus.png"
 
-theme.titlebar_ontop_button_normal_inactive = configdir .. "titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive  = configdir .. "titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active = configdir .. "titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active  = configdir .. "titlebar/ontop_focus_active.png"
+theme.titlebar_ontop_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/ontop_normal_inactive.png"
+theme.titlebar_ontop_button_focus_inactive  = "/usr/share/awesome/themes/default/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_active = "/usr/share/awesome/themes/default/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_active  = "/usr/share/awesome/themes/default/titlebar/ontop_focus_active.png"
 
-theme.titlebar_sticky_button_normal_inactive = configdir .. "titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive  = configdir .. "titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active = configdir .. "titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active  = configdir .. "titlebar/sticky_focus_active.png"
+theme.titlebar_sticky_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/sticky_normal_inactive.png"
+theme.titlebar_sticky_button_focus_inactive  = "/usr/share/awesome/themes/default/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_active = "/usr/share/awesome/themes/default/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_active  = "/usr/share/awesome/themes/default/titlebar/sticky_focus_active.png"
 
-theme.titlebar_floating_button_normal_inactive = configdir .. "titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive  = configdir .. "titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active = configdir .. "titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active  = configdir .. "titlebar/floating_focus_active.png"
+theme.titlebar_floating_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/floating_normal_inactive.png"
+theme.titlebar_floating_button_focus_inactive  = "/usr/share/awesome/themes/default/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_active = "/usr/share/awesome/themes/default/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_active  = "/usr/share/awesome/themes/default/titlebar/floating_focus_active.png"
 
-theme.titlebar_maximized_button_normal_inactive = configdir .. "titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive  = configdir .. "titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active = configdir .. "titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active  = configdir .. "titlebar/maximized_focus_active.png"
+theme.titlebar_maximized_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/maximized_normal_inactive.png"
+theme.titlebar_maximized_button_focus_inactive  = "/usr/share/awesome/themes/default/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_active = "/usr/share/awesome/themes/default/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_active  = "/usr/share/awesome/themes/default/titlebar/maximized_focus_active.png"
 
-theme.wallpaper = configdir .. "background.png"
+theme.wallpaper = "/usr/share/awesome/themes/default/background.png"
 
 -- You can use your own layout icons like this:
-theme.layout_fairh = configdir .. "layouts/fairhw.png"
-theme.layout_fairv = configdir .. "layouts/fairvw.png"
-theme.layout_floating  = configdir .. "layouts/floatingw.png"
-theme.layout_magnifier = configdir .. "layouts/magnifierw.png"
-theme.layout_max = configdir .. "layouts/maxw.png"
-theme.layout_fullscreen = configdir .. "layouts/fullscreenw.png"
-theme.layout_tilebottom = configdir .. "layouts/tilebottomw.png"
-theme.layout_tileleft   = configdir .. "layouts/tileleftw.png"
-theme.layout_tile = configdir .. "layouts/tilew.png"
-theme.layout_tiletop = configdir .. "layouts/tiletopw.png"
-theme.layout_spiral  = configdir .. "layouts/spiralw.png"
-theme.layout_dwindle = configdir .. "layouts/dwindlew.png"
+theme.layout_fairh = "/usr/share/awesome/themes/default/layouts/fairhw.png"
+theme.layout_fairv = "/usr/share/awesome/themes/default/layouts/fairvw.png"
+theme.layout_floating  = "/usr/share/awesome/themes/default/layouts/floatingw.png"
+theme.layout_magnifier = "/usr/share/awesome/themes/default/layouts/magnifierw.png"
+theme.layout_max = "/usr/share/awesome/themes/default/layouts/maxw.png"
+theme.layout_fullscreen = "/usr/share/awesome/themes/default/layouts/fullscreenw.png"
+theme.layout_tilebottom = "/usr/share/awesome/themes/default/layouts/tilebottomw.png"
+theme.layout_tileleft   = "/usr/share/awesome/themes/default/layouts/tileleftw.png"
+theme.layout_tile = "/usr/share/awesome/themes/default/layouts/tilew.png"
+theme.layout_tiletop = "/usr/share/awesome/themes/default/layouts/tiletopw.png"
+theme.layout_spiral  = "/usr/share/awesome/themes/default/layouts/spiralw.png"
+theme.layout_dwindle = "/usr/share/awesome/themes/default/layouts/dwindlew.png"
 
 theme.awesome_icon = "/usr/share/awesome/icons/awesome16.png"
 
@@ -99,4 +95,4 @@ theme.awesome_icon = "/usr/share/awesome/icons/awesome16.png"
 theme.icon_theme = nil
 
 return theme
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/.homeinit b/.homeinit
index a8627977..24426dba 100755
--- a/.homeinit
+++ b/.homeinit
@@ -1,7 +1,7 @@
 #!/bin/sh
 ################################################################################
 ## Home session initialization.
-## 2012-09-09
+## 2012-12-31
 ################################################################################
 
 ## Fetch source from Git repo:
@@ -31,15 +31,6 @@ echo "==> Taskwarrior"
 ln -snf "${SOURCEDIR}/todo" "${HOME}/.task"
 echo
 
-## Awesome
-echo "==> Awesome"
-THEME_DEST="${XDG_CONFIG_HOME}/awesome/themes/custom"
-THEME_SOURCE="${XDG_DATA_DIRS}/awesome/themes/default/"
-if [ ! -e "${THEME_DEST}/background.png" ]; then
-    [ -d "${THEME_SOURCE}" ] && cp -rn ${THEME_SOURCE}/* "${THEME_DEST}"
-fi
-echo
-
 ## rtorrent
 echo "==> rtorrent"
 mkdir -p "${HOME}/.session"