Better colours, better borders