diff --git a/river/.config/river/init b/river/.config/river/init
index 57a3bf4..9090b9d 100755
--- a/river/.config/river/init
+++ b/river/.config/river/init
@@ -109,17 +109,21 @@ for mode in normal locked
 do
     riverctl map $mode None XF86Eject spawn 'eject -T'
 
-    riverctl map $mode None XF86AudioRaiseVolume spawn "amixer sset Master 5%+ | sed -En 's/.*\[([0-9]+)%\].*/\1/p' | head -1 > $wobsock"
-    riverctl map $mode None XF86AudioLowerVolume spawn "amixer sset Master 5%- | sed -En 's/.*\[([0-9]+)%\].*/\1/p' | head -1 > $wobsock"
-    riverctl map $mode None XF86AudioMute exec spawn "sset Master toggle | sed -En '/\[on\]/ s/.*\[([0-9]+)%\].*/\1/ p; /\[off\]/ s/.*/0/p' | head -1 > $wobsock"
+    riverctl map $mode None XF86AudioRaiseVolume spawn "~/.config/river/volume.sh up 0.02"
+    riverctl map $mode None XF86AudioLowerVolume spawn "~/.config/river/volume.sh down 0.02"
+    riverctl map $mode Shift XF86AudioRaiseVolume spawn "~/.config/river/volume.sh up 0.01"
+    riverctl map $mode Shift XF86AudioLowerVolume spawn "~/.config/river/volume.sh down 0.01"
+    riverctl map $mode Control XF86AudioRaiseVolume spawn "~/.config/river/volume.sh up 0.10"
+    riverctl map $mode Control XF86AudioLowerVolume spawn "~/.config/river/volume.sh down 0.10"
+    riverctl map $mode None XF86AudioMute exec spawn "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
 
     riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause'
     riverctl map $mode None XF86AudioPlay  spawn 'playerctl play-pause'
     riverctl map $mode None XF86AudioPrev  spawn 'playerctl previous'
     riverctl map $mode None XF86AudioNext  spawn 'playerctl next'
 
-    riverctl map $mode $mod+Control+Shift K spawn "brightnessctl set +5% | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > $wobsock"
-    riverctl map $mode $mod+Control+Shift J spawn "brightnessctl set 5%- | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > $wobsock"
+    riverctl map $mode None XF86MonBrightnessUp spawn "brightnessctl set +5% | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > $wobsock"
+    riverctl map $mode None XF86MonBrightnessDown spawn "brightnessctl set 5%- | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > $wobsock"
 done
 
 # "caffeine"
@@ -134,7 +138,8 @@ riverctl border-width 2
 # options
 riverctl set-repeat 50 300
 # riverctl keyboard-layout -options "altwin:swap_lalt_lwin" us
-riverctl keyboard-layout -options "altwin:swap_lalt_lwin,grp:alt_space_toggle" -variant ,colemak_dh us,us
+# riverctl keyboard-layout -options "altwin:swap_lalt_lwin,grp:alt_space_toggle" -variant colemak_dh, us,us
+riverctl keyboard-layout -options "grp:alt_space_toggle" -variant colemak_dh, us,us
 # riverctl keyboard-layout -options "altwin:swap_lalt_lwin,grp:alt_space_toggle" -variant ,colemak_dh,dvorak us,us,us
 # riverctl keyboard-layout -options "grp:alt_space_toggle" -variant ,dvorak us,us
 
@@ -176,7 +181,7 @@ riverctl rule-add -app-id org.gnome.Boxes ssd
 riverctl rule-add -app-id com.github.xournalpp.xournalpp ssd
 
 # spawn stuff
-pgrep wbg || wbg ~/.config/wallpaper.png &
+pgrep wbg || wbg ~/.config/river/wallpaper.jpg &
 wlr-randr --output eDP-1 --scale 1.25 &
 pgrep waybar || waybar &
 
@@ -194,6 +199,9 @@ foot --server & # TODO: figure out systemd service
 # emacs daemon
 emacs --daemon &
 
+# nextcloud client
+nextcloud &
+
 # pianobar
 riverctl map normal $mod+Shift S spawn '~/.config/pianobar/change_station.sh'
 riverctl map normal $mod P spawn 'echo "p" > ~/.config/pianobar/ctl'
diff --git a/river/.config/river/volume.sh b/river/.config/river/volume.sh
new file mode 100755
index 0000000..af1f2ef
--- /dev/null
+++ b/river/.config/river/volume.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+wobsock=$XDG_RUNTIME_DIR/wob.sock
+
+if [ $1 = "up" ]; then
+    wpctl set-volume @DEFAULT_AUDIO_SINK@ "$2+"
+else
+    wpctl set-volume @DEFAULT_AUDIO_SINK@ "$2-"
+fi
+
+wpctl get-volume @DEFAULT_AUDIO_SINK@ | sed 's/Volume: 0.//' > $wobsock
diff --git a/river/.config/river/wallpaper.jpg b/river/.config/river/wallpaper.jpg
new file mode 100644
index 0000000..9ca0c04
Binary files /dev/null and b/river/.config/river/wallpaper.jpg differ
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index 891ea04..82b5e3b 120000
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -1 +1 @@
-config-niri
\ No newline at end of file
+./config-river
\ No newline at end of file
diff --git a/waybar/.config/waybar/config-river b/waybar/.config/waybar/config-river
index c0df4ad..2418334 100644
--- a/waybar/.config/waybar/config-river
+++ b/waybar/.config/waybar/config-river
@@ -13,7 +13,7 @@
 	],
 	"modules-right": [
 		"tray",
-		"pulseaudio",
+		"wireplumber",
         "network",
 		"battery",
 	],
@@ -54,6 +54,27 @@
         "on-click-right": "pavucontrol"
     },
 
+    "wireplumber": {
+        "format": "{volume}% {icon}",
+        "format-muted": "",
+        "on-click": "helvum",
+        "format-icons": ["", "", ""]
+    },
+
+//    "wireplumber": {
+//        "format": "{icon} {volume:2}%",
+//        "format-bluetooth": "{icon}  {volume}%",
+//        "format-muted": "MUTE",
+//        "format-icons": {
+//            "headphones": "",
+//            "default": [
+//                "",
+//                ""
+//            ]
+//        },
+//        "on-click": "helvum"
+//    },
+
     "network": {
         "interface": "wlan0",
         "format": "{ifname}",
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 02df39a..b825dd0 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -19,6 +19,24 @@ window#waybar {
     color: @pink;
 }
 
+#tags button {
+    color: @text;
+}
+
+#tags button.occupied {
+    color: @yellow;
+}
+
+#tags button.focused {
+    color: @base;
+    background: @pink;
+}
+
+#tags button.urgent {
+    color: @base;
+    background: @red;
+}
+
 #clock,
 #pulseaudio,
 #battery,