Gapps, theme, misc reworking