fix up double click to edit, re-add self highlight colours