Add border and padding to highlights.
First Trademark commit.