Removed 'state' & changed colour scheme