feat(signal_proxy): added signal proxy for designer

2026-04-15 13:10:54 +02:00 · 2024-09-05 16:38:54 +02:00
381 changed files with 3014 additions and 14733 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,9 +12,6 @@ variables:
    description: ophyd_devices branch
    value: main
  CHILD_PIPELINE_BRANCH: $CI_DEFAULT_BRANCH
-  CHECK_PKG_VERSIONS:
-    description: Whether to run additional tests against min/max/random selection of dependencies. Set to 1 for running. 
-    value: 0

 workflow:
  rules:
@@ -34,9 +31,8 @@ include:
    inputs:
      stage: test
      path: "."
-      pytest_args: "-v,--random-order,tests/unit_tests"
-      ignore_dep_group: "pyqt6"
-      pip_args: ".[dev,pyside6]"
+      pytest_args: "-v --random-order tests/"
+      exclude_packages: ""

 # different stages in the pipeline
 stages:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,214 +1,157 @@
 # CHANGELOG

+## v0.103.0 (2024-09-04)

-## v1.7.0 (2024-12-02)
+### Ci

-### Bug Fixes
+* ci: prefill variables for manual pipeline start ([`158c19e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/158c19eda771562a325fd59405f9fd4cb9a17ed6))

- **tests**: Add test for Console widget
-  ([`da579b6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/da579b6d213bcdf28c40c1a9e4e2535fdde824fb))
+### Feature

-### Features
+* feat(vscode): open vscode on a free port ([`52da835`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/52da835803f2453096a8b7df23bee5fdf93ae2bb))

- **console**: Add "prompt" signal to inform when shell is at prompt
-  ([`3aeb0b6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3aeb0b66fbeb03d3d0ee60e108cc6b98fd9aa9b9))
+* feat(website): added method to wait until the webpage is loaded ([`9be19d4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9be19d4abebad08c5fc6bea936dd97475fe8f628))

- **console**: Add 'terminate' and 'send_ctrl_c' methods to Console
-  ([`02086ae`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/02086aeae09233ec4e6ccc0e6a17f2b078d500b8))
+### Fix

-.terminate() ends the started process, sending SIGTERM signal. If process is not dead after optional
-  timeout, SIGKILL is sent. .send_ctrl_c() sends SIGINT to the child process, and waits for prompt
-  until optional timeout is reached. Timeouts raise 'TimeoutError' exception.
+* fix(theme): fixed segfault for webengineview for auto updates ([`9866075`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9866075100577948755b563dc7b7dc4cdc60d040))

+### Test

-## v1.6.0 (2024-11-27)
+* test(webview): fixed tests after refactoring ([`d5eb30c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d5eb30cd7df4cb0dc3275dd362768afc211eaf2d))

-### Bug Fixes
+* test(vscode): popen call does not have to be the only one ([`39f98ec`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/39f98ec223ba8b59e478ac788c08c59ffe886b4e))

- Add back accidentally removed variables
-  ([`e998352`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e9983521ed2a1c04af048a55ece70a1943a84313))
-
- Differentiate click and drag for DeviceItem, adapt tests accordingly
-  ([`cffcdf2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cffcdf292363249bcc7efa9d130431d0bc727fda))
-
-This fixes the blocking "QDrag.exec_()" on Linux, indeed before the drag'n'drop operation was
-  started with a simple click and it was waiting for drop forever. Now there are 2 different cases,
-  click or drag'n'drop - the drag'n'drop test actually moves the mouse and releases the button.
-
- Do not quit automatically when last window is "closed"
-  ([`96e255e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/96e255e4ef394eb79006a66d13e06775ae235667))
-
-Qt confuses closed and hidden
-
- No need to call inspect.signature - it can fail on methods coming from C (like Qt methods)
-  ([`6029246`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/60292465e9e52d3248ae681c68c07298b9b3ce14))
-
- **rpc**: Gui hide/show also hide/show all floating docks
-  ([`c27d058`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c27d058b01fe604eccec76454e39360122e48515))
-
- **server**: Use dock area by default
-  ([`2fe7f5e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2fe7f5e1510a5ea72676045e6ea3485e6b11c220))
-
- **tests**: Make use of BECDockArea with client mixin to start server and use it in tests
-  ([`da18c2c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/da18c2ceecf9aeaf0e0ea9b78f4c867b27b9c314))
-
-Depending on the test, auto-updates are enabled or not.
-
-### Features
-
- '._auto_updates_enabled' attribute can be used to activate auto updates installation in
-  BECDockArea
-  ([`31d8703`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/31d87036c9801e639a7ca6fc003c90e0c4edb19d))
-
- Add '--hide' argument to BEC GUI server
-  ([`1f60fec`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1f60fec7201ed252d7e49bf16f2166ee7f6bed6a))
-
- Add main window container widget
-  ([`f80ec33`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f80ec33ae5a261dbcab901ae30f4cc802316e554))
-
- Add rpc_id member to client objects
-  ([`3ba0b1d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3ba0b1daf5b83da840e90fbbc063ed7b86ebe99b))
-
- Asynchronous .start() for GUI
-  ([`2047e48`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2047e484d5a4b2f5ea494a1e49035b35b1bbde35))
-
- Do not take focus when GUI is loaded
-  ([`1f71d8e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1f71d8e5eded9952f9b34bfc427e2ff44cf5fc18))
-
- **client**: Add show()/hide() methods to "gui" object
-  ([`e68e2b5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e68e2b5978339475b97555c3e20795807932fbc9))
-
- **server**: Add main window, with proper gui_id derived from given id
-  ([`daf6ea0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/daf6ea0159c9ffc7b53bb7ae6b9abc16a302972c))
-
-
-## v1.5.3 (2024-11-21)
-
-### Bug Fixes
-
- **alignment_1d**: Fix imports after widget module refactor
-  ([`e71e3b2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e71e3b2956feb3f3051e538432133f6e85bbd5a8))
-
-### Continuous Integration
-
- Fix ci syntax for package-dep-job
-  ([`6e39bdb`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6e39bdbf53b147c8ff163527b45691835ce9a2eb))
-
-
-## v1.5.2 (2024-11-18)
-
-### Bug Fixes
-
- Support for bec v3
-  ([`746359b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/746359b2cc07a317473907adfcabbe5fe5d1b64c))
-
-
-## v1.5.1 (2024-11-14)
-
-### Bug Fixes
-
- **plugin_utils**: Plugin utils are able to detect classes for plugin creation based on class
-  attribute rather than if it is top level widget
-  ([`7a1b874`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7a1b8748a433f854671ac95f2eaf4604e6b8df20))
-
-### Refactoring
-
- **widgets**: Widget module structure reorganised
-  ([`aab0229`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/aab0229a4067ad626de919e38a5c8a2e9e7b03c2))
-
-
-## v1.5.0 (2024-11-12)
-
-### Bug Fixes
-
- **crosshair**: Crosshair adapted for multi waveform widget
-  ([`0cd85ed`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0cd85ed9fa5b67a6ecce89985cd4f54b7bbe3a4b))
+## v0.102.0 (2024-09-04)

 ### Documentation

- **multi_waveform**: Docs added
-  ([`42d4f18`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/42d4f182f790a97687ca3b6d0e72866070a89767))
+* docs(buttons): buttons section of docs split to appearance and queue buttons ([`047aa26`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/047aa26a60220c826cc1375cf81daf11d1f3ab5c))

-### Features
+* docs(tests): added tests tutorial for widget ([`18d8561`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/18d8561c965d149a7662085f7dbe2a39a8c4a475))

- **multi-waveform**: New widget added
-  ([`f3a39a6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f3a39a69e29d490b3023a508ced18028c4205772))
+### Feature

+* feat(queue): BECQueue controls extended with Resume, Stop, Abort, Reset buttons ([`0d7c10e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0d7c10e670e4937787e1afaa19ca8259ac752486))

-## v1.4.1 (2024-11-12)
+### Fix

-### Bug Fixes
+* fix(queue_reset_button): queue reset has to be confirmed with msgBox ([`9dd43aa`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9dd43aa1fd3991368002605df4389a7a7271011b))

- **positioner_box**: Adjusted default signals
-  ([`8e5c0ad`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8e5c0ad8c8eff5a9308169bc663d2b7230f0ebb1))
+### Refactor

+* refactor(tests): positioner box test changed to use create_widget fixture ([`df5eff3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/df5eff3147c79ff0278e6a5a09c8f73d5236aed3))

-## v1.4.0 (2024-11-11)
+## v0.101.0 (2024-09-02)

-### Bug Fixes
+### Feature

- **crosshair**: Label of coordinates of TextItem displays numbers in general format
-  ([`11e5937`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/11e5937ae0f3c1413acd4e66878a692ebe4ef7d0))
+* feat: add Dap dialog widget ([`9781b77`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9781b77de27b2810fbb1047a61b1832dd186db01))

- **crosshair**: Label of coordinates of TextItem is updated according to the current theme of qapp
-  ([`4f31ea6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4f31ea655cf6190e141e6a2720a2d6da517a2b5b))
+### Refactor

- **crosshair**: Log is separately scaled for backend logic and for signal emit
-  ([`b2eb71a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b2eb71aae0b6a7c82158f2d150ae1e31411cfdeb))
+* refactor: add docs, cleanup ([`61ecf49`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/61ecf491e52bfbfa0d5a84764a9095310659043d))

-### Features
-
- **crosshair**: Textitem to display crosshair coordinates
-  ([`035136d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/035136d5171ec5f4311d15a9aa5bad2bdbc1f6cb))
-
-### Testing
-
- **crosshair**: Tests extended
-  ([`64df805`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/64df805a9ed92bb97e580ac3bc0a1bbd2b1cb81e))
-
-
-## v1.3.3 (2024-11-07)
-
-### Bug Fixes
-
- **scan_control**: Devicelineedit kwargs readings changed to get name of the positioner
-  ([`5fabd4b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5fabd4bea95bafd2352102686357cc1db80813fd))
+## v0.100.0 (2024-09-01)

 ### Documentation

- Update outdated text in docs
-  ([`4f0693c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4f0693cae34b391d75884837e1ae6353a0501868))
+* docs(becwidget): improvements to the bec widget base class docs; fixed type hint import for sphinx ([`99d5e8e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/99d5e8e71c7f89a53d7967126f4056dde005534c))

+### Feature

-## v1.3.2 (2024-11-05)
+* feat(theme): added theme handler to bec widget base class; added tests ([`7fb938a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7fb938a8506685278ee5eeb6fe9a03f74b713cf8))

-### Bug Fixes
+### Fix

- **plot_base**: Legend text color is changed when changing dark-light theme
-  ([`2304c9f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2304c9f8497c1ab1492f3e6690bb79b0464c0df8))
+* fix(pyqt slot): removed slot decorator to avoid problems with pyqt6 ([`6c1f89a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6c1f89ad39b7240ab1d1c1123422b99ae195bf01))

-### Build System
+## v0.99.15 (2024-08-31)

- Pyside6 version fixed 6.7.2
-  ([`c6e48ec`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c6e48ec1fe5aaee6a7c7a6f930f1520cd439cdb2))
+### Fix

+* fix(theme): update pg axes on theme update ([`af23e74`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/af23e74f71152f4abc319ab7b45e65deefde3519))

-## v1.3.1 (2024-10-31)
+* fix(positioner_box): fixed positioner box dialog; added test; closes #332 ([`0bf1cf9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0bf1cf9b8ab2f9171d5ff63d4e3672eb93e9a5fa))

-### Bug Fixes
+## v0.99.14 (2024-08-30)

- **ophyd_kind_util**: Kind enums are imported from the bec widget util class
-  ([`940ee65`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/940ee6552c1ee8d9b4e4a74c62351f2e133ab678))
+### Fix

+* fix(color_button): signal and slot added for selecting color and for emitting color after change ([`99a98de`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/99a98de8a3b7a83d71e4b567e865ac6f5c62a754))

-## v1.3.0 (2024-10-30)
+* fix(color_button): inheritance changed to QWidget ([`3c0e501`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3c0e501c56227d4d98ff0ac2186ff5065bff8d7a))

-### Bug Fixes
+## v0.99.13 (2024-08-30)

- **colors**: Extend color map validation for matplotlib and colorcet maps (if available)
-  ([`14dd8c5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/14dd8c5b2947c92f6643b888d71975e4e8d4ee88))
+### Documentation

-### Features
+* docs: minor updates to the widget tutorial ([`ec9c8f2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ec9c8f29633364c45ebd998a5411d428c1ce488d))

- **colormap_button**: Colormap button with menu to select colormap filtered by the colormap type
-  ([`b039933`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b039933405e2fbe92bd81bd0748e79e8d443a741))
+* docs(widget tutorial): step by step guide added ([`b32ced8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b32ced85fff628a9e1303a781630cdae3865238e))
+
+### Fix
+
+* fix(dark mode button): fixed dark mode button state for external updates, including auto ([`a3110d9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a3110d98147295dcb1f9353f9aaf5461cba9232a))
+
+## v0.99.12 (2024-08-29)
+
+### Fix
+
+* fix(toolbar): widget action added ([`2efd487`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2efd48736cbe04e84533f7933c552ea8274e2162))
+
+* fix(reset_button): reset button added ([`6ed1efc`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6ed1efc6af193908f70aa37fb73157d2ca6a62f4))
+
+* fix(abort_button): abort button added; some minor fixes ([`a568633`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a568633c3206a8c26069d140f2d9a548bf4124b0))
+
+## v0.99.11 (2024-08-29)
+
+### Fix
+
+* fix(resume_button): resume button added ([`8be8295`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8be8295b2b38f36da210ab36c5da6d0a00e330cc))
+
+### Refactor
+
+* refactor(icons): general app icon changed; jupyter app icon changed to material icon ([`5d73fe4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5d73fe455a568ad40a9fadc5ce6e249d782ad20d))
+
+* refactor: add option to select scan and hide arg bundle buttons ([`7dadab1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7dadab1f14aa41876ad39e8cdc7f7732248cc643))
+
+## v0.99.10 (2024-08-29)
+
+### Fix
+
+* fix(stop_button): queue logic scan changed to halt instead of abort and reset ([`4a89028`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4a890281f7eaef02d0ec9f4c5bf080be11fe0fe3))
+
+### Refactor
+
+* refactor(stop_button): stop button changed to QWidget and adapted for toolbar ([`097946f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/097946fd688b8faf770e7cc0e689ea668206bc7a))
+
+* refactor: added hide option for device selection button ([`cdd1752`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cdd175207e922904b2efbb2d9ecf7c556c617f2e))
+
+## v0.99.9 (2024-08-28)
+
+### Fix
+
+* fix: fixed build process and excluded docs and tests from tarballs and wheels ([`719254c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/719254cf0a48e1fc4bd541edba239570778bcfea))
+
+## v0.99.8 (2024-08-28)
+
+### Fix
+
+* fix(website): fixed designer integration for website widget ([`5f37e86`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5f37e862c95ac7173b6918ad39bcaef938dad698))
+
+### Refactor
+
+* refactor(website): changed inheritance of website widget to simple qwidget; closes #325 ([`9925bbd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9925bbdb48b55eacbbce9fd6a1555a21b84221f9))
+
+## v0.99.7 (2024-08-28)
+
+### Fix
+
+* fix(toolbar): material icons can accept color as kwarg ([`ffc871e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ffc871ebbd3b68abc3e151bb8f5849e6c50e775e))
+
+## v0.99.6 (2024-08-28)
+
+### Fix
+
+* fix(toolbar): use of native qt separators ([`09c6c93`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/09c6c93c397ce4a21c293f6c79106c74b2db65ca))
--- a/bec_widgets/applications/alignment/alignment_1d/alignment_1d.py
+++ b/bec_widgets/applications/alignment/alignment_1d/alignment_1d.py
@@ -1,198 +0,0 @@
-""" This module contains the GUI for the 1D alignment application.
-It is a preliminary version of the GUI, which will be added to the main branch and steadily updated to be improved.
-"""
-
-import os
-from typing import Optional
-
-from bec_lib.device import Signal as BECSignal
-from bec_lib.endpoints import MessageEndpoints
-from bec_lib.logger import bec_logger
-from qtpy.QtCore import QSize
-from qtpy.QtGui import QIcon
-from qtpy.QtWidgets import QApplication
-
-import bec_widgets
-from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
-from bec_widgets.utils import UILoader
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
-from bec_widgets.utils.colors import get_accent_colors
-from bec_widgets.widgets.control.buttons.stop_button.stop_button import StopButton
-from bec_widgets.widgets.control.device_control.positioner_group.positioner_group import (
-    PositionerGroup,
-)
-from bec_widgets.widgets.dap.lmfit_dialog.lmfit_dialog import LMFitDialog
-from bec_widgets.widgets.plots.waveform.waveform_widget import BECWaveformWidget
-from bec_widgets.widgets.progress.bec_progressbar.bec_progressbar import BECProgressBar
-
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-logger = bec_logger.logger
-
-
-class Alignment1D:
-    """Alignment GUI to perform 1D scans"""
-
-    def __init__(self, client=None, gui_id: Optional[str] = None) -> None:
-        """Initialization
-
-        Args:
-            config: Configuration of the application.
-            client: BEC client object.
-            gui_id: GUI ID.
-        """
-        self.bec_dispatcher = BECDispatcher(client=client)
-        self.client = self.bec_dispatcher.client if client is None else client
-        QApplication.instance().aboutToQuit.connect(self.close)
-        self.dev = self.client.device_manager.devices
-
-        self._accent_colors = get_accent_colors()
-        self.ui_file = "alignment_1d.ui"
-        self.ui = None
-        self.progress_bar = None
-        self.waveform = None
-        self.init_ui()
-
-    def init_ui(self):
-        """Initialise the UI from QT Designer file"""
-        current_path = os.path.dirname(__file__)
-        self.ui = UILoader(None).loader(os.path.join(current_path, self.ui_file))
-        # Customize the plotting widget
-        self.waveform = self.ui.findChild(BECWaveformWidget, "bec_waveform_widget")
-        self._customise_bec_waveform_widget()
-        # Setup comboboxes for motor and signal selection
-        # FIXME after changing the filtering in the combobox
-        self._setup_signal_combobox()
-        # Setup motor indicator
-        self._setup_motor_indicator()
-        # Setup progress bar
-        self._setup_progress_bar()
-        # Add actions buttons
-        self._customise_buttons()
-        # Hook scaninfo updates
-        self.bec_dispatcher.connect_slot(self.scan_status_callback, MessageEndpoints.scan_status())
-
-    def show(self):
-        return self.ui.show()
-
-    ##############################
-    ############ SLOTS ###########
-    ##############################
-
-    @Slot(dict, dict)
-    def scan_status_callback(self, content: dict, _) -> None:
-        """This slot allows to enable/disable the UI critical components when a scan is running"""
-        if content["status"] in ["open"]:
-            self.enable_ui(False)
-        elif content["status"] in ["aborted", "halted", "closed"]:
-            self.enable_ui(True)
-
-    @Slot(tuple)
-    def move_to_center(self, move_request: tuple) -> None:
-        """Move the selected motor to the center"""
-        motor = self.ui.device_combobox.currentText()
-        if move_request[0] in ["center", "center1", "center2"]:
-            pos = move_request[1]
-        self.dev.get(motor).move(float(pos), relative=False)
-
-    @Slot()
-    def reset_progress_bar(self) -> None:
-        """Reset the progress bar"""
-        self.progress_bar.set_value(0)
-        self.progress_bar.set_minimum(0)
-
-    @Slot(dict, dict)
-    def update_progress_bar(self, content: dict, _) -> None:
-        """Hook to update the progress bar
-
-        Args:
-            content: Content of the scan progress message.
-            metadata: Metadata of the message.
-        """
-        if content["max_value"] == 0:
-            self.progress_bar.set_value(0)
-            return
-        self.progress_bar.set_maximum(content["max_value"])
-        self.progress_bar.set_value(content["value"])
-
-    @Slot()
-    def clear_queue(self) -> None:
-        """Clear the scan queue"""
-        self.queue.request_queue_reset()
-
-    ##############################
-    ######## END OF SLOTS ########
-    ##############################
-
-    def enable_ui(self, enable: bool) -> None:
-        """Enable or disable the UI components"""
-        # Enable/disable motor and signal selection
-        self.ui.device_combobox_2.setEnabled(enable)
-        # Enable/disable DAP selection
-        self.ui.dap_combo_box.setEnabled(enable)
-        # Enable/disable Scan Button
-        # self.ui.scan_button.setEnabled(enable)
-        # Disable move to buttons in LMFitDialog
-        self.ui.findChild(LMFitDialog).set_actions_enabled(enable)
-
-    def _customise_buttons(self) -> None:
-        """Add action buttons for the Action Control.
-        In addition, we are adding a callback to also clear the queue to the stop button
-        to ensure that upon clicking the button, no scans from another client may be queued
-        which would be confusing without the queue widget.
-        """
-        fit_dialog = self.ui.findChild(LMFitDialog)
-        fit_dialog.active_action_list = ["center", "center1", "center2"]
-        fit_dialog.move_action.connect(self.move_to_center)
-        stop_button = self.ui.findChild(StopButton)
-        stop_button.button.setText("Stop and Clear Queue")
-        stop_button.button.clicked.connect(self.clear_queue)
-
-    def _customise_bec_waveform_widget(self) -> None:
-        """Customise the BEC Waveform Widget, i.e. clear the toolbar"""
-        self.waveform.toolbar.clear()
-
-    def _setup_motor_indicator(self) -> None:
-        """Setup the arrow item"""
-        self.waveform.waveform.tick_item.add_to_plot()
-        positioner_box = self.ui.findChild(PositionerGroup)
-        positioner_box.position_update.connect(self.waveform.waveform.tick_item.set_position)
-        self.waveform.waveform.tick_item.set_position(0)
-
-    def _setup_signal_combobox(self) -> None:
-        """Setup signal selection"""
-        # FIXME after changing the filtering in the combobox
-        signals = [name for name in self.dev if isinstance(self.dev.get(name), BECSignal)]
-        self.ui.device_combobox_2.setCurrentText(signals[0])
-        self.ui.device_combobox_2.set_device_filter("Signal")
-
-    def _setup_progress_bar(self) -> None:
-        """Setup progress bar"""
-        # FIXME once the BECScanProgressBar is implemented
-        self.progress_bar = self.ui.findChild(BECProgressBar, "bec_progress_bar")
-        self.progress_bar.set_value(0)
-        self.ui.bec_waveform_widget.new_scan.connect(self.reset_progress_bar)
-        self.bec_dispatcher.connect_slot(self.update_progress_bar, MessageEndpoints.scan_progress())
-
-    def close(self):
-        logger.info("Disconnecting", repr(self.bec_dispatcher))
-        self.bec_dispatcher.disconnect_all()
-        logger.info("Shutting down BEC Client", repr(self.client))
-        self.client.shutdown()
-
-
-def main():
-    import sys
-
-    app = QApplication(sys.argv)
-    icon = QIcon()
-    icon.addFile(
-        os.path.join(MODULE_PATH, "assets", "app_icons", "alignment_1d.png"), size=QSize(48, 48)
-    )
-    app.setWindowIcon(icon)
-    window = Alignment1D()
-    window.show()
-    sys.exit(app.exec_())
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main()
--- a/bec_widgets/applications/alignment/alignment_1d/alignment_1d.ui
+++ b/bec_widgets/applications/alignment/alignment_1d/alignment_1d.ui
@@ -1,615 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>mainWindow</class>
- <widget class="QMainWindow" name="mainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1611</width>
-    <height>1019</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Alignment tool</string>
-  </property>
-  <widget class="QWidget" name="widget">
-   <layout class="QVBoxLayout" name="verticalLayout_2">
-    <item>
-     <widget class="QWidget" name="widget" native="true">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <layout class="QHBoxLayout" name="horizontalLayout_5">
-       <item>
-        <widget class="DarkModeButton" name="dark_mode_button"/>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_6">
-         <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="BECStatusBox" name="bec_status_box">
-         <property name="compact_view" stdset="0">
-          <bool>true</bool>
-         </property>
-         <property name="label" stdset="0">
-          <string>BEC Servers</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="BECQueue" name="bec_queue">
-         <property name="compact_view" stdset="0">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_5">
-         <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QRadioButton" name="radioButton">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="text">
-          <string>SLS Light On</string>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-         <property name="autoExclusive">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_7">
-         <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QRadioButton" name="radioButton_3">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="text">
-          <string>BEAMLINE Checks</string>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-         <property name="autoExclusive">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_4">
-         <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="StopButton" name="stop_button">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>200</width>
-           <height>40</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>200</width>
-           <height>40</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </item>
-    <item>
-     <widget class="BECProgressBar" name="bec_progress_bar">
-      <property name="minimumSize">
-       <size>
-        <width>0</width>
-        <height>25</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>16777215</width>
-        <height>25</height>
-       </size>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QTabWidget" name="tabWidget">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="currentIndex">
-       <number>0</number>
-      </property>
-      <widget class="QWidget" name="ControlTab">
-       <attribute name="title">
-        <string>Alignment Control</string>
-       </attribute>
-       <layout class="QHBoxLayout" name="horizontalLayout_6">
-        <item>
-         <widget class="QWidget" name="widget_4" native="true">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>1</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_3">
-           <item>
-            <widget class="ScanControl" name="scan_control">
-             <property name="current_scan" stdset="0">
-              <string>line_scan</string>
-             </property>
-             <property name="hide_arg_box" stdset="0">
-              <bool>false</bool>
-             </property>
-             <property name="hide_scan_selection_combobox" stdset="0">
-              <bool>true</bool>
-             </property>
-             <property name="hide_add_remove_buttons" stdset="0">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="PositionerGroup" name="positioner_group"/>
-           </item>
-           <item>
-            <spacer name="verticalSpacer">
-             <property name="orientation">
-              <enum>Qt::Orientation::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="widget_3" native="true">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>4</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout">
-           <item>
-            <widget class="QWidget" name="widget_2" native="true">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <layout class="QHBoxLayout" name="horizontalLayout_3">
-              <item>
-               <widget class="QLabel" name="label_2">
-                <property name="font">
-                 <font/>
-                </property>
-                <property name="text">
-                 <string>Monitor</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="DeviceComboBox" name="device_combobox_2"/>
-              </item>
-              <item>
-               <widget class="QLabel" name="label_3">
-                <property name="font">
-                 <font/>
-                </property>
-                <property name="text">
-                 <string>LMFit Model</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="DapComboBox" name="dap_combo_box"/>
-              </item>
-              <item>
-               <widget class="QLabel" name="label">
-                <property name="text">
-                 <string>Enable ROI</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="ToggleSwitch" name="toggle_switch">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-                  <horstretch>3</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="toolTip">
-                 <string>Activate linear region select for LMFit</string>
-                </property>
-                <property name="layoutDirection">
-                 <enum>Qt::LayoutDirection::LeftToRight</enum>
-                </property>
-                <property name="checked" stdset="0">
-                 <bool>false</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer_8">
-                <property name="orientation">
-                 <enum>Qt::Orientation::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="BECWaveformWidget" name="bec_waveform_widget">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-               <horstretch>0</horstretch>
-               <verstretch>1</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>600</width>
-               <height>450</height>
-              </size>
-             </property>
-             <property name="clear_curves_on_plot_update" stdset="0">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="LMFitDialog" name="lm_fit_dialog">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>190</height>
-              </size>
-             </property>
-             <property name="always_show_latest" stdset="0">
-              <bool>true</bool>
-             </property>
-             <property name="hide_curve_selection" stdset="0">
-              <bool>true</bool>
-             </property>
-             <property name="hide_summary" stdset="0">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="tab_2">
-       <attribute name="title">
-        <string>Logbook</string>
-       </attribute>
-       <layout class="QHBoxLayout" name="horizontalLayout_4">
-        <property name="leftMargin">
-         <number>2</number>
-        </property>
-        <property name="topMargin">
-         <number>2</number>
-        </property>
-        <property name="rightMargin">
-         <number>2</number>
-        </property>
-        <property name="bottomMargin">
-         <number>2</number>
-        </property>
-        <item>
-         <widget class="WebsiteWidget" name="website_widget">
-          <property name="url" stdset="0">
-           <string>https://scilog.psi.ch/login</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </widget>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>DapComboBox</class>
-   <extends>QWidget</extends>
-   <header>dap_combo_box</header>
-  </customwidget>
-  <customwidget>
-   <class>StopButton</class>
-   <extends>QWidget</extends>
-   <header>stop_button</header>
-  </customwidget>
-  <customwidget>
-   <class>WebsiteWidget</class>
-   <extends>QWidget</extends>
-   <header>website_widget</header>
-  </customwidget>
-  <customwidget>
-   <class>BECQueue</class>
-   <extends>QWidget</extends>
-   <header>bec_queue</header>
-  </customwidget>
-  <customwidget>
-   <class>ScanControl</class>
-   <extends>QWidget</extends>
-   <header>scan_control</header>
-  </customwidget>
-  <customwidget>
-   <class>ToggleSwitch</class>
-   <extends>QWidget</extends>
-   <header>toggle_switch</header>
-  </customwidget>
-  <customwidget>
-   <class>BECProgressBar</class>
-   <extends>QWidget</extends>
-   <header>bec_progress_bar</header>
-  </customwidget>
-  <customwidget>
-   <class>DarkModeButton</class>
-   <extends>QWidget</extends>
-   <header>dark_mode_button</header>
-  </customwidget>
-  <customwidget>
-   <class>PositionerGroup</class>
-   <extends>QWidget</extends>
-   <header>positioner_group</header>
-  </customwidget>
-  <customwidget>
-   <class>BECWaveformWidget</class>
-   <extends>QWidget</extends>
-   <header>bec_waveform_widget</header>
-  </customwidget>
-  <customwidget>
-   <class>DeviceComboBox</class>
-   <extends>QComboBox</extends>
-   <header>device_combobox</header>
-  </customwidget>
-  <customwidget>
-   <class>LMFitDialog</class>
-   <extends>QWidget</extends>
-   <header>lm_fit_dialog</header>
-  </customwidget>
-  <customwidget>
-   <class>BECStatusBox</class>
-   <extends>QWidget</extends>
-   <header>bec_status_box</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>toggle_switch</sender>
-   <signal>enabled(bool)</signal>
-   <receiver>bec_waveform_widget</receiver>
-   <slot>toogle_roi_select(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>1042</x>
-     <y>212</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>1416</x>
-     <y>322</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>bec_waveform_widget</sender>
-   <signal>dap_summary_update(QVariantMap,QVariantMap)</signal>
-   <receiver>lm_fit_dialog</receiver>
-   <slot>update_summary_tree(QVariantMap,QVariantMap)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>1099</x>
-     <y>258</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>1157</x>
-     <y>929</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>device_combobox_2</sender>
-   <signal>currentTextChanged(QString)</signal>
-   <receiver>bec_waveform_widget</receiver>
-   <slot>plot(QString)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>577</x>
-     <y>215</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>1416</x>
-     <y>427</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>device_combobox_2</sender>
-   <signal>currentTextChanged(QString)</signal>
-   <receiver>dap_combo_box</receiver>
-   <slot>select_y_axis(QString)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>577</x>
-     <y>215</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>909</x>
-     <y>215</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>dap_combo_box</sender>
-   <signal>new_dap_config(QString,QString,QString)</signal>
-   <receiver>bec_waveform_widget</receiver>
-   <slot>add_dap(QString,QString,QString)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>909</x>
-     <y>215</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>1416</x>
-     <y>447</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>scan_control</sender>
-   <signal>device_selected(QString)</signal>
-   <receiver>positioner_group</receiver>
-   <slot>set_positioners(QString)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>230</x>
-     <y>306</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>187</x>
-     <y>926</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>scan_control</sender>
-   <signal>device_selected(QString)</signal>
-   <receiver>bec_waveform_widget</receiver>
-   <slot>set_x(QString)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>187</x>
-     <y>356</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>972</x>
-     <y>509</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>scan_control</sender>
-   <signal>device_selected(QString)</signal>
-   <receiver>dap_combo_box</receiver>
-   <slot>select_x_axis(QString)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>187</x>
-     <y>356</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>794</x>
-     <y>202</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
--- a/bec_widgets/applications/bec_app.py
+++ b/bec_widgets/applications/bec_app.py
@@ -1,84 +0,0 @@
-"""
-Launcher for BEC GUI Applications
-
-Application must be located in bec_widgets/applications ;
-in order for the launcher to find the application, it has to be put in
-a subdirectory with the same name as the main Python module:
-
-/bec_widgets/applications
-    ├── alignment
-    │   └── alignment_1d
-    │       └── alignment_1d.py
-    ├── other_app
-        └── other_app.py
-
-The tree above would contain 2 applications, alignment_1d and other_app.
-
-The Python module for the application must have `if __name__ == "__main__":`
-in order for the launcher to execute it (it is run with `python -m`).
-"""
-
-import argparse
-import os
-import sys
-
-MODULE_PATH = os.path.dirname(__file__)
-
-
-def find_apps(base_dir: str) -> list[str]:
-    matching_modules = []
-
-    for root, dirs, files in os.walk(base_dir):
-        parent_dir = os.path.basename(root)
-
-        for file in files:
-            if file.endswith(".py") and file != "__init__.py":
-                file_name_without_ext = os.path.splitext(file)[0]
-
-                if file_name_without_ext == parent_dir:
-                    rel_path = os.path.relpath(root, base_dir)
-                    module_path = rel_path.replace(os.sep, ".")
-
-                    module_name = f"{module_path}.{file_name_without_ext}"
-                    matching_modules.append((file_name_without_ext, module_name))
-
-    return matching_modules
-
-
-def main():
-    parser = argparse.ArgumentParser(description="BEC application launcher")
-
-    parser.add_argument("-m", "--module", type=str, help="The module to run (string argument).")
-
-    # Add a positional argument for the module, which acts as a fallback if -m is not provided
-    parser.add_argument(
-        "positional_module",
-        nargs="?",  # This makes the positional argument optional
-        help="Positional argument that is treated as module if -m is not specified.",
-    )
-
-    args = parser.parse_args()
-    # If the -m/--module is not provided, fallback to the positional argument
-    module = args.module if args.module else args.positional_module
-
-    if module:
-        for app_name, app_module in find_apps(MODULE_PATH):
-            if module in (app_name, app_module):
-                print("Starting:", app_name)
-                python_executable = sys.executable
-
-                # Replace the current process with the new Python module
-                os.execvp(
-                    python_executable,
-                    [python_executable, "-m", f"bec_widgets.applications.{app_module}"],
-                )
-        print(f"Error: cannot find application {module}")
-
-    # display list of apps
-    print("Available applications:")
-    for app, _ in find_apps(MODULE_PATH):
-        print(f"  - {app}")
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main()
--- a/bec_widgets/assets/app_icons/alignment_1d.png
+++ b/bec_widgets/assets/app_icons/alignment_1d.png
--- a/bec_widgets/assets/status_icons/error.svg
+++ b/bec_widgets/assets/status_icons/error.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 -960 960 960" width="48px" fill="#EA3323">
+    <path d="M479.85-265.87q19.8 0 32.69-12.46 12.9-12.46 12.9-32.26 0-19.8-12.75-32.98-12.74-13.17-32.54-13.17-19.8 0-32.69 13.16-12.9 13.15-12.9 32.95 0 19.8 12.75 32.28 12.74 12.48 32.54 12.48Zm-36.46-166.56h79.22v-262.61h-79.22v262.61Zm36.95 366.56q-86.2 0-161.5-32.39-75.3-32.4-131.74-88.84-56.44-56.44-88.84-131.73-32.39-75.3-32.39-161.59t32.39-161.67q32.4-75.37 88.75-131.34t131.69-88.62q75.34-32.65 161.67-32.65 86.34 0 161.78 32.61 75.45 32.6 131.37 88.5 55.93 55.89 88.55 131.45 32.63 75.56 32.63 161.87 0 86.29-32.65 161.58t-88.62 131.48q-55.97 56.18-131.42 88.76-75.46 32.58-161.67 32.58Z"/>
+</svg>
--- a/bec_widgets/assets/status_icons/not_connected.svg
+++ b/bec_widgets/assets/status_icons/not_connected.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 -960 960 960" width="48px" fill="#EA3323">
+    <path d="m759.04-283.09-63.13-62q49.31-9.43 84.44-46.02 35.13-36.59 35.13-86.14 0-55.49-39.42-95.08-39.43-39.58-94.93-39.58h-153.3v-79.79h152.74q89.28 0 151.7 62.71Q894.7-566.28 894.7-477q0 63.7-38.26 115.96-38.27 52.26-97.4 77.95ZM596.83-443.61l-65.66-66.78h110.05v66.78h-44.39ZM804.96-56 58.48-802.48 106-850l746.48 746.48L804.96-56ZM443.22-265.87H279.43q-89.28 0-151.7-62.42Q65.3-390.72 65.3-480q0-72.57 43.09-129.54 43.09-56.98 112.09-76.07l70.13 70.7h-11.18q-55.73 0-95.32 39.3-39.59 39.31-39.59 95.61t39.66 95.61q39.66 39.3 95.5 39.3h163.54v79.22ZM319.35-446.61v-66.78h77.3l66.78 66.78H319.35Z"/>
+</svg>
--- a/bec_widgets/assets/status_icons/refresh.svg
+++ b/bec_widgets/assets/status_icons/refresh.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 -960 960 960" width="48px" fill="#FFFF55">
+    <path d="M478.3-145.87q-138.65 0-236.39-97.74-97.74-97.74-97.74-236.25t97.74-236.68q97.74-98.16 236.39-98.16 88.4 0 155.45 35.76 67.04 35.76 115.86 98.9V-814.7h66.78v274.92H540.91V-606h165.74q-38.56-57.74-95.3-93.33-56.74-35.58-133.05-35.58-106.88 0-180.89 73.98-74.02 73.99-74.02 180.83 0 106.84 74.02 180.93 74.02 74.08 180.91 74.08 80.16 0 147.74-46.08 67.59-46.09 95.16-121.83H803q-29.56 110.65-119.67 178.89-90.1 68.24-205.03 68.24Z"/>
+</svg>
--- a/bec_widgets/assets/status_icons/running.svg
+++ b/bec_widgets/assets/status_icons/running.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 -960 960 960" width="48px" fill="#75FB4C">
+    <path d="m419.87-289.52 289.22-289.22-57.31-56.87L419.87-403.7 304.96-518.61l-56.31 56.87 171.22 172.22Zm60.21 223.65q-85.47 0-161.01-32.39-75.53-32.4-131.97-88.84-56.44-56.44-88.84-131.89-32.39-75.46-32.39-160.93 0-86.47 32.39-162.01 32.4-75.53 88.75-131.5t131.85-88.62q75.5-32.65 161.01-32.65 86.52 0 162.12 32.61 75.61 32.6 131.53 88.5 55.93 55.89 88.55 131.45Q894.7-566.58 894.7-480q0 85.55-32.65 161.07-32.65 75.53-88.62 131.9-55.97 56.37-131.42 88.77-75.46 32.39-161.93 32.39Z"/>
+</svg>
--- a/bec_widgets/assets/status_icons/warning.svg
+++ b/bec_widgets/assets/status_icons/warning.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 -960 960 960" width="48px" fill="#F19E39">
+    <path d="M27.56-112.65 480-894.7l452.44 782.05H27.56Zm456.62-125.48q13.15 0 22.61-9.64 9.47-9.65 9.47-22.8t-9.64-22.33q-9.65-9.19-22.8-9.19t-22.61 9.36q-9.47 9.36-9.47 22.51 0 13.15 9.64 22.62 9.65 9.47 22.8 9.47ZM454-348h60v-219.48h-60V-348Z"/>
+</svg>
--- a/bec_widgets/cli/client.py
+++ b/bec_widgets/cli/client.py
--- a/bec_widgets/cli/client_utils.py
+++ b/bec_widgets/cli/client_utils.py
@@ -80,7 +80,7 @@ def _get_output(process, logger) -> None:
                    buf.clear()
                    buf.append(remaining)
    except Exception as e:
-        logger.error(f"Error reading process output: {str(e)}")
+        print(f"Error reading process output: {str(e)}")


 def _start_plot_process(gui_id: str, gui_class: type, config: dict | str, logger=None) -> None:
@@ -92,11 +92,11 @@ def _start_plot_process(gui_id: str, gui_class: type, config: dict | str, logger
    process will not be captured.
    """
    # pylint: disable=subprocess-run-check
-    command = ["bec-gui-server", "--id", gui_id, "--gui_class", gui_class.__name__, "--hide"]
+    command = ["bec-gui-server", "--id", gui_id, "--gui_class", gui_class.__name__]
    if config:
        if isinstance(config, dict):
            config = json.dumps(config)
-        command.extend(["--config", str(config)])
+        command.extend(["--config", config])

    env_dict = os.environ.copy()
    env_dict["PYTHONUNBUFFERED"] = "1"
@@ -126,36 +126,15 @@ def _start_plot_process(gui_id: str, gui_class: type, config: dict | str, logger
    return process, process_output_processing_thread


-class RepeatTimer(threading.Timer):
-    def run(self):
-        while not self.finished.wait(self.interval):
-            self.function(*self.args, **self.kwargs)
-
-
 class BECGuiClientMixin:
    def __init__(self, **kwargs) -> None:
        super().__init__(**kwargs)
-        self._auto_updates_enabled = True
-        self._auto_updates = None
-        self._gui_started_timer = None
-        self._gui_started_event = threading.Event()
        self._process = None
        self._process_output_processing_thread = None
+        self.auto_updates = self._get_update_script()
        self._target_endpoint = MessageEndpoints.scan_status()
        self._selected_device = None

-    @property
-    def auto_updates(self):
-        if self._auto_updates_enabled:
-            self._gui_started_event.wait()
-        return self._auto_updates
-
-    def shutdown_auto_updates(self):
-        if self._auto_updates_enabled:
-            if self._auto_updates is not None:
-                self._auto_updates.shutdown()
-                self._auto_updates = None
-
    def _get_update_script(self) -> AutoUpdates | None:
        eps = imd.entry_points(group="bec.widgets.auto_updates")
        for ep in eps:
@@ -167,7 +146,7 @@ class BECGuiClientMixin:
                        continue
                    return ep.load()(gui=self)
                except Exception as e:
-                    logger.error(f"Error loading auto update script from plugin: {str(e)}")
+                    print(f"Error loading auto update script from plugin: {str(e)}")
        return None

    @property
@@ -201,80 +180,37 @@ class BECGuiClientMixin:
        if isinstance(msg, messages.ScanStatusMessage):
            if not self.gui_is_alive():
                return
-            if self._auto_updates_enabled:
-                self.auto_updates.msg_queue.put(msg)
+            self.auto_updates.msg_queue.put(msg)

-    def _gui_post_startup(self):
-        if self._auto_updates_enabled:
-            if self._auto_updates is None:
-                auto_updates = self._get_update_script()
-                if auto_updates is None:
-                    AutoUpdates.create_default_dock = True
-                    AutoUpdates.enabled = True
-                    auto_updates = AutoUpdates(gui=self)
-                if auto_updates.create_default_dock:
-                    auto_updates.start_default_dock()
-                    # fig = auto_updates.get_default_figure()
-                self._auto_updates = auto_updates
-        self._gui_started_event.set()
-        self.show_all()
-
-    def start_server(self, wait=False) -> None:
+    def show(self) -> None:
        """
-        Start the GUI server, and execute callback when it is launched
+        Show the figure.
        """
        if self._process is None or self._process.poll() is not None:
-            logger.success("GUI starting...")
-            self._gui_started_event.clear()
            self._start_update_script()
            self._process, self._process_output_processing_thread = _start_plot_process(
-                self._gui_id, self.__class__, self._client._service_config.config, logger=logger
+                self._gui_id, self.__class__, self._client._service_config.config
            )
-
-            def gui_started_callback(callback):
-                try:
-                    if callable(callback):
-                        callback()
-                finally:
-                    threading.current_thread().cancel()
-
-            self._gui_started_timer = RepeatTimer(
-                1, lambda: self.gui_is_alive() and gui_started_callback(self._gui_post_startup)
-            )
-            self._gui_started_timer.start()
-
-        if wait:
-            self._gui_started_event.wait()
-
-    def show_all(self):
-        self._gui_started_event.wait()
-        rpc_client = RPCBase(gui_id=f"{self._gui_id}:window", parent=self)
-        rpc_client._run_rpc("show")
-
-    def hide_all(self):
-        self._gui_started_event.wait()
-        rpc_client = RPCBase(gui_id=f"{self._gui_id}:window", parent=self)
-        rpc_client._run_rpc("hide")
+        while not self.gui_is_alive():
+            print("Waiting for GUI to start...")
+            time.sleep(1)

    def close(self) -> None:
        """
        Close the gui window.
        """
-        if self._gui_started_timer is not None:
-            self._gui_started_timer.cancel()
-            self._gui_started_timer.join()
-
        if self._process is None:
            return

+        self._client.shutdown()
        if self._process:
-            logger.success("Stopping GUI...")
            self._process.terminate()
            if self._process_output_processing_thread:
                self._process_output_processing_thread.join()
            self._process.wait()
            self._process = None
-        self.shutdown_auto_updates()
+        if self.auto_updates is not None:
+            self.auto_updates.shutdown()


 class RPCResponseTimeoutError(Exception):
@@ -290,7 +226,7 @@ class RPCBase:
    def __init__(self, gui_id: str = None, config: dict = None, parent=None) -> None:
        self._client = BECClient()  # BECClient is a singleton; here, we simply get the instance
        self._config = config if config is not None else {}
-        self._gui_id = gui_id if gui_id is not None else str(uuid.uuid4())[:5]
+        self._gui_id = gui_id if gui_id is not None else str(uuid.uuid4())
        self._parent = parent
        self._msg_wait_event = threading.Event()
        self._rpc_response = None
--- a/bec_widgets/cli/generate_cli.py
+++ b/bec_widgets/cli/generate_cli.py
@@ -8,10 +8,9 @@ import sys

 import black
 import isort
-from qtpy.QtCore import Property as QtProperty

 from bec_widgets.utils.generate_designer_plugin import DesignerPluginGenerator
-from bec_widgets.utils.plugin_utils import BECClassContainer, get_custom_classes
+from bec_widgets.utils.plugin_utils import BECClassContainer, get_rpc_classes

 if sys.version_info >= (3, 11):
    from typing import get_overloads
@@ -31,7 +30,6 @@ else:
 class ClientGenerator:
    def __init__(self):
        self.header = """# This file was automatically generated by generate_cli.py\n
-from __future__ import annotations
 import enum
 from typing import Literal, Optional, overload

@@ -92,27 +90,11 @@ class {class_name}(RPCBase):"""
            self.content += """...
    """
        for method in cls.USER_ACCESS:
-            is_property_setter = False
-            obj = getattr(cls, method, None)
-            if obj is None:
-                obj = getattr(cls, method.split(".setter")[0], None)
-                is_property_setter = True
-                method = method.split(".setter")[0]
-            if obj is None:
-                raise AttributeError(
-                    f"Method {method} not found in class {cls.__name__}. Please check the USER_ACCESS list."
-                )
-            if isinstance(obj, (property, QtProperty)):
-                # for the cli, we can map qt properties to regular properties
-                if is_property_setter:
-                    self.content += f"""
-    @{method}.setter
-    @rpc_call"""
-                else:
-                    self.content += """
+            obj = getattr(cls, method)
+            if isinstance(obj, property):
+                self.content += """
    @property
    @rpc_call"""
-
                sig = str(inspect.signature(obj.fget))
                doc = inspect.getdoc(obj.fget)
            else:
@@ -175,7 +157,7 @@ def main():
        current_path = os.path.dirname(__file__)
        client_path = os.path.join(current_path, "client.py")

-        rpc_classes = get_custom_classes("bec_widgets")
+        rpc_classes = get_rpc_classes("bec_widgets")

        generator = ClientGenerator()
        generator.generate_client(rpc_classes)
--- a/bec_widgets/cli/rpc_register.py
+++ b/bec_widgets/cli/rpc_register.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from threading import Lock
 from weakref import WeakValueDictionary

--- a/bec_widgets/cli/rpc_wigdet_handler.py
+++ b/bec_widgets/cli/rpc_wigdet_handler.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from bec_widgets.utils import BECConnector


@@ -28,10 +26,10 @@ class RPCWidgetHandler:
        Returns:
            None
        """
-        from bec_widgets.utils.plugin_utils import get_custom_classes
+        from bec_widgets.utils.plugin_utils import get_rpc_classes

-        clss = get_custom_classes("bec_widgets")
-        self._widget_classes = {cls.__name__: cls for cls in clss.widgets}
+        clss = get_rpc_classes("bec_widgets")
+        self._widget_classes = {cls.__name__: cls for cls in clss.top_level_classes}

    def create_widget(self, widget_type, **kwargs) -> BECConnector:
        """
--- a/bec_widgets/cli/server.py
+++ b/bec_widgets/cli/server.py
@@ -1,5 +1,6 @@
 from __future__ import annotations

+import inspect
 import json
 import signal
 import sys
@@ -10,14 +11,14 @@ from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
 from bec_lib.service_config import ServiceConfig
 from bec_lib.utils.import_utils import lazy_import
-from qtpy.QtCore import Qt, QTimer
+from qtpy.QtCore import QTimer

 from bec_widgets.cli.rpc_register import RPCRegister
 from bec_widgets.utils import BECDispatcher
 from bec_widgets.utils.bec_connector import BECConnector
-from bec_widgets.widgets.containers.dock import BECDockArea
-from bec_widgets.widgets.containers.figure import BECFigure
-from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow
+from bec_widgets.utils.bec_dispatcher import QtRedisConnector
+from bec_widgets.widgets.dock.dock_area import BECDockArea
+from bec_widgets.widgets.figure import BECFigure

 messages = lazy_import("bec_lib.messages")
 logger = bec_logger.logger
@@ -52,11 +53,9 @@ class BECWidgetsCLIServer:
        self._heartbeat_timer.start(200)

        self.status = messages.BECStatus.RUNNING
-        logger.success(f"Server started with gui_id: {self.gui_id}")

    def on_rpc_update(self, msg: dict, metadata: dict):
        request_id = metadata.get("request_id")
-        logger.debug(f"Received RPC instruction: {msg}, metadata: {metadata}")
        try:
            obj = self.get_object_from_config(msg["parameter"])
            method = msg["action"]
@@ -64,10 +63,9 @@ class BECWidgetsCLIServer:
            kwargs = msg["parameter"].get("kwargs", {})
            res = self.run_rpc(obj, method, args, kwargs)
        except Exception as e:
-            logger.error(f"Error while executing RPC instruction: {e}")
+            print(e)
            self.send_response(request_id, False, {"error": str(e)})
        else:
-            logger.debug(f"RPC instruction executed successfully: {res}")
            self.send_response(request_id, True, {"result": res})

    def send_response(self, request_id: str, accepted: bool, msg: dict):
@@ -85,17 +83,16 @@ class BECWidgetsCLIServer:
        return obj

    def run_rpc(self, obj, method, args, kwargs):
-        logger.debug(f"Running RPC instruction: {method} with args: {args}, kwargs: {kwargs}")
        method_obj = getattr(obj, method)
        # check if the method accepts args and kwargs
        if not callable(method_obj):
-            if not args:
-                res = method_obj
-            else:
-                setattr(obj, method, args[0])
-                res = None
+            res = method_obj
        else:
-            res = method_obj(*args, **kwargs)
+            sig = inspect.signature(method_obj)
+            if sig.parameters:
+                res = method_obj(*args, **kwargs)
+            else:
+                res = method_obj()

        if isinstance(res, list):
            res = [self.serialize_object(obj) for obj in res]
@@ -116,7 +113,6 @@ class BECWidgetsCLIServer:
        return obj

    def emit_heartbeat(self):
-        logger.trace(f"Emitting heartbeat for {self.gui_id}")
        self.client.connector.set(
            MessageEndpoints.gui_heartbeat(self.gui_id),
            messages.StatusMessage(name=self.gui_id, status=self.status, info={}),
@@ -124,7 +120,6 @@ class BECWidgetsCLIServer:
        )

    def shutdown(self):  # TODO not sure if needed when cleanup is done at level of BECConnector
-        logger.info(f"Shutting down server with gui_id: {self.gui_id}")
        self.status = messages.BECStatus.IDLE
        self._heartbeat_timer.stop()
        self.emit_heartbeat()
@@ -142,8 +137,7 @@ class SimpleFileLikeFromLogOutputFunc:

    def flush(self):
        lines, _, remaining = "".join(self._buffer).rpartition("\n")
-        if lines:
-            self._log_func(lines)
+        self._log_func(lines)
        self._buffer = [remaining]

    def close(self):
@@ -161,12 +155,12 @@ def _start_server(gui_id: str, gui_class: Union[BECFigure, BECDockArea], config:
        # if no config is provided, use the default config
        service_config = ServiceConfig()

-    # bec_logger.configure(
-    #     service_config.redis,
-    #     QtRedisConnector,
-    #     service_name="BECWidgetsCLIServer",
-    #     service_config=service_config.service_config,
-    # )
+    bec_logger.configure(
+        service_config.redis,
+        QtRedisConnector,
+        service_name="BECWidgetsCLIServer",
+        service_config=service_config.service_config,
+    )
    server = BECWidgetsCLIServer(gui_id=gui_id, config=service_config, gui_class=gui_class)
    return server

@@ -177,16 +171,10 @@ def main():

    from qtpy.QtCore import QSize
    from qtpy.QtGui import QIcon
-    from qtpy.QtWidgets import QApplication
+    from qtpy.QtWidgets import QApplication, QMainWindow

    import bec_widgets

-    bec_logger.level = bec_logger.LOGLEVEL.DEBUG
-    if __name__ != "__main__":
-        # if not running as main, set the log level to critical
-        # pylint: disable=protected-access
-        bec_logger._stderr_log_level = bec_logger.LOGLEVEL.CRITICAL
-
    parser = argparse.ArgumentParser(description="BEC Widgets CLI Server")
    parser.add_argument("--id", type=str, help="The id of the server")
    parser.add_argument(
@@ -195,7 +183,6 @@ def main():
        help="Name of the gui class to be rendered. Possible values: \n- BECFigure\n- BECDockArea",
    )
    parser.add_argument("--config", type=str, help="Config file or config string.")
-    parser.add_argument("--hide", action="store_true", help="Hide on startup")

    args = parser.parse_args()

@@ -208,12 +195,11 @@ def main():
            "Please specify a valid gui_class to run. Use -h for help."
            "\n Starting with default gui_class BECFigure."
        )
-        gui_class = BECDockArea
+        gui_class = BECFigure

-    with redirect_stdout(SimpleFileLikeFromLogOutputFunc(logger.info)):
+    with redirect_stdout(SimpleFileLikeFromLogOutputFunc(logger.debug)):
        with redirect_stderr(SimpleFileLikeFromLogOutputFunc(logger.error)):
            app = QApplication(sys.argv)
-            app.setQuitOnLastWindowClosed(False)
            app.setApplicationName("BEC Figure")
            module_path = os.path.dirname(bec_widgets.__file__)
            icon = QIcon()
@@ -223,19 +209,15 @@ def main():
            )
            app.setWindowIcon(icon)

-            server = _start_server(args.id, gui_class, args.config)
-
-            win = BECMainWindow(gui_id=f"{server.gui_id}:window")
-            win.setAttribute(Qt.WA_ShowWithoutActivating)
+            win = QMainWindow()
            win.setWindowTitle("BEC Widgets")

-            RPCRegister().add_rpc(win)
+            server = _start_server(args.id, gui_class, args.config)

            gui = server.gui
            win.setCentralWidget(gui)
            win.resize(800, 600)
-            if not args.hide:
-                win.show()
+            win.show()

            app.aboutToQuit.connect(server.shutdown)

@@ -251,5 +233,5 @@ def main():


 if __name__ == "__main__":  # pragma: no cover
-    sys.argv = ["bec_widgets.cli.server", "--id", "e2860", "--gui_class", "BECDockArea"]
+    sys.argv = ["bec_widgets.cli.server", "--id", "test", "--gui_class", "BECDockArea"]
    main()
--- a/bec_widgets/examples/jupyter_console/jupyter_console_window.py
+++ b/bec_widgets/examples/jupyter_console/jupyter_console_window.py
@@ -3,6 +3,8 @@ import os
 import numpy as np
 import pyqtgraph as pg
 from bec_qthemes import material_icon
+from qtpy.QtCore import QSize
+from qtpy.QtGui import QIcon
 from qtpy.QtWidgets import (
    QApplication,
    QGroupBox,
@@ -15,9 +17,9 @@ from qtpy.QtWidgets import (

 from bec_widgets.utils import BECDispatcher
 from bec_widgets.utils.colors import apply_theme
-from bec_widgets.widgets.containers.dock import BECDockArea
-from bec_widgets.widgets.containers.figure import BECFigure
-from bec_widgets.widgets.editors.jupyter_console.jupyter_console import BECJupyterConsole
+from bec_widgets.widgets.dock.dock_area import BECDockArea
+from bec_widgets.widgets.figure import BECFigure
+from bec_widgets.widgets.jupyter_console.jupyter_console import BECJupyterConsole


 class JupyterConsoleWindow(QWidget):  # pragma: no cover:
@@ -54,7 +56,6 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
                    # "cm": self.colormap,
                    "im": self.im,
                    "mm": self.mm,
-                    "mw": self.mw,
                }
            )

@@ -163,14 +164,12 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:

        self.d1 = self.dock.add_dock(name="dock_1", position="right")
        self.im = self.d1.add_widget("BECImageWidget")
-        self.im.image("waveform", "1d")
+        self.im.image("eiger")

        self.d2 = self.dock.add_dock(name="dock_2", position="bottom")
-        self.wf = self.d2.add_widget("BECFigure", row=0, col=0)
-
-        self.mw = self.wf.multi_waveform(monitor="waveform")  # , config=config)
-        # self.wf.plot(x_name="samx", y_name="bpm3a")
-        # self.wf.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
+        self.wf = self.d2.add_widget("BECWaveformWidget", row=0, col=0)
+        self.wf.plot(x_name="samx", y_name="bpm3a")
+        self.wf.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
        # self.bar = self.d2.add_widget("RingProgressBar", row=0, col=1)
        # self.bar.set_diameter(200)

@@ -211,7 +210,6 @@ if __name__ == "__main__":  # pragma: no cover

    win = JupyterConsoleWindow()
    win.show()
-    win.resize(1200, 800)

    app.aboutToQuit.connect(win.close)
    sys.exit(app.exec_())
--- a/bec_widgets/examples/plugin_example_pyside/tictactoe.py
+++ b/bec_widgets/examples/plugin_example_pyside/tictactoe.py
@@ -16,6 +16,7 @@ class TicTacToe(QWidget):  # pragma: no cover
        super().__init__(parent)
        self._state = DEFAULT_STATE
        self._turn_number = 0
+        print("TicTac HERE !!!!!!")

    def minimumSizeHint(self):
        return QSize(200, 200)
--- a/bec_widgets/qt_utils/compact_popup.py
+++ b/bec_widgets/qt_utils/compact_popup.py
@@ -1,268 +0,0 @@
-import time
-from types import SimpleNamespace
-
-from bec_qthemes import material_icon
-from qtpy.QtCore import Property, Qt, Signal
-from qtpy.QtGui import QColor
-from qtpy.QtWidgets import (
-    QDialog,
-    QHBoxLayout,
-    QLabel,
-    QPushButton,
-    QSizePolicy,
-    QSpacerItem,
-    QVBoxLayout,
-    QWidget,
-)
-
-from bec_widgets.utils.colors import get_accent_colors
-
-
-class LedLabel(QLabel):
-    success_led = "color: white;border-radius: 10;background-color: qlineargradient(spread:pad, x1:0.145, y1:0.16, x2:1, y2:1, stop:0 %s, stop:1 %s);"
-    emergency_led = "color: white;border-radius: 10;background-color: qlineargradient(spread:pad, x1:0.145, y1:0.16, x2:0.92, y2:0.988636, stop:0 %s, stop:1 %s);"
-    warning_led = "color: white;border-radius: 10;background-color: qlineargradient(spread:pad, x1:0.232, y1:0.272, x2:0.98, y2:0.959773, stop:0 %s, stop:1 %s);"
-    default_led = "color: white;border-radius: 10;background-color: qlineargradient(spread:pad, x1:0.04, y1:0.0565909, x2:0.799, y2:0.795, stop:0 %s, stop:1 %s);"
-
-    def __init__(self, parent=None):
-        super().__init__(parent)
-
-        self.palette = get_accent_colors()
-        if self.palette is None:
-            # no theme!
-            self.palette = SimpleNamespace(
-                default=QColor("blue"),
-                success=QColor("green"),
-                warning=QColor("orange"),
-                emergency=QColor("red"),
-            )
-        self.setState("default")
-        self.setFixedSize(20, 20)
-
-    def setState(self, state: str):
-        match state:
-            case "success":
-                r, g, b, a = self.palette.success.getRgb()
-                self.setStyleSheet(
-                    LedLabel.success_led
-                    % (
-                        f"rgba({r},{g},{b},{a})",
-                        f"rgba({int(r*0.8)},{int(g*0.8)},{int(b*0.8)},{a})",
-                    )
-                )
-            case "default":
-                r, g, b, a = self.palette.default.getRgb()
-                self.setStyleSheet(
-                    LedLabel.default_led
-                    % (
-                        f"rgba({r},{g},{b},{a})",
-                        f"rgba({int(r*0.8)},{int(g*0.8)},{int(b*0.8)},{a})",
-                    )
-                )
-            case "warning":
-                r, g, b, a = self.palette.warning.getRgb()
-                self.setStyleSheet(
-                    LedLabel.warning_led
-                    % (
-                        f"rgba({r},{g},{b},{a})",
-                        f"rgba({int(r*0.8)},{int(g*0.8)},{int(b*0.8)},{a})",
-                    )
-                )
-            case "emergency":
-                r, g, b, a = self.palette.emergency.getRgb()
-                self.setStyleSheet(
-                    LedLabel.emergency_led
-                    % (
-                        f"rgba({r},{g},{b},{a})",
-                        f"rgba({int(r*0.8)},{int(g*0.8)},{int(b*0.8)},{a})",
-                    )
-                )
-            case unknown_state:
-                raise ValueError(
-                    f"Unknown state {repr(unknown_state)}, must be one of default, success, warning or emergency"
-                )
-
-
-class PopupDialog(QDialog):
-    def __init__(self, content_widget):
-        self.parent = content_widget.parent()
-        self.content_widget = content_widget
-
-        super().__init__(self.parent)
-
-        self.setAttribute(Qt.WA_DeleteOnClose)
-
-        self.content_widget.setParent(self)
-        QVBoxLayout(self)
-        self.layout().addWidget(self.content_widget)
-        self.content_widget.setVisible(True)
-
-    def closeEvent(self, event):
-        self.content_widget.setVisible(False)
-        self.content_widget.setParent(self.parent)
-        self.done(True)
-
-
-class CompactPopupWidget(QWidget):
-    """Container widget, that can display its content or have a compact form,
-    in this case clicking on a small button pops the contained widget up.
-
-    In the compact form, a LED-like indicator shows a status indicator.
-    """
-
-    expand = Signal(bool)
-
-    def __init__(self, parent=None, layout=QVBoxLayout):
-        super().__init__(parent)
-
-        self._popup_window = None
-        self._expand_popup = True
-
-        QVBoxLayout(self)
-        self.compact_view_widget = QWidget(self)
-        self.compact_view_widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
-        QHBoxLayout(self.compact_view_widget)
-        self.compact_view_widget.layout().setSpacing(0)
-        self.compact_view_widget.layout().setContentsMargins(0, 0, 0, 0)
-        self.compact_view_widget.layout().addSpacerItem(
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Fixed)
-        )
-        self.compact_label = QLabel(self.compact_view_widget)
-        self.compact_status = LedLabel(self.compact_view_widget)
-        self.compact_show_popup = QPushButton(self.compact_view_widget)
-        self.compact_show_popup.setFlat(True)
-        self.compact_show_popup.setIcon(
-            material_icon(icon_name="expand_content", size=(10, 10), convert_to_pixmap=False)
-        )
-        self.compact_view_widget.layout().addWidget(self.compact_label)
-        self.compact_view_widget.layout().addWidget(self.compact_status)
-        self.compact_view_widget.layout().addWidget(self.compact_show_popup)
-        self.compact_view_widget.setVisible(False)
-        self.layout().addWidget(self.compact_view_widget)
-        self.container = QWidget(self)
-        self.layout().addWidget(self.container)
-        self.container.setVisible(True)
-        layout(self.container)
-        self.layout = self.container.layout()
-
-        self.compact_show_popup.clicked.connect(self.show_popup)
-
-    def set_global_state(self, state: str):
-        """Set the LED-indicator state
-
-        The LED indicator represents the 'global' state. State can be one of the
-        following: "default", "success", "warning", "emergency"
-        """
-        self.compact_status.setState(state)
-
-    def show_popup(self):
-        """Display the contained widgets in a popup dialog"""
-        if self._expand_popup:
-            # show popup
-            self._popup_window = PopupDialog(self.container)
-            self._popup_window.show()
-            self._popup_window.finished.connect(lambda: self.expand.emit(False))
-            self.expand.emit(True)
-        else:
-            if self.compact_view:
-                # expand in place
-                self.compact_view = False
-                self.compact_view_widget.setVisible(True)
-                self.compact_label.setVisible(False)
-                self.compact_status.setVisible(False)
-                self.compact_show_popup.setIcon(
-                    material_icon(
-                        icon_name="collapse_content", size=(10, 10), convert_to_pixmap=False
-                    )
-                )
-                self.expand.emit(True)
-            else:
-                # back to compact form
-                self.compact_label.setVisible(True)
-                self.compact_status.setVisible(True)
-                self.compact_show_popup.setIcon(
-                    material_icon(
-                        icon_name="expand_content", size=(10, 10), convert_to_pixmap=False
-                    )
-                )
-                self.compact_view = True
-                self.expand.emit(False)
-
-    def setSizePolicy(self, size_policy1, size_policy2=None):
-        # setting size policy on the compact popup widget will set
-        # the policy for the container, and for itself
-        if size_policy2 is None:
-            # assuming first form: setSizePolicy(QSizePolicy)
-            self.container.setSizePolicy(size_policy1)
-            QWidget.setSizePolicy(self, size_policy1)
-        else:
-            self.container.setSizePolicy(size_policy1, size_policy2)
-            QWidget.setSizePolicy(self, size_policy1, size_policy2)
-
-    def addWidget(self, widget):
-        """Add a widget to the popup container
-
-        The popup container corresponds to the "full view" (not compact)
-        The widget is reparented to the container, and added to the container layout
-        """
-        widget.setParent(self.container)
-        self.container.layout().addWidget(widget)
-
-    @Property(bool)
-    def compact_view(self):
-        return self.compact_label.isVisible()
-
-    @compact_view.setter
-    def compact_view(self, set_compact: bool):
-        """Sets the compact form
-
-        If set_compact is True, the compact view is displayed ; otherwise,
-        the full view is displayed. This is handled by toggling visibility of
-        the container widget or the compact view widget.
-        """
-        if set_compact:
-            self.compact_view_widget.setVisible(True)
-            self.container.setVisible(False)
-            QWidget.setSizePolicy(self, QSizePolicy.Fixed, QSizePolicy.Fixed)
-        else:
-            self.compact_view_widget.setVisible(False)
-            self.container.setVisible(True)
-            QWidget.setSizePolicy(self, self.container.sizePolicy())
-        if self.parentWidget():
-            self.parentWidget().adjustSize()
-        else:
-            self.adjustSize()
-
-    @Property(str)
-    def label(self):
-        return self.compact_label.text()
-
-    @label.setter
-    def label(self, compact_label_text: str):
-        """Set the label text associated to the compact view"""
-        self.compact_label.setText(compact_label_text)
-
-    @Property(str)
-    def tooltip(self):
-        return self.compact_label.toolTip()
-
-    @tooltip.setter
-    def tooltip(self, tooltip: str):
-        """Set the tooltip text associated to the compact view"""
-        self.compact_label.setToolTip(tooltip)
-        self.compact_status.setToolTip(tooltip)
-
-    @Property(bool)
-    def expand_popup(self):
-        return self._expand_popup
-
-    @expand_popup.setter
-    def expand_popup(self, popup: bool):
-        self._expand_popup = popup
-
-    def closeEvent(self, event):
-        # Called by Qt, on closing - since the children widgets can be
-        # BECWidgets, it is good to explicitely call 'close' on them,
-        # to ensure proper resources cleanup
-        for child in self.container.findChildren(QWidget, options=Qt.FindDirectChildrenOnly):
-            child.close()
--- a/bec_widgets/qt_utils/palette_viewer.py
+++ b/bec_widgets/qt_utils/palette_viewer.py
@@ -1,183 +0,0 @@
-from qtpy.QtCore import Qt
-from qtpy.QtWidgets import (
-    QApplication,
-    QFrame,
-    QGridLayout,
-    QHBoxLayout,
-    QLabel,
-    QScrollArea,
-    QSizePolicy,
-    QVBoxLayout,
-    QWidget,
-)
-
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.colors import get_accent_colors, get_theme_palette
-from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton
-
-
-class PaletteViewer(BECWidget, QWidget):
-    """
-    This class is a widget that displays current palette colors.
-    """
-
-    ICON_NAME = "palette"
-
-    def __init__(self, *args, parent=None, **kwargs):
-        super().__init__(*args, theme_update=True, **kwargs)
-        QWidget.__init__(self, parent=parent)
-        self.setFixedSize(400, 600)
-        layout = QVBoxLayout(self)
-        dark_mode_button = DarkModeButton(self)
-        layout.addWidget(dark_mode_button)
-
-        # Create a scroll area to hold the color boxes
-        scroll_area = QScrollArea(self)
-        scroll_area.setWidgetResizable(True)
-        scroll_area.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-
-        # Create a frame to hold the color boxes
-        self.frame = QFrame(self)
-        self.frame_layout = QGridLayout(self.frame)
-        self.frame_layout.setSpacing(0)
-        self.frame_layout.setContentsMargins(0, 0, 0, 0)
-
-        scroll_area.setWidget(self.frame)
-        layout.addWidget(scroll_area)
-
-        self.setLayout(layout)
-
-        self.update_palette()
-
-    def apply_theme(self, theme) -> None:
-        """
-        Apply the theme to the widget.
-
-        Args:
-            theme (str): The theme to apply.
-        """
-        self.update_palette()
-
-    def clear_palette(self) -> None:
-        """
-        Clear the palette colors from the frame.
-        Recursively removes all widgets and layouts in the frame layout.
-        """
-        # Iterate over all items in the layout in reverse to safely remove them
-        for i in reversed(range(self.frame_layout.count())):
-            item = self.frame_layout.itemAt(i)
-
-            # If the item is a layout, clear its contents
-            if isinstance(item, QHBoxLayout):
-                # Recursively remove all widgets from the layout
-                for j in reversed(range(item.count())):
-                    widget = item.itemAt(j).widget()
-                    if widget:
-                        item.removeWidget(widget)
-                        widget.deleteLater()
-                self.frame_layout.removeItem(item)
-
-            # If the item is a widget, remove and delete it
-            elif item.widget():
-                widget = item.widget()
-                self.frame_layout.removeWidget(widget)
-                widget.deleteLater()
-
-    def update_palette(self) -> None:
-        """
-        Update the palette colors in the frame.
-        """
-        self.clear_palette()
-        palette_label = QLabel("Palette Colors (e.g. palette.windowText().color())")
-        palette_label.setStyleSheet("font-weight: bold;")
-        self.frame_layout.addWidget(palette_label, 0, 0)
-
-        palette = get_theme_palette()
-        # Add the palette colors (roles) to the frame
-        palette_roles = [
-            palette.windowText,
-            palette.toolTipText,
-            palette.placeholderText,
-            palette.text,
-            palette.buttonText,
-            palette.highlight,
-            palette.link,
-            palette.light,
-            palette.midlight,
-            palette.mid,
-            palette.shadow,
-            palette.button,
-            palette.brightText,
-            palette.toolTipBase,
-            palette.alternateBase,
-            palette.dark,
-            palette.base,
-            palette.window,
-            palette.highlightedText,
-            palette.linkVisited,
-        ]
-
-        offset = 1
-        for i, pal in enumerate(palette_roles):
-            i += offset
-            color = pal().color()
-            label_layout = QHBoxLayout()
-            color_label = QLabel(f"{pal().color().name()} ({pal.__name__})")
-            background_label = self.background_label_with_clipboard(color)
-            label_layout.addWidget(color_label)
-            label_layout.addWidget(background_label)
-            self.frame_layout.addLayout(label_layout, i, 0)
-
-        # add a horizontal spacer
-        spacer = QLabel()
-        spacer.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum)
-        self.frame_layout.addWidget(spacer, i + 1, 0)
-
-        accent_colors_label = QLabel("Accent Colors (e.g. accent_colors.default)")
-        accent_colors_label.setStyleSheet("font-weight: bold;")
-        self.frame_layout.addWidget(accent_colors_label, i + 2, 0)
-
-        accent_colors = get_accent_colors()
-        items = [
-            (accent_colors.default, "default"),
-            (accent_colors.success, "success"),
-            (accent_colors.warning, "warning"),
-            (accent_colors.emergency, "emergency"),
-            (accent_colors.highlight, "highlight"),
-        ]
-
-        offset = len(palette_roles) + 2
-        for i, (color, name) in enumerate(items):
-            i += offset
-            label_layout = QHBoxLayout()
-            color_label = QLabel(f"{color.name()} ({name})")
-            background_label = self.background_label_with_clipboard(color)
-            label_layout.addWidget(color_label)
-            label_layout.addWidget(background_label)
-            self.frame_layout.addLayout(label_layout, i + 2, 0)
-
-    def background_label_with_clipboard(self, color) -> QLabel:
-        """
-        Create a label with a background color that copies the color to the clipboard when clicked.
-
-        Args:
-            color (QColor): The color to display in the background.
-
-        Returns:
-            QLabel: The label with the background color.
-        """
-        button = QLabel()
-        button.setStyleSheet(f"QLabel {{ background-color: {color.name()}; }}")
-        button.setToolTip("Click to copy color to clipboard")
-        button.setCursor(Qt.PointingHandCursor)
-        button.mousePressEvent = lambda event: QApplication.clipboard().setText(color.name())
-        return button
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    app = QApplication(sys.argv)
-    viewer = PaletteViewer()
-    viewer.show()
-    sys.exit(app.exec_())
--- a/bec_widgets/qt_utils/toolbar.py
+++ b/bec_widgets/qt_utils/toolbar.py
@@ -7,18 +7,9 @@ from collections import defaultdict
 from typing import Literal

 from bec_qthemes._icon.material_icons import material_icon
-from qtpy.QtCore import QSize, Qt
+from qtpy.QtCore import QSize
 from qtpy.QtGui import QAction, QColor, QIcon
-from qtpy.QtWidgets import (
-    QComboBox,
-    QHBoxLayout,
-    QLabel,
-    QMenu,
-    QSizePolicy,
-    QToolBar,
-    QToolButton,
-    QWidget,
-)
+from qtpy.QtWidgets import QHBoxLayout, QLabel, QMenu, QToolBar, QToolButton, QWidget

 import bec_widgets

@@ -163,52 +154,20 @@ class WidgetAction(ToolBarAction):

    """

-    def __init__(self, label: str | None = None, widget: QWidget = None, parent=None):
-        super().__init__(parent)
+    def __init__(self, label: str | None = None, widget: QWidget = None):
+        super().__init__()
        self.label = label
        self.widget = widget

-    def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
-        container = QWidget()
-        layout = QHBoxLayout(container)
+    def add_to_toolbar(self, toolbar, target):
+        widget = QWidget()
+        layout = QHBoxLayout(widget)
        layout.setContentsMargins(0, 0, 0, 0)
-        layout.setSpacing(5)
-
        if self.label is not None:
-            label_widget = QLabel(f"{self.label}")
-            label_widget.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed)
-            label_widget.setAlignment(Qt.AlignVCenter | Qt.AlignRight)
-            layout.addWidget(label_widget)
-
-        if isinstance(self.widget, QComboBox):
-            self.widget.setSizeAdjustPolicy(QComboBox.AdjustToContents)
-
-            size_policy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
-            self.widget.setSizePolicy(size_policy)
-
-            self.widget.setMinimumWidth(self.calculate_minimum_width(self.widget))
-
-        else:
-            self.widget.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
-
+            label = QLabel(f"{self.label}")
+            layout.addWidget(label)
        layout.addWidget(self.widget)
-
-        toolbar.addWidget(container)
-
-    @staticmethod
-    def calculate_minimum_width(combo_box: QComboBox) -> int:
-        """
-        Calculate the minimum width required to display the longest item in the combo box.
-
-        Args:
-            combo_box (QComboBox): The combo box to calculate the width for.
-
-        Returns:
-            int: The calculated minimum width in pixels.
-        """
-        font_metrics = combo_box.fontMetrics()
-        max_width = max(font_metrics.width(combo_box.itemText(i)) for i in range(combo_box.count()))
-        return max_width + 60
+        toolbar.addWidget(widget)


 class ExpandableMenuAction(ToolBarAction):
--- a/bec_widgets/tests/utils.py
+++ b/bec_widgets/tests/utils.py
@@ -1,226 +0,0 @@
-from unittest.mock import MagicMock
-
-from bec_lib.device import Device as BECDevice
-from bec_lib.device import Positioner as BECPositioner
-from bec_lib.device import ReadoutPriority
-from bec_lib.devicemanager import DeviceContainer
-
-
-class FakeDevice(BECDevice):
-    """Fake minimal positioner class for testing."""
-
-    def __init__(self, name, enabled=True, readout_priority=ReadoutPriority.MONITORED):
-        super().__init__(name=name)
-        self._enabled = enabled
-        self.signals = {self.name: {"value": 1.0}}
-        self.description = {self.name: {"source": self.name, "dtype": "number", "shape": []}}
-        self._readout_priority = readout_priority
-        self._config = {
-            "readoutPriority": "baseline",
-            "deviceClass": "ophyd.Device",
-            "deviceConfig": {},
-            "deviceTags": ["user device"],
-            "enabled": enabled,
-            "readOnly": False,
-            "name": self.name,
-        }
-
-    @property
-    def readout_priority(self):
-        return self._readout_priority
-
-    @readout_priority.setter
-    def readout_priority(self, value):
-        self._readout_priority = value
-
-    @property
-    def limits(self) -> tuple[float, float]:
-        return self._limits
-
-    @limits.setter
-    def limits(self, value: tuple[float, float]):
-        self._limits = value
-
-    def __contains__(self, item):
-        return item == self.name
-
-    @property
-    def _hints(self):
-        return [self.name]
-
-    def set_value(self, fake_value: float = 1.0) -> None:
-        """
-        Setup fake value for device readout
-        Args:
-            fake_value(float): Desired fake value
-        """
-        self.signals[self.name]["value"] = fake_value
-
-    def describe(self) -> dict:
-        """
-        Get the description of the device
-        Returns:
-            dict: Description of the device
-        """
-        return self.description
-
-
-class FakePositioner(BECPositioner):
-
-    def __init__(
-        self,
-        name,
-        enabled=True,
-        limits=None,
-        read_value=1.0,
-        readout_priority=ReadoutPriority.MONITORED,
-    ):
-        super().__init__(name=name)
-        # self.limits = limits if limits is not None else [0.0, 0.0]
-        self.read_value = read_value
-        self.setpoint_value = read_value
-        self.motor_is_moving_value = 0
-        self._enabled = enabled
-        self._limits = limits
-        self._readout_priority = readout_priority
-        self.signals = {self.name: {"value": 1.0}}
-        self.description = {self.name: {"source": self.name, "dtype": "number", "shape": []}}
-        self._config = {
-            "readoutPriority": "baseline",
-            "deviceClass": "ophyd_devices.SimPositioner",
-            "deviceConfig": {"delay": 1, "tolerance": 0.01, "update_frequency": 400},
-            "deviceTags": ["user motors"],
-            "enabled": enabled,
-            "readOnly": False,
-            "name": self.name,
-        }
-        self._info = {
-            "signals": {
-                "readback": {"kind_str": "5"},  # hinted
-                "setpoint": {"kind_str": "1"},  # normal
-                "velocity": {"kind_str": "2"},  # config
-            }
-        }
-        self.signals = {
-            self.name: {"value": self.read_value},
-            f"{self.name}_setpoint": {"value": self.setpoint_value},
-            f"{self.name}_motor_is_moving": {"value": self.motor_is_moving_value},
-        }
-
-    @property
-    def readout_priority(self):
-        return self._readout_priority
-
-    @readout_priority.setter
-    def readout_priority(self, value):
-        self._readout_priority = value
-
-    @property
-    def enabled(self) -> bool:
-        return self._enabled
-
-    @enabled.setter
-    def enabled(self, value: bool):
-        self._enabled = value
-
-    @property
-    def limits(self) -> tuple[float, float]:
-        return self._limits
-
-    @limits.setter
-    def limits(self, value: tuple[float, float]):
-        self._limits = value
-
-    def __contains__(self, item):
-        return item == self.name
-
-    @property
-    def _hints(self):
-        return [self.name]
-
-    def set_value(self, fake_value: float = 1.0) -> None:
-        """
-        Setup fake value for device readout
-        Args:
-            fake_value(float): Desired fake value
-        """
-        self.read_value = fake_value
-
-    def describe(self) -> dict:
-        """
-        Get the description of the device
-        Returns:
-            dict: Description of the device
-        """
-        return self.description
-
-    @property
-    def precision(self):
-        return 3
-
-    def set_read_value(self, value):
-        self.read_value = value
-
-    def read(self):
-        return self.signals
-
-    def set_limits(self, limits):
-        self.limits = limits
-
-    def move(self, value, relative=False):
-        """Simulates moving the device to a new position."""
-        if relative:
-            self.read_value += value
-        else:
-            self.read_value = value
-        # Respect the limits
-        self.read_value = max(min(self.read_value, self.limits[1]), self.limits[0])
-
-    @property
-    def readback(self):
-        return MagicMock(get=MagicMock(return_value=self.read_value))
-
-
-class Positioner(FakePositioner):
-    """just placeholder for testing embedded isinstance check in DeviceCombobox"""
-
-    def __init__(self, name="test", limits=None, read_value=1.0):
-        super().__init__(name, limits, read_value)
-
-
-class Device(FakeDevice):
-    """just placeholder for testing embedded isinstance check in DeviceCombobox"""
-
-    def __init__(self, name, enabled=True):
-        super().__init__(name, enabled)
-
-
-class DMMock:
-    def __init__(self):
-        self.devices = DeviceContainer()
-        self.enabled_devices = [device for device in self.devices if device.enabled]
-
-    def add_devives(self, devices: list):
-        for device in devices:
-            self.devices[device.name] = device
-
-
-DEVICES = [
-    FakePositioner("samx", limits=[-10, 10], read_value=2.0),
-    FakePositioner("samy", limits=[-5, 5], read_value=3.0),
-    FakePositioner("samz", limits=[-8, 8], read_value=4.0),
-    FakePositioner("aptrx", limits=None, read_value=4.0),
-    FakePositioner("aptry", limits=None, read_value=5.0),
-    FakeDevice("gauss_bpm"),
-    FakeDevice("gauss_adc1"),
-    FakeDevice("gauss_adc2"),
-    FakeDevice("gauss_adc3"),
-    FakeDevice("bpm4i"),
-    FakeDevice("bpm3a"),
-    FakeDevice("bpm3i"),
-    FakeDevice("eiger", readout_priority=ReadoutPriority.ASYNC),
-    FakeDevice("waveform1d"),
-    FakeDevice("async_device", readout_priority=ReadoutPriority.ASYNC),
-    Positioner("test", limits=[-10, 10], read_value=2.0),
-    Device("test_device"),
-]
--- a/bec_widgets/utils/bec_connector.py
+++ b/bec_widgets/utils/bec_connector.py
@@ -6,7 +6,7 @@ import time
 import uuid
 from typing import Optional

-from bec_lib.logger import bec_logger
+import yaml
 from bec_lib.utils.import_utils import lazy_import_from
 from pydantic import BaseModel, Field, field_validator
 from qtpy.QtCore import QObject, QRunnable, QThreadPool, Signal
@@ -17,7 +17,6 @@ from bec_widgets.qt_utils.error_popups import ErrorPopupUtility
 from bec_widgets.qt_utils.error_popups import SafeSlot as pyqtSlot
 from bec_widgets.utils.yaml_dialog import load_yaml, load_yaml_gui, save_yaml, save_yaml_gui

-logger = bec_logger.logger
 BECDispatcher = lazy_import_from("bec_widgets.utils.bec_dispatcher", ("BECDispatcher",))


@@ -69,7 +68,7 @@ class Worker(QRunnable):
 class BECConnector:
    """Connection mixin class to handle BEC client and device manager"""

-    USER_ACCESS = ["_config_dict", "_get_all_rpc", "_rpc_id"]
+    USER_ACCESS = ["_config_dict", "_get_all_rpc"]
    EXIT_HANDLERS = {}

    def __init__(self, client=None, config: ConnectionConfig = None, gui_id: str = None):
@@ -82,9 +81,9 @@ class BECConnector:
            # the function depends on BECClient, and BECDispatcher
            @pyqtSlot()
            def terminate(client=self.client, dispatcher=self.bec_dispatcher):
-                logger.info("Disconnecting", repr(dispatcher))
+                print("Disconnecting", repr(dispatcher))
                dispatcher.disconnect_all()
-                logger.info("Shutting down BEC Client", repr(client))
+                print("Shutting down BEC Client", repr(client))
                client.shutdown()

            BECConnector.EXIT_HANDLERS[self.client] = terminate
@@ -94,7 +93,7 @@ class BECConnector:
            self.config = config
            self.config.widget_class = self.__class__.__name__
        else:
-            logger.debug(
+            print(
                f"No initial config found for {self.__class__.__name__}.\n"
                f"Initializing with default config."
            )
--- a/bec_widgets/utils/bec_dispatcher.py
+++ b/bec_widgets/utils/bec_dispatcher.py
@@ -6,14 +6,11 @@ from typing import TYPE_CHECKING, Union

 import redis
 from bec_lib.client import BECClient
-from bec_lib.logger import bec_logger
 from bec_lib.redis_connector import MessageObject, RedisConnector
 from bec_lib.service_config import ServiceConfig
 from qtpy.QtCore import QObject
 from qtpy.QtCore import Signal as pyqtSignal

-logger = bec_logger.logger
-
 if TYPE_CHECKING:
    from bec_lib.endpoints import EndpointInfo

@@ -68,6 +65,11 @@ class QtRedisConnector(RedisConnector):
            cb(msg.content, msg.metadata)


+class BECClientWithoutLoggerInit(BECClient):
+    def _initialize_logger(self):
+        return
+
+
 class BECDispatcher:
    """Utility class to keep track of slots connected to a particular redis connector"""

@@ -92,22 +94,24 @@ class BECDispatcher:
                if not isinstance(config, ServiceConfig):
                    # config is supposed to be a path
                    config = ServiceConfig(config)
-            self.client = BECClient(
-                config=config, connector_cls=QtRedisConnector, name="BECWidgets"
-            )
+                self.client = BECClientWithoutLoggerInit(
+                    config=config, connector_cls=QtRedisConnector
+                )  # , forced=True)
+            else:
+                self.client = BECClientWithoutLoggerInit(
+                    connector_cls=QtRedisConnector
+                )  # , forced=True)
        else:
            if self.client.started:
                # have to reinitialize client to use proper connector
-                logger.info("Shutting down BECClient to switch to QtRedisConnector")
                self.client.shutdown()
            self.client._BECClient__init_params["connector_cls"] = QtRedisConnector

        try:
            self.client.start()
        except redis.exceptions.ConnectionError:
-            logger.warning("Could not connect to Redis, skipping start of BECClient.")
+            print("Could not connect to Redis, skipping start of BECClient.")

-        logger.success("Initialized BECDispatcher")
        self._initialized = True

    @classmethod
--- a/bec_widgets/utils/bec_signal_proxy.py
+++ b/bec_widgets/utils/bec_signal_proxy.py
@@ -1,54 +0,0 @@
-""" This custom class is a thin wrapper around the SignalProxy class to allow signal calls to be blocked.
-Unblocking the proxy needs to be done through the slot unblock_proxy. The most likely use case for this class is
-when the callback function is potentially initiating a slower progress, i.e. requesting a data analysis routine to 
-analyse data. Requesting a new fit may lead to request piling up and an overall slow done of performance. This proxy
-will allow you to decide by yourself when to unblock and execute the callback again."""
-
-from pyqtgraph import SignalProxy
-from qtpy.QtCore import Signal, Slot
-
-
-class BECSignalProxy(SignalProxy):
-    """Thin wrapper around the SignalProxy class to allow signal calls to be blocked, but args still being stored
-
-    Args:
-        *args: Arguments to pass to the SignalProxy class
-        rateLimit (int): The rateLimit of the proxy
-        **kwargs: Keyword arguments to pass to the SignalProxy class
-
-    Example:
-    >>> proxy = BECSignalProxy(signal, rate_limit=25, slot=callback)"""
-
-    is_blocked = Signal(bool)
-
-    def __init__(self, *args, rateLimit=25, **kwargs):
-        super().__init__(*args, rateLimit=rateLimit, **kwargs)
-        self._blocking = False
-        self.old_args = None
-        self.new_args = None
-
-    @property
-    def blocked(self):
-        """Returns if the proxy is blocked"""
-        return self._blocking
-
-    @blocked.setter
-    def blocked(self, value: bool):
-        self._blocking = value
-        self.is_blocked.emit(value)
-
-    def signalReceived(self, *args):
-        """Receive signal, store the args and call signalReceived from the parent class if not blocked"""
-        self.new_args = args
-        if self.blocked is True:
-            return
-        self.blocked = True
-        self.old_args = args
-        super().signalReceived(*args)
-
-    @Slot()
-    def unblock_proxy(self):
-        """Unblock the proxy, and call the signalReceived method in case there was an update of the args."""
-        self.blocked = False
-        if self.new_args != self.old_args:
-            self.signalReceived(*self.new_args)
--- a/bec_widgets/utils/bec_widget.py
+++ b/bec_widgets/utils/bec_widget.py
@@ -1,15 +1,12 @@
 from __future__ import annotations

 import darkdetect
-from bec_lib.logger import bec_logger
 from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QApplication, QWidget

 from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
 from bec_widgets.utils.colors import set_theme

-logger = bec_logger.logger
-

 class BECWidget(BECConnector):
    """Mixin class for all BEC widgets, to handle cleanup"""
@@ -44,7 +41,7 @@ class BECWidget(BECConnector):
        """
        if not isinstance(self, QWidget):
            raise RuntimeError(f"{repr(self)} is not a subclass of QWidget")
-        super().__init__(client=client, config=config, gui_id=gui_id)
+        super().__init__(client, config, gui_id)

        # Set the theme to auto if it is not set yet
        app = QApplication.instance()
@@ -57,7 +54,6 @@ class BECWidget(BECConnector):
                set_theme("light")

        if theme_update:
-            logger.debug(f"Subscribing to theme updates for {self.__class__.__name__}")
            self._connect_to_theme_change()

    def _connect_to_theme_change(self):
@@ -71,7 +67,7 @@ class BECWidget(BECConnector):
        if theme is None:
            qapp = QApplication.instance()
            if hasattr(qapp, "theme"):
-                theme = qapp.theme.theme
+                theme = qapp.theme["theme"]
            else:
                theme = "dark"
        self.apply_theme(theme)
--- a/bec_widgets/utils/colors.py
+++ b/bec_widgets/utils/colors.py
@@ -1,8 +1,6 @@
-from __future__ import annotations
-
 import itertools
 import re
-from typing import TYPE_CHECKING, Literal
+from typing import Literal

 import bec_qthemes
 import numpy as np
@@ -10,38 +8,25 @@ import pyqtgraph as pg
 from bec_qthemes._os_appearance.listener import OSThemeSwitchListener
 from pydantic_core import PydanticCustomError
 from qtpy.QtGui import QColor
-from qtpy.QtWidgets import QApplication
-
-if TYPE_CHECKING:
-    from bec_qthemes._main import AccentColors
+from qtpy.QtWidgets import QApplication, QPushButton, QToolButton


 def get_theme_palette():
    if QApplication.instance() is None or not hasattr(QApplication.instance(), "theme"):
        theme = "dark"
    else:
-        theme = QApplication.instance().theme.theme
+        theme = QApplication.instance().theme["theme"]
    return bec_qthemes.load_palette(theme)


-def get_accent_colors() -> AccentColors | None:
-    """
-    Get the accent colors for the current theme. These colors are extensions of the color palette
-    and are used to highlight specific elements in the UI.
-    """
-    if QApplication.instance() is None or not hasattr(QApplication.instance(), "theme"):
-        return None
-    return QApplication.instance().theme.accent_colors
-
-
 def _theme_update_callback():
    """
    Internal callback function to update the theme based on the system theme.
    """
    app = QApplication.instance()
    # pylint: disable=protected-access
-    app.theme.theme = app.os_listener._theme.lower()
-    app.theme_signal.theme_updated.emit(app.theme.theme)
+    app.theme["theme"] = app.os_listener._theme.lower()
+    app.theme_signal.theme_updated.emit(app.theme["theme"])
    apply_theme(app.os_listener._theme.lower())


@@ -107,98 +92,9 @@ class Colors:
            angles.append(angle)
        return angles

-    @staticmethod
-    def set_theme_offset(theme: Literal["light", "dark"] | None = None, offset=0.2) -> tuple:
-        """
-        Set the theme offset to avoid colors too close to white or black with light or dark theme respectively for pyqtgraph plot background.
-
-        Args:
-            theme(str): The theme to be applied.
-            offset(float): Offset to avoid colors too close to white or black with light or dark theme respectively for pyqtgraph plot background.
-
-        Returns:
-            tuple: Tuple of min_pos and max_pos.
-
-        Raises:
-            ValueError: If theme_offset is not between 0 and 1.
-        """
-
-        if offset < 0 or offset > 1:
-            raise ValueError("theme_offset must be between 0 and 1")
-
-        if theme is None:
-            app = QApplication.instance()
-            if hasattr(app, "theme"):
-                theme = app.theme.theme
-
-        if theme == "light":
-            min_pos = 0.0
-            max_pos = 1 - offset
-        else:
-            min_pos = 0.0 + offset
-            max_pos = 1.0
-
-        return min_pos, max_pos
-
-    @staticmethod
-    def evenly_spaced_colors(
-        colormap: str,
-        num: int,
-        format: Literal["QColor", "HEX", "RGB"] = "QColor",
-        theme_offset=0.2,
-        theme: Literal["light", "dark"] | None = None,
-    ) -> list:
-        """
-        Extract `num` colors from the specified colormap, evenly spaced along its range,
-        and return them in the specified format.
-
-        Args:
-            colormap (str): Name of the colormap.
-            num (int): Number of requested colors.
-            format (Literal["QColor","HEX","RGB"]): The format of the returned colors ('RGB', 'HEX', 'QColor').
-            theme_offset (float): Has to be between 0-1. Offset to avoid colors too close to white or black with light or dark theme respectively for pyqtgraph plot background.
-            theme (Literal['light', 'dark'] | None): The theme to be applied. Overrides the QApplication theme if specified.
-
-        Returns:
-            list: List of colors in the specified format.
-
-        Raises:
-            ValueError: If theme_offset is not between 0 and 1.
-        """
-        if theme_offset < 0 or theme_offset > 1:
-            raise ValueError("theme_offset must be between 0 and 1")
-
-        cmap = pg.colormap.get(colormap)
-        min_pos, max_pos = Colors.set_theme_offset(theme, theme_offset)
-
-        # Generate positions that are evenly spaced within the acceptable range
-        if num == 1:
-            positions = np.array([(min_pos + max_pos) / 2])
-        else:
-            positions = np.linspace(min_pos, max_pos, num)
-
-        # Sample colors from the colormap at the calculated positions
-        colors = cmap.map(positions, mode="float")
-        color_list = []
-
-        for color in colors:
-            if format.upper() == "HEX":
-                color_list.append(QColor.fromRgbF(*color).name())
-            elif format.upper() == "RGB":
-                color_list.append(tuple((np.array(color) * 255).astype(int)))
-            elif format.upper() == "QCOLOR":
-                color_list.append(QColor.fromRgbF(*color))
-            else:
-                raise ValueError("Unsupported format. Please choose 'RGB', 'HEX', or 'QColor'.")
-        return color_list
-
    @staticmethod
    def golden_angle_color(
-        colormap: str,
-        num: int,
-        format: Literal["QColor", "HEX", "RGB"] = "QColor",
-        theme_offset=0.2,
-        theme: Literal["dark", "light"] | None = None,
+        colormap: str, num: int, format: Literal["QColor", "HEX", "RGB"] = "QColor"
    ) -> list:
        """
        Extract num colors from the specified colormap following golden angle distribution and return them in the specified format.
@@ -207,39 +103,45 @@ class Colors:
            colormap (str): Name of the colormap.
            num (int): Number of requested colors.
            format (Literal["QColor","HEX","RGB"]): The format of the returned colors ('RGB', 'HEX', 'QColor').
-            theme_offset (float): Has to be between 0-1. Offset to avoid colors too close to white or black with light or dark theme respectively for pyqtgraph plot background.

        Returns:
            list: List of colors in the specified format.

        Raises:
-            ValueError: If theme_offset is not between 0 and 1.
+            ValueError: If the number of requested colors is greater than the number of colors in the colormap.
        """
-
        cmap = pg.colormap.get(colormap)
-        phi = (1 + np.sqrt(5)) / 2  # Golden ratio
-        golden_angle_conjugate = 1 - (1 / phi)  # Approximately 0.38196601125
+        cmap_colors = cmap.getColors(mode="float")
+        if num > len(cmap_colors):
+            raise ValueError(
+                f"Number of colors requested ({num}) is greater than the number of colors in the colormap ({len(cmap_colors)})"
+            )
+        angles = Colors.golden_ratio(len(cmap_colors))
+        color_selection = np.round(np.interp(angles, (-np.pi, np.pi), (0, len(cmap_colors))))
+        colors = []
+        ii = 0
+        while len(colors) < num:
+            color_index = int(color_selection[ii])
+            color = cmap_colors[color_index]
+            app = QApplication.instance()
+            if hasattr(app, "theme") and app.theme["theme"] == "light":
+                background = 255
+            else:
+                background = 0
+            if np.abs(np.mean(color[:3] * 255) - background) < 50:
+                ii += 1
+                continue

-        min_pos, max_pos = Colors.set_theme_offset(theme, theme_offset)
-
-        # Generate positions within the acceptable range
-        positions = np.mod(np.arange(num) * golden_angle_conjugate, 1)
-        positions = min_pos + positions * (max_pos - min_pos)
-
-        # Sample colors from the colormap at the calculated positions
-        colors = cmap.map(positions, mode="float")
-        color_list = []
-
-        for color in colors:
            if format.upper() == "HEX":
-                color_list.append(QColor.fromRgbF(*color).name())
+                colors.append(QColor.fromRgbF(*color).name())
            elif format.upper() == "RGB":
-                color_list.append(tuple((np.array(color) * 255).astype(int)))
+                colors.append(tuple((np.array(color) * 255).astype(int)))
            elif format.upper() == "QCOLOR":
-                color_list.append(QColor.fromRgbF(*color))
+                colors.append(QColor.fromRgbF(*color))
            else:
                raise ValueError("Unsupported format. Please choose 'RGB', 'HEX', or 'QColor'.")
-        return color_list
+            ii += 1
+        return colors

    @staticmethod
    def hex_to_rgba(hex_color: str, alpha=255) -> tuple:
@@ -468,7 +370,7 @@ class Colors:
            return color

    @staticmethod
-    def validate_color_map(color_map: str, return_error: bool = True) -> str | bool:
+    def validate_color_map(color_map: str) -> str:
        """
        Validate the colormap input if it is supported by pyqtgraph. Can be used in any pydantic model as a field validator. If validation fails it prints all available colormaps from pyqtgraph instance.

@@ -476,24 +378,13 @@ class Colors:
            color_map(str): The colormap to be validated.

        Returns:
-            str: The validated colormap, if colormap is valid.
-            bool: False, if colormap is invalid.
-
-        Raises:
-            PydanticCustomError: If colormap is invalid.
+            str: The validated colormap.
        """
-        available_pg_maps = pg.colormap.listMaps()
-        available_mpl_maps = pg.colormap.listMaps("matplotlib")
-        available_mpl_colorcet = pg.colormap.listMaps("colorcet")
-
-        available_colormaps = available_pg_maps + available_mpl_maps + available_mpl_colorcet
+        available_colormaps = pg.colormap.listMaps()
        if color_map not in available_colormaps:
-            if return_error:
-                raise PydanticCustomError(
-                    "unsupported colormap",
-                    f"Colormap '{color_map}' not found in the current installation of pyqtgraph. Choose on the following: {available_colormaps}.",
-                    {"wrong_value": color_map},
-                )
-            else:
-                return False
+            raise PydanticCustomError(
+                "unsupported colormap",
+                f"Colormap '{color_map}' not found in the current installation of pyqtgraph. Choose on the following: {available_colormaps}.",
+                {"wrong_value": color_map},
+            )
        return color_map
--- a/bec_widgets/utils/crosshair.py
+++ b/bec_widgets/utils/crosshair.py
@@ -2,34 +2,21 @@ from collections import defaultdict

 import numpy as np
 import pyqtgraph as pg
-from qtpy.QtCore import QObject, Qt, Signal, Slot
-from qtpy.QtWidgets import QApplication

-
-class CrosshairScatterItem(pg.ScatterPlotItem):
-    def setDownsampling(self, ds=None, auto=None, method=None):
-        pass
-
-    def setClipToView(self, state):
-        pass
-
-    def setAlpha(self, *args, **kwargs):
-        pass
+# from qtpy.QtCore import QObject, pyqtSignal
+from qtpy.QtCore import QObject, Qt
+from qtpy.QtCore import Signal as pyqtSignal


 class Crosshair(QObject):
-    # QT Position of mouse cursor
-    positionChanged = Signal(tuple)
-    positionClicked = Signal(tuple)
-    # Plain crosshair position signals mapped to real coordinates
-    crosshairChanged = Signal(tuple)
-    crosshairClicked = Signal(tuple)
+    positionChanged = pyqtSignal(tuple)
+    positionClicked = pyqtSignal(tuple)
    # Signal for 1D plot
-    coordinatesChanged1D = Signal(tuple)
-    coordinatesClicked1D = Signal(tuple)
+    coordinatesChanged1D = pyqtSignal(tuple)
+    coordinatesClicked1D = pyqtSignal(tuple)
    # Signal for 2D plot
-    coordinatesChanged2D = Signal(tuple)
-    coordinatesClicked2D = Signal(tuple)
+    coordinatesChanged2D = pyqtSignal(tuple)
+    coordinatesClicked2D = pyqtSignal(tuple)

    def __init__(self, plot_item: pg.PlotItem, precision: int = 3, parent=None):
        """
@@ -50,147 +37,51 @@ class Crosshair(QObject):
        self.v_line.skip_auto_range = True
        self.h_line = pg.InfiniteLine(angle=0, movable=False)
        self.h_line.skip_auto_range = True
-        # Add custom attribute to identify crosshair lines
-        self.v_line.is_crosshair = True
-        self.h_line.is_crosshair = True
        self.plot_item.addItem(self.v_line, ignoreBounds=True)
        self.plot_item.addItem(self.h_line, ignoreBounds=True)
-
-        # Initialize highlighted curve in a case of multiple curves
-        self.highlighted_curve_index = None
-
-        # Add TextItem to display coordinates
-        self.coord_label = pg.TextItem("", anchor=(1, 1), fill=(0, 0, 0, 100))
-        self.coord_label.setVisible(False)  # Hide initially
-        self.coord_label.skip_auto_range = True
-        self.plot_item.addItem(self.coord_label)
-
-        # Signals to connect
        self.proxy = pg.SignalProxy(
            self.plot_item.scene().sigMouseMoved, rateLimit=60, slot=self.mouse_moved
        )
-        self.positionChanged.connect(self.update_coord_label)
        self.plot_item.scene().sigMouseClicked.connect(self.mouse_clicked)

-        # Connect signals from pyqtgraph right click menu
        self.plot_item.ctrl.derivativeCheck.checkStateChanged.connect(self.check_derivatives)
        self.plot_item.ctrl.logXCheck.checkStateChanged.connect(self.check_log)
        self.plot_item.ctrl.logYCheck.checkStateChanged.connect(self.check_log)
-        self.plot_item.ctrl.downsampleSpin.valueChanged.connect(self.clear_markers)

        # Initialize markers
-        self.items = []
        self.marker_moved_1d = {}
        self.marker_clicked_1d = {}
        self.marker_2d = None
        self.update_markers()
-        self.check_log()
-        self.check_derivatives()
-
-        self._connect_to_theme_change()
-
-    def _connect_to_theme_change(self):
-        """Connect to the theme change signal."""
-        qapp = QApplication.instance()
-        if hasattr(qapp, "theme_signal"):
-            qapp.theme_signal.theme_updated.connect(self._update_theme)
-            self._update_theme()
-
-    @Slot(str)
-    def _update_theme(self, theme: str | None = None):
-        """Update the theme."""
-        if theme is None:
-            qapp = QApplication.instance()
-            if hasattr(qapp, "theme"):
-                theme = qapp.theme.theme
-            else:
-                theme = "dark"
-        self.apply_theme(theme)
-
-    def apply_theme(self, theme: str):
-        """Apply the theme to the plot."""
-        if theme == "dark":
-            text_color = "w"
-            label_bg_color = (50, 50, 50, 150)
-        elif theme == "light":
-            text_color = "k"
-            label_bg_color = (240, 240, 240, 150)
-        else:
-            text_color = "w"
-            label_bg_color = (50, 50, 50, 150)
-
-        self.coord_label.setColor(text_color)
-        self.coord_label.fill = pg.mkBrush(label_bg_color)
-        self.coord_label.border = pg.mkPen(None)
-
-    @Slot(int)
-    def update_highlighted_curve(self, curve_index: int):
-        """
-        Update the highlighted curve in the case of multiple curves in a plot item.
-
-        Args:
-            curve_index(int): The index of curve to highlight
-        """
-        self.highlighted_curve_index = curve_index
-        self.clear_markers()
-        self.update_markers()

    def update_markers(self):
        """Update the markers for the crosshair, creating new ones if necessary."""

-        if self.highlighted_curve_index is not None and hasattr(self.plot_item, "visible_curves"):
-            # Focus on the highlighted curve only
-            self.items = [self.plot_item.visible_curves[self.highlighted_curve_index]]
-        else:
-            # Handle all curves
-            self.items = self.plot_item.items
-
-        # Create or update markers
-        for item in self.items:
+        # Create new markers
+        for item in self.plot_item.items:
            if isinstance(item, pg.PlotDataItem):  # 1D plot
+                if item.name() in self.marker_moved_1d:
+                    continue
                pen = item.opts["pen"]
                color = pen.color() if hasattr(pen, "color") else pg.mkColor(pen)
-                name = item.name() or str(id(item))
-                if name in self.marker_moved_1d:
-                    # Update existing markers
-                    marker_moved = self.marker_moved_1d[name]
-                    marker_moved.setPen(pg.mkPen(color))
-                    # Update clicked markers' brushes
-                    for marker_clicked in self.marker_clicked_1d[name]:
-                        alpha = marker_clicked.opts["brush"].color().alpha()
-                        marker_clicked.setBrush(
-                            pg.mkBrush(color.red(), color.green(), color.blue(), alpha)
-                        )
-                    # Update z-values
-                    marker_moved.setZValue(item.zValue() + 1)
-                    for marker_clicked in self.marker_clicked_1d[name]:
-                        marker_clicked.setZValue(item.zValue() + 1)
-                else:
-                    # Create new markers
-                    marker_moved = CrosshairScatterItem(
-                        size=10, pen=pg.mkPen(color), brush=pg.mkBrush(None)
-                    )
-                    marker_moved.skip_auto_range = True
-                    marker_moved.is_crosshair = True
-                    self.marker_moved_1d[name] = marker_moved
-                    self.plot_item.addItem(marker_moved)
-                    # Set marker z-value higher than the curve
-                    marker_moved.setZValue(item.zValue() + 1)
+                marker_moved = pg.ScatterPlotItem(
+                    size=10, pen=pg.mkPen(color), brush=pg.mkBrush(None)
+                )
+                marker_moved.skip_auto_range = True
+                self.marker_moved_1d[item.name()] = marker_moved
+                self.plot_item.addItem(marker_moved)
+
+                # Create glowing effect markers for clicked events
+                for size, alpha in [(18, 64), (14, 128), (10, 255)]:
+                    marker_clicked = pg.ScatterPlotItem(
+                        size=size,
+                        pen=pg.mkPen(None),
+                        brush=pg.mkBrush(color.red(), color.green(), color.blue(), alpha),
+                    )
+                    marker_clicked.skip_auto_range = True
+                    self.marker_clicked_1d[item.name()] = marker_clicked
+                    self.plot_item.addItem(marker_clicked)

-                    # Create glowing effect markers for clicked events
-                    marker_clicked_list = []
-                    for size, alpha in [(18, 64), (14, 128), (10, 255)]:
-                        marker_clicked = CrosshairScatterItem(
-                            size=size,
-                            pen=pg.mkPen(None),
-                            brush=pg.mkBrush(color.red(), color.green(), color.blue(), alpha),
-                        )
-                        marker_clicked.skip_auto_range = True
-                        marker_clicked.is_crosshair = True
-                        self.plot_item.addItem(marker_clicked)
-                        marker_clicked.setZValue(item.zValue() + 1)
-                        marker_clicked_list.append(marker_clicked)
-                    self.marker_clicked_1d[name] = marker_clicked_list
            elif isinstance(item, pg.ImageItem):  # 2D plot
                if self.marker_2d is not None:
                    continue
@@ -212,11 +103,12 @@ class Crosshair(QObject):
        """
        y_values = defaultdict(list)
        x_values = defaultdict(list)
+        image_2d = None

        # Iterate through items in the plot
-        for item in self.items:
+        for item in self.plot_item.items:
            if isinstance(item, pg.PlotDataItem):  # 1D plot
-                name = item.name() or str(id(item))
+                name = item.name()
                plot_data = item._getDisplayDataset()
                if plot_data is None:
                    continue
@@ -237,7 +129,7 @@ class Crosshair(QObject):
            elif isinstance(item, pg.ImageItem):  # 2D plot
                name = item.config.monitor
                image_2d = item.image
-                # Clip the x and y values to the image dimensions to avoid out of bounds errors
+                # clip the x and y values to the image dimensions to avoid out of bounds errors
                y_values[name] = int(np.clip(y, 0, image_2d.shape[1] - 1))
                x_values[name] = int(np.clip(x, 0, image_2d.shape[0] - 1))

@@ -250,34 +142,21 @@ class Crosshair(QObject):

        return None, None

-    def closest_x_y_value(self, input_x: float, list_x: list, list_y: list) -> tuple:
+    def closest_x_y_value(self, input_value: float, list_x: list, list_y: list) -> tuple:
        """
        Find the closest x and y value to the input value.

        Args:
-            input_x (float): Input value
+            input_value (float): Input value
            list_x (list): List of x values
            list_y (list): List of y values

        Returns:
            tuple: Closest x and y value
        """
-        # Convert lists to NumPy arrays
-        arr_x = np.asarray(list_x)
-
-        # Get the indices where x is not NaN
-        valid_indices = ~np.isnan(arr_x)
-
-        # Filter x array to exclude NaN values
-        filtered_x = arr_x[valid_indices]
-
-        # Find the index of the closest value in the filtered x array
-        closest_index = np.abs(filtered_x - input_x).argmin()
-
-        # Map back to the original index in the list_x and list_y arrays
-        original_index = np.where(valid_indices)[0][closest_index]
-
-        return list_x[original_index], list_y[original_index]
+        arr = np.asarray(list_x)
+        i = (np.abs(arr - input_value)).argmin()
+        return list_x[i], list_y[i]

    def mouse_moved(self, event):
        """Handles the mouse moved event, updating the crosshair position and emitting signals.
@@ -287,15 +166,17 @@ class Crosshair(QObject):
        """
        pos = event[0]
        self.update_markers()
+        self.positionChanged.emit((pos.x(), pos.y()))
        if self.plot_item.vb.sceneBoundingRect().contains(pos):
            mouse_point = self.plot_item.vb.mapSceneToView(pos)
-            x, y = mouse_point.x(), mouse_point.y()
-            self.v_line.setPos(x)
-            self.h_line.setPos(y)
-            scaled_x, scaled_y = self.scale_emitted_coordinates(mouse_point.x(), mouse_point.y())
-            self.crosshairChanged.emit((scaled_x, scaled_y))
-            self.positionChanged.emit((x, y))
+            self.v_line.setPos(mouse_point.x())
+            self.h_line.setPos(mouse_point.y())

+            x, y = mouse_point.x(), mouse_point.y()
+            if self.is_log_x:
+                x = 10**x
+            if self.is_log_y:
+                y = 10**y
            x_snap_values, y_snap_values = self.snap_to_data(x, y)
            if x_snap_values is None or y_snap_values is None:
                return
@@ -305,19 +186,14 @@ class Crosshair(QObject):
                # not sure how we got here, but just to be safe...
                return

-            for item in self.items:
+            for item in self.plot_item.items:
                if isinstance(item, pg.PlotDataItem):
-                    name = item.name() or str(id(item))
+                    name = item.name()
                    x, y = x_snap_values[name], y_snap_values[name]
                    if x is None or y is None:
                        continue
                    self.marker_moved_1d[name].setData([x], [y])
-                    x_snapped_scaled, y_snapped_scaled = self.scale_emitted_coordinates(x, y)
-                    coordinate_to_emit = (
-                        name,
-                        round(x_snapped_scaled, self.precision),
-                        round(y_snapped_scaled, self.precision),
-                    )
+                    coordinate_to_emit = (name, round(x, self.precision), round(y, self.precision))
                    self.coordinatesChanged1D.emit(coordinate_to_emit)
                elif isinstance(item, pg.ImageItem):
                    name = item.config.monitor
@@ -344,10 +220,12 @@ class Crosshair(QObject):
        if self.plot_item.vb.sceneBoundingRect().contains(event._scenePos):
            mouse_point = self.plot_item.vb.mapSceneToView(event._scenePos)
            x, y = mouse_point.x(), mouse_point.y()
-            scaled_x, scaled_y = self.scale_emitted_coordinates(mouse_point.x(), mouse_point.y())
-            self.crosshairClicked.emit((scaled_x, scaled_y))
            self.positionClicked.emit((x, y))

+            if self.is_log_x:
+                x = 10**x
+            if self.is_log_y:
+                y = 10**y
            x_snap_values, y_snap_values = self.snap_to_data(x, y)

            if x_snap_values is None or y_snap_values is None:
@@ -358,20 +236,14 @@ class Crosshair(QObject):
                # not sure how we got here, but just to be safe...
                return

-            for item in self.items:
+            for item in self.plot_item.items:
                if isinstance(item, pg.PlotDataItem):
-                    name = item.name() or str(id(item))
+                    name = item.name()
                    x, y = x_snap_values[name], y_snap_values[name]
                    if x is None or y is None:
                        continue
-                    for marker_clicked in self.marker_clicked_1d[name]:
-                        marker_clicked.setData([x], [y])
-                    x_snapped_scaled, y_snapped_scaled = self.scale_emitted_coordinates(x, y)
-                    coordinate_to_emit = (
-                        name,
-                        round(x_snapped_scaled, self.precision),
-                        round(y_snapped_scaled, self.precision),
-                    )
+                    self.marker_clicked_1d[name].setData([x], [y])
+                    coordinate_to_emit = (name, round(x, self.precision), round(y, self.precision))
                    self.coordinatesClicked1D.emit(coordinate_to_emit)
                elif isinstance(item, pg.ImageItem):
                    name = item.config.monitor
@@ -387,47 +259,14 @@ class Crosshair(QObject):
    def clear_markers(self):
        """Clears the markers from the plot."""
        for marker in self.marker_moved_1d.values():
-            self.plot_item.removeItem(marker)
-        for markers in self.marker_clicked_1d.values():
-            for marker in markers:
-                self.plot_item.removeItem(marker)
-        self.marker_moved_1d.clear()
-        self.marker_clicked_1d.clear()
-
-    def scale_emitted_coordinates(self, x, y):
-        """Scales the emitted coordinates if the axes are in log scale.
-
-        Args:
-            x (float): The x-coordinate
-            y (float): The y-coordinate
-
-        Returns:
-            tuple: The scaled x and y coordinates
-        """
-        if self.is_log_x:
-            x = 10**x
-        if self.is_log_y:
-            y = 10**y
-        return x, y
-
-    def update_coord_label(self, pos: tuple):
-        """Updates the coordinate label based on the crosshair position and axis scales.
-
-        Args:
-            pos (tuple): The (x, y) position of the crosshair.
-        """
-        x, y = pos
-        x_scaled, y_scaled = self.scale_emitted_coordinates(x, y)
-
-        # Update coordinate label
-        self.coord_label.setText(f"({x_scaled:.{self.precision}g}, {y_scaled:.{self.precision}g})")
-        self.coord_label.setPos(x, y)
-        self.coord_label.setVisible(True)
+            marker.clear()
+        for marker in self.marker_clicked_1d.values():
+            marker.clear()

    def check_log(self):
        """Checks if the x or y axis is in log scale and updates the internal state accordingly."""
-        self.is_log_x = self.plot_item.axes["bottom"]["item"].logMode
-        self.is_log_y = self.plot_item.axes["left"]["item"].logMode
+        self.is_log_x = self.plot_item.ctrl.logXCheck.isChecked()
+        self.is_log_y = self.plot_item.ctrl.logYCheck.isChecked()
        self.clear_markers()

    def check_derivatives(self):
@@ -436,8 +275,6 @@ class Crosshair(QObject):
        self.clear_markers()

    def cleanup(self):
-        self.plot_item.removeItem(self.v_line)
-        self.plot_item.removeItem(self.h_line)
-        self.plot_item.removeItem(self.coord_label)
-
+        self.v_line.deleteLater()
+        self.h_line.deleteLater()
        self.clear_markers()
--- a/bec_widgets/utils/filter_io.py
+++ b/bec_widgets/utils/filter_io.py
@@ -1,156 +0,0 @@
-"""Module for handling filter I/O operations in BEC Widgets for input fields.
-These operations include filtering device/signal names and/or device types.
-"""
-
-from abc import ABC, abstractmethod
-
-from bec_lib.logger import bec_logger
-from qtpy.QtCore import QStringListModel
-from qtpy.QtWidgets import QComboBox, QCompleter, QLineEdit
-
-logger = bec_logger.logger
-
-
-class WidgetFilterHandler(ABC):
-    """Abstract base class for widget filter handlers"""
-
-    @abstractmethod
-    def set_selection(self, widget, selection: list) -> None:
-        """Set the filtered_selection for the widget
-
-        Args:
-            selection (list): Filtered selection of items
-        """
-
-    @abstractmethod
-    def check_input(self, widget, text: str) -> bool:
-        """Check if the input text is in the filtered selection
-
-        Args:
-            widget: Widget instance
-            text (str): Input text
-
-        Returns:
-            bool: True if the input text is in the filtered selection
-        """
-
-
-class LineEditFilterHandler(WidgetFilterHandler):
-    """Handler for QLineEdit widget"""
-
-    def set_selection(self, widget: QLineEdit, selection: list) -> None:
-        """Set the selection for the widget to the completer model
-
-        Args:
-            widget (QLineEdit): The QLineEdit widget
-            selection (list): Filtered selection of items
-        """
-        if not isinstance(widget.completer, QCompleter):
-            completer = QCompleter(widget)
-            widget.setCompleter(completer)
-        widget.completer.setModel(QStringListModel(selection, widget))
-
-    def check_input(self, widget: QLineEdit, text: str) -> bool:
-        """Check if the input text is in the filtered selection
-
-        Args:
-            widget (QLineEdit): The QLineEdit widget
-            text (str): Input text
-
-        Returns:
-            bool: True if the input text is in the filtered selection
-        """
-        model = widget.completer.model()
-        model_data = [model.data(model.index(i)) for i in range(model.rowCount())]
-        return text in model_data
-
-
-class ComboBoxFilterHandler(WidgetFilterHandler):
-    """Handler for QComboBox widget"""
-
-    def set_selection(self, widget: QComboBox, selection: list) -> None:
-        """Set the selection for the widget to the completer model
-
-        Args:
-            widget (QComboBox): The QComboBox widget
-            selection (list): Filtered selection of items
-        """
-        widget.clear()
-        widget.addItems(selection)
-
-    def check_input(self, widget: QComboBox, text: str) -> bool:
-        """Check if the input text is in the filtered selection
-
-        Args:
-            widget (QComboBox): The QComboBox widget
-            text (str): Input text
-
-        Returns:
-            bool: True if the input text is in the filtered selection
-        """
-        return text in [widget.itemText(i) for i in range(widget.count())]
-
-
-class FilterIO:
-    """Public interface to set filters for input widgets.
-    It supports the list of widgets stored in class attribute _handlers.
-    """
-
-    _handlers = {QLineEdit: LineEditFilterHandler, QComboBox: ComboBoxFilterHandler}
-
-    @staticmethod
-    def set_selection(widget, selection: list, ignore_errors=True):
-        """
-        Retrieve value from the widget instance.
-
-        Args:
-            widget: Widget instance.
-            selection(list): List of filtered selection items.
-            ignore_errors(bool, optional): Whether to ignore if no handler is found.
-        """
-        handler_class = FilterIO._find_handler(widget)
-        if handler_class:
-            return handler_class().set_selection(widget=widget, selection=selection)
-        if not ignore_errors:
-            raise ValueError(
-                f"No matching handler for widget type: {type(widget)} in handler list {FilterIO._handlers}"
-            )
-        return None
-
-    @staticmethod
-    def check_input(widget, text: str, ignore_errors=True):
-        """
-        Check if the input text is in the filtered selection.
-
-        Args:
-            widget: Widget instance.
-            text(str): Input text.
-            ignore_errors(bool, optional): Whether to ignore if no handler is found.
-
-        Returns:
-            bool: True if the input text is in the filtered selection.
-        """
-        handler_class = FilterIO._find_handler(widget)
-        if handler_class:
-            return handler_class().check_input(widget=widget, text=text)
-        if not ignore_errors:
-            raise ValueError(
-                f"No matching handler for widget type: {type(widget)} in handler list {FilterIO._handlers}"
-            )
-        return None
-
-    @staticmethod
-    def _find_handler(widget):
-        """
-        Find the appropriate handler for the widget by checking its base classes.
-
-        Args:
-            widget: Widget instance.
-
-        Returns:
-            handler_class: The handler class if found, otherwise None.
-        """
-        for base in type(widget).__mro__:
-            if base in FilterIO._handlers:
-                return FilterIO._handlers[base]
-        return None
--- a/bec_widgets/utils/fps_counter.py
+++ b/bec_widgets/utils/fps_counter.py
@@ -1,84 +0,0 @@
-"""
-This module provides a utility class for counting and reporting frames per second (FPS) in a PyQtGraph application.
-
-Classes:
-    FPSCounter: A class that monitors the paint events of a `ViewBox` to calculate and emit FPS values.
-
-Usage:
-    The `FPSCounter` class can be used to monitor the rendering performance of a `ViewBox` in a PyQtGraph application.
-    It connects to the `ViewBox`'s paint event and calculates the FPS over a specified interval, emitting the FPS value
-    at regular intervals.
-
-Example:
-    from qtpy import QtWidgets, QtCore
-    import pyqtgraph as pg
-    from fps_counter import FPSCounter
-
-    app = pg.mkQApp("FPS Counter Example")
-    win = pg.GraphicsLayoutWidget()
-    win.show()
-
-    vb = pg.ViewBox()
-    plot_item = pg.PlotItem(viewBox=vb)
-    win.addItem(plot_item)
-
-    fps_counter = FPSCounter(vb)
-    fps_counter.sigFpsUpdate.connect(lambda fps: print(f"FPS: {fps:.2f}"))
-
-    sys.exit(app.exec_())
-"""
-
-from time import perf_counter
-
-import pyqtgraph as pg
-from qtpy import QtCore
-
-
-class FPSCounter(QtCore.QObject):
-    """
-    A utility class for counting and reporting frames per second (FPS).
-
-    This class connects to a `ViewBox`'s paint event to count the number of
-    frames rendered and calculates the FPS over a specified interval. It emits
-    a signal with the FPS value at regular intervals.
-
-    Attributes:
-        sigFpsUpdate (QtCore.Signal): Signal emitted with the FPS value.
-        view_box (pg.ViewBox): The `ViewBox` instance to monitor.
-    """
-
-    sigFpsUpdate = QtCore.Signal(float)
-
-    def __init__(self, view_box):
-        super().__init__()
-        self.view_box = view_box
-        self.view_box.sigPaint.connect(self.increment_count)
-        self.count = 0
-        self.last_update = perf_counter()
-        self.timer = QtCore.QTimer()
-        self.timer.timeout.connect(self.calculate_fps)
-        self.timer.start(1000)
-
-    def increment_count(self):
-        """
-        Increment the frame count when the `ViewBox` is painted.
-        """
-        self.count += 1
-
-    def calculate_fps(self):
-        """
-        Calculate the frames per second (FPS) based on the number of frames
-        """
-        now = perf_counter()
-        elapsed = now - self.last_update
-        fps = self.count / elapsed if elapsed > 0 else 0.0
-        self.last_update = now
-        self.count = 0
-        self.sigFpsUpdate.emit(fps)
-
-    def cleanup(self):
-        """
-        Clean up the FPS counter by stopping the timer and disconnecting the signal.
-        """
-        self.timer.stop()
-        self.timer.timeout.disconnect(self.calculate_fps)
--- a/bec_widgets/utils/generate_designer_plugin.py
+++ b/bec_widgets/utils/generate_designer_plugin.py
@@ -143,7 +143,7 @@ class DesignerPluginGenerator:

 if __name__ == "__main__":  # pragma: no cover
    # from bec_widgets.widgets.bec_queue.bec_queue import BECQueue
-    from bec_widgets.widgets.utility.spinner import SpinnerWidget
+    from bec_widgets.widgets.spinner.spinner import SpinnerWidget

    generator = DesignerPluginGenerator(SpinnerWidget)
    generator.run(validate=False)
--- a/bec_widgets/utils/linear_region_selector.py
+++ b/bec_widgets/utils/linear_region_selector.py
@@ -1,84 +0,0 @@
-""" Module for a thin wrapper (LinearRegionWrapper) around the LinearRegionItem in pyqtgraph.
-The class is mainly designed for usage with the BECWaveform and 1D plots. """
-
-import pyqtgraph as pg
-from qtpy.QtCore import QObject, Signal, Slot
-from qtpy.QtGui import QColor
-
-
-class LinearRegionWrapper(QObject):
-    """Wrapper class for the LinearRegionItem in pyqtgraph for 1D plots (BECWaveform)
-
-    Args:
-        plot_item (pg.PlotItem): The plot item to add the region selector to.
-        parent (QObject): The parent object.
-        color (QColor): The color of the region selector.
-        hover_color (QColor): The color of the region selector when the mouse is over it.
-    """
-
-    # Signal with the region tuble (start, end)
-    region_changed = Signal(tuple)
-
-    def __init__(
-        self, plot_item: pg.PlotItem, color: QColor = None, hover_color: QColor = None, parent=None
-    ):
-        super().__init__(parent)
-        self.is_log_x = None
-        self._edge_width = 2
-        self.plot_item = plot_item
-        self.linear_region_selector = pg.LinearRegionItem()
-        self.proxy = None
-        self.change_roi_color((color, hover_color))
-        self.plot_item.ctrl.logXCheck.checkStateChanged.connect(self.check_log)
-        self.plot_item.ctrl.logYCheck.checkStateChanged.connect(self.check_log)
-
-    # Slot for changing the color of the region selector (edge and fill)
-    @Slot(tuple)
-    def change_roi_color(self, colors: tuple[QColor | str | tuple, QColor | str | tuple]):
-        """Change the color and hover color of the region selector.
-        Hover color means the color when the mouse is over the region.
-
-        Args:
-            colors (tuple): Tuple with the color and hover color
-        """
-        color, hover_color = colors
-        if color is not None:
-            self.linear_region_selector.setBrush(pg.mkBrush(color))
-        if hover_color is not None:
-            self.linear_region_selector.setHoverBrush(pg.mkBrush(hover_color))
-
-    @Slot()
-    def add_region_selector(self):
-        """Add the region selector to the plot item"""
-        self.plot_item.addItem(self.linear_region_selector)
-        # Use proxy to limit the update rate of the region change signal to 10Hz
-        self.proxy = pg.SignalProxy(
-            self.linear_region_selector.sigRegionChanged,
-            rateLimit=10,
-            slot=self._region_change_proxy,
-        )
-
-    @Slot()
-    def remove_region_selector(self):
-        """Remove the region selector from the plot item"""
-        self.proxy.disconnect()
-        self.proxy = None
-        self.plot_item.removeItem(self.linear_region_selector)
-
-    def _region_change_proxy(self):
-        """Emit the region change signal. If the plot is in log mode, convert the region to log."""
-        x_low, x_high = self.linear_region_selector.getRegion()
-        if self.is_log_x:
-            x_low = 10**x_low
-            x_high = 10**x_high
-        self.region_changed.emit((x_low, x_high))
-
-    @Slot()
-    def check_log(self):
-        """Check if the plot is in log mode."""
-        self.is_log_x = self.plot_item.ctrl.logXCheck.isChecked()
-        self.is_log_y = self.plot_item.ctrl.logYCheck.isChecked()
-
-    def cleanup(self):
-        """Cleanup the widget."""
-        self.remove_region_selector()
--- a/bec_widgets/utils/ophyd_kind_util.py
+++ b/bec_widgets/utils/ophyd_kind_util.py
@@ -1,26 +0,0 @@
-from enum import IntFlag
-
-try:
-
-    from enum import KEEP
-
-    class IFBase(IntFlag, boundary=KEEP): ...
-
-except ImportError:
-
-    IFBase = IntFlag
-
-
-class Kind(IFBase):
-    """
-    This is used in the .kind attribute of all OphydObj (Signals, Devices).
-
-    A Device examines its components' .kind atttribute to decide whether to
-    traverse it in read(), read_configuration(), or neither. Additionally, if
-    decides whether to include its name in `hints['fields']`.
-    """
-
-    omitted = 0b000
-    normal = 0b001
-    config = 0b010
-    hinted = 0b101  # Notice that bool(hinted & normal) is True.
--- a/bec_widgets/utils/plot_indicator_items.py
+++ b/bec_widgets/utils/plot_indicator_items.py
@@ -1,247 +0,0 @@
-"""Module to create an arrow item for a pyqtgraph plot"""
-
-import numpy as np
-import pyqtgraph as pg
-from bec_lib.logger import bec_logger
-from qtpy.QtCore import QObject, QPointF, Signal, Slot
-
-from bec_widgets.utils.colors import get_accent_colors
-
-logger = bec_logger.logger
-
-
-class BECIndicatorItem(QObject):
-
-    def __init__(self, plot_item: pg.PlotItem = None, parent=None):
-        super().__init__(parent=parent)
-        self.accent_colors = get_accent_colors()
-        self.plot_item = plot_item
-        self._item_on_plot = False
-        self._pos = None
-        self.is_log_x = False
-        self.is_log_y = False
-
-    @property
-    def item_on_plot(self) -> bool:
-        """Returns if the item is on the plot"""
-        return self._item_on_plot
-
-    @item_on_plot.setter
-    def item_on_plot(self, value: bool) -> None:
-        self._item_on_plot = value
-
-    def add_to_plot(self) -> None:
-        """Add the item to the plot"""
-        raise NotImplementedError("Method add_to_plot not implemented")
-
-    def remove_from_plot(self) -> None:
-        """Remove the item from the plot"""
-        raise NotImplementedError("Method remove_from_plot not implemented")
-
-    def set_position(self, pos) -> None:
-        """This method should implement the logic to set the position of the
-        item on the plot. Depending on the child class, the position can be
-        a tuple (x,y) or a single value, i.e. x position where y position is fixed.
-        """
-        raise NotImplementedError("Method set_position not implemented")
-
-    def check_log(self):
-        """Checks if the x or y axis is in log scale and updates the internal state accordingly."""
-        self.is_log_x = self.plot_item.ctrl.logXCheck.isChecked()
-        self.is_log_y = self.plot_item.ctrl.logYCheck.isChecked()
-        self.set_position(self._pos)
-
-
-class BECTickItem(BECIndicatorItem):
-    """Class to create a tick item which can be added to a pyqtgraph plot.
-    The tick item will be added to the layout of the plot item and can be used to indicate
-    a position"""
-
-    position_changed = Signal(float)
-    position_changed_str = Signal(str)
-
-    def __init__(self, plot_item: pg.PlotItem = None, parent=None):
-        super().__init__(plot_item=plot_item, parent=parent)
-        self.tick_item = pg.TickSliderItem(
-            parent=parent, allowAdd=False, allowRemove=False, orientation="bottom"
-        )
-        self.tick_item.skip_auto_range = True
-        self.tick = None
-        self._pos = 0.0
-        self._range = [0, 1]
-
-    @Slot(float)
-    def set_position(self, pos: float) -> None:
-        """Set the x position of the tick item
-
-        Args:
-            pos (float): The position of the tick item.
-        """
-        if self.is_log_x is True:
-            pos = pos if pos > 0 else 1e-10
-            pos = np.log10(pos)
-        self._pos = pos
-        view_box = self.plot_item.getViewBox()  # Ensure you're accessing the correct view box
-        view_range = view_box.viewRange()[0]
-        self.update_range(self.plot_item.vb, view_range)
-        self.position_changed.emit(pos)
-        self.position_changed_str.emit(str(pos))
-
-    @Slot()
-    def update_range(self, _, view_range: tuple[float, float]) -> None:
-        """Update the range of the tick item
-
-        Args:
-            vb (pg.ViewBox): The view box.
-            viewRange (tuple): The view range.
-        """
-        if self._pos < view_range[0] or self._pos > view_range[1]:
-            self.tick_item.setVisible(False)
-        else:
-            self.tick_item.setVisible(True)
-
-        if self.tick_item.isVisible():
-            origin = self.tick_item.tickSize / 2.0
-            length = self.tick_item.length
-
-            length_with_padding = length + self.tick_item.tickSize + 2
-
-            self._range = view_range
-            tick_with_padding = (self._pos - view_range[0]) / (view_range[1] - view_range[0])
-            tick_value = (tick_with_padding * length_with_padding - origin) / length
-            self.tick_item.setTickValue(self.tick, tick_value)
-
-    def add_to_plot(self):
-        """Add the tick item to the view box or plot item."""
-        if self.plot_item is None:
-            return
-
-        self.plot_item.layout.addItem(self.tick_item, 2, 1)
-        self.tick_item.setOrientation("top")
-        self.tick = self.tick_item.addTick(0, movable=False, color=self.accent_colors.highlight)
-        self.update_tick_pos_y()
-        self.plot_item.vb.sigXRangeChanged.connect(self.update_range)
-        self.plot_item.ctrl.logXCheck.checkStateChanged.connect(self.check_log)
-        self.plot_item.ctrl.logYCheck.checkStateChanged.connect(self.check_log)
-        self.plot_item.vb.geometryChanged.connect(self.update_tick_pos_y)
-        self.item_on_plot = True
-
-    @Slot()
-    def update_tick_pos_y(self):
-        """Update tick position, while respecting the tick_item coordinates"""
-        pos = self.tick.pos()
-        pos = self.tick_item.mapToParent(pos)
-        new_pos = self.plot_item.vb.geometry().bottom()
-        new_pos = self.tick_item.mapFromParent(QPointF(pos.x(), new_pos))
-        self.tick.setPos(new_pos)
-
-    def remove_from_plot(self):
-        """Remove the tick item from the view box or plot item."""
-        if self.plot_item is not None and self.item_on_plot is True:
-            self.plot_item.vb.sigXRangeChanged.disconnect(self.update_range)
-            self.plot_item.ctrl.logXCheck.checkStateChanged.disconnect(self.check_log)
-            self.plot_item.ctrl.logYCheck.checkStateChanged.disconnect(self.check_log)
-            if self.plot_item.layout is not None:
-                self.plot_item.layout.removeItem(self.tick_item)
-        self.item_on_plot = False
-
-    def cleanup(self) -> None:
-        """Cleanup the item"""
-        self.remove_from_plot()
-        if self.tick_item is not None:
-            self.tick_item.close()
-            self.tick_item.deleteLater()
-            self.tick_item = None
-
-
-class BECArrowItem(BECIndicatorItem):
-    """Class to create an arrow item which can be added to a pyqtgraph plot.
-    It can be either added directly to a view box or a plot item.
-    To add the arrow item to a view box or plot item, use the add_to_plot method.
-
-    Args:
-        view_box (pg.ViewBox | pg.PlotItem): The view box or plot item to which the arrow item should be added.
-        parent (QObject): The parent object.
-
-    Signals:
-        position_changed (tuple[float, float]): Signal emitted when the position of the arrow item has changed.
-        position_changed_str (tuple[str, str]): Signal emitted when the position of the arrow item has changed.
-    """
-
-    # Signal to emit if the position of the arrow item has changed
-    position_changed = Signal(tuple)
-    position_changed_str = Signal(tuple)
-
-    def __init__(self, plot_item: pg.PlotItem = None, parent=None):
-        super().__init__(plot_item=plot_item, parent=parent)
-        self.arrow_item = pg.ArrowItem(parent=parent)
-        self.arrow_item.skip_auto_range = True
-        self._pos = (0, 0)
-        self.arrow_item.setVisible(False)
-
-    @Slot(dict)
-    def set_style(self, style: dict) -> None:
-        """Set the style of the arrow item
-
-        Args:
-            style (dict): The style of the arrow item. Dictionary with key,
-                          value pairs which are accepted from the pg.ArrowItem.setStyle method.
-        """
-        self.arrow_item.setStyle(**style)
-
-    @Slot(tuple)
-    def set_position(self, pos: tuple[float, float]) -> None:
-        """Set the position of the arrow item
-
-        Args:
-            pos (tuple): The position of the arrow item as a tuple (x, y).
-        """
-        self._pos = pos
-        pos_x = pos[0]
-        pos_y = pos[1]
-        if self.is_log_x is True:
-            pos_x = np.log10(pos_x) if pos_x > 0 else 1e-10
-            view_box = self.plot_item.getViewBox()  # Ensure you're accessing the correct view box
-            view_range = view_box.viewRange()[0]
-            # Avoid values outside the view range in the negative direction. Otherwise, there is
-            # a buggy behaviour of the arrow item and it appears at the wrong position.
-            if pos_x < view_range[0]:
-                pos_x = view_range[0]
-        if self.is_log_y is True:
-            pos_y = np.log10(pos_y) if pos_y > 0 else 1e-10
-
-        self.arrow_item.setPos(pos_x, pos_y)
-        self.position_changed.emit(self._pos)
-        self.position_changed_str.emit((str(self._pos[0]), str(self._pos[1])))
-
-    def add_to_plot(self):
-        """Add the arrow item to the view box or plot item."""
-        if not self.arrow_item:
-            logger.warning(f"Arrow item was already destroyed, cannot be created")
-            return
-
-        self.arrow_item.setStyle(
-            angle=-90,
-            pen=pg.mkPen(self.accent_colors.emergency, width=1),
-            brush=pg.mkBrush(self.accent_colors.highlight),
-            headLen=20,
-        )
-        self.arrow_item.setVisible(True)
-        if self.plot_item is not None:
-            self.plot_item.addItem(self.arrow_item)
-            self.plot_item.ctrl.logXCheck.checkStateChanged.connect(self.check_log)
-            self.plot_item.ctrl.logYCheck.checkStateChanged.connect(self.check_log)
-            self.item_on_plot = True
-
-    def remove_from_plot(self):
-        """Remove the arrow item from the view box or plot item."""
-        if self.plot_item is not None and self.item_on_plot is True:
-            self.plot_item.ctrl.logXCheck.checkStateChanged.disconnect(self.check_log)
-            self.plot_item.ctrl.logYCheck.checkStateChanged.disconnect(self.check_log)
-            self.plot_item.removeItem(self.arrow_item)
-        self.item_on_plot = False
-
-    def cleanup(self) -> None:
-        """Cleanup the item"""
-        self.remove_from_plot()
-        self.arrow_item = None
--- a/bec_widgets/utils/plugin_utils.py
+++ b/bec_widgets/utils/plugin_utils.py
@@ -53,7 +53,7 @@ class BECClassInfo:
    obj: type
    is_connector: bool = False
    is_widget: bool = False
-    is_plugin: bool = False
+    is_top_level: bool = False


 class BECClassContainer:
@@ -88,14 +88,14 @@ class BECClassContainer:
        """
        Get all top-level classes.
        """
-        return [info.obj for info in self.collection if info.is_plugin]
+        return [info.obj for info in self.collection if info.is_top_level]

    @property
    def plugins(self):
        """
        Get all plugins. These are all classes that are on the top level and are widgets.
        """
-        return [info.obj for info in self.collection if info.is_widget and info.is_plugin]
+        return [info.obj for info in self.collection if info.is_widget and info.is_top_level]

    @property
    def widgets(self):
@@ -109,17 +109,10 @@ class BECClassContainer:
        """
        Get all top-level classes that are RPC-enabled. These are all classes that users can choose from.
        """
-        return [info.obj for info in self.collection if info.is_plugin and info.is_connector]
-
-    @property
-    def classes(self):
-        """
-        Get all classes.
-        """
-        return [info.obj for info in self.collection]
+        return [info.obj for info in self.collection if info.is_top_level and info.is_connector]


-def get_custom_classes(repo_name: str) -> BECClassContainer:
+def get_rpc_classes(repo_name: str) -> BECClassContainer:
    """
    Get all RPC-enabled classes in the specified repository.

@@ -160,8 +153,6 @@ def get_custom_classes(repo_name: str) -> BECClassContainer:
                        issubclass(obj, QWidget) or issubclass(obj, QGraphicsWidget)
                    ):
                        class_info.is_top_level = True
-                    if hasattr(obj, "PLUGIN") and obj.PLUGIN:
-                        class_info.is_plugin = True
                    collection.add_class(class_info)

    return collection
--- a/bec_widgets/utils/ui_loader.py
+++ b/bec_widgets/utils/ui_loader.py
@@ -4,7 +4,7 @@ from qtpy import PYQT6, PYSIDE6, QT_VERSION
 from qtpy.QtCore import QFile, QIODevice

 from bec_widgets.utils.generate_designer_plugin import DesignerPluginInfo
-from bec_widgets.utils.plugin_utils import get_custom_classes
+from bec_widgets.utils.plugin_utils import get_rpc_classes

 if PYSIDE6:
    from PySide6.QtUiTools import QUiLoader
@@ -30,7 +30,7 @@ class UILoader:
    def __init__(self, parent=None):
        self.parent = parent

-        widgets = get_custom_classes("bec_widgets").classes
+        widgets = get_rpc_classes("bec_widgets").top_level_classes

        self.custom_widgets = {widget.__name__: widget for widget in widgets}

--- a/bec_widgets/utils/widget_io.py
+++ b/bec_widgets/utils/widget_io.py
@@ -1,6 +1,5 @@
 # pylint: disable=no-name-in-module
 from abc import ABC, abstractmethod
-from typing import Literal

 from qtpy.QtWidgets import (
    QApplication,
@@ -21,7 +20,7 @@ class WidgetHandler(ABC):
    """Abstract base class for all widget handlers."""

    @abstractmethod
-    def get_value(self, widget: QWidget, **kwargs):
+    def get_value(self, widget: QWidget):
        """Retrieve value from the widget instance."""

    @abstractmethod
@@ -32,7 +31,7 @@ class WidgetHandler(ABC):
 class LineEditHandler(WidgetHandler):
    """Handler for QLineEdit widgets."""

-    def get_value(self, widget: QLineEdit, **kwargs) -> str:
+    def get_value(self, widget: QLineEdit) -> str:
        return widget.text()

    def set_value(self, widget: QLineEdit, value: str) -> None:
@@ -42,9 +41,7 @@ class LineEditHandler(WidgetHandler):
 class ComboBoxHandler(WidgetHandler):
    """Handler for QComboBox widgets."""

-    def get_value(self, widget: QComboBox, as_string: bool = False, **kwargs) -> int | str:
-        if as_string is True:
-            return widget.currentText()
+    def get_value(self, widget: QComboBox) -> int:
        return widget.currentIndex()

    def set_value(self, widget: QComboBox, value: int | str) -> None:
@@ -57,7 +54,7 @@ class ComboBoxHandler(WidgetHandler):
 class TableWidgetHandler(WidgetHandler):
    """Handler for QTableWidget widgets."""

-    def get_value(self, widget: QTableWidget, **kwargs) -> list:
+    def get_value(self, widget: QTableWidget) -> list:
        return [
            [
                widget.item(row, col).text() if widget.item(row, col) else ""
@@ -76,7 +73,7 @@ class TableWidgetHandler(WidgetHandler):
 class SpinBoxHandler(WidgetHandler):
    """Handler for QSpinBox and QDoubleSpinBox widgets."""

-    def get_value(self, widget, **kwargs):
+    def get_value(self, widget):
        return widget.value()

    def set_value(self, widget, value):
@@ -86,7 +83,7 @@ class SpinBoxHandler(WidgetHandler):
 class CheckBoxHandler(WidgetHandler):
    """Handler for QCheckBox widgets."""

-    def get_value(self, widget, **kwargs):
+    def get_value(self, widget):
        return widget.isChecked()

    def set_value(self, widget, value):
@@ -96,7 +93,7 @@ class CheckBoxHandler(WidgetHandler):
 class LabelHandler(WidgetHandler):
    """Handler for QLabel widgets."""

-    def get_value(self, widget, **kwargs):
+    def get_value(self, widget):
        return widget.text()

    def set_value(self, widget, value):
@@ -117,7 +114,7 @@ class WidgetIO:
    }

    @staticmethod
-    def get_value(widget, ignore_errors=False, **kwargs):
+    def get_value(widget, ignore_errors=False):
        """
        Retrieve value from the widget instance.

@@ -127,7 +124,7 @@ class WidgetIO:
        """
        handler_class = WidgetIO._find_handler(widget)
        if handler_class:
-            return handler_class().get_value(widget, **kwargs)  # Instantiate the handler
+            return handler_class().get_value(widget)  # Instantiate the handler
        if not ignore_errors:
            raise ValueError(f"No handler for widget type: {type(widget)}")
        return None
--- a/bec_widgets/widgets/base_classes/init.py
+++ b/bec_widgets/widgets/base_classes/init.py
--- a/bec_widgets/widgets/base_classes/device_input_base.py
+++ b/bec_widgets/widgets/base_classes/device_input_base.py
@@ -0,0 +1,123 @@
+from __future__ import annotations
+
+from bec_widgets.utils import ConnectionConfig
+from bec_widgets.utils.bec_widget import BECWidget
+
+
+class DeviceInputConfig(ConnectionConfig):
+    device_filter: str | list[str] | None = None
+    default: str | None = None
+    arg_name: str | None = None
+
+
+class DeviceInputBase(BECWidget):
+    """
+    Mixin class for device input widgets. This class provides methods to get the device list and device object based
+    on the current text of the widget.
+    """
+
+    def __init__(self, client=None, config=None, gui_id=None):
+        if config is None:
+            config = DeviceInputConfig(widget_class=self.__class__.__name__)
+        else:
+            if isinstance(config, dict):
+                config = DeviceInputConfig(**config)
+            self.config = config
+        super().__init__(client=client, config=config, gui_id=gui_id)
+
+        self.get_bec_shortcuts()
+        self._device_filter = None
+        self._devices = []
+
+    @property
+    def devices(self) -> list[str]:
+        """
+        Get the list of devices.
+
+        Returns:
+            list[str]: List of devices.
+        """
+        return self._devices
+
+    @devices.setter
+    def devices(self, value: list[str]):
+        """
+        Set the list of devices.
+
+        Args:
+            value: List of devices.
+        """
+        self._devices = value
+
+    def set_device_filter(self, device_filter: str | list[str]):
+        """
+        Set the device filter.
+
+        Args:
+            device_filter(str): Device filter, name of the device class.
+        """
+        self.validate_device_filter(device_filter)
+        self.config.device_filter = device_filter
+        self._device_filter = device_filter
+
+    def set_default_device(self, default_device: str):
+        """
+        Set the default device.
+
+        Args:
+            default_device(str): Default device name.
+        """
+        self.validate_device(default_device)
+        self.config.default = default_device
+
+    def get_device_list(self, filter: str | list[str] | None = None) -> list[str]:
+        """
+        Get the list of device names based on the filter of current BEC client.
+
+        Args:
+            filter(str|None): Class name filter to apply on the device list.
+
+        Returns:
+            devices(list[str]): List of device names.
+        """
+        all_devices = self.dev.enabled_devices
+        if filter is not None:
+            self.validate_device_filter(filter)
+            if isinstance(filter, str):
+                filter = [filter]
+            devices = [device.name for device in all_devices if device.__class__.__name__ in filter]
+        else:
+            devices = [device.name for device in all_devices]
+        return devices
+
+    def get_available_filters(self):
+        """
+        Get the available device classes which can be used as filters.
+        """
+        all_devices = self.dev.enabled_devices
+        filters = {device.__class__.__name__ for device in all_devices}
+        return filters
+
+    def validate_device_filter(self, filter: str | list[str]) -> None:
+        """
+        Validate the device filter if the class name is present in the current BEC instance.
+
+        Args:
+            filter(str|list[str]): Class name to use as a device filter.
+        """
+        if isinstance(filter, str):
+            filter = [filter]
+        available_filters = self.get_available_filters()
+        for f in filter:
+            if f not in available_filters:
+                raise ValueError(f"Device filter {f} is not valid.")
+
+    def validate_device(self, device: str) -> None:
+        """
+        Validate the device if it is present in current BEC instance.
+
+        Args:
+            device(str): Device to validate.
+        """
+        if device not in self.get_device_list(self.config.device_filter):
+            raise ValueError(f"Device {device} is not valid.")
--- a/bec_widgets/applications/alignment/init.py
+++ b/bec_widgets/applications/alignment/init.py
--- a/bec_widgets/widgets/services/bec_queue/bec_queue.py
+++ b/bec_widgets/widgets/services/bec_queue/bec_queue.py
@@ -2,26 +2,24 @@ from __future__ import annotations

 from bec_lib.endpoints import MessageEndpoints
 from bec_qthemes import material_icon
-from qtpy.QtCore import Property, Qt, Signal, Slot
+from qtpy.QtCore import Property, Qt, Slot
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QHeaderView, QLabel, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget

-from bec_widgets.qt_utils.compact_popup import CompactPopupWidget
 from bec_widgets.qt_utils.toolbar import ModularToolBar, SeparatorAction, WidgetAction
 from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.widgets.control.buttons.button_abort.button_abort import AbortButton
-from bec_widgets.widgets.control.buttons.button_reset.button_reset import ResetButton
-from bec_widgets.widgets.control.buttons.button_resume.button_resume import ResumeButton
-from bec_widgets.widgets.control.buttons.stop_button.stop_button import StopButton
+from bec_widgets.widgets.button_abort.button_abort import AbortButton
+from bec_widgets.widgets.button_reset.button_reset import ResetButton
+from bec_widgets.widgets.button_resume.button_resume import ResumeButton
+from bec_widgets.widgets.stop_button.stop_button import StopButton


-class BECQueue(BECWidget, CompactPopupWidget):
+class BECQueue(BECWidget, QWidget):
    """
    Widget to display the BEC queue.
    """

-    PLUGIN = True
    ICON_NAME = "edit_note"
    status_colors = {
        "STOPPED": "red",
@@ -33,8 +31,6 @@ class BECQueue(BECWidget, CompactPopupWidget):
        "COMPLETED": "blue",
    }

-    queue_busy = Signal(bool)
-
    def __init__(
        self,
        parent: QWidget | None = None,
@@ -44,24 +40,22 @@ class BECQueue(BECWidget, CompactPopupWidget):
        refresh_upon_start: bool = True,
    ):
        super().__init__(client, config, gui_id)
-        CompactPopupWidget.__init__(self, parent=parent, layout=QVBoxLayout)
+        QWidget.__init__(self, parent=parent)
+        self.layout = QVBoxLayout(self)
        self.layout.setSpacing(0)
        self.layout.setContentsMargins(0, 0, 0, 0)

        # Set up the toolbar
        self.set_toolbar()
+
        # Set up the table
        self.table = QTableWidget(self)
-        # self.layout.addWidget(self.table)
+        self.layout.addWidget(self.table)
        self.table.setColumnCount(4)
        self.table.setHorizontalHeaderLabels(["Scan Number", "Type", "Status", "Cancel"])
        header = self.table.horizontalHeader()
        header.setSectionResizeMode(QHeaderView.Stretch)

-        self.addWidget(self.table)
-        self.label = "BEC Queue"
-        self.tooltip = "BEC Queue status"
-
        self.bec_dispatcher.connect_slot(self.update_queue, MessageEndpoints.scan_queue_status())
        self.reset_content()
        if refresh_upon_start:
@@ -84,7 +78,7 @@ class BECQueue(BECWidget, CompactPopupWidget):
            target_widget=self,
        )

-        self.addWidget(self.toolbar)
+        self.layout.addWidget(self.toolbar)

    @Property(bool)
    def hide_toolbar(self):
@@ -115,9 +109,6 @@ class BECQueue(BECWidget, CompactPopupWidget):
        Refresh the queue.
        """
        msg = self.client.connector.get(MessageEndpoints.scan_queue_status())
-        if msg is None:
-            # msg is None if no scan has been run yet (fresh start)
-            return
        self.update_queue(msg.content, msg.metadata)

    @Slot(dict, dict)
@@ -161,13 +152,6 @@ class BECQueue(BECWidget, CompactPopupWidget):
            if scan_ids:
                scan_ids = ", ".join(scan_ids)
            self.set_row(index, scan_numbers, scan_types, status, scan_ids)
-        busy = (
-            False
-            if all(item.get("status") in ("STOPPED", "COMPLETED", "IDLE") for item in queue_info)
-            else True
-        )
-        self.set_global_state("warning" if busy else "default")
-        self.queue_busy.emit(busy)

    def format_item(self, content: str, status=False) -> QTableWidgetItem:
        """
--- a/bec_widgets/widgets/services/bec_queue/bec_queue.pyproject
+++ b/bec_widgets/widgets/services/bec_queue/bec_queue.pyproject
--- a/bec_widgets/widgets/services/bec_queue/bec_queue_plugin.py
+++ b/bec_widgets/widgets/services/bec_queue/bec_queue_plugin.py
@@ -6,7 +6,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.services.bec_queue.bec_queue import BECQueue
+from bec_widgets.widgets.bec_queue.bec_queue import BECQueue

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/services/bec_queue/register_bec_queue.py
+++ b/bec_widgets/widgets/services/bec_queue/register_bec_queue.py
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.services.bec_queue.bec_queue_plugin import BECQueuePlugin
+    from bec_widgets.widgets.bec_queue.bec_queue_plugin import BECQueuePlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(BECQueuePlugin())

--- a/bec_widgets/applications/alignment/alignment_1d/init.py
+++ b/bec_widgets/applications/alignment/alignment_1d/init.py
--- a/bec_widgets/widgets/services/bec_status_box/bec_status_box.py
+++ b/bec_widgets/widgets/services/bec_status_box/bec_status_box.py
@@ -4,17 +4,18 @@ The widget automatically updates the status of all running BEC services, and dis

 from __future__ import annotations

+import sys
 from collections import defaultdict
 from dataclasses import dataclass
 from typing import TYPE_CHECKING

 from bec_lib.utils.import_utils import lazy_import_from
 from qtpy.QtCore import QObject, QTimer, Signal, Slot
-from qtpy.QtWidgets import QHBoxLayout, QTreeWidget, QTreeWidgetItem
+from qtpy.QtWidgets import QHBoxLayout, QTreeWidget, QTreeWidgetItem, QWidget

-from bec_widgets.qt_utils.compact_popup import CompactPopupWidget
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.widgets.services.bec_status_box.status_item import StatusItem
+from bec_widgets.utils.colors import apply_theme
+from bec_widgets.widgets.bec_status_box.status_item import StatusItem

 if TYPE_CHECKING:
    from bec_lib.client import BECClient
@@ -63,7 +64,7 @@ class BECServiceStatusMixin(QObject):
        self._service_update_timer.deleteLater()


-class BECStatusBox(BECWidget, CompactPopupWidget):
+class BECStatusBox(BECWidget, QWidget):
    """An autonomous widget to display the status of BEC services.

    Args:
@@ -74,7 +75,6 @@ class BECStatusBox(BECWidget, CompactPopupWidget):
        gui_id Optional(str): The unique id for the widget. Defaults to None.
    """

-    PLUGIN = True
    CORE_SERVICES = ["DeviceServer", "ScanServer", "SciHub", "ScanBundler", "FileWriterManager"]

    service_update = Signal(BECServiceInfoContainer)
@@ -83,13 +83,15 @@ class BECStatusBox(BECWidget, CompactPopupWidget):
    def __init__(
        self,
        parent=None,
-        box_name: str = "BEC Servers",
+        box_name: str = "BEC Server",
        client: BECClient = None,
        bec_service_status_mixin: BECServiceStatusMixin = None,
        gui_id: str = None,
    ):
        super().__init__(client=client, gui_id=gui_id)
-        CompactPopupWidget.__init__(self, parent=parent, layout=QHBoxLayout)
+        QWidget.__init__(self, parent=parent)
+        self.tree = QTreeWidget(self)
+        self.layout = QHBoxLayout(self)

        self.box_name = box_name
        self.status_container = defaultdict(lambda: {"info": None, "item": None, "widget": None})
@@ -98,13 +100,11 @@ class BECStatusBox(BECWidget, CompactPopupWidget):
            bec_service_status_mixin = BECServiceStatusMixin(self, client=self.client)
        self.bec_service_status = bec_service_status_mixin

-        self.label = box_name
-        self.tooltip = "BEC servers health status"
        self.init_ui()
        self.bec_service_status.services_update.connect(self.update_service_status)
        self.bec_core_state.connect(self.update_top_item_status)
        self.tree.itemDoubleClicked.connect(self.on_tree_item_double_clicked)
-        self.addWidget(self.tree)
+        self.layout.addWidget(self.tree)

    def init_ui(self) -> None:
        """Init the UI for the BECStatusBox widget, should only take place once."""
@@ -121,44 +121,18 @@ class BECStatusBox(BECWidget, CompactPopupWidget):

    def init_ui_tree_widget(self) -> None:
        """Initialise the tree widget for the status box."""
-        self.tree = QTreeWidget(self)
        self.tree.setHeaderHidden(True)
        # TODO probably here is a problem still with setting the stylesheet
-        # self.tree.setStyleSheet(
-        #     "QTreeWidget::item:!selected "
-        #     "{ "
-        #     "border: 1px solid gainsboro; "
-        #     "border-left: none; "
-        #     "border-top: none; "
-        #     "}"
-        #     "QTreeWidget::item:selected {}"
-        # )
        self.tree.setStyleSheet(
-            "QTreeWidget::item:!selected { "
+            "QTreeWidget::item:!selected "
+            "{ "
            "border: 1px solid gainsboro; "
            "border-left: none; "
            "border-top: none; "
-            "} "
-            "QTreeWidget::item:selected {} "
-            "QTreeView::branch { "
-            "border-image: none; "
-            "background: transparent; "
-            "} "
-            "QTreeView::branch:has-siblings:!adjoins-item { "
-            "border-image: none; "
-            "} "
-            "QTreeView::branch:has-children:!has-siblings:closed, "
-            "QTreeView::branch:closed:has-children:has-siblings { "
-            "border-image: none; "
-            "} "
-            "QTreeView::branch:open:has-children:!has-siblings, "
-            "QTreeView::branch:open:has-children:has-siblings { "
-            "border-image: none; "
            "}"
+            "QTreeWidget::item:selected {}"
        )

-        # self.tree.setRootIsDecorated(False)
-
    def _create_status_widget(
        self, service_name: str, status=BECStatus, info: dict = None, metrics: dict = None
    ) -> StatusItem:
@@ -189,7 +163,6 @@ class BECStatusBox(BECWidget, CompactPopupWidget):
            status (BECStatus): The state of the core services.
        """
        self.status_container[self.box_name]["info"].status = status
-        self.set_global_state("emergency" if status == "NOTCONNECTED" else "success")
        self.service_update.emit(self.status_container[self.box_name]["info"])

    def _update_status_container(
@@ -330,15 +303,17 @@ class BECStatusBox(BECWidget, CompactPopupWidget):
        return super().cleanup()


-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
+def main():
+    """Main method to run the BECStatusBox widget."""
+    # pylint: disable=import-outside-toplevel
    from qtpy.QtWidgets import QApplication

-    from bec_widgets.utils.colors import set_theme
-
    app = QApplication(sys.argv)
-    set_theme("dark")
+    apply_theme("dark")
    main_window = BECStatusBox()
    main_window.show()
    sys.exit(app.exec())
+
+
+if __name__ == "__main__":
+    main()
--- a/bec_widgets/widgets/services/bec_status_box/bec_status_box.pyproject
+++ b/bec_widgets/widgets/services/bec_status_box/bec_status_box.pyproject
--- 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
@@ -6,7 +6,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 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
+from bec_widgets.widgets.bec_status_box.bec_status_box import BECStatusBox

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/services/bec_status_box/register_bec_status_box.py
+++ b/bec_widgets/widgets/services/bec_status_box/register_bec_status_box.py
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.services.bec_status_box.bec_status_box_plugin import BECStatusBoxPlugin
+    from bec_widgets.widgets.bec_status_box.bec_status_box_plugin import BECStatusBoxPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(BECStatusBoxPlugin())

--- a/bec_widgets/widgets/services/bec_status_box/status_item.py
+++ b/bec_widgets/widgets/services/bec_status_box/status_item.py
@@ -6,13 +6,11 @@ import os
 from datetime import datetime

 from bec_lib.utils.import_utils import lazy_import_from
-from bec_qthemes import material_icon
 from qtpy.QtCore import Qt, Slot
-from qtpy.QtGui import QIcon, QPainter
+from qtpy.QtGui import QIcon
 from qtpy.QtWidgets import QDialog, QHBoxLayout, QLabel, QVBoxLayout, QWidget

 import bec_widgets
-from bec_widgets.utils.colors import get_accent_colors

 # TODO : Put normal imports back when Pydantic gets faster
 BECStatus = lazy_import_from("bec_lib.messages", ("BECStatus",))
@@ -23,11 +21,11 @@ MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 class IconsEnum(enum.Enum):
    """Enum class for icons in the status item widget."""

-    RUNNING = "check_circle"
-    BUSY = "progress_activity"
-    IDLE = "progress_activity"
-    ERROR = "emergency_home"
-    NOTCONNECTED = "signal_disconnected"
+    RUNNING = os.path.join(MODULE_PATH, "assets", "status_icons", "running.svg")
+    BUSY = os.path.join(MODULE_PATH, "assets", "status_icons", "refresh.svg")
+    IDLE = os.path.join(MODULE_PATH, "assets", "status_icons", "warning.svg")
+    ERROR = os.path.join(MODULE_PATH, "assets", "status_icons", "error.svg")
+    NOTCONNECTED = os.path.join(MODULE_PATH, "assets", "status_icons", "not_connected.svg")


 class StatusItem(QWidget):
@@ -45,13 +43,13 @@ class StatusItem(QWidget):
            raise ValueError(
                "Please initialize the StatusItem with a BECServiceInfoContainer for config, received None."
            )
-        self.accent_colors = get_accent_colors()
        self.config = config
        self.parent = parent
        self.layout = None
        self._label = None
        self._icon = None
        self.icon_size = (24, 24)
+
        self._popup_label_ref = {}
        self.init_ui()

@@ -99,15 +97,8 @@ class StatusItem(QWidget):

    def set_status(self) -> None:
        """Set the status icon for the status item widget."""
-        status = self.config.status
-        if status in ["RUNNING", "BUSY"]:
-            color = self.accent_colors.success
-        elif status == "IDLE":
-            color = self.accent_colors.warning
-        elif status in ["ERROR", "NOTCONNECTED"]:
-            color = self.accent_colors.emergency
-        icon = QIcon(material_icon(IconsEnum[status].value, filled=True, color=color))
-
+        icon_path = IconsEnum[self.config.status].value
+        icon = QIcon(icon_path)
        self._icon.setPixmap(icon.pixmap(*self.icon_size))
        self._icon.setAlignment(Qt.AlignmentFlag.AlignRight)

@@ -141,7 +132,6 @@ class StatusItem(QWidget):
        metrics_text = (
            f"<b>SERVICE:</b> {self.config.service_name}<br><b>STATUS:</b> {self.config.status}<br>"
        )
-        metrics_text += f"<b>BEC_LIB VERSION:</b> {self.config.info['version']}<br>"
        if self.config.metrics:
            for key, value in self.config.metrics.items():
                if key == "create_time":
--- a/bec_widgets/widgets/button_abort/init.py
+++ b/bec_widgets/widgets/button_abort/init.py
--- a/bec_widgets/widgets/control/buttons/button_abort/abort_button.pyproject
+++ b/bec_widgets/widgets/control/buttons/button_abort/abort_button.pyproject
--- a/bec_widgets/widgets/control/buttons/button_abort/abort_button_plugin.py
+++ b/bec_widgets/widgets/control/buttons/button_abort/abort_button_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.buttons.button_abort.button_abort import AbortButton
+from bec_widgets.widgets.button_abort.button_abort import AbortButton

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/control/buttons/button_abort/button_abort.py
+++ b/bec_widgets/widgets/control/buttons/button_abort/button_abort.py
@@ -9,7 +9,6 @@ from bec_widgets.utils.bec_widget import BECWidget
 class AbortButton(BECWidget, QWidget):
    """A button that abort the scan."""

-    PLUGIN = True
    ICON_NAME = "cancel"

    def __init__(
--- a/bec_widgets/widgets/control/buttons/button_abort/register_abort_button.py
+++ b/bec_widgets/widgets/control/buttons/button_abort/register_abort_button.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.control.buttons.button_abort.abort_button_plugin import (
-        AbortButtonPlugin,
-    )
+    from bec_widgets.widgets.button_abort.abort_button_plugin import AbortButtonPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(AbortButtonPlugin())

--- a/bec_widgets/widgets/button_reset/init.py
+++ b/bec_widgets/widgets/button_reset/init.py
--- a/bec_widgets/widgets/control/buttons/button_reset/button_reset.py
+++ b/bec_widgets/widgets/control/buttons/button_reset/button_reset.py
@@ -9,7 +9,6 @@ from bec_widgets.utils.bec_widget import BECWidget
 class ResetButton(BECWidget, QWidget):
    """A button that resets the scan queue."""

-    PLUGIN = True
    ICON_NAME = "restart_alt"

    def __init__(self, parent=None, client=None, config=None, gui_id=None, toolbar=False):
--- a/bec_widgets/widgets/control/buttons/button_reset/register_reset_button.py
+++ b/bec_widgets/widgets/control/buttons/button_reset/register_reset_button.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.control.buttons.button_reset.reset_button_plugin import (
-        ResetButtonPlugin,
-    )
+    from bec_widgets.widgets.button_reset.reset_button_plugin import ResetButtonPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(ResetButtonPlugin())

--- a/bec_widgets/widgets/control/buttons/button_reset/reset_button.pyproject
+++ b/bec_widgets/widgets/control/buttons/button_reset/reset_button.pyproject
--- a/bec_widgets/widgets/control/buttons/button_reset/reset_button_plugin.py
+++ b/bec_widgets/widgets/control/buttons/button_reset/reset_button_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.buttons.button_reset.button_reset import ResetButton
+from bec_widgets.widgets.button_reset.button_reset import ResetButton

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/containers/figure/plots/init.py
+++ b/bec_widgets/widgets/containers/figure/plots/init.py
--- a/bec_widgets/widgets/control/buttons/button_resume/button_resume.py
+++ b/bec_widgets/widgets/control/buttons/button_resume/button_resume.py
@@ -9,7 +9,6 @@ from bec_widgets.utils.bec_widget import BECWidget
 class ResumeButton(BECWidget, QWidget):
    """A button that continue scan queue."""

-    PLUGIN = True
    ICON_NAME = "resume"

    def __init__(self, parent=None, client=None, config=None, gui_id=None, toolbar=False):
--- a/bec_widgets/widgets/control/buttons/button_resume/register_resume_button.py
+++ b/bec_widgets/widgets/control/buttons/button_resume/register_resume_button.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.control.buttons.button_resume.resume_button_plugin import (
-        ResumeButtonPlugin,
-    )
+    from bec_widgets.widgets.button_resume.resume_button_plugin import ResumeButtonPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(ResumeButtonPlugin())

--- a/bec_widgets/widgets/control/buttons/button_resume/resume_button.pyproject
+++ b/bec_widgets/widgets/control/buttons/button_resume/resume_button.pyproject
--- a/bec_widgets/widgets/control/buttons/button_resume/resume_button_plugin.py
+++ b/bec_widgets/widgets/control/buttons/button_resume/resume_button_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.buttons.button_resume.button_resume import ResumeButton
+from bec_widgets.widgets.button_resume.button_resume import ResumeButton

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/containers/figure/plots/image/init.py
+++ b/bec_widgets/widgets/containers/figure/plots/image/init.py
--- a/bec_widgets/widgets/utility/visual/color_button/color_button.py
+++ b/bec_widgets/widgets/utility/visual/color_button/color_button.py
@@ -17,7 +17,6 @@ class ColorButton(QWidget):

    color_selected = Signal(str)

-    PLUGIN = True
    ICON_NAME = "colors"

    def __init__(self, *args, **kwargs):
--- a/bec_widgets/widgets/utility/visual/color_button/color_button.pyproject
+++ b/bec_widgets/widgets/utility/visual/color_button/color_button.pyproject
--- a/bec_widgets/widgets/utility/visual/color_button/color_button_plugin.py
+++ b/bec_widgets/widgets/utility/visual/color_button/color_button_plugin.py
@@ -4,7 +4,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 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
+from bec_widgets.widgets.color_button.color_button import ColorButton

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/utility/visual/color_button/register_color_button.py
+++ b/bec_widgets/widgets/utility/visual/color_button/register_color_button.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.utility.visual.color_button.color_button_plugin import (
-        ColorButtonPlugin,
-    )
+    from bec_widgets.widgets.color_button.color_button_plugin import ColorButtonPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(ColorButtonPlugin())

--- a/bec_widgets/widgets/containers/figure/plots/motor_map/init.py
+++ b/bec_widgets/widgets/containers/figure/plots/motor_map/init.py
--- a/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector.py
+++ b/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector.py
@@ -47,7 +47,6 @@ class ColormapSelector(QWidget):

    colormap_changed_signal = Signal(str)
    ICON_NAME = "palette"
-    PLUGIN = True

    def __init__(self, parent=None, default_colormaps=None):
        super().__init__(parent=parent)
--- a/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector.pyproject
+++ b/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector.pyproject
--- a/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector_plugin.py
+++ b/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector_plugin.py
@@ -6,7 +6,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 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
+from bec_widgets.widgets.colormap_selector.colormap_selector import ColormapSelector

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/utility/visual/colormap_selector/register_colormap_selector.py
+++ b/bec_widgets/widgets/utility/visual/colormap_selector/register_colormap_selector.py
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.utility.visual.colormap_selector.colormap_selector_plugin import (
+    from bec_widgets.widgets.colormap_selector.colormap_selector_plugin import (
        ColormapSelectorPlugin,
    )

--- a/bec_widgets/widgets/console/console.py
+++ b/bec_widgets/widgets/console/console.py
@@ -0,0 +1,497 @@
+"""
+BECConsole is a Qt widget that runs a Bash shell. The widget can be used and
+embedded like any other Qt widget.
+
+BECConsole is powered by Pyte, a Python based terminal emulator
+(https://github.com/selectel/pyte).
+"""
+
+import fcntl
+import html
+import os
+import pty
+import subprocess
+import sys
+import threading
+
+import pyte
+from qtpy import QtCore, QtGui, QtWidgets
+from qtpy.QtCore import QSize, QSocketNotifier, Qt
+from qtpy.QtCore import Signal as pyqtSignal
+from qtpy.QtGui import QClipboard, QTextCursor
+from qtpy.QtWidgets import QApplication, QHBoxLayout, QScrollBar, QSizePolicy
+
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
+
+ansi_colors = {
+    "black": "#000000",
+    "red": "#CD0000",
+    "green": "#00CD00",
+    "brown": "#996633",  # Brown, replacing the yellow
+    "blue": "#0000EE",
+    "magenta": "#CD00CD",
+    "cyan": "#00CDCD",
+    "white": "#E5E5E5",
+    "brightblack": "#7F7F7F",
+    "brightred": "#FF0000",
+    "brightgreen": "#00FF00",
+    "brightyellow": "#FFFF00",
+    "brightblue": "#5C5CFF",
+    "brightmagenta": "#FF00FF",
+    "brightcyan": "#00FFFF",
+    "brightwhite": "#FFFFFF",
+}
+
+control_keys_mapping = {
+    QtCore.Qt.Key_A: b"\x01",  # Ctrl-A
+    QtCore.Qt.Key_B: b"\x02",  # Ctrl-B
+    QtCore.Qt.Key_C: b"\x03",  # Ctrl-C
+    QtCore.Qt.Key_D: b"\x04",  # Ctrl-D
+    QtCore.Qt.Key_E: b"\x05",  # Ctrl-E
+    QtCore.Qt.Key_F: b"\x06",  # Ctrl-F
+    QtCore.Qt.Key_G: b"\x07",  # Ctrl-G (Bell)
+    QtCore.Qt.Key_H: b"\x08",  # Ctrl-H (Backspace)
+    QtCore.Qt.Key_I: b"\x09",  # Ctrl-I (Tab)
+    QtCore.Qt.Key_J: b"\x0A",  # Ctrl-J (Line Feed)
+    QtCore.Qt.Key_K: b"\x0B",  # Ctrl-K (Vertical Tab)
+    QtCore.Qt.Key_L: b"\x0C",  # Ctrl-L (Form Feed)
+    QtCore.Qt.Key_M: b"\x0D",  # Ctrl-M (Carriage Return)
+    QtCore.Qt.Key_N: b"\x0E",  # Ctrl-N
+    QtCore.Qt.Key_O: b"\x0F",  # Ctrl-O
+    QtCore.Qt.Key_P: b"\x10",  # Ctrl-P
+    QtCore.Qt.Key_Q: b"\x11",  # Ctrl-Q
+    QtCore.Qt.Key_R: b"\x12",  # Ctrl-R
+    QtCore.Qt.Key_S: b"\x13",  # Ctrl-S
+    QtCore.Qt.Key_T: b"\x14",  # Ctrl-T
+    QtCore.Qt.Key_U: b"\x15",  # Ctrl-U
+    QtCore.Qt.Key_V: b"\x16",  # Ctrl-V
+    QtCore.Qt.Key_W: b"\x17",  # Ctrl-W
+    QtCore.Qt.Key_X: b"\x18",  # Ctrl-X
+    QtCore.Qt.Key_Y: b"\x19",  # Ctrl-Y
+    QtCore.Qt.Key_Z: b"\x1A",  # Ctrl-Z
+    QtCore.Qt.Key_Escape: b"\x1B",  # Ctrl-Escape
+    QtCore.Qt.Key_Backslash: b"\x1C",  # Ctrl-\
+    QtCore.Qt.Key_Underscore: b"\x1F",  # Ctrl-_
+}
+
+normal_keys_mapping = {
+    QtCore.Qt.Key_Return: b"\n",
+    QtCore.Qt.Key_Space: b" ",
+    QtCore.Qt.Key_Enter: b"\n",
+    QtCore.Qt.Key_Tab: b"\t",
+    QtCore.Qt.Key_Backspace: b"\x08",
+    QtCore.Qt.Key_Home: b"\x47",
+    QtCore.Qt.Key_End: b"\x4f",
+    QtCore.Qt.Key_Left: b"\x02",
+    QtCore.Qt.Key_Up: b"\x10",
+    QtCore.Qt.Key_Right: b"\x06",
+    QtCore.Qt.Key_Down: b"\x0E",
+    QtCore.Qt.Key_PageUp: b"\x49",
+    QtCore.Qt.Key_PageDown: b"\x51",
+    QtCore.Qt.Key_F1: b"\x1b\x31",
+    QtCore.Qt.Key_F2: b"\x1b\x32",
+    QtCore.Qt.Key_F3: b"\x1b\x33",
+    QtCore.Qt.Key_F4: b"\x1b\x34",
+    QtCore.Qt.Key_F5: b"\x1b\x35",
+    QtCore.Qt.Key_F6: b"\x1b\x36",
+    QtCore.Qt.Key_F7: b"\x1b\x37",
+    QtCore.Qt.Key_F8: b"\x1b\x38",
+    QtCore.Qt.Key_F9: b"\x1b\x39",
+    QtCore.Qt.Key_F10: b"\x1b\x30",
+    QtCore.Qt.Key_F11: b"\x45",
+    QtCore.Qt.Key_F12: b"\x46",
+}
+
+
+def QtKeyToAscii(event):
+    """
+    Convert the Qt key event to the corresponding ASCII sequence for
+    the terminal. This works fine for standard alphanumerical characters, but
+    most other characters require terminal specific control sequences.
+
+    The conversion below works for TERM="linux" terminals.
+    """
+    if sys.platform == "darwin":
+        # special case for MacOS
+        # /!\ Qt maps ControlModifier to CMD
+        # CMD-C, CMD-V for copy/paste
+        # CTRL-C and other modifiers -> key mapping
+        if event.modifiers() == QtCore.Qt.MetaModifier:
+            if event.key() == Qt.Key_Backspace:
+                return control_keys_mapping.get(Qt.Key_W)
+            return control_keys_mapping.get(event.key())
+        elif event.modifiers() == QtCore.Qt.ControlModifier:
+            if event.key() == Qt.Key_C:
+                # copy
+                return "copy"
+            elif event.key() == Qt.Key_V:
+                # paste
+                return "paste"
+            return None
+        else:
+            return normal_keys_mapping.get(event.key(), event.text().encode("utf8"))
+    if event.modifiers() == QtCore.Qt.ControlModifier:
+        return control_keys_mapping.get(event.key())
+    else:
+        return normal_keys_mapping.get(event.key(), event.text().encode("utf8"))
+
+
+class Screen(pyte.HistoryScreen):
+    def __init__(self, stdin_fd, numColumns, numLines, historyLength):
+        super().__init__(numColumns, numLines, historyLength, ratio=1 / numLines)
+        self._fd = stdin_fd
+
+    def write_process_input(self, data):
+        """Response to CPR request for example"""
+        os.write(self._fd, data.encode("utf-8"))
+
+
+class Backend(QtCore.QObject):
+    """
+    Poll Bash.
+
+    This class will run as a qsocketnotifier (started in ``_TerminalWidget``) and poll the
+    file descriptor of the Bash terminal.
+    """
+
+    # Signals to communicate with ``_TerminalWidget``.
+    startWork = pyqtSignal()
+    dataReady = pyqtSignal(object)
+
+    def __init__(self, fd, numColumns, numLines):
+        super().__init__()
+
+        # File descriptor that connects to Bash process.
+        self.fd = fd
+
+        # Setup Pyte (hard coded display size for now).
+        self.screen = Screen(self.fd, numColumns, numLines, 10000)
+        self.stream = pyte.ByteStream()
+        self.stream.attach(self.screen)
+
+        self.notifier = QSocketNotifier(fd, QSocketNotifier.Read)
+        self.notifier.activated.connect(self._fd_readable)
+
+    def _fd_readable(self):
+        """
+        Poll the Bash output, run it through Pyte, and notify the main applet.
+        """
+        # Read the shell output until the file descriptor is closed.
+        try:
+            out = os.read(self.fd, 2**16)
+        except OSError:
+            return
+
+        # Feed output into Pyte's state machine and send the new screen
+        # output to the GUI
+        self.stream.feed(out)
+        self.dataReady.emit(self.screen)
+
+
+class BECConsole(QtWidgets.QScrollArea):
+    """Container widget for the terminal text area"""
+
+    def __init__(self, parent=None, numLines=50, numColumns=125):
+        super().__init__(parent)
+
+        self.innerWidget = QtWidgets.QWidget(self)
+        QHBoxLayout(self.innerWidget)
+        self.innerWidget.layout().setContentsMargins(0, 0, 0, 0)
+
+        self.term = _TerminalWidget(self.innerWidget, numLines, numColumns)
+        self.term.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+        self.innerWidget.layout().addWidget(self.term)
+
+        self.scroll_bar = QScrollBar(Qt.Vertical, self.term)
+        self.innerWidget.layout().addWidget(self.scroll_bar)
+
+        self.term.set_scroll(self.scroll_bar)
+
+        self.setWidget(self.innerWidget)
+
+    def start(self, cmd=["bec", "--nogui"], deactivate_ctrl_d=True):
+        self.term._cmd = cmd
+        self.term.start(deactivate_ctrl_d=deactivate_ctrl_d)
+
+    def push(self, text):
+        """Push some text to the terminal"""
+        return self.term.push(text)
+
+
+class _TerminalWidget(QtWidgets.QPlainTextEdit):
+    """
+    Start ``Backend`` process and render Pyte output as text.
+    """
+
+    def __init__(self, parent, numColumns=125, numLines=50, **kwargs):
+        super().__init__(parent)
+
+        # file descriptor to communicate with the subprocess
+        self.fd = None
+        self.backend = None
+        self.lock = threading.Lock()
+        # command to execute
+        self._cmd = None
+        # should ctrl-d be deactivated ? (prevent Python exit)
+        self._deactivate_ctrl_d = False
+
+        # Specify the terminal size in terms of lines and columns.
+        self.numLines = numLines
+        self.numColumns = numColumns
+        self.output = [""] * numLines
+
+        # Use Monospace fonts and disable line wrapping.
+        self.setFont(QtGui.QFont("Courier", 9))
+        self.setFont(QtGui.QFont("Monospace"))
+        self.setLineWrapMode(QtWidgets.QPlainTextEdit.NoWrap)
+
+        # Disable vertical scrollbar (we use our own, to be set via .set_scroll())
+        self.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+
+        fmt = QtGui.QFontMetrics(self.font())
+        self._char_width = fmt.width("w")
+        self._char_height = fmt.height()
+        self.setCursorWidth(self._char_width)
+        # self.setStyleSheet("QPlainTextEdit { color: #ffff00; background-color: #303030; } ");
+
+    def start(self, deactivate_ctrl_d=False):
+        self._deactivate_ctrl_d = deactivate_ctrl_d
+
+        # Start the Bash process
+        self.fd = self.forkShell()
+
+        # Create the ``Backend`` object
+        self.backend = Backend(self.fd, self.numColumns, self.numLines)
+        self.backend.dataReady.connect(self.dataReady)
+
+    def minimumSizeHint(self):
+        width = self._char_width * self.numColumns
+        height = self._char_height * self.numLines
+        return QSize(width, height + 20)
+
+    def set_scroll(self, scroll):
+        self.scroll = scroll
+        self.scroll.setMinimum(0)
+        self.scroll.valueChanged.connect(self.scroll_value_change)
+
+    def scroll_value_change(self, value, old={"value": 0}):
+        if value <= old["value"]:
+            # scroll up
+            # value is number of lines from the start
+            nlines = old["value"] - value
+            # history ratio gives prev_page == 1 line
+            for i in range(nlines):
+                self.backend.screen.prev_page()
+        else:
+            # scroll down
+            nlines = value - old["value"]
+            for i in range(nlines):
+                self.backend.screen.next_page()
+        old["value"] = value
+        self.dataReady(self.backend.screen, reset_scroll=False)
+
+    @Slot(object)
+    def keyPressEvent(self, event):
+        """
+        Redirect all keystrokes to the terminal process.
+        """
+        # Convert the Qt key to the correct ASCII code.
+        if (
+            self._deactivate_ctrl_d
+            and event.modifiers() == QtCore.Qt.ControlModifier
+            and event.key() == QtCore.Qt.Key_D
+        ):
+            return None
+
+        code = QtKeyToAscii(event)
+        if code == "copy":
+            # MacOS only: CMD-C handling
+            self.copy()
+        elif code == "paste":
+            # MacOS only: CMD-V handling
+            self._push_clipboard()
+        elif code is not None:
+            os.write(self.fd, code)
+
+    def push(self, text):
+        """
+        Write 'text' to terminal
+        """
+        os.write(self.fd, text.encode("utf-8"))
+
+    def contextMenuEvent(self, event):
+        menu = self.createStandardContextMenu()
+        for action in menu.actions():
+            # remove all actions except copy and paste
+            if "opy" in action.text():
+                # redefine text without shortcut
+                # since it probably clashes with control codes (like CTRL-C etc)
+                action.setText("Copy")
+                continue
+            if "aste" in action.text():
+                # redefine text without shortcut
+                action.setText("Paste")
+                # paste -> have to insert with self.push
+                action.triggered.connect(self._push_clipboard)
+                continue
+            menu.removeAction(action)
+        menu.exec_(event.globalPos())
+
+    def _push_clipboard(self):
+        clipboard = QApplication.instance().clipboard()
+        self.push(clipboard.text())
+
+    def mouseReleaseEvent(self, event):
+        if event.button() == Qt.MiddleButton:
+            # push primary selection buffer ("mouse clipboard") to terminal
+            clipboard = QApplication.instance().clipboard()
+            if clipboard.supportsSelection():
+                self.push(clipboard.text(QClipboard.Selection))
+            return None
+        elif event.button() == Qt.LeftButton:
+            # left button click
+            textCursor = self.textCursor()
+            if textCursor.selectedText():
+                # mouse was used to select text -> nothing to do
+                pass
+            else:
+                # a simple 'click', make cursor going to end
+                textCursor.setPosition(0)
+                textCursor.movePosition(
+                    QTextCursor.Down, QTextCursor.MoveAnchor, self.backend.screen.cursor.y
+                )
+                textCursor.movePosition(
+                    QTextCursor.Right, QTextCursor.MoveAnchor, self.backend.screen.cursor.x
+                )
+                self.setTextCursor(textCursor)
+                self.ensureCursorVisible()
+                return None
+        return super().mouseReleaseEvent(event)
+
+    def dataReady(self, screenData, reset_scroll=True):
+        """
+        Render the new screen as text into the widget.
+
+        This method is triggered via a signal from ``Backend``.
+        """
+        with self.lock:
+            # Clear the widget
+            self.clear()
+
+            # Prepare the HTML output
+            for line_no in screenData.dirty:
+                line = text = ""
+                style = old_style = ""
+                for ch in screenData.buffer[line_no].values():
+                    style = f"{'background-color:%s;' % ansi_colors.get(ch.bg, ansi_colors['black']) if ch.bg!='default' else ''}{'color:%s;' % ansi_colors.get(ch.fg, ansi_colors['white']) if ch.fg!='default' else ''}{'font-weight:bold;' if ch.bold else ''}{'font-style:italic;' if ch.italics else ''}"
+                    if style != old_style:
+                        if old_style:
+                            line += f"<span style={repr(old_style)}>{html.escape(text, quote=True)}</span>"
+                        else:
+                            line += html.escape(text, quote=True)
+                        text = ""
+                        old_style = style
+                    text += ch.data
+                if style:
+                    line += f"<span style={repr(style)}>{html.escape(text, quote=True)}</span>"
+                else:
+                    line += html.escape(text, quote=True)
+                self.output[line_no] = line
+            # fill the text area with HTML contents in one go
+            self.appendHtml(f"<pre>{chr(10).join(self.output)}</pre>")
+            # done updates, all clean
+            screenData.dirty.clear()
+
+            # Activate cursor
+            textCursor = self.textCursor()
+            textCursor.setPosition(0)
+            textCursor.movePosition(QTextCursor.Down, QTextCursor.MoveAnchor, screenData.cursor.y)
+            textCursor.movePosition(QTextCursor.Right, QTextCursor.MoveAnchor, screenData.cursor.x)
+            self.setTextCursor(textCursor)
+            self.ensureCursorVisible()
+
+            # manage scroll
+            if reset_scroll:
+                self.scroll.valueChanged.disconnect(self.scroll_value_change)
+                tmp = len(self.backend.screen.history.top) + len(self.backend.screen.history.bottom)
+                self.scroll.setMaximum(tmp if tmp > 0 else 0)
+                self.scroll.setSliderPosition(len(self.backend.screen.history.top))
+                self.scroll.valueChanged.connect(self.scroll_value_change)
+
+    # def resizeEvent(self, event):
+    #    with self.lock:
+    #        self.numColumns = int(self.width() / self._char_width)
+    #        self.numLines = int(self.height() / self._char_height)
+    #        self.output = [""] * self.numLines
+    #        print("RESIZING TO", self.numColumns, "x", self.numLines)
+    #        self.backend.screen.resize(self.numLines, self.numColumns)
+
+    def wheelEvent(self, event):
+        y = event.angleDelta().y()
+        if y > 0:
+            self.backend.screen.prev_page()
+        else:
+            self.backend.screen.next_page()
+        self.dataReady(self.backend.screen, reset_scroll=False)
+
+    def forkShell(self):
+        """
+        Fork the current process and execute bec in shell.
+        """
+        try:
+            pid, fd = pty.fork()
+        except (IOError, OSError):
+            return False
+        if pid == 0:
+            # Safe way to make it work under BSD and Linux
+            try:
+                ls = os.environ["LANG"].split(".")
+            except KeyError:
+                ls = []
+            if len(ls) < 2:
+                ls = ["en_US", "UTF-8"]
+            try:
+                os.putenv("COLUMNS", str(self.numColumns))
+                os.putenv("LINES", str(self.numLines))
+                os.putenv("TERM", "linux")
+                os.putenv("LANG", ls[0] + ".UTF-8")
+                if isinstance(self._cmd, str):
+                    os.execvp(self._cmd, self._cmd)
+                else:
+                    os.execvp(self._cmd[0], self._cmd)
+                # print "child_pid", child_pid, sts
+            except (IOError, OSError):
+                pass
+            # self.proc_finish(sid)
+            os._exit(0)
+        else:
+            # We are in the parent process.
+            # Set file control
+            fcntl.fcntl(fd, fcntl.F_SETFL, os.O_NONBLOCK)
+            print("Spawned Bash shell (PID {})".format(pid))
+            return fd
+
+
+if __name__ == "__main__":
+    import os
+    import sys
+
+    from qtpy import QtGui, QtWidgets
+
+    # Terminal size in characters.
+    numLines = 25
+    numColumns = 100
+
+    # Create the Qt application and QBash instance.
+    app = QtWidgets.QApplication([])
+    mainwin = QtWidgets.QMainWindow()
+    title = "BECConsole ({}x{})".format(numColumns, numLines)
+    mainwin.setWindowTitle(title)
+
+    console = BECConsole(mainwin, numColumns, numLines)
+    mainwin.setCentralWidget(console)
+    console.start()
+
+    # Show widget and launch Qt's event loop.
+    mainwin.show()
+    sys.exit(app.exec_())
--- a/bec_widgets/widgets/containers/figure/plots/multi_waveform/multi_waveform.py
+++ b/bec_widgets/widgets/containers/figure/plots/multi_waveform/multi_waveform.py
@@ -1,353 +0,0 @@
-from collections import deque
-from typing import Literal, Optional
-
-import pyqtgraph as pg
-from bec_lib.endpoints import MessageEndpoints
-from bec_lib.logger import bec_logger
-from pydantic import Field, field_validator
-from pyqtgraph.exporters import MatplotlibExporter
-from qtpy.QtCore import Signal, Slot
-from qtpy.QtWidgets import QWidget
-
-from bec_widgets.utils import Colors
-from bec_widgets.widgets.containers.figure.plots.plot_base import BECPlotBase, SubplotConfig
-
-logger = bec_logger.logger
-
-
-class BECMultiWaveformConfig(SubplotConfig):
-    color_palette: Optional[str] = Field(
-        "magma", description="The color palette of the figure widget.", validate_default=True
-    )
-    curve_limit: Optional[int] = Field(
-        200, description="The maximum number of curves to display on the plot."
-    )
-    flush_buffer: Optional[bool] = Field(
-        False, description="Flush the buffer of the plot widget when the curve limit is reached."
-    )
-    monitor: Optional[str] = Field(
-        None, description="The monitor to set for the plot widget."
-    )  # TODO validate monitor in bec -> maybe make it as SignalData class for validation purpose
-    curve_width: Optional[int] = Field(1, description="The width of the curve on the plot.")
-    opacity: Optional[int] = Field(50, description="The opacity of the curve on the plot.")
-    highlight_last_curve: Optional[bool] = Field(
-        True, description="Highlight the last curve on the plot."
-    )
-
-    model_config: dict = {"validate_assignment": True}
-    _validate_color_map_z = field_validator("color_palette")(Colors.validate_color_map)
-
-
-class BECMultiWaveform(BECPlotBase):
-    monitor_signal_updated = Signal()
-    highlighted_curve_index_changed = Signal(int)
-    USER_ACCESS = [
-        "_rpc_id",
-        "_config_dict",
-        "curves",
-        "set_monitor",
-        "set_opacity",
-        "set_curve_limit",
-        "set_curve_highlight",
-        "set_colormap",
-        "set",
-        "set_title",
-        "set_x_label",
-        "set_y_label",
-        "set_x_scale",
-        "set_y_scale",
-        "set_x_lim",
-        "set_y_lim",
-        "set_grid",
-        "set_colormap",
-        "enable_fps_monitor",
-        "lock_aspect_ratio",
-        "export",
-        "get_all_data",
-        "remove",
-    ]
-
-    def __init__(
-        self,
-        parent: Optional[QWidget] = None,
-        parent_figure=None,
-        config: Optional[BECMultiWaveformConfig] = None,
-        client=None,
-        gui_id: Optional[str] = None,
-    ):
-        if config is None:
-            config = BECMultiWaveformConfig(widget_class=self.__class__.__name__)
-        super().__init__(
-            parent=parent, parent_figure=parent_figure, config=config, client=client, gui_id=gui_id
-        )
-        self.old_scan_id = None
-        self.scan_id = None
-        self.monitor = None
-        self.connected = False
-        self.current_highlight_index = 0
-        self._curves = deque()
-        self.visible_curves = []
-        self.number_of_visible_curves = 0
-
-        # Get bec shortcuts dev, scans, queue, scan_storage, dap
-        self.get_bec_shortcuts()
-
-    @property
-    def curves(self) -> deque:
-        """
-        Get the curves of the plot widget as a deque.
-        Returns:
-            deque: Deque of curves.
-        """
-        return self._curves
-
-    @curves.setter
-    def curves(self, value: deque):
-        self._curves = value
-
-    @property
-    def highlight_last_curve(self) -> bool:
-        """
-        Get the highlight_last_curve property.
-        Returns:
-            bool: The highlight_last_curve property.
-        """
-        return self.config.highlight_last_curve
-
-    @highlight_last_curve.setter
-    def highlight_last_curve(self, value: bool):
-        self.config.highlight_last_curve = value
-
-    def set_monitor(self, monitor: str):
-        """
-        Set the monitor for the plot widget.
-        Args:
-            monitor (str): The monitor to set.
-        """
-        self.config.monitor = monitor
-        self._connect_monitor()
-
-    def _connect_monitor(self):
-        """
-        Connect the monitor to the plot widget.
-        """
-        try:
-            previous_monitor = self.monitor
-        except AttributeError:
-            previous_monitor = None
-
-        if previous_monitor and self.connected is True:
-            self.bec_dispatcher.disconnect_slot(
-                self.on_monitor_1d_update, MessageEndpoints.device_monitor_1d(previous_monitor)
-            )
-        if self.config.monitor and self.connected is False:
-            self.bec_dispatcher.connect_slot(
-                self.on_monitor_1d_update, MessageEndpoints.device_monitor_1d(self.config.monitor)
-            )
-            self.connected = True
-            self.monitor = self.config.monitor
-
-    @Slot(dict, dict)
-    def on_monitor_1d_update(self, msg: dict, metadata: dict):
-        """
-        Update the plot widget with the monitor data.
-
-        Args:
-            msg(dict): The message data.
-            metadata(dict): The metadata of the message.
-        """
-        data = msg.get("data", None)
-        current_scan_id = metadata.get("scan_id", None)
-
-        if current_scan_id != self.scan_id:
-            self.scan_id = current_scan_id
-            self.clear_curves()
-            self.curves.clear()
-            if self.crosshair:
-                self.crosshair.clear_markers()
-
-        # Always create a new curve and add it
-        curve = pg.PlotDataItem()
-        curve.setData(data)
-        self.plot_item.addItem(curve)
-        self.curves.append(curve)
-
-        # Max Trace and scale colors
-        self.set_curve_limit(self.config.curve_limit, self.config.flush_buffer)
-
-        self.monitor_signal_updated.emit()
-
-    @Slot(int)
-    def set_curve_highlight(self, index: int):
-        """
-        Set the curve highlight based on visible curves.
-
-        Args:
-            index (int): The index of the curve to highlight among visible curves.
-        """
-        self.plot_item.visible_curves = [curve for curve in self.curves if curve.isVisible()]
-        num_visible_curves = len(self.plot_item.visible_curves)
-        self.number_of_visible_curves = num_visible_curves
-
-        if num_visible_curves == 0:
-            return  # No curves to highlight
-
-        if index >= num_visible_curves:
-            index = num_visible_curves - 1
-        elif index < 0:
-            index = num_visible_curves + index
-        self.current_highlight_index = index
-        num_colors = num_visible_curves
-        colors = Colors.evenly_spaced_colors(
-            colormap=self.config.color_palette, num=num_colors, format="HEX"
-        )
-        for i, curve in enumerate(self.plot_item.visible_curves):
-            curve.setPen()
-            if i == self.current_highlight_index:
-                curve.setPen(pg.mkPen(color=colors[i], width=5))
-                curve.setAlpha(alpha=1, auto=False)
-                curve.setZValue(1)
-            else:
-                curve.setPen(pg.mkPen(color=colors[i], width=1))
-                curve.setAlpha(alpha=self.config.opacity / 100, auto=False)
-                curve.setZValue(0)
-
-        self.highlighted_curve_index_changed.emit(self.current_highlight_index)
-
-    @Slot(int)
-    def set_opacity(self, opacity: int):
-        """
-        Set the opacity of the curve on the plot.
-
-        Args:
-            opacity(int): The opacity of the curve. 0-100.
-        """
-        self.config.opacity = max(0, min(100, opacity))
-        self.set_curve_highlight(self.current_highlight_index)
-
-    @Slot(int, bool)
-    def set_curve_limit(self, max_trace: int, flush_buffer: bool = False):
-        """
-        Set the maximum number of traces to display on the plot.
-
-        Args:
-            max_trace (int): The maximum number of traces to display.
-            flush_buffer (bool): Flush the buffer.
-        """
-        self.config.curve_limit = max_trace
-        self.config.flush_buffer = flush_buffer
-
-        if self.config.curve_limit is None:
-            self.scale_colors()
-            return
-
-        if self.config.flush_buffer:
-            # Remove excess curves from the plot and the deque
-            while len(self.curves) > self.config.curve_limit:
-                curve = self.curves.popleft()
-                self.plot_item.removeItem(curve)
-        else:
-            # Hide or show curves based on the new max_trace
-            num_curves_to_show = min(self.config.curve_limit, len(self.curves))
-            for i, curve in enumerate(self.curves):
-                if i < len(self.curves) - num_curves_to_show:
-                    curve.hide()
-                else:
-                    curve.show()
-        self.scale_colors()
-
-    def scale_colors(self):
-        """
-        Scale the colors of the curves based on the current colormap.
-        """
-        if self.config.highlight_last_curve:
-            self.set_curve_highlight(-1)  # Use -1 to highlight the last visible curve
-        else:
-            self.set_curve_highlight(self.current_highlight_index)
-
-    def set_colormap(self, colormap: str):
-        """
-        Set the colormap for the curves.
-
-        Args:
-            colormap(str): Colormap for the curves.
-        """
-        self.config.color_palette = colormap
-        self.set_curve_highlight(self.current_highlight_index)
-
-    def hook_crosshair(self) -> None:
-        super().hook_crosshair()
-        if self.crosshair:
-            self.highlighted_curve_index_changed.connect(self.crosshair.update_highlighted_curve)
-            if self.curves:
-                self.crosshair.update_highlighted_curve(self.current_highlight_index)
-
-    def get_all_data(self, output: Literal["dict", "pandas"] = "dict") -> dict:
-        """
-        Extract all curve data into a dictionary or a pandas DataFrame.
-
-        Args:
-            output (Literal["dict", "pandas"]): Format of the output data.
-
-        Returns:
-            dict | pd.DataFrame: Data of all curves in the specified format.
-        """
-        data = {}
-        try:
-            import pandas as pd
-        except ImportError:
-            pd = None
-            if output == "pandas":
-                logger.warning(
-                    "Pandas is not installed. "
-                    "Please install pandas using 'pip install pandas'."
-                    "Output will be dictionary instead."
-                )
-                output = "dict"
-
-        curve_keys = []
-        curves_list = list(self.curves)
-        for i, curve in enumerate(curves_list):
-            x_data, y_data = curve.getData()
-            if x_data is not None or y_data is not None:
-                key = f"curve_{i}"
-                curve_keys.append(key)
-                if output == "dict":
-                    data[key] = {"x": x_data.tolist(), "y": y_data.tolist()}
-                elif output == "pandas" and pd is not None:
-                    data[key] = pd.DataFrame({"x": x_data, "y": y_data})
-
-        if output == "pandas" and pd is not None:
-            combined_data = pd.concat([data[key] for key in curve_keys], axis=1, keys=curve_keys)
-            return combined_data
-        return data
-
-    def clear_curves(self):
-        """
-        Remove all curves from the plot, excluding crosshair items.
-        """
-        items_to_remove = []
-        for item in self.plot_item.items:
-            if not getattr(item, "is_crosshair", False) and isinstance(item, pg.PlotDataItem):
-                items_to_remove.append(item)
-        for item in items_to_remove:
-            self.plot_item.removeItem(item)
-
-    def export_to_matplotlib(self):
-        """
-        Export current waveform to matplotlib GUI. Available only if matplotlib is installed in the environment.
-        """
-        MatplotlibExporter(self.plot_item).export()
-
-
-if __name__ == "__main__":
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    from bec_widgets.widgets.containers.figure import BECFigure
-
-    app = QApplication(sys.argv)
-    widget = BECFigure()
-    widget.show()
-    sys.exit(app.exec_())
--- a/bec_widgets/widgets/containers/main_window/main_window.py
+++ b/bec_widgets/widgets/containers/main_window/main_window.py
@@ -1,9 +0,0 @@
-from qtpy.QtWidgets import QMainWindow
-
-from bec_widgets.utils import BECConnector
-
-
-class BECMainWindow(QMainWindow, BECConnector):
-    def __init__(self, *args, **kwargs):
-        BECConnector.__init__(self, **kwargs)
-        QMainWindow.__init__(self, *args, **kwargs)
--- a/bec_widgets/widgets/control/device_control/position_indicator/position_indicator.py
+++ b/bec_widgets/widgets/control/device_control/position_indicator/position_indicator.py
@@ -1,291 +0,0 @@
-import numpy as np
-from qtpy.QtCore import Property, QSize, Qt, Slot
-from qtpy.QtGui import QBrush, QColor, QPainter, QPainterPath, QPen
-from qtpy.QtWidgets import QWidget
-
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.colors import get_accent_colors, get_theme_palette
-
-
-class PositionIndicator(BECWidget, QWidget):
-    USER_ACCESS = ["set_value", "set_range", "vertical", "indicator_width", "rounded_corners"]
-    PLUGIN = True
-    ICON_NAME = "horizontal_distribute"
-
-    def __init__(self, parent=None, client=None, config=None, gui_id=None):
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        QWidget.__init__(self, parent=parent)
-        self.position = 50
-        self.min_value = 0
-        self.max_value = 100
-        self.scaling_factor = 0.5
-        self.is_vertical = False
-        self._current_indicator_position = 0
-        self._draw_position = 0
-        self._rounded_corners = 10
-        self._indicator_width = 2
-        self._indicator_color = get_accent_colors().success
-        self._background_color = get_theme_palette().mid().color()
-        self._use_color_palette = True
-
-    def set_range(self, min_value: float, max_value: float):
-        """
-        Set the range of the position indicator
-
-        Args:
-            min_value(float): Minimum value of the range
-            max_value(float): Maximum value of the range
-        """
-        self.minimum = min_value
-        self.maximum = max_value
-
-    @Property(float)
-    def minimum(self):
-        """
-        Property to get the minimum value of the position indicator
-        """
-        return self.min_value
-
-    @minimum.setter
-    def minimum(self, min_value: float):
-        """
-        Setter for the minimum property
-
-        Args:
-            min_value: The minimum value of the position indicator
-        """
-        self.min_value = min_value
-        self.update()
-
-    @Property(float)
-    def maximum(self):
-        """
-        Property to get the maximum value of the position indicator
-        """
-        return self.max_value
-
-    @maximum.setter
-    def maximum(self, max_value: float):
-        """
-        Setter for the maximum property
-
-        Args:
-            max_value: The maximum value of the position indicator
-        """
-        self.max_value = max_value
-        self.update()
-
-    @Property(bool)
-    def vertical(self):
-        """
-        Property to determine the orientation of the position indicator
-        """
-        return self.is_vertical
-
-    @vertical.setter
-    def vertical(self, is_vertical: bool):
-        """
-        Setter for the vertical property
-
-        Args:
-            is_vertical: True if the indicator should be vertical, False if horizontal
-        """
-
-        self.is_vertical = is_vertical
-        self.update()
-
-    @Property(float)
-    def value(self):
-        """
-        Property to get the current value of the position indicator
-        """
-        return self.position
-
-    @value.setter
-    def value(self, position: float):
-        """
-        Setter for the value property
-
-        Args:
-            position: The new position of the indicator
-        """
-        self.set_value(position)
-
-    @Property(int)
-    def indicator_width(self):
-        """
-        Property to get the width of the indicator
-        """
-        return self._indicator_width
-
-    @indicator_width.setter
-    def indicator_width(self, width: int):
-        """
-        Setter for the indicator width property
-
-        Args:
-            width: The new width of the indicator
-        """
-        self._indicator_width = width
-        self.update()
-
-    @Property(int)
-    def rounded_corners(self):
-        """
-        Property to get the rounded corners of the position indicator
-        """
-        return self._rounded_corners
-
-    @rounded_corners.setter
-    def rounded_corners(self, value: int):
-        """
-        Setter for the rounded corners property
-
-        Args:
-            value: The new value for the rounded corners
-        """
-        self._rounded_corners = value
-        self.update()
-
-    @Property(QColor)
-    def indicator_color(self):
-        """
-        Property to get the color of the indicator
-        """
-        return self._indicator_color
-
-    @indicator_color.setter
-    def indicator_color(self, color: QColor):
-        """
-        Setter for the indicator color property
-
-        Args:
-            color: The new color for the indicator
-        """
-        self._indicator_color = color
-        self.update()
-
-    @Property(QColor)
-    def background_color(self):
-        """
-        Property to get the background color of the position indicator
-        """
-        return self._background_color
-
-    @background_color.setter
-    def background_color(self, color: QColor):
-        """
-        Setter for the background color property
-
-        Args:
-            color: The new background color
-        """
-        self._background_color = color
-        self.update()
-
-    @Property(bool)
-    def use_color_palette(self):
-        """
-        Property to determine if the indicator should use the color palette or the custom color.
-        """
-        return self._use_color_palette
-
-    @use_color_palette.setter
-    def use_color_palette(self, use_palette: bool):
-        """
-        Setter for the use color palette property
-
-        Args:
-            use_palette: True if the indicator should use the color palette, False if custom color
-        """
-        self._use_color_palette = use_palette
-        self.update()
-
-    # @Property(float)
-    @Slot(int)
-    @Slot(float)
-    def set_value(self, position: float):
-        self.position = position
-        self.update()
-
-    def _get_indicator_color(self):
-        if self._use_color_palette:
-            return get_accent_colors().success
-        return self._indicator_color
-
-    def _get_background_brush(self):
-        if self._use_color_palette:
-            return get_theme_palette().mid()
-        return QBrush(self._background_color)
-
-    def paintEvent(self, event):
-        painter = QPainter(self)
-        width = self.width()
-        height = self.height()
-
-        # Set up the brush for the background
-        painter.setBrush(self._get_background_brush())
-
-        # Create a QPainterPath with a rounded rectangle for clipping
-        path = QPainterPath()
-        path.addRoundedRect(0, 0, width, height, self._rounded_corners, self._rounded_corners)
-
-        # Set clipping to the rounded rectangle
-        painter.setClipPath(path)
-
-        # Draw the rounded rectangle background first
-        painter.setPen(Qt.NoPen)
-        painter.drawRoundedRect(0, 0, width, height, self._rounded_corners, self._rounded_corners)
-
-        # get the position scaled to the defined min and max values
-        self._current_indicator_position = position = np.interp(
-            self.position, [self.min_value, self.max_value], [0, 100]
-        )
-
-        if self.is_vertical:
-            # If vertical, rotate the coordinate system by -90 degrees
-            painter.translate(width // 2, height // 2)  # Move origin to center
-            painter.rotate(-90)  # Rotate by -90 degrees for vertical drawing
-            painter.translate(-height // 2, -width // 2)  # Restore the origin for drawing
-
-            # Switch width and height for the vertical orientation
-            width, height = height, width
-
-        # Draw the moving vertical indicator, respecting the clip path
-        self._draw_position = x_pos = round(
-            position * width / 100
-        )  # Position for the vertical line
-
-        indicator_pen = QPen(self._get_indicator_color(), self._indicator_width)
-        painter.setPen(indicator_pen)
-        painter.drawLine(x_pos, 0, x_pos, height)
-
-        painter.end()
-
-    def minimumSizeHint(self):
-        # Set the smallest possible size
-        return QSize(10, 10)
-
-
-if __name__ == "__main__":  # pragma: no cover
-    from bec_qthemes import setup_theme
-    from qtpy.QtWidgets import QApplication, QSlider, QVBoxLayout
-
-    app = QApplication([])
-    setup_theme("dark")
-    # Create position indicator and slider
-    position_indicator = PositionIndicator()
-    # position_indicator.set_range(0, 1)
-    slider = QSlider(Qt.Horizontal)
-    slider.valueChanged.connect(lambda value: position_indicator.set_value(value))
-    position_indicator.is_vertical = False
-    # position_indicator.set_value(100)
-    layout = QVBoxLayout()
-    layout.addWidget(position_indicator)
-    layout.addWidget(slider)
-
-    widget = QWidget()
-    widget.setLayout(layout)
-    widget.show()
-
-    app.exec_()
--- a/bec_widgets/widgets/control/device_control/positioner_group/positioner_group.py
+++ b/bec_widgets/widgets/control/device_control/positioner_group/positioner_group.py
@@ -1,170 +0,0 @@
-""" Module for a PositionerGroup widget to control a positioner device."""
-
-from __future__ import annotations
-
-from bec_lib.device import Positioner
-from bec_lib.logger import bec_logger
-from qtpy.QtCore import Property, QSize, Signal, Slot
-from qtpy.QtWidgets import QGridLayout, QGroupBox, QVBoxLayout, QWidget
-
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.widgets.control.device_control.positioner_box.positioner_box import PositionerBox
-
-logger = bec_logger.logger
-
-
-class PositionerGroupBox(QGroupBox):
-    PLUGIN = True
-    position_update = Signal(float)
-
-    def __init__(self, parent, dev_name):
-        super().__init__(parent)
-
-        self.device_name = dev_name
-
-        QVBoxLayout(self)
-        self.layout().setContentsMargins(0, 0, 0, 0)
-        self.layout().setSpacing(0)
-        self.widget = PositionerBox(self, dev_name)
-        self.widget.compact_view = True
-        self.widget.expand_popup = False
-        self.layout().addWidget(self.widget)
-        self.widget.position_update.connect(self._on_position_update)
-        self.widget.expand.connect(self._on_expand)
-        self.setTitle(self.device_name)
-        self.widget.init_device()  # force readback
-
-    def _on_expand(self, expand):
-        if expand:
-            self.setTitle("")
-            self.setFlat(True)
-        else:
-            self.setTitle(self.device_name)
-            self.setFlat(False)
-
-    def _on_position_update(self, pos: float):
-        self.position_update.emit(pos)
-        self.widget.label = f"%.{self.widget.dev[self.widget.device].precision}f" % pos
-
-    def close(self):
-        self.widget.close()
-        super().close()
-
-
-class PositionerGroup(BECWidget, QWidget):
-    """Simple Widget to control a positioner in box form"""
-
-    ICON_NAME = "grid_view"
-    USER_ACCESS = ["set_positioners"]
-
-    # Signal emitted to inform listeners about a position update of the first positioner
-    position_update = Signal(float)
-    # Signal emitted to inform listeners about (positioner, pos) updates
-    device_position_update = Signal(str, float)
-
-    def __init__(self, parent=None, **kwargs):
-        """Initialize the widget.
-
-        Args:
-            parent: The parent widget.
-        """
-        super().__init__(**kwargs)
-        QWidget.__init__(self, parent)
-
-        self.get_bec_shortcuts()
-
-        QGridLayout(self)
-        self.layout().setContentsMargins(0, 0, 0, 0)
-
-        self._device_widgets = {}
-        self._grid_ncols = 2
-
-    def minimumSizeHint(self):
-        return QSize(300, 30)
-
-    @Slot(str)
-    def set_positioners(self, device_names: str):
-        """Redraw grid with positioners from device_names string
-
-        Device names must be separated by space
-        """
-        devs = device_names.split()
-        for dev_name in devs:
-            if not self._check_device_is_valid(dev_name):
-                raise ValueError(f"{dev_name} is not a valid Positioner")
-        for i, existing_widget in enumerate(self._device_widgets.values()):
-            self.layout().removeWidget(existing_widget)
-            existing_widget.position_update.disconnect(self._on_position_update)
-            if i == 0:
-                existing_widget.position_update.disconnect(self.position_update)
-        for i, dev_name in enumerate(devs):
-            widget = self._device_widgets.get(dev_name)
-            if widget is None:
-                widget = PositionerGroupBox(self, dev_name)
-                self._device_widgets[dev_name] = widget
-                widget.position_update.connect(self._on_position_update)
-                if i == 0:
-                    # only emit 'position_update' for the first positioner in grid
-                    widget.position_update.connect(self.position_update)
-            self.layout().addWidget(widget, i // self._grid_ncols, i % self._grid_ncols)
-        to_remove = set(self._device_widgets) - set(devs)
-        for dev_name in to_remove:
-            self._device_widgets[dev_name].close()
-            del self._device_widgets[dev_name]
-
-    def _check_device_is_valid(self, device: str):
-        """Check if the device is a positioner
-
-        Args:
-            device (str): The device name
-        """
-        if device not in self.dev:
-            logger.info(f"Device {device} not found in the device list")
-            return False
-        if not isinstance(self.dev[device], Positioner):
-            logger.info(f"Device {device} is not a positioner")
-            return False
-        return True
-
-    def _on_position_update(self, pos: float):
-        widget = self.sender()
-        self.device_position_update.emit(widget.title(), pos)
-
-    @Property(str)
-    def devices_list(self):
-        """Device names string separated by space"""
-        return " ".join(self._device_widgets)
-
-    @devices_list.setter
-    def devices_list(self, device_names: str):
-        """Set devices list from device names string separated by space"""
-        devs = device_names.split()
-        for dev_name in devs:
-            if not self._check_device_is_valid(dev_name):
-                return
-        self.set_positioners(device_names)
-
-    @Property(int)
-    def grid_max_cols(self):
-        """Max number of columns for widgets grid"""
-        return self._grid_ncols
-
-    @grid_max_cols.setter
-    def grid_max_cols(self, ncols: int):
-        """Set max number of columns for widgets grid"""
-        self._grid_ncols = ncols
-        self.set_positioners(self.devices_list)
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from qtpy.QtWidgets import QApplication  # pylint: disable=ungrouped-imports
-
-    app = QApplication(sys.argv)
-    widget = PositionerGroup()
-    widget.grid_max_cols = 3
-    widget.set_positioners("samx samy samz")
-
-    widget.show()
-    sys.exit(app.exec_())
--- 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 +0,0 @@
-{'files': ['positioner_group.py']}
--- 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,59 +0,0 @@
-# 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 bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.device_control.positioner_group.positioner_group import (
-    PositionerGroup,
-)
-
-DOM_XML = """
-<ui language='c++'>
-    <widget class='PositionerGroup' name='positioner_group'>
-    </widget>
-</ui>
-"""
-MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
-
-
-class PositionerGroupPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
-    def __init__(self):
-        super().__init__()
-        self._form_editor = None
-
-    def createWidget(self, parent):
-        t = PositionerGroup(parent)
-        return t
-
-    def domXml(self):
-        return DOM_XML
-
-    def group(self):
-        return "Device Control"
-
-    def icon(self):
-        return designer_material_icon(PositionerGroup.ICON_NAME)
-
-    def includeFile(self):
-        return "positioner_group"
-
-    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 "PositionerGroup"
-
-    def toolTip(self):
-        return "Container Widget to control positioners in compact form, in a grid"
-
-    def whatsThis(self):
-        return self.toolTip()
--- a/bec_widgets/widgets/control/device_control/positioner_group/register_positioner_group.py
+++ b/bec_widgets/widgets/control/device_control/positioner_group/register_positioner_group.py
@@ -1,17 +0,0 @@
-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.control.device_control.positioner_group.positioner_group_plugin import (
-        PositionerGroupPlugin,
-    )
-
-    QPyDesignerCustomWidgetCollection.addCustomWidget(PositionerGroupPlugin())
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main()
--- a/bec_widgets/widgets/control/device_input/base_classes/device_input_base.py
+++ b/bec_widgets/widgets/control/device_input/base_classes/device_input_base.py
@@ -1,392 +0,0 @@
-from __future__ import annotations
-
-import enum
-
-from bec_lib.device import ComputedSignal, Device, Positioner, ReadoutPriority
-from bec_lib.device import Signal as BECSignal
-from bec_lib.logger import bec_logger
-from qtpy.QtCore import Property, Signal, Slot
-
-from bec_widgets.utils import ConnectionConfig
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.filter_io import FilterIO
-from bec_widgets.utils.widget_io import WidgetIO
-
-logger = bec_logger.logger
-
-
-class BECDeviceFilter(enum.Enum):
-    """Filter for the device classes."""
-
-    DEVICE = "Device"
-    POSITIONER = "Positioner"
-    SIGNAL = "Signal"
-    COMPUTED_SIGNAL = "ComputedSignal"
-
-
-class DeviceInputConfig(ConnectionConfig):
-    device_filter: list[BECDeviceFilter] = []
-    readout_filter: list[ReadoutPriority] = []
-    devices: list[str] = []
-    default: str | None = None
-    arg_name: str | None = None
-    apply_filter: bool = True
-
-
-class DeviceInputBase(BECWidget):
-    """
-    Mixin base class for device input widgets.
-    It allows to filter devices from BEC based on
-    device class and readout priority.
-    """
-
-    _device_handler = {
-        BECDeviceFilter.DEVICE: Device,
-        BECDeviceFilter.POSITIONER: Positioner,
-        BECDeviceFilter.SIGNAL: BECSignal,
-        BECDeviceFilter.COMPUTED_SIGNAL: ComputedSignal,
-    }
-
-    _filter_handler = {
-        BECDeviceFilter.DEVICE: "filter_to_device",
-        BECDeviceFilter.POSITIONER: "filter_to_positioner",
-        BECDeviceFilter.SIGNAL: "filter_to_signal",
-        BECDeviceFilter.COMPUTED_SIGNAL: "filter_to_computed_signal",
-        ReadoutPriority.MONITORED: "readout_monitored",
-        ReadoutPriority.BASELINE: "readout_baseline",
-        ReadoutPriority.ASYNC: "readout_async",
-        ReadoutPriority.CONTINUOUS: "readout_continuous",
-        ReadoutPriority.ON_REQUEST: "readout_on_request",
-    }
-
-    def __init__(self, client=None, config=None, gui_id: str = None):
-
-        if config is None:
-            config = DeviceInputConfig(widget_class=self.__class__.__name__)
-        else:
-            if isinstance(config, dict):
-                config = DeviceInputConfig(**config)
-            self.config = config
-        super().__init__(client=client, config=config, gui_id=gui_id, theme_update=True)
-        self.get_bec_shortcuts()
-        self._device_filter = []
-        self._readout_filter = []
-        self._devices = []
-
-    ### QtSlots ###
-
-    @Slot(str)
-    def set_device(self, device: str):
-        """
-        Set the device.
-
-        Args:
-            device (str): Default name.
-        """
-        if self.validate_device(device) is True:
-            WidgetIO.set_value(widget=self, value=device)
-            self.config.default = device
-        else:
-            logger.warning(f"Device {device} is not in the filtered selection.")
-
-    @Slot()
-    def update_devices_from_filters(self):
-        """Update the devices based on the current filter selection
-        in self.device_filter and self.readout_filter. If apply_filter is False,
-        it will not apply the filters, store the filter settings and return.
-        """
-        current_device = WidgetIO.get_value(widget=self, as_string=True)
-        self.config.device_filter = self.device_filter
-        self.config.readout_filter = self.readout_filter
-        if self.apply_filter is False:
-            return
-        all_dev = self.dev.enabled_devices
-        # Filter based on device class
-        devs = [dev for dev in all_dev if self._check_device_filter(dev)]
-        # Filter based on readout priority
-        devs = [dev for dev in devs if self._check_readout_filter(dev)]
-        self.devices = [device.name for device in devs]
-        self.set_device(current_device)
-
-    @Slot(list)
-    def set_available_devices(self, devices: list[str]):
-        """
-        Set the devices. If a device in the list is not valid, it will not be considered.
-
-        Args:
-            devices (list[str]): List of devices.
-        """
-        self.apply_filter = False
-        self.devices = devices
-
-    ### QtProperties ###
-
-    @Property(
-        "QStringList",
-        doc="List of devices. If updated, it will disable the apply filters property.",
-    )
-    def devices(self) -> list[str]:
-        """
-        Get the list of devices for the applied filters.
-
-        Returns:
-            list[str]: List of devices.
-        """
-        return self._devices
-
-    @devices.setter
-    def devices(self, value: list):
-        self._devices = value
-        self.config.devices = value
-        FilterIO.set_selection(widget=self, selection=value)
-
-    @Property(str)
-    def default(self):
-        """Get the default device name. If set through this property, it will update only if the device is within the filtered selection."""
-        return self.config.default
-
-    @default.setter
-    def default(self, value: str):
-        if self.validate_device(value) is False:
-            return
-        self.config.default = value
-        WidgetIO.set_value(widget=self, value=value)
-
-    @Property(bool)
-    def apply_filter(self):
-        """Apply the filters on the devices."""
-        return self.config.apply_filter
-
-    @apply_filter.setter
-    def apply_filter(self, value: bool):
-        self.config.apply_filter = value
-        self.update_devices_from_filters()
-
-    @Property(bool)
-    def filter_to_device(self):
-        """Include devices in filters."""
-        return BECDeviceFilter.DEVICE in self.device_filter
-
-    @filter_to_device.setter
-    def filter_to_device(self, value: bool):
-        if value is True and BECDeviceFilter.DEVICE not in self.device_filter:
-            self._device_filter.append(BECDeviceFilter.DEVICE)
-        if value is False and BECDeviceFilter.DEVICE in self.device_filter:
-            self._device_filter.remove(BECDeviceFilter.DEVICE)
-        self.update_devices_from_filters()
-
-    @Property(bool)
-    def filter_to_positioner(self):
-        """Include devices of type Positioner in filters."""
-        return BECDeviceFilter.POSITIONER in self.device_filter
-
-    @filter_to_positioner.setter
-    def filter_to_positioner(self, value: bool):
-        if value is True and BECDeviceFilter.POSITIONER not in self.device_filter:
-            self._device_filter.append(BECDeviceFilter.POSITIONER)
-        if value is False and BECDeviceFilter.POSITIONER in self.device_filter:
-            self._device_filter.remove(BECDeviceFilter.POSITIONER)
-        self.update_devices_from_filters()
-
-    @Property(bool)
-    def filter_to_signal(self):
-        """Include devices of type Signal in filters."""
-        return BECDeviceFilter.SIGNAL in self.device_filter
-
-    @filter_to_signal.setter
-    def filter_to_signal(self, value: bool):
-        if value is True and BECDeviceFilter.SIGNAL not in self.device_filter:
-            self._device_filter.append(BECDeviceFilter.SIGNAL)
-        if value is False and BECDeviceFilter.SIGNAL in self.device_filter:
-            self._device_filter.remove(BECDeviceFilter.SIGNAL)
-        self.update_devices_from_filters()
-
-    @Property(bool)
-    def filter_to_computed_signal(self):
-        """Include devices of type ComputedSignal in filters."""
-        return BECDeviceFilter.COMPUTED_SIGNAL in self.device_filter
-
-    @filter_to_computed_signal.setter
-    def filter_to_computed_signal(self, value: bool):
-        if value is True and BECDeviceFilter.COMPUTED_SIGNAL not in self.device_filter:
-            self._device_filter.append(BECDeviceFilter.COMPUTED_SIGNAL)
-        if value is False and BECDeviceFilter.COMPUTED_SIGNAL in self.device_filter:
-            self._device_filter.remove(BECDeviceFilter.COMPUTED_SIGNAL)
-        self.update_devices_from_filters()
-
-    @Property(bool)
-    def readout_monitored(self):
-        """Include devices with readout priority Monitored in filters."""
-        return ReadoutPriority.MONITORED in self.readout_filter
-
-    @readout_monitored.setter
-    def readout_monitored(self, value: bool):
-        if value is True and ReadoutPriority.MONITORED not in self.readout_filter:
-            self._readout_filter.append(ReadoutPriority.MONITORED)
-        if value is False and ReadoutPriority.MONITORED in self.readout_filter:
-            self._readout_filter.remove(ReadoutPriority.MONITORED)
-        self.update_devices_from_filters()
-
-    @Property(bool)
-    def readout_baseline(self):
-        """Include devices with readout priority Baseline in filters."""
-        return ReadoutPriority.BASELINE in self.readout_filter
-
-    @readout_baseline.setter
-    def readout_baseline(self, value: bool):
-        if value is True and ReadoutPriority.BASELINE not in self.readout_filter:
-            self._readout_filter.append(ReadoutPriority.BASELINE)
-        if value is False and ReadoutPriority.BASELINE in self.readout_filter:
-            self._readout_filter.remove(ReadoutPriority.BASELINE)
-        self.update_devices_from_filters()
-
-    @Property(bool)
-    def readout_async(self):
-        """Include devices with readout priority Async in filters."""
-        return ReadoutPriority.ASYNC in self.readout_filter
-
-    @readout_async.setter
-    def readout_async(self, value: bool):
-        if value is True and ReadoutPriority.ASYNC not in self.readout_filter:
-            self._readout_filter.append(ReadoutPriority.ASYNC)
-        if value is False and ReadoutPriority.ASYNC in self.readout_filter:
-            self._readout_filter.remove(ReadoutPriority.ASYNC)
-        self.update_devices_from_filters()
-
-    @Property(bool)
-    def readout_continuous(self):
-        """Include devices with readout priority continuous in filters."""
-        return ReadoutPriority.CONTINUOUS in self.readout_filter
-
-    @readout_continuous.setter
-    def readout_continuous(self, value: bool):
-        if value is True and ReadoutPriority.CONTINUOUS not in self.readout_filter:
-            self._readout_filter.append(ReadoutPriority.CONTINUOUS)
-        if value is False and ReadoutPriority.CONTINUOUS in self.readout_filter:
-            self._readout_filter.remove(ReadoutPriority.CONTINUOUS)
-        self.update_devices_from_filters()
-
-    @Property(bool)
-    def readout_on_request(self):
-        """Include devices with readout priority OnRequest in filters."""
-        return ReadoutPriority.ON_REQUEST in self.readout_filter
-
-    @readout_on_request.setter
-    def readout_on_request(self, value: bool):
-        if value is True and ReadoutPriority.ON_REQUEST not in self.readout_filter:
-            self._readout_filter.append(ReadoutPriority.ON_REQUEST)
-        if value is False and ReadoutPriority.ON_REQUEST in self.readout_filter:
-            self._readout_filter.remove(ReadoutPriority.ON_REQUEST)
-        self.update_devices_from_filters()
-
-    ### Python Methods and Properties ###
-
-    @property
-    def device_filter(self) -> list[object]:
-        """Get the list of filters to apply on the devices."""
-        return self._device_filter
-
-    @property
-    def readout_filter(self) -> list[str]:
-        """Get the list of filters to apply on the devices"""
-        return self._readout_filter
-
-    def get_available_filters(self) -> list:
-        """Get the available filters."""
-        return [entry for entry in BECDeviceFilter]
-
-    def get_readout_priority_filters(self) -> list:
-        """Get the available readout priority filters."""
-        return [entry for entry in ReadoutPriority]
-
-    def set_device_filter(
-        self, filter_selection: str | BECDeviceFilter | list[str] | list[BECDeviceFilter]
-    ):
-        """
-        Set the device filter. If None is passed, no filters are applied and all devices included.
-
-        Args:
-            filter_selection (str | list[str]): Device filters. It is recommended to make an enum for the filters.
-        """
-        filters = None
-        if isinstance(filter_selection, list):
-            filters = [self._filter_handler.get(entry) for entry in filter_selection]
-        if isinstance(filter_selection, str) or isinstance(filter_selection, BECDeviceFilter):
-            filters = [self._filter_handler.get(filter_selection)]
-        if filters is None or any([entry is None for entry in filters]):
-            logger.warning(f"Device filter {filter_selection} is not in the device filter list.")
-            return
-        for entry in filters:
-            setattr(self, entry, True)
-
-    def set_readout_priority_filter(
-        self, filter_selection: str | ReadoutPriority | list[str] | list[ReadoutPriority]
-    ):
-        """
-        Set the readout priority filter. If None is passed, all filters are included.
-
-        Args:
-            filter_selection (str | list[str]): Readout priority filters.
-        """
-        filters = None
-        if isinstance(filter_selection, list):
-            filters = [self._filter_handler.get(entry) for entry in filter_selection]
-        if isinstance(filter_selection, str) or isinstance(filter_selection, ReadoutPriority):
-            filters = [self._filter_handler.get(filter_selection)]
-        if filters is None or any([entry is None for entry in filters]):
-            logger.warning(
-                f"Readout priority filter {filter_selection} is not in the readout priority list."
-            )
-            return
-        for entry in filters:
-            setattr(self, entry, True)
-
-    def _check_device_filter(
-        self, device: Device | BECSignal | ComputedSignal | Positioner
-    ) -> bool:
-        """Check if filter for device type is applied or not.
-
-        Args:
-            device(Device | Signal | ComputedSignal | Positioner): Device object.
-        """
-        return all(isinstance(device, self._device_handler[entry]) for entry in self.device_filter)
-
-    def _check_readout_filter(
-        self, device: Device | BECSignal | ComputedSignal | Positioner
-    ) -> bool:
-        """Check if filter for readout priority is applied or not.
-
-        Args:
-            device(Device | Signal | ComputedSignal | Positioner): Device object.
-        """
-        return device.readout_priority in self.readout_filter
-
-    def get_device_object(self, device: str) -> object:
-        """
-        Get the device object based on the device name.
-
-        Args:
-            device(str): Device name.
-
-        Returns:
-            object: Device object, can be device of type Device, Positioner, Signal or ComputedSignal.
-        """
-        self.validate_device(device)
-        dev = getattr(self.dev, device.lower(), None)
-        if dev is None:
-            raise ValueError(
-                f"Device {device} is not found in the device manager {self.dev} as enabled device."
-            )
-        return dev
-
-    def validate_device(self, device: str) -> bool:
-        """
-        Validate the device if it is present in the filtered device selection.
-
-        Args:
-            device(str): Device to validate.
-        """
-        all_devs = [dev.name for dev in self.dev.enabled_devices]
-        if device in self.devices and device in all_devs:
-            return True
-        return False
--- a/bec_widgets/widgets/control/device_input/base_classes/device_signal_input_base.py
+++ b/bec_widgets/widgets/control/device_input/base_classes/device_signal_input_base.py
@@ -1,280 +0,0 @@
-from bec_lib.callback_handler import EventType
-from bec_lib.device import Signal
-from bec_lib.logger import bec_logger
-from qtpy.QtCore import Property, Slot
-
-from bec_widgets.utils import ConnectionConfig
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.filter_io import FilterIO
-from bec_widgets.utils.ophyd_kind_util import Kind
-from bec_widgets.utils.widget_io import WidgetIO
-
-logger = bec_logger.logger
-
-
-class DeviceSignalInputBaseConfig(ConnectionConfig):
-    """Configuration class for DeviceSignalInputBase."""
-
-    signal_filter: str | list[str] | None = None
-    default: str | None = None
-    arg_name: str | None = None
-    device: str | None = None
-    signals: list[str] | None = None
-
-
-class DeviceSignalInputBase(BECWidget):
-    """
-    Mixin base class for device signal input widgets.
-    Mixin class for device signal input widgets. This class provides methods to get the device signal list and device
-    signal object based on the current text of the widget.
-    """
-
-    _filter_handler = {
-        Kind.hinted: "include_hinted_signals",
-        Kind.normal: "include_normal_signals",
-        Kind.config: "include_config_signals",
-    }
-
-    def __init__(self, client=None, config=None, gui_id: str = None):
-        if config is None:
-            config = DeviceSignalInputBaseConfig(widget_class=self.__class__.__name__)
-        else:
-            if isinstance(config, dict):
-                config = DeviceSignalInputBaseConfig(**config)
-            self.config = config
-        super().__init__(client=client, config=config, gui_id=gui_id)
-
-        self._device = None
-        self.get_bec_shortcuts()
-        self._signal_filter = []
-        self._signals = []
-        self._hinted_signals = []
-        self._normal_signals = []
-        self._config_signals = []
-        self.bec_dispatcher.client.callbacks.register(
-            EventType.DEVICE_UPDATE, self.update_signals_from_filters
-        )
-
-    ### Qt Slots ###
-
-    @Slot(str)
-    def set_signal(self, signal: str):
-        """
-        Set the signal.
-
-        Args:
-            signal (str): signal name.
-        """
-        if self.validate_signal(signal) is True:
-            WidgetIO.set_value(widget=self, value=signal)
-            self.config.default = signal
-        else:
-            logger.warning(
-                f"Signal {signal} not found for device {self.device} and filtered selection {self.signal_filter}."
-            )
-
-    @Slot(str)
-    def set_device(self, device: str | None):
-        """
-        Set the device. If device is not valid, device will be set to None which happpens
-
-        Args:
-            device(str): device name.
-        """
-        if self.validate_device(device) is False:
-            self._device = None
-        else:
-            self._device = device
-        self.update_signals_from_filters()
-
-    @Slot(dict, dict)
-    @Slot()
-    def update_signals_from_filters(
-        self, content: dict | None = None, metadata: dict | None = None
-    ):
-        """Update the filters for the device signals based on list in self.signal_filter.
-        In addition, store the hinted, normal and config signals in separate lists to allow
-        customisation within QLineEdit.
-
-        Note:
-        Signal and ComputedSignals have no signals. The naming convention follows the device name.
-        """
-        self.config.signal_filter = self.signal_filter
-        # pylint: disable=protected-access
-        self._hinted_signals = []
-        self._normal_signals = []
-        self._config_signals = []
-        if self.validate_device(self._device) is False:
-            self._device = None
-            self.config.device = self._device
-            return
-        device = self.get_device_object(self._device)
-        # See above convention for Signals and ComputedSignals
-        if isinstance(device, Signal):
-            self._signals = [self._device]
-            FilterIO.set_selection(widget=self, selection=[self._device])
-            return
-        device_info = device._info["signals"]
-        if Kind.hinted in self.signal_filter:
-            hinted_signals = [
-                signal
-                for signal, signal_info in device_info.items()
-                if (signal_info.get("kind_str", None) == str(Kind.hinted.value))
-            ]
-            self._hinted_signals = hinted_signals
-        if Kind.normal in self.signal_filter:
-            normal_signals = [
-                signal
-                for signal, signal_info in device_info.items()
-                if (signal_info.get("kind_str", None) == str(Kind.normal.value))
-            ]
-            self._normal_signals = normal_signals
-        if Kind.config in self.signal_filter:
-            config_signals = [
-                signal
-                for signal, signal_info in device_info.items()
-                if (signal_info.get("kind_str", None) == str(Kind.config.value))
-            ]
-            self._config_signals = config_signals
-        self._signals = self._hinted_signals + self._normal_signals + self._config_signals
-        FilterIO.set_selection(widget=self, selection=self.signals)
-
-    ### Qt Properties ###
-
-    @Property(str)
-    def device(self) -> str:
-        """Get the selected device."""
-        if self._device is None:
-            return ""
-        return self._device
-
-    @device.setter
-    def device(self, value: str):
-        """Set the device and update the filters, only allow devices present in the devicemanager."""
-        self._device = value
-        self.config.device = value
-        self.update_signals_from_filters()
-
-    @Property(bool)
-    def include_hinted_signals(self):
-        """Include hinted signals in filters."""
-        return Kind.hinted in self.signal_filter
-
-    @include_hinted_signals.setter
-    def include_hinted_signals(self, value: bool):
-        if value:
-            self._signal_filter.append(Kind.hinted)
-        else:
-            self._signal_filter.remove(Kind.hinted)
-        self.update_signals_from_filters()
-
-    @Property(bool)
-    def include_normal_signals(self):
-        """Include normal signals in filters."""
-        return Kind.normal in self.signal_filter
-
-    @include_normal_signals.setter
-    def include_normal_signals(self, value: bool):
-        if value:
-            self._signal_filter.append(Kind.normal)
-        else:
-            self._signal_filter.remove(Kind.normal)
-        self.update_signals_from_filters()
-
-    @Property(bool)
-    def include_config_signals(self):
-        """Include config signals in filters."""
-        return Kind.config in self.signal_filter
-
-    @include_config_signals.setter
-    def include_config_signals(self, value: bool):
-        if value:
-            self._signal_filter.append(Kind.config)
-        else:
-            self._signal_filter.remove(Kind.config)
-        self.update_signals_from_filters()
-
-    ### Properties and Methods ###
-
-    @property
-    def signals(self) -> list[str]:
-        """
-        Get the list of device signals for the applied filters.
-
-        Returns:
-            list[str]: List of device signals.
-        """
-        return self._signals
-
-    @signals.setter
-    def signals(self, value: list[str]):
-        self._signals = value
-        self.config.signals = value
-        FilterIO.set_selection(widget=self, selection=value)
-
-    @property
-    def signal_filter(self) -> list[str]:
-        """Get the list of filters to apply on the device signals."""
-        return self._signal_filter
-
-    def get_available_filters(self) -> list[str]:
-        """Get the available filters."""
-        return [entry for entry in self._filter_handler]
-
-    def set_filter(self, filter_selection: str | list[str]):
-        """
-        Set the device filter. If None, all devices are included.
-
-        Args:
-            filter_selection (str | list[str]): Device filters from BECDeviceFilter and BECReadoutPriority.
-        """
-        filters = None
-        if isinstance(filter_selection, list):
-            filters = [self._filter_handler.get(entry) for entry in filter_selection]
-        if isinstance(filter_selection, str):
-            filters = [self._filter_handler.get(filter_selection)]
-        if filters is None:
-            return
-        for entry in filters:
-            setattr(self, entry, True)
-
-    def get_device_object(self, device: str) -> object | None:
-        """
-        Get the device object based on the device name.
-
-        Args:
-            device(str): Device name.
-
-        Returns:
-            object: Device object, can be device of type Device, Positioner, Signal or ComputedSignal.
-        """
-        self.validate_device(device)
-        dev = getattr(self.dev, device.lower(), None)
-        if dev is None:
-            logger.warning(f"Device {device} not found in devicemanager.")
-            return None
-        return dev
-
-    def validate_device(self, device: str | None, raise_on_false: bool = False) -> bool:
-        """
-        Validate the device if it is present in current BEC instance.
-
-        Args:
-            device(str): Device to validate.
-        """
-        if device in self.dev:
-            return True
-        if raise_on_false is True:
-            raise ValueError(f"Device {device} not found in devicemanager.")
-        return False
-
-    def validate_signal(self, signal: str) -> bool:
-        """
-        Validate the signal if it is present in the device signals.
-
-        Args:
-            signal(str): Signal to validate.
-        """
-        if signal in self.signals:
-            return True
-        return False
--- a/bec_widgets/widgets/control/device_input/device_combobox/device_combobox.py
+++ b/bec_widgets/widgets/control/device_input/device_combobox/device_combobox.py
@@ -1,164 +0,0 @@
-from bec_lib.callback_handler import EventType
-from bec_lib.device import ReadoutPriority
-from qtpy.QtCore import QSize, Signal, Slot
-from qtpy.QtGui import QPainter, QPaintEvent, QPen
-from qtpy.QtWidgets import QComboBox, QSizePolicy
-
-from bec_widgets.utils.colors import get_accent_colors
-from bec_widgets.widgets.control.device_input.base_classes.device_input_base import (
-    BECDeviceFilter,
-    DeviceInputBase,
-    DeviceInputConfig,
-)
-
-
-class DeviceComboBox(DeviceInputBase, QComboBox):
-    """
-    Combobox widget for device input with autocomplete for device names.
-
-    Args:
-        parent: Parent widget.
-        client: BEC client object.
-        config: Device input configuration.
-        gui_id: GUI ID.
-        device_filter: Device filter, name of the device class from BECDeviceFilter and BECReadoutPriority. Check DeviceInputBase for more details.
-        default: Default device name.
-        arg_name: Argument name, can be used for the other widgets which has to call some other function in bec using correct argument names.
-    """
-
-    ICON_NAME = "list_alt"
-    PLUGIN = True
-
-    device_selected = Signal(str)
-    device_config_update = Signal()
-
-    def __init__(
-        self,
-        parent=None,
-        client=None,
-        config: DeviceInputConfig = None,
-        gui_id: str | None = None,
-        device_filter: BECDeviceFilter | list[BECDeviceFilter] | None = None,
-        readout_priority_filter: (
-            str | ReadoutPriority | list[str] | list[ReadoutPriority] | None
-        ) = None,
-        available_devices: list[str] | None = None,
-        default: str | None = None,
-        arg_name: str | None = None,
-    ):
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        QComboBox.__init__(self, parent=parent)
-        if arg_name is not None:
-            self.config.arg_name = arg_name
-            self.arg_name = arg_name
-        self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
-        self.setMinimumSize(QSize(100, 0))
-        self._callback_id = None
-        self._is_valid_input = False
-        self._accent_colors = get_accent_colors()
-        # We do not consider the config that is passed here, this produced problems
-        # with QtDesigner, since config and input arguments may differ and resolve properly
-        # Implementing this logic and config recoverage is postponed.
-        # Set available devices if passed
-        if available_devices is not None:
-            self.set_available_devices(available_devices)
-        # Set readout priority filter default is all
-        if readout_priority_filter is not None:
-            self.set_readout_priority_filter(readout_priority_filter)
-        else:
-            self.set_readout_priority_filter(
-                [
-                    ReadoutPriority.MONITORED,
-                    ReadoutPriority.BASELINE,
-                    ReadoutPriority.ASYNC,
-                    ReadoutPriority.CONTINUOUS,
-                    ReadoutPriority.ON_REQUEST,
-                ]
-            )
-        # Device filter default is None
-        if device_filter is not None:
-            self.set_device_filter(device_filter)
-        # Set default device if passed
-        if default is not None:
-            self.set_device(default)
-        self._callback_id = self.bec_dispatcher.client.callbacks.register(
-            EventType.DEVICE_UPDATE, self.on_device_update
-        )
-        self.device_config_update.connect(self.update_devices_from_filters)
-        self.currentTextChanged.connect(self.check_validity)
-        self.check_validity(self.currentText())
-
-    def on_device_update(self, action: str, content: dict) -> None:
-        """
-        Callback for device update events. Triggers the device_update signal.
-
-        Args:
-            action (str): The action that triggered the event.
-            content (dict): The content of the config update.
-        """
-        if action in ["add", "remove", "reload"]:
-            self.device_config_update.emit()
-
-    def cleanup(self):
-        """Cleanup the widget."""
-        if self._callback_id is not None:
-            self.bec_dispatcher.client.callbacks.remove(self._callback_id)
-
-    def get_current_device(self) -> object:
-        """
-        Get the current device object based on the current value.
-
-        Returns:
-            object: Device object, can be device of type Device, Positioner, Signal or ComputedSignal.
-        """
-        dev_name = self.currentText()
-        return self.get_device_object(dev_name)
-
-    def paintEvent(self, event: QPaintEvent) -> None:
-        """Extend the paint event to set the border color based on the validity of the input.
-
-        Args:
-            event (PySide6.QtGui.QPaintEvent) : Paint event.
-        """
-        # logger.info(f"Received paint event: {event} in {self.__class__}")
-        super().paintEvent(event)
-
-        if self._is_valid_input is False and self.isEnabled() is True:
-            painter = QPainter(self)
-            pen = QPen()
-            pen.setWidth(2)
-            pen.setColor(self._accent_colors.emergency)
-            painter.setPen(pen)
-            painter.drawRect(self.rect().adjusted(1, 1, -1, -1))
-            painter.end()
-
-    @Slot(str)
-    def check_validity(self, input_text: str) -> None:
-        """
-        Check if the current value is a valid device name.
-        """
-        if self.validate_device(input_text) is True:
-            self._is_valid_input = True
-            self.device_selected.emit(input_text.lower())
-        else:
-            self._is_valid_input = False
-        self.update()
-
-
-if __name__ == "__main__":  # pragma: no cover
-    # pylint: disable=import-outside-toplevel
-    from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
-
-    from bec_widgets.utils.colors import set_theme
-
-    app = QApplication([])
-    set_theme("dark")
-    widget = QWidget()
-    widget.setFixedSize(200, 200)
-    layout = QVBoxLayout()
-    widget.setLayout(layout)
-    combo = DeviceComboBox()
-    combo.devices = ["samx", "dev1", "dev2", "dev3", "dev4"]
-    layout.addWidget(combo)
-    widget.show()
-    app.exec_()
--- a/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit.py
+++ b/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit.py
@@ -1,179 +0,0 @@
-from bec_lib.callback_handler import EventType
-from bec_lib.device import ReadoutPriority
-from bec_lib.logger import bec_logger
-from qtpy.QtCore import QSize, Signal, Slot
-from qtpy.QtGui import QPainter, QPaintEvent, QPen
-from qtpy.QtWidgets import QApplication, QCompleter, QLineEdit, QSizePolicy
-
-from bec_widgets.utils.colors import get_accent_colors
-from bec_widgets.widgets.control.device_input.base_classes.device_input_base import (
-    BECDeviceFilter,
-    DeviceInputBase,
-    DeviceInputConfig,
-)
-
-logger = bec_logger.logger
-
-
-class DeviceLineEdit(DeviceInputBase, QLineEdit):
-    """
-    Line edit widget for device input with autocomplete for device names.
-
-    Args:
-        parent: Parent widget.
-        client: BEC client object.
-        config: Device input configuration.
-        gui_id: GUI ID.
-        device_filter: Device filter, name of the device class from BECDeviceFilter and ReadoutPriority. Check DeviceInputBase for more details.
-        default: Default device name.
-        arg_name: Argument name, can be used for the other widgets which has to call some other function in bec using correct argument names.
-    """
-
-    device_selected = Signal(str)
-    device_config_update = Signal()
-
-    PLUGIN = True
-    ICON_NAME = "edit_note"
-
-    def __init__(
-        self,
-        parent=None,
-        client=None,
-        config: DeviceInputConfig = None,
-        gui_id: str | None = None,
-        device_filter: BECDeviceFilter | list[BECDeviceFilter] | None = None,
-        readout_priority_filter: (
-            str | ReadoutPriority | list[str] | list[ReadoutPriority] | None
-        ) = None,
-        available_devices: list[str] | None = None,
-        default: str | None = None,
-        arg_name: str | None = None,
-    ):
-        self._callback_id = None
-        self._is_valid_input = False
-        self._accent_colors = get_accent_colors()
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        QLineEdit.__init__(self, parent=parent)
-        self.completer = QCompleter(self)
-        self.setCompleter(self.completer)
-
-        if arg_name is not None:
-            self.config.arg_name = arg_name
-            self.arg_name = arg_name
-        self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
-        self.setMinimumSize(QSize(100, 0))
-
-        # We do not consider the config that is passed here, this produced problems
-        # with QtDesigner, since config and input arguments may differ and resolve properly
-        # Implementing this logic and config recoverage is postponed.
-        # Set available devices if passed
-        if available_devices is not None:
-            self.set_available_devices(available_devices)
-        # Set readout priority filter default is all
-        if readout_priority_filter is not None:
-            self.set_readout_priority_filter(readout_priority_filter)
-        else:
-            self.set_readout_priority_filter(
-                [
-                    ReadoutPriority.MONITORED,
-                    ReadoutPriority.BASELINE,
-                    ReadoutPriority.ASYNC,
-                    ReadoutPriority.CONTINUOUS,
-                    ReadoutPriority.ON_REQUEST,
-                ]
-            )
-        # Device filter default is None
-        if device_filter is not None:
-            self.set_device_filter(device_filter)
-        # Set default device if passed
-        if default is not None:
-            self.set_device(default)
-        self._callback_id = self.bec_dispatcher.client.callbacks.register(
-            EventType.DEVICE_UPDATE, self.on_device_update
-        )
-        self.device_config_update.connect(self.update_devices_from_filters)
-        self.textChanged.connect(self.check_validity)
-        self.check_validity(self.text())
-
-    def on_device_update(self, action: str, content: dict) -> None:
-        """
-        Callback for device update events. Triggers the device_update signal.
-
-        Args:
-            action (str): The action that triggered the event.
-            content (dict): The content of the config update.
-        """
-        if action in ["add", "remove", "reload"]:
-            self.device_config_update.emit()
-
-    def cleanup(self):
-        """Cleanup the widget."""
-        if self._callback_id is not None:
-            self.bec_dispatcher.client.callbacks.remove(self._callback_id)
-
-    def get_current_device(self) -> object:
-        """
-        Get the current device object based on the current value.
-
-        Returns:
-            object: Device object, can be device of type Device, Positioner, Signal or ComputedSignal.
-        """
-        dev_name = self.text()
-        return self.get_device_object(dev_name)
-
-    def paintEvent(self, event: QPaintEvent) -> None:
-        """Extend the paint event to set the border color based on the validity of the input.
-
-        Args:
-            event (PySide6.QtGui.QPaintEvent) : Paint event.
-        """
-        # logger.info(f"Received paint event: {event} in {self.__class__}")
-        super().paintEvent(event)
-
-        if self._is_valid_input is False and self.isEnabled() is True:
-            painter = QPainter(self)
-            pen = QPen()
-            pen.setWidth(2)
-            pen.setColor(self._accent_colors.emergency)
-            painter.setPen(pen)
-            painter.drawRect(self.rect().adjusted(1, 1, -1, -1))
-            painter.end()
-
-    @Slot(str)
-    def check_validity(self, input_text: str) -> None:
-        """
-        Check if the current value is a valid device name.
-        """
-        if self.validate_device(input_text) is True:
-            self._is_valid_input = True
-            self.device_selected.emit(input_text.lower())
-        else:
-            self._is_valid_input = False
-        self.update()
-
-
-if __name__ == "__main__":  # pragma: no cover
-    # pylint: disable=import-outside-toplevel
-    from qtpy.QtWidgets import QVBoxLayout, QWidget
-
-    from bec_widgets.utils.colors import set_theme
-    from bec_widgets.widgets.control.device_input.signal_combobox.signal_combobox import (
-        SignalComboBox,
-    )
-
-    app = QApplication([])
-    set_theme("dark")
-    widget = QWidget()
-    widget.setFixedSize(200, 200)
-    layout = QVBoxLayout()
-    widget.setLayout(layout)
-    line_edit = DeviceLineEdit()
-    line_edit.filter_to_positioner = True
-    signal_line_edit = SignalComboBox()
-    line_edit.textChanged.connect(signal_line_edit.set_device)
-    line_edit.set_available_devices(["samx", "samy", "samz"])
-    line_edit.set_device("samx")
-    layout.addWidget(line_edit)
-    layout.addWidget(signal_line_edit)
-    widget.show()
-    app.exec_()
--- a/bec_widgets/widgets/control/device_input/signal_combobox/register_signal_combobox.py
+++ b/bec_widgets/widgets/control/device_input/signal_combobox/register_signal_combobox.py
@@ -1,17 +0,0 @@
-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.control.device_input.signal_combobox.signal_combobox_plugin import (
-        SignalComboBoxPlugin,
-    )
-
-    QPyDesignerCustomWidgetCollection.addCustomWidget(SignalComboBoxPlugin())
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main()
--- a/bec_widgets/widgets/control/device_input/signal_combobox/signal_combobox.py
+++ b/bec_widgets/widgets/control/device_input/signal_combobox/signal_combobox.py
@@ -1,118 +0,0 @@
-from bec_lib.device import Positioner
-from qtpy.QtCore import QSize, Signal, Slot
-from qtpy.QtWidgets import QComboBox, QSizePolicy
-
-from bec_widgets.utils.filter_io import ComboBoxFilterHandler, FilterIO
-from bec_widgets.utils.ophyd_kind_util import Kind
-from bec_widgets.widgets.control.device_input.base_classes.device_signal_input_base import (
-    DeviceSignalInputBase,
-)
-
-
-class SignalComboBox(DeviceSignalInputBase, QComboBox):
-    """
-    Line edit widget for device input with autocomplete for device names.
-
-    Args:
-        parent: Parent widget.
-        client: BEC client object.
-        config: Device input configuration.
-        gui_id: GUI ID.
-        device_filter: Device filter, name of the device class from BECDeviceFilter and BECReadoutPriority. Check DeviceInputBase for more details.
-        default: Default device name.
-        arg_name: Argument name, can be used for the other widgets which has to call some other function in bec using correct argument names.
-    """
-
-    ICON_NAME = "list_alt"
-    PLUGIN = True
-
-    device_signal_changed = Signal(str)
-
-    def __init__(
-        self,
-        parent=None,
-        client=None,
-        config: DeviceSignalInputBase = None,
-        gui_id: str | None = None,
-        device: str | None = None,
-        signal_filter: str | list[str] | None = None,
-        default: str | None = None,
-        arg_name: str | None = None,
-    ):
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        QComboBox.__init__(self, parent=parent)
-        if arg_name is not None:
-            self.config.arg_name = arg_name
-            self.arg_name = arg_name
-        if default is not None:
-            self.set_device(default)
-
-        self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
-        self.setMinimumSize(QSize(100, 0))
-        # We do not consider the config that is passed here, this produced problems
-        # with QtDesigner, since config and input arguments may differ and resolve properly
-        # Implementing this logic and config recoverage is postponed.
-        self.currentTextChanged.connect(self.on_text_changed)
-        if signal_filter is not None:
-            self.set_filter(signal_filter)
-        else:
-            self.set_filter([Kind.hinted, Kind.normal, Kind.config])
-        if device is not None:
-            self.set_device(device)
-        if default is not None:
-            self.set_signal(default)
-
-    def update_signals_from_filters(self):
-        """Update the filters for the combobox"""
-        super().update_signals_from_filters()
-        # pylint: disable=protected-access
-        if FilterIO._find_handler(self) is ComboBoxFilterHandler:
-            if len(self._config_signals) > 0:
-                self.insertItem(
-                    len(self._hinted_signals) + len(self._normal_signals), "Config Signals"
-                )
-                self.model().item(len(self._hinted_signals) + len(self._normal_signals)).setEnabled(
-                    False
-                )
-            if len(self._normal_signals) > 0:
-                self.insertItem(len(self._hinted_signals), "Normal Signals")
-                self.model().item(len(self._hinted_signals)).setEnabled(False)
-            if len(self._hinted_signals) > 0:
-                self.insertItem(0, "Hinted Signals")
-                self.model().item(0).setEnabled(False)
-
-    @Slot(str)
-    def on_text_changed(self, text: str):
-        """Slot for text changed. If a device is selected and the signal is changed and valid it emits a signal.
-        For a positioner, the readback value has to be renamed to the device name.
-
-        Args:
-            text (str): Text in the combobox.
-        """
-        if self.validate_device(self.device) is False:
-            return
-        if self.validate_signal(text) is False:
-            return
-        if text == "readback" and isinstance(self.get_device_object(self.device), Positioner):
-            device_signal = self.device
-        else:
-            device_signal = f"{self.device}_{text}"
-        self.device_signal_changed.emit(device_signal)
-
-
-if __name__ == "__main__":  # pragma: no cover
-    # pylint: disable=import-outside-toplevel
-    from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
-
-    from bec_widgets.utils.colors import set_theme
-
-    app = QApplication([])
-    set_theme("dark")
-    widget = QWidget()
-    widget.setFixedSize(200, 200)
-    layout = QVBoxLayout()
-    widget.setLayout(layout)
-    box = SignalComboBox(device="samx")
-    layout.addWidget(box)
-    widget.show()
-    app.exec_()
--- a/bec_widgets/widgets/control/device_input/signal_combobox/signal_combobox.pyproject
+++ b/bec_widgets/widgets/control/device_input/signal_combobox/signal_combobox.pyproject
@@ -1 +0,0 @@
-{'files': ['signal_combobox.py']}
--- a/bec_widgets/widgets/control/device_input/signal_combobox/signal_combobox_plugin.py
+++ b/bec_widgets/widgets/control/device_input/signal_combobox/signal_combobox_plugin.py
@@ -1,54 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-
-from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-
-from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.device_input.signal_combobox.signal_combobox import SignalComboBox
-
-DOM_XML = """
-<ui language='c++'>
-    <widget class='SignalComboBox' name='signal_combobox'>
-    </widget>
-</ui>
-"""
-
-
-class SignalComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
-    def __init__(self):
-        super().__init__()
-        self._form_editor = None
-
-    def createWidget(self, parent):
-        t = SignalComboBox(parent)
-        return t
-
-    def domXml(self):
-        return DOM_XML
-
-    def group(self):
-        return "BEC Input Widgets"
-
-    def icon(self):
-        return designer_material_icon(SignalComboBox.ICON_NAME)
-
-    def includeFile(self):
-        return "signal_combobox"
-
-    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 "SignalComboBox"
-
-    def toolTip(self):
-        return ""
-
-    def whatsThis(self):
-        return self.toolTip()
--- a/bec_widgets/widgets/control/device_input/signal_line_edit/register_signal_line_edit.py
+++ b/bec_widgets/widgets/control/device_input/signal_line_edit/register_signal_line_edit.py
@@ -1,17 +0,0 @@
-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.control.device_input.signal_line_edit.signal_line_edit_plugin import (
-        SignalLineEditPlugin,
-    )
-
-    QPyDesignerCustomWidgetCollection.addCustomWidget(SignalLineEditPlugin())
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main()
--- a/bec_widgets/widgets/control/device_input/signal_line_edit/signal_line_edit.py
+++ b/bec_widgets/widgets/control/device_input/signal_line_edit/signal_line_edit.py
@@ -1,143 +0,0 @@
-from bec_lib.device import Positioner
-from qtpy.QtCore import QSize, Signal, Slot
-from qtpy.QtGui import QPainter, QPaintEvent, QPen
-from qtpy.QtWidgets import QCompleter, QLineEdit, QSizePolicy
-
-from bec_widgets.utils.colors import get_accent_colors
-from bec_widgets.utils.ophyd_kind_util import Kind
-from bec_widgets.widgets.control.device_input.base_classes.device_signal_input_base import (
-    DeviceSignalInputBase,
-)
-
-
-class SignalLineEdit(DeviceSignalInputBase, QLineEdit):
-    """
-    Line edit widget for device input with autocomplete for device names.
-
-    Args:
-        parent: Parent widget.
-        client: BEC client object.
-        config: Device input configuration.
-        gui_id: GUI ID.
-        device_filter: Device filter, name of the device class from BECDeviceFilter and BECReadoutPriority. Check DeviceInputBase for more details.
-        default: Default device name.
-        arg_name: Argument name, can be used for the other widgets which has to call some other function in bec using correct argument names.
-    """
-
-    device_signal_changed = Signal(str)
-
-    PLUGIN = True
-    ICON_NAME = "vital_signs"
-
-    def __init__(
-        self,
-        parent=None,
-        client=None,
-        config: DeviceSignalInputBase = None,
-        gui_id: str | None = None,
-        device: str | None = None,
-        signal_filter: str | list[str] | None = None,
-        default: str | None = None,
-        arg_name: str | None = None,
-    ):
-        self._is_valid_input = False
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        QLineEdit.__init__(self, parent=parent)
-        self._accent_colors = get_accent_colors()
-        self.completer = QCompleter(self)
-        self.setCompleter(self.completer)
-        if arg_name is not None:
-            self.config.arg_name = arg_name
-            self.arg_name = arg_name
-        if default is not None:
-            self.set_device(default)
-
-        self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
-        self.setMinimumSize(QSize(100, 0))
-        # We do not consider the config that is passed here, this produced problems
-        # with QtDesigner, since config and input arguments may differ and resolve properly
-        # Implementing this logic and config recoverage is postponed.
-        if signal_filter is not None:
-            self.set_filter(signal_filter)
-        else:
-            self.set_filter([Kind.hinted, Kind.normal, Kind.config])
-        if device is not None:
-            self.set_device(device)
-        if default is not None:
-            self.set_signal(default)
-        self.textChanged.connect(self.validate_device)
-        self.validate_device(self.text())
-
-    def get_current_device(self) -> object:
-        """
-        Get the current device object based on the current value.
-
-        Returns:
-            object: Device object, can be device of type Device, Positioner, Signal or ComputedSignal.
-        """
-        dev_name = self.text()
-        return self.get_device_object(dev_name)
-
-    def paintEvent(self, event: QPaintEvent) -> None:
-        """Extend the paint event to set the border color based on the validity of the input.
-
-        Args:
-            event (PySide6.QtGui.QPaintEvent) : Paint event.
-        """
-        super().paintEvent(event)
-        painter = QPainter(self)
-        pen = QPen()
-        pen.setWidth(2)
-
-        if self._is_valid_input is False and self.isEnabled() is True:
-            pen.setColor(self._accent_colors.emergency)
-            painter.setPen(pen)
-            painter.drawRect(self.rect().adjusted(1, 1, -1, -1))
-
-    @Slot(str)
-    def check_validity(self, input_text: str) -> None:
-        """
-        Check if the current value is a valid device name.
-        """
-        if self.validate_signal(input_text) is True:
-            self._is_valid_input = True
-            self.on_text_changed(input_text)
-        else:
-            self._is_valid_input = False
-        self.update()
-
-    @Slot(str)
-    def on_text_changed(self, text: str):
-        """Slot for text changed. If a device is selected and the signal is changed and valid it emits a signal.
-        For a positioner, the readback value has to be renamed to the device name.
-
-        Args:
-            text (str): Text in the combobox.
-        """
-        print("test")
-        if self.validate_device(self.device) is False:
-            return
-        if self.validate_signal(text) is False:
-            return
-        if text == "readback" and isinstance(self.get_device_object(self.device), Positioner):
-            device_signal = self.device
-        else:
-            device_signal = f"{self.device}_{text}"
-        self.device_signal_changed.emit(device_signal)
-
-
-if __name__ == "__main__":  # pragma: no cover
-    # pylint: disable=import-outside-toplevel
-    from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
-
-    from bec_widgets.utils.colors import set_theme
-
-    app = QApplication([])
-    set_theme("dark")
-    widget = QWidget()
-    widget.setFixedSize(200, 200)
-    layout = QVBoxLayout()
-    widget.setLayout(layout)
-    layout.addWidget(SignalLineEdit(device="samx"))
-    widget.show()
-    app.exec_()
--- a/bec_widgets/widgets/control/device_input/signal_line_edit/signal_line_edit.pyproject
+++ b/bec_widgets/widgets/control/device_input/signal_line_edit/signal_line_edit.pyproject
@@ -1 +0,0 @@
-{'files': ['signal_line_edit.py']}
--- a/bec_widgets/widgets/control/scan_control/scan_control.py
+++ b/bec_widgets/widgets/control/scan_control/scan_control.py
@@ -1,491 +0,0 @@
-from collections import defaultdict
-from types import SimpleNamespace
-from typing import Optional
-
-from bec_lib.endpoints import MessageEndpoints
-from pydantic import BaseModel, Field
-from qtpy.QtCore import Property, Signal, Slot
-from qtpy.QtGui import QColor
-from qtpy.QtWidgets import (
-    QApplication,
-    QComboBox,
-    QHBoxLayout,
-    QLabel,
-    QPushButton,
-    QSizePolicy,
-    QSpacerItem,
-    QVBoxLayout,
-    QWidget,
-)
-
-from bec_widgets.qt_utils.error_popups import SafeSlot
-from bec_widgets.utils import ConnectionConfig
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.colors import get_accent_colors
-from bec_widgets.widgets.control.buttons.stop_button.stop_button import StopButton
-from bec_widgets.widgets.control.scan_control.scan_group_box import ScanGroupBox
-from bec_widgets.widgets.utility.toggle.toggle import ToggleSwitch
-
-
-class ScanParameterConfig(BaseModel):
-    name: str
-    args: Optional[list] = Field(None)
-    kwargs: Optional[dict] = Field(None)
-
-
-class ScanControlConfig(ConnectionConfig):
-    default_scan: Optional[str] = Field(None)
-    allowed_scans: Optional[list] = Field(None)
-    scans: Optional[dict[str, ScanParameterConfig]] = defaultdict(dict)
-
-
-class ScanControl(BECWidget, QWidget):
-    PLUGIN = True
-    ICON_NAME = "tune"
-
-    scan_started = Signal()
-    scan_selected = Signal(str)
-    device_selected = Signal(str)
-    scan_args = Signal(list)
-
-    def __init__(
-        self,
-        parent=None,
-        client=None,
-        config: ScanControlConfig | dict | None = None,
-        gui_id: str | None = None,
-        allowed_scans: list | None = None,
-        default_scan: str | None = None,
-    ):
-
-        if config is None:
-            config = ScanControlConfig(
-                widget_class=self.__class__.__name__, allowed_scans=allowed_scans
-            )
-        super().__init__(client=client, gui_id=gui_id, config=config)
-        QWidget.__init__(self, parent=parent)
-
-        self._hide_add_remove_buttons = False
-
-        # Client from BEC + shortcuts to device manager and scans
-        self.get_bec_shortcuts()
-
-        # Main layout
-        self.layout = QVBoxLayout(self)
-        self.layout.setContentsMargins(5, 5, 5, 5)
-        self.arg_box = None
-        self.kwarg_boxes = []
-        self.expert_mode = False  # TODO implement in the future versions
-        self.previous_scan = None
-        self.last_scan_found = None
-
-        # Widget Default Parameters
-        self.config.default_scan = default_scan
-        self.config.allowed_scans = allowed_scans
-
-        # Create and set main layout
-        self._init_UI()
-
-    def _init_UI(self):
-        """
-        Initializes the UI of the scan control widget. Create the top box for scan selection and populate scans to main combobox.
-        """
-        palette = get_accent_colors()
-        if palette is None:
-            palette = SimpleNamespace(
-                default=QColor("blue"),
-                success=QColor("green"),
-                warning=QColor("orange"),
-                emergency=QColor("red"),
-            )
-        # Scan selection box
-        self.scan_selection_group = QWidget(self)
-        QVBoxLayout(self.scan_selection_group)
-        scan_selection_layout = QHBoxLayout()
-        self.comboBox_scan_selection_label = QLabel("Scan:", self.scan_selection_group)
-        self.comboBox_scan_selection = QComboBox(self.scan_selection_group)
-        scan_selection_layout.addWidget(self.comboBox_scan_selection_label, 0)
-        scan_selection_layout.addWidget(self.comboBox_scan_selection, 1)
-        self.scan_selection_group.layout().addLayout(scan_selection_layout)
-
-        # Label to reload the last scan parameters within scan selection group box
-        self.toggle_layout = QHBoxLayout()
-        self.toggle_layout.addSpacerItem(
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Fixed)
-        )
-        self.last_scan_label = QLabel("Restore last scan parameters", self.scan_selection_group)
-        self.toggle = ToggleSwitch(parent=self.scan_selection_group, checked=False)
-        self.toggle.enabled.connect(self.request_last_executed_scan_parameters)
-        self.toggle_layout.addWidget(self.last_scan_label)
-        self.toggle_layout.addWidget(self.toggle)
-        self.scan_selection_group.layout().addLayout(self.toggle_layout)
-        self.scan_selection_group.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
-        self.layout.addWidget(self.scan_selection_group)
-
-        # Scan control (Run/Stop) buttons
-        self.scan_control_group = QWidget(self)
-        self.scan_control_group.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
-        self.button_layout = QHBoxLayout(self.scan_control_group)
-        self.button_run_scan = QPushButton("Start", self.scan_control_group)
-        self.button_run_scan.setStyleSheet(
-            f"background-color: {palette.success.name()}; color: white"
-        )
-        self.button_stop_scan = StopButton(parent=self.scan_control_group)
-        self.button_stop_scan.setStyleSheet(
-            f"background-color: {palette.emergency.name()}; color: white"
-        )
-        self.button_layout.addWidget(self.button_run_scan)
-        self.button_layout.addWidget(self.button_stop_scan)
-        self.layout.addWidget(self.scan_control_group)
-
-        # Default scan from config
-        if self.config.default_scan is not None:
-            self.comboBox_scan_selection.setCurrentText(self.config.default_scan)
-
-        # Connect signals
-        self.comboBox_scan_selection.view().pressed.connect(self.save_current_scan_parameters)
-        self.comboBox_scan_selection.currentIndexChanged.connect(self.on_scan_selection_changed)
-        self.button_run_scan.clicked.connect(self.run_scan)
-
-        self.scan_selected.connect(self.scan_select)
-
-        # Initialize scan selection
-        self.populate_scans()
-
-    def populate_scans(self):
-        """Populates the scan selection combo box with available scans from BEC session."""
-        self.available_scans = self.client.connector.get(
-            MessageEndpoints.available_scans()
-        ).resource
-        if self.config.allowed_scans is None:
-            supported_scans = ["ScanBase", "SyncFlyScanBase", "AsyncFlyScanBase"]
-            allowed_scans = [
-                scan_name
-                for scan_name, scan_info in self.available_scans.items()
-                if scan_info["base_class"] in supported_scans and len(scan_info["gui_config"]) > 0
-            ]
-
-        else:
-            allowed_scans = self.config.allowed_scans
-        self.comboBox_scan_selection.addItems(allowed_scans)
-
-    def on_scan_selection_changed(self, index: int):
-        """Callback for scan selection combo box"""
-        selected_scan_name = self.comboBox_scan_selection.currentText()
-        self.scan_selected.emit(selected_scan_name)
-        self.request_last_executed_scan_parameters()
-        self.restore_scan_parameters(selected_scan_name)
-
-    @Slot()
-    def request_last_executed_scan_parameters(self):
-        """
-        Requests the last executed scan parameters from BEC and restores them to the scan control widget.
-        """
-        enabled = self.toggle.checked
-        current_scan = self.comboBox_scan_selection.currentText()
-        if enabled:
-            history = self.client.connector.lrange(MessageEndpoints.scan_queue_history(), 0, -1)
-
-            for scan in history:
-                scan_name = scan.content["info"]["request_blocks"][-1]["msg"].content["scan_type"]
-                if scan_name == current_scan:
-                    args_dict = scan.content["info"]["request_blocks"][-1]["msg"].content[
-                        "parameter"
-                    ]["args"]
-                    args_list = []
-                    for key, value in args_dict.items():
-                        args_list.append(key)
-                        args_list.extend(value)
-                    if len(args_list) > 1 and self.arg_box is not None:
-                        self.arg_box.set_parameters(args_list)
-                    kwargs = scan.content["info"]["request_blocks"][-1]["msg"].content["parameter"][
-                        "kwargs"
-                    ]
-                    if kwargs and self.kwarg_boxes:
-                        for box in self.kwarg_boxes:
-                            box.set_parameters(kwargs)
-                    self.last_scan_found = True
-                    break
-                else:
-                    self.last_scan_found = False
-        else:
-            self.last_scan_found = False
-
-    @Property(str)
-    def current_scan(self):
-        """Returns the scan name for the currently selected scan."""
-        return self.comboBox_scan_selection.currentText()
-
-    @current_scan.setter
-    def current_scan(self, scan_name: str):
-        """Sets the current scan to the given scan name.
-
-        Args:
-            scan_name(str): Name of the scan to set as current.
-        """
-        if scan_name not in self.available_scans:
-            return
-        self.comboBox_scan_selection.setCurrentText(scan_name)
-
-    @Slot(str)
-    def set_current_scan(self, scan_name: str):
-        """Slot for setting the current scan to the given scan name.
-
-        Args:
-            scan_name(str): Name of the scan to set as current.
-        """
-        self.current_scan = scan_name
-
-    @Property(bool)
-    def hide_arg_box(self):
-        """Property to hide the argument box."""
-        if self.arg_box is None:
-            return True
-        return not self.arg_box.isVisible()
-
-    @hide_arg_box.setter
-    def hide_arg_box(self, hide: bool):
-        """Setter for the hide_arg_box property.
-
-        Args:
-            hide(bool): Hide or show the argument box.
-        """
-        if self.arg_box is not None:
-            self.arg_box.setVisible(not hide)
-
-    @Property(bool)
-    def hide_kwarg_boxes(self):
-        """Property to hide the keyword argument boxes."""
-        if len(self.kwarg_boxes) == 0:
-            return True
-
-        for box in self.kwarg_boxes:
-            if box is not None:
-                return not box.isVisible()
-
-    @hide_kwarg_boxes.setter
-    def hide_kwarg_boxes(self, hide: bool):
-        """Setter for the hide_kwarg_boxes property.
-
-        Args:
-            hide(bool): Hide or show the keyword argument boxes.
-        """
-        if len(self.kwarg_boxes) > 0:
-            for box in self.kwarg_boxes:
-                box.setVisible(not hide)
-
-    @Property(bool)
-    def hide_scan_control_buttons(self):
-        """Property to hide the scan control buttons."""
-        return not self.button_run_scan.isVisible()
-
-    @hide_scan_control_buttons.setter
-    def hide_scan_control_buttons(self, hide: bool):
-        """Setter for the hide_scan_control_buttons property.
-
-        Args:
-            hide(bool): Hide or show the scan control buttons.
-        """
-        self.show_scan_control_buttons(not hide)
-
-    @Slot(bool)
-    def show_scan_control_buttons(self, show: bool):
-        """Shows or hides the scan control buttons."""
-        self.scan_control_group.setVisible(show)
-
-    @Property(bool)
-    def hide_scan_selection_combobox(self):
-        """Property to hide the scan selection combobox."""
-        return not self.comboBox_scan_selection.isVisible()
-
-    @hide_scan_selection_combobox.setter
-    def hide_scan_selection_combobox(self, hide: bool):
-        """Setter for the hide_scan_selection_combobox property.
-
-        Args:
-            hide(bool): Hide or show the scan selection combobox.
-        """
-        self.show_scan_selection_combobox(not hide)
-
-    @Slot(bool)
-    def show_scan_selection_combobox(self, show: bool):
-        """Shows or hides the scan selection combobox."""
-        self.scan_selection_group.setVisible(show)
-
-    @Slot(str)
-    def scan_select(self, scan_name: str):
-        """
-        Slot for scan selection. Updates the scan control layout based on the selected scan.
-
-        Args:
-            scan_name(str): Name of the selected scan.
-        """
-        self.reset_layout()
-        selected_scan_info = self.available_scans.get(scan_name, {})
-
-        gui_config = selected_scan_info.get("gui_config", {})
-        self.arg_group = gui_config.get("arg_group", None)
-        self.kwarg_groups = gui_config.get("kwarg_groups", None)
-
-        if bool(self.arg_group["arg_inputs"]):
-            self.add_arg_group(self.arg_group)
-        if len(self.kwarg_groups) > 0:
-            self.add_kwargs_boxes(self.kwarg_groups)
-
-        self.update()
-        self.adjustSize()
-
-    @Property(bool)
-    def hide_add_remove_buttons(self):
-        """Property to hide the add_remove buttons."""
-        return self._hide_add_remove_buttons
-
-    @hide_add_remove_buttons.setter
-    def hide_add_remove_buttons(self, hide: bool):
-        """Setter for the hide_add_remove_buttons property.
-
-        Args:
-            hide(bool): Hide or show the add_remove buttons.
-        """
-        self._hide_add_remove_buttons = hide
-        if self.arg_box is not None:
-            self.arg_box.hide_add_remove_buttons = hide
-
-    def add_kwargs_boxes(self, groups: list):
-        """
-        Adds the given gui_groups to the scan control layout.
-
-        Args:
-            groups(list): List of dictionaries containing the gui_group information.
-        """
-        for group in groups:
-            box = ScanGroupBox(box_type="kwargs", config=group)
-            box.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
-            self.layout.addWidget(box)
-            self.kwarg_boxes.append(box)
-
-    def add_arg_group(self, group: dict):
-        """
-        Adds the given gui_groups to the scan control layout.
-
-        Args:
-        """
-        self.arg_box = ScanGroupBox(box_type="args", config=group)
-        self.arg_box.device_selected.connect(self.emit_device_selected)
-        self.arg_box.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
-        self.arg_box.hide_add_remove_buttons = self._hide_add_remove_buttons
-        self.layout.addWidget(self.arg_box)
-
-    @Slot(str)
-    def emit_device_selected(self, dev_names):
-        """
-        Emit the signal to inform about selected device(s)
-
-        "dev_names" is a string separated by space, in case of multiple devices
-        """
-        self._selected_devices = dev_names
-        self.device_selected.emit(dev_names)
-
-    def reset_layout(self):
-        """Clears the scan control layout from GuiGroups and ArgGroups boxes."""
-        if self.arg_box is not None:
-            self.layout.removeWidget(self.arg_box)
-            self.arg_box.deleteLater()
-            self.arg_box = None
-        if self.kwarg_boxes != []:
-            self.remove_kwarg_boxes()
-
-    def remove_kwarg_boxes(self):
-        for box in self.kwarg_boxes:
-            self.layout.removeWidget(box)
-            box.deleteLater()
-        self.kwarg_boxes = []
-
-    def get_scan_parameters(self, bec_object: bool = True):
-        """
-        Returns the scan parameters for the selected scan.
-
-        Args:
-            bec_object(bool): If True, returns the BEC object for the scan parameters such as device objects.
-        """
-        args = []
-        kwargs = {}
-        if self.arg_box is not None:
-            args = self.arg_box.get_parameters(bec_object)
-        for box in self.kwarg_boxes:
-            box_kwargs = box.get_parameters(bec_object)
-            kwargs.update(box_kwargs)
-        return args, kwargs
-
-    def restore_scan_parameters(self, scan_name: str):
-        """
-        Restores the scan parameters for the given scan name
-
-        Args:
-            scan_name(str): Name of the scan to restore the parameters for.
-        """
-        if self.last_scan_found is True:
-            return
-        scan_params = self.config.scans.get(scan_name, None)
-        if scan_params is None and self.previous_scan is None:
-            return
-
-        if scan_params is None and self.previous_scan is not None:
-            previous_scan_params = self.config.scans.get(self.previous_scan, None)
-            self._restore_kwargs(previous_scan_params.kwargs)
-            return
-
-        if scan_params.args is not None and self.arg_box is not None:
-            self.arg_box.set_parameters(scan_params.args)
-
-        self._restore_kwargs(scan_params.kwargs)
-
-    def _restore_kwargs(self, scan_kwargs: dict):
-        """Restores the kwargs for the given scan parameters."""
-        if scan_kwargs is not None and self.kwarg_boxes is not None:
-            for box in self.kwarg_boxes:
-                box.set_parameters(scan_kwargs)
-
-    def save_current_scan_parameters(self):
-        """Saves the current scan parameters to the scan control config for further use."""
-        scan_name = self.comboBox_scan_selection.currentText()
-        self.previous_scan = scan_name
-        args, kwargs = self.get_scan_parameters(False)
-        scan_params = ScanParameterConfig(name=scan_name, args=args, kwargs=kwargs)
-        self.config.scans[scan_name] = scan_params
-
-    @SafeSlot(popup_error=True)
-    def run_scan(self):
-        """Starts the selected scan with the given parameters."""
-        args, kwargs = self.get_scan_parameters()
-        self.scan_args.emit(args)
-        scan_function = getattr(self.scans, self.comboBox_scan_selection.currentText())
-        if callable(scan_function):
-            self.scan_started.emit()
-            scan_function(*args, **kwargs)
-
-    def cleanup(self):
-        """Cleanup the scan control widget."""
-        self.button_stop_scan.cleanup()
-        if self.arg_box:
-            for widget in self.arg_box.widgets:
-                if hasattr(widget, "cleanup"):
-                    widget.cleanup()
-        for kwarg_box in self.kwarg_boxes:
-            for widget in kwarg_box.widgets:
-                if hasattr(widget, "cleanup"):
-                    widget.cleanup()
-        super().cleanup()
-
-
-# Application example
-if __name__ == "__main__":  # pragma: no cover
-    from bec_widgets.utils.colors import set_theme
-
-    app = QApplication([])
-    scan_control = ScanControl()
-
-    set_theme("auto")
-    window = scan_control
-    window.show()
-    app.exec()
--- a/bec_widgets/widgets/dap/dap_combo_box/dap_combo_box.py
+++ b/bec_widgets/widgets/dap/dap_combo_box/dap_combo_box.py
@@ -1,184 +0,0 @@
-""" Module for DapComboBox widget class to select a DAP model from a combobox. """
-
-from bec_lib.logger import bec_logger
-from qtpy.QtCore import Property, Signal, Slot
-from qtpy.QtWidgets import QComboBox, QVBoxLayout, QWidget
-
-from bec_widgets.utils.bec_widget import BECWidget
-
-logger = bec_logger.logger
-
-
-class DapComboBox(BECWidget, QWidget):
-    """
-    The DAPComboBox widget is an extension to the QComboBox with all avaialble DAP model from BEC.
-
-    Args:
-        parent: Parent widget.
-        client: BEC client object.
-        gui_id: GUI ID.
-        default: Default device name.
-    """
-
-    ICON_NAME = "data_exploration"
-    PLUGIN = True
-    USER_ACCESS = ["select_y_axis", "select_x_axis", "select_fit_model"]
-
-    ### Signals ###
-    # Signal to emit a new dap_config: (x_axis, y_axis, fit_model). Can be used to add a new DAP process
-    # in the BECWaveformWidget using its add_dap method. The signal is emitted when the user selects a new
-    # fit model, but only if x_axis and y_axis are set.
-    new_dap_config = Signal(str, str, str)
-    # Signal to emit the name of the updated x_axis
-    x_axis_updated = Signal(str)
-    # Signal to emit the name of the updated y_axis
-    y_axis_updated = Signal(str)
-    # Signal to emit the name of the updated fit model
-    fit_model_updated = Signal(str)
-
-    def __init__(
-        self, parent=None, client=None, gui_id: str | None = None, default_fit: str | None = None
-    ):
-        super().__init__(client=client, gui_id=gui_id)
-        QWidget.__init__(self, parent=parent)
-        self.layout = QVBoxLayout(self)
-        self.fit_model_combobox = QComboBox(self)
-        self.layout.addWidget(self.fit_model_combobox)
-        self.layout.setContentsMargins(0, 0, 0, 0)
-        self._available_models = None
-        self._x_axis = None
-        self._y_axis = None
-        self.populate_fit_model_combobox()
-        self.fit_model_combobox.currentTextChanged.connect(self._update_current_fit)
-        # Set default fit model
-        self.select_default_fit(default_fit)
-
-    def select_default_fit(self, default_fit: str | None):
-        """Set the default fit model.
-
-        Args:
-            default_fit(str): Default fit model.
-        """
-        if self._validate_dap_model(default_fit):
-            self.select_fit_model(default_fit)
-        else:
-            self.select_fit_model("GaussianModel")
-
-    @property
-    def available_models(self):
-        """Available models property."""
-        return self._available_models
-
-    @available_models.setter
-    def available_models(self, available_models: list[str]):
-        """Set the available models.
-
-        Args:
-            available_models(list[str]): Available models.
-        """
-        self._available_models = available_models
-
-    @Property(str)
-    def x_axis(self):
-        """X axis property."""
-        return self._x_axis
-
-    @x_axis.setter
-    def x_axis(self, x_axis: str):
-        """Set the x axis.
-
-        Args:
-            x_axis(str): X axis.
-        """
-        # TODO add validator for x axis -> Positioner? or also device (must be monitored)!!
-        self._x_axis = x_axis
-        self.x_axis_updated.emit(x_axis)
-
-    @Property(str)
-    def y_axis(self):
-        """Y axis property."""
-        # TODO add validator for y axis -> Positioner & Device? Must be a monitored device!!
-        return self._y_axis
-
-    @y_axis.setter
-    def y_axis(self, y_axis: str):
-        """Set the y axis.
-
-        Args:
-            y_axis(str): Y axis.
-        """
-        self._y_axis = y_axis
-        self.y_axis_updated.emit(y_axis)
-
-    def _update_current_fit(self, fit_name: str):
-        """Update the current fit."""
-        self.fit_model_updated.emit(fit_name)
-        if self.x_axis is not None and self.y_axis is not None:
-            self.new_dap_config.emit(self._x_axis, self._y_axis, fit_name)
-
-    @Slot(str)
-    def select_x_axis(self, x_axis: str):
-        """Slot to update the x axis.
-
-        Args:
-            x_axis(str): X axis.
-        """
-        self.x_axis = x_axis
-        self._update_current_fit(self.fit_model_combobox.currentText())
-
-    @Slot(str)
-    def select_y_axis(self, y_axis: str):
-        """Slot to update the y axis.
-
-        Args:
-            y_axis(str): Y axis.
-        """
-        self.y_axis = y_axis
-        self._update_current_fit(self.fit_model_combobox.currentText())
-
-    @Slot(str)
-    def select_fit_model(self, fit_name: str | None):
-        """Slot to update the fit model.
-
-        Args:
-            default_device(str): Default device name.
-        """
-        if not self._validate_dap_model(fit_name):
-            raise ValueError(f"Fit {fit_name} is not valid.")
-        self.fit_model_combobox.setCurrentText(fit_name)
-
-    def populate_fit_model_combobox(self):
-        """Populate the fit_model_combobox with the devices."""
-        # pylint: disable=protected-access
-        self.available_models = [model for model in self.client.dap._available_dap_plugins.keys()]
-        self.fit_model_combobox.clear()
-        self.fit_model_combobox.addItems(self.available_models)
-
-    def _validate_dap_model(self, model: str | None) -> bool:
-        """Validate the DAP model.
-
-        Args:
-            model(str): Model name.
-        """
-        if model is None:
-            return False
-        if model not in self.available_models:
-            return False
-        return True
-
-
-if __name__ == "__main__":  # pragma: no cover
-    # pylint: disable=import-outside-toplevel
-    from qtpy.QtWidgets import QApplication
-
-    from bec_widgets.utils.colors import set_theme
-
-    app = QApplication([])
-    set_theme("dark")
-    widget = QWidget()
-    widget.setFixedSize(200, 200)
-    layout = QVBoxLayout()
-    widget.setLayout(layout)
-    layout.addWidget(DapComboBox())
-    widget.show()
-    app.exec_()
--- a/bec_widgets/widgets/dap/dap_combo_box/dap_combo_box.pyproject
+++ b/bec_widgets/widgets/dap/dap_combo_box/dap_combo_box.pyproject
@@ -1 +0,0 @@
-{'files': ['dap_combo_box.py']}
--- 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
@@ -1,54 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-
-from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-
-from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.dap.dap_combo_box.dap_combo_box import DapComboBox
-
-DOM_XML = """
-<ui language='c++'>
-    <widget class='DapComboBox' name='dap_combo_box'>
-    </widget>
-</ui>
-"""
-
-
-class DapComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
-    def __init__(self):
-        super().__init__()
-        self._form_editor = None
-
-    def createWidget(self, parent):
-        t = DapComboBox(parent)
-        return t
-
-    def domXml(self):
-        return DOM_XML
-
-    def group(self):
-        return "BEC Input Widgets"
-
-    def icon(self):
-        return designer_material_icon(DapComboBox.ICON_NAME)
-
-    def includeFile(self):
-        return "dap_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 "DapComboBox"
-
-    def toolTip(self):
-        return ""
-
-    def whatsThis(self):
-        return self.toolTip()
--- a/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py
+++ b/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py
@@ -1,330 +0,0 @@
-import os
-
-from bec_lib.logger import bec_logger
-from qtpy.QtCore import Property, Signal, Slot
-from qtpy.QtWidgets import QPushButton, QTreeWidgetItem, QVBoxLayout, QWidget
-
-from bec_widgets.utils import UILoader
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.colors import get_accent_colors
-
-logger = bec_logger.logger
-
-
-class LMFitDialog(BECWidget, QWidget):
-    """Dialog for displaying the fit summary and params for LMFit DAP processes"""
-
-    PLUGIN = True
-    ICON_NAME = "monitoring"
-    # Signal to emit the currently selected fit curve_id
-    selected_fit = Signal(str)
-    # Signal to emit a move action in form of a tuple (param_name, value)
-    move_action = Signal(tuple)
-
-    def __init__(
-        self,
-        parent=None,
-        client=None,
-        config=None,
-        target_widget=None,
-        gui_id: str | None = None,
-        ui_file="lmfit_dialog_vertical.ui",
-    ):
-        """
-        Initialises the LMFitDialog widget.
-
-        Args:
-            parent (QWidget): The parent widget.
-            client: BEC client object.
-            config: Configuration of the widget.
-            target_widget: The widget that the settings will be taken from and applied to.
-            gui_id (str): GUI ID.
-            ui_file (str): The UI file to be loaded.
-        """
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        QWidget.__init__(self, parent=parent)
-        self._ui_file = ui_file
-        self.target_widget = target_widget
-
-        current_path = os.path.dirname(__file__)
-        self.ui = UILoader(self).loader(os.path.join(current_path, self._ui_file))
-        self.layout = QVBoxLayout(self)
-        self.layout.addWidget(self.ui)
-        self.summary_data = {}
-        self._fit_curve_id = None
-        self._deci_precision = 3
-        self._always_show_latest = False
-        self.ui.curve_list.currentItemChanged.connect(self.display_fit_details)
-        self.layout.setContentsMargins(0, 0, 0, 0)
-        self.setLayout(self.layout)
-        self._active_actions = []
-        self._enable_actions = True
-        self._move_buttons = []
-        self._accent_colors = get_accent_colors()
-        self.action_buttons = {}
-
-    @property
-    def enable_actions(self) -> bool:
-        """Property to enable the move to buttons."""
-        return self._enable_actions
-
-    @enable_actions.setter
-    def enable_actions(self, enable: bool):
-        self._enable_actions = enable
-        for button in self.action_buttons.values():
-            button.setEnabled(enable)
-
-    @Property(list)
-    def active_action_list(self) -> list[str]:
-        """Property to list the names of the fit parameters for which actions should be enabled."""
-        return self._active_actions
-
-    @active_action_list.setter
-    def active_action_list(self, actions: list[str]):
-        self._active_actions = actions
-
-    # This slot needed?
-    @Slot(bool)
-    def set_actions_enabled(self, enable: bool) -> bool:
-        """Slot to enable the move to buttons.
-
-        Args:
-            enable (bool): Whether to enable the action buttons.
-        """
-        self.enable_actions = enable
-
-    @Property(bool)
-    def always_show_latest(self):
-        """Property to indicate if always the latest DAP update is displayed."""
-        return self._always_show_latest
-
-    @always_show_latest.setter
-    def always_show_latest(self, show: bool):
-        self._always_show_latest = show
-
-    @Property(bool)
-    def hide_curve_selection(self):
-        """Property for showing the curve selection."""
-        return not self.ui.group_curve_selection.isVisible()
-
-    @hide_curve_selection.setter
-    def hide_curve_selection(self, show: bool):
-        """Setter for showing the curve selection.
-
-        Args:
-            show (bool): Whether to show the curve selection.
-        """
-        self.ui.group_curve_selection.setVisible(not show)
-
-    @Property(bool)
-    def hide_summary(self) -> bool:
-        """Property for showing the summary."""
-        return not self.ui.group_summary.isVisible()
-
-    @hide_summary.setter
-    def hide_summary(self, show: bool):
-        """Setter for showing the summary.
-
-        Args:
-            show (bool): Whether to show the summary.
-        """
-        self.ui.group_summary.setVisible(not show)
-
-    @Property(bool)
-    def hide_parameters(self) -> bool:
-        """Property for showing the parameters."""
-        return not self.ui.group_parameters.isVisible()
-
-    @hide_parameters.setter
-    def hide_parameters(self, show: bool):
-        """Setter for showing the parameters.
-
-        Args:
-            show (bool): Whether to show the parameters.
-        """
-        self.ui.group_parameters.setVisible(not show)
-
-    @property
-    def fit_curve_id(self) -> str:
-        """Property for the currently displayed fit curve_id."""
-        return self._fit_curve_id
-
-    @fit_curve_id.setter
-    def fit_curve_id(self, curve_id: str):
-        """Setter for the currently displayed fit curve_id.
-
-        Args:
-            fit_curve_id (str): The curve_id of the fit curve to be displayed.
-        """
-        self._fit_curve_id = curve_id
-        self.selected_fit.emit(curve_id)
-
-    @Slot(str)
-    def remove_dap_data(self, curve_id: str):
-        """Remove the DAP data for the given curve_id.
-
-        Args:
-            curve_id (str): The curve_id of the DAP data to be removed.
-        """
-        self.summary_data.pop(curve_id, None)
-        self.refresh_curve_list()
-
-    @Slot(str)
-    def select_curve(self, curve_id: str):
-        """Select active curve_id in the curve list.
-
-        Args:
-            curve_id (str): curve_id to be selected.
-        """
-        self.fit_curve_id = curve_id
-
-    @Slot(dict, dict)
-    def update_summary_tree(self, data: dict, metadata: dict):
-        """Update the summary tree with the given data.
-
-        Args:
-            data (dict): Data for the DAP Summary.
-            metadata (dict): Metadata of the fit curve.
-        """
-        curve_id = metadata.get("curve_id", "")
-        self.summary_data.update({curve_id: data})
-        self.refresh_curve_list()
-        if self.fit_curve_id is None or self.always_show_latest is True:
-            self.fit_curve_id = curve_id
-        if curve_id != self.fit_curve_id:
-            return
-        if data is None:
-            return
-        self.ui.summary_tree.clear()
-        chi_squared = data.get("chisqr", 0.0)
-        if isinstance(chi_squared, float) or isinstance(chi_squared, int):
-            chi_squared = f"{chi_squared:.{self._deci_precision}f}"
-        else:
-            chi_squared = "None"
-        reduced_chi_squared = data.get("redchi", 0.0)
-        if isinstance(reduced_chi_squared, float) or isinstance(reduced_chi_squared, int):
-            reduced_chi_squared = f"{reduced_chi_squared:.{self._deci_precision}f}"
-        else:
-            reduced_chi_squared = "None"
-        r_squared = data.get("rsquared", 0.0)
-        if isinstance(r_squared, float) or isinstance(r_squared, int):
-            r_squared = f"{r_squared:.{self._deci_precision}f}"
-        else:
-            r_squared = "None"
-        properties = [
-            ("Model", data.get("model", "")),
-            ("Method", data.get("method", "")),
-            ("Chi-Squared", chi_squared),
-            ("Reduced Chi-Squared", reduced_chi_squared),
-            ("R-Squared", r_squared),
-            ("Message", data.get("message", "")),
-        ]
-        for prop, val in properties:
-            QTreeWidgetItem(self.ui.summary_tree, [prop, val])
-        self.update_param_tree(data.get("params", []))
-
-    def _update_summary_data(self, curve_id: str, data: dict):
-        """Update the summary data with the given data.
-
-        Args:
-            curve_id (str): The curve_id of the fit curve.
-            data (dict): The data to be updated.
-        """
-        self.summary_data.update({curve_id: data})
-        if self.fit_curve_id is not None:
-            return
-        self.fit_curve_id = curve_id
-
-    def update_param_tree(self, params):
-        """Update the parameter tree with the given parameters.
-
-        Args:
-            params (list): List of LMFit parameters for the fit curve.
-        """
-        self._move_buttons = []
-        self.ui.param_tree.clear()
-        for param in params:
-            param_name = param[0]
-            param_value = param[1]
-            if isinstance(param_value, float) or isinstance(param_value, int):
-                param_value = f"{param_value:.{self._deci_precision}f}"
-            else:
-                param_value = "None"
-            param_std = param[7]
-            if isinstance(param_std, float) or isinstance(param_std, int):
-                param_std = f"{param_std:.{self._deci_precision}f}"
-            else:
-                param_std = "None"
-
-            tree_item = QTreeWidgetItem(self.ui.param_tree, [param_name, param_value, param_std])
-            if param_name in self.active_action_list:  # pylint: disable=unsupported-membership-test
-                # Create a push button to move the motor to a specific position
-                widget = QWidget()
-                button = QPushButton(f"Move to {param_name}")
-                button.clicked.connect(self._create_move_action(param_name, param[1]))
-                if self.enable_actions is True:
-                    button.setEnabled(True)
-                else:
-                    button.setEnabled(False)
-                button.setStyleSheet(
-                    f"""
-                    QPushButton:enabled {{ background-color: {self._accent_colors.success.name()};color: white; }} 
-                    QPushButton:disabled {{ background-color: grey;color: white; }}
-                    """
-                )
-                self.action_buttons[param_name] = button
-                layout = QVBoxLayout()
-                layout.addWidget(self.action_buttons[param_name])
-                layout.setContentsMargins(0, 0, 0, 0)
-                widget.setLayout(layout)
-                self.ui.param_tree.setItemWidget(tree_item, 3, widget)
-
-    def _create_move_action(self, param_name: str, param_value: float) -> callable:
-        """Create a move action for the given parameter name and value.
-
-        Args:
-            param_name (str): The name of the parameter.
-            param_value (float): The value of the parameter.
-        Returns:
-            callable: The move action with the given parameter name and value.
-        """
-
-        def move_action():
-            self.move_action.emit((param_name, param_value))
-
-        return move_action
-
-    def populate_curve_list(self):
-        """Populate the curve list with the available fit curves."""
-        for curve_name in self.summary_data:
-            self.ui.curve_list.addItem(curve_name)
-
-    def refresh_curve_list(self):
-        """Refresh the curve list with the updated data."""
-        self.ui.curve_list.clear()
-        self.populate_curve_list()
-
-    def display_fit_details(self, current):
-        """Callback for displaying the fit details of the selected curve.
-
-        Args:
-            current: The current item in the curve list.
-        """
-        if current:
-            curve_name = current.text()
-            self.fit_curve_id = curve_name
-            data = self.summary_data[curve_name]
-            if data is None:
-                return
-            self.update_summary_tree(data, {"curve_id": curve_name})
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from qtpy.QtWidgets import QApplication  # pylint: disable=ungrouped-imports
-
-    app = QApplication(sys.argv)
-    dialog = LMFitDialog()
-    dialog.show()
-    sys.exit(app.exec_())
--- a/Show More
+++ b/Show More