Finished updating files to new styleguide