Moving more styles to more specific files.  A work in progress