diff --git a/init.org b/init.org
index 5656a4d..1162d66 100644
--- a/init.org
+++ b/init.org
@@ -87,11 +87,11 @@ Emacs variables are dynamically scoped. That's unusual for most languages, so di
 
 * Default settings
 #+BEGIN_SRC emacs-lisp
-(defconst *linux*
+(defconst *sys/linux*
   (string-equal system-type 'gnu/linux)
   "Is the system running Linux?")
 
-(defconst *windows*
+(defconst *sys/windows*
   (string-equal system-type 'windows-nt)
   "Is the system running Windows?")
 
@@ -116,7 +116,7 @@ Emacs variables are dynamically scoped. That's unusual for most languages, so di
 (defvar MY--PATH_USER_LOCAL  (expand-file-name "~/.emacs.d/user-local/"))
 (defvar MY--PATH_USER_GLOBAL (expand-file-name "~/.emacs.d/user-global/"))
 
-(when *linux*
+(when *sys/linux*
   (defconst MY--PATH_ORG_FILES        (expand-file-name "~/Archiv/Organisieren/"))
   (defconst MY--PATH_ORG_FILES_MOBILE (expand-file-name "~/Archiv/Organisieren/mobile/")))
   (defconst MY--PATH_ORG_JOURNAl      (expand-file-name "~/Archiv/Organisieren/Journal/"))
@@ -144,7 +144,7 @@ Emacs variables are dynamically scoped. That's unusual for most languages, so di
 (set-terminal-coding-system 'utf-8)
 (set-keyboard-coding-system 'utf-8)
 (set-selection-coding-system 'utf-8)
-(if *windows*
+(if *sys/windows*
     (prefer-coding-system 'utf-8-dos)
   (prefer-coding-system 'utf-8))
 
@@ -181,7 +181,7 @@ Some windows specific stuff
 * visuals
 ** Font
 #+BEGIN_SRC emacs-lisp
-(when *linux*
+(when *sys/linux*
   (set-face-font 'default "Hack-10"))
 (when *work_remote*
   (set-face-font 'default "Lucida Sans Typewriter-11"))
@@ -192,7 +192,7 @@ Some windows specific stuff
 #+BEGIN_SRC emacs-lisp
 (defun my/toggle-theme ()
   (interactive)
-  (when (or *windows* *linux*)
+  (when (or *sys/windows* *sys/linux*)
     (if (eq (car custom-enabled-themes) 'tango-dark)
         (progn (disable-theme 'tango-dark)
                (load-theme 'tango))
@@ -205,7 +205,7 @@ Some windows specific stuff
 
 Windows Theme:
 #+BEGIN_SRC emacs-lisp
-(when *windows*
+(when *sys/windows*
   (load-theme 'tango))
 #+END_SRC
 ** line wrappings
@@ -419,7 +419,7 @@ Windows Theme:
         org-agenda-files (list (concat MY--PATH_ORG_FILES "notes.org")
                                (concat MY--PATH_ORG_FILES "projects.org")
                                (concat MY--PATH_ORG_FILES "todo.org")))
-  (when *linux*
+  (when *sys/linux*
     (setq org-agenda-files (list org-agenda-files
                                  MY--PATH_ORG_FILES_MOBILE)))
   (setq org-id-locations-file (concat MY--PATH_USER_LOCAL ".org-id-locations")
@@ -545,7 +545,7 @@ Vorerst deaktiviert, Nutzen evtl. nicht vorhanden
 
 #+BEGIN_SRC emacs-lisp
 (use-package org-journal
-  :if *linux*
+  :if *sys/linux*
   :ensure t
   :defer t
   :config
@@ -723,7 +723,7 @@ Manage projects and jump quickly between its files
 ** YAML
 #+begin_src emacs-lisp
 (use-package yaml-mode
-  :if *linux*
+  :if *sys/linux*
   :ensure t
   :mode ("\\.yml$" . yaml-mode))
 #+end_src