diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index 3becf6e37d3..ed861205cf0 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -15,8 +15,10 @@ OC.MimeTypeList={
     "application/gpx+xml": "location",
     "application/gzip": "package/x-generic",
     "application/illustrator": "image",
+    "application/internet-shortcut": "link",
     "application/javascript": "text/code",
     "application/json": "text/code",
+    "application/km": "mindmap",
     "application/msaccess": "file",
     "application/msexcel": "x-office/spreadsheet",
     "application/msonenote": "x-office/document",
@@ -27,21 +29,21 @@ OC.MimeTypeList={
     "application/rss+xml": "application/xml",
     "application/vnd.android.package-archive": "package/x-generic",
     "application/vnd.excalidraw+json": "whiteboard",
-    "application/vnd.lotus-wordpro": "x-office/document",
     "application/vnd.garmin.tcx+xml": "location",
     "application/vnd.google-earth.kml+xml": "location",
     "application/vnd.google-earth.kmz": "location",
-    "application/vnd.ms-excel": "x-office/spreadsheet",
+    "application/vnd.lotus-wordpro": "x-office/document",
     "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-excel": "x-office/spreadsheet",
     "application/vnd.ms-fontobject": "font",
-    "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",
     "application/vnd.ms-powerpoint.slideshow.macroEnabled.12": "x-office/presentation",
     "application/vnd.ms-powerpoint.template.macroEnabled.12": "x-office/presentation",
+    "application/vnd.ms-powerpoint": "x-office/presentation",
     "application/vnd.ms-visio.drawing.macroEnabled.12": "application/vnd.visio",
     "application/vnd.ms-visio.drawing": "application/vnd.visio",
     "application/vnd.ms-visio.stencil.macroEnabled.12": "application/vnd.visio",
@@ -50,29 +52,32 @@ OC.MimeTypeList={
     "application/vnd.ms-visio.template": "application/vnd.visio",
     "application/vnd.ms-word.document.macroEnabled.12": "x-office/document",
     "application/vnd.ms-word.template.macroEnabled.12": "x-office/document",
-    "application/vnd.oasis.opendocument.presentation": "x-office/presentation",
+    "application/vnd.oasis.opendocument.graphics-flat-xml": "x-office/drawing",
+    "application/vnd.oasis.opendocument.graphics-template": "x-office/drawing",
+    "application/vnd.oasis.opendocument.graphics": "x-office/drawing",
+    "application/vnd.oasis.opendocument.presentation-flat-xml": "x-office/presentation",
     "application/vnd.oasis.opendocument.presentation-template": "x-office/presentation",
-    "application/vnd.oasis.opendocument.spreadsheet": "x-office/spreadsheet",
+    "application/vnd.oasis.opendocument.presentation": "x-office/presentation",
+    "application/vnd.oasis.opendocument.spreadsheet-flat-xml": "x-office/spreadsheet",
     "application/vnd.oasis.opendocument.spreadsheet-template": "x-office/spreadsheet",
-    "application/vnd.oasis.opendocument.text": "x-office/document",
+    "application/vnd.oasis.opendocument.spreadsheet": "x-office/spreadsheet",
+    "application/vnd.oasis.opendocument.text-flat-xml": "x-office/document",
     "application/vnd.oasis.opendocument.text-master": "x-office/document",
     "application/vnd.oasis.opendocument.text-template": "x-office/document",
-    "application/vnd.oasis.opendocument.graphics": "x-office/drawing",
-    "application/vnd.oasis.opendocument.graphics-template": "x-office/drawing",
     "application/vnd.oasis.opendocument.text-web": "x-office/document",
-    "application/vnd.oasis.opendocument.text-flat-xml": "x-office/document",
-    "application/vnd.oasis.opendocument.spreadsheet-flat-xml": "x-office/spreadsheet",
-    "application/vnd.oasis.opendocument.graphics-flat-xml": "x-office/drawing",
-    "application/vnd.oasis.opendocument.presentation-flat-xml": "x-office/presentation",
+    "application/vnd.oasis.opendocument.text": "x-office/document",
     "application/vnd.openxmlformats-officedocument.presentationml.presentation": "x-office/presentation",
     "application/vnd.openxmlformats-officedocument.presentationml.slideshow": "x-office/presentation",
     "application/vnd.openxmlformats-officedocument.presentationml.template": "x-office/presentation",
     "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "x-office/spreadsheet",
     "application/vnd.openxmlformats-officedocument.spreadsheetml.template": "x-office/spreadsheet",
+    "application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf": "x-office/form-template",
+    "application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform": "x-office/form",
     "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "x-office/document",
     "application/vnd.openxmlformats-officedocument.wordprocessingml.template": "x-office/document",
     "application/vnd.visio": "x-office/document",
     "application/vnd.wordperfect": "x-office/document",
+    "application/vnd.xmind.workbook": "mindmap",
     "application/x-7z-compressed": "package/x-generic",
     "application/x-bzip2": "package/x-generic",
     "application/x-cbr": "text",
@@ -81,6 +86,7 @@ OC.MimeTypeList={
     "application/x-deb": "package/x-generic",
     "application/x-fictionbook+xml": "text",
     "application/x-font": "font",
+    "application/x-freemind": "mindmap",
     "application/x-gimp": "image",
     "application/x-gzip": "application/gzip",
     "application/x-iwork-keynote-sffkey": "x-office/presentation",
@@ -96,8 +102,11 @@ OC.MimeTypeList={
     "application/xml": "text/html",
     "application/yaml": "text/code",
     "application/zip": "package/x-generic",
+    "application/zstd": "package/x-generic",
     "database": "file",
     "httpd/unix-directory": "dir",
+    "image/targa": "image/tga",
+    "image/x-emf": "image/emf",
     "text/css": "text/code",
     "text/csv": "x-office/spreadsheet",
     "text/html": "text/code",
@@ -109,15 +118,7 @@ OC.MimeTypeList={
     "text/x-python": "text/code",
     "text/x-rst": "text",
     "text/x-shellscript": "text/code",
-    "web": "text/code",
-    "application/internet-shortcut": "link",
-    "application/km": "mindmap",
-    "application/x-freemind": "mindmap",
-    "application/vnd.xmind.workbook": "mindmap",
-    "image/targa": "image/tga",
-    "application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform": "x-office/form",
-    "application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf": "x-office/form-template",
-    "image/x-emf": "image/emf"
+    "web": "text/code"
 },
 	files: [
     "application",
diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
index 6fe7db76318..05af6382e30 100644
--- a/resources/config/mimetypealiases.dist.json
+++ b/resources/config/mimetypealiases.dist.json
@@ -15,8 +15,10 @@
 	"application/gpx+xml": "location",
 	"application/gzip": "package/x-generic",
 	"application/illustrator": "image",
+	"application/internet-shortcut": "link",
 	"application/javascript": "text/code",
 	"application/json": "text/code",
+	"application/km": "mindmap",
 	"application/msaccess": "file",
 	"application/msexcel": "x-office/spreadsheet",
 	"application/msonenote": "x-office/document",
@@ -27,21 +29,21 @@
 	"application/rss+xml": "application/xml",
 	"application/vnd.android.package-archive": "package/x-generic",
 	"application/vnd.excalidraw+json": "whiteboard",
-	"application/vnd.lotus-wordpro": "x-office/document",
 	"application/vnd.garmin.tcx+xml": "location",
 	"application/vnd.google-earth.kml+xml": "location",
 	"application/vnd.google-earth.kmz": "location",
-	"application/vnd.ms-excel": "x-office/spreadsheet",
+	"application/vnd.lotus-wordpro": "x-office/document",
 	"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-excel": "x-office/spreadsheet",
 	"application/vnd.ms-fontobject": "font",
-	"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",
 	"application/vnd.ms-powerpoint.slideshow.macroEnabled.12": "x-office/presentation",
 	"application/vnd.ms-powerpoint.template.macroEnabled.12": "x-office/presentation",
+	"application/vnd.ms-powerpoint": "x-office/presentation",
 	"application/vnd.ms-visio.drawing.macroEnabled.12": "application/vnd.visio",
 	"application/vnd.ms-visio.drawing": "application/vnd.visio",
 	"application/vnd.ms-visio.stencil.macroEnabled.12": "application/vnd.visio",
@@ -50,29 +52,32 @@
 	"application/vnd.ms-visio.template": "application/vnd.visio",
 	"application/vnd.ms-word.document.macroEnabled.12": "x-office/document",
 	"application/vnd.ms-word.template.macroEnabled.12": "x-office/document",
-	"application/vnd.oasis.opendocument.presentation": "x-office/presentation",
+	"application/vnd.oasis.opendocument.graphics-flat-xml": "x-office/drawing",
+	"application/vnd.oasis.opendocument.graphics-template": "x-office/drawing",
+	"application/vnd.oasis.opendocument.graphics": "x-office/drawing",
+	"application/vnd.oasis.opendocument.presentation-flat-xml": "x-office/presentation",
 	"application/vnd.oasis.opendocument.presentation-template": "x-office/presentation",
-	"application/vnd.oasis.opendocument.spreadsheet": "x-office/spreadsheet",
+	"application/vnd.oasis.opendocument.presentation": "x-office/presentation",
+	"application/vnd.oasis.opendocument.spreadsheet-flat-xml": "x-office/spreadsheet",
 	"application/vnd.oasis.opendocument.spreadsheet-template": "x-office/spreadsheet",
-	"application/vnd.oasis.opendocument.text": "x-office/document",
+	"application/vnd.oasis.opendocument.spreadsheet": "x-office/spreadsheet",
+	"application/vnd.oasis.opendocument.text-flat-xml": "x-office/document",
 	"application/vnd.oasis.opendocument.text-master": "x-office/document",
 	"application/vnd.oasis.opendocument.text-template": "x-office/document",
-	"application/vnd.oasis.opendocument.graphics": "x-office/drawing",
-	"application/vnd.oasis.opendocument.graphics-template": "x-office/drawing",
 	"application/vnd.oasis.opendocument.text-web": "x-office/document",
-	"application/vnd.oasis.opendocument.text-flat-xml": "x-office/document",
-	"application/vnd.oasis.opendocument.spreadsheet-flat-xml": "x-office/spreadsheet",
-	"application/vnd.oasis.opendocument.graphics-flat-xml": "x-office/drawing",
-	"application/vnd.oasis.opendocument.presentation-flat-xml": "x-office/presentation",
+	"application/vnd.oasis.opendocument.text": "x-office/document",
 	"application/vnd.openxmlformats-officedocument.presentationml.presentation": "x-office/presentation",
 	"application/vnd.openxmlformats-officedocument.presentationml.slideshow": "x-office/presentation",
 	"application/vnd.openxmlformats-officedocument.presentationml.template": "x-office/presentation",
 	"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "x-office/spreadsheet",
 	"application/vnd.openxmlformats-officedocument.spreadsheetml.template": "x-office/spreadsheet",
+	"application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf": "x-office/form-template",
+	"application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform": "x-office/form",
 	"application/vnd.openxmlformats-officedocument.wordprocessingml.document": "x-office/document",
 	"application/vnd.openxmlformats-officedocument.wordprocessingml.template": "x-office/document",
 	"application/vnd.visio": "x-office/document",
 	"application/vnd.wordperfect": "x-office/document",
+	"application/vnd.xmind.workbook": "mindmap",
 	"application/x-7z-compressed": "package/x-generic",
 	"application/x-bzip2": "package/x-generic",
 	"application/x-cbr": "text",
@@ -81,6 +86,7 @@
 	"application/x-deb": "package/x-generic",
 	"application/x-fictionbook+xml": "text",
 	"application/x-font": "font",
+	"application/x-freemind": "mindmap",
 	"application/x-gimp": "image",
 	"application/x-gzip": "application/gzip",
 	"application/x-iwork-keynote-sffkey": "x-office/presentation",
@@ -96,8 +102,11 @@
 	"application/xml": "text/html",
 	"application/yaml": "text/code",
 	"application/zip": "package/x-generic",
+	"application/zstd": "package/x-generic",
 	"database": "file",
 	"httpd/unix-directory": "dir",
+	"image/targa": "image/tga",
+	"image/x-emf": "image/emf",
 	"text/css": "text/code",
 	"text/csv": "x-office/spreadsheet",
 	"text/html": "text/code",
@@ -109,13 +118,5 @@
 	"text/x-python": "text/code",
 	"text/x-rst": "text",
 	"text/x-shellscript": "text/code",
-	"web": "text/code",
-	"application/internet-shortcut": "link",
-	"application/km": "mindmap",
-	"application/x-freemind": "mindmap",
-	"application/vnd.xmind.workbook": "mindmap",
-	"image/targa": "image/tga",
-	"application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform": "x-office/form",
-	"application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf": "x-office/form-template",
-	"image/x-emf": "image/emf"
+	"web": "text/code"
 }
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index ca515b2c578..6f1f25f2718 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -234,5 +234,6 @@
 	"xrf": ["image/x-dcraw"],
 	"yaml": ["application/yaml", "text/plain"],
 	"yml": ["application/yaml", "text/plain"],
-	"zip": ["application/zip"]
+	"zip": ["application/zip"],
+	"zst": ["application/zstd"]
 }