add gray2 to dark/light theme
some null checks