Add \s alias for italics and change \r token to \o