Make better suited for dark themes