'Update to make more themable for theme chooser'