diff --git a/dot_Xresources.tmpl b/dot_Xresources.tmpl
index 3c936f2..3cf81d1 100644
--- a/dot_Xresources.tmpl
+++ b/dot_Xresources.tmpl
@@ -27,11 +27,11 @@ URxvt*loginShell: false
 !URxvt*termName:  screen-256color
 
 {{- if (or (eq .chezmoi.hostname "nielanjo") (eq .chezmoi.hostname "jnielandt") (eq .chezmoi.hostname "zaptorjezus")) }}
-URxvt.font: xft:Fura Code Nerd Font Mono:size=10:antialias=true
-URxvt.boldfont: xft:Fura Code Nerd Font Mono:bold:size=10
+URxvt.font: xft:Hasklug Nerd Font Mono:size=10:antialias=true
+URxvt.boldfont: xft:Hasklug Nerd Font Mono:bold:size=10
 {{- else }}
-URxvt.font: xft:Fura Code Nerd Font Mono:size=8:antialias=true
-URxvt.boldfont: xft:Fura Code Nerd Font Mono:bold:size=8
+URxvt.font: xft:Hasklug Nerd Font Mono:size=8:antialias=true
+URxvt.boldfont: xft:Hasklug Nerd Font Mono:bold:size=8
 {{- end }}
 
 ! Give us a nice cursor then
diff --git a/dot_doom.d/config.el b/dot_doom.d/config.el
index ac4ab10..13cc2ee 100644
--- a/dot_doom.d/config.el
+++ b/dot_doom.d/config.el
@@ -40,8 +40,10 @@
 ;; (setq doom-font (font-spec :family "FiraCode Nerd Font Mono" :size 12 :weight 'semi-light)
 ;;       doom-unicode-font (font-spec :family "FiraCode Nerd Font Mono" :size 12 :weight 'semi-light)
 ;;       doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13))
-(setq doom-font (font-spec :family "FiraCode Nerd Font Mono")
-      doom-unicode-font (font-spec :family "FiraCode Nerd Font Mono")
+;;
+;; (font-spec :family "Fira Sans") ; nice, but not mono
+(setq doom-font (font-spec :family "Hasklug Nerd Font")
+      doom-unicode-font (font-spec :family "Hasklug Nerd Font Mono")
       doom-variable-pitch-font (font-spec :family "Fira Sans"))
 
 ;; This determines the style of line numbers in effect. If set to `nil', line
@@ -114,8 +116,52 @@
                       "#+title: ${title}\n#+created: %U\n#+filetags: meeting\n\n")
            :unnarrowed t)
           ))
+
   ; adapt indentation in org files for _all_ lines (headings and content)
-  (setq org-adapt-indentation t))
+  (setq org-adapt-indentation t)
+
+  ; found these here https://lucidmanager.org/productivity/ricing-org-mode/
+  (setq org-startup-indented t
+        org-pretty-entities t
+        org-hide-emphasis-markers t
+        org-startup-with-inline-images t
+        org-image-actual-width '(300))
+  )
+
+; enable org-download
+; https://github.com/abo-abo/org-download
+(require 'org-download)
+; configure org-download
+(after! org-download
+  (setq-default org-download-image-dir "~/org-roam/images")
+  ;; Drag-and-drop to `dired`
+  (add-hook 'dired-mode-hook 'org-download-enable))
+
+; TODO should use (concat (file-name-as-directory dirfile) relfile)
 
 ; enable chezmoi
 (use-package chezmoi)
+
+; make sure image previews have sane default widths
+(setq org-image-actual-width (truncate (* (window-pixel-width) 0.8)))
+
+; https://github.com/ryuslash/git-auto-commit-mode
+(use-package! git-auto-commit-mode
+  :config
+  (setq-default gac-debounce-interval 300)
+  (setq-default gac-automatically-push-p t))
+
+; make sure appear-mode is enabled in org-mode
+(add-hook! org-mode :append #'org-appear-mode)
+
+;; Nice bullets
+(use-package! org-superstar
+  :config
+  (setq org-superstar-special-todo-items t)
+  ; alternatives: ? ? ? ? ?
+  (setq org-superstar-headline-bullets-list '(? ? ? ?))
+  (add-hook 'org-mode-hook (lambda ()
+                             (org-superstar-mode 1))))
+
+
+
diff --git a/dot_doom.d/packages.el b/dot_doom.d/packages.el
index d315c9f..7c630c6 100644
--- a/dot_doom.d/packages.el
+++ b/dot_doom.d/packages.el
@@ -63,3 +63,13 @@
 (package! chezmoi)
 ; powershell support
 (package! powershell)
+; enable image handling in org mode
+(package! org-download)
+; org-ql for clever orgmode searches
+(package! org-ql)
+; auto commit to git
+(package! git-auto-commit-mode)
+; make emphasis markers appear when cursor is close
+(package! org-appear)
+; nice bullets
+(package! org-superstar)
diff --git a/dot_dotfiles/i3/config.tmpl b/dot_dotfiles/i3/config.tmpl
index a3f9aba..a95ec2a 100644
--- a/dot_dotfiles/i3/config.tmpl
+++ b/dot_dotfiles/i3/config.tmpl
@@ -73,7 +73,8 @@ focus_wrapping no
 
 # font pango:DejaVu Sans Mono 8
 # font xft:Fantasque Sans Mono 9
-font xft:FuraCode Nerd Font 8
+# font xft:FuraCode Nerd Font 8
+font xft:Hasklug Nerd Font 8
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
diff --git a/dot_dotfiles/polybar/config.tmpl b/dot_dotfiles/polybar/config.tmpl
index d5ba46d..335caa2 100644
--- a/dot_dotfiles/polybar/config.tmpl
+++ b/dot_dotfiles/polybar/config.tmpl
@@ -83,7 +83,8 @@ padding-right = 5
 ;font-0 = "Wuncon Siji:pixelsize=15;1"
 ;font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
 ;font-2 = "Inconsolata\ For\ Powerline:pixelsize=10;1"
-font-0 = FuraCode Nerd Font:pixelsize=11;1
+;font-0 = FuraCode Nerd Font:pixelsize=11;1
+font-0 = Hasklug Nerd Font Mono:pixelsize=11;1
 ;font-1 = Siji:style=Regular:pixelsize=11
 font-1 = Siji:pixelsize=14;0
 ; override pointers 
diff --git a/dot_dotfiles/vim/vimrc.d/30-style.vim b/dot_dotfiles/vim/vimrc.d/30-style.vim
index 7858012..6963bad 100644
--- a/dot_dotfiles/vim/vimrc.d/30-style.vim
+++ b/dot_dotfiles/vim/vimrc.d/30-style.vim
@@ -1,4 +1,4 @@
-set guifont=FuraCode\ Nerd\ Font\ 11
+set guifont=Hasklug\ Nerd\ Font\ 11
 
 " set up the color scheme
 colorscheme gruvbox