workshop pullout stuff and colour corrections from Chris
merge conflict resolved
merge conflict resolved