Resolve Old Colors Branch

Some small changes were made in this branch and never merged. I think some of the dynamic button was copy pasted.