diff --git a/home/alex/cli.nix b/home/alex/cli.nix
index ea5edd7..1d6d661 100644
--- a/home/alex/cli.nix
+++ b/home/alex/cli.nix
@@ -19,6 +19,7 @@ in
     ./programs/fzf
     ./programs/git
     ./programs/shell
+    ./programs/devenv.nix
   ];
 
   programs.home-manager.enable = true;
diff --git a/home/alex/home.nix b/home/alex/home.nix
index 4e6caea..6d2e9c2 100644
--- a/home/alex/home.nix
+++ b/home/alex/home.nix
@@ -7,7 +7,6 @@
 {
   imports = [
     ./cli.nix
-    ./programs/devenv.nix
     ./programs/rofi
     ./programs/xmonad
     ./programs/jitsi-meet
diff --git a/home/alex/programs/emacs/doom/config.el b/home/alex/programs/emacs/doom/config.el
index b1761ad..db63885 100644
--- a/home/alex/programs/emacs/doom/config.el
+++ b/home/alex/programs/emacs/doom/config.el
@@ -3,7 +3,7 @@
 ;; Place your private configuration here! Remember, you do not need to run 'doom
 ;; sync' after modifying this file!
 
-(setq ak/at-work? (getenv "AK_AT_WORK"))
+(setq ak/at-work? (getenv "I_AM_AT_WORK"))
 
 ;; Some functionality uses this to identify you, e.g. GPG configuration, email
 ;; clients, file templates and snippets.
@@ -112,12 +112,31 @@
          org-todo-keywords '(
                              (sequence "NEXT(n)" "TODO(t)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)")
                              (sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)")
-                             ))
+                             )
+         org-tag-alist '(
+                         ;; Places
+                         ("@home" . ?h)
+                         ("@work" . ?w)
+
+                         ;; devices
+                         ("@phone" . ?p)
+                         ("@computer" . ?c)
+
+                         ;;
+                         ("@email" . ?e)
+
+                         ))
+
   (use-package! org-ql)
+  (use-package! org-modern)
   (use-package! org-bookmark-heading)
 
   (add-hook! 'org-mode-hook #'+org-init-keybinds-h))
 
+(use-package! org-contacts
+  :after org
+  :custom (org-contacts-files '("~/org/contacts.org")))
+
 (use-package! activities
   :demand t
   :config
@@ -129,6 +148,7 @@
 
   (activities-mode)
   (activities-tabs-mode)
+  (setopt tab-bar-show 1)
   (map!
    (:prefix ("C-c a" . "Activities")
     :desc "Switch activity" "a" #'activities-switch
diff --git a/home/alex/programs/emacs/doom/init.el b/home/alex/programs/emacs/doom/init.el
index 927777c..a9067aa 100644
--- a/home/alex/programs/emacs/doom/init.el
+++ b/home/alex/programs/emacs/doom/init.el
@@ -148,8 +148,8 @@
        latex             ; writing papers in Emacs has never been so fun
        ;;lean              ; for folks with too much to prove
        ledger            ; be audit you can be
-       lua               ; one-based indices? one-based indices
-       markdown          ; writing docs for people to ignore
+       (lua +lsp +tree-sitter)               ; one-based indices? one-based indices
+       (markdown +grip)          ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
        (nix +lsp +tree-sitter)  ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
diff --git a/home/alex/programs/emacs/doom/packages.el b/home/alex/programs/emacs/doom/packages.el
index f602e5d..670b315 100644
--- a/home/alex/programs/emacs/doom/packages.el
+++ b/home/alex/programs/emacs/doom/packages.el
@@ -53,6 +53,9 @@
 ;;  :recipe (:host github :repo "username/repo"
 ;;           :files ("some-file.el" "src/lisp/*.el")))
 
+(unpin! compat)
+                                        ;(unpin! with-editor ghub)
+
 (package! ormolu)
 (package! org-gtd
   :recipe (:host github :repo "Trevoke/org-gtd.el" :branch "master"))
@@ -67,7 +70,9 @@
 (package! org-present)
 (package! denote)
 (package! org-super-agenda)
+(package! org-modern)
 (package! org-ql)
+(package! org-contacts)
 (package! org-bookmark-heading)
 (package! activities
   :recipe (:host github :repo "alphapapa/activities.el" :branch "master"))
diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix
index 08cbfef..c2934c8 100644
--- a/hosts/thrall/default.nix
+++ b/hosts/thrall/default.nix
@@ -84,6 +84,7 @@ in
           80
           443
           5000
+          40005 # syncthing
         ];
         allowedUDPPorts = [
           53
@@ -324,6 +325,7 @@ in
     consumptionDirIsPublic = true;
     settings = {
       PAPERLESS_OCR_LANGUAGE = "deu+eng";
+      PAPERLESS_OCR_USER_ARGS = ''{"invalidate_digital_signatures": true}'';
       PAPERLESS_URL = "https://docs.failco.de";
       PAPERLESS_CONSUMER_RECURSIVE = true;
       PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS = true;