diff --git a/system/options.nix b/system/options.nix
index ef73fcb7ec00..2f96a4266381 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -667,7 +667,7 @@ in
       defaultTheme = mkOption {
         default = pkgs.fetchurl {
           #url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
-          url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-BabyTux.tar.bz2;
+          url = mirror://gentoo/distfiles/Theme-BabyTux.tar.bz2;
           md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
         };
         description = "
@@ -687,11 +687,7 @@ in
           }
           */
           { tty = 10;
-            theme = pkgs.fetchurl {
-              #url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
-              url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-GNU.tar.bz2;
-              md5 = "61969309d23c631e57b0a311102ef034";
-            };
+            theme = pkgs.themes "theme-gnu";
           }
         ];
         description = "