Added more colors and matching walls