--- a/awesome/rc.lua	Sat Jun 20 16:21:25 2015 -0400
+++ b/awesome/rc.lua	Sat Jun 20 20:32:45 2015 -0400
@@ -51,7 +51,7 @@
 -- The default is a dark theme
 -- theme_path = "/usr/share/awesome/themes/default/theme.lua"
 -- Uncommment this for a lighter theme
-theme_path = "/usr/share/awesome/themes/sky/theme.lua"
+theme_path = awful.util.getdir("config") .. "/current_theme/theme.lua"
 
 -- This is used later as the default terminal and editor to run.
 terminal = "x-terminal-emulator"
@@ -76,12 +76,12 @@
 -- another modifier like Mod1, but it may interact with others.
 modkey = "Mod4"
 
-wallpaper_dir = "/home/fabien/themes/backgrounds/"
-wallpaper = wallpaper_dir .. "universalis_1024_jsh.jpg"
+wallpaper = awful.util.getdir("config") .. "/default"
+wallpaper_cmd = "fbsetbg -a " .. wallpaper
 
 -- Actually load theme
 beautiful.init(theme_path)
-beautiful.get().wallpaper_cmd = { "awsetbg -a " .. wallpaper }
+beautiful.wallpaper_cmd = { wallpaper_cmd }
 awful.util.spawn_with_shell("pgrep unagi || unagi &")
 
 
@@ -275,6 +275,8 @@
    {"manual", terminal .. " -e man awesome"},
    {"edit config",
     editor_cmd .. " " .. awful.util.getdir("config") .. "/rc.lua"},
+   {"themes", my.theme_menu()},
+   {"wallpapers", my.wallpaper_menu()},
    {"restart", awesome.restart},
    {"quit", my.quit}
 }
@@ -337,7 +339,7 @@
 local myktwidget = my.widgets.mode()
 
 for s = 1, screen.count() do
-   awful.util.spawn("awsetbg -a " .. wallpaper, false, s)
+   awful.util.spawn(wallpaper_cmd, false, s)
 
    -- status box