Small fixes
Properly coloring of variable names in figures
Merge branch 'aupress'