Merged iOS and android themes (iOS basically just adds gradients and tweaks some colors), added icons.