Large-ish updates to styles

Signed-off-by: Joel Fischer <joel@livioradio.com>