diff --git a/hasjob/templates/403.html b/hasjob/templates/403.html.jinja2
similarity index 94%
rename from hasjob/templates/403.html
rename to hasjob/templates/403.html.jinja2
index b44b60de1..44e38d639 100644
--- a/hasjob/templates/403.html
+++ b/hasjob/templates/403.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}403 Forbidden{% endblock %}
 {% block pageheaders %}
 {% endblock %}
diff --git a/hasjob/templates/404.html b/hasjob/templates/404.html.jinja2
similarity index 92%
rename from hasjob/templates/404.html
rename to hasjob/templates/404.html.jinja2
index 151c55e65..3f3e11829 100644
--- a/hasjob/templates/404.html
+++ b/hasjob/templates/404.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}404 Not Found{% endblock %}
 {% block pageheaders %}
 {% endblock %}
diff --git a/hasjob/templates/410.html b/hasjob/templates/410.html.jinja2
similarity index 92%
rename from hasjob/templates/410.html
rename to hasjob/templates/410.html.jinja2
index b413fe095..a7c98ec1e 100644
--- a/hasjob/templates/410.html
+++ b/hasjob/templates/410.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}410 Gone{% endblock %}
 {% block pageheaders %}
 {% endblock %}
diff --git a/hasjob/templates/500.html b/hasjob/templates/500.html.jinja2
similarity index 94%
rename from hasjob/templates/500.html
rename to hasjob/templates/500.html.jinja2
index 2be6ad1c0..cb7a940b5 100644
--- a/hasjob/templates/500.html
+++ b/hasjob/templates/500.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}500 Internal Server Error{% endblock %}
 {% block pageheaders %}
 {% endblock %}
diff --git a/hasjob/templates/admin_dashboard.html b/hasjob/templates/admin_dashboard.html.jinja2
similarity index 97%
rename from hasjob/templates/admin_dashboard.html
rename to hasjob/templates/admin_dashboard.html.jinja2
index 04577362e..39dca6f51 100644
--- a/hasjob/templates/admin_dashboard.html
+++ b/hasjob/templates/admin_dashboard.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "dashlayout.html" %}
+{% extends "dashlayout.html.jinja2" %}
 {% block title %}Admin dashboard{% endblock %}
 
 {% block tabcontent %}
diff --git a/hasjob/templates/admin_historical.html b/hasjob/templates/admin_historical.html.jinja2
similarity index 98%
rename from hasjob/templates/admin_historical.html
rename to hasjob/templates/admin_historical.html.jinja2
index b23a38467..93e044a83 100644
--- a/hasjob/templates/admin_historical.html
+++ b/hasjob/templates/admin_historical.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "dashlayout.html" %}
+{% extends "dashlayout.html.jinja2" %}
 {% block title %}Historical trend{% endblock %}
 
 {% block tabcontent %}
diff --git a/hasjob/templates/application.html b/hasjob/templates/application.html.jinja2
similarity index 97%
rename from hasjob/templates/application.html
rename to hasjob/templates/application.html.jinja2
index 9c55f2b48..ea8dea10d 100644
--- a/hasjob/templates/application.html
+++ b/hasjob/templates/application.html.jinja2
@@ -1,6 +1,6 @@
-{% extends "sheet.html" %}
-{% from "baseframe/forms.html" import ajaxform, widgetscripts %}
-{% from "macros.html" import jobheader %}
+{% extends "sheet.html.jinja2" %}
+{% from "baseframe/forms.html.jinja2" import ajaxform, widgetscripts %}
+{% from "macros.html.jinja2" import jobheader %}
 {% block title %}{{ job_application.fullname }} — {{ post.headline }}{% endblock %}
 {% block metareferrer %}origin{% endblock %}
 
@@ -91,7 +91,7 @@ <h2>{{ job_application.fullname }}</h2>
           <p class="appl-msg-reject hidden">
             <em>{{ g.user.fullname if post.admin_is(g.user) else post.fullname or post.company_name }} has declined your application for {{ post.headline }}:</em>
           </p>
-          {% include "inc/replyform.html" %}
+          {% include "inc/replyform.html.jinja2" %}
         </div>
       </div>
       <div class="col-md-3">
@@ -144,7 +144,7 @@ <h2>{{ job_application.fullname }}</h2>
             // This doesn't work. We don't know why.
             tinymce.execCommand('mceFocus', false, 'response_message');
           }
-        });        
+        });
         $("#response_form").find('button').prop('disabled', true);
         $("#appl-options").slideUp();
         $("#appl-send").val('reject');
diff --git a/hasjob/templates/apply_email.html b/hasjob/templates/apply_email.html.jinja2
similarity index 95%
rename from hasjob/templates/apply_email.html
rename to hasjob/templates/apply_email.html.jinja2
index c442d31c2..2fc5f60f3 100644
--- a/hasjob/templates/apply_email.html
+++ b/hasjob/templates/apply_email.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "inc/email_layout_lite.html" %}
+{% extends "inc/email_layout_lite.html.jinja2" %}
 {% block content %}
   <div itemscope itemtype="http://schema.org/EmailMessage">
     <div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
@@ -9,7 +9,7 @@
     <div itemprop="publisher" itemscope itemtype="http://schema.org/Organization">
       <meta itemprop="name" content="{{ config['SITE_TITLE'] }}"/>
       <link itemprop="url" href="{{ url_for('index', subdomain=none, _external=true) }}"/>
-    </div>  
+    </div>
   </div>
   <p>
     <em>{{ job_application.fullname }}</strong> has applied for <a href="{{ post.url_for(_external=true) }}" target="_blank">{{ post.headline }}</a>:</em>
diff --git a/hasjob/templates/archive.html b/hasjob/templates/archive.html.jinja2
similarity index 76%
rename from hasjob/templates/archive.html
rename to hasjob/templates/archive.html.jinja2
index adad8170b..5f3ec9139 100644
--- a/hasjob/templates/archive.html
+++ b/hasjob/templates/archive.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "sheet.html" %}
+{% extends "sheet.html.jinja2" %}
 {% block title %}Archive{% endblock %}
 
 {% block content %}
@@ -7,7 +7,7 @@
       <h1>{{ self.title() }}</h1>
       <p>All jobs ever posted on the board.</p>
       <div id="archive_table">
-        {% include "archive_inner.html" %}
+        {% include "archive_inner.html.jinja2" %}
       </div>
     </div>
   </div>
diff --git a/hasjob/templates/archive_inner.html b/hasjob/templates/archive_inner.html.jinja2
similarity index 100%
rename from hasjob/templates/archive_inner.html
rename to hasjob/templates/archive_inner.html.jinja2
diff --git a/hasjob/templates/campaign_action_response.html b/hasjob/templates/campaign_action_response.html.jinja2
similarity index 57%
rename from hasjob/templates/campaign_action_response.html
rename to hasjob/templates/campaign_action_response.html.jinja2
index 882dc90ad..e0eeef897 100644
--- a/hasjob/templates/campaign_action_response.html
+++ b/hasjob/templates/campaign_action_response.html.jinja2
@@ -1,3 +1,3 @@
-{% from "macros.html" import campaign_action_form, campaign_header_postscript -%}
+{% from "macros.html.jinja2" import campaign_action_form, campaign_header_postscript -%}
 {{ campaign_action_form(campaign, g.user, g.anon_user, message, redirect, dismiss) }}
 {{ campaign_header_postscript() }}
diff --git a/hasjob/templates/campaign_info.html b/hasjob/templates/campaign_info.html.jinja2
similarity index 99%
rename from hasjob/templates/campaign_info.html
rename to hasjob/templates/campaign_info.html.jinja2
index 581598c90..6e22f8713 100644
--- a/hasjob/templates/campaign_info.html
+++ b/hasjob/templates/campaign_info.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "sheet.html" %}
+{% extends "sheet.html.jinja2" %}
 {% block title %}{{ campaign.title }}{% endblock %}
 
 {% block pageheaders %}
@@ -21,7 +21,7 @@ <h1>{{ self.title() }}</h1>
             <time datetime="{{ campaign.end_at.isoformat() }}Z">{{ campaign.end_at|longdate }}</time>
           </p>
         </div>
-      </div>      
+      </div>
     </div>
     <div class="section">
       <div class="row">
diff --git a/hasjob/templates/campaign_list.html b/hasjob/templates/campaign_list.html.jinja2
similarity index 96%
rename from hasjob/templates/campaign_list.html
rename to hasjob/templates/campaign_list.html.jinja2
index a29f5e78c..d68e36aec 100644
--- a/hasjob/templates/campaign_list.html
+++ b/hasjob/templates/campaign_list.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "sheet.html" %}
+{% extends "sheet.html.jinja2" %}
 {% block title %}Campaign archive{% endblock %}
 
 {% block content %}
diff --git a/hasjob/templates/close.html b/hasjob/templates/close.html.jinja2
similarity index 88%
rename from hasjob/templates/close.html
rename to hasjob/templates/close.html.jinja2
index d9b3db691..64f19b293 100644
--- a/hasjob/templates/close.html
+++ b/hasjob/templates/close.html.jinja2
@@ -1,5 +1,5 @@
-{% extends "sheet.html" %}
-{% from "baseframe/forms.html" import renderfield %}
+{% extends "sheet.html.jinja2" %}
+{% from "baseframe/forms.html.jinja2" import renderfield %}
 {% block title %}{{ post.headline|e }}{% endblock %}
 {% block content %}
   <div class="sheet">
diff --git a/hasjob/templates/confirm.html b/hasjob/templates/confirm.html.jinja2
similarity index 85%
rename from hasjob/templates/confirm.html
rename to hasjob/templates/confirm.html.jinja2
index f0ca9ec0a..b3736322c 100644
--- a/hasjob/templates/confirm.html
+++ b/hasjob/templates/confirm.html.jinja2
@@ -1,5 +1,5 @@
-{% extends "sheet.html" %}
-{% from "baseframe/forms.html" import renderfield %}
+{% extends "sheet.html.jinja2" %}
+{% from "baseframe/forms.html.jinja2" import renderfield %}
 {% block title %}{{ post.headline|e }}{% endblock %}
 {% block content %}
   {% if post.is_draft %}
@@ -8,7 +8,7 @@
         <div class="page-header">
           <h1>Terms of service</h1>
         </div>
-        {% include "inc/tos.html" %}
+        {% include "inc/tos.html.jinja2" %}
         <form method="POST" class="form-horizontal">
           <input type="hidden" name="_charset_"/>
           <input type="hidden" name="form.id" value="confirmjob"/>
diff --git a/hasjob/templates/confirm_email.html b/hasjob/templates/confirm_email.html.jinja2
similarity index 95%
rename from hasjob/templates/confirm_email.html
rename to hasjob/templates/confirm_email.html.jinja2
index 50bcb341c..e8c7c7692 100644
--- a/hasjob/templates/confirm_email.html
+++ b/hasjob/templates/confirm_email.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "inc/email_layout_lite.html" %}
+{% extends "inc/email_layout_lite.html.jinja2" %}
 {% block content %}
   <div itemscope itemtype="http://schema.org/EmailMessage">
     <div itemprop="action" itemscope itemtype="http://schema.org/ConfirmAction">
@@ -7,11 +7,11 @@
         <link itemprop="url" href="{{ post.url_for('confirm-link', _external=true) }}"/>
       </div>
     </div>
-    <meta itemprop="description" content="This is a confirmation email for the job you listed."/>  
+    <meta itemprop="description" content="This is a confirmation email for the job you listed."/>
     <div itemprop="publisher" itemscope itemtype="http://schema.org/Organization">
     <meta itemprop="name" content="{{ config['SITE_TITLE'] }}"/>
     <link itemprop="url" href="{{ url_for('index', subdomain=none, _external=true) }}"/>
-    </div>  
+    </div>
   </div>
   <p>Hello,</p>
   <p>This is a confirmation email for the job you listed at {% if g.board -%} {{ g.board.title }} {%- else -%} {{ config['SITE_TITLE'] }} {%- endif %}:
diff --git a/hasjob/templates/connect_email.html b/hasjob/templates/connect_email.html.jinja2
similarity index 86%
rename from hasjob/templates/connect_email.html
rename to hasjob/templates/connect_email.html.jinja2
index 670fa0044..5fe2a3b33 100644
--- a/hasjob/templates/connect_email.html
+++ b/hasjob/templates/connect_email.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "inc/email_layout_lite.html" %}
+{% extends "inc/email_layout_lite.html.jinja2" %}
 
 {% block content -%}
 <p>
diff --git a/hasjob/templates/dashlayout.html b/hasjob/templates/dashlayout.html.jinja2
similarity index 96%
rename from hasjob/templates/dashlayout.html
rename to hasjob/templates/dashlayout.html.jinja2
index 54aad6525..a7b43afca 100644
--- a/hasjob/templates/dashlayout.html
+++ b/hasjob/templates/dashlayout.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "sheet.html" %}
+{% extends "sheet.html.jinja2" %}
 {% block pageheaders %}
   <link href="//cdnjs.cloudflare.com/ajax/libs/c3/0.4.14/c3.min.css" rel="stylesheet"/>
 {% endblock %}
diff --git a/hasjob/templates/detail.html b/hasjob/templates/detail.html.jinja2
similarity index 98%
rename from hasjob/templates/detail.html
rename to hasjob/templates/detail.html.jinja2
index 8e3996de6..3866cfcda 100644
--- a/hasjob/templates/detail.html
+++ b/hasjob/templates/detail.html.jinja2
@@ -1,6 +1,6 @@
-{% extends "sheet.html" %}
-{%- from "baseframe/forms.html" import ajaxform %}
-{%- from "macros.html" import jobheader, stickie %}
+{% extends "sheet.html.jinja2" %}
+{%- from "baseframe/forms.html.jinja2" import ajaxform %}
+{%- from "macros.html.jinja2" import jobheader, stickie %}
 {% block title %}{{ headline }} / {{ post.company_name }} / {{ post.location }}{% endblock %}
 {% block description %}{{ post.company_name }}, {{ post.location }}, {{ post.type.title }}, {{ post.category.title }}{% endblock %}
 {% block canonical_url %}
@@ -138,7 +138,7 @@ <h2>Job Perks</h2>
                   <a class="close-popup" href="#">&#10005;</a>
                   {%- if g.user %}
                     <h2>What’s wrong with it?</h2>
-                    {% include "inc/reportform.html" %}
+                    {% include "inc/reportform.html.jinja2" %}
                   {%- else %}
                     <p>You need to be logged in to report a post</p>
                     <p><a class="btn btn-primary btn-sm" href="{{ url_for('login') }}">Login with Twitter or Google</a></p>
@@ -176,7 +176,7 @@ <h2>What’s wrong with it?</h2>
                 <div class="popup-box" id="reject">
                   <a class="close-popup" href="#">&#10005;</a>
                   <h2>What’s wrong with it?</h2>
-                  {% include "inc/rejectform.html" %}
+                  {% include "inc/rejectform.html.jinja2" %}
                 </div>
               </div>
               <div class="list-group-item">
@@ -186,7 +186,7 @@ <h2>What’s wrong with it?</h2>
                 <div class="popup-box" id="moderate">
                   <a class="close-popup" href="#">&#10005;</a>
                   <h2>What’s wrong with it?</h2>
-                  {% include "inc/moderateform.html" %}
+                  {% include "inc/moderateform.html.jinja2" %}
                 </div>
               </div>
             {%- endif %}
@@ -197,7 +197,7 @@ <h2>What’s wrong with it?</h2>
                 </a>
                 <div class="popup-box" id="makepinned">
                   <a class="close-popup" href="#">&#10005;</a>
-                  {% include "inc/pinnedform.html" %}
+                  {% include "inc/pinnedform.html.jinja2" %}
                 </div>
               </div>
             {%- endif %}
diff --git a/hasjob/templates/domain.html b/hasjob/templates/domain.html.jinja2
similarity index 100%
rename from hasjob/templates/domain.html
rename to hasjob/templates/domain.html.jinja2
diff --git a/hasjob/templates/formlayout.html b/hasjob/templates/formlayout.html.jinja2
similarity index 95%
rename from hasjob/templates/formlayout.html
rename to hasjob/templates/formlayout.html.jinja2
index 44efd0ce4..41792a2e6 100644
--- a/hasjob/templates/formlayout.html
+++ b/hasjob/templates/formlayout.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "layout.html" -%}
+{% extends "layout.html.jinja2" -%}
 {% block messages %}{% endblock %}
 {% block basecontent %}
   <div class="row">
diff --git a/hasjob/templates/index.html b/hasjob/templates/index.html.jinja2
similarity index 97%
rename from hasjob/templates/index.html
rename to hasjob/templates/index.html.jinja2
index 222486953..3a40b3db1 100644
--- a/hasjob/templates/index.html
+++ b/hasjob/templates/index.html.jinja2
@@ -1,8 +1,8 @@
-{%- from "domain.html" import org_profile, user_profile with context %}
-{% from "baseframe/forms.html" import renderfield, widgetscripts %}
+{%- from "domain.html.jinja2" import org_profile, user_profile with context %}
+{% from "baseframe/forms.html.jinja2" import renderfield, widgetscripts %}
 {%- macro pagetitle() %}{% if title %}{% if domain %}Jobs at {% endif%}{{ title }} | {% endif %}{% if g.board %}{{ g.board.title }}{% if g.board.not_root %} ({{ config['SITE_TITLE'] }}){% endif %}{% else %}{{ config['SITE_TITLE'] }}{% endif %}{%- endmacro %}
 {%- if not request.is_xhr -%}
-  {% extends "layout.html" %}
+  {% extends "layout.html.jinja2" %}
   {% block titletags -%}
     <title>{% block title %}{{ pagetitle() }}{% endblock %}</title>
     <meta name="DC.title" content="{{ self.title() }}" />
@@ -52,7 +52,7 @@
   {% endblock %}
 {% endif %}
 {% block content %}
-  {%- from "macros.html" import stickie %}
+  {%- from "macros.html.jinja2" import stickie %}
   {% with gkiosk=g.kiosk, gboard=g.board, guser=g.user, gstarred_ids=g.starred_ids %}
     {%- if gboard and gboard.not_root and not paginated and not (domain or md5sum or location or tag) %}
       <div class="flash info">
@@ -179,7 +179,7 @@ <h2>What these jobs pay per annum</h2>
     });
   </script>
   {%- if not paginated -%}
-    {% from "macros.html" import filters_setup_script %}
+    {% from "macros.html.jinja2" import filters_setup_script %}
     {%- if request.is_xhr -%}
       {{ filters_setup_script(job_filters) }}
       <script type="text/javascript">
diff --git a/hasjob/templates/jobpost_reveal.html b/hasjob/templates/jobpost_reveal.html.jinja2
similarity index 79%
rename from hasjob/templates/jobpost_reveal.html
rename to hasjob/templates/jobpost_reveal.html.jinja2
index 2c6e29015..f4a636de1 100644
--- a/hasjob/templates/jobpost_reveal.html
+++ b/hasjob/templates/jobpost_reveal.html.jinja2
@@ -1,4 +1,4 @@
-{% from "baseframe/forms.html" import ajaxform -%}
+{% from "baseframe/forms.html.jinja2" import ajaxform -%}
 <p id="apply-info-para">{{ instructions }}</p>
 {%- if job_application %}
   <h3>You have applied for this position</h3>
@@ -10,6 +10,6 @@ <h3>You have applied for this position</h3>
   {{ job_application.message|safe }}
 {%- else %}
   {%- if applyform %}
-    {% include "inc/applyform.html" %}
+    {% include "inc/applyform.html.jinja2" %}
   {% endif %}
 {%- endif %}
diff --git a/hasjob/templates/layout.html b/hasjob/templates/layout.html.jinja2
similarity index 98%
rename from hasjob/templates/layout.html
rename to hasjob/templates/layout.html.jinja2
index a4e1ae215..9500fc055 100644
--- a/hasjob/templates/layout.html
+++ b/hasjob/templates/layout.html.jinja2
@@ -1,6 +1,6 @@
-{% extends "baseframe.html" -%}
-{% from "baseframe/components.html" import hgnav %}
-{% from "macros.html" import campaign_header, campaign_script, filters_setup_script %}
+{% extends "baseframe.html.jinja2" -%}
+{% from "baseframe/components.html.jinja2" import hgnav %}
+{% from "macros.html.jinja2" import campaign_header, campaign_script, filters_setup_script %}
 
 {% block doctypehtml -%}
 <!DOCTYPE html>
diff --git a/hasjob/templates/macros.html b/hasjob/templates/macros.html.jinja2
similarity index 100%
rename from hasjob/templates/macros.html
rename to hasjob/templates/macros.html.jinja2
diff --git a/hasjob/templates/mailsent.html b/hasjob/templates/mailsent.html.jinja2
similarity index 92%
rename from hasjob/templates/mailsent.html
rename to hasjob/templates/mailsent.html.jinja2
index e053602aa..07bc3086c 100644
--- a/hasjob/templates/mailsent.html
+++ b/hasjob/templates/mailsent.html.jinja2
@@ -1,5 +1,5 @@
-{% extends "sheet.html" %}
-{%- from "macros.html" import campaign_header, campaign_header_postscript %}
+{% extends "sheet.html.jinja2" %}
+{%- from "macros.html.jinja2" import campaign_header, campaign_header_postscript %}
 {% block title %}One last step…{% endblock %}
 {% block content %}
   <div class="sheet">
diff --git a/hasjob/templates/moderate_email.html b/hasjob/templates/moderate_email.html.jinja2
similarity index 96%
rename from hasjob/templates/moderate_email.html
rename to hasjob/templates/moderate_email.html.jinja2
index ea3ac0325..6ca3fd6f2 100644
--- a/hasjob/templates/moderate_email.html
+++ b/hasjob/templates/moderate_email.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "inc/email_layout_lite.html" %}
+{% extends "inc/email_layout_lite.html.jinja2" %}
 
 {% block content %}
   <div itemscope itemtype="http://schema.org/EmailMessage">
diff --git a/hasjob/templates/notimplemented.html b/hasjob/templates/notimplemented.html.jinja2
similarity index 91%
rename from hasjob/templates/notimplemented.html
rename to hasjob/templates/notimplemented.html.jinja2
index d52e14f22..71bdd292c 100644
--- a/hasjob/templates/notimplemented.html
+++ b/hasjob/templates/notimplemented.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}Not Implemented{% endblock %}
 {% block pageheaders %}
 {% endblock %}
diff --git a/hasjob/templates/postjob.html b/hasjob/templates/postjob.html.jinja2
similarity index 99%
rename from hasjob/templates/postjob.html
rename to hasjob/templates/postjob.html.jinja2
index 97f77011b..2e83bec09 100644
--- a/hasjob/templates/postjob.html
+++ b/hasjob/templates/postjob.html.jinja2
@@ -1,5 +1,5 @@
-{% extends "sheet.html" %}
-{% from "baseframe/forms.html" import renderfield, rendersubmit, widgetscripts %}
+{% extends "sheet.html.jinja2" %}
+{% from "baseframe/forms.html.jinja2" import renderfield, rendersubmit, widgetscripts %}
 {% block title %}Post a job{% endblock %}
 {% block content %}
   {%- if archived_post %}
diff --git a/hasjob/templates/reject_domain_email.html b/hasjob/templates/reject_domain_email.html.jinja2
similarity index 95%
rename from hasjob/templates/reject_domain_email.html
rename to hasjob/templates/reject_domain_email.html.jinja2
index 4b47986cd..7465baee2 100644
--- a/hasjob/templates/reject_domain_email.html
+++ b/hasjob/templates/reject_domain_email.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "inc/email_layout_lite.html" %}
+{% extends "inc/email_layout_lite.html.jinja2" %}
 
 {% block content %}
   <p>Hi {% if post.user %}{{ post.user.fullname }}{% else %}{{ post.company_name }}{% endif %},</p>
diff --git a/hasjob/templates/reject_email.html b/hasjob/templates/reject_email.html.jinja2
similarity index 94%
rename from hasjob/templates/reject_email.html
rename to hasjob/templates/reject_email.html.jinja2
index ad2169bfb..65bf4fdcf 100644
--- a/hasjob/templates/reject_email.html
+++ b/hasjob/templates/reject_email.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "inc/email_layout_lite.html" %}
+{% extends "inc/email_layout_lite.html.jinja2" %}
 
 {% block content %}
   <p>Hi {{ post.company_name }},</p>
diff --git a/hasjob/templates/related_posts.html b/hasjob/templates/related_posts.html.jinja2
similarity index 88%
rename from hasjob/templates/related_posts.html
rename to hasjob/templates/related_posts.html.jinja2
index 1bf2eda45..05eac4db7 100644
--- a/hasjob/templates/related_posts.html
+++ b/hasjob/templates/related_posts.html.jinja2
@@ -1,4 +1,4 @@
-{%- from "macros.html" import stickie %}
+{%- from "macros.html.jinja2" import stickie %}
 {%- if related_posts %}
   {%- for post in related_posts -%}
     <li class="col-xs-12 col-md-3 col-sm-4">
diff --git a/hasjob/templates/reopen.html b/hasjob/templates/reopen.html.jinja2
similarity index 91%
rename from hasjob/templates/reopen.html
rename to hasjob/templates/reopen.html.jinja2
index 55f5b39fe..4441f5d8c 100644
--- a/hasjob/templates/reopen.html
+++ b/hasjob/templates/reopen.html.jinja2
@@ -1,5 +1,5 @@
-{% extends "sheet.html" %}
-{% from "baseframe/forms.html" import renderfield %}
+{% extends "sheet.html.jinja2" %}
+{% from "baseframe/forms.html.jinja2" import renderfield %}
 {% block title %}{{ post.headline|e }}{% endblock %}
 {% block content %}
   <div class="sheet">
diff --git a/hasjob/templates/respond_email.html b/hasjob/templates/respond_email.html.jinja2
similarity index 96%
rename from hasjob/templates/respond_email.html
rename to hasjob/templates/respond_email.html.jinja2
index 8bda82b71..d90d5a264 100644
--- a/hasjob/templates/respond_email.html
+++ b/hasjob/templates/respond_email.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "inc/email_layout_lite.html" %}
+{% extends "inc/email_layout_lite.html.jinja2" %}
 
 {% block content -%}
   <div itemscope itemtype="http://schema.org/EmailMessage">
diff --git a/hasjob/templates/sheet.html b/hasjob/templates/sheet.html.jinja2
similarity index 87%
rename from hasjob/templates/sheet.html
rename to hasjob/templates/sheet.html.jinja2
index 5643cba84..83484d8fb 100644
--- a/hasjob/templates/sheet.html
+++ b/hasjob/templates/sheet.html.jinja2
@@ -1,5 +1,5 @@
-{% extends "layout.html" -%}
-{% from "macros.html" import campaign_header, campaign_script %}
+{% extends "layout.html.jinja2" -%}
+{% from "macros.html.jinja2" import campaign_header, campaign_script %}
 {% block messages %}{% endblock %}
 {% block basecontent %}
   {%- if header_campaign %}<div id="header-campaign"></div>{% endif %}
diff --git a/hasjob/templates/stats.html b/hasjob/templates/stats.html.jinja2
similarity index 93%
rename from hasjob/templates/stats.html
rename to hasjob/templates/stats.html.jinja2
index 3bc95631b..889392d57 100644
--- a/hasjob/templates/stats.html
+++ b/hasjob/templates/stats.html.jinja2
@@ -1,5 +1,5 @@
-{% extends "sheet.html" %}
-{% from "baseframe/forms.html" import renderfield %}
+{% extends "sheet.html.jinja2" %}
+{% from "baseframe/forms.html.jinja2" import renderfield %}
 {% block title %}Job post statistics{% endblock %}
 {% block content %}
   <div class="sheet">
diff --git a/hasjob/templates/tags.html b/hasjob/templates/tags.html.jinja2
similarity index 95%
rename from hasjob/templates/tags.html
rename to hasjob/templates/tags.html.jinja2
index bfdfc5257..e9c9d8f09 100644
--- a/hasjob/templates/tags.html
+++ b/hasjob/templates/tags.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}Top tags{% endblock %}
 {% block content %}
 <ul id="stickie-area" class="row">
diff --git a/hasjob/templates/tos.html b/hasjob/templates/tos.html.jinja2
similarity index 85%
rename from hasjob/templates/tos.html
rename to hasjob/templates/tos.html.jinja2
index cc496d9a8..55142bbbf 100644
--- a/hasjob/templates/tos.html
+++ b/hasjob/templates/tos.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "sheet.html" %}
+{% extends "sheet.html.jinja2" %}
 {% block title %}Terms of Service{% endblock %}
 {% block canonical_url %}
   <link rel="canonical" href="{{ url_for('terms_of_service', subdomain=none) }}" />
@@ -9,7 +9,7 @@
     <div class="section first">
       <h1>{{ self.title()|e }}</h1>
       <h2>You must agree to these terms to list a job</h2>
-      {% include "inc/tos.html" %}
+      {% include "inc/tos.html.jinja2" %}
     </div>
   </div>
 {% endblock %}
diff --git a/hasjob/templates/withdraw.html b/hasjob/templates/withdraw.html.jinja2
similarity index 91%
rename from hasjob/templates/withdraw.html
rename to hasjob/templates/withdraw.html.jinja2
index 562d4f8bd..bc62a5d50 100644
--- a/hasjob/templates/withdraw.html
+++ b/hasjob/templates/withdraw.html.jinja2
@@ -1,5 +1,5 @@
-{% extends "sheet.html" %}
-{% from "baseframe/forms.html" import renderfield %}
+{% extends "sheet.html.jinja2" %}
+{% from "baseframe/forms.html.jinja2" import renderfield %}
 {% block title %}{{ post.headline|e }}{% endblock %}
 {% block content %}
   <div class="sheet">
diff --git a/hasjob/views/admindash.py b/hasjob/views/admindash.py
index 8a4b7fcc5..414b325df 100644
--- a/hasjob/views/admindash.py
+++ b/hasjob/views/admindash.py
@@ -11,13 +11,13 @@
 @app.route('/admin/dashboard')
 @lastuser.requires_permission('siteadmin')
 def admin_dashboard():
-    return render_template('admin_dashboard.html')
+    return render_template('admin_dashboard.html.jinja2')
 
 
 @app.route('/admin/dashboard/historical')
 @lastuser.requires_permission('siteadmin')
 def admin_dashboard_historical():
-    return render_template('admin_historical.html')
+    return render_template('admin_historical.html.jinja2')
 
 
 @app.route('/admin/dashboard/daystats.csv', defaults={'period': 'day'})
diff --git a/hasjob/views/campaign.py b/hasjob/views/campaign.py
index db68b24da..853ab3514 100644
--- a/hasjob/views/campaign.py
+++ b/hasjob/views/campaign.py
@@ -32,7 +32,7 @@ def chart_interval_for(campaign, default='hour'):
 @app.route('/admin/campaign', methods=['GET'])
 @lastuser.requires_permission('siteadmin')
 def campaign_list():
-    return render_template('campaign_list.html', campaigns=Campaign.all())
+    return render_template('campaign_list.html.jinja2', campaigns=Campaign.all())
 
 
 @app.route('/admin/campaign/new', methods=['GET', 'POST'])
@@ -59,7 +59,7 @@ def campaign_new():
 @lastuser.requires_permission('siteadmin')
 @load_model(Campaign, {'name': 'campaign'}, 'campaign')
 def campaign_view(campaign):
-    return render_template('campaign_info.html', campaign=campaign, interval=chart_interval_for(campaign, default=None))
+    return render_template('campaign_info.html.jinja2', campaign=campaign, interval=chart_interval_for(campaign, default=None))
 
 
 @app.route('/admin/campaign/<campaign>/edit', methods=['GET', 'POST'])
@@ -282,7 +282,7 @@ def campaign_action(campaign):
     """
     form = campaign.form()
     if not form.validate():
-        return render_template('campaign_action_response.html',
+        return render_template('campaign_action_response.html.jinja2',
             campaign=campaign,
             message=Markup("<p>This form timed out. Please try again</p>"))
 
@@ -298,13 +298,13 @@ def campaign_action(campaign):
             if view:
                 view.dismissed = True
                 db.session.commit()
-        return render_template('campaign_action_response.html',
+        return render_template('campaign_action_response.html.jinja2',
             campaign=campaign, dismiss=True)
 
     action_name = request.form.get('action')
     action = CampaignAction.get(campaign, action_name)
     if not action:
-        return render_template('campaign_action_response.html',
+        return render_template('campaign_action_response.html.jinja2',
             campaign=campaign,
             message=Markup("<p>Unknown action selected</p>"))
     cua = None
@@ -320,7 +320,7 @@ def campaign_action(campaign):
                 cua = CampaignAnonUserAction(action=action, anon_user=g.anon_user)
                 db.session.add(cua)
         else:  # All of the other types require a user (not an anon user; will change when forms are introduced)
-            return render_template('campaign_action_response.html', campaign=campaign,
+            return render_template('campaign_action_response.html.jinja2', campaign=campaign,
                 redirect=url_for('login', next=request.referrer, message=u"Please login so we can save your preferences"))
 
     if action.type in (CAMPAIGN_ACTION.RSVP_Y, CAMPAIGN_ACTION.RSVP_N, CAMPAIGN_ACTION.RSVP_M):
@@ -329,18 +329,18 @@ def campaign_action(campaign):
                     CAMPAIGN_ACTION.RSVP_Y, CAMPAIGN_ACTION.RSVP_N, CAMPAIGN_ACTION.RSVP_M):
                 db.session.delete(cua)  # If user changed their RSVP answer, delete old answer
         db.session.commit()
-        return render_template('campaign_action_response.html', campaign=campaign,
+        return render_template('campaign_action_response.html.jinja2', campaign=campaign,
             message=Markup(action.message))
     elif action.type == CAMPAIGN_ACTION.DISMISS:
         view = campaign.view_for(g.user, g.anon_user)
         if view:
             view.dismissed = True
             db.session.commit()
-        return render_template('campaign_action_response.html',
+        return render_template('campaign_action_response.html.jinja2',
             campaign=campaign, dismiss=True,
             message=Markup(action.message))
     elif action.type == CAMPAIGN_ACTION.FORM:
         # Render a form here
         db.session.commit()
-        return render_template('campaign_action_response.html', campaign=campaign,
+        return render_template('campaign_action_response.html.jinja2', campaign=campaign,
             message=Markup("To be implemented"))  # TODO
diff --git a/hasjob/views/error_handling.py b/hasjob/views/error_handling.py
index f70667eb6..a7c88ef2c 100644
--- a/hasjob/views/error_handling.py
+++ b/hasjob/views/error_handling.py
@@ -4,19 +4,19 @@
 
 @app.errorhandler(403)
 def error_403(e):
-    return render_template('403.html'), 403
+    return render_template('403.html.jinja2'), 403
 
 
 @app.errorhandler(404)
 def error_404(e):
-    return render_template('404.html'), 404
+    return render_template('404.html.jinja2'), 404
 
 
 @app.errorhandler(410)
 def error_410(e):
-    return render_template('410.html'), 410
+    return render_template('410.html.jinja2'), 410
 
 
 @app.errorhandler(500)
 def error_500(e):
-    return render_template('500.html'), 500
+    return render_template('500.html.jinja2'), 500
diff --git a/hasjob/views/index.py b/hasjob/views/index.py
index 88104bc59..2bae7267c 100644
--- a/hasjob/views/index.py
+++ b/hasjob/views/index.py
@@ -327,7 +327,7 @@ def fetch_cached_jobposts(request_args, request_values, is_index, board, board_j
 
 @app.route('/', methods=['GET', 'POST'], subdomain='<subdomain>')
 @app.route('/', methods=['GET', 'POST'])
-@render_with({'text/html': 'index.html', 'application/json': json_index}, json=False)
+@render_with({'text/html': 'index.html.jinja2', 'application/json': json_index}, json=False)
 def index(basequery=None, md5sum=None, tag=None, domain=None, location=None, title=None, showall=True, statuses=None, batched=True, ageless=False, cached=False, template_vars={}):
     now = datetime.utcnow()
     is_siteadmin = lastuser.has_permission('siteadmin')
@@ -532,7 +532,7 @@ def browse_by_tag(tag):
 @app.route('/tag', subdomain='<subdomain>')
 @app.route('/tag')
 def browse_tags():
-    return render_template('tags.html', tags=gettags(alltime=getbool(request.args.get('all'))))
+    return render_template('tags.html.jinja2', tags=gettags(alltime=getbool(request.args.get('all'))))
 
 
 @app.route('/opensearch.xml', subdomain='<subdomain>')
@@ -700,9 +700,9 @@ def sortarchive(order_by):
     count, posts = getallposts(order_by=order_by, desc=reverse, start=start, limit=limit)
 
     if request.is_xhr:
-        tmpl = 'archive_inner.html'
+        tmpl = 'archive_inner.html.jinja2'
     else:
-        tmpl = 'archive.html'
+        tmpl = 'archive.html.jinja2'
     return render_template(tmpl, order_by=request.args.get('order_by'),
         posts=posts, start=start, limit=limit, count=count,
         # Pass some functions
diff --git a/hasjob/views/listing.py b/hasjob/views/listing.py
index ba00f7739..0c3cf9f5c 100644
--- a/hasjob/views/listing.py
+++ b/hasjob/views/listing.py
@@ -123,7 +123,7 @@ def jobdetail(domain, hashid):
             else:
                 flash("You need to be logged in to report a post", "interactive")
     elif request.method == 'POST' and request.is_xhr:
-        return render_template('inc/reportform.html', reportform=reportform)
+        return render_template('inc/reportform.html.jinja2', reportform=reportform)
 
     if post.company_url and post.status != POSTSTATUS.ANNOUNCEMENT:
         domain_mismatch = not base_domain_matches(post.company_url.lower(), post.email_domain.lower())
@@ -151,7 +151,7 @@ def jobdetail(domain, hashid):
     else:
         post_viewcounts = None
 
-    return render_template('detail.html', post=post, headline=headline,
+    return render_template('detail.html.jinja2', post=post, headline=headline,
         reportform=reportform, rejectform=rejectform, pinnedform=pinnedform,
         jobview=jobview, report=report, moderateform=moderateform,
         domain_mismatch=domain_mismatch, header_campaign=header_campaign,
@@ -188,7 +188,7 @@ def job_related_posts(domain, hashid):
     if is_siteadmin or (g.user and g.user.flags.get('is_employer_month')):
         load_viewcounts(related_posts)
     g.impressions = {rp.id: (False, rp.id, bgroup(jobpost_ab, rp)) for rp in related_posts}
-    return render_template('related_posts.html', post=post,
+    return render_template('related_posts.html.jinja2', post=post,
         related_posts=related_posts, is_siteadmin=is_siteadmin)
 
 
@@ -261,7 +261,7 @@ def revealjob(domain, hashid):
         applyform = forms.ApplicationForm()
         applyform.apply_phone.data = g.user.phone
 
-    return render_template('jobpost_reveal.html',
+    return render_template('jobpost_reveal.html.jinja2',
         post=post,
         instructions=redactemail(post.how_to_apply),
         applyform=applyform,
@@ -321,7 +321,7 @@ def applyjob(domain, hashid):
                 db.session.commit()
                 post.uncache_viewcounts('applied')
                 email_html = email_transform(
-                    render_template('apply_email.html',
+                    render_template('apply_email.html.jinja2',
                         post=post, job_application=job_application,
                         archive_url=job_application.url_for(_external=True)),
                     base_url=request.url_root)
@@ -346,7 +346,7 @@ def applyjob(domain, hashid):
                 return redirect(post.url_for(), 303)
 
         if request.is_xhr:
-            return render_template('inc/applyform.html', post=post, applyform=applyform)
+            return render_template('inc/applyform.html.jinja2', post=post, applyform=applyform)
         else:
             return redirect(post.url_for(), 303)
 
@@ -437,7 +437,7 @@ def view_application(domain, hashid, application):
     else:
         header_campaign = None
 
-    return render_template('application.html', post=post, job_application=job_application,
+    return render_template('application.html.jinja2', post=post, job_application=job_application,
         header_campaign=header_campaign,
         response_form=response_form, statuses=statuses, is_siteadmin=lastuser.has_permission('siteadmin'))
 
@@ -472,7 +472,7 @@ def process_application(domain, hashid, application):
                 job_application.replied_at = datetime.utcnow()
 
                 email_html = email_transform(
-                    render_template('respond_email.html',
+                    render_template('respond_email.html.jinja2',
                         post=post, job_application=job_application,
                         archive_url=job_application.url_for(_external=True)),
                     base_url=request.url_root)
@@ -564,11 +564,11 @@ def send_reject_mail(reject_type, post, banned_posts=[]):
         mail_meta = {
             'reject': {
                 'subject': "About your job post on Hasjob",
-                'template': "reject_email.html"
+                'template': "reject_email.html.jinja2"
             },
             'ban': {
                 'subject': "About your account and job posts on Hasjob",
-                'template': "reject_domain_email.html"
+                'template': "reject_domain_email.html.jinja2"
             }
         }
         msg = Message(subject=mail_meta[reject_type]['subject'], recipients=[post.email])
@@ -631,7 +631,7 @@ def reject_post(post, reason, spam=False):
         else:
             flash(flashmsg, "interactive")
     elif request.method == 'POST' and request.is_xhr:
-        return render_template('inc/rejectform.html', post=post, rejectform=rejectform)
+        return render_template('inc/rejectform.html.jinja2', post=post, rejectform=rejectform)
     return redirect(post.url_for(), code=303)
 
 
@@ -656,7 +656,7 @@ def moderatejob(domain, hashid):
         post.status = POSTSTATUS.MODERATED
         msg = Message(subject="About your job post on Hasjob",
             recipients=[post.email])
-        msg.html = email_transform(render_template('moderate_email.html', post=post), base_url=request.url_root)
+        msg.html = email_transform(render_template('moderate_email.html.jinja2', post=post), base_url=request.url_root)
         msg.body = html2text(msg.html)
         mail.send(msg)
         db.session.commit()
@@ -665,7 +665,7 @@ def moderatejob(domain, hashid):
         if request.is_xhr:
             return "<p>%s</p>" % flashmsg
     elif request.method == 'POST' and request.is_xhr:
-        return render_template('inc/moderateform.html', post=post, moderateform=moderateform)
+        return render_template('inc/moderateform.html.jinja2', post=post, moderateform=moderateform)
     return redirect(post.url_for(), code=303)
 
 
@@ -689,7 +689,7 @@ def confirm(domain, hashid):
         # User has accepted terms of service. Now send email and/or wait for payment
         msg = Message(subject="Confirmation of your job post at Hasjob",
             recipients=[post.email])
-        msg.html = email_transform(render_template('confirm_email.html', post=post), base_url=request.url_root)
+        msg.html = email_transform(render_template('confirm_email.html.jinja2', post=post), base_url=request.url_root)
         msg.body = html2text(msg.html)
         mail.send(msg)
         post.email_sent = True
@@ -699,8 +699,8 @@ def confirm(domain, hashid):
         footer_campaign = Campaign.for_context(CAMPAIGN_POSITION.AFTERPOST, board=g.board, user=g.user,
                     anon_user=g.anon_user, geonameids=g.user_geonameids)
 
-        return render_template('mailsent.html', footer_campaign=footer_campaign)
-    return render_template('confirm.html', post=post, form=form)
+        return render_template('mailsent.html.jinja2', footer_campaign=footer_campaign)
+    return render_template('confirm.html.jinja2', post=post, form=form)
 
 
 @app.route('/confirm/demo', defaults={'domain': None}, methods=('GET', 'POST'), subdomain='<subdomain>')
@@ -709,7 +709,7 @@ def confirm_demo(domain):
     footer_campaign = Campaign.for_context(CAMPAIGN_POSITION.AFTERPOST, board=g.board, user=g.user,
                 anon_user=g.anon_user, geonameids=g.user_geonameids)
 
-    return render_template('mailsent.html', footer_campaign=footer_campaign)
+    return render_template('mailsent.html.jinja2', footer_campaign=footer_campaign)
 
 
 @app.route('/<domain>/<hashid>/confirm/<key>', subdomain='<subdomain>')
@@ -732,7 +732,7 @@ def confirm_email(domain, hashid, key):
         return redirect(post.url_for('confirm'), code=302)
     elif post.status == POSTSTATUS.PENDING:
         if key != post.email_verify_key:
-            return render_template('403.html', description=u"This link has expired or is malformed. Check if you have received a newer email from us.")
+            return render_template('403.html.jinja2', description=u"This link has expired or is malformed. Check if you have received a newer email from us.")
         else:
             if app.config.get('THROTTLE_LIMIT', 0) > 0:
                 post_count = JobPost.query.filter(JobPost.email_domain == post.email_domain).filter(
@@ -791,7 +791,7 @@ def withdraw(domain, hashid, key):
         # cache bust
         dogpile.invalidate_region('hasjob_index')
         return redirect(url_for('index'), code=303)
-    return render_template("withdraw.html", post=post, form=form)
+    return render_template("withdraw.html.jinja2", post=post, form=form)
 
 
 @app.route('/<domain>/<hashid>/edit', methods=('GET', 'POST'), defaults={'key': None}, subdomain='<subdomain>')
@@ -956,7 +956,7 @@ def editjob(hashid, key, domain=None, form=None, validated=False, newpost=None):
         flash("Please review the indicated issues", category='interactive')
     elif request.method == 'GET':
         form.populate_from(post)
-    return render_template('postjob.html', form=form, no_email=no_email)
+    return render_template('postjob.html.jinja2', form=form, no_email=no_email)
 
 
 @app.route('/new', methods=('GET', 'POST'), subdomain='<subdomain>')
@@ -1021,7 +1021,7 @@ def newjob():
     # Render page. Execution reaches here under three conditions:
     # 1. GET request, page loaded for the first time
     # 2. POST request from this page, with errors
-    return render_template('postjob.html', form=form, no_removelogo=True, archived_post=archived_post,
+    return render_template('postjob.html.jinja2', form=form, no_removelogo=True, archived_post=archived_post,
         header_campaign=header_campaign)
 
 
@@ -1046,7 +1046,7 @@ def close(domain, hashid, key):
         # cache bust
         dogpile.invalidate_region('hasjob_index')
         return redirect(post.url_for(), code=303)
-    return render_template("close.html", post=post, form=form)
+    return render_template("close.html.jinja2", post=post, form=form)
 
 
 @app.route('/<domain>/<hashid>/reopen', methods=('GET', 'POST'), defaults={'key': None}, subdomain='<subdomain>')
@@ -1069,4 +1069,4 @@ def reopen(domain, hashid, key):
         # cache bust
         dogpile.invalidate_region('hasjob_index')
         return redirect(post.url_for(), code=303)
-    return render_template("reopen.html", post=post, form=form)
+    return render_template("reopen.html.jinja2", post=post, form=form)
diff --git a/hasjob/views/static.py b/hasjob/views/static.py
index e76fa3f86..862fd657d 100644
--- a/hasjob/views/static.py
+++ b/hasjob/views/static.py
@@ -5,4 +5,4 @@
 @app.route('/tos', subdomain='<subdomain>')
 @app.route('/tos')
 def terms_of_service():
-    return render_template('tos.html')
+    return render_template('tos.html.jinja2')