diff --git a/CHANGES.rst b/CHANGES.rst
index 3363301911..dde4d30967 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -23,7 +23,7 @@ New Features
 
 - Plugin APIs now include a ``close_in_tray()`` method. [#2562]
 
-- Convert the layer select dropdown in Plot Options into a horizontal panel of buttons. [#2566]
+- Convert the layer select dropdown in Plot Options into a horizontal panel of buttons. [#2566, #2574]
 
 Cubeviz
 ^^^^^^^
diff --git a/jdaviz/app.py b/jdaviz/app.py
index 6320ce62bd..74ab5eaadb 100644
--- a/jdaviz/app.py
+++ b/jdaviz/app.py
@@ -283,6 +283,21 @@ def __init__(self, configuration=None, *args, **kwargs):
         #  can reference their state easily since glue does not store viewers
         self._viewer_store = {}
 
+        # Add new and inverse colormaps to Glue global state. Also see ColormapRegistry in
+        # https://github.com/glue-viz/glue/blob/main/glue/config.py
+        new_cms = (['Rainbow', cm.rainbow],
+                   ['Seismic', cm.seismic],
+                   ['Reversed: Gray', cm.gray_r],
+                   ['Reversed: Viridis', cm.viridis_r],
+                   ['Reversed: Plasma', cm.plasma_r],
+                   ['Reversed: Inferno', cm.inferno_r],
+                   ['Reversed: Magma', cm.magma_r],
+                   ['Reversed: Hot', cm.hot_r],
+                   ['Reversed: Rainbow', cm.rainbow_r])
+        for cur_cm in new_cms:
+            if cur_cm not in colormaps.members:
+                colormaps.add(*cur_cm)
+
         # Parse the yaml configuration file used to compose the front-end UI
         self.load_configuration(configuration)
 
@@ -333,21 +348,6 @@ def __init__(self, configuration=None, *args, **kwargs):
         self.hub.subscribe(self, SubsetUpdateMessage,
                            handler=lambda msg: self._clear_object_cache(msg.subset.label))
 
-        # Add new and inverse colormaps to Glue global state. Also see ColormapRegistry in
-        # https://github.com/glue-viz/glue/blob/main/glue/config.py
-        new_cms = (['Rainbow', cm.rainbow],
-                   ['Seismic', cm.seismic],
-                   ['Reversed: Gray', cm.gray_r],
-                   ['Reversed: Viridis', cm.viridis_r],
-                   ['Reversed: Plasma', cm.plasma_r],
-                   ['Reversed: Inferno', cm.inferno_r],
-                   ['Reversed: Magma', cm.magma_r],
-                   ['Reversed: Hot', cm.hot_r],
-                   ['Reversed: Rainbow', cm.rainbow_r])
-        for cur_cm in new_cms:
-            if cur_cm not in colormaps.members:
-                colormaps.add(*cur_cm)
-
         # Subscribe to messages that result in changes to the layers
         self.hub.subscribe(self, AddDataMessage,
                            handler=self._on_layers_changed)
diff --git a/jdaviz/app.vue b/jdaviz/app.vue
index a2b9f8521e..2cff6119ba 100644
--- a/jdaviz/app.vue
+++ b/jdaviz/app.vue
@@ -451,22 +451,4 @@ a:active {
     font-weight: 500 !important;
 }
 
-.suppress-scrollbar {
-    overflow-y: scroll;
-    scrollbar-width: none; /* Firefox */
-    -ms-overflow-style: none;  /* Internet Explorer 10+ */
-}
-.suppress-scrollbar::-webkit-scrollbar { /* WebKit */
-    width: 0;
-    height: 0;
-}
-
-.layer-tab-selected {
-  background-color: rgba(0,0,0,0.1); 
-}
-
-.theme--dark .layer-tab-selected {
-  background-color: rgba(255,255,255,0.1); 
-}
-
 </style>
diff --git a/jdaviz/components/plugin_layer_select_tabs.vue b/jdaviz/components/plugin_layer_select_tabs.vue
index 480b0d7dfb..8647a04d92 100644
--- a/jdaviz/components/plugin_layer_select_tabs.vue
+++ b/jdaviz/components/plugin_layer_select_tabs.vue
@@ -1,11 +1,22 @@
 <template>
-  <div>
-    <span class="suppress-scrollbar" style="display: inline-block; white-space: nowrap; margin-left: -24px; width: calc(100% + 48px); overflow-x: scroll; overflow-y: hidden">
-      <span v-for="(item, index) in items" :class="selectedAsList.includes(item.label) ? 'layer-tab-selected' : ''" :style="'display: inline-block; padding: 12px; '+(selectedAsList.includes(item.label) ? 'border-top: 2px solid #c75109' : 'border-top: 2px solid transparent')">
+  <div style="margin-top: 24px">
+    <div v-if="show_multiselect_toggle" style="position: absolute; width: 32px; right: 0px; margin-right: 12px; margin-top: -32px">
+      <j-tooltip tipid='layer-multiselect-toggle'>
+        <v-btn
+          icon
+          style="opacity: 0.7"
+          @click="$emit('update:multiselect', !multiselect)"
+        >
+          <img :src="multiselect ? icon_checktoradial : icon_radialtocheck" width="24" class="invert-if-dark"/>
+        </v-btn>
+      </j-tooltip>
+    </div>
+    <span style="display: inline-block; white-space: nowrap; margin-left: -24px; width: calc(100% + 48px); overflow-x: scroll; overflow-y: hidden">
+      <span v-for="(item, index) in items" :class="selectedAsList.includes(item.label) ? 'layer-tab-selected' : ''" :style="'display: inline-block; padding: 8px; '+(selectedAsList.includes(item.label) ? 'border-top: 3px solid #00617E' : 'border-top: 3px solid transparent')">
         <j-tooltip :tooltipcontent="tooltipContent(item)">
           <v-btn
             :rounded="item.is_subset"
-            @click="() => {if (!multiselect){$emit('update:selected', item.label)} else if(!selectedAsList.includes(item.label)) {$emit('update:selected', selected.concat(item.label))} else {$emit('update:selected', selected.filter(select => select != item.label))} }"
+            @click="() => {if (!multiselect){$emit('update:selected', item.label)} else if(!selectedAsList.includes(item.label)) {$emit('update:selected', selected.concat(item.label))} else if (selected.length > 1) {$emit('update:selected', selected.filter(select => select != item.label))} }"
             :style="'padding: 0px; margin-bottom: 4px; background: '+visibilityStyle(item)+', '+colorStyle(item)"
             width="30px"
             min-width="30px"
@@ -23,7 +34,8 @@
 
 <script>
 module.exports = {
-  props: ['items', 'selected', 'multiselect', 'colormode'],
+  props: ['items', 'selected', 'multiselect', 'colormode', 'cmap_samples',
+          'show_multiselect_toggle', 'icon_checktoradial', 'icon_radialtocheck'],
   computed: {
     selectedAsList() {
       if (this.$props.multiselect) { 
@@ -35,50 +47,64 @@ module.exports = {
   methods: {
     tooltipContent(item) {
       var tooltip = item.label
-      if (item.mixed_visibility) {
-        tooltip += '<br/>Visible: mixed'
+      if (item.visible === 'mixed') {
+        tooltip += '<br/>Visibility: mixed'
       } else if (!item.visible) {
-        tooltip += '<br/>Visible: false'
+        tooltip += '<br/>Visibility: hidden'
       }
-      if (this.$props.colormode === 'Colormaps' && !item.is_subset) {
-        tooltip += '<br/>Color mode: colormap'
-      } else if (this.$props.colormode === 'mixed' && !item.is_subset) {
+      if (this.$props.colormode === 'mixed' && !item.is_subset) {
         tooltip += '<br/>Color mode: mixed'
       }
-      if (item.mixed_color && (this.$props.colormode !== 'Colormaps' || item.is_subset)) {
-        tooltip += '<br/>Color: mixed'
+      if (item.colors.length > 1) {
+        if (this.$props.colormode === 'Colormaps') {
+          tooltip += '<br/>Colormap: mixed'
+        } else if (this.$props.colormode === 'mixed') {
+          tooltip += '<br/>Color/colormap: mixed'
+        } else {
+          tooltip += '<br/>Color: mixed'
+        }
       }
       return tooltip
     },
     visibilityStyle(item) {
-      if (item.mixed_visibility){
+      if (item.visible === 'mixed'){
         return 'repeating-linear-gradient(30deg, rgba(0,0,0,0.3), rgba(0,0,0,0.3) 3px, transparent 3px, transparent 3px, transparent 10px)'
       }
       else if (item.visible) {
         return 'repeating-linear-gradient(30deg, transparent, transparent 10px)'
       } else {
-        return 'repeating-linear-gradient(30deg, rgba(0,0,0,0.8), rgba(0,0,0,0.8) 7px, transparent 7px, transparent 7px, transparent 10px)'
+        return 'repeating-linear-gradient(30deg, rgba(0,0,0,0.4), rgba(0,0,0,0.4) 8px, transparent 8px, transparent 8px, transparent 10px)'
       }
     },
     colorStyle(item) {
-      if (this.$props.colormode == 'Colormaps' && !item.is_subset) {
-        return 'repeating-linear-gradient( -45deg, gray, gray 20px)'
-      }
-      if (item.mixed_color) {
-        colors = item.all_colors_to_label
-        const strip_width = 42 / colors.length
+      const strip_width = 42 / item.colors.length
+      var cmap_strip_width = strip_width
+      var colors = []
+      var style = 'repeating-linear-gradient( 135deg, '
+  
+      for ([mi, color_or_cmap] of item.colors.entries()) {
+        if (color_or_cmap.startsWith('#')) {
+          colors = [color_or_cmap]
+        } else {
+          colors = this.$props.cmap_samples[color_or_cmap]
+        }
 
-        var style = 'repeating-linear-gradient( -45deg, '
-        for ([ind, color] of colors.entries()) {
-          style += color + ' '+ind*strip_width+'px, ' + color + ' '+(ind+1)*strip_width+'px'
-          if (ind !== colors.length-1) {
+        cmap_strip_width = strip_width / colors.length
+        for ([ci, color] of colors.entries()) {
+          var start = mi*strip_width + ci*cmap_strip_width
+          var end = mi*strip_width+(ci+1)*cmap_strip_width
+          style += color + ' '+start+'px, ' + color + ' '+end+'px'
+          if (ci !== colors.length-1) {
             style += ', '
           }
         }
-        style += ')'
-        return style
-      } 
-      return 'repeating-linear-gradient( -45deg, '+item.color+', '+item.color+' 20px)'
+        if (mi !== item.colors.length-1) {
+          style += ', '
+        }
+      }
+    
+      style += ')'
+      return style
 
     }
   }
diff --git a/jdaviz/components/plugin_viewer_select.vue b/jdaviz/components/plugin_viewer_select.vue
index 150392d72b..cc93d14850 100644
--- a/jdaviz/components/plugin_viewer_select.vue
+++ b/jdaviz/components/plugin_viewer_select.vue
@@ -1,5 +1,16 @@
 <template>
   <div>
+  <div v-if="show_multiselect_toggle" style="position: absolute; width: 32px; right: 0px; margin-right: 12px; margin-top: -6px; z-index: 999">
+    <j-tooltip tipid='viewer-multiselect-toggle'>
+      <v-btn
+        icon
+        style="opacity: 0.7"
+        @click="$emit('update:multiselect', !multiselect)"
+      >
+        <img :src="multiselect ? icon_checktoradial : icon_radialtocheck" width="24" class="invert-if-dark"/>
+      </v-btn>
+    </j-tooltip>
+  </div>
   <v-row v-if="items.length > 1 || selected.length===0 || show_if_single_entry">
     <v-select
       :menu-props="{ left: true }"
@@ -64,7 +75,8 @@
 
 <script>
 module.exports = {
-  props: ['items', 'selected', 'label', 'hint', 'rules', 'show_if_single_entry', 'multiselect']
+  props: ['items', 'selected', 'label', 'hint', 'rules', 'show_if_single_entry', 'multiselect',
+          'show_multiselect_toggle', 'icon_checktoradial', 'icon_radialtocheck']
 };
 </script>
 
diff --git a/jdaviz/components/tooltip.vue b/jdaviz/components/tooltip.vue
index 0a71d9802e..f4e302e04d 100644
--- a/jdaviz/components/tooltip.vue
+++ b/jdaviz/components/tooltip.vue
@@ -72,7 +72,8 @@ const tooltips = {
   'table-next': 'Select next row in table',
   'table-play-pause-toggle': 'Toggle cycling through rows of table',
   'table-play-pause-delay': 'Set delay before cycling to next entry',
-  'plugin-plot-options-multiselect-toggle': 'Toggle between simple (single-select) and advanced (multiselect)',
+  'viewer-multiselect-toggle': 'Toggle between choosing a single or multiple viewer(s)',
+  'layer-multiselect-toggle': 'Toggle between choosing a single or multiple layer(s)',
   'plugin-plot-options-mixed-state': 'Current values are mixed, click to sync at shown value',
   'plugin-model-fitting-add-model': 'Create model component',
   'plugin-model-fitting-param-fixed': 'Check the box to freeze parameter value',
diff --git a/jdaviz/configs/default/plugins/plot_options/plot_options.py b/jdaviz/configs/default/plugins/plot_options/plot_options.py
index b099a6f604..eb27af80fc 100644
--- a/jdaviz/configs/default/plugins/plot_options/plot_options.py
+++ b/jdaviz/configs/default/plugins/plot_options/plot_options.py
@@ -1,3 +1,4 @@
+import logging
 import math
 import os
 import matplotlib
@@ -103,10 +104,10 @@ class PlotOptions(PluginTemplateMixin):
     * :meth:`~jdaviz.core.template_mixin.PluginTemplateMixin.show`
     * :meth:`~jdaviz.core.template_mixin.PluginTemplateMixin.open_in_tray`
     * :meth:`~jdaviz.core.template_mixin.PluginTemplateMixin.close_in_tray`
-    * ``multiselect``:
-      whether ``viewer`` and ``layer`` should both be in multiselect mode.
     * ``viewer`` (:class:`~jdaviz.core.template_mixin.ViewerSelect`):
+    * ``viewer_multiselect``
     * ``layer`` (:class:`~jdaviz.core.template_mixin.LayerSelect`):
+    * ``layer_multiselect``
     * :meth:`select_all`
     * ``subset_visible`` (:class:`~jdaviz.core.template_mixin.PlotOptionsSyncState`):
       whether a subset should be visible.
@@ -172,11 +173,11 @@ class PlotOptions(PluginTemplateMixin):
     template_file = __file__, "plot_options.vue"
     uses_active_status = Bool(True).tag(sync=True)
 
-    # multiselect is shared between viewer and layer
-    multiselect = Bool(False).tag(sync=True)
-
+    viewer_multiselect = Bool(False).tag(sync=True)
     viewer_items = List().tag(sync=True)
     viewer_selected = Any().tag(sync=True)  # Any needed for multiselect
+
+    layer_multiselect = Bool(False).tag(sync=True)
     layer_items = List().tag(sync=True)
     layer_selected = Any().tag(sync=True)  # Any needed for multiselect
 
@@ -325,13 +326,15 @@ class PlotOptions(PluginTemplateMixin):
 
     show_viewer_labels = Bool(True).tag(sync=True)
 
+    cmap_samples = Dict().tag(sync=True)
     swatches_palette = List().tag(sync=True)
     apply_RGB_presets_spinner = Bool(False).tag(sync=True)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.viewer = ViewerSelect(self, 'viewer_items', 'viewer_selected', 'multiselect')
-        self.layer = LayerSelect(self, 'layer_items', 'layer_selected', 'viewer_selected', 'multiselect')  # noqa
+        self.viewer = ViewerSelect(self, 'viewer_items', 'viewer_selected', 'viewer_multiselect')
+        self.layer = LayerSelect(self, 'layer_items', 'layer_selected',
+                                 'viewer_selected', 'layer_multiselect')
 
         self.swatches_palette = [
             ['#FF0000', '#AA0000', '#550000'],
@@ -551,9 +554,17 @@ def state_attr_for_line_visible(state):
         self.show_viewer_labels = self.app.state.settings['viewer_labels']
         self.app.state.add_callback('settings', self._on_app_settings_changed)
 
+        # give UI access to sampled version of the available colormap choices
+        def hex_for_cmap(cmap):
+            N = 50
+            cm_sampled = cmap.resampled(N)
+            return [matplotlib.colors.to_hex(cm_sampled(i)) for i in range(N)]
+        self.cmap_samples = {cmap[1].name: hex_for_cmap(cmap[1]) for cmap in colormaps.members}
+
     @property
     def user_api(self):
-        expose = ['multiselect', 'viewer', 'layer', 'select_all', 'subset_visible']
+        expose = ['multiselect', 'viewer', 'viewer_multiselect', 'layer', 'layer_multiselect',
+                  'select_all', 'subset_visible']
         if self.config == "cubeviz":
             expose += ['collapse_function', 'uncertainty_visible']
         if self.config != "imviz":
@@ -579,6 +590,17 @@ def _on_show_viewer_labels_changed(self, event):
     def _on_app_settings_changed(self, value):
         self.show_viewer_labels = value['viewer_labels']
 
+    @property
+    def multiselect(self):
+        logging.warning(f"DeprecationWarning: multiselect has been replaced by separate viewer_multiselect and layer_multiselect and will be removed in the future.  This currently evaluates viewer_multiselect or layer_multiselect")  # noqa
+        return self.viewer_multiselect or self.layer_multiselect
+
+    @multiselect.setter
+    def multiselect(self, value):
+        logging.warning(f"DeprecationWarning: multiselect has been replaced by separate viewer_multiselect and layer_multiselect and will be removed in the future.  This currently sets viewer_multiselect and layer_multiselect")  # noqa
+        self.viewer_multiselect = value
+        self.layer_multiselect = value
+
     def select_all(self, viewers=True, layers=True):
         """
         Enable multiselect mode and select all viewers and/or layers.
@@ -586,15 +608,16 @@ def select_all(self, viewers=True, layers=True):
         Parameters
         ----------
         viewers : bool
-            Whether to select all viewers (default: True)
+            Whether to set ``viewer_multiselect`` and select all viewers (default: True)
 
         layers: bool
-            Whether to select all layers (default: True)
+            Whether to set ``layer_multiselect`` and select all layers (default: True)
         """
-        self.multiselect = True
         if viewers:
+            self.viewer_multiselect = True
             self.viewer.select_all()
         if layers:
+            self.layer_multiselect = True
             self.layer.select_all()
 
     def vue_unmix_state(self, name):
@@ -630,7 +653,7 @@ def apply_RGB_presets(self):
         initial_layer = self.layer_selected
 
         # Determine layers visible in selected viewer(s) - consider mixed to be visible
-        visible_layers = [layer['label'] for layer in self.layer.items if not layer['is_subset'] and (layer['visible'] or layer['mixed_visibility'])]  # noqa
+        visible_layers = [layer['label'] for layer in self.layer.items if not layer['is_subset'] and (layer['visible'] in (True, 'mixed'))]  # noqa
 
         # Set opacity to something that seems sensible
         n_visible = len(visible_layers)
@@ -686,18 +709,16 @@ def _update_stretch_histogram(self, msg={}):
             self.stretch_histogram.clear_all_marks()
             return
 
-        if self.multiselect and (len(self.viewer.selected) > 1
-                                 or len(self.layer.selected) > 1):  # pragma: no cover
-            # currently only support single-layer/viewer.  For now we'll just clear and return.
-            # TODO: add support for multi-layer/viewer
-            self.stretch_histogram.clear_all_marks()
+        if self.layer_multiselect and len(self.layer.selected) > 1:
+            # currently only support single-layer, if multiple layers are selected, the plot
+            # will be hidden in the UI
             return
 
         if not self._viewer_is_image_viewer():
             # don't update histogram if selected viewer is not an image viewer:
             return
 
-        viewer = self.viewer.selected_obj[0] if self.multiselect else self.viewer.selected_obj
+        viewer = self.viewer.selected_obj[0] if self.viewer_multiselect else self.viewer.selected_obj  # noqa
 
         # manage viewer zoom limit callbacks
         if ((isinstance(msg, dict) and msg.get('name') == 'viewer_selected')
@@ -715,7 +736,7 @@ def _update_stretch_histogram(self, msg={}):
                 for attr in ('x_min', 'x_max', 'y_min', 'y_max'):
                     vs_old.remove_callback(attr, self._update_stretch_histogram)
 
-        if self.multiselect:
+        if self.layer_multiselect:
             data = self.layer.selected_obj[0][0].layer
         elif len(self.layer.selected_obj):
             data = self.layer.selected_obj[0].layer
@@ -730,7 +751,7 @@ def _update_stretch_histogram(self, msg={}):
         comp = data.get_component(data.main_components[0])
 
         # TODO: further optimization could be done by caching sub_data
-        if self.stretch_hist_zoom_limits:
+        if self.stretch_hist_zoom_limits and (not self.layer_multiselect or len(self.layer_selected) == 1):  # noqa
             if hasattr(viewer, '_get_zoom_limits'):
                 # Viewer limits. This takes account of Imviz linking.
                 xy_limits = viewer._get_zoom_limits(data).astype(int)
@@ -806,7 +827,7 @@ def _update_stretch_curve(self, msg=None):
             # or the stretch histogram hasn't been initialized:
             return
 
-        if self.multiselect:
+        if self.viewer_multiselect or self.layer_multiselect:
             self.stretch_histogram.clear_marks('stretch_curve', 'stretch_knots', 'colorbar')
             return
 
diff --git a/jdaviz/configs/default/plugins/plot_options/plot_options.vue b/jdaviz/configs/default/plugins/plot_options/plot_options.vue
index 20505ba7b7..0c3b0502b5 100644
--- a/jdaviz/configs/default/plugins/plot_options/plot_options.vue
+++ b/jdaviz/configs/default/plugins/plot_options/plot_options.vue
@@ -26,34 +26,21 @@
       </v-expansion-panels>
     </v-row>
 
-    <v-row>
-      <div style="width: calc(100% - 32px)">
-      </div>
-      <div style="width: 32px">
-        <j-tooltip tipid='plugin-plot-options-multiselect-toggle'>
-          <v-btn
-            icon
-            style="opacity: 0.7"
-            @click="() => {multiselect = !multiselect}"
-          >
-            <img :src="multiselect ? icon_checktoradial : icon_radialtocheck" width="24" class="invert-if-dark"/>
-          </v-btn>
-        </j-tooltip>
-      </div>
-    </v-row>
-
     <!-- VIEWER OPTIONS -->
     <plugin-viewer-select
       :items="viewer_items"
       :selected.sync="viewer_selected"
-      :multiselect="multiselect"
-      :label="multiselect ? 'Viewers' : 'Viewer'"
-      :show_if_single_entry="multiselect"
-      :hint="multiselect ? 'Select viewers to set options simultaneously' : 'Select the viewer to set options.'"
+      :multiselect.sync="viewer_multiselect"
+      :show_multiselect_toggle="viewer_multiselect || viewer_items.length > 1"
+      :icon_checktoradial="icon_checktoradial"
+      :icon_radialtocheck="icon_radialtocheck"
+      :label="viewer_multiselect ? 'Viewers' : 'Viewer'"
+      :show_if_single_entry="viewer_multiselect"
+      :hint="viewer_multiselect ? 'Select viewers to set options simultaneously' : 'Select the viewer to set options.'"
     />
 
     <div v-if="image_color_mode_sync.in_subscribed_states">
-      <glue-state-sync-wrapper :sync="image_color_mode_sync" :multiselect="multiselect" @unmix-state="unmix_state('image_color_mode')">
+      <glue-state-sync-wrapper :sync="image_color_mode_sync" :multiselect="viewer_multiselect" @unmix-state="unmix_state('image_color_mode')">
         <v-select
           attach
           :menu-props="{ left: true }"
@@ -75,21 +62,21 @@
             :results_isolated_to_plugin="false"
             @click="apply_RGB_presets"
           >
-            Assign Presets
+            Assign RGB Presets
           </plugin-action-button>
         </j-tooltip>
       </v-row>
     </div>
 
     <!-- GENERAL:AXES -->
-    <glue-state-sync-wrapper v-if="axes_visible_sync.in_subscribed_states && config !== 'imviz'" :sync="axes_visible_sync" :multiselect="multiselect" @unmix-state="unmix_state('axes_visible')">
+    <glue-state-sync-wrapper v-if="axes_visible_sync.in_subscribed_states && config !== 'imviz'" :sync="axes_visible_sync" :multiselect="viewer_multiselect" @unmix-state="unmix_state('axes_visible')">
       <v-switch
         v-model="axes_visible_value"
         label="Show Axes"
         />
     </glue-state-sync-wrapper>
 
-    <glue-state-sync-wrapper v-if="uncertainty_visible_sync.in_subscribed_states" :sync="uncertainty_visible_sync" :multiselect="multiselect" @unmix-state="unmix_state('uncertainty_visible')">
+    <glue-state-sync-wrapper v-if="uncertainty_visible_sync.in_subscribed_states" :sync="uncertainty_visible_sync" :multiselect="viewer_multiselect" @unmix-state="unmix_state('uncertainty_visible')">
       <v-switch
         v-model="uncertainty_visible_value"
         label="Plot uncertainties"
@@ -97,22 +84,25 @@
     </glue-state-sync-wrapper>
 
     <!-- LAYER OPTIONS -->
-    <span style="height: 36px;"/>
     <plugin-layer-select-tabs
       :items="layer_items"
       :selected.sync="layer_selected"
-      :multiselect="multiselect"
+      :multiselect.sync="layer_multiselect"
+      :show_multiselect_toggle="layer_multiselect || layer_items.length > 1"
+      :icon_checktoradial="icon_checktoradial"
+      :icon_radialtocheck="icon_radialtocheck"
       :colormode="image_color_mode_sync['mixed'] ? 'mixed' : image_color_mode_value"
+      :cmap_samples="cmap_samples"
       label="Layers"
       hint="Select the data or subset to set options."
+      style="margin-top: 36px"
     />
     <div v-if="layer_selected.length === 0" style="text-align: center">
       no layers selected
     </div>
-    <div v-else class='layer-tab-selected' style="margin-left: -24px; padding-left: 24px; margin-top: -42px; padding-top: 0px; margin-right: -24px; padding-right: 24px">
-
+    <div v-else class='layer-tab-selected' style="margin-left: -24px; padding-left: 24px; margin-top: -42px; margin-right: -24px; padding-right: 24px; border-bottom: 2px solid #00617E">
       <j-plugin-section-header v-if="layer_selected.length && (line_visible_sync.in_subscribed_states || subset_visible_sync.in_subscribed_states)">Layer Visibility</j-plugin-section-header>
-      <glue-state-sync-wrapper :sync="marker_visible_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_visible')">
+      <glue-state-sync-wrapper :sync="marker_visible_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_visible')">
         <span>
           <v-btn icon @click.stop="marker_visible_value = !marker_visible_value">
             <v-icon>mdi-eye{{ marker_visible_value ? '' : '-off' }}</v-icon>
@@ -121,7 +111,7 @@
         </span>
       </glue-state-sync-wrapper>
 
-      <glue-state-sync-wrapper v-if="!marker_visible_sync.in_subscribed_states" :sync="line_visible_sync" :multiselect="multiselect" @unmix-state="unmix_state('line_visible')">
+      <glue-state-sync-wrapper v-if="!marker_visible_sync.in_subscribed_states" :sync="line_visible_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('line_visible')">
         <span>
           <v-btn icon @click.stop="line_visible_value = !line_visible_value">
             <v-icon>mdi-eye{{ line_visible_value ? '' : '-off' }}</v-icon>
@@ -130,7 +120,7 @@
         </span>
       </glue-state-sync-wrapper>
 
-      <glue-state-sync-wrapper :sync="subset_visible_sync" :multiselect="multiselect" @unmix-state="unmix_state('subset_visible')">
+      <glue-state-sync-wrapper :sync="subset_visible_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('subset_visible')">
         <span>
           <v-btn icon @click.stop="subset_visible_value = !subset_visible_value">
             <v-icon>mdi-eye{{ subset_visible_value ? '' : '-off' }}</v-icon>
@@ -139,9 +129,9 @@
         </span>
       </glue-state-sync-wrapper>
 
-      <glue-state-sync-wrapper v-if="subset_visible_value" :sync="subset_color_sync" :multiselect="multiselect" @unmix-state="unmix_state('subset_color')">
+      <glue-state-sync-wrapper v-if="subset_visible_value" :sync="subset_color_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('subset_color')">
         <div>
-          <v-subheader class="pl-0 slider-label" style="height: 12px">Subset Color</v-subheader>
+          <v-subheader class="pl-0 slider-label" style="height: 12px; margin-bottom: 4px">Subset Color</v-subheader>
           <v-menu>
             <template v-slot:activator="{ on }">
                 <span class="color-menu"
@@ -160,7 +150,7 @@
 
       <!-- PROFILE/LINE -->
       <j-plugin-section-header v-if="(line_visible_sync.in_subscribed_states && ((!marker_visible_sync.in_subscribed_states && line_visible_value) || (marker_visible_sync.in_subscribed_states && marker_visible_value))) || collapse_func_sync.in_subscribed_states">Line</j-plugin-section-header>
-      <glue-state-sync-wrapper v-if="marker_visible_sync.in_subscribed_states && marker_visible_value" :sync="line_visible_sync" :multiselect="multiselect" @unmix-state="unmix_state('line_visible')">
+      <glue-state-sync-wrapper v-if="marker_visible_sync.in_subscribed_states && marker_visible_value" :sync="line_visible_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('line_visible')">
         <span>
           <v-btn icon @click.stop="line_visible_value = !line_visible_value">
             <v-icon>mdi-eye{{ line_visible_value ? '' : '-off' }}</v-icon>
@@ -169,7 +159,7 @@
         </span>
       </glue-state-sync-wrapper>
 
-      <glue-state-sync-wrapper v-if="config === 'cubeviz'" :sync="collapse_func_sync" :multiselect="multiselect" @unmix-state="unmix_state('function')">
+      <glue-state-sync-wrapper v-if="config === 'cubeviz'" :sync="collapse_func_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('function')">
         <v-select
           :menu-props="{ left: true }"
           attach
@@ -181,9 +171,9 @@
         ></v-select>
       </glue-state-sync-wrapper>
 
-      <glue-state-sync-wrapper v-if="line_visible_value  && (!marker_visible_sync.in_subscribed_states || marker_visible_value)" :sync="line_color_sync" :multiselect="multiselect" @unmix-state="unmix_state('line_color')">
+      <glue-state-sync-wrapper v-if="line_visible_value  && (!marker_visible_sync.in_subscribed_states || marker_visible_value)" :sync="line_color_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('line_color')">
         <div>
-          <v-subheader class="pl-0 slider-label" style="height: 12px">Line Color</v-subheader>
+          <v-subheader class="pl-0 slider-label" style="height: 12px; margin-bottom: 4px">Line Color</v-subheader>
           <v-menu>
             <template v-slot:activator="{ on }">
                 <span class="color-menu"
@@ -199,18 +189,18 @@
         </div>
       </glue-state-sync-wrapper>
 
-      <glue-state-sync-wrapper v-if="line_visible_value  && (!marker_visible_sync.in_subscribed_states || marker_visible_value)" :sync="line_width_sync" :multiselect="multiselect" @unmix-state="unmix_state('line_width')">
+      <glue-state-sync-wrapper v-if="line_visible_value  && (!marker_visible_sync.in_subscribed_states || marker_visible_value)" :sync="line_width_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('line_width')">
         <glue-float-field label="Line Width" :value.sync="line_width_value" />
       </glue-state-sync-wrapper>
 
-      <glue-state-sync-wrapper v-if="line_visible_value  && (!marker_visible_sync.in_subscribed_states || marker_visible_value)" :sync="line_opacity_sync" :multiselect="multiselect" @unmix-state="unmix_state('line_opacity')">
+      <glue-state-sync-wrapper v-if="line_visible_value  && (!marker_visible_sync.in_subscribed_states || marker_visible_value)" :sync="line_opacity_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('line_opacity')">
         <div>
           <v-subheader class="pl-0 slider-label" style="height: 12px">Line Opacity</v-subheader>
           <glue-throttled-slider wait="300" max="1" step="0.01" :value.sync="line_opacity_value" hide-details class="no-hint" />
         </div>
       </glue-state-sync-wrapper>
 
-      <glue-state-sync-wrapper v-if="line_visible_value  && (!marker_visible_sync.in_subscribed_states || marker_visible_value)" :sync="line_as_steps_sync" :multiselect="multiselect" @unmix-state="unmix_state('line_as_steps')">
+      <glue-state-sync-wrapper v-if="line_visible_value  && (!marker_visible_sync.in_subscribed_states || marker_visible_value)" :sync="line_as_steps_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('line_as_steps')">
         <v-switch
           v-model="line_as_steps_value"
           label="Plot profile as steps"
@@ -220,21 +210,21 @@
       <!-- MARKER/SCATTER -->
       <div v-if="marker_visible_sync.in_subscribed_states  && (!marker_visible_sync.in_subscribed_states || marker_visible_value)">
         <j-plugin-section-header>Marker</j-plugin-section-header>
-        <glue-state-sync-wrapper v-if="marker_visible_value" :sync="marker_fill_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_fill')">
+        <glue-state-sync-wrapper v-if="marker_visible_value" :sync="marker_fill_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_fill')">
           <v-switch
             v-model="marker_fill_value"
             label="Fill Marker"
             />
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper v-if="marker_visible_value" :sync="marker_opacity_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_opacity')">
+        <glue-state-sync-wrapper v-if="marker_visible_value" :sync="marker_opacity_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_opacity')">
           <div>
             <v-subheader class="pl-0 slider-label" style="height: 12px">Opacity</v-subheader>
             <glue-throttled-slider wait="300" max="1" step="0.01" :value.sync="marker_opacity_value" hide-details class="no-hint" />
           </div>
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper v-if="marker_visible_value" :sync="marker_size_mode_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_size_mode')">
+        <glue-state-sync-wrapper v-if="marker_visible_value" :sync="marker_size_mode_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_size_mode')">
           <v-select
             attach
             :menu-props="{ left: true }"
@@ -245,21 +235,21 @@
           ></v-select>
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper v-if="marker_visible_value && marker_size_mode_value==='Fixed'" :sync="marker_size_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_size')">
+        <glue-state-sync-wrapper v-if="marker_visible_value && marker_size_mode_value==='Fixed'" :sync="marker_size_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_size')">
           <div>
             <v-subheader class="pl-0 slider-label" style="height: 12px">Size</v-subheader>
             <glue-throttled-slider wait="300" max="10" step="0.1" :value.sync="marker_size_value" hide-details class="no-hint" />
           </div>
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper v-if="marker_visible_value" :sync="marker_size_scale_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_size_scale')">
+        <glue-state-sync-wrapper v-if="marker_visible_value" :sync="marker_size_scale_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_size_scale')">
           <div>
             <v-subheader class="pl-0 slider-label" style="height: 12px">Scale</v-subheader>
             <glue-throttled-slider wait="300" max="10" step="0.1" :value.sync="marker_size_scale_value" hide-details class="no-hint" />
           </div>
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper v-if="marker_visible_value && marker_size_mode_value!=='Fixed'" :sync="marker_size_col_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_size_col')">
+        <glue-state-sync-wrapper v-if="marker_visible_value && marker_size_mode_value!=='Fixed'" :sync="marker_size_col_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_size_col')">
           <v-select
             attach
             :menu-props="{ left: true }"
@@ -270,7 +260,7 @@
           ></v-select>
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper v-if="marker_visible_value && marker_size_mode_value!=='Fixed'" :sync="marker_size_vmin_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_size_vmin')">
+        <glue-state-sync-wrapper v-if="marker_visible_value && marker_size_mode_value!=='Fixed'" :sync="marker_size_vmin_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_size_vmin')">
           <v-text-field
             ref="marker_size_vmin"
             label="vmin"
@@ -280,7 +270,7 @@
           ></v-text-field>
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper v-if="marker_visible_value && marker_size_mode_value!=='Fixed'" :sync="marker_size_vmax_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_size_vmax')">
+        <glue-state-sync-wrapper v-if="marker_visible_value && marker_size_mode_value!=='Fixed'" :sync="marker_size_vmax_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_size_vmax')">
           <v-text-field
             ref="marker_size_vmax"
             label="vmax"
@@ -291,7 +281,7 @@
         </glue-state-sync-wrapper>
 
 
-        <glue-state-sync-wrapper v-if="marker_visible_value" :sync="marker_color_mode_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_color_mode')">
+        <glue-state-sync-wrapper v-if="marker_visible_value" :sync="marker_color_mode_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_color_mode')">
           <v-select
             attach
             :menu-props="{ left: true }"
@@ -302,9 +292,9 @@
           ></v-select>
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper v-if="marker_visible_value && marker_color_mode_value==='Fixed'" :sync="marker_color_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_color')">
+        <glue-state-sync-wrapper v-if="marker_visible_value && marker_color_mode_value==='Fixed'" :sync="marker_color_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_color')">
           <div>
-            <v-subheader class="pl-0 slider-label" style="height: 12px">Color</v-subheader>
+            <v-subheader class="pl-0 slider-label" style="height: 12px; margin-bottom: 4px">Color</v-subheader>
             <v-menu>
               <template v-slot:activator="{ on }">
                   <span class="color-menu"
@@ -320,7 +310,7 @@
           </div>
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper v-if="marker_visible_value && marker_color_mode_value!=='Fixed'" :sync="marker_color_col_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_color_col')">
+        <glue-state-sync-wrapper v-if="marker_visible_value && marker_color_mode_value!=='Fixed'" :sync="marker_color_col_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_color_col')">
           <v-select
             attach
             :menu-props="{ left: true }"
@@ -331,7 +321,7 @@
           ></v-select>
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper v-if="marker_visible_value && marker_color_mode_value!=='Fixed'" :sync="marker_colormap_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_colormap')">
+        <glue-state-sync-wrapper v-if="marker_visible_value && marker_color_mode_value!=='Fixed'" :sync="marker_colormap_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_colormap')">
           <v-select
             attach
             :menu-props="{ left: true }"
@@ -342,7 +332,7 @@
           ></v-select>
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper v-if="marker_visible_value && marker_color_mode_value!=='Fixed'" :sync="marker_colormap_vmin_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_colormap_vmin')">
+        <glue-state-sync-wrapper v-if="marker_visible_value && marker_color_mode_value!=='Fixed'" :sync="marker_colormap_vmin_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_colormap_vmin')">
           <v-text-field
             ref="marker_colormap_vmin"
             label="vmin"
@@ -352,7 +342,7 @@
           ></v-text-field>
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper v-if="marker_visible_value && marker_color_mode_value!=='Fixed'" :sync="marker_colormap_vmax_sync" :multiselect="multiselect" @unmix-state="unmix_state('marker_colormap_vmax')">
+        <glue-state-sync-wrapper v-if="marker_visible_value && marker_color_mode_value!=='Fixed'" :sync="marker_colormap_vmax_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('marker_colormap_vmax')">
           <v-text-field
             ref="marker_colormap_vmax"
             label="vmax"
@@ -366,7 +356,7 @@
       <!-- IMAGE -->
       <!-- IMAGE:IMAGE -->
       <j-plugin-section-header v-if="image_visible_sync.in_subscribed_states">Image</j-plugin-section-header>
-      <glue-state-sync-wrapper :sync="image_visible_sync" :multiselect="multiselect" @unmix-state="unmix_state('image_visible')">
+      <glue-state-sync-wrapper :sync="image_visible_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('image_visible')">
         <span>
           <v-btn icon @click.stop="image_visible_value = !image_visible_value">
             <v-icon>mdi-eye{{ image_visible_value ? '' : '-off' }}</v-icon>
@@ -376,7 +366,7 @@
       </glue-state-sync-wrapper>
 
       <div v-if="image_visible_sync.in_subscribed_states && (image_visible_value || image_visible_sync['mixed'])">
-        <glue-state-sync-wrapper v-if="image_color_mode_value === 'Colormaps' || image_color_mode_sync['mixed']" :sync="image_colormap_sync" :multiselect="multiselect" @unmix-state="unmix_state('image_colormap')">
+        <glue-state-sync-wrapper v-if="image_color_mode_value === 'Colormaps' || image_color_mode_sync['mixed']" :sync="image_colormap_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('image_colormap')">
           <v-select
             attach
             :menu-props="{ left: true }"
@@ -386,9 +376,9 @@
             dense
           ></v-select>
         </glue-state-sync-wrapper>
-        <glue-state-sync-wrapper v-if="image_color_mode_value !== 'Colormaps' || image_color_mode_sync['mixed']" :sync="image_color_sync" :multiselect="multiselect" @unmix-state="unmix_state('image_color')">
+        <glue-state-sync-wrapper v-if="image_color_mode_value !== 'Colormaps' || image_color_mode_sync['mixed']" :sync="image_color_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('image_color')">
           <div>
-            <v-subheader class="pl-0 slider-label" style="height: 12px">Image Color</v-subheader>
+            <v-subheader class="pl-0 slider-label" style="height: 12px; margin-bottom: 4px">Image Color</v-subheader>
             <v-menu>
               <template v-slot:activator="{ on }">
                   <span class="color-menu"
@@ -407,21 +397,21 @@
           </div>
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper :sync="image_opacity_sync" :multiselect="multiselect" @unmix-state="unmix_state('image_opacity')">
+        <glue-state-sync-wrapper :sync="image_opacity_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('image_opacity')">
           <div>
             <v-subheader class="pl-0 slider-label" style="height: 12px">Opacity</v-subheader>
             <glue-throttled-slider wait="300" max="1" step="0.01" :value.sync="image_opacity_value" hide-details class="no-hint" />
           </div>
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper :sync="image_contrast_sync" :multiselect="multiselect" @unmix-state="unmix_state('image_contrast')">
+        <glue-state-sync-wrapper :sync="image_contrast_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('image_contrast')">
           <div>
             <v-subheader class="pl-0 slider-label" style="height: 12px">Contrast</v-subheader>
             <glue-throttled-slider wait="300" max="4" step="0.01" :value.sync="image_contrast_value" hide-details />
           </div>
         </glue-state-sync-wrapper>
 
-        <glue-state-sync-wrapper :sync="image_bias_sync" :multiselect="multiselect" @unmix-state="unmix_state('image_bias')">
+        <glue-state-sync-wrapper :sync="image_bias_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('image_bias')">
           <div>
             <v-subheader class="pl-0 slider-label" style="height: 12px" style="height: 12px">Bias</v-subheader>
             <glue-throttled-slider wait="300" max="1" step="0.01" :value.sync="image_bias_value" hide-details />
@@ -431,7 +421,7 @@
 
       <!-- IMAGE:STRETCH -->
       <j-plugin-section-header v-if="stretch_function_sync.in_subscribed_states">Stretch</j-plugin-section-header>
-      <glue-state-sync-wrapper :sync="stretch_function_sync" :multiselect="multiselect" @unmix-state="unmix_state('stretch_function')">
+      <glue-state-sync-wrapper :sync="stretch_function_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('stretch_function')">
         <v-select
           attach
           :menu-props="{ left: true }"
@@ -442,7 +432,7 @@
         ></v-select>
       </glue-state-sync-wrapper>
 
-      <glue-state-sync-wrapper :sync="stretch_preset_sync" :multiselect="multiselect" @unmix-state="unmix_state('stretch_preset')">
+      <glue-state-sync-wrapper :sync="stretch_preset_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('stretch_preset')">
         <v-select
           attach
           :menu-props="{ left: true }"
@@ -454,7 +444,7 @@
       </glue-state-sync-wrapper>
 
       <!-- for multiselect, show vmin/max here, otherwise they'll be in the "more stretch options" expandable section -->
-      <glue-state-sync-wrapper v-if="multiselect" :sync="stretch_vmin_sync" :multiselect="multiselect" @unmix-state="unmix_state('stretch_vmin')">
+      <glue-state-sync-wrapper v-if="layer_multiselect" :sync="stretch_vmin_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('stretch_vmin')">
         <v-text-field
           ref="stretch_vmin"
           label="Stretch VMin"
@@ -464,7 +454,7 @@
         ></v-text-field>
       </glue-state-sync-wrapper>
 
-      <glue-state-sync-wrapper v-if="multiselect" :sync="stretch_vmax_sync" :multiselect="multiselect" @unmix-state="unmix_state('stretch_vmax')">
+      <glue-state-sync-wrapper v-if="layer_multiselect" :sync="stretch_vmax_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('stretch_vmax')">
         <v-text-field
           ref="stretch_vmax"
           label="Stretch VMax"
@@ -474,7 +464,7 @@
         ></v-text-field>
       </glue-state-sync-wrapper>
 
-      <div v-if="stretch_function_sync.in_subscribed_states && !multiselect">
+      <div v-if="stretch_function_sync.in_subscribed_states && (!layer_multiselect || layer_selected.length <= 1)">
         <jupyter-widget :widget="stretch_histogram_widget"/>
         <v-row>
           <v-expansion-panels accordion>
@@ -500,6 +490,7 @@
                     v-model="stretch_hist_zoom_limits"
                     class="hide-input"
                     label="Limit histogram to current zoom limits"
+                    :disabled="viewer_multiselect && viewer_selected.length > 1"
                   ></v-switch>
                 </v-row>
                 <v-row>
@@ -509,7 +500,7 @@
                     label="Show stretch function curve"
                   ></v-switch>
                 </v-row>
-                <glue-state-sync-wrapper :sync="stretch_vmin_sync" :multiselect="multiselect" @unmix-state="unmix_state('stretch_vmin')">
+                <glue-state-sync-wrapper :sync="stretch_vmin_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('stretch_vmin')">
                   <v-text-field
                     ref="stretch_vmin"
                     label="Stretch VMin"
@@ -518,7 +509,7 @@
                     :step="stretch_vstep"
                   ></v-text-field>
                 </glue-state-sync-wrapper>
-                <glue-state-sync-wrapper :sync="stretch_vmax_sync" :multiselect="multiselect" @unmix-state="unmix_state('stretch_vmax')">
+                <glue-state-sync-wrapper :sync="stretch_vmax_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('stretch_vmax')">
                   <v-text-field
                     ref="stretch_vmax"
                     label="Stretch VMax"
@@ -538,7 +529,7 @@
       <j-plugin-section-header v-if="contour_visible_sync.in_subscribed_states">Contours</j-plugin-section-header>
       <div style="display: grid"> <!-- overlay container -->
         <div style="grid-area: 1/1">
-          <glue-state-sync-wrapper :sync="contour_visible_sync" :multiselect="multiselect" @unmix-state="unmix_state('contour_visible')">
+          <glue-state-sync-wrapper :sync="contour_visible_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('contour_visible')">
             <span>
               <v-btn icon @click.stop="contour_visible_value = !contour_visible_value">
                 <v-icon>mdi-eye{{ contour_visible_value ? '' : '-off' }}</v-icon>
@@ -548,7 +539,7 @@
           </glue-state-sync-wrapper>
 
           <div v-if="contour_visible_sync.in_subscribed_states && contour_visible_value">
-            <glue-state-sync-wrapper :sync="contour_mode_sync" :multiselect="multiselect" @unmix-state="unmix_state('contour_mode')">
+            <glue-state-sync-wrapper :sync="contour_mode_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('contour_mode')">
               <v-btn-toggle dense v-model="contour_mode_value" style="margin-right: 8px; margin-top: 8px">
                   <v-tooltip bottom>
                       <template v-slot:activator="{ on }">
@@ -571,20 +562,20 @@
             </glue-state-sync-wrapper>
 
             <div v-if="contour_mode_value === 'Linear'">
-              <glue-state-sync-wrapper :sync="contour_min_sync" :multiselect="multiselect" @unmix-state="unmix_state('contour_min')">
+              <glue-state-sync-wrapper :sync="contour_min_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('contour_min')">
                 <glue-float-field label="Contour Min" :value.sync="contour_min_value" />
               </glue-state-sync-wrapper>
 
-              <glue-state-sync-wrapper :sync="contour_max_sync" :multiselect="multiselect" @unmix-state="unmix_state('contour_max')">
+              <glue-state-sync-wrapper :sync="contour_max_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('contour_max')">
                 <glue-float-field label="Contour Max" :value.sync="contour_max_value" />
               </glue-state-sync-wrapper>
 
-              <glue-state-sync-wrapper :sync="contour_nlevels_sync" :multiselect="multiselect" @unmix-state="unmix_state('contour_nlevels')">
+              <glue-state-sync-wrapper :sync="contour_nlevels_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('contour_nlevels')">
                 <glue-float-field label="Number of Contour Levels" :value.sync="contour_nlevels_value" />
               </glue-state-sync-wrapper>
             </div>
             <div v-else>
-              <glue-state-sync-wrapper :sync="contour_custom_levels_sync" :multiselect="multiselect" @unmix-state="unmix_state('contour_levels')">
+              <glue-state-sync-wrapper :sync="contour_custom_levels_sync" :multiselect="layer_multiselect" @unmix-state="unmix_state('contour_levels')">
                 <v-text-field
                   label="Contour Levels"
                   :value="contour_custom_levels_txt"
@@ -651,9 +642,21 @@ module.exports = {
 </script>
 
 <style scoped>
-.color-menu {
-    font-size: 16px;
-    padding-left: 16px;
-    border: 2px solid rgba(0,0,0,0.54);
-}
+  .color-menu {
+      font-size: 16px;
+      padding-left: 16px;
+      border: 2px solid rgba(0,0,0,0.54);
+  }
+
+  .layer-tab-selected {
+    background-color: rgba(0,0,0,0.1); 
+  }
+
+  .theme--dark .layer-tab-selected {
+    background-color: rgba(255,255,255,0.1); 
+  }
+
+  .layer-tab-selected .strike:first-of-type {
+    padding-top: 16px;
+  }
 </style>
diff --git a/jdaviz/configs/default/plugins/plot_options/tests/test_plot_options.py b/jdaviz/configs/default/plugins/plot_options/tests/test_plot_options.py
index 140f13a8be..603e42bee3 100644
--- a/jdaviz/configs/default/plugins/plot_options/tests/test_plot_options.py
+++ b/jdaviz/configs/default/plugins/plot_options/tests/test_plot_options.py
@@ -15,12 +15,13 @@ def test_multiselect(cubeviz_helper, spectrum1d_cube):
     po = cubeviz_helper.app.get_tray_item_from_name('g-plot-options')
 
     # default selection for viewer should be flux-viewer (first in list) and nothing for layer
-    assert po.multiselect is False
     assert po.viewer.multiselect is False
     assert po.layer.multiselect is False
     assert po.viewer.selected == 'flux-viewer'
     assert po.layer.selected == 'Unknown spectrum object[FLUX]'
 
+    # deprecated functionality to toggle both at once, replace with setting
+    # individually when removing
     po.multiselect = True
     assert po.viewer.multiselect is True
     assert po.layer.multiselect is True
@@ -59,10 +60,11 @@ def test_multiselect(cubeviz_helper, spectrum1d_cube):
     for viewer_name in ['spectrum-viewer']:
         assert cubeviz_helper.app.get_viewer(viewer_name).state.show_axes is True
 
-    po.multiselect = False
+    po.viewer_multiselect = False
     # should default back to the first selected entry
     assert po.viewer.multiselect is False
     assert po.viewer.selected == 'flux-viewer'
+    po.layer_multiselect = False
     assert po.axes_visible.value is False
 
     po.viewer.selected = 'spectrum-viewer'
@@ -336,7 +338,7 @@ def test_track_mixed_states(imviz_helper):
     assert po.layer.items[-1]["label"] == "array_2"
     # The corresponding layer in each viewer is the same color,
     # so the state is not mixed.
-    assert not po.layer.items[-1]["mixed_color"]
+    assert len(po.layer.items[-1]["colors"]) == 1
 
     # Change the color of one of the layers in one viewer
     po.viewer_selected = ["imviz-1"]
@@ -345,7 +347,7 @@ def test_track_mixed_states(imviz_helper):
     po.viewer_selected = ["imviz-0", "imviz-1"]
     # The color state is now mixed when two viewers are selected
     assert po.layer.items[-1]["label"] == "array_2"
-    assert po.layer.items[-1]["mixed_color"]
+    assert len(po.layer.items[-1]["colors"]) == 2
 
     # Now test mixed visibility
     po.viewer_selected = ["imviz-1"]
@@ -353,27 +355,27 @@ def test_track_mixed_states(imviz_helper):
     po.image_visible.value = False
     po.viewer_selected = ["imviz-0", "imviz-1"]
     assert po.layer.items[-1]["label"] == "array_2"
-    assert po.layer.items[-1]["mixed_visibility"]
+    assert po.layer.items[-1]["visible"] == 'mixed'
     assert po.layer.items[-2]["label"] == "array_1"
-    assert po.layer.items[-2]["mixed_visibility"]
+    assert po.layer.items[-2]["visible"] == 'mixed'
 
     # Test unmixing visibility
     po.image_visible.unmix_state(True)
-    assert not po.layer.items[-1]["mixed_visibility"]
+    assert po.layer.items[-1]["visible"] is True
     assert po.layer.items[-1]["visible"]
-    assert not po.layer.items[-2]["mixed_visibility"]
+    assert po.layer.items[-2]["visible"] is True
     assert po.layer.items[-2]["visible"]
 
     # Now test unmixing color
     po.viewer_selected = ["imviz-0", "imviz-1"]
-    assert po.layer.items[-1]["mixed_color"]
-    assert po.layer.items[-2]["mixed_color"]
+    assert len(po.layer.items[-1]["colors"]) > 1
+    assert len(po.layer.items[-2]["colors"]) == 1
 
     # Make sure that all selected layers are no longer
     # mixed state and are the same color
     po.image_color.unmix_state()
-    assert not po.layer.items[-1]["mixed_color"]
-    assert not po.layer.items[-2]["mixed_color"]
+    assert len(po.layer.items[-1]["colors"]) == 1
+    assert len(po.layer.items[-2]["colors"]) == 1
     assert po.image_color.value == "#00ff00"
-    assert po.layer.items[-1]["color"] == "#00ff00"
-    assert po.layer.items[-2]["color"] == "#00ff00"
+    assert po.layer.items[-1]["colors"][0] == "#00ff00"
+    assert po.layer.items[-2]["colors"][0] == "#00ff00"
diff --git a/jdaviz/core/template_mixin.py b/jdaviz/core/template_mixin.py
index 074d1a91c6..b21ba5bfac 100644
--- a/jdaviz/core/template_mixin.py
+++ b/jdaviz/core/template_mixin.py
@@ -1272,21 +1272,21 @@ def __init__(self, plugin, items, selected, viewer,
         self.hub.subscribe(self, AddDataMessage,
                            handler=self._on_data_added)
         self.hub.subscribe(self, RemoveDataMessage,
-                           handler=lambda _: self._on_layers_changed())
+                           handler=lambda _: self._update_layer_items())
         self.hub.subscribe(self, AddDataToViewerMessage,
                            handler=self._on_data_added)
         self.hub.subscribe(self, SubsetCreateMessage,
                            handler=lambda _: self._on_subset_created())
         # will need SubsetUpdateMessage for name only (style shouldn't force a full refresh)
         # self.hub.subscribe(self, SubsetUpdateMessage,
-        #                    handler=lambda _: self._on_layers_changed())
+        #                    handler=lambda _: self._update_layer_items())
         self.hub.subscribe(self, SubsetDeleteMessage,
-                           handler=lambda _: self._on_layers_changed())
+                           handler=lambda _: self._update_layer_items())
 
-        self.app.state.add_callback('layer_icons', self._on_layers_changed)
-        self.add_observe(viewer, self._on_viewer_changed)
-        self.add_observe(selected, self._on_layers_changed)
-        self._on_layers_changed()
+        self.app.state.add_callback('layer_icons', self._update_layer_items)
+        self.add_observe(viewer, self._on_viewer_selected_changed)
+        self.add_observe(selected, self._update_layer_items)
+        self._update_layer_items()
 
     def _get_viewer(self, viewer):
         # newer will likely be the viewer name in most cases, but viewer id in the case
@@ -1296,21 +1296,40 @@ def _get_viewer(self, viewer):
         except TypeError:
             return self.app.get_viewer_by_id(viewer)
 
-    def _layer_to_dict(self, layer, label_to_color={}, label_mixed_color={},
-                       label_to_visibility={}, label_mixed_visibility={}):
-        is_subset = ((hasattr(layer, 'state') and hasattr(layer.state, 'subset_state')) or
-                     (hasattr(layer, 'layer') and hasattr(layer.layer, 'subset_state')))
-        d = {"label": layer.layer.label,
-             "color": layer.state.color,
-             "all_colors_to_label": label_to_color.get(layer.layer.label, False),
-             "icon": self.app.state.layer_icons.get(layer.layer.label),
-             "visible": getattr(layer.state, 'bitmap_visible', True) and layer.visible,
-             "mixed_color": label_mixed_color.get(layer.layer.label, False),
-             "mixed_visibility": label_mixed_visibility.get(layer.layer.label, False),
-             "is_subset": is_subset}
-        return d
-
-    def _on_viewer_changed(self, msg=None):
+    @property
+    def viewer_objs(self):
+        viewer_names = self.viewer
+        if not isinstance(viewer_names, list):
+            viewer_names = [viewer_names]
+        return [self._get_viewer(viewer) for viewer in viewer_names]
+
+    def _layer_to_dict(self, layer_label):
+        is_subset = None
+        colors = []
+        visibilities = []
+        for viewer in self.viewer_objs:
+            for layer in viewer.layers:
+                if layer.layer.label == layer_label:
+                    if is_subset is None:
+                        is_subset = ((hasattr(layer, 'state') and hasattr(layer.state, 'subset_state')) or  # noqa
+                                     (hasattr(layer, 'layer') and hasattr(layer.layer, 'subset_state')))  # noqa
+
+                    if (getattr(viewer.state, 'color_mode', None) == 'Colormaps'
+                            and hasattr(layer.state, 'cmap')):
+                        colors.append(layer.state.cmap.name)
+                    else:
+                        colors.append(layer.state.color)
+
+                    visibilities.append(getattr(layer.state, 'bitmap_visible', True)
+                                        and layer.visible)
+
+        return {"label": layer_label,
+                "is_subset": is_subset,
+                "icon": self.app.state.layer_icons.get(layer_label),
+                "visible": visibilities[0] if len(list(set(visibilities))) == 1 else 'mixed',
+                "colors": np.unique(colors).tolist()}
+
+    def _on_viewer_selected_changed(self, msg=None):
         # we don't want to update the layers if we're just toggling
         # between single and multi-select
         old, new = msg['old'], msg['new']
@@ -1320,28 +1339,40 @@ def _on_viewer_changed(self, msg=None):
             new = [new]
         if new != old:
             self._clear_cache()
-            self._on_layers_changed()
+            self._update_layer_items()
             added_viewers = list(set(new) - set(old))
             removed_viewers = list(set(old) - set(new))
             for old_viewer in removed_viewers:
-                if self._get_viewer(old_viewer) is None:
+                old_viewer = self._get_viewer(old_viewer)
+                if old_viewer is None:
                     continue
-                for layer in self._get_viewer(old_viewer).state.layers:
-                    layer.remove_callback('color', self._on_layers_changed)
+                # NOTE: color_mode callback must be conflicting with something else, so instead
+                # we call _update_layer_items in the PlotOptionsSyncState for color_mode
+                # old_viewer.state.remove_callback('color_mode', self._update_layer_items)
+                for layer in old_viewer.state.layers:
+                    layer.remove_callback('color', self._update_layer_items)
+                    if hasattr(layer, 'cmap'):
+                        layer.remove_callback('cmap', self._update_layer_items)
                     if hasattr(layer, 'bitmap_visible'):
-                        layer.remove_callback('bitmap_visible', self._on_layers_changed)
+                        layer.remove_callback('bitmap_visible', self._update_layer_items)
                     elif hasattr(layer, 'visible'):
-                        layer.remove_callback('visible', self._on_layers_changed)
+                        layer.remove_callback('visible', self._update_layer_items)
 
             for new_viewer in added_viewers:
-                if self._get_viewer(new_viewer) is None:
+                new_viewer = self._get_viewer(new_viewer)
+                if new_viewer is None:
                     continue
-                for layer in self._get_viewer(new_viewer).state.layers:
-                    layer.add_callback('color', self._on_layers_changed)
+                # NOTE: color_mode callback must be conflicting with something else, so instead
+                # we call _update_layer_items in the PlotOptionsSyncState for color_mode
+                # new_viewer.state.add_callback('color_mode', self._update_layer_items)
+                for layer in new_viewer.state.layers:
+                    layer.add_callback('color', self._update_layer_items)
+                    if hasattr(layer, 'cmap'):
+                        layer.add_callback('cmap', self._update_layer_items)
                     if hasattr(layer, 'bitmap_visible'):
-                        layer.add_callback('bitmap_visible', self._on_layers_changed)
+                        layer.add_callback('bitmap_visible', self._update_layer_items)
                     if hasattr(layer, 'visible'):
-                        layer.add_callback('visible', self._on_layers_changed)
+                        layer.add_callback('visible', self._update_layer_items)
 
     def _on_subset_created(self, msg=None):
         new_subset_label = self.app.data_collection.subset_groups[-1].label
@@ -1350,11 +1381,11 @@ def _on_subset_created(self, msg=None):
             for layer in self._get_viewer(current_viewer).state.layers:
                 if layer.layer.label == new_subset_label:
                     # Is it ok if only one subset layer has this callback?
-                    layer.add_callback('color', self._on_layers_changed)
-                    layer.add_callback('visible', self._on_layers_changed)
+                    layer.add_callback('color', self._update_layer_items)
+                    layer.add_callback('visible', self._update_layer_items)
                     break
                     # TODO: Add ability to add new item to self.items instead of recompiling
-        self._on_layers_changed('subset_added')
+        self._update_layer_items({'source': 'subset_added'})
 
     def _on_data_added(self, msg=None):
         if msg is None or not hasattr(msg, 'data') or msg.data is None:
@@ -1368,97 +1399,35 @@ def _on_data_added(self, msg=None):
                     # _on_layers_changed whenever the color changes
                     # TODO: find out if this conflicts with another color change event
                     #  and is causing the lag in the color picker
-                    layer.add_callback('color', self._on_layers_changed)
+                    layer.add_callback('color', self._update_layer_items)
+                    if hasattr(layer, 'cmap'):
+                        layer.add_callback('cmap', self._update_layer_items)
                     if hasattr(layer, 'bitmap_visible'):
-                        layer.add_callback('bitmap_visible', self._on_layers_changed)
+                        layer.add_callback('bitmap_visible', self._update_layer_items)
                     if hasattr(layer, 'visible'):
-                        layer.add_callback('visible', self._on_layers_changed)
+                        layer.add_callback('visible', self._update_layer_items)
 
-        self._on_layers_changed('data_added')
+        self._update_layer_items({'source': 'data_added'})
 
     @observe('filters')
-    def _on_layers_changed(self, msg=None, **kwargs):
+    def _update_layer_items(self, msg={}):
         # NOTE: _on_layers_changed is passed without a msg object during init
         # TODO: Handle changes to just one item without recompiling the whole thing
-        viewer_names = self.viewer
-        if not isinstance(viewer_names, list):
-            viewer_names = [viewer_names]
-        viewers = [self._get_viewer(viewer) for viewer in viewer_names]
-
         manual_items = [{'label': label} for label in self.manual_options]
-        layers = [layer for viewer in viewers for layer in getattr(viewer, 'layers', [])]
-        # remove duplicates - NOTE: by doing this, any color-mismatch between layers with the
-        # same name in different viewers will be randomly assigned within plot_options
-        # based on which was found _first.
-        layer_labels = [layer.layer.label for layer in layers if self.app.state.layer_icons.get(layer.layer.label)]  # noqa
-        _, inds = np.unique(layer_labels, return_index=True)
-        layers_unique = [layers[i] for i in inds]
-
-        selected_labels = self.selected
-        selected_color = None
-        mixed_selected_color = False
-        label_to_color = {}
-        label_mixed_color = {}
-        label_to_visibility = {}
-        label_mixed_visibility = {}
-
-        # Go through all layers and determine what colors go to what layers based
-        # on what label they use. Also determine if those layers with shared labels
-        # also share color or visibility. If not, show that as a mixed state.
-        for layer in layers:
-            label = layer.layer.label
-            color = layer.state.color.lower()
-            visible = getattr(layer.state, 'bitmap_visible', True) and layer.visible
-            # This handles the subset case since each subset can only be one color,
-            # even though there is a layer with the subsets name for each data layer that
-            # subset is applied to
-            if hasattr(layer.state, 'subset_state'):
-                if label not in label_to_color:
-                    label_to_color[label] = [color]
-                    label_mixed_color[label] = False
-                    label_to_visibility[label] = [visible]
-                    label_mixed_visibility[label] = False
-                continue
-
-            # Determine whether all currently selected layers share the same color. If so
-            # then there is no mixed color state. Otherwise, there is.
-            if selected_labels and label in selected_labels and selected_color is None:
-                selected_color = color
-            elif selected_labels and label in selected_labels and color != selected_color:
-                mixed_selected_color = True
-
-            # label_to_color tracks all colors per layer label
-            # label_to_visibility tracks all visibility states per layer label
-            if label not in label_to_color:
-                label_to_color[label] = [color]
-                label_mixed_color[label] = False
-                label_to_visibility[label] = [visible]
-                label_mixed_visibility[label] = False
+        all_layers = [layer for viewer in self.viewer_objs
+                      for layer in getattr(viewer, 'layers', [])]
+        # remove duplicates - we'll loop back through all selected viewers to get a list of colors
+        # and visibilities later within _layer_to_dict
+        layer_labels = [layer.layer.label for layer in all_layers if self.app.state.layer_icons.get(layer.layer.label)]  # noqa
+        unique_layer_labels = list(set(layer_labels))
 
-            else:
-                label_to_color[label] += [color]
-                label_to_visibility[label] += [visible]
-
-        # If there is more than one unique color per label or the label is
-        # selected and not the same color as other selected labels, then the
-        # current state of the layer's color is mixed
-        for k, v in label_to_color.items():
-            if (len(np.unique(v)) > 1 or
-                    (selected_labels and k in selected_labels and mixed_selected_color)):
-                label_mixed_color[k] = True
-            label_mixed_visibility[k] = (label_to_visibility[k][1:] != label_to_visibility[k][:-1]
-                                         if len(label_to_visibility[k]) > 1 else False)
-
-        # Send layers with unique labels and what colors are associated
-        # with that label and if layers with that label are in a mixed color state
-        items = manual_items + [self._layer_to_dict(layer, label_to_color, label_mixed_color,
-                                                    label_to_visibility, label_mixed_visibility)
-                                for layer in layers_unique]
+        layer_items = [self._layer_to_dict(layer_label) for layer_label in unique_layer_labels]
 
         def _sort_by_icon(items_dict):
             return items_dict['icon']
-        items.sort(key=_sort_by_icon)
-        self.items = items
+        layer_items.sort(key=_sort_by_icon)
+
+        self.items = manual_items + layer_items
 
         self._apply_default_selection()
 
@@ -3162,6 +3131,9 @@ def _on_glue_value_changed(self, value):
             # currently in subscribed states will be ignored.
             for viewer in self.subscribed_viewers:
                 viewer._update_layer_icons()
+            # callbacks from the viewer state also do not trigger an update to the
+            # layer items (tabs), so we'll force those to update from here as well.
+            self.plugin.layer._update_layer_items()
 
         if self._processing_change_to_glue:
             return