diff --git a/aleksis/apps/chronos/templates/chronos/edit_substitution.html b/aleksis/apps/chronos/templates/chronos/edit_substitution.html
index b9164bfb081ab5abae5ee86d6ca50ead558cf01d..74c4ca8300a1aad0db38ee30ae4ae6a30edb0e3f 100644
--- a/aleksis/apps/chronos/templates/chronos/edit_substitution.html
+++ b/aleksis/apps/chronos/templates/chronos/edit_substitution.html
@@ -12,7 +12,7 @@
 
     {% form form=edit_substitution_form %}{% endform %}
 
-    {% include "core/save_button.html" %}
+    {% include "core/partials/save_button.html" %}
     {% if substitution %}
       {# FIXME Respect year as well #}
       <a href="{% url 'delete_substitution' substitution.lesson_period.id substitution.week %}"
diff --git a/aleksis/apps/chronos/templates/chronos/my_timetable.html b/aleksis/apps/chronos/templates/chronos/my_timetable.html
index ed55cc19014b061b0a2f956ae8dabfd55d5083e4..897aafdb448da7f282d349a004bc5efc59caa28b 100644
--- a/aleksis/apps/chronos/templates/chronos/my_timetable.html
+++ b/aleksis/apps/chronos/templates/chronos/my_timetable.html
@@ -26,7 +26,7 @@
 
   <div class="row nomargin">
     <div class="col m12 s12 l6 xl4">
-      {% include "core/announcements.html" with announcements=announcements %}
+      {% include "core/partials/announcements.html" with announcements=announcements %}
     </div>
   </div>
 
diff --git a/aleksis/apps/chronos/templates/chronos/substitutions.html b/aleksis/apps/chronos/templates/chronos/substitutions.html
index b5f8551d2566191b4fe1a2755e9a72d386e77974..cb47a88ca14f750229987a0be0e175ad5cf32dd1 100644
--- a/aleksis/apps/chronos/templates/chronos/substitutions.html
+++ b/aleksis/apps/chronos/templates/chronos/substitutions.html
@@ -28,7 +28,7 @@
     <div class="col s12 m6 l8">
       {% include "chronos/partials/headerbox.html" %}
 
-      {% include "core/announcements.html" with announcements=announcements show_recipients=1 %}
+      {% include "core/partials/announcements.html" with announcements=announcements show_recipients=1 %}
     </div>
     <div class="col s12 m6 l4 no-padding">
       {% include "chronos/partials/datepicker.html" %}
diff --git a/aleksis/apps/chronos/templates/chronos/substitutions_print.html b/aleksis/apps/chronos/templates/chronos/substitutions_print.html
index 56dcf953109aac69b4fcd2316c853e3fe1a61cb2..29853991b8465d29c35f670728dcf1ac71fbdcdc 100644
--- a/aleksis/apps/chronos/templates/chronos/substitutions_print.html
+++ b/aleksis/apps/chronos/templates/chronos/substitutions_print.html
@@ -16,7 +16,7 @@
   {% for day, c in days.items %}
     <h4>{% trans "Substitutions" %} {{ c.day|date:"l" }} {{ c.day }}</h4>
 
-    {% include "core/announcements.html" with announcements=announcements show_recipients=1 %}
+    {% include "core/partials/announcements.html" with announcements=announcements show_recipients=1 %}
 
     {% include "chronos/partials/headerbox.html" with affected_teachers=c.affected_teachers affected_groups=c.affected_groups absent_teachers=c.absent_teachers absent_groups=c.absent_groups print=1 %}
 
diff --git a/aleksis/apps/chronos/templates/chronos/timetable.html b/aleksis/apps/chronos/templates/chronos/timetable.html
index 341d35c32e00feddf9cbcbb9b2aaabf881aab410..76f1885499b7ccf33aa017eabd2862f4dad01535 100644
--- a/aleksis/apps/chronos/templates/chronos/timetable.html
+++ b/aleksis/apps/chronos/templates/chronos/timetable.html
@@ -69,7 +69,7 @@
     {% endif %}
   </div>
 
-  {% include "core/announcements.html" with announcements=announcements show_interval=1 %}
+  {% include "core/partials/announcements.html" with announcements=announcements show_interval=1 %}
 
   {# show full timetable on tablets, laptops and pcs #}
   <div class="timetable-plan hide-on-small-and-down">