Develop

These are the final changes made to the theme for version 1.0

Including some final cleanup of the scss files, and small code changes.