Move things around,
rename accented to text-accented,
and improve typography handling