Improve regex for colour extraction to deal with trailing comma