Convert loose scripts to command bodies
Add "highlight" command