--- a/page.c	Tue Feb 21 22:22:02 2023 +0100
+++ b/page.c	Wed Mar 15 19:34:00 2023 +0100
@@ -2,11 +2,11 @@
  * page.c -- page renderer
  *
  * Copyright (c) 2020-2023 David Demelier <markand@malikania.fr>
- * 
+ *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
@@ -16,62 +16,76 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
 #include <assert.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdlib.h>
+#include <string.h>
 
-#include <kcgi.h>
-#include <kcgihtml.h>
+#include <mustach-jansson.h>
 
-#include "fmt.h"
 #include "page.h"
 #include "util.h"
 
+#include "html/footer.h"
 #include "html/header.h"
-#include "html/footer.h"
+#include "html/status.h"
+
+static const int statustab[] = {
+	[KHTTP_200] = 200,
+	[KHTTP_400] = 400,
+	[KHTTP_404] = 404,
+	[KHTTP_500] = 500
+};
+
+static const char * const statusmsg[] = {
+	[KHTTP_200] = "OK",
+	[KHTTP_400] = "Bad Request",
+	[KHTTP_404] = "Not Found",
+	[KHTTP_500] = "Internal Server Error"
+};
+
+static int
+writer(void *data, const char *buffer, size_t size)
+{
+	struct kreq *req = data;
+
+	khttp_write(req, buffer, size);
+
+	return MUSTACH_OK;
+}
 
 static void
-print_title(struct kreq *req, struct khtmlreq *html, const void *data)
+format(struct kreq *req, const char *html, json_t *doc)
 {
-	(void)req;
-
-	khtml_printf(html, "%s", (const char *)data);
+	if (!doc)
+		khttp_template_buf(req, NULL, html, strlen(html));
+	else
+		mustach_jansson_write(html, strlen(html), doc, 0, writer, req);
 }
 
 void
-page(struct kreq *req, const struct ktemplate *tmpl, enum khttp status, const char *file, const char *title)
+page(struct kreq *req, enum khttp status, const unsigned char *html, json_t *doc)
 {
+	assert(req);
+	assert(html);
+
 	khttp_head(req, kresps[KRESP_CONTENT_TYPE], "%s", kmimetypes[KMIME_TEXT_HTML]);
 	khttp_head(req, kresps[KRESP_STATUS], "%s", khttps[status]);
 	khttp_body(req);
+	format(req, (const char *)html_header, doc);
+	format(req, (const char *)html, doc);
+	format(req, (const char *)html_footer, doc);
+	khttp_free(req);
 
-	fmt(req, html_header, title, (const struct fmt_printer []) {
-		{ "title",      print_title     },
-		{ NULL,         NULL            }
-	});
-	fmt(req, html_footer, NULL, NULL);
-	khttp_free(req);
+	if (doc)
+		json_decref(doc);
 }
 
 void
-page2(struct kreq *req,
-      enum khttp status,
-      const char *title,
-      const unsigned char *html,
-      const void *data,
-      const struct fmt_printer *printers)
+page_status(struct kreq *req, enum khttp status)
 {
-	khttp_head(req, kresps[KRESP_CONTENT_TYPE], "%s", kmimetypes[KMIME_TEXT_HTML]);
-	khttp_head(req, kresps[KRESP_STATUS], "%s", khttps[status]);
-	khttp_body(req);
+	assert(req);
 
-	fmt(req, html_header, title, (const struct fmt_printer []) {
-		{ "title",      print_title     },
-		{ NULL,         NULL            }
-	});
-	fmt(req, html, data, printers);
-	fmt(req, html_footer, NULL, NULL);
-	khttp_free(req);
+	page(req, status, html_status, json_pack("{si ss}",
+		"code",         statustab[status],
+		"status",       statusmsg[status]
+	));
 }