diff --git a/aleksis/apps/chronos/tables.py b/aleksis/apps/chronos/tables.py
index 688db9ccb0c0a8ba3ef296e3ef9580438a248b27..d475169b72cb67350d817aaf37e89416bd079b24 100644
--- a/aleksis/apps/chronos/tables.py
+++ b/aleksis/apps/chronos/tables.py
@@ -24,7 +24,7 @@ def _css_class_from_lesson_state(
 
 class LessonsTable(tables.Table):
     class Meta:
-        attrs = {"class": "table table-striped table-bordered table-hover table-responsive-xl"}
+        attrs = {"class": "highlight"}
         row_attrs = {"class": _css_class_from_lesson_state}
 
     period__period = tables.Column(accessor="period__period")
@@ -39,7 +39,7 @@ class LessonsTable(tables.Table):
 
 class SubstitutionsTable(tables.Table):
     class Meta:
-        attrs = {"class": "table table-striped table-bordered table-hover table-responsive-xl"}
+        attrs = {"class": "highlight"}
 
     lesson_period = tables.Column(verbose_name=_("Lesson"))
     lesson__groups = tables.Column(
diff --git a/aleksis/apps/chronos/templates/chronos/edit_substitution.html b/aleksis/apps/chronos/templates/chronos/edit_substitution.html
index 213ad7a83f2725d6452a63875add14724c7fc1b1..4478dc5c2889a86fa734ded6ee8bcbe8e90fd26e 100644
--- a/aleksis/apps/chronos/templates/chronos/edit_substitution.html
+++ b/aleksis/apps/chronos/templates/chronos/edit_substitution.html
@@ -1,40 +1,23 @@
 {# -*- engine:django -*- #}
 
 {% extends "core/base.html" %}
-{% load bootstrap4 i18n %}
-
-{% block bootstrap4_extra_head %}
-  {{ block.super }}
-  {{ edit_substitution_form.media.css }}
-{% endblock %}
-
-{% block bootstrap4_extra_script %}
-  {{ block.super }}
-  {{ edit_substitution_form.media.js }}
-{% endblock %}
-
-
-{% block bootstrap4_title %}{% blocktrans %}Edit substitution{% endblocktrans %} - {{ block.super }}{% endblock %}
+{% load material_form i18n %}
 
 {% block page_title %}{% blocktrans %}Edit substitution{% endblocktrans %}{% endblock %}
 
 {% block content %}
-  <div class="d-flex justify-content-between">
-    <div class="btn-group" role="group" aria-label="Day actions">
-      {% if substitution %}
-        {# FIXME Respect year as well #}
-        <a href="{% url 'delete_substitution' substitution.lesson_period.id substitution.week %}" class="btn btn-danger">
-          <span class="mdi mdi-delete"></span>
-        </a>
-      {% endif %}
-    </div>
-  </div>
-
   <form method="post">
     {% csrf_token %}
-    {% bootstrap_form edit_substitution_form %}
-    <button type="submit" class="btn btn-dark">
-      <span class="mdi mdi-content-save"></span>
-    </button>
+
+    {% form form=edit_substitution_form %}{% endform %}
+
+    {% include "core/save_button.html" %}
+    {% if substitution %}
+      {# FIXME Respect year as well #}
+      <a href="{% url 'delete_substitution' substitution.lesson_period.id substitution.week %}"
+         class="btn red waves-effect waves-light">
+        <i class="material-icons left">delete</i> {% trans "Delete" %}
+      </a>
+    {% endif %}
   </form>
 {% endblock %}
diff --git a/aleksis/apps/chronos/templates/chronos/lessons_day.html b/aleksis/apps/chronos/templates/chronos/lessons_day.html
index a2c8938d9791c89b0cf11570e35482f61b4e9efd..cd6bcb8e8ebcbcc71ab808fe619bfb1da214ec1a 100644
--- a/aleksis/apps/chronos/templates/chronos/lessons_day.html
+++ b/aleksis/apps/chronos/templates/chronos/lessons_day.html
@@ -1,10 +1,14 @@
 {# -*- engine:django -*- #}
 
-{% extends "core/turnable.html" %}
+{% extends "core/base.html" %}
 {% load i18n %}
+
+
 {% load render_table from django_tables2 %}
 
+{% block page_title %}{% blocktrans %}Lessons {{ day }}{% endblocktrans %}{% endblock %}
 
-{% block current_content %}
+{% block content %}
+  {% include "core/turnable.html" %}
   {% render_table lessons_table %}
 {% endblock %}