Improvements to black and white themes