Use a box for the yasnippet field highlight face
Tweak snippets