diff --git a/inspect.lua b/debug/inspect.lua
similarity index 100%
rename from inspect.lua
rename to debug/inspect.lua
diff --git a/default_config.lua b/default_config.lua
new file mode 100644
index 0000000..b9e7ed1
--- /dev/null
+++ b/default_config.lua
@@ -0,0 +1,14 @@
+-- Default configuration file
+-- Copy to TBD to override values. This file will be overridden on update.
+local awful = require("awful")
+
+
+local config = {}
+
+
+-- Theme
+-- Change to gears.filesystem.get_themes_dir() .. "default/theme.lua" to use default awesome theme
+config.theme = awful.util.getdir("config") .. "/default_theme.lua"
+
+
+return config
\ No newline at end of file
diff --git a/theme.lua b/default_theme.lua
similarity index 100%
rename from theme.lua
rename to default_theme.lua
diff --git a/rc.lua b/rc.lua
index 77b960f..5db770f 100644
--- a/rc.lua
+++ b/rc.lua
@@ -3,7 +3,7 @@
 pcall(require, "luarocks.loader")
 
 -- DEBUG
-local inspect = require("inspect")
+local inspect = require("debug/inspect")
 
 -- Standard awesome library
 local gears = require("gears")
@@ -22,6 +22,7 @@ local hotkeys_popup = require("awful.hotkeys_popup")
 require("awful.hotkeys_popup.keys")
 
 -- Simple awesome
+local config = require("default_config")
 local tiling = require("tiling")
 
 
@@ -53,7 +54,7 @@ end
 
 -- {{{ Variable definitions
 -- Themes define colours, icons, font and wallpapers.
-beautiful.init(awful.util.getdir("config") .. "/theme.lua")
+beautiful.init(config.theme)
 
 -- This is used later as the default terminal and editor to run.
 terminal = "terminator"