Fixes highlighting for "thin" files
WIP improved highlighting