Improve night mode by unifying border-color