diff --git a/.config/awesome/btheme/theme.lua b/.config/awesome/btheme/theme.lua
index 242ab8f..c9eecbf 100644
--- a/.config/awesome/btheme/theme.lua
+++ b/.config/awesome/btheme/theme.lua
@@ -35,10 +35,10 @@ theme.border_marked = "#91231c"
 --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.taglist_squares_sel   = themedir .. "/taglist/squarefw.png"
+theme.taglist_squares_unsel = themedir .. "/taglist/squarew.png"
 
-theme.tasklist_floating_icon = confdir .. "/tasklist/floatingw.png"
+theme.tasklist_floating_icon = themedir .. "/tasklist/floatingw.png"
 
 -- Variables set for theming the menu:
 -- menu_[bg|fg]_[normal|focus]
@@ -53,45 +53,45 @@ theme.menu_width  = "100"
 --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_close_button_normal = themedir .. "/titlebar/close_normal.png"
+theme.titlebar_close_button_focus  = themedir .. "/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_ontop_button_normal_inactive = themedir .. "/titlebar/ontop_normal_inactive.png"
+theme.titlebar_ontop_button_focus_inactive  = themedir .. "/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_active = themedir .. "/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_active  = themedir .. "/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_sticky_button_normal_inactive = themedir .. "/titlebar/sticky_normal_inactive.png"
+theme.titlebar_sticky_button_focus_inactive  = themedir .. "/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_active = themedir .. "/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_active  = themedir .. "/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_floating_button_normal_inactive = themedir .. "/titlebar/floating_normal_inactive.png"
+theme.titlebar_floating_button_focus_inactive  = themedir .. "/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_active = themedir .. "/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_active  = themedir .. "/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"
+theme.titlebar_maximized_button_normal_inactive = themedir .. "/titlebar/maximized_normal_inactive.png"
+theme.titlebar_maximized_button_focus_inactive  = themedir .. "/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_active = themedir .. "/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_active  = themedir .. "/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.layout_fairh = themedir .. "/layouts/fairhw.png"
+theme.layout_fairv = themedir .. "/layouts/fairvw.png"
+theme.layout_floating  = themedir .. "/layouts/floatingw.png"
+theme.layout_magnifier = themedir .. "/layouts/magnifierw.png"
+theme.layout_max = themedir .. "/layouts/maxw.png"
+theme.layout_fullscreen = themedir .. "/layouts/fullscreenw.png"
+theme.layout_tilebottom = themedir .. "/layouts/tilebottomw.png"
+theme.layout_tileleft   = themedir .. "/layouts/tileleftw.png"
+theme.layout_tile = themedir .. "/layouts/tilew.png"
+theme.layout_tiletop = themedir .. "/layouts/tiletopw.png"
+theme.layout_spiral  = themedir .. "/layouts/spiralw.png"
+theme.layout_dwindle = themedir .. "/layouts/dwindlew.png"
 
 theme.awesome_icon = "/usr/share/awesome/icons/awesome16.png"
 
diff --git a/.puppet/x11.pp b/.puppet/x11.pp
index 892af6c..e53ffdc 100644
--- a/.puppet/x11.pp
+++ b/.puppet/x11.pp
@@ -1,6 +1,6 @@
-$packages = [ "awesome", "awesome-extra", "feh", "synapse"]
+$x11_packages = [ "awesome", "awesome-extra", "feh", "synapse"]
 
 package { 
-  $packages: 
+  $x11_packages: 
     ensure => "installed" 
 }
diff --git a/.xinitrc b/.xinitrc
index ade42ce..a594aff 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -8,5 +8,6 @@ xscreensaver -no-splash &
 synapse -s &
 nm-applet &
 gnome-sound-applet &
+synclient PalmDetect=1
 
 exec awesome