basic font changes
merged style changes