Move Colors into Wrappers