Move +1 button, separate +1 count
Move color to colors file