diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index af2ad73c51..760d7baab7 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -9,23 +9,26 @@
 OC.MimeTypeList={
 	aliases: {
     "application/coreldraw": "image",
-    "application/font-sfnt": "font",
-    "application/font-woff": "font",
-    "application/illustrator": "image/vector",
+    "application/epub+zip": "text",
+    "application/font-sfnt": "image",
+    "application/font-woff": "image",
+    "application/illustrator": "image",
+    "application/javascript": "text/code",
     "application/json": "text/code",
-    "application/msaccess": "database",
+    "application/msaccess": "file",
     "application/msexcel": "x-office/spreadsheet",
     "application/mspowerpoint": "x-office/presentation",
     "application/msword": "x-office/document",
     "application/octet-stream": "file",
-    "application/postscript": "image/vector",
+    "application/postscript": "image",
+    "application/rss+xml": "application/xml",
     "application/vnd.android.package-archive": "package/x-generic",
     "application/vnd.ms-excel": "x-office/spreadsheet",
     "application/vnd.ms-excel.addin.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.sheet.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.template.macroEnabled.12": "x-office/spreadsheet",
-    "application/vnd.ms-fontobject": "font",
+    "application/vnd.ms-fontobject": "image",
     "application/vnd.ms-powerpoint": "x-office/presentation",
     "application/vnd.ms-powerpoint.addin.macroEnabled.12": "x-office/presentation",
     "application/vnd.ms-powerpoint.presentation.macroEnabled.12": "x-office/presentation",
@@ -49,10 +52,11 @@ OC.MimeTypeList={
     "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "x-office/document",
     "application/vnd.openxmlformats-officedocument.wordprocessingml.template": "x-office/document",
     "application/x-7z-compressed": "package/x-generic",
+    "application/x-cbr": "text",
     "application/x-compressed": "package/x-generic",
     "application/x-dcraw": "image",
     "application/x-deb": "package/x-generic",
-    "application/x-font": "font",
+    "application/x-font": "image",
     "application/x-gimp": "image",
     "application/x-gzip": "package/x-generic",
     "application/x-perl": "text/code",
@@ -64,33 +68,39 @@ OC.MimeTypeList={
     "application/xml": "text/html",
     "application/yaml": "text/code",
     "application/zip": "package/x-generic",
+    "database": "file",
     "httpd/unix-directory": "dir",
-    "image/svg+xml": "image/vector",
     "text/css": "text/code",
     "text/csv": "x-office/spreadsheet",
-    "text/x-shellscript": "text/code"
+    "text/html": "text/code",
+    "text/x-c": "text/code",
+    "text/x-h": "text/code",
+    "text/x-java-source": "text/code",
+    "text/x-python": "text/code",
+    "text/x-shellscript": "text/code",
+    "web": "text/code"
 },
 	files: [
-    "application-pdf",
-    "application",
-    "audio",
-    "file",
-    "folder-drag-accept",
-    "folder-external",
-    "folder-public",
-    "folder-shared",
-    "folder-starred",
-    "folder",
-    "image",
-    "package-x-generic",
-    "text-calendar",
-    "text-code",
-    "text-vcard",
-    "text",
     "video",
+    "folder-drag-accept",
+    "folder-starred",
+    "folder-public",
+    "package-x-generic",
+    "text",
+    "folder-external",
+    "text-vcard",
+    "application",
+    "text-code",
+    "x-office-spreadsheet",
+    "application-pdf",
+    "folder",
     "x-office-document",
+    "text-calendar",
     "x-office-presentation",
-    "x-office-spreadsheet"
+    "file",
+    "folder-shared",
+    "image",
+    "audio"
 ],
 	themes: []
 };
diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
index 3d6c5edc13..d0019c4f0a 100644
--- a/resources/config/mimetypealiases.dist.json
+++ b/resources/config/mimetypealiases.dist.json
@@ -9,23 +9,26 @@
 
 
 	"application/coreldraw": "image",
-	"application/font-sfnt": "font",
-	"application/font-woff": "font",
-	"application/illustrator": "image/vector",
+	"application/epub+zip": "text",
+	"application/font-sfnt": "image",
+	"application/font-woff": "image",
+	"application/illustrator": "image",
+	"application/javascript": "text/code",
 	"application/json": "text/code",
-	"application/msaccess": "database",
+	"application/msaccess": "file",
 	"application/msexcel": "x-office/spreadsheet",
 	"application/mspowerpoint": "x-office/presentation",
 	"application/msword": "x-office/document",
 	"application/octet-stream": "file",
-	"application/postscript": "image/vector",
+	"application/postscript": "image",
+	"application/rss+xml": "application/xml",
 	"application/vnd.android.package-archive": "package/x-generic",
 	"application/vnd.ms-excel": "x-office/spreadsheet",
 	"application/vnd.ms-excel.addin.macroEnabled.12": "x-office/spreadsheet",
 	"application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
 	"application/vnd.ms-excel.sheet.macroEnabled.12": "x-office/spreadsheet",
 	"application/vnd.ms-excel.template.macroEnabled.12": "x-office/spreadsheet",
-	"application/vnd.ms-fontobject": "font",
+	"application/vnd.ms-fontobject": "image",
 	"application/vnd.ms-powerpoint": "x-office/presentation",
 	"application/vnd.ms-powerpoint.addin.macroEnabled.12": "x-office/presentation",
 	"application/vnd.ms-powerpoint.presentation.macroEnabled.12": "x-office/presentation",
@@ -49,10 +52,11 @@
 	"application/vnd.openxmlformats-officedocument.wordprocessingml.document": "x-office/document",
 	"application/vnd.openxmlformats-officedocument.wordprocessingml.template": "x-office/document",
 	"application/x-7z-compressed": "package/x-generic",
+	"application/x-cbr": "text",
 	"application/x-compressed": "package/x-generic",
 	"application/x-dcraw": "image",
 	"application/x-deb": "package/x-generic",
-	"application/x-font": "font",
+	"application/x-font": "image",
 	"application/x-gimp": "image",
 	"application/x-gzip": "package/x-generic",
 	"application/x-perl": "text/code",
@@ -64,10 +68,16 @@
 	"application/xml": "text/html",
 	"application/yaml": "text/code",
 	"application/zip": "package/x-generic",
+	"database": "file",
 	"httpd/unix-directory": "dir",
-	"image/svg+xml": "image/vector",
 	"text/css": "text/code",
 	"text/csv": "x-office/spreadsheet",
-	"text/x-shellscript": "text/code"
+	"text/html": "text/code",
+	"text/x-c": "text/code",
+	"text/x-h": "text/code",
+	"text/x-java-source": "text/code",
+	"text/x-python": "text/code",
+	"text/x-shellscript": "text/code",
+	"web": "text/code"
 }
 
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index 79b0ca6524..e7c0887181 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -27,6 +27,7 @@
 	"cbz": ["application/x-cbr"],
 	"cc": ["text/x-c"],
 	"cdr": ["application/coreldraw"],
+	"class": ["application/java"],
 	"cnf": ["text/plain"],
 	"conf": ["text/plain"],
 	"cpp": ["text/x-c++src"],
@@ -35,7 +36,7 @@
 	"csv": ["text/csv"],
 	"cvbdl": ["application/x-cbr"],
 	"c": ["text/x-c"],
-	"c++": ["text/x-c++src"],
+	"c++": ["text/x-c"],
 	"dcr": ["image/x-dcraw"],
 	"deb": ["application/x-deb"],
 	"dng": ["image/x-dcraw"],
@@ -57,12 +58,14 @@
 	"gzip": ["application/x-gzip"],
 	"h": ["text/x-h"],
 	"hh": ["text/x-h"],
+	"hpp": ["text/x-h"],
 	"html": ["text/html", "text/plain"],
 	"htm": ["text/html", "text/plain"],
 	"ical": ["text/calendar"],
 	"ics": ["text/calendar"],
 	"iiq": ["image/x-dcraw"],
 	"impress": ["text/impress"],
+	"java": ["text/x-java-source"],
 	"jpeg": ["image/jpeg"],
 	"jpg": ["image/jpeg"],
 	"jps": ["image/jpeg"],
@@ -130,6 +133,8 @@
 	"raf": ["image/x-dcraw"],
 	"rar": ["application/x-rar-compressed"],
 	"reveal": ["text/reveal"],
+	"rss": ["application/rss+xml"],
+	"rtf": ["text/rtf"],
 	"rw2": ["image/x-dcraw"],
 	"sgf": ["application/sgf"],
 	"sh-lib": ["text/x-shellscript"],