Removed rework-color. Updated tests. Removed button dependency.
Removing button dependency