Update to colors and raised type active state