Finished changes to rpi2 following on from readthrough, and some consequence mods to desktop1 mostly about vector graphics