refactor color palatte styling
fix merge conflicts