Added buttons and new colors