Work on dark theme.
More reskinning work
Work on reskinning