diff --git a/core/start.lua b/core/start.lua
index 1496124..0330c66 100755
--- a/core/start.lua
+++ b/core/start.lua
@@ -41,6 +41,16 @@ local function start()
 	-- make_layoutbox(screen) will return a widget for the given screen.
 	local make_layoutbox = require("core.layouts.widget")
 
+	-- Quick hack to allow disabling modules.
+	-- Replace with a better system later
+	local function try_mod(module)
+		if (module == nil) then
+			return {}
+		end
+
+		return module
+	end
+
 
 	-- If timed wallpaper is enabled, load timed manager
 	if (type(beautiful.wallpaper) == "table") then
@@ -152,7 +162,7 @@ local function start()
 
 			if (modules.mpc ~= nil) then
 				rightside = gears.table.join(rightside, {
-					modules.mpc.widgets.mpc,
+					modules.mpc.widget,
 					desktop.widgets.space(5),
 					desktop.widgets.separator(2, 5, 3),
 					desktop.widgets.space(15),
@@ -163,12 +173,12 @@ local function start()
 				modules.simple_widgets.textclock,
 				desktop.widgets.space(8),
 
-				--modules.battery.widgets.battery,
-				--modules.backlight.widgets.backlight,
-				modules.volume.widgets.volume,
+				try_mod(modules.battery).widget,
+				try_mod(modules.backlight).widget,
+				try_mod(modules.volume).widget,
 				desktop.widgets.space(8),
 
-				modules.ibus.widgets.keymap,
+				try_mod(modules.ibus).widget,
 				desktop.widgets.space(8),
 
 			})
@@ -187,7 +197,7 @@ local function start()
 						desktop.widgets.space(8),
 
 
-						modules.launcher.widgets.launcher,
+						try_mod(modules.launcher).widget,
 
 						desktop.widgets.space(18),
 						s.tagger.widget.widget,
diff --git a/modules/backlight/init.lua b/modules/backlight/init.lua
index d4d127f..4f8d906 100644
--- a/modules/backlight/init.lua
+++ b/modules/backlight/init.lua
@@ -1,6 +1,4 @@
 return {
-	widgets = {
-		backlight = require("modules.backlight.widget").widget
-	},
+	widget = require("modules.backlight.widget").widget,
 	keybinds = require("modules.backlight.keybinds"),
 }
diff --git a/modules/battery/init.lua b/modules/battery/init.lua
index e53c3a3..040708d 100644
--- a/modules/battery/init.lua
+++ b/modules/battery/init.lua
@@ -1,5 +1,3 @@
 return {
-	widgets = {
-		battery = require("modules.battery.widget").widget
-	}
+	widget = require("modules.battery.widget").widget
 }
diff --git a/modules/ibus/init.lua b/modules/ibus/init.lua
index b843ffc..b237f65 100644
--- a/modules/ibus/init.lua
+++ b/modules/ibus/init.lua
@@ -1,9 +1,7 @@
 local util = require("modules.ibus.util")
 
 return {
-	widgets = {
-		keymap = require("modules.ibus.widget").widget
-	},
+	widget = require("modules.ibus.widget").widget,
 	keybinds = require("modules.ibus.keybinds"),
 
 	init = function()
diff --git a/modules/launcher/init.lua b/modules/launcher/init.lua
index 65a4f81..fe1690b 100644
--- a/modules/launcher/init.lua
+++ b/modules/launcher/init.lua
@@ -1,7 +1,4 @@
 return {
-	widgets = {
-		launcher = require("modules.launcher.widget").widget
-	},
-
+	widget = require("modules.launcher.widget").widget,
 	keybinds = require("modules.launcher.keybinds")
 }
diff --git a/modules/mpc/init.lua b/modules/mpc/init.lua
index 94c0ef3..8d17e92 100644
--- a/modules/mpc/init.lua
+++ b/modules/mpc/init.lua
@@ -1,6 +1,4 @@
 return {
-	widgets = {
-		mpc = require("modules.mpc.widget").widget
-	},
+	widget = require("modules.mpc.widget").widget,
 	keybinds = require("modules.mpc.keybinds")
 }
diff --git a/modules/volume/init.lua b/modules/volume/init.lua
index 99566b3..018abc2 100644
--- a/modules/volume/init.lua
+++ b/modules/volume/init.lua
@@ -2,9 +2,7 @@ local volume = require("modules.volume.util")
 local widget = require("modules.volume.widget")
 
 return {
-	widgets = {
-		volume = require("modules.volume.widget").widget
-	},
+	widget = require("modules.volume.widget").widget,
 	keybinds = require("modules.volume.keybinds"),
 
 	init = function ()