diff --git a/.gitmodules b/.gitmodules
index f937846..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "themes/nice-and-clean-theme"]
-	path = themes/nice-and-clean-theme
-	url = https://github.com/waf/nice-and-clean-theme/
diff --git a/icons/dev.png b/icons/taglist/dev.png
similarity index 100%
rename from icons/dev.png
rename to icons/taglist/dev.png
diff --git a/icons/im.png b/icons/taglist/im.png
similarity index 100%
rename from icons/im.png
rename to icons/taglist/im.png
diff --git a/icons/main.png b/icons/taglist/main.png
similarity index 100%
rename from icons/main.png
rename to icons/taglist/main.png
diff --git a/icons/taglist/squarefw.png b/icons/taglist/squarefw.png
new file mode 100644
index 0000000..2a86430
Binary files /dev/null and b/icons/taglist/squarefw.png differ
diff --git a/icons/taglist/squarew.png b/icons/taglist/squarew.png
new file mode 100644
index 0000000..913f2ca
Binary files /dev/null and b/icons/taglist/squarew.png differ
diff --git a/icons/web.png b/icons/taglist/web.png
similarity index 100%
rename from icons/web.png
rename to icons/taglist/web.png
diff --git a/rc/tags.lua b/rc/tags.lua
index a73f1c4..656d962 100644
--- a/rc/tags.lua
+++ b/rc/tags.lua
@@ -40,7 +40,7 @@ for i = 1, #tags do
    -- Properties
    for pname, pvalue in pairs(otags[i]) do
       if pname == "icon" then
-	 awful.tag.seticon(awful.util.getdir("config") .. "/icons/" .. pvalue .. ".png", tags[i])
+	 awful.tag.seticon(awful.util.getdir("config") .. "/icons/taglist/" .. pvalue .. ".png", tags[i])
       elseif pname ~= "name" and pname ~= "layout" then
 	 awful.tag.setproperty(tags[i], pname, pvalue)
       end
diff --git a/rc/theme.lua b/rc/theme.lua
index 753533d..f8234ad 100644
--- a/rc/theme.lua
+++ b/rc/theme.lua
@@ -1,39 +1,47 @@
 -- 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 = "Terminus 8"
+local icons = awful.util.getdir("config") .. "/icons"
 
-   for n, l in pairs(theme) do
-      local layout = n:match("layout_([%w]+)")
-      if layout then
-	 theme[n] = awful.util.getdir("config") .. "/icons/layouts/" .. layout .. ".png"
-      end
-   end
+theme = {}
+theme.wallpaper_cmd = { "/bin/true" }
+theme.font = "Terminus 8"
+theme.tasklist_font = "DejaVu Sans 8"
 
-   theme.border_width  = 4
-   theme.border_normal = "#00000000"
-   theme.border_focus  = "#FF7F0066"
-   theme.border_marked = theme.border_marked .. "66"
+theme.bg_normal     = "#22222299"
+theme.bg_focus      = "#d8d8d8bb"
+theme.bg_urgent     = "#d02e5499"
+theme.bg_minimize   = "#44444499"
 
-   theme.bg_normal        = theme.bg_normal .. "99"
-   theme.bg_focus         = theme.bg_focus .. "BB"
-   theme.bg_urgent        = theme.bg_urgent .. "99"
-   theme.bg_minimize      = theme.bg_minimize .. "99"
+theme.fg_normal     = "#cccccc"
+theme.fg_focus      = "#000000"
+theme.fg_urgent     = "#ffffff"
+theme.fg_minimize   = "#ffffff"
 
-   -- Widget stuff
-   theme.bg_widget        = "#000000BB"
-   theme.fg_widget_label  = "#737d8c"
-   theme.fg_widget_value  = na(theme.fg_normal)
-   theme.fg_widget_value_important  = "#E80F28"
-   theme.fg_widget_border = theme.fg_widget_label
-   theme.fg_widget_clock  = na(theme.border_focus)
+theme.border_width  = 4
+theme.border_normal = "#00000000"
+theme.border_focus  = "#FF7F0066"
+theme.border_marked = "#91231c66"
 
-   -- Naughty
-   naughty.config.presets.normal.bg = theme.bg_widget
-   naughty.config.default_preset.font = "DejaVu Sans 10"
+-- Widget stuff
+theme.bg_widget        = "#000000BB"
+theme.fg_widget_label  = "#737d8c"
+theme.fg_widget_value  = na(theme.fg_normal)
+theme.fg_widget_value_important  = "#E80F28"
+theme.fg_widget_border = theme.fg_widget_label
+theme.fg_widget_clock  = na(theme.border_focus)
 
-   return theme
+-- Taglist
+theme.taglist_squares_sel   = icons .. "/taglist/squarefw.png"
+theme.taglist_squares_unsel = icons .. "/taglist/squarew.png"
+
+-- Layout icons
+for _, l in pairs(config.layouts) do
+   theme["layout_" .. l.name] = icons .. "/layouts/" .. l.name .. ".png"
 end
+
+-- Naughty
+naughty.config.presets.normal.bg = theme.bg_widget
+naughty.config.default_preset.font = "DejaVu Sans 10"
+
+return theme
diff --git a/themes/nice-and-clean-theme b/themes/nice-and-clean-theme
deleted file mode 160000
index 687d77a..0000000
--- a/themes/nice-and-clean-theme
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 687d77ae6c2c2cfc38ca85f226006244384560d6