Made settings highlighter better