Clean-up of styles.xmlfor API21+