diff --git a/bec_widgets/cli/client.py b/bec_widgets/cli/client.py
index a0462ccb..7933e42e 100644
--- a/bec_widgets/cli/client.py
+++ b/bec_widgets/cli/client.py
@@ -48,11 +48,13 @@ _Widgets = {
     "PositionerBox": "PositionerBox",
     "PositionerBox2D": "PositionerBox2D",
     "PositionerControlLine": "PositionerControlLine",
+    "PositionerGroup": "PositionerGroup",
     "ResetButton": "ResetButton",
     "ResumeButton": "ResumeButton",
     "RingProgressBar": "RingProgressBar",
     "SBBMonitor": "SBBMonitor",
     "ScanControl": "ScanControl",
+    "ScanProgressBar": "ScanProgressBar",
     "ScatterWaveform": "ScatterWaveform",
     "SignalComboBox": "SignalComboBox",
     "SignalLabel": "SignalLabel",
diff --git a/bec_widgets/utils/generate_designer_plugin.py b/bec_widgets/utils/generate_designer_plugin.py
index 3e37fbb0..4495f0cd 100644
--- a/bec_widgets/utils/generate_designer_plugin.py
+++ b/bec_widgets/utils/generate_designer_plugin.py
@@ -7,7 +7,7 @@ from qtpy.QtCore import QObject
 
 from bec_widgets.utils.name_utils import pascal_to_snake
 
-EXCLUDED_PLUGINS = ["BECConnector", "BECDockArea", "BECDock", "BECFigure"]
+EXCLUDED_PLUGINS = ["BECConnector", "BECDock"]
 _PARENT_ARG_REGEX = r".__init__\(\s*(?:parent\)|parent=parent,?|parent,?)"
 _SELF_PARENT_ARG_REGEX = r".__init__\(\s*self,\s*(?:parent\)|parent=parent,?|parent,?)"
 SUPER_INIT_REGEX = re.compile(r"super\(\)" + _PARENT_ARG_REGEX, re.MULTILINE)
diff --git a/bec_widgets/widgets/containers/dock/bec_dock_area.pyproject b/bec_widgets/widgets/containers/dock/bec_dock_area.pyproject
new file mode 100644
index 00000000..e12ce031
--- /dev/null
+++ b/bec_widgets/widgets/containers/dock/bec_dock_area.pyproject
@@ -0,0 +1 @@
+{'files': ['dock_area.py']}
\ No newline at end of file
diff --git a/bec_widgets/widgets/containers/dock/dock_area_plugin.py b/bec_widgets/widgets/containers/dock/bec_dock_area_plugin.py
similarity index 78%
rename from bec_widgets/widgets/containers/dock/dock_area_plugin.py
rename to bec_widgets/widgets/containers/dock/bec_dock_area_plugin.py
index be576978..fb507cc6 100644
--- a/bec_widgets/widgets/containers/dock/dock_area_plugin.py
+++ b/bec_widgets/widgets/containers/dock/bec_dock_area_plugin.py
@@ -1,22 +1,19 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.containers.dock import BECDockArea
+from bec_widgets.widgets.containers.dock.dock_area import BECDockArea
 
 DOM_XML = """
 <ui language='c++'>
-    <widget class='BECDockArea' name='dock_area'>
+    <widget class='BECDockArea' name='bec_dock_area'>
     </widget>
 </ui>
 """
 
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-
 
 class BECDockAreaPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -24,6 +21,8 @@ class BECDockAreaPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = BECDockArea(parent)
         return t
 
@@ -31,13 +30,13 @@ class BECDockAreaPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Plots"
+        return "BEC Containers"
 
     def icon(self):
         return designer_material_icon(BECDockArea.ICON_NAME)
 
     def includeFile(self):
-        return "dock_area"
+        return "bec_dock_area"
 
     def initialize(self, form_editor):
         self._form_editor = form_editor
@@ -52,7 +51,7 @@ class BECDockAreaPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BECDockArea"
 
     def toolTip(self):
-        return "BECDockArea"
+        return ""
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/containers/dock/dock_area.pyproject b/bec_widgets/widgets/containers/dock/dock_area.pyproject
deleted file mode 100644
index f2de3525..00000000
--- a/bec_widgets/widgets/containers/dock/dock_area.pyproject
+++ /dev/null
@@ -1 +0,0 @@
-{'files': ['dock_area.py','dock.py']}
\ No newline at end of file
diff --git a/bec_widgets/widgets/containers/dock/register_dock_area.py b/bec_widgets/widgets/containers/dock/register_bec_dock_area.py
similarity index 81%
rename from bec_widgets/widgets/containers/dock/register_dock_area.py
rename to bec_widgets/widgets/containers/dock/register_bec_dock_area.py
index 5d32afe7..2c33f79d 100644
--- a/bec_widgets/widgets/containers/dock/register_dock_area.py
+++ b/bec_widgets/widgets/containers/dock/register_bec_dock_area.py
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.containers.dock.dock_area_plugin import BECDockAreaPlugin
+    from bec_widgets.widgets.containers.dock.bec_dock_area_plugin import BECDockAreaPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(BECDockAreaPlugin())
 
diff --git a/bec_widgets/widgets/control/buttons/button_abort/abort_button_plugin.py b/bec_widgets/widgets/control/buttons/button_abort/abort_button_plugin.py
index 69daa840..3a3e2383 100644
--- a/bec_widgets/widgets/control/buttons/button_abort/abort_button_plugin.py
+++ b/bec_widgets/widgets/control/buttons/button_abort/abort_button_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.buttons.button_abort.button_abort import AbortButton
@@ -20,6 +21,8 @@ class AbortButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = AbortButton(parent)
         return t
 
diff --git a/bec_widgets/widgets/control/buttons/button_reset/reset_button_plugin.py b/bec_widgets/widgets/control/buttons/button_reset/reset_button_plugin.py
index 3cd01119..b53be4cd 100644
--- a/bec_widgets/widgets/control/buttons/button_reset/reset_button_plugin.py
+++ b/bec_widgets/widgets/control/buttons/button_reset/reset_button_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.buttons.button_reset.button_reset import ResetButton
@@ -20,6 +21,8 @@ class ResetButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = ResetButton(parent)
         return t
 
@@ -48,7 +51,7 @@ class ResetButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "ResetButton"
 
     def toolTip(self):
-        return "A button that reset the scan queue."
+        return "A button that resets the scan queue."
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/control/buttons/button_resume/resume_button_plugin.py b/bec_widgets/widgets/control/buttons/button_resume/resume_button_plugin.py
index f4e600a3..b8535b18 100644
--- a/bec_widgets/widgets/control/buttons/button_resume/resume_button_plugin.py
+++ b/bec_widgets/widgets/control/buttons/button_resume/resume_button_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.buttons.button_resume.button_resume import ResumeButton
@@ -20,6 +21,8 @@ class ResumeButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = ResumeButton(parent)
         return t
 
diff --git a/bec_widgets/widgets/control/buttons/stop_button/stop_button_plugin.py b/bec_widgets/widgets/control/buttons/stop_button/stop_button_plugin.py
index fa381b77..f08fb8fa 100644
--- a/bec_widgets/widgets/control/buttons/stop_button/stop_button_plugin.py
+++ b/bec_widgets/widgets/control/buttons/stop_button/stop_button_plugin.py
@@ -1,10 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.buttons.stop_button.stop_button import StopButton
 
@@ -15,8 +14,6 @@ DOM_XML = """
 </ui>
 """
 
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-
 
 class StopButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -24,6 +21,8 @@ class StopButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = StopButton(parent)
         return t
 
diff --git a/bec_widgets/widgets/control/device_control/position_indicator/position_indicator_plugin.py b/bec_widgets/widgets/control/device_control/position_indicator/position_indicator_plugin.py
index 52fdbbae..8d472591 100644
--- a/bec_widgets/widgets/control/device_control/position_indicator/position_indicator_plugin.py
+++ b/bec_widgets/widgets/control/device_control/position_indicator/position_indicator_plugin.py
@@ -1,10 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.device_control.position_indicator.position_indicator import (
     PositionIndicator,
@@ -17,8 +16,6 @@ DOM_XML = """
 </ui>
 """
 
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-
 
 class PositionIndicatorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -26,6 +23,8 @@ class PositionIndicatorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = PositionIndicator(parent)
         return t
 
@@ -54,7 +53,7 @@ class PositionIndicatorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         return "PositionIndicator"
 
     def toolTip(self):
-        return "PositionIndicator"
+        return ""
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box_plugin.py b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box_plugin.py
index 9750932e..a642342f 100644
--- a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box_plugin.py
+++ b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box_plugin.py
@@ -1,12 +1,13 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-import os
-
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.device_control.positioner_box import PositionerBox
+from bec_widgets.widgets.control.device_control.positioner_box.positioner_box.positioner_box import (
+    PositionerBox,
+)
 
 DOM_XML = """
 <ui language='c++'>
@@ -14,7 +15,6 @@ DOM_XML = """
     </widget>
 </ui>
 """
-MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
 
 class PositionerBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -23,6 +23,8 @@ class PositionerBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = PositionerBox(parent)
         return t
 
@@ -30,7 +32,7 @@ class PositionerBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Device Control"
+        return "BEC Device Control"
 
     def icon(self):
         return designer_material_icon(PositionerBox.ICON_NAME)
diff --git a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box2_d_plugin.py b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box2_d_plugin.py
index ab28cce5..a55c588c 100644
--- a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box2_d_plugin.py
+++ b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box2_d_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.device_control.positioner_box.positioner_box_2d.positioner_box_2d import (
@@ -22,6 +23,8 @@ class PositionerBox2DPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = PositionerBox2D(parent)
         return t
 
@@ -29,7 +32,7 @@ class PositionerBox2DPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Device Control"
+        return "BEC Device Control"
 
     def icon(self):
         return designer_material_icon(PositionerBox2D.ICON_NAME)
diff --git a/bec_widgets/widgets/control/device_control/positioner_box/positioner_control_line/positioner_control_line_plugin.py b/bec_widgets/widgets/control/device_control/positioner_box/positioner_control_line/positioner_control_line_plugin.py
index cd04eebb..909cbf8e 100644
--- a/bec_widgets/widgets/control/device_control/positioner_box/positioner_control_line/positioner_control_line_plugin.py
+++ b/bec_widgets/widgets/control/device_control/positioner_box/positioner_control_line/positioner_control_line_plugin.py
@@ -1,12 +1,13 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-import os
-
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.device_control.positioner_box import PositionerControlLine
+from bec_widgets.widgets.control.device_control.positioner_box.positioner_control_line.positioner_control_line import (
+    PositionerControlLine,
+)
 
 DOM_XML = """
 <ui language='c++'>
@@ -14,7 +15,6 @@ DOM_XML = """
     </widget>
 </ui>
 """
-MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
 
 class PositionerControlLinePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -23,6 +23,8 @@ class PositionerControlLinePlugin(QDesignerCustomWidgetInterface):  # pragma: no
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = PositionerControlLine(parent)
         return t
 
@@ -30,7 +32,7 @@ class PositionerControlLinePlugin(QDesignerCustomWidgetInterface):  # pragma: no
         return DOM_XML
 
     def group(self):
-        return "Device Control"
+        return "BEC Device Control"
 
     def icon(self):
         return designer_material_icon(PositionerControlLine.ICON_NAME)
@@ -51,7 +53,7 @@ class PositionerControlLinePlugin(QDesignerCustomWidgetInterface):  # pragma: no
         return "PositionerControlLine"
 
     def toolTip(self):
-        return "A widget that controls a single positioner in line form."
+        return "A widget that controls a single device."
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/control/device_control/positioner_group/positioner_group.py b/bec_widgets/widgets/control/device_control/positioner_group/positioner_group.py
index a50b1f20..f3ac8892 100644
--- a/bec_widgets/widgets/control/device_control/positioner_group/positioner_group.py
+++ b/bec_widgets/widgets/control/device_control/positioner_group/positioner_group.py
@@ -15,7 +15,7 @@ logger = bec_logger.logger
 
 
 class PositionerGroupBox(QGroupBox):
-    PLUGIN = True
+
     position_update = Signal(float)
 
     def __init__(self, parent, dev_name):
@@ -60,6 +60,7 @@ class PositionerGroupBox(QGroupBox):
 class PositionerGroup(BECWidget, QWidget):
     """Simple Widget to control a positioner in box form"""
 
+    PLUGIN = True
     ICON_NAME = "grid_view"
     USER_ACCESS = ["set_positioners"]
 
diff --git a/bec_widgets/widgets/control/device_control/positioner_group/positioner_group.pyproject b/bec_widgets/widgets/control/device_control/positioner_group/positioner_group.pyproject
index 58b1a143..ff506179 100644
--- a/bec_widgets/widgets/control/device_control/positioner_group/positioner_group.pyproject
+++ b/bec_widgets/widgets/control/device_control/positioner_group/positioner_group.pyproject
@@ -1 +1 @@
-{'files': ['positioner_group.py']}
+{'files': ['positioner_group.py']}
\ No newline at end of file
diff --git a/bec_widgets/widgets/control/device_control/positioner_group/positioner_group_plugin.py b/bec_widgets/widgets/control/device_control/positioner_group/positioner_group_plugin.py
index 2101ab51..c1a687ec 100644
--- a/bec_widgets/widgets/control/device_control/positioner_group/positioner_group_plugin.py
+++ b/bec_widgets/widgets/control/device_control/positioner_group/positioner_group_plugin.py
@@ -1,9 +1,8 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-import os
-
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.device_control.positioner_group.positioner_group import (
@@ -16,7 +15,6 @@ DOM_XML = """
     </widget>
 </ui>
 """
-MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
 
 class PositionerGroupPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -25,6 +23,8 @@ class PositionerGroupPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = PositionerGroup(parent)
         return t
 
@@ -32,7 +32,7 @@ class PositionerGroupPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Device Control"
+        return "BEC Device Control"
 
     def icon(self):
         return designer_material_icon(PositionerGroup.ICON_NAME)
@@ -53,7 +53,7 @@ class PositionerGroupPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "PositionerGroup"
 
     def toolTip(self):
-        return "Container Widget to control positioners in compact form, in a grid"
+        return "Simple Widget to control a positioner in box form"
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/control/device_input/device_combobox/device_combo_box.pyproject b/bec_widgets/widgets/control/device_input/device_combobox/device_combo_box.pyproject
index 6220cc1c..97eca2a7 100644
--- a/bec_widgets/widgets/control/device_input/device_combobox/device_combo_box.pyproject
+++ b/bec_widgets/widgets/control/device_input/device_combobox/device_combo_box.pyproject
@@ -1,3 +1 @@
-{
-    "files": ["device_combobox.py"]
-}
+{'files': ['device_combobox.py']}
\ No newline at end of file
diff --git a/bec_widgets/widgets/control/device_input/device_combobox/device_combo_box_plugin.py b/bec_widgets/widgets/control/device_input/device_combobox/device_combo_box_plugin.py
index c9100b2c..f745f89e 100644
--- a/bec_widgets/widgets/control/device_input/device_combobox/device_combo_box_plugin.py
+++ b/bec_widgets/widgets/control/device_input/device_combobox/device_combo_box_plugin.py
@@ -1,22 +1,19 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.device_input.device_combobox.device_combobox import DeviceComboBox
 
 DOM_XML = """
 <ui language='c++'>
-    <widget class='DeviceComboBox' name='device_combobox'>
+    <widget class='DeviceComboBox' name='device_combo_box'>
     </widget>
 </ui>
 """
 
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-
 
 class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -24,6 +21,8 @@ class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = DeviceComboBox(parent)
         return t
 
@@ -37,7 +36,7 @@ class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return designer_material_icon(DeviceComboBox.ICON_NAME)
 
     def includeFile(self):
-        return "device_combobox"
+        return "device_combo_box"
 
     def initialize(self, form_editor):
         self._form_editor = form_editor
@@ -52,7 +51,7 @@ class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "DeviceComboBox"
 
     def toolTip(self):
-        return "Device ComboBox Example for BEC Widgets"
+        return ""
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit.pyproject b/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit.pyproject
index 8639120f..d9496b9f 100644
--- a/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit.pyproject
+++ b/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit.pyproject
@@ -1,3 +1 @@
-{
-    "files": ["device_line_edit.py"]
-}
+{'files': ['device_line_edit.py']}
\ No newline at end of file
diff --git a/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit_plugin.py b/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit_plugin.py
index 5fcab2f9..e39b7be3 100644
--- a/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit_plugin.py
+++ b/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit_plugin.py
@@ -1,10 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.device_input.device_line_edit.device_line_edit import (
     DeviceLineEdit,
@@ -17,8 +16,6 @@ DOM_XML = """
 </ui>
 """
 
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-
 
 class DeviceLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -26,6 +23,8 @@ class DeviceLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = DeviceLineEdit(parent)
         return t
 
@@ -54,7 +53,7 @@ class DeviceLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "DeviceLineEdit"
 
     def toolTip(self):
-        return "Device LineEdit Example for BEC Widgets with autocomplete."
+        return ""
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/control/device_input/signal_combobox/signal_combo_box_plugin.py b/bec_widgets/widgets/control/device_input/signal_combobox/signal_combo_box_plugin.py
index e8f77b79..6a22c1da 100644
--- a/bec_widgets/widgets/control/device_input/signal_combobox/signal_combo_box_plugin.py
+++ b/bec_widgets/widgets/control/device_input/signal_combobox/signal_combo_box_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.device_input.signal_combobox.signal_combobox import SignalComboBox
@@ -20,6 +21,8 @@ class SignalComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = SignalComboBox(parent)
         return t
 
@@ -48,7 +51,7 @@ class SignalComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "SignalComboBox"
 
     def toolTip(self):
-        return "Signal ComboBox Example for BEC Widgets with autocomplete."
+        return ""
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/control/device_input/signal_line_edit/signal_line_edit_plugin.py b/bec_widgets/widgets/control/device_input/signal_line_edit/signal_line_edit_plugin.py
index 8238c35d..492f4cfa 100644
--- a/bec_widgets/widgets/control/device_input/signal_line_edit/signal_line_edit_plugin.py
+++ b/bec_widgets/widgets/control/device_input/signal_line_edit/signal_line_edit_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.device_input.signal_line_edit.signal_line_edit import (
@@ -22,6 +23,8 @@ class SignalLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = SignalLineEdit(parent)
         return t
 
@@ -50,7 +53,7 @@ class SignalLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "SignalLineEdit"
 
     def toolTip(self):
-        return "Signal LineEdit Example for BEC Widgets with autocomplete."
+        return ""
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/control/scan_control/scan_control_plugin.py b/bec_widgets/widgets/control/scan_control/scan_control_plugin.py
index 35209d85..5fa83614 100644
--- a/bec_widgets/widgets/control/scan_control/scan_control_plugin.py
+++ b/bec_widgets/widgets/control/scan_control/scan_control_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.scan_control.scan_control import ScanControl
@@ -20,6 +21,8 @@ class ScanControlPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = ScanControl(parent)
         return t
 
@@ -27,7 +30,7 @@ class ScanControlPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Device Control"
+        return "BEC Device Control"
 
     def icon(self):
         return designer_material_icon(ScanControl.ICON_NAME)
@@ -48,7 +51,7 @@ class ScanControlPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "ScanControl"
 
     def toolTip(self):
-        return "ScanControl"
+        return ""
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/dap/dap_combo_box/dap_combo_box_plugin.py b/bec_widgets/widgets/dap/dap_combo_box/dap_combo_box_plugin.py
index d7974324..5654c9d9 100644
--- a/bec_widgets/widgets/dap/dap_combo_box/dap_combo_box_plugin.py
+++ b/bec_widgets/widgets/dap/dap_combo_box/dap_combo_box_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.dap.dap_combo_box.dap_combo_box import DapComboBox
@@ -20,6 +21,8 @@ class DapComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = DapComboBox(parent)
         return t
 
diff --git a/bec_widgets/widgets/dap/lmfit_dialog/lm_fit_dialog_plugin.py b/bec_widgets/widgets/dap/lmfit_dialog/lm_fit_dialog_plugin.py
index fc05f4b2..24da25d6 100644
--- a/bec_widgets/widgets/dap/lmfit_dialog/lm_fit_dialog_plugin.py
+++ b/bec_widgets/widgets/dap/lmfit_dialog/lm_fit_dialog_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.dap.lmfit_dialog.lmfit_dialog import LMFitDialog
@@ -20,6 +21,8 @@ class LMFitDialogPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = LMFitDialog(parent)
         return t
 
@@ -48,7 +51,7 @@ class LMFitDialogPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "LMFitDialog"
 
     def toolTip(self):
-        return "LMFitDialog"
+        return "Dialog for displaying the fit summary and params for LMFit DAP processes"
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/editors/monaco/monaco_widget_plugin.py b/bec_widgets/widgets/editors/monaco/monaco_widget_plugin.py
index 4bd1f1d6..3a9640f4 100644
--- a/bec_widgets/widgets/editors/monaco/monaco_widget_plugin.py
+++ b/bec_widgets/widgets/editors/monaco/monaco_widget_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.editors.monaco.monaco_widget import MonacoWidget
@@ -20,6 +21,8 @@ class MonacoWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = MonacoWidget(parent)
         return t
 
diff --git a/bec_widgets/widgets/editors/sbb_monitor/sbb_monitor_plugin.py b/bec_widgets/widgets/editors/sbb_monitor/sbb_monitor_plugin.py
index ac256d57..44dcd831 100644
--- a/bec_widgets/widgets/editors/sbb_monitor/sbb_monitor_plugin.py
+++ b/bec_widgets/widgets/editors/sbb_monitor/sbb_monitor_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.editors.sbb_monitor.sbb_monitor import SBBMonitor
@@ -20,6 +21,8 @@ class SBBMonitorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = SBBMonitor(parent)
         return t
 
@@ -27,7 +30,7 @@ class SBBMonitorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return ""
+        return "BEC Utils"
 
     def icon(self):
         return designer_material_icon(SBBMonitor.ICON_NAME)
diff --git a/bec_widgets/widgets/editors/scan_metadata/scan_metadata_plugin.py b/bec_widgets/widgets/editors/scan_metadata/scan_metadata_plugin.py
index ff14361b..4af62fb1 100644
--- a/bec_widgets/widgets/editors/scan_metadata/scan_metadata_plugin.py
+++ b/bec_widgets/widgets/editors/scan_metadata/scan_metadata_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.editors.scan_metadata.scan_metadata import ScanMetadata
@@ -20,6 +21,8 @@ class ScanMetadataPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = ScanMetadata(parent)
         return t
 
@@ -27,7 +30,7 @@ class ScanMetadataPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return ""
+        return "BEC Input Widgets"
 
     def icon(self):
         return designer_material_icon(ScanMetadata.ICON_NAME)
@@ -48,7 +51,7 @@ class ScanMetadataPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "ScanMetadata"
 
     def toolTip(self):
-        return "Dynamically generates a form for inclusion of metadata for a scan."
+        return "ScanMetadata"
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/editors/text_box/text_box_plugin.py b/bec_widgets/widgets/editors/text_box/text_box_plugin.py
index 83854a3a..cce58bb6 100644
--- a/bec_widgets/widgets/editors/text_box/text_box_plugin.py
+++ b/bec_widgets/widgets/editors/text_box/text_box_plugin.py
@@ -1,10 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.editors.text_box.text_box import TextBox
 
@@ -14,7 +13,6 @@ DOM_XML = """
     </widget>
 </ui>
 """
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
 
 class TextBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -23,6 +21,8 @@ class TextBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = TextBox(parent)
         return t
 
@@ -51,7 +51,7 @@ class TextBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "TextBox"
 
     def toolTip(self):
-        return "TextBox"
+        return "A widget that displays text in plain and HTML format"
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/editors/vscode/vs_code_editor_plugin.py b/bec_widgets/widgets/editors/vscode/vs_code_editor_plugin.py
index 68967e02..4614210b 100644
--- a/bec_widgets/widgets/editors/vscode/vs_code_editor_plugin.py
+++ b/bec_widgets/widgets/editors/vscode/vs_code_editor_plugin.py
@@ -1,10 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.editors.vscode.vscode import VSCodeEditor
 
@@ -15,8 +14,6 @@ DOM_XML = """
 </ui>
 """
 
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-
 
 class VSCodeEditorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -24,6 +21,8 @@ class VSCodeEditorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = VSCodeEditor(parent)
         return t
 
diff --git a/bec_widgets/widgets/editors/web_console/web_console_plugin.py b/bec_widgets/widgets/editors/web_console/web_console_plugin.py
index 572ad87e..8fa8b6f2 100644
--- a/bec_widgets/widgets/editors/web_console/web_console_plugin.py
+++ b/bec_widgets/widgets/editors/web_console/web_console_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.editors.web_console.web_console import WebConsole
@@ -20,6 +21,8 @@ class WebConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = WebConsole(parent)
         return t
 
@@ -27,7 +30,7 @@ class WebConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Console"
+        return "BEC Developer"
 
     def icon(self):
         return designer_material_icon(WebConsole.ICON_NAME)
diff --git a/bec_widgets/widgets/editors/website/website_widget_plugin.py b/bec_widgets/widgets/editors/website/website_widget_plugin.py
index 79fef6d9..794e0721 100644
--- a/bec_widgets/widgets/editors/website/website_widget_plugin.py
+++ b/bec_widgets/widgets/editors/website/website_widget_plugin.py
@@ -1,10 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.editors.website.website import WebsiteWidget
 
@@ -14,7 +13,6 @@ DOM_XML = """
     </widget>
 </ui>
 """
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
 
 class WebsiteWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -23,6 +21,8 @@ class WebsiteWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = WebsiteWidget(parent)
         return t
 
diff --git a/bec_widgets/widgets/games/minesweeper_plugin.py b/bec_widgets/widgets/games/minesweeper_plugin.py
index bc4b3297..28f3afe9 100644
--- a/bec_widgets/widgets/games/minesweeper_plugin.py
+++ b/bec_widgets/widgets/games/minesweeper_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.games.minesweeper import Minesweeper
@@ -20,6 +21,8 @@ class MinesweeperPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = Minesweeper(parent)
         return t
 
diff --git a/bec_widgets/widgets/plots/heatmap/heatmap_plugin.py b/bec_widgets/widgets/plots/heatmap/heatmap_plugin.py
index 220ec809..7a03ecd5 100644
--- a/bec_widgets/widgets/plots/heatmap/heatmap_plugin.py
+++ b/bec_widgets/widgets/plots/heatmap/heatmap_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.plots.heatmap.heatmap import Heatmap
@@ -20,6 +21,8 @@ class HeatmapPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = Heatmap(parent)
         return t
 
@@ -27,7 +30,7 @@ class HeatmapPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Plot Widgets"
+        return "BEC Plots"
 
     def icon(self):
         return designer_material_icon(Heatmap.ICON_NAME)
diff --git a/bec_widgets/widgets/plots/image/image_plugin.py b/bec_widgets/widgets/plots/image/image_plugin.py
index e29e6fb2..47192e96 100644
--- a/bec_widgets/widgets/plots/image/image_plugin.py
+++ b/bec_widgets/widgets/plots/image/image_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.plots.image.image import Image
@@ -20,6 +21,8 @@ class ImagePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = Image(parent)
         return t
 
@@ -27,7 +30,7 @@ class ImagePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Plot Widgets"
+        return "BEC Plots"
 
     def icon(self):
         return designer_material_icon(Image.ICON_NAME)
diff --git a/bec_widgets/widgets/plots/motor_map/motor_map_plugin.py b/bec_widgets/widgets/plots/motor_map/motor_map_plugin.py
index d1cac238..237f7c39 100644
--- a/bec_widgets/widgets/plots/motor_map/motor_map_plugin.py
+++ b/bec_widgets/widgets/plots/motor_map/motor_map_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.plots.motor_map.motor_map import MotorMap
@@ -20,6 +21,8 @@ class MotorMapPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = MotorMap(parent)
         return t
 
@@ -27,7 +30,7 @@ class MotorMapPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Plot Widgets"
+        return "BEC Plots"
 
     def icon(self):
         return designer_material_icon(MotorMap.ICON_NAME)
diff --git a/bec_widgets/widgets/plots/multi_waveform/multi_waveform_plugin.py b/bec_widgets/widgets/plots/multi_waveform/multi_waveform_plugin.py
index dd0aba5b..2f8cdc19 100644
--- a/bec_widgets/widgets/plots/multi_waveform/multi_waveform_plugin.py
+++ b/bec_widgets/widgets/plots/multi_waveform/multi_waveform_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.plots.multi_waveform.multi_waveform import MultiWaveform
@@ -20,6 +21,8 @@ class MultiWaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = MultiWaveform(parent)
         return t
 
@@ -27,7 +30,7 @@ class MultiWaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Plot Widgets"
+        return "BEC Plots"
 
     def icon(self):
         return designer_material_icon(MultiWaveform.ICON_NAME)
diff --git a/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform_plugin.py b/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform_plugin.py
index 4a122634..7634c4e0 100644
--- a/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform_plugin.py
+++ b/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.plots.scatter_waveform.scatter_waveform import ScatterWaveform
@@ -20,6 +21,8 @@ class ScatterWaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = ScatterWaveform(parent)
         return t
 
@@ -27,7 +30,7 @@ class ScatterWaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Plot Widgets"
+        return "BEC Plots"
 
     def icon(self):
         return designer_material_icon(ScatterWaveform.ICON_NAME)
diff --git a/bec_widgets/widgets/plots/waveform/waveform_plugin.py b/bec_widgets/widgets/plots/waveform/waveform_plugin.py
index f9e2526e..37e5188f 100644
--- a/bec_widgets/widgets/plots/waveform/waveform_plugin.py
+++ b/bec_widgets/widgets/plots/waveform/waveform_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.plots.waveform.waveform import Waveform
@@ -20,6 +21,8 @@ class WaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = Waveform(parent)
         return t
 
@@ -27,7 +30,7 @@ class WaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Plot Widgets"
+        return "BEC Plots"
 
     def icon(self):
         return designer_material_icon(Waveform.ICON_NAME)
diff --git a/bec_widgets/widgets/progress/bec_progressbar/bec_progress_bar_plugin.py b/bec_widgets/widgets/progress/bec_progressbar/bec_progress_bar_plugin.py
index e548eed6..dd4c21f3 100644
--- a/bec_widgets/widgets/progress/bec_progressbar/bec_progress_bar_plugin.py
+++ b/bec_widgets/widgets/progress/bec_progressbar/bec_progress_bar_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.progress.bec_progressbar.bec_progressbar import BECProgressBar
@@ -20,6 +21,8 @@ class BECProgressBarPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = BECProgressBar(parent)
         return t
 
diff --git a/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_bar_plugin.py b/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_bar_plugin.py
index 2d01ea01..f329166b 100644
--- a/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_bar_plugin.py
+++ b/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_bar_plugin.py
@@ -1,10 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.progress.ring_progress_bar.ring_progress_bar import RingProgressBar
 
@@ -14,7 +13,6 @@ DOM_XML = """
     </widget>
 </ui>
 """
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
 
 class RingProgressBarPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -23,6 +21,8 @@ class RingProgressBarPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = RingProgressBar(parent)
         return t
 
@@ -51,7 +51,7 @@ class RingProgressBarPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "RingProgressBar"
 
     def toolTip(self):
-        return "RingProgressBar"
+        return ""
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/progress/scan_progressbar/scan_progress_bar_plugin.py b/bec_widgets/widgets/progress/scan_progressbar/scan_progress_bar_plugin.py
index 5c8bf71a..bd9323a7 100644
--- a/bec_widgets/widgets/progress/scan_progressbar/scan_progress_bar_plugin.py
+++ b/bec_widgets/widgets/progress/scan_progressbar/scan_progress_bar_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.progress.scan_progressbar.scan_progressbar import ScanProgressBar
@@ -20,6 +21,8 @@ class ScanProgressBarPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = ScanProgressBar(parent)
         return t
 
@@ -48,7 +51,7 @@ class ScanProgressBarPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "ScanProgressBar"
 
     def toolTip(self):
-        return "A progress bar that is hooked up to the scan progress of a scan."
+        return ""
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/progress/scan_progressbar/scan_progressbar.py b/bec_widgets/widgets/progress/scan_progressbar/scan_progressbar.py
index f0d3b167..401936e5 100644
--- a/bec_widgets/widgets/progress/scan_progressbar/scan_progressbar.py
+++ b/bec_widgets/widgets/progress/scan_progressbar/scan_progressbar.py
@@ -124,6 +124,7 @@ class ScanProgressBar(BECWidget, QWidget):
     """
 
     ICON_NAME = "timelapse"
+    PLUGIN = True
     progress_started = Signal()
     progress_finished = Signal()
 
diff --git a/bec_widgets/widgets/services/bec_queue/bec_queue_plugin.py b/bec_widgets/widgets/services/bec_queue/bec_queue_plugin.py
index d88e2843..201cda4f 100644
--- a/bec_widgets/widgets/services/bec_queue/bec_queue_plugin.py
+++ b/bec_widgets/widgets/services/bec_queue/bec_queue_plugin.py
@@ -1,10 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.services.bec_queue.bec_queue import BECQueue
 
@@ -15,8 +14,6 @@ DOM_XML = """
 </ui>
 """
 
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-
 
 class BECQueuePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -24,6 +21,8 @@ class BECQueuePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = BECQueue(parent)
         return t
 
diff --git a/bec_widgets/widgets/services/bec_status_box/bec_status_box_plugin.py b/bec_widgets/widgets/services/bec_status_box/bec_status_box_plugin.py
index 711d718b..82e59a1b 100644
--- a/bec_widgets/widgets/services/bec_status_box/bec_status_box_plugin.py
+++ b/bec_widgets/widgets/services/bec_status_box/bec_status_box_plugin.py
@@ -1,10 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.services.bec_status_box.bec_status_box import BECStatusBox
 
@@ -15,8 +14,6 @@ DOM_XML = """
 </ui>
 """
 
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-
 
 class BECStatusBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -24,6 +21,8 @@ class BECStatusBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = BECStatusBox(parent)
         return t
 
diff --git a/bec_widgets/widgets/services/device_browser/device_browser_plugin.py b/bec_widgets/widgets/services/device_browser/device_browser_plugin.py
index a7b73e9d..43ef14e9 100644
--- a/bec_widgets/widgets/services/device_browser/device_browser_plugin.py
+++ b/bec_widgets/widgets/services/device_browser/device_browser_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.services.device_browser.device_browser import DeviceBrowser
@@ -20,6 +21,8 @@ class DeviceBrowserPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = DeviceBrowser(parent)
         return t
 
diff --git a/bec_widgets/widgets/utility/logpanel/log_panel_plugin.py b/bec_widgets/widgets/utility/logpanel/log_panel_plugin.py
index 9ee99a3c..83ec7c1e 100644
--- a/bec_widgets/widgets/utility/logpanel/log_panel_plugin.py
+++ b/bec_widgets/widgets/utility/logpanel/log_panel_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.logpanel.logpanel import LogPanel
@@ -20,6 +21,8 @@ class LogPanelPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = LogPanel(parent)
         return t
 
@@ -27,7 +30,7 @@ class LogPanelPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Utils"
+        return "BEC Services"
 
     def icon(self):
         return designer_material_icon(LogPanel.ICON_NAME)
diff --git a/bec_widgets/widgets/utility/signal_label/signal_label_plugin.py b/bec_widgets/widgets/utility/signal_label/signal_label_plugin.py
index 4d3dd2fc..e3dc34a1 100644
--- a/bec_widgets/widgets/utility/signal_label/signal_label_plugin.py
+++ b/bec_widgets/widgets/utility/signal_label/signal_label_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.signal_label.signal_label import SignalLabel
@@ -20,6 +21,8 @@ class SignalLabelPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = SignalLabel(parent)
         return t
 
diff --git a/bec_widgets/widgets/utility/spinbox/bec_spin_box_plugin.py b/bec_widgets/widgets/utility/spinbox/bec_spin_box_plugin.py
index 0276ec5d..88f2bf32 100644
--- a/bec_widgets/widgets/utility/spinbox/bec_spin_box_plugin.py
+++ b/bec_widgets/widgets/utility/spinbox/bec_spin_box_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.spinbox.decimal_spinbox import BECSpinBox
@@ -20,6 +21,8 @@ class BECSpinBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = BECSpinBox(parent)
         return t
 
@@ -27,7 +30,7 @@ class BECSpinBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return ""
+        return "BEC Utils"
 
     def icon(self):
         return designer_material_icon(BECSpinBox.ICON_NAME)
diff --git a/bec_widgets/widgets/utility/spinner/spinner_widget_plugin.py b/bec_widgets/widgets/utility/spinner/spinner_widget_plugin.py
index a9ba84d2..4d4338d8 100644
--- a/bec_widgets/widgets/utility/spinner/spinner_widget_plugin.py
+++ b/bec_widgets/widgets/utility/spinner/spinner_widget_plugin.py
@@ -1,10 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.spinner.spinner import SpinnerWidget
 
@@ -15,8 +14,6 @@ DOM_XML = """
 </ui>
 """
 
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-
 
 class SpinnerWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -24,6 +21,8 @@ class SpinnerWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = SpinnerWidget(parent)
         return t
 
diff --git a/bec_widgets/widgets/utility/toggle/toggle_switch_plugin.py b/bec_widgets/widgets/utility/toggle/toggle_switch_plugin.py
index efe33a7d..b1298fa0 100644
--- a/bec_widgets/widgets/utility/toggle/toggle_switch_plugin.py
+++ b/bec_widgets/widgets/utility/toggle/toggle_switch_plugin.py
@@ -1,10 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.toggle.toggle import ToggleSwitch
 
@@ -15,8 +14,6 @@ DOM_XML = """
 </ui>
 """
 
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-
 
 class ToggleSwitchPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -24,6 +21,8 @@ class ToggleSwitchPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = ToggleSwitch(parent)
         return t
 
@@ -52,7 +51,7 @@ class ToggleSwitchPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "ToggleSwitch"
 
     def toolTip(self):
-        return "ToggleSwitch"
+        return ""
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/utility/visual/color_button/color_button.py b/bec_widgets/widgets/utility/visual/color_button/color_button.py
index 48035d6a..8f0e8b58 100644
--- a/bec_widgets/widgets/utility/visual/color_button/color_button.py
+++ b/bec_widgets/widgets/utility/visual/color_button/color_button.py
@@ -20,8 +20,8 @@ class ColorButton(QWidget):
     PLUGIN = True
     ICON_NAME = "colors"
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, parent=None, *args, **kwargs):
+        super().__init__(parent=parent, *args, **kwargs)
 
         self.layout = QHBoxLayout(self)
         self.layout.setSpacing(0)
diff --git a/bec_widgets/widgets/utility/visual/color_button/color_button_plugin.py b/bec_widgets/widgets/utility/visual/color_button/color_button_plugin.py
index 6e619b46..80398c9c 100644
--- a/bec_widgets/widgets/utility/visual/color_button/color_button_plugin.py
+++ b/bec_widgets/widgets/utility/visual/color_button/color_button_plugin.py
@@ -1,8 +1,9 @@
-import os
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.visual.color_button.color_button import ColorButton
 
@@ -12,7 +13,6 @@ DOM_XML = """
     </widget>
 </ui>
 """
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
 
 class ColorButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -21,6 +21,8 @@ class ColorButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = ColorButton(parent)
         return t
 
@@ -28,7 +30,7 @@ class ColorButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Buttons"
+        return "BEC Visual Utils"
 
     def icon(self):
         return designer_material_icon(ColorButton.ICON_NAME)
@@ -49,7 +51,7 @@ class ColorButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "ColorButton"
 
     def toolTip(self):
-        return "ColorButton which opens a color dialog."
+        return ""
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/utility/visual/color_button_native/color_button_native_plugin.py b/bec_widgets/widgets/utility/visual/color_button_native/color_button_native_plugin.py
index d6290bd3..9e36ecf5 100644
--- a/bec_widgets/widgets/utility/visual/color_button_native/color_button_native_plugin.py
+++ b/bec_widgets/widgets/utility/visual/color_button_native/color_button_native_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.visual.color_button_native.color_button_native import (
@@ -22,6 +23,8 @@ class ColorButtonNativePlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = ColorButtonNative(parent)
         return t
 
@@ -29,7 +32,7 @@ class ColorButtonNativePlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         return DOM_XML
 
     def group(self):
-        return "BEC Buttons"
+        return "BEC Visual Utils"
 
     def icon(self):
         return designer_material_icon(ColorButtonNative.ICON_NAME)
diff --git a/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector_plugin.py b/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector_plugin.py
index 9cf959a4..c031ced7 100644
--- a/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector_plugin.py
+++ b/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector_plugin.py
@@ -1,10 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.visual.colormap_selector.colormap_selector import ColormapSelector
 
@@ -15,8 +14,6 @@ DOM_XML = """
 </ui>
 """
 
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-
 
 class ColormapSelectorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -24,6 +21,8 @@ class ColormapSelectorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cove
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = ColormapSelector(parent)
         return t
 
@@ -31,7 +30,7 @@ class ColormapSelectorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cove
         return DOM_XML
 
     def group(self):
-        return "BEC Buttons"
+        return "BEC Visual Utils"
 
     def icon(self):
         return designer_material_icon(ColormapSelector.ICON_NAME)
diff --git a/bec_widgets/widgets/utility/visual/colormap_widget/bec_color_map_widget_plugin.py b/bec_widgets/widgets/utility/visual/colormap_widget/bec_color_map_widget_plugin.py
index 892dfa63..872a39be 100644
--- a/bec_widgets/widgets/utility/visual/colormap_widget/bec_color_map_widget_plugin.py
+++ b/bec_widgets/widgets/utility/visual/colormap_widget/bec_color_map_widget_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.visual.colormap_widget.colormap_widget import BECColorMapWidget
@@ -20,6 +21,8 @@ class BECColorMapWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = BECColorMapWidget(parent)
         return t
 
@@ -27,7 +30,7 @@ class BECColorMapWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         return DOM_XML
 
     def group(self):
-        return "BEC Buttons"
+        return "BEC Visual Utils"
 
     def icon(self):
         return designer_material_icon(BECColorMapWidget.ICON_NAME)
diff --git a/bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py b/bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py
index d0f71591..5317843c 100644
--- a/bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py
+++ b/bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py
@@ -24,7 +24,7 @@ class RoundedColorMapButton(ColorMapButton):
         painter.end()
 
 
-class BECColorMapWidget(BECWidget, QWidget):
+class BECColorMapWidget(QWidget):
     colormap_changed_signal = Signal(str)
     ICON_NAME = "palette"
     PLUGIN = True
diff --git a/bec_widgets/widgets/utility/visual/dark_mode_button/dark_mode_button_plugin.py b/bec_widgets/widgets/utility/visual/dark_mode_button/dark_mode_button_plugin.py
index 107a57c9..bf354824 100644
--- a/bec_widgets/widgets/utility/visual/dark_mode_button/dark_mode_button_plugin.py
+++ b/bec_widgets/widgets/utility/visual/dark_mode_button/dark_mode_button_plugin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton
@@ -20,6 +21,8 @@ class DarkModeButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
         t = DarkModeButton(parent)
         return t
 
@@ -27,7 +30,7 @@ class DarkModeButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Buttons"
+        return "BEC Visual Utils"
 
     def icon(self):
         return designer_material_icon(DarkModeButton.ICON_NAME)
@@ -48,7 +51,7 @@ class DarkModeButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "DarkModeButton"
 
     def toolTip(self):
-        return "Button to toggle between dark and light mode."
+        return "DarkModeButton"
 
     def whatsThis(self):
         return self.toolTip()
diff --git a/bec_widgets/widgets/utility/widget_finder/register_widget_finder_combo_box.py b/bec_widgets/widgets/utility/widget_finder/register_widget_finder_combo_box.py
new file mode 100644
index 00000000..ba53fc09
--- /dev/null
+++ b/bec_widgets/widgets/utility/widget_finder/register_widget_finder_combo_box.py
@@ -0,0 +1,17 @@
+def main():  # pragma: no cover
+    from qtpy import PYSIDE6
+
+    if not PYSIDE6:
+        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
+        return
+    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
+
+    from bec_widgets.widgets.utility.widget_finder.widget_finder_combo_box_plugin import (
+        WidgetFinderComboBoxPlugin,
+    )
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(WidgetFinderComboBoxPlugin())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()
diff --git a/bec_widgets/widgets/utility/widget_finder/widget_finder.py b/bec_widgets/widgets/utility/widget_finder/widget_finder.py
index 20e2839f..fb211990 100644
--- a/bec_widgets/widgets/utility/widget_finder/widget_finder.py
+++ b/bec_widgets/widgets/utility/widget_finder/widget_finder.py
@@ -23,6 +23,8 @@ from bec_widgets.widgets.plots.waveform.waveform import Waveform
 
 
 class WidgetFinderComboBox(QComboBox):
+    ICON_NAME = "frame_inspect"
+    PLUGIN = True
 
     def __init__(self, parent=None, widget_class: type[QWidget] | str | None = None):
         super().__init__(parent)
diff --git a/bec_widgets/widgets/utility/widget_finder/widget_finder_combo_box.pyproject b/bec_widgets/widgets/utility/widget_finder/widget_finder_combo_box.pyproject
new file mode 100644
index 00000000..5f55bae1
--- /dev/null
+++ b/bec_widgets/widgets/utility/widget_finder/widget_finder_combo_box.pyproject
@@ -0,0 +1 @@
+{'files': ['widget_finder.py']}
\ No newline at end of file
diff --git a/bec_widgets/widgets/utility/widget_finder/widget_finder_combo_box_plugin.py b/bec_widgets/widgets/utility/widget_finder/widget_finder_combo_box_plugin.py
new file mode 100644
index 00000000..57c75bc6
--- /dev/null
+++ b/bec_widgets/widgets/utility/widget_finder/widget_finder_combo_box_plugin.py
@@ -0,0 +1,57 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtWidgets import QWidget
+
+from bec_widgets.utils.bec_designer import designer_material_icon
+from bec_widgets.widgets.utility.widget_finder.widget_finder import WidgetFinderComboBox
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='WidgetFinderComboBox' name='widget_finder_combo_box'>
+    </widget>
+</ui>
+"""
+
+
+class WidgetFinderComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        if parent is None:
+            return QWidget()
+        t = WidgetFinderComboBox(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return "BEC Utils"
+
+    def icon(self):
+        return designer_material_icon(WidgetFinderComboBox.ICON_NAME)
+
+    def includeFile(self):
+        return "widget_finder_combo_box"
+
+    def initialize(self, form_editor):
+        self._form_editor = form_editor
+
+    def isContainer(self):
+        return False
+
+    def isInitialized(self):
+        return self._form_editor is not None
+
+    def name(self):
+        return "WidgetFinderComboBox"
+
+    def toolTip(self):
+        return "WidgetFinderComboBox"
+
+    def whatsThis(self):
+        return self.toolTip()