diff --git a/pyproject.toml b/pyproject.toml
index dcc82d58..675ce6c0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -84,7 +84,7 @@ full = [
     "markdown==3.7",         # to convert Markdown to HTML
     "watchdog==6.0.0",       # to poll files for updates
     "typst==0.12.2",         # to render PDF from Typst source files
-    "rendercv-fonts==0.1.0", # some font files for RenderCV
+    "rendercv-fonts==0.2.0", # some font files for RenderCV
 ]
 
 [project.urls]
diff --git a/rendercv/themes/engineeringresumes/__init__.py b/rendercv/themes/engineeringresumes/__init__.py
index a4b14816..d9128866 100644
--- a/rendercv/themes/engineeringresumes/__init__.py
+++ b/rendercv/themes/engineeringresumes/__init__.py
@@ -48,7 +48,7 @@ class Links(o.Links):
     use_external_link_icon: bool = o.links_use_external_link_icon_field_info
 
 
-o.text_font_family_field_info.default = "Charter"
+o.text_font_family_field_info.default = "XCharter"
 o.text_leading_field_info.default = "0.2em"
 
 
diff --git a/rendercv/themes/moderncv/__init__.py b/rendercv/themes/moderncv/__init__.py
index c0d0e87d..ddc1c56d 100644
--- a/rendercv/themes/moderncv/__init__.py
+++ b/rendercv/themes/moderncv/__init__.py
@@ -22,7 +22,7 @@ class Links(o.Links):
     use_external_link_icon: bool = o.links_use_external_link_icon_field_info
 
 
-o.text_font_family_field_info.default = "Charter"
+o.text_font_family_field_info.default = "XCharter"
 o.text_leading_field_info.default = "0.2em"
 
 
diff --git a/rendercv/themes/options.py b/rendercv/themes/options.py
index db2a2390..8017ad35 100644
--- a/rendercv/themes/options.py
+++ b/rendercv/themes/options.py
@@ -38,7 +38,7 @@ FontFamily = Literal[
     "Ubuntu",
     "Noto Sans",
     "Mukta",
-    "Charter",
+    "XCharter",
 ]
 BulletPoint = Literal["•", "◦", "-", "◆", "★", "■", "—", "○"]
 PageSize = Literal[
diff --git a/schema.json b/schema.json
index fb38ffcd..cdb8c845 100644
--- a/schema.json
+++ b/schema.json
@@ -500,7 +500,7 @@
         "text": {
           "$ref": "#/$defs/rendercv__themes__engineeringresumes__Text",
           "default": {
-            "font_family": "Charter",
+            "font_family": "XCharter",
             "font_size": "10pt",
             "leading": "0.2em",
             "alignment": "justified",
@@ -819,7 +819,7 @@
         "text": {
           "$ref": "#/$defs/rendercv__themes__moderncv__Text",
           "default": {
-            "font_family": "Charter",
+            "font_family": "XCharter",
             "font_size": "10pt",
             "leading": "0.2em",
             "alignment": "justified",
@@ -2185,7 +2185,7 @@
             "Ubuntu",
             "Noto Sans",
             "Mukta",
-            "Charter"
+            "XCharter"
           ],
           "title": "Font Family",
           "type": "string"
@@ -2799,7 +2799,7 @@
       "additionalProperties": false,
       "properties": {
         "font_family": {
-          "default": "Charter",
+          "default": "XCharter",
           "description": "The font family.",
           "enum": [
             "Libertinus Serif",
@@ -2811,7 +2811,7 @@
             "Ubuntu",
             "Noto Sans",
             "Mukta",
-            "Charter"
+            "XCharter"
           ],
           "title": "Font Family",
           "type": "string"
@@ -3256,7 +3256,7 @@
       "additionalProperties": false,
       "properties": {
         "font_family": {
-          "default": "Charter",
+          "default": "XCharter",
           "description": "The font family.",
           "enum": [
             "Libertinus Serif",
@@ -3268,7 +3268,7 @@
             "Ubuntu",
             "Noto Sans",
             "Mukta",
-            "Charter"
+            "XCharter"
           ],
           "title": "Font Family",
           "type": "string"
@@ -3929,7 +3929,7 @@
             "Ubuntu",
             "Noto Sans",
             "Mukta",
-            "Charter"
+            "XCharter"
           ],
           "title": "Font Family",
           "type": "string"
@@ -4351,7 +4351,7 @@
             "Ubuntu",
             "Noto Sans",
             "Mukta",
-            "Charter"
+            "XCharter"
           ],
           "title": "Font Family",
           "type": "string"
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 19134569..fc4ecea6 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -932,9 +932,10 @@ def test_watcher(tmp_path, input_file_path):
     assert p.is_alive()
     import signal
 
+    p.terminate()
     os.kill(p.pid, signal.SIGINT)  # type: ignore
 
-    p.join()
+    p.join(timeout=12)
     # check if Jane Doe is in the output files:
     assert (tmp_path / "rendercv_output" / "Jane_Doe_CV.pdf").exists()
 
diff --git a/tests/testdata/test_create_a_typst_file/engineeringresumes_empty.typ b/tests/testdata/test_create_a_typst_file/engineeringresumes_empty.typ
index 4341351a..3b07f9b1 100644
--- a/tests/testdata/test_create_a_typst_file/engineeringresumes_empty.typ
+++ b/tests/testdata/test_create_a_typst_file/engineeringresumes_empty.typ
@@ -23,7 +23,7 @@
 #let design-links-use-external-link-icon = false
 #let design-text-font-size = 10pt
 #let design-text-leading = 0.2em
-#let design-text-font-family = "Charter"
+#let design-text-font-family = "XCharter"
 #let design-text-alignment = "justified"
 #let design-text-date-and-location-column-alignment = right
 #let design-header-photo-width = 3.5cm
diff --git a/tests/testdata/test_create_a_typst_file/engineeringresumes_filled.typ b/tests/testdata/test_create_a_typst_file/engineeringresumes_filled.typ
index 654029d7..f3943e33 100644
--- a/tests/testdata/test_create_a_typst_file/engineeringresumes_filled.typ
+++ b/tests/testdata/test_create_a_typst_file/engineeringresumes_filled.typ
@@ -23,7 +23,7 @@
 #let design-links-use-external-link-icon = false
 #let design-text-font-size = 10pt
 #let design-text-leading = 0.2em
-#let design-text-font-family = "Charter"
+#let design-text-font-family = "XCharter"
 #let design-text-alignment = "justified"
 #let design-text-date-and-location-column-alignment = right
 #let design-header-photo-width = 3.5cm
diff --git a/tests/testdata/test_create_a_typst_file/moderncv_empty.typ b/tests/testdata/test_create_a_typst_file/moderncv_empty.typ
index 0461d5b7..e9b38f30 100644
--- a/tests/testdata/test_create_a_typst_file/moderncv_empty.typ
+++ b/tests/testdata/test_create_a_typst_file/moderncv_empty.typ
@@ -23,7 +23,7 @@
 #let design-links-use-external-link-icon = false
 #let design-text-font-size = 10pt
 #let design-text-leading = 0.2em
-#let design-text-font-family = "Charter"
+#let design-text-font-family = "XCharter"
 #let design-text-alignment = "justified"
 #let design-text-date-and-location-column-alignment = right
 #let design-header-photo-width = 3.5cm
diff --git a/tests/testdata/test_create_a_typst_file/moderncv_filled.typ b/tests/testdata/test_create_a_typst_file/moderncv_filled.typ
index 74234fd8..ad224295 100644
--- a/tests/testdata/test_create_a_typst_file/moderncv_filled.typ
+++ b/tests/testdata/test_create_a_typst_file/moderncv_filled.typ
@@ -23,7 +23,7 @@
 #let design-links-use-external-link-icon = false
 #let design-text-font-size = 10pt
 #let design-text-leading = 0.2em
-#let design-text-font-family = "Charter"
+#let design-text-font-family = "XCharter"
 #let design-text-alignment = "justified"
 #let design-text-date-and-location-column-alignment = right
 #let design-header-photo-width = 3.5cm
diff --git a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_empty_long_second_row/None_CV.typ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_empty_long_second_row/None_CV.typ
index 4341351a..3b07f9b1 100644
--- a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_empty_long_second_row/None_CV.typ
+++ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_empty_long_second_row/None_CV.typ
@@ -23,7 +23,7 @@
 #let design-links-use-external-link-icon = false
 #let design-text-font-size = 10pt
 #let design-text-leading = 0.2em
-#let design-text-font-family = "Charter"
+#let design-text-font-family = "XCharter"
 #let design-text-alignment = "justified"
 #let design-text-date-and-location-column-alignment = right
 #let design-header-photo-width = 3.5cm
diff --git a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_empty_short_second_row/None_CV.typ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_empty_short_second_row/None_CV.typ
index 4341351a..3b07f9b1 100644
--- a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_empty_short_second_row/None_CV.typ
+++ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_empty_short_second_row/None_CV.typ
@@ -23,7 +23,7 @@
 #let design-links-use-external-link-icon = false
 #let design-text-font-size = 10pt
 #let design-text-leading = 0.2em
-#let design-text-font-family = "Charter"
+#let design-text-font-family = "XCharter"
 #let design-text-alignment = "justified"
 #let design-text-date-and-location-column-alignment = right
 #let design-header-photo-width = 3.5cm
diff --git a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_filled_long_second_row/John_Doe_CV.typ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_filled_long_second_row/John_Doe_CV.typ
index 654029d7..f3943e33 100644
--- a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_filled_long_second_row/John_Doe_CV.typ
+++ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_filled_long_second_row/John_Doe_CV.typ
@@ -23,7 +23,7 @@
 #let design-links-use-external-link-icon = false
 #let design-text-font-size = 10pt
 #let design-text-leading = 0.2em
-#let design-text-font-family = "Charter"
+#let design-text-font-family = "XCharter"
 #let design-text-alignment = "justified"
 #let design-text-date-and-location-column-alignment = right
 #let design-header-photo-width = 3.5cm
diff --git a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_filled_short_second_row/John_Doe_CV.typ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_filled_short_second_row/John_Doe_CV.typ
index 9ea03d9e..8ab3e140 100644
--- a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_filled_short_second_row/John_Doe_CV.typ
+++ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/engineeringresumes_filled_short_second_row/John_Doe_CV.typ
@@ -23,7 +23,7 @@
 #let design-links-use-external-link-icon = false
 #let design-text-font-size = 10pt
 #let design-text-leading = 0.2em
-#let design-text-font-family = "Charter"
+#let design-text-font-family = "XCharter"
 #let design-text-alignment = "justified"
 #let design-text-date-and-location-column-alignment = right
 #let design-header-photo-width = 3.5cm
diff --git a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_empty_long_second_row/None_CV.typ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_empty_long_second_row/None_CV.typ
index 0461d5b7..e9b38f30 100644
--- a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_empty_long_second_row/None_CV.typ
+++ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_empty_long_second_row/None_CV.typ
@@ -23,7 +23,7 @@
 #let design-links-use-external-link-icon = false
 #let design-text-font-size = 10pt
 #let design-text-leading = 0.2em
-#let design-text-font-family = "Charter"
+#let design-text-font-family = "XCharter"
 #let design-text-alignment = "justified"
 #let design-text-date-and-location-column-alignment = right
 #let design-header-photo-width = 3.5cm
diff --git a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_empty_short_second_row/None_CV.typ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_empty_short_second_row/None_CV.typ
index 0461d5b7..e9b38f30 100644
--- a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_empty_short_second_row/None_CV.typ
+++ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_empty_short_second_row/None_CV.typ
@@ -23,7 +23,7 @@
 #let design-links-use-external-link-icon = false
 #let design-text-font-size = 10pt
 #let design-text-leading = 0.2em
-#let design-text-font-family = "Charter"
+#let design-text-font-family = "XCharter"
 #let design-text-alignment = "justified"
 #let design-text-date-and-location-column-alignment = right
 #let design-header-photo-width = 3.5cm
diff --git a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_filled_long_second_row/John_Doe_CV.typ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_filled_long_second_row/John_Doe_CV.typ
index 74234fd8..ad224295 100644
--- a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_filled_long_second_row/John_Doe_CV.typ
+++ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_filled_long_second_row/John_Doe_CV.typ
@@ -23,7 +23,7 @@
 #let design-links-use-external-link-icon = false
 #let design-text-font-size = 10pt
 #let design-text-leading = 0.2em
-#let design-text-font-family = "Charter"
+#let design-text-font-family = "XCharter"
 #let design-text-alignment = "justified"
 #let design-text-date-and-location-column-alignment = right
 #let design-header-photo-width = 3.5cm
diff --git a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_filled_short_second_row/John_Doe_CV.typ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_filled_short_second_row/John_Doe_CV.typ
index 74234fd8..ad224295 100644
--- a/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_filled_short_second_row/John_Doe_CV.typ
+++ b/tests/testdata/test_create_a_typst_file_and_copy_theme_files/moderncv_filled_short_second_row/John_Doe_CV.typ
@@ -23,7 +23,7 @@
 #let design-links-use-external-link-icon = false
 #let design-text-font-size = 10pt
 #let design-text-leading = 0.2em
-#let design-text-font-family = "Charter"
+#let design-text-font-family = "XCharter"
 #let design-text-alignment = "justified"
 #let design-text-date-and-location-column-alignment = right
 #let design-header-photo-width = 3.5cm