diff --git a/emacs/.config/emacs/Emacs.org b/emacs/.config/emacs/Emacs.org
index 2d0ac83..d434faa 100644
--- a/emacs/.config/emacs/Emacs.org
+++ b/emacs/.config/emacs/Emacs.org
@@ -56,6 +56,12 @@
   (setq use-package-always-ensure t)
   (setq use-package-verbose t)
 #+end_src
+** Set up path correctly
+#+begin_src emacs-lisp
+  (use-package exec-path-from-shell
+      :config
+      (exec-path-from-shell-initialize))
+#+end_src
 ** Automatic updates
 #+begin_src emacs-lisp
   (use-package auto-package-update
@@ -134,8 +140,22 @@
 *** Catppuccin
 #+begin_src emacs-lisp
   (use-package catppuccin-theme
+    :config)
+;    (load-theme 'catppuccin :no-confirm))
+#+end_src
+*** Modus Themes
+#+begin_src emacs-lisp
+  (use-package emacs
     :config
-    (load-theme 'catppuccin :no-confirm))
+    (require-theme 'modus-themes)
+    (setq modus-themes-italic-constructs t
+          modus-themes-bold-constructs t
+          modus-themes-links '(no-underline background faint)
+          modus-themes-prompts '(bold intense)
+          modus-themes-mode-line '(borderless accented moody)
+          modus-themes-org-blocks 'gray-background
+          modus-themes-region '(bg-only no-extend))
+    (load-theme 'modus-operandi :no-confirm))
 #+end_src
 * Completion
 ** Vertico
@@ -262,8 +282,8 @@
 * Languages
 ** Agda
 #+begin_src emacs-lisp
- (load-file (let ((coding-system-for-read 'utf-8))
-                 (shell-command-to-string "agda-mode locate")))
+  (load-file (let ((coding-system-for-read 'utf-8))
+                  (shell-command-to-string "agda-mode locate")))
 #+end_src
 ** PG
 #+begin_src emacs-lisp
@@ -276,17 +296,13 @@
   		   :host github
   		   :repo "idris-community/idris2-mode"))
 #+end_src
-** Sage
+** C
 #+begin_src emacs-lisp
-  (use-package sage-shell-mode
+  (use-package emacs
     :hook
-    (sage-shell-mode . eldoc-mode)
-    (sage-shell:sage-mode . eldoc-mode)
-    (sage-shell-after-prompt . sage-shell-view-mode)
+    (c-mode . electric-pair-mode)
     :custom
-    (sage-shell-view-default-resolution 250)
-    :config
-    (sage-shell:define-alias))
+    (c-default-style '((java-mode . "java") (awk-mode . "awk") (other . "linux"))))
 #+end_src
 * Latex
 ** Auctex
@@ -367,6 +383,8 @@
       "PP" "\\P"
       "FF" "\\F"
       "HH" "\\H"
+      "SS" "\\Ss"
+      "TT" "\\T"
       "\\\\\\" "\\setminus"
       "s=" "\\subseteq"
       "s<" "\\subset"
@@ -379,23 +397,46 @@
 #+end_src
 * Org Mode
 ** Org itself
+I'm using the fork as described [[https://abode.karthinks.com/org-latex-preview/][here]] in order to have much better LaTeX previews. This is eventually supposed to be merged into emacs proper, which would be nice.
 #+begin_src emacs-lisp
   (use-package org
-    :straight (:type built-in)
+    :defer
+    :straight `(org
+                :fork (:host nil
+                       :repo "https://git.tecosaur.net/tec/org-mode.git"
+                       :branch "dev"
+                       :remote "tecosaur")
+                :files (:defaults "etc")
+                :build t
+                :pre-build
+                (with-temp-file "org-version.el"
+                 (require 'lisp-mnt)
+                 (let ((version
+                        (with-temp-buffer
+                          (insert-file-contents "lisp/org.el")
+                          (lm-header "version")))
+                       (git-version
+                        (string-trim
+                         (with-temp-buffer
+                           (call-process "git" nil t nil "rev-parse" "--short" "HEAD")
+                           (buffer-string)))))
+                  (insert
+                   (format "(defun org-release () \"The release version of Org.\" %S)\n" version)
+                   (format "(defun org-git-version () \"The truncate git commit hash of Org mode.\" %S)\n" git-version)
+                   "(provide 'org-version)\n")))
+                :pin nil)
     :init
     (setq org-list-allow-alphabetical t)
     :custom
     (org-startup-indented t)
-    (org-pretty-entities t)
     (org-hide-emphasis-markers t)
     (org-startup-with-inline-images t)
     (org-image-actual-width '(300))
     (org-export-with-smart-quotes t)
+    (org-latex-preview-live t)
     (org-directory "~/Nextcloud/org")
     (org-cite-global-bibliography '("~/Nextcloud/library.bib"))
     (org-agenda-files `(,org-directory))
-    (org-preview-latex-default-process 'imagemagick)
-    (org-highlight-latex-and-related '(native))
     (org-default-notes-file (mapcar (lambda (x) (concat org-directory x))
                                     '("/todo.org" "/done.org")))
     :after ox-latex
@@ -411,7 +452,8 @@
            ("C-c l" . org-store-link)
            ("C-c a" . org-agenda))
     :hook (org-mode . visual-line-mode)
-    (org-mode . flyspell-mode))
+    (org-mode . flyspell-mode)
+    (org-mode . org-latex-preview-auto-mode))
 #+end_src
 ** Prettify
 #+begin_src emacs-lisp
@@ -427,12 +469,6 @@
   (require 'oc-natbib)
   (require 'oc-biblatex)
 #+end_src
-** Org fragtog
-Once [[https://abode.karthinks.com/org-latex-preview/][the improvements to =org-latex-preview= get merged]], this will be unnecessary. For now, however, this really comes in handy.
-#+begin_src emacs-lisp
-  (use-package org-fragtog
-    :hook (org-mode . org-fragtog-mode))
-#+end_src
 * Pdfs
 ** Pdf tools
 #+begin_src emacs-lisp
@@ -462,11 +498,6 @@ Once [[https://abode.karthinks.com/org-latex-preview/][the improvements to =org-
   (defalias 'ff 'find-file)
   (defalias 'fo 'find-file-other-window)
   (defalias 'clear 'clear-scrollback)
-
-  (use-package exec-path-from-shell
-    :config
-    (when (daemonp)
-      (exec-path-from-shell-initialize)))
 #+end_src
 ** Dired
 #+begin_src emacs-lisp