diff --git a/common/DejaVuSans.ttf b/common/DejaVuSans.ttf
deleted file mode 100644
index e5f7eec..0000000
Binary files a/common/DejaVuSans.ttf and /dev/null differ
diff --git a/common/dejavu_sans_12.pf2 b/common/dejavu_sans_12.pf2
deleted file mode 100644
index 19e0499..0000000
Binary files a/common/dejavu_sans_12.pf2 and /dev/null differ
diff --git a/common/dejavu_sans_14.pf2 b/common/dejavu_sans_14.pf2
deleted file mode 100644
index dcc727e..0000000
Binary files a/common/dejavu_sans_14.pf2 and /dev/null differ
diff --git a/common/dejavu_sans_16.pf2 b/common/dejavu_sans_16.pf2
deleted file mode 100644
index 37f3ef4..0000000
Binary files a/common/dejavu_sans_16.pf2 and /dev/null differ
diff --git a/common/dejavu_sans_24.pf2 b/common/dejavu_sans_24.pf2
deleted file mode 100644
index 8c3e434..0000000
Binary files a/common/dejavu_sans_24.pf2 and /dev/null differ
diff --git a/common/dejavu_sans_32.pf2 b/common/dejavu_sans_32.pf2
deleted file mode 100644
index bbbbe28..0000000
Binary files a/common/dejavu_sans_32.pf2 and /dev/null differ
diff --git a/common/dejavu_sans_48.pf2 b/common/dejavu_sans_48.pf2
deleted file mode 100644
index 776c982..0000000
Binary files a/common/dejavu_sans_48.pf2 and /dev/null differ
diff --git a/common/makefont.sh b/common/makefont.sh
new file mode 100755
index 0000000..7c47d01
--- /dev/null
+++ b/common/makefont.sh
@@ -0,0 +1,5 @@
+#! /usr/bin/env bash
+
+grub2-mkfont -o unifont-16.pf2 -s 16 unifont.otf
+grub2-mkfont -o unifont-24.pf2 -s 24 unifont.otf
+grub2-mkfont -o unifont-32.pf2 -s 32 unifont.otf
diff --git a/common/terminal_box_c.png b/common/terminal_box_c.png
deleted file mode 100644
index d0dd52a..0000000
Binary files a/common/terminal_box_c.png and /dev/null differ
diff --git a/common/terminal_box_e.png b/common/terminal_box_e.png
deleted file mode 100644
index 394cbe4..0000000
Binary files a/common/terminal_box_e.png and /dev/null differ
diff --git a/common/terminal_box_n.png b/common/terminal_box_n.png
deleted file mode 100644
index 476f8bc..0000000
Binary files a/common/terminal_box_n.png and /dev/null differ
diff --git a/common/terminal_box_ne.png b/common/terminal_box_ne.png
deleted file mode 100644
index 9e26959..0000000
Binary files a/common/terminal_box_ne.png and /dev/null differ
diff --git a/common/terminal_box_nw.png b/common/terminal_box_nw.png
deleted file mode 100644
index 5c3cba8..0000000
Binary files a/common/terminal_box_nw.png and /dev/null differ
diff --git a/common/terminal_box_s.png b/common/terminal_box_s.png
deleted file mode 100644
index 85a8901..0000000
Binary files a/common/terminal_box_s.png and /dev/null differ
diff --git a/common/terminal_box_se.png b/common/terminal_box_se.png
deleted file mode 100644
index d8627ee..0000000
Binary files a/common/terminal_box_se.png and /dev/null differ
diff --git a/common/terminal_box_sw.png b/common/terminal_box_sw.png
deleted file mode 100644
index 67c600c..0000000
Binary files a/common/terminal_box_sw.png and /dev/null differ
diff --git a/common/terminal_box_w.png b/common/terminal_box_w.png
deleted file mode 100644
index d066e2d..0000000
Binary files a/common/terminal_box_w.png and /dev/null differ
diff --git a/common/unifont-16.pf2 b/common/unifont-16.pf2
new file mode 100644
index 0000000..4771676
Binary files /dev/null and b/common/unifont-16.pf2 differ
diff --git a/common/unifont-24.pf2 b/common/unifont-24.pf2
new file mode 100644
index 0000000..3efd22b
Binary files /dev/null and b/common/unifont-24.pf2 differ
diff --git a/common/unifont-32.pf2 b/common/unifont-32.pf2
new file mode 100644
index 0000000..47b0207
Binary files /dev/null and b/common/unifont-32.pf2 differ
diff --git a/common/unifont.otf b/common/unifont.otf
new file mode 100644
index 0000000..3094772
Binary files /dev/null and b/common/unifont.otf differ
diff --git a/config/theme-2k.txt b/config/theme-2k.txt
index 043b46e..3fef17c 100644
--- a/config/theme-2k.txt
+++ b/config/theme-2k.txt
@@ -19,7 +19,7 @@ terminal-border: "0"
   top = 30%
   width = 40%
   height = 40%
-  item_font = "DejaVu Sans Regular 24"
+  item_font = "Unifont Regular 24"
   item_color = "#cccccc"
   selected_item_color = "#ffffff"
   icon_width = 48
@@ -48,5 +48,5 @@ terminal-border: "0"
   id = "__timeout__"
   text = "Booting in %d seconds"
   color = "#cccccc"
-  font = "DejaVu Sans Regular 24"
+  font = "Unifont Regular 24"
 }
diff --git a/config/theme-4k.txt b/config/theme-4k.txt
index 2b7eed8..8a97f77 100644
--- a/config/theme-4k.txt
+++ b/config/theme-4k.txt
@@ -19,7 +19,7 @@ terminal-border: "0"
   top = 30%
   width = 40%
   height = 40%
-  item_font = "DejaVu Sans Regular 32"
+  item_font = "Unifont Regular 32"
   item_color = "#cccccc"
   selected_item_color = "#ffffff"
   icon_width = 64
@@ -48,5 +48,5 @@ terminal-border: "0"
   id = "__timeout__"
   text = "Booting in %d seconds"
   color = "#cccccc"
-  font = "DejaVu Sans Regular 32"
+  font = "Unifont Regular 32"
 }
diff --git a/config/theme-ultrawide2k.txt b/config/theme-ultrawide2k.txt
index 043b46e..3fef17c 100644
--- a/config/theme-ultrawide2k.txt
+++ b/config/theme-ultrawide2k.txt
@@ -19,7 +19,7 @@ terminal-border: "0"
   top = 30%
   width = 40%
   height = 40%
-  item_font = "DejaVu Sans Regular 24"
+  item_font = "Unifont Regular 24"
   item_color = "#cccccc"
   selected_item_color = "#ffffff"
   icon_width = 48
@@ -48,5 +48,5 @@ terminal-border: "0"
   id = "__timeout__"
   text = "Booting in %d seconds"
   color = "#cccccc"
-  font = "DejaVu Sans Regular 24"
+  font = "Unifont Regular 24"
 }