diff --git a/django_lostplaces/lostplaces/templates/global.html b/django_lostplaces/lostplaces/templates/global.html
index 9363682..280c504 100644
--- a/django_lostplaces/lostplaces/templates/global.html
+++ b/django_lostplaces/lostplaces/templates/global.html
@@ -89,7 +89,7 @@
     </div>
 
     {% block footer %}
-    {% partial 'nav/footer' %}
+        {% include 'partials/nav/footer.html' %}
     {% endblock footer %}
 
 </body>
diff --git a/django_lostplaces/lostplaces/templates/home.html b/django_lostplaces/lostplaces/templates/home.html
index a09bc7b..dc8803b 100644
--- a/django_lostplaces/lostplaces/templates/home.html
+++ b/django_lostplaces/lostplaces/templates/home.html
@@ -12,13 +12,10 @@
 
 {% block maincontent %}
 
-{% partial 'welcome' %}
+{% include 'partials/welcome.html' %}
 <article class="LP-TextSection">
 </article>
-{% partial 'osm_map' %}
-	{% set config mapping_config %}
-	{% set modifier 'wide' %}
-{% endpartial %}
+{% include 'partials/osm_map.html' with config=mapping_config modifier='wide' %}
 <div class="LP-PlaceGrid">
     <h1 class="LP-Headline LP-Headline">{% translate 'Explore the latest places' %}</h1>
     <ul class="LP-PlaceGrid__Grid">
diff --git a/django_lostplaces/lostplaces/templates/home_unauth.html b/django_lostplaces/lostplaces/templates/home_unauth.html
index 90301ff..d9bb47b 100644
--- a/django_lostplaces/lostplaces/templates/home_unauth.html
+++ b/django_lostplaces/lostplaces/templates/home_unauth.html
@@ -6,7 +6,7 @@
 
 {% block maincontent %}
 
-{% partial 'welcome' %}
+{% include 'partials/welcome.html' %}
 <article class="LP-TextSection">
     <p class="LP-Paragraph">
         {% blocktranslate %}You can create, view and share your lost places with other members of this site. You can upload photos, place links to your web galleries and contribute your knowledge by tagging other places or commenting on them. You will find detailed information on where these locations are, how to get there and what to expect from them. This might even include detailed information on the surroundings or the history of a lost place.{% endblocktranslate %}
@@ -25,9 +25,7 @@
             <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
                 <article class="LP-PlaceTeaser">
                     <div class="LP-PlaceTeaser__Image">
-						{% partial 'image' %}
-							{% set source_url place.placeimages.first.filename.thumbnail.url %}
-						{% endpartial %}
+                        {% include 'partials/image.html' with source_url=place.placeimages.first.filename.thumbnail.url %}
                     </div>
                     <div class="LP-PlaceTeaser__Meta">
                         <div class="LP-PlaceTeaser__Info">
diff --git a/django_lostplaces/lostplaces/templates/place/place_detail.html b/django_lostplaces/lostplaces/templates/place/place_detail.html
index f01c9f5..a768ffb 100644
--- a/django_lostplaces/lostplaces/templates/place/place_detail.html
+++ b/django_lostplaces/lostplaces/templates/place/place_detail.html
@@ -26,12 +26,7 @@
         <h1 class="LP-Headline">{{ place.name }} {% include 'partials/icons/place_favorite.html' %} {% include 'partials/icons/place_visited.html' %}</h1>
         {% if place.get_hero_image %}
         <div class="LP-PlaceDetail__Image">
-			{% partial image %}
-				{% set source_url place.get_hero_image.filename.hero.url %}
-				{% set link_url %}
-					{{"#image"|addstr:place.get_hero_index_in_queryset}}
-				{% endset %}
-			{% endpartial %}
+			{% include '../partials/image.html' with source_url=place.get_hero_image.filename.hero.url link_url="#image"|addstr:place.get_hero_index_in_queryset %}
         </div>
         {% endif %}
     </header>
@@ -43,23 +38,18 @@
 	<div class="LP-Quickinfo">
 	    <section class="LP-Section">
 			{% url 'place_tag_submit' place_id=place.id as tag_submit_url %}
-			{% partial tagging %}
-				{% set config=tagging_config %}
-			{% endpartial %}
+			{% include '../partials/tagging.html' with config=tagging_config %}
 		</section>
 		
 		{{votingplace.vote}}
 		<section class="LP-Section">
-			{% partial voting %}
-				{% set place=place %}
-				{% set voting=placevoting %}
-			{% endpartial %}
+			{% include '../partials/voting.html' with voting=placevoting %}
 		</section>
 	</div>
 
     <section class="LP-Section">
         <h1 class="LP-Headline">{% translate 'Map links' %}</h1>
-        {% partial osm_map config=mapping_config %}
+		{% include '../partials/osm_map.html' with config=mapping_config %}
 		<ul class="LP-LinkList">
 			<li class="LP-LinkList__Item">
 				<a target="_blank" href="https://www.google.com/maps?q={{place.latitude|safe}},{{place.longitude|safe}}" class="LP-Link">
@@ -137,7 +127,7 @@
 
     <section class="LP-Section">
 		{% translate 'Images' as headline %}
-		{% partial "placeImageGrid" image_list=place.placeimages.all %}
+		{% include '../partials/placeImageGrid.html' with image_list=place.placeimages.all %}
     </section>
 
 </article>