light theme almost fixed