yes, the diamond is a separate type of player character.
the toggle idea is good- i'll see if i can work that into my plans. my current thinking is that eventually the rest of that palette will be filled with other types of entities, such as particle emitters, various characters, switches, doors, and the like. the plan is for all of them to be optionally player controlled.