Be more consistent with existing mechanisms:  Move defaults file into theme.