Make light theme more correct