diff --git a/dotfiles/xconfig.org b/dotfiles/xconfig.org
index a770efb..8419014 100644
--- a/dotfiles/xconfig.org
+++ b/dotfiles/xconfig.org
@@ -78,89 +78,23 @@
   *color21:      base06
 #+end_src
 
-** XFT
+** Fonts
 #+BEGIN_SRC conf
-  Xft.dpi:       96
-  Xft.autohint:  0
-  Xft.lcdfilter: lcddefault
-  Xft.hintstyle: hintfull
-  Xft.hinting:   1
-  Xft.antialias: 1
-  Xft.rgba:      rgb
+Xft.dpi:       96
+Xft.autohint:  0
+Xft.lcdfilter: lcddefault
+Xft.hintstyle: hintfull
+Xft.hinting:   1
+Xft.antialias: 1
+Xft.rgba:      rgb
 #+END_SRC
 
-** Xcursor
+** Cursor
 #+BEGIN_SRC conf
   Xcursor.theme: Breeze
   Xcursor.size:  0
 #+END_SRC
 
-** URxvt
-#+BEGIN_SRC conf :tangle no
-  ! -----------------------------------------------------------------------------
-  ! File: gruvbox-dark.xresources
-  ! Description: Retro groove colorscheme generalized
-  ! Author: morhetz <morhetz@gmail.com>
-  ! Source: https://github.com/morhetz/gruvbox-generalized
-  ! Last Modified: 6 Sep 2014
-  ! -----------------------------------------------------------------------------
-
-  ! hard contrast: *background: #1d2021
-  *background: #282828
-  ! soft contrast: *background: #32302f
-  *foreground: #ebdbb2
-  ! Black + DarkGrey
-  *color0:  #282828
-  *color8:  #928374
-  ! DarkRed + Red
-  *color1:  #cc241d
-  *color9:  #fb4934
-  ! DarkGreen + Green
-  *color2:  #98971a
-  *color10: #b8bb26
-  ! DarkYellow + Yellow
-  *color3:  #d79921
-  *color11: #fabd2f
-  ! DarkBlue + Blue
-  *color4:  #458588
-  *color12: #83a598
-  ! DarkMagenta + Magenta
-  *color5:  #b16286
-  *color13: #d3869b
-  ! DarkCyan + Cyan
-  *color6:  #689d6a
-  *color14: #8ec07c
-  ! LightGrey + White
-  *color7:  #a89984
-  *color15: #ebdbb2
-#+END_SRC
-
-#+begin_src conf
-  URxvt*termName: screen-256color
-  URxvt*geometry: 240x84
-  URxvt*loginShell: true
-  URxvt*scrollstyle: plain
-  URxvt*scrollTtyKeypress: true
-  URxvt*scrollTtyOutput: false
-  URxvt*scrollWithBuffer: false
-  URxvt*secondaryScreen: true
-  URxvt*secondaryScroll: true
-  URxvt*skipScroll: true
-  URxvt*scrollBar: false
-  URxvt*scrollBar_right: false
-  URxvt*scrollBar_floating: false
-  URxvt*utmpInhibit: false
-  URxvt*urgentOnBell: false
-  URxvt*visualBell: true
-  URxvt*mapAlert: true
-  URxvt*mouseWheelScrollPage: true
-  URxvt*font: xft:Hack Nerd Font Mono:size=10
-  URxvt*boldFont: xft:Hack Nerd Font Mono:bold:size=10
-  URxvt.perl-ext-common: selection-to-clipboard
-  URxvt.keysym.C-S-c: perl:clipboard:copy
-  URxvt.keysym.C-S-v: perl:clipboard:paste
-#+end_src
-
 * Xmodmap
 :PROPERTIES:
 :header-args:  :tangle ~/.Xmodmap
@@ -440,6 +374,11 @@ Fix for Matlab.
   export _JAVA_AWT_WM_NONREPARENTING=1
 #+end_src
 
+Set =DISPLAY= for =dunst= when started with =systemd=.
+#+begin_src bash
+  systemctl --user import-environment DISPLAY
+#+end_src
+
 Merge in defaults and keymaps
 #+BEGIN_SRC bash
   userresources=$HOME/.Xresources
@@ -502,7 +441,7 @@ Start programs related to display.
   pgrep -xu "$USER" redshift >/dev/null || \
       redshift &
 
-  # Run Compton (compositor)
+  # Run Picom (compositor)
   picom --daemon &
 #+end_src
 
@@ -522,7 +461,7 @@ Start the applications related to the top bar (polybar + applet).
 
   # Udiskie to automount usb keys
   pgrep -xu "$USER" udiskie >/dev/null || \
-    udiskie --automount --notify --tray --use-udisks2 &
+    udiskie --automount --notify --tray &
 #+end_src
 
 Finally, run SXHKD for the key bindings.