Color for tjenester
merge fix