Refactored
Updated Colors