diff --git a/.github/workflows/deploy_pypi.yml b/.github/workflows/deploy_pypi.yml
index cbbc648..9735a07 100644
--- a/.github/workflows/deploy_pypi.yml
+++ b/.github/workflows/deploy_pypi.yml
@@ -22,7 +22,7 @@ jobs:
         pip install setuptools wheel twine
     - name: build
       run: |
-        pipx run build --sdist
+        pipx run build --sdist --wheel
     - name: publish
       env:
         TWINE_USERNAME: __token__
diff --git a/dcor_control/inspect/config_ckan.py b/dcor_control/inspect/config_ckan.py
index bf6e04e..b086d52 100644
--- a/dcor_control/inspect/config_ckan.py
+++ b/dcor_control/inspect/config_ckan.py
@@ -225,6 +225,22 @@ def get_expected_site_options(dcor_site_config_dir):
     for key, value in cfg_d.items():
         cfg["ckan.ini"].setdefault(key, value)
 
+    # Branding: Determine extra template paths
+    template_paths = []
+    for pi in cfg.get("branding_paths", []):
+        pp = (dcor_site_config_dir / pi).resolve() / "templates"
+        if pp.exists():
+            template_paths.append(str(pp))
+    if template_paths:
+        cfg["ckan.ini"]["extra_template_paths"] = ",".join(template_paths)
+
+    # Branding: Set favicon
+    for pi in reversed(cfg.get("branding_paths", [])):
+        pf = (dcor_site_config_dir / pi).resolve() / "favicon.ico"
+        if pf.exists():
+            cfg["ckan.ini"]["ckan.favicon"] = str(pf)
+            break
+
     # Fill in template variables
     update_expected_ckan_options_templates(cfg)
 
diff --git a/dcor_control/resources/site_dcor-dev/branding/.gitignore b/dcor_control/resources/branding/medical/.gitignore
similarity index 100%
rename from dcor_control/resources/site_dcor-dev/branding/.gitignore
rename to dcor_control/resources/branding/medical/.gitignore
diff --git a/dcor_control/resources/site_dcor-med/branding/favicon.ico b/dcor_control/resources/branding/medical/favicon.ico
similarity index 100%
rename from dcor_control/resources/site_dcor-med/branding/favicon.ico
rename to dcor_control/resources/branding/medical/favicon.ico
diff --git a/dcor_control/resources/site_dcor-med/branding/favicon.svg b/dcor_control/resources/branding/medical/favicon.svg
similarity index 100%
rename from dcor_control/resources/site_dcor-med/branding/favicon.svg
rename to dcor_control/resources/branding/medical/favicon.svg
diff --git a/dcor_control/resources/site_dcor-med/branding/images/dcor-076.png b/dcor_control/resources/branding/medical/images/dcor-076.png
similarity index 100%
rename from dcor_control/resources/site_dcor-med/branding/images/dcor-076.png
rename to dcor_control/resources/branding/medical/images/dcor-076.png
diff --git a/dcor_control/resources/site_dcor-med/branding/images/dcor-096.png b/dcor_control/resources/branding/medical/images/dcor-096.png
similarity index 100%
rename from dcor_control/resources/site_dcor-med/branding/images/dcor-096.png
rename to dcor_control/resources/branding/medical/images/dcor-096.png
diff --git a/dcor_control/resources/site_dcor-med/branding/images/dcor-152.png b/dcor_control/resources/branding/medical/images/dcor-152.png
similarity index 100%
rename from dcor_control/resources/site_dcor-med/branding/images/dcor-152.png
rename to dcor_control/resources/branding/medical/images/dcor-152.png
diff --git a/dcor_control/resources/site_dcor-med/branding/images/dcor-180.png b/dcor_control/resources/branding/medical/images/dcor-180.png
similarity index 100%
rename from dcor_control/resources/site_dcor-med/branding/images/dcor-180.png
rename to dcor_control/resources/branding/medical/images/dcor-180.png
diff --git a/dcor_control/resources/site_dcor-med/templates/home/snippets/promoted.html b/dcor_control/resources/branding/medical/templates/home/snippets/promoted.html
similarity index 80%
rename from dcor_control/resources/site_dcor-med/templates/home/snippets/promoted.html
rename to dcor_control/resources/branding/medical/templates/home/snippets/promoted.html
index 25bf484..8062ba6 100644
--- a/dcor_control/resources/site_dcor-med/templates/home/snippets/promoted.html
+++ b/dcor_control/resources/branding/medical/templates/home/snippets/promoted.html
@@ -16,7 +16,7 @@ <h1 class="page-heading">{{ _("Welcome to DCOR-med") }}</h1>
     <section class="featured media-overlay hidden-xs">
       {% block home_image_content %}
         <a class="media-image" href="{{ h.url_for_static('/images/dcor_tiles.png') }}">
-          <img class="img-responsive" src="{{ h.url_for_static('/images/dcor_tiles_420.jpg') }}" alt="Placeholder" width="420" height="152" />
+          <img class="img-fluid" src="{{ h.url_for_static('/images/dcor_tiles_420.jpg') }}" alt="Placeholder" width="420" height="152" />
         </a>
       {% endblock %}
     </section>
diff --git a/dcor_control/resources/site_dcor-main/branding/.gitignore b/dcor_control/resources/branding/mpl/.gitignore
similarity index 100%
rename from dcor_control/resources/site_dcor-main/branding/.gitignore
rename to dcor_control/resources/branding/mpl/.gitignore
diff --git a/dcor_control/resources/site_dcor-main/branding/favicon.ico b/dcor_control/resources/branding/mpl/favicon.ico
similarity index 100%
rename from dcor_control/resources/site_dcor-main/branding/favicon.ico
rename to dcor_control/resources/branding/mpl/favicon.ico
diff --git a/dcor_control/resources/site_dcor-main/branding/favicon.svg b/dcor_control/resources/branding/mpl/favicon.svg
similarity index 100%
rename from dcor_control/resources/site_dcor-main/branding/favicon.svg
rename to dcor_control/resources/branding/mpl/favicon.svg
diff --git a/dcor_control/resources/site_dcor-main/templates/contact.html b/dcor_control/resources/branding/mpl/templates/contact.html
similarity index 100%
rename from dcor_control/resources/site_dcor-main/templates/contact.html
rename to dcor_control/resources/branding/mpl/templates/contact.html
diff --git a/dcor_control/resources/site_dcor-main/templates/imprint.html b/dcor_control/resources/branding/mpl/templates/imprint.html
similarity index 100%
rename from dcor_control/resources/site_dcor-main/templates/imprint.html
rename to dcor_control/resources/branding/mpl/templates/imprint.html
diff --git a/dcor_control/resources/site_dcor-main/templates/privacy.html b/dcor_control/resources/branding/mpl/templates/privacy.html
similarity index 100%
rename from dcor_control/resources/site_dcor-main/templates/privacy.html
rename to dcor_control/resources/branding/mpl/templates/privacy.html
diff --git a/dcor_control/resources/site_dcor-med/branding/.gitignore b/dcor_control/resources/branding/testing/.gitignore
similarity index 100%
rename from dcor_control/resources/site_dcor-med/branding/.gitignore
rename to dcor_control/resources/branding/testing/.gitignore
diff --git a/dcor_control/resources/site_dcor-dev/branding/favicon.ico b/dcor_control/resources/branding/testing/favicon.ico
similarity index 100%
rename from dcor_control/resources/site_dcor-dev/branding/favicon.ico
rename to dcor_control/resources/branding/testing/favicon.ico
diff --git a/dcor_control/resources/site_dcor-dev/branding/favicon.svg b/dcor_control/resources/branding/testing/favicon.svg
similarity index 100%
rename from dcor_control/resources/site_dcor-dev/branding/favicon.svg
rename to dcor_control/resources/branding/testing/favicon.svg
diff --git a/dcor_control/resources/site_dcor-dev/branding/images/dcor-076.png b/dcor_control/resources/branding/testing/images/dcor-076.png
similarity index 100%
rename from dcor_control/resources/site_dcor-dev/branding/images/dcor-076.png
rename to dcor_control/resources/branding/testing/images/dcor-076.png
diff --git a/dcor_control/resources/site_dcor-dev/branding/images/dcor-096.png b/dcor_control/resources/branding/testing/images/dcor-096.png
similarity index 100%
rename from dcor_control/resources/site_dcor-dev/branding/images/dcor-096.png
rename to dcor_control/resources/branding/testing/images/dcor-096.png
diff --git a/dcor_control/resources/site_dcor-dev/branding/images/dcor-152.png b/dcor_control/resources/branding/testing/images/dcor-152.png
similarity index 100%
rename from dcor_control/resources/site_dcor-dev/branding/images/dcor-152.png
rename to dcor_control/resources/branding/testing/images/dcor-152.png
diff --git a/dcor_control/resources/site_dcor-dev/branding/images/dcor-180.png b/dcor_control/resources/branding/testing/images/dcor-180.png
similarity index 100%
rename from dcor_control/resources/site_dcor-dev/branding/images/dcor-180.png
rename to dcor_control/resources/branding/testing/images/dcor-180.png
diff --git a/dcor_control/resources/dcor_defaults.ini.template b/dcor_control/resources/dcor_defaults.ini.template
index 993c787..c3fd8c6 100644
--- a/dcor_control/resources/dcor_defaults.ini.template
+++ b/dcor_control/resources/dcor_defaults.ini.template
@@ -76,7 +76,6 @@ ckanext.dcor_depot.users_depot_name = users-<TEMPLATE:HOSTNAME>
 
 # ckanext-dcor_schemas
 ckan.extra_resource_fields = etag sha256
-extra_template_paths = <TEMPLATE:DCOR_SITE_CONFIG_DIR>/templates
 ckanext.dcor_schemas.allow_content_listing_for_anon = true
 ckanext.dcor_schemas.allow_public_datasets = true
 ckanext.dcor_schemas.json_resource_schema_dir = package
diff --git a/dcor_control/resources/site_dcor-colab/branding b/dcor_control/resources/site_dcor-colab/branding
deleted file mode 120000
index 18351a8..0000000
--- a/dcor_control/resources/site_dcor-colab/branding
+++ /dev/null
@@ -1 +0,0 @@
-../site_dcor-med/branding
\ No newline at end of file
diff --git a/dcor_control/resources/site_dcor-colab/dcor_config.json b/dcor_control/resources/site_dcor-colab/dcor_config.json
index ae7f50d..579ea8d 100644
--- a/dcor_control/resources/site_dcor-colab/dcor_config.json
+++ b/dcor_control/resources/site_dcor-colab/dcor_config.json
@@ -2,6 +2,7 @@
  "requirements": {
      "ip": "130.183.206.38",
      "hostname": "dcor-colab"},
+ "branding_paths": ["../branding/mpl", "../branding/medical"],
  "ckan.ini": {
      "ckan.site_title": "DCOR-colab",
      "ckan.site_url": "https://dcor-colab.mpl.mpg.de",
diff --git a/dcor_control/resources/site_dcor-colab/licenses.json b/dcor_control/resources/site_dcor-colab/licenses.json
deleted file mode 120000
index c25670c..0000000
--- a/dcor_control/resources/site_dcor-colab/licenses.json
+++ /dev/null
@@ -1 +0,0 @@
-../site_dcor-med/licenses.json
\ No newline at end of file
diff --git a/dcor_control/resources/site_dcor-colab/licenses.json b/dcor_control/resources/site_dcor-colab/licenses.json
new file mode 100644
index 0000000..3f646e1
--- /dev/null
+++ b/dcor_control/resources/site_dcor-colab/licenses.json
@@ -0,0 +1,29 @@
+[
+  {
+    "domain_content": false,
+    "domain_data": false,
+    "domain_software": false,
+    "family": "",
+    "id": "none",
+    "maintainer": "Unknown",
+    "od_conformance": "not approved",
+    "osd_conformance": "not reviewed",
+    "status": "active",
+    "title": "Not specified",
+    "url": ""
+  },
+  {
+    "domain_content": false,
+    "domain_data": true,
+    "domain_software": false,
+    "family": "",
+    "id": "patient",
+    "maintainer": "Unknown",
+    "od_conformance": "not approved",
+    "osd_conformance": "not reviewed",
+    "status": "active",
+    "title": "Unlicensed Patient Data",
+    "url": ""
+  }
+]
+
diff --git a/dcor_control/resources/site_dcor-dev/dcor_config.json b/dcor_control/resources/site_dcor-dev/dcor_config.json
index 74a80b3..4fddbc6 100644
--- a/dcor_control/resources/site_dcor-dev/dcor_config.json
+++ b/dcor_control/resources/site_dcor-dev/dcor_config.json
@@ -2,7 +2,7 @@
  "requirements": {
      "ip": "130.183.206.46",
      "hostname": "dcor-dev-mpl"},
- "branding": ["testing", "dcor"],
+ "branding_paths": ["../branding/mpl", "../branding/testing"],
  "ckan.ini": {
      "ckan.auth.create_user_via_api": "true",
      "ckan.auth.create_user_via_web": "true",
diff --git a/dcor_control/resources/site_dcor-dev/templates b/dcor_control/resources/site_dcor-dev/templates
deleted file mode 120000
index 0fd95cc..0000000
--- a/dcor_control/resources/site_dcor-dev/templates
+++ /dev/null
@@ -1 +0,0 @@
-../site_dcor-main/templates
\ No newline at end of file
diff --git a/dcor_control/resources/site_dcor-main/dcor_config.json b/dcor_control/resources/site_dcor-main/dcor_config.json
index 614f17b..d16e71a 100644
--- a/dcor_control/resources/site_dcor-main/dcor_config.json
+++ b/dcor_control/resources/site_dcor-main/dcor_config.json
@@ -2,6 +2,7 @@
  "requirements": {
      "ip": "130.183.206.45",
      "hostname": "dcor-mpl"},
+ "branding_paths": ["../branding/mpl"],
  "ckan.ini": {
      "ckan.auth.create_user_via_web": "true",
      "ckan.site_url": "https://dcor.mpl.mpg.de",
diff --git a/dcor_control/resources/site_dcor-med/dcor_config.json b/dcor_control/resources/site_dcor-med/dcor_config.json
index f0c86c5..de4033f 100644
--- a/dcor_control/resources/site_dcor-med/dcor_config.json
+++ b/dcor_control/resources/site_dcor-med/dcor_config.json
@@ -1,6 +1,6 @@
 {"name": "medical",
  "requirements": {},
- "branding": ["medical"],
+ "branding_paths": ["../branding/medical"],
  "ckan.ini": {
      "ckan.site_title": "DCOR-med",
      "ckan.site_url": "https://<TEMPLATE:HOSTNAME>",
diff --git a/dcor_control/resources/site_dcor-vagrant/dcor_config.json b/dcor_control/resources/site_dcor-vagrant/dcor_config.json
index a2ae000..8836eba 100644
--- a/dcor_control/resources/site_dcor-vagrant/dcor_config.json
+++ b/dcor_control/resources/site_dcor-vagrant/dcor_config.json
@@ -2,6 +2,7 @@
  "requirements": {
    "ip": "unknown",
    "hostname": "dcor-test"},
+ "branding_paths": ["../branding/testing"],
  "ckan.ini": {
      "ckan.auth.create_user_via_api": "true",
      "ckan.auth.create_user_via_web": "true",