diff --git a/setup.py b/setup.py
index c3f3e1da73dd8aef1f1e4af8233bc3e9585ac1c7..21184c0c4b4134b4ecfbfaa0f4057f2089af317d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,59 +1,205 @@
-"""setup.py based on
+"""A setuptools based setup module.
+
+See:
+https://packaging.python.org/guides/distributing-packages-using-setuptools/
 https://github.com/pypa/sampleproject
 """
 
+# Always prefer setuptools over distutils
 from setuptools import setup, find_packages
-from codecs import open
-from os import path
+import pathlib
+
+here = pathlib.Path(__file__).parent.resolve()
 
-here = path.abspath(path.dirname(__file__))
+# Get the long description from the README file
+long_description = (here / 'README.md').read_text(encoding='utf-8')
 
-with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
-    long_description = f.read()
+# Arguments marked as "Required" below must be included for upload to PyPI.
+# Fields marked as "Optional" may be commented out.
 
 setup(
-    name='vl-dcc',
-    version='0.1.0',
-    description='DCC generation for the vacuum laboratory.',
-    long_description=long_description,
-    url='https://a75436.berlin.ptb.de/vaclab/vl-dcc',
-    author='Thomas Bock',
-    author_email='thomas.bock@ptb.de',
-    license='MIT',
-    classifiers=[
+    # This is the name of your project. The first time you publish this
+    # package, this name will be registered for you. It will determine how
+    # users can install this project, e.g.:
+    #
+    # $ pip install sampleproject
+    #
+    # And where it will live on PyPI: https://pypi.org/project/sampleproject/
+    #
+    # There are some restrictions on what makes a valid project name
+    # specification here:
+    # https://packaging.python.org/specifications/core-metadata/#name
+    name='vl-dcc',  # Required
+
+    # Versions should comply with PEP 440:
+    # https://www.python.org/dev/peps/pep-0440/
+    #
+    # For a discussion on single-sourcing the version across setup.py and the
+    # project code, see
+    # https://packaging.python.org/en/latest/single_source_version.html
+    version='0.0.0',  # Required
+
+    # This is a one-line description or tagline of what your project does. This
+    # corresponds to the "Summary" metadata field:
+    # https://packaging.python.org/specifications/core-metadata/#summary
+    description='REST service for the validation of "xml" against a XML Schema',  # Optional
+
+    # This is an optional longer description of your project that represents
+    # the body of text which users will see when they visit PyPI.
+    #
+    # Often, this is the same as your README, so you can just read it in from
+    # that file directly (as we have already done above)
+    #
+    # This field corresponds to the "Description" metadata field:
+    # https://packaging.python.org/specifications/core-metadata/#description-optional
+    long_description=long_description,  # Optional
+
+    # Denotes that our long_description is in Markdown; valid values are
+    # text/plain, text/x-rst, and text/markdown
+    #
+    # Optional if long_description is written in reStructuredText (rst) but
+    # required for plain-text or Markdown; if unspecified, "applications should
+    # attempt to render [the long_description] as text/x-rst; charset=UTF-8 and
+    # fall back to text/plain if it is not valid rst" (see link below)
+    #
+    # This field corresponds to the "Description-Content-Type" metadata field:
+    # https://packaging.python.org/specifications/core-metadata/#description-content-type-optional
+    long_description_content_type='text/markdown',  # Optional (see note above)
+
+    # This should be a valid link to your project's main homepage.
+    #
+    # This field corresponds to the "Home-Page" metadata field:
+    # https://packaging.python.org/specifications/core-metadata/#home-page-optional
+    url='https://a75436.berlin.ptb.de/vaclab/vl-dcc',  # Optional
+
+    # This should be your name or the name of the organization which owns the
+    # project.
+    author='Rolf Niepraschk',  # Optional
+
+    # This should be a valid email address corresponding to the author listed
+    # above.
+    author_email='Rolf.Niepraschk@ptb.de',  # Optional
+
+    # Classifiers help users find your project by categorizing it.
+    #
+    # For a list of valid classifiers, see https://pypi.org/classifiers/
+    classifiers=[  # Optional
+        # How mature is this project? Common values are
+        #   3 - Alpha
+        #   4 - Beta
+        #   5 - Production/Stable
         'Development Status :: 3 - Alpha',
-        'Intended Audience :: vaclab team',
+
+        # Indicate who your project is intended for
+        'Intended Audience :: Developers',
+        'Topic :: Software Development :: Build Tools',
+
+        # Pick your license as you wish
         'License :: OSI Approved :: MIT License',
+
+        # Specify the Python versions you support here. In particular, ensure
+        # that you indicate you support Python 3. These classifiers are *not*
+        # checked by 'pip install'. See instead 'python_requires' below.
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3 :: Only',
     ],
-    keywords='Vacuum Laboratory, Calibration, Certificate',
-    packages=find_packages(exclude=['docs',
-                                    'tests',
-                                    'test_doc',
-                                    'htmlcov'
+
+    # This field adds keywords for your project which will appear on the
+    # project page. What does your project relate to?
+    #
+    # Note that this is a list of additional keywords, separated
+    # by commas, to be used to assist searching for the distribution in a
+    # larger catalog.
+    keywords='xml, xsd, dcc',  # Optional
+
+    # When your source code is in a subdirectory under the project root, e.g.
+    # `src/`, it is necessary to specify the `package_dir` argument.
+    ### package_dir={'': 'src'},  # Optional
+
+    # You can just specify package directories manually here if your project is
+    # simple. Or you can use find_packages().
+    #
+    # Alternatively, if you just want to distribute a single Python file, use
+    # the `py_modules` argument instead as follows, which will expect a file
+    # called `my_module.py` to exist:
+    #
+    #   py_modules=["my_module"],
+    #
+    packages=find_packages(exclude=['bin',
+                                    'examples',
+                                    'include',
+                                    'Kritik',
+                                    'templates'
                                     ]),
-    install_requires=['flask',
-                      'flask-cors', 
-                      'GitPython',
-                      'requests',
-                      'prettierfier'
-    ],
-    extras_require={
-        'dev': ['sphinx',
-                'sphinx_rtd_theme',
-                'autopep8',
-                ],
-    },
-    package_data={
-        'sample': ['test_doc'],
-    },
-    #entry_points={
-    # 'console_scripts': [
-    #     'start=',
-    # ],
+
+    # Specify which Python versions you support. In contrast to the
+    # 'Programming Language' classifiers above, 'pip install' will check this
+    # and refuse to install the project if the version does not match. See
+    # https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires
+    python_requires='>=3.5, <4',
+
+    # This field lists other packages that your project depends on to run.
+    # Any package you put here will be installed by pip when your project is
+    # installed, so they must be valid existing projects.
+    #
+    # For an analysis of "install_requires" vs pip's requirements files see:
+    # https://packaging.python.org/en/latest/requirements.html
+    install_requires=['peppercorn'],  # Optional
+
+    # List additional groups of dependencies here (e.g. development
+    # dependencies). Users will be able to install these using the "extras"
+    # syntax, for example:
+    #
+    #   $ pip install sampleproject[dev]
+    #
+    # Similar to `install_requires` above, these must be valid existing
+    # projects.
+    #extras_require={  # Optional
+    #    'dev': ['check-manifest'],
+    #    'test': ['coverage'],
     #},
+
+    # If there are data files included in your packages that need to be
+    # installed, specify them here.
+    #package_data={  # Optional
+    #    'sample': ['package_data.dat'],
+    #},
+
+    # Although 'package_data' is the preferred approach, in some case you may
+    # need to place data files outside of your packages. See:
+    # http://docs.python.org/distutils/setupscript.html#installing-additional-files
+    #
+    # In this case, 'data_file' will be installed into '<sys.prefix>/my_data'
+    #data_files=[('my_data', ['data/data_file'])],  # Optional
+
+    # To provide executable scripts, use entry points in preference to the
+    # "scripts" keyword. Entry points provide cross-platform support and allow
+    # `pip` to create the appropriate form of executable for the target
+    # platform.
+    #
+    # For example, the following would provide a command called `sample` which
+    # executes the function `main` from this package when invoked:
+    #entry_points={  # Optional
+    #    'console_scripts': [
+    #        'sample=sample:main',
+    #    ],
+    #},
+
+    # List additional URLs that are relevant to your project as a dict.
+    #
+    # This field corresponds to the "Project-URL" metadata fields:
+    # https://packaging.python.org/specifications/core-metadata/#project-url-multiple-use
+    #
+    # Examples listed include a pattern for specifying where the package tracks
+    # issues, where the source is hosted, where to say thanks to the package
+    # maintainers, and where to support the project financially. The key is
+    # what's used to render the link text on PyPI.
+    project_urls={  # Optional
+        'Bug Reports': 'https://a75436.berlin.ptb.de/vaclab/vl-dcc/-/issues',
+        'Source': 'https://a75436.berlin.ptb.de/vaclab/vl-dcc'
+    },
 )
diff --git a/templates/xml/calibration_item.xml b/templates/xml/calibration_item.xml
index aa494ecc8c63dddf7de0a2e4605dc60b48c0f8b3..66f5e7009cc7a877cae126fc45c67c441d5939fa 100644
--- a/templates/xml/calibration_item.xml
+++ b/templates/xml/calibration_item.xml
@@ -24,7 +24,7 @@
       {%- for j in i['description'] %}
       <dcc:content lang="{{j.lang}}">
         {%- for k in j.content %}
-        {{k|safe}}
+        {{utils.sanitize_ltx(k)|safe}}
         {% endfor -%}
       </dcc:content>
       {% endfor -%}
diff --git a/templates/xml/used_methods.xml b/templates/xml/used_methods.xml
index 9dea41c59cf0b4f02c499a14bf6bfa902a680c41..b750d523597e9b485c0f09f5458258abfbc2a3f8 100644
--- a/templates/xml/used_methods.xml
+++ b/templates/xml/used_methods.xml
@@ -13,11 +13,9 @@
     <dcc:description>
       {%- for j in i['description'] %}
       <dcc:content lang="{{j.lang}}">
-        <![CDATA[
         {%- for k in j.content %}
-        {{k|safe}}
+        {{utils.sanitize_ltx(k)|safe}}
         {% endfor -%}
-        ]]>   
       </dcc:content>
       {% endfor -%}
     </dcc:description>    
diff --git a/trans.py b/trans.py
index cc35244dfa2b3948198c97822e2cae2cf1e0fc24..f0af9af027445b44d4e779886cb6d429dbd980de 100644
--- a/trans.py
+++ b/trans.py
@@ -20,7 +20,7 @@ def cert_to_xml(cert_doc):
     }
     cert_doc['DCC']['administrativeData']['dccSoftware'].append(s)
            
-    xml = render_template(dcc_template, doc=cert_doc['DCC'])  
+    xml = render_template(dcc_template, doc=cert_doc['DCC'], utils=utils)  
     try:
         xml = prettify_xml(xml, indent=2, debug=False)
     except Exception as error:
diff --git a/utils.py b/utils.py
index 30d71f50cab928118a02e92d6bfd8320c043ed1e..f0a6130773c8c106c38212c5e442c837b8ba787a 100644
--- a/utils.py
+++ b/utils.py
@@ -62,3 +62,12 @@ def get_version():
     except:
         return False
      
+ltx2entity = {
+  '<':'&lt;',
+  '>':'&gt;'
+}
+
+def sanitize_ltx(x):
+    for key in ltx2entity:
+        x = x.replace(key, ltx2entity[key])
+    return x