diff --git a/early-init.el b/early-init.el
index adc876a..2a6e068 100644
--- a/early-init.el
+++ b/early-init.el
@@ -57,7 +57,8 @@
         (right-fringe . 8)		; (8 is default)
         (font . ,(pcase acdw/system
                    (:home "DejaVu Sans Mono 10")
-                   (:work "Consolas 10"))))
+                   (:work "Consolas 10")
+                   (:other "monospace 10"))))
       frame-inhibit-implied-resize t	; Don't resize randomly
       frame-resize-pixelwise t	; Resize by pixels, not chars
       )
diff --git a/init.el b/init.el
index b2236a1..f7db5e0 100644
--- a/init.el
+++ b/init.el
@@ -221,6 +221,20 @@
       scroll-conservatively 101
       scroll-preserve-screen-position 1)
 
+;; Fonts
+(set-face-attribute 'default nil
+                    :font (pcase acdw/system
+                            (:home "DejaVu Sans Mono-10")
+                            (:work "Consolas-10")
+                            (:other "monospace-10")))
+(set-face-attribute 'fixed-pitch nil
+                    :inherit 'default)
+(set-face-attribute 'variable-pitch nil
+                    :font (pcase acdw/system
+                            (:home "DejaVu Sans")
+                            (:work "Calibri-11")
+                            (:other "sans-serif")))
+
 ;; MS Windows
 (setc w32-allow-system-shell t
       w32-pass-lwindow-to-system nil