changed tooltip color and updated link to Marescaux
merged conflits