Fully converted kick and cloak to new command setup