diff --git a/www/res/puzzles.js b/www/res/puzzles.js
index 842284d..d91482a 100644
--- a/www/res/puzzles.js
+++ b/www/res/puzzles.js
@@ -4,60 +4,62 @@ var puzzlesJsonUrl = "puzzles.json?" + ms;
 console.log(puzzlesJsonUrl);
 
 function loadPuzzle(cat, id, points) {
-    console.log("Requested " + cat + "/" + id + "(" + points + ")");
+	console.log("Requested " + cat + "/" + id + "(" + points + ")");
 }
 
 function puzzlesRefresh(term, obj) {
-    term.clear();
+	term.clear();
 
-    for (var cat in obj) {
-	var puzzles = obj[cat];
+	var k = Object.keys(obj);
+	k.sort();
+	k.forEach(function(cat) {
+		var puzzles = obj[cat];
 
-	var pdiv = createElement('div');
-	pdiv.className = 'category';
+		var pdiv = createElement('div');
+		pdiv.className = 'category';
 
-	var h = createElement('h2');
-	pdiv.appendChild(h);
-	h.textContent = cat;
+		var h = createElement('h2');
+		pdiv.appendChild(h);
+		h.textContent = cat;
 
-	var l = createElement('ul');
-	pdiv.appendChild(l);
+		var l = createElement('ul');
+		pdiv.appendChild(l);
 
-	for (var puzzle of puzzles) {
-	    var points = puzzle[0];
-	    var id = puzzle[1];
+		for (var puzzle of puzzles) {
+			var points = puzzle[0];
+			var id = puzzle[1];
 
-	    var i = createElement('li');
-	    l.appendChild(i);
+			var i = createElement('li');
+			l.appendChild(i);
 
-	    if (points == 0) {
-		i.textContent = "‡";
-	    } else {
-		var a = createElement('a');
-		i.appendChild(a);
-		a.className = "link";
-		a.textContent = points;
-                a.href = cat + "/" + id + "/index.html";
-		// a.addEventListener("click", loadPuzzle.bind(undefined, cat, id, points));
-	    }
-	}
+			if (points == 0) {
+				i.textContent = "‡";
+			} else {
+				var a = createElement('a');
+				i.appendChild(a);
+				a.className = "link";
+				a.textContent = points;
+				a.href = cat + "/" + id + "/index.html";
+				// a.addEventListener("click", loadPuzzle.bind(undefined, cat, id, points));
+			}
+		}
 
-	term.appendShallow(pdiv);
-    }
+		term.appendShallow(pdiv);
+	});
 }
 
 function puzzles_start() {
-    var element = document.getElementById("puzzles");
-    var puzzlesTerminal = new Terminal(element);
-    var refreshInterval = 40 * 1000;
+	var element = document.getElementById("puzzles");
+	var puzzlesTerminal = new Terminal(element);
+	var refreshInterval = 40 * 1000;
 
-    var refreshCallback = puzzlesRefresh.bind(undefined, puzzlesTerminal);
-    var refreshFunction = loadJSON.bind(undefined, puzzlesJsonUrl, refreshCallback);
+	var refreshCallback = puzzlesRefresh.bind(undefined, puzzlesTerminal);
+	var refreshFunction = loadJSON.bind(undefined, puzzlesJsonUrl, refreshCallback);
 
-    puzzlesTerminal.clear();
-    puzzlesTerminal.par("Loading...");
-    refreshFunction();
-    setInterval(refreshFunction, refreshInterval);
+	puzzlesTerminal.clear();
+	puzzlesTerminal.par("Loading...");
+	refreshFunction();
+	setInterval(refreshFunction, refreshInterval);
 }
 
 window.addEventListener("load", puzzles_start);