cleanup template origin reference
cleanup commands saved state
bug in commands user colors