Matched colors and updated buttons