Update gems
Add Android theme support