Small fixes
Properly coloring of variable names in figures