diff --git a/template/cv.typ b/template/cv.typ
index 8f02768..3e57573 100644
--- a/template/cv.typ
+++ b/template/cv.typ
@@ -1,25 +1,59 @@
-#let timeframe(from, to) = {
+#let pill(fill, content) = {
   block(
     inset: 4pt,
-    fill: luma(240),
+    fill: fill,
     radius: 3pt,
-    text(luma(20), [#from - #to]),
+    text(black, [#content]),
   )
 }
 
-#let work(company, from, to, content) = {
+#let education(degree, university, from, to, location, content) = {
   grid(
     align: horizon,
-    inset: (
-      top: 10pt,
-      bottom: 6pt  
+    rows: (auto, auto),
+    columns: (auto, auto, auto),
+    grid.cell(
+      inset: (
+        bottom: 6pt,
+      ),
+      colspan: 3,
+      stack(
+        dir: ltr,
+        spacing: 6pt,
+        text(13pt, [*#degree*]),
+        pill(luma(230), [#from - #to]),
+        pill(luma(200), location),
+      ),
     ),
-    gutter: 8pt,
-    columns: (auto, auto),
-    [== >> Digital H GmbH],
-    timeframe(from, to)
+    text(luma(90), [*#university*]),
   )
 
+  v(4pt)
+  content
+}
+
+#let work(role, company, from, to, location, content) = {
+  grid(
+    align: horizon,
+    rows: (auto, auto),
+    columns: (auto, auto, auto),
+    grid.cell(
+      inset: (
+        bottom: 6pt,
+      ),
+      colspan: 3,
+      stack(
+        dir: ltr,
+        spacing: 6pt,
+        text(13pt, [*#role*]),
+        pill(luma(230), [#from - #to]),
+        pill(luma(200), location),
+      ),
+    ),
+    text(luma(90), [*#company*]),
+  )
+
+  v(4pt)
   content
 }
 
@@ -62,12 +96,12 @@
           dir: ltr,
           spacing: 10pt,
           text(red, 22pt, [\$ dennis\@schöpf \~>]),
-          text(white, 22pt, [*cv*]),
+          text(white, 22pt, [*lebenslauf*]),
         ),
         text(
           white,
           14pt,
-          positions.join(", ", last: " &\n"),
+          positions.join("\n", last: " & "),
         ),
         v(16pt),
         stack(
@@ -75,8 +109,8 @@
           stack(
             dir: ltr,
             spacing: 6pt,
-            text(red, 11pt, [\$ \~>]),
-            text(white, 11pt, [*contact*]),
+            text(red, 12pt, [\$ \~>]),
+            text(white, 12pt, [*kontakt*]),
           ),
           text(
             white,