diff --git a/config.toml b/config.toml
index 1f8bf0e..4fa2477 100644
--- a/config.toml
+++ b/config.toml
@@ -113,6 +113,11 @@ lazy_async_image = false
 
 # Configuration of the link checker.
 
+[markdown.highlighting]
+theme = "catppuccin-frappe"
+style = "class"
+error_on_missing_language = true
+
 [link_checker]
 # Skip link checking for external URLs that start with these prefixes
 skip_prefixes = ["http://[2001:db8::]/"]
diff --git a/themes/tabi/sass/parts/_code.scss b/themes/tabi/sass/parts/_code.scss
index ac4f837..1d8eeff 100644
--- a/themes/tabi/sass/parts/_code.scss
+++ b/themes/tabi/sass/parts/_code.scss
@@ -14,6 +14,7 @@ code {
         color: inherit;
     }
 
+    /* Legacy table support for Zola versions older than 0.22.0 */
     table {
         margin: 0rem;
         border-collapse: collapse;
@@ -21,18 +22,15 @@ code {
         width: 100%;
         text-align: start;
 
-        td,
-        th,
-        tr {
+        td, th, tr {
             border: none;
             padding: 0rem;
         }
 
-        // Line number col.
         tbody td:first-child {
             opacity: 50%;
             padding-inline-end: 0.8rem;
-            width: 1px;  // Without this, iOS Safari centres short lines.
+            width: 1px;
             user-select: none;
             text-align: end;
         }
@@ -41,6 +39,23 @@ code {
             background-color: inherit;
         }
     }
+    /* Span-based layout (Giallo; Zola v0.22.0 and above) */
+    .giallo-l {
+        float: left;
+        clear: left;
+        width: 100%;
+        line-height: 1.2;
+    }
+
+    .giallo-ln {
+        display: inline-block;
+        opacity: 0.5;
+        padding-inline-end: 0.8rem;
+        min-width: 3ch;
+        color: inherit;
+        user-select: none;
+        text-align: end;
+    }
 }
 
 a:hover code {
@@ -65,8 +80,8 @@ pre {
 
     // Supports both native Zola way of adding src, and old shortcode-based logic.
     // See: https://github.com/welpo/tabi/pull/489
-    &::after,
-    code .source-path {
+    code .source-path,
+    code[data-name]::after {
         display: block;
         position: absolute;
         top: 0;
@@ -76,13 +91,16 @@ pre {
         max-width: calc(100% - 14em);
         height: 0.9rem;
         overflow: hidden;
-        content: attr(data-name);
         color: var(--hover-color);
         font-size: 0.65rem;
         text-align: end;
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+ 
+    code[data-name]::after {
+        content: attr(data-name);
+    }
 
     code {
         display: block;
@@ -123,6 +141,10 @@ html[data-code-direction="inherit"] {
     code, pre {
         direction: inherit;
     }
+    .giallo-l {
+        float: right;
+        clear: right;
+    }
 }
 
 .copy-code {