Better adherence to UIAppearance settings