diff --git a/src/postorius/context_processors.py b/src/postorius/context_processors.py
index 213f68c..1cb6c6e 100644
--- a/src/postorius/context_processors.py
+++ b/src/postorius/context_processors.py
@@ -25,14 +25,5 @@
 def postorius(request):
     """Add template variables to context.
     """
-    # Use a template so that the page header/footer is suppressed when
-    # requested via AJAX
-
-    if request.is_ajax():
-        template_to_extend = "postorius/base_ajax.html"
-    else:
-        template_to_extend = "postorius/base.html"
-
-    return {
-        'postorius_base_template': template_to_extend,
-    }
+    # Unused at the moment
+    return {}
diff --git a/src/postorius/templates/postorius/base_ajax.html b/src/postorius/templates/postorius/base_ajax.html
deleted file mode 100644
index 524a005..0000000
--- a/src/postorius/templates/postorius/base_ajax.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{% load i18n %}
-    {% block header%}{% endblock %}
diff --git a/src/postorius/templates/postorius/domain/confirm_delete.html b/src/postorius/templates/postorius/domain/confirm_delete.html
index c969aa5..7d33410 100644
--- a/src/postorius/templates/postorius/domain/confirm_delete.html
+++ b/src/postorius/templates/postorius/domain/confirm_delete.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 
 {% block head_title %}
diff --git a/src/postorius/templates/postorius/domain/index.html b/src/postorius/templates/postorius/domain/index.html
index 9b6f870..ef83e5c 100644
--- a/src/postorius/templates/postorius/domain/index.html
+++ b/src/postorius/templates/postorius/domain/index.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 
 {% block head_title %}
diff --git a/src/postorius/templates/postorius/domain/new.html b/src/postorius/templates/postorius/domain/new.html
index c9d3fc3..5ba3375 100644
--- a/src/postorius/templates/postorius/domain/new.html
+++ b/src/postorius/templates/postorius/domain/new.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load bootstrap_tags %}
 
diff --git a/src/postorius/templates/postorius/errors/generic.html b/src/postorius/templates/postorius/errors/generic.html
index 954dd07..0ab2d0b 100644
--- a/src/postorius/templates/postorius/errors/generic.html
+++ b/src/postorius/templates/postorius/errors/generic.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 
 {% block content %}
diff --git a/src/postorius/templates/postorius/index.html b/src/postorius/templates/postorius/index.html
index dbf984a..b0cae21 100644
--- a/src/postorius/templates/postorius/index.html
+++ b/src/postorius/templates/postorius/index.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load pagination %}
 
diff --git a/src/postorius/templates/postorius/lists/archival_options.html b/src/postorius/templates/postorius/lists/archival_options.html
index a844cdb..b16ad27 100644
--- a/src/postorius/templates/postorius/lists/archival_options.html
+++ b/src/postorius/templates/postorius/lists/archival_options.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 
 {% block head_title %}
diff --git a/src/postorius/templates/postorius/lists/bans.html b/src/postorius/templates/postorius/lists/bans.html
index 2436c33..b3e6d9c 100644
--- a/src/postorius/templates/postorius/lists/bans.html
+++ b/src/postorius/templates/postorius/lists/bans.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load bootstrap_tags %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/confirm_delete.html b/src/postorius/templates/postorius/lists/confirm_delete.html
index 015f904..4b3c8a5 100644
--- a/src/postorius/templates/postorius/lists/confirm_delete.html
+++ b/src/postorius/templates/postorius/lists/confirm_delete.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 
 {% block head_title %}
diff --git a/src/postorius/templates/postorius/lists/confirm_remove_role.html b/src/postorius/templates/postorius/lists/confirm_remove_role.html
index d1a6823..c92be87 100644
--- a/src/postorius/templates/postorius/lists/confirm_remove_role.html
+++ b/src/postorius/templates/postorius/lists/confirm_remove_role.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 
 {% block head_title %}
diff --git a/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html b/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html
index f29f137..2f3da74 100644
--- a/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html
+++ b/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load nav_helpers %}
 
diff --git a/src/postorius/templates/postorius/lists/header_matches.html b/src/postorius/templates/postorius/lists/header_matches.html
index ea53f01..24e72ef 100644
--- a/src/postorius/templates/postorius/lists/header_matches.html
+++ b/src/postorius/templates/postorius/lists/header_matches.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load bootstrap_tags %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html
index 92e7ccd..2ab4216 100644
--- a/src/postorius/templates/postorius/lists/held_messages.html
+++ b/src/postorius/templates/postorius/lists/held_messages.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load nav_helpers %}
 {% load pagination %}
diff --git a/src/postorius/templates/postorius/lists/mass_removal.html b/src/postorius/templates/postorius/lists/mass_removal.html
index 0c0baf9..58e0bf7 100644
--- a/src/postorius/templates/postorius/lists/mass_removal.html
+++ b/src/postorius/templates/postorius/lists/mass_removal.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load nav_helpers %}
 {% load bootstrap_tags %}
diff --git a/src/postorius/templates/postorius/lists/mass_subscribe.html b/src/postorius/templates/postorius/lists/mass_subscribe.html
index 45b6045..f7cf396 100644
--- a/src/postorius/templates/postorius/lists/mass_subscribe.html
+++ b/src/postorius/templates/postorius/lists/mass_subscribe.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load bootstrap_tags %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/memberoptions.html b/src/postorius/templates/postorius/lists/memberoptions.html
index 4f816be..93e7899 100644
--- a/src/postorius/templates/postorius/lists/memberoptions.html
+++ b/src/postorius/templates/postorius/lists/memberoptions.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load nav_helpers %}
 {% load bootstrap_tags %}
diff --git a/src/postorius/templates/postorius/lists/members.html b/src/postorius/templates/postorius/lists/members.html
index 3073739..240873f 100644
--- a/src/postorius/templates/postorius/lists/members.html
+++ b/src/postorius/templates/postorius/lists/members.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load bootstrap_tags %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/new.html b/src/postorius/templates/postorius/lists/new.html
index 9389e3e..d341932 100644
--- a/src/postorius/templates/postorius/lists/new.html
+++ b/src/postorius/templates/postorius/lists/new.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load bootstrap_tags %}
 
diff --git a/src/postorius/templates/postorius/lists/settings.html b/src/postorius/templates/postorius/lists/settings.html
index e1f1d14..416c284 100644
--- a/src/postorius/templates/postorius/lists/settings.html
+++ b/src/postorius/templates/postorius/lists/settings.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load bootstrap_tags %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/subscription_requests.html b/src/postorius/templates/postorius/lists/subscription_requests.html
index 7d5bd22..6262218 100644
--- a/src/postorius/templates/postorius/lists/subscription_requests.html
+++ b/src/postorius/templates/postorius/lists/subscription_requests.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load nav_helpers %}
 
diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html
index 6a2cf2d..06f7ee9 100644
--- a/src/postorius/templates/postorius/lists/summary.html
+++ b/src/postorius/templates/postorius/lists/summary.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load bootstrap_tags %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/user/address_preferences.html b/src/postorius/templates/postorius/user/address_preferences.html
index d9cf05b..fc97741 100644
--- a/src/postorius/templates/postorius/user/address_preferences.html
+++ b/src/postorius/templates/postorius/user/address_preferences.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 
 {% load i18n %}
 {% load bootstrap_tags %}
diff --git a/src/postorius/templates/postorius/user/list_options.html b/src/postorius/templates/postorius/user/list_options.html
index 7c7535e..7ae2657 100644
--- a/src/postorius/templates/postorius/user/list_options.html
+++ b/src/postorius/templates/postorius/user/list_options.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load nav_helpers %}
 {% load bootstrap_tags %}
diff --git a/src/postorius/templates/postorius/user/mailman_settings.html b/src/postorius/templates/postorius/user/mailman_settings.html
index d929542..5e83bc0 100644
--- a/src/postorius/templates/postorius/user/mailman_settings.html
+++ b/src/postorius/templates/postorius/user/mailman_settings.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load bootstrap_tags %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/user/subscription_preferences.html b/src/postorius/templates/postorius/user/subscription_preferences.html
index d30c165..29da1b7 100644
--- a/src/postorius/templates/postorius/user/subscription_preferences.html
+++ b/src/postorius/templates/postorius/user/subscription_preferences.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 {% load i18n %}
 {% load bootstrap_tags %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/user/subscriptions.html b/src/postorius/templates/postorius/user/subscriptions.html
index d106653..b89492a 100644
--- a/src/postorius/templates/postorius/user/subscriptions.html
+++ b/src/postorius/templates/postorius/user/subscriptions.html
@@ -1,4 +1,4 @@
-{% extends postorius_base_template %}
+{% extends "postorius/base.html" %}
 
 {% load i18n %}
 {% load nav_helpers %}