diff --git a/src/assets/exttomime.json b/src/assets/exttomime.json
index bab000445..2728d8b3d 100644
--- a/src/assets/exttomime.json
+++ b/src/assets/exttomime.json
@@ -6,17 +6,17 @@
 "3ds": {"type":"image/x-3ds"},
 "3g2": {"type":"video/3gpp2"},
 "3gp": {"type":"video/quicktime","icon":"quicktime","string":"video","groups":["video"]},
-"7z": {"type":"application/x-7z-compressed","icon":"archive"},
+"7z": {"type":"application/x-7z-compressed","icon":"archive","string":"archive","groups":["archive"]},
 "a": {"type":"application/octet-stream"},
 "aab": {"type":"application/x-authorware-bin"},
-"aac": {"type":"audio/aac","icon":"audio","string":"audio","groups":["audio"]},
+"aac": {"type":"audio/aac","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]},
 "aam": {"type":"application/x-authorware-map"},
 "aas": {"type":"application/x-authorware-seg"},
 "abc": {"type":"text/vnd.abc"},
 "abw": {"type":"application/x-abiword"},
 "ac": {"type":"application/pkix-attr-cert"},
 "acc": {"type":"application/vnd.americandynamics.acc"},
-"accdb": {"type":"application/msaccess","icon":"database"},
+"accdb": {"type":"application/msaccess","icon":"base"},
 "ace": {"type":"application/x-ace-compressed","icon":"archive"},
 "acgi": {"type":"text/html"},
 "acu": {"type":"application/vnd.acucobol"},
@@ -77,6 +77,7 @@
 "bcpio": {"type":"application/x-bcpio"},
 "bdf": {"type":"application/x-font-bdf"},
 "bdm": {"type":"application/vnd.syncml.dm+wbxml"},
+"bdoc": {"type":"application/x-digidoc","icon":"document","groups":["archive"]},
 "bed": {"type":"application/vnd.realvnc.bed"},
 "bh2": {"type":"application/vnd.fujitsu.oasysprs"},
 "bin": {"type":"application/octet-stream"},
@@ -126,6 +127,7 @@
 "cdmid": {"type":"application/cdmi-domain"},
 "cdmio": {"type":"application/cdmi-object"},
 "cdmiq": {"type":"application/cdmi-queue"},
+"cdoc": {"type":"application/x-digidoc","icon":"document","groups":["archive"]},
 "cdx": {"type":"chemical/x-cdx"},
 "cdxml": {"type":"application/vnd.chemdraw+xml"},
 "cdy": {"type":"application/vnd.cinderella"},
@@ -188,6 +190,7 @@
 "dcurl": {"type":"text/vnd.curl.dcurl"},
 "dd2": {"type":"application/vnd.oma.dd2+xml"},
 "ddd": {"type":"application/vnd.fujixerox.ddd"},
+"ddoc": {"type":"application/x-digidoc","icon":"document","groups":["archive"]},
 "deb": {"type":"application/x-debian-package"},
 "deepv": {"type":"application/x-deepv"},
 "def": {"type":"text/plain"},
@@ -274,7 +277,7 @@
 "fbs": {"type":"image/vnd.fastbidsheet"},
 "fcdt": {"type":"application/vnd.adobe.formscentral.fcdt"},
 "fcs": {"type":"application/vnd.isac.fcs"},
-"fdf": {"type":"application/pdf","icon":"pdf"},
+"fdf": {"type":"application/vnd.fdf","icon":"pdf"},
 "fdk": {"type":"application/octet-stream"},
 "fe_launch": {"type":"application/vnd.denovo.fcselayout-link"},
 "fg5": {"type":"application/vnd.fujitsu.oasysgp"},
@@ -286,7 +289,7 @@
 "fhc": {"type":"image/x-freehand"},
 "fif": {"type":"application/fractals"},
 "fig": {"type":"application/x-xfig"},
-"flac": {"type":"audio/x-flac","icon":"audio","string":"audio","groups":["audio","web_audio"]},
+"flac": {"type":"audio/flac","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]},
 "fli": {"type":"video/x-fli"},
 "flo": {"type":"application/vnd.micrografx.flo"},
 "flv": {"type":"video/x-flv","icon":"flash","string":"video","groups":["video","web_video"]},
@@ -295,6 +298,7 @@
 "fly": {"type":"text/vnd.fly"},
 "fm": {"type":"application/vnd.framemaker"},
 "fmf": {"type":"video/x-atomic3d-feature"},
+"fmp4": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["html_video","video","web_video"]},
 "fnc": {"type":"application/vnd.frogans.fnc"},
 "for": {"type":"text/x-fortran"},
 "fpx": {"type":"image/vnd.fpx"},
@@ -314,12 +318,15 @@
 "g3": {"type":"image/g3fax"},
 "g3w": {"type":"application/vnd.geospace"},
 "gac": {"type":"application/vnd.groove-account"},
+"gallery": {"type":"application/x-smarttech-notebook","icon":"archive"},
+"gallerycollection": {"type":"application/x-smarttech-notebook","icon":"archive"},
+"galleryitem": {"type":"application/x-smarttech-notebook","icon":"archive"},
 "gam": {"type":"application/x-tads"},
 "gbr": {"type":"application/rpki-ghostbusters"},
 "gca": {"type":"application/x-gca-compressed"},
 "gdl": {"type":"model/vnd.gdl"},
 "gdoc": {"type":"application/vnd.google-apps.document","icon":"document","groups":["document"]},
-"gdraw": {"type":"application/vnd.google-apps.drawing","icon":"draw"},
+"gdraw": {"type":"application/vnd.google-apps.drawing","icon":"image","groups":["image"]},
 "geo": {"type":"application/vnd.dynageo"},
 "gex": {"type":"application/vnd.geometry-explorer"},
 "ggb": {"type":"application/vnd.geogebra.file","icon":"archive"},
@@ -359,7 +366,7 @@
 "h261": {"type":"video/h261"},
 "h263": {"type":"video/h263"},
 "h264": {"type":"video/h264"},
-"h5p": {"type":"application/zip","icon":"archive","string":"archive","groups":["archive"]},
+"h5p": {"type":"application/zip","icon":"h5p","string":"archive"},
 "hal": {"type":"application/vnd.hal+xml"},
 "hbci": {"type":"application/vnd.hbci"},
 "hdf": {"type":"application/x-hdf"},
@@ -434,7 +441,7 @@
 "ivy": {"type":"application/x-livescreen"},
 "jad": {"type":"text/vnd.sun.j2me.app-descriptor"},
 "jam": {"type":"application/vnd.jam"},
-"jar": {"type":"application/java-archive"},
+"jar": {"type":"application/java-archive","icon":"archive"},
 "jav": {"type":"text/plain"},
 "java": {"type":"text/plain","icon":"sourcecode"},
 "jcb": {"type":"text/xml","icon":"markup"},
@@ -447,7 +454,7 @@
 "jlt": {"type":"application/vnd.hp-jlyt"},
 "jmt": {"type":"text/xml","icon":"markup"},
 "jmx": {"type":"text/xml","icon":"markup"},
-"jnlp": {"type":"application/x-java-jnlp-file"},
+"jnlp": {"type":"application/x-java-jnlp-file","icon":"markup"},
 "joda": {"type":"application/vnd.joost.joda-archive"},
 "jpe": {"type":"image/jpeg","icon":"jpeg","string":"image","groups":["image","web_image"]},
 "jpeg": {"type":"image/jpeg","icon":"jpeg","string":"image","groups":["image","web_image"]},
@@ -458,7 +465,7 @@
 "jps": {"type":"image/x-jps"},
 "jqz": {"type":"text/xml","icon":"markup"},
 "js": {"type":"application/x-javascript","icon":"text","groups":["web_file"]},
-"json": {"type":"application/json"},
+"json": {"type":"application/json","icon":"text"},
 "jsonml": {"type":"application/jsonml+json"},
 "jut": {"type":"image/jutvision"},
 "kar": {"type":"audio/midi"},
@@ -521,10 +528,10 @@
 "m2v": {"type":"video/mpeg"},
 "m3a": {"type":"audio/mpeg"},
 "m3u": {"type":"audio/x-mpegurl","icon":"mp3","string":"audio","groups":["audio"]},
-"m3u8": {"type":"application/vnd.apple.mpegurl"},
-"m4a": {"type":"audio/mp4","icon":"audio","string":"audio","groups":["audio","web_audio"]},
+"m3u8": {"type":"application/x-mpegURL","icon":"mpeg","groups":["media_source"]},
+"m4a": {"type":"audio/mp4","icon":"mp3","string":"audio","groups":["audio","html_audio","web_audio"]},
 "m4u": {"type":"video/vnd.mpegurl"},
-"m4v": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["video","web_video"]},
+"m4v": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["html_video","video","web_video"]},
 "ma": {"type":"application/mathematica","string":"math"},
 "mads": {"type":"application/mads+xml"},
 "mag": {"type":"application/vnd.ecowin.chart"},
@@ -544,7 +551,7 @@
 "mcf": {"type":"image/vasa"},
 "mcp": {"type":"application/netmc"},
 "mcurl": {"type":"text/vnd.curl.mcurl"},
-"mdb": {"type":"application/x-msaccess","icon":"database"},
+"mdb": {"type":"application/x-msaccess","icon":"base"},
 "mdi": {"type":"image/vnd.ms-modi"},
 "me": {"type":"text/troff"},
 "mesh": {"type":"model/mesh"},
@@ -555,8 +562,8 @@
 "mft": {"type":"application/rpki-manifest"},
 "mgp": {"type":"application/vnd.osgeo.mapguide.package"},
 "mgz": {"type":"application/vnd.proteus.magazine"},
-"mht": {"type":"message/rfc822"},
-"mhtml": {"type":"message/rfc822"},
+"mht": {"type":"message/rfc822","icon":"archive"},
+"mhtml": {"type":"message/rfc822","icon":"archive"},
 "mid": {"type":"audio/midi"},
 "midi": {"type":"audio/midi"},
 "mie": {"type":"application/x-mie"},
@@ -582,18 +589,19 @@
 "mod": {"type":"audio/mod"},
 "mods": {"type":"application/mods+xml"},
 "moov": {"type":"video/quicktime"},
-"mov": {"type":"video/quicktime","icon":"quicktime","string":"video","groups":["video","web_video"]},
+"mov": {"type":"video/quicktime","icon":"quicktime","string":"video","groups":["video","web_video","html_video"]},
 "movie": {"type":"video/x-sgi-movie","icon":"quicktime","string":"video","groups":["video"]},
 "mp2": {"type":"audio/mpeg"},
 "mp21": {"type":"application/mp21"},
 "mp2a": {"type":"audio/mpeg"},
-"mp3": {"type":"audio/mp3","icon":"mp3","string":"audio","groups":["audio","web_audio"]},
-"mp4": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["video","web_video"]},
-"mp4a": {"type":"audio/mp4","icon":"audio","string":"audio","groups":["audio","web_audio"]},
+"mp3": {"type":"audio/mp3","icon":"mp3","string":"audio","groups":["audio","html_audio","web_audio"]},
+"mp4": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["html_video","video","web_video"]},
+"mp4a": {"type":"audio/mp4","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]},
 "mp4s": {"type":"application/mp4"},
 "mp4v": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["video","web_video"]},
 "mpa": {"type":"audio/mpeg"},
 "mpc": {"type":"application/vnd.mophun.certificate"},
+"mpd": {"type":"application/dash+xml","icon":"mpeg","groups":["media_source"]},
 "mpe": {"type":"video/mpeg","icon":"mpeg","string":"video","groups":["video","web_video"]},
 "mpeg": {"type":"video/mpeg","icon":"mpeg","string":"video","groups":["video","web_video"]},
 "mpg": {"type":"video/mpeg","icon":"mpeg","string":"video","groups":["video","web_video"]},
@@ -603,6 +611,7 @@
 "mpm": {"type":"application/vnd.blueice.multipass"},
 "mpn": {"type":"application/vnd.mophun.application"},
 "mpp": {"type":"application/vnd.ms-project"},
+"mpr": {"type":"application/vnd.moodle.profiling","icon":"moodle"},
 "mpt": {"type":"application/vnd.ms-project"},
 "mpv": {"type":"application/x-project"},
 "mpx": {"type":"application/x-project"},
@@ -624,7 +633,9 @@
 "musicxml": {"type":"application/vnd.recordare.musicxml+xml"},
 "mv": {"type":"video/x-sgi-movie"},
 "mvb": {"type":"application/x-msmediaview"},
+"mw": {"type":"application/maple","icon":"math"},
 "mwf": {"type":"application/vnd.mfer"},
+"mws": {"type":"application/maple","icon":"math"},
 "mxf": {"type":"application/mxf"},
 "mxl": {"type":"application/vnd.recordare.musicxml"},
 "mxml": {"type":"application/xv+xml"},
@@ -637,6 +648,7 @@
 "nap": {"type":"image/naplps"},
 "naplps": {"type":"image/naplps"},
 "nb": {"type":"application/mathematica","string":"math"},
+"nbk": {"type":"application/x-smarttech-notebook","icon":"archive"},
 "nbp": {"type":"application/vnd.wolfram.player"},
 "nc": {"type":"application/x-netcdf"},
 "ncm": {"type":"application/vnd.nokia.configuration-message"},
@@ -652,6 +664,7 @@
 "nnd": {"type":"application/vnd.noblenet-directory"},
 "nns": {"type":"application/vnd.noblenet-sealer"},
 "nnw": {"type":"application/vnd.noblenet-web"},
+"notebook": {"type":"application/x-smarttech-notebook","icon":"archive"},
 "npx": {"type":"image/vnd.net-fpx"},
 "nsc": {"type":"application/x-conference"},
 "nsf": {"type":"application/vnd.lotus-notes"},
@@ -672,12 +685,12 @@
 "odg": {"type":"application/vnd.oasis.opendocument.graphics","icon":"draw"},
 "odi": {"type":"application/vnd.oasis.opendocument.image","icon":"draw"},
 "odm": {"type":"application/vnd.oasis.opendocument.text-master","icon":"writer"},
-"odp": {"type":"application/vnd.oasis.opendocument.presentation","icon":"impress"},
+"odp": {"type":"application/vnd.oasis.opendocument.presentation","icon":"impress","groups":["presentation"]},
 "ods": {"type":"application/vnd.oasis.opendocument.spreadsheet","icon":"calc","groups":["spreadsheet"]},
 "odt": {"type":"application/vnd.oasis.opendocument.text","icon":"writer","groups":["document"]},
-"oga": {"type":"audio/ogg","icon":"audio","string":"audio","groups":["audio","web_audio"]},
-"ogg": {"type":"audio/ogg","icon":"audio","string":"audio","groups":["audio","web_audio"]},
-"ogv": {"type":"video/ogg","icon":"video","string":"video","groups":["video","web_video"]},
+"oga": {"type":"audio/ogg","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]},
+"ogg": {"type":"audio/ogg","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]},
+"ogv": {"type":"video/ogg","icon":"video","string":"video","groups":["html_video","video","web_video"]},
 "ogx": {"type":"application/ogg"},
 "omc": {"type":"application/x-omc"},
 "omcd": {"type":"application/x-omcdatamaker"},
@@ -698,7 +711,7 @@
 "otg": {"type":"application/vnd.oasis.opendocument.graphics-template","icon":"draw"},
 "oth": {"type":"application/vnd.oasis.opendocument.text-web","icon":"oth","groups":["document"]},
 "oti": {"type":"application/vnd.oasis.opendocument.image-template"},
-"otp": {"type":"application/vnd.oasis.opendocument.presentation-template","icon":"impress"},
+"otp": {"type":"application/vnd.oasis.opendocument.presentation-template","icon":"impress","groups":["presentation"]},
 "ots": {"type":"application/vnd.oasis.opendocument.spreadsheet-template","icon":"calc","groups":["spreadsheet"]},
 "ott": {"type":"application/vnd.oasis.opendocument.text-template","icon":"writer","groups":["document"]},
 "oxps": {"type":"application/oxps"},
@@ -726,7 +739,7 @@
 "pcurl": {"type":"application/vnd.curl.pcurl"},
 "pcx": {"type":"image/x-pcx"},
 "pdb": {"type":"application/vnd.palm"},
-"pdf": {"type":"application/pdf","icon":"pdf"},
+"pdf": {"type":"application/pdf","icon":"pdf","groups":["document"]},
 "pem": {"type":"application/x-pem-file"},
 "pfa": {"type":"application/x-font-type1"},
 "pfb": {"type":"application/x-font-type1"},
@@ -760,20 +773,20 @@
 "png": {"type":"image/png","icon":"png","string":"image","groups":["image","web_image"]},
 "pnm": {"type":"image/x-portable-anymap"},
 "portpkg": {"type":"application/vnd.macports.portpkg"},
-"pot": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint"},
-"potm": {"type":"application/vnd.ms-powerpoint.template.macroenabled.12","icon":"powerpoint"},
-"potx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.template","icon":"powerpoint"},
+"pot": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint","groups":["presentation"]},
+"potm": {"type":"application/vnd.ms-powerpoint.template.macroenabled.12","icon":"powerpoint","groups":["presentation"]},
+"potx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.template","icon":"powerpoint","groups":["presentation"]},
 "pov": {"type":"model/x-pov"},
-"ppa": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint"},
-"ppam": {"type":"application/vnd.ms-powerpoint.addin.macroenabled.12","icon":"powerpoint"},
+"ppa": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint","groups":["presentation"]},
+"ppam": {"type":"application/vnd.ms-powerpoint.addin.macroenabled.12","icon":"powerpoint","groups":["presentation"]},
 "ppd": {"type":"application/vnd.cups-ppd"},
 "ppm": {"type":"image/x-portable-pixmap"},
 "pps": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint","groups":["presentation"]},
-"ppsm": {"type":"application/vnd.ms-powerpoint.slideshow.macroenabled.12","icon":"powerpoint"},
-"ppsx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.slideshow","icon":"powerpoint"},
+"ppsm": {"type":"application/vnd.ms-powerpoint.slideshow.macroenabled.12","icon":"powerpoint","groups":["presentation"]},
+"ppsx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.slideshow","icon":"powerpoint","groups":["presentation"]},
 "ppt": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint","groups":["presentation"]},
-"pptm": {"type":"application/vnd.ms-powerpoint.presentation.macroenabled.12","icon":"powerpoint"},
-"pptx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.presentation","icon":"powerpoint"},
+"pptm": {"type":"application/vnd.ms-powerpoint.presentation.macroenabled.12","icon":"powerpoint","groups":["presentation"]},
+"pptx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.presentation","icon":"powerpoint","groups":["presentation"]},
 "ppz": {"type":"application/mspowerpoint"},
 "pqa": {"type":"application/vnd.palm"},
 "prc": {"type":"application/x-mobipocket-ebook"},
@@ -786,11 +799,11 @@
 "psf": {"type":"application/x-font-linux-psf"},
 "pskcxml": {"type":"application/pskc+xml"},
 "ptid": {"type":"application/vnd.pvi.ptid1"},
-"pub": {"type":"application/x-mspublisher","icon":"publisher"},
+"pub": {"type":"application/x-mspublisher","icon":"publisher","groups":["presentation"]},
 "pvb": {"type":"application/vnd.3gpp.pic-bw-var"},
 "pvu": {"type":"paleovu/x-pv"},
 "pwn": {"type":"application/vnd.3m.post-it-notes"},
-"pwz": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint"},
+"pwz": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint","groups":["presentation"]},
 "py": {"type":"text/x-script.phyton"},
 "pya": {"type":"audio/vnd.ms-playready.media.pya"},
 "pyc": {"type":"application/x-bytecode.python"},
@@ -815,7 +828,7 @@
 "qxt": {"type":"application/vnd.quark.quarkxpress"},
 "ra": {"type":"audio/x-realaudio-plugin","icon":"audio","string":"audio","groups":["audio","web_audio"]},
 "ram": {"type":"audio/x-pn-realaudio-plugin","icon":"audio","string":"audio","groups":["audio"]},
-"rar": {"type":"application/x-rar-compressed"},
+"rar": {"type":"application/x-rar-compressed","icon":"archive","string":"archive","groups":["archive"]},
 "ras": {"type":"image/x-cmu-raster"},
 "rast": {"type":"image/cmu-raster"},
 "rb": {"type":"text/plain"},
@@ -872,7 +885,7 @@
 "scm": {"type":"application/vnd.lotus-screencam"},
 "scq": {"type":"application/scvp-cv-request"},
 "scs": {"type":"application/scvp-cv-response"},
-"scss": {"type":"text/x-scss"},
+"scss": {"type":"text/x-scss","icon":"text","groups":["web_file"]},
 "scurl": {"type":"text/vnd.curl.scurl"},
 "sda": {"type":"application/vnd.stardivision.draw","icon":"draw"},
 "sdc": {"type":"application/vnd.stardivision.calc","icon":"calc"},
@@ -917,7 +930,7 @@
 "skp": {"type":"application/vnd.koan"},
 "skt": {"type":"application/vnd.koan"},
 "sl": {"type":"application/x-seelogo"},
-"sldm": {"type":"application/vnd.ms-powerpoint.slide.macroenabled.12","icon":"powerpoint"},
+"sldm": {"type":"application/vnd.ms-powerpoint.slide.macroenabled.12","icon":"powerpoint","groups":["presentation"]},
 "sldx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.slide"},
 "slt": {"type":"application/vnd.epson.salt"},
 "sm": {"type":"application/vnd.stepmania.stepchart"},
@@ -957,7 +970,7 @@
 "std": {"type":"application/vnd.sun.xml.draw.template","icon":"draw"},
 "step": {"type":"application/step"},
 "stf": {"type":"application/vnd.wt.stf"},
-"sti": {"type":"application/vnd.sun.xml.impress.template","icon":"impress"},
+"sti": {"type":"application/vnd.sun.xml.impress.template","icon":"impress","groups":["presentation"]},
 "stk": {"type":"application/hyperstudio"},
 "stl": {"type":"application/vnd.ms-pki.stl"},
 "stp": {"type":"application/step"},
@@ -982,7 +995,7 @@
 "sxc": {"type":"application/vnd.sun.xml.calc","icon":"calc"},
 "sxd": {"type":"application/vnd.sun.xml.draw","icon":"draw"},
 "sxg": {"type":"application/vnd.sun.xml.writer.global","icon":"writer"},
-"sxi": {"type":"application/vnd.sun.xml.impress","icon":"impress"},
+"sxi": {"type":"application/vnd.sun.xml.impress","icon":"impress","groups":["presentation"]},
 "sxm": {"type":"application/vnd.sun.xml.math","icon":"math"},
 "sxw": {"type":"application/vnd.sun.xml.writer","icon":"writer"},
 "t": {"type":"text/troff"},
@@ -1016,6 +1029,7 @@
 "tr": {"type":"text/troff"},
 "tra": {"type":"application/vnd.trueapp"},
 "trm": {"type":"application/x-msterminal"},
+"ts": {"type":"video/MP2T","icon":"mpeg","string":"video","groups":["video","web_video"]},
 "tsd": {"type":"application/timestamped-data"},
 "tsi": {"type":"audio/tsp-audio"},
 "tsp": {"type":"application/dsptype"},
@@ -1028,7 +1042,7 @@
 "twds": {"type":"application/vnd.simtech-mindmapper"},
 "txd": {"type":"application/vnd.genomatix.tuxedo"},
 "txf": {"type":"application/vnd.mobius.txf"},
-"txt": {"type":"text/plain","icon":"text"},
+"txt": {"type":"text/plain","icon":"text","defaulticon":true},
 "udeb": {"type":"application/x-debian-package"},
 "ufd": {"type":"application/vnd.ufdl"},
 "ufdl": {"type":"application/vnd.ufdl"},
@@ -1104,7 +1118,7 @@
 "vss": {"type":"application/vnd.visio"},
 "vst": {"type":"application/vnd.visio"},
 "vsw": {"type":"application/vnd.visio"},
-"vtt": {"type":"text/vtt"},
+"vtt": {"type":"text/vtt","icon":"text","groups":["html_track"]},
 "vtu": {"type":"model/vnd.vtu"},
 "vxml": {"type":"application/voicexml+xml"},
 "w3d": {"type":"application/x-director"},
@@ -1112,7 +1126,7 @@
 "w61": {"type":"application/wordperfect6.1"},
 "w6w": {"type":"application/msword"},
 "wad": {"type":"application/x-doom"},
-"wav": {"type":"audio/wav","icon":"wav","string":"audio","groups":["audio","web_audio"]},
+"wav": {"type":"audio/wav","icon":"wav","string":"audio","groups":["audio","html_audio","web_audio"]},
 "wax": {"type":"audio/x-ms-wax"},
 "wb1": {"type":"application/x-qpro"},
 "wbmp": {"type":"image/vnd.wap.wbmp"},
@@ -1122,8 +1136,8 @@
 "wdb": {"type":"application/vnd.ms-works"},
 "wdp": {"type":"image/vnd.ms-photo"},
 "web": {"type":"application/vnd.xara"},
-"weba": {"type":"audio/webm","icon":"audio","string":"audio","groups":["audio","web_audio"]},
-"webm": {"type":"video/webm","icon":"video","string":"video","groups":["video","web_video"]},
+"weba": {"type":"audio/webm","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]},
+"webm": {"type":"video/webm","icon":"video","string":"video","groups":["html_video","video","web_video"]},
 "webp": {"type":"image/webp"},
 "wg": {"type":"application/vnd.pmi.widget"},
 "wgt": {"type":"application/widget"},
@@ -1131,7 +1145,7 @@
 "wk1": {"type":"application/x-123"},
 "wks": {"type":"application/vnd.ms-works"},
 "wm": {"type":"video/x-ms-wm"},
-"wma": {"type":"audio/x-ms-wma"},
+"wma": {"type":"audio/x-ms-wma","icon":"audio","string":"audio","groups":["audio"]},
 "wmd": {"type":"application/x-ms-wmd"},
 "wmf": {"type":"application/x-msmetafile"},
 "wml": {"type":"text/vnd.wap.wml"},
@@ -1173,17 +1187,18 @@
 "xar": {"type":"application/vnd.xara"},
 "xbap": {"type":"application/x-ms-xbap"},
 "xbd": {"type":"application/vnd.fujixerox.docuworks.binder"},
+"xbk": {"type":"application/x-smarttech-notebook","icon":"archive"},
 "xbm": {"type":"image/x-xbitmap"},
 "xdf": {"type":"application/xcap-diff+xml"},
 "xdm": {"type":"application/vnd.syncml.dm+xml"},
-"xdp": {"type":"application/pdf","icon":"pdf"},
+"xdp": {"type":"application/vnd.adobe.xdp+xml","icon":"pdf"},
 "xdr": {"type":"video/x-amt-demorun"},
 "xdssc": {"type":"application/dssc+xml"},
 "xdw": {"type":"application/vnd.fujixerox.docuworks"},
 "xenc": {"type":"application/xenc+xml"},
 "xer": {"type":"application/patch-ops-error+xml"},
-"xfd": {"type":"application/pdf","icon":"pdf"},
-"xfdf": {"type":"application/pdf","icon":"pdf"},
+"xfd": {"type":"application/vnd.xfdl","icon":"pdf"},
+"xfdf": {"type":"application/vnd.adobe.xfdf","icon":"pdf"},
 "xfdl": {"type":"application/vnd.xfdl"},
 "xgz": {"type":"xgl/drawing"},
 "xht": {"type":"application/xhtml+xml"},
@@ -1203,7 +1218,7 @@
 "xls": {"type":"application/vnd.ms-excel","icon":"spreadsheet","groups":["spreadsheet"]},
 "xlsb": {"type":"application/vnd.ms-excel.sheet.binary.macroenabled.12","icon":"spreadsheet"},
 "xlsm": {"type":"application/vnd.ms-excel.sheet.macroenabled.12","icon":"spreadsheet","groups":["spreadsheet"]},
-"xlsx": {"type":"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet","icon":"spreadsheet"},
+"xlsx": {"type":"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet","icon":"spreadsheet","groups":["spreadsheet"]},
 "xlt": {"type":"application/vnd.ms-excel","icon":"spreadsheet"},
 "xltm": {"type":"application/vnd.ms-excel.template.macroenabled.12","icon":"spreadsheet"},
 "xltx": {"type":"application/vnd.openxmlformats-officedocument.spreadsheetml.template","icon":"spreadsheet"},
diff --git a/src/assets/img/files/h5p-64.png b/src/assets/img/files/h5p-64.png
new file mode 100644
index 000000000..cdd1c9b1b
Binary files /dev/null and b/src/assets/img/files/h5p-64.png differ
diff --git a/src/assets/mimetoext.json b/src/assets/mimetoext.json
index 842fcf09d..438731f8b 100644
--- a/src/assets/mimetoext.json
+++ b/src/assets/mimetoext.json
@@ -20,6 +20,7 @@
 "application/clariscad": ["ccad"],
 "application/commonground": ["dp"],
 "application/cu-seeme": ["cu"],
+"application/dash+xml": ["mpd"],
 "application/davmount+xml": ["davmount"],
 "application/docbook+xml": ["dbk"],
 "application/drafting": ["drw"],
@@ -71,6 +72,7 @@
 "application/mac-compactpro": ["cpt"],
 "application/macbinary": ["bin"],
 "application/mads+xml": ["mads"],
+"application/maple": ["mw","mws"],
 "application/marc": ["mrc"],
 "application/marcxml+xml": ["mrcx"],
 "application/mathematica": ["ma","mb","nb"],
@@ -355,6 +357,7 @@
 "application/vnd.mobius.plc": ["plc"],
 "application/vnd.mobius.txf": ["txf"],
 "application/vnd.moodle.backup": ["mbz"],
+"application/vnd.moodle.profiling": ["mpr"],
 "application/vnd.mophun.application": ["mpn"],
 "application/vnd.mophun.certificate": ["mpc"],
 "application/vnd.mozilla.xul+xml": ["xul"],
@@ -520,7 +523,7 @@
 "application/vnd.wqd": ["wqd"],
 "application/vnd.wt.stf": ["stf"],
 "application/vnd.xara": ["xar","web"],
-"application/vnd.xfdl": ["xfdl"],
+"application/vnd.xfdl": ["xfdl","xfd"],
 "application/vnd.yamaha.hv-dic": ["hvd"],
 "application/vnd.yamaha.hv-script": ["hvs"],
 "application/vnd.yamaha.hv-voice": ["hvp"],
@@ -579,6 +582,7 @@
 "application/x-debian-package": ["deb","udeb"],
 "application/x-deepv": ["deepv"],
 "application/x-dgc-compressed": ["dgc"],
+"application/x-digidoc": ["bdoc","cdoc","ddoc"],
 "application/x-director": ["cct","cst","cxt","dcr","dir","dxr","fgd","swa","w3d"],
 "application/x-doom": ["wad"],
 "application/x-dtbncx+xml": ["ncx"],
@@ -709,6 +713,7 @@
 "application/x-shockwave-flash": ["swf","swfl"],
 "application/x-silverlight-app": ["xap"],
 "application/x-sit": ["sit"],
+"application/x-smarttech-notebook": ["gallery","gallerycollection","galleryitem","nbk","notebook","xbk"],
 "application/x-sprite": ["spr","sprite"],
 "application/x-sql": ["sql"],
 "application/x-stuffit": ["sit"],
@@ -762,13 +767,14 @@
 "application/xv+xml": ["mxml","xhvml","xvm","xvml"],
 "application/yang": ["yang"],
 "application/yin+xml": ["yin"],
-"application/zip": ["zip"],
+"application/zip": ["zip","h5p"],
 "audio/aac": ["aac"],
 "audio/adpcm": ["adp"],
 "audio/aiff": ["aif","aifc","aiff"],
 "audio/amr": ["amr"],
 "audio/au": ["au"],
 "audio/basic": ["au","snd"],
+"audio/flac": ["flac"],
 "audio/it": ["it"],
 "audio/make": ["funk","my","pfunk"],
 "audio/make.my.funk": ["pfunk"],
@@ -816,7 +822,7 @@
 "audio/x-mod": ["mod"],
 "audio/x-mpeg": ["mp2"],
 "audio/x-mpeg-3": ["mp3"],
-"audio/x-mpegurl": ["m3u"],
+"audio/x-mpegurl": ["m3u","m3u8"],
 "audio/x-mpequrl": ["m3u"],
 "audio/x-ms-wax": ["wax"],
 "audio/x-ms-wma": ["wma"],
@@ -1026,8 +1032,9 @@
 "video/jpeg": ["jpgv"],
 "video/jpm": ["jpgm","jpm"],
 "video/mj2": ["mj2","mjp2"],
-"video/mp4": ["mp4","f4v","m4v","mp4v","mpg4"],
+"video/mp4": ["mp4","f4v","m4v","mp4v","mpg4","fmp4"],
 "video/mpeg": ["mpeg","m1v","m2v","mp2","mp3","mpa","mpe","mpg"],
+"video/MP2T": ["ts"],
 "video/msvideo": ["avi"],
 "video/ogg": ["ogv"],
 "video/quicktime": ["mov","3gp","moov","qt"],
diff --git a/src/core/fileuploader/providers/fileuploader.ts b/src/core/fileuploader/providers/fileuploader.ts
index a061b8e29..d5c2fcda3 100644
--- a/src/core/fileuploader/providers/fileuploader.ts
+++ b/src/core/fileuploader/providers/fileuploader.ts
@@ -298,12 +298,18 @@ export class CoreFileUploaderProvider {
      * @return Undefined if file is valid, error message if file is invalid.
      */
     isInvalidMimetype(mimetypes?: string[], path?: string, mimetype?: string): string {
-        let extension;
+        let extension: string;
 
         if (mimetypes) {
             // Verify that the mimetype of the file is supported.
             if (mimetype) {
                 extension = this.mimeUtils.getExtension(mimetype);
+
+                if (mimetypes.indexOf(mimetype) == -1) {
+                    // Get the "main" mimetype of the extension.
+                    // It's possible that the list of accepted mimetypes only includes the "main" mimetypes.
+                    mimetype = this.mimeUtils.getMimeType(extension);
+                }
             } else {
                 extension = this.mimeUtils.getFileExtension(path);
                 mimetype = this.mimeUtils.getMimeType(extension);