Fixed spacing and highlighting, see #86