diff --git a/rc.lua b/rc.lua
index f847f56..6679c82 100644
--- a/rc.lua
+++ b/rc.lua
@@ -36,9 +36,6 @@ function loadrc(name, mod)
    return result
 end
 
--- Error handling
-loadrc("errors")
-
 -- Global configuration
 modkey = "Mod4"
 config = {}
@@ -69,6 +66,7 @@ config.hostname = awful.util.pread('uname -n'):gsub('\n', '')
 -- Remaining modules
 loadrc("xrun")			-- xrun function
 loadrc("appearance")		-- theme and appearance settings
+loadrc("errors")		-- errors and debug stuff
 
 loadrc("start")			-- programs to run on start
 loadrc("bindings")		-- keybindings
diff --git a/rc/errors.lua b/rc/errors.lua
index 8da80ff..1dc296f 100644
--- a/rc/errors.lua
+++ b/rc/errors.lua
@@ -17,10 +17,10 @@ do
 end
 
 local colors = {
-  header = "#FF004D",
-  count  = "#33FF33",
-  index = "#708090",
-  name = "#8F8870",
+  header = theme.fg_widget_clock,
+  count  = theme.fg_widget_label,
+  index  = theme.fg_widget_label,
+  name   = theme.fg_widget_value_important,
 }
 
 local function dbg_get(var, depth, indent)
diff --git a/rc/theme.lua b/rc/theme.lua
index 749a4a7..adf9282 100644
--- a/rc/theme.lua
+++ b/rc/theme.lua
@@ -1,27 +1,32 @@
 -- Small modifications to anrxc's zenburn theme
 
+local na = awful.util.color_strip_alpha
 local theme = loadrc("../themes/nice-and-clean-theme/theme")
 if theme then
    theme.wallpaper_cmd = { "/bin/true" }
    theme.font = "DejaVu Sans 9"
-   theme.border_width = 4
+
+   theme.border_width  = 4
    theme.border_normal = "#00000000"
-   theme.border_focus = "#FF7F0066"
+   theme.border_focus  = "#FF7F0066"
    theme.border_marked = theme.border_marked .. "66"
 
    theme.bg_normal        = theme.bg_normal .. "99"
    theme.bg_focus         = theme.bg_focus .. "99"
    theme.bg_urgent        = theme.bg_urgent .. "99"
    theme.bg_minimize      = theme.bg_minimize .. "99"
+
+   -- Widget stuff
    theme.bg_widget        = "#00000099"
-   theme.fg_widget_label  = "#708090"
-   theme.fg_widget_value  = "#FFFFFF"
-   theme.fg_widget_value_important  = "#FF2222"
-   theme.fg_widget_sep    = "#FFFFFF"
-   theme.fg_widget_border = "#FFFFFF"
-   theme.fg_widget_clock  = "#FF7F00"
+   theme.fg_widget_label  = "#737d8c"
+   theme.fg_widget_value  = na(theme.fg_normal)
+   theme.fg_widget_value_important  = na(theme.border_marked)
+   theme.fg_widget_sep    = na(theme.fg_normal)
+   theme.fg_widget_border = theme.fg_widget_label
+   theme.fg_widget_clock  = na(theme.border_focus)
    theme.fg_widget_end    = "#FFFFFF"
    theme.fg_widget_center = "#FFCCCC"
    theme.fg_widget_start  = "#FF0000"
+
    return theme
 end
diff --git a/rc/widgets.lua b/rc/widgets.lua
index c21c946..09f3b4c 100644
--- a/rc/widgets.lua
+++ b/rc/widgets.lua
@@ -4,7 +4,7 @@ require("vicious")
 
 -- Separator
 local separator = widget({ type = "textbox" })
-separator.text = ' <span color="' .. beautiful.fg_widget_sep .. '">|</span> '
+separator.text = ' <span color="' .. beautiful.fg_widget_sep .. '" size="small">⋆</span> '
 
 -- Date
 local datewidget = widget({ type = "textbox" })