Working: fill colors and catcher changes