Add Colored Buttons and States