Update colors and introduce back the border
tweak it