Cleanup styles, avoid disparate color theme headers