diff --git a/plinth/modules/sharing/templates/sharing.html b/plinth/modules/sharing/templates/sharing.html
index aa8557dac..17eda8141 100644
--- a/plinth/modules/sharing/templates/sharing.html
+++ b/plinth/modules/sharing/templates/sharing.html
@@ -5,7 +5,7 @@
{% load i18n %}
{% load static %}
-{% load plinth_extras %}
+{% load extras %}
{% block page_head %}
diff --git a/plinth/modules/snapshot/templates/snapshot_not_supported.html b/plinth/modules/snapshot/templates/snapshot_not_supported.html
index 9441b970f..b30126127 100644
--- a/plinth/modules/snapshot/templates/snapshot_not_supported.html
+++ b/plinth/modules/snapshot/templates/snapshot_not_supported.html
@@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
-{% load plinth_extras %}
+{% load extras %}
{% block configuration %}
diff --git a/plinth/modules/storage/templates/storage.html b/plinth/modules/storage/templates/storage.html
index 383bb77f0..bdb61596b 100644
--- a/plinth/modules/storage/templates/storage.html
+++ b/plinth/modules/storage/templates/storage.html
@@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
-{% load plinth_extras %}
+{% load extras %}
{% block page_head %}
{% trans "Frequent Feature Updates" %}
diff --git a/plinth/modules/upgrades/templates/upgrades-dist-upgrade-confirm.html b/plinth/modules/upgrades/templates/upgrades-dist-upgrade-confirm.html
index 0c7faeebe..69bcca510 100644
--- a/plinth/modules/upgrades/templates/upgrades-dist-upgrade-confirm.html
+++ b/plinth/modules/upgrades/templates/upgrades-dist-upgrade-confirm.html
@@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
-{% load plinth_extras %}
+{% load extras %}
{% block content %}
{% trans "Confirm Distribution Update?" %}
diff --git a/plinth/modules/upgrades/templates/upgrades-dist-upgrade.html b/plinth/modules/upgrades/templates/upgrades-dist-upgrade.html
index 69c463023..be6810b78 100644
--- a/plinth/modules/upgrades/templates/upgrades-dist-upgrade.html
+++ b/plinth/modules/upgrades/templates/upgrades-dist-upgrade.html
@@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
-{% load plinth_extras %}
+{% load extras %}
{% block content %}
{% trans "Distribution Update" %}
diff --git a/plinth/modules/upgrades/templates/upgrades_configure.html b/plinth/modules/upgrades/templates/upgrades_configure.html
index a82ddf860..9d75a644a 100644
--- a/plinth/modules/upgrades/templates/upgrades_configure.html
+++ b/plinth/modules/upgrades/templates/upgrades_configure.html
@@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
-{% load plinth_extras %}
+{% load extras %}
{% block status %}
{{ block.super}} {% comment %} To extend instead of overwrite {% endcomment %}
diff --git a/plinth/modules/users/templates/users_firstboot.html b/plinth/modules/users/templates/users_firstboot.html
index 6d91229de..44f3ef30e 100644
--- a/plinth/modules/users/templates/users_firstboot.html
+++ b/plinth/modules/users/templates/users_firstboot.html
@@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
-{% load plinth_extras %}
+{% load extras %}
{% block content %}
{% trans "Administrator Account" %}
diff --git a/plinth/modules/users/templates/users_list.html b/plinth/modules/users/templates/users_list.html
index 8ea3ab843..6a85793bc 100644
--- a/plinth/modules/users/templates/users_list.html
+++ b/plinth/modules/users/templates/users_list.html
@@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
-{% load plinth_extras %}
+{% load extras %}
{% block configuration %}
diff --git a/plinth/modules/wireguard/templates/wireguard.html b/plinth/modules/wireguard/templates/wireguard.html
index e100f5dfc..95db00105 100644
--- a/plinth/modules/wireguard/templates/wireguard.html
+++ b/plinth/modules/wireguard/templates/wireguard.html
@@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
-{% load plinth_extras %}
+{% load extras %}
{% block configuration %}
{% trans "As a Server" %}
diff --git a/plinth/modules/wireguard/templates/wireguard_show_client.html b/plinth/modules/wireguard/templates/wireguard_show_client.html
index 3f979116e..9a5e5ae58 100644
--- a/plinth/modules/wireguard/templates/wireguard_show_client.html
+++ b/plinth/modules/wireguard/templates/wireguard_show_client.html
@@ -4,7 +4,7 @@
{% endcomment %}
{% load i18n %}
-{% load plinth_extras %}
+{% load extras %}
{% block content %}
diff --git a/plinth/modules/wireguard/templates/wireguard_show_server.html b/plinth/modules/wireguard/templates/wireguard_show_server.html
index 8bfe0fe78..12adb99ec 100644
--- a/plinth/modules/wireguard/templates/wireguard_show_server.html
+++ b/plinth/modules/wireguard/templates/wireguard_show_server.html
@@ -4,7 +4,7 @@
{% endcomment %}
{% load i18n %}
-{% load plinth_extras %}
+{% load extras %}
{% block content %}
diff --git a/plinth/templates/app-header.html b/plinth/templates/app-header.html
index 3fb3a7001..4e25d8096 100644
--- a/plinth/templates/app-header.html
+++ b/plinth/templates/app-header.html
@@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
-{% load plinth_extras %}
+{% load extras %}
diff --git a/plinth/templates/app-logs.html b/plinth/templates/app-logs.html
index 7fc8c0d93..7d9e25fd9 100644
--- a/plinth/templates/app-logs.html
+++ b/plinth/templates/app-logs.html
@@ -4,7 +4,7 @@
{% endcomment %}
{% load i18n %}
-{% load plinth_extras %}
+{% load extras %}
{% block content %}
{% trans "Logs" %}: {{ app_info.name }}
diff --git a/plinth/templates/app.html b/plinth/templates/app.html
index ed74baf62..8ac4424ba 100644
--- a/plinth/templates/app.html
+++ b/plinth/templates/app.html
@@ -7,7 +7,7 @@
{% load bootstrap %}
{% load i18n %}
-{% load plinth_extras %}
+{% load extras %}
{% load static %}
{% block content %}
diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index 116d54ba1..fd05b7996 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -1,6 +1,6 @@
{% load i18n %}
{% load static %}
-{% load plinth_extras %}
+{% load extras %}
{% comment %}
# SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/plinth/templates/breadcrumbs.html b/plinth/templates/breadcrumbs.html
index a4c671686..b654bf77e 100644
--- a/plinth/templates/breadcrumbs.html
+++ b/plinth/templates/breadcrumbs.html
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
{% endcomment %}
-{% load plinth_extras %}
+{% load extras %}