diff --git a/.btd.yml b/.btd.yml
index 03528e6b..296c029b 100644
--- a/.btd.yml
+++ b/.btd.yml
@@ -2,8 +2,8 @@ input: doc
 output: _build
 requirements: requirements.txt
 target: gh-pages
-formats: [ html, pdf, man ]
+formats: [ html ]
 images:
-  base: edaa/doc
+  base: btdi/sphinx:pytooling
   latex: btdi/latex
-theme: https://codeload.github.com/buildthedocs/sphinx.theme/tar.gz/v1
+theme: https://codeload.GitHub.com/buildthedocs/sphinx.theme/tar.gz/v1
diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
index f3dd915f..35b22fe7 100644
--- a/.github/workflows/Pipeline.yml
+++ b/.github/workflows/Pipeline.yml
@@ -1,6 +1,8 @@
-name: Unit Testing, Coverage Collection, Package, Release, Documentation and Publish
+name: Pipeline
 
-on: [ push ]
+on:
+  push:
+  workflow_dispatch:
 
 defaults:
   run:
@@ -8,443 +10,122 @@ defaults:
 
 jobs:
 
-  UnitTesting:
-    name: ${{ matrix.icon }} Unit Tests using Python ${{ matrix.python }}
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-#          - {python: "3.6", icon: 🔴}  # until 23.12.2021
-          - {python: "3.7", icon: 🟠}  # until 27.06.2023
-          - {python: "3.8", icon: 🟡}  # until Oct. 2024
-          - {python: "3.9", icon: 🟢}  # until Oct. 2025
-          - {python: "3.10", icon: 🟢} # until Oct. 2026
-
-    env:
-      PYTHON: ${{ matrix.python }}
-    outputs:
-      python: ${{ env.PYTHON }}
-
-    steps:
-      - name: ⏬ Checkout repository
-        uses: actions/checkout@v2
-
-      - name: 🐍 Setup Python ${{ matrix.python }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python }}
-
-      - name: 🔧 Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r tests/requirements.txt
+  Params:
+    uses: pyTooling/Actions/.github/workflows/Parameters.yml@r0
+    with:
+      name: pyEDAA.ProjectModel
+      python_version_list: "3.7 3.8 3.9 3.10"
 
-      - name: ☑ Run unit tests
-        run: |
-          python -m pytest -rA tests/unit --color=yes
+  UnitTesting:
+    uses: pyTooling/Actions/.github/workflows/UnitTesting.yml@r0
+    needs:
+      - Params
+    with:
+      jobs: ${{ needs.Params.outputs.python_jobs }}
+      artifact: ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}
 
   Coverage:
-    name: 📈 Collect Coverage Data using Python 3.10
-    runs-on: ubuntu-latest
-
-    env:
-      PYTHON: "3.10"
-      ARTIFACT: pyEDAA-ProjectModel-coverage-html
-    outputs:
-      python: ${{ env.PYTHON }}
-      artifact: ${{ env.ARTIFACT }}
-
-    steps:
-      - name: ⏬ Checkout repository
-        uses: actions/checkout@v2
-
-      - name: 🐍 Setup Python ${{ env.PYTHON }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ env.PYTHON }}
-
-      - name: 🗂 Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r tests/requirements.txt
-
-      - name: Collect coverage
-        continue-on-error: true
-        run: |
-          python -m pytest -rA --cov=.. --cov-config=tests/.coveragerc tests/unit --color=yes
-
-      - name: Convert to cobertura format
-        run: |
-          coverage xml
-
-      - name: Convert to HTML format
-        run: |
-          coverage html
-          rm htmlcov/.gitignore
-
-      - name: 📊 Publish coverage at CodeCov
-        continue-on-error: true
-        uses: codecov/codecov-action@v1
-        with:
-          file: ./coverage.xml
-          flags: unittests
-          env_vars: PYTHON
-
-      - name: 📉 Publish coverage at Codacy
-        continue-on-error: true
-        uses: codacy/codacy-coverage-reporter-action@master
-        with:
-          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-          coverage-reports: ./coverage.xml
-
-      - name: 📤 Upload 'Coverage Report' artifact
-        continue-on-error: true
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ env.ARTIFACT }}
-          path: htmlcov
-          if-no-files-found: error
-          retention-days: 1
+    uses: pyTooling/Actions/.github/workflows/CoverageCollection.yml@r0
+    needs:
+      - Params
+    with:
+      python_version: ${{ fromJson(needs.Params.outputs.params).python_version }}
+      artifact: ${{ fromJson(needs.Params.outputs.params).artifacts.coverage }}
+    secrets:
+      codacy_token: ${{ secrets.CODACY_PROJECT_TOKEN }}
 
   StaticTypeCheck:
-    name: 👀 Check Static Typing using Python 3.10
-    runs-on: ubuntu-latest
-
-    env:
-      PYTHON: "3.10"
-      ARTIFACT: pyEDAA-ProjectModel-typing-html
-    outputs:
-      python: ${{ env.PYTHON }}
-      artifact: ${{ env.ARTIFACT }}
-
-    steps:
-      - name: ⏬ Checkout repository
-        uses: actions/checkout@v2
-
-      - name: 🐍 Setup Python ${{ env.PYTHON }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ env.PYTHON }}
-
-      - name: 🗂 Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r tests/requirements.txt
-
-      - name: Check Static Typing
-        continue-on-error: true
-        run: |
-          pwd
-          mypy --html-report htmlmypy -m pyEDAA.ProjectModel
-
-      - name: 📤 Upload 'Static Typing Report' artifact
-        continue-on-error: true
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ env.ARTIFACT }}
-          path: htmlmypy
-          if-no-files-found: error
-          retention-days: 1
-
-
-  Release:
-    name: 📝 Create 'Release Page' on GitHub
-    runs-on: ubuntu-latest
-
-    if: startsWith(github.ref, 'refs/tags')
+    uses: pyTooling/Actions/.github/workflows/StaticTypeCheck.yml@r0
+    needs:
+      - Params
+    with:
+      python_version: ${{ fromJson(needs.Params.outputs.params).python_version }}
+      commands: |
+        cd pyEDAA
+        mypy --html-report ../htmlmypy -p ProjectModel
+      report: 'htmlmypy'
+      artifact: ${{ fromJson(needs.Params.outputs.params).artifacts.typing }}
+
+  PublishTestResults:
+    uses: pyTooling/Actions/.github/workflows/PublishTestResults.yml@r0
     needs:
       - UnitTesting
-      - Coverage
-      - StaticTypeCheck
-
-    env:
-      PYTHON: ${{ needs.Coverage.outputs.python }}
-    outputs:
-      python:     ${{ env.PYTHON }}
-      tag:        ${{ steps.getVariables.outputs.gitTag }}
-      version:    ${{ steps.getVariables.outputs.version }}
-      datetime:   ${{ steps.getVariables.outputs.datetime }}
-      upload_url: ${{ steps.createReleasePage.outputs.upload_url }}
-
-    steps:
-      - name: 🔁 Extract Git tag from GITHUB_REF
-        id:   getVariables
-        run: |
-          GIT_TAG=${GITHUB_REF#refs/*/}
-          RELEASE_VERSION=${GIT_TAG#v}
-          RELEASE_DATETIME="$(date --utc '+%d.%m.%Y - %H:%M:%S')"
-          # write to step outputs
-          echo ::set-output name=gitTag::${GIT_TAG}
-          echo ::set-output name=version::${RELEASE_VERSION}
-          echo ::set-output name=datetime::${RELEASE_DATETIME}
-
-      - name: 📑 Create Release Page
-        id:   createReleasePage
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ steps.getVariables.outputs.gitTag }}
-#          release_name: ${{ steps.getVariables.outputs.gitTag }}
-          body: |
-            **Automated Release created on: ${{ steps.getVariables.outputs.datetime }}**
-
-            # New Features
-            * tbd
-
-            # Changes
-            * tbd
-
-            # Bug Fixes
-            * tbd
-          draft: false
-          prerelease: false
 
   Package:
-    name: 📦 Package in Wheel Format
-    runs-on: ubuntu-latest
+    uses: pyTooling/Actions/.github/workflows/Package.yml@r0
+    needs:
+      - Params
+      - Coverage
+    with:
+      python_version: ${{ fromJson(needs.Params.outputs.params).python_version }}
+      artifact: ${{ fromJson(needs.Params.outputs.params).artifacts.package }}
 
+  Release:
+    uses: pyTooling/Actions/.github/workflows/Release.yml@r0
     if: startsWith(github.ref, 'refs/tags')
     needs:
+      - UnitTesting
       - Coverage
-
-    env:
-      PYTHON:   ${{ needs.Coverage.outputs.python }}
-      ARTIFACT: pyEDAA-ProjectModel-wheel
-    outputs:
-      python:   ${{ env.PYTHON }}
-      artifact: ${{ env.ARTIFACT }}
-
-    steps:
-      - name: 📥 Checkout repository
-        uses: actions/checkout@v2
-
-      - name: 🐍 Setup Python ${{ env.PYTHON }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ env.PYTHON }}
-
-      - name: 🔧 Install dependencies for packaging and release
-        run: |
-          python -m pip install --upgrade pip
-          pip install wheel
-
-      - name: 🔨 Build Python package (source distribution)
-        run: |
-          python setup.py sdist
-
-      - name: 🔨 Build Python package (binary distribution - wheel)
-        run: |
-          python setup.py bdist_wheel
-
-      - name: 📤 Upload 'pyEDAA.ProjectModel' artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ env.ARTIFACT }}
-          path: dist/
-          if-no-files-found: error
-          retention-days: 1
+      - StaticTypeCheck
+      - Package
 
   PublishOnPyPI:
-    name: 🚀 Publish to PyPI
-    runs-on: ubuntu-latest
-
+    uses: pyTooling/Actions/.github/workflows/PublishOnPyPI.yml@r0
     if: startsWith(github.ref, 'refs/tags')
     needs:
+      - Params
       - Release
       - Package
-
-    env:
-      PYTHON:   ${{ needs.Package.outputs.python }}
-      ARTIFACT: ${{ needs.Package.outputs.artifact }}
-    outputs:
-      python:   ${{ env.PYTHON }}
-      artifact: ${{ env.ARTIFACT }}
-
-    steps:
-      - name: 📥 Download artifacts '${{ env.ARTIFACT }}' from 'Package' job
-        uses: actions/download-artifact@v2
-        with:
-          name: ${{ env.ARTIFACT }}
-          path: dist/
-
-      - name: 🐍 Setup Python ${{ env.PYTHON }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ env.PYTHON }}
-
-      - name: ⚙ Install dependencies for packaging and release
-        run: |
-          python -m pip install --upgrade pip
-          pip install wheel twine
-
-      - name: ⤴ Release Python package to PyPI
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
-        run: |
-          twine upload dist/*
-
-      - name: 🗑️ Delete packaging Artifacts
-        uses: geekyeggo/delete-artifact@v1
-        with:
-          name: |
-            ${{ env.ARTIFACT }}
+    with:
+      python_version: ${{ fromJson(needs.Params.outputs.params).python_version }}
+      requirements: -r dist/requirements.txt
+      artifact: ${{ fromJson(needs.Params.outputs.params).artifacts.package }}
+    secrets:
+      PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
 
   VerifyDocs:
-    name: 👍 Verify example snippets using Python 3.10
-    runs-on: ubuntu-latest
-
-    env:
-      PYTHON: "3.10"
-    outputs:
-      python: ${{ env.PYTHON }}
-
-    steps:
-      - name: ⏬ Checkout repository
-        uses: actions/checkout@v2
-
-      - name: 🐍 Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ env.PYTHON }}
-
-      - name: 🐍 Install dependencies
-        run: |
-          pip3 install .
-
-      - name: ✂ Extract code snippet from README
-        shell: python
-        run: |
-          from pathlib import Path
-          import re
-
-          ROOT = Path('.')
-
-          with (ROOT / 'README.md').open('r') as rptr:
-              content = rptr.read()
-
-          m = re.search(r"```py(thon)?(?P<code>.*?)```", content, re.MULTILINE|re.DOTALL)
-
-          if m is None:
-              raise Exception("Regular expression did not find the example in the README!")
-
-          with (ROOT / 'tests/docs/example.py').open('w') as wptr:
-              wptr.write(m["code"])
-
-      - name: Print example.py
-        run: cat tests/docs/example.py
-
-      - name: ☑ Run example snippet
-        working-directory: tests/docs
-        run: |
-          python3 example.py
+    uses: pyTooling/Actions/.github/workflows/VerifyDocs.yml@r0
+    needs:
+      - Params
+    with:
+      python_version: ${{ fromJson(needs.Params.outputs.params).python_version }}
 
   BuildTheDocs:
-    name: 📓 Run BuildTheDocs
-    runs-on: ubuntu-latest
+    uses: pyTooling/Actions/.github/workflows/BuildTheDocs.yml@r0
     needs:
+      - Params
       - VerifyDocs
-
-    env:
-      ARTIFACT: pyEDAA-ProjectModel-documentation
-    outputs:
-      artifact: ${{ env.ARTIFACT }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: 🚢 Build container image 'vhdl/doc'
-        run: |
-          docker build -t edaa/doc - <<-EOF
-          FROM btdi/sphinx:featured
-          RUN apk add -U --no-cache graphviz
-          EOF
-
-      - name: 🛳️ Build documentation using container edaa/doc
-        uses: buildthedocs/btd@v0
-        with:
-          skip-deploy: true
-
-      - name: 📤 Upload 'documentation' artifacts
-        uses: actions/upload-artifact@master
-        with:
-          name: ${{ env.ARTIFACT }}
-          path: doc/_build/html
-          retention-days: 7
+    with:
+      artifact: ${{ fromJson(needs.Params.outputs.params).artifacts.doc }}
 
   PublishToGitHubPages:
-    name: 📚 Publish to GH-Pages
-    runs-on: ubuntu-latest
+    uses: pyTooling/Actions/.github/workflows/PublishToGitHubPages.yml@r0
     needs:
+      - Params
       - BuildTheDocs
       - Coverage
       - StaticTypeCheck
-
-    env:
-      DOC:      ${{ needs.BuildTheDocs.outputs.artifact }}
-      COVERAGE: ${{ needs.Coverage.outputs.artifact }}
-      TYPING:   ${{ needs.StaticTypeCheck.outputs.artifact }}
-    outputs:
-      artifact: ${{ env.ARTIFACT }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: 📥 Download artifacts '${{ env.DOC }}' from 'BuildTheDocs' job
-        uses: actions/download-artifact@v2
-        with:
-          name: ${{ env.DOC }}
-          path: public
-
-      - name: 📥 Download artifacts '${{ env.COVERAGE }}' from 'Coverage' job
-        uses: actions/download-artifact@v2
-        with:
-          name: ${{ env.COVERAGE }}
-          path: public/coverage
-
-      - name: 📥 Download artifacts '${{ env.TYPING }}' from 'StaticTypeCheck' job
-        uses: actions/download-artifact@v2
-        with:
-          name: ${{ env.TYPING }}
-          path: public/typing
-
-      - name: '📓 Publish site to GitHub Pages'
-        if: github.event_name != 'pull_request'
-        run: |
-          cd public
-          touch .nojekyll
-          git init
-          cp ../.git/config ./.git/config
-          git add .
-          git config --local user.email "BuildTheDocs@GitHubActions"
-          git config --local user.name "GitHub Actions"
-          git commit -a -m "update ${{ github.sha }}"
-          git push -u origin +HEAD:gh-pages
+    with:
+      doc: ${{ fromJson(needs.Params.outputs.params).artifacts.doc }}
+      coverage: ${{ fromJson(needs.Params.outputs.params).artifacts.coverage }}
+      typing: ${{ fromJson(needs.Params.outputs.params).artifacts.typing }}
 
   ArtifactCleanUp:
-    name: 🗑️ Artifact Cleanup
-    runs-on: ubuntu-latest
+    uses: pyTooling/Actions/.github/workflows/ArtifactCleanUp.yml@r0
     needs:
+      - Params
+      - UnitTesting
       - Coverage
       - StaticTypeCheck
       - BuildTheDocs
       - PublishToGitHubPages
-
-    env:
-      COVERAGE: ${{ needs.Coverage.outputs.artifact }}
-      TYPING:   ${{ needs.StaticTypeCheck.outputs.artifact }}
-      DOC:      ${{ needs.BuildTheDocs.outputs.artifact }}
-
-    steps:
-      - name: 🗑️ Delete all Artifacts
-        uses: geekyeggo/delete-artifact@v1
-        with:
-          name: |
-            ${{ env.COVERAGE }}
-            ${{ env.TYPING }}
-            ${{ env.DOC }}
+    with:
+      package: ${{ fromJson(needs.Params.outputs.params).artifacts.package }}
+      remaining: |
+        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-3.7
+        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-3.8
+        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-3.9
+        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-3.10
+        ${{ fromJson(needs.Params.outputs.params).artifacts.coverage }}
+        ${{ fromJson(needs.Params.outputs.params).artifacts.typing }}
+        ${{ fromJson(needs.Params.outputs.params).artifacts.doc }}
diff --git a/.gitignore b/.gitignore
index 3cb8138a..7d9e3f23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,10 +8,13 @@ __pycache__/
 coverage.xml
 
 # setuptools
-/build
-/dist
+/build/**/*.*
+/dist/**/*.*
 /*.egg-info
 
+# Dependencies
+!requirements.txt
+
 # Sphinx
 doc/_build/
 doc/pyEDAA.ProjectModel/**/*.*
diff --git a/.idea/pyEDAA.ProjectModel.iml b/.idea/pyEDAA.ProjectModel.iml
index d0876a78..c8149c8d 100644
--- a/.idea/pyEDAA.ProjectModel.iml
+++ b/.idea/pyEDAA.ProjectModel.iml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/pyEDAA" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
diff --git a/README.md b/README.md
index 9c722968..81219eef 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,28 @@
-[![Sourcecode on GitHub](https://img.shields.io/badge/edaa--org-pyEDAA.ProjectModel-323131.svg?logo=github&longCache=true)](https://github.com/edaa-org/pyEDAA.ProjectModel)
-[![Sourcecode License](https://img.shields.io/pypi/l/pyEDAA.ProjectModel?logo=Github&label=code%20license)](LICENSE.md)
-[![GitHub tag (latest SemVer incl. pre-release)](https://img.shields.io/github/v/tag/edaa-org/pyEDAA.ProjectModel?logo=GitHub&include_prereleases)](https://github.com/edaa-org/pyEDAA.ProjectModel/tags)
-[![GitHub release (latest SemVer incl. including pre-releases)](https://img.shields.io/github/v/release/edaa-org/pyEDAA.ProjectModel?logo=GitHub&include_prereleases)](https://github.com/edaa-org/pyEDAA.ProjectModel/releases/latest)
-[![GitHub release date](https://img.shields.io/github/release-date/edaa-org/pyEDAA.ProjectModel?logo=GitHub&)](https://github.com/edaa-org/pyEDAA.ProjectModel/releases)  
-[![GitHub Workflow - Build and Test Status](https://img.shields.io/github/workflow/status/edaa-org/pyEDAA.ProjectModel/Unit%20Testing,%20Coverage%20Collection,%20Package,%20Release,%20Documentation%20and%20Publish?label=build%20and%20test&logo=GitHub%20Actions&logoColor=FFFFFF)](https://github.com/edaa-org/pyEDAA.ProjectModel/actions?query=workflow%3A%22Unit%20Testing,%20Coverage%20Collection,%20Package,%20Release,%20Documentation%20and%20Publish%22)
-[![Codacy - Quality](https://img.shields.io/codacy/grade/c2635df20fa840bc85639ca2fa1d9cb4?logo=Codacy)](https://www.codacy.com/manual/edaa-org/pyEDAA.ProjectModel)
-[![Codacy - Coverage](https://img.shields.io/codacy/coverage/c2635df20fa840bc85639ca2fa1d9cb4?logo=Codacy)](https://www.codacy.com/manual/edaa-org/pyEDAA.ProjectModel)
-[![Codecov - Branch Coverage](https://img.shields.io/codecov/c/github/edaa-org/pyEDAA.ProjectModel?logo=Codecov)](https://codecov.io/gh/edaa-org/pyEDAA.ProjectModel)
-[![Libraries.io SourceRank](https://img.shields.io/librariesio/sourcerank/pypi/pyEDAA.ProjectModel)](https://libraries.io/github/edaa-org/pyEDAA.ProjectModel/sourcerank)  
-[![PyPI](https://img.shields.io/pypi/v/pyEDAA.ProjectModel?logo=PyPI&logoColor=FBE072)](https://pypi.org/project/pyEDAA.ProjectModel/)
-![PyPI - Status](https://img.shields.io/pypi/status/pyEDAA.ProjectModel?logo=PyPI&logoColor=FBE072)
-![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pyEDAA.ProjectModel?logo=PyPI&logoColor=FBE072)
-[![Libraries.io status for latest release](https://img.shields.io/librariesio/release/pypi/pyEDAA.ProjectModel)](https://libraries.io/github/edaa-org/pyEDAA.ProjectModel)
-[![Requires.io](https://img.shields.io/requires/github/edaa-org/pyEDAA.ProjectModel)](https://requires.io/github/edaa-org/pyEDAA.ProjectModel/requirements/?branch=main)  
-[![Documentation License](https://img.shields.io/badge/doc%20license-CC--BY%204.0-green)](LICENSE.md)
-[![Documentation - Read Now!](https://img.shields.io/badge/doc-read%20now%20%E2%9E%94-blueviolet)](https://edaa-org.github.io/pyEDAA.ProjectModel/)
+<p align="center">
+  <a title="edaa-org.github.io/pySVModel" href="https://edaa-org.github.io/pyEDAA.ProjectModel"><img height="80px" src="doc/_static/logo_on_dark.svg"/></a>
+</p>
+
+[![Sourcecode on GitHub](https://img.shields.io/badge/pyEDAA-ProjectModel-ab47bc.svg?longCache=true&style=flat-square&logo=github&longCache=true&logo=GitHub&labelColor=6a1b9a)](https://GitHub.com/edaa-org/pyEDAA.ProjectModel)
+[![Sourcecode License](https://img.shields.io/pypi/l/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=Apache&label=code)](LICENSE.md)
+[![Documentation](https://img.shields.io/website?longCache=true&style=flat-square&label=edaa-org.github.io%2FpyEDAA.ProjectModel&logo=GitHub&logoColor=fff&up_color=blueviolet&up_message=Read%20now%20%E2%9E%9A&url=https%3A%2F%2Fedaa-org.github.io%2FpyEDAA.ProjectModel%2Findex.html)](https://edaa-org.github.io/pyEDAA.ProjectModel/)
+[![Documentation License](https://img.shields.io/badge/doc-CC--BY%204.0-green?longCache=true&style=flat-square&logo=CreativeCommons&logoColor=fff)](LICENSE.md)
+[![Gitter](https://img.shields.io/badge/chat-on%20gitter-4db797.svg?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef)](https://gitter.im/hdl/community)  
+[![PyPI](https://img.shields.io/pypi/v/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072)](https://pypi.org/project/pyEDAA.ProjectModel/)
+![PyPI - Status](https://img.shields.io/pypi/status/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072)
+![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072)  
+[![GitHub Workflow - Build and Test Status](https://img.shields.io/github/workflow/status/edaa-org/pyEDAA.ProjectModel/Pipeline/main?longCache=true&style=flat-square&label=Build%20and%20test&logo=GitHub%20Actions&logoColor=FFFFFF)](https://GitHub.com/edaa-org/pyEDAA.ProjectModel/actions/workflows/Pipeline.yml)
+[![Libraries.io status for latest release](https://img.shields.io/librariesio/release/pypi/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=Libraries.io&logoColor=fff)](https://libraries.io/github/edaa-org/pyEDAA.ProjectModel)
+[![Codacy - Quality](https://img.shields.io/codacy/grade/c2635df20fa840bc85639ca2fa1d9cb4?longCache=true&style=flat-square&logo=Codacy)](https://www.codacy.com/manual/edaa-org/pyEDAA.ProjectModel)
+[![Codacy - Coverage](https://img.shields.io/codacy/coverage/c2635df20fa840bc85639ca2fa1d9cb4?longCache=true&style=flat-square&logo=Codacy)](https://www.codacy.com/manual/edaa-org/pyEDAA.ProjectModel)
+[![Codecov - Branch Coverage](https://img.shields.io/codecov/c/github/edaa-org/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=Codecov)](https://codecov.io/gh/edaa-org/pyEDAA.ProjectModel)
 
 <!--
-[![Dependent repos (via libraries.io)](https://img.shields.io/librariesio/dependent-repos/pypi/pyEDAA.ProjectModel?logo=GitHub)](https://github.com/edaa-org/pyEDAA.ProjectModel/network/dependents)
+[![Dependent repos (via libraries.io)](https://img.shields.io/librariesio/dependent-repos/pypi/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=GitHub)](https://github.com/edaa-org/pyEDAA.ProjectModel/network/dependents)
+[![Requires.io](https://img.shields.io/requires/github/edaa-org/pyEDAA.ProjectModel?longCache=true&style=flat-square)](https://requires.io/github/edaa-org/pyEDAA.ProjectModel/requirements/?branch=main)
+[![Libraries.io SourceRank](https://img.shields.io/librariesio/sourcerank/pypi/pyEDAA.ProjectModel)](https://libraries.io/github/edaa-org/pyEDAA.ProjectModel/sourcerank)  
 -->
 
-# pyEDAA.ProjectModel
+# Main Goals
 
 This package provides a unified abstract project model for HDL designs and EDA tools.
 Third-party frameworks can derive own classes and implement additional logic to create
@@ -97,22 +99,22 @@ for file in designA.Files(fileType=VHDLSourceFile):
 
 # References
 
-- [Paebbels/pyIPCMI: pyIPCMI/Base/Project.py](https://github.com/Paebbels/pyIPCMI/blob/master/pyIPCMI/Base/Project.py)
-- [VUnit/vunit: vunit/project.py](https://github.com/VUnit/vunit/blob/master/vunit/project.py)
-- [PyFPGA/pyfpga: fpga/project.py](https://github.com/PyFPGA/pyfpga/blob/main/fpga/project.py)
-- [olofk/fusesoc: fusesoc/capi2/core.py](https://github.com/olofk/fusesoc/blob/master/fusesoc/capi2/core.py)
-- [XedaHQ/xeda: xeda/flows/flow.py](https://github.com/XedaHQ/xeda/blob/master/xeda/flows/flow.py)
+- [Paebbels/pyIPCMI: pyIPCMI/Base/Project.py](https://GitHub.com/Paebbels/pyIPCMI/blob/master/pyIPCMI/Base/Project.py)
+- [VUnit/vunit: vunit/project.py](https://GitHub.com/VUnit/vunit/blob/master/vunit/project.py)
+- [PyFPGA/pyfpga: fpga/project.py](https://GitHub.com/PyFPGA/pyfpga/blob/main/fpga/project.py)
+- [olofk/fusesoc: fusesoc/capi2/core.py](https://GitHub.com/olofk/fusesoc/blob/master/fusesoc/capi2/core.py)
+- [XedaHQ/xeda: xeda/flows/flow.py](https://GitHub.com/XedaHQ/xeda/blob/master/xeda/flows/flow.py)
 - [tsfpga/tsfpga: tsfpga/build_project_list.py](https://gitlab.com/tsfpga/tsfpga/-/blob/master/tsfpga/build_project_list.py)
 - [hdl-make: hdlmake/](https://ohwr.org/project/hdl-make/tree/master/hdlmake)
-- [OSVVM/OSVVM-Scripts: OsvvmProjectScripts.tcl](https://github.com/OSVVM/OSVVM-Scripts/blob/master/OsvvmProjectScripts.tcl)
+- [OSVVM/OSVVM-Scripts: OsvvmProjectScripts.tcl](https://GitHub.com/OSVVM/OSVVM-Scripts/blob/master/OsvvmProjectScripts.tcl)
 
 
 
 ## Contributors
-* [Patrick Lehmann](https://github.com/Paebbels) (Maintainer)
-* [Unai Martinez-Corral](https://github.com/umarcor)
-* [Stefan Unrein](https://github.com/stefanunrein)
-* [and more...](https://github.com/edaa-org/pyEDAA.ProjectModel/graphs/contributors)
+* [Patrick Lehmann](https://GitHub.com/Paebbels) (Maintainer)
+* [Unai Martinez-Corral](https://GitHub.com/umarcor)
+* [Stefan Unrein](https://GitHub.com/stefanunrein)
+* [and more...](https://GitHub.com/edaa-org/pyEDAA.ProjectModel/graphs/contributors)
 
 
 ## License
diff --git a/dist/requirements.txt b/dist/requirements.txt
new file mode 100644
index 00000000..6c4932c1
--- /dev/null
+++ b/dist/requirements.txt
@@ -0,0 +1,2 @@
+wheel
+twine
diff --git a/doc/Dependency.rst b/doc/Dependency.rst
index 218e922a..d3a279e0 100644
--- a/doc/Dependency.rst
+++ b/doc/Dependency.rst
@@ -10,7 +10,7 @@ Dependency
 .. |img-ProjectModel-req-status| image:: https://img.shields.io/requires/github/edaa-org/pyEDAA.ProjectModel
    :alt: Requires.io
    :height: 22
-   :target: https://requires.io/github/edaa-org/pyEDAA.ProjectModel/requirements/?branch=master
+   :target: https://requires.io/github/edaa-org/pyEDAA.ProjectModel/requirements/?branch=main
 
 +------------------------------------------+------------------------------------------+
 | `Libraries.io <https://libraries.io/>`_  | `Requires.io <https://requires.io/>`_    |
@@ -24,65 +24,145 @@ Dependency
 pyEDAA.ProjectModel Package
 ***************************
 
-+-------------------------------------------------------+-------------+-----------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------+
-| **Package**                                           | **Version** | **License**                                                                       | **Dependencies**                                                                                                                  |
-+=======================================================+=============+===================================================================================+===================================================================================================================================+
-| `pydecor <https://github.com/mplanchard/pydecor>`__   | ≥2.0.1      | `MIT <https://github.com/mplanchard/pydecor/blob/master/LICENSE>`__               | * `dill <https://github.com/uqfoundation/dill>`__ (`BSD 3-clause <https://github.com/uqfoundation/dill/blob/master/LICENSE>`__)   |
-|                                                       |             |                                                                                   | * `six <https://github.com/benjaminp/six>`__ (`MIT <https://github.com/benjaminp/six/blob/master/LICENSE>`__)                     |
-+-------------------------------------------------------+-------------+-----------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------+
-| `pyVHDLModel <https://github.com/VHDL/pyVHDLModel>`__ | ≥0.13.0     | `Apache License, 2.0 <https://github.com/VHDL/pyVHDLModel/blob/master/LICENSE>`__ | * `pydecor <https://github.com/mplanchard/pydecor>`__ (`MIT <https://github.com/mplanchard/pydecor/blob/master/LICENSE>`__)       |
-|                                                       |             |                                                                                   |                                                                                                                                   |
-|                                                       |             |                                                                                   |   * `dill <https://github.com/uqfoundation/dill>`__ (`BSD 3-clause <https://github.com/uqfoundation/dill/blob/master/LICENSE>`__) |
-|                                                       |             |                                                                                   |   * `six <https://github.com/benjaminp/six>`__ (`MIT <https://github.com/benjaminp/six/blob/master/LICENSE>`__)                   |
-+-------------------------------------------------------+-------------+-----------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------+
-| `pySVModel <https://github.com/edaa-org/pySVModel>`__ | ≥0.3.0      | `Apache License, 2.0 <https://github.com/VHDL/pyVHDLModel/blob/master/LICENSE>`__ | * `pydecor <https://github.com/mplanchard/pydecor>`__ (`MIT <https://github.com/mplanchard/pydecor/blob/master/LICENSE>`__)       |
-|                                                       |             |                                                                                   |                                                                                                                                   |
-|                                                       |             |                                                                                   |   * `dill <https://github.com/uqfoundation/dill>`__ (`BSD 3-clause <https://github.com/uqfoundation/dill/blob/master/LICENSE>`__) |
-|                                                       |             |                                                                                   |   * `six <https://github.com/benjaminp/six>`__ (`MIT <https://github.com/benjaminp/six/blob/master/LICENSE>`__)                   |
-+-------------------------------------------------------+-------------+-----------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------+
++----------------------------------------------------------+-------------+-------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
+| **Package**                                              | **Version** | **License**                                                                               | **Dependencies**                                                                                                                |
++==========================================================+=============+===========================================================================================+=================================================================================================================================+
+| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__   | ≥1.7.0      | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/main/LICENSE.txt>`__    | *None*                                                                                                                          |
++----------------------------------------------------------+-------------+-------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
+| `pyVHDLModel <https://GitHub.com/VHDL/pyVHDLModel>`__    | ≥0.13.0     | `Apache License, 2.0 <https://GitHub.com/VHDL/pyVHDLModel/blob/master/LICENSE>`__         |                                                                                                                                 |
++----------------------------------------------------------+-------------+-------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
+| `pySVModel <https://GitHub.com/edaa-org/pySVModel>`__    | ≥0.3.1      | `Apache License, 2.0 <https://GitHub.com/VHDL/pyVHDLModel/blob/master/LICENSE>`__         |                                                                                                                                 |
++----------------------------------------------------------+-------------+-------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
 
 
 .. _dependency-testing:
 
-Unit Testing / Coverage
-***********************
+Unit Testing / Coverage / Type Checking (Optional)
+**************************************************
 
-Additional Python packages needed for testing and code coverage collection.
-These packages are only needed for developers or on a CI server, thus
-sub-dependencies are not evaluated further.
+Additional Python packages needed for testing, code coverage collection and static type checking. These packages are
+only needed for developers or on a CI server, thus sub-dependencies are not evaluated further.
+
+
+.. rubric:: Manually Installing Test Requirements
+
+Use the :file:`tests/requirements.txt` file to install all dependencies via ``pip3``. The file will recursively install
+the mandatory dependencies too.
+
+.. code-block:: shell
+
+   pip3 install -U -r tests/requirements.txt
+
+
+.. rubric:: Dependency List
 
 +-----------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+
 | **Package**                                               | **Version** | **License**                                                                            | **Dependencies**     |
 +===========================================================+=============+========================================================================================+======================+
-| `pytest <https://github.com/pytest-dev/pytest>`__         | ≥6.2.4      | `MIT <https://github.com/pytest-dev/pytest/blob/master/LICENSE>`__                     | *Not yet evaluated.* |
+| `pytest <https://GitHub.com/pytest-dev/pytest>`__         | ≥6.2.5      | `MIT <https://GitHub.com/pytest-dev/pytest/blob/master/LICENSE>`__                     | *Not yet evaluated.* |
++-----------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+
+| `pytest-cov <https://GitHub.com/pytest-dev/pytest-cov>`__ | ≥3.0.0      | `MIT <https://GitHub.com/pytest-dev/pytest-cov/blob/master/LICENSE>`__                 | *Not yet evaluated.* |
++-----------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+
+| `Coverage <https://GitHub.com/nedbat/coveragepy>`__       | ≥6.2        | `Apache License, 2.0 <https://GitHub.com/nedbat/coveragepy/blob/master/LICENSE.txt>`__ | *Not yet evaluated.* |
 +-----------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+
-| `pytest-cov <https://github.com/pytest-dev/pytest-cov>`__ | ≥2.12.1     | `MIT <https://github.com/pytest-dev/pytest-cov/blob/master/LICENSE>`__                 | *Not yet evaluated.* |
+| `mypy <https://GitHub.com/python/mypy>`__                 | ≥0.910      | `MIT <https://GitHub.com/python/mypy/blob/master/LICENSE>`__                           | *Not yet evaluated.* |
 +-----------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+
-| `Coverage <https://github.com/nedbat/coveragepy>`__       | ≥6.0        | `Apache License, 2.0 <https://github.com/nedbat/coveragepy/blob/master/LICENSE.txt>`__ | *Not yet evaluated.* |
+| `lxml <https://GitHub.com/lxml/lxml>`__                   | ≥4.6.4      | `BSD 3-Clause <https://GitHub.com/lxml/lxml/blob/master/LICENSE.txt>`__                | *Not yet evaluated.* |
 +-----------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+
 
 
 .. _dependency-documentation:
 
-Sphinx Documentation
+Sphinx Documentation (Optional)
+*******************************
+
+Additional Python packages needed for documentation generation. These packages are only needed for developers or on a
+CI server, thus sub-dependencies are not evaluated further.
+
+
+.. rubric:: Manually Installing Documentation Requirements
+
+Use the :file:`doc/requirements.txt` file to install all dependencies via ``pip3``. The file will recursively install
+the mandatory dependencies too.
+
+.. code-block:: shell
+
+   pip3 install -U -r doc/requirements.txt
+
+
+.. rubric:: Dependency List
+
++-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
+| **Package**                                                                                     | **Version**  | **License**                                                                                              | **Dependencies**                                                                                                                                     |
++=================================================================================================+==============+==========================================================================================================+======================================================================================================================================================+
+| `pyTooling.Packaging <https://GitHub.com/pyTooling/pyTooling>`__                                | ≥1.7.0       | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling.Packaging/blob/main/LICENSE.md>`__          | *None*                                                                                                                                               |
++-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
+| `Sphinx <https://GitHub.com/sphinx-doc/sphinx>`__                                               | ≥4.3.0       | `BSD 3-Clause <https://GitHub.com/sphinx-doc/sphinx/blob/master/LICENSE>`__                              | *Not yet evaluated.*                                                                                                                                 |
++-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
+| `sphinx_btd_theme <https://GitHub.com/buildthedocs/sphinx.theme>`__                             | ≥0.5.2       | `MIT <https://GitHub.com/buildthedocs/sphinx.theme/blob/master/LICENSE>`__                               | *Not yet evaluated.*                                                                                                                                 |
++-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
+| !! `sphinx_fontawesome <https://GitHub.com/fraoustin/sphinx_fontawesome>`__                     | ≥0.0.6       | `GPL 2.0 <https://GitHub.com/fraoustin/sphinx_fontawesome/blob/master/LICENSE>`__                        | *Not yet evaluated.*                                                                                                                                 |
++-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
+| `sphinx_autodoc_typehints <https://GitHub.com/agronholm/sphinx-autodoc-typehints>`__            | ≥1.12.0      | `MIT <https://GitHub.com/agronholm/sphinx-autodoc-typehints/blob/master/LICENSE>`__                      | *Not yet evaluated.*                                                                                                                                 |
++-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
+
+
+.. _dependency-packaging:
+
+Packaging (Optional)
 ********************
 
-Additional Python packages needed for documentation generation. These packages
-are only needed for developers or on a CI server, thus sub-dependencies are not
-evaluated further.
-
-+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
-| **Package**                                                                                     | **Version**  | **License**                                                                                              | **Dependencies**     |
-+=================================================================================================+==============+==========================================================================================================+======================+
-| `Sphinx <https://github.com/sphinx-doc/sphinx>`__                                               | ≥4.2.0       | `BSD 3-Clause <https://github.com/sphinx-doc/sphinx/blob/master/LICENSE>`__                              | *Not yet evaluated.* |
-+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
-| `sphinx_btd_theme <https://github.com/buildthedocs/sphinx.theme>`__                             |              | `MIT <https://github.com/buildthedocs/sphinx.theme/blob/master/LICENSE>`__                               | *Not yet evaluated.* |
-+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
-| `autoapi <https://github.com/carlos-jenkins/autoapi>`__                                         |              | `Apache License, 2.0 <https://github.com/carlos-jenkins/autoapi/blob/master/LICENSE>`__                  | *Not yet evaluated.* |
-+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
-| !! `sphinx_fontawesome <https://github.com/fraoustin/sphinx_fontawesome>`__                     | ≥0.0.6       | `GPL 2.0 <https://github.com/fraoustin/sphinx_fontawesome/blob/master/LICENSE>`__                        | *Not yet evaluated.* |
-+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
-| `sphinx_autodoc_typehints <https://github.com/agronholm/sphinx-autodoc-typehints>`__            | ≥1.12.0      | `MIT <https://github.com/agronholm/sphinx-autodoc-typehints/blob/master/LICENSE>`__                      | *Not yet evaluated.* |
-+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
-| `Pygments <https://github.com/pygments/pygments>`__                                             | ≥2.9.0       | `BSD 2-Clause <https://github.com/pygments/pygments/blob/master/LICENSE>`__                              | *Not yet evaluated.* |
-+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
+Additional Python packages needed for installation package generation. These packages are only needed for developers or
+on a CI server, thus sub-dependencies are not evaluated further.
+
+
+.. rubric:: Manually Installing Packaging Requirements
+
+Use the :file:`build/requirements.txt` file to install all dependencies via ``pip3``. The file will recursively
+install the mandatory dependencies too.
+
+.. code-block:: shell
+
+   pip3 install -U -r build/requirements.txt
+
+
+.. rubric:: Dependency List
+
++----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
+| **Package**                                                                | **Version**  | **License**                                                                                              | **Dependencies**                                                                                                                                     |
++============================================================================+==============+==========================================================================================================+======================================================================================================================================================+
+| `pyTooling.Packaging <https://GitHub.com/pyTooling/pyTooling>`__           | ≥1.7.0       | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling.Packaging/blob/main/LICENSE.md>`__          | *None*                                                                                                                                               |
++----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
+| `wheel <https://GitHub.com/pypa/wheel>`__                                  | any          | `MIT <https://github.com/pypa/wheel/blob/main/LICENSE.txt>`__                                            | *Not yet evaluated.*                                                                                                                                 |
++----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
+
+
+.. _dependency-publishing:
+
+Publishing (CI-Server only)
+***************************
+
+Additional Python packages needed for publishing the generated installation package to e.g, PyPI or any equivalent
+services. These packages are only needed for maintainers or on a CI server, thus sub-dependencies are not evaluated
+further.
+
+
+.. rubric:: Manually Installing Publishing Requirements
+
+Use the :file:`dist/requirements.txt` file to install all dependencies via ``pip3``. The file will recursively
+install the mandatory dependencies too.
+
+.. code-block:: shell
+
+   pip3 install -U -r dist/requirements.txt
+
+
+.. rubric:: Dependency List
+
++----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+
+| **Package**                                              | **Version**  | **License**                                                                               | **Dependencies**     |
++==========================================================+==============+===========================================================================================+======================+
+| `wheel <https://GitHub.com/pypa/wheel>`__                | any          | `MIT <https://github.com/pypa/wheel/blob/main/LICENSE.txt>`__                             | *Not yet evaluated.* |
++----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+
+| `Twine <https://GitHub.com/pypa/twine/>`__               | any          | `Apache License, 2.0 <https://github.com/pypa/twine/blob/main/LICENSE>`__                 | *Not yet evaluated.* |
++----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+
diff --git a/doc/_static/favicon.svg b/doc/_static/favicon.svg
new file mode 100644
index 00000000..97995b9d
--- /dev/null
+++ b/doc/_static/favicon.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="304"
+   height="304"
+   version="1.1"
+   id="svg18"
+   sodipodi:docname="favicon.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs22" />
+  <sodipodi:namedview
+     id="namedview20"
+     pagecolor="#505050"
+     bordercolor="#ffffff"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="1"
+     showgrid="false"
+     inkscape:zoom="0.43884871"
+     inkscape:cx="1254.4186"
+     inkscape:cy="151.53286"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="1072"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg18"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <path
+     fill="none"
+     d="M 2,2 H 102 V 52 H 2 Z"
+     style="fill:#ffffff;fill-opacity:0;stroke:#ba68c8;stroke-width:4px"
+     id="path2" />
+  <path
+     d="m 202,52 h 100 v 50 H 202 Z"
+     style="fill:#ba68c8;fill-opacity:1;stroke:#ba68c8;stroke-width:4px"
+     id="path4" />
+  <path
+     fill="none"
+     d="m 2,102 h 100 v 50 H 2 Z m 200,50 h 100 v 50 H 202 Z M 2,202 h 100 v 50 H 2 Z m 200,50 h 100 v 50 H 202 Z"
+     style="fill:#ffffff;fill-opacity:0;stroke:#ba68c8;stroke-width:4px"
+     id="path6" />
+  <path
+     fill="none"
+     d="M 102,2 H 202 V 52 H 102 Z"
+     style="fill:#ffffff;fill-opacity:0;stroke:#8e24aa;stroke-width:4px"
+     id="path8" />
+  <path
+     d="m 102,52 h 100 v 50 H 102 Z"
+     style="fill:#8e24aa;fill-opacity:1;stroke:#8e24aa;stroke-width:4px"
+     id="path10" />
+  <path
+     fill="none"
+     d="m 102,102 h 100 v 50 H 102 Z m 0,50 h 100 v 50 H 102 Z m 0,50 h 100 v 50 H 102 Z m 0,50 h 100 v 50 H 102 Z"
+     style="fill:#ffffff;fill-opacity:0;stroke:#8e24aa;stroke-width:4px"
+     id="path12" />
+</svg>
diff --git a/doc/_static/logo_on_dark.svg b/doc/_static/logo_on_dark.svg
new file mode 100644
index 00000000..24e8576a
--- /dev/null
+++ b/doc/_static/logo_on_dark.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="2511.116" height="304">
+  <path fill="none" d="M2 2h100v50H2Z" style="fill:#fff;fill-opacity:0;stroke:#ba68c8;stroke-width:4px"/>
+  <path d="M202 52h100v50H202Z" style="fill:#ba68c8;fill-opacity:1;stroke:#ba68c8;stroke-width:4px"/>
+  <path fill="none" d="M2 102h100v50H2Zm200 50h100v50H202ZM2 202h100v50H2Zm200 50h100v50H202Z" style="fill:#fff;fill-opacity:0;stroke:#ba68c8;stroke-width:4px"/>
+  <path fill="none" d="M102 2h100v50H102Z" style="fill:#fff;fill-opacity:0;stroke:#8e24aa;stroke-width:4px"/>
+  <path d="M102 52h100v50H102Z" style="fill:#8e24aa;fill-opacity:1;stroke:#8e24aa;stroke-width:4px"/>
+  <path fill="none" d="M102 102h100v50H102Zm0 50h100v50H102Zm0 50h100v50H102Zm0 50h100v50H102Z" style="fill:#fff;fill-opacity:0;stroke:#8e24aa;stroke-width:4px"/>
+  <path d="M429.947 67.827h12.133q31.547 0 31.547 30.853v107.813q0 30.507-31.547 30.507h-12.133q-16.987 0-21.494-13.52v61.36h-31.2V67.827h31.2v13.52q4.507-13.52 21.494-13.52Zm12.48 133.813v-98.453q0-6.24-2.08-7.974-2.08-2.08-8.32-2.08h-12.134q-6.24 0-9.013 2.774-2.427 2.773-2.427 9.36v94.293q0 6.587 2.427 9.36 2.773 2.773 9.013 2.773h12.134q6.24 0 8.32-1.733 2.08-2.08 2.08-8.32zm84.586 83.2h-20.8v-24.96h14.213q14.907 0 18.027-11.44l3.467-14.213h-16.987l-35.36-166.4h31.893l25.654 141.786 23.92-141.786h31.546L566.88 253.293q-7.627 31.547-39.867 31.547Zm127.92-73.147h62.746V237h-94.293V19.987h91.867v25.306h-60.32V112.2h49.92v25.307h-49.92zm88.052-191.706h75.574q32.24 0 32.24 30.506v156q0 30.507-32.24 30.507h-75.574Zm76.267 182.346V54.653q0-6.24-2.08-7.973-2.08-2.08-8.32-2.08h-34.32v167.787h34.32q6.24 0 8.32-1.734 2.08-2.08 2.08-8.32zM964.852 237l-8.667-50.267h-45.76L902.452 237h-31.2l38.48-217.013h45.413L996.398 237Zm-50.614-75.573h37.787l-19.76-114.4zM1098.318 237l-8.667-50.267h-45.76L1035.918 237h-31.2l38.48-217.013h45.413L1129.864 237Zm-50.614-75.573h37.787l-19.76-114.4zM1145.117 237v-42.64h35.013V237Z" aria-label="pyEDAA." class="pyEDAA_ProjectModel_dark_svg__TekoFont" style="fill:#8e24aa"/>
+  <path d="M1200.027 19.987h71.066q32.24 0 32.24 30.506V122.6q0 30.507-32.24 30.507h-39.866V237h-31.2zm72.106 97.76v-62.4q0-6.24-2.08-7.974-2.08-2.08-8.32-2.08h-30.506v82.854h30.506q6.24 0 8.32-2.08t2.08-8.32zM1386.88 67.48h6.933v27.04h-12.48q-21.84 0-21.84 25.653V237h-31.2V67.827h31.2v20.8q2.773-9.014 9.706-14.907 7.28-6.24 17.68-6.24zm54.08.347h37.092q32.24 0 32.24 30.853v107.813q0 30.507-32.24 30.507h-37.093q-31.893 0-31.893-30.507V98.68q0-30.853 31.893-30.853zm38.48 134.16V102.84q0-6.24-2.08-8.32t-8.32-2.08h-19.068q-6.24 0-8.32 2.08-1.733 2.08-1.733 8.32v99.147q0 6.24 1.733 8.32 2.08 2.08 8.32 2.08h19.067q6.24 0 8.32-2.08t2.08-8.32zm58.932-166.4V4.733h32.587v30.854Zm.693 214.586V67.827h31.2v186.506q0 30.507-32.24 30.507h-15.6v-24.613h6.24q6.24 0 8.32-2.08t2.08-7.974zm93.254-182.346h33.973q32.587 0 32.587 30.853v63.44h-68.294v40.213q0 5.894 2.08 7.974t8.32 2.08h15.947q6.24 0 8.32-2.08t2.08-8.32V188.12h30.506v18.373q0 30.507-32.24 30.507h-33.28q-32.24 0-32.24-30.507V98.68q0-30.853 32.24-30.853zm-1.734 71.413h37.44v-36.747q0-5.893-2.08-7.973-1.733-2.08-7.973-2.08h-16.987q-6.24 0-8.32 2.08t-2.08 7.973zm190.666-18.027h-30.853v-18.026q0-6.24-2.08-7.974-2.08-2.08-8.32-2.08h-14.907q-6.24 0-8.32 2.08-2.08 1.734-2.08 7.974v98.453q0 6.24 2.08 8.32 2.08 1.733 8.32 1.733h14.907q6.24 0 8.32-1.733 2.08-2.08 2.08-8.32v-18.027h30.853v22.88q0 30.507-32.586 30.507h-32.934q-32.24 0-32.24-30.507V98.68q0-30.853 32.24-30.853h32.934q32.586 0 32.586 30.853zm83.2-28.08h-23.226v107.12q0 6.24 1.733 8.32 2.08 1.734 8.32 1.734h13.173V237h-22.186q-32.587 0-32.587-30.507V93.133h-15.947V67.827h15.947V39.053h31.547v28.774h23.226zM1953.331 237h-27.386V19.987h34.32l37.093 134.506 37.093-134.506h34.32V237h-27.386V78.227l-29.814 111.626h-28.426l-29.814-111.28ZM2132.21 67.827h37.094q32.24 0 32.24 30.853v107.813q0 30.507-32.24 30.507h-37.093q-31.893 0-31.893-30.507V98.68q0-30.853 31.893-30.853zm38.48 134.16V102.84q0-6.24-2.08-8.32t-8.32-2.08h-19.066q-6.24 0-8.32 2.08-1.733 2.08-1.733 8.32v99.147q0 6.24 1.733 8.32 2.08 2.08 8.32 2.08h19.067q6.24 0 8.32-2.08t2.08-8.32zM2293.41 5.08h31.2V237h-31.2v-13.52q-4.506 13.52-21.493 13.52h-12.48q-31.2 0-31.2-30.507V98.333q0-30.853 31.2-30.853h12.48q16.987 0 21.493 13.52zm-23.573 206.613h12.133q6.24 0 8.667-2.773 2.773-2.773 2.773-9.36v-94.64q0-6.587-2.773-9.36-2.427-2.773-8.667-2.773h-12.133q-6.24 0-8.32 2.08t-2.08 7.973v98.8q0 6.24 2.08 8.32 2.08 1.733 8.32 1.733zm116.826-143.866h33.974q32.586 0 32.586 30.853v63.44h-68.293v40.213q0 5.894 2.08 7.974t8.32 2.08h15.947q6.24 0 8.32-2.08t2.08-8.32V188.12h30.506v18.373q0 30.507-32.24 30.507h-33.28q-32.24 0-32.24-30.507V98.68q0-30.853 32.24-30.853zm-1.733 71.413h37.44v-36.747q0-5.893-2.08-7.973-1.733-2.08-7.973-2.08h-16.987q-6.24 0-8.32 2.08t-2.08 7.973zM2511.116 237h-31.2V5.08h31.2z" aria-label="ProjectModel" class="pyEDAA_ProjectModel_dark_svg__TekoFont" style="fill:#ba68c8"/>
+</svg>
diff --git a/doc/_static/logo_on_light.svg b/doc/_static/logo_on_light.svg
new file mode 100644
index 00000000..eac24d90
--- /dev/null
+++ b/doc/_static/logo_on_light.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="2511.116" height="304">
+  <path fill="none" d="M2 2h100v50H2Z" style="fill:#fff;fill-opacity:0;stroke:#ba68c8;stroke-width:4px"/>
+  <path d="M202 52h100v50H202Z" style="fill:#ba68c8;fill-opacity:1;stroke:#ba68c8;stroke-width:4px"/>
+  <path fill="none" d="M2 102h100v50H2Zm200 50h100v50H202ZM2 202h100v50H2Zm200 50h100v50H202Z" style="fill:#fff;fill-opacity:0;stroke:#ba68c8;stroke-width:4px"/>
+  <path fill="none" d="M102 2h100v50H102Z" style="fill:#fff;fill-opacity:0;stroke:#8e24aa;stroke-width:4px"/>
+  <path d="M102 52h100v50H102Z" style="fill:#8e24aa;fill-opacity:1;stroke:#8e24aa;stroke-width:4px"/>
+  <path fill="none" d="M102 102h100v50H102Zm0 50h100v50H102Zm0 50h100v50H102Zm0 50h100v50H102Z" style="fill:#fff;fill-opacity:0;stroke:#8e24aa;stroke-width:4px"/>
+  <path d="M429.947 67.827h12.133q31.547 0 31.547 30.853v107.813q0 30.507-31.547 30.507h-12.133q-16.987 0-21.494-13.52v61.36h-31.2V67.827h31.2v13.52q4.507-13.52 21.494-13.52Zm12.48 133.813v-98.453q0-6.24-2.08-7.974-2.08-2.08-8.32-2.08h-12.134q-6.24 0-9.013 2.774-2.427 2.773-2.427 9.36v94.293q0 6.587 2.427 9.36 2.773 2.773 9.013 2.773h12.134q6.24 0 8.32-1.733 2.08-2.08 2.08-8.32zm84.586 83.2h-20.8v-24.96h14.213q14.907 0 18.027-11.44l3.467-14.213h-16.987l-35.36-166.4h31.893l25.654 141.786 23.92-141.786h31.546L566.88 253.293q-7.627 31.547-39.867 31.547Zm127.92-73.147h62.746V237h-94.293V19.987h91.867v25.306h-60.32V112.2h49.92v25.307h-49.92zm88.052-191.706h75.574q32.24 0 32.24 30.506v156q0 30.507-32.24 30.507h-75.574Zm76.267 182.346V54.653q0-6.24-2.08-7.973-2.08-2.08-8.32-2.08h-34.32v167.787h34.32q6.24 0 8.32-1.734 2.08-2.08 2.08-8.32zM964.852 237l-8.667-50.267h-45.76L902.452 237h-31.2l38.48-217.013h45.413L996.398 237Zm-50.614-75.573h37.787l-19.76-114.4zM1098.318 237l-8.667-50.267h-45.76L1035.918 237h-31.2l38.48-217.013h45.413L1129.864 237Zm-50.614-75.573h37.787l-19.76-114.4zM1145.117 237v-42.64h35.013V237Z" aria-label="pyEDAA." class="pyEDAA_ProjectModel_light_svg__TekoFont" style="fill:#8e24aa"/>
+  <path d="M1200.027 19.987h71.066q32.24 0 32.24 30.506V122.6q0 30.507-32.24 30.507h-39.866V237h-31.2zm72.106 97.76v-62.4q0-6.24-2.08-7.974-2.08-2.08-8.32-2.08h-30.506v82.854h30.506q6.24 0 8.32-2.08t2.08-8.32zM1386.88 67.48h6.933v27.04h-12.48q-21.84 0-21.84 25.653V237h-31.2V67.827h31.2v20.8q2.773-9.014 9.706-14.907 7.28-6.24 17.68-6.24zm54.08.347h37.092q32.24 0 32.24 30.853v107.813q0 30.507-32.24 30.507h-37.093q-31.893 0-31.893-30.507V98.68q0-30.853 31.893-30.853zm38.48 134.16V102.84q0-6.24-2.08-8.32t-8.32-2.08h-19.068q-6.24 0-8.32 2.08-1.733 2.08-1.733 8.32v99.147q0 6.24 1.733 8.32 2.08 2.08 8.32 2.08h19.067q6.24 0 8.32-2.08t2.08-8.32zm58.932-166.4V4.733h32.587v30.854Zm.693 214.586V67.827h31.2v186.506q0 30.507-32.24 30.507h-15.6v-24.613h6.24q6.24 0 8.32-2.08t2.08-7.974zm93.254-182.346h33.973q32.587 0 32.587 30.853v63.44h-68.294v40.213q0 5.894 2.08 7.974t8.32 2.08h15.947q6.24 0 8.32-2.08t2.08-8.32V188.12h30.506v18.373q0 30.507-32.24 30.507h-33.28q-32.24 0-32.24-30.507V98.68q0-30.853 32.24-30.853zm-1.734 71.413h37.44v-36.747q0-5.893-2.08-7.973-1.733-2.08-7.973-2.08h-16.987q-6.24 0-8.32 2.08t-2.08 7.973zm190.666-18.027h-30.853v-18.026q0-6.24-2.08-7.974-2.08-2.08-8.32-2.08h-14.907q-6.24 0-8.32 2.08-2.08 1.734-2.08 7.974v98.453q0 6.24 2.08 8.32 2.08 1.733 8.32 1.733h14.907q6.24 0 8.32-1.733 2.08-2.08 2.08-8.32v-18.027h30.853v22.88q0 30.507-32.586 30.507h-32.934q-32.24 0-32.24-30.507V98.68q0-30.853 32.24-30.853h32.934q32.586 0 32.586 30.853zm83.2-28.08h-23.226v107.12q0 6.24 1.733 8.32 2.08 1.734 8.32 1.734h13.173V237h-22.186q-32.587 0-32.587-30.507V93.133h-15.947V67.827h15.947V39.053h31.547v28.774h23.226zM1953.331 237h-27.386V19.987h34.32l37.093 134.506 37.093-134.506h34.32V237h-27.386V78.227l-29.814 111.626h-28.426l-29.814-111.28ZM2132.21 67.827h37.094q32.24 0 32.24 30.853v107.813q0 30.507-32.24 30.507h-37.093q-31.893 0-31.893-30.507V98.68q0-30.853 31.893-30.853zm38.48 134.16V102.84q0-6.24-2.08-8.32t-8.32-2.08h-19.066q-6.24 0-8.32 2.08-1.733 2.08-1.733 8.32v99.147q0 6.24 1.733 8.32 2.08 2.08 8.32 2.08h19.067q6.24 0 8.32-2.08t2.08-8.32zM2293.41 5.08h31.2V237h-31.2v-13.52q-4.506 13.52-21.493 13.52h-12.48q-31.2 0-31.2-30.507V98.333q0-30.853 31.2-30.853h12.48q16.987 0 21.493 13.52zm-23.573 206.613h12.133q6.24 0 8.667-2.773 2.773-2.773 2.773-9.36v-94.64q0-6.587-2.773-9.36-2.427-2.773-8.667-2.773h-12.133q-6.24 0-8.32 2.08t-2.08 7.973v98.8q0 6.24 2.08 8.32 2.08 1.733 8.32 1.733zm116.826-143.866h33.974q32.586 0 32.586 30.853v63.44h-68.293v40.213q0 5.894 2.08 7.974t8.32 2.08h15.947q6.24 0 8.32-2.08t2.08-8.32V188.12h30.506v18.373q0 30.507-32.24 30.507h-33.28q-32.24 0-32.24-30.507V98.68q0-30.853 32.24-30.853zm-1.733 71.413h37.44v-36.747q0-5.893-2.08-7.973-1.733-2.08-7.973-2.08h-16.987q-6.24 0-8.32 2.08t-2.08 7.973zM2511.116 237h-31.2V5.08h31.2z" aria-label="ProjectModel" class="pyEDAA_ProjectModel_light_svg__TekoFont" style="fill:#ba68c8"/>
+</svg>
diff --git a/doc/_themes/.gitempty b/doc/_themes/.gitempty
deleted file mode 100644
index e69de29b..00000000
diff --git a/doc/conf.py b/doc/conf.py
index 65f8443b..4ff89d87 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -2,52 +2,36 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 
-import sys
+from sys import path as sys_path
 from os.path import abspath
 from pathlib import Path
-from json    import dump, loads
+from json import loads
 
-sys.path.insert(0, abspath('.'))
-sys.path.insert(0, abspath('..'))
-sys.path.insert(0, abspath('../pyEDAA/ProjectModel'))
-#sys.path.insert(0, abspath('_extensions'))
+from pyTooling.Packaging import extractVersionInformation
 
+ROOT = Path(__file__).resolve().parent
 
-# ==============================================================================
-# Project information
-# ==============================================================================
-project =   "pyEDAA.ProjectModel"
-copyright = "2016-2021 Patrick Lehmann, Unai Martinez-Corral and contributors"
-author =    "Patrick Lehmann"
+sys_path.insert(0, abspath('.'))
+sys_path.insert(0, abspath('..'))
+sys_path.insert(0, abspath('../pyEDAA/ProjectModel'))
+#sys_path.insert(0, abspath('_extensions'))
 
 
 # ==============================================================================
-# Versioning
+# Project information and versioning
 # ==============================================================================
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
-from subprocess import check_output
-
-def _IsUnderGitControl():
-	return (check_output(["git", "rev-parse", "--is-inside-work-tree"], universal_newlines=True).strip() == "true")
-
-def _LatestTagName():
-	return check_output(["git", "describe", "--abbrev=0", "--tags"], universal_newlines=True).strip()
+project =     "pyEDAA.ProjectModel"
 
-# The full version, including alpha/beta/rc tags
-version = "0.3"     # The short X.Y version.
-release = "0.3.1"   # The full version, including alpha/beta/rc tags.
-try:
-	if _IsUnderGitControl:
-		latestTagName = _LatestTagName()[1:]		# remove prefix "v"
-		versionParts =  latestTagName.split("-")[0].split(".")
-
-		version = ".".join(versionParts[:2])
-		release = latestTagName   # ".".join(versionParts[:3])
-except:
-	pass
+packageInformationFile = Path(f"../{project.replace('.', '/')}/__init__.py")
+versionInformation = extractVersionInformation(packageInformationFile)
 
+author =    versionInformation.Author
+copyright = versionInformation.Copyright
+version =   ".".join(versionInformation.Version.split(".")[:2])  # e.g. 2.3    The short X.Y version.
+release =   versionInformation.Version
 
 # ==============================================================================
 # Miscellaneous settings
@@ -88,24 +72,31 @@ def _LatestTagName():
 # ==============================================================================
 # Options for HTML output
 # ==============================================================================
-html_theme_options = {
-    'home_breadcrumbs': True,
-    'vcs_pageview_mode': 'blob',
-}
 
 html_context = {}
-ctx = Path(__file__).resolve().parent / 'context.json'
+ctx = ROOT / 'context.json'
 if ctx.is_file():
 	html_context.update(loads(ctx.open('r').read()))
 
-html_theme_path = ["."]
-html_theme = "_theme"
+if (ROOT / "_theme").is_dir():
+	html_theme_path = ["."]
+	html_theme = "_theme"
+	html_theme_options = {
+		'logo_only': True,
+		'home_breadcrumbs': False,
+		'vcs_pageview_mode': 'blob',
+	}
+else:
+	html_theme = "alabaster"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
+html_logo = str(Path(html_static_path[0]) / "logo_on_dark.svg")
+html_favicon = str(Path(html_static_path[0]) / "favicon.svg")
+
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'pyEDAAProjectModelDoc'
 
@@ -134,7 +125,7 @@ def _LatestTagName():
 		% ================================================================================
 		% Add more Unicode characters for pdfLaTeX.
 		% - Alternatively, compile with XeLaTeX or LuaLaTeX.
-		% - https://github.com/sphinx-doc/sphinx/issues/3511
+		% - https://GitHub.com/sphinx-doc/sphinx/issues/3511
 		%
 		\ifdefined\DeclareUnicodeCharacter
 			\DeclareUnicodeCharacter{2265}{$\geq$}
@@ -223,10 +214,9 @@ def _LatestTagName():
 # Sphinx.Ext.ExtLinks
 # ==============================================================================
 extlinks = {
-	'issue': ('https://github.com/edaa-org/pyEDAA.ProjectModel/issues/%s', 'issue #'),
-	'pull':  ('https://github.com/edaa-org/pyEDAA.ProjectModel/pull/%s', 'pull request #'),
-	'src':   ('https://github.com/edaa-org/pyEDAA.ProjectModel/blob/master/pyMetaClasses/%s?ts=2', None),
-#	'test':  ('https://github.com/edaa-org/pyEDAA.ProjectModel/blob/master/test/%s?ts=2', None)
+	"ghissue": ('https://GitHub.com/edaa-org/pyEDAA.ProjectModel/issues/%s', 'issue #'),
+	"ghpull":  ('https://GitHub.com/edaa-org/pyEDAA.ProjectModel/pull/%s', 'pull request #'),
+	"ghsrc":   ('https://GitHub.com/edaa-org/pyEDAA.ProjectModel/blob/main/%s?ts=2', None),
 }
 
 
diff --git a/doc/coverage/index.rst b/doc/coverage/index.rst
index 59e1add6..80bbad2e 100644
--- a/doc/coverage/index.rst
+++ b/doc/coverage/index.rst
@@ -1,2 +1,4 @@
 Coverage Report
 ###############
+
+*Placeholder for the Coverage report generated with* ``pytest`` *and* ``coverage``.
diff --git a/doc/index.rst b/doc/index.rst
index 77100837..cf662a69 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -1,22 +1,33 @@
 .. include:: shields.inc
 
+.. image:: _static/logo_on_light.svg
+   :height: 90 px
+   :align: center
+   :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel
+
+.. raw:: html
+
+    <br>
+
 .. raw:: latex
 
    \part{Introduction}
 
 .. only:: html
 
-   |  |SHIELD:svg:ProjectModel-github| |SHIELD:svg:ProjectModel-src-license| |SHIELD:svg:ProjectModel-tag| |SHIELD:svg:ProjectModel-release| |SHIELD:svg:ProjectModel-date| |SHIELD:svg:ProjectModel-lib-dep|
-   |  |SHIELD:svg:ProjectModel-gha-test| |SHIELD:svg:ProjectModel-codacy-quality| |SHIELD:svg:ProjectModel-codacy-coverage| |SHIELD:svg:ProjectModel-codecov-coverage| |SHIELD:svg:ProjectModel-lib-rank|
-   |  |SHIELD:svg:ProjectModel-pypi-tag| |SHIELD:svg:ProjectModel-pypi-status| |SHIELD:svg:ProjectModel-pypi-python| |SHIELD:svg:ProjectModel-lib-status| |SHIELD:svg:ProjectModel-req-status|
-   |  |SHIELD:svg:ProjectModel-doc-license| |SHIELD:svg:ProjectModel-ghp-doc|
+   |  |SHIELD:svg:ProjectModel-github| |SHIELD:svg:ProjectModel-src-license| |SHIELD:svg:ProjectModel-ghp-doc| |SHIELD:svg:ProjectModel-doc-license| |SHIELD:svg:ProjectModel-gitter|
+   |  |SHIELD:svg:ProjectModel-pypi-tag| |SHIELD:svg:ProjectModel-pypi-status| |SHIELD:svg:ProjectModel-pypi-python|
+   |  |SHIELD:svg:ProjectModel-gha-test| |SHIELD:svg:ProjectModel-lib-status| |SHIELD:svg:ProjectModel-codacy-quality| |SHIELD:svg:ProjectModel-codacy-coverage| |SHIELD:svg:ProjectModel-codecov-coverage|
+
+.. Disabled shields: |SHIELD:svg:ProjectModel-lib-dep| |SHIELD:svg:ProjectModel-req-status| |SHIELD:svg:ProjectModel-lib-rank|
 
 .. only:: latex
 
-   |SHIELD:png:ProjectModel-github| |SHIELD:png:ProjectModel-src-license| |SHIELD:png:ProjectModel-tag| |SHIELD:png:ProjectModel-release| |SHIELD:png:ProjectModel-date| |SHIELD:png:ProjectModel-lib-dep|
-   |SHIELD:png:ProjectModel-gha-test| |SHIELD:png:ProjectModel-codacy-quality| |SHIELD:png:ProjectModel-codacy-coverage| |SHIELD:png:ProjectModel-codecov-coverage| |SHIELD:png:ProjectModel-lib-rank|
-   |SHIELD:png:ProjectModel-pypi-tag| |SHIELD:png:ProjectModel-pypi-status| |SHIELD:png:ProjectModel-pypi-python| |SHIELD:png:ProjectModel-lib-status| |SHIELD:png:ProjectModel-req-status|
-   |SHIELD:png:ProjectModel-doc-license| |SHIELD:png:ProjectModel-ghp-doc|
+   |SHIELD:png:ProjectModel-github| |SHIELD:png:ProjectModel-src-license| |SHIELD:png:ProjectModel-ghp-doc| |SHIELD:png:ProjectModel-doc-license| |SHIELD:svg:ProjectModel-gitter|
+   |SHIELD:png:ProjectModel-pypi-tag| |SHIELD:png:ProjectModel-pypi-status| |SHIELD:png:ProjectModel-pypi-python|
+   |SHIELD:png:ProjectModel-gha-test| |SHIELD:png:ProjectModel-lib-status| |SHIELD:png:ProjectModel-codacy-quality| |SHIELD:png:ProjectModel-codacy-coverage| |SHIELD:png:ProjectModel-codecov-coverage|
+
+.. Disabled shields: |SHIELD:png:ProjectModel-lib-dep| |SHIELD:png:ProjectModel-req-status| |SHIELD:png:ProjectModel-lib-rank|
 
 --------------------------------------------------------------------------------
 
@@ -52,7 +63,7 @@ Use Cases
   `Verilog to Routing (VTR) <https://hdl.github.io/awesome/items/vtr/>`__,
   `nextpnr <https://hdl.github.io/awesome/items/nextpnr/>`__,
   etc.
-* Managing IP cores and projects with `pyIPCMI <https://github.com/Paebbels/pyIPCMI>`__.
+* Managing IP cores and projects with `pyIPCMI <https://GitHub.com/Paebbels/pyIPCMI>`__.
 
 
 .. _news:
@@ -83,8 +94,8 @@ News
 
    .. rubric:: Extracted ProjectModel from pyIPCMI
 
-* The project model has been extracted from `pyIPCMI <https://github.com/Paebbels/pyIPCMI>`__.
-* ProjectModel became first citizen of `EDA² <https://github.com/edaa-org>`__ and got integrated into the `pyEDAA` namespace at PyPI.
+* The project model has been extracted from `pyIPCMI <https://GitHub.com/Paebbels/pyIPCMI>`__.
+* ProjectModel became first citizen of `EDA² <https://GitHub.com/edaa-org>`__ and got integrated into the `pyEDAA` namespace at PyPI.
 
 
 .. _contributors:
@@ -92,9 +103,9 @@ News
 Contributors
 ************
 
-* `Patrick Lehmann <https://github.com/Paebbels>`__ (Maintainer)
-* `Unai Martinez-Corral <https://github.com/umarcor/>`__ (Maintainer)
-* `and more... <https://github.com/VHDL/pyVHDLModel/graphs/contributors>`__
+* `Patrick Lehmann <https://GitHub.com/Paebbels>`__ (Maintainer)
+* `Unai Martinez-Corral <https://GitHub.com/umarcor/>`__ (Maintainer)
+* `and more... <https://GitHub.com/VHDL/pyVHDLModel/graphs/contributors>`__
 
 
 License
@@ -119,6 +130,12 @@ License
    This document was generated on |docdate|.
 
 
+.. toctree::
+   :hidden:
+
+   Used as a layer of EDA² ➚ <https://edaa-org.github.io/>
+
+
 .. toctree::
    :caption: Introduction
    :hidden:
diff --git a/doc/requirements.txt b/doc/requirements.txt
index e63a4235..58166dc3 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,15 +1,12 @@
 -r ../requirements.txt
+
+pyTooling>=1.7.0
+
 # Enforce latest version on ReadTheDocs
-sphinx>=4.2.0
+sphinx>=4.3.0
 
 # Sphinx Extenstions
-#sphinx.ext.coverage
-#sphinxcontrib-actdiag>=0.8.5
 sphinxcontrib-mermaid>=0.7.1
-#sphinxcontrib-seqdiag>=0.8.5
-#sphinxcontrib-textstyle>=0.2.1
-#sphinxcontrib-spelling>=2.2.0
-autoapi
+autoapi>=2.0.1
 sphinx_fontawesome>=0.0.6
 sphinx_autodoc_typehints>=1.12.0
-# changelog>=0.3.5
diff --git a/doc/shields.inc b/doc/shields.inc
index 308f1eca..f5d376c0 100644
--- a/doc/shields.inc
+++ b/doc/shields.inc
@@ -4,177 +4,177 @@
    # percent encoding so that the URL is properly parsed.
 
 .. # Sourcecode link to GitHub
-.. |SHIELD:svg:ProjectModel-github| image:: https://img.shields.io/badge/edaa--org-pyEDAA.ProjectModel-323131?logo=github&longCache=true
+.. |SHIELD:svg:ProjectModel-github| image:: https://img.shields.io/badge/pyEDAA-ProjectModel-ab47bc.svg?longCache=true&style=flat-square&logo=github&longCache=true&logo=GitHub&labelColor=6a1b9a
    :alt: Sourcecode on GitHub
    :height: 22
-   :target: https://github.com/edaa-org/pyEDAA.ProjectModel
-.. |SHIELD:png:ProjectModel-github| image:: https://raster.shields.io/badge/edaa--org-pyEDAA.ProjectModel-323131?logo=github&longCache=true
+   :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel
+.. |SHIELD:png:ProjectModel-github| image:: https://raster.shields.io/badge/pyEDAA-ProjectModel-ab47bc.svg?longCache=true&style=flat-square&logo=github&longCache=true&logo=GitHub&labelColor=6a1b9a
    :alt: Sourcecode on GitHub
    :height: 22
-   :target: https://github.com/edaa-org/pyEDAA.ProjectModel
+   :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel
 
 .. # Sourcecode license
-.. |SHIELD:svg:ProjectModel-src-license| image:: https://img.shields.io/pypi/l/pyEDAA.ProjectModel?logo=GitHub&label=code%20license
+.. |SHIELD:svg:ProjectModel-src-license| image:: https://img.shields.io/pypi/l/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=Apache&label=code
    :alt: Code license
    :height: 22
    :target: Code-License.html
-.. |SHIELD:png:ProjectModel-src-license| image:: https://img.shields.io/pypi/l/pyEDAA.ProjectModel?logo=GitHub&label=code%20license
+.. |SHIELD:png:ProjectModel-src-license| image:: https://img.shields.io/pypi/l/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=Apache&label=code
    :alt: Code license
    :height: 22
-   :target: https://github.com/edaa-org/pyEDAA.ProjectModel/blob/main/LICENSE.md
+   :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel/blob/main/LICENSE.md
 
 .. # GitHub tag
-.. |SHIELD:svg:ProjectModel-tag| image:: https://img.shields.io/github/v/tag/edaa-org/pyEDAA.ProjectModel?logo=GitHub&include_prereleases
+.. |SHIELD:svg:ProjectModel-tag| image:: https://img.shields.io/github/v/tag/edaa-org/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=GitHub&include_prereleases
    :alt: GitHub tag (latest SemVer incl. pre-release
    :height: 22
-   :target: https://github.com/edaa-org/pyEDAA.ProjectModel/tags
-.. |SHIELD:png:ProjectModel-tag| image:: https://raster.shields.io/github/v/tag/edaa-org/pyEDAA.ProjectModel?logo=GitHub&include_prereleases
+   :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel/tags
+.. |SHIELD:png:ProjectModel-tag| image:: https://raster.shields.io/github/v/tag/edaa-org/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=GitHub&include_prereleases
    :alt: GitHub tag (latest SemVer incl. pre-release
    :height: 22
-   :target: https://github.com/edaa-org/pyEDAA.ProjectModel/tags
-
-.. # GitHub release
-.. |SHIELD:svg:ProjectModel-release| image:: https://img.shields.io/github/v/release/edaa-org/pyEDAA.ProjectModel?logo=GitHub&include_prereleases
-   :alt: GitHub release (latest SemVer incl. including pre-releases
-   :height: 22
-   :target: https://github.com/edaa-org/pyEDAA.ProjectModel/releases/latest
-.. |SHIELD:png:ProjectModel-release| image:: https://raster.shields.io/github/v/release/edaa-org/pyEDAA.ProjectModel?logo=GitHub&include_prereleases
-   :alt: GitHub release (latest SemVer incl. including pre-releases
-   :height: 22
-   :target: https://github.com/edaa-org/pyEDAA.ProjectModel/releases/latest
+   :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel/tags
 
 .. # GitHub release date
-.. |SHIELD:svg:ProjectModel-date| image:: https://img.shields.io/github/release-date/edaa-org/pyEDAA.ProjectModel?logo=GitHub
+.. |SHIELD:svg:ProjectModel-date| image:: https://img.shields.io/github/release-date/edaa-org/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=GitHub
    :alt: GitHub release date
    :height: 22
-   :target: https://github.com/edaa-org/pyEDAA.ProjectModel/releases
-.. |SHIELD:png:ProjectModel-date| image:: https://raster.shields.io/github/release-date/edaa-org/pyEDAA.ProjectModel?logo=GitHub
+   :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel/releases
+.. |SHIELD:png:ProjectModel-date| image:: https://raster.shields.io/github/release-date/edaa-org/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=GitHub
    :alt: GitHub release date
    :height: 22
-   :target: https://github.com/edaa-org/pyEDAA.ProjectModel/releases
+   :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel/releases
 
 .. # GitHub/Libraries dependent projects
-.. |SHIELD:svg:ProjectModel-lib-dep| image:: https://img.shields.io/librariesio/dependent-repos/pypi/pyEDAA.ProjectModel
+.. |SHIELD:svg:ProjectModel-lib-dep| image:: https://img.shields.io/librariesio/dependent-repos/pypi/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=Libraries.io&logoColor=fff
    :alt: Dependent repos (via libraries.io)
    :height: 22
-   :target: https://github.com/edaa-org/pyEDAA.ProjectModel/network/dependents
-.. |SHIELD:png:ProjectModel-lib-dep| image:: https://raster.shields.io/librariesio/dependent-repos/pypi/pyEDAA.ProjectModel
+   :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel/network/dependents
+.. |SHIELD:png:ProjectModel-lib-dep| image:: https://raster.shields.io/librariesio/dependent-repos/pypi/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=Libraries.io&logoColor=fff
    :alt: Dependent repos (via libraries.io)
    :height: 22
-   :target: https://github.com/edaa-org/pyEDAA.ProjectModel/network/dependents
+   :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel/network/dependents
 
 .. # GHA test and coverage
-.. |SHIELD:svg:ProjectModel-gha-test| image:: https://img.shields.io/github/workflow/status/edaa-org/pyEDAA.ProjectModel/Unit%20Testing,%20Coverage%20Collection,%20Package,%20Release,%20Documentation%20and%20Publish?label=Build%20and%20Test&logo=GitHub%20Actions&logoColor=FFFFFF
+.. |SHIELD:svg:ProjectModel-gha-test| image:: https://img.shields.io/github/workflow/status/edaa-org/pyEDAA.ProjectModel/Pipeline/main?longCache=true&style=flat-square&label=Build%20and%20Test&logo=GitHub%20Actions&logoColor=FFFFFF
    :alt: GitHub Workflow - Build and Test Status
    :height: 22
-   :target: https://github.com/edaa-org/pyEDAA.ProjectModel/actions?query=workflow%3A%22Unit%20Testing,%20Coverage%20Collection,%20Package,%20Release,%20Documentation%20and%20Publish%22
-.. |SHIELD:png:ProjectModel-gha-test| image:: https://img.shields.io/github/workflow/status/edaa-org/pyEDAA.ProjectModel/Unit%20Testing,%20Coverage%20Collection,%20Package,%20Release,%20Documentation%20and%20Publish?label=Build%20and%20Test&logo=GitHub%20Actions&logoColor=FFFFFF
+   :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel/actions/workflows/Pipeline.yml
+.. |SHIELD:png:ProjectModel-gha-test| image:: https://raster.shields.io/github/workflow/status/edaa-org/pyEDAA.ProjectModel/Pipeline/main?longCache=true&style=flat-square&label=Build%20and%20Test&logo=GitHub%20Actions&logoColor=FFFFFF
    :alt: GitHub Workflow - Build and Test Status
    :height: 22
-   :target: https://github.com/edaa-org/pyEDAA.ProjectModel/actions?query=workflow%3A%22Unit%20Testing,%20Coverage%20Collection,%20Package,%20Release,%20Documentation%20and%20Publish%22
+   :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel/actions/workflows/Pipeline.yml
 
 .. # Codacy - quality
-.. |SHIELD:svg:ProjectModel-codacy-quality| image:: https://img.shields.io/codacy/grade/c2635df20fa840bc85639ca2fa1d9cb4?logo=codacy
+.. |SHIELD:svg:ProjectModel-codacy-quality| image:: https://img.shields.io/codacy/grade/c2635df20fa840bc85639ca2fa1d9cb4?longCache=true&style=flat-square&logo=codacy
    :alt: Codacy - Quality
    :height: 22
    :target: https://www.codacy.com/manual/edaa-org/pyEDAA.ProjectModel
-.. |SHIELD:png:ProjectModel-codacy-quality| image:: https://raster.shields.io/codacy/grade/c2635df20fa840bc85639ca2fa1d9cb4?logo=codacy
+.. |SHIELD:png:ProjectModel-codacy-quality| image:: https://raster.shields.io/codacy/grade/c2635df20fa840bc85639ca2fa1d9cb4?longCache=true&style=flat-square&logo=codacy
    :alt: Codacy - Quality
    :height: 22
    :target: https://www.codacy.com/manual/edaa-org/pyEDAA.ProjectModel
 
 .. # Codacy - coverage
-.. |SHIELD:svg:ProjectModel-codacy-coverage| image:: https://img.shields.io/codacy/coverage/c2635df20fa840bc85639ca2fa1d9cb4?logo=codacy
+.. |SHIELD:svg:ProjectModel-codacy-coverage| image:: https://img.shields.io/codacy/coverage/c2635df20fa840bc85639ca2fa1d9cb4?longCache=true&style=flat-square&logo=codacy
    :alt: Codacy - Line Coverage
    :height: 22
    :target: https://www.codacy.com/manual/edaa-org/pyEDAA.ProjectModel
-.. |SHIELD:png:ProjectModel-codacy-coverage| image:: https://raster.shields.io/codacy/coverage/c2635df20fa840bc85639ca2fa1d9cb4?logo=codacy
+.. |SHIELD:png:ProjectModel-codacy-coverage| image:: https://raster.shields.io/codacy/coverage/c2635df20fa840bc85639ca2fa1d9cb4?longCache=true&style=flat-square&logo=codacy
    :alt: Codacy - Line Coverage
    :height: 22
    :target: https://www.codacy.com/manual/edaa-org/pyEDAA.ProjectModel
 
 .. # Codecov - coverage
-.. |SHIELD:svg:ProjectModel-codecov-coverage| image:: https://img.shields.io/codecov/c/github/edaa-org/pyEDAA.ProjectModel
+.. |SHIELD:svg:ProjectModel-codecov-coverage| image:: https://img.shields.io/codecov/c/github/edaa-org/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=Codecov
    :alt: Codecov - Branch Coverage
    :height: 22
    :target: https://codecov.io/gh/edaa-org/pyEDAA.ProjectModel
-.. |SHIELD:png:ProjectModel-codecov-coverage| image:: https://raster.shields.io/codecov/c/github/edaa-org/pyEDAA.ProjectModel
+.. |SHIELD:png:ProjectModel-codecov-coverage| image:: https://raster.shields.io/codecov/c/github/edaa-org/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=Codecov
    :alt: Codecov - Branch Coverage
    :height: 22
    :target: https://codecov.io/gh/edaa-org/pyEDAA.ProjectModel
 
 .. # Libraries - source rank
-.. |SHIELD:svg:ProjectModel-lib-rank| image:: https://img.shields.io/librariesio/sourcerank/pypi/pyEDAA.ProjectModel
+.. |SHIELD:svg:ProjectModel-lib-rank| image:: https://img.shields.io/librariesio/sourcerank/pypi/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=Libraries.io&logoColor=fff
    :alt: Libraries.io SourceRank
    :height: 22
    :target: https://libraries.io/github/edaa-org/pyEDAA.ProjectModel/sourcerank
-.. |SHIELD:png:ProjectModel-lib-rank| image:: https://raster.shields.io/librariesio/sourcerank/pypi/pyEDAA.ProjectModel
+.. |SHIELD:png:ProjectModel-lib-rank| image:: https://raster.shields.io/librariesio/sourcerank/pypi/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=Libraries.io&logoColor=fff
    :alt: Libraries.io SourceRank
    :height: 22
    :target: https://libraries.io/github/edaa-org/pyEDAA.ProjectModel/sourcerank
 
 .. # PyPI tag
-.. |SHIELD:svg:ProjectModel-pypi-tag| image:: https://img.shields.io/pypi/v/pyEDAA.ProjectModel?logo=PyPI
+.. |SHIELD:svg:ProjectModel-pypi-tag| image:: https://img.shields.io/pypi/v/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072
    :alt: PyPI - Tag
    :height: 22
    :target: https://pypi.org/project/pyEDAA.ProjectModel/
-.. |SHIELD:png:ProjectModel-pypi-tag| image:: https://raster.shields.io/pypi/v/pyEDAA.ProjectModel?logo=PyPI
+.. |SHIELD:png:ProjectModel-pypi-tag| image:: https://raster.shields.io/pypi/v/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072
    :alt: PyPI - Tag
    :height: 22
    :target: https://pypi.org/project/pyEDAA.ProjectModel/
 
 .. # PyPI project status
-.. |SHIELD:svg:ProjectModel-pypi-status| image:: https://img.shields.io/pypi/status/pyEDAA.ProjectModel?logo=PyPI
+.. |SHIELD:svg:ProjectModel-pypi-status| image:: https://img.shields.io/pypi/status/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072
    :alt: PyPI - Status
    :height: 22
-.. |SHIELD:png:ProjectModel-pypi-status| image:: https://raster.shields.io/pypi/status/pyEDAA.ProjectModel?logo=PyPI
+.. |SHIELD:png:ProjectModel-pypi-status| image:: https://raster.shields.io/pypi/status/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072
    :alt: PyPI - Status
    :height: 22
 
 .. # PyPI Python versions
-.. |SHIELD:svg:ProjectModel-pypi-python| image:: https://img.shields.io/pypi/pyversions/pyEDAA.ProjectModel?logo=PyPI
+.. |SHIELD:svg:ProjectModel-pypi-python| image:: https://img.shields.io/pypi/pyversions/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072
    :alt: PyPI - Python Version
    :height: 22
-.. |SHIELD:png:ProjectModel-pypi-python| image:: https://raster.shields.io/pypi/pyversions/pyEDAA.ProjectModel?logo=PyPI
+.. |SHIELD:png:ProjectModel-pypi-python| image:: https://raster.shields.io/pypi/pyversions/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072
    :alt: PyPI - Python Version
    :height: 22
 
 .. # Libraries - status
-.. |SHIELD:svg:ProjectModel-lib-status| image:: https://img.shields.io/librariesio/release/pypi/pyEDAA.ProjectModel
+.. |SHIELD:svg:ProjectModel-lib-status| image:: https://img.shields.io/librariesio/release/pypi/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=Libraries.io&logoColor=fff
    :alt: Libraries.io status for latest release
    :height: 22
    :target: https://libraries.io/github/edaa-org/pyEDAA.ProjectModel
-.. |SHIELD:png:ProjectModel-lib-status| image:: https://raster.shields.io/librariesio/release/pypi/pyEDAA.ProjectModel
+.. |SHIELD:png:ProjectModel-lib-status| image:: https://raster.shields.io/librariesio/release/pypi/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=Libraries.io&logoColor=fff
    :alt: Libraries.io status for latest release
    :height: 22
    :target: https://libraries.io/github/edaa-org/pyEDAA.ProjectModel
 
 .. # Requires - status
-.. |SHIELD:svg:ProjectModel-req-status| image:: https://img.shields.io/requires/github/edaa-org/pyEDAA.ProjectModel
+.. |SHIELD:svg:ProjectModel-req-status| image:: https://img.shields.io/requires/github/edaa-org/pyEDAA.ProjectModel?longCache=true&style=flat-square
    :alt: Requires.io
    :height: 22
    :target: https://requires.io/github/edaa-org/pyEDAA.ProjectModel/requirements/?branch=main
-.. |SHIELD:png:ProjectModel-req-status| image:: https://raster.shields.io/requires/github/edaa-org/pyEDAA.ProjectModel
+.. |SHIELD:png:ProjectModel-req-status| image:: https://raster.shields.io/requires/github/edaa-org/pyEDAA.ProjectModel?longCache=true&style=flat-square
    :alt: Requires.io
    :height: 22
    :target: https://requires.io/github/edaa-org/pyEDAA.ProjectModel/requirements/?branch=main
 
 .. # Documentation license
-.. |SHIELD:svg:ProjectModel-doc-license| image:: https://img.shields.io/badge/doc%20license-CC--BY%204.0-green
+.. |SHIELD:svg:ProjectModel-doc-license| image:: https://img.shields.io/badge/doc-CC--BY%204.0-green?longCache=true&style=flat-square&logo=CreativeCommons&logoColor=fff
    :alt: Documentation License
    :height: 22
-   :target: Doc-License.html
-.. |SHIELD:png:ProjectModel-doc-license| image:: https://img.shields.io/badge/doc%20license-CC--BY%204.0-green
+   :target: License.html
+.. |SHIELD:png:ProjectModel-doc-license| image:: https://raster.shields.io/badge/doc-CC--BY%204.0-green?longCache=true&style=flat-square&logo=CreativeCommons&logoColor=fff
    :alt: Documentation License
    :height: 22
-   :target: https://github.com/edaa-org/pyEDAA.ProjectModel/blob/main/doc/Doc-License.rst
+   :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel/blob/main/doc/License.rst
 
 .. # GHPages - read now
-.. |SHIELD:svg:ProjectModel-ghp-doc| image:: https://img.shields.io/badge/doc-read%20now%20%E2%9E%94-blueviolet
+.. |SHIELD:svg:ProjectModel-ghp-doc| image:: https://img.shields.io/website?longCache=true&style=flat-square&label=edaa-org.github.io%2FpyEDAA.ProjectModel&logo=GitHub&logoColor=fff&up_color=blueviolet&up_message=Read%20now%20%E2%9E%9A&url=https%3A%2F%2Fedaa-org.github.io%2FpyEDAA.ProjectModel%2Findex.html
    :alt: Documentation - Read Now!
    :height: 22
    :target: https://edaa-org.github.io/pyEDAA.ProjectModel/
-.. |SHIELD:png:ProjectModel-ghp-doc| image:: https://img.shields.io/badge/doc-read%20now%20%E2%9E%94-blueviolet
+.. |SHIELD:png:ProjectModel-ghp-doc| image:: https://raster.shields.io/website?longCache=true&style=flat-square&label=edaa-org.github.io%2FpyEDAA.ProjectModel&logo=GitHub&logoColor=fff&up_color=blueviolet&up_message=Read%20now%20%E2%9E%9A&url=https%3A%2F%2Fedaa-org.github.io%2FpyEDAA.ProjectModel%2Findex.html
    :alt: Documentation - Read Now!
    :height: 22
    :target: https://edaa-org.github.io/pyEDAA.ProjectModel/
+
+.. # Gitter 
+.. |SHIELD:svg:ProjectModel-gitter| image:: https://img.shields.io/badge/chat-on%20gitter-4db797.svg?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef
+   :alt: Documentation License
+   :height: 22
+   :target: https://gitter.im/hdl/community
+.. |SHIELD:png:ProjectModel-gitter| image:: https://raster.shields.io/badge/chat-on%20gitter-4db797.svg?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef
+   :alt: Documentation License
+   :height: 22
+   :target: https://gitter.im/hdl/community
diff --git a/doc/typing/index.rst b/doc/typing/index.rst
index 96a472c4..97d4ae2a 100644
--- a/doc/typing/index.rst
+++ b/doc/typing/index.rst
@@ -1,2 +1,4 @@
 Static Type Checking Report
 ###########################
+
+*Placeholder for the Static Type Checking report generated with* ``mypy``.
diff --git a/pyEDAA/ProjectModel/Altera/Quartus.py b/pyEDAA/ProjectModel/Altera/Quartus.py
index e9cd0ed2..e347e25e 100644
--- a/pyEDAA/ProjectModel/Altera/Quartus.py
+++ b/pyEDAA/ProjectModel/Altera/Quartus.py
@@ -29,7 +29,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============================================================================
 #
-from pydecor import export
+from pyTooling.Decorators import export
 
 from pyEDAA.ProjectModel import ConstraintFile, ProjectFile, SDCContent, TCLContent
 
diff --git a/pyEDAA/ProjectModel/GHDL.py b/pyEDAA/ProjectModel/GHDL.py
index c584eb86..115a2295 100644
--- a/pyEDAA/ProjectModel/GHDL.py
+++ b/pyEDAA/ProjectModel/GHDL.py
@@ -29,7 +29,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============================================================================
 #
-from pydecor import export
+from pyTooling.Decorators import export
 
 from pyEDAA.ProjectModel import WaveformExchangeFile
 
diff --git a/pyEDAA/ProjectModel/Intel/QuartusPrime.py b/pyEDAA/ProjectModel/Intel/QuartusPrime.py
index e9cd0ed2..e347e25e 100644
--- a/pyEDAA/ProjectModel/Intel/QuartusPrime.py
+++ b/pyEDAA/ProjectModel/Intel/QuartusPrime.py
@@ -29,7 +29,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============================================================================
 #
-from pydecor import export
+from pyTooling.Decorators import export
 
 from pyEDAA.ProjectModel import ConstraintFile, ProjectFile, SDCContent, TCLContent
 
diff --git a/pyEDAA/ProjectModel/MentorGraphics/ModelSim.py b/pyEDAA/ProjectModel/MentorGraphics/ModelSim.py
index b5b39f16..59cf6eee 100644
--- a/pyEDAA/ProjectModel/MentorGraphics/ModelSim.py
+++ b/pyEDAA/ProjectModel/MentorGraphics/ModelSim.py
@@ -29,7 +29,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============================================================================
 #
-from pydecor import export
+from pyTooling.Decorators import export
 
 from pyEDAA.ProjectModel import ProjectFile, SettingFile, INIContent, WaveformConfigFile, TCLContent
 
diff --git a/pyEDAA/ProjectModel/MentorGraphics/QuestaSim.py b/pyEDAA/ProjectModel/MentorGraphics/QuestaSim.py
index b5b39f16..59cf6eee 100644
--- a/pyEDAA/ProjectModel/MentorGraphics/QuestaSim.py
+++ b/pyEDAA/ProjectModel/MentorGraphics/QuestaSim.py
@@ -29,7 +29,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============================================================================
 #
-from pydecor import export
+from pyTooling.Decorators import export
 
 from pyEDAA.ProjectModel import ProjectFile, SettingFile, INIContent, WaveformConfigFile, TCLContent
 
diff --git a/pyEDAA/ProjectModel/OSVVM.py b/pyEDAA/ProjectModel/OSVVM.py
index 244b6113..f72c1324 100644
--- a/pyEDAA/ProjectModel/OSVVM.py
+++ b/pyEDAA/ProjectModel/OSVVM.py
@@ -32,7 +32,7 @@
 from enum import Enum, unique
 from pathlib import Path
 
-from pydecor import export
+from pyTooling.Decorators import export
 from typing import Optional as Nullable, List
 
 from pyEDAA.ProjectModel import ProjectFile, TCLContent, Project, Design, FileSet, VHDLLibrary, VHDLSourceFile
diff --git a/pyEDAA/ProjectModel/Verilog.py b/pyEDAA/ProjectModel/Verilog.py
index a9e75cc6..aed280ab 100644
--- a/pyEDAA/ProjectModel/Verilog.py
+++ b/pyEDAA/ProjectModel/Verilog.py
@@ -29,7 +29,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============================================================================
 #
-from pydecor import export
+from pyTooling.Decorators import export
 
 from pyEDAA.ProjectModel import WaveformExchangeFile
 
diff --git a/pyEDAA/ProjectModel/Xilinx/ISE.py b/pyEDAA/ProjectModel/Xilinx/ISE.py
index 672c35c5..7fab7aaa 100644
--- a/pyEDAA/ProjectModel/Xilinx/ISE.py
+++ b/pyEDAA/ProjectModel/Xilinx/ISE.py
@@ -29,7 +29,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============================================================================
 #
-from pydecor import export
+from pyTooling.Decorators import export
 
 from pyEDAA.ProjectModel import ConstraintFile, ProjectFile, HumanReadableContent
 
diff --git a/pyEDAA/ProjectModel/Xilinx/Vivado.py b/pyEDAA/ProjectModel/Xilinx/Vivado.py
index a4c597b8..2c86cf7f 100644
--- a/pyEDAA/ProjectModel/Xilinx/Vivado.py
+++ b/pyEDAA/ProjectModel/Xilinx/Vivado.py
@@ -34,7 +34,7 @@
 
 from xml.dom import minidom, Node
 from pyVHDLModel import VHDLVersion
-from pydecor import export
+from pyTooling.Decorators import export
 
 from pyEDAA.ProjectModel import ProjectFile, XMLFile, XMLContent, SDCContent, Project, FileSet, Attribute, Design
 from pyEDAA.ProjectModel import File as Model_File
@@ -116,9 +116,13 @@ def Parse(self):
 	def _ParseRootElement(self, root):
 		for rootNode in root.childNodes:
 			if rootNode.nodeName == "FileSets":
-				for fileSetsNode in rootNode.childNodes:
-					if fileSetsNode.nodeType == Node.ELEMENT_NODE and fileSetsNode.tagName == "FileSet":
-						self._ParseFileSet(fileSetsNode)
+				self._ParseFileSets(rootNode)
+				break
+
+	def _ParseFileSets(self, filesetsNode):
+		for fileSetsNode in filesetsNode.childNodes:
+			if fileSetsNode.nodeType == Node.ELEMENT_NODE and fileSetsNode.tagName == "FileSet":
+				self._ParseFileSet(fileSetsNode)
 
 	def _ParseFileSet(self, filesetNode):
 		filesetName = filesetNode.getAttribute("Name")
diff --git a/pyEDAA/ProjectModel/__init__.py b/pyEDAA/ProjectModel/__init__.py
index b6ea206a..f55832c8 100644
--- a/pyEDAA/ProjectModel/__init__.py
+++ b/pyEDAA/ProjectModel/__init__.py
@@ -31,16 +31,20 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============================================================================
 #
+__author__ =    "Patrick Lehmann"
+__email__ =     "Paebbels@gmail.com"
+__copyright__ = "2014-2021, Patrick Lehmann, Unai Martinez-Corral"
+__license__ =   "Apache License, Version 2.0"
+__version__ =   "0.4.0"
+__keywords__ =  ["eda project", "model", "abstract", "xilinx", "vivado", "osvvm", "file set", "file group", "test bench", "test harness"]
+
 from os.path import relpath as path_relpath
 from pathlib import Path as pathlib_Path
 from typing import Dict, Union, Optional as Nullable, List, Iterable, Generator, Tuple, Any as typing_Any, Type
 
 from pySVModel import VerilogVersion, SystemVerilogVersion
+from pyTooling.Decorators import export
 from pyVHDLModel import VHDLVersion
-from pydecor import export
-
-
-__version__ = "0.3.1"
 
 
 @export
@@ -703,7 +707,7 @@ def Parent(self, value: 'FileSet') -> None:
 
 	@property
 	def FileSets(self) -> Dict[str, 'FileSet']:
-		"""Read-only property returning the a dictionary of sub-filesets."""
+		"""Read-only property returning the dictionary of sub-filesets."""
 		return self._fileSets
 
 	def Files(self, fileType: FileType = FileTypes.Any, fileSet: Union[bool, str, 'FileSet'] = None) -> Generator[File, None, None]:
@@ -1105,7 +1109,7 @@ def DefaultFileSet(self, value: Union[str, FileSet]) -> None:
 	# TODO: return generator with another method
 	@property
 	def FileSets(self) -> Dict[str, FileSet]:
-		"""Read-only property returning the a dictionary of filesets."""
+		"""Read-only property returning the dictionary of filesets."""
 		return self._fileSets
 
 	def Files(self, fileType: FileType = FileTypes.Any, fileSet: Union[str, FileSet] = None) -> Generator[File, None, None]:
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 00000000..c2ddfb77
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,10 @@
+[build-system]
+requires = [
+    "pyTooling >= 1.7.0",
+    "setuptools >= 35.0.2",
+    "wheel >= 0.29.0"
+]
+build-backend = "setuptools.build_meta"
+
+[tool.black]
+line-length = 120
diff --git a/requirements.txt b/requirements.txt
index 3a9a4b58..29173060 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
-pydecor>=2.0.1
-
-pyVHDLModel>=0.13.2
-pySVModel>=0.3.0
+pyTooling>=1.7.0
+pyVHDLModel>=0.14.0
+pySVModel>=0.3.1
diff --git a/setup.py b/setup.py
index cb05ebc7..d933cca5 100644
--- a/setup.py
+++ b/setup.py
@@ -31,70 +31,25 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============================================================================
 #
-from pathlib    import Path
-from setuptools import (
-	setup as setuptools_setup,
-	find_namespace_packages as setuptools_find_namespace_packages
-)
-
-gitHubNamespace =       "edaa-org"
-projectName =           "ProjectModel"
-projectNameWithPrefix = "pyEDAA." + projectName
-version =               "0.3.1"
-
-# Read README for upload to PyPI
-readmeFile = Path("README.md")
-with readmeFile.open("r") as file:
-	long_description = file.read()
-
-# Read requirements file and add them to package dependency list
-requirementsFile = Path("requirements.txt")
-with requirementsFile.open("r") as file:
-	requirements = [line for line in file.readlines()]
-
-# Derive URLs
-sourceCodeURL =     "https://github.com/{namespace}/{projectName}".format(namespace=gitHubNamespace, projectName=projectName)
-documentationURL =  "https://{namespace}.github.io/{projectName}".format(namespace=gitHubNamespace, projectName=projectName)
+from pathlib             import Path
+from pyTooling.Packaging import DescribePythonPackageHostedOnGitHub
 
-# Assemble all package information
-setuptools_setup(
-	name=projectNameWithPrefix,
-	version=version,
-
-	author="Patrick Lehmann",
-	author_email="Paebbels@gmail.com",
-	# maintainer="Patrick Lehmann",
-	# maintainer_email="Paebbels@gmail.com",
-  license='Apache 2.0',
+gitHubNamespace =        "edaa-org"
+packageName =            "pyEDAA.ProjectModel"
+packageDirectory =       packageName.replace(".", "/")
+packageInformationFile = Path(f"{packageDirectory}/__init__.py")
 
+DescribePythonPackageHostedOnGitHub(
+	packageName=packageName,
 	description="An abstract model of EDA tool projects.",
-	long_description=long_description,
-	long_description_content_type="text/markdown",
-
-	url=sourceCodeURL,
-	project_urls={
-		'Documentation': documentationURL,
-		'Source Code':   sourceCodeURL,
-		'Issue Tracker': sourceCodeURL + "/issues"
-	},
-	# download_url="https://github.com/vhdl/pyVHDLModel/tarball/0.1.0",
-
-	packages=setuptools_find_namespace_packages(exclude=["tests", "tests.*",]),
+	gitHubNamespace=gitHubNamespace,
+	sourceFileWithVersion=packageInformationFile,
+	developmentStatus="beta",
 	classifiers=[
-		"License :: OSI Approved :: Apache Software License",
 		"Operating System :: OS Independent",
-		"Programming Language :: Python :: 3 :: Only",
-		"Programming Language :: Python :: 3.7",
-		"Programming Language :: Python :: 3.8",
-		"Programming Language :: Python :: 3.9",
-   "Development Status :: 4 - Beta",
-#		"Development Status :: 5 - Production/Stable",
 		"Intended Audience :: Developers",
+		"Topic :: Utilities",
 		"Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)",
 		"Topic :: Utilities"
-	],
-	keywords="Python3 EDA Project Model Abstract",
-
-	python_requires='>=3.7',
-	install_requires=requirements,
+	]
 )
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 172211b8..85964cb0 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,12 +1,12 @@
 -r ../requirements.txt
 
 # Coverage collection
-Coverage>=6.0
+Coverage>=6.2
 
 # Test Runner
-pytest>=6.2.4
-pytest-cov>=2.12.1
+pytest>=6.2.5
+pytest-cov>=3.0.0
 
 # Static Type Checking
 mypy>=0.910
-lxml>=4.6.3
+lxml>=4.6.4