diff --git a/pkgs/applications/audio/xmms/default.nix b/pkgs/applications/audio/xmms/default.nix
index 4fe952f4b3d2..6152e325bb61 100644
--- a/pkgs/applications/audio/xmms/default.nix
+++ b/pkgs/applications/audio/xmms/default.nix
@@ -2,6 +2,7 @@
 
 stdenv.mkDerivation {
   name = "xmms-1.2.10";
+  
   src = fetchurl {
     url = http://nixos.org/tarballs/xmms-1.2.10.tar.bz2;
     md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c";
@@ -15,5 +16,6 @@ stdenv.mkDerivation {
   meta = {
     description = "A music player very similar to Winamp";
     homepage = http://www.xmms.org;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gtk-libs/2.16/atk/default.nix b/pkgs/development/libraries/atk/1.24.x.nix
similarity index 94%
rename from pkgs/development/libraries/gtk-libs/2.16/atk/default.nix
rename to pkgs/development/libraries/atk/1.24.x.nix
index 320033bad009..1ff7f388c76d 100644
--- a/pkgs/development/libraries/gtk-libs/2.16/atk/default.nix
+++ b/pkgs/development/libraries/atk/1.24.x.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, perl, glib }:
 
 stdenv.mkDerivation rec {
   name = "atk-1.24.0";
diff --git a/pkgs/development/libraries/gtk-libs/2.16/glib/default.nix b/pkgs/development/libraries/glib/2.20.x.nix
similarity index 95%
rename from pkgs/development/libraries/gtk-libs/2.16/glib/default.nix
rename to pkgs/development/libraries/glib/2.20.x.nix
index 7235ff09831e..01e70c172d16 100644
--- a/pkgs/development/libraries/gtk-libs/2.16/glib/default.nix
+++ b/pkgs/development/libraries/glib/2.20.x.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, gettext, perl }:
 
 stdenv.mkDerivation rec {
   name = "glib-2.20.1";
diff --git a/pkgs/development/libraries/gtk-libs/2.16/glibmm/default.nix b/pkgs/development/libraries/glibmm/2.18.x.nix
similarity index 89%
rename from pkgs/development/libraries/gtk-libs/2.16/glibmm/default.nix
rename to pkgs/development/libraries/glibmm/2.18.x.nix
index 952591011570..b5f8ebf7eb11 100644
--- a/pkgs/development/libraries/gtk-libs/2.16/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/2.18.x.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
 
 stdenv.mkDerivation rec {
   name = "glibmm-2.18.1";
diff --git a/pkgs/development/libraries/gtk-libs/2.16/gtk+/default.nix b/pkgs/development/libraries/gtk+/2.16.x.nix
similarity index 79%
rename from pkgs/development/libraries/gtk-libs/2.16/gtk+/default.nix
rename to pkgs/development/libraries/gtk+/2.16.x.nix
index ceeec10f9582..b9f73184087b 100644
--- a/pkgs/development/libraries/gtk-libs/2.16/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk+/2.16.x.nix
@@ -1,4 +1,7 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, perl, jasper, x11, glib, atk, pango
+, libtiff, libjpeg, libpng, cairo, xlibs
+, xineramaSupport ? true
+}:
 
 stdenv.mkDerivation rec {
   name = "gtk+-2.16.2";
@@ -11,8 +14,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig perl jasper ];
   
   propagatedBuildInputs = [
-    x11 glib atk pango libtiff libjpeg libpng cairo libXrandr
-  ] ++ stdenv.lib.optional xineramaSupport libXinerama;
+    x11 glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr
+  ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama;
     
   passthru = { inherit libtiff libjpeg libpng; };
 
diff --git a/pkgs/development/libraries/gtk-libs/2.16/default.nix b/pkgs/development/libraries/gtk-libs/2.16/default.nix
deleted file mode 100644
index 71444890e949..000000000000
--- a/pkgs/development/libraries/gtk-libs/2.16/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args: with args;
-
-rec {
-
-  glib = (import ./glib) args;
-  glib_2_21 = (import ./glib/2.21.4.nix) args;
-
-  atk = (import ./atk) (args // { inherit glib; });
-
-  pango = (import ./pango) (args // { inherit glib cairo; });
-
-  gtk = (import ./gtk+) (args // {
-    inherit glib atk pango;
-  });
-
-  glibmm = (import ./glibmm) (args // { inherit glib; });
-
-  pangomm = (import ./pangomm) (args // { inherit pango glibmm cairomm; });
-
-  gtkmm = (import ./gtkmm) (args // { inherit gtk atk glibmm pangomm; });
-}
diff --git a/pkgs/development/libraries/gtk-libs/2.16/glib/2.21.4.nix b/pkgs/development/libraries/gtk-libs/2.16/glib/2.21.4.nix
deleted file mode 100644
index aec37961ca38..000000000000
--- a/pkgs/development/libraries/gtk-libs/2.16/glib/2.21.4.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "glib-2.21.4";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/glib/2.21/${name}.tar.bz2";
-    sha256 = "b772e4bdf1b28dd23cdb4c4d7f1d219ddb748226d0207e57c75992bf0100182d";
-  };
-
-  buildInputs = [pkgconfig gettext perl];
-
-  # The nbd package depends on a static version of this library; hence
-  # the default configure flag --disable-static is switched off.
-  dontDisableStatic = true;
-  configureFlags = "--enable-static --enable-shared";
-
-  meta = {
-    description = "GLib, a C library of programming buildings blocks";
-
-    longDescription = ''
-      GLib provides the core application building blocks for libraries
-      and applications written in C.  It provides the core object
-      system used in GNOME, the main loop implementation, and a large
-      set of utility functions for strings and common data structures.
-    '';
-
-    homepage = http://www.gtk.org/;
-
-    license = "LGPLv2+";
-  };
-}
diff --git a/pkgs/development/libraries/gtk-libs/2.16/gtkmm/default.nix b/pkgs/development/libraries/gtkmm/2.14.x.nix
similarity index 92%
rename from pkgs/development/libraries/gtk-libs/2.16/gtkmm/default.nix
rename to pkgs/development/libraries/gtkmm/2.14.x.nix
index 2379dc04c120..74b234d8e4b6 100644
--- a/pkgs/development/libraries/gtk-libs/2.16/gtkmm/default.nix
+++ b/pkgs/development/libraries/gtkmm/2.14.x.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, gtk, atk, glibmm, cairomm, pangomm }:
 
 stdenv.mkDerivation rec {
   name = "gtkmm-2.14.3";
diff --git a/pkgs/development/libraries/gtk-libs/2.16/pango/default.nix b/pkgs/development/libraries/pango/1.24.x.nix
similarity index 93%
rename from pkgs/development/libraries/gtk-libs/2.16/pango/default.nix
rename to pkgs/development/libraries/pango/1.24.x.nix
index 8d8934de4bff..b2e61e6cae4e 100644
--- a/pkgs/development/libraries/gtk-libs/2.16/pango/default.nix
+++ b/pkgs/development/libraries/pango/1.24.x.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
 
 stdenv.mkDerivation rec {
   name = "pango-1.24.1";
diff --git a/pkgs/development/libraries/gtk-libs/2.16/pangomm/default.nix b/pkgs/development/libraries/pangomm/2.14.x.nix
similarity index 89%
rename from pkgs/development/libraries/gtk-libs/2.16/pangomm/default.nix
rename to pkgs/development/libraries/pangomm/2.14.x.nix
index ca43437574e5..346962c5eaa4 100644
--- a/pkgs/development/libraries/gtk-libs/2.16/pangomm/default.nix
+++ b/pkgs/development/libraries/pangomm/2.14.x.nix
@@ -1,7 +1,7 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }:
 
 stdenv.mkDerivation rec {
-  name ="pangomm-2.14.1";
+  name = "pangomm-2.14.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pangomm/2.14/${name}.tar.bz2";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c13caf29581b..d68d8be36a8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3575,11 +3575,37 @@ let
   
   };
 
-  gtkLibs216 = import ../development/libraries/gtk-libs/2.16 {
-    inherit fetchurl stdenv pkgconfig gettext perl x11 jasper
-            libtiff libjpeg libpng cairo libsigcxx cairomm;
-    inherit (xlibs) libXinerama libXrandr;
-    xineramaSupport = true;
+  gtkLibs216 = rec {
+
+    glib = import ../development/libraries/glib/2.20.x.nix {
+      inherit fetchurl stdenv pkgconfig gettext perl;
+    };
+
+    glibmm = import ../development/libraries/glibmm/2.18.x.nix {
+      inherit fetchurl stdenv pkgconfig glib libsigcxx;
+    };
+
+    atk = import ../development/libraries/atk/1.24.x.nix {
+      inherit fetchurl stdenv pkgconfig perl glib;
+    };
+
+    pango = import ../development/libraries/pango/1.24.x.nix {
+      inherit fetchurl stdenv pkgconfig gettext x11 glib cairo libpng;
+    };
+
+    pangomm = import ../development/libraries/pangomm/2.14.x.nix {
+      inherit fetchurl stdenv pkgconfig pango glibmm cairomm libpng;
+    };
+
+    gtk = import ../development/libraries/gtk+/2.16.x.nix {
+      inherit fetchurl stdenv pkgconfig perl jasper x11 glib atk pango
+        libtiff libjpeg libpng cairo xlibs;
+    };
+  
+    gtkmm = import ../development/libraries/gtkmm/2.14.x.nix {
+      inherit fetchurl stdenv pkgconfig gtk atk glibmm cairomm pangomm;
+    };
+  
   };
 
   gtkLibs218 = import ../development/libraries/gtk-libs/2.18 {