Fix gifv expandos overlapping content (again), and refactor one of my changes

For some reason gifv expandos still overlap (I swear my first fix worked, maybe we changed something?), but this should fix it. (original PR #1767)

Also refactored score highlighting presets (it's now slightly cleaner).