Updated buttons and colors