Merge "Move caption style to its own class, add presets"