Update to PWA colours to use in line styles and move location