74 files changed, 89 insertions, 83 deletions

diff --git a/nixops/modules/websites/default.nix b/nixops/modules/websites/default.nix
index 7ed00db..891d917 100644
--- a/nixops/modules/websites/default.nix
+++ b/nixops/modules/websites/default.nix
@@ -305,88 +305,7 @@ in
         '';
       };
       apaxy = {
-        extraConfig = ''
-          <Macro Apaxy %{folder} %{ignored}>
-            Alias /theme ${theme_root}
-            <Directory ${theme_root}>
-              Options -Indexes
-              AllowOverride None
-              Require all granted
-            </Directory>
-
-            # mod_autoindex
-            <Directory %{folder}>
-              Options Indexes
-              AllowOverride None
-              Require all granted
-
-              # Inspired from Apaxy by @adamwhitcroft
-
-              IndexOptions +Charset=UTF-8 +FancyIndexing +IgnoreCase +FoldersFirst +XHTML +HTMLTable +SuppressRules +SuppressDescription +NameWidth=* +IconsAreLinks +ShowForbidden
-
-              IndexHeadInsert "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />"
-
-              IndexIgnoreReset ON
-              IndexIgnore /theme .htaccess %{ignored}
-
-              AddIcon /theme/icons/blank.png ^^BLANKICON^^
-              AddIcon /theme/icons/folder.png ^^DIRECTORY^^
-              AddIcon /theme/icons/folder-home.png ..
-
-              AddIconByType (TXT,/theme/icons/text.png) text/*
-              AddIconByType (IMG,/theme/icons/image.png) image/*
-              AddIconByType (SND,/theme/icons/audio.png) audio/*
-              AddIconByType (VID,/theme/icons/video.png) video/*
-
-              AddIcon /theme/icons/archive.png .7z .bz2 .cab .gz .tar
-              AddIcon /theme/icons/audio.png .aac .aif .aifc .aiff .ape .au .flac .iff .m4a .mid .mp3 .mpa .ra .wav .wma .f4a .f4b .oga .ogg .xm .it .s3m .mod
-              AddIcon /theme/icons/bin.png .bin .hex
-              AddIcon /theme/icons/bmp.png .bmp
-              AddIcon /theme/icons/c.png .c
-              AddIcon /theme/icons/calc.png .xlsx .xlsm .xltx .xltm .xlam .xlr .xls .csv
-              AddIcon /theme/icons/cd.png .iso
-              AddIcon /theme/icons/cpp.png .cpp
-              AddIcon /theme/icons/css.png .css .sass .scss
-              AddIcon /theme/icons/deb.png .deb
-              AddIcon /theme/icons/doc.png .doc .docx .docm .dot .dotx .dotm .log .msg .odt .pages .rtf .tex .wpd .wps
-              AddIcon /theme/icons/draw.png .svg .svgz
-              AddIcon /theme/icons/eps.png .ai .eps
-              AddIcon /theme/icons/exe.png .exe
-              AddIcon /theme/icons/gif.png .gif
-              AddIcon /theme/icons/h.png .h
-              AddIcon /theme/icons/html.png .html .xhtml .shtml .htm .URL .url
-              AddIcon /theme/icons/ico.png .ico
-              AddIcon /theme/icons/java.png .jar
-              AddIcon /theme/icons/jpg.png .jpg .jpeg .jpe
-              AddIcon /theme/icons/js.png .js .json
-              AddIcon /theme/icons/markdown.png .md
-              AddIcon /theme/icons/package.png .pkg .dmg
-              AddIcon /theme/icons/pdf.png .pdf
-              AddIcon /theme/icons/php.png .php .phtml
-              AddIcon /theme/icons/playlist.png .m3u .m3u8 .pls .pls8
-              AddIcon /theme/icons/png.png .png
-              AddIcon /theme/icons/ps.png .ps
-              AddIcon /theme/icons/psd.png .psd
-              AddIcon /theme/icons/py.png .py
-              AddIcon /theme/icons/rar.png .rar
-              AddIcon /theme/icons/rb.png .rb
-              AddIcon /theme/icons/rpm.png .rpm
-              AddIcon /theme/icons/rss.png .rss
-              AddIcon /theme/icons/script.png .bat .cmd .sh
-              AddIcon /theme/icons/sql.png .sql
-              AddIcon /theme/icons/tiff.png .tiff .tif
-              AddIcon /theme/icons/text.png .txt .nfo
-              AddIcon /theme/icons/video.png .asf .asx .avi .flv .mkv .mov .mp4 .mpg .rm .srt .swf .vob .wmv .m4v .f4v .f4p .ogv
-              AddIcon /theme/icons/xml.png .xml
-              AddIcon /theme/icons/zip.png .zip
-              DefaultIcon /theme/icons/default.png
-
-              HeaderName /theme/header.html
-              ReadmeName /theme/footer.html
-              IndexStyleSheet /theme/style.css
-            </Directory>
-          </Macro>
-        '';
+        extraConfig = (pkgs.webapps.apache-theme.override { inherit theme_root; }).apacheConfig;
       };
       http2 = {
         modules = [ "http2" ];
@@ -418,7 +337,7 @@ in
     in ''
       mkdir -p $out/webapps
       ln -s ${../../www} $out/webapps/_www
-      ln -s ${./apache/theme} $out/webapps/_theme
+      ln -s ${pkgs.webapps.apache-theme.theme} $out/webapps/_theme
       ln -s ${adminer.webRoot} $out/webapps/${adminer.apache.webappName}
       '';
 
diff --git a/pkgs/webapps/apache-theme/default.nix b/pkgs/webapps/apache-theme/default.nix
new file mode 100644
index 0000000..b679afe
--- /dev/null
+++ b/pkgs/webapps/apache-theme/default.nix
@@ -0,0 +1,86 @@
+{ theme_root ? null }:
+rec {
+  theme = ./theme;
+  apacheConfig = ''
+    <Macro Apaxy %{folder} %{ignored}>
+      Alias /theme ${if isNull theme_root then theme else theme_root}
+      <Directory ${if isNull theme_root then theme else theme_root}>
+        Options -Indexes
+        AllowOverride None
+        Require all granted
+      </Directory>
+
+      # mod_autoindex
+      <Directory %{folder}>
+        Options Indexes
+        AllowOverride None
+        Require all granted
+
+        # Inspired from Apaxy by @adamwhitcroft
+
+        IndexOptions +Charset=UTF-8 +FancyIndexing +IgnoreCase +FoldersFirst +XHTML +HTMLTable +SuppressRules +SuppressDescription +NameWidth=* +IconsAreLinks +ShowForbidden
+
+        IndexHeadInsert "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />"
+
+        IndexIgnoreReset ON
+        IndexIgnore /theme .htaccess %{ignored}
+
+        AddIcon /theme/icons/blank.png ^^BLANKICON^^
+        AddIcon /theme/icons/folder.png ^^DIRECTORY^^
+        AddIcon /theme/icons/folder-home.png ..
+
+        AddIconByType (TXT,/theme/icons/text.png) text/*
+        AddIconByType (IMG,/theme/icons/image.png) image/*
+        AddIconByType (SND,/theme/icons/audio.png) audio/*
+        AddIconByType (VID,/theme/icons/video.png) video/*
+
+        AddIcon /theme/icons/archive.png .7z .bz2 .cab .gz .tar
+        AddIcon /theme/icons/audio.png .aac .aif .aifc .aiff .ape .au .flac .iff .m4a .mid .mp3 .mpa .ra .wav .wma .f4a .f4b .oga .ogg .xm .it .s3m .mod
+        AddIcon /theme/icons/bin.png .bin .hex
+        AddIcon /theme/icons/bmp.png .bmp
+        AddIcon /theme/icons/c.png .c
+        AddIcon /theme/icons/calc.png .xlsx .xlsm .xltx .xltm .xlam .xlr .xls .csv
+        AddIcon /theme/icons/cd.png .iso
+        AddIcon /theme/icons/cpp.png .cpp
+        AddIcon /theme/icons/css.png .css .sass .scss
+        AddIcon /theme/icons/deb.png .deb
+        AddIcon /theme/icons/doc.png .doc .docx .docm .dot .dotx .dotm .log .msg .odt .pages .rtf .tex .wpd .wps
+        AddIcon /theme/icons/draw.png .svg .svgz
+        AddIcon /theme/icons/eps.png .ai .eps
+        AddIcon /theme/icons/exe.png .exe
+        AddIcon /theme/icons/gif.png .gif
+        AddIcon /theme/icons/h.png .h
+        AddIcon /theme/icons/html.png .html .xhtml .shtml .htm .URL .url
+        AddIcon /theme/icons/ico.png .ico
+        AddIcon /theme/icons/java.png .jar
+        AddIcon /theme/icons/jpg.png .jpg .jpeg .jpe
+        AddIcon /theme/icons/js.png .js .json
+        AddIcon /theme/icons/markdown.png .md
+        AddIcon /theme/icons/package.png .pkg .dmg
+        AddIcon /theme/icons/pdf.png .pdf
+        AddIcon /theme/icons/php.png .php .phtml
+        AddIcon /theme/icons/playlist.png .m3u .m3u8 .pls .pls8
+        AddIcon /theme/icons/png.png .png
+        AddIcon /theme/icons/ps.png .ps
+        AddIcon /theme/icons/psd.png .psd
+        AddIcon /theme/icons/py.png .py
+        AddIcon /theme/icons/rar.png .rar
+        AddIcon /theme/icons/rb.png .rb
+        AddIcon /theme/icons/rpm.png .rpm
+        AddIcon /theme/icons/rss.png .rss
+        AddIcon /theme/icons/script.png .bat .cmd .sh
+        AddIcon /theme/icons/sql.png .sql
+        AddIcon /theme/icons/tiff.png .tiff .tif
+        AddIcon /theme/icons/text.png .txt .nfo
+        AddIcon /theme/icons/video.png .asf .asx .avi .flv .mkv .mov .mp4 .mpg .rm .srt .swf .vob .wmv .m4v .f4v .f4p .ogv
+        AddIcon /theme/icons/xml.png .xml
+        AddIcon /theme/icons/zip.png .zip
+        DefaultIcon /theme/icons/default.png
+
+        HeaderName /theme/header.html
+        ReadmeName /theme/footer.html
+        IndexStyleSheet /theme/style.css
+      </Directory>
+    </Macro>
+  '';
+}
diff --git a/nixops/modules/websites/apache/theme/.htaccess b/pkgs/webapps/apache-theme/theme/.htaccess
index f9e5472..f9e5472 100644
--- a/nixops/modules/websites/apache/theme/.htaccess
+++ b/pkgs/webapps/apache-theme/theme/.htaccess
diff --git a/nixops/modules/websites/apache/theme/footer.html b/pkgs/webapps/apache-theme/theme/footer.html
index 57a2012..57a2012 100644
--- a/nixops/modules/websites/apache/theme/footer.html
+++ b/pkgs/webapps/apache-theme/theme/footer.html
diff --git a/nixops/modules/websites/apache/theme/header.html b/pkgs/webapps/apache-theme/theme/header.html
index cbded6a..cbded6a 100644
--- a/nixops/modules/websites/apache/theme/header.html
+++ b/pkgs/webapps/apache-theme/theme/header.html
diff --git a/nixops/modules/websites/apache/theme/icons/archive.png b/pkgs/webapps/apache-theme/theme/icons/archive.png
index 99ae6fc..99ae6fc 100644
--- a/nixops/modules/websites/apache/theme/icons/archive.png
+++ b/pkgs/webapps/apache-theme/theme/icons/archive.png
diff --git a/nixops/modules/websites/apache/theme/icons/audio.png b/pkgs/webapps/apache-theme/theme/icons/audio.png
index a67618d..a67618d 100644
--- a/nixops/modules/websites/apache/theme/icons/audio.png
+++ b/pkgs/webapps/apache-theme/theme/icons/audio.png
diff --git a/nixops/modules/websites/apache/theme/icons/authors.png b/pkgs/webapps/apache-theme/theme/icons/authors.png
index 78bf784..78bf784 100644
--- a/nixops/modules/websites/apache/theme/icons/authors.png
+++ b/pkgs/webapps/apache-theme/theme/icons/authors.png
diff --git a/nixops/modules/websites/apache/theme/icons/bin.png b/pkgs/webapps/apache-theme/theme/icons/bin.png
index ec2220b..ec2220b 100644
--- a/nixops/modules/websites/apache/theme/icons/bin.png
+++ b/pkgs/webapps/apache-theme/theme/icons/bin.png
diff --git a/nixops/modules/websites/apache/theme/icons/blank.png b/pkgs/webapps/apache-theme/theme/icons/blank.png
index bef1f60..bef1f60 100644
--- a/nixops/modules/websites/apache/theme/icons/blank.png
+++ b/pkgs/webapps/apache-theme/theme/icons/blank.png
diff --git a/nixops/modules/websites/apache/theme/icons/bmp.png b/pkgs/webapps/apache-theme/theme/icons/bmp.png
index c6f3044..c6f3044 100644
--- a/nixops/modules/websites/apache/theme/icons/bmp.png
+++ b/pkgs/webapps/apache-theme/theme/icons/bmp.png
diff --git a/nixops/modules/websites/apache/theme/icons/c.png b/pkgs/webapps/apache-theme/theme/icons/c.png
index 12adaa3..12adaa3 100644
--- a/nixops/modules/websites/apache/theme/icons/c.png
+++ b/pkgs/webapps/apache-theme/theme/icons/c.png
diff --git a/nixops/modules/websites/apache/theme/icons/calc.png b/pkgs/webapps/apache-theme/theme/icons/calc.png
index a034367..a034367 100644
--- a/nixops/modules/websites/apache/theme/icons/calc.png
+++ b/pkgs/webapps/apache-theme/theme/icons/calc.png
diff --git a/nixops/modules/websites/apache/theme/icons/cd.png b/pkgs/webapps/apache-theme/theme/icons/cd.png
index 3a3ffbb..3a3ffbb 100644
--- a/nixops/modules/websites/apache/theme/icons/cd.png
+++ b/pkgs/webapps/apache-theme/theme/icons/cd.png
diff --git a/nixops/modules/websites/apache/theme/icons/copying.png b/pkgs/webapps/apache-theme/theme/icons/copying.png
index 83fa06e..83fa06e 100644
--- a/nixops/modules/websites/apache/theme/icons/copying.png
+++ b/pkgs/webapps/apache-theme/theme/icons/copying.png
diff --git a/nixops/modules/websites/apache/theme/icons/cpp.png b/pkgs/webapps/apache-theme/theme/icons/cpp.png
index 47e8b1e..47e8b1e 100644
--- a/nixops/modules/websites/apache/theme/icons/cpp.png
+++ b/pkgs/webapps/apache-theme/theme/icons/cpp.png
diff --git a/nixops/modules/websites/apache/theme/icons/css.png b/pkgs/webapps/apache-theme/theme/icons/css.png
index 15f7695..15f7695 100644
--- a/nixops/modules/websites/apache/theme/icons/css.png
+++ b/pkgs/webapps/apache-theme/theme/icons/css.png
diff --git a/nixops/modules/websites/apache/theme/icons/deb.png b/pkgs/webapps/apache-theme/theme/icons/deb.png
index 1b12d29..1b12d29 100644
--- a/nixops/modules/websites/apache/theme/icons/deb.png
+++ b/pkgs/webapps/apache-theme/theme/icons/deb.png
diff --git a/nixops/modules/websites/apache/theme/icons/default.png b/pkgs/webapps/apache-theme/theme/icons/default.png
index 6997229..6997229 100644
--- a/nixops/modules/websites/apache/theme/icons/default.png
+++ b/pkgs/webapps/apache-theme/theme/icons/default.png
diff --git a/nixops/modules/websites/apache/theme/icons/diff.png b/pkgs/webapps/apache-theme/theme/icons/diff.png
index 5bef920..5bef920 100644
--- a/nixops/modules/websites/apache/theme/icons/diff.png
+++ b/pkgs/webapps/apache-theme/theme/icons/diff.png
diff --git a/nixops/modules/websites/apache/theme/icons/doc.png b/pkgs/webapps/apache-theme/theme/icons/doc.png
index 5732f9b..5732f9b 100644
--- a/nixops/modules/websites/apache/theme/icons/doc.png
+++ b/pkgs/webapps/apache-theme/theme/icons/doc.png
diff --git a/nixops/modules/websites/apache/theme/icons/draw.png b/pkgs/webapps/apache-theme/theme/icons/draw.png
index 8f1da5c..8f1da5c 100644
--- a/nixops/modules/websites/apache/theme/icons/draw.png
+++ b/pkgs/webapps/apache-theme/theme/icons/draw.png
diff --git a/nixops/modules/websites/apache/theme/icons/eps.png b/pkgs/webapps/apache-theme/theme/icons/eps.png
index 93736bb..93736bb 100644
--- a/nixops/modules/websites/apache/theme/icons/eps.png
+++ b/pkgs/webapps/apache-theme/theme/icons/eps.png
diff --git a/nixops/modules/websites/apache/theme/icons/exe.png b/pkgs/webapps/apache-theme/theme/icons/exe.png
index 31299b7..31299b7 100644
--- a/nixops/modules/websites/apache/theme/icons/exe.png
+++ b/pkgs/webapps/apache-theme/theme/icons/exe.png
diff --git a/nixops/modules/websites/apache/theme/icons/folder-home.png b/pkgs/webapps/apache-theme/theme/icons/folder-home.png
index 14fe20a..14fe20a 100644
--- a/nixops/modules/websites/apache/theme/icons/folder-home.png
+++ b/pkgs/webapps/apache-theme/theme/icons/folder-home.png
diff --git a/nixops/modules/websites/apache/theme/icons/folder-open.png b/pkgs/webapps/apache-theme/theme/icons/folder-open.png
index 2aa5cc7..2aa5cc7 100644
--- a/nixops/modules/websites/apache/theme/icons/folder-open.png
+++ b/pkgs/webapps/apache-theme/theme/icons/folder-open.png
diff --git a/nixops/modules/websites/apache/theme/icons/folder-page.png b/pkgs/webapps/apache-theme/theme/icons/folder-page.png
index 604f9ad..604f9ad 100644
--- a/nixops/modules/websites/apache/theme/icons/folder-page.png
+++ b/pkgs/webapps/apache-theme/theme/icons/folder-page.png
diff --git a/nixops/modules/websites/apache/theme/icons/folder-parent-old.png b/pkgs/webapps/apache-theme/theme/icons/folder-parent-old.png
index b82d7a9..b82d7a9 100644
--- a/nixops/modules/websites/apache/theme/icons/folder-parent-old.png
+++ b/pkgs/webapps/apache-theme/theme/icons/folder-parent-old.png
diff --git a/nixops/modules/websites/apache/theme/icons/folder-parent.png b/pkgs/webapps/apache-theme/theme/icons/folder-parent.png
index 3c964f1..3c964f1 100644
--- a/nixops/modules/websites/apache/theme/icons/folder-parent.png
+++ b/pkgs/webapps/apache-theme/theme/icons/folder-parent.png
diff --git a/nixops/modules/websites/apache/theme/icons/folder.png b/pkgs/webapps/apache-theme/theme/icons/folder.png
index 7c613e0..7c613e0 100644
--- a/nixops/modules/websites/apache/theme/icons/folder.png
+++ b/pkgs/webapps/apache-theme/theme/icons/folder.png
diff --git a/nixops/modules/websites/apache/theme/icons/gif.png b/pkgs/webapps/apache-theme/theme/icons/gif.png
index 01a2f2a..01a2f2a 100644
--- a/nixops/modules/websites/apache/theme/icons/gif.png
+++ b/pkgs/webapps/apache-theme/theme/icons/gif.png
diff --git a/nixops/modules/websites/apache/theme/icons/gzip.png b/pkgs/webapps/apache-theme/theme/icons/gzip.png
index 99ae6fc..99ae6fc 100644
--- a/nixops/modules/websites/apache/theme/icons/gzip.png
+++ b/pkgs/webapps/apache-theme/theme/icons/gzip.png
diff --git a/nixops/modules/websites/apache/theme/icons/h.png b/pkgs/webapps/apache-theme/theme/icons/h.png
index d3c7a9c..d3c7a9c 100644
--- a/nixops/modules/websites/apache/theme/icons/h.png
+++ b/pkgs/webapps/apache-theme/theme/icons/h.png
diff --git a/nixops/modules/websites/apache/theme/icons/hpp.png b/pkgs/webapps/apache-theme/theme/icons/hpp.png
index e5e52e2..e5e52e2 100644
--- a/nixops/modules/websites/apache/theme/icons/hpp.png
+++ b/pkgs/webapps/apache-theme/theme/icons/hpp.png
diff --git a/nixops/modules/websites/apache/theme/icons/html.png b/pkgs/webapps/apache-theme/theme/icons/html.png
index 2f94a78..2f94a78 100644
--- a/nixops/modules/websites/apache/theme/icons/html.png
+++ b/pkgs/webapps/apache-theme/theme/icons/html.png
diff --git a/nixops/modules/websites/apache/theme/icons/ico.png b/pkgs/webapps/apache-theme/theme/icons/ico.png
index 82227e8..82227e8 100644
--- a/nixops/modules/websites/apache/theme/icons/ico.png
+++ b/pkgs/webapps/apache-theme/theme/icons/ico.png
diff --git a/nixops/modules/websites/apache/theme/icons/image.png b/pkgs/webapps/apache-theme/theme/icons/image.png
index add1c59..add1c59 100644
--- a/nixops/modules/websites/apache/theme/icons/image.png
+++ b/pkgs/webapps/apache-theme/theme/icons/image.png
diff --git a/nixops/modules/websites/apache/theme/icons/install.png b/pkgs/webapps/apache-theme/theme/icons/install.png
index 0a9c036..0a9c036 100644
--- a/nixops/modules/websites/apache/theme/icons/install.png
+++ b/pkgs/webapps/apache-theme/theme/icons/install.png
diff --git a/nixops/modules/websites/apache/theme/icons/java.png b/pkgs/webapps/apache-theme/theme/icons/java.png
index 63b8683..63b8683 100644
--- a/nixops/modules/websites/apache/theme/icons/java.png
+++ b/pkgs/webapps/apache-theme/theme/icons/java.png
diff --git a/nixops/modules/websites/apache/theme/icons/jpg.png b/pkgs/webapps/apache-theme/theme/icons/jpg.png
index a50c99b..a50c99b 100644
--- a/nixops/modules/websites/apache/theme/icons/jpg.png
+++ b/pkgs/webapps/apache-theme/theme/icons/jpg.png
diff --git a/nixops/modules/websites/apache/theme/icons/js.png b/pkgs/webapps/apache-theme/theme/icons/js.png
index af1a475..af1a475 100644
--- a/nixops/modules/websites/apache/theme/icons/js.png
+++ b/pkgs/webapps/apache-theme/theme/icons/js.png
diff --git a/nixops/modules/websites/apache/theme/icons/json.png b/pkgs/webapps/apache-theme/theme/icons/json.png
index af1a475..af1a475 100644
--- a/nixops/modules/websites/apache/theme/icons/json.png
+++ b/pkgs/webapps/apache-theme/theme/icons/json.png
diff --git a/nixops/modules/websites/apache/theme/icons/log.png b/pkgs/webapps/apache-theme/theme/icons/log.png
index 02f1b9a..02f1b9a 100644
--- a/nixops/modules/websites/apache/theme/icons/log.png
+++ b/pkgs/webapps/apache-theme/theme/icons/log.png
diff --git a/nixops/modules/websites/apache/theme/icons/makefile.png b/pkgs/webapps/apache-theme/theme/icons/makefile.png
index f99ea4c..f99ea4c 100644
--- a/nixops/modules/websites/apache/theme/icons/makefile.png
+++ b/pkgs/webapps/apache-theme/theme/icons/makefile.png
diff --git a/nixops/modules/websites/apache/theme/icons/markdown.png b/pkgs/webapps/apache-theme/theme/icons/markdown.png
index 25c8373..25c8373 100644
--- a/nixops/modules/websites/apache/theme/icons/markdown.png
+++ b/pkgs/webapps/apache-theme/theme/icons/markdown.png
diff --git a/nixops/modules/websites/apache/theme/icons/package.png b/pkgs/webapps/apache-theme/theme/icons/package.png
index fb1343e..fb1343e 100644
--- a/nixops/modules/websites/apache/theme/icons/package.png
+++ b/pkgs/webapps/apache-theme/theme/icons/package.png
diff --git a/nixops/modules/websites/apache/theme/icons/pdf.png b/pkgs/webapps/apache-theme/theme/icons/pdf.png
index 7408d8d..7408d8d 100644
--- a/nixops/modules/websites/apache/theme/icons/pdf.png
+++ b/pkgs/webapps/apache-theme/theme/icons/pdf.png
diff --git a/nixops/modules/websites/apache/theme/icons/php.png b/pkgs/webapps/apache-theme/theme/icons/php.png
index 22c4df6..22c4df6 100644
--- a/nixops/modules/websites/apache/theme/icons/php.png
+++ b/pkgs/webapps/apache-theme/theme/icons/php.png
diff --git a/nixops/modules/websites/apache/theme/icons/playlist.png b/pkgs/webapps/apache-theme/theme/icons/playlist.png
index 8d6f281..8d6f281 100644
--- a/nixops/modules/websites/apache/theme/icons/playlist.png
+++ b/pkgs/webapps/apache-theme/theme/icons/playlist.png
diff --git a/nixops/modules/websites/apache/theme/icons/png.png b/pkgs/webapps/apache-theme/theme/icons/png.png
index 1fe1ec4..1fe1ec4 100644
--- a/nixops/modules/websites/apache/theme/icons/png.png
+++ b/pkgs/webapps/apache-theme/theme/icons/png.png
diff --git a/nixops/modules/websites/apache/theme/icons/pres.png b/pkgs/webapps/apache-theme/theme/icons/pres.png
index db195e9..db195e9 100644
--- a/nixops/modules/websites/apache/theme/icons/pres.png
+++ b/pkgs/webapps/apache-theme/theme/icons/pres.png
diff --git a/nixops/modules/websites/apache/theme/icons/ps.png b/pkgs/webapps/apache-theme/theme/icons/ps.png
index 05f3ed9..05f3ed9 100644
--- a/nixops/modules/websites/apache/theme/icons/ps.png
+++ b/pkgs/webapps/apache-theme/theme/icons/ps.png
diff --git a/nixops/modules/websites/apache/theme/icons/psd.png b/pkgs/webapps/apache-theme/theme/icons/psd.png
index 62718ee..62718ee 100644
--- a/nixops/modules/websites/apache/theme/icons/psd.png
+++ b/pkgs/webapps/apache-theme/theme/icons/psd.png
diff --git a/nixops/modules/websites/apache/theme/icons/py.png b/pkgs/webapps/apache-theme/theme/icons/py.png
index 0aaffd1..0aaffd1 100644
--- a/nixops/modules/websites/apache/theme/icons/py.png
+++ b/pkgs/webapps/apache-theme/theme/icons/py.png
diff --git a/nixops/modules/websites/apache/theme/icons/rar.png b/pkgs/webapps/apache-theme/theme/icons/rar.png
index 8a0ff54..8a0ff54 100644
--- a/nixops/modules/websites/apache/theme/icons/rar.png
+++ b/pkgs/webapps/apache-theme/theme/icons/rar.png
diff --git a/nixops/modules/websites/apache/theme/icons/rb.png b/pkgs/webapps/apache-theme/theme/icons/rb.png
index c7db42f..c7db42f 100644
--- a/nixops/modules/websites/apache/theme/icons/rb.png
+++ b/pkgs/webapps/apache-theme/theme/icons/rb.png
diff --git a/nixops/modules/websites/apache/theme/icons/readme.png b/pkgs/webapps/apache-theme/theme/icons/readme.png
index 3ae48cd..3ae48cd 100644
--- a/nixops/modules/websites/apache/theme/icons/readme.png
+++ b/pkgs/webapps/apache-theme/theme/icons/readme.png
diff --git a/nixops/modules/websites/apache/theme/icons/rpm.png b/pkgs/webapps/apache-theme/theme/icons/rpm.png
index 64699ac..64699ac 100644
--- a/nixops/modules/websites/apache/theme/icons/rpm.png
+++ b/pkgs/webapps/apache-theme/theme/icons/rpm.png
diff --git a/nixops/modules/websites/apache/theme/icons/rss.png b/pkgs/webapps/apache-theme/theme/icons/rss.png
index a1130a1..a1130a1 100644
--- a/nixops/modules/websites/apache/theme/icons/rss.png
+++ b/pkgs/webapps/apache-theme/theme/icons/rss.png
diff --git a/nixops/modules/websites/apache/theme/icons/rtf.png b/pkgs/webapps/apache-theme/theme/icons/rtf.png
index 25c8373..25c8373 100644
--- a/nixops/modules/websites/apache/theme/icons/rtf.png
+++ b/pkgs/webapps/apache-theme/theme/icons/rtf.png
diff --git a/nixops/modules/websites/apache/theme/icons/script.png b/pkgs/webapps/apache-theme/theme/icons/script.png
index 1099b5f..1099b5f 100644
--- a/nixops/modules/websites/apache/theme/icons/script.png
+++ b/pkgs/webapps/apache-theme/theme/icons/script.png
diff --git a/nixops/modules/websites/apache/theme/icons/source.png b/pkgs/webapps/apache-theme/theme/icons/source.png
index 5bef920..5bef920 100644
--- a/nixops/modules/websites/apache/theme/icons/source.png
+++ b/pkgs/webapps/apache-theme/theme/icons/source.png
diff --git a/nixops/modules/websites/apache/theme/icons/sql.png b/pkgs/webapps/apache-theme/theme/icons/sql.png
index b3b1467..b3b1467 100644
--- a/nixops/modules/websites/apache/theme/icons/sql.png
+++ b/pkgs/webapps/apache-theme/theme/icons/sql.png
diff --git a/nixops/modules/websites/apache/theme/icons/tar.png b/pkgs/webapps/apache-theme/theme/icons/tar.png
index bab3b6a..bab3b6a 100644
--- a/nixops/modules/websites/apache/theme/icons/tar.png
+++ b/pkgs/webapps/apache-theme/theme/icons/tar.png
diff --git a/nixops/modules/websites/apache/theme/icons/tex.png b/pkgs/webapps/apache-theme/theme/icons/tex.png
index 1487b25..1487b25 100644
--- a/nixops/modules/websites/apache/theme/icons/tex.png
+++ b/pkgs/webapps/apache-theme/theme/icons/tex.png
diff --git a/nixops/modules/websites/apache/theme/icons/text.png b/pkgs/webapps/apache-theme/theme/icons/text.png
index 1d48677..1d48677 100644
--- a/nixops/modules/websites/apache/theme/icons/text.png
+++ b/pkgs/webapps/apache-theme/theme/icons/text.png
diff --git a/nixops/modules/websites/apache/theme/icons/tiff.png b/pkgs/webapps/apache-theme/theme/icons/tiff.png
index 819e64c..819e64c 100644
--- a/nixops/modules/websites/apache/theme/icons/tiff.png
+++ b/pkgs/webapps/apache-theme/theme/icons/tiff.png
diff --git a/nixops/modules/websites/apache/theme/icons/unknown.png b/pkgs/webapps/apache-theme/theme/icons/unknown.png
index b1dcc3f..b1dcc3f 100644
--- a/nixops/modules/websites/apache/theme/icons/unknown.png
+++ b/pkgs/webapps/apache-theme/theme/icons/unknown.png
diff --git a/nixops/modules/websites/apache/theme/icons/vcal.png b/pkgs/webapps/apache-theme/theme/icons/vcal.png
index 3d81455..3d81455 100644
--- a/nixops/modules/websites/apache/theme/icons/vcal.png
+++ b/pkgs/webapps/apache-theme/theme/icons/vcal.png
diff --git a/nixops/modules/websites/apache/theme/icons/video.png b/pkgs/webapps/apache-theme/theme/icons/video.png
index f92f7e1..f92f7e1 100644
--- a/nixops/modules/websites/apache/theme/icons/video.png
+++ b/pkgs/webapps/apache-theme/theme/icons/video.png
diff --git a/nixops/modules/websites/apache/theme/icons/xml.png b/pkgs/webapps/apache-theme/theme/icons/xml.png
index 83a83df..83a83df 100644
--- a/nixops/modules/websites/apache/theme/icons/xml.png
+++ b/pkgs/webapps/apache-theme/theme/icons/xml.png
diff --git a/nixops/modules/websites/apache/theme/icons/zip.png b/pkgs/webapps/apache-theme/theme/icons/zip.png
index cc196c1..cc196c1 100644
--- a/nixops/modules/websites/apache/theme/icons/zip.png
+++ b/pkgs/webapps/apache-theme/theme/icons/zip.png
diff --git a/nixops/modules/websites/apache/theme/style.css b/pkgs/webapps/apache-theme/theme/style.css
index 4d25c9f..4d25c9f 100644
--- a/nixops/modules/websites/apache/theme/style.css
+++ b/pkgs/webapps/apache-theme/theme/style.css
diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 229609f..8151b8d 100644
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -1,6 +1,7 @@
 { callPackage, mylibs, composerEnv, lib }:
 rec {
   adminer = callPackage ./adminer {};
+  apache-theme = callPackage ./apache-theme {};
   awl = callPackage ./awl {};
   davical = callPackage ./davical {};
   diaspora = callPackage ./diaspora { inherit mylibs; };