Fix themes, fix Google play implementation