Break default styling into modules

Apply _s styling where applicable, merging with bitters and divided
into appropriate modules