refactor: rewrite AddIcon to AddIconByType

Huge rewrite of .htaccess file so that AddIcon are rewritten to AddIconByType for most of the file. Icon are now displayed on a real media type basis <hich is more reliable that file extension. More extensions are now supported. File extensions that are not associated to a media type are still using the old AddIcon syntax.
2025-08-23 23:23:14 +02:00 · 2019-05-27 18:17:08 +02:00
parent 917e61a6cc
commit 412d45f564
12 changed files with 451 additions and 117 deletions
--- a/2
+++ b/2
@@ -42,7 +42,7 @@ RUN groupadd -f -g 1000 me && \
 COPY --from=0 /var/www/html${apaxyPath} /usr/local/apache2/htdocs${apaxyPath}

 WORKDIR /usr/local/apache2/htdocs${apaxyPath}
-RUN for file_extension in txt mp3 mp4 7z bin bmp c xlsx iso cpp css dev docx svg ai exe gif h html ico jar jpg js md pdf php m3u png ps psd py rar rb rpm rss cmd sql tiff epub xml zip; do touch example.${file_extension}; done
+RUN for file_extension in 3dml 3ds 3g2 3gp 7z aac adp ai aif aifc aiff apk appcache asf asm asx atom au avi azw bat bin bmp bpk btif bz bz2 c cab caf cb7 cba cbr cbt cbz cc cgm class cmx com conf cpp css csv curl cxx dcurl deb def deploy dic diff dist distz djv djvu dll dmg dms doc docx dot dra dsc dtd dts dtshd dump dvb dwg dxf ecelp4800 ecelp7470 ecelp9600 elc eol eps epub etx exe f f4v f77 f90 fbs fh fh4 fh5 fh7 fhc flac fli flv flx fly for fpx fst fvt g3 gif gv gz gzip h h261 h263 h264 hh hpp htm html ico ics ief ifb in iso jad jar java jpe jpeg jpg jpgm jpgv jpm js json kar ktx latex list log lrf lvp m1v m2a m2v m3a m3u m3u8 m4a m4u m4v Makefile man mar markdown mcurl md mdb mdi me mid midi mj2 mjp2 mk3d mka mks mkv mmr mng mobi mov movie mp2 mp2a mp3 mp4 mp4a mp4v mpe mpeg mpg mpg4 mpga mpkg ms msi mxu n3 nfo npx odb odc odf odft odg odi odm odp ods odt oga ogg ogv opml otc otf otg oth oti otp ots ott p pas patch pbm pct pcx pdf pgm php phtml pic pkg pls png pnm pot ppm pps ppsx ppt pptx prc ps psd py pya pyv qt ra ram rar ras rb README rgb rip rlc rmi rmp roff rpm rss rtf rtx s s3m sass scss scurl sfv sgi sgm sgml sh sid sil smv snd so spot spx sql sub svg svgz t tar tex text tga tif tiff torrent tr tsv ttc ttf ttl txt udeb uri uris urls uu uva uvg uvh uvi uvm uvp uvs uvu uvv uvva uvvg uvvh uvvi uvvm uvvp uvvs uvvu uvvv vcard vcf vcs vcsvcf viv vob wav wax wbmp wdp weba webm webp wm wma wml wmls wmv wmx woff woff2 wvx xbm xht xhtml xif xla xlc xlm xls xlsx xlt xlw xm xml xpmxwd xsl zip; do touch example.${file_extension}; done

 # allow user 'me' to read apache's files
 RUN chown -R me:root /usr/local/apache2/ && \
--- a/README.md
+++ b/README.md
@@ -1,43 +1,40 @@
 # Apaxy

-Apaxy is a customisable theme built to enhance the experience of browsing web directories. It uses the `mod_autoindex` Apache module—and some CSS—to override the default style of a directory listing.
+apaxy is a customisable theme built to enhance the experience of browsing web directories. It uses the `mod_autoindex` Apache module - and some css - to override the default style of a directory listing.

-## Table of Contents
+## Table of contents

- [Features](#features)
- [Installation](#installation)
- [Docker images](#docker-images)
- [Apaxy themes](#apaxy-themes)
- [Mime Types](#mime-types)
- [Troubleshooting](#troubleshooting)
- [Credits](#credits)
+- [features](#features)
+- [installation](#installation)
+- [docker images](#docker-images)
+- [apaxy themes](#apaxy-themes)
+- [mime Types](#mime-types)
+- [troubleshooting](#troubleshooting)
+- [credits](#credits)

 ## Features

 Apaxy may be basic, but it gives you a great deal of creative freedom when styling your directory.

-* Style your directory listing with CSS.
-* Make it pop with Javascript or jQuery.
-* Add welcome messages, download instructions or copyright notices.
-* Add custom mime type icons (requires editing the `.htaccess` file)
-* Use custom error pages.
+* style your directory listing with css
+* make it pop with javascript
+* add welcome messages, download instructions or copyright notices
+* add custom media type icons (requires editing the `.htaccess` file)
+* use custom error pages

-_Sadly, visual style is all you can work with. It's not possible to alter the generated table structure of the listing directory with Apaxy._
+*Sadly, visual style is all you can work with. It's not possible to alter the generated table structure of the listing directory with Apaxy.*

 ## Installation

-Apaxy requires an Apache(2.2.11+) enabled HTTP server.
+apaxy requires an apache (2.2.11+) enabled http server.

 ### Quick Start
+
 If you would like, you can automate the installation of Apaxy with the included `apaxy-configure.sh` script.

-To get started, first open `apaxy.config` in your favorite editor:
+To get started, first open `apaxy.config` in your favorite editor, then edit the `apacheWebRootPath` and `installWebPath` variables to correspond to your server's settings. Save the file and exit.

-	$ vim apaxy.config
-
-Edit the WEB_ROOT and INSTALL_DIRECTORY variables to correspond to your server's settings, then save and exit.
-
-Then run the configuration script as a user that can write to the install directory. With Apache, this would be the `www-data` user:
+Then run the configuration script as a user that can write to the `installWebPath` directory. With apache under debian, this would be the `www-data` user:

 	$ sudo -u www-data ./apaxy-configure.sh

@@ -47,23 +44,23 @@ The files will be copied to the web server directory, and modified automatically

 Let's assume you have a folder named `share` in your server root directory (the path thus being `http://mywebsite.com/share`) that you'd like to use as your listing directory:

-* [Download](https://github.com/AdamWhitcroft/Apaxy/archive/master.zip) and unzip Apaxy
-* Copy and paste the contents of the `/apaxy` folder to your `/share` folder.
-* Edit `htaccess.txt` (now in the `/share` folder) and update all instances of paths marked with *{FOLDERNAME}* to point to your site root.
+- [download](https://github.com/oupala/apaxy/archive/master.zip) and unzip apaxy
+- copy and paste the contents of the `/apaxy` folder to your `/share` folder
+- edit `htaccess.txt` (now in the `/share` folder) and update all instances of paths marked with *{FOLDERNAME}* to point to your site root

 So...

-```ApacheConf
-AddIcon {FOLDERNAME}/theme/icons/gif.png .gif
+```apache
+AddIconByType (gif,{FOLDERNAME}/theme/icons/gif.png) image/gif
 ```

 Should be changed to...

-```ApacheConf
-AddIcon /share/theme/icons/gif.png .gif
+```apache
+AddIconByType (gif,/share/theme/icons/gif.png) image/gif
 ```

-* Edit `footer.html`, along with all the other `html` documents (in the `/share/theme` folder) and update all instances of paths marked with *{FOLDERNAME}* to point to your site root.
+- edit `footer.html`, along with all the other `html` documents (in the `/share/theme` folder) and update all instances of paths marked with *{FOLDERNAME}* to point to your site root

 So...

@@ -77,54 +74,51 @@ Should be changed to...
 <script src=/share/theme/apaxy.js></script>
 ```

-* Once done, rename `htaccess.txt` to `.htaccess` in the `/share` directory.
-* [Treat yo'self](http://25.media.tumblr.com/tumblr_lw7q28y0Mz1qanm80o1_500.gif), you're done.
+* once done, rename `htaccess.txt` to `.htaccess` in the `/share` directory
+* [treat yo'self](http://25.media.tumblr.com/tumblr_lw7q28y0Mz1qanm80o1_500.gif), you're done!

-## Docker images
+## Docker image

 A [local Demo](http://localhost:8080) can be started with docker.
-`docker-compose build`
-`docker-compose up`

+```bash
+docker-compose up
+```

 ## Apaxy themes

 If you'd like to alter the default Apaxy theme, look in the `/theme` folder and you'll find the following files:

-* `header.html`
-* `footer.html`
-* `style.css`
+- `header.html`
+- `footer.html`
+- `style.css`

-Edit these as you would any other HTML or CSS file.
+Edit these as you would any other html or css file.

 Adding your own icons is a little more involved. You'll need to edit the main Apaxy `.htaccess` file. Look for the following as an example:

-```ApacheConf
-AddIcon {FOLDERNAME}/theme/icons/gif.png .gif
+```apache
+AddIconByType (gif,{FOLDERNAME}/theme/icons/gif.png) image/gif
 ```

-The above rule will assign an icon named `gif.png` from the directory `{FOLDERNAME}/theme/icons/` to any file with the `.gif` extension.
+The above rule will assign an icon named `gif.png` from the directory `{FOLDERNAME}/theme/icons/` to any file whose media type is `image/gif`.

-This URL path is relative to your site's root.
+This url path is relative to your site's root.

-## Mime Types
+## Media types

-The default Apaxy theme `/themes/apaxy` has icons in place for the following mime types:
+The default apaxy theme `/themes/apaxy` has icons in place for the following media types:

-    .aif .aif .asf .asx .avi .bin .c .css .csv .dmg .doc .docm .docx .dot .dotm .eps .flv .gif 
-    .htm .html .ico .iff .jar .jpeg .jpg .js .json .log .m3u .m4a .md .mid .mov .mp3 .mp4 .mpa 
-    .mpg .msg .mwa .odt .pages .pdf .pkg .png .ps .psd .ra .rar .rb .rm .rss .rtf .shtml 
-    .sql .srt .swf .tex .tiff .txt .vob .wav .wmv .wpd .wps .xhtml .xlam .xlr .xls .xlsm .xlsx 
-    .xltm .xltx .xml .zip
+3dml 3ds 3g2 3gp 7z aac adp ai aif aifc aiff apk appcache asf asm asx atom au avi azw bat bin bmp bpk btif bz bz2 c cab caf cb7 cba cbr cbt cbz cc cgm class cmx com conf cpp css csv curl cxx dcurl deb def deploy dic diff dist distz djv djvu dll dmg dms doc docx dot dra dsc dtd dts dtshd dump dvb dwg dxf ecelp4800 ecelp7470 ecelp9600 elc eol eps epub etx exe f f4v f77 f90 fbs fh fh4 fh5 fh7 fhc flac fli flv flx fly for fpx fst fvt g3 gif gv gz gzip h h261 h263 h264 hh hpp htm html ico ics ief ifb in iso jad jar java jpe jpeg jpg jpgm jpgv jpm js json kar ktx latex list log lrf lvp m1v m2a m2v m3a m3u m3u8 m4a m4u m4v Makefile man mar markdown mcurl md mdb mdi me mid midi mj2 mjp2 mk3d mka mks mkv mmr mng mobi mov movie mp2 mp2a mp3 mp4 mp4a mp4v mpe mpeg mpg mpg4 mpga mpkg ms msi mxu n3 nfo npx odb odc odf odft odg odi odm odp ods odt oga ogg ogv opml otc otf otg oth oti otp ots ott p pas patch pbm pct pcx pdf pgm php phtml pic pkg pls png pnm pot ppm pps ppsx ppt pptx prc ps psd py pya pyv qt ra ram rar ras rb README rgb rip rlc rmi rmp roff rpm rss rtf rtx s s3m sass scss scurl sfv sgi sgm sgml sh sid sil smv snd so spot spx sql sub svg svgz t tar tex text tga tif tiff torrent tr tsv ttc ttf ttl txt udeb uri uris urls uu uva uvg uvh uvi uvm uvp uvs uvu uvv uvva uvvg uvvh uvvi uvvm uvvp uvvs uvvu uvvv vcard vcf vcs viv vob wav wax wbmp wdp weba webm webp wm wma wml wmls wmv wmx woff woff2 wvx xbm xht xhtml xif xla xlc xlm xls xlsx xlt xlw xm xml xpmxwd xsl zip

 ## Troubleshooting

-Make sure the options set in `.htaccess` files of Apaxy can actually be changed. This means that you need to allow to ovveride the used options in your apache configuration of the directory apaxy used with: `AllowOverride Indexes`
+Make sure the options set in `.htaccess` files of Apaxy can actually be changed. This means that you need to allow to override the used options in your apache configuration of the directory apaxy used with: `AllowOverride Indexes`.

-Find more information in the in the [apache documentation](https://httpd.apache.org/docs/2.2/de/mod/core.html).
+Find more information in the in the [apache documentation](https://httpd.apache.org/docs/current/mod/core.html#allowoverride).

 ## Credits

-Apaxy owes its existence to the amazing [h5ai](http://larsjung.de/h5ai/) by [Lars Jung](https://twitter.com/lrsjng). Had I not seen this, I would never have looked into making my own (probably way less useful) version.
+apaxy owes its existence to the amazing [h5ai](http://larsjung.de/h5ai/) by [Lars Jung](https://twitter.com/lrsjng). Had I not seen this, I would never have looked into making my own (probably way less useful) version.

 [Faenza Icons](http://tiheum.deviantart.com/art/Faenza-Icons-173323228) are used in the `apaxy` theme.
--- a/apaxy/htaccess.txt
+++ b/apaxy/htaccess.txt
@@ -1,30 +1,39 @@
 #
-# Apaxy by @adamwhitcroft
+# apaxy by @adamwhitcroft
 #
-# For a full breakdown of the mod_autoindex module:
+# for a full breakdown of the mod_autoindex module:
 # http://apache.org/docs/2.4/mod/mod_autoindex.html
 #

-# ENABLE INDEXING
+#
+# official media types list from IANA
+# https://www.iana.org/assignments/media-types/media-types.xhtml
+#
+# media types included in apache
+# https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
+#
+
+# enable indexing
 Options +Indexes

-# INDEX OPTIONS
-IndexOptions +Charset=UTF-8 +FancyIndexing +IgnoreCase +FoldersFirst +XHTML +HTMLTable +SuppressRules +SuppressDescription +NameWidth=* +IconsAreLinks
+# index options
+IndexOptions +Charset=UTF-8 +FancyIndexing +FoldersFirst +HTMLTable +IconsAreLinks +IgnoreCase +NameWidth=* +SuppressDescription +SuppressRules +XHTML

-# META VIEWPORT
+# meta viewport
 IndexHeadInsert "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />"

-# HIDE /theme DIRECTORY
+# hide ".htaccess" file and "/theme" directory
 IndexIgnore .htaccess /theme

+
 #
-# GENERAL ICONS (BLANK, DIRECTORY, PARENT DIRECTORY)
+# general icons (blank, directory, parent directory)
 #

 #
-# Replace {FOLDERNAME} with your directory URL eg:
-# If your directory is http://mywebsite.com/share/
-# you would change to:
+# replace {FOLDERNAME} with your directory url
+#
+# if your directory is http://mywebsite.com/share/ you would change to:
 #
 # AddIcon /share/theme/icons/blank.png ^^BLANKICON^^
 #
@@ -33,73 +42,404 @@ AddIcon {FOLDERNAME}/theme/icons/blank.png ^^BLANKICON^^
 AddIcon {FOLDERNAME}/theme/icons/folder.png ^^DIRECTORY^^
 AddIcon {FOLDERNAME}/theme/icons/folder-home.png ..

-AddIconByType (TXT,{FOLDERNAME}/theme/icons/text.png) text/*
-AddIconByType (IMG,{FOLDERNAME}/theme/icons/image.png) image/*
-AddIconByType (SND,{FOLDERNAME}/theme/icons/audio.png) audio/*
-AddIconByType (VID,{FOLDERNAME}/theme/icons/video.png) video/*
+#
+# unused icons (that should be soon removed)
+#
+# folder-open.png => maybe a js when a folder is hovered
+# folder-page.png
+#

+#
+# image
+#
+
+# ext: bmp
+AddIconByType (bmp,{FOLDERNAME}/theme/icons/bmp.png) image/bmp
+
+# ext: svg svgz
+AddIconByType (draw,{FOLDERNAME}/theme/icons/draw.png) image/svg+xml
+
+# ext: gif
+AddIconByType (gif,{FOLDERNAME}/theme/icons/gif.png) image/gif
+
+# ext: ico
+AddIconByType (ico,{FOLDERNAME}/theme/icons/ico.png) image/x-icon
+
+# ext: jpg jpeg jpe
+AddIconByType (jpg,{FOLDERNAME}/theme/icons/jpg.png) image/jpeg
+
+# ext: png
+AddIconByType (png,{FOLDERNAME}/theme/icons/png.png) image/png
+
+# ext: ai eps ps
+AddIconByType (ps,{FOLDERNAME}/theme/icons/eps.png) application/postscript
+
+# ext: psd
+AddIconByType (psd,{FOLDERNAME}/theme/icons/psd.png) image/vnd.adobe.photoshop
+
+# ext: tiff tif
+AddIconByType (tiff,{FOLDERNAME}/theme/icons/tiff.png) image/tiff
+
+# oti media type bug in apache, fallback to AddIcon
+# ext: oti
+AddIcon {FOLDERNAME}/theme/icons/image.png .oti
+
+# all other images
+# ext: bmp cgm g3 gif ief jpeg jpg jpe ktx png btif sgi svg svgz tiff tif psd uvi uvvi uvg uvvg djvu djv sub dwg dxf fbs fpx fst mmr rlc mdi wdp npx wbmp xif webp 3ds ras cmx fh fhc fh4 fh5 fh7 ico sid pcx pic pct pnm pbm pgm ppm rgb tga xbm xpmxwd
+# ext: odg
+# ext: otg
+# ext: odi
+# ext: oti
+AddIconByType (image,{FOLDERNAME}/theme/icons/image.png) image/* \
+                                                         application/vnd.oasis.opendocument.graphics \
+                                                         application/vnd.oasis.opendocument.graphics-template \
+                                                         application/vnd.oasis.opendocument.image \
+                                                         application/vnd.oasis.opendocument.image-template
+
+
+#
+# audio
+#
+
+# audio playlist
+# ext: m3u
+# ext: m3u8
+# ext: pls
+AddIconByType (playlist,{FOLDERNAME}/theme/icons/playlist.png) audio/x-mpegurl \
+                                                               application/vnd.apple.mpegurl \
+                                                               application/pls+xml
+
+# all audio
+# ext: adp au snd mid midi kar rmi m4a mp4a mpga mp2 mp2a mp3 m2a m3a oga ogg spx s3m sil uva uvva eol dra dts dtshd lvp pya ecelp4800 ecelp7470 ecelp9600 rip weba aac aif aiff aifc caf flac mka m3u wax wma xm rmp ram ra wav
+AddIconByType (audio,{FOLDERNAME}/theme/icons/audio.png) audio/*
+
+
+#
+# video
+#
+
+# audio playlist
+# ext: mxu m4u
+AddIconByType (playlist,{FOLDERNAME}/theme/icons/video.png) video/vnd.mpegurl
+
+# all video
+# ext: 3g2 3gp h261 h263 h264 jpgv jpm jpgm mj2 mjp2 mp4 mp4v mpg4 mpeg mpg mpe m1v m2v ogv qt mov uvh uvvh uvm uvvm uvp uvvp uvs uvvs uvv uvvv dvb fvt mxu m4u pyv uvu uvvu viv webm f4v fli flv m4v mkv mk3d mks mng asf asx avi vob wmv wm wmx wvx movie smv 
+AddIconByType (video,{FOLDERNAME}/theme/icons/video.png) video/*
+
+
+#
+# internet
+#
+
+# ext: html htm
+# ext: xhtml xht
+# ext: uri uris urls
+AddIconByType (html,{FOLDERNAME}/theme/icons/html.png) text/html \
+                                                       application/xhtml+xml \
+                                                       text/uri-list
+
+# ext: rss
+# ext: atom
+AddIconByType (rss,{FOLDERNAME}/theme/icons/rss.png) application/rss+xml \
+                                                     application/atom+xml
+
+# ext: ics ifb
+# ext: vcs
+AddIconByType (vcal,{FOLDERNAME}/theme/icons/vcal.png) text/calendar \
+                                                       text/x-vcalendar
+
+# ext: vcard
+# ext: vcf
+AddIconByType (vcard,{FOLDERNAME}/theme/icons/vcard.png) text/vcard \
+                                                         text/x-vcard
+
+# ext: torrent
+AddIconByType (torrent,{FOLDERNAME}/theme/icons/torrent.png) application/x-bittorrent
+
+
+#
+# office
+#
+
+# otc media type bug in apache, fallback to AddIcon
+# ext: otc
+AddIcon {FOLDERNAME}/theme/icons/calc.png .otc
+
+# ext: odc
+# ext: otc
+# ext: odf
+# ext: odft
+# ext: ods
+# ext: ots
+# ext: csv
+# ext: xls xlm xla xlc xlt xlw
+# ext: xlsx
+AddIconByType (calc,{FOLDERNAME}/theme/icons/calc.png) application/vnd.oasis.opendocument.chart \
+                                                       application/vnd.oasis.opendocument.chart-template \
+                                                       application/vnd.oasis.opendocument.formula \
+                                                       application/vnd.oasis.opendocument.formula-template \
+                                                       application/vnd.oasis.opendocument.spreadsheet \
+                                                       application/vnd.oasis.opendocument.spreadsheet-template \
+                                                       text/csv \
+                                                       application/vnd.ms-excel \
+                                                       application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+
+# ext: odt
+# ext: odm
+# ext: ott
+# ext: oth
+# ext: doc dot
+# ext: docx
+AddIconByType (doc,{FOLDERNAME}/theme/icons/doc.png) application/vnd.oasis.opendocument.text \
+                                                     application/vnd.oasis.opendocument.text-master \
+                                                     application/vnd.oasis.opendocument.text-template \
+                                                     application/vnd.oasis.opendocument.text-web \
+                                                     application/msword \
+                                                     application/vnd.openxmlformats-officedocument.wordprocessingml.document
+
+# ext: odp
+# ext: otp
+# ext: ppt pps pot
+# ext: pptx
+# ext: ppsx
+AddIconByType (slideshow,{FOLDERNAME}/theme/icons/pres.png) application/vnd.oasis.opendocument.presentation \
+                                                            application/vnd.oasis.opendocument.presentation-template \
+                                                            application/vnd.ms-powerpoint \
+\
+                                                            application/vnd.openxmlformats-officedocument.presentationml.presentation \
+                                                            application/vnd.openxmlformats-officedocument.presentationml.slideshow
+
+# ext: mdb
+# ext: odb
+AddIconByType (database,{FOLDERNAME}/theme/icons/unknown.png) application/x-msaccess \
+                                                              application/vnd.oasis.opendocument.database
+
+# ext: pdf
 AddIconByType (pdf,{FOLDERNAME}/theme/icons/pdf.png) application/pdf
-AddIconByType (zip,{FOLDERNAME}/theme/icons/zip.png) application/zip
-AddIconByType (xml,{FOLDERNAME}/theme/icons/xml.png) application/xml
-AddIconByType (doc,{FOLDERNAME}/theme/icons/doc.png) application/msword application/vnd.openxmlformats-officedocument.wordprocessingml.document application/vnd.oasis.opendocument.text
-AddIconByType (calc,{FOLDERNAME}/theme/icons/calc.png) application/vnd.ms-excel application/vnd.openxmlformats-officedocument.spreadsheetml.sheet application/vnd.oasis.opendocument.calc
+
+# ext: rtf
+AddIconByType (rtf,{FOLDERNAME}/theme/icons/rtf.png) application/rtf
+
+# ext: latex
+# ext: tex
+AddIconByType (tex,{FOLDERNAME}/theme/icons/tex.png) application/x-latex \
+                                                     application/x-tex
+

 #
-# EXTENSION SPECIFIC ICONS
+# programming
 #

-AddIcon {FOLDERNAME}/theme/icons/archive.png .7z .bz2 .cab .gz .tar
-AddIcon {FOLDERNAME}/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 {FOLDERNAME}/theme/icons/bin.png .bin .hex
-AddIcon {FOLDERNAME}/theme/icons/bmp.png .bmp
-AddIcon {FOLDERNAME}/theme/icons/c.png .c
-AddIcon {FOLDERNAME}/theme/icons/calc.png .xlsx .xlsm .xltx .xltm .xlam .xlr .xls .csv
-AddIcon {FOLDERNAME}/theme/icons/cd.png .iso
-AddIcon {FOLDERNAME}/theme/icons/cpp.png .cpp
-AddIcon {FOLDERNAME}/theme/icons/css.png .css .sass .scss
-AddIcon {FOLDERNAME}/theme/icons/deb.png .deb
-AddIcon {FOLDERNAME}/theme/icons/doc.png .doc .docx .docm .dot .dotx .dotm .log .msg .odt .pages .rtf .tex .wpd .wps
-AddIcon {FOLDERNAME}/theme/icons/draw.png .svg .svgz
-AddIcon {FOLDERNAME}/theme/icons/eps.png .ai .eps
-AddIcon {FOLDERNAME}/theme/icons/exe.png .exe
-AddIcon {FOLDERNAME}/theme/icons/gif.png .gif
+# h media type not yet included in apache, fallback to AddIcon
+# ext: h
+#AddIconByType (h,{FOLDERNAME}/theme/icons/h.png) text/x-h
 AddIcon {FOLDERNAME}/theme/icons/h.png .h
-AddIcon {FOLDERNAME}/theme/icons/html.png .html .xhtml .shtml .htm .URL .url
-AddIcon {FOLDERNAME}/theme/icons/ico.png .ico
-AddIcon {FOLDERNAME}/theme/icons/java.png .jar
-AddIcon {FOLDERNAME}/theme/icons/jpg.png .jpg .jpeg .jpe
-AddIcon {FOLDERNAME}/theme/icons/js.png .js .json
-AddIcon {FOLDERNAME}/theme/icons/markdown.png .md
-AddIcon {FOLDERNAME}/theme/icons/package.png .pkg .dmg
-AddIcon {FOLDERNAME}/theme/icons/pdf.png .pdf
+
+# hpp files do not have a specific media type, fallback to AddIcon
+# ext: hpp
+AddIcon {FOLDERNAME}/theme/icons/hpp.png .hpp
+
+# cpp files do not have a specific media type, fallback to AddIcon
+# ext: cpp
+AddIcon {FOLDERNAME}/theme/icons/cpp.png .cpp
+
+# c media type bug in apache, fallback to AddIcon
+# ext: c
+AddIcon {FOLDERNAME}/theme/icons/c.png .c
+
+# ext: c cc cxx cpp h hh dic
+AddIconByType (c,{FOLDERNAME}/theme/icons/c.png) text/x-c
+
+# ext: java
+# ext: jar
+# ext: class
+AddIconByType (java,{FOLDERNAME}/theme/icons/java.png) text/x-java-source \
+                                                       application/java-archive \
+                                                       application/java-vm
+
+# sass and scss files do not have a specific media type, fallback to AddIcon
+# ext: sass scss
+AddIcon {FOLDERNAME}/theme/icons/css.png .sass .scss
+
+# ext: css
+AddIconByType (css,{FOLDERNAME}/theme/icons/css.png) text/css
+
+# ext: js
+AddIconByType (js,{FOLDERNAME}/theme/icons/js.png) application/javascript
+
+# ext: json
+AddIconByType (json,{FOLDERNAME}/theme/icons/json.png) application/json
+
+# diff and patch files do not have a specific media type, fallback to AddIcon
+# ext: diff patch
+AddIcon {FOLDERNAME}/theme/icons/diff.png .diff .patch
+
+# makefile files do not have a specific media type, fallback to AddIcon
+# ext: Makefile
+AddIcon {FOLDERNAME}/theme/icons/makefile.png Makefile
+
+# php files do not have a specific media type, fallback to AddIcon
+# ext: php phtml
 AddIcon {FOLDERNAME}/theme/icons/php.png .php .phtml
-AddIcon {FOLDERNAME}/theme/icons/playlist.png .m3u .m3u8 .pls .pls8
-AddIcon {FOLDERNAME}/theme/icons/png.png .png
-AddIcon {FOLDERNAME}/theme/icons/ps.png .ps
-AddIcon {FOLDERNAME}/theme/icons/psd.png .psd
+
+# python files do not have a specific media type, fallback to AddIcon
+# ext: py
 AddIcon {FOLDERNAME}/theme/icons/py.png .py
-AddIcon {FOLDERNAME}/theme/icons/rar.png .rar
+
+# ruby files do not have a specific media type, fallback to AddIcon
+# ext: rb
 AddIcon {FOLDERNAME}/theme/icons/rb.png .rb
+
+# ext: sql
+AddIconByType (sql,{FOLDERNAME}/theme/icons/sql.png) application/x-sql
+
+# ext: xml xsl
+# ext: dtd
+AddIconByType (xml,{FOLDERNAME}/theme/icons/xml.png) application/xml \
+                                                     application/xml-dtd
+
+
+#
+# sysadmin
+#
+
+# pkg files do not have a specific media type, fallback to AddIcon
+# ext: pkg
+AddIcon {FOLDERNAME}/theme/icons/package.png .pkg
+
+# ext: bin dms lrf mar so dist distz pkg bpk dump elc deploy
+AddIconByType (bin,{FOLDERNAME}/theme/icons/bin.png) application/octet-stream
+
+# log files do not have a specific media type, fallback to AddIcon
+# ext: log
+AddIcon {FOLDERNAME}/theme/icons/log.png .log
+
+# ext: iso
+AddIconByType (cd,{FOLDERNAME}/theme/icons/cd.png) application/x-iso9660-image
+
+# ext: deb udeb
+AddIconByType (deb,{FOLDERNAME}/theme/icons/deb.png) application/x-debian-package
+
+# msi files do not have a specific media type, fallback to AddIcon
+# ext: msi
+AddIcon {FOLDERNAME}/theme/icons/install.png .msi
+
+# exe media type bug in apache, fallback to AddIcon
+# ext: exe
+AddIcon {FOLDERNAME}/theme/icons/exe.png .exe
+
+# ext: exe dll com bat msi
+AddIconByType (exe,{FOLDERNAME}/theme/icons/exe.png) application/x-msdownload
+
+# ext: dmg
+# ext: mpkg
+# ext: apk
+AddIconByType (package,{FOLDERNAME}/theme/icons/package.png) application/x-apple-diskimage \
+                                                             application/vnd.apple.installer+xml \
+                                                             application/vnd.android.package-archive
+
+# rpm files do not have a specific media type, fallback to AddIcon
+# ext: rpm
 AddIcon {FOLDERNAME}/theme/icons/rpm.png .rpm
-AddIcon {FOLDERNAME}/theme/icons/rss.png .rss
-AddIcon {FOLDERNAME}/theme/icons/script.png .bat .cmd .sh
-AddIcon {FOLDERNAME}/theme/icons/sql.png .sql
-AddIcon {FOLDERNAME}/theme/icons/tiff.png .tiff .tif
-AddIcon {FOLDERNAME}/theme/icons/text.png .txt .nfo .epub .mobi .azw
-AddIcon {FOLDERNAME}/theme/icons/video.png .asf .asx .avi .flv .mkv .mov .mp4 .mpg .rm .srt .swf .vob .wmv .m4v .f4v .f4p .ogv
-AddIcon {FOLDERNAME}/theme/icons/xml.png .xml
-AddIcon {FOLDERNAME}/theme/icons/zip.png .zip
+
+# ext: sh
+AddIconByType (script,{FOLDERNAME}/theme/icons/script.png) application/x-sh
+
+# otf media type bug in apache, fallback to AddIcon
+# ext: otf
+AddIcon {FOLDERNAME}/theme/icons/font.png .otf
+
+# ext: ttc otf ttf woff2 woff
+AddIconByType (font,{FOLDERNAME}/theme/icons/font.png) font/*
+
+#
+# archives
+#
+
+# gzip media type not yet included in apache, fallback to AddIcon
+# ext: gzip gz
+#AddIconByType (gzip,{FOLDERNAME}/theme/icons/gzip.png) application/gzip
+AddIcon {FOLDERNAME}/theme/icons/gzip.png .gzip .gz
+
+# ext: rar
+AddIconByType (rar,{FOLDERNAME}/theme/icons/rar.png) application/x-rar-compressed
+
+# ext: tar
+AddIconByType (tar,{FOLDERNAME}/theme/icons/tar.png) application/x-tar
+
+# ext: zip
+AddIconByType (zip,{FOLDERNAME}/theme/icons/zip.png) application/zip
+
+# ext: 7z bz bz2 cab
+AddIconByType (archive,{FOLDERNAME}/theme/icons/archive.png) application/x-7z-compressed \
+                                                         application/x-bzip \
+                                                         application/x-bzip2 \
+                                                         application/vnd.ms-cab-compressed
+
+
+#
+# books
+#
+
+# ext: cbr cba cbt cbz cb7
+AddIconByType (text,{FOLDERNAME}/theme/icons/image.png) application/x-cbr
+
+# ext: epub
+# ext: prc mobi
+# ext: azw
+AddIconByType (text,{FOLDERNAME}/theme/icons/text.png) application/epub+zip \
+                                                       application/x-mobipocket-ebook \
+                                                       application/vnd.amazon.ebook
+
+
+#
+# text
+#
+
+# readme files do not have a specific media type, fallback to AddIcon
+# ext: README
+AddIcon {FOLDERNAME}/theme/icons/readme.png README
+
+# markdown media type not yet included in apache, fallback to AddIcon
+# ext: markdown md
+#AddIconByType (markdown,{FOLDERNAME}/theme/icons/markdown.png) text/mardown
+AddIcon {FOLDERNAME}/theme/icons/markdown.png .markdown .md
+
+# conf media type bug in apache, fallback to AddIcon
+# ext: conf
+AddIcon {FOLDERNAME}/theme/icons/script.png .conf
+
+# for media type bug in apache, fallback to AddIcon
+# ext: for
+AddIcon {FOLDERNAME}/theme/icons/text.png .for
+
+# uu media type bug in apache, fallback to AddIcon
+# ext: uu
+AddIcon {FOLDERNAME}/theme/icons/text.png .uu
+
+# this directive has to be at the end of the file because the text/* media type is very generic and should not be interpreted before other more specific directives
+# ext: appcache ics ifb css csv html htm n3 txt text conf def list log in dsc rtx sgml sgm tsv t tr roff man me ms ttl uri uris urls vcard curl dcurl mcurl scurl sub fly flx gv 3dml spot jad wmls wml s asm c cc cxx cpp h hh dic f for f77 f90 java nfo opml p pas etx sfv uu vcs vcf
+AddIconByType (text,{FOLDERNAME}/theme/icons/text.png) text/*
+
+
+#
+# default
+#
+
 DefaultIcon {FOLDERNAME}/theme/icons/default.png

-#
-# THEME FILES
-#
-HeaderName {FOLDERNAME}/theme/header.html
-ReadmeName {FOLDERNAME}/theme/footer.html
-IndexStyleSheet "{FOLDERNAME}/theme/style.css"

 #
-# ERROR PAGES
+# theme files
+#
+
+HeaderName {FOLDERNAME}/theme/header.html
+ReadmeName {FOLDERNAME}/theme/footer.html
+IndexStyleSheet {FOLDERNAME}/theme/style.css
+
+
+#
+# error pages
 #

 ErrorDocument 400 {FOLDERNAME}/theme/400.html
--- a/apaxy/theme/icons/copying.png
+++ b/apaxy/theme/icons/copying.png
--- a/apaxy/theme/icons/eps.png
+++ b/apaxy/theme/icons/eps.png
--- a/apaxy/theme/icons/folder-parent-old.png
+++ b/apaxy/theme/icons/folder-parent-old.png
--- a/apaxy/theme/icons/folder-parent.png
+++ b/apaxy/theme/icons/folder-parent.png
--- a/apaxy/theme/icons/font.png
+++ b/apaxy/theme/icons/font.png
--- a/apaxy/theme/icons/ps.png
+++ b/apaxy/theme/icons/ps.png
--- a/apaxy/theme/icons/source.png
+++ b/apaxy/theme/icons/source.png
--- a/apaxy/theme/icons/torrent.png
+++ b/apaxy/theme/icons/torrent.png
--- a/apaxy/theme/icons/authors.png
+++ b/apaxy/theme/icons/authors.png