diff --git a/emacs.el b/emacs.el
index 1a848ed..706d431 100644
--- a/emacs.el
+++ b/emacs.el
@@ -110,6 +110,8 @@
 (global-auto-revert-mode 1)
 (put 'narrow-to-region 'disabled nil)
 (global-unset-key (kbd "C-z"))
+(setq mac-command-modifier 'meta
+      mac-option-modifier nil)
 ;; (set-face-attribute 'default nil :height 140)
 
 (setq use-package-compute-statistics t)
@@ -141,7 +143,7 @@
 
 (use-package exec-path-from-shell
   :config
-  (when (memq window-system '(mac))
+  (when (memq window-system '(mac ns))
     (exec-path-from-shell-initialize)))
 
 (use-package undo-tree
@@ -214,17 +216,15 @@
 
 (use-package typst-mode)
 
-(use-package ziggy-mode)
-(use-package zine-mode)
-
 (use-package eglot
+  :defer t
   :config
   (add-to-list 'eglot-server-programs
                '(svelte-mode . ("svelteserver" "--stdio"))))
 
 (use-package ellama
   :bind ("C-c e" . ellama-transient-main-menu)
-  :init
+  :config
   (require 'llm-ollama)
   (setopt ellama-auto-scroll t)
   (setopt ellama-provider