diff --git a/aleksis/apps/chronos/templates/chronos/lessons_day.html b/aleksis/apps/chronos/templates/chronos/lessons_day.html
index c498c419f7fe66235ae29502655374f654094883..203590ffe0ef86f63347010203fcedf967ab81f3 100644
--- a/aleksis/apps/chronos/templates/chronos/lessons_day.html
+++ b/aleksis/apps/chronos/templates/chronos/lessons_day.html
@@ -15,7 +15,7 @@
 
   <div class="row no-margin">
     <div class="col s12 m6 l8 no-padding">
-      <h4>{% blocktrans %}Lessons{% endblocktrans %} {{ day|date:"l, j. F Y" }}</h4>
+      <h4>{% blocktrans %}Lessons{% endblocktrans %} {{ day|date:"l" }}, {{ day }}</h4>
     </div>
     <div class="col s12 m6 l4 no-padding" style="margin-top: 10px;">
       {% include "chronos/partials/datepicker.html" %}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/datepicker.html b/aleksis/apps/chronos/templates/chronos/partials/datepicker.html
index ca845de753303b987d9f5a868d6d83f8e184e03e..9ef498408913ec07068c1c5f3854ef445eb7d0d5 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/datepicker.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/datepicker.html
@@ -17,7 +17,7 @@
 {% if display_date_only %}
     <div class="col s8">
     <span class="card-title center-block" id="date">
-        {{ day|date:"l, j.n.Y" }}
+        {{ day|date:"l" }}, {{ day }}
     </span>
     </div>
 {% else %}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/period_time.html b/aleksis/apps/chronos/templates/chronos/partials/period_time.html
index 83c27b7b288cf05a0cbaa14c01d042bfc64e5c0a..f22a12e7088cbf375d0757c9041e838d9cfc10ea 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/period_time.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/period_time.html
@@ -11,9 +11,9 @@
     {# Time dimension of lesson #}
     <div class="right timetable-time grey-text text-darken-2">
       {% with period_obj=periods|get_dict:period %}
-        <span>{{ period_obj.0|date:"H:i" }}</span>
+        <span>{{ period_obj.0|time }}</span>
         <br>
-        <span>{{ period_obj.1|date:"H:i" }}</span>
+        <span>{{ period_obj.1|time }}</span>
       {% endwith %}
     </div>
   </div>
diff --git a/aleksis/apps/chronos/templates/chronos/substitutions.html b/aleksis/apps/chronos/templates/chronos/substitutions.html
index 204efd1a3501bd6d743f175f5b785b12faaf5468..52708d1f38673e4b09ad719a7276ff6989ca5028 100644
--- a/aleksis/apps/chronos/templates/chronos/substitutions.html
+++ b/aleksis/apps/chronos/templates/chronos/substitutions.html
@@ -57,7 +57,7 @@
     </div>
   </div>
 
-  <h5 class="hide-on-small-and-down">{{ day|date:"l, j. F Y" }}</h5>
+  <h5 class="hide-on-small-and-down">{{ day|date:"l" }}, {{ day }}</h5>
 
   <table class="substitutions striped responsive-table">
     <thead>