Added/changed definition of scale, axis and color