diff --git a/README.rst b/README.rst
index 0afee13..5c30b84 100644
--- a/README.rst
+++ b/README.rst
@@ -137,7 +137,7 @@ This way, you can safely ``git pull`` anytime.
 Notes
 =====
 
-Complements are provided by lain_.
+Complements are provided by lain_ and freedesktop_.
 
 Fonts are Terminus_ (Multicolor, Powerarrow Darker), Tamzen_ (Copland), Roboto_ (Holo, Vertex) and Tamsyn_ (other ones).
 
@@ -159,6 +159,7 @@ Additional software used: ::
 .. _swordfischer: https://github.com/copycat-killer/awesome-copycats/issues/53
 .. _foozer: http://dotshare.it/dots/499
 .. _lain: https://github.com/copycat-killer/lain
+.. _freedesktop: https://github.com/copycat-killer/freedesktop
 .. _Terminus: http://terminus-font.sourceforge.net
 .. _Tamzen: https://github.com/sunaku/tamzen-font
 .. _Roboto: https://fonts.google.com/specimen/Roboto
diff --git a/eminent/init.lua b/eminent/init.lua
deleted file mode 100644
index f48d580..0000000
--- a/eminent/init.lua
+++ /dev/null
@@ -1,54 +0,0 @@
-------------------------------------------
--- Effortless wmii-style dynamic tagging.
-------------------------------------------
--- Lucas de Vries <lucas@glacicle.org>
--- Licensed under the WTFPL version 2
---   * http://sam.zoy.org/wtfpl/COPYING
------------------------------------------
--- Cut version
------------------------------------------
-
--- Grab environment
-local ipairs = ipairs
-local awful  = require("awful")
-local table  = table
-local capi   = { screen = screen }
-
--- Eminent: Effortless wmii-style dynamic tagging
-module("eminent")
-
--- Grab the original functions we're replacing
-local deflayout = nil
-local orig = {
-    new     = awful.tag.new,
-    taglist = awful.widget.taglist.new,
-    filter  = awful.widget.taglist.filter.all,
-}
-
--- Return tags with stuff on them, mark others hidden
-function gettags(screen)
-    local tags = {}
-    for k, t in ipairs(capi.screen[screen]:tags()) do
-        if t.selected or #t:clients() > 0 then
-            awful.tag.setproperty(t, "hide", false)
-            table.insert(tags, t)
-        else
-            awful.tag.setproperty(t, "hide", true)
-        end
-    end
-
-    return tags
-end
-
--- Pre-create tags
-awful.tag.new = function (names, screen, layout)
-    deflayout = layout and layout[1] or layout
-    return orig.new(names, screen, layout)
-end
-
--- Taglist label functions
-awful.widget.taglist.filter.all = function (t, args)
-    if t.selected or #t:clients() > 0 then
-        return orig.filter(t, args)
-    end
-end
diff --git a/themes/copland/theme.lua b/themes/copland/theme.lua
index 04864f1..e6b9c0c 100644
--- a/themes/copland/theme.lua
+++ b/themes/copland/theme.lua
@@ -10,8 +10,8 @@ local gears   = require("gears")
 local lain    = require("lain")
 local awful   = require("awful")
 local wibox   = require("wibox")
-local eminent = require("eminent")
 local os      = { getenv = os.getenv, setlocale = os.setlocale }
+local awesome, client = awesome, client
 
 local theme                                     = {}
 theme.dir                                       = os.getenv("HOME") .. "/.config/awesome/themes/copland"
@@ -288,6 +288,16 @@ local spr       = wibox.widget.textbox(' ')
 local small_spr = wibox.widget.textbox(markup.font("Tamzen 4", " "))
 local bar_spr   = wibox.widget.textbox(markup.font("Tamzen 3", " ") .. markup.fontfg(theme.font, "#333333", "|") .. markup.font("Tamzen 5", " "))
 
+-- Eminent-like task filtering
+local orig_filter = awful.widget.taglist.filter.all
+
+-- Taglist label functions
+awful.widget.taglist.filter.all = function (t, args)
+    if t.selected or #t:clients() > 0 then
+        return orig_filter(t, args)
+    end
+end
+
 function theme.at_screen_connect(s)
     -- Quake application
     s.quake = lain.util.quake({ app = awful.util.terminal })