Merge "vector: Restore @body-font-color to black"