Redo cloak, kick and slay to new command format