styles - diverse clean up - renaming base styles
style - renaming