More specificity on Night theme; better colors on Night