Add state group for theme
Update main_android