diff --git a/assets/css/v2/style.css b/assets/css/v2/style.css
index a9689e49..1b8e1bf7 100644
--- a/assets/css/v2/style.css
+++ b/assets/css/v2/style.css
@@ -973,6 +973,61 @@ blockquote p:last-child {
 }
 
 /* Codeblocks */
+.highlight {
+  grid-column: 1 / -1 !important;
+  width: 100%;
+  position: relative;
+  z-index: -1;
+  display: grid;
+  grid-template-columns: 40% 60%;
+
+  pre.chroma {
+    grid-column: 1 / -1;
+  }
+
+  code .line {
+    display: grid;
+    grid-template-columns: 40% 60%;
+    grid-template-areas: "comment code";
+    position: relative;
+
+    .cl {
+      grid-column: 2 / -1;
+      grid-area: code;
+    }
+
+    .c1:not(:empty) {
+      position: relative;
+      display: inline-block;
+      white-space: normal;
+      margin-bottom: var(--codeblock-comment-space-between);
+      width: calc(100% - (var(--codeblock-comment-diff) * 2));
+      border: black var(--codeblock-border-thickness) solid;
+      box-shadow: 3px 3px 0px var(--color-shadow);
+      padding: 8px;
+      grid-column: 1;
+      grid-area: comment;
+    }
+
+    &:has(.c1:not(:empty)) .cl {
+      height: fit-content;
+      margin-bottom: var(--codeblock-comment-space-between);
+      background-color: var(--color-codeblock-code-with-comment);
+    }
+
+    &:has(.c1) .cl::before {
+      content: "";
+      border-left: none;
+      border-top: black var(--codeblock-border-thickness) solid;
+      left: calc(var(--codeblock-comment-diff) * -1);
+      width: calc(
+        var(--codeblock-horizontal-line-length) +
+        var(--codeblock-horizontal-line-overflow)
+      );
+    }
+  }
+}
+
 .highlight-mf {
   grid-column: 1 / -1 !important;
   position: relative;
@@ -1005,7 +1060,7 @@ blockquote p:last-child {
       " comment ";
   }
 
-  code .line:has(.comment) .code {
+  code .line:has(.comment) .code.c1 {
     display: inline-block;
     height: fit-content;
     white-space: pre-wrap;
diff --git a/assets/js/codeblock-v2.js b/assets/js/codeblock-v2.js
new file mode 100644
index 00000000..ce0dcd0b
--- /dev/null
+++ b/assets/js/codeblock-v2.js
@@ -0,0 +1,7 @@
+document.addEventListener('DOMContentLoaded', () => {
+  const codeblockLines = document.querySelectorAll('span.c1');
+  codeblockLines.forEach((val) => {
+    const parent = val.parentNode;
+    parent.parentNode.insertBefore(val, parent.nextSibling);
+  });
+});
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 77c0d434..e9594c2e 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -60,7 +60,9 @@
 
 {{ end }}
 
-
+<!-- Load Codeblock javascript -->
+{{ $jsCodeblockV2 := resources.Get "js/codeblock-v2.js" | minify | fingerprint "sha512" }}
+<script src="{{ $jsCodeblockV2.RelPermalink }}" type="text/javascript" integrity="{{ $jsCodeblockV2.Data.Integrity }}"></script>
 
 <!-- Load Sidebar javascript -->
 {{ $jsSidebar := resources.Get "js/sidebar.js" | minify | fingerprint "sha512" }}