:lipstick: Simplify by combining code

Didn't need separate .editor sections for gutter and highlights.