diff --git a/usr/bin/jgtint2-pipe b/usr/bin/jgtint2-pipe
index c4d754c..7cd8fcb 100755
--- a/usr/bin/jgtint2-pipe
+++ b/usr/bin/jgtint2-pipe
@@ -58,11 +58,26 @@ case $LANG in
;;
esac
+out+=("^sep($APPS)")
+out+=("$LAUNCHERS,jgtint2launcher")
-out+=("^sep($TITLE)")
-out+=("$CHOOSE_TINT2,$TZEN")
-out+=("$RESTART_TINT2,mb-tint2restart")
-out+=("$RELOAD_TINT2,killall -SIGUSR1 tint2")
+if command -v phwmon.py &>/dev/null; then
+PHWRUN="mabox-obstart phwmon"
+
+. $HOME/.config/mabox/mabox.conf
+
+ out+=("^sep($TRAY_HWMON)")
+ if [ "$(pgrep -f phwmon.py)" ];then
+ out+=("Stop/Disable,mb-setvar phwmon_monitor=false;sleep 2;$PHWRUN;$me")
+ else
+ out+=("Start/Enable,mb-setvar phwmon_monitor=true;$PHWRUN;$me")
+ fi
+ out+=("^sep()")
+[[ $phwmon_cpu = false ]] && out+=("CPU,mb-setvar phwmon_cpu=true;$PHWRUN;$me") || out+=("CPU,mb-setvar phwmon_cpu=false;$PHWRUN;$me")
+[[ $phwmon_mem = false ]] && out+=("Memory,mb-setvar phwmon_mem=true;$PHWRUN;$me") || out+=("Memory,mb-setvar phwmon_mem=false;$PHWRUN;$me")
+[[ $phwmon_swap = false ]] && out+=("Swap,mb-setvar phwmon_swap=true;$PHWRUN;$me") || out+=("Swap,mb-setvar phwmon_swap=false;$PHWRUN;$me")
+[[ $phwmon_net = false ]] && out+=("Network usage,mb-setvar phwmon_net=true;$PHWRUN;$me") || out+=("Network usage,mb-setvar phwmon_net=false;$PHWRUN;$me")
+[[ $phwmon_io = false ]] && out+=("Disk IO,mb-setvar phwmon_io=true;$PHWRUN;$me") || out+=("Disk IO,mb-setvar phwmon_io=false;$PHWRUN;$me")
if [ "$(pidof tint2)" ];then
out+=("^sep($TINT2_CONFIGURE)")
@@ -79,28 +94,14 @@ out+=("^sep($TINT2_CONFIGURE)")
fi
done < <(pgrep -a tint2)
fi
+
+out+=("^sep($TITLE)")
+out+=("$CHOOSE_TINT2,$TZEN")
+out+=("$RESTART_TINT2,mb-tint2restart")
+out+=("$RELOAD_TINT2,killall -SIGUSR1 tint2")
+
+
#out+=("^sep($EDIT_TINT2)")
-out+=("^sep($APPS)")
-out+=("$LAUNCHERS,jgtint2launcher")
-
-if command -v phwmon.py &>/dev/null; then
-PHWRUN="mabox-obstart phwmon"
-
-. $HOME/.config/mabox/mabox.conf
-
- out+=("^sep($TRAY_HWMON)")
- if [ "$(pgrep -f phwmon.py)" ];then
- out+=("Stop/Disable,mb-setvar phwmon_monitor=false;$PHWRUN;$me")
- else
- out+=("Start/Enable,mb-setvar phwmon_monitor=true;$PHWRUN;$me")
- fi
- out+=("^sep()")
-[[ $phwmon_cpu = false ]] && out+=("CPU,mb-setvar phwmon_cpu=true;$PHWRUN;$me") || out+=("CPU,mb-setvar phwmon_cpu=false;$PHWRUN;$me")
-[[ $phwmon_mem = false ]] && out+=("Memory,mb-setvar phwmon_mem=true;$PHWRUN;$me") || out+=("Memory,mb-setvar phwmon_mem=false;$PHWRUN;$me")
-[[ $phwmon_swap = false ]] && out+=("Swap,mb-setvar phwmon_swap=true;$PHWRUN;$me") || out+=("Swap,mb-setvar phwmon_swap=false;$PHWRUN;$me")
-[[ $phwmon_net = false ]] && out+=("Network usage,mb-setvar phwmon_net=true;$PHWRUN;$me") || out+=("Network usage,mb-setvar phwmon_net=false;$PHWRUN;$me")
-[[ $phwmon_io = false ]] && out+=("Disk IO,mb-setvar phwmon_io=true;$PHWRUN;$me") || out+=("Disk IO,mb-setvar phwmon_io=false;$PHWRUN;$me")
-
# out+=("^sep()")
fi