Fix theme to follow android theme