Added Google apps and removed Amazon ones