Update style to better match Cilantro

Note, there are still redundantly defined styles and some
inconsistencies.