diff --git a/src/app/components/tasks/task-body/task-body.component.ts b/src/app/components/tasks/task-body/task-body.component.ts
index c66e195..bfbe5b0 100644
--- a/src/app/components/tasks/task-body/task-body.component.ts
+++ b/src/app/components/tasks/task-body/task-body.component.ts
@@ -16,6 +16,31 @@ import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { TaskTipComponent } from './task-tip/task-tip.component';
 import { TaskPanel, TaskTipData } from '../../../models';
 
+// https://stackoverflow.com/questions/64280814/how-can-i-correctly-highlight-a-line-by-line-code-using-highlight-js-react
+highlight.addPlugin({
+  'after:highlight': (params: { value: string }) => {
+    const openTags: string[] = [];
+
+    params.value = params.value
+      .split('\n')
+      .map((line) => {
+        line = line.replace(/(<span [^>]+>)|(<\/span>)/g, (match) => {
+          if (match === '</span>') {
+            openTags.pop();
+          } else {
+            openTags.push(match);
+          }
+          return match;
+        });
+
+        return `<div>${openTags.join('')}${line}${'</span>'.repeat(
+          openTags.length
+        )}</div>`;
+      })
+      .join('');
+  },
+});
+
 @Component({
   selector: 'ksi-task-body',
   templateUrl: './task-body.component.html',
diff --git a/src/styles.scss b/src/styles.scss
index fdd6811..79500eb 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -59,6 +59,25 @@ Codemirror core style
   }
 }
 
+pre.numberLines {
+  counter-reset: line;
+}
+
+pre.numberLines code {
+  display: block;
+}
+
+pre.numberLines code div::before {
+  content: counter(line);
+  counter-increment: line;
+  display: inline-block;
+  text-align: right;
+  color: #999;
+  border-right: 1px solid #ddd;
+  padding: 0 0.5em 0 0.1em;
+  margin-right: 6px;
+}
+
 table {
   th, td {
     color: $ksi-page-fg;