diff --git a/client/build.js b/client/build.js
index 0581c3a..9b19337 100644
--- a/client/build.js
+++ b/client/build.js
@@ -63,10 +63,10 @@ function bundleHtml(config) {
         collapseWhitespace: true,
         conservativeCollapse: true,
     };
-    glob('./html/**/*.hbs', {}, (er, files) => {
+    glob('./html/**/*.tpl', {}, (er, files) => {
         let templates = {};
         for (const file of files) {
-            const name = path.basename(file, '.hbs').replace(/_/g, '-');
+            const name = path.basename(file, '.tpl').replace(/_/g, '-');
             templates[name] = minify(
                 fs.readFileSync(file, 'utf-8'), minifyOptions);
         }
diff --git a/client/html/endless_pager.hbs b/client/html/endless_pager.tpl
similarity index 100%
rename from client/html/endless_pager.hbs
rename to client/html/endless_pager.tpl
diff --git a/client/html/endless_pager_page.hbs b/client/html/endless_pager_page.tpl
similarity index 100%
rename from client/html/endless_pager_page.hbs
rename to client/html/endless_pager_page.tpl
diff --git a/client/html/file-dropper.hbs b/client/html/file_dropper.tpl
similarity index 100%
rename from client/html/file-dropper.hbs
rename to client/html/file_dropper.tpl
diff --git a/client/html/help.hbs b/client/html/help.tpl
similarity index 100%
rename from client/html/help.hbs
rename to client/html/help.tpl
diff --git a/client/html/help-about.hbs b/client/html/help_about.tpl
similarity index 100%
rename from client/html/help-about.hbs
rename to client/html/help_about.tpl
diff --git a/client/html/help-comments.hbs b/client/html/help_comments.tpl
similarity index 100%
rename from client/html/help-comments.hbs
rename to client/html/help_comments.tpl
diff --git a/client/html/help-keyboard.hbs b/client/html/help_keyboard.tpl
similarity index 100%
rename from client/html/help-keyboard.hbs
rename to client/html/help_keyboard.tpl
diff --git a/client/html/help-search.hbs b/client/html/help_search.tpl
similarity index 100%
rename from client/html/help-search.hbs
rename to client/html/help_search.tpl
diff --git a/client/html/help-search-general.hbs b/client/html/help_search_general.tpl
similarity index 100%
rename from client/html/help-search-general.hbs
rename to client/html/help_search_general.tpl
diff --git a/client/html/help-search-posts.hbs b/client/html/help_search_posts.tpl
similarity index 100%
rename from client/html/help-search-posts.hbs
rename to client/html/help_search_posts.tpl
diff --git a/client/html/help-search-tags.hbs b/client/html/help_search_tags.tpl
similarity index 100%
rename from client/html/help-search-tags.hbs
rename to client/html/help_search_tags.tpl
diff --git a/client/html/help-search-users.hbs b/client/html/help_search_users.tpl
similarity index 100%
rename from client/html/help-search-users.hbs
rename to client/html/help_search_users.tpl
diff --git a/client/html/help-tos.hbs b/client/html/help_tos.tpl
similarity index 100%
rename from client/html/help-tos.hbs
rename to client/html/help_tos.tpl
diff --git a/client/html/home.hbs b/client/html/home.tpl
similarity index 100%
rename from client/html/home.hbs
rename to client/html/home.tpl
diff --git a/client/html/login.hbs b/client/html/login.tpl
similarity index 100%
rename from client/html/login.hbs
rename to client/html/login.tpl
diff --git a/client/html/manual_pager.hbs b/client/html/manual_pager.tpl
similarity index 100%
rename from client/html/manual_pager.hbs
rename to client/html/manual_pager.tpl
diff --git a/client/html/manual_pager_nav.hbs b/client/html/manual_pager_nav.tpl
similarity index 100%
rename from client/html/manual_pager_nav.hbs
rename to client/html/manual_pager_nav.tpl
diff --git a/client/html/password_reset.hbs b/client/html/password_reset.tpl
similarity index 100%
rename from client/html/password_reset.hbs
rename to client/html/password_reset.tpl
diff --git a/client/html/settings.hbs b/client/html/settings.tpl
similarity index 100%
rename from client/html/settings.hbs
rename to client/html/settings.tpl
diff --git a/client/html/tag.hbs b/client/html/tag.tpl
similarity index 100%
rename from client/html/tag.hbs
rename to client/html/tag.tpl
diff --git a/client/html/tag_categories.hbs b/client/html/tag_categories.tpl
similarity index 100%
rename from client/html/tag_categories.hbs
rename to client/html/tag_categories.tpl
diff --git a/client/html/tag_delete.hbs b/client/html/tag_delete.tpl
similarity index 100%
rename from client/html/tag_delete.hbs
rename to client/html/tag_delete.tpl
diff --git a/client/html/tag_merge.hbs b/client/html/tag_merge.tpl
similarity index 100%
rename from client/html/tag_merge.hbs
rename to client/html/tag_merge.tpl
diff --git a/client/html/tag_summary.hbs b/client/html/tag_summary.tpl
similarity index 100%
rename from client/html/tag_summary.hbs
rename to client/html/tag_summary.tpl
diff --git a/client/html/tags_header.hbs b/client/html/tags_header.tpl
similarity index 100%
rename from client/html/tags_header.hbs
rename to client/html/tags_header.tpl
diff --git a/client/html/tags_page.hbs b/client/html/tags_page.tpl
similarity index 100%
rename from client/html/tags_page.hbs
rename to client/html/tags_page.tpl
diff --git a/client/html/top_nav.hbs b/client/html/top_nav.tpl
similarity index 100%
rename from client/html/top_nav.hbs
rename to client/html/top_nav.tpl
diff --git a/client/html/user.hbs b/client/html/user.tpl
similarity index 100%
rename from client/html/user.hbs
rename to client/html/user.tpl
diff --git a/client/html/user_delete.hbs b/client/html/user_delete.tpl
similarity index 100%
rename from client/html/user_delete.hbs
rename to client/html/user_delete.tpl
diff --git a/client/html/user_edit.hbs b/client/html/user_edit.tpl
similarity index 100%
rename from client/html/user_edit.hbs
rename to client/html/user_edit.tpl
diff --git a/client/html/user_registration.hbs b/client/html/user_registration.tpl
similarity index 100%
rename from client/html/user_registration.hbs
rename to client/html/user_registration.tpl
diff --git a/client/html/user_summary.hbs b/client/html/user_summary.tpl
similarity index 100%
rename from client/html/user_summary.hbs
rename to client/html/user_summary.tpl
diff --git a/client/html/users_header.hbs b/client/html/users_header.tpl
similarity index 100%
rename from client/html/users_header.hbs
rename to client/html/users_header.tpl
diff --git a/client/html/users_page.hbs b/client/html/users_page.tpl
similarity index 100%
rename from client/html/users_page.hbs
rename to client/html/users_page.tpl