diff --git a/src/_h5ai/client/js/inc/core/types.js b/src/_h5ai/client/js/inc/core/types.js
index f02f9dae..b4d765e7 100644
--- a/src/_h5ai/client/js/inc/core/types.js
+++ b/src/_h5ai/client/js/inc/core/types.js
@@ -2,25 +2,20 @@
modulejs.define('core/types', ['config', '_'], function (config, _) {
var reEndsWithSlash = /\/$/,
- reStartsWithDot = /^\./,
+ regexps = {},
- fileExts = {},
- fileNames = {},
+ escapeRegExp = function (sequence) {
+
+ return sequence.replace(/[\-\[\]\/\{\}\(\)\+\?\.\\\^\$]/g, "\\$&");
+ // return sequence.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+ },
parse = function (types) {
- _.each(types, function (matches, type) {
+ _.each(types, function (patterns, type) {
- _.each(matches, function (match) {
-
- match = match.toLowerCase();
-
- if (reStartsWithDot.test(match)) {
- fileExts[match] = type;
- } else {
- fileNames[match] = type;
- }
- });
+ var pattern = '^' + _.map(patterns, function (p) { return escapeRegExp(p).replace(/\*/g, '.*'); }).join('|') + '$';
+ regexps[type] = new RegExp(pattern, 'i');
});
},
@@ -30,14 +25,18 @@ modulejs.define('core/types', ['config', '_'], function (config, _) {
return 'folder';
}
- sequence = sequence.toLowerCase();
-
var slashidx = sequence.lastIndexOf('/'),
- name = slashidx >= 0 ? sequence.substr(slashidx + 1) : sequence,
- dotidx = sequence.lastIndexOf('.'),
- ext = dotidx >= 0 ? sequence.substr(dotidx) : sequence;
+ name = slashidx >= 0 ? sequence.substr(slashidx + 1) : sequence;
- return fileNames[name] || fileExts[ext] || 'unknown';
+ for (var type in regexps) {
+ if (regexps.hasOwnProperty(type)) {
+ if (regexps[type].test(name)) {
+ return type;
+ }
+ }
+ }
+
+ return 'file';
};
parse(_.extend({}, config.types));
diff --git a/src/_h5ai/client/themes/evolvere/icons/7zip.svg b/src/_h5ai/client/themes/evolvere/icons/ar-7z.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/7zip.svg
rename to src/_h5ai/client/themes/evolvere/icons/ar-7z.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/ace.svg b/src/_h5ai/client/themes/evolvere/icons/ar-ace.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/ace.svg
rename to src/_h5ai/client/themes/evolvere/icons/ar-ace.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/bz.svg b/src/_h5ai/client/themes/evolvere/icons/ar-bz.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/bz.svg
rename to src/_h5ai/client/themes/evolvere/icons/ar-bz.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/gzip.svg b/src/_h5ai/client/themes/evolvere/icons/ar-gz.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/gzip.svg
rename to src/_h5ai/client/themes/evolvere/icons/ar-gz.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/jar.svg b/src/_h5ai/client/themes/evolvere/icons/ar-jar.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/jar.svg
rename to src/_h5ai/client/themes/evolvere/icons/ar-jar.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/archive.svg b/src/_h5ai/client/themes/evolvere/icons/ar-pkg.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/archive.svg
rename to src/_h5ai/client/themes/evolvere/icons/ar-pkg.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/rar.svg b/src/_h5ai/client/themes/evolvere/icons/ar-rar.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/rar.svg
rename to src/_h5ai/client/themes/evolvere/icons/ar-rar.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/tar.svg b/src/_h5ai/client/themes/evolvere/icons/ar-tar.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/tar.svg
rename to src/_h5ai/client/themes/evolvere/icons/ar-tar.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/tgz.svg b/src/_h5ai/client/themes/evolvere/icons/ar-tgz.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/tgz.svg
rename to src/_h5ai/client/themes/evolvere/icons/ar-tgz.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/zip.svg b/src/_h5ai/client/themes/evolvere/icons/ar-zip.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/zip.svg
rename to src/_h5ai/client/themes/evolvere/icons/ar-zip.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/package.svg b/src/_h5ai/client/themes/evolvere/icons/ar.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/package.svg
rename to src/_h5ai/client/themes/evolvere/icons/ar.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/audio.svg b/src/_h5ai/client/themes/evolvere/icons/aud.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/audio.svg
rename to src/_h5ai/client/themes/evolvere/icons/aud.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/exe.svg b/src/_h5ai/client/themes/evolvere/icons/bin-exe.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/exe.svg
rename to src/_h5ai/client/themes/evolvere/icons/bin-exe.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/iso.svg b/src/_h5ai/client/themes/evolvere/icons/disc.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/iso.svg
rename to src/_h5ai/client/themes/evolvere/icons/disc.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/email.svg b/src/_h5ai/client/themes/evolvere/icons/email.svg
deleted file mode 100755
index 8729bc2c..00000000
--- a/src/_h5ai/client/themes/evolvere/icons/email.svg
+++ /dev/null
@@ -1,633 +0,0 @@
-
-
-
-
diff --git a/src/_h5ai/client/themes/evolvere/icons/bmp.svg b/src/_h5ai/client/themes/evolvere/icons/img-bmp.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/bmp.svg
rename to src/_h5ai/client/themes/evolvere/icons/img-bmp.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/gif.svg b/src/_h5ai/client/themes/evolvere/icons/img-gif.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/gif.svg
rename to src/_h5ai/client/themes/evolvere/icons/img-gif.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/ico.svg b/src/_h5ai/client/themes/evolvere/icons/img-ico.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/ico.svg
rename to src/_h5ai/client/themes/evolvere/icons/img-ico.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/jpg.svg b/src/_h5ai/client/themes/evolvere/icons/img-jpg.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/jpg.svg
rename to src/_h5ai/client/themes/evolvere/icons/img-jpg.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/png.svg b/src/_h5ai/client/themes/evolvere/icons/img-png.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/png.svg
rename to src/_h5ai/client/themes/evolvere/icons/img-png.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/tiff.svg b/src/_h5ai/client/themes/evolvere/icons/img-tiff.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/tiff.svg
rename to src/_h5ai/client/themes/evolvere/icons/img-tiff.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/image.svg b/src/_h5ai/client/themes/evolvere/icons/img.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/image.svg
rename to src/_h5ai/client/themes/evolvere/icons/img.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/apk.svg b/src/_h5ai/client/themes/evolvere/icons/pkg-apk.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/apk.svg
rename to src/_h5ai/client/themes/evolvere/icons/pkg-apk.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/deb.svg b/src/_h5ai/client/themes/evolvere/icons/pkg-deb.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/deb.svg
rename to src/_h5ai/client/themes/evolvere/icons/pkg-deb.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/rpm.svg b/src/_h5ai/client/themes/evolvere/icons/pkg-rpm.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/rpm.svg
rename to src/_h5ai/client/themes/evolvere/icons/pkg-rpm.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/pkg.svg b/src/_h5ai/client/themes/evolvere/icons/pkg.svg
new file mode 100755
index 00000000..d8b409f7
--- /dev/null
+++ b/src/_h5ai/client/themes/evolvere/icons/pkg.svg
@@ -0,0 +1,249 @@
+
+
+
+
diff --git a/src/_h5ai/client/themes/evolvere/icons/settings.svg b/src/_h5ai/client/themes/evolvere/icons/txt-build.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/settings.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-build.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/c.svg b/src/_h5ai/client/themes/evolvere/icons/txt-c.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/c.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-c.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/cpp.svg b/src/_h5ai/client/themes/evolvere/icons/txt-cpp.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/cpp.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-cpp.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/csv.svg b/src/_h5ai/client/themes/evolvere/icons/txt-csv.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/csv.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-csv.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/fortran.svg b/src/_h5ai/client/themes/evolvere/icons/txt-fortran.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/fortran.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-fortran.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/h.svg b/src/_h5ai/client/themes/evolvere/icons/txt-h.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/h.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-h.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/hpp.svg b/src/_h5ai/client/themes/evolvere/icons/txt-hpp.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/hpp.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-hpp.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/html.svg b/src/_h5ai/client/themes/evolvere/icons/txt-html.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/html.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-html.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/install.svg b/src/_h5ai/client/themes/evolvere/icons/txt-install.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/install.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-install.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/java.svg b/src/_h5ai/client/themes/evolvere/icons/txt-java.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/java.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-java.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/js.svg b/src/_h5ai/client/themes/evolvere/icons/txt-js.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/js.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-js.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/json.svg b/src/_h5ai/client/themes/evolvere/icons/txt-json.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/json.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-json.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/license.svg b/src/_h5ai/client/themes/evolvere/icons/txt-license.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/license.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-license.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/log.svg b/src/_h5ai/client/themes/evolvere/icons/txt-log.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/log.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-log.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/php.svg b/src/_h5ai/client/themes/evolvere/icons/txt-php.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/php.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-php.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/py.svg b/src/_h5ai/client/themes/evolvere/icons/txt-py.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/py.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-py.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/readme.svg b/src/_h5ai/client/themes/evolvere/icons/txt-readme.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/readme.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-readme.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/rss.svg b/src/_h5ai/client/themes/evolvere/icons/txt-rss.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/rss.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-rss.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/script.svg b/src/_h5ai/client/themes/evolvere/icons/txt-script.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/script.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-script.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/svg.svg b/src/_h5ai/client/themes/evolvere/icons/txt-svg.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/svg.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-svg.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/vcal.svg b/src/_h5ai/client/themes/evolvere/icons/txt-vcal.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/vcal.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-vcal.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/xml.svg b/src/_h5ai/client/themes/evolvere/icons/txt-xml.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/xml.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt-xml.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/text.svg b/src/_h5ai/client/themes/evolvere/icons/txt.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/text.svg
rename to src/_h5ai/client/themes/evolvere/icons/txt.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/video.svg b/src/_h5ai/client/themes/evolvere/icons/vid.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/video.svg
rename to src/_h5ai/client/themes/evolvere/icons/vid.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/calc.svg b/src/_h5ai/client/themes/evolvere/icons/x-calc.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/calc.svg
rename to src/_h5ai/client/themes/evolvere/icons/x-calc.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/db.svg b/src/_h5ai/client/themes/evolvere/icons/x-db.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/db.svg
rename to src/_h5ai/client/themes/evolvere/icons/x-db.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/doc.svg b/src/_h5ai/client/themes/evolvere/icons/x-doc.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/doc.svg
rename to src/_h5ai/client/themes/evolvere/icons/x-doc.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/flash.svg b/src/_h5ai/client/themes/evolvere/icons/x-flash.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/flash.svg
rename to src/_h5ai/client/themes/evolvere/icons/x-flash.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/font.svg b/src/_h5ai/client/themes/evolvere/icons/x-font.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/font.svg
rename to src/_h5ai/client/themes/evolvere/icons/x-font.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/pdf.svg b/src/_h5ai/client/themes/evolvere/icons/x-pdf.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/pdf.svg
rename to src/_h5ai/client/themes/evolvere/icons/x-pdf.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/pres.svg b/src/_h5ai/client/themes/evolvere/icons/x-pres.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/pres.svg
rename to src/_h5ai/client/themes/evolvere/icons/x-pres.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/torrent.svg b/src/_h5ai/client/themes/evolvere/icons/x-torrent.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/torrent.svg
rename to src/_h5ai/client/themes/evolvere/icons/x-torrent.svg
diff --git a/src/_h5ai/client/themes/evolvere/icons/unknown.svg b/src/_h5ai/client/themes/evolvere/icons/x.svg
similarity index 100%
rename from src/_h5ai/client/themes/evolvere/icons/unknown.svg
rename to src/_h5ai/client/themes/evolvere/icons/x.svg
diff --git a/src/_h5ai/client/themes/faenza/icons/7zip.png b/src/_h5ai/client/themes/faenza/icons/ar-7z.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/7zip.png
rename to src/_h5ai/client/themes/faenza/icons/ar-7z.png
diff --git a/src/_h5ai/client/themes/faenza/icons/ace.png b/src/_h5ai/client/themes/faenza/icons/ar-ace.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/ace.png
rename to src/_h5ai/client/themes/faenza/icons/ar-ace.png
diff --git a/src/_h5ai/client/themes/faenza/icons/gzip.png b/src/_h5ai/client/themes/faenza/icons/ar-gz.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/gzip.png
rename to src/_h5ai/client/themes/faenza/icons/ar-gz.png
diff --git a/src/_h5ai/client/themes/faenza/icons/jar.png b/src/_h5ai/client/themes/faenza/icons/ar-jar.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/jar.png
rename to src/_h5ai/client/themes/faenza/icons/ar-jar.png
diff --git a/src/_h5ai/client/themes/faenza/icons/rar.png b/src/_h5ai/client/themes/faenza/icons/ar-rar.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/rar.png
rename to src/_h5ai/client/themes/faenza/icons/ar-rar.png
diff --git a/src/_h5ai/client/themes/faenza/icons/archive.png b/src/_h5ai/client/themes/faenza/icons/ar-tar.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/archive.png
rename to src/_h5ai/client/themes/faenza/icons/ar-tar.png
diff --git a/src/_h5ai/client/themes/faenza/icons/zip.png b/src/_h5ai/client/themes/faenza/icons/ar-zip.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/zip.png
rename to src/_h5ai/client/themes/faenza/icons/ar-zip.png
diff --git a/src/_h5ai/client/themes/faenza/icons/tar.png b/src/_h5ai/client/themes/faenza/icons/ar.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/tar.png
rename to src/_h5ai/client/themes/faenza/icons/ar.png
diff --git a/src/_h5ai/client/themes/faenza/icons/mp3.png b/src/_h5ai/client/themes/faenza/icons/aud-mp3.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/mp3.png
rename to src/_h5ai/client/themes/faenza/icons/aud-mp3.png
diff --git a/src/_h5ai/client/themes/faenza/icons/ogg.png b/src/_h5ai/client/themes/faenza/icons/aud-ogg.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/ogg.png
rename to src/_h5ai/client/themes/faenza/icons/aud-ogg.png
diff --git a/src/_h5ai/client/themes/faenza/icons/playlist.png b/src/_h5ai/client/themes/faenza/icons/aud-pls.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/playlist.png
rename to src/_h5ai/client/themes/faenza/icons/aud-pls.png
diff --git a/src/_h5ai/client/themes/faenza/icons/wav.png b/src/_h5ai/client/themes/faenza/icons/aud-wav.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/wav.png
rename to src/_h5ai/client/themes/faenza/icons/aud-wav.png
diff --git a/src/_h5ai/client/themes/faenza/icons/wma.png b/src/_h5ai/client/themes/faenza/icons/aud-wma.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/wma.png
rename to src/_h5ai/client/themes/faenza/icons/aud-wma.png
diff --git a/src/_h5ai/client/themes/faenza/icons/audio.png b/src/_h5ai/client/themes/faenza/icons/aud.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/audio.png
rename to src/_h5ai/client/themes/faenza/icons/aud.png
diff --git a/src/_h5ai/client/themes/faenza/icons/exe.png b/src/_h5ai/client/themes/faenza/icons/bin-exe.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/exe.png
rename to src/_h5ai/client/themes/faenza/icons/bin-exe.png
diff --git a/src/_h5ai/client/themes/faenza/icons/cue.png b/src/_h5ai/client/themes/faenza/icons/cue.png
deleted file mode 100644
index e2aa2000..00000000
Binary files a/src/_h5ai/client/themes/faenza/icons/cue.png and /dev/null differ
diff --git a/src/_h5ai/client/themes/faenza/icons/dia.png b/src/_h5ai/client/themes/faenza/icons/dia.png
deleted file mode 100644
index ea41ca8b..00000000
Binary files a/src/_h5ai/client/themes/faenza/icons/dia.png and /dev/null differ
diff --git a/src/_h5ai/client/themes/faenza/icons/cd.png b/src/_h5ai/client/themes/faenza/icons/disc.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/cd.png
rename to src/_h5ai/client/themes/faenza/icons/disc.png
diff --git a/src/_h5ai/client/themes/faenza/icons/encrypted.png b/src/_h5ai/client/themes/faenza/icons/encrypted.png
deleted file mode 100644
index 7325b5d4..00000000
Binary files a/src/_h5ai/client/themes/faenza/icons/encrypted.png and /dev/null differ
diff --git a/src/_h5ai/client/themes/faenza/icons/glade.png b/src/_h5ai/client/themes/faenza/icons/glade.png
deleted file mode 100644
index b5f2467e..00000000
Binary files a/src/_h5ai/client/themes/faenza/icons/glade.png and /dev/null differ
diff --git a/src/_h5ai/client/themes/faenza/icons/bmp.png b/src/_h5ai/client/themes/faenza/icons/img-bmp.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/bmp.png
rename to src/_h5ai/client/themes/faenza/icons/img-bmp.png
diff --git a/src/_h5ai/client/themes/faenza/icons/gif.png b/src/_h5ai/client/themes/faenza/icons/img-gif.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/gif.png
rename to src/_h5ai/client/themes/faenza/icons/img-gif.png
diff --git a/src/_h5ai/client/themes/faenza/icons/ico.png b/src/_h5ai/client/themes/faenza/icons/img-ico.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/ico.png
rename to src/_h5ai/client/themes/faenza/icons/img-ico.png
diff --git a/src/_h5ai/client/themes/faenza/icons/jpg.png b/src/_h5ai/client/themes/faenza/icons/img-jpg.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/jpg.png
rename to src/_h5ai/client/themes/faenza/icons/img-jpg.png
diff --git a/src/_h5ai/client/themes/faenza/icons/png.png b/src/_h5ai/client/themes/faenza/icons/img-png.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/png.png
rename to src/_h5ai/client/themes/faenza/icons/img-png.png
diff --git a/src/_h5ai/client/themes/faenza/icons/tiff.png b/src/_h5ai/client/themes/faenza/icons/img-tiff.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/tiff.png
rename to src/_h5ai/client/themes/faenza/icons/img-tiff.png
diff --git a/src/_h5ai/client/themes/faenza/icons/xcf.png b/src/_h5ai/client/themes/faenza/icons/img-xcf.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/xcf.png
rename to src/_h5ai/client/themes/faenza/icons/img-xcf.png
diff --git a/src/_h5ai/client/themes/faenza/icons/image.png b/src/_h5ai/client/themes/faenza/icons/img.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/image.png
rename to src/_h5ai/client/themes/faenza/icons/img.png
diff --git a/src/_h5ai/client/themes/faenza/icons/message.png b/src/_h5ai/client/themes/faenza/icons/message.png
deleted file mode 100644
index 5ee14d95..00000000
Binary files a/src/_h5ai/client/themes/faenza/icons/message.png and /dev/null differ
diff --git a/src/_h5ai/client/themes/faenza/icons/deb.png b/src/_h5ai/client/themes/faenza/icons/pkg-deb.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/deb.png
rename to src/_h5ai/client/themes/faenza/icons/pkg-deb.png
diff --git a/src/_h5ai/client/themes/faenza/icons/rpm.png b/src/_h5ai/client/themes/faenza/icons/pkg-rpm.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/rpm.png
rename to src/_h5ai/client/themes/faenza/icons/pkg-rpm.png
diff --git a/src/_h5ai/client/themes/faenza/icons/package.png b/src/_h5ai/client/themes/faenza/icons/pkg.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/package.png
rename to src/_h5ai/client/themes/faenza/icons/pkg.png
diff --git a/src/_h5ai/client/themes/faenza/icons/sql.png b/src/_h5ai/client/themes/faenza/icons/sql.png
deleted file mode 100644
index e897b242..00000000
Binary files a/src/_h5ai/client/themes/faenza/icons/sql.png and /dev/null differ
diff --git a/src/_h5ai/client/themes/faenza/icons/tex-bib.png b/src/_h5ai/client/themes/faenza/icons/tex-bib.png
deleted file mode 100644
index 22ca5e7b..00000000
Binary files a/src/_h5ai/client/themes/faenza/icons/tex-bib.png and /dev/null differ
diff --git a/src/_h5ai/client/themes/faenza/icons/theme.png b/src/_h5ai/client/themes/faenza/icons/theme.png
deleted file mode 100644
index dd0d6386..00000000
Binary files a/src/_h5ai/client/themes/faenza/icons/theme.png and /dev/null differ
diff --git a/src/_h5ai/client/themes/faenza/icons/authors.png b/src/_h5ai/client/themes/faenza/icons/txt-authors.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/authors.png
rename to src/_h5ai/client/themes/faenza/icons/txt-authors.png
diff --git a/src/_h5ai/client/themes/faenza/icons/makefile.png b/src/_h5ai/client/themes/faenza/icons/txt-build.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/makefile.png
rename to src/_h5ai/client/themes/faenza/icons/txt-build.png
diff --git a/src/_h5ai/client/themes/faenza/icons/c.png b/src/_h5ai/client/themes/faenza/icons/txt-c.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/c.png
rename to src/_h5ai/client/themes/faenza/icons/txt-c.png
diff --git a/src/_h5ai/client/themes/faenza/icons/cpp.png b/src/_h5ai/client/themes/faenza/icons/txt-cpp.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/cpp.png
rename to src/_h5ai/client/themes/faenza/icons/txt-cpp.png
diff --git a/src/_h5ai/client/themes/faenza/icons/css.png b/src/_h5ai/client/themes/faenza/icons/txt-css.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/css.png
rename to src/_h5ai/client/themes/faenza/icons/txt-css.png
diff --git a/src/_h5ai/client/themes/faenza/icons/diff.png b/src/_h5ai/client/themes/faenza/icons/txt-diff.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/diff.png
rename to src/_h5ai/client/themes/faenza/icons/txt-diff.png
diff --git a/src/_h5ai/client/themes/faenza/icons/h.png b/src/_h5ai/client/themes/faenza/icons/txt-h.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/h.png
rename to src/_h5ai/client/themes/faenza/icons/txt-h.png
diff --git a/src/_h5ai/client/themes/faenza/icons/hpp.png b/src/_h5ai/client/themes/faenza/icons/txt-hpp.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/hpp.png
rename to src/_h5ai/client/themes/faenza/icons/txt-hpp.png
diff --git a/src/_h5ai/client/themes/faenza/icons/html.png b/src/_h5ai/client/themes/faenza/icons/txt-html.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/html.png
rename to src/_h5ai/client/themes/faenza/icons/txt-html.png
diff --git a/src/_h5ai/client/themes/faenza/icons/install.png b/src/_h5ai/client/themes/faenza/icons/txt-install.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/install.png
rename to src/_h5ai/client/themes/faenza/icons/txt-install.png
diff --git a/src/_h5ai/client/themes/faenza/icons/java.png b/src/_h5ai/client/themes/faenza/icons/txt-java.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/java.png
rename to src/_h5ai/client/themes/faenza/icons/txt-java.png
diff --git a/src/_h5ai/client/themes/faenza/icons/js.png b/src/_h5ai/client/themes/faenza/icons/txt-js.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/js.png
rename to src/_h5ai/client/themes/faenza/icons/txt-js.png
diff --git a/src/_h5ai/client/themes/faenza/icons/json.png b/src/_h5ai/client/themes/faenza/icons/txt-json.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/json.png
rename to src/_h5ai/client/themes/faenza/icons/txt-json.png
diff --git a/src/_h5ai/client/themes/faenza/icons/copying.png b/src/_h5ai/client/themes/faenza/icons/txt-license.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/copying.png
rename to src/_h5ai/client/themes/faenza/icons/txt-license.png
diff --git a/src/_h5ai/client/themes/faenza/icons/log.png b/src/_h5ai/client/themes/faenza/icons/txt-log.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/log.png
rename to src/_h5ai/client/themes/faenza/icons/txt-log.png
diff --git a/src/_h5ai/client/themes/faenza/icons/markdown.png b/src/_h5ai/client/themes/faenza/icons/txt-md.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/markdown.png
rename to src/_h5ai/client/themes/faenza/icons/txt-md.png
diff --git a/src/_h5ai/client/themes/faenza/icons/php.png b/src/_h5ai/client/themes/faenza/icons/txt-php.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/php.png
rename to src/_h5ai/client/themes/faenza/icons/txt-php.png
diff --git a/src/_h5ai/client/themes/faenza/icons/py.png b/src/_h5ai/client/themes/faenza/icons/txt-py.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/py.png
rename to src/_h5ai/client/themes/faenza/icons/txt-py.png
diff --git a/src/_h5ai/client/themes/faenza/icons/rb.png b/src/_h5ai/client/themes/faenza/icons/txt-rb.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/rb.png
rename to src/_h5ai/client/themes/faenza/icons/txt-rb.png
diff --git a/src/_h5ai/client/themes/faenza/icons/readme.png b/src/_h5ai/client/themes/faenza/icons/txt-readme.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/readme.png
rename to src/_h5ai/client/themes/faenza/icons/txt-readme.png
diff --git a/src/_h5ai/client/themes/faenza/icons/rss.png b/src/_h5ai/client/themes/faenza/icons/txt-rss.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/rss.png
rename to src/_h5ai/client/themes/faenza/icons/txt-rss.png
diff --git a/src/_h5ai/client/themes/faenza/icons/rtf.png b/src/_h5ai/client/themes/faenza/icons/txt-rtf.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/rtf.png
rename to src/_h5ai/client/themes/faenza/icons/txt-rtf.png
diff --git a/src/_h5ai/client/themes/faenza/icons/script.png b/src/_h5ai/client/themes/faenza/icons/txt-script.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/script.png
rename to src/_h5ai/client/themes/faenza/icons/txt-script.png
diff --git a/src/_h5ai/client/themes/faenza/icons/source.png b/src/_h5ai/client/themes/faenza/icons/txt-source.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/source.png
rename to src/_h5ai/client/themes/faenza/icons/txt-source.png
diff --git a/src/_h5ai/client/themes/faenza/icons/draw.png b/src/_h5ai/client/themes/faenza/icons/txt-svg.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/draw.png
rename to src/_h5ai/client/themes/faenza/icons/txt-svg.png
diff --git a/src/_h5ai/client/themes/faenza/icons/tex.png b/src/_h5ai/client/themes/faenza/icons/txt-tex.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/tex.png
rename to src/_h5ai/client/themes/faenza/icons/txt-tex.png
diff --git a/src/_h5ai/client/themes/faenza/icons/vcal.png b/src/_h5ai/client/themes/faenza/icons/txt-vcal.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/vcal.png
rename to src/_h5ai/client/themes/faenza/icons/txt-vcal.png
diff --git a/src/_h5ai/client/themes/faenza/icons/xml.png b/src/_h5ai/client/themes/faenza/icons/txt-xml.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/xml.png
rename to src/_h5ai/client/themes/faenza/icons/txt-xml.png
diff --git a/src/_h5ai/client/themes/faenza/icons/text.png b/src/_h5ai/client/themes/faenza/icons/txt.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/text.png
rename to src/_h5ai/client/themes/faenza/icons/txt.png
diff --git a/src/_h5ai/client/themes/faenza/icons/video.png b/src/_h5ai/client/themes/faenza/icons/vid.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/video.png
rename to src/_h5ai/client/themes/faenza/icons/vid.png
diff --git a/src/_h5ai/client/themes/faenza/icons/calc.png b/src/_h5ai/client/themes/faenza/icons/x-calc.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/calc.png
rename to src/_h5ai/client/themes/faenza/icons/x-calc.png
diff --git a/src/_h5ai/client/themes/faenza/icons/doc.png b/src/_h5ai/client/themes/faenza/icons/x-doc.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/doc.png
rename to src/_h5ai/client/themes/faenza/icons/x-doc.png
diff --git a/src/_h5ai/client/themes/faenza/icons/svg.png b/src/_h5ai/client/themes/faenza/icons/x-draw.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/svg.png
rename to src/_h5ai/client/themes/faenza/icons/x-draw.png
diff --git a/src/_h5ai/client/themes/faenza/icons/eps.png b/src/_h5ai/client/themes/faenza/icons/x-eps.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/eps.png
rename to src/_h5ai/client/themes/faenza/icons/x-eps.png
diff --git a/src/_h5ai/client/themes/faenza/icons/flash.png b/src/_h5ai/client/themes/faenza/icons/x-flash.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/flash.png
rename to src/_h5ai/client/themes/faenza/icons/x-flash.png
diff --git a/src/_h5ai/client/themes/faenza/icons/font.png b/src/_h5ai/client/themes/faenza/icons/x-font.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/font.png
rename to src/_h5ai/client/themes/faenza/icons/x-font.png
diff --git a/src/_h5ai/client/themes/faenza/icons/pdf.png b/src/_h5ai/client/themes/faenza/icons/x-pdf.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/pdf.png
rename to src/_h5ai/client/themes/faenza/icons/x-pdf.png
diff --git a/src/_h5ai/client/themes/faenza/icons/pgp.png b/src/_h5ai/client/themes/faenza/icons/x-pgp.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/pgp.png
rename to src/_h5ai/client/themes/faenza/icons/x-pgp.png
diff --git a/src/_h5ai/client/themes/faenza/icons/pres.png b/src/_h5ai/client/themes/faenza/icons/x-pres.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/pres.png
rename to src/_h5ai/client/themes/faenza/icons/x-pres.png
diff --git a/src/_h5ai/client/themes/faenza/icons/ps.png b/src/_h5ai/client/themes/faenza/icons/x-ps.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/ps.png
rename to src/_h5ai/client/themes/faenza/icons/x-ps.png
diff --git a/src/_h5ai/client/themes/faenza/icons/psd.png b/src/_h5ai/client/themes/faenza/icons/x-psd.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/psd.png
rename to src/_h5ai/client/themes/faenza/icons/x-psd.png
diff --git a/src/_h5ai/client/themes/faenza/icons/torrent.png b/src/_h5ai/client/themes/faenza/icons/x-torrent.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/torrent.png
rename to src/_h5ai/client/themes/faenza/icons/x-torrent.png
diff --git a/src/_h5ai/client/themes/faenza/icons/unknown.png b/src/_h5ai/client/themes/faenza/icons/x.png
similarity index 100%
rename from src/_h5ai/client/themes/faenza/icons/unknown.png
rename to src/_h5ai/client/themes/faenza/icons/x.png
diff --git a/src/_h5ai/client/themes/faenza/icons/xhtml.png b/src/_h5ai/client/themes/faenza/icons/xhtml.png
deleted file mode 100644
index 27cc3369..00000000
Binary files a/src/_h5ai/client/themes/faenza/icons/xhtml.png and /dev/null differ
diff --git a/src/_h5ai/client/themes/fallback/icons/folder-parent.png b/src/_h5ai/client/themes/fallback/icons/folder-parent.png
index 79e3041d..dcc3e4dd 100644
Binary files a/src/_h5ai/client/themes/fallback/icons/folder-parent.png and b/src/_h5ai/client/themes/fallback/icons/folder-parent.png differ
diff --git a/src/_h5ai/client/themes/fallback/icons/folder-parent.svg b/src/_h5ai/client/themes/fallback/icons/folder-parent.svg
index 4ac45820..37af99fc 100644
--- a/src/_h5ai/client/themes/fallback/icons/folder-parent.svg
+++ b/src/_h5ai/client/themes/fallback/icons/folder-parent.svg
@@ -9,49 +9,15 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg7384"
height="96"
- width="96"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="folder-parent.svg"
+ id="svg7384"
+ width="96"
inkscape:export-filename="/home/lars/env/workspace/h5ai/src/_h5ai/client/themes/fallback/icons/folder-parent.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
-