diff --git a/CHANGES.rst b/CHANGES.rst
index fbbdb5b603..42371351bf 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -16,7 +16,7 @@ New Features
 
 - The colormap menu for image layers now shows in-line previews of the colormaps. [#2900]
 
-- Plugins can now expose in-UI API hints. [#3137]
+- Plugins can now expose in-UI API hints. [#3137, #3159]
 
 Cubeviz
 ^^^^^^^
diff --git a/jdaviz/components/plugin_color_picker.vue b/jdaviz/components/plugin_color_picker.vue
index 90245516a8..41fe2e7b2b 100644
--- a/jdaviz/components/plugin_color_picker.vue
+++ b/jdaviz/components/plugin_color_picker.vue
@@ -3,7 +3,7 @@
     <plugin-input-header
       v-if="label && !label_inline"
       :label="label"
-      :api_hint="api_hint + value"
+      :api_hint="api_hint + '\''+value+'\''"
       :api_hints_enabled="api_hints_enabled"
     ></plugin-input-header>
     <v-menu>
diff --git a/jdaviz/configs/cubeviz/plugins/slice/slice.vue b/jdaviz/configs/cubeviz/plugins/slice/slice.vue
index 9154133745..90848761fc 100644
--- a/jdaviz/configs/cubeviz/plugins/slice/slice.vue
+++ b/jdaviz/configs/cubeviz/plugins/slice/slice.vue
@@ -1,7 +1,7 @@
 <template>
   <j-tray-plugin
     :config="config"
-    plugin_key="Slice"
+    :plugin_key="plugin_key || 'Slice'"
     :api_hints_enabled.sync="api_hints_enabled"
     :description="docs_description || 'Select slice of the cube to show in the image viewers.  The slice can also be changed interactively in the spectrum viewer by activating the slice tool.'"
     :irrelevant_msg="irrelevant_msg"
@@ -60,8 +60,8 @@
         v-model.number="value"
         @focus="(e) => value_editing = true"
         @blur="(e) => value_editing = false"
-        class="mt-0 pt-0"
         :label="api_hints_enabled ? 'plg.value =' : value_label"
+        :class="api_hints_enabled ? 'api-hint' : null"
         :hint="value_label+' corresponding to slice.'+(snap_to_slice && value_editing ? '  Indicator will snap to slice when clicking or tabbing away from input.' : '')"
         :suffix="value_unit"
       ></v-text-field>
diff --git a/jdaviz/configs/cubeviz/plugins/spectral_extraction/spectral_extraction.vue b/jdaviz/configs/cubeviz/plugins/spectral_extraction/spectral_extraction.vue
index 1a60c21863..f22cbff4d2 100644
--- a/jdaviz/configs/cubeviz/plugins/spectral_extraction/spectral_extraction.vue
+++ b/jdaviz/configs/cubeviz/plugins/spectral_extraction/spectral_extraction.vue
@@ -1,7 +1,7 @@
 <template>
   <j-tray-plugin
     :config="config"
-    plugin_key="Spectral Extraction"
+    :plugin_key="plugin_key || Spectral Extraction"
     :api_hints_enabled.sync="api_hints_enabled"
     :description="docs_description || 'Extract a '+resulting_product_name+' from a spectral cube.'"
     :link="docs_link || 'https://jdaviz.readthedocs.io/en/'+vdocs+'/'+config+'/plugins.html#spectral-extraction'"
diff --git a/jdaviz/configs/default/plugins/plot_options/plot_options.vue b/jdaviz/configs/default/plugins/plot_options/plot_options.vue
index abfec5a735..0eddb38884 100644
--- a/jdaviz/configs/default/plugins/plot_options/plot_options.vue
+++ b/jdaviz/configs/default/plugins/plot_options/plot_options.vue
@@ -185,6 +185,7 @@
           <plugin-action-button
             :spinner="apply_RGB_presets_spinner"
             :results_isolated_to_plugin="false"
+            :class="api_hints_enabled ? 'api-hint' : null"
             @click="apply_RGB_presets"
           >
             {{ api_hints_enabled ?
diff --git a/jdaviz/configs/imviz/plugins/orientation/orientation.vue b/jdaviz/configs/imviz/plugins/orientation/orientation.vue
index 1c7dc5bcd9..451739dde3 100644
--- a/jdaviz/configs/imviz/plugins/orientation/orientation.vue
+++ b/jdaviz/configs/imviz/plugins/orientation/orientation.vue
@@ -68,7 +68,7 @@
             <v-radio
               v-for="item in align_by_items"
               :key="item.label"
-              :label="item.label == 'WCS' ? 'WCS (Sky)' : item.label"
+              :label="item.label == 'WCS' && !api_hints_enabled ? 'WCS (Sky)' : item.label"
               :value="item.label"
             ></v-radio>
           </v-radio-group>
diff --git a/jdaviz/core/template_mixin.py b/jdaviz/core/template_mixin.py
index 27ce6ef771..7f417e78d7 100644
--- a/jdaviz/core/template_mixin.py
+++ b/jdaviz/core/template_mixin.py
@@ -394,6 +394,7 @@ class PluginTemplateMixin(TemplateMixin):
     _plugin_name = None  # noqa overwritten by the registry - won't be populated by plugins instantiated directly
     disabled_msg = Unicode("").tag(sync=True)  # noqa if non-empty, will show this message in place of plugin content
     irrelevant_msg = Unicode("").tag(sync=True)  # noqa if non-empty, will exclude from the tray, and show this message in place of any content in other instances
+    plugin_key = Unicode("").tag(sync=True)  # noqa set to non-empty to override value in vue file (when supported by vue file)
     docs_link = Unicode("").tag(sync=True)  # set to non-empty to override value in vue file
     docs_description = Unicode("").tag(sync=True)  # set to non-empty to override value in vue file
     plugin_opened = Bool(False).tag(sync=True)  # noqa any instance of the plugin is open (recently sent an "alive" ping)