Added color and none to highlight
Added colors to highlights
Added bg-color for highlght-none
Change bg color on highlight-none in dark mode