added more structure and basic colors