Match official colors and add the X button!