diff --git a/src/armory/Armory.ts b/src/armory/Armory.ts
index 1b3a5e7..42bd4db 100644
--- a/src/armory/Armory.ts
+++ b/src/armory/Armory.ts
@@ -80,11 +80,11 @@ export class Armory {
 		app.locals.websiteName = this.config.websiteName;
 		app.locals.iframeMode = this.config.iframeMode;
 
-		app.engine(".html", handlebarsEngine({
-			extname: "html",
+		app.engine(".hbs", handlebarsEngine({
+			extname: "hbs",
 			partialsDir: path.join(process.cwd(), "static", "partials"),
 			layoutsDir: path.join(process.cwd(), "static"),
-			defaultLayout: "layout.html",
+			defaultLayout: "layout.hbs",
 			helpers: {
 				...require("handlebars-helpers")(),
 			},
@@ -139,7 +139,7 @@ export class Armory {
 				status = err;
 			}
 
-			res.status(status).render("error.html", this.getErrorViewData(status, req));
+			res.status(status).render("error.hbs", this.getErrorViewData(status, req));
 		});
 
 		app.use((req: express.Request, res: express.Response, next: express.NextFunction) => {
@@ -148,7 +148,7 @@ export class Armory {
 
 			// Respond with html page
 			if (req.accepts("html")) {
-				return res.render("error.html", this.getErrorViewData(404, req));
+				return res.render("error.hbs", this.getErrorViewData(404, req));
 			}
 
 			// Respond with json
diff --git a/src/armory/controllers/CharacterController.ts b/src/armory/controllers/CharacterController.ts
index 245cdb2..2f0112f 100644
--- a/src/armory/controllers/CharacterController.ts
+++ b/src/armory/controllers/CharacterController.ts
@@ -176,7 +176,7 @@ export class CharacterController {
 		});
 		const mounts = await this.getMounts(realmName, charData.guid);
 
-		res.render("character.html", {
+		res.render("character.hbs", {
 			title: `Armory - ${charName}`,
 			...this.makeSharedDataObject(realm, charData),
 			data: JSON.stringify({
@@ -210,7 +210,7 @@ export class CharacterController {
 			return next(404);
 		}
 
-		res.render("character-talents.html", {
+		res.render("character-talents.hbs", {
 			title: `Armory - ${charName} - Talents`,
 			...this.makeSharedDataObject(realm, charData),
 			data: JSON.stringify({
@@ -237,7 +237,7 @@ export class CharacterController {
 			return next(404);
 		}
 
-		res.render("character-achievements.html", {
+		res.render("character-achievements.hbs", {
 			title: `Armory - ${charName} - Achievements`,
 			...this.makeSharedDataObject(realm, charData),
 		});
diff --git a/src/armory/controllers/IndexController.ts b/src/armory/controllers/IndexController.ts
index fe0eee3..6b3a992 100644
--- a/src/armory/controllers/IndexController.ts
+++ b/src/armory/controllers/IndexController.ts
@@ -38,7 +38,7 @@ export class IndexController {
 	}
 
 	public async index(req: express.Request, res: express.Response): Promise<void> {
-		res.render("index.html", {
+		res.render("index.hbs", {
 			title: "Armory",
 			realms: this.armory.config.realms.map(r => r.name),
 		});
diff --git a/static/character-achievements.html b/static/character-achievements.hbs
similarity index 100%
rename from static/character-achievements.html
rename to static/character-achievements.hbs
diff --git a/static/character-talents.html b/static/character-talents.hbs
similarity index 100%
rename from static/character-talents.html
rename to static/character-talents.hbs
diff --git a/static/character.html b/static/character.hbs
similarity index 100%
rename from static/character.html
rename to static/character.hbs
diff --git a/static/error.html b/static/error.hbs
similarity index 100%
rename from static/error.html
rename to static/error.hbs
diff --git a/static/index.html b/static/index.hbs
similarity index 100%
rename from static/index.html
rename to static/index.hbs
diff --git a/static/layout.html b/static/layout.hbs
similarity index 100%
rename from static/layout.html
rename to static/layout.hbs
diff --git a/static/partials/character-header.html b/static/partials/character-header.hbs
similarity index 100%
rename from static/partials/character-header.html
rename to static/partials/character-header.hbs
diff --git a/static/partials/icons.html b/static/partials/icons.hbs
similarity index 100%
rename from static/partials/icons.html
rename to static/partials/icons.hbs