Move schemes to component
New blue colours and layout