diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index f5d05bf..9b610bd 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -33,7 +33,7 @@ if hc silent new_attr bool my_not_first_autostart; then
     # investiged more into the issue.
     systemctl --user start pipewire &
     # TODO: trigger this in ~/.xprofile?
-    #xmodmap ~/.Xmodmap
+    xmodmap ~/.Xmodmap
 fi
 
 # remove all existing keybindings
diff --git a/shells/zshrc b/shells/zshrc
index 25156c0..50edb4a 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -1,5 +1,5 @@
 # ZSH Configuration
-# Marcel Kapfer (c) 2019-2021
+# Marcel Kapfer (c) 2019
 # MIT License
 
 # Hide user- and hostname when on local machine
@@ -21,7 +21,7 @@ fi
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
-ZSH_THEME="robbyrussell"
+ZSH_THEME="agnoster"
 
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
@@ -65,7 +65,7 @@ HIST_STAMPS="dd/mm/yyyy"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-# plugins=(git adb battery bower coffee command-not-found debian gitignore github git-prompt gnu-utils node npm python web-search)
+plugins=(git adb battery bower coffee command-not-found debian gitignore github git-prompt gnu-utils node npm python web-search)
 
 # User configuration
 
@@ -90,7 +90,7 @@ export VISUAL='es'
 # fi
 
 # Compilation flags
-#export ARCHFLAGS="-arch x86_64"
+export ARCHFLAGS="-arch x86_64"
 
 # ssh
 # export SSH_KEY_PATH="~/.ssh/dsa_id"
@@ -135,13 +135,3 @@ alias q=' exit'
 alias Q=' exit'
 alias x=' exit'
 alias cd..='cd ..'
-
-######################
-### GNU GUIX STUFF ###
-######################
-
-GUIX_PROFILE="$HOME/.guix-profile/"
-GUIX_LOCPATH="$GUIX_PROFILE/lib/locale/"
-. "$GUIX_PROFILE/etc/profile"
-GUIX_PROFILE="$HOME/.config/guix/current"
-. "$GUIX_PROFILE/etc/profile"