Fix for #8430 plus various dark theme tweaks.