updated structure, colour scheme