More changes/updates to theme.