add a border and fix the text color on last color block