diff --git a/config.org b/config.org
index 32004e7..91eb363 100644
--- a/config.org
+++ b/config.org
@@ -58,6 +58,11 @@
   (defalias 'yes-or-no-p 'y-or-n-p)
 #+END_SRC
 
+  Don't ask me if I want to load themes.
+#+BEGIN_SRC emacs-lisp
+  (setq custom-safe-themes t)
+#+END_SRC
+
   Don't count two spaces after a period as the end of a sentence.
   Just one space is needed
 #+BEGIN_SRC emacs-lisp
@@ -96,8 +101,7 @@
 #+END_SRC
   
 * Visuals
-** Theme
-*** Font
+** Font
 
  Don't add the font in the work environment, which I am logged in as POH
 
@@ -107,6 +111,7 @@
  )
 #+END_SRC
 
+** Themes
 *** Material Theme
  The [[https://github.com/cpaulik/emacs-material-theme][Material Theme]] comes in a dark and a light variant. Not too dark
  to be strenious though.
@@ -116,7 +121,6 @@
      :if (window-system)
      :defer t
      :ensure t
-;;     :init
  )
 #+END_SRC
 *** Apropospriate Theme
@@ -127,7 +131,6 @@
      :if (window-system)
      :defer t
      :ensure t
-     :config
  )
 #+END_SRC
 
@@ -139,13 +142,13 @@
 
 #+BEGIN_SRC emacs-lisp
 (use-package ample-theme
+  :if (window-system)
   :defer t
   :ensure t
   :init
-  (load-theme 'ample-flat)
+  (load-theme 'ample-flat t)
 )
 #+END_SRC
-
 ** Prettier Line Wraps
    By default there is no line wrapping. M-q actually modifies the buffer, which might not be wanted.
    So: enable visual wrapping and keep indentation if there are any.
@@ -831,6 +834,7 @@ sudo apt install pandoc
   - hydra for notmuch?
   - maybe org-notmuch?
   - some way to refresh the notmuch db before I run notmuch?
+
 #+BEGIN_SRC emacs-lisp
 (unless (string-equal user-login-name "POH")
   (use-package notmuch