Try to tweak the themes/colors to work right