diff --git a/TRANSLATIONS.md b/TRANSLATIONS.md
index 6b60ea4d..2fa4fd6e 100644
--- a/TRANSLATIONS.md
+++ b/TRANSLATIONS.md
@@ -1,6 +1,6 @@
 # Translation Status
 
-Last updated: 2026-10-07 09:57:47
+Last updated: 2026-10-09 09:28:47
 
 Reference locale (en): **346 keys**
 
diff --git a/backend/src/controllers/templates.ts b/backend/src/controllers/templates.ts
index e4330a14..0c1a7a2e 100644
--- a/backend/src/controllers/templates.ts
+++ b/backend/src/controllers/templates.ts
@@ -644,7 +644,7 @@ function assertLocalManifestShape(m: unknown): asserts m is LocalManifest {
 
 // Install a template from an uploaded .zip file (local template)
 export async function installLocalTemplateFromZip(
-  zipData: Uint8Array,
+  zipData: Uint8Array<ArrayBuffer>,
 ): Promise<Template> {
   // Create a blob from the zip data for the ZipReader
   const blob = new Blob([zipData]);
diff --git a/backend/src/controllers/templates_new.ts b/backend/src/controllers/templates_new.ts
deleted file mode 100644
index 69613c2a..00000000
--- a/backend/src/controllers/templates_new.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { getDatabase } from "../database/init.ts";
-import { Template } from "../types/index.ts";
-import { generateUUID } from "../utils/uuid.ts";
-
-export const getTemplates = () => {
-  const db = getDatabase();
-  const results = db.query(
-    "SELECT id, name, html, is_default, created_at FROM templates",
-  );
-  return results.map((row: unknown[]) => ({
-    id: row[0] as string,
-    name: row[1] as string,
-    html: row[2] as string,
-    isDefault: Boolean(row[3]),
-    createdAt: new Date(row[4] as string),
-  }));
-};
-
-export const createTemplate = (data: Partial<Template>) => {
-  const db = getDatabase();
-  const templateId = generateUUID();
-
-  const template: Template = {
-    id: templateId,
-    name: data.name!,
-    html: data.html!,
-    isDefault: data.isDefault || false,
-    createdAt: new Date(),
-  };
-
-  db.query(
-    "INSERT INTO templates (id, name, html, is_default, created_at) VALUES (?, ?, ?, ?, ?)",
-    [
-      template.id,
-      template.name,
-      template.html,
-      template.isDefault,
-      template.createdAt,
-    ],
-  );
-
-  return template;
-};
-
-export const updateTemplate = (id: string, data: Partial<Template>) => {
-  const db = getDatabase();
-  db.query(
-    "UPDATE templates SET name = ?, html = ?, is_default = ? WHERE id = ?",
-    [data.name, data.html, data.isDefault, id],
-  );
-
-  const result = db.query(
-    "SELECT id, name, html, is_default, created_at FROM templates WHERE id = ?",
-    [id],
-  );
-  if (result.length > 0) {
-    const row = result[0] as unknown[];
-    return {
-      id: row[0] as string,
-      name: row[1] as string,
-      html: row[2] as string,
-      isDefault: Boolean(row[3]),
-      createdAt: new Date(row[4] as string),
-    };
-  }
-  return null;
-};
-
-export const deleteTemplate = (id: string) => {
-  const db = getDatabase();
-  db.query("DELETE FROM templates WHERE id = ?", [id]);
-  return true;
-};
diff --git a/backend/src/database/init.ts b/backend/src/database/init.ts
index 14ce7837..61652a7e 100644
--- a/backend/src/database/init.ts
+++ b/backend/src/database/init.ts
@@ -5,7 +5,7 @@ import { generateUUID } from "../utils/uuid.ts";
 import { RESOURCE_ACTIONS } from "../types/index.ts";
 import type { Action, Resource } from "../types/index.ts";
 
-let db: DB;
+let db: DB | undefined;
 
 //
 //  Path helpers
@@ -772,7 +772,7 @@ function getNumberingSettings(): {
     enabled: true,
   };
   try {
-    const rows = db.query(
+    const rows = getDatabase().query(
       "SELECT key, value FROM settings WHERE key IN ('invoicePrefix','invoiceIncludeYear','invoiceNumberPadding','invoiceNumberPattern')",
     );
     const m = new Map<string, string>();
@@ -789,7 +789,7 @@ function getNumberingSettings(): {
     cfg.pattern = (m.get("invoiceNumberPattern") || "").trim() || undefined;
 
     try {
-      const raw = db.query(
+      const raw = getDatabase().query(
         "SELECT value FROM settings WHERE key = 'invoiceNumberingEnabled' LIMIT 1",
       );
       if (raw.length > 0) {
@@ -807,11 +807,11 @@ function getNumberingSettings(): {
 /** Find the highest existing sequential suffix matching `likePrefix%`, optionally scoped to a single customer. */
 function findMaxSequence(likePrefix: string, customerId?: string): number {
   const rows = customerId
-    ? db.query(
+    ? getDatabase().query(
       "SELECT invoice_number FROM invoices WHERE invoice_number LIKE ? AND customer_id = ?",
       [likePrefix + "%", customerId],
     )
-    : db.query(
+    : getDatabase().query(
       "SELECT invoice_number FROM invoices WHERE invoice_number LIKE ?",
       [likePrefix + "%"],
     );
@@ -829,7 +829,7 @@ function findMaxSequence(likePrefix: string, customerId?: string): number {
 function getCustomerNumber(customerId?: string): number | null {
   if (!customerId) return null;
   try {
-    const rows = db.query(
+    const rows = getDatabase().query(
       "SELECT customer_number FROM customers WHERE id = ?",
       [customerId],
     ) as unknown[][];
diff --git a/backend/src/routes/admin.ts b/backend/src/routes/admin.ts
index 568fc919..9084b7a3 100644
--- a/backend/src/routes/admin.ts
+++ b/backend/src/routes/admin.ts
@@ -620,7 +620,7 @@ adminRoutes.post(
     try {
       const contentType = c.req.header("content-type") || "";
 
-      let zipData: Uint8Array;
+      let zipData: Uint8Array<ArrayBuffer>;
 
       if (contentType.includes("multipart/form-data")) {
         // Handle multipart form upload
diff --git a/backend/src/utils/oidc.ts b/backend/src/utils/oidc.ts
index 169cc1b9..f8fb6680 100644
--- a/backend/src/utils/oidc.ts
+++ b/backend/src/utils/oidc.ts
@@ -160,7 +160,7 @@ export async function exchangeAndVerify(
 
 // ── ID token verification (RS256) ─────────────────────────────────────────
 
-function b64urlToBytes(b64url: string): Uint8Array {
+function b64urlToBytes(b64url: string): Uint8Array<ArrayBuffer> {
   const b64 = b64url.replace(/-/g, "+").replace(/_/g, "/");
   const padded = b64 + "=".repeat((4 - (b64.length % 4)) % 4);
   const bin = atob(padded);
@@ -193,7 +193,7 @@ async function verifyIdToken(
   const jwks = await getJwks(jwksUri);
   const jwk = jwks.find(
     (k) =>
-      k.kid === header.kid &&
+      (k as Record<string, unknown>).kid === header.kid &&
       (k as Record<string, unknown>).use !== "enc" &&
       ((k as Record<string, unknown>).alg === "RS256" ||
         (k as Record<string, unknown>).kty === "RSA"),