Refactored colors & patterns