diff --git a/system/config/media.yaml b/system/config/media.yaml
index 443ec8aeb..b5dbfd0f9 100644
--- a/system/config/media.yaml
+++ b/system/config/media.yaml
@@ -11,6 +11,10 @@ jpg:
   type: image
   thumb: media/thumb-jpg.png
   mime: image/jpeg
+jpe:
+  type: image
+  thumb: media/thumb-jpg.png
+  mime: image/jpeg
 jpeg:
   type: image
   thumb: media/thumb-jpeg.png
@@ -19,6 +23,12 @@ png:
   type: image
   thumb: media/thumb-png.png
   mime: image/png
+bmp:
+  type: image
+  mime: image/bmp
+tiff:
+  type: image
+  mime: image/tiff
 gif:
   type: animated
   thumb: media/thumb-gif.png
@@ -33,6 +43,15 @@ mp4:
   type: video
   thumb: media/thumb-mp4.png
   mime: video/mp4
+mpeg:
+  type: video
+  mime: video/mpeg
+mpg:
+  type: video
+  mime: video/mpeg
+mpe:
+  type: video
+  mime: video/mpeg
 mov:
   type: video
   thumb: media/thumb-mov.png
@@ -49,6 +68,12 @@ flv:
   type: video
   thumb: media/thumb-flv.png
   mime: video/x-flv
+avi:
+  type: video
+  mime: video/msvideo
+wmv:
+  type: video
+  mime: video/x-ms-wmv
 
 mp3:
   type: audio
@@ -70,6 +95,12 @@ wav:
   type: audio
   thumb: media/thumb-wav.png
   mime: audio/wav
+aiff:
+  type: audio
+  mime: audio/aiff
+aif:
+  type: audio
+  mime: audio/aif
 
 txt:
   type: file
@@ -83,10 +114,54 @@ doc:
   type: file
   thumb: media/thumb-doc.png
   mime: application/msword
+docx:
+  type: file
+  mime: application/msword
+xls:
+  type: file
+  mime: application/vnd.ms-excel
+xlt:
+  type: file
+  mime: application/vnd.ms-excel
+xlm:
+  type: file
+  mime: application/vnd.ms-excel
+xld:
+  type: file
+  mime: application/vnd.ms-excel
+xla:
+  type: file
+  mime: application/vnd.ms-excel
+xlc:
+  type: file
+  mime: application/vnd.ms-excel
+xlw:
+  type: file
+  mime: application/vnd.ms-excel
+xll:
+  type: file
+  mime: application/vnd.ms-excel
+ppt:
+  type: file
+  mime: application/vnd.ms-powerpoint
+pps:
+  type: file
+  mime: application/vnd.ms-powerpoint
+rtf:
+  type: file
+  mime: application/rtf
+txt:
+  type: file
+  mime: text/plain
+
 html:
   type: file
   thumb: media/thumb-html.png
   mime: text/html
+htm:
+  type: file
+  thumb: media/thumb-html.png
+  mime: text/html
 pdf:
   type: file
   thumb: media/thumb-pdf.png
@@ -99,6 +174,9 @@ gz:
   type: file
   thumb: media/thumb-gz.png
   mime: application/gzip
+tar:
+  type: file
+  mime: application/x-tar
 css:
   type: file
   thumb: media/thumb-css.png
diff --git a/system/src/Grav/Common/Utils.php b/system/src/Grav/Common/Utils.php
index ec8fff972..c0b15af44 100644
--- a/system/src/Grav/Common/Utils.php
+++ b/system/src/Grav/Common/Utils.php
@@ -264,102 +264,13 @@ abstract class Utils
     public static function getMimeType($extension)
     {
         $extension = strtolower($extension);
+        $config = self::getGrav()['config']->get('media');
 
-        switch ($extension) {
-            case "js":
-                return "application/x-javascript";
-
-            case "json":
-                return "application/json";
-
-            case "jpg":
-            case "jpeg":
-            case "jpe":
-                return "image/jpg";
-
-            case "png":
-            case "gif":
-            case "bmp":
-            case "tiff":
-                return "image/" . $extension;
-
-            case "svg":
-                return "image/svg+xml";
-
-            case "css":
-                return "text/css";
-
-            case "xml":
-                return "application/xml";
-
-            case "doc":
-            case "docx":
-                return "application/msword";
-
-            case "xls":
-            case "xlt":
-            case "xlm":
-            case "xld":
-            case "xla":
-            case "xlc":
-            case "xlw":
-            case "xll":
-                return "application/vnd.ms-excel";
-
-            case "ppt":
-            case "pps":
-                return "application/vnd.ms-powerpoint";
-
-            case "rtf":
-                return "application/rtf";
-
-            case "pdf":
-                return "application/pdf";
-
-            case "html":
-            case "htm":
-            case "php":
-                return "text/html";
-
-            case "txt":
-                return "text/plain";
-
-            case "mpeg":
-            case "mpg":
-            case "mpe":
-                return "video/mpeg";
-
-            case "mp3":
-                return "audio/mpeg3";
-
-            case "wav":
-                return "audio/wav";
-
-            case "aiff":
-            case "aif":
-                return "audio/aiff";
-
-            case "avi":
-                return "video/msvideo";
-
-            case "wmv":
-                return "video/x-ms-wmv";
-
-            case "mov":
-                return "video/quicktime";
-
-            case "zip":
-                return "application/zip";
-
-            case "tar":
-                return "application/x-tar";
-
-            case "swf":
-                return "application/x-shockwave-flash";
-
-            default:
-                return "application/octet-stream";
+        if (isset($config[$extension])) {
+            return $config[$extension]['mime'];
         }
+
+        return 'application/octet-stream';
     }
 
     /**