Merged in pull request w/ Light theme.