mostly colour and style improvements