diff --git a/sway/idle.sh b/sway/idle.sh
index d191070..d3b035b 100755
--- a/sway/idle.sh
+++ b/sway/idle.sh
@@ -10,9 +10,12 @@ BLFILE="$HOME/.local/state/idle.dim"
 OPFILE="$HOME/.local/state/active_outputs"
 STATEFILE="$HOME/.local/state/idle.state"
 IDLEMODE=$(cat $HOME/.local/state/idle_mode)
+
 if [[ -n $2 ]]; then
 	if [[ $2 == '--ignore_mode' ]]; then
 		IDLEMODE='hibernate'
+	elif [[ $1 == "mode" ]]; then
+		IDLEMODE=$2
 	else
 		echo "Unknown mode $IDLEMODE"
 		exit
@@ -76,6 +79,23 @@ function usage() {
 if [[ -z $1 ]]; then
 	echo "Missing argument"
 	usage
+elif [[ $1 == "mode" ]]; then
+	if [[ -n $2 ]]; then
+		echo -n $2 > $HOME/.local/state/idle_mode
+	elif [[ $IDLEMODE == 0 ]]; then
+		echo -n 'fade' > $HOME/.local/state/idle_mode
+	elif [[ $IDLEMODE == 1 ]]; then
+		echo -n 'dim' > $HOME/.local/state/idle_mode
+	elif [[ $IDLEMODE == 2 ]]; then
+		echo -n 'lock' > $HOME/.local/state/idle_mode
+	elif [[ $IDLEMODE == 3 ]]; then
+		echo -n 'sleep' > $HOME/.local/state/idle_mode
+	elif [[ $IDLEMODE == 4 ]]; then
+		echo -n 'hibernate' > $HOME/.local/state/idle_mode
+	elif [[ $IDLEMODE == 5 ]]; then
+		echo -n 'none' > $HOME/.local/state/idle_mode
+	fi
+	cat $HOME/.local/state/idle_mode
 elif [[ $1 == "-h" ]] || [[ $1 == "--help" ]] || [[ $1 == "help" ]]; then
 	usage
 elif [[ $1 == "start" ]]; then
diff --git a/waybar/waybar-idle.sh b/waybar/waybar-idle.sh
index 10a6579..0cc613c 100755
--- a/waybar/waybar-idle.sh
+++ b/waybar/waybar-idle.sh
@@ -1,45 +1,28 @@
 #!/bin/bash
 
 FILE="$HOME/.local/state/idle_mode"
-if [[ -z $1 ]] || [[ "$1" == 'rotate' ]] || [[ "$1" == 'bar' ]]; then
-    if [[ -e $FILE ]]; then
-        MODE=$(cat $FILE)
-    else
-        MODE="fade"
-    fi
+if [[ -e $FILE ]]; then
+    MODE=$(cat $FILE)
 else
-    MODE="$1"
+    MODE="fade"
 fi
 
 if [[ $MODE == "none" ]]; then
-    NEXT="fade"
     ICON="☕"
 elif [[ $MODE == "fade" ]]; then
     ICON="🌌"
-    NEXT="dim"
 elif [[ $MODE == "dim" ]]; then
     ICON="⬛"
-    NEXT="lock"
 elif [[ $MODE == "lock" ]]; then
     ICON="🔒"
-    NEXT="sleep"
 elif [[ $MODE == "sleep" ]]; then
     ICON="💤"
-    NEXT="hibernate"
 elif [[ $MODE == "hibernate" ]]; then
     ICON="↯ "
-    NEXT="none"
 else
-    echo "Invalid mode: $MODE"
+    ICON="? "
+    echo '{"text":"'$ICON'","icon":"'$ICON'","tooltip":"Error: Invalid mode ('$MODE')","class":"'$MODE'"}'
     exit
 fi
 
-if [[ -z $1 ]] || [[ "$1" == "bar" ]]; then
-    echo '{"text":"'$ICON'","icon":"'$ICON'","tooltip":"Change sleep mode ('$MODE')","class":"'$MODE'"}'
-elif [ "$1" == "rotate" ]; then
-    echo -n $NEXT >$FILE
-    $0 bar
-else
-    echo -n $MODE >$FILE
-    $0 bar
-fi
+echo '{"text":"'$ICON'","icon":"'$ICON'","tooltip":"Change sleep mode ('$MODE')","class":"'$MODE'"}'