Use iOS and Android themes instead of changing all files. Grunfile also updated.