diff --git a/src/mol-model-props/computed/themes/accessible-surface-area.ts b/src/mol-model-props/computed/themes/accessible-surface-area.ts
index 2c608b36daadf24f5415896de78e9a0a6f606488..5de7df9837f50baec785434be678d0ebf43c8cec 100644
--- a/src/mol-model-props/computed/themes/accessible-surface-area.ts
+++ b/src/mol-model-props/computed/themes/accessible-surface-area.ts
@@ -66,7 +66,7 @@ export function AccessibleSurfaceAreaColorTheme(ctx: ThemeDataContext, props: PD
export const AccessibleSurfaceAreaColorThemeProvider: ColorTheme.Provider<AccessibleSurfaceAreaColorThemeParams> = {
label: 'Accessible Surface Area',
- category: ColorTheme.Category.Computed,
+ category: ColorTheme.Category.Residue,
factory: AccessibleSurfaceAreaColorTheme,
getParams: getAccessibleSurfaceAreaColorThemeParams,
defaultValues: PD.getDefaultValues(AccessibleSurfaceAreaColorThemeParams),
diff --git a/src/mol-model-props/computed/themes/interaction-type.ts b/src/mol-model-props/computed/themes/interaction-type.ts
index f816d2b4180da5ebad18bba0ec03c5578bf36d90..70c88fd04979d9616f22bfd086f191b9a65c56a4 100644
--- a/src/mol-model-props/computed/themes/interaction-type.ts
+++ b/src/mol-model-props/computed/themes/interaction-type.ts
@@ -108,7 +108,7 @@ export function InteractionTypeColorTheme(ctx: ThemeDataContext, props: PD.Value
export const InteractionTypeColorThemeProvider: ColorTheme.Provider<InteractionTypeColorThemeParams> = {
label: 'Interaction Type',
- category: ColorTheme.Category.Computed,
+ category: ColorTheme.Category.Misc,
factory: InteractionTypeColorTheme,
getParams: getInteractionTypeColorThemeParams,
defaultValues: PD.getDefaultValues(InteractionTypeColorThemeParams),
diff --git a/src/mol-model-props/integrative/cross-link-restraint/color.ts b/src/mol-model-props/integrative/cross-link-restraint/color.ts
index 3ba49d73d14c505ae0192d5584ae459fc5940173..0ff69cd16f2a016ca9907c76aa0ab662570255e3 100644
--- a/src/mol-model-props/integrative/cross-link-restraint/color.ts
+++ b/src/mol-model-props/integrative/cross-link-restraint/color.ts
@@ -63,7 +63,7 @@ export function CrossLinkColorTheme(ctx: ThemeDataContext, props: PD.Values<Cros
export const CrossLinkColorThemeProvider: ColorTheme.Provider<CrossLinkColorThemeParams> = {
label: 'Cross Link',
- category: ColorTheme.Category.Advanced,
+ category: ColorTheme.Category.Misc,
factory: CrossLinkColorTheme,
getParams: getCrossLinkColorThemeParams,
defaultValues: PD.getDefaultValues(CrossLinkColorThemeParams),
diff --git a/src/mol-model-props/pdbe/themes/structure-quality-report.ts b/src/mol-model-props/pdbe/themes/structure-quality-report.ts
index 237eb3dcddb24d57becf92e322dab2657e11bdaf..5f624e0f26a1944fb890826b3b7a72a8cee56ec0 100644
--- a/src/mol-model-props/pdbe/themes/structure-quality-report.ts
+++ b/src/mol-model-props/pdbe/themes/structure-quality-report.ts
@@ -79,7 +79,7 @@ export function StructureQualityReportColorTheme(ctx: ThemeDataContext, props: P
export const StructureQualityReportColorThemeProvider: ColorTheme.Provider<Params> = {
label: 'Structure Quality Report',
- category: 'PDBe',
+ category: ColorTheme.Category.Validation,
factory: StructureQualityReportColorTheme,
getParams: ctx => {
const issueTypes = StructureQualityReport.getIssueTypes(ctx.structure);
diff --git a/src/mol-model-props/rcsb/themes/assembly-symmetry-cluster.ts b/src/mol-model-props/rcsb/themes/assembly-symmetry-cluster.ts
index 292ef5c9510cee816687bf3a0a03c91afd0ef977..5ef15770e2c16dd1b724849768f0cbb4e46d8494 100644
--- a/src/mol-model-props/rcsb/themes/assembly-symmetry-cluster.ts
+++ b/src/mol-model-props/rcsb/themes/assembly-symmetry-cluster.ts
@@ -93,7 +93,7 @@ export function AssemblySymmetryClusterColorTheme(ctx: ThemeDataContext, props:
export const AssemblySymmetryClusterColorThemeProvider: ColorTheme.Provider<AssemblySymmetryClusterColorThemeParams> = {
label: 'Assembly Symmetry Cluster',
- category: 'RCSB',
+ category: ColorTheme.Category.Symmetry,
factory: AssemblySymmetryClusterColorTheme,
getParams: getAssemblySymmetryClusterColorThemeParams,
defaultValues: PD.getDefaultValues(AssemblySymmetryClusterColorThemeParams),
diff --git a/src/mol-model-props/rcsb/themes/density-fit.ts b/src/mol-model-props/rcsb/themes/density-fit.ts
index f5c7266779b3eada84f59920c175c57edf1b8309..0661d73d228daf94cf144292aa26404113533b1c 100644
--- a/src/mol-model-props/rcsb/themes/density-fit.ts
+++ b/src/mol-model-props/rcsb/themes/density-fit.ts
@@ -62,7 +62,7 @@ export function DensityFitColorTheme(ctx: ThemeDataContext, props: {}): ColorThe
export const DensityFitColorThemeProvider: ColorTheme.Provider<{}> = {
label: 'Density Fit',
- category: 'RCSB',
+ category: ColorTheme.Category.Validation,
factory: DensityFitColorTheme,
getParams: () => ({}),
defaultValues: PD.getDefaultValues({}),
diff --git a/src/mol-model-props/rcsb/themes/geometry-quality.ts b/src/mol-model-props/rcsb/themes/geometry-quality.ts
index 4ae2c0ca045030f2dcea4fe3452ccd6ade28f350..834ccefab83e3a9807c063e41f1ab8749eac0fa6 100644
--- a/src/mol-model-props/rcsb/themes/geometry-quality.ts
+++ b/src/mol-model-props/rcsb/themes/geometry-quality.ts
@@ -102,7 +102,7 @@ export function GeometryQualityColorTheme(ctx: ThemeDataContext, props: PD.Value
export const GeometryQualityColorThemeProvider: ColorTheme.Provider<GeometricQualityColorThemeParams> = {
label: 'Geometry Quality',
- category: 'RCSB',
+ category: ColorTheme.Category.Validation,
factory: GeometryQualityColorTheme,
getParams: getGeometricQualityColorThemeParams,
defaultValues: PD.getDefaultValues(getGeometricQualityColorThemeParams({})),
diff --git a/src/mol-model-props/rcsb/themes/random-coil-index.ts b/src/mol-model-props/rcsb/themes/random-coil-index.ts
index 51e62a32eed81d7f1c52ecdcd14c0c984ef486e3..1dedd686f457c9380f8b857046956a3200238fd1 100644
--- a/src/mol-model-props/rcsb/themes/random-coil-index.ts
+++ b/src/mol-model-props/rcsb/themes/random-coil-index.ts
@@ -53,7 +53,7 @@ export function RandomCoilIndexColorTheme(ctx: ThemeDataContext, props: {}): Col
export const RandomCoilIndexColorThemeProvider: ColorTheme.Provider<{}> = {
label: 'Random Coil Index',
- category: 'RCSB',
+ category: ColorTheme.Category.Validation,
factory: RandomCoilIndexColorTheme,
getParams: () => ({}),
defaultValues: PD.getDefaultValues({}),
diff --git a/src/mol-theme/color.ts b/src/mol-theme/color.ts
index 6efcc769161ac2472ea82fdf9c7ac70d73ec817d..6829233f6e18fe8642b1216451c6ad8bd7f8c84f 100644
--- a/src/mol-theme/color.ts
+++ b/src/mol-theme/color.ts
@@ -47,10 +47,12 @@ interface ColorTheme<P extends PD.Params> {
}
namespace ColorTheme {
export const enum Category {
- Basic = 'Basic',
- Advanced = 'Advanced',
- Computed = 'Computed',
- Misc = 'Miscellaneous'
+ Atom = 'Atom Property',
+ Chain = 'Chain Property',
+ Residue = 'Residue Property',
+ Symmetry = 'Symmetry',
+ Validation = 'Validation',
+ Misc = 'Miscellaneous',
}
export type Props = { [k: string]: any }
diff --git a/src/mol-theme/color/carbohydrate-symbol.ts b/src/mol-theme/color/carbohydrate-symbol.ts
index 853e7cf9ce3828c1288be8b09521914d6b4ef342..39d41725491f48c9bf5ee3fcccdcc363d401d4c5 100644
--- a/src/mol-theme/color/carbohydrate-symbol.ts
+++ b/src/mol-theme/color/carbohydrate-symbol.ts
@@ -61,8 +61,8 @@ export function CarbohydrateSymbolColorTheme(ctx: ThemeDataContext, props: PD.Va
}
export const CarbohydrateSymbolColorThemeProvider: ColorTheme.Provider<CarbohydrateSymbolColorThemeParams> = {
- label: 'Carbohydrate Symbol',
- category: ColorTheme.Category.Advanced,
+ label: 'Carbohydrate Symbol',
+ category: ColorTheme.Category.Residue,
factory: CarbohydrateSymbolColorTheme,
getParams: getCarbohydrateSymbolColorThemeParams,
defaultValues: PD.getDefaultValues(CarbohydrateSymbolColorThemeParams),
diff --git a/src/mol-theme/color/chain-id.ts b/src/mol-theme/color/chain-id.ts
index d9ae75cb9d3fb4282a2016974059d54ec0afdb20..46b587c708517f24ee6c052fe6f7c47376c21a87 100644
--- a/src/mol-theme/color/chain-id.ts
+++ b/src/mol-theme/color/chain-id.ts
@@ -119,7 +119,7 @@ export function ChainIdColorTheme(ctx: ThemeDataContext, props: PD.Values<ChainI
export const ChainIdColorThemeProvider: ColorTheme.Provider<ChainIdColorThemeParams> = {
label: 'Chain Id',
- category: ColorTheme.Category.Basic,
+ category: ColorTheme.Category.Chain,
factory: ChainIdColorTheme,
getParams: getChainIdColorThemeParams,
defaultValues: PD.getDefaultValues(ChainIdColorThemeParams),
diff --git a/src/mol-theme/color/element-index.ts b/src/mol-theme/color/element-index.ts
index d2e13588ba64f46174ae2a5889d90800c3374d41..0e796512a00b6af51a604b3a92276aa49f1bf17f 100644
--- a/src/mol-theme/color/element-index.ts
+++ b/src/mol-theme/color/element-index.ts
@@ -73,7 +73,7 @@ export function ElementIndexColorTheme(ctx: ThemeDataContext, props: PD.Values<E
export const ElementIndexColorThemeProvider: ColorTheme.Provider<ElementIndexColorThemeParams> = {
label: 'Element Index',
- category: ColorTheme.Category.Basic,
+ category: ColorTheme.Category.Atom,
factory: ElementIndexColorTheme,
getParams: getElementIndexColorThemeParams,
defaultValues: PD.getDefaultValues(ElementIndexColorThemeParams),
diff --git a/src/mol-theme/color/element-symbol.ts b/src/mol-theme/color/element-symbol.ts
index 8c559ff64356da9d0083e9bb1fa9098f9edf14e6..3582d1414f04afaac51849cf3cd262c4b8c6af71 100644
--- a/src/mol-theme/color/element-symbol.ts
+++ b/src/mol-theme/color/element-symbol.ts
@@ -69,7 +69,7 @@ export function ElementSymbolColorTheme(ctx: ThemeDataContext, props: PD.Values<
export const ElementSymbolColorThemeProvider: ColorTheme.Provider<ElementSymbolColorThemeParams> = {
label: 'Element Symbol',
- category: ColorTheme.Category.Basic,
+ category: ColorTheme.Category.Atom,
factory: ElementSymbolColorTheme,
getParams: getElementSymbolColorThemeParams,
defaultValues: PD.getDefaultValues(ElementSymbolColorThemeParams),
diff --git a/src/mol-theme/color/entity-source.ts b/src/mol-theme/color/entity-source.ts
index e8b4e71bc264df06283932b4566ad48039df0320..641839576b59aba23a4e8ac23672aa9150928f64 100644
--- a/src/mol-theme/color/entity-source.ts
+++ b/src/mol-theme/color/entity-source.ts
@@ -175,7 +175,7 @@ export function EntitySourceColorTheme(ctx: ThemeDataContext, props: PD.Values<E
export const EntitySourceColorThemeProvider: ColorTheme.Provider<EntitySourceColorThemeParams> = {
label: 'Entity Source',
- category: ColorTheme.Category.Advanced,
+ category: ColorTheme.Category.Chain,
factory: EntitySourceColorTheme,
getParams: getEntitySourceColorThemeParams,
defaultValues: PD.getDefaultValues(EntitySourceColorThemeParams),
diff --git a/src/mol-theme/color/hydrophobicity.ts b/src/mol-theme/color/hydrophobicity.ts
index e49e3f25cc77111133365feb1e1a55d1b5c5605b..6ddea14a6e505d8270eca238da5ec61450a8fc6e 100644
--- a/src/mol-theme/color/hydrophobicity.ts
+++ b/src/mol-theme/color/hydrophobicity.ts
@@ -94,7 +94,7 @@ export function HydrophobicityColorTheme(ctx: ThemeDataContext, props: PD.Values
export const HydrophobicityColorThemeProvider: ColorTheme.Provider<HydrophobicityColorThemeParams> = {
label: 'Hydrophobicity',
- category: ColorTheme.Category.Advanced,
+ category: ColorTheme.Category.Residue,
factory: HydrophobicityColorTheme,
getParams: getHydrophobicityColorThemeParams,
defaultValues: PD.getDefaultValues(HydrophobicityColorThemeParams),
diff --git a/src/mol-theme/color/model-index.ts b/src/mol-theme/color/model-index.ts
index f7cc54bf7cdd7df506716c5e56f2239bc1d31c4f..20df7e57212ef604707c73e3fd707f4f8f82109b 100644
--- a/src/mol-theme/color/model-index.ts
+++ b/src/mol-theme/color/model-index.ts
@@ -61,7 +61,7 @@ export function ModelIndexColorTheme(ctx: ThemeDataContext, props: PD.Values<Mod
export const ModelIndexColorThemeProvider: ColorTheme.Provider<ModelIndexColorThemeParams> = {
label: 'Model Index',
- category: ColorTheme.Category.Basic,
+ category: ColorTheme.Category.Chain,
factory: ModelIndexColorTheme,
getParams: getModelIndexColorThemeParams,
defaultValues: PD.getDefaultValues(ModelIndexColorThemeParams),
diff --git a/src/mol-theme/color/molecule-type.ts b/src/mol-theme/color/molecule-type.ts
index 668f8ccfe8b6fc9becc285f90490bb814433ee5d..1692e649728c5564deef6859b770c0bd6677e060 100644
--- a/src/mol-theme/color/molecule-type.ts
+++ b/src/mol-theme/color/molecule-type.ts
@@ -78,7 +78,7 @@ export function MoleculeTypeColorTheme(ctx: ThemeDataContext, props: PD.Values<M
export const MoleculeTypeColorThemeProvider: ColorTheme.Provider<MoleculeTypeColorThemeParams> = {
label: 'Molecule Type',
- category: ColorTheme.Category.Advanced,
+ category: ColorTheme.Category.Residue,
factory: MoleculeTypeColorTheme,
getParams: getMoleculeTypeColorThemeParams,
defaultValues: PD.getDefaultValues(MoleculeTypeColorThemeParams),
diff --git a/src/mol-theme/color/occupancy.ts b/src/mol-theme/color/occupancy.ts
index 7cfa1c4580b737c2c65a4349ec72e83ec553ebe0..47686503c292c9da785e2fd077b2617de628be14 100644
--- a/src/mol-theme/color/occupancy.ts
+++ b/src/mol-theme/color/occupancy.ts
@@ -60,7 +60,7 @@ export function OccupancyColorTheme(ctx: ThemeDataContext, props: PD.Values<Occu
export const OccupancyColorThemeProvider: ColorTheme.Provider<OccupancyColorThemeParams> = {
label: 'Occupancy',
- category: ColorTheme.Category.Advanced,
+ category: ColorTheme.Category.Atom,
factory: OccupancyColorTheme,
getParams: getOccupancyColorThemeParams,
defaultValues: PD.getDefaultValues(OccupancyColorThemeParams),
diff --git a/src/mol-theme/color/operator-hkl.ts b/src/mol-theme/color/operator-hkl.ts
index d08c290333e47d901e051a0e339a778063c7f9f5..b6adab5f2161bd87dd6eb2c6a8fe864295714184 100644
--- a/src/mol-theme/color/operator-hkl.ts
+++ b/src/mol-theme/color/operator-hkl.ts
@@ -119,7 +119,7 @@ export function OperatorHklColorTheme(ctx: ThemeDataContext, props: PD.Values<Op
export const OperatorHklColorThemeProvider: ColorTheme.Provider<OperatorHklColorThemeParams> = {
label: 'Operator HKL',
- category: ColorTheme.Category.Advanced,
+ category: ColorTheme.Category.Symmetry,
factory: OperatorHklColorTheme,
getParams: getOperatorHklColorThemeParams,
defaultValues: PD.getDefaultValues(OperatorHklColorThemeParams),
diff --git a/src/mol-theme/color/operator-name.ts b/src/mol-theme/color/operator-name.ts
index 61b4e95c4e3c9704615e298547173aa6d7adc9cb..3c4b60895f0dabda9af8c4bf6a817ed6f11d5830 100644
--- a/src/mol-theme/color/operator-name.ts
+++ b/src/mol-theme/color/operator-name.ts
@@ -85,7 +85,7 @@ export function OperatorNameColorTheme(ctx: ThemeDataContext, props: PD.Values<O
export const OperatorNameColorThemeProvider: ColorTheme.Provider<OperatorNameColorThemeParams> = {
label: 'Operator Name',
- category: ColorTheme.Category.Advanced,
+ category: ColorTheme.Category.Symmetry,
factory: OperatorNameColorTheme,
getParams: getOperatorNameColorThemeParams,
defaultValues: PD.getDefaultValues(OperatorNameColorThemeParams),
diff --git a/src/mol-theme/color/polymer-id.ts b/src/mol-theme/color/polymer-id.ts
index 3e796d3d9aa2e4449bb203f54102619271c90421..68649703483620535f88e05a03f19076ad7831d2 100644
--- a/src/mol-theme/color/polymer-id.ts
+++ b/src/mol-theme/color/polymer-id.ts
@@ -127,8 +127,8 @@ export function PolymerIdColorTheme(ctx: ThemeDataContext, props: PD.Values<Poly
}
export const PolymerIdColorThemeProvider: ColorTheme.Provider<PolymerIdColorThemeParams> = {
- label: 'Polymer Id',
- category: ColorTheme.Category.Basic,
+ label: 'Polymer Chain Id',
+ category: ColorTheme.Category.Chain,
factory: PolymerIdColorTheme,
getParams: getPolymerIdColorThemeParams,
defaultValues: PD.getDefaultValues(PolymerIdColorThemeParams),
diff --git a/src/mol-theme/color/polymer-index.ts b/src/mol-theme/color/polymer-index.ts
index ef37ce818edc5571e0e9a25e7a1e8a891065279a..6d6c86dc9ae258c16509e6478d0b1a63ce6d974f 100644
--- a/src/mol-theme/color/polymer-index.ts
+++ b/src/mol-theme/color/polymer-index.ts
@@ -16,7 +16,7 @@ import { ColorLists } from '../../mol-util/color/lists';
const DefaultList = 'dark-2'
const DefaultColor = Color(0xCCCCCC)
-const Description = 'Gives every polymer a unique color based on the position (index) of the polymer in the list of polymers in the structure.'
+const Description = 'Gives every polymer chain instance a unique color based on the position (index) of the polymer in the list of polymers in the structure.'
export const PolymerIndexColorThemeParams = {
...getPaletteParams({ type: 'set', setList: DefaultList }),
@@ -87,8 +87,8 @@ export function PolymerIndexColorTheme(ctx: ThemeDataContext, props: PD.Values<P
}
export const PolymerIndexColorThemeProvider: ColorTheme.Provider<PolymerIndexColorThemeParams> = {
- label: 'Polymer Index',
- category: ColorTheme.Category.Advanced,
+ label: 'Polymer Chain Instance',
+ category: ColorTheme.Category.Chain,
factory: PolymerIndexColorTheme,
getParams: getPolymerIndexColorThemeParams,
defaultValues: PD.getDefaultValues(PolymerIndexColorThemeParams),
diff --git a/src/mol-theme/color/residue-name.ts b/src/mol-theme/color/residue-name.ts
index 72259d10f211d7b9116dc81b684ea34d27f8b713..741601e1cd2e6f37dd068d3d59857ac24b4e45de 100644
--- a/src/mol-theme/color/residue-name.ts
+++ b/src/mol-theme/color/residue-name.ts
@@ -130,7 +130,7 @@ export function ResidueNameColorTheme(ctx: ThemeDataContext, props: PD.Values<Re
export const ResidueNameColorThemeProvider: ColorTheme.Provider<ResidueNameColorThemeParams> = {
label: 'Residue Name',
- category: ColorTheme.Category.Basic,
+ category: ColorTheme.Category.Residue,
factory: ResidueNameColorTheme,
getParams: getResidueNameColorThemeParams,
defaultValues: PD.getDefaultValues(ResidueNameColorThemeParams),
diff --git a/src/mol-theme/color/secondary-structure.ts b/src/mol-theme/color/secondary-structure.ts
index 6afa2dc1b3b038bc6b32472432ea68fe9542ddf2..12eaf2eb8df454b20d2b7b1d9cf1d7d2c6521da4 100644
--- a/src/mol-theme/color/secondary-structure.ts
+++ b/src/mol-theme/color/secondary-structure.ts
@@ -113,7 +113,7 @@ export function SecondaryStructureColorTheme(ctx: ThemeDataContext, props: PD.Va
export const SecondaryStructureColorThemeProvider: ColorTheme.Provider<SecondaryStructureColorThemeParams> = {
label: 'Secondary Structure',
- category: ColorTheme.Category.Basic,
+ category: ColorTheme.Category.Residue,
factory: SecondaryStructureColorTheme,
getParams: getSecondaryStructureColorThemeParams,
defaultValues: PD.getDefaultValues(SecondaryStructureColorThemeParams),
diff --git a/src/mol-theme/color/sequence-id.ts b/src/mol-theme/color/sequence-id.ts
index 90f5038eca3641248a6562dce33939ac2a15aa0f..26881241a45d546ec50da3cba5c17b4cf6314487 100644
--- a/src/mol-theme/color/sequence-id.ts
+++ b/src/mol-theme/color/sequence-id.ts
@@ -101,7 +101,7 @@ export function SequenceIdColorTheme(ctx: ThemeDataContext, props: PD.Values<Seq
export const SequenceIdColorThemeProvider: ColorTheme.Provider<SequenceIdColorThemeParams> = {
label: 'Sequence Id',
- category: ColorTheme.Category.Basic,
+ category: ColorTheme.Category.Residue,
factory: SequenceIdColorTheme,
getParams: getSequenceIdColorThemeParams,
defaultValues: PD.getDefaultValues(SequenceIdColorThemeParams),
diff --git a/src/mol-theme/color/shape-group.ts b/src/mol-theme/color/shape-group.ts
index d5b5ba87ee925e22856186514992d09ed34c9a7a..8a8232657dec24eac00254c08ba2bf2a458b4dc7 100644
--- a/src/mol-theme/color/shape-group.ts
+++ b/src/mol-theme/color/shape-group.ts
@@ -37,7 +37,7 @@ export function ShapeGroupColorTheme(ctx: ThemeDataContext, props: PD.Values<Sha
export const ShapeGroupColorThemeProvider: ColorTheme.Provider<ShapeGroupColorThemeParams> = {
label: 'Shape Group',
- category: ColorTheme.Category.Advanced,
+ category: ColorTheme.Category.Misc,
factory: ShapeGroupColorTheme,
getParams: getShapeGroupColorThemeParams,
defaultValues: PD.getDefaultValues(ShapeGroupColorThemeParams),
diff --git a/src/mol-theme/color/uncertainty.ts b/src/mol-theme/color/uncertainty.ts
index 7e87f0127e065efc0c65a7b3615967a79590f257..512dbea67781636037f14c4bbf34b9cf7202acf4 100644
--- a/src/mol-theme/color/uncertainty.ts
+++ b/src/mol-theme/color/uncertainty.ts
@@ -64,7 +64,7 @@ export function UncertaintyColorTheme(ctx: ThemeDataContext, props: PD.Values<Un
export const UncertaintyColorThemeProvider: ColorTheme.Provider<UncertaintyColorThemeParams> = {
label: 'Uncertainty/Disorder',
- category: ColorTheme.Category.Advanced,
+ category: ColorTheme.Category.Atom,
factory: UncertaintyColorTheme,
getParams: getUncertaintyColorThemeParams,
defaultValues: PD.getDefaultValues(UncertaintyColorThemeParams),
diff --git a/src/mol-theme/color/uniform.ts b/src/mol-theme/color/uniform.ts
index e018b914d22ad253040c4894c09549670239e49e..2fd01719375da61b3e1693a7ba213095e8895981 100644
--- a/src/mol-theme/color/uniform.ts
+++ b/src/mol-theme/color/uniform.ts
@@ -37,7 +37,7 @@ export function UniformColorTheme(ctx: ThemeDataContext, props: PD.Values<Unifor
export const UniformColorThemeProvider: ColorTheme.Provider<UniformColorThemeParams> = {
label: 'Uniform',
- category: ColorTheme.Category.Basic,
+ category: ColorTheme.Category.Misc,
factory: UniformColorTheme,
getParams: getUniformColorThemeParams,
defaultValues: PD.getDefaultValues(UniformColorThemeParams),
diff --git a/src/mol-theme/color/unit-index.ts b/src/mol-theme/color/unit-index.ts
index bcd5e7314f9bf66aaaa28bd0403cd8f991e8c1dd..3cc6cdcf26bbd93a71bda07611a6e1201cd149c7 100644
--- a/src/mol-theme/color/unit-index.ts
+++ b/src/mol-theme/color/unit-index.ts
@@ -16,7 +16,7 @@ import { ColorLists } from '../../mol-util/color/lists';
const DefaultList = 'dark-2'
const DefaultColor = Color(0xCCCCCC)
-const Description = 'Gives every unit (single chain or collection of single elements) a unique color based on the position (index) of the unit in the list of units in the structure.'
+const Description = 'Gives every chain instance (single chain or collection of single elements) a unique color based on the position (index) of the chain in the list of chains in the structure.'
export const UnitIndexColorThemeParams = {
...getPaletteParams({ type: 'set', setList: DefaultList }),
@@ -72,8 +72,8 @@ export function UnitIndexColorTheme(ctx: ThemeDataContext, props: PD.Values<Unit
}
export const UnitIndexColorThemeProvider: ColorTheme.Provider<UnitIndexColorThemeParams> = {
- label: 'Unit Index',
- category: ColorTheme.Category.Advanced,
+ label: 'Chain Instance',
+ category: ColorTheme.Category.Chain,
factory: UnitIndexColorTheme,
getParams: getUnitIndexColorThemeParams,
defaultValues: PD.getDefaultValues(UnitIndexColorThemeParams),