diff --git a/content/ss24/bachelor/b0-template/techstack.md b/content/ss24/bachelor/b0-template/techstack.md
index 2875183bb..0167a84c6 100644
--- a/content/ss24/bachelor/b0-template/techstack.md
+++ b/content/ss24/bachelor/b0-template/techstack.md
@@ -2,15 +2,42 @@
 title = "Tech Stack"
 weight = 30
 draft = true
+hasMermaid = true
 +++
 
-{{<section title="Tech Stack">}}
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla facilisis neque id vulputate malesuada. Quisque dignissim finibus urna sed sagittis. 
-
 
+{{<section title="Tech Stack">}}
+Hugo offers a couple of options to include diagrams right in the source code, see
+[https://gohugo.io/content-management/diagrams/](https://gohugo.io/content-management/diagrams/)
+
+Here's a mermaid example: (note the hasMermaid = true parameter in the front matter!)
+
+```mermaid
+classDiagram
+    Animal <|-- Duck
+    Animal <|-- Fish
+    Animal <|-- Zebra
+    Animal : +int age
+    Animal : +String gender
+    Animal: +isMammal()
+    Animal: +mate()
+    class Duck{
+      +String beakColor
+      +swim()
+      +quack()
+    }
+    class Fish{
+      -int sizeInFeet
+      -canEat()
+    }
+    class Zebra{
+      +bool is_wild
+      +run()
+    }
+```
 {{</section>}}
 
+
 {{<section title="Future">}}
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla facilisis neque id vulputate malesuada. Quisque dignissim finibus urna sed sagittis. 
diff --git a/content/ss24/master/m0-template/techstack.md b/content/ss24/master/m0-template/techstack.md
index 2875183bb..301d02e13 100644
--- a/content/ss24/master/m0-template/techstack.md
+++ b/content/ss24/master/m0-template/techstack.md
@@ -2,19 +2,71 @@
 title = "Tech Stack"
 weight = 30
 draft = true
+hasMermaid = true
 +++
 
 {{<section title="Tech Stack">}}
+Hugo offers a couple of options to include diagrams right in the source code, see
+[https://gohugo.io/content-management/diagrams/](https://gohugo.io/content-management/diagrams/)
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla facilisis neque id vulputate malesuada. Quisque dignissim finibus urna sed sagittis. 
-
+Here's a mermaid example: (note the hasMermaid = true parameter in the front matter!)
 
+```mermaid
+classDiagram
+    Animal <|-- Duck
+    Animal <|-- Fish
+    Animal <|-- Zebra
+    Animal : +int age
+    Animal : +String gender
+    Animal: +isMammal()
+    Animal: +mate()
+    class Duck{
+      +String beakColor
+      +swim()
+      +quack()
+    }
+    class Fish{
+      -int sizeInFeet
+      -canEat()
+    }
+    class Zebra{
+      +bool is_wild
+      +run()
+    }
+```
 {{</section>}}
 
 {{<section title="Future">}}
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla facilisis neque id vulputate malesuada. Quisque dignissim finibus urna sed sagittis. 
 
 
+```goat
++-------------------+                           ^                      .---.
+|    A Box          |__.--.__    __.-->         |      .-.             |   |
+|                   |        '--'               v     | * |<---        |   |
++-------------------+                                  '-'             |   |
+                       Round                                       *---(-. |
+  .-----------------.  .-------.    .----------.         .-------.     | | |
+ |   Mixed Rounded  | |         |  / Diagonals  \        |   |   |     | | |
+ | & Square Corners |  '--. .--'  /              \       |---+---|     '-)-'       .--------.
+ '--+------------+-'  .--. |     '-------+--------'      |   |   |       |        / Search /
+    |            |   |    | '---.        |               '-------'       |       '-+------'
+    |<---------->|   |    |      |       v                Interior                 |     ^
+    '           <---'      '----'   .-----------.              ---.     .---       v     |
+ .------------------.  Diag line    | .-------. +---.              \   /           .     |
+ |   if (a > b)     +---.      .--->| |       | |    | Curved line  \ /           / \    |
+ |   obj->fcn()     |    \    /     | '-------' |<--'                +           /   \   |
+ '------------------'     '--'      '--+--------'      .--. .--.     |  .-.     +Done?+-'
+    .---+-----.                        |   ^           |\ | | /|  .--+ |   |     \   /
+    |   |     | Join        \|/        |   | Curved    | \| |/ | |    \    |      \ /
+    |   |     +---->  o    --o--        '-'  Vertical  '--' '--'  '--  '--'        +  .---.
+ <--+---+-----'       |     /|\                                                    |  | 3 |
+                      v                             not:line    'quotes'        .-'   '---'
+  .-.             .---+--------.            /            A || B   *bold*       |        ^
+ |   |           |   Not a dot  |      <---+---<--    A dash--is not a line    v        |
+  '-'             '---------+--'          /           Nor/is this.            ---
+
+```
+Goat Diagrams are also supported :)
 {{</section>}}
 
diff --git a/themes/showtime-theme-2021 b/themes/showtime-theme-2021
index 25ff8b2c9..68ca260eb 160000
--- a/themes/showtime-theme-2021
+++ b/themes/showtime-theme-2021
@@ -1 +1 @@
-Subproject commit 25ff8b2c9e5c84ab41dfaf13916e936d16e2ff40
+Subproject commit 68ca260eb590eb844a3123a9a005f43edd04cd61