colors simplified + a few new aliases for admin