Border is now drawn inside so right border won't clip from theme CSS. Highlighting improvements for variables and entities.