Reorganize styles in more logical files. Some style cleanup
More cleanup and improvement of styles all around