diff --git a/assets/js/markdown.js b/assets/js/markdown.js
index bc1fdf1..85b8b32 100644
--- a/assets/js/markdown.js
+++ b/assets/js/markdown.js
@@ -84,18 +84,24 @@ function parseMarkdown(markdown) {
         return '<h' + level + idAttr + '>' + text + '</h' + level + '>';
     });
 
-    // Task lists — must run before general list processing
-    html = html.replace(/^\s*-\s+\[x\]\s+(.+)$/gim, '<li class="task-item task-done"><span class="task-cb">&#x2611;</span> $1</li>');
-    html = html.replace(/^\s*-\s+\[ \]\s+(.+)$/gm,  '<li class="task-item task-todo"><span class="task-cb">&#x2610;</span> $1</li>');
+    // Lists — tag each item type with a placeholder, then wrap consecutive runs
+    html = html.replace(/^\s*\d+\.\s+(.+)$/gm,           '%%OLI%%$1');
+    html = html.replace(/^\s*[-*+]\s+\[x\]\s+(.+)$/gim,  '%%TDI%%$1');
+    html = html.replace(/^\s*[-*+]\s+\[ \]\s+(.+)$/gm,   '%%TTI%%$1');
+    html = html.replace(/^\s*[-*+]\s+(.+)$/gm,            '%%ULI%%$1');
 
-    // Unordered lists (- item or * item) — wrap consecutive <li> in <ul>
-    html = html.replace(/^\s*[-*]\s+(.+)$/gm, '<li>$1</li>');
-    html = html.replace(/(<li>(?:(?!<li>|<\/ul>)[\s\S])*<\/li>(?:\n<li>(?:(?!<li>|<\/ul>)[\s\S])*<\/li>)*)/g, '<ul>$1</ul>');
+    // Wrap consecutive ordered items in <ol>
+    html = html.replace(/(%%OLI%%.+(\n%%OLI%%.+)*)/g, function(block) {
+        return '<ol>' + block.replace(/%%OLI%%(.+)/g, '<li>$1</li>') + '</ol>';
+    });
 
-    // Ordered lists (1. item) — wrap in <ol>
-    html = html.replace(/(?:^\s*\d+\.\s+.+$\n?)+/gm, function(block) {
-        const items = block.trim().replace(/^\s*\d+\.\s+(.+)$/gm, '<li>$1</li>');
-        return '<ol>' + items + '</ol>';
+    // Wrap consecutive unordered/task items in <ul>
+    html = html.replace(/((?:%%(?:ULI|TDI|TTI)%%).+(?:\n(?:%%(?:ULI|TDI|TTI)%%).+)*)/g, function(block) {
+        return '<ul>' + block
+            .replace(/%%ULI%%(.+)/g, '<li>$1</li>')
+            .replace(/%%TDI%%(.+)/g, '<li class="task-item task-done"><span class="task-cb">&#x2611;</span> $1</li>')
+            .replace(/%%TTI%%(.+)/g, '<li class="task-item task-todo"><span class="task-cb">&#x2610;</span> $1</li>')
+            + '</ul>';
     });
 
     // Blockquotes (> text)