Custom theme fix

1. classes in removeClass were separated by `,` instead of spaces.
2. android typo fixed