diff --git a/arch-user/config/fontconfig/fonts.conf b/arch-user/config/fontconfig/fonts.conf
index 25cd127..6e637c7 100644
--- a/arch-user/config/fontconfig/fonts.conf
+++ b/arch-user/config/fontconfig/fonts.conf
@@ -3,18 +3,23 @@
 <fontconfig>
   <alias>
     <family>serif</family>
-    <prefer><family>Roboto</family></prefer>
+    <prefer><family>{{ .theme.font.name_regular }}</family></prefer>
   </alias>
   <alias>
     <family>sans-serif</family>
-    <prefer><family>Roboto</family></prefer>
+    <prefer><family>{{ .theme.font.name_regular }}</family></prefer>
   </alias>
   <alias>
     <family>monospace</family>
-    <prefer><family>Roboto Mono</family></prefer>
+    <prefer><family>{{ .theme.font.name_mono }}</family></prefer>
   </alias>
   <alias>
     <family>system-ui</family>
-    <prefer><family>Roboto</family></prefer>
+    <prefer><family>{{ .theme.font.name_regular }}</family></prefer>
   </alias>
+  <match target="pattern">
+    <edit name="size" mode="append">
+      <double>{{ .theme.font.size_base_pt }}</double>
+    </edit>
+  </match>
 </fontconfig>
diff --git a/arch-user/config/mako/config.tmpl b/arch-user/config/mako/config.tmpl
index ed3f8f3..7a5912c 100644
--- a/arch-user/config/mako/config.tmpl
+++ b/arch-user/config/mako/config.tmpl
@@ -1,8 +1,9 @@
-format=<span size="{{ math.Add .theme.font.size_base_pt .theme.font.size_step_pt }}pt" weight="bold">%s - %a</span>\n%b
-font={{ .theme.font.name_regular }} {{ .theme.font.size_base_pt }}
+format=<span size="{{ .theme.font.size_base_pt }}pt" weight="bold">%s - %a</span>\n%b
+font={{ .theme.font.name_regular }} {{ math.Sub .theme.font.size_base_pt .theme.font.size_step_pt }}
 background-color=#{{ .theme.color.bg_accent_dark }}{{ math.Mul .theme.opacity.high 255 | conv.ToInt64 | printf "%02X" }}
 border-size=2
 border-radius=4
+icon-border-radius=4
 border-color=#{{ .theme.color.fg_accent }}{{ math.Mul .theme.opacity.med 255 | conv.ToInt64 | printf "%02X" }}
 padding=5,10
 width=600