added default and primary colors to buttons and code examples
resolved merge conflicts in the build folder