diff --git a/src/fellchensammlung/templates/fellchensammlung/animal-shelters.html b/src/fellchensammlung/templates/fellchensammlung/animal-shelters.html
index ebe6522..6dec246 100644
--- a/src/fellchensammlung/templates/fellchensammlung/animal-shelters.html
+++ b/src/fellchensammlung/templates/fellchensammlung/animal-shelters.html
@@ -6,7 +6,7 @@
 {% block content %}
     <div class="block">
         <div style="height: 70vh">
-            {% include "fellchensammlung/partials/bulma-partial-map.html" %}
+            {% include "fellchensammlung/partials/partial-map.html" %}
         </div>
     </div>
     <div class="block">
diff --git a/src/fellchensammlung/templates/fellchensammlung/details/bulma-detail-adoption-notice.html b/src/fellchensammlung/templates/fellchensammlung/details/bulma-detail-adoption-notice.html
index cc6086f..6c647fb 100644
--- a/src/fellchensammlung/templates/fellchensammlung/details/bulma-detail-adoption-notice.html
+++ b/src/fellchensammlung/templates/fellchensammlung/details/bulma-detail-adoption-notice.html
@@ -84,7 +84,7 @@
                         </span>
                         </div>
                         <div class="cell">
-                            {% include "fellchensammlung/partials/bulma-sex-overview.html" %}
+                            {% include "fellchensammlung/partials/sex-overview.html" %}
                         </div>
                     </div>
                 </div>
@@ -160,7 +160,7 @@
         <div class="column">
             {% for animal in adoption_notice.animals %}
                 <div class="block">
-                    {% include "fellchensammlung/partials/bulma-partial-animal-card.html" %}
+                    {% include "fellchensammlung/partials/partial-animal-card.html" %}
                 </div>
             {% endfor %}
         </div>
@@ -169,6 +169,6 @@
 
 
     <div class="block">
-        {% include "fellchensammlung/partials/bulma-partial-comment-section.html" %}
+        {% include "fellchensammlung/partials/partial-comment-section.html" %}
     </div>
 {% endblock %}
diff --git a/src/fellchensammlung/templates/fellchensammlung/details/detail-rescue-organization.html b/src/fellchensammlung/templates/fellchensammlung/details/detail-rescue-organization.html
index 2cbd0e4..c60292d 100644
--- a/src/fellchensammlung/templates/fellchensammlung/details/detail-rescue-organization.html
+++ b/src/fellchensammlung/templates/fellchensammlung/details/detail-rescue-organization.html
@@ -28,11 +28,11 @@
                 </div>
             </div>
             <div class="block">
-                {% include "fellchensammlung/partials/bulma-partial-rescue-organization-contact.html" %}
+                {% include "fellchensammlung/partials/partial-rescue-organization-contact.html" %}
             </div>
         </div>
         <div class="column">
-            {% include "fellchensammlung/partials/bulma-partial-map.html" %}
+            {% include "fellchensammlung/partials/partial-map.html" %}
         </div>
     </div>
 
@@ -41,7 +41,7 @@
     <div class="container-cards">
         {% if org.adoption_notices %}
             {% for adoption_notice in org.adoption_notices %}
-                {% include "fellchensammlung/partials/bulma-partial-adoption-notice-minimal.html" %}
+                {% include "fellchensammlung/partials/partial-adoption-notice-minimal.html" %}
             {% endfor %}
         {% else %}
             <p>{% translate "Keine Vermittlungen gefunden." %}</p>
diff --git a/src/fellchensammlung/templates/fellchensammlung/index.html b/src/fellchensammlung/templates/fellchensammlung/index.html
index 665fe5d..40ed2f8 100644
--- a/src/fellchensammlung/templates/fellchensammlung/index.html
+++ b/src/fellchensammlung/templates/fellchensammlung/index.html
@@ -6,7 +6,7 @@
 
 {% block content %}
     {% for announcement in announcements %}
-        {% include "fellchensammlung/partials/bulma-partial-announcement.html" %}
+        {% include "fellchensammlung/partials/partial-announcement.html" %}
     {% endfor %}
     {% if introduction %}
         <h1>{{ introduction.title }}</h1>
@@ -21,7 +21,7 @@
     </div>
 
     <div class="block" style="height: 50vh">
-        {% include "fellchensammlung/partials/bulma-partial-map.html" %}
+        {% include "fellchensammlung/partials/partial-map.html" %}
     </div>
 
     {% if how_to %}
diff --git a/src/fellchensammlung/templates/fellchensammlung/lists/bulma-list-adoption-notices.html b/src/fellchensammlung/templates/fellchensammlung/lists/bulma-list-adoption-notices.html
index ea23fe5..fd36a1a 100644
--- a/src/fellchensammlung/templates/fellchensammlung/lists/bulma-list-adoption-notices.html
+++ b/src/fellchensammlung/templates/fellchensammlung/lists/bulma-list-adoption-notices.html
@@ -3,7 +3,7 @@
     <div class="grid is-col-min-10">
         {% for adoption_notice in adoption_notices %}
             <div class="cell">
-                {% include "fellchensammlung/partials/bulma-partial-adoption-notice-minimal.html" %}
+                {% include "fellchensammlung/partials/partial-adoption-notice-minimal.html" %}
             </div>
         {% endfor %}
     </div>
diff --git a/src/fellchensammlung/templates/fellchensammlung/lists/bulma-list-animal-shelters.html b/src/fellchensammlung/templates/fellchensammlung/lists/bulma-list-animal-shelters.html
index 3c5217b..29d5454 100644
--- a/src/fellchensammlung/templates/fellchensammlung/lists/bulma-list-animal-shelters.html
+++ b/src/fellchensammlung/templates/fellchensammlung/lists/bulma-list-animal-shelters.html
@@ -3,7 +3,7 @@
     {% if rescue_organizations %}
         {% for rescue_organization in rescue_organizations %}
             <div class="cell">
-                {% include "fellchensammlung/partials/bulma-partial-rescue-organization.html" %}
+                {% include "fellchensammlung/partials/partial-rescue-organization.html" %}
             </div>
         {% endfor %}
     {% else %}
diff --git a/src/fellchensammlung/templates/fellchensammlung/lists/bulma-list-rules.html b/src/fellchensammlung/templates/fellchensammlung/lists/bulma-list-rules.html
index 84434c2..323d273 100644
--- a/src/fellchensammlung/templates/fellchensammlung/lists/bulma-list-rules.html
+++ b/src/fellchensammlung/templates/fellchensammlung/lists/bulma-list-rules.html
@@ -1,5 +1,5 @@
 <div class="container-cards">
 {% for rule in rules %}
-    {% include "fellchensammlung/partials/bulma-partial-rule.html" %}
+    {% include "fellchensammlung/partials/partial-rule.html" %}
 {% endfor %}
 </div>
\ No newline at end of file
diff --git a/src/fellchensammlung/templates/fellchensammlung/map.html b/src/fellchensammlung/templates/fellchensammlung/map.html
index 9addec9..eb7a172 100644
--- a/src/fellchensammlung/templates/fellchensammlung/map.html
+++ b/src/fellchensammlung/templates/fellchensammlung/map.html
@@ -4,6 +4,6 @@
 
 {% block content %}
     <div style="height:70vh">
-        {% include "fellchensammlung/partials/bulma-partial-map.html" %}
+        {% include "fellchensammlung/partials/partial-map.html" %}
     </div>
 {% endblock %}
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-comment-section.html b/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-comment-section.html
deleted file mode 100644
index c1afa00..0000000
--- a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-comment-section.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% load i18n %}
-
-<div class="card block">
-    <div class="card-header">
-        <h2 class="card-header-title title is-2">{% translate 'Kommentare' %}</h2>
-    </div>
-    <div class="card-content">
-        {% if adoption_notice.comments %}
-            {% for comment in adoption_notice.comments %}
-                {% include "fellchensammlung/partials/bulma-partial-comment.html" %}
-            {% endfor %}
-        {% else %}
-            <p class="is-italic">{% translate 'Noch keine Kommentare' %}</p>
-        {% endif %}
-    </div>
-</div>
-<div class="block">
-    {% if user.is_authenticated %}
-        {% include "fellchensammlung/forms/bulma-form-comment.html" %}
-    {% else %}
-        <p class="card-footer-item">
-            {% translate 'Du musst dich einloggen um Kommentare zu hinterlassen' %}
-        </p>
-    {% endif %}
-</div>
\ No newline at end of file
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal-map.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-adoption-notice-minimal-map.html
similarity index 92%
rename from src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal-map.html
rename to src/fellchensammlung/templates/fellchensammlung/partials/partial-adoption-notice-minimal-map.html
index 1f86dc1..b21bbe1 100644
--- a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal-map.html
+++ b/src/fellchensammlung/templates/fellchensammlung/partials/partial-adoption-notice-minimal-map.html
@@ -22,7 +22,7 @@
                     {% endif %}</p>
             </div>
             <div class="cell">
-                {% include "fellchensammlung/partials/bulma-sex-overview.html" %}
+                {% include "fellchensammlung/partials/sex-overview.html" %}
             </div>
         </div>
     </div>
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-adoption-notice-minimal.html
similarity index 96%
rename from src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal.html
rename to src/fellchensammlung/templates/fellchensammlung/partials/partial-adoption-notice-minimal.html
index c15c554..95157d1 100644
--- a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal.html
+++ b/src/fellchensammlung/templates/fellchensammlung/partials/partial-adoption-notice-minimal.html
@@ -24,7 +24,7 @@
                             {% endif %}</p>
                     </div>
                     <div class="cell">
-                        {% include "fellchensammlung/partials/bulma-sex-overview.html" %}
+                        {% include "fellchensammlung/partials/sex-overview.html" %}
                     </div>
                 </div>
             </div>
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-animal-card.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-animal-card.html
similarity index 100%
rename from src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-animal-card.html
rename to src/fellchensammlung/templates/fellchensammlung/partials/partial-animal-card.html
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-announcement.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-announcement.html
similarity index 100%
rename from src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-announcement.html
rename to src/fellchensammlung/templates/fellchensammlung/partials/partial-announcement.html
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/partial-comment-section.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-comment-section.html
index cf9bc72..08c8f67 100644
--- a/src/fellchensammlung/templates/fellchensammlung/partials/partial-comment-section.html
+++ b/src/fellchensammlung/templates/fellchensammlung/partials/partial-comment-section.html
@@ -1,21 +1,25 @@
 {% load i18n %}
 
-<div class="container-comments">
-    <h2>{% translate 'Kommentare' %}</h2>
-    {% if adoption_notice.comments %}
-        {% for comment in adoption_notice.comments %}
-            {% include "fellchensammlung/partials/partial-comment.html" %}
-        {% endfor %}
-    {% else %}
-        <div class="card">
-            <p>{% translate 'Noch keine Kommentare' %}</p>
-        </div>
-    {% endif %}
-
+<div class="card block">
+    <div class="card-header">
+        <h2 class="card-header-title title is-2">{% translate 'Kommentare' %}</h2>
+    </div>
+    <div class="card-content">
+        {% if adoption_notice.comments %}
+            {% for comment in adoption_notice.comments %}
+                {% include "fellchensammlung/partials/partial-comment.html" %}
+            {% endfor %}
+        {% else %}
+            <p class="is-italic">{% translate 'Noch keine Kommentare' %}</p>
+        {% endif %}
+    </div>
+</div>
+<div class="block">
     {% if user.is_authenticated %}
-        {% include "fellchensammlung/forms/form-comment.html" %}
+        {% include "fellchensammlung/forms/bulma-form-comment.html" %}
     {% else %}
-        {% translate 'Du musst dich einloggen um Kommentare zu hinterlassen' %}
+        <p class="card-footer-item">
+            {% translate 'Du musst dich einloggen um Kommentare zu hinterlassen' %}
+        </p>
     {% endif %}
-
 </div>
\ No newline at end of file
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-comment.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-comment.html
similarity index 100%
rename from src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-comment.html
rename to src/fellchensammlung/templates/fellchensammlung/partials/partial-comment.html
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-map.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-map.html
similarity index 100%
rename from src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-map.html
rename to src/fellchensammlung/templates/fellchensammlung/partials/partial-map.html
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-rescue-organization-contact.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-rescue-organization-contact.html
similarity index 100%
rename from src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-rescue-organization-contact.html
rename to src/fellchensammlung/templates/fellchensammlung/partials/partial-rescue-organization-contact.html
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-rescue-organization-minimal-map.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-rescue-organization-minimal-map.html
similarity index 100%
rename from src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-rescue-organization-minimal-map.html
rename to src/fellchensammlung/templates/fellchensammlung/partials/partial-rescue-organization-minimal-map.html
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-rescue-organization.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-rescue-organization.html
similarity index 100%
rename from src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-rescue-organization.html
rename to src/fellchensammlung/templates/fellchensammlung/partials/partial-rescue-organization.html
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-rule.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-rule.html
similarity index 100%
rename from src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-rule.html
rename to src/fellchensammlung/templates/fellchensammlung/partials/partial-rule.html
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-sex-overview.html b/src/fellchensammlung/templates/fellchensammlung/partials/sex-overview.html
similarity index 100%
rename from src/fellchensammlung/templates/fellchensammlung/partials/bulma-sex-overview.html
rename to src/fellchensammlung/templates/fellchensammlung/partials/sex-overview.html
diff --git a/src/fellchensammlung/templates/fellchensammlung/search.html b/src/fellchensammlung/templates/fellchensammlung/search.html
index ecedd1b..2a18354 100644
--- a/src/fellchensammlung/templates/fellchensammlung/search.html
+++ b/src/fellchensammlung/templates/fellchensammlung/search.html
@@ -9,7 +9,7 @@
         <!--- Map -->
         <div class="column is-two-thirds">
             <div style="height: 75vh">
-                {% include "fellchensammlung/partials/bulma-partial-map.html" %}
+                {% include "fellchensammlung/partials/partial-map.html" %}
             </div>
         </div>
         <!--- Search Form -->