Some more colours/spacing tweaking