diff --git a/paludis/keywords.conf b/paludis/keywords.conf
index ea8fb2d..1f32ad5 100644
--- a/paludis/keywords.conf
+++ b/paludis/keywords.conf
@@ -93,30 +93,23 @@ net-im/toxic *
 media-libs/libfilteraudio *
 
 
-=sys-devel/bison-2.7.1 ~amd64
-=media-libs/xvid-1.3.2-r1 ~amd64
-=media-libs/speex-1.2_rc1-r2 ~amd64
-=media-libs/libao-1.1.0-r2 ~amd64
-=media-libs/a52dec-0.7.4-r7 ~amd64
-=dev-libs/fribidi-0.19.5-r2 ~amd64
-=media-libs/libv4l-1.0.0 ~amd64
-=media-sound/lame-3.99.5-r1 ~amd64
-=media-sound/gsm-1.0.13-r1 ~amd64
+~sys-devel/bison-2.7.1 ~amd64
+~media-libs/xvid-1.3.2 ~amd64
+~media-libs/speex-1.2_rc1 ~amd64
+~media-libs/libao-1.1.0 ~amd64
+~media-libs/a52dec-0.7.4 ~amd64
+~dev-libs/fribidi-0.19.5 ~amd64
+~media-libs/libv4l-1.0.0 ~amd64
+~media-sound/lame-3.99.5 ~amd64
+~media-sound/gsm-1.0.13 ~amd64
 
-=media-libs/faad2-2.7-r3 ~amd64
-
-
-=media-libs/glew-1.10.0-r2 ~amd64
-
-=media-libs/openjpeg-1.5.1-r1 ~amd64
-
-=media-libs/libmodplug-0.8.8.4-r1 ~amd64
-
-=media-libs/vo-aacenc-0.1.3 ~amd64
-
-=media-libs/libdv-1.0.0-r3 ~amd64
-
-=media-libs/lcms-2.5-r1 ~amd64
+~media-libs/faad2-2.7 ~amd64
+~media-libs/glew-1.10.0 ~amd64
+~media-libs/openjpeg-1.5.1 ~amd64
+~media-libs/libmodplug-0.8.8.4 ~amd64
+~media-libs/vo-aacenc-0.1.3 ~amd64
+~media-libs/libdv-1.0.0 ~amd64
+~media-libs/lcms-2.5 ~amd64
 
 dev-util/kbuild ~amd64
 sys-devel/gdb ~amd64
@@ -642,14 +635,6 @@ dev-vcs/hub ~amd64
 
 
 
-# haskell
-dev-haskell/* ~amd64
-app-vim/haskellmode ~amd64
-app-emacs/ghc-mod ~amd64
-app-text/pandoc ~amd64
-<dev-lang/ghc-7.10 ~amd64
-app-portage/hackport *
-
 
 ~dev-python/simplejson-3.6.3 ~amd64
 
@@ -787,27 +772,10 @@ dev-libs/protobuf-c ~amd64
 app-editors/texworks ~amd64
 
 
-# multilib
-app-emulation/emul-linux-x86-db ~amd64
-
 
 net-im/mu-conference ~amd64
 
-# tex
-dev-tex/minted ~amd64
-dev-tex/* ~amd64
-dev-texlive/* ~amd64
-app-text/texlive-core ~amd64
-app-text/ps2pkm ~amd64
-app-text/dvipsk ~amd64
-dev-libs/kpathsea ~amd64
-app-text/xdvipdfmx ~amd64
-app-text/dvipdfmx ~amd64
-app-text/dvipdfm ~amd64
-dev-tex/luatex ~amd64
-dev-texlive/texlive-documentation-base ~amd64
-app-text/texlive ~amd64
-app-text/texlive-core ~amd64
+
 
 
 sys-apps/memtest86+ ~amd64
diff --git a/paludis/keywords.conf.d/docker.conf b/paludis/keywords.conf.d/docker.conf
new file mode 100644
index 0000000..a17739f
--- /dev/null
+++ b/paludis/keywords.conf.d/docker.conf
@@ -0,0 +1,12 @@
+# docker
+app-emulation/docker ~amd64
+dev-go/sanitized-anchor-name ~amd64
+dev-go/blackfriday ~amd64
+dev-go/go-md2man ~amd64
+dev-python/dockerpty ~amd64
+dev-python/texttable ~amd64
+dev-python/websocket-client ~amd64
+dev-python/docker-py ~amd64
+app-emulation/docker-compose ~amd64
+dev-python/requests ~amd64
+dev-python/websocket-client ~amd64
diff --git a/paludis/keywords.conf.d/haskell.conf b/paludis/keywords.conf.d/haskell.conf
new file mode 100644
index 0000000..80623de
--- /dev/null
+++ b/paludis/keywords.conf.d/haskell.conf
@@ -0,0 +1,7 @@
+# haskell
+dev-haskell/* ~amd64
+app-vim/haskellmode ~amd64
+app-emacs/ghc-mod ~amd64
+app-text/pandoc ~amd64
+<dev-lang/ghc-7.10 ~amd64
+app-portage/hackport *
diff --git a/paludis/keywords.conf.d/tex.conf b/paludis/keywords.conf.d/tex.conf
new file mode 100644
index 0000000..595977d
--- /dev/null
+++ b/paludis/keywords.conf.d/tex.conf
@@ -0,0 +1,15 @@
+# tex
+dev-tex/minted ~amd64
+dev-tex/* ~amd64
+dev-texlive/* ~amd64
+app-text/texlive-core ~amd64
+app-text/ps2pkm ~amd64
+app-text/dvipsk ~amd64
+dev-libs/kpathsea ~amd64
+app-text/xdvipdfmx ~amd64
+app-text/dvipdfmx ~amd64
+app-text/dvipdfm ~amd64
+dev-tex/luatex ~amd64
+dev-texlive/texlive-documentation-base ~amd64
+app-text/texlive ~amd64
+app-text/texlive-core ~amd64