Initial pass at the styles for decoupling.

Still more on this WIP