diff --git a/config.el b/config.el
index 39d097d..6b375ef 100644
--- a/config.el
+++ b/config.el
@@ -1114,14 +1114,18 @@ Otherwise: runs interactive ement-connect, then opens rooms after sync."
 ;;; WRITING — olivetti-mode
 ;;; ============================================================
 
-;; olivetti NESMÍ být v org-mode-hook — mění vizuální marginy,
-;; corfu pak počítá špatné souřadnice popupu (zdánlivě nefunguje).
-;; Zapínáme jen manuálně přes SPC t o.
+;; Guard: buffer-file-name zajisti ze olivetti nebezi v export temp bufferech
+;; (ty nemaji prirazeny soubor a volani set-window-margins by selhalo).
+;; Corfu popup: pokud se zobrazi mimo obrazovku, vypni olivetti (SPC t o).
 (use-package! olivetti
   :defer t
   :config
   (setq olivetti-body-width 90))
 
+(add-hook 'org-mode-hook      (lambda () (when buffer-file-name (olivetti-mode 1))))
+(add-hook 'markdown-mode-hook (lambda () (when buffer-file-name (olivetti-mode 1))))
+(add-hook 'text-mode-hook     (lambda () (when buffer-file-name (olivetti-mode 1))))
+
 (map! :leader
       (:prefix ("t" . "toggle")
        :desc "Olivetti mode" "o" #'olivetti-mode))
@@ -1131,28 +1135,16 @@ Otherwise: runs interactive ement-connect, then opens rooms after sync."
 ;;; ORG-MODERN — lepší vizuální styl org-mode
 ;;; ============================================================
 
-;; Pozn.: org-modern-table nil — tabulkove overlaye mohou interferovat s LaTeX exportem.
-;; :hook zajisti spravny load-order; after! blok aktivuje org-modern i v uz
-;; otevrenych bufferech (inbox.org otevreny pred loadem balicku).
+;; global-org-modern-mode: nejspolehlivejsi pristup, funguje na vsechny
+;; otevrene buffery vcetne inbox.org. org-modern-table nil kvuli LaTeX exportu.
+;; Export temp buffery nejsou problem -- org-modern pouziva overlaye, ne zmeny textu.
 (use-package! org-modern
   :after org
-  :hook (org-mode . my/org-modern-maybe)
   :config
   (setq org-modern-star '("◉" "○" "✸" "✿")
         org-modern-table nil
-        org-modern-checkbox t))
-
-(defun my/org-modern-maybe ()
-  "Enable org-modern-mode only in file-backed buffers (ne export temp buffery)."
-  (when buffer-file-name
-    (org-modern-mode 1)))
-
-;; Aktivovat i v uz otevrenych org bufferech
-(after! org-modern
-  (dolist (buf (buffer-list))
-    (with-current-buffer buf
-      (when (and (derived-mode-p 'org-mode) buffer-file-name)
-        (org-modern-mode 1)))))
+        org-modern-checkbox t)
+  (global-org-modern-mode))
 
 
 ;;; ============================================================