Rename some stuff, recolor some stuff
Merge branch 'master' of github.com:gshubham/bases_website
Fix some wording stuff