diff --git a/src/classic/BulletEntry.j2.typ b/src/classic/BulletEntry.j2.typ
index c179c66..addd8c5 100644
--- a/src/classic/BulletEntry.j2.typ
+++ b/src/classic/BulletEntry.j2.typ
@@ -1,3 +1 @@
-#one-col-entry(
-  content: [- <<entry.bullet>>],
-)
+#one-col-entry(content: [#bullet-entry[<<entry.bullet>>]])
diff --git a/src/classic/EducationEntry.j2.typ b/src/classic/EducationEntry.j2.typ
index cd89d65..6c4eb9d 100644
--- a/src/classic/EducationEntry.j2.typ
+++ b/src/classic/EducationEntry.j2.typ
@@ -10,7 +10,7 @@
     #v(-design-text-leading)
     ((* endif *))
 
-    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")>>
+    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")|replace("!!LINEBREAK!!", "\n\n")>>
     ((* endif *))
   ],
   right-content: [
@@ -39,7 +39,7 @@
     #v(-design-text-leading)
     ((* endif *))
 
-    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")>>
+    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")|replace("!!LINEBREAK!!", "\n\n")>>
     ((* endif *))
   ],
   right-content: [
@@ -74,7 +74,7 @@
     #v(-design-text-leading)
     ((* endif *))
   
-    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")>>
+    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")|replace("!!LINEBREAK!!", "\n\n")>>
     ((* endif *))
   ],
 )
@@ -100,7 +100,7 @@
     ((* if main_column_second_row_template *))
     #v(-design-text-leading)
     ((* endif *))
-    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")>>
+    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")|replace("!!LINEBREAK!!", "\n\n")>>
   ],
 )
 ((* endif *))
\ No newline at end of file
diff --git a/src/classic/ExperienceEntry.j2.typ b/src/classic/ExperienceEntry.j2.typ
index ce90bd4..163487f 100644
--- a/src/classic/ExperienceEntry.j2.typ
+++ b/src/classic/ExperienceEntry.j2.typ
@@ -7,7 +7,7 @@
     #v(-design-text-leading)
     ((* endif *))
 
-    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")>>
+    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")|replace("!!LINEBREAK!!", "\n\n")>>
     ((* endif *))
   ],
   right-content: [
@@ -17,7 +17,7 @@
   ((* if not (design.entries.short_second_row or date_and_location_column_template.count("\n\n") > main_column_first_row_template.count("\n\n") or design.section_titles.type=="moderncv") *))
 #one-col-entry(
   content: [
-    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")>>
+    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")|replace("!!LINEBREAK!!", "\n\n")>>
   ],
 )
 ((* endif *))
@@ -30,7 +30,7 @@
     ((* if main_column_second_row_template *))
     #v(-design-text-leading)
     ((* endif *))
-    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")>>
+    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")|replace("!!LINEBREAK!!", "\n\n")>>
   ],
 )
 ((* endif *))
diff --git a/src/classic/Header.j2.typ b/src/classic/Header.j2.typ
index 17baacc..4a2614e 100644
--- a/src/classic/Header.j2.typ
+++ b/src/classic/Header.j2.typ
@@ -12,24 +12,24 @@
   right-content: [
 ((* endif *))
 ((* if cv.name *))
-= <<cv.name>>
+= <<cv.name|escape_typst_characters>>
 ((* endif *))
 
 // Print connections:
 #let connections-list = (
 ((* for connection in cv.connections *))
-  [((*- if connection["url"] -*))
+  [((*- if connection["url"] and design.header.make_connections_links -*))
   #box(original-link("<<connection["url"]>>")[
   ((*- endif -*))
   ((*- if design.header.use_icons_for_connections -*))
     #fa-icon("<<connection["typst_icon"]>>", size: 0.9em) #h(0.05cm)
   ((*- endif -*))
-  ((*- if design.header.use_icons_for_connections or not connection["url"] -*))
+  ((*- if not design.header.use_urls_as_placeholders_for_connections or not connection["url"] -*))
     <<connection["placeholder"]|escape_typst_characters>>
   ((*- else -*))
     <<connection["clean_url"]|escape_typst_characters>>
   ((*- endif -*))
-  ((*- if connection["url"] -*))
+  ((*- if connection["url"] and design.header.make_connections_links -*))
   ])
   ((*- endif -*))],
 ((* endfor *))
diff --git a/src/classic/NormalEntry.j2.typ b/src/classic/NormalEntry.j2.typ
index ce90bd4..163487f 100644
--- a/src/classic/NormalEntry.j2.typ
+++ b/src/classic/NormalEntry.j2.typ
@@ -7,7 +7,7 @@
     #v(-design-text-leading)
     ((* endif *))
 
-    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")>>
+    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")|replace("!!LINEBREAK!!", "\n\n")>>
     ((* endif *))
   ],
   right-content: [
@@ -17,7 +17,7 @@
   ((* if not (design.entries.short_second_row or date_and_location_column_template.count("\n\n") > main_column_first_row_template.count("\n\n") or design.section_titles.type=="moderncv") *))
 #one-col-entry(
   content: [
-    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")>>
+    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")|replace("!!LINEBREAK!!", "\n\n")>>
   ],
 )
 ((* endif *))
@@ -30,7 +30,7 @@
     ((* if main_column_second_row_template *))
     #v(-design-text-leading)
     ((* endif *))
-    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")>>
+    <<main_column_second_row_template|replace("\n\n", "\n\n#v(-design-text-leading)")|replace("!!LINEBREAK!!", "\n\n")>>
   ],
 )
 ((* endif *))
diff --git a/src/classic/NumberedEntry.j2.typ b/src/classic/NumberedEntry.j2.typ
new file mode 100644
index 0000000..b8ec33e
--- /dev/null
+++ b/src/classic/NumberedEntry.j2.typ
@@ -0,0 +1 @@
++ <<entry.number>>
\ No newline at end of file
diff --git a/src/classic/Preamble.j2.typ b/src/classic/Preamble.j2.typ
index a4984a5..ced8f25 100644
--- a/src/classic/Preamble.j2.typ
+++ b/src/classic/Preamble.j2.typ
@@ -10,18 +10,18 @@
 } *))
 #import "@preview/fontawesome:0.5.0": fa-icon
 
-#let name = "<<cv.name>>"
+#let name = "<<cv.name|remove_typst_commands>>"
 #let locale-catalog-page-numbering-style = context { "<<locale.page_numbering_template|replace_placeholders_with_actual_values(page_numbering_template_placeholders)>>" }
 #let locale-catalog-last-updated-date-style = "<<locale.last_updated_date_template|replace_placeholders_with_actual_values(last_updated_date_template_placeholders)>>"
 #let locale-catalog-language = "<<locale.language>>"
 #let design-page-size = "<<design.page.size>>"
-#let design-section-titles-font-size = <<design.section_titles.font_size>>
 #let design-colors-text = <<design.colors.text.as_rgb()>>
 #let design-colors-section-titles = <<design.colors.section_titles.as_rgb()>>
 #let design-colors-last-updated-date-and-page-numbering = <<design.colors.last_updated_date_and_page_numbering.as_rgb()>>
 #let design-colors-name = <<design.colors.name.as_rgb()>>
 #let design-colors-connections = <<design.colors.connections.as_rgb()>>
 #let design-colors-links = <<design.colors.links.as_rgb()>>
+#let design-section-titles-font-family = "<<design.section_titles.font_family>>"
 #let design-section-titles-bold = <<design.section_titles.bold|lower>>
 #let design-section-titles-line-thickness = <<design.section_titles.line_thickness>>
 #let design-section-titles-font-size = <<design.section_titles.font_size>>
@@ -37,8 +37,11 @@
 #let design-text-date-and-location-column-alignment = <<design.text.date_and_location_column_alignment>>
 #let design-header-photo-width = <<design.header.photo_width>>
 #let design-header-use-icons-for-connections = <<design.header.use_icons_for_connections|lower>>
+#let design-header-name-font-family = "<<design.header.name_font_family>>"
 #let design-header-name-font-size = <<design.header.name_font_size>>
 #let design-header-name-bold = <<design.header.name_bold|lower>>
+#let design-header-small-caps-for-name = <<design.header.small_caps_for_name|lower>>
+#let design-header-connections-font-family = "<<design.header.connections_font_family>>"
 #let design-header-vertical-space-between-name-and-connections = <<design.header.vertical_space_between_name_and_connections>>
 #let design-header-vertical-space-between-connections-and-first-section = <<design.header.vertical_space_between_connections_and_first_section>>
 #let design-header-use-icons-for-connections = <<design.header.use_icons_for_connections|lower>>
@@ -47,6 +50,7 @@
 #let design-header-alignment = <<design.header.alignment>>
 #let design-highlights-summary-left-margin = <<design.highlights.summary_left_margin>>
 #let design-highlights-bullet = "<<design.highlights.bullet>>"
+#let design-highlights-nested-bullet = "<<design.highlights.nested_bullet>>"
 #let design-highlights-top-margin = <<design.highlights.top_margin>>
 #let design-highlights-left-margin = <<design.highlights.left_margin>>
 #let design-highlights-vertical-space-between-highlights = <<design.highlights.vertical_space_between_highlights>>
@@ -116,6 +120,9 @@
   leading: design-text-leading,
   justify: justify,
 )
+#set enum(
+  spacing: design-entries-vertical-space-between-entries,
+)
 
 // Highlights settings:
 #let highlights(..content) = {
@@ -128,13 +135,22 @@
   )
 }
 #show list: set list(
-  marker: design-highlights-bullet,
-  spacing: 0pt,
+  marker: design-highlights-nested-bullet,
+  spacing: design-highlights-vertical-space-between-highlights,
   indent: 0pt,
   body-indent: design-highlights-horizontal-space-between-bullet-and-highlights,
 )
 
 // Entry utilities:
+#let bullet-entry(..content) = {
+  list(
+    ..content,
+    marker: design-highlights-bullet,
+    spacing: 0pt,
+    indent: 0pt,
+    body-indent: design-highlights-horizontal-space-between-bullet-and-highlights,
+  )
+}
 #let three-col(
   left-column-width: 1fr,
   middle-column-width: 1fr,
@@ -190,11 +206,16 @@
   #set par(spacing: 0pt)
   #set align(design-header-alignment)
   #set text(
+    font: design-header-name-font-family,
     weight: header-font-weight,
     size: design-header-name-font-size,
     fill: design-colors-name,
   )
-  #it.body
+  #if design-header-small-caps-for-name [
+    #smallcaps(it.body)
+  ] else [
+    #it.body
+  ]
   // Vertical space after the name
   #v(design-header-vertical-space-between-name-and-connections)
 ]
@@ -210,6 +231,7 @@
   #set align(left)
   #set text(size: (1em / 1.2)) // reset
   #set text(
+    font: design-section-titles-font-family,
     size: (design-section-titles-font-size),
     weight: section-title-font-weight,
     fill: design-colors-section-titles,
@@ -244,7 +266,7 @@
         #box(
           [
             #section-title
-            #if design-section-titles-type == "with-parial-line" [
+            #if design-section-titles-type == "with-partial-line" [
               #box(width: 1fr, height: design-section-titles-line-thickness, fill: design-colors-section-titles)
             ] else if design-section-titles-type == "with-full-line" [
 
@@ -294,6 +316,8 @@
 }
 
 #let connections(connections-list) = context {
+  set text(fill: design-colors-connections, font: design-header-connections-font-family)
+  set par(leading: design-text-leading*1.7, justify: false)
   let list-of-connections = ()
   let separator = (
     h(design-header-horizontal-space-between-connections / 2, weak: true)
@@ -329,8 +353,6 @@
     list-of-connections.push(connections-list.slice(starting-index, ending-index).join(separator))
     starting-index = ending-index
   }
-  set text(fill: design-colors-connections)
-  set par(leading: design-text-leading*1.7, justify: false)
   align(list-of-connections.join(linebreak()), design-header-alignment)
   v(design-header-vertical-space-between-connections-and-first-section - design-section-titles-vertical-space-above)
 }
diff --git a/src/classic/ReversedNumberedEntry.j2.typ b/src/classic/ReversedNumberedEntry.j2.typ
new file mode 100644
index 0000000..8f26733
--- /dev/null
+++ b/src/classic/ReversedNumberedEntry.j2.typ
@@ -0,0 +1 @@
+[<<entry.reversed_number>>],
\ No newline at end of file
diff --git a/src/classic/SectionBeginning.j2.typ b/src/classic/SectionBeginning.j2.typ
index de1e459..2029508 100644
--- a/src/classic/SectionBeginning.j2.typ
+++ b/src/classic/SectionBeginning.j2.typ
@@ -1 +1,12 @@
 == <<section_title>>
+((* if not design.entries.allow_page_break_in_sections *))
+#block(
+  [
+((* endif *))
+((* if entry_type in ["NumberedEntry", "ReversedNumberedEntry"] *))
+#one-col-entry(
+  content: [
+  ((* if entry_type == "ReversedNumberedEntry" *))
+    #let rev-enum-items = (
+  ((* endif *))
+((* endif *))
diff --git a/src/classic/SectionEnding.j2.typ b/src/classic/SectionEnding.j2.typ
index e69de29..8dd8a3c 100644
--- a/src/classic/SectionEnding.j2.typ
+++ b/src/classic/SectionEnding.j2.typ
@@ -0,0 +1,21 @@
+((* if entry_type in ["NumberedEntry", "ReversedNumberedEntry"] *))
+  ((* if entry_type == "ReversedNumberedEntry" *))
+  )
+  #enum(
+    numbering: n => [#{rev-enum-items.len() + 1 - n}.],
+    ..rev-enum-items,
+  )
+  ((* endif *))
+  ],
+)
+((* endif *))
+((* if not design.entries.allow_page_break_in_sections *))
+  ],
+  breakable: false,
+  inset: (
+    left: 0cm,
+    right: 0cm,
+  ),
+  width: 100%,
+)
+((* endif *))
\ No newline at end of file
diff --git a/src/markdown/NumberedEntry.j2.md b/src/markdown/NumberedEntry.j2.md
new file mode 100644
index 0000000..74f586b
--- /dev/null
+++ b/src/markdown/NumberedEntry.j2.md
@@ -0,0 +1 @@
+- <<entry.number>>
diff --git a/src/markdown/ReversedNumberedEntry.j2.md b/src/markdown/ReversedNumberedEntry.j2.md
new file mode 100644
index 0000000..efa6b96
--- /dev/null
+++ b/src/markdown/ReversedNumberedEntry.j2.md
@@ -0,0 +1 @@
+- <<entry.reversed_number>>