various updates but colours still not right