diff --git a/src/TNEFDecoder/file_extension_to_mime_type_map.php b/src/TNEFDecoder/file_extension_to_mime_type_map.php
index b3841df..797e9cf 100644
--- a/src/TNEFDecoder/file_extension_to_mime_type_map.php
+++ b/src/TNEFDecoder/file_extension_to_mime_type_map.php
@@ -32,6 +32,7 @@ function get_file_extension_to_mime_type_map()
    return array(
       '3dm' => 'x-world/x-3dmf',
       '3dmf' => 'x-world/x-3dmf',
+      '7z' => 'application/x-7z-compressed',
       'Z' => 'application/x-compress',
       'a' => 'application/octet-stream',
       'aab' => 'application/x-authorware-bin',
@@ -100,6 +101,7 @@ function get_file_extension_to_mime_type_map()
       'crt' => 'application/x-x509-ca-cert',
       'csh' => 'text/x-script.csh',
       'css' => 'text/css',
+      'csv' => 'text/csv',
       'cxx' => 'text/plain',
       'dcr' => 'application/x-director',
       'deepv' => 'application/x-deepv',
@@ -205,11 +207,12 @@ function get_file_extension_to_mime_type_map()
       'jcm' => 'application/x-java-commerce',
       'jfif' => 'image/pipeg',
       'jfif-tbnl' => 'image/jpeg',
-      'jpe' => 'image/pjpeg',
-      'jpeg' => 'image/pjpeg',
-      'jpg' => 'image/pjpeg',
+      'jpe' => 'image/jpeg',
+      'jpeg' => 'image/jpeg',
+      'jpg' => 'image/jpeg',
       'jps' => 'image/x-jps',
-      'js' => 'application/x-javascript',
+      'js' => 'text/javascript',
+      'json' => 'application/json',
       'jut' => 'image/jutvision',
       'kar' => 'audio/midi',
       'kil' => 'application/x-killustrator',
@@ -269,6 +272,7 @@ function get_file_extension_to_mime_type_map()
       'movie' => 'video/x-sgi-movie',
       'mp2' => 'audio/mpeg',
       'mp3' => 'audio/mpeg',
+      'mp4' => 'video/mp4',
       'mpa' => 'video/mpeg',
       'mpc' => 'application/x-project',
       'mpe' => 'video/mpeg',
@@ -340,6 +344,7 @@ function get_file_extension_to_mime_type_map()
       'pfx' => 'application/x-pkcs12',
       'pgm' => 'image/x-portable-greymap',
       'pgn' => 'application/x-chess-pgn',
+      'php' => 'application/x-httpd-php',
       'pic' => 'image/pict',
       'pict' => 'image/pict',
       'pkg' => 'application/x-newton-compatible-pkg',
@@ -391,6 +396,7 @@ function get_file_extension_to_mime_type_map()
       'qtif' => 'image/x-quicktime',
       'ra' => 'audio/x-realaudio',
       'ram' => 'audio/x-pn-realaudio',
+      'rar' => 'application/vnd.rar',
       'ras' => 'image/x-cmu-raster',
       'rast' => 'image/cmu-raster',
       'rexx' => 'text/x-script.rexx',
@@ -480,14 +486,15 @@ function get_file_extension_to_mime_type_map()
       'texinfo' => 'application/x-texinfo',
       'text' => 'text/plain',
       'tgz' => 'application/x-compressed',
-      'tif' => 'image/x-tiff',
-      'tiff' => 'image/x-tiff',
+      'tif' => 'image/tiff',
+      'tiff' => 'image/tiff',
       'torrent' => 'application/x-bittorrent',
       'tr' => 'application/x-troff',
       'trm' => 'application/x-msterminal',
       'tsi' => 'audio/tsp-audio',
       'tsp' => 'audio/tsplayer',
       'tsv' => 'text/tab-separated-values',
+      'ttf' => 'font/ttf',
       'turbot' => 'image/florian',
       'txt' => 'text/plain',
       'uil' => 'text/x-uil',
@@ -524,13 +531,16 @@ function get_file_extension_to_mime_type_map()
       'w60' => 'application/wordperfect6.0',
       'w61' => 'application/wordperfect6.1',
       'w6w' => 'application/msword',
-      'wav' => 'audio/x-wav',
+      'wav' => 'audio/wav',
       'wb1' => 'application/x-qpro',
       'wbmp' => 'image/vnd.wap.wbmp',
       'wbxml' => 'application/vnd.wap.wbxml',
       'wcm' => 'application/vnd.ms-works',
       'wdb' => 'application/vnd.ms-works',
       'web' => 'application/vnd.xara',
+      'weba' => 'audio/webm',
+      'webm' => 'video/webm',
+      'webp' => 'image/webp',
       'wiz' => 'application/msword',
       'wk1' => 'application/x-123',
       'wks' => 'application/vnd.ms-works',
@@ -539,6 +549,8 @@ function get_file_extension_to_mime_type_map()
       'wmlc' => 'application/vnd.wap.wmlc',
       'wmls' => 'text/vnd.wap.wmlscript',
       'wmlsc' => 'application/vnd.wap.wmlscriptc',
+      'woff' => 'font/woff',
+      'woff2' => 'font/woff2',
       'word' => 'application/msword',
       'wp' => 'application/wordperfect',
       'wp5' => 'application/wordperfect6.0',
@@ -579,7 +591,7 @@ function get_file_extension_to_mime_type_map()
       'xlv' => 'application/x-excel',
       'xlw' => 'application/vnd.ms-excel',
       'xm' => 'audio/xm',
-      'xml' => 'text/xml',
+      'xml' => 'application/xml',
       'xmz' => 'xgl/movie',
       'xof' => 'x-world/x-vrml',
       'xpix' => 'application/x-vnd.ls-xpix',
@@ -589,7 +601,7 @@ function get_file_extension_to_mime_type_map()
       'xwd' => 'image/x-xwindowdump',
       'xyz' => 'chemical/x-pdb',
       'z' => 'application/x-compress',
-      'zip' => 'multipart/x-zip',
+      'zip' => 'application/zip',
       'zoo' => 'application/octet-stream',
       'zsh' => 'text/x-script.zsh',
       '323' => 'text/h323',