Fix metrics keys
Change update color