diff --git a/ckanext-theme_hft/ckanext/theme_hft/templates/base.html b/ckanext-theme_hft/ckanext/theme_hft/templates/base.html
index 2184648a3d0e4db693c47e2477a121ebbdc0e698..17a85c54e8d89a2d5c776e4718f7a24a27ca72af 100644
--- a/ckanext-theme_hft/ckanext/theme_hft/templates/base.html
+++ b/ckanext-theme_hft/ckanext/theme_hft/templates/base.html
@@ -1,5 +1,7 @@
 {% ckan_extends %}
 
+{# Add HFT assets (figures, footer, css, etc.)  #}
+
 {% block styles %}
 	{{ super() }}
 	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous">
diff --git a/ckanext-theme_hft/ckanext/theme_hft/templates/footer.html b/ckanext-theme_hft/ckanext/theme_hft/templates/footer.html
index 9a38d97bbc71004294b3e3f06503f51494460971..28ba32b674a97f426dee0e2cef2f48f95bec0347 100644
--- a/ckanext-theme_hft/ckanext/theme_hft/templates/footer.html
+++ b/ckanext-theme_hft/ckanext/theme_hft/templates/footer.html
@@ -1,6 +1,7 @@
 {% ckan_extends %}
 
-{# override footer.html #}
+{# Override footer.html to put M4_LAB footer #}
+
 {% block footer_content %}
 	<div class="row">
 		<div class="col-md-4 attribution">
diff --git a/ckanext-theme_hft/ckanext/theme_hft/templates/home/snippets/search.html b/ckanext-theme_hft/ckanext/theme_hft/templates/home/snippets/search.html
index 1274b9d31c6f5b3bc7d1c88e22cb7e76decf3d59..7da0854af1f2f034916ac04f0f827b266fc6f015 100644
--- a/ckanext-theme_hft/ckanext/theme_hft/templates/home/snippets/search.html
+++ b/ckanext-theme_hft/ckanext/theme_hft/templates/home/snippets/search.html
@@ -1,5 +1,7 @@
 {% set placeholder = _('E.g. environment') %}
 
+{# Remove tags #}
+
 <div class="module module-search module-narrow module-shallow box">
   <form class="module-content search-form" method="get" action="{% url_for 'dataset.search' %}">
     <h3 class="heading">{{ _("Search data") }}</h3>
diff --git a/ckanext-theme_hft/ckanext/theme_hft/templates/home/snippets/stats.html b/ckanext-theme_hft/ckanext/theme_hft/templates/home/snippets/stats.html
index 4b2b877c89c9df216053432ca728385075c1ff7b..02701750945750597e6a56fc788f87ed5a48e18f 100644
--- a/ckanext-theme_hft/ckanext/theme_hft/templates/home/snippets/stats.html
+++ b/ckanext-theme_hft/ckanext/theme_hft/templates/home/snippets/stats.html
@@ -1,5 +1,7 @@
 {% ckan_extends %}
 
+{# Remove Organization #}
+
       {% block stats_group %}
       <li>
         <a href="{{ h.url_for('dataset.search') }}">
diff --git a/ckanext-theme_hft/ckanext/theme_hft/templates/package/snippets/package_basic_fields.html b/ckanext-theme_hft/ckanext/theme_hft/templates/package/snippets/package_basic_fields.html
index ea0c632b1bae792aeef3958bac38c42c45dce44e..730df1f37c6ad137fa74ccfb0441d8e98ba1e2f3 100644
--- a/ckanext-theme_hft/ckanext/theme_hft/templates/package/snippets/package_basic_fields.html
+++ b/ckanext-theme_hft/ckanext/theme_hft/templates/package/snippets/package_basic_fields.html
@@ -1,5 +1,7 @@
 {% ckan_extends %}
 
+{# Simplifies the form for adding datasets by removing Tags. Titel field is marked as *Pflichtfeld (mandatory) #}
+
 {% block package_basic_fields_title %}
 {{ form.input('title', id='field-title', label=_('Title'), placeholder=_('eg. A descriptive title'), value=data.title, error=errors.title, classes=['control-full', 'control-large'], attrs={'data-module': 'slug-preview-target', 'class': 'form-control'}, is_required=true) }}
 {% endblock %}
diff --git a/ckanext-theme_hft/ckanext/theme_hft/templates/package/snippets/package_metadata_fields.html b/ckanext-theme_hft/ckanext/theme_hft/templates/package/snippets/package_metadata_fields.html
index 4ef9f4ce761add51b81d21f74bf2c917a8b38226..3bf12812f134090020a157875992a5db10a74d66 100644
--- a/ckanext-theme_hft/ckanext/theme_hft/templates/package/snippets/package_metadata_fields.html
+++ b/ckanext-theme_hft/ckanext/theme_hft/templates/package/snippets/package_metadata_fields.html
@@ -1,5 +1,7 @@
 {% ckan_extends %}
 
+{# Remove Custom Fields and marks Autor, Verantwortlicher, and their emails fields as *Pflichtfeld (mandatory) #}
+
 {% block package_metadata_author %}
   {{ form.input('author', label=_('Author'), id='field-author', placeholder=_('Joe Bloggs'), value=data.author, error=errors.author, classes=['control-medium'], is_required=true) }}
   {{ form.input('author_email', label=_('Author Email'), id='field-author-email', placeholder=_('joe@example.com'), value=data.author_email, error=errors.author_email, classes=['control-medium'], is_required=true) }}
diff --git a/ckanext-theme_hft/ckanext/theme_hft/templates/package/snippets/resource_form.html b/ckanext-theme_hft/ckanext/theme_hft/templates/package/snippets/resource_form.html
index 5cb72df0f329f69d4cfdfb270a1e75297710e7db..a7ef2242f07c950f9eebe4eb548b3c4d196d2f0b 100644
--- a/ckanext-theme_hft/ckanext/theme_hft/templates/package/snippets/resource_form.html
+++ b/ckanext-theme_hft/ckanext/theme_hft/templates/package/snippets/resource_form.html
@@ -1,5 +1,7 @@
 {% ckan_extends %}
 
+{# Add a label: maximum data size #}
+
 {% block basic_fields_url %}
       {% set is_upload = (data.url_type == 'upload') %}
       {{ form.image_upload(data, errors, field_url='url', field_upload='upload', field_clear='clear_upload',
diff --git a/ckanext-theme_hft/ckanext/theme_hft/templates/snippets/activity_stream.html b/ckanext-theme_hft/ckanext/theme_hft/templates/snippets/activity_stream.html
index ece09c2682237e4935c143b0deb705b2c57123b9..bf8074eed6fa3379477d4852c0d9d555eb567e27 100644
--- a/ckanext-theme_hft/ckanext/theme_hft/templates/snippets/activity_stream.html
+++ b/ckanext-theme_hft/ckanext/theme_hft/templates/snippets/activity_stream.html
@@ -1,5 +1,7 @@
 {% ckan_extends %}
 
+{# Remove all activity records #}
+
 {% macro actor(activity) %}
 {% endmacro %}
 
diff --git a/ckanext-theme_hft/ckanext/theme_hft/templates/user/dashboard.html b/ckanext-theme_hft/ckanext/theme_hft/templates/user/dashboard.html
index 61b02e7c2acd1ccb6c84b006d2c60ed65c78ba0b..b21438c8631be1f573c83e8df9b40cfdee041df2 100644
--- a/ckanext-theme_hft/ckanext/theme_hft/templates/user/dashboard.html
+++ b/ckanext-theme_hft/ckanext/theme_hft/templates/user/dashboard.html
@@ -1,5 +1,7 @@
 {% ckan_extends %}
 
+{# Remove activity stream tab #}
+
 {% block page_header %}
    <header class="module-content page-header hug">
       {% block content_primary_nav %}