diff --git a/logout.sh b/logout.sh
index 893bd67..05a5dde 100755
--- a/logout.sh
+++ b/logout.sh
@@ -34,7 +34,7 @@ handler() {
       elif pgrep plasmashell; then
         killall plasmashell
       elif pgrep ryudo; then
-        pkill -9 -P $(pgrep ryudo)
+        pkill -9 -P $(pgrep startx)
       else
           killall -0 Xorg
       fi
diff --git a/plasma-autostart.sh b/plasma-autostart.sh
index 3606975..5ee2159 100755
--- a/plasma-autostart.sh
+++ b/plasma-autostart.sh
@@ -5,18 +5,16 @@ sudo powertop -auto-tune &
 redshit -x; redshift -O 6000K &
 xbacklight -set 50 &
 
-if ! pgrep pulseaudio; then
-  pulseaudio -k
-  pulseaudio --start --exit-idle-time=-1 &
-fi
-if ! pgrep hamster-service; then
-  hamster-service &
-fi
 if ! pgrep offlineimap; then
   offlineimap &
 fi
 
+if ! pgrep pipewire; then
+  pipewire & sleep 0.3
+  pipewire-pulse &
+fi
 
+export WINIT_X11_SCALE_FACTOR=1
 export GTK_THEME=steppenwolf-dark
 rm ~/.config/gtkrc*
 export WINIT_X11_SCALE_FACTOR=1
diff --git a/t2stats.sh b/t2stats.sh
index 8f4e540..b1c790c 100755
--- a/t2stats.sh
+++ b/t2stats.sh
@@ -32,7 +32,7 @@ if [ "$1" = "-r" ]; then
     output=offline
   fi
 
-  echo -n "${output} "
+  echo -n "${output}"
 
   # battery
   powerlevel=$(cat /sys/class/power_supply/BAT*/capacity)
@@ -72,5 +72,8 @@ if [ "$1" = "-r" ]; then
       ;;
   esac
 
-  echo "${meter}"    
+  if ! grep Full /sys/class/power_supply/BAT*/status > /dev/null \
+    && file /sys/class/power_supply/BAT* > /dev/null; then
+    echo " ${meter}"
+  fi
 fi