diff --git a/templates/backlinks.jinja2 b/templates/backlinks.jinja2
index 9cf9f7c..aa6bbff 100644
--- a/templates/backlinks.jinja2
+++ b/templates/backlinks.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Pages linking to “{{ p.title }}” - {{ app_name }}{% endblock %}
 
diff --git a/templates/badrequest.jinja2 b/templates/badrequest.jinja2
index df7c777..ba04376 100644
--- a/templates/badrequest.jinja2
+++ b/templates/badrequest.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Bad Request - {{ app_name }}{% endblock %}
 
diff --git a/templates/calendar.jinja2 b/templates/calendar.jinja2
index f3e5c23..d4272f7 100644
--- a/templates/calendar.jinja2
+++ b/templates/calendar.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Calendar – {{ app_name }}{% endblock %}
 
diff --git a/templates/circles/add.jinja2 b/templates/circles/add.jinja2
index eb2a937..90e76cc 100644
--- a/templates/circles/add.jinja2
+++ b/templates/circles/add.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Circles – {{ app_name }}{% endblock %}
 
diff --git a/templates/circles/csv.jinja2 b/templates/circles/csv.jinja2
index e50404c..b1b3e49 100644
--- a/templates/circles/csv.jinja2
+++ b/templates/circles/csv.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Circles – {{ app_name }}{% endblock %}
 
diff --git a/templates/circles/list.jinja2 b/templates/circles/list.jinja2
index 8b03b4a..4f9884e 100644
--- a/templates/circles/list.jinja2
+++ b/templates/circles/list.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Circles – {{ app_name }}{% endblock %}
 
diff --git a/templates/circles/stats.jinja2 b/templates/circles/stats.jinja2
index f1617b0..4fdff58 100644
--- a/templates/circles/stats.jinja2
+++ b/templates/circles/stats.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Circles – {{ app_name }}{% endblock %}
 
diff --git a/templates/contactnova/list.jinja2 b/templates/contactnova/list.jinja2
index 276370b..5289f64 100644
--- a/templates/contactnova/list.jinja2
+++ b/templates/contactnova/list.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}List of contacts – {{ app_name }}{% endblock %}
 
diff --git a/templates/contactnova/new.jinja2 b/templates/contactnova/new.jinja2
index 89e17c8..5608dc1 100644
--- a/templates/contactnova/new.jinja2
+++ b/templates/contactnova/new.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Create new contact – {{ app_name }}{% endblock %}
 
diff --git a/templates/contactnova/single.jinja2 b/templates/contactnova/single.jinja2
index 3e77462..ff7a1df 100644
--- a/templates/contactnova/single.jinja2
+++ b/templates/contactnova/single.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Contact {{ p.code }} – {{ app_name }}{% endblock %}
 
diff --git a/templates/contributions.jinja2 b/templates/contributions.jinja2
index f94509f..69cc4db 100644
--- a/templates/contributions.jinja2
+++ b/templates/contributions.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Contributions of {{ u.username }} - {{ app_name }}{% endblock %}
 
diff --git a/templates/easter.jinja2 b/templates/easter.jinja2
index 4a8ebc8..dd81ef8 100644
--- a/templates/easter.jinja2
+++ b/templates/easter.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}{{ T('easter-date-calc') }} - {{ app_name }}{% endblock %}
 
diff --git a/templates/edit.jinja2 b/templates/edit.jinja2
index bceabbc..45374c9 100644
--- a/templates/edit.jinja2
+++ b/templates/edit.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 
 {% block title %}
diff --git a/templates/exportpages.jinja2 b/templates/exportpages.jinja2
index 574c644..136a739 100644
--- a/templates/exportpages.jinja2
+++ b/templates/exportpages.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Export pages - {{ app_name }}{% endblock %}
 
diff --git a/templates/forbidden.jinja2 b/templates/forbidden.jinja2
index 8ac8560..83b57b4 100644
--- a/templates/forbidden.jinja2
+++ b/templates/forbidden.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Access Denied - {{ app_name }}{% endblock %}
 
diff --git a/templates/history.jinja2 b/templates/history.jinja2
index 8760ec4..3f38d0c 100644
--- a/templates/history.jinja2
+++ b/templates/history.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Page history - {{ app_name }}{% endblock %}
 
diff --git a/templates/home.jinja2 b/templates/home.jinja2
index f776700..2c02af0 100644
--- a/templates/home.jinja2
+++ b/templates/home.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}{{ T('homepage') }} - {{ app_name }}{% endblock %}
 
diff --git a/templates/importpages.jinja2 b/templates/importpages.jinja2
index 67b3a64..e0f54c7 100644
--- a/templates/importpages.jinja2
+++ b/templates/importpages.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Import pages - {{ app_name }}{% endblock %}
 
diff --git a/templates/internalservererror.jinja2 b/templates/internalservererror.jinja2
index 53ae91f..050f4c2 100644
--- a/templates/internalservererror.jinja2
+++ b/templates/internalservererror.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Internal Server Error - {{ app_name }}{% endblock %}
 
diff --git a/templates/leaderboard.jinja2 b/templates/leaderboard.jinja2
index 3cc88d2..b8966c7 100644
--- a/templates/leaderboard.jinja2
+++ b/templates/leaderboard.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Best pages - {{ app_name }}{% endblock %}
 
diff --git a/templates/listrecent.jinja2 b/templates/listrecent.jinja2
index 01bb1ff..deebe66 100644
--- a/templates/listrecent.jinja2
+++ b/templates/listrecent.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block content %}
 <h1>Notes by date</h1>
diff --git a/templates/listtag.jinja2 b/templates/listtag.jinja2
index 68ef780..4249bfe 100644
--- a/templates/listtag.jinja2
+++ b/templates/listtag.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Notes tagged #{{ tagname }} - {{ app_name }}{% endblock %}
 
diff --git a/templates/login.jinja2 b/templates/login.jinja2
index 384a652..40c7c0d 100644
--- a/templates/login.jinja2
+++ b/templates/login.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}{{ T('login') }} – {{ app_name }}{% endblock %}
 
diff --git a/templates/month.jinja2 b/templates/month.jinja2
index 9211ade..55ba03b 100644
--- a/templates/month.jinja2
+++ b/templates/month.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}{{ d.strftime("%B %Y") }} – {{ app_name }}{% endblock %}
 
diff --git a/templates/notfound.jinja2 b/templates/notfound.jinja2
index 0bd7f79..5b1f7b8 100644
--- a/templates/notfound.jinja2
+++ b/templates/notfound.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Not found - {{ app_name }}{% endblock %}
 
diff --git a/templates/register.jinja2 b/templates/register.jinja2
index cf6012f..f255136 100644
--- a/templates/register.jinja2
+++ b/templates/register.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}{{ T('sign-up') }} – {{ app_name }}{% endblock %}
 
diff --git a/templates/search.jinja2 b/templates/search.jinja2
index df1aaea..01a7304 100644
--- a/templates/search.jinja2
+++ b/templates/search.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}{% if q %}Search results for "{{ q }}"{% else %}Search{% endif %} - {{ app_name }}{% endblock %}
 
@@ -22,7 +22,7 @@
 
 <ul class="nl-list">
   {% for n in results %}
-  <li>{% include "includes/nl_item.html" %}</li>
+  <li>{% include "includes/nl_item.jinja2" %}</li>
   {% endfor %}
 </ul>
 {% elif q %}
diff --git a/templates/stats.jinja2 b/templates/stats.jinja2
index 4e660ca..0c0f2b0 100644
--- a/templates/stats.jinja2
+++ b/templates/stats.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Statistics - {{ app_name }}{% endblock %}
 
diff --git a/templates/upload.jinja2 b/templates/upload.jinja2
index e3f2266..6c044b5 100644
--- a/templates/upload.jinja2
+++ b/templates/upload.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block content %}
 <h1>Upload new file</h1>
diff --git a/templates/uploadinfo.jinja2 b/templates/uploadinfo.jinja2
index 6eec1fa..1be8c30 100644
--- a/templates/uploadinfo.jinja2
+++ b/templates/uploadinfo.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}Info on file "{{ upl.name }}" - {{ app_name }}{% endblock %}
 
diff --git a/templates/view.jinja2 b/templates/view.jinja2
index b66fb00..76fbb8e 100644
--- a/templates/view.jinja2
+++ b/templates/view.jinja2
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.jinja2" %}
 
 {% block title %}{{ p.title }} - {{ app_name }}{% endblock %}
 
diff --git a/templates/viewold.jinja2 b/templates/viewold.jinja2
index 085ba4a..0ea4139 100644
--- a/templates/viewold.jinja2
+++ b/templates/viewold.jinja2
@@ -1,4 +1,4 @@
-{% extends "view.html" %}
+{% extends "view.jinja2" %}
 
 {% block meta %}
 <meta name="robots" content="noindex,nofollow" />