diff --git a/imgsrc/mimetypes/azw2.svg b/imgsrc/mimetypes/azw2.svg
new file mode 100644
index 0000000000..1c3c718b0b
--- /dev/null
+++ b/imgsrc/mimetypes/azw2.svg
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="128"
+   height="128"
+   id="svg2606"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="azw2.svg"
+   inkscape:export-filename="/home/niluje/Patchland/calibre/imgsrc/mimetypes/azw2.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     id="namedview45"
+     showgrid="false"
+     inkscape:zoom="1.84375"
+     inkscape:cx="-11.118644"
+     inkscape:cy="42.305085"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2606" />
+  <defs
+     id="defs2608">
+    <linearGradient
+       id="linearGradient10207">
+      <stop
+         id="stop10209"
+         style="stop-color:#a2a2a2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop10211"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="96"
+       y1="104"
+       x2="88.000198"
+       y2="96.000198"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop83"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop85"
+         style="stop-color:#8c8e89;stop-opacity:1"
+         offset="0.0072" />
+      <stop
+         id="stop87"
+         style="stop-color:#abaca9;stop-opacity:1"
+         offset="0.0673" />
+      <stop
+         id="stop89"
+         style="stop-color:#c5c6c4;stop-opacity:1"
+         offset="0.1347" />
+      <stop
+         id="stop91"
+         style="stop-color:#dbdbda;stop-opacity:1"
+         offset="0.2652576" />
+      <stop
+         id="stop93"
+         style="stop-color:#ebebeb;stop-opacity:1"
+         offset="0.37646064" />
+      <stop
+         id="stop95"
+         style="stop-color:#f7f7f6;stop-opacity:1"
+         offset="0.48740286" />
+      <stop
+         id="stop97"
+         style="stop-color:#fdfdfd;stop-opacity:1"
+         offset="0.6324091" />
+      <stop
+         id="stop99"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="102"
+       cy="112.3047"
+       r="139.55859"
+       id="XMLID_8_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop41"
+         style="stop-color:#b7b8b9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop47"
+         style="stop-color:#ececec;stop-opacity:1"
+         offset="0.18851049" />
+      <stop
+         id="stop49"
+         style="stop-color:#fafafa;stop-opacity:1"
+         offset="0.25718147" />
+      <stop
+         id="stop51"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.30111277" />
+      <stop
+         id="stop53"
+         style="stop-color:#fafafa;stop-opacity:1"
+         offset="0.53130001" />
+      <stop
+         id="stop55"
+         style="stop-color:#ebecec;stop-opacity:1"
+         offset="0.84490001" />
+      <stop
+         id="stop57"
+         style="stop-color:#e1e2e3;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <filter
+       x="-0.19200002"
+       y="-0.19199999"
+       width="1.3839999"
+       height="1.3839999"
+       color-interpolation-filters="sRGB"
+       id="filter6697">
+      <feGaussianBlur
+         id="feGaussianBlur6699"
+         stdDeviation="1.9447689" />
+    </filter>
+    <clipPath
+       id="clipPath7084">
+      <path
+         d="m 72,88 -32,32 -8,0 0,-40 40,0 0,8 z"
+         id="path7086"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    </clipPath>
+    <radialGradient
+       cx="102"
+       cy="112.3047"
+       r="139.55859"
+       id="radialGradient9437"
+       xlink:href="#XMLID_8_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9996653,2e-6,0.00301608)" />
+    <linearGradient
+       x1="98.617439"
+       y1="106.41443"
+       x2="91.228737"
+       y2="99.254974"
+       id="linearGradient10213"
+       xlink:href="#linearGradient10207"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter2770">
+      <feGaussianBlur
+         id="feGaussianBlur2772"
+         stdDeviation="2.0786429" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata2611">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <path
+       d="m 16,8 0,112 c 0,0 63.15625,0 63.15625,0 l 0.03125,0 c 3e-6,0 11.90625,-9.90625 17.40625,-15.40625 C 102.09375,99.09375 112,87.1875 112,87.1875 L 112,87.15625 112,8 16,8 z"
+       transform="matrix(1.0416667,0,0,1.0267857,-2.6666667,-1.2142891)"
+       id="path7865"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;filter:url(#filter2770)" />
+    <path
+       d="M 16.000001,8 16,120 c 0,0 63.146418,0 63.146418,0 L 112,87.14642 112,8 16.000001,8 z"
+       id="path34"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m 18.000002,9.0000034 c -0.551,0 -1,0.44885 -1,0.999665 l 0,107.9638516 c 0,0.55181 0.449,0.99966 1,0.99966 l 59.171997,0 c 0.263,0 2.76268,0.11813 2.948681,-0.0688 L 110.707,88.094202 C 110.894,87.907264 111,85.40942 111,85.146508 l 0,-75.1468396 c 0,-0.550815 -0.448,-0.999665 -1,-0.999665 l -91.999998,0 z"
+       id="path59"
+       style="fill:url(#radialGradient9437);fill-opacity:1" />
+    <path
+       d="m 41.879531,115.98249 c 0,0 24.309609,-24.309614 24.309609,-24.309614 0,0 -9.35314,2.913124 -19.60314,2.913124 0,10.25 -4.706469,21.39649 -4.706469,21.39649 z"
+       transform="translate(40,0)"
+       clip-path="url(#clipPath7084)"
+       id="path5540"
+       style="opacity:0.4;fill:#000000;fill-opacity:1;filter:url(#filter6697)" />
+    <path
+       d="m 79.172,120 c 0,0 11.914,-9.914 17.414,-15.414 5.5,-5.5 15.414,-17.414 15.414,-17.414 0,0 -13.75,8.828 -24,8.828 0,10.25 -8.828,24 -8.828,24 z"
+       id="path14523"
+       style="fill:url(#linearGradient10213);fill-opacity:1" />
+    <text
+       x="63.980469"
+       y="32.160156"
+       id="text3772"
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3021"
+         x="63.980469"
+         y="32.160156">Kindlet</tspan></text>
+    <path
+       d="m 68.227,60.477999 c 0,2.157 0.052,3.954 -1.035,5.874 -0.88,1.561 -2.279,2.517 -3.833,2.517 -2.121,0 -3.366,-1.62 -3.366,-4.015 C 59.993,60.14 64.225,59.283 68.226,59.283 v 1.194999 z m 5.579,13.496 c -0.365,0.332 -0.896,0.352 -1.307,0.132 -1.838,-1.528 -2.167,-2.231 -3.174,-3.69 -3.035,3.094 -5.188,4.023 -9.123,4.023 -4.663,0 -8.284,-2.876 -8.284,-8.629 0,-4.49 2.433,-7.543999 5.899,-9.044999 3.005,-1.317 7.202,-1.556 10.41,-1.914 v -0.723 c 0,-1.313 0.104,-2.875 -0.671,-4.012 -0.674,-1.021 -1.968,-1.437 -3.106,-1.437 -2.111,0 -3.99,1.078 -4.45,3.321 -0.097,0.498 -0.46,0.991 -0.962,1.017 l -5.364,-0.581 c -0.456,-0.102 -0.958,-0.463 -0.828,-1.155 1.233,-6.511 7.109,-8.475 12.378,-8.475 2.693,0 6.215,0.719 8.335,2.757 2.692997,2.515 2.431997,5.869 2.431997,9.524 v 8.622999 c 0,2.596 1.081,3.732 2.091,5.128 0.354,0.503 0.434,1.103 -0.018,1.473 -1.131,0.949 -3.138997,2.693 -4.243997,3.676 l -0.014,-0.013 z"
+       id="path4047"
+       style="fill-rule:evenodd" />
+    <path
+       d="m 99.325111,79.885297 c -8.716894,6.432161 -21.357191,9.853809 -32.243032,9.853809 -15.251419,0 -28.989193,-5.636741 -39.38419,-15.021522 -0.815557,-0.738364 -0.08726,-1.746902 0.89191,-1.173831 C 39.807066,80.071565 53.675732,84 68,84 c 9.664184,0 20.284886,-2.004491 30.058986,-6.151079 1.474215,-0.623415 2.709284,0.97246 1.266125,2.036376 z"
+       id="path3858"
+       style="fill:#ff9201;fill-rule:evenodd" />
+    <path
+       d="m 104,76 c -1.11342,-1.426386 -7.371903,-0.676274 -10.179364,-0.337298 -0.853315,0.09817 -0.984206,-0.641874 -0.217315,-1.184739 4.990671,-3.505554 13.168059,-2.491141 14.119539,-1.318987 0.95736,1.187256 -0.25087,9.384779 -4.92858,13.293915 -0.71907,0.604117 -1.40373,0.286117 -1.08573,-0.510142 C 102.75988,83.311486 105.11761,77.427225 104,76 z"
+       id="path3860"
+       style="fill:#ff9201;fill-rule:evenodd" />
+  </g>
+</svg>
diff --git a/imgsrc/mimetypes/azw3.svg b/imgsrc/mimetypes/azw3.svg
new file mode 100644
index 0000000000..c60a7070f9
--- /dev/null
+++ b/imgsrc/mimetypes/azw3.svg
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="128"
+   height="128"
+   id="svg2606"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="azw3.svg"
+   inkscape:export-filename="/home/niluje/Patchland/calibre/imgsrc/mimetypes/azw3.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     id="namedview45"
+     showgrid="false"
+     inkscape:zoom="1.84375"
+     inkscape:cx="-11.118644"
+     inkscape:cy="42.305085"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2606" />
+  <defs
+     id="defs2608">
+    <linearGradient
+       id="linearGradient10207">
+      <stop
+         id="stop10209"
+         style="stop-color:#a2a2a2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop10211"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="96"
+       y1="104"
+       x2="88.000198"
+       y2="96.000198"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop83"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop85"
+         style="stop-color:#8c8e89;stop-opacity:1"
+         offset="0.0072" />
+      <stop
+         id="stop87"
+         style="stop-color:#abaca9;stop-opacity:1"
+         offset="0.0673" />
+      <stop
+         id="stop89"
+         style="stop-color:#c5c6c4;stop-opacity:1"
+         offset="0.1347" />
+      <stop
+         id="stop91"
+         style="stop-color:#dbdbda;stop-opacity:1"
+         offset="0.2652576" />
+      <stop
+         id="stop93"
+         style="stop-color:#ebebeb;stop-opacity:1"
+         offset="0.37646064" />
+      <stop
+         id="stop95"
+         style="stop-color:#f7f7f6;stop-opacity:1"
+         offset="0.48740286" />
+      <stop
+         id="stop97"
+         style="stop-color:#fdfdfd;stop-opacity:1"
+         offset="0.6324091" />
+      <stop
+         id="stop99"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="102"
+       cy="112.3047"
+       r="139.55859"
+       id="XMLID_8_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop41"
+         style="stop-color:#b7b8b9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop47"
+         style="stop-color:#ececec;stop-opacity:1"
+         offset="0.18851049" />
+      <stop
+         id="stop49"
+         style="stop-color:#fafafa;stop-opacity:1"
+         offset="0.25718147" />
+      <stop
+         id="stop51"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.30111277" />
+      <stop
+         id="stop53"
+         style="stop-color:#fafafa;stop-opacity:1"
+         offset="0.53130001" />
+      <stop
+         id="stop55"
+         style="stop-color:#ebecec;stop-opacity:1"
+         offset="0.84490001" />
+      <stop
+         id="stop57"
+         style="stop-color:#e1e2e3;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <filter
+       x="-0.19200002"
+       y="-0.19199999"
+       width="1.3839999"
+       height="1.3839999"
+       color-interpolation-filters="sRGB"
+       id="filter6697">
+      <feGaussianBlur
+         id="feGaussianBlur6699"
+         stdDeviation="1.9447689" />
+    </filter>
+    <clipPath
+       id="clipPath7084">
+      <path
+         d="m 72,88 -32,32 -8,0 0,-40 40,0 0,8 z"
+         id="path7086"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    </clipPath>
+    <radialGradient
+       cx="102"
+       cy="112.3047"
+       r="139.55859"
+       id="radialGradient9437"
+       xlink:href="#XMLID_8_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9996653,2e-6,0.00301608)" />
+    <linearGradient
+       x1="98.617439"
+       y1="106.41443"
+       x2="91.228737"
+       y2="99.254974"
+       id="linearGradient10213"
+       xlink:href="#linearGradient10207"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter2770">
+      <feGaussianBlur
+         id="feGaussianBlur2772"
+         stdDeviation="2.0786429" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata2611">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <path
+       d="m 16,8 0,112 c 0,0 63.15625,0 63.15625,0 l 0.03125,0 c 3e-6,0 11.90625,-9.90625 17.40625,-15.40625 C 102.09375,99.09375 112,87.1875 112,87.1875 L 112,87.15625 112,8 16,8 z"
+       transform="matrix(1.0416667,0,0,1.0267857,-2.6666667,-1.2142891)"
+       id="path7865"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;filter:url(#filter2770)" />
+    <path
+       d="M 16.000001,8 16,120 c 0,0 63.146418,0 63.146418,0 L 112,87.14642 112,8 16.000001,8 z"
+       id="path34"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m 18.000002,9.0000034 c -0.551,0 -1,0.44885 -1,0.999665 l 0,107.9638516 c 0,0.55181 0.449,0.99966 1,0.99966 l 59.171997,0 c 0.263,0 2.76268,0.11813 2.948681,-0.0688 L 110.707,88.094202 C 110.894,87.907264 111,85.40942 111,85.146508 l 0,-75.1468396 c 0,-0.550815 -0.448,-0.999665 -1,-0.999665 l -91.999998,0 z"
+       id="path59"
+       style="fill:url(#radialGradient9437);fill-opacity:1" />
+    <path
+       d="m 41.879531,115.98249 c 0,0 24.309609,-24.309614 24.309609,-24.309614 0,0 -9.35314,2.913124 -19.60314,2.913124 0,10.25 -4.706469,21.39649 -4.706469,21.39649 z"
+       transform="translate(40,0)"
+       clip-path="url(#clipPath7084)"
+       id="path5540"
+       style="opacity:0.4;fill:#000000;fill-opacity:1;filter:url(#filter6697)" />
+    <path
+       d="m 79.172,120 c 0,0 11.914,-9.914 17.414,-15.414 5.5,-5.5 15.414,-17.414 15.414,-17.414 0,0 -13.75,8.828 -24,8.828 0,10.25 -8.828,24 -8.828,24 z"
+       id="path14523"
+       style="fill:url(#linearGradient10213);fill-opacity:1" />
+    <text
+       x="64.392578"
+       y="32.103516"
+       id="text3772"
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3026"
+         x="64.392578"
+         y="32.103516">KF8</tspan></text>
+    <path
+       d="m 68.227,60.477999 c 0,2.157 0.052,3.954 -1.035,5.874 -0.88,1.561 -2.279,2.517 -3.833,2.517 -2.121,0 -3.366,-1.62 -3.366,-4.015 C 59.993,60.14 64.225,59.283 68.226,59.283 v 1.194999 z m 5.579,13.496 c -0.365,0.332 -0.896,0.352 -1.307,0.132 -1.838,-1.528 -2.167,-2.231 -3.174,-3.69 -3.035,3.094 -5.188,4.023 -9.123,4.023 -4.663,0 -8.284,-2.876 -8.284,-8.629 0,-4.49 2.433,-7.543999 5.899,-9.044999 3.005,-1.317 7.202,-1.556 10.41,-1.914 v -0.723 c 0,-1.313 0.104,-2.875 -0.671,-4.012 -0.674,-1.021 -1.968,-1.437 -3.106,-1.437 -2.111,0 -3.99,1.078 -4.45,3.321 -0.097,0.498 -0.46,0.991 -0.962,1.017 l -5.364,-0.581 c -0.456,-0.102 -0.958,-0.463 -0.828,-1.155 1.233,-6.511 7.109,-8.475 12.378,-8.475 2.693,0 6.215,0.719 8.335,2.757 2.692997,2.515 2.431997,5.869 2.431997,9.524 v 8.622999 c 0,2.596 1.081,3.732 2.091,5.128 0.354,0.503 0.434,1.103 -0.018,1.473 -1.131,0.949 -3.138997,2.693 -4.243997,3.676 l -0.014,-0.013 z"
+       id="path4047"
+       style="fill-rule:evenodd" />
+    <path
+       d="m 99.325111,79.885297 c -8.716894,6.432161 -21.357191,9.853809 -32.243032,9.853809 -15.251419,0 -28.989193,-5.636741 -39.38419,-15.021522 -0.815557,-0.738364 -0.08726,-1.746902 0.89191,-1.173831 C 39.807066,80.071565 53.675732,84 68,84 c 9.664184,0 20.284886,-2.004491 30.058986,-6.151079 1.474215,-0.623415 2.709284,0.97246 1.266125,2.036376 z"
+       id="path3858"
+       style="fill:#ff9201;fill-rule:evenodd" />
+    <path
+       d="m 104,76 c -1.11342,-1.426386 -7.371903,-0.676274 -10.179364,-0.337298 -0.853315,0.09817 -0.984206,-0.641874 -0.217315,-1.184739 4.990671,-3.505554 13.168059,-2.491141 14.119539,-1.318987 0.95736,1.187256 -0.25087,9.384779 -4.92858,13.293915 -0.71907,0.604117 -1.40373,0.286117 -1.08573,-0.510142 C 102.75988,83.311486 105.11761,77.427225 104,76 z"
+       id="path3860"
+       style="fill:#ff9201;fill-rule:evenodd" />
+  </g>
+</svg>
diff --git a/imgsrc/mimetypes/mobi.svg b/imgsrc/mimetypes/mobi.svg
index 970456b0cb..9089dac15c 100644
--- a/imgsrc/mimetypes/mobi.svg
+++ b/imgsrc/mimetypes/mobi.svg
@@ -8,10 +8,37 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
    width="128"
    height="128"
-   id="svg2606">
+   id="svg2606"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="mobi.svg"
+   inkscape:export-filename="/home/niluje/Patchland/calibre/imgsrc/mimetypes/mobi.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     id="namedview45"
+     showgrid="false"
+     inkscape:zoom="1.84375"
+     inkscape:cx="64"
+     inkscape:cy="64"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2606" />
   <defs
      id="defs2608">
     <linearGradient
@@ -184,15 +211,16 @@
        id="path14523"
        style="fill:url(#linearGradient10213);fill-opacity:1" />
     <text
-       x="32"
-       y="32"
+       x="64.902344"
+       y="32.103516"
        id="text3772"
        xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans"><tspan
-         x="32"
-         y="32"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
+       sodipodi:linespacing="125%"><tspan
+         x="64.902344"
+         y="32.103516"
          id="tspan3774"
-         style="font-size:28px;fill:#000000;fill-opacity:1">mobi</tspan></text>
+         style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">mobi</tspan></text>
     <path
        d="m 68.227,60.477999 c 0,2.157 0.052,3.954 -1.035,5.874 -0.88,1.561 -2.279,2.517 -3.833,2.517 -2.121,0 -3.366,-1.62 -3.366,-4.015 C 59.993,60.14 64.225,59.283 68.226,59.283 v 1.194999 z m 5.579,13.496 c -0.365,0.332 -0.896,0.352 -1.307,0.132 -1.838,-1.528 -2.167,-2.231 -3.174,-3.69 -3.035,3.094 -5.188,4.023 -9.123,4.023 -4.663,0 -8.284,-2.876 -8.284,-8.629 0,-4.49 2.433,-7.543999 5.899,-9.044999 3.005,-1.317 7.202,-1.556 10.41,-1.914 v -0.723 c 0,-1.313 0.104,-2.875 -0.671,-4.012 -0.674,-1.021 -1.968,-1.437 -3.106,-1.437 -2.111,0 -3.99,1.078 -4.45,3.321 -0.097,0.498 -0.46,0.991 -0.962,1.017 l -5.364,-0.581 c -0.456,-0.102 -0.958,-0.463 -0.828,-1.155 1.233,-6.511 7.109,-8.475 12.378,-8.475 2.693,0 6.215,0.719 8.335,2.757 2.692997,2.515 2.431997,5.869 2.431997,9.524 v 8.622999 c 0,2.596 1.081,3.732 2.091,5.128 0.354,0.503 0.434,1.103 -0.018,1.473 -1.131,0.949 -3.138997,2.693 -4.243997,3.676 l -0.014,-0.013 z"
        id="path4047"
diff --git a/imgsrc/mimetypes/tpz.svg b/imgsrc/mimetypes/tpz.svg
new file mode 100644
index 0000000000..cf6713a8d1
--- /dev/null
+++ b/imgsrc/mimetypes/tpz.svg
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="128"
+   height="128"
+   id="svg2606"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="tpz.svg"
+   inkscape:export-filename="/home/niluje/Patchland/calibre/imgsrc/mimetypes/tpz.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     id="namedview45"
+     showgrid="false"
+     inkscape:zoom="1.84375"
+     inkscape:cx="-11.118644"
+     inkscape:cy="42.305085"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2606" />
+  <defs
+     id="defs2608">
+    <linearGradient
+       id="linearGradient10207">
+      <stop
+         id="stop10209"
+         style="stop-color:#a2a2a2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop10211"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="96"
+       y1="104"
+       x2="88.000198"
+       y2="96.000198"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop83"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop85"
+         style="stop-color:#8c8e89;stop-opacity:1"
+         offset="0.0072" />
+      <stop
+         id="stop87"
+         style="stop-color:#abaca9;stop-opacity:1"
+         offset="0.0673" />
+      <stop
+         id="stop89"
+         style="stop-color:#c5c6c4;stop-opacity:1"
+         offset="0.1347" />
+      <stop
+         id="stop91"
+         style="stop-color:#dbdbda;stop-opacity:1"
+         offset="0.2652576" />
+      <stop
+         id="stop93"
+         style="stop-color:#ebebeb;stop-opacity:1"
+         offset="0.37646064" />
+      <stop
+         id="stop95"
+         style="stop-color:#f7f7f6;stop-opacity:1"
+         offset="0.48740286" />
+      <stop
+         id="stop97"
+         style="stop-color:#fdfdfd;stop-opacity:1"
+         offset="0.6324091" />
+      <stop
+         id="stop99"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="102"
+       cy="112.3047"
+       r="139.55859"
+       id="XMLID_8_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop41"
+         style="stop-color:#b7b8b9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop47"
+         style="stop-color:#ececec;stop-opacity:1"
+         offset="0.18851049" />
+      <stop
+         id="stop49"
+         style="stop-color:#fafafa;stop-opacity:1"
+         offset="0.25718147" />
+      <stop
+         id="stop51"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.30111277" />
+      <stop
+         id="stop53"
+         style="stop-color:#fafafa;stop-opacity:1"
+         offset="0.53130001" />
+      <stop
+         id="stop55"
+         style="stop-color:#ebecec;stop-opacity:1"
+         offset="0.84490001" />
+      <stop
+         id="stop57"
+         style="stop-color:#e1e2e3;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <filter
+       x="-0.19200002"
+       y="-0.19199999"
+       width="1.3839999"
+       height="1.3839999"
+       color-interpolation-filters="sRGB"
+       id="filter6697">
+      <feGaussianBlur
+         id="feGaussianBlur6699"
+         stdDeviation="1.9447689" />
+    </filter>
+    <clipPath
+       id="clipPath7084">
+      <path
+         d="m 72,88 -32,32 -8,0 0,-40 40,0 0,8 z"
+         id="path7086"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    </clipPath>
+    <radialGradient
+       cx="102"
+       cy="112.3047"
+       r="139.55859"
+       id="radialGradient9437"
+       xlink:href="#XMLID_8_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9996653,2e-6,0.00301608)" />
+    <linearGradient
+       x1="98.617439"
+       y1="106.41443"
+       x2="91.228737"
+       y2="99.254974"
+       id="linearGradient10213"
+       xlink:href="#linearGradient10207"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter2770">
+      <feGaussianBlur
+         id="feGaussianBlur2772"
+         stdDeviation="2.0786429" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata2611">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <path
+       d="m 16,8 0,112 c 0,0 63.15625,0 63.15625,0 l 0.03125,0 c 3e-6,0 11.90625,-9.90625 17.40625,-15.40625 C 102.09375,99.09375 112,87.1875 112,87.1875 L 112,87.15625 112,8 16,8 z"
+       transform="matrix(1.0416667,0,0,1.0267857,-2.6666667,-1.2142891)"
+       id="path7865"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;filter:url(#filter2770)" />
+    <path
+       d="M 16.000001,8 16,120 c 0,0 63.146418,0 63.146418,0 L 112,87.14642 112,8 16.000001,8 z"
+       id="path34"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m 18.000002,9.0000034 c -0.551,0 -1,0.44885 -1,0.999665 l 0,107.9638516 c 0,0.55181 0.449,0.99966 1,0.99966 l 59.171997,0 c 0.263,0 2.76268,0.11813 2.948681,-0.0688 L 110.707,88.094202 C 110.894,87.907264 111,85.40942 111,85.146508 l 0,-75.1468396 c 0,-0.550815 -0.448,-0.999665 -1,-0.999665 l -91.999998,0 z"
+       id="path59"
+       style="fill:url(#radialGradient9437);fill-opacity:1" />
+    <path
+       d="m 41.879531,115.98249 c 0,0 24.309609,-24.309614 24.309609,-24.309614 0,0 -9.35314,2.913124 -19.60314,2.913124 0,10.25 -4.706469,21.39649 -4.706469,21.39649 z"
+       transform="translate(40,0)"
+       clip-path="url(#clipPath7084)"
+       id="path5540"
+       style="opacity:0.4;fill:#000000;fill-opacity:1;filter:url(#filter6697)" />
+    <path
+       d="m 79.172,120 c 0,0 11.914,-9.914 17.414,-15.414 5.5,-5.5 15.414,-17.414 15.414,-17.414 0,0 -13.75,8.828 -24,8.828 0,10.25 -8.828,24 -8.828,24 z"
+       id="path14523"
+       style="fill:url(#linearGradient10213);fill-opacity:1" />
+    <text
+       x="64.703125"
+       y="32.175781"
+       id="text3772"
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3021"
+         x="64.703125"
+         y="32.175781">Topaz</tspan></text>
+    <path
+       d="m 68.227,60.477999 c 0,2.157 0.052,3.954 -1.035,5.874 -0.88,1.561 -2.279,2.517 -3.833,2.517 -2.121,0 -3.366,-1.62 -3.366,-4.015 C 59.993,60.14 64.225,59.283 68.226,59.283 v 1.194999 z m 5.579,13.496 c -0.365,0.332 -0.896,0.352 -1.307,0.132 -1.838,-1.528 -2.167,-2.231 -3.174,-3.69 -3.035,3.094 -5.188,4.023 -9.123,4.023 -4.663,0 -8.284,-2.876 -8.284,-8.629 0,-4.49 2.433,-7.543999 5.899,-9.044999 3.005,-1.317 7.202,-1.556 10.41,-1.914 v -0.723 c 0,-1.313 0.104,-2.875 -0.671,-4.012 -0.674,-1.021 -1.968,-1.437 -3.106,-1.437 -2.111,0 -3.99,1.078 -4.45,3.321 -0.097,0.498 -0.46,0.991 -0.962,1.017 l -5.364,-0.581 c -0.456,-0.102 -0.958,-0.463 -0.828,-1.155 1.233,-6.511 7.109,-8.475 12.378,-8.475 2.693,0 6.215,0.719 8.335,2.757 2.692997,2.515 2.431997,5.869 2.431997,9.524 v 8.622999 c 0,2.596 1.081,3.732 2.091,5.128 0.354,0.503 0.434,1.103 -0.018,1.473 -1.131,0.949 -3.138997,2.693 -4.243997,3.676 l -0.014,-0.013 z"
+       id="path4047"
+       style="fill-rule:evenodd" />
+    <path
+       d="m 99.325111,79.885297 c -8.716894,6.432161 -21.357191,9.853809 -32.243032,9.853809 -15.251419,0 -28.989193,-5.636741 -39.38419,-15.021522 -0.815557,-0.738364 -0.08726,-1.746902 0.89191,-1.173831 C 39.807066,80.071565 53.675732,84 68,84 c 9.664184,0 20.284886,-2.004491 30.058986,-6.151079 1.474215,-0.623415 2.709284,0.97246 1.266125,2.036376 z"
+       id="path3858"
+       style="fill:#ff9201;fill-rule:evenodd" />
+    <path
+       d="m 104,76 c -1.11342,-1.426386 -7.371903,-0.676274 -10.179364,-0.337298 -0.853315,0.09817 -0.984206,-0.641874 -0.217315,-1.184739 4.990671,-3.505554 13.168059,-2.491141 14.119539,-1.318987 0.95736,1.187256 -0.25087,9.384779 -4.92858,13.293915 -0.71907,0.604117 -1.40373,0.286117 -1.08573,-0.510142 C 102.75988,83.311486 105.11761,77.427225 104,76 z"
+       id="path3860"
+       style="fill:#ff9201;fill-rule:evenodd" />
+  </g>
+</svg>
diff --git a/resources/images/mimetypes/azw2.png b/resources/images/mimetypes/azw2.png
new file mode 100644
index 0000000000..229d98ed38
Binary files /dev/null and b/resources/images/mimetypes/azw2.png differ
diff --git a/resources/images/mimetypes/azw3.png b/resources/images/mimetypes/azw3.png
new file mode 100644
index 0000000000..04e913b288
Binary files /dev/null and b/resources/images/mimetypes/azw3.png differ
diff --git a/resources/images/mimetypes/mobi.png b/resources/images/mimetypes/mobi.png
index cb1230a15b..0446021706 100644
Binary files a/resources/images/mimetypes/mobi.png and b/resources/images/mimetypes/mobi.png differ
diff --git a/resources/images/mimetypes/tpz.png b/resources/images/mimetypes/tpz.png
new file mode 100644
index 0000000000..04d685fd2d
Binary files /dev/null and b/resources/images/mimetypes/tpz.png differ
diff --git a/resources/mime.types b/resources/mime.types
index afc5e9b849..75452bb17a 100644
--- a/resources/mime.types
+++ b/resources/mime.types
@@ -1,127 +1,127 @@
 ## Mimetypes from my linux system
 
-application/activemessage				
+application/activemessage
 application/andrew-inset				ez
-application/applefile				
+application/applefile
 application/applixware				aw
 application/atom+xml				atom
 application/atomcat+xml				atomcat
-application/atomicmail				
+application/atomicmail
 application/atomsvc+xml				atomsvc
-application/auth-policy+xml				
-application/batch-smtp				
-application/beep+xml				
-application/cals-1840				
+application/auth-policy+xml
+application/batch-smtp
+application/beep+xml
+application/cals-1840
 application/ccxml+xml				ccxml
-application/cea-2018+xml				
-application/cellml+xml				
-application/cnrp+xml				
-application/commonground				
-application/conference-info+xml				
-application/cpl+xml				
-application/csta+xml				
-application/cstadata+xml				
+application/cea-2018+xml
+application/cellml+xml
+application/cnrp+xml
+application/commonground
+application/conference-info+xml
+application/cpl+xml
+application/csta+xml
+application/cstadata+xml
 application/cu-seeme				cu
-application/cybercash				
+application/cybercash
 application/davmount+xml				davmount
-application/dca-rft				
-application/dec-dx				
-application/dialog-info+xml				
-application/dicom				
-application/dns				
+application/dca-rft
+application/dec-dx
+application/dialog-info+xml
+application/dicom
+application/dns
 application/dsptype				tsp
-application/dvcs				
+application/dvcs
 application/ecmascript				ecma
-application/edi-consent				
-application/edi-x12				
-application/edifact				
+application/edi-consent
+application/edi-x12
+application/edifact
 application/emma+xml				emma
-application/epp+xml				
+application/epp+xml
 application/epub+zip				epub
-application/eshop				
-application/example				
-application/fastinfoset				
-application/fastsoap				
-application/fits				
+application/eshop
+application/example
+application/fastinfoset
+application/fastsoap
+application/fits
 application/font-tdpfr				pfr
 application/futuresplash				spl
-application/h224				
+application/h224
 application/hta				hta
-application/http				
+application/http
 application/hyperstudio				stk
-application/ibe-key-request+xml				
-application/ibe-pkg-reply+xml				
-application/ibe-pp-data				
-application/iges				
-application/im-iscomposing+xml				
-application/index				
-application/index.cmd				
-application/index.obj				
-application/index.response				
-application/index.vnd				
-application/iotp				
-application/ipp				
-application/isup				
+application/ibe-key-request+xml
+application/ibe-pkg-reply+xml
+application/ibe-pp-data
+application/iges
+application/im-iscomposing+xml
+application/index
+application/index.cmd
+application/index.obj
+application/index.response
+application/index.vnd
+application/iotp
+application/ipp
+application/isup
 application/java-archive				jar
 application/java-serialized-object				ser
 application/java-vm				class
 application/javascript				js
 application/json				json
-application/kpml-request+xml				
-application/kpml-response+xml				
+application/kpml-request+xml
+application/kpml-response+xml
 application/lost+xml				lostxml
 application/mac-binhex40				hqx
 application/mac-compactpro				cpt
-application/macwriteii				
+application/macwriteii
 application/marc				mrc
 application/mathematica				ma mb nb
 application/mathml+xml				mathml
-application/mbms-associated-procedure-description+xml				
-application/mbms-deregister+xml				
-application/mbms-envelope+xml				
-application/mbms-msk+xml				
-application/mbms-msk-response+xml				
-application/mbms-protection-description+xml				
-application/mbms-reception-report+xml				
-application/mbms-register+xml				
-application/mbms-register-response+xml				
-application/mbms-user-service-description+xml				
+application/mbms-associated-procedure-description+xml
+application/mbms-deregister+xml
+application/mbms-envelope+xml
+application/mbms-msk+xml
+application/mbms-msk-response+xml
+application/mbms-protection-description+xml
+application/mbms-reception-report+xml
+application/mbms-register+xml
+application/mbms-register-response+xml
+application/mbms-user-service-description+xml
 application/mbox				mbox
-application/media_control+xml				
+application/media_control+xml
 application/mediaservercontrol+xml				mscml
-application/mikey				
-application/moss-keys				
-application/moss-signature				
-application/mosskey-data				
-application/mosskey-request				
+application/mikey
+application/moss-keys
+application/moss-signature
+application/mosskey-data
+application/mosskey-request
 application/mp4				mp4s
-application/mpeg4-generic				
-application/mpeg4-iod				
-application/mpeg4-iod-xmt				
+application/mpeg4-generic
+application/mpeg4-iod
+application/mpeg4-iod-xmt
 application/msaccess				mdb
 application/msword				doc dot
 application/mxf				mxf
-application/nasdata				
-application/news-checkgroups				
-application/news-groupinfo				
-application/news-transmission				
-application/nss				
-application/ocsp-request				
-application/ocsp-response				
+application/nasdata
+application/news-checkgroups
+application/news-groupinfo
+application/news-transmission
+application/nss
+application/ocsp-request
+application/ocsp-response
 application/octet-stream				bin bpk deploy dist distz dmg dms dump elc iso lha lrf lzh pkg so
 application/oda				oda
 application/oebps-package+xml				opf
 application/ogg				ogg ogx
 application/onenote				onepkg onetmp onetoc onetoc2
-application/parityfec				
+application/parityfec
 application/patch-ops-error+xml				xer
 application/pdf				pdf
 application/pgp-encrypted				pgp
 application/pgp-keys				key
 application/pgp-signature				asc pgp sig
 application/pics-rules				prf
-application/pidf+xml				
-application/pidf-diff+xml				
+application/pidf+xml
+application/pidf-diff+xml
 application/pkcs10				p10
 application/pkcs7-mime				p7c p7m
 application/pkcs7-signature				p7s
@@ -130,70 +130,70 @@ application/pkix-crl				crl
 application/pkix-pkipath				pkipath
 application/pkixcmp				pki
 application/pls+xml				pls
-application/poc-settings+xml				
+application/poc-settings+xml
 application/postscript				ai eps ps
-application/prs.alvestrand.titrax-sheet				
+application/prs.alvestrand.titrax-sheet
 application/prs.cww				cww
-application/prs.nprend				
-application/prs.plucker				
-application/qsig				
+application/prs.nprend
+application/prs.plucker
+application/qsig
 application/rar				rar
 application/rdf+xml				rdf
 application/reginfo+xml				rif
 application/relax-ng-compact-syntax				rnc
-application/remote-printing				
+application/remote-printing
 application/resource-lists+xml				rl
 application/resource-lists-diff+xml				rld
-application/riscos				
-application/rlmi+xml				
+application/riscos
+application/rlmi+xml
 application/rls-services+xml				rs
 application/rsd+xml				rsd
 application/rss+xml				rss
 application/rtf				rtf
-application/rtx				
-application/samlassertion+xml				
-application/samlmetadata+xml				
+application/rtx
+application/samlassertion+xml
+application/samlmetadata+xml
 application/sbml+xml				sbml
 application/scvp-cv-request				scq
 application/scvp-cv-response				scs
 application/scvp-vp-request				spq
 application/scvp-vp-response				spp
 application/sdp				sdp
-application/set-payment				
+application/set-payment
 application/set-payment-initiation				setpay
-application/set-registration				
+application/set-registration
 application/set-registration-initiation				setreg
-application/sgml				
-application/sgml-open-catalog				
+application/sgml
+application/sgml-open-catalog
 application/shf+xml				shf
-application/sieve				
-application/simple-filter+xml				
-application/simple-message-summary				
-application/simplesymbolcontainer				
-application/slate				
+application/sieve
+application/simple-filter+xml
+application/simple-message-summary
+application/simplesymbolcontainer
+application/slate
 application/smil				smi smil
 application/smil+xml				smi smil
-application/soap+fastinfoset				
-application/soap+xml				
+application/soap+fastinfoset
+application/soap+xml
 application/sparql-query				rq
 application/sparql-results+xml				srx
-application/spirits-event+xml				
+application/spirits-event+xml
 application/srgs				gram
 application/srgs+xml				grxml
 application/ssml+xml				ssml
-application/timestamp-query				
-application/timestamp-reply				
-application/tve-trigger				
-application/ulpfec				
-application/vemmi				
-application/vividence.scriptfile				
-application/vnd.3gpp.bsf+xml				
+application/timestamp-query
+application/timestamp-reply
+application/tve-trigger
+application/ulpfec
+application/vemmi
+application/vividence.scriptfile
+application/vnd.3gpp.bsf+xml
 application/vnd.3gpp.pic-bw-large				plb
 application/vnd.3gpp.pic-bw-small				psb
 application/vnd.3gpp.pic-bw-var				pvb
-application/vnd.3gpp.sms				
-application/vnd.3gpp2.bcmcsinfo+xml				
-application/vnd.3gpp2.sms				
+application/vnd.3gpp.sms
+application/vnd.3gpp2.bcmcsinfo+xml
+application/vnd.3gpp2.sms
 application/vnd.3gpp2.tcap				tcap
 application/vnd.3m.post-it-notes				pwn
 application/vnd.accpac.simply.aso				aso
@@ -203,7 +203,7 @@ application/vnd.acucorp				acutc atc
 application/vnd.adobe.air-application-installer-package+zip				air
 application/vnd.adobe.xdp+xml				xdp
 application/vnd.adobe.xfdf				xfdf
-application/vnd.aether.imp				
+application/vnd.aether.imp
 application/vnd.airzip.filesecure.azf				azf
 application/vnd.airzip.filesecure.azs				azs
 application/vnd.amazon.ebook				azw
@@ -216,23 +216,23 @@ application/vnd.antix.game-component				atx
 application/vnd.apple.installer+xml				mpkg
 application/vnd.arastra.swi				swi
 application/vnd.audiograph				aep
-application/vnd.autopackage				
-application/vnd.avistar+xml				
+application/vnd.autopackage
+application/vnd.avistar+xml
 application/vnd.blueice.multipass				mpm
-application/vnd.bluetooth.ep.oob				
+application/vnd.bluetooth.ep.oob
 application/vnd.bmi				bmi
 application/vnd.businessobjects				rep
-application/vnd.cab-jscript				
-application/vnd.canon-cpdl				
-application/vnd.canon-lips				
-application/vnd.cendio.thinlinc.clientconf				
+application/vnd.cab-jscript
+application/vnd.canon-cpdl
+application/vnd.canon-lips
+application/vnd.cendio.thinlinc.clientconf
 application/vnd.chemdraw+xml				cdxml
 application/vnd.chipnuts.karaoke-mmd				mmd
 application/vnd.cinderella				cdy
-application/vnd.cirpack.isdn-ext				
+application/vnd.cirpack.isdn-ext
 application/vnd.claymore				cla
 application/vnd.clonk.c4group				c4d c4f c4g c4p c4u
-application/vnd.commerce-battelle				
+application/vnd.commerce-battelle
 application/vnd.commonspace				csp
 application/vnd.contact.cmsg				cdbcmsg
 application/vnd.cosmocaller				cmc
@@ -243,79 +243,79 @@ application/vnd.crick.clicker.template				clkt
 application/vnd.crick.clicker.wordbank				clkw
 application/vnd.criticaltools.wbs+xml				wbs
 application/vnd.ctc-posml				pml
-application/vnd.ctct.ws+xml				
-application/vnd.cups-pdf				
-application/vnd.cups-postscript				
+application/vnd.ctct.ws+xml
+application/vnd.cups-pdf
+application/vnd.cups-postscript
 application/vnd.cups-ppd				ppd
-application/vnd.cups-raster				
-application/vnd.cups-raw				
+application/vnd.cups-raster
+application/vnd.cups-raw
 application/vnd.curl.car				car
 application/vnd.curl.pcurl				pcurl
-application/vnd.cybank				
+application/vnd.cybank
 application/vnd.data-vision.rdz				rdz
 application/vnd.denovo.fcselayout-link				fe_launch
-application/vnd.dir-bi.plate-dl-nosuffix				
+application/vnd.dir-bi.plate-dl-nosuffix
 application/vnd.dna				dna
 application/vnd.dolby.mlp				mlp
-application/vnd.dolby.mobile.1				
-application/vnd.dolby.mobile.2				
+application/vnd.dolby.mobile.1
+application/vnd.dolby.mobile.2
 application/vnd.dpgraph				dpg
 application/vnd.dreamfactory				dfac
-application/vnd.dvb.esgcontainer				
-application/vnd.dvb.ipdcdftnotifaccess				
-application/vnd.dvb.ipdcesgaccess				
-application/vnd.dvb.ipdcroaming				
-application/vnd.dvb.iptv.alfec-base				
-application/vnd.dvb.iptv.alfec-enhancement				
-application/vnd.dvb.notif-aggregate-root+xml				
-application/vnd.dvb.notif-container+xml				
-application/vnd.dvb.notif-generic+xml				
-application/vnd.dvb.notif-ia-msglist+xml				
-application/vnd.dvb.notif-ia-registration-request+xml				
-application/vnd.dvb.notif-ia-registration-response+xml				
-application/vnd.dvb.notif-init+xml				
-application/vnd.dxr				
+application/vnd.dvb.esgcontainer
+application/vnd.dvb.ipdcdftnotifaccess
+application/vnd.dvb.ipdcesgaccess
+application/vnd.dvb.ipdcroaming
+application/vnd.dvb.iptv.alfec-base
+application/vnd.dvb.iptv.alfec-enhancement
+application/vnd.dvb.notif-aggregate-root+xml
+application/vnd.dvb.notif-container+xml
+application/vnd.dvb.notif-generic+xml
+application/vnd.dvb.notif-ia-msglist+xml
+application/vnd.dvb.notif-ia-registration-request+xml
+application/vnd.dvb.notif-ia-registration-response+xml
+application/vnd.dvb.notif-init+xml
+application/vnd.dxr
 application/vnd.dynageo				geo
-application/vnd.ecdis-update				
+application/vnd.ecdis-update
 application/vnd.ecowin.chart				mag
-application/vnd.ecowin.filerequest				
-application/vnd.ecowin.fileupdate				
-application/vnd.ecowin.series				
-application/vnd.ecowin.seriesrequest				
-application/vnd.ecowin.seriesupdate				
-application/vnd.emclient.accessrequest+xml				
+application/vnd.ecowin.filerequest
+application/vnd.ecowin.fileupdate
+application/vnd.ecowin.series
+application/vnd.ecowin.seriesrequest
+application/vnd.ecowin.seriesupdate
+application/vnd.emclient.accessrequest+xml
 application/vnd.enliven				nml
 application/vnd.epson.esf				esf
 application/vnd.epson.msf				msf
 application/vnd.epson.quickanime				qam
 application/vnd.epson.salt				slt
 application/vnd.epson.ssf				ssf
-application/vnd.ericsson.quickcall				
+application/vnd.ericsson.quickcall
 application/vnd.eszigno3+xml				es3 et3
-application/vnd.etsi.aoc+xml				
-application/vnd.etsi.cug+xml				
-application/vnd.etsi.iptvcommand+xml				
-application/vnd.etsi.iptvdiscovery+xml				
-application/vnd.etsi.iptvprofile+xml				
-application/vnd.etsi.iptvsad-bc+xml				
-application/vnd.etsi.iptvsad-cod+xml				
-application/vnd.etsi.iptvsad-npvr+xml				
-application/vnd.etsi.iptvueprofile+xml				
-application/vnd.etsi.mcid+xml				
-application/vnd.etsi.sci+xml				
-application/vnd.etsi.simservs+xml				
-application/vnd.eudora.data				
+application/vnd.etsi.aoc+xml
+application/vnd.etsi.cug+xml
+application/vnd.etsi.iptvcommand+xml
+application/vnd.etsi.iptvdiscovery+xml
+application/vnd.etsi.iptvprofile+xml
+application/vnd.etsi.iptvsad-bc+xml
+application/vnd.etsi.iptvsad-cod+xml
+application/vnd.etsi.iptvsad-npvr+xml
+application/vnd.etsi.iptvueprofile+xml
+application/vnd.etsi.mcid+xml
+application/vnd.etsi.sci+xml
+application/vnd.etsi.simservs+xml
+application/vnd.eudora.data
 application/vnd.ezpix-album				ez2
 application/vnd.ezpix-package				ez3
-application/vnd.f-secure.mobile				
+application/vnd.f-secure.mobile
 application/vnd.fdf				fdf
 application/vnd.fdsn.mseed				mseed
 application/vnd.fdsn.seed				dataless seed
-application/vnd.ffsns				
-application/vnd.fints				
+application/vnd.ffsns
+application/vnd.fints
 application/vnd.flographit				gph
 application/vnd.fluxtime.clip				ftc
-application/vnd.font-fontforge-sfd				
+application/vnd.font-fontforge-sfd
 application/vnd.framemaker				book fm frame maker
 application/vnd.frogans.fnc				fnc
 application/vnd.frogans.ltf				ltf
@@ -325,13 +325,13 @@ application/vnd.fujitsu.oasys2				oa2
 application/vnd.fujitsu.oasys3				oa3
 application/vnd.fujitsu.oasysgp				fg5
 application/vnd.fujitsu.oasysprs				bh2
-application/vnd.fujixerox.art-ex				
-application/vnd.fujixerox.art4				
+application/vnd.fujixerox.art-ex
+application/vnd.fujixerox.art4
 application/vnd.fujixerox.ddd				ddd
 application/vnd.fujixerox.docuworks				xdw
 application/vnd.fujixerox.docuworks.binder				xbd
-application/vnd.fujixerox.hbpl				
-application/vnd.fut-misnet				
+application/vnd.fujixerox.hbpl
+application/vnd.fut-misnet
 application/vnd.fuzzysheet				fzs
 application/vnd.genomatix.tuxedo				txd
 application/vnd.geogebra.file				ggb
@@ -341,7 +341,7 @@ application/vnd.gmx				gmx
 application/vnd.google-earth.kml+xml				kml
 application/vnd.google-earth.kmz				kmz
 application/vnd.grafeq				gqf gqs
-application/vnd.gridmp				
+application/vnd.gridmp
 application/vnd.groove-account				gac
 application/vnd.groove-help				ghf
 application/vnd.groove-identity-message				gim
@@ -351,7 +351,7 @@ application/vnd.groove-tool-template				tpl
 application/vnd.groove-vcard				vcg
 application/vnd.handheld-entertainment+xml				zmm
 application/vnd.hbci				hbci
-application/vnd.hcl-bireports				
+application/vnd.hcl-bireports
 application/vnd.hhe.lesson-player				les
 application/vnd.hp-hpgl				hpgl
 application/vnd.hp-hpid				hpid
@@ -359,11 +359,11 @@ application/vnd.hp-hps				hps
 application/vnd.hp-jlyt				jlt
 application/vnd.hp-pcl				pcl
 application/vnd.hp-pclxl				pclxl
-application/vnd.httphone				
+application/vnd.httphone
 application/vnd.hydrostatix.sof-data				sfd-hdstx
 application/vnd.hzn-3d-crossword				x3d
-application/vnd.ibm.afplinedata				
-application/vnd.ibm.electronic-media				
+application/vnd.ibm.afplinedata
+application/vnd.ibm.electronic-media
 application/vnd.ibm.minipay				mpy
 application/vnd.ibm.modcap				afp list3820 listafp
 application/vnd.ibm.rights-management				irm
@@ -372,29 +372,29 @@ application/vnd.iccprofile				icc icm
 application/vnd.igloader				igl
 application/vnd.immervision-ivp				ivp
 application/vnd.immervision-ivu				ivu
-application/vnd.informedcontrol.rms+xml				
-application/vnd.informix-visionary				
+application/vnd.informedcontrol.rms+xml
+application/vnd.informix-visionary
 application/vnd.intercon.formnet				xpw xpx
-application/vnd.intertrust.digibox				
-application/vnd.intertrust.nncp				
+application/vnd.intertrust.digibox
+application/vnd.intertrust.nncp
 application/vnd.intu.qbo				qbo
 application/vnd.intu.qfx				qfx
-application/vnd.iptc.g2.conceptitem+xml				
-application/vnd.iptc.g2.knowledgeitem+xml				
-application/vnd.iptc.g2.newsitem+xml				
-application/vnd.iptc.g2.packageitem+xml				
+application/vnd.iptc.g2.conceptitem+xml
+application/vnd.iptc.g2.knowledgeitem+xml
+application/vnd.iptc.g2.newsitem+xml
+application/vnd.iptc.g2.packageitem+xml
 application/vnd.ipunplugged.rcprofile				rcprofile
 application/vnd.irepository.package+xml				irp
 application/vnd.is-xpr				xpr
 application/vnd.jam				jam
-application/vnd.japannet-directory-service				
-application/vnd.japannet-jpnstore-wakeup				
-application/vnd.japannet-payment-wakeup				
-application/vnd.japannet-registration				
-application/vnd.japannet-registration-wakeup				
-application/vnd.japannet-setstore-wakeup				
-application/vnd.japannet-verification				
-application/vnd.japannet-verification-wakeup				
+application/vnd.japannet-directory-service
+application/vnd.japannet-jpnstore-wakeup
+application/vnd.japannet-payment-wakeup
+application/vnd.japannet-registration
+application/vnd.japannet-registration-wakeup
+application/vnd.japannet-setstore-wakeup
+application/vnd.japannet-verification
+application/vnd.japannet-verification-wakeup
 application/vnd.jcp.javame.midlet-rms				rms
 application/vnd.jisp				jisp
 application/vnd.joost.joda-archive				joda
@@ -412,7 +412,7 @@ application/vnd.kidspiration				kia
 application/vnd.kinar				kne knp
 application/vnd.koan				skd skm skp skt
 application/vnd.kodak-descriptor				sse
-application/vnd.liberty-request+xml				
+application/vnd.liberty-request+xml
 application/vnd.llamagraphics.life-balance.desktop				lbd
 application/vnd.llamagraphics.life-balance.exchange+xml				lbe
 application/vnd.lotus-1-2-3				123
@@ -423,21 +423,21 @@ application/vnd.lotus-organizer				org
 application/vnd.lotus-screencam				scm
 application/vnd.lotus-wordpro				lwp
 application/vnd.macports.portpkg				portpkg
-application/vnd.marlin.drm.actiontoken+xml				
-application/vnd.marlin.drm.conftoken+xml				
-application/vnd.marlin.drm.license+xml				
-application/vnd.marlin.drm.mdcf				
+application/vnd.marlin.drm.actiontoken+xml
+application/vnd.marlin.drm.conftoken+xml
+application/vnd.marlin.drm.license+xml
+application/vnd.marlin.drm.mdcf
 application/vnd.mcd				mcd
 application/vnd.medcalcdata				mc1
 application/vnd.mediastation.cdkey				cdkey
-application/vnd.meridian-slingshot				
+application/vnd.meridian-slingshot
 application/vnd.mfer				mwf
 application/vnd.mfmp				mfm
 application/vnd.micrografx.flo				flo
 application/vnd.micrografx.igx				igx
 application/vnd.mif				mif
-application/vnd.minisoft-hp3000-save				
-application/vnd.mitsubishi.misty-guard.trustweb				
+application/vnd.minisoft-hp3000-save
+application/vnd.mitsubishi.misty-guard.trustweb
 application/vnd.mobius.daf				daf
 application/vnd.mobius.dis				dis
 application/vnd.mobius.mbk				mbk
@@ -447,17 +447,17 @@ application/vnd.mobius.plc				plc
 application/vnd.mobius.txf				txf
 application/vnd.mophun.application				mpn
 application/vnd.mophun.certificate				mpc
-application/vnd.motorola.flexsuite				
-application/vnd.motorola.flexsuite.adsi				
-application/vnd.motorola.flexsuite.fis				
-application/vnd.motorola.flexsuite.gotap				
-application/vnd.motorola.flexsuite.kmr				
-application/vnd.motorola.flexsuite.ttc				
-application/vnd.motorola.flexsuite.wem				
-application/vnd.motorola.iprm				
+application/vnd.motorola.flexsuite
+application/vnd.motorola.flexsuite.adsi
+application/vnd.motorola.flexsuite.fis
+application/vnd.motorola.flexsuite.gotap
+application/vnd.motorola.flexsuite.kmr
+application/vnd.motorola.flexsuite.ttc
+application/vnd.motorola.flexsuite.wem
+application/vnd.motorola.iprm
 application/vnd.mozilla.xul+xml				xul
 application/vnd.ms-artgalry				cil
-application/vnd.ms-asf				
+application/vnd.ms-asf
 application/vnd.ms-cab-compressed				cab
 application/vnd.ms-excel				xla xlb xlc xlm xls xlt xlw
 application/vnd.ms-excel.addin.macroenabled.12				xlam
@@ -470,7 +470,7 @@ application/vnd.ms-ims				ims
 application/vnd.ms-lrm				lrm
 application/vnd.ms-pki.seccat				cat
 application/vnd.ms-pki.stl				stl
-application/vnd.ms-playready.initiator+xml				
+application/vnd.ms-playready.initiator+xml
 application/vnd.ms-powerpoint				pot pps ppt
 application/vnd.ms-powerpoint.addin.macroenabled.12				ppam
 application/vnd.ms-powerpoint.presentation.macroenabled.12				pptm
@@ -478,45 +478,45 @@ application/vnd.ms-powerpoint.slide.macroenabled.12				sldm
 application/vnd.ms-powerpoint.slideshow.macroenabled.12				ppsm
 application/vnd.ms-powerpoint.template.macroenabled.12				potm
 application/vnd.ms-project				mpp mpt
-application/vnd.ms-tnef				
-application/vnd.ms-wmdrm.lic-chlg-req				
-application/vnd.ms-wmdrm.lic-resp				
-application/vnd.ms-wmdrm.meter-chlg-req				
-application/vnd.ms-wmdrm.meter-resp				
+application/vnd.ms-tnef
+application/vnd.ms-wmdrm.lic-chlg-req
+application/vnd.ms-wmdrm.lic-resp
+application/vnd.ms-wmdrm.meter-chlg-req
+application/vnd.ms-wmdrm.meter-resp
 application/vnd.ms-word.document.macroenabled.12				docm
 application/vnd.ms-word.template.macroenabled.12				dotm
 application/vnd.ms-works				wcm wdb wks wps
 application/vnd.ms-wpl				wpl
 application/vnd.ms-xpsdocument				xps
 application/vnd.mseq				mseq
-application/vnd.msign				
-application/vnd.multiad.creator				
-application/vnd.multiad.creator.cif				
-application/vnd.music-niff				
+application/vnd.msign
+application/vnd.multiad.creator
+application/vnd.multiad.creator.cif
+application/vnd.music-niff
 application/vnd.musician				mus
 application/vnd.muvee.style				msty
-application/vnd.ncd.control				
-application/vnd.ncd.reference				
-application/vnd.nervana				
-application/vnd.netfpx				
+application/vnd.ncd.control
+application/vnd.ncd.reference
+application/vnd.nervana
+application/vnd.netfpx
 application/vnd.neurolanguage.nlu				nlu
 application/vnd.noblenet-directory				nnd
 application/vnd.noblenet-sealer				nns
 application/vnd.noblenet-web				nnw
-application/vnd.nokia.catalogs				
-application/vnd.nokia.conml+wbxml				
-application/vnd.nokia.conml+xml				
-application/vnd.nokia.iptv.config+xml				
-application/vnd.nokia.isds-radio-presets				
-application/vnd.nokia.landmark+wbxml				
-application/vnd.nokia.landmark+xml				
-application/vnd.nokia.landmarkcollection+xml				
-application/vnd.nokia.n-gage.ac+xml				
+application/vnd.nokia.catalogs
+application/vnd.nokia.conml+wbxml
+application/vnd.nokia.conml+xml
+application/vnd.nokia.iptv.config+xml
+application/vnd.nokia.isds-radio-presets
+application/vnd.nokia.landmark+wbxml
+application/vnd.nokia.landmark+xml
+application/vnd.nokia.landmarkcollection+xml
+application/vnd.nokia.n-gage.ac+xml
 application/vnd.nokia.n-gage.data				ngdat
 application/vnd.nokia.n-gage.symbian.install				n-gage
-application/vnd.nokia.ncd				
-application/vnd.nokia.pcd+wbxml				
-application/vnd.nokia.pcd+xml				
+application/vnd.nokia.ncd
+application/vnd.nokia.pcd+wbxml
+application/vnd.nokia.pcd+xml
 application/vnd.nokia.radio-preset				rpst
 application/vnd.nokia.radio-presets				rpss
 application/vnd.novadigm.edm				edm
@@ -539,39 +539,39 @@ application/vnd.oasis.opendocument.text				odt
 application/vnd.oasis.opendocument.text-master				odm otm
 application/vnd.oasis.opendocument.text-template				ott
 application/vnd.oasis.opendocument.text-web				oth
-application/vnd.obn				
+application/vnd.obn
 application/vnd.olpc-sugar				xo
-application/vnd.oma-scws-config				
-application/vnd.oma-scws-http-request				
-application/vnd.oma-scws-http-response				
-application/vnd.oma.bcast.associated-procedure-parameter+xml				
-application/vnd.oma.bcast.drm-trigger+xml				
-application/vnd.oma.bcast.imd+xml				
-application/vnd.oma.bcast.ltkm				
-application/vnd.oma.bcast.notification+xml				
-application/vnd.oma.bcast.provisioningtrigger				
-application/vnd.oma.bcast.sgboot				
-application/vnd.oma.bcast.sgdd+xml				
-application/vnd.oma.bcast.sgdu				
-application/vnd.oma.bcast.simple-symbol-container				
-application/vnd.oma.bcast.smartcard-trigger+xml				
-application/vnd.oma.bcast.sprov+xml				
-application/vnd.oma.bcast.stkm				
-application/vnd.oma.dcd				
-application/vnd.oma.dcdc				
+application/vnd.oma-scws-config
+application/vnd.oma-scws-http-request
+application/vnd.oma-scws-http-response
+application/vnd.oma.bcast.associated-procedure-parameter+xml
+application/vnd.oma.bcast.drm-trigger+xml
+application/vnd.oma.bcast.imd+xml
+application/vnd.oma.bcast.ltkm
+application/vnd.oma.bcast.notification+xml
+application/vnd.oma.bcast.provisioningtrigger
+application/vnd.oma.bcast.sgboot
+application/vnd.oma.bcast.sgdd+xml
+application/vnd.oma.bcast.sgdu
+application/vnd.oma.bcast.simple-symbol-container
+application/vnd.oma.bcast.smartcard-trigger+xml
+application/vnd.oma.bcast.sprov+xml
+application/vnd.oma.bcast.stkm
+application/vnd.oma.dcd
+application/vnd.oma.dcdc
 application/vnd.oma.dd2+xml				dd2
-application/vnd.oma.drm.risd+xml				
-application/vnd.oma.group-usage-list+xml				
-application/vnd.oma.poc.detailed-progress-report+xml				
-application/vnd.oma.poc.final-report+xml				
-application/vnd.oma.poc.groups+xml				
-application/vnd.oma.poc.invocation-descriptor+xml				
-application/vnd.oma.poc.optimized-progress-report+xml				
-application/vnd.oma.xcap-directory+xml				
-application/vnd.omads-email+xml				
-application/vnd.omads-file+xml				
-application/vnd.omads-folder+xml				
-application/vnd.omaloc-supl-init				
+application/vnd.oma.drm.risd+xml
+application/vnd.oma.group-usage-list+xml
+application/vnd.oma.poc.detailed-progress-report+xml
+application/vnd.oma.poc.final-report+xml
+application/vnd.oma.poc.groups+xml
+application/vnd.oma.poc.invocation-descriptor+xml
+application/vnd.oma.poc.optimized-progress-report+xml
+application/vnd.oma.xcap-directory+xml
+application/vnd.omads-email+xml
+application/vnd.omads-file+xml
+application/vnd.omads-folder+xml
+application/vnd.omaloc-supl-init
 application/vnd.openofficeorg.extension				oxt
 application/vnd.openxmlformats-officedocument.presentationml.presentation				pptx
 application/vnd.openxmlformats-officedocument.presentationml.slide				sldx
@@ -581,55 +581,55 @@ application/vnd.openxmlformats-officedocument.spreadsheetml.sheet				xlsx
 application/vnd.openxmlformats-officedocument.spreadsheetml.template				xltx
 application/vnd.openxmlformats-officedocument.wordprocessingml.document				docx
 application/vnd.openxmlformats-officedocument.wordprocessingml.template				dotx
-application/vnd.osa.netdeploy				
-application/vnd.osgi.bundle				
+application/vnd.osa.netdeploy
+application/vnd.osgi.bundle
 application/vnd.osgi.dp				dp
-application/vnd.otps.ct-kip+xml				
-application/vnd.paos.xml				
+application/vnd.otps.ct-kip+xml
+application/vnd.paos.xml
 application/vnd.pg.format				str
 application/vnd.pg.osasli				ei6
-application/vnd.piaccess.application-licence				
+application/vnd.piaccess.application-licence
 application/vnd.picsel				efif
-application/vnd.poc.group-advertisement+xml				
+application/vnd.poc.group-advertisement+xml
 application/vnd.pocketlearn				plf
 application/vnd.powerbuilder6				pbd
-application/vnd.powerbuilder6-s				
-application/vnd.powerbuilder7				
-application/vnd.powerbuilder7-s				
-application/vnd.powerbuilder75				
-application/vnd.powerbuilder75-s				
-application/vnd.preminet				
+application/vnd.powerbuilder6-s
+application/vnd.powerbuilder7
+application/vnd.powerbuilder7-s
+application/vnd.powerbuilder75
+application/vnd.powerbuilder75-s
+application/vnd.preminet
 application/vnd.previewsystems.box				box
 application/vnd.proteus.magazine				mgz
 application/vnd.publishare-delta-tree				qps
 application/vnd.pvi.ptid1				ptid
-application/vnd.pwg-multiplexed				
-application/vnd.pwg-xhtml-print+xml				
-application/vnd.qualcomm.brew-app-res				
+application/vnd.pwg-multiplexed
+application/vnd.pwg-xhtml-print+xml
+application/vnd.qualcomm.brew-app-res
 application/vnd.quark.quarkxpress				qwd qwt qxb qxd qxl qxt
-application/vnd.rapid				
+application/vnd.rapid
 application/vnd.recordare.musicxml				mxl
 application/vnd.recordare.musicxml+xml				musicxml
-application/vnd.renlearn.rlprint				
+application/vnd.renlearn.rlprint
 application/vnd.rim.cod				cod
 application/vnd.rn-realmedia				rm
 application/vnd.route66.link66+xml				link66
-application/vnd.ruckus.download				
-application/vnd.s3sms				
-application/vnd.sbm.cid				
-application/vnd.sbm.mid2				
-application/vnd.scribus				
-application/vnd.sealed.3df				
-application/vnd.sealed.csf				
-application/vnd.sealed.doc				
-application/vnd.sealed.eml				
-application/vnd.sealed.mht				
-application/vnd.sealed.net				
-application/vnd.sealed.ppt				
-application/vnd.sealed.tiff				
-application/vnd.sealed.xls				
-application/vnd.sealedmedia.softseal.html				
-application/vnd.sealedmedia.softseal.pdf				
+application/vnd.ruckus.download
+application/vnd.s3sms
+application/vnd.sbm.cid
+application/vnd.sbm.mid2
+application/vnd.scribus
+application/vnd.sealed.3df
+application/vnd.sealed.csf
+application/vnd.sealed.doc
+application/vnd.sealed.eml
+application/vnd.sealed.mht
+application/vnd.sealed.net
+application/vnd.sealed.ppt
+application/vnd.sealed.tiff
+application/vnd.sealed.xls
+application/vnd.sealedmedia.softseal.html
+application/vnd.sealedmedia.softseal.pdf
 application/vnd.seemail				see
 application/vnd.sema				sema
 application/vnd.semd				semd
@@ -641,22 +641,22 @@ application/vnd.shana.informed.package				ipk
 application/vnd.simtech-mindmapper				twd twds
 application/vnd.smaf				mmf
 application/vnd.smart.teacher				teacher
-application/vnd.software602.filler.form+xml				
-application/vnd.software602.filler.form-xml-zip				
+application/vnd.software602.filler.form+xml
+application/vnd.software602.filler.form-xml-zip
 application/vnd.solent.sdkm+xml				sdkd sdkm
 application/vnd.spotfire.dxp				dxp
 application/vnd.spotfire.sfs				sfs
-application/vnd.sss-cod				
-application/vnd.sss-dtf				
-application/vnd.sss-ntf				
+application/vnd.sss-cod
+application/vnd.sss-dtf
+application/vnd.sss-ntf
 application/vnd.stardivision.calc				sdc
 application/vnd.stardivision.draw				sda
 application/vnd.stardivision.impress				sdd sdp
 application/vnd.stardivision.math				sdf smf
 application/vnd.stardivision.writer				sdw vor
 application/vnd.stardivision.writer-global				sgl
-application/vnd.street-stream				
-application/vnd.sun.wadl+xml				
+application/vnd.street-stream
+application/vnd.sun.wadl+xml
 application/vnd.sun.xml.calc				sxc
 application/vnd.sun.xml.calc.template				stc
 application/vnd.sun.xml.draw				sxd
@@ -669,70 +669,70 @@ application/vnd.sun.xml.writer.global				sxg
 application/vnd.sun.xml.writer.template				stw
 application/vnd.sus-calendar				sus susp
 application/vnd.svd				svd
-application/vnd.swiftview-ics				
+application/vnd.swiftview-ics
 application/vnd.symbian.install				sis sisx
 application/vnd.syncml+xml				xsm
 application/vnd.syncml.dm+wbxml				bdm
 application/vnd.syncml.dm+xml				xdm
-application/vnd.syncml.dm.notification				
-application/vnd.syncml.ds.notification				
+application/vnd.syncml.dm.notification
+application/vnd.syncml.ds.notification
 application/vnd.tao.intent-module-archive				tao
 application/vnd.tmobile-livetv				tmo
 application/vnd.trid.tpt				tpt
 application/vnd.triscape.mxs				mxs
 application/vnd.trueapp				tra
-application/vnd.truedoc				
+application/vnd.truedoc
 application/vnd.ufdl				ufd ufdl
 application/vnd.uiq.theme				utz
 application/vnd.umajin				umj
 application/vnd.unity				unityweb
 application/vnd.uoml+xml				uoml
-application/vnd.uplanet.alert				
-application/vnd.uplanet.alert-wbxml				
-application/vnd.uplanet.bearer-choice				
-application/vnd.uplanet.bearer-choice-wbxml				
-application/vnd.uplanet.cacheop				
-application/vnd.uplanet.cacheop-wbxml				
-application/vnd.uplanet.channel				
-application/vnd.uplanet.channel-wbxml				
-application/vnd.uplanet.list				
-application/vnd.uplanet.list-wbxml				
-application/vnd.uplanet.listcmd				
-application/vnd.uplanet.listcmd-wbxml				
-application/vnd.uplanet.signal				
+application/vnd.uplanet.alert
+application/vnd.uplanet.alert-wbxml
+application/vnd.uplanet.bearer-choice
+application/vnd.uplanet.bearer-choice-wbxml
+application/vnd.uplanet.cacheop
+application/vnd.uplanet.cacheop-wbxml
+application/vnd.uplanet.channel
+application/vnd.uplanet.channel-wbxml
+application/vnd.uplanet.list
+application/vnd.uplanet.list-wbxml
+application/vnd.uplanet.listcmd
+application/vnd.uplanet.listcmd-wbxml
+application/vnd.uplanet.signal
 application/vnd.vcx				vcx
-application/vnd.vd-study				
-application/vnd.vectorworks				
-application/vnd.vidsoft.vidconference				
+application/vnd.vd-study
+application/vnd.vectorworks
+application/vnd.vidsoft.vidconference
 application/vnd.visio				vsd vss vst vsw
 application/vnd.visionary				vis
-application/vnd.vividence.scriptfile				
+application/vnd.vividence.scriptfile
 application/vnd.vsf				vsf
-application/vnd.wap.sic				
-application/vnd.wap.slc				
+application/vnd.wap.sic
+application/vnd.wap.slc
 application/vnd.wap.wbxml				wbxml
 application/vnd.wap.wmlc				wmlc
 application/vnd.wap.wmlscriptc				wmlsc
 application/vnd.webturbo				wtb
-application/vnd.wfa.wsc				
-application/vnd.wmc				
-application/vnd.wmf.bootstrap				
+application/vnd.wfa.wsc
+application/vnd.wmc
+application/vnd.wmf.bootstrap
 application/vnd.wordperfect				wpd
 application/vnd.wqd				wqd
-application/vnd.wrq-hp3000-labelled				
+application/vnd.wrq-hp3000-labelled
 application/vnd.wt.stf				stf
-application/vnd.wv.csp+wbxml				
-application/vnd.wv.csp+xml				
-application/vnd.wv.ssp+xml				
+application/vnd.wv.csp+wbxml
+application/vnd.wv.csp+xml
+application/vnd.wv.ssp+xml
 application/vnd.xara				xar
 application/vnd.xfdl				xfdl
-application/vnd.xfdl.webform				
-application/vnd.xmi+xml				
-application/vnd.xmpie.cpkg				
-application/vnd.xmpie.dpkg				
-application/vnd.xmpie.plan				
-application/vnd.xmpie.ppkg				
-application/vnd.xmpie.xlim				
+application/vnd.xfdl.webform
+application/vnd.xmi+xml
+application/vnd.xmpie.cpkg
+application/vnd.xmpie.dpkg
+application/vnd.xmpie.plan
+application/vnd.xmpie.ppkg
+application/vnd.xmpie.xlim
 application/vnd.yamaha.hv-dic				hvd
 application/vnd.yamaha.hv-script				hvs
 application/vnd.yamaha.hv-voice				hvp
@@ -744,11 +744,11 @@ application/vnd.yellowriver-custom-menu				cmp
 application/vnd.zul				zir zirz
 application/vnd.zzazz.deck+xml				zaz
 application/voicexml+xml				vxml
-application/watcherinfo+xml				
-application/whoispp-query				
-application/whoispp-response				
+application/watcherinfo+xml
+application/whoispp-query
+application/whoispp-response
 application/winhlp				hlp
-application/wita				
+application/wita
 application/wordperfect				wpd
 application/wordperfect5.1				wp5
 application/wsdl+xml				wsdl
@@ -768,7 +768,7 @@ application/x-cdf				cdf
 application/x-cdlink				vcd
 application/x-chat				chat
 application/x-chess-pgn				pgn
-application/x-compress				
+application/x-compress
 application/x-cpio				cpio
 application/x-csh				csh
 application/x-debian-package				deb udeb
@@ -782,26 +782,26 @@ application/x-dvi				dvi
 application/x-flac				flac
 application/x-font				gsf pcf pcf.Z pfa pfb
 application/x-font-bdf				bdf
-application/x-font-dos				
-application/x-font-framemaker				
+application/x-font-dos
+application/x-font-framemaker
 application/x-font-ghostscript				gsf
-application/x-font-libgrx				
+application/x-font-libgrx
 application/x-font-linux-psf				psf
 application/x-font-otf				otf
 application/x-font-pcf				pcf
 application/x-font-snf				snf
-application/x-font-speedo				
-application/x-font-sunos-news				
+application/x-font-speedo
+application/x-font-sunos-news
 application/x-font-ttf				ttc ttf
 application/x-font-type1				afm pfa pfb pfm
-application/x-font-vfont				
+application/x-font-vfont
 application/x-freemind				mm
 application/x-futuresplash				spl
 application/x-gnumeric				gnumeric
 application/x-go-sgf				sgf
 application/x-graphing-calculator				gcf
 application/x-gtar				gtar taz tgz
-application/x-gzip				
+application/x-gzip
 application/x-hdf				hdf
 application/x-ica				ica
 application/x-internet-signup				ins isp
@@ -880,147 +880,147 @@ application/x-x509-ca-cert				crt der
 application/x-xcf				xcf
 application/x-xfig				fig
 application/x-xpinstall				xpi
-application/x400-bp				
-application/xcap-att+xml				
-application/xcap-caps+xml				
-application/xcap-el+xml				
-application/xcap-error+xml				
-application/xcap-ns+xml				
-application/xcon-conference-info+xml				
-application/xcon-conference-info-diff+xml				
+application/x400-bp
+application/xcap-att+xml
+application/xcap-caps+xml
+application/xcap-el+xml
+application/xcap-error+xml
+application/xcap-ns+xml
+application/xcon-conference-info+xml
+application/xcon-conference-info-diff+xml
 application/xenc+xml				xenc
 application/xhtml+xml				xht xhtml
-application/xhtml-voice+xml				
+application/xhtml-voice+xml
 application/xml				xml xsl
 application/xml-dtd				dtd
-application/xml-external-parsed-entity				
-application/xmpp+xml				
+application/xml-external-parsed-entity
+application/xmpp+xml
 application/xop+xml				xop
 application/xslt+xml				xslt
 application/xspf+xml				xspf
 application/xv+xml				mxml xhvml xvm xvml
 application/zip				zip
-audio/32kadpcm				
-audio/3gpp				
-audio/3gpp2				
-audio/ac3				
+audio/32kadpcm
+audio/3gpp
+audio/3gpp2
+audio/ac3
 audio/adpcm				adp
-audio/amr				
-audio/amr-wb				
-audio/amr-wb+				
-audio/asc				
+audio/amr
+audio/amr-wb
+audio/amr-wb+
+audio/asc
 audio/basic				au snd
-audio/bv16				
-audio/bv32				
-audio/clearmode				
-audio/cn				
-audio/dat12				
-audio/dls				
-audio/dsr-es201108				
-audio/dsr-es202050				
-audio/dsr-es202211				
-audio/dsr-es202212				
-audio/dvi4				
-audio/eac3				
-audio/evrc				
-audio/evrc-qcp				
-audio/evrc0				
-audio/evrc1				
-audio/evrcb				
-audio/evrcb0				
-audio/evrcb1				
-audio/evrcwb				
-audio/evrcwb0				
-audio/evrcwb1				
-audio/example				
-audio/g719				
-audio/g722				
-audio/g7221				
-audio/g723				
-audio/g726-16				
-audio/g726-24				
-audio/g726-32				
-audio/g726-40				
-audio/g728				
-audio/g729				
-audio/g7291				
-audio/g729d				
-audio/g729e				
-audio/gsm				
-audio/gsm-efr				
-audio/ilbc				
-audio/l16				
-audio/l20				
-audio/l24				
-audio/l8				
-audio/lpc				
+audio/bv16
+audio/bv32
+audio/clearmode
+audio/cn
+audio/dat12
+audio/dls
+audio/dsr-es201108
+audio/dsr-es202050
+audio/dsr-es202211
+audio/dsr-es202212
+audio/dvi4
+audio/eac3
+audio/evrc
+audio/evrc-qcp
+audio/evrc0
+audio/evrc1
+audio/evrcb
+audio/evrcb0
+audio/evrcb1
+audio/evrcwb
+audio/evrcwb0
+audio/evrcwb1
+audio/example
+audio/g719
+audio/g722
+audio/g7221
+audio/g723
+audio/g726-16
+audio/g726-24
+audio/g726-32
+audio/g726-40
+audio/g728
+audio/g729
+audio/g7291
+audio/g729d
+audio/g729e
+audio/gsm
+audio/gsm-efr
+audio/ilbc
+audio/l16
+audio/l20
+audio/l24
+audio/l8
+audio/lpc
 audio/midi				kar mid midi rmi
-audio/mobile-xmf				
+audio/mobile-xmf
 audio/mp4				mp4a
-audio/mp4a-latm				
-audio/mpa				
-audio/mpa-robust				
+audio/mp4a-latm
+audio/mpa
+audio/mpa-robust
 audio/mpeg				m2a m3a m4a mp2 mp2a mp3 mpega mpga
-audio/mpeg4-generic				
+audio/mpeg4-generic
 audio/mpegurl				m3u
 audio/ogg				oga ogg spx
-audio/parityfec				
-audio/pcma				
-audio/pcma-wb				
-audio/pcmu				
-audio/pcmu-wb				
+audio/parityfec
+audio/pcma
+audio/pcma-wb
+audio/pcmu
+audio/pcmu-wb
 audio/prs.sid				sid
-audio/qcelp				
-audio/red				
-audio/rtp-enc-aescm128				
-audio/rtp-midi				
-audio/rtx				
-audio/smv				
-audio/smv-qcp				
-audio/smv0				
-audio/sp-midi				
-audio/t140c				
-audio/t38				
-audio/telephone-event				
-audio/tone				
-audio/ulpfec				
-audio/vdvi				
-audio/vmr-wb				
-audio/vnd.3gpp.iufp				
-audio/vnd.4sb				
-audio/vnd.audiokoz				
-audio/vnd.celp				
-audio/vnd.cisco.nse				
-audio/vnd.cmles.radio-events				
-audio/vnd.cns.anp1				
-audio/vnd.cns.inf1				
+audio/qcelp
+audio/red
+audio/rtp-enc-aescm128
+audio/rtp-midi
+audio/rtx
+audio/smv
+audio/smv-qcp
+audio/smv0
+audio/sp-midi
+audio/t140c
+audio/t38
+audio/telephone-event
+audio/tone
+audio/ulpfec
+audio/vdvi
+audio/vmr-wb
+audio/vnd.3gpp.iufp
+audio/vnd.4sb
+audio/vnd.audiokoz
+audio/vnd.celp
+audio/vnd.cisco.nse
+audio/vnd.cmles.radio-events
+audio/vnd.cns.anp1
+audio/vnd.cns.inf1
 audio/vnd.digital-winds				eol
-audio/vnd.dlna.adts				
-audio/vnd.dolby.heaac.1				
-audio/vnd.dolby.heaac.2				
-audio/vnd.dolby.mlp				
-audio/vnd.dolby.mps				
-audio/vnd.dolby.pl2				
-audio/vnd.dolby.pl2x				
-audio/vnd.dolby.pl2z				
+audio/vnd.dlna.adts
+audio/vnd.dolby.heaac.1
+audio/vnd.dolby.heaac.2
+audio/vnd.dolby.mlp
+audio/vnd.dolby.mps
+audio/vnd.dolby.pl2
+audio/vnd.dolby.pl2x
+audio/vnd.dolby.pl2z
 audio/vnd.dts				dts
 audio/vnd.dts.hd				dtshd
-audio/vnd.everad.plj				
-audio/vnd.hns.audio				
+audio/vnd.everad.plj
+audio/vnd.hns.audio
 audio/vnd.lucent.voice				lvp
 audio/vnd.ms-playready.media.pya				pya
-audio/vnd.nokia.mobile-xmf				
-audio/vnd.nortel.vbk				
+audio/vnd.nokia.mobile-xmf
+audio/vnd.nortel.vbk
 audio/vnd.nuera.ecelp4800				ecelp4800
 audio/vnd.nuera.ecelp7470				ecelp7470
 audio/vnd.nuera.ecelp9600				ecelp9600
-audio/vnd.octel.sbc				
-audio/vnd.qcelp				
-audio/vnd.rhetorex.32kadpcm				
-audio/vnd.sealedmedia.softseal.mpeg				
-audio/vnd.vmx.cvsd				
-audio/vorbis				
-audio/vorbis-config				
+audio/vnd.octel.sbc
+audio/vnd.qcelp
+audio/vnd.rhetorex.32kadpcm
+audio/vnd.sealedmedia.softseal.mpeg
+audio/vnd.vmx.cvsd
+audio/vorbis
+audio/vorbis-config
 audio/x-aac				aac
 audio/x-aiff				aif aifc aiff
 audio/x-gsm				gsm
@@ -1088,26 +1088,26 @@ chemical/x-xtel				xtel
 chemical/x-xyz				xyz
 image/bmp				bmp
 image/cgm				cgm
-image/example				
-image/fits				
+image/example
+image/fits
 image/g3fax				g3
 image/gif				gif
 image/ief				ief
-image/jp2				
+image/jp2
 image/jpeg				jpe jpeg jpg
-image/jpm				
-image/jpx				
-image/naplps				
+image/jpm
+image/jpx
+image/naplps
 image/pcx				pcx
 image/png				png
 image/prs.btif				btif
-image/prs.pti				
+image/prs.pti
 image/svg+xml				svg svgz
-image/t38				
+image/t38
 image/tiff				tif tiff
-image/tiff-fx				
+image/tiff-fx
 image/vnd.adobe.photoshop				psd
-image/vnd.cns.inf2				
+image/vnd.cns.inf2
 image/vnd.djvu				djv djvu
 image/vnd.dwg				dwg
 image/vnd.dxf				dxf
@@ -1116,16 +1116,16 @@ image/vnd.fpx				fpx
 image/vnd.fst				fst
 image/vnd.fujixerox.edmics-mmr				mmr
 image/vnd.fujixerox.edmics-rlc				rlc
-image/vnd.globalgraphics.pgb				
-image/vnd.microsoft.icon				
-image/vnd.mix				
+image/vnd.globalgraphics.pgb
+image/vnd.microsoft.icon
+image/vnd.mix
 image/vnd.ms-modi				mdi
 image/vnd.net-fpx				npx
-image/vnd.radiance				
-image/vnd.sealed.png				
-image/vnd.sealedmedia.softseal.gif				
-image/vnd.sealedmedia.softseal.jpg				
-image/vnd.svf				
+image/vnd.radiance
+image/vnd.sealed.png
+image/vnd.sealedmedia.softseal.gif
+image/vnd.sealedmedia.softseal.jpg
+image/vnd.svf
 image/vnd.wap.wbmp				wbmp
 image/vnd.xiff				xif
 image/x-cmu-raster				ras
@@ -1150,109 +1150,109 @@ image/x-rgb				rgb
 image/x-xbitmap				xbm
 image/x-xpixmap				xpm
 image/x-xwindowdump				xwd
-message/cpim				
-message/delivery-status				
-message/disposition-notification				
-message/example				
-message/external-body				
-message/global				
-message/global-delivery-status				
-message/global-disposition-notification				
-message/global-headers				
-message/http				
-message/imdn+xml				
-message/news				
-message/partial				
+message/cpim
+message/delivery-status
+message/disposition-notification
+message/example
+message/external-body
+message/global
+message/global-delivery-status
+message/global-disposition-notification
+message/global-headers
+message/http
+message/imdn+xml
+message/news
+message/partial
 message/rfc822				eml mime
-message/s-http				
-message/sip				
-message/sipfrag				
-message/tracking-status				
-message/vnd.si.simp				
-model/example				
+message/s-http
+message/sip
+message/sipfrag
+message/tracking-status
+message/vnd.si.simp
+model/example
 model/iges				iges igs
 model/mesh				mesh msh silo
 model/vnd.dwf				dwf
-model/vnd.flatland.3dml				
+model/vnd.flatland.3dml
 model/vnd.gdl				gdl
-model/vnd.gs-gdl				
-model/vnd.gs.gdl				
+model/vnd.gs-gdl
+model/vnd.gs.gdl
 model/vnd.gtw				gtw
-model/vnd.moml+xml				
+model/vnd.moml+xml
 model/vnd.mts				mts
-model/vnd.parasolid.transmit.binary				
-model/vnd.parasolid.transmit.text				
+model/vnd.parasolid.transmit.binary
+model/vnd.parasolid.transmit.text
 model/vnd.vtu				vtu
 model/vrml				vrml wrl
-multipart/alternative				
-multipart/appledouble				
-multipart/byteranges				
-multipart/digest				
-multipart/encrypted				
-multipart/example				
-multipart/form-data				
-multipart/header-set				
-multipart/mixed				
-multipart/parallel				
-multipart/related				
-multipart/report				
-multipart/signed				
-multipart/voice-message				
+multipart/alternative
+multipart/appledouble
+multipart/byteranges
+multipart/digest
+multipart/encrypted
+multipart/example
+multipart/form-data
+multipart/header-set
+multipart/mixed
+multipart/parallel
+multipart/related
+multipart/report
+multipart/signed
+multipart/voice-message
 text/calendar				ics icz ifb
 text/comma-separated-values				csv
 text/css				css
 text/csv				csv
-text/directory				
-text/dns				
-text/ecmascript				
-text/enriched				
-text/example				
+text/directory
+text/dns
+text/ecmascript
+text/enriched
+text/example
 text/h323				323
 text/html				htm html shtml
 text/iuls				uls
-text/javascript				
+text/javascript
 text/mathml				mml
-text/parityfec				
+text/parityfec
 text/plain				asc conf def diff in list log pot text txt
-text/prs.fallenstein.rst				
+text/prs.fallenstein.rst
 text/prs.lines.tag				dsc
-text/red				
-text/rfc822-headers				
+text/red
+text/rfc822-headers
 text/richtext				rtx
 text/rtf				rtf
-text/rtp-enc-aescm128				
-text/rtx				
+text/rtp-enc-aescm128
+text/rtx
 text/scriptlet				sct wsc
 text/sgml				sgm sgml
-text/t140				
+text/t140
 text/tab-separated-values				tsv
 text/texmacs				tm ts
 text/troff				man me ms roff t tr
-text/ulpfec				
+text/ulpfec
 text/uri-list				uri uris urls
-text/vnd.abc				
+text/vnd.abc
 text/vnd.curl				curl
 text/vnd.curl.dcurl				dcurl
 text/vnd.curl.mcurl				mcurl
 text/vnd.curl.scurl				scurl
-text/vnd.dmclientscript				
-text/vnd.esmertec.theme-descriptor				
+text/vnd.dmclientscript
+text/vnd.esmertec.theme-descriptor
 text/vnd.fly				fly
 text/vnd.fmi.flexstor				flx
 text/vnd.graphviz				gv
 text/vnd.in3d.3dml				3dml
 text/vnd.in3d.spot				spot
-text/vnd.iptc.newsml				
-text/vnd.iptc.nitf				
-text/vnd.latex-z				
-text/vnd.motorola.reflex				
-text/vnd.ms-mediapackage				
-text/vnd.net2phone.commcenter.command				
-text/vnd.si.uricatalogue				
+text/vnd.iptc.newsml
+text/vnd.iptc.nitf
+text/vnd.latex-z
+text/vnd.motorola.reflex
+text/vnd.ms-mediapackage
+text/vnd.net2phone.commcenter.command
+text/vnd.si.uricatalogue
 text/vnd.sun.j2me.app-descriptor				jad
-text/vnd.trolltech.linguist				
-text/vnd.wap.si				
-text/vnd.wap.sl				
+text/vnd.trolltech.linguist
+text/vnd.wap.si
+text/vnd.wap.sl
 text/vnd.wap.wml				wml
 text/vnd.wap.wmlscript				wmls
 text/x-asm				asm s
@@ -1281,68 +1281,68 @@ text/x-tex				cls ltx sty tex
 text/x-uuencode				uu
 text/x-vcalendar				vcs
 text/x-vcard				vcf
-text/xml				
-text/xml-external-parsed-entity				
+text/xml
+text/xml-external-parsed-entity
 video/3gpp				3gp
-video/3gpp-tt				
+video/3gpp-tt
 video/3gpp2				3g2
-video/bmpeg				
-video/bt656				
-video/celb				
+video/bmpeg
+video/bt656
+video/celb
 video/dl				dl
 video/dv				dif dv
-video/example				
+video/example
 video/fli				fli
 video/gl				gl
 video/h261				h261
 video/h263				h263
-video/h263-1998				
-video/h263-2000				
+video/h263-1998
+video/h263-2000
 video/h264				h264
 video/jpeg				jpgv
-video/jpeg2000				
+video/jpeg2000
 video/jpm				jpgm jpm
 video/mj2				mj2 mjp2
-video/mp1s				
-video/mp2p				
-video/mp2t				
+video/mp1s
+video/mp2p
+video/mp2t
 video/mp4				mp4 mp4v mpg4
-video/mp4v-es				
+video/mp4v-es
 video/mpeg				m1v m2v mpe mpeg mpg
-video/mpeg4-generic				
-video/mpv				
-video/nv				
+video/mpeg4-generic
+video/mpv
+video/nv
 video/ogg				ogv
-video/parityfec				
-video/pointer				
+video/parityfec
+video/pointer
 video/quicktime				mov qt
-video/raw				
-video/rtp-enc-aescm128				
-video/rtx				
-video/smpte292m				
-video/ulpfec				
-video/vc1				
-video/vnd.cctv				
-video/vnd.dlna.mpeg-tts				
+video/raw
+video/rtp-enc-aescm128
+video/rtx
+video/smpte292m
+video/ulpfec
+video/vc1
+video/vnd.cctv
+video/vnd.dlna.mpeg-tts
 video/vnd.fvt				fvt
-video/vnd.hns.video				
-video/vnd.iptvforum.1dparityfec-1010				
-video/vnd.iptvforum.1dparityfec-2005				
-video/vnd.iptvforum.2dparityfec-1010				
-video/vnd.iptvforum.2dparityfec-2005				
-video/vnd.iptvforum.ttsavc				
-video/vnd.iptvforum.ttsmpeg2				
-video/vnd.motorola.video				
-video/vnd.motorola.videop				
+video/vnd.hns.video
+video/vnd.iptvforum.1dparityfec-1010
+video/vnd.iptvforum.1dparityfec-2005
+video/vnd.iptvforum.2dparityfec-1010
+video/vnd.iptvforum.2dparityfec-2005
+video/vnd.iptvforum.ttsavc
+video/vnd.iptvforum.ttsmpeg2
+video/vnd.motorola.video
+video/vnd.motorola.videop
 video/vnd.mpegurl				m4u mxu
 video/vnd.ms-playready.media.pyv				pyv
-video/vnd.nokia.interleaved-multimedia				
-video/vnd.nokia.videovoip				
-video/vnd.objectvideo				
-video/vnd.sealed.mpeg1				
-video/vnd.sealed.mpeg4				
-video/vnd.sealed.swf				
-video/vnd.sealedmedia.softseal.mov				
+video/vnd.nokia.interleaved-multimedia
+video/vnd.nokia.videovoip
+video/vnd.objectvideo
+video/vnd.sealed.mpeg1
+video/vnd.sealed.mpeg4
+video/vnd.sealed.swf
+video/vnd.sealedmedia.softseal.mov
 video/vnd.vivo				viv
 video/x-f4v				f4v
 video/x-fli				fli
@@ -1370,8 +1370,11 @@ application/x-sony-bbeb                    lrf lrx
 application/adobe-page-template+xml        xpgt
 application/x-font-opentype                otf
 application/x-font-truetype                ttf
-application/x-mobipocket-ebook             mobi prc 
-application/vnd.amazon.ebook               azw3 azw azw2 azw4
+application/x-mobipocket-ebook             mobi prc azw
+application/x-topaz-ebook                  tpz azw1
+application/x-mobipocket-subscription      pobi
+application/x-kindle-application           azw2
+application/x-mobi8-ebook                  azw3
 application/x-cbz                          cbz
 application/x-cbr                          cbr
 application/x-cb7                          cb7
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index dc4646f208..7a5e71e17b 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -477,10 +477,13 @@ class FileIconProvider(QFileIconProvider):
              'prc'     : 'mobi',
              'azw'     : 'mobi',
              'mobi'    : 'mobi',
+             'pobi'    : 'mobi',
              'mbp'     : 'zero',
-             'azw1'    : 'mobi',
+             'azw1'    : 'tpz',
+             'azw2'    : 'azw2',
+             'azw3'    : 'azw3',
              'azw4'    : 'pdf',
-             'tpz'     : 'mobi',
+             'tpz'     : 'tpz',
              'tan'     : 'zero',
              'epub'    : 'epub',
              'fb2'     : 'fb2',
diff --git a/src/calibre/gui2/convert/azw3_output.py b/src/calibre/gui2/convert/azw3_output.py
index 0acb436d2c..264b7ae92b 100644
--- a/src/calibre/gui2/convert/azw3_output.py
+++ b/src/calibre/gui2/convert/azw3_output.py
@@ -17,7 +17,7 @@ class PluginWidget(Widget, Ui_Form):
     TITLE = _('AZW3 Output')
     HELP = _('Options specific to')+' AZW3 '+_('output')
     COMMIT_NAME = 'azw3_output'
-    ICON = I('mimetypes/mobi.png')
+    ICON = I('mimetypes/azw3.png')
 
     def __init__(self, parent, get_option, get_help, db=None, book_id=None):
         Widget.__init__(self, parent,
diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index a50cedb001..0f3e2d1792 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -363,6 +363,18 @@ class PostInstall:
                 cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
                 self.icon_resources.append(('mimetypes', 'application-lrs',
                 '128'))
+                render_img('mimetypes/mobi.png', 'calibre-mobi.png')
+                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True)
+                self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128'))
+                render_img('mimetypes/tpz.png', 'calibre-tpz.png')
+                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True)
+                self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128'))
+                render_img('mimetypes/azw2.png', 'calibre-azw2.png')
+                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True)
+                self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128'))
+                render_img('mimetypes/azw3.png', 'calibre-azw3.png')
+                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True)
+                self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128'))
                 render_img('lt.png', 'calibre-gui.png', width=256, height=256)
                 cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
                 self.icon_resources.append(('apps', 'calibre-gui', '128'))
@@ -397,11 +409,11 @@ class PostInstall:
                     cc(' '.join(cmd), shell=True)
                     self.menu_resources.append(x)
                 cc(['xdg-desktop-menu', 'forceupdate'])
-                f = open('calibre-mimetypes', 'wb')
+                f = open('calibre-mimetypes.xml', 'wb')
                 f.write(MIME)
                 f.close()
-                self.mime_resources.append('calibre-mimetypes')
-                cc('xdg-mime install ./calibre-mimetypes', shell=True)
+                self.mime_resources.append('calibre-mimetypes.xml')
+                cc('xdg-mime install ./calibre-mimetypes.xml', shell=True)
         except Exception:
             if self.opts.fatal_errors:
                 raise
@@ -563,6 +575,33 @@ MIME = '''\
         <comment>SONY E-book source format</comment>
         <glob pattern="*.lrs"/>
     </mime-type>
+    <mime-type type="application/x-mobipocket-ebook">
+        <comment>Amazon Mobipocket e-book format</comment>
+        <sub-class-of type="application/x-palm-database"/>
+        <glob pattern="*.azw"/>
+    </mime-type>
+    <mime-type type="application/x-topaz-ebook">
+        <comment>Amazon Topaz ebook format</comment>
+        <glob pattern="*.tpz"/>
+        <glob pattern="*.azw1"/>
+    </mime-type>
+    <mime-type type="application/x-kindle-application">
+        <comment>Amazon Kindle Application (Kindlet)</comment>
+        <sub-class-of type="application/x-java-archive"/>
+        <glob pattern="*.azw2"/>
+    </mime-type>
+    <mime-type type="application/x-mobipocket-subscription">
+        <comment>Amazon Mobipocket ebook newspaper format</comment>
+        <sub-class-of type="application/x-mobipocket-ebook"/>
+        <!-- Technically, this depends on the cdeType (NWPR or MAGZ), but since EXTH headers have a variable length, it's tricky to probe via magic... -->
+        <alias type="application/x-mobipocket-subscription-magazine"/>
+        <glob pattern="*.pobi"/>
+    </mime-type>
+    <mime-type type="application/x-mobi8-ebook">
+        <comment>Amazon KF8 ebook format</comment>
+        <sub-class-of type="application/x-palm-database"/>
+        <glob pattern="*.azw3"/>
+    </mime-type>
 </mime-info>
 '''