Applied fixes to Dark theme in light theme