move colours to locations file
add current location markers