diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index 9b610bd..6eddba5 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -10,30 +10,18 @@ hc emit_hook reload
 
 # Startup
 if hc silent new_attr bool my_not_first_autostart; then
-    ~/.xprofile
     xsetroot -solid '#5A8E3A'
     ~/.fehbg &
+    xmodmap ~/.Xmodmap
     picom -b
-    # 2021-05-01T22:53:48 CEST: The path for kdeconnectd was adjusted
-    # for Fedora, where the binary lives in /usr/libexec and not in
-    # /usr/lib like in Arch Linux or Debian.
-    /usr/libexec/kdeconnectd &
+    /usr/lib/kdeconnectd &
     /usr/bin/kdeconnect-indicator &
     redshift-gtk &
     nm-applet &
     gnome-keyring-daemon --start
-    nextcloud --background &
+    nextcloud &
     dunst &
-    # 2021-05-01T22:51:27 CEST: The first time I tried hlwm on Fedora
-    # 34, PipeWire was not automatically started I don't want to
-    # enable it, since it should be triggerd with pipewire.socket and
-    # I do not want to break anything and also on GNOME this was not a
-    # problem. This is therefore also an short-term solutions
-    # (although we all know whats happens to them...) and should be
-    # investiged more into the issue.
-    systemctl --user start pipewire &
-    # TODO: trigger this in ~/.xprofile?
-    xmodmap ~/.Xmodmap
+    # /usr/share/doc/herbstluftwm/examples/exec_on_tag.sh 10 keepassxc &
 fi
 
 # remove all existing keybindings
@@ -54,7 +42,7 @@ hc keybind $Mod-Tab            spawn rofi -show combi
 hc keybind $Mod-Return         spawn es
 hc keybind $Mod-Control-Return spawn ~/.emacs_anywhere/bin/run
 hc keybind $Mod-t              spawn es -e '(vterm)'
-hc keybind $Mod-b              spawn qutebrowser
+hc keybind $Mod-b              spawn epiphany
 hc keybind $Mod-v              spawn pavucontrol-qt
 hc keybind $Mod-Control-b      spawn firefox-developer-edition
 hc keybind $Mod-Control-t      spawn es -e '(eshell)'
@@ -215,6 +203,4 @@ panel=~/.config/herbstluftwm/panel.sh
 # autostart programs that require existing tags
 if hc silent new_attr bool my_not_first_autostart_end; then
     /usr/share/doc/herbstluftwm/examples/exec_on_tag.sh 10 keepassxc &
-    # Test: start xmodmap at the end. Maybe then it gets loaded.
-    xmodmap ~/.Xmodmap
 fi