For the love of macros/PLE - make all command toggles separate on/off commands

I thought it was Pi aka infinity.