diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/META-INF/MANIFEST.MF b/cda/plugins/org.eclipse.mdht.cda.xml.ui/META-INF/MANIFEST.MF
index b385e58..4cb386e 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/META-INF/MANIFEST.MF
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/META-INF/MANIFEST.MF
@@ -38,11 +38,19 @@
  org.apache.commons.lang3
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
- poi-3.16/poi-3.16.jar,
- poi-3.16/poi-ooxml-3.16.jar,
- poi-3.16/poi-ooxml-schemas-3.16.jar,
- poi-3.16/ooxml-lib/curvesapi-1.04.jar,
- poi-3.16/ooxml-lib/xmlbeans-2.6.0.jar,
- poi-3.16/lib/commons-codec-1.10.jar,
- poi-3.16/lib/commons-collections4-4.1.jar,
- jericho/jericho-html-3.4.jar
+ jericho/jericho-html-3.4.jar,
+ poi-5.0.0/lib/commons-codec-1.15.jar,
+ poi-5.0.0/lib/commons-collections4-4.4.jar,
+ poi-5.0.0/lib/commons-math3-3.6.1.jar,
+ poi-5.0.0/lib/SparseBitSet-1.2.jar,
+ poi-5.0.0/ooxml-lib/commons-compress-1.20.jar,
+ poi-5.0.0/ooxml-lib/curvesapi-1.06.jar,
+ poi-5.0.0/ooxml-lib/xmlbeans-4.0.0.jar,
+ poi-5.0.0/poi-5.0.0.jar,
+ poi-5.0.0/poi-examples-5.0.0.jar,
+ poi-5.0.0/poi-excelant-5.0.0.jar,
+ poi-5.0.0/poi-integration-5.0.0.jar,
+ poi-5.0.0/poi-ooxml-5.0.0.jar,
+ poi-5.0.0/poi-ooxml-full-5.0.0.jar,
+ poi-5.0.0/poi-ooxml-lite-5.0.0.jar,
+ poi-5.0.0/poi-scratchpad-5.0.0.jar
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/build.properties b/cda/plugins/org.eclipse.mdht.cda.xml.ui/build.properties
index f2de5b2..8908ede 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/build.properties
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/build.properties
@@ -17,13 +17,35 @@
                .,\
                resources/,\
                icons/,\
-               poi-3.16/poi-3.16.jar,\
-               poi-3.16/poi-excelant-3.16.jar,\
-               poi-3.16/poi-ooxml-3.16.jar,\
-               poi-3.16/poi-ooxml-schemas-3.16.jar,\
-               poi-3.16/ooxml-lib/curvesapi-1.04.jar,\
-               poi-3.16/ooxml-lib/xmlbeans-2.6.0.jar,\
-               poi-3.16/lib/commons-codec-1.10.jar,\
-               poi-3.16/lib/commons-collections4-4.1.jar,\
-               jericho/jericho-html-3.4.jar
+               jericho/jericho-html-3.4.jar,\
+               poi-5.0.0/lib/commons-codec-1.15.jar,\
+               poi-5.0.0/lib/commons-collections4-4.4.jar,\
+               poi-5.0.0/lib/commons-math3-3.6.1.jar,\
+               poi-5.0.0/lib/SparseBitSet-1.2.jar,\
+               poi-5.0.0/ooxml-lib/commons-compress-1.20.jar,\
+               poi-5.0.0/ooxml-lib/curvesapi-1.06.jar,\
+               poi-5.0.0/ooxml-lib/xmlbeans-4.0.0.jar,\
+               poi-5.0.0/poi-5.0.0.jar,\
+               poi-5.0.0/poi-examples-5.0.0.jar,\
+               poi-5.0.0/poi-excelant-5.0.0.jar,\
+               poi-5.0.0/poi-integration-5.0.0.jar,\
+               poi-5.0.0/poi-ooxml-5.0.0.jar,\
+               poi-5.0.0/poi-ooxml-full-5.0.0.jar,\
+               poi-5.0.0/poi-ooxml-lite-5.0.0.jar,\
+               poi-5.0.0/poi-scratchpad-5.0.0.jar
+src.includes = poi-5.0.0/lib/SparseBitSet-1.2.jar,\
+               poi-5.0.0/lib/commons-codec-1.15.jar,\
+               poi-5.0.0/lib/commons-math3-3.6.1.jar,\
+               poi-5.0.0/lib/commons-collections4-4.4.jar,\
+               poi-5.0.0/ooxml-lib/commons-compress-1.20.jar,\
+               poi-5.0.0/ooxml-lib/curvesapi-1.06.jar,\
+               poi-5.0.0/ooxml-lib/xmlbeans-4.0.0.jar,\
+               poi-5.0.0/poi-5.0.0.jar,\
+               poi-5.0.0/poi-examples-5.0.0.jar,\
+               poi-5.0.0/poi-excelant-5.0.0.jar,\
+               poi-5.0.0/poi-integration-5.0.0.jar,\
+               poi-5.0.0/poi-ooxml-5.0.0.jar,\
+               poi-5.0.0/poi-ooxml-full-5.0.0.jar,\
+               poi-5.0.0/poi-ooxml-lite-5.0.0.jar,\
+               poi-5.0.0/poi-scratchpad-5.0.0.jar
 
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/null20210329_nullperformance.log b/cda/plugins/org.eclipse.mdht.cda.xml.ui/null20210329_nullperformance.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/null20210329_nullperformance.log
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/null20210329_nullvalidatation.csv b/cda/plugins/org.eclipse.mdht.cda.xml.ui/null20210329_nullvalidatation.csv
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/null20210329_nullvalidatation.csv
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/LICENSE b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/LICENSE
deleted file mode 100644
index 3b63d08..0000000
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/LICENSE
+++ /dev/null
@@ -1,537 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-APACHE POI SUBCOMPONENTS:
-
-Apache POI includes subcomponents with separate copyright notices and
-license terms. Your use of these subcomponents is subject to the terms
-and conditions of the following licenses:
-
-
-Office Open XML schemas (ooxml-schemas-1.*.jar)
-
-    The Office Open XML schema definitions used by Apache POI are
-    a part of the Office Open XML ECMA Specification (ECMA-376, [1]).
-    As defined in section 9.4 of the ECMA bylaws [2], this specification
-    is available to all interested parties without restriction:
-
-        9.4 All documents when approved shall be made available to
-            all interested parties without restriction.
-
-    Furthermore, both Microsoft and Adobe have granted patent licenses
-    to this work [3,4,5].
-
-    [1] http://www.ecma-international.org/publications/standards/Ecma-376.htm
-    [2] http://www.ecma-international.org/memento/Ecmabylaws.htm
-    [3] http://www.microsoft.com/openspecifications/en/us/programs/osp/default.aspx
-    [4] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/
-        Patent%20statements%20ok/ECMA-376%20Edition%202%20Microsoft%20Patent%20Declaration.pdf
-    [5] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/
-        Patent%20statements%20ok/ECMA-376%20Adobe%20Patent%20Declaration.pdf
-
-
-Bouncy Castle library (bcprov-*.jar, bcpg-*.jar, bcpkix-*.jar)
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to
-    deal in the Software without restriction, including without limitation the
-    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-    sell copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-    IN THE SOFTWARE.
-
-JUnit test library (junit-4.*.jar) & JaCoCo (*jacoco*)
-
-    Eclipse Public License - v 1.0
-
-    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-    LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-    CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-    a) in the case of the initial Contributor, the initial code and documentation
-       distributed under this Agreement, and
-    b) in the case of each subsequent Contributor:
-    i) changes to the Program, and
-    ii) additions to the Program;
-    where such changes and/or additions to the Program originate from and are 
-    distributed by that particular Contributor. A Contribution 'originates' from
-    a Contributor if it was added to the Program by such Contributor itself or
-    anyone acting on such Contributor's behalf. Contributions do not include
-    additions to the Program which: (i) are separate modules of software
-    distributed in conjunction with the Program under their own license agreement,
-    and (ii) are not derivative works of the Program.
-
-    "Contributor" means any person or entity that distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which are
-    necessarily infringed by the use or sale of its Contribution alone or when
-    combined with the Program.
-
-    "Program" means the Contributions distributed in accordance with this Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement,
-    including all Contributors.
-
-    2. GRANT OF RIGHTS
-
-    a) Subject to the terms of this Agreement, each Contributor hereby grants
-       Recipient a non-exclusive, worldwide, royalty-free copyright license to
-       reproduce, prepare derivative works of, publicly display, publicly
-       perform, distribute and sublicense the Contribution of such Contributor,
-       if any, and such derivative works, in source code and object code form.
-    b) Subject to the terms of this Agreement, each Contributor hereby grants
-       Recipient a non-exclusive, worldwide, royalty-free patent license under
-       Licensed Patents to make, use, sell, offer to sell, import and otherwise
-       transfer the Contribution of such Contributor, if any, in source code
-       and object code form. This patent license shall apply to the combination
-       of the Contribution and the Program if, at the time the Contribution is
-       added by the Contributor, such addition of the Contribution causes such
-       combination to be covered by the Licensed Patents. The patent license
-       shall not apply to any other combinations which include the Contribution.
-       No hardware per se is licensed hereunder.
-    c) Recipient understands that although each Contributor grants the licenses
-       to its Contributions set forth herein, no assurances are provided by any
-       Contributor that the Program does not infringe the patent or other
-       intellectual property rights of any other entity. Each Contributor
-       disclaims any liability to Recipient for claims brought by any other
-       entity based on infringement of intellectual property rights or
-       otherwise. As a condition to exercising the rights and licenses granted
-       hereunder, each Recipient hereby assumes sole responsibility to secure
-       any other intellectual property rights needed, if any. For example, if
-       a third party patent license is required to allow Recipient to distribute
-       the Program, it is Recipient's responsibility to acquire that license
-       before distributing the Program.
-    d) Each Contributor represents that to its knowledge it has sufficient
-       copyright rights in its Contribution, if any, to grant the copyright
-       license set forth in this Agreement.
-
-    3. REQUIREMENTS
-
-    A Contributor may choose to distribute the Program in object code form under
-    its own license agreement, provided that:
-
-    a) it complies with the terms and conditions of this Agreement; and
-    b) its license agreement:
-    i) effectively disclaims on behalf of all Contributors all warranties and
-       conditions, express and implied, including warranties or conditions of
-       title and non-infringement, and implied warranties or conditions of
-       merchantability and fitness for a particular purpose;
-    ii) effectively excludes on behalf of all Contributors all liability for
-       damages, including direct, indirect, special, incidental and
-       consequential damages, such as lost profits;
-    iii) states that any provisions which differ from this Agreement are
-       offered by that Contributor alone and not by any other party; and
-    iv) states that source code for the Program is available from such
-       Contributor, and informs licensees how to obtain it in a reasonable
-       manner on or through a medium customarily used for software exchange.
-
-    When the Program is made available in source code form:
-
-    a) it must be made available under this Agreement; and
-    b) a copy of this Agreement must be included with each copy of the Program.
-       Contributors may not remove or alter any copyright notices contained
-       within the Program.
-
-    Each Contributor must identify itself as the originator of its Contribution,
-    if any, in a manner that reasonably allows subsequent Recipients to identify
-    the originator of the Contribution.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities with
-    respect to end users, business partners and the like. While this license is
-    intended to facilitate the commercial use of the Program, the Contributor
-    who includes the Program in a commercial product offering should do so in a
-    manner which does not create potential liability for other Contributors.
-    Therefore, if a Contributor includes the Program in a commercial product
-    offering, such Contributor ("Commercial Contributor") hereby agrees to
-    defend and indemnify every other Contributor ("Indemnified Contributor")
-    against any losses, damages and costs (collectively "Losses") arising from
-    claims, lawsuits and other legal actions brought by a third party against
-    the Indemnified Contributor to the extent caused by the acts or omissions
-    of such Commercial Contributor in connection with its distribution of the
-    Program in a commercial product offering. The obligations in this section
-    do not apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in writing
-    of such claim, and b) allow the Commercial Contributor to control, and
-    cooperate with the Commercial Contributor in, the defense and any related
-    settlement negotiations. The Indemnified Contributor may participate in any
-    such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial product
-    offering, Product X. That Contributor is then a Commercial Contributor. If
-    that Commercial Contributor then makes performance claims, or offers
-    warranties related to Product X, those performance claims and warranties are
-    such Commercial Contributor's responsibility alone. Under this section, the
-    Commercial Contributor would have to defend claims against the other
-    Contributors related to those performance claims and warranties, and if a
-    court requires any other Contributor to pay any damages as a result, the
-    Commercial Contributor must pay those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
-    AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
-    EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
-    CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
-    PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all risks
-    associated with its exercise of rights under this Agreement , including but
-    not limited to the risks and costs of program errors, compliance with
-    applicable laws, damage to or loss of data, programs or equipment, and
-    unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-    CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
-    LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
-    OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of the
-    remainder of the terms of this Agreement, and without further action by the
-    parties hereto, such provision shall be reformed to the minimum extent
-    necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity (including a
-    cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-    (excluding combinations of the Program with other software or hardware)
-    infringes such Recipient's patent(s), then such Recipient's rights granted
-    under Section 2(b) shall terminate as of the date such litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it fails to
-    comply with any of the material terms or conditions of this Agreement and
-    does not cure such failure in a reasonable period of time after becoming
-    aware of such noncompliance. If all Recipient's rights under this Agreement
-    terminate, Recipient agrees to cease use and distribution of the Program as
-    soon as reasonably practicable. However, Recipient's obligations under this
-    Agreement and any licenses granted by Recipient relating to the Program
-    shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement, but
-    in order to avoid inconsistency the Agreement is copyrighted and may only
-    be modified in the following manner. The Agreement Steward reserves the
-    right to publish new versions (including revisions) of this Agreement from
-    time to time. No one other than the Agreement Steward has the right to
-    modify this Agreement. The Eclipse Foundation is the initial Agreement
-    Steward. The Eclipse Foundation may assign the responsibility to serve as
-    the Agreement Steward to a suitable separate entity. Each new version of
-    the Agreement will be given a distinguishing version number. The Program
-    (including Contributions) may always be distributed subject to the version
-    of the Agreement under which it was received. In addition, after a new
-    version of the Agreement is published, Contributor may elect to distribute
-    the Program (including its Contributions) under the new version. Except as
-    expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-    rights or licenses to the intellectual property of any Contributor under
-    this Agreement, whether expressly, by implication, estoppel or otherwise.
-    All rights in the Program not expressly granted under this Agreement are
-    reserved.
-
-    This Agreement is governed by the laws of the State of New York and the
-    intellectual property laws of the United States of America. No party to this
-    Agreement will bring a legal action under this Agreement more than one year
-    after the cause of action arose. Each party waives its rights to a jury
-    trial in any resulting litigation.
-
-Hamcrest library (hamcrest-*.jar) & CuvesAPI / Curve API
-
-    BSD License
-
-    Copyright (c) 2000-2006, www.hamcrest.org
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-    Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer. Redistributions in binary
-    form must reproduce the above copyright notice, this list of conditions and
-    the following disclaimer in the documentation and/or other materials
-    provided with the distribution.
-
-    Neither the name of Hamcrest nor the names of its contributors may be used
-    to endorse or promote products derived from this software without specific
-    prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-
-SLF4J library (slf4j-api-*.jar)
-
-    Copyright (c) 2004-2013 QOS.ch
-    All rights reserved. 
-
-    Permission is hereby granted, free  of charge, to any person obtaining
-    a  copy  of this  software  and  associated  documentation files  (the
-    "Software"), to  deal in  the Software without  restriction, including
-    without limitation  the rights to  use, copy, modify,  merge, publish,
-    distribute,  sublicense, and/or sell  copies of  the Software,  and to
-    permit persons to whom the Software  is furnished to do so, subject to
-    the following conditions:
-
-    The  above  copyright  notice  and  this permission  notice  shall  be
-    included in all copies or substantial portions of the Software.
-
-    THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-    EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-    MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-inbot-utils (https://github.com/Inbot/inbot-utils)
-
-	The MIT License (MIT)
-	
-	Copyright (c) 2015 Inbot
-	
-	Permission is hereby granted, free of charge, to any person obtaining a copy
-	of this software and associated documentation files (the "Software"), to deal
-	in the Software without restriction, including without limitation the rights
-	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	copies of the Software, and to permit persons to whom the Software is
-	furnished to do so, subject to the following conditions:
-	
-	The above copyright notice and this permission notice shall be included in all
-	copies or substantial portions of the Software.
-	
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-	SOFTWARE.
\ No newline at end of file
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/lib/commons-codec-1.10.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/lib/commons-codec-1.10.jar
deleted file mode 100644
index 1d7417c..0000000
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/lib/commons-codec-1.10.jar
+++ /dev/null
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/lib/commons-collections4-4.1.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/lib/commons-collections4-4.1.jar
deleted file mode 100644
index 43a9413..0000000
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/lib/commons-collections4-4.1.jar
+++ /dev/null
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/ooxml-lib/curvesapi-1.04.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/ooxml-lib/curvesapi-1.04.jar
deleted file mode 100644
index f097d0b..0000000
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/ooxml-lib/curvesapi-1.04.jar
+++ /dev/null
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/ooxml-lib/xmlbeans-2.6.0.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/ooxml-lib/xmlbeans-2.6.0.jar
deleted file mode 100644
index d1b6627..0000000
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/ooxml-lib/xmlbeans-2.6.0.jar
+++ /dev/null
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-3.16.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-3.16.jar
deleted file mode 100644
index 1831e3c..0000000
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-3.16.jar
+++ /dev/null
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-examples-3.16.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-examples-3.16.jar
deleted file mode 100644
index bf9204d..0000000
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-examples-3.16.jar
+++ /dev/null
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-excelant-3.16.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-excelant-3.16.jar
deleted file mode 100644
index 08e8ade..0000000
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-excelant-3.16.jar
+++ /dev/null
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-ooxml-3.16.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-ooxml-3.16.jar
deleted file mode 100644
index 4ecb485..0000000
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-ooxml-3.16.jar
+++ /dev/null
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-ooxml-schemas-3.16.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-ooxml-schemas-3.16.jar
deleted file mode 100644
index 71df899..0000000
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-ooxml-schemas-3.16.jar
+++ /dev/null
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-scratchpad-3.16.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-scratchpad-3.16.jar
deleted file mode 100644
index 7788454..0000000
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-scratchpad-3.16.jar
+++ /dev/null
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/LICENSE b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/LICENSE
new file mode 100644
index 0000000..3ce6efe
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/LICENSE
@@ -0,0 +1,335 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+APACHE POI SUBCOMPONENTS:
+
+Apache POI includes subcomponents with separate copyright notices and
+license terms. Your use of these subcomponents is subject to the terms
+and conditions of the following licenses:
+
+
+Office Open XML schemas (poi-ooxml-full-*.jar)
+
+    The Office Open XML schema definitions used by Apache POI are
+    a part of the Office Open XML ECMA Specification (ECMA-376, [1]).
+    As defined in section 9.4 of the ECMA bylaws [2], this specification
+    is available to all interested parties without restriction:
+
+        9.4 All documents when approved shall be made available to
+            all interested parties without restriction.
+
+    Furthermore, both Microsoft and Adobe have granted patent licenses
+    to this work [3,4,5].
+
+    [1] http://www.ecma-international.org/publications/standards/Ecma-376.htm
+    [2] http://www.ecma-international.org/memento/Ecmabylaws.htm
+    [3] http://www.microsoft.com/openspecifications/en/us/programs/osp/default.aspx
+    [4] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/
+        Patent%20statements%20ok/ECMA-376%20Edition%202%20Microsoft%20Patent%20Declaration.pdf
+    [5] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/
+        Patent%20statements%20ok/ECMA-376%20Adobe%20Patent%20Declaration.pdf
+
+
+Bouncy Castle library (bcprov-*.jar, bcpg-*.jar, bcpkix-*.jar)
+
+    Copyright (c) 2000 - 2021 The Legion of the Bouncy Castle Inc.
+    (https://www.bouncycastle.org)
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+
+CurvesAPI / Curve API
+
+    BSD License
+
+    Copyright (c) 2000-2015 www.hamcrest.org
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+    Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer. Redistributions in
+    binary form must reproduce the above copyright notice, this list of
+    conditions and the following disclaimer in the documentation and/or other
+    materials provided with the distribution. Neither the name of Hamcrest nor
+    the names of its contributors may be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+SLF4J library (slf4j-api-*.jar)
+
+    Copyright (c) 2004-2017 QOS.ch
+    All rights reserved.
+
+    Permission is hereby granted, free  of charge, to any person obtaining
+    a  copy  of this  software  and  associated  documentation files  (the
+    "Software"), to  deal in  the Software without  restriction, including
+    without limitation  the rights to  use, copy, modify,  merge, publish,
+    distribute,  sublicense, and/or sell  copies of  the Software,  and to
+    permit persons to whom the Software  is furnished to do so, subject to
+    the following conditions:
+
+    The  above  copyright  notice  and  this permission  notice  shall  be
+    included in all copies or substantial portions of the Software.
+
+    THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+    EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+    MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+inbot-utils (https://github.com/Inbot/inbot-utils)
+
+	The MIT License (MIT)
+
+	Copyright (c) 2015 Inbot
+
+	Permission is hereby granted, free of charge, to any person obtaining a copy
+	of this software and associated documentation files (the "Software"), to deal
+	in the Software without restriction, including without limitation the rights
+	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	copies of the Software, and to permit persons to whom the Software is
+	furnished to do so, subject to the following conditions:
+
+	The above copyright notice and this permission notice shall be included in all
+	copies or substantial portions of the Software.
+
+	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+	SOFTWARE.
\ No newline at end of file
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/NOTICE b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/NOTICE
similarity index 76%
rename from cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/NOTICE
rename to cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/NOTICE
index 15f1611..3c2ed73 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-3.16/NOTICE
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/NOTICE
@@ -1,7 +1,7 @@
 Apache POI
-Copyright 2003-2017 The Apache Software Foundation
+Copyright 2003-2021 The Apache Software Foundation
 
-This product includes software developed by
+This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
 
 This product contains parts that were originally based on software from BEA.
@@ -14,14 +14,11 @@
 World Wide Web Consortium (Massachusetts Institute of Technology, European
 Research Consortium for Informatics and Mathematics, Keio University)
 
-This product contains the Piccolo XML Parser for Java
-(http://piccolo.sourceforge.net/). Copyright 2002 Yuval Oren.
-
 This product contains the chunks_parse_cmds.tbl file from the vsdump program.
 Copyright (C) 2006-2007 Valek Filippov (frob@df.ru)
 
-This product contains parts of the eID Applet project 
+This product contains parts of the eID Applet project
 <http://eid-applet.googlecode.com> and <https://github.com/e-Contract/eid-applet>.
-Copyright (c) 2009-2014
+Copyright (c) 2009-2018
 FedICT (federal ICT department of Belgium), e-Contract.be BVBA (https://www.e-contract.be),
 Bart Hanssens from FedICT
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/lib/SparseBitSet-1.2.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/lib/SparseBitSet-1.2.jar
new file mode 100644
index 0000000..bdb6771
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/lib/SparseBitSet-1.2.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/lib/commons-codec-1.15.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/lib/commons-codec-1.15.jar
new file mode 100644
index 0000000..f14985a
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/lib/commons-codec-1.15.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/lib/commons-collections4-4.4.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/lib/commons-collections4-4.4.jar
new file mode 100644
index 0000000..da06c3e
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/lib/commons-collections4-4.4.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/lib/commons-math3-3.6.1.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/lib/commons-math3-3.6.1.jar
new file mode 100644
index 0000000..0ff582c
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/lib/commons-math3-3.6.1.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/ooxml-lib/commons-compress-1.20.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/ooxml-lib/commons-compress-1.20.jar
new file mode 100644
index 0000000..17c1c7b
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/ooxml-lib/commons-compress-1.20.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/ooxml-lib/curvesapi-1.06.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/ooxml-lib/curvesapi-1.06.jar
new file mode 100644
index 0000000..800ab9b
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/ooxml-lib/curvesapi-1.06.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/ooxml-lib/xmlbeans-4.0.0.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/ooxml-lib/xmlbeans-4.0.0.jar
new file mode 100644
index 0000000..7744826
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/ooxml-lib/xmlbeans-4.0.0.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-5.0.0.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-5.0.0.jar
new file mode 100644
index 0000000..d239022
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-5.0.0.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-examples-5.0.0.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-examples-5.0.0.jar
new file mode 100644
index 0000000..bfbb3d2
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-examples-5.0.0.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-excelant-5.0.0.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-excelant-5.0.0.jar
new file mode 100644
index 0000000..5ab8342
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-excelant-5.0.0.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-integration-5.0.0.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-integration-5.0.0.jar
new file mode 100644
index 0000000..0a9c627
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-integration-5.0.0.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-ooxml-5.0.0.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-ooxml-5.0.0.jar
new file mode 100644
index 0000000..574e6c1
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-ooxml-5.0.0.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-ooxml-full-5.0.0.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-ooxml-full-5.0.0.jar
new file mode 100644
index 0000000..1966707
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-ooxml-full-5.0.0.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-ooxml-lite-5.0.0.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-ooxml-lite-5.0.0.jar
new file mode 100644
index 0000000..5d0e244
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-ooxml-lite-5.0.0.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-scratchpad-5.0.0.jar b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-scratchpad-5.0.0.jar
new file mode 100644
index 0000000..9c4f344
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/poi-5.0.0/poi-scratchpad-5.0.0.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/run.scr b/cda/plugins/org.eclipse.mdht.cda.xml.ui/run.scr
new file mode 100755
index 0000000..2bf247f
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/run.scr
@@ -0,0 +1,21 @@
+/Library/Java/JavaVirtualMachines/jdk-11.0.10.jdk/Contents/Home/bin/java \
+-XstartOnFirstThread \
+-Declipse.pde.launch=true \
+--add-modules=ALL-SYSTEM \
+-Dfile.encoding=UTF-8 \
+-classpath /Users/seanmuir/.p2/pool/plugins/org.eclipse.equinox.launcher_1.6.100.v20201223-0822.jar org.eclipse.equinox.launcher.Main \
+-launcher /Users/seanmuir/Applications/EclipseModeling/Eclipse.app/Contents/Eclipse/Eclipse.app/Contents/MacOS/eclipse \
+-name Eclipse \
+-showsplash 600 \
+-application org.eclipse.mdht.cda.xml.ui.generatexls \
+-data /Users/seanmuir/Workspaces/MDMIInstall20210220/../runtime-New_configuration \
+-configuration file:/Users/seanmuir/Workspaces/MDMIInstall20210220/.metadata/.plugins/org.eclipse.pde.core/generatexls/ \
+-dev file:/Users/seanmuir/Workspaces/MDMIInstall20210220/.metadata/.plugins/org.eclipse.pde.core/generatexls/dev.properties \
+-os macosx \
+-ws cocoa \
+-arch x86_64 \
+-nl en_US \
+-consoleLog \
+-Xquickstart \  
+-Xverify:none \
+-Z/Users/seanmuir/Downloads/AAA.zip
\ No newline at end of file
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java
index 155a1a4..b517bf6 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java
@@ -55,7 +55,6 @@
 import org.apache.poi.openxml4j.util.ZipSecureFile;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.IndexedColors;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -873,9 +872,9 @@
 				"Opened  " + CDAValueUtil.DATE_FORMAT3.format(new Date()) + "_" + fileLocation.toUpperCase() +
 						"_SA.xlsx");
 			CellStyle boldstyle = wb.createCellStyle();
-			Font boldFont = wb.createFont();
-			boldFont.setBoldweight(Font.BOLDWEIGHT_BOLD);
-			boldstyle.setFont(boldFont);
+			// Font boldFont = wb.createFont();
+			// boldFont.setBoldweight(Font.BOLDWEIGHT_BOLD);
+			// boldstyle.setFont(boldFont);
 
 			for (int sheetCtr = 0; sheetCtr < wb.getNumberOfSheets(); sheetCtr++) {
 
@@ -1999,14 +1998,14 @@
 			List<String> sortedKeys = new ArrayList<String>(sectionbyfile.keySet());
 			Collections.sort(sortedKeys);
 
-			Font boldFont = wb.createFont();
-			boldFont.setBoldweight(Font.BOLDWEIGHT_BOLD);
-			CellStyle sectionstyle = null;
+			// Font boldFont = wb.createFont();
+			// boldFont.setBoldweight(Font.BOLDWEIGHT_BOLD);
+			// CellStyle sectionstyle = null;
 			if (sectionsSheet.getWorkbook().getNumCellStyles() < 100) {
-				sectionstyle = sectionsSheet.getWorkbook().createCellStyle();
-				sectionstyle.setFillForegroundColor(IndexedColors.BLUE.getIndex());
-				sectionstyle.setRotation((short) -90);
-				sectionstyle.setFont(boldFont);
+				// sectionstyle = sectionsSheet.getWorkbook().createCellStyle();
+				// sectionstyle.setFillForegroundColor(IndexedColors.BLUE.getIndex());
+				// sectionstyle.setRotation((short) -90);
+				// sectionstyle.setFont(boldFont);
 			}
 
 			SXSSFRow row1 = sectionsSheet.createRow(sectionsSheet.getPhysicalNumberOfRows());
@@ -2021,9 +2020,9 @@
 			for (String sectionclass : sortedKeys) {
 				Cell cell = row1.createCell(offset++);
 				cell.setCellValue(sectionclass);
-				if (sectionstyle != null) {
-					cell.setCellStyle(sectionstyle);
-				}
+				// if (sectionstyle != null) {
+				// cell.setCellStyle(sectionstyle);
+				// }
 			}
 
 			row1 = sectionsSheet.createRow(sectionsSheet.getPhysicalNumberOfRows());
@@ -2033,7 +2032,7 @@
 				Cell cell = row1.createCell(metadataoffset++);
 				String columnLetter = CellReference.convertNumToColString(cell.getColumnIndex());
 				String strFormula = "COUNTIF(" + columnLetter + "3:" + columnLetter + (files.size() + 2) + ",\"X\")";
-				cell.setCellType(Cell.CELL_TYPE_FORMULA);
+				// cell.setCellType(Cell.CELL_TYPE_FORMULA);
 				cell.setCellFormula(strFormula);
 			}
 
@@ -2041,8 +2040,8 @@
 			if (sectionsSheet.getWorkbook().getNumCellStyles() < 100) {
 				style = sectionsSheet.getWorkbook().createCellStyle();
 				style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-				style.setFillPattern(CellStyle.SOLID_FOREGROUND);
-				style.setAlignment(CellStyle.ALIGN_CENTER);
+				// style.setFillPattern(CellStyle.SOLID_FOREGROUND);
+				// style.setAlignment(CellStyle.ALIGN_CENTER);
 			}
 
 			// style.setFont(font);
@@ -3314,14 +3313,14 @@
 			List<String> sortedKeys = new ArrayList<String>(sectionbyfile.keySet());
 			Collections.sort(sortedKeys);
 
-			Font boldFont = wb.createFont();
-			boldFont.setBoldweight(Font.BOLDWEIGHT_BOLD);
+			// Font boldFont = wb.createFont();
+			// boldFont.setBoldweight(Font.BOLDWEIGHT_BOLD);
 			CellStyle sectionstyle = null;
 			if (sectionsSheet.getWorkbook().getNumCellStyles() < 100) {
 				sectionstyle = sectionsSheet.getWorkbook().createCellStyle();
 				sectionstyle.setFillForegroundColor(IndexedColors.BLUE.getIndex());
 				sectionstyle.setRotation((short) -90);
-				sectionstyle.setFont(boldFont);
+				// sectionstyle.setFont(boldFont);
 			}
 
 			SXSSFRow row1 = sectionsSheet.createRow(sectionsSheet.getPhysicalNumberOfRows());
@@ -3348,7 +3347,7 @@
 				Cell cell = row1.createCell(metadataoffset++);
 				String columnLetter = CellReference.convertNumToColString(cell.getColumnIndex());
 				String strFormula = "COUNTIF(" + columnLetter + "3:" + columnLetter + (files.size() + 2) + ",\"X\")";
-				cell.setCellType(Cell.CELL_TYPE_FORMULA);
+				// cell.setCellType(Cell.CELL_TYPE_FORMULA);
 				cell.setCellFormula(strFormula);
 			}
 
@@ -3356,8 +3355,8 @@
 			if (sectionsSheet.getWorkbook().getNumCellStyles() < 100) {
 				style = sectionsSheet.getWorkbook().createCellStyle();
 				style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-				style.setFillPattern(CellStyle.SOLID_FOREGROUND);
-				style.setAlignment(CellStyle.ALIGN_CENTER);
+				// style.setFillPattern(CellStyle.SOLID_FOREGROUND);
+				// style.setAlignment(CellStyle.ALIGN_CENTER);
 			}
 
 			// style.setFont(font);
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/html/HTMLToExcel.java b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/html/HTMLToExcel.java
index d9f510b..21f9d57 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/html/HTMLToExcel.java
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/html/HTMLToExcel.java
@@ -158,7 +158,7 @@
 			case BOLD:
 			case EM:
 			case STRONG:
-				font.setBoldweight(Font.BOLDWEIGHT_BOLD);
+				// font.setBoldweight(Font.BOLDWEIGHT_BOLD);
 				break;
 			case UNDERLINE:
 				font.setUnderline(Font.U_SINGLE);