diff --git a/0001-Remove-sub-classing-from-OO.o-mime-types.patch b/0001-Remove-sub-classing-from-OO.o-mime-types.patch
index 3ffca1d..dc31a7a 100644
--- a/0001-Remove-sub-classing-from-OO.o-mime-types.patch
+++ b/0001-Remove-sub-classing-from-OO.o-mime-types.patch
@@ -15,7 +15,7 @@ index 29ed9ef..542f1f7 100644
 @@ -845,7 +845,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.calc">
-     <_comment>OpenOffice Calc spreadsheet</_comment>
+     <comment>OpenOffice Calc spreadsheet</comment>
 -    <sub-class-of type="application/zip"/>
      <generic-icon name="x-office-spreadsheet"/>
      <magic priority="70">
@@ -23,7 +23,7 @@ index 29ed9ef..542f1f7 100644
 @@ -858,7 +857,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.calc.template">
-     <_comment>OpenOffice Calc template</_comment>
+     <comment>OpenOffice Calc template</comment>
 -    <sub-class-of type="application/zip"/>
      <generic-icon name="x-office-spreadsheet"/>
      <magic priority="70">
@@ -31,7 +31,7 @@ index 29ed9ef..542f1f7 100644
 @@ -871,7 +869,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.draw">
-     <_comment>OpenOffice Draw drawing</_comment>
+     <comment>OpenOffice Draw drawing</comment>
 -    <sub-class-of type="application/zip"/>
      <generic-icon name="image-x-generic"/>
      <magic priority="70">
@@ -39,7 +39,7 @@ index 29ed9ef..542f1f7 100644
 @@ -884,7 +881,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.draw.template">
-     <_comment>OpenOffice Draw template</_comment>
+     <comment>OpenOffice Draw template</comment>
 -    <sub-class-of type="application/zip"/>
      <generic-icon name="image-x-generic"/>
      <magic priority="70">
@@ -47,7 +47,7 @@ index 29ed9ef..542f1f7 100644
 @@ -897,7 +893,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.impress">
-     <_comment>OpenOffice Impress presentation</_comment>
+     <comment>OpenOffice Impress presentation</comment>
 -    <sub-class-of type="application/zip"/>
      <generic-icon name="x-office-presentation"/>
      <magic priority="70">
@@ -55,7 +55,7 @@ index 29ed9ef..542f1f7 100644
 @@ -910,7 +905,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.impress.template">
-     <_comment>OpenOffice Impress template</_comment>
+     <comment>OpenOffice Impress template</comment>
 -    <sub-class-of type="application/zip"/>
      <generic-icon name="x-office-presentation"/>
      <magic priority="70">
@@ -63,7 +63,7 @@ index 29ed9ef..542f1f7 100644
 @@ -923,7 +917,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.math">
-     <_comment>OpenOffice Math formula</_comment>
+     <comment>OpenOffice Math formula</comment>
 -    <sub-class-of type="application/zip"/>
      <generic-icon name="x-office-document"/>
      <magic priority="70">
@@ -71,7 +71,7 @@ index 29ed9ef..542f1f7 100644
 @@ -936,7 +929,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.writer">
-     <_comment>OpenOffice Writer document</_comment>
+     <comment>OpenOffice Writer document</comment>
 -    <sub-class-of type="application/zip"/>
      <generic-icon name="x-office-document"/>
      <magic priority="70">
@@ -79,7 +79,7 @@ index 29ed9ef..542f1f7 100644
 @@ -949,7 +941,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.writer.global">
-     <_comment>OpenOffice Writer global document</_comment>
+     <comment>OpenOffice Writer global document</comment>
 -    <sub-class-of type="application/zip"/>
      <generic-icon name="x-office-document"/>
      <magic priority="70">
@@ -87,13 +87,13 @@ index 29ed9ef..542f1f7 100644
 @@ -962,7 +953,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.writer.template">
-     <_comment>OpenOffice Writer template</_comment>
+     <comment>OpenOffice Writer template</comment>
 -    <sub-class-of type="application/zip"/>
      <generic-icon name="x-office-document"/>
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -977,7 +967,6 @@ command to generate the output files.
-     <_comment>ODT document</_comment>
+     <comment>ODT document</comment>
      <acronym>ODT</acronym>
      <expanded-acronym>OpenDocument Text</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -101,7 +101,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -992,7 +981,6 @@ command to generate the output files.
-     <_comment>ODT document (Flat XML)</_comment>
+     <comment>ODT document (Flat XML)</comment>
      <acronym>FODT</acronym>
      <expanded-acronym>OpenDocument Text (Flat XML)</expanded-acronym>
 -    <sub-class-of type="application/xml"/>
@@ -109,7 +109,7 @@ index 29ed9ef..542f1f7 100644
      <glob pattern="*.fodt"/>
    </mime-type>
 @@ -1000,7 +988,6 @@ command to generate the output files.
-     <_comment>ODT template</_comment>
+     <comment>ODT template</comment>
      <acronym>ODT</acronym>
      <expanded-acronym>OpenDocument Text</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -117,7 +117,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -1015,7 +1002,6 @@ command to generate the output files.
-     <_comment>OTH template</_comment>
+     <comment>OTH template</comment>
      <acronym>OTH</acronym>
      <expanded-acronym>OpenDocument HTML</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -125,7 +125,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -1030,7 +1016,6 @@ command to generate the output files.
-     <_comment>ODM document</_comment>
+     <comment>ODM document</comment>
      <acronym>ODM</acronym>
      <expanded-acronym>OpenDocument Master</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -133,7 +133,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -1045,7 +1030,6 @@ command to generate the output files.
-     <_comment>ODG drawing</_comment>
+     <comment>ODG drawing</comment>
      <acronym>ODG</acronym>
      <expanded-acronym>OpenDocument Drawing</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -141,7 +141,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -1060,7 +1044,6 @@ command to generate the output files.
-     <_comment>ODG drawing (Flat XML)</_comment>
+     <comment>ODG drawing (Flat XML)</comment>
      <acronym>FODG</acronym>
      <expanded-acronym>OpenDocument Drawing (Flat XML)</expanded-acronym>
 -    <sub-class-of type="application/xml"/>
@@ -149,7 +149,7 @@ index 29ed9ef..542f1f7 100644
      <glob pattern="*.fodg"/>
    </mime-type>
 @@ -1068,7 +1051,6 @@ command to generate the output files.
-     <_comment>ODG template</_comment>
+     <comment>ODG template</comment>
      <acronym>ODG</acronym>
      <expanded-acronym>OpenDocument Drawing</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -157,7 +157,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -1083,7 +1065,6 @@ command to generate the output files.
-     <_comment>ODP presentation</_comment>
+     <comment>ODP presentation</comment>
      <acronym>ODP</acronym>
      <expanded-acronym>OpenDocument Presentation</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -165,7 +165,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -1098,7 +1079,6 @@ command to generate the output files.
-     <_comment>ODP presentation (Flat XML)</_comment>
+     <comment>ODP presentation (Flat XML)</comment>
      <acronym>FODP</acronym>
      <expanded-acronym>OpenDocument Presentation (Flat XML)</expanded-acronym>
 -    <sub-class-of type="application/xml"/>
@@ -173,7 +173,7 @@ index 29ed9ef..542f1f7 100644
      <glob pattern="*.fodp"/>
    </mime-type>
 @@ -1106,7 +1086,6 @@ command to generate the output files.
-     <_comment>ODP template</_comment>
+     <comment>ODP template</comment>
      <acronym>ODP</acronym>
      <expanded-acronym>OpenDocument Presentation</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -181,7 +181,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -1121,7 +1100,6 @@ command to generate the output files.
-     <_comment>ODS spreadsheet</_comment>
+     <comment>ODS spreadsheet</comment>
      <acronym>ODS</acronym>
      <expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -189,7 +189,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -1136,7 +1114,6 @@ command to generate the output files.
-     <_comment>ODS spreadsheet (Flat XML)</_comment>
+     <comment>ODS spreadsheet (Flat XML)</comment>
      <acronym>FODS</acronym>
      <expanded-acronym>OpenDocument Spreadsheet (Flat XML)</expanded-acronym>
 -    <sub-class-of type="application/xml"/>
@@ -197,7 +197,7 @@ index 29ed9ef..542f1f7 100644
      <glob pattern="*.fods"/>
    </mime-type>
 @@ -1144,7 +1121,6 @@ command to generate the output files.
-     <_comment>ODS template</_comment>
+     <comment>ODS template</comment>
      <acronym>ODS</acronym>
      <expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -205,7 +205,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -1159,7 +1135,6 @@ command to generate the output files.
-     <_comment>ODC chart</_comment>
+     <comment>ODC chart</comment>
      <acronym>ODC</acronym>
      <expanded-acronym>OpenDocument Chart</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -213,7 +213,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -1174,7 +1149,6 @@ command to generate the output files.
-     <_comment>ODC template</_comment>
+     <comment>ODC template</comment>
      <acronym>ODC</acronym>
      <expanded-acronym>OpenDocument Chart</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -221,7 +221,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -1189,7 +1163,6 @@ command to generate the output files.
-     <_comment>ODF formula</_comment>
+     <comment>ODF formula</comment>
      <acronym>ODF</acronym>
      <expanded-acronym>OpenDocument Formula</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -229,7 +229,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -1204,7 +1177,6 @@ command to generate the output files.
-     <_comment>ODF template</_comment>
+     <comment>ODF template</comment>
      <acronym>ODF</acronym>
      <expanded-acronym>OpenDocument Formula</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -237,7 +237,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -1219,7 +1191,6 @@ command to generate the output files.
-     <_comment>ODB database</_comment>
+     <comment>ODB database</comment>
      <acronym>ODB</acronym>
      <expanded-acronym>OpenDocument Database</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -245,7 +245,7 @@ index 29ed9ef..542f1f7 100644
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
 @@ -1235,7 +1206,6 @@ command to generate the output files.
-     <_comment>ODI image</_comment>
+     <comment>ODI image</comment>
      <acronym>ODI</acronym>
      <expanded-acronym>OpenDocument Image</expanded-acronym>
 -    <sub-class-of type="application/zip"/>
@@ -255,7 +255,7 @@ index 29ed9ef..542f1f7 100644
 @@ -1248,7 +1218,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.openofficeorg.extension">
-     <_comment>OpenOffice.org extension</_comment>
+     <comment>OpenOffice.org extension</comment>
 -    <sub-class-of type="application/zip"/>
      <generic-icon name="x-office-document"/>
      <glob pattern="*.oxt" />