diff --git a/home-environments/radio/files/.config/river/init b/home-environments/radio/files/.config/river/init
index ee5f493..6780f85 100755
--- a/home-environments/radio/files/.config/river/init
+++ b/home-environments/radio/files/.config/river/init
@@ -25,15 +25,8 @@ rivercarro -inner-gaps 10 -outer-gaps 10 -no-smart-gaps &
 riverctl focus-follows-cursor normal
 
 # Inputs ______________________________________________________________________
-riverctl input keyboard-0-1-Power_Button events enabled
-riverctl input keyboard-0-6-Video_Bus events enabled
-riverctl input switch-0-5-Lid_Switch events enabled
-riverctl input keyboard-0-3-Sleep_Button events enabled
-riverctl input keyboard-1-1-AT_Translated_Set_2_keyboard events enabled
-riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad events enabled
-riverctl input pointer-2-10-TPPS/2_IBM_TrackPoint events enabled
-riverctl input keyboard-6058-20564-ThinkPad_Extra_Buttons events enabled
-riverctl input switch-6058-20564-ThinkPad_Extra_Buttons events enabled
+riverctl input pointer-2-10-TPPS/2_IBM_TrackPoint accel-profile none
+riverctl input pointer-2-10-TPPS/2_IBM_TrackPoint pointer-accel 1.0
 
 # Keyboard ____________________________________________________________________
 
@@ -47,16 +40,16 @@ riverctl set-repeat 50 300
 
 # Bindings ____________________________________________________________________
 
-## layout related keybindings _________________________________________________
+## kill river __________________________________________________________________
+riverctl map normal Super+Shift Q exit
+
+## cycle layout
+riverctl Super       Space send-layout-cmd "riverguile cycle-layout"
 
 # toggle monocle layout
 riverctl map normal Super M send-layout-cmd rivercarro "main-location monocle"
 riverctl map normal Super T send-layout-cmd rivercarro "main-location left"
 
-# Super+J and Super+K to focus the next/previous view in the layout stack
-riverctl map normal Super Tab focus-view next
-riverctl map normal Super+Shift Tab focus-view previous
-
 # Super+H and Super+L to decrease/increase the main ratio of rivercarro(1)
 riverctl map normal Super H send-layout-cmd rivercarro "main-ratio -0.05"
 riverctl map normal Super L send-layout-cmd rivercarro "main-ratio +0.05"
@@ -65,14 +58,20 @@ riverctl map normal Super L send-layout-cmd rivercarro "main-ratio +0.05"
 riverctl map normal Super+Shift H send-layout-cmd rivercarro "main-count +1"
 riverctl map normal Super+Shift L send-layout-cmd rivercarro "main-count -1"
 
+# Super+J and Super+K to focus the next/previous view in the layout stack
+riverctl map normal Super Tab focus-view next
+riverctl map normal Super+Shift Tab focus-view previous
+
 # Super+Return to bump the focused view to the top of the layout stack
 #riverctl map normal Super Return zoom
 
 ## view related keybindings ___________________________________________________
 
-# Super+Control+{J,K} to swap views
-riverctl map -repeat normal Super+Shift J swap next
-riverctl map -repeat normal Super+Shift K swap previous
+# Super+Control+{H,J,K,L} to swap views
+riverctl map -repeat normal Super+Shift H swap left
+riverctl map -repeat normal Super+Shift J swap down
+riverctl map -repeat normal Super+Shift K swap up
+riverctl map -repeat normal Super+Shift L swap right
 
 # Super+Alt+{H,J,K,L} to move views
 riverctl map -repeat normal Super+Control H move left 10
@@ -101,6 +100,9 @@ riverctl map normal Super Space toggle-float
 # Super+F to toggle fullscreen
 riverctl map normal Super F toggle-fullscreen
 
+# Super+T to toggle top
+riverctl map normal Super T zoom
+
 # close the focused view
 riverctl map normal Super q close
 
@@ -113,7 +115,7 @@ riverctl map normal Super Return spawn $TERMINAL
 riverctl map normal Super e spawn "$TERMINAL -e $EDITOR"
 
 # file manager
-riverctl map normal Super d spawn "$TERMINAL -t st -e lf"
+riverctl map normal Super d spawn "$TERMINAL -e lf"
 
 # $BROWSER
 riverctl map normal Super b spawn $BROWSER
@@ -247,6 +249,10 @@ riverctl map passthrough Super F11 enter-mode normal
 
 # Autostart applications ______________________________________________________
 
+dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river
+~/.guix-home/profile/libexec/xdg-desktop-portal-wlr &
+~/.guix-home/profile/libexec/xdg-desktop-portal -r &
+
 # status bar
 riverctl spawn waybar