Improved colours and borders to play nice with the background