Merge theme and config changes from theme-dev.
Update with own theme.