* Relocate chart type and dataset type defaults * Update types * Separate overrides and descriptors * Update derived sample, use merge for inherit * Don't merge overrides * Review update