diff --git a/.config/river/init b/.config/river/init
index 1ba1c8c..3c57914 100755
--- a/.config/river/init
+++ b/.config/river/init
@@ -14,10 +14,10 @@
 riverctl map normal Super Return spawn wezterm
 
 # Super+Q to close the focused view
-riverctl map normal Super Q close
+riverctl map normal Super W close
 
 # Super+Shift+E to exit river
-riverctl map normal Super+Shift E exit
+riverctl map normal Super+Shift Q exit
 
 # Super+J and Super+K to focus the next/previous view in the layout stack
 riverctl map normal Super J focus-view next
diff --git a/setup.sh b/setup.sh
index 1140ed2..aba1db8 100755
--- a/setup.sh
+++ b/setup.sh
@@ -10,6 +10,10 @@ cp -r ./.* $HOME/.dotfiles/
 cp -r ./* $HOME/.dotfiles/
 cd $HOME/.dotfiles && stow . && cd -
 
+mkdir --parents ~/projects/rust
+mkdir --parents ~/projects/haskell
+mkdir --parents ~/projects/java
+mkdir --parents ~/projects/javascript
 
 # Setup zsh
 chsh -s $(which zsh)
@@ -21,10 +25,4 @@ sudo xbps-install -y rustup ghc openjdk21 apache-maven gradle nodejs
 sudo ln -s /etc/sv/dbus  /var/service
 sudo sv up dbus
 
-
-mkdir --parents ~/projects/rust
-mkdir --parents ~/projects/haskell
-mkdir --parents ~/projects/java
-mkdir --parents ~/projects/javascript
-
 exit