diff --git a/oni-gui.el b/oni-gui.el
index 3e08be1..8938dc5 100644
--- a/oni-gui.el
+++ b/oni-gui.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1123.003312
+;; Version: 2021.1201.174449
 ;; Package-Requires: (oni-ui oni-hydra yoshi-theme diminish)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -115,12 +115,14 @@ _bi_: Auto Insert  ^^          ^^
 
 (if (daemonp)
     (progn
-      (add-hook 'after-make-frame-functions #'oni-gui-setup-fontsets)
       (add-hook 'after-make-frame-functions #'oni-gui-setup-ligatures)
-      (add-hook 'after-make-frame-functions #'oni-gui-setup-faces))
-  (oni-gui-setup-fontsets nil)
-  (oni-gui-setup-ligatures)
-  (oni-gui-setup-faces nil))
+      (unless (eq system-type 'windows-nt)
+        (add-hook 'after-make-frame-functions #'oni-gui-setup-fontsets)
+        (add-hook 'after-make-frame-functions #'oni-gui-setup-faces)))
+  (unless (eq system-type 'windows-nt)
+    (oni-gui-setup-fontsets nil)
+    (oni-gui-setup-faces nil))
+  (oni-gui-setup-ligatures))
 
 (global-unset-key (kbd "C-z"))
 (global-set-key (kbd "C-c c") 'oni-gui-hydra/body)