renaming some stuff, updating colors