--- Themes define colours, icons, and wallpapers
-beautiful.init(awful.util.getdir("config").."/themes/mlp/theme.lua")
-
--- This is used later as the default terminal and editor to run.
-terminal = "urxvtc"
-editor = os.getenv("EDITOR") or "vim"
-editor_cmd = terminal .. " -e " .. editor
-
--- Wallpaper {{{1
-if beautiful.wallpaper then
- for s = 1, screen.count() do
- gears.wallpaper.maximized(beautiful.wallpaper, s, true)
- end
+-- Themes define colours, icons, font and wallpapers.
+local gfs = require("gears.filesystem")
+local theme = os.getenv("THEME")
+local theme_path = gfs.get_dir("config").."/themes/"..theme.."/theme.lua"
+
+if not beautiful.init(theme_path) then
+ -- we failed to load the theme, load default instead
+ naughty.notify({ preset = naughty.config.presets.warning,
+ title = "Could not load theme, fallback to default",
+ text = "theme_path = '"..theme_path.."'" })
+ beautiful.init(gfs.get_themes_dir() .. "default/theme.lua")