fix border and active bg color