feat(qt_utils): added warning utility with simple API to setup warning message

feat(qt_utils): added error handle utility with popup messageBoxes
0.85.0
2026-04-18 14:25:37 +02:00 · 2024-07-16 17:47:27 +02:00 · 2024-07-16 17:47:19 +02:00 · 2024-07-16 10:53:17 +00:00 · 2024-07-15 22:26:14 +02:00 · 2024-07-15 15:23:17 +00:00
154 changed files with 5254 additions and 4726 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,6 +144,9 @@ tests:
      coverage_report:
        coverage_format: cobertura
        path: coverage.xml
+    paths:
+      - tests/reference_failures/
+    when: always

 test-matrix:
  parallel:
@@ -154,7 +157,6 @@ test-matrix:
          - "3.12"
        QT_PCKG:
          - "pyside6"
-          - "pyqt5"
          - "pyqt6"

  stage: AdditionalTests
--- a/.pylintrc
+++ b/.pylintrc
@@ -3,7 +3,7 @@
 # A comma-separated list of package or module names from where C extensions may
 # be loaded. Extensions are loading into the active Python interpreter and may
 # run arbitrary code.
-extension-pkg-allow-list=PyQt5, pyqtgraph
+extension-pkg-allow-list=PyQt6, PySide6, pyqtgraph

 # A comma-separated list of package or module names from where C extensions may
 # be loaded. Extensions are loading into the active Python interpreter and may
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,155 +1,141 @@
 # CHANGELOG

-## v0.77.0 (2024-07-02)
+## v0.85.0 (2024-07-16)

 ### Feature

-* feat(bec_connector): export config to yaml ([`a391f30`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a391f3018c50fee6a4a06884491b957df80c3cd3))
+* feat(color_map_selector): added colormap selector with plugin ([`b98fd00`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b98fd00adef97adf57f49b60ade99972b9f5a6bc))

-* feat(utils): colors added convertor for rgba to hex ([`572f2fb`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/572f2fb8110d5cb0e80f3ca45ce57ef405572456))
-
-### Fix
-
-* fix(waveform): scatter 2D brush error ([`215d59c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/215d59c8bfe7fda9aff8cec8353bef9e1ce2eca1))
-
-* fix(figure): API cleanup ([`008a33a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/008a33a9b192473cc58e90cd6d98c5bcb5f7b8c0))
-
-* fix(figure): if/else logic corrected in subplot_factory ([`3e78723`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3e787234c7274b0698423d7bf9a4c54ec46bad5f))
-
-* fix(image): processing of already displayed data; closes #106 ([`1173510`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1173510105d2d70d7e498c2ac1e122cea3a16597))
-
-* fix(bec_figure): full reconstruction with config from other bec figure ([`b6e1e20`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b6e1e20b7c8549bb092e981062329e601411dda6))
-
-* fix(motor_map): API changes updates current visualisation; motor_map can be initialised from config ([`2e2d422`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2e2d422910685a2527a3d961a468c787f771ca44))
-
-* fix(image): image add_custom_image fixed, closes #225 ([`f0556e4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f0556e44113ffee66cf735aa2dd758c62cb634f4))
-
-* fix(figure): subplot methods consolidated; added subplot factory ([`4a97105`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4a97105e4bd2ce77d72dfe5f8307dd9ee65b21b0))
-
-* fix(image): image can be fully reconstructed from config ([`797f73c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/797f73c39aa73e07d6311f3de4baea53f6c380e0))
-
-* fix(image_item): vrange added int for pydantic model check ([`b8f796f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b8f796fd3fcc15641e8fc6a3ca75c344ce90fc45))
-
-* fix(bec_figure): waveforms can be initialised from the config; widgets are deleteLater after removal ([`78673ea`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/78673ea11a47aad878128197ae6213925228ed59))
-
-### Unknown
-
-* Resolve &#34;add VT100 console executing BEC as a widget&#34; ([`c6a14c0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c6a14c0768a90695567a83a7895247ed0c64f3ce))
-
-## v0.76.1 (2024-06-29)
-
-### Fix
-
-* fix(plugins): fixes and tests for auto-gen plugins ([`c42511d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c42511dd44cc13577e108a6cef3166376e594f54))
-
-## v0.76.0 (2024-06-28)
+## v0.84.0 (2024-07-15)

 ### Feature

-* feat(designer): added support for creating designer plugins automatically ([`c1dd0ee`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c1dd0ee1906dba1f2e2ae9ce40a84d55c26a1cce))
+* feat(waveform): async readback update implemented for async devices ([`0c6a9f2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0c6a9f2310df31ddcd68050a17cfbf52c3e2e226))
+
+* feat(waveform): data are taken directly from ScanItem which is defined from scan_status endpoint; scan update is triggered from scan_segment; plots can be added just specifying y_name -&gt; best effort for setting x reported device ([`b8717f1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b8717f13276734dd655ab03cd6005985ad5af9fb))

 ### Fix

-* fix: fixed qwidget inheritance for ring progress bar ([`0610d2f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0610d2f9f027f8659e7149f2dfbb316ff30e337d))
+* fix(waveform): timestamp are not converted to human readable format ([`e495fd3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e495fd30c4c16474689943c7263e3060cb09ffb4))

-### Unknown
+* fix(waveform): set_x method various bugs fixed ([`8516a1d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8516a1d639925a877f174fa13f427a71131cc918))

-* fix:parent set as first kwarg TextBox and WebsiteWidget ([`a45c407`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a45c4075684b93bfdcee03e5a416b84f61d3bc6f))
+* fix(waveform): x axis switching logic fixed when axis are not compatible ([`e4e1a90`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e4e1a905d19def22f970b364c18c953f00e10389))

-## v0.75.0 (2024-06-26)
+* fix(waveform): dap leaked RID for all daps in current process; dap RID is now f&#34;{scan_id}-{gui_id}&#34; to distinguish for each plot instance ([`d23fd8b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d23fd8bd074ede6e14eb8e85e025cbced4bd45ef))

-### Feature
+* fix(waveform): only one type of x axis allowed; x mode validated ([`9d6ae87`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9d6ae87d0f03ca227570fcca8af2d8190828d271))

-* feat(widgets): added simple bec queue widget ([`3faee98`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3faee98ec80041a27e4c1f1156178de6f9dcdc63))
+* fix(waveform): data for axis are taken by separate method; validation consolidated ([`fc5a8bd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fc5a8bdd8b260f5e9b59ec71a4610c57442e43fe))
+
+* fix(bec_dispatcher): connect_slot can accept kwargs ([`0aa317a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0aa317aae58d3612d46f05b85f8b0db3d12bbe14))

 ### Refactor

-* refactor(dispatcher): cleanup ([`ca02132`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ca02132c8d18535b37e9192e00459d2aca6ba5cf))
+* refactor(waveform): plot can be prompted without specifying kwargs ([`48911e9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/48911e934815923c94edb5ced6042058a11a97f5))

-## v0.74.1 (2024-06-26)
-
-### Build
-
-* build: added missing pytest-bec-e2e dependency; closes #219 ([`56fdae4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/56fdae42757bdb9fa301c1e425a77e98b6eaf92b))
-
-* build: fixed dependency ranges; closes #135 ([`e6a06c9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e6a06c9f43e0ad6bbfcfa550a2f580d2a27aff66))
-
-### Chore
-
-* chore: sorted dependencies alphabetically ([`21c807f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/21c807f35831fdd1ef2e488ab90edae4719f0cb7))
-
-### Documentation
-
-* docs: fixed doc string ([`f979a63`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f979a63d3d1a008f80e500510909750878ff4303))
-
-### Fix
-
-* fix(rings): rings properties updated right after setting ([`c8b7367`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c8b7367815b095f8e4aa8b819481efb701f2e542))
-
-* fix(motor_map): motor map can be removed from BECFigure with .remove() ([`6b25abf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6b25abff70280271e2eeb70450553c05d4b7c99c))
+* refactor(jupyter_console_window): added more examples of waveforms ([`fc935d9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fc935d9fc81067c3a67389ff88ea97da2e0c903e))

 ### Test

-* test(bec_figure): tests for removing widgets with rpc e2e ([`a268caa`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a268caaa30711fcc7ece542d24578d74cbf65c77))
+* test(waveform): tests extended ([`006992e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/006992e43cc56d56261bc4fd3e9cae9abcab2153))

-## v0.74.0 (2024-06-25)
+## v0.83.1 (2024-07-14)

-### Documentation
+### Fix

-* docs(becfigure): docs added ([`a51b15d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a51b15da3f5e83e0c897a0342bdb05b9c677a179))
+* fix(toolbar): default transparent background ([`eab7883`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/eab78839792f175b7ac127ca603385c6baa5ff15))
+
+* fix: use apply_theme ([`2d4249e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2d4249e73a792fed1c2c7ab79bb8aec38c57466c))
+
+* fix: spinner: update reference image for widget test, use apply_theme ([`63db135`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/63db1352ee883d35670b3a692dbe51d6d01872ae))
+
+* fix: replace pyqtdarktheme by qdarkstyle, add &#39;apply_theme&#39; function (in utils/colors.py) ([`8308115`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8308115f3646245d825fc47ab57297d3460bbcf5))
+
+### Test
+
+* test(toolbar): added reference pngs for spinner for Darwin ([`11a7204`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/11a7204c98e0bf211a8721d296b45d24a3102b97))
+
+## v0.83.0 (2024-07-08)

 ### Feature

-* feat(waveform1d): dap LMFit model can be added to plot ([`1866ba6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1866ba66c8e3526661beb13fff3e13af6a0ae562))
+* feat: added reference utils to compare renderings of widgets ([`2988fd3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2988fd387e6b8076fffec1d57e3ccab89ddb2aeb))
+
+* feat(widgets): added device box with spinner ([`1b017ed`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1b017edfad8e78fa079210486123976695b8915c))
+
+* feat(designer): added option to skip the widget validation for DesignerPluginGenerator ([`41bcb80`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/41bcb801674ab6c4d6069bba34ffee09c9e665db))
+
+### Fix
+
+* fix(terminal): added default args to avoid designer crashes on startup ([`360d171`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/360d17135573e44b80ab517756da3c0b31daab0f))
+
+* fix(widget): fixed widget cleanup routine ([`2b29e34`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2b29e34b52d056349647bb2fcf649b749a60d292))
+
+* fix(bec_widget): added cleanup method to bec widget base class ([`fd8766e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fd8766ed87770661da6591aeb4df5abdaf38afc7))
+
+* fix(website): fixed dummy input ([`903ce7d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/903ce7d46b5d37d40486d0fda92d3694d3faca62))

 ### Test

-* test(waveform1d): dap e2e test added ([`7271b42`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7271b422f98ef9264970d708811c414b69a644db))
+* test(vscode): fixed vscode tests for new cleanup routine ([`eb26e2a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/eb26e2a11b229a52efe2e6d4fb28d760d3740136))

-## v0.73.2 (2024-06-25)
+* test(vscode): improved vscode test ([`5de8804`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5de8804da1e41eafad2472344904b3324438c13b))
+
+## v0.82.2 (2024-07-08)

 ### Fix

-* fix(vscode): only run terminate if the process is still alive ([`7120f3e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7120f3e93b054b788f15e2d5bcd688e3c140c1ce))
+* fix(rpc_server): pass cli config to server ([`90178e2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/90178e2f61fa9dac7d82c0d0db40a9767bb133e6))

-* fix(rpc): trigger shutdown of server when gui is terminated ([`acc1318`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/acc13183e28030e3ca9af21bb081e1eed081622b))
-
-* fix(rpc): remove of calling &#34;close&#34; and waiting for gui_is_alive ([`f75fc19`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f75fc19c5b10022763252917ca473f404a25165a))
-
-## v0.73.1 (2024-06-25)
+## v0.82.1 (2024-07-07)

 ### Fix

-* fix(ringprogressbar): removed hard-coded endpoint strings ([`1de3cbf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1de3cbf65a1832150917a7549a1bf3efdee6371a))
+* fix(motor_map): bug where motors without limits were selected ([`c78cd89`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c78cd898f203f950d7cb589eb5609feaa88062cf))

-## v0.73.0 (2024-06-25)
+### Refactor
+
+* refactor(setting_dialog): moved to qt_utils ([`3826bb3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3826bb3d9e870e85709b5b20ef09a4d22641280c))
+
+* refactor(toolbar): toolbar moved from widgets to qt_utils ([`7ffc06f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7ffc06f3c7ddd86a1681408a75221b9bbadb236b))
+
+### Test
+
+* test(setting_dialog): tests added ([`74a249b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/74a249bd065d01006cb532bfff2a9bfedb34b592))
+
+### Unknown
+
+* tests(motor_map_widget): tests added ([`734f4c7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/734f4c77507a1edafd477d81b5f7401d8e759be2))
+
+* feat(settings_dialog):apply button ([`2020953`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2020953b933b6fcad61ecc770588d39518c26fdd))
+
+## v0.82.0 (2024-07-07)

 ### Feature

-* feat: add new default scaling of image_item ([`df812ea`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/df812eaad5989f2930dde41d87491868505af946))
+* feat(toggle): added angular component-like toggle ([`b9bff38`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b9bff38b64b86f06b3bc047922ef9df0c7d32e71))

-### Test
+### Refactor

-* test: add test for imageitem ([`88ecd05`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/88ecd05b95974938ef1efff40e81854baf004cb4))
+* refactor(device_input): DeviceComboBox and DeviceLineEdit moved to top layer of widgets ([`f048629`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f04862933f049030554086adef3ec9e1aebd3eda))

-## v0.72.2 (2024-06-25)
+* refactor(stop_button): moved to top layer, plugin added ([`f5b8375`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f5b8375fd36e3bb681de571da86a6c0bdb3cb6f0))
+
+* refactor(motor_map_widget): removed restriction of only PySide6 for widget ([`db1cdf4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/db1cdf42806fef6d7c6d2db83528f32df3f9751d))
+
+* refactor(color_button): ColorButton moved to top level of widgets ([`fa1e86f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fa1e86ff07b25d2c47c73117b00765b8e2f25da4))
+
+## v0.81.2 (2024-07-07)

 ### Fix

-* fix(designer): fixed designer for pyenv and venv; closes #237 ([`e631fc1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e631fc15d8707b73d58cb64316e115a7e43961ea))
+* fix(waveform): scan_history error check for IndexError ([`dd1875e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/dd1875ea5cc18bcef9aad743347a8accf144c08d))

-## v0.72.1 (2024-06-24)
+## v0.81.1 (2024-07-07)

 ### Fix

-* fix: renamed spiral progress bar to ring progress bar; closes #235 ([`e5c0087`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e5c0087c9aed831edbe1c172746325a772a3bafa))
+* fix(motor_control): temporary remove of motor control widgets ([`99114f1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/99114f14f62202e1fd8bf145616fa8c69937ada4))

-### Test
-
-* test: bugfix to prohibit leackage of mock ([`4348ed1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4348ed1bb2182da6bdecaf372d6db85279e60af8))
-
-## v0.72.0 (2024-06-24)
-
-### Feature
-
-* feat(connector): added threadpool wrapper ([`4ca1efe`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4ca1efeeb8955604069f7b98374c7f82e1a8da67))
+## v0.81.0 (2024-07-06)
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ cd bec_widgets
 pip install -e .[dev,pyqt6]
 ```

-BEC Widgets currently supports both PyQt5 and PyQt6, however, no default distribution is specified. As a result, users must install one of the supported
+BEC Widgets currently supports both Pyside6 and PyQt6, however, no default distribution is specified. As a result, users must install one of the supported
 Python Qt distributions manually.

 To select a specific Python Qt distribution, install the package with an additional tag:
@@ -28,7 +28,7 @@ pip install bec_widgets[pyqt6]
 or 

 ```bash
-pip install bec_widgets[pyqt5]
+pip install bec_widgets[pyside6]
 ```
 ## Documentation

--- a/bec_widgets/cli/client.py
+++ b/bec_widgets/cli/client.py
@@ -13,13 +13,18 @@ class Widgets(str, enum.Enum):
    Enum for the available widgets.
    """

-    BECQueue = "BECQueue"
-    BECStatusBox = "BECStatusBox"
    BECDock = "BECDock"
    BECDockArea = "BECDockArea"
    BECFigure = "BECFigure"
+    BECMotorMapWidget = "BECMotorMapWidget"
+    BECQueue = "BECQueue"
+    BECStatusBox = "BECStatusBox"
+    DeviceBox = "DeviceBox"
+    DeviceComboBox = "DeviceComboBox"
+    DeviceLineEdit = "DeviceLineEdit"
    RingProgressBar = "RingProgressBar"
    ScanControl = "ScanControl"
+    StopButton = "StopButton"
    TextBox = "TextBox"
    VSCodeEditor = "VSCodeEditor"
    WebsiteWidget = "WebsiteWidget"
@@ -463,8 +468,9 @@ class BECFigure(RPCBase):
    @rpc_call
    def plot(
        self,
-        x: "list | np.ndarray | None" = None,
+        arg1: "list | np.ndarray | str | None" = None,
        y: "list | np.ndarray | None" = None,
+        x: "list | np.ndarray | None" = None,
        x_name: "str | None" = None,
        y_name: "str | None" = None,
        z_name: "str | None" = None,
@@ -486,8 +492,9 @@ class BECFigure(RPCBase):
        Add a 1D waveform plot to the figure. Always access the first waveform widget in the figure.

        Args:
-            x(list | np.ndarray): Custom x data to plot.
+            arg1(list | np.ndarray | str | None): First argument which can be x data, y data, or y_name.
            y(list | np.ndarray): Custom y data to plot.
+            x(list | np.ndarray): Custom x data to plot.
            x_name(str): The name of the device for the x-axis.
            y_name(str): The name of the device for the y-axis.
            z_name(str): The name of the device for the z-axis.
@@ -1192,6 +1199,7 @@ class BECMotorMap(RPCBase):
    def get_data(self) -> "dict":
        """
        Get the data of the motor map.
+
        Returns:
            dict: Data of the motor map.
        """
@@ -1202,6 +1210,94 @@ class BECMotorMap(RPCBase):
        Remove the plot widget from the figure.
        """

+    @rpc_call
+    def reset_history(self):
+        """
+        Reset the history of the motor map.
+        """
+
+
+class BECMotorMapWidget(RPCBase):
+    @rpc_call
+    def change_motors(
+        self,
+        motor_x: "str",
+        motor_y: "str",
+        motor_x_entry: "str" = None,
+        motor_y_entry: "str" = None,
+        validate_bec: "bool" = True,
+    ) -> "None":
+        """
+        Change the active motors for the plot.
+
+        Args:
+            motor_x(str): Motor name for the X axis.
+            motor_y(str): Motor name for the Y axis.
+            motor_x_entry(str): Motor entry for the X axis.
+            motor_y_entry(str): Motor entry for the Y axis.
+            validate_bec(bool, optional): If True, validate the signal with BEC. Defaults to True.
+        """
+
+    @rpc_call
+    def set_max_points(self, max_points: "int") -> "None":
+        """
+        Set the maximum number of points to display on the motor map.
+
+        Args:
+            max_points(int): Maximum number of points to display.
+        """
+
+    @rpc_call
+    def set_precision(self, precision: "int") -> "None":
+        """
+        Set the precision of the motor map.
+
+        Args:
+            precision(int): Precision to set.
+        """
+
+    @rpc_call
+    def set_num_dim_points(self, num_dim_points: "int") -> "None":
+        """
+        Set the number of points to display on the motor map.
+
+        Args:
+            num_dim_points(int): Number of points to display.
+        """
+
+    @rpc_call
+    def set_background_value(self, background_value: "int") -> "None":
+        """
+        Set the background value of the motor map.
+
+        Args:
+            background_value(int): Background value of the motor map.
+        """
+
+    @rpc_call
+    def set_scatter_size(self, scatter_size: "int") -> "None":
+        """
+        Set the scatter size of the motor map.
+
+        Args:
+            scatter_size(int): Scatter size of the motor map.
+        """
+
+    @rpc_call
+    def get_data(self) -> "dict":
+        """
+        Get the data of the motor map.
+
+        Returns:
+            dict: Data of the motor map.
+        """
+
+    @rpc_call
+    def reset_history(self) -> "None":
+        """
+        Reset the history of the motor map.
+        """
+

 class BECPlotBase(RPCBase):
    @property
@@ -1403,8 +1499,9 @@ class BECWaveform(RPCBase):
    @rpc_call
    def plot(
        self,
-        x: "list | np.ndarray | None" = None,
+        arg1: "list | np.ndarray | str | None" = None,
        y: "list | np.ndarray | None" = None,
+        x: "list | np.ndarray | None" = None,
        x_name: "str | None" = None,
        y_name: "str | None" = None,
        z_name: "str | None" = None,
@@ -1416,13 +1513,20 @@ class BECWaveform(RPCBase):
        label: "str | None" = None,
        validate: "bool" = True,
        dap: "str | None" = None,
+        **kwargs,
    ) -> "BECCurve":
        """
        Plot a curve to the plot widget.
+
        Args:
-            x(list | np.ndarray): Custom x data to plot.
+            arg1(list | np.ndarray | str | None): First argument which can be x data, y data, or y_name.
            y(list | np.ndarray): Custom y data to plot.
-            x_name(str): The name of the device for the x-axis.
+            x(list | np.ndarray): Custom y data to plot.
+            x_name(str): Name of the x signal.
+                - "best_effort": Use the best effort signal.
+                - "timestamp": Use the timestamp signal.
+                - "index": Use the index signal.
+                - Custom signal name of device from BEC.
            y_name(str): The name of the device for the y-axis.
            z_name(str): The name of the device for the z-axis.
            x_entry(str): The name of the entry for the x-axis.
@@ -1432,7 +1536,7 @@ class BECWaveform(RPCBase):
            color_map_z(str): The color map to use for the z-axis.
            label(str): The label of the curve.
            validate(bool): If True, validate the device names and entries.
-            dap(str): The dap model to use for the curve. If not specified, none will be added.
+            dap(str): The dap model to use for the curve, only available for sync devices. If not specified, none will be added.

        Returns:
            BECCurve: The curve object.
@@ -1441,12 +1545,13 @@ class BECWaveform(RPCBase):
    @rpc_call
    def add_dap(
        self,
-        x_name: "str",
-        y_name: "str",
+        x_name: "str | None" = None,
+        y_name: "str | None" = None,
        x_entry: "Optional[str]" = None,
        y_entry: "Optional[str]" = None,
        color: "Optional[str]" = None,
        dap: "str" = "GaussianModel",
+        validate_bec: "bool" = True,
        **kwargs,
    ) -> "BECCurve":
        """
@@ -1461,12 +1566,27 @@ class BECWaveform(RPCBase):
            color_map_z(str): The color map to use for the z-axis.
            label(str, optional): Label of the curve. Defaults to None.
            dap(str): The dap model to use for the curve.
+            validate_bec(bool, optional): If True, validate the signal with BEC. Defaults to True.
            **kwargs: Additional keyword arguments for the curve configuration.

        Returns:
            BECCurve: The curve object.
        """

+    @rpc_call
+    def set_x(self, x_name: "str", x_entry: "str | None" = None):
+        """
+        Change the x axis of the plot widget.
+
+        Args:
+            x_name(str): Name of the x signal.
+                - "best_effort": Use the best effort signal.
+                - "timestamp": Use the timestamp signal.
+                - "index": Use the index signal.
+                - Custom signal name of device from BEC.
+            x_entry(str): Entry of the x signal.
+        """
+
    @rpc_call
    def get_dap_params(self) -> "dict":
        """
@@ -1651,6 +1771,12 @@ class BECWaveform(RPCBase):
        Remove the plot widget from the figure.
        """

+    @rpc_call
+    def clear_all(self):
+        """
+        None
+        """
+
    @rpc_call
    def set_legend_label_size(self, size: "int" = None):
        """
@@ -1661,6 +1787,24 @@ class BECWaveform(RPCBase):
        """


+class DeviceBox(RPCBase):
+    @property
+    @rpc_call
+    def _config_dict(self) -> "dict":
+        """
+        Get the configuration of the widget.
+
+        Returns:
+            dict: The configuration of the widget.
+        """
+
+    @rpc_call
+    def _get_all_rpc(self) -> "dict":
+        """
+        Get all registered RPC objects.
+        """
+
+
 class DeviceComboBox(RPCBase):
    @property
    @rpc_call
--- a/bec_widgets/cli/client_utils.py
+++ b/bec_widgets/cli/client_utils.py
@@ -2,6 +2,7 @@ from __future__ import annotations

 import importlib
 import importlib.metadata as imd
+import json
 import os
 import select
 import subprocess
@@ -87,7 +88,7 @@ def _get_output(process, logger) -> None:
        print(f"Error reading process output: {str(e)}")


-def _start_plot_process(gui_id, gui_class, config, logger=None) -> None:
+def _start_plot_process(gui_id: str, gui_class: type, config: dict | str, logger=None) -> None:
    """
    Start the plot in a new process.

@@ -98,6 +99,8 @@ def _start_plot_process(gui_id, gui_class, config, logger=None) -> None:
    # pylint: disable=subprocess-run-check
    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", config])

    env_dict = os.environ.copy()
@@ -190,7 +193,7 @@ class BECGuiClientMixin:
        if self._process is None or self._process.poll() is not None:
            self._start_update_script()
            self._process, self._process_output_processing_thread = _start_plot_process(
-                self._gui_id, self.__class__, self._client._service_config.config_path
+                self._gui_id, self.__class__, self._client._service_config.config
            )
        while not self.gui_is_alive():
            print("Waiting for GUI to start...")
--- a/bec_widgets/cli/generate_cli.py
+++ b/bec_widgets/cli/generate_cli.py
@@ -5,13 +5,12 @@ import argparse
 import inspect
 import os
 import sys
-from typing import Literal

 import black
 import isort

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

 if sys.version_info >= (3, 11):
    from typing import get_overloads
@@ -40,17 +39,20 @@ from bec_widgets.cli.client_utils import RPCBase, rpc_call, BECGuiClientMixin

        self.content = ""

-    def generate_client(
-        self, published_classes: dict[Literal["connector_classes", "top_level_classes"], list[type]]
-    ):
+    def generate_client(self, class_container: BECClassContainer):
        """
        Generate the client for the published classes.

        Args:
-            published_classes(dict): A dictionary with keys "connector_classes" and "top_level_classes" and values as lists of classes.
+            class_container: The class container with the classes to generate the client for.
        """
-        self.write_client_enum(published_classes["top_level_classes"])
-        for cls in published_classes["connector_classes"]:
+        rpc_top_level_classes = class_container.rpc_top_level_classes
+        rpc_top_level_classes.sort(key=lambda x: x.__name__)
+        connector_classes = class_container.connector_classes
+        connector_classes.sort(key=lambda x: x.__name__)
+
+        self.write_client_enum(rpc_top_level_classes)
+        for cls in connector_classes:
            self.content += "\n\n"
            self.generate_content_for_class(cls)

@@ -156,13 +158,12 @@ def main():
        client_path = os.path.join(current_path, "client.py")

        rpc_classes = get_rpc_classes("bec_widgets")
-        rpc_classes["connector_classes"].sort(key=lambda x: x.__name__)

        generator = ClientGenerator()
        generator.generate_client(rpc_classes)
        generator.write(client_path)

-        for cls in rpc_classes["top_level_classes"]:
+        for cls in rpc_classes.plugins:
            plugin = DesignerPluginGenerator(cls)
            if not hasattr(plugin, "info"):
                continue
--- a/bec_widgets/cli/rpc_wigdet_handler.py
+++ b/bec_widgets/cli/rpc_wigdet_handler.py
@@ -29,7 +29,7 @@ class RPCWidgetHandler:
        from bec_widgets.utils.plugin_utils import get_rpc_classes

        clss = get_rpc_classes("bec_widgets")
-        self._widget_classes = {cls.__name__: cls for cls in clss["top_level_classes"]}
+        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,6 +1,7 @@
 from __future__ import annotations

 import inspect
+import json
 import signal
 import sys
 from contextlib import redirect_stderr, redirect_stdout
@@ -141,10 +142,30 @@ class SimpleFileLikeFromLogOutputFunc:
        return


+def _start_server(gui_id: str, gui_class: Union[BECFigure, BECDockArea], config: str | None = None):
+    if config:
+        try:
+            config = json.loads(config)
+            service_config = ServiceConfig(config=config)
+        except (json.JSONDecodeError, TypeError):
+            service_config = ServiceConfig(config_path=config)
+    else:
+        # 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,
+    )
+    server = BECWidgetsCLIServer(gui_id=gui_id, config=service_config, gui_class=gui_class)
+    return server
+
+
 def main():
    import argparse
    import os
-    import sys

    from qtpy.QtCore import QSize
    from qtpy.QtGui import QIcon
@@ -159,7 +180,7 @@ def main():
        type=str,
        help="Name of the gui class to be rendered. Possible values: \n- BECFigure\n- BECDockArea",
    )
-    parser.add_argument("--config", type=str, help="Config file")
+    parser.add_argument("--config", type=str, help="Config file or config string.")

    args = parser.parse_args()

@@ -188,14 +209,7 @@ def main():
            win = QMainWindow()
            win.setWindowTitle("BEC Widgets")

-            service_config = ServiceConfig(args.config)
-            bec_logger.configure(
-                service_config.redis,
-                QtRedisConnector,
-                service_name="BECWidgetsCLIServer",
-                service_config=service_config.service_config,
-            )
-            server = BECWidgetsCLIServer(gui_id=args.id, config=service_config, gui_class=gui_class)
+            server = _start_server(args.id, gui_class, args.config)

            gui = server.gui
            win.setCentralWidget(gui)
--- a/bec_widgets/examples/init.py
+++ b/bec_widgets/examples/init.py
@@ -1,9 +0,0 @@
-from .motor_movement import (
-    MotorControlApp,
-    MotorControlMap,
-    MotorControlPanel,
-    MotorControlPanelAbsolute,
-    MotorControlPanelRelative,
-    MotorCoordinateTable,
-    MotorThread,
-)
--- a/bec_widgets/examples/jupyter_console/jupyter_console_window.py
+++ b/bec_widgets/examples/jupyter_console/jupyter_console_window.py
@@ -2,14 +2,20 @@ import os

 import numpy as np
 import pyqtgraph as pg
-import qdarktheme
-from qtconsole.inprocess import QtInProcessKernelManager
-from qtconsole.rich_jupyter_widget import RichJupyterWidget
 from qtpy.QtCore import QSize
 from qtpy.QtGui import QIcon
-from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
+from qtpy.QtWidgets import (
+    QApplication,
+    QGroupBox,
+    QHBoxLayout,
+    QSplitter,
+    QTabWidget,
+    QVBoxLayout,
+    QWidget,
+)

-from bec_widgets.utils import BECDispatcher, UILoader
+from bec_widgets.utils import BECDispatcher
+from bec_widgets.utils.colors import apply_theme
 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
@@ -21,14 +27,8 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
    def __init__(self, parent=None):
        super().__init__(parent)

-        current_path = os.path.dirname(__file__)
-        self.ui = UILoader().load_ui(os.path.join(current_path, "jupyter_console_window.ui"), self)
-
        self._init_ui()

-        self.ui.splitter.setSizes([200, 100])
-        self.safe_close = False
-
        # console push
        if self.console.inprocess is True:
            self.console.kernel_manager.kernel.shell.push(
@@ -40,10 +40,12 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
                    "w1": self.w1,
                    "w2": self.w2,
                    "w3": self.w3,
-                    "w1_c": self.w1_c,
-                    "w2_c": self.w2_c,
-                    "w3_c": self.w3_c,
                    "w4": self.w4,
+                    "w5": self.w5,
+                    "w6": self.w6,
+                    "w7": self.w7,
+                    "w8": self.w8,
+                    "w9": self.w9,
                    "d0": self.d0,
                    "d1": self.d1,
                    "d2": self.d2,
@@ -53,14 +55,30 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
            )

    def _init_ui(self):
-        # Plotting window
-        self.glw_1_layout = QVBoxLayout(self.ui.glw)  # Create a new QVBoxLayout
-        self.figure = BECFigure(parent=self, gui_id="remote")  # Create a new BECDeviceMonitor
-        self.glw_1_layout.addWidget(self.figure)  # Add BECDeviceMonitor to the layout
+        self.layout = QHBoxLayout(self)

-        self.dock_layout = QVBoxLayout(self.ui.dock_placeholder)
-        self.dock = BECDockArea(gui_id="remote")
-        self.dock_layout.addWidget(self.dock)
+        # Horizontal splitter
+        splitter = QSplitter(self)
+        self.layout.addWidget(splitter)
+
+        tab_widget = QTabWidget(splitter)
+
+        first_tab = QWidget()
+        first_tab_layout = QVBoxLayout(first_tab)
+        self.dock = BECDockArea(gui_id="dock")
+        first_tab_layout.addWidget(self.dock)
+        tab_widget.addTab(first_tab, "Dock Area")
+
+        second_tab = QWidget()
+        second_tab_layout = QVBoxLayout(second_tab)
+        self.figure = BECFigure(parent=self, gui_id="figure")
+        second_tab_layout.addWidget(self.figure)
+        tab_widget.addTab(second_tab, "BEC Figure")
+
+        group_box = QGroupBox("Jupyter Console", splitter)
+        group_box_layout = QVBoxLayout(group_box)
+        self.console = BECJupyterConsole(inprocess=True)
+        group_box_layout.addWidget(self.console)

        # add stuff to figure
        self._init_figure()
@@ -68,44 +86,70 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
        # init dock for testing
        self._init_dock()

-        self.console_layout = QVBoxLayout(self.ui.widget_console)
-        self.console = BECJupyterConsole(inprocess=True)
-        self.console_layout.addWidget(self.console)
+        self.setWindowTitle("Jupyter Console Window")

    def _init_figure(self):
-        self.figure.plot(x_name="samx", y_name="samy", z_name="bpm4i", color_map_z="cividis")
-        self.figure.motor_map("samx", "samy")
-        self.figure.image("eiger", color_map="viridis", vrange=(0, 100))
-        self.figure.plot(
-            x_name="samx", y_name="samy", z_name="bpm4i", color_map_z="magma", new=True
+        self.w1 = self.figure.plot(
+            x_name="samx",
+            y_name="bpm4i",
+            # title="Standard Plot with sync device, custom labels - w1",
+            # x_label="Motor Position",
+            # y_label="Intensity (A.U.)",
+            row=0,
+            col=0,
+        )
+        self.w1.set(
+            title="Standard Plot with sync device, custom labels - w1",
+            x_label="Motor Position",
+            y_label="Intensity (A.U.)",
+        )
+        self.w2 = self.figure.motor_map("samx", "samy", row=0, col=1)
+        self.w3 = self.figure.image(
+            "eiger", color_map="viridis", vrange=(0, 100), title="Eiger Image - w3", row=0, col=2
+        )
+        self.w4 = self.figure.plot(
+            x_name="samx",
+            y_name="samy",
+            z_name="bpm4i",
+            color_map_z="magma",
+            new=True,
+            title="2D scatter plot - w4",
+            row=0,
+            col=3,
+        )
+        self.w5 = self.figure.plot(
+            y_name="bpm4i",
+            new=True,
+            title="Best Effort Plot - w5",
+            dap="GaussianModel",
+            row=1,
+            col=0,
+        )
+        self.w6 = self.figure.plot(
+            x_name="timestamp", y_name="bpm4i", new=True, title="Timestamp Plot - w6", row=1, col=1
+        )
+        self.w7 = self.figure.plot(
+            x_name="index", y_name="bpm4i", new=True, title="Index Plot - w7", row=1, col=2
+        )
+        self.w8 = self.figure.plot(
+            y_name="monitor_async", new=True, title="Async Plot - Best Effort - w8", row=2, col=0
+        )
+        self.w9 = self.figure.plot(
+            x_name="timestamp",
+            y_name="monitor_async",
+            new=True,
+            title="Async Plot - timestamp - w9",
+            row=2,
+            col=1,
+        )
+        self.w10 = self.figure.plot(
+            x_name="index",
+            y_name="monitor_async",
+            new=True,
+            title="Async Plot - index - w10",
+            row=2,
+            col=2,
        )
-
-        self.figure.change_layout(2, 2)
-
-        self.w1 = self.figure[0, 0]
-        self.w2 = self.figure[0, 1]
-        self.w3 = self.figure[1, 0]
-        self.w4 = self.figure[1, 1]
-
-        # Plot Customisation
-        self.w1.set_title("Waveform 1")
-        self.w1.set_x_label("Motor Position (samx)")
-        self.w1.set_y_label("Intensity A.U.")
-
-        # Image Customisation
-        self.w3.set_title("Eiger Image")
-        self.w3.set_x_label("X")
-        self.w3.set_y_label("Y")
-
-        # Configs to try to pass
-        self.w1_c = self.w1._config_dict
-        self.w2_c = self.w2._config_dict
-        self.w3_c = self.w3._config_dict
-
-        # curves for w1
-        self.c1 = self.w1.get_config()
-
-        self.fig_c = self.figure._config_dict

    def _init_dock(self):

@@ -131,9 +175,13 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:

    def closeEvent(self, event):
        """Override to handle things when main window is closed."""
+        self.dock.clear_all()
        self.dock.cleanup()
+        self.dock.close()
        self.figure.clear_all()
-        self.figure.client.shutdown()
+        self.figure.cleanup()
+        self.figure.close()
+
        super().closeEvent(event)


@@ -147,7 +195,7 @@ if __name__ == "__main__":  # pragma: no cover
    app = QApplication(sys.argv)
    app.setApplicationName("Jupyter Console")
    app.setApplicationDisplayName("Jupyter Console")
-    qdarktheme.setup_theme("auto")
+    apply_theme("dark")
    icon = QIcon()
    icon.addFile(os.path.join(module_path, "assets", "terminal_icon.png"), size=QSize(48, 48))
    app.setWindowIcon(icon)
--- a/bec_widgets/examples/jupyter_console/jupyter_console_window.ui
+++ b/bec_widgets/examples/jupyter_console/jupyter_console_window.ui
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>2104</width>
-    <height>966</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Plotting Console</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4">
-   <item>
-    <widget class="QSplitter" name="splitter">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <widget class="QTabWidget" name="tabWidget">
-      <property name="currentIndex">
-       <number>0</number>
-      </property>
-      <widget class="QWidget" name="tab_1">
-       <attribute name="title">
-        <string>BECDock</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QWidget" name="dock_placeholder" native="true"/>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="tab_2">
-       <attribute name="title">
-        <string>BECFigure</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout_3">
-        <item>
-         <widget class="QWidget" name="glw" native="true"/>
-        </item>
-       </layout>
-      </widget>
-     </widget>
-     <widget class="QWidget" name="widget_console" native="true"/>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
--- a/bec_widgets/examples/motor_movement/init.py
+++ b/bec_widgets/examples/motor_movement/init.py
@@ -1,9 +0,0 @@
-from .motor_control_compilations import (
-    MotorControlApp,
-    MotorControlMap,
-    MotorControlPanel,
-    MotorControlPanelAbsolute,
-    MotorControlPanelRelative,
-    MotorCoordinateTable,
-    MotorThread,
-)
--- a/bec_widgets/examples/motor_movement/motor_control_compilations.py
+++ b/bec_widgets/examples/motor_movement/motor_control_compilations.py
@@ -1,250 +0,0 @@
-# pylint: disable = no-name-in-module,missing-class-docstring, missing-module-docstring
-
-import qdarktheme
-from qtpy.QtCore import Qt
-from qtpy.QtWidgets import QApplication, QSplitter, QVBoxLayout, QWidget
-
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
-from bec_widgets.widgets.motor_control.motor_control import MotorThread
-from bec_widgets.widgets.motor_control.motor_table.motor_table import MotorCoordinateTable
-from bec_widgets.widgets.motor_control.movement_absolute.movement_absolute import (
-    MotorControlAbsolute,
-)
-from bec_widgets.widgets.motor_control.movement_relative.movement_relative import (
-    MotorControlRelative,
-)
-from bec_widgets.widgets.motor_control.selection.selection import MotorControlSelection
-
-CONFIG_DEFAULT = {
-    "motor_control": {
-        "motor_x": "samx",
-        "motor_y": "samy",
-        "step_size_x": 3,
-        "step_size_y": 3,
-        "precision": 4,
-        "step_x_y_same": False,
-        "move_with_arrows": False,
-    },
-    "plot_settings": {
-        "colormap": "Greys",
-        "scatter_size": 5,
-        "max_points": 1000,
-        "num_dim_points": 100,
-        "precision": 2,
-        "num_columns": 1,
-        "background_value": 25,
-    },
-    "motors": [
-        {
-            "plot_name": "Motor Map",
-            "x_label": "Motor X",
-            "y_label": "Motor Y",
-            "signals": {
-                "x": [{"name": "samx", "entry": "samx"}],
-                "y": [{"name": "samy", "entry": "samy"}],
-            },
-        }
-    ],
-}
-
-
-class MotorControlApp(QWidget):
-    def __init__(self, parent=None, client=None, config=None):
-        super().__init__(parent)
-
-        bec_dispatcher = BECDispatcher()
-        self.client = bec_dispatcher.client if client is None else client
-        self.config = config
-
-        # Widgets
-        self.motor_control_panel = MotorControlPanel(client=self.client, config=self.config)
-        # Create MotorMap
-        # self.motion_map = MotorMap(client=self.client, config=self.config)
-        # Create MotorCoordinateTable
-        self.motor_table = MotorCoordinateTable(client=self.client, config=self.config)
-
-        # Create the splitter and add MotorMap and MotorControlPanel
-        splitter = QSplitter(Qt.Horizontal)
-        # splitter.addWidget(self.motion_map)
-        splitter.addWidget(self.motor_control_panel)
-        splitter.addWidget(self.motor_table)
-
-        # Set the main layout
-        layout = QVBoxLayout(self)
-        layout.addWidget(splitter)
-        self.setLayout(layout)
-
-        # Connecting signals and slots
-        # self.motor_control_panel.selection_widget.selected_motors_signal.connect(
-        #     lambda x, y: self.motion_map.change_motors(x, y, 0)
-        # )
-        self.motor_control_panel.absolute_widget.coordinates_signal.connect(
-            self.motor_table.add_coordinate
-        )
-        self.motor_control_panel.relative_widget.precision_signal.connect(
-            self.motor_table.set_precision
-        )
-        self.motor_control_panel.relative_widget.precision_signal.connect(
-            self.motor_control_panel.absolute_widget.set_precision
-        )
-
-        # self.motor_table.plot_coordinates_signal.connect(self.motion_map.plot_saved_coordinates)
-
-
-class MotorControlMap(QWidget):
-    def __init__(self, parent=None, client=None, config=None):
-        super().__init__(parent)
-
-        bec_dispatcher = BECDispatcher()
-        self.client = bec_dispatcher.client if client is None else client
-        self.config = config
-
-        # Widgets
-        self.motor_control_panel = MotorControlPanel(client=self.client, config=self.config)
-        # Create MotorMap
-        # self.motion_map = MotorMap(client=self.client, config=self.config)
-
-        # Create the splitter and add MotorMap and MotorControlPanel
-        splitter = QSplitter(Qt.Horizontal)
-        # splitter.addWidget(self.motion_map)
-        splitter.addWidget(self.motor_control_panel)
-
-        # Set the main layout
-        layout = QVBoxLayout(self)
-        layout.addWidget(splitter)
-        self.setLayout(layout)
-
-        # Connecting signals and slots
-        # self.motor_control_panel.selection_widget.selected_motors_signal.connect(
-        #     lambda x, y: self.motion_map.change_motors(x, y, 0)
-        # )
-
-
-class MotorControlPanel(QWidget):
-    def __init__(self, parent=None, client=None, config=None):
-        super().__init__(parent)
-
-        bec_dispatcher = BECDispatcher()
-        self.client = bec_dispatcher.client if client is None else client
-        self.config = config
-
-        self.motor_thread = MotorThread(client=self.client)
-
-        self.selection_widget = MotorControlSelection(
-            client=self.client, config=self.config, motor_thread=self.motor_thread
-        )
-        self.relative_widget = MotorControlRelative(
-            client=self.client, config=self.config, motor_thread=self.motor_thread
-        )
-        self.absolute_widget = MotorControlAbsolute(
-            client=self.client, config=self.config, motor_thread=self.motor_thread
-        )
-
-        layout = QVBoxLayout(self)
-
-        layout.addWidget(self.selection_widget)
-        layout.addWidget(self.relative_widget)
-        layout.addWidget(self.absolute_widget)
-
-        # Connecting signals and slots
-        self.selection_widget.selected_motors_signal.connect(self.relative_widget.change_motors)
-        self.selection_widget.selected_motors_signal.connect(self.absolute_widget.change_motors)
-
-        # Set the window to a fixed size based on its contents
-        # self.layout().setSizeConstraint(layout.SetFixedSize)
-
-
-class MotorControlPanelAbsolute(QWidget):
-    def __init__(self, parent=None, client=None, config=None):
-        super().__init__(parent)
-
-        bec_dispatcher = BECDispatcher()
-        self.client = bec_dispatcher.client if client is None else client
-        self.config = config
-
-        self.motor_thread = MotorThread(client=self.client)
-
-        self.selection_widget = MotorControlSelection(
-            client=client, config=config, motor_thread=self.motor_thread
-        )
-        self.absolute_widget = MotorControlAbsolute(
-            client=client, config=config, motor_thread=self.motor_thread
-        )
-
-        layout = QVBoxLayout(self)
-        layout.addWidget(self.selection_widget)
-        layout.addWidget(self.absolute_widget)
-
-        # Connecting signals and slots
-        self.selection_widget.selected_motors_signal.connect(self.absolute_widget.change_motors)
-
-
-class MotorControlPanelRelative(QWidget):
-    def __init__(self, parent=None, client=None, config=None):
-        super().__init__(parent)
-
-        bec_dispatcher = BECDispatcher()
-        self.client = bec_dispatcher.client if client is None else client
-        self.config = config
-
-        self.motor_thread = MotorThread(client=self.client)
-
-        self.selection_widget = MotorControlSelection(
-            client=client, config=config, motor_thread=self.motor_thread
-        )
-        self.relative_widget = MotorControlRelative(
-            client=client, config=config, motor_thread=self.motor_thread
-        )
-
-        layout = QVBoxLayout(self)
-        layout.addWidget(self.selection_widget)
-        layout.addWidget(self.relative_widget)
-
-        # Connecting signals and slots
-        self.selection_widget.selected_motors_signal.connect(self.relative_widget.change_motors)
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import argparse
-    import sys
-
-    parser = argparse.ArgumentParser(description="Run various Motor Control Widgets compositions.")
-    parser.add_argument(
-        "-v",
-        "--variant",
-        type=str,
-        choices=["app", "map", "panel", "panel_abs", "panel_rel"],
-        help="Select the variant of the motor control to run. "
-        "'app' for the full application, "
-        "'map' for MotorMap, "
-        "'panel' for the MotorControlPanel, "
-        "'panel_abs' for MotorControlPanel with absolute control, "
-        "'panel_rel' for MotorControlPanel with relative control.",
-    )
-
-    args = parser.parse_args()
-
-    bec_dispatcher = BECDispatcher()
-    client = bec_dispatcher.client
-    client.start()
-
-    app = QApplication([])
-    qdarktheme.setup_theme("auto")
-
-    if args.variant == "app":
-        window = MotorControlApp(client=client)  # , config=CONFIG_DEFAULT)
-    elif args.variant == "map":
-        window = MotorControlMap(client=client)  # , config=CONFIG_DEFAULT)
-    elif args.variant == "panel":
-        window = MotorControlPanel(client=client)  # , config=CONFIG_DEFAULT)
-    elif args.variant == "panel_abs":
-        window = MotorControlPanelAbsolute(client=client)  # , config=CONFIG_DEFAULT)
-    elif args.variant == "panel_rel":
-        window = MotorControlPanelRelative(client=client)  # , config=CONFIG_DEFAULT)
-    else:
-        print("Please specify a valid variant to run. Use -h for help.")
-        print("Running the full application by default.")
-        window = MotorControlApp(client=client)  # , config=CONFIG_DEFAULT)
-
-    window.show()
-    sys.exit(app.exec())
--- a/bec_widgets/examples/motor_movement/motor_controller.ui
+++ b/bec_widgets/examples/motor_movement/motor_controller.ui
@@ -1,926 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1561</width>
-    <height>748</height>
-   </rect>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>1409</width>
-    <height>748</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Motor Controller</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout" stretch="8,5,8">
-   <item>
-    <widget class="GraphicsLayoutWidget" name="glw">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QFrame" name="Controls">
-     <property name="minimumSize">
-      <size>
-       <width>221</width>
-       <height>471</height>
-      </size>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_6" stretch="1,1,1,0,1">
-      <property name="spacing">
-       <number>1</number>
-      </property>
-      <property name="sizeConstraint">
-       <enum>QLayout::SetMinimumSize</enum>
-      </property>
-      <item>
-       <widget class="QGroupBox" name="motorSelection">
-        <property name="minimumSize">
-         <size>
-          <width>261</width>
-          <height>145</height>
-         </size>
-        </property>
-        <property name="title">
-         <string>Motor Selection</string>
-        </property>
-        <layout class="QGridLayout" name="gridLayout_4">
-         <item row="2" column="0">
-          <widget class="QLabel" name="label_8">
-           <property name="text">
-            <string>Motor Y</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QComboBox" name="comboBox_motor_x"/>
-         </item>
-         <item row="2" column="1">
-          <widget class="QComboBox" name="comboBox_motor_y"/>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_5">
-           <property name="text">
-            <string>Motor X</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0" colspan="2">
-          <widget class="QPushButton" name="pushButton_connecMotors">
-           <property name="text">
-            <string>Connect Motors</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer_3">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Minimum</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>18</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QGroupBox" name="motorControl">
-        <property name="minimumSize">
-         <size>
-          <width>261</width>
-          <height>339</height>
-         </size>
-        </property>
-        <property name="title">
-         <string>Motor Relative</string>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_5">
-         <item>
-          <widget class="QCheckBox" name="checkBox_enableArrows">
-           <property name="text">
-            <string>Move with arrow keys</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="checkBox_same_xy">
-           <property name="text">
-            <string>Step [X] = Step [Y]</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <layout class="QGridLayout" name="step_grid">
-           <item row="2" column="0">
-            <widget class="QLabel" name="label_step_y">
-             <property name="minimumSize">
-              <size>
-               <width>111</width>
-               <height>19</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>Step [Y]</string>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="0">
-            <widget class="QLabel" name="label_2">
-             <property name="minimumSize">
-              <size>
-               <width>111</width>
-               <height>19</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>Decimal</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QDoubleSpinBox" name="spinBox_step_x">
-             <property name="minimumSize">
-              <size>
-               <width>110</width>
-               <height>19</height>
-              </size>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-             <property name="minimum">
-              <double>0.000000000000000</double>
-             </property>
-             <property name="maximum">
-              <double>99.000000000000000</double>
-             </property>
-             <property name="singleStep">
-              <double>0.100000000000000</double>
-             </property>
-             <property name="value">
-              <double>1.000000000000000</double>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="label_step_x">
-             <property name="minimumSize">
-              <size>
-               <width>111</width>
-               <height>19</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>Step [X]</string>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="1">
-            <widget class="QDoubleSpinBox" name="spinBox_step_y">
-             <property name="minimumSize">
-              <size>
-               <width>110</width>
-               <height>19</height>
-              </size>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-             <property name="minimum">
-              <double>0.000000000000000</double>
-             </property>
-             <property name="maximum">
-              <double>99.000000000000000</double>
-             </property>
-             <property name="singleStep">
-              <double>0.100000000000000</double>
-             </property>
-             <property name="value">
-              <double>1.000000000000000</double>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QSpinBox" name="spinBox_precision">
-             <property name="minimumSize">
-              <size>
-               <width>110</width>
-               <height>19</height>
-              </size>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-             <property name="maximum">
-              <number>8</number>
-             </property>
-             <property name="value">
-              <number>2</number>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QGridLayout" name="direction_grid">
-           <property name="sizeConstraint">
-            <enum>QLayout::SetDefaultConstraint</enum>
-           </property>
-           <item row="1" column="2" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
-            <widget class="QToolButton" name="toolButton_up">
-             <property name="minimumSize">
-              <size>
-               <width>26</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>...</string>
-             </property>
-             <property name="arrowType">
-              <enum>Qt::UpArrow</enum>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="4">
-            <spacer name="horizontalSpacer_2">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="3" column="2" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
-            <widget class="QToolButton" name="toolButton_down">
-             <property name="minimumSize">
-              <size>
-               <width>26</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>...</string>
-             </property>
-             <property name="arrowType">
-              <enum>Qt::DownArrow</enum>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="1">
-            <widget class="QToolButton" name="toolButton_left">
-             <property name="minimumSize">
-              <size>
-               <width>26</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>...</string>
-             </property>
-             <property name="arrowType">
-              <enum>Qt::LeftArrow</enum>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="2">
-            <spacer name="verticalSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="2" column="3">
-            <widget class="QToolButton" name="toolButton_right">
-             <property name="minimumSize">
-              <size>
-               <width>26</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>...</string>
-             </property>
-             <property name="arrowType">
-              <enum>Qt::RightArrow</enum>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="0">
-            <spacer name="horizontalSpacer">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="4" column="2">
-            <spacer name="verticalSpacer_2">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer_4">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Minimum</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>18</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QGroupBox" name="motorControl_absolute">
-        <property name="minimumSize">
-         <size>
-          <width>261</width>
-          <height>195</height>
-         </size>
-        </property>
-        <property name="title">
-         <string>Move Absolute</string>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout">
-         <item>
-          <widget class="QCheckBox" name="checkBox_save_with_go">
-           <property name="text">
-            <string>Save position with Go</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <layout class="QGridLayout" name="gridLayout_3">
-           <item row="1" column="1">
-            <widget class="QDoubleSpinBox" name="spinBox_absolute_y">
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-             <property name="minimum">
-              <double>-500.000000000000000</double>
-             </property>
-             <property name="maximum">
-              <double>500.000000000000000</double>
-             </property>
-             <property name="singleStep">
-              <double>0.100000000000000</double>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QDoubleSpinBox" name="spinBox_absolute_x">
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-             <property name="minimum">
-              <double>-500.000000000000000</double>
-             </property>
-             <property name="maximum">
-              <double>500.000000000000000</double>
-             </property>
-             <property name="singleStep">
-              <double>0.100000000000000</double>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QLabel" name="label_7">
-             <property name="text">
-              <string>Y</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="0">
-            <widget class="QLabel" name="label_6">
-             <property name="text">
-              <string>X</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_2">
-           <item>
-            <widget class="QPushButton" name="pushButton_save">
-             <property name="text">
-              <string>Save</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="pushButton_set">
-             <property name="text">
-              <string>Set</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="pushButton_go_absolute">
-             <property name="text">
-              <string>Go</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <widget class="QPushButton" name="pushButton_stop">
-           <property name="text">
-            <string>Stop Movement</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QTabWidget" name="tabWidget_tables">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab_coordinates">
-      <attribute name="title">
-       <string>Coordinates</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <spacer name="horizontalSpacer_3">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string>Entries Mode:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_mode">
-           <item>
-            <property name="text">
-             <string>Individual</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Start/Stop</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QTableWidget" name="tableWidget_coordinates">
-         <property name="selectionMode">
-          <enum>QAbstractItemView::MultiSelection</enum>
-         </property>
-         <property name="selectionBehavior">
-          <enum>QAbstractItemView::SelectRows</enum>
-         </property>
-         <column>
-          <property name="text">
-           <string>Show</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Move</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Tag</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>X</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Y</string>
-          </property>
-         </column>
-        </widget>
-       </item>
-       <item>
-        <layout class="QGridLayout" name="gridLayout">
-         <item row="1" column="1">
-          <widget class="QPushButton" name="pushButton_resize_table">
-           <property name="text">
-            <string>Resize Table</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QCheckBox" name="checkBox_resize_auto">
-           <property name="text">
-            <string>Resize Auto</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QPushButton" name="pushButton_importCSV">
-           <property name="text">
-            <string>Import CSV</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="0">
-          <widget class="QPushButton" name="pushButton_exportCSV">
-           <property name="text">
-            <string>Export CSV</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QPushButton" name="pushButton_help">
-           <property name="text">
-            <string>Help</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QPushButton" name="pushButton_duplicate">
-           <property name="text">
-            <string>Duplicate Last Entry</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tab_settings">
-      <attribute name="title">
-       <string>Settings</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <item>
-        <widget class="QGroupBox" name="motorLimits">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="title">
-          <string>Motor Limits</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="2" column="1">
-           <widget class="QPushButton" name="pushButton_updateLimits">
-            <property name="text">
-             <string>Update</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLabel" name="label_Y_max">
-            <property name="text">
-             <string>+ Y</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1">
-           <widget class="QLabel" name="label_Y_min">
-            <property name="text">
-             <string>- Y</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_X_min">
-            <property name="text">
-             <string>- X</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QLabel" name="label_X_max">
-            <property name="text">
-             <string>+ X</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QDoubleSpinBox" name="spinBox_y_max">
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-            <property name="minimum">
-             <double>-1000.000000000000000</double>
-            </property>
-            <property name="maximum">
-             <double>1000.000000000000000</double>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QDoubleSpinBox" name="spinBox_y_min">
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-            <property name="minimum">
-             <double>-1000.000000000000000</double>
-            </property>
-            <property name="maximum">
-             <double>1000.000000000000000</double>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QDoubleSpinBox" name="spinBox_x_min">
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-            <property name="minimum">
-             <double>-1000.000000000000000</double>
-            </property>
-            <property name="maximum">
-             <double>1000.000000000000000</double>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="2">
-           <widget class="QDoubleSpinBox" name="spinBox_x_max">
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-            <property name="minimum">
-             <double>-1000.000000000000000</double>
-            </property>
-            <property name="maximum">
-             <double>1000.000000000000000</double>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_2">
-         <property name="title">
-          <string>Plotting Options</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_5">
-          <item row="0" column="1" colspan="2">
-           <widget class="QSpinBox" name="spinBox_max_points">
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-            <property name="minimum">
-             <number>100</number>
-            </property>
-            <property name="maximum">
-             <number>10000</number>
-            </property>
-            <property name="singleStep">
-             <number>100</number>
-            </property>
-            <property name="value">
-             <number>5000</number>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_15">
-            <property name="text">
-             <string>Max Points</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1" colspan="2">
-           <widget class="QSpinBox" name="spinBox_scatter_size">
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-            <property name="minimum">
-             <number>1</number>
-            </property>
-            <property name="maximum">
-             <number>15</number>
-            </property>
-            <property name="value">
-             <number>5</number>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_11">
-            <property name="text">
-             <string>Scatter Size</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0" colspan="3">
-           <widget class="QPushButton" name="pushButton_update_config">
-            <property name="text">
-             <string>Update Settings</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1" colspan="2">
-           <widget class="QSpinBox" name="spinBox_num_dim_points">
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-            <property name="minimum">
-             <number>10</number>
-            </property>
-            <property name="maximum">
-             <number>1000</number>
-            </property>
-            <property name="singleStep">
-             <number>10</number>
-            </property>
-            <property name="value">
-             <number>100</number>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_16">
-            <property name="text">
-             <string>N dim</string>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="0" colspan="3">
-           <widget class="QPushButton" name="pushButton_enableGUI">
-            <property name="text">
-             <string>Enable Control GUI</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tab_queue">
-      <attribute name="title">
-       <string>Queue</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QLabel" name="label_3">
-         <property name="text">
-          <string>Work in progress</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="pushButton_5">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="text">
-          <string>Reset Queue</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QTableWidget" name="tableWidget_2">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <column>
-          <property name="text">
-           <string>queueID</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>scan_id</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>is_scan</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>type</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>scan_number</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>IQ status</string>
-          </property>
-         </column>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>GraphicsLayoutWidget</class>
-   <extends>QGraphicsView</extends>
-   <header>pyqtgraph.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
--- a/bec_widgets/widgets/buttons/stop_button/init.py
+++ b/bec_widgets/widgets/buttons/stop_button/init.py
--- a/bec_widgets/qt_utils/error_popups.py
+++ b/bec_widgets/qt_utils/error_popups.py
@@ -0,0 +1,215 @@
+import sys
+import traceback
+
+from qtpy.QtCore import QObject, Qt, Signal, Slot
+from qtpy.QtWidgets import QApplication, QMessageBox, QPushButton, QVBoxLayout, QWidget
+
+
+class WarningPopupUtility(QObject):
+    """
+    Utility class to show warning popups in the application.
+    """
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+    @Slot(str, str, str, QWidget)
+    def show_warning_message(self, title, message, detailed_text, widget):
+        msg = QMessageBox(widget)
+        msg.setIcon(QMessageBox.Warning)
+        msg.setWindowTitle(title)
+        msg.setText(message)
+        msg.setStandardButtons(QMessageBox.Ok)
+        msg.setDetailedText(detailed_text)
+        msg.exec_()
+
+    def show_warning(self, title: str, message: str, detailed_text: str, widget: QWidget = None):
+        """
+        Show a warning message with the given title, message, and detailed text.
+
+        Args:
+            title (str): The title of the warning message.
+            message (str): The main text of the warning message.
+            detailed_text (str): The detailed text to show when the user expands the message.
+            widget (QWidget): The parent widget for the message box.
+        """
+        self.show_warning_message(title, message, detailed_text, widget)
+
+
+class ErrorPopupUtility(QObject):
+    """
+    Utility class to manage error popups in the application to show error messages to the users.
+    This class is singleton and the error popup can be enabled or disabled globally or attach to widget methods with decorator @error_managed.
+    """
+
+    error_occurred = Signal(str, str, QWidget)
+
+    _instance = None
+    _initialized = False
+
+    def __new__(cls, *args, **kwargs):
+        if cls._instance is None:
+            cls._instance = super(ErrorPopupUtility, cls).__new__(cls)
+            cls._instance._initialized = False
+        return cls._instance
+
+    def __init__(self, parent=None):
+        if not self._initialized:
+            super().__init__(parent=parent)
+            self.error_occurred.connect(self.show_error_message)
+            self.enable_error_popup = False
+            self.original_excepthook = sys.excepthook
+            self._initialized = True
+
+    @Slot(str, str, QWidget)
+    def show_error_message(self, title, message, widget):
+        detailed_text = self.format_traceback(message)
+        error_message = self.parse_error_message(detailed_text)
+
+        msg = QMessageBox(widget)
+        msg.setIcon(QMessageBox.Critical)
+        msg.setWindowTitle(title)
+        msg.setText(error_message)
+        msg.setStandardButtons(QMessageBox.Ok)
+        msg.setDetailedText(detailed_text)
+        msg.setTextInteractionFlags(Qt.TextSelectableByMouse)
+        msg.setMinimumWidth(600)
+        msg.setMinimumHeight(400)
+        msg.exec_()
+
+    def format_traceback(self, traceback_message: str) -> str:
+        """
+        Format the traceback message to be displayed in the error popup by adding indentation to each line.
+
+        Args:
+            traceback_message(str): The traceback message to be formatted.
+
+        Returns:
+            str: The formatted traceback message.
+        """
+        formatted_lines = []
+        lines = traceback_message.split("\n")
+        for line in lines:
+            formatted_lines.append("    " + line)  # Add indentation to each line
+        return "\n".join(formatted_lines)
+
+    def parse_error_message(self, traceback_message):
+        lines = traceback_message.split("\n")
+        error_message = "Error occurred. See details."
+        capture = False
+        captured_message = []
+
+        for line in lines:
+            if "raise" in line:
+                capture = True
+                continue
+            if capture:
+                if line.strip() and not line.startswith("  File "):
+                    captured_message.append(line.strip())
+                else:
+                    break
+
+        if captured_message:
+            error_message = " ".join(captured_message)
+        return error_message
+
+    def custom_exception_hook(self, exctype, value, tb):
+        if self.enable_error_popup:
+            error_message = traceback.format_exception(exctype, value, tb)
+            self.error_occurred.emit("Application Error", "".join(error_message), self.parent())
+        else:
+            self.original_excepthook(exctype, value, tb)  # Call the original excepthook
+
+    def enable_global_error_popups(self, state: bool):
+        """
+        Enable or disable global error popups for all applications.
+
+        Args:
+            state(bool): True to enable error popups, False to disable error popups.
+        """
+        self.enable_error_popup = bool(state)
+        if self.enable_error_popup:
+            sys.excepthook = self.custom_exception_hook
+        else:
+            sys.excepthook = self.original_excepthook
+
+    @classmethod
+    def reset_singleton(cls):
+        """
+        Reset the singleton instance.
+        """
+        cls._instance = None
+        cls._initialized = False
+
+
+def error_managed(method):
+    """Decorator to manage errors with the ErrorPopupUtility"""
+
+    def wrapper(*args, **kwargs):
+        try:
+            return method(*args, **kwargs)
+        except Exception as e:
+            exc_type, exc_value, exc_traceback = sys.exc_info()
+            error_message = traceback.format_exception(exc_type, exc_value, exc_traceback)
+            ErrorPopupUtility().error_occurred.emit("Error in Method", "".join(error_message), None)
+            if not ErrorPopupUtility()._instance.enable_error_popup:
+                raise
+
+    return wrapper
+
+
+class ExampleWidget(QWidget):  # pragma: no cover
+    """
+    Example widget to demonstrate error handling with the ErrorPopupUtility.
+
+    Warnings -> This example works properly only with PySide6, PyQt6 has a bug with the error handling.
+    """
+
+    def __init__(self, parent=None):
+        super().__init__(parent=parent)
+        self.init_ui()
+        self.warning_utility = WarningPopupUtility(self)
+
+    def init_ui(self):
+        self.layout = QVBoxLayout(self)
+
+        # Button to trigger method with error handling
+        self.error_button = QPushButton("Trigger Handled Error", self)
+        self.error_button.clicked.connect(self.method_with_error_handling)
+        self.layout.addWidget(self.error_button)
+
+        # Button to trigger method without error handling
+        self.normal_button = QPushButton("Trigger Normal Error", self)
+        self.normal_button.clicked.connect(self.method_without_error_handling)
+        self.layout.addWidget(self.normal_button)
+
+        # Button to trigger warning popup
+        self.warning_button = QPushButton("Trigger Warning", self)
+        self.warning_button.clicked.connect(self.trigger_warning)
+        self.layout.addWidget(self.warning_button)
+
+    @error_managed
+    def method_with_error_handling(self):
+        """This method raises an error and the exception is handled by the decorator."""
+        raise ValueError("This is a handled error.")
+
+    def method_without_error_handling(self):
+        """This method raises an error and the exception is not handled here."""
+        raise ValueError("This is an unhandled error.")
+
+    def trigger_warning(self):
+        """Trigger a warning using the WarningPopupUtility."""
+        self.warning_utility.show_warning(
+            title="Warning",
+            message="This is a warning message.",
+            detailed_text="This is the detailed text of the warning message.",
+            widget=self,
+        )
+
+
+if __name__ == "__main__":  # pragma: no cover
+
+    app = QApplication(sys.argv)
+    widget = ExampleWidget()
+    widget.show()
+    sys.exit(app.exec_())
--- a/bec_widgets/qt_utils/settings_dialog.py
+++ b/bec_widgets/qt_utils/settings_dialog.py
@@ -0,0 +1,107 @@
+from qtpy.QtCore import Slot
+from qtpy.QtWidgets import QDialog, QDialogButtonBox, QHBoxLayout, QPushButton, QVBoxLayout, QWidget
+
+
+class SettingWidget(QWidget):
+    """
+    Abstract class for a settings widget to enforce the implementation of the accept_changes and display_current_settings.
+    Can be used for toolbar actions to display the settings of a widget.
+
+    Args:
+        target_widget (QWidget): The widget that the settings will be taken from and applied to.
+    """
+
+    def __init__(self, parent=None, *args, **kwargs):
+        super().__init__(parent, *args, **kwargs)
+
+        self.target_widget = None
+
+    def set_target_widget(self, target_widget: QWidget):
+        self.target_widget = target_widget
+
+    @Slot()
+    def accept_changes(self):
+        """
+        Accepts the changes made in the settings widget and applies them to the target widget.
+        """
+        pass
+
+    @Slot(dict)
+    def display_current_settings(self, config_dict: dict):
+        """
+        Displays the current settings of the target widget in the settings widget.
+
+        Args:
+            config_dict(dict): The current settings of the target widget.
+        """
+        pass
+
+
+class SettingsDialog(QDialog):
+    """
+    Dialog to display and edit the settings of a widget with accept and cancel buttons.
+
+    Args:
+        parent (QWidget): The parent widget of the dialog.
+        target_widget (QWidget): The widget that the settings will be taken from and applied to.
+        settings_widget (SettingWidget): The widget that will display the settings.
+    """
+
+    def __init__(
+        self,
+        parent=None,
+        settings_widget: SettingWidget = None,
+        window_title: str = "Settings",
+        config: dict = None,
+        *args,
+        **kwargs,
+    ):
+        super().__init__(parent, *args, **kwargs)
+
+        self.setModal(False)
+
+        self.setWindowTitle(window_title)
+
+        self.widget = settings_widget
+        self.widget.set_target_widget(parent)
+        if config is None:
+            config = parent.get_config()
+
+        self.widget.display_current_settings(config)
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+
+        self.apply_button = QPushButton("Apply")
+
+        button_layout = QHBoxLayout()
+        button_layout.addWidget(self.button_box.button(QDialogButtonBox.Cancel))
+        button_layout.addWidget(self.apply_button)
+        button_layout.addWidget(self.button_box.button(QDialogButtonBox.Ok))
+
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        self.apply_button.clicked.connect(self.apply_changes)
+
+        self.layout = QVBoxLayout(self)
+        self.layout.setContentsMargins(5, 5, 5, 5)
+        self.layout.addWidget(self.widget)
+        self.layout.addLayout(button_layout)
+
+        ok_button = self.button_box.button(QDialogButtonBox.Ok)
+        ok_button.setDefault(True)
+        ok_button.setAutoDefault(True)
+
+    @Slot()
+    def accept(self):
+        """
+        Accept the changes made in the settings widget and close the dialog.
+        """
+        self.widget.accept_changes()
+        super().accept()
+
+    @Slot()
+    def apply_changes(self):
+        """
+        Apply the changes made in the settings widget without closing the dialog.
+        """
+        self.widget.accept_changes()
--- a/bec_widgets/qt_utils/toolbar.py
+++ b/bec_widgets/qt_utils/toolbar.py
@@ -0,0 +1,57 @@
+from abc import ABC, abstractmethod
+from collections import defaultdict
+
+# pylint: disable=no-name-in-module
+from qtpy.QtCore import QSize
+from qtpy.QtWidgets import QToolBar, QWidget
+
+
+class ToolBarAction(ABC):
+    @abstractmethod
+    def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
+        """Adds an action or widget to a toolbar.
+
+        Args:
+            toolbar (QToolBar): The toolbar to add the action or widget to.
+            target (QWidget): The target widget for the action.
+        """
+
+
+class ModularToolBar(QToolBar):
+    """Modular toolbar with optional automatic initialization.
+    Args:
+        parent (QWidget, optional): The parent widget of the toolbar. Defaults to None.
+        actions (list[ToolBarAction], optional): A list of action creators to populate the toolbar. Defaults to None.
+        target_widget (QWidget, optional): The widget that the actions will target. Defaults to None.
+        color (str, optional): The background color of the toolbar. Defaults to "black".
+    """
+
+    def __init__(
+        self, parent=None, actions=None, target_widget=None, color: str = "rgba(255, 255, 255, 0)"
+    ):
+        super().__init__(parent)
+
+        self.widgets = defaultdict(dict)
+        self.set_background_color(color)
+
+        if actions is not None and target_widget is not None:
+            self.populate_toolbar(actions, target_widget)
+
+    def populate_toolbar(self, actions: dict, target_widget):
+        """Populates the toolbar with a set of actions.
+
+        Args:
+            actions (list[ToolBarAction]): A list of action creators to populate the toolbar.
+            target_widget (QWidget): The widget that the actions will target.
+        """
+        self.clear()
+        for action_id, action in actions.items():
+            action.add_to_toolbar(self, target_widget)
+            self.widgets[action_id] = action
+
+    def set_background_color(self, color: str):
+        self.setStyleSheet(f"QToolBar {{ background: {color}; }}")
+        self.setIconSize(QSize(20, 20))
+        self.setMovable(False)
+        self.setFloatable(False)
+        self.setContentsMargins(0, 0, 0, 0)
--- a/bec_widgets/utils/bec_connector.py
+++ b/bec_widgets/utils/bec_connector.py
@@ -13,6 +13,8 @@ from qtpy.QtCore import QObject, QRunnable, QThreadPool, Signal
 from qtpy.QtCore import Slot as pyqtSlot

 from bec_widgets.cli.rpc_register import RPCRegister
+from bec_widgets.qt_utils.error_popups import ErrorPopupUtility
+from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.yaml_dialog import load_yaml, load_yaml_gui, save_yaml, save_yaml_gui

 BECDispatcher = lazy_import_from("bec_widgets.utils.bec_dispatcher", ("BECDispatcher",))
@@ -63,7 +65,7 @@ class Worker(QRunnable):
        self.signals.completed.emit()


-class BECConnector:
+class BECConnector(BECWidget):
    """Connection mixin class for all BEC widgets, to handle BEC client and device manager"""

    USER_ACCESS = ["_config_dict", "_get_all_rpc"]
@@ -93,6 +95,9 @@ class BECConnector:
        self.rpc_register = RPCRegister()
        self.rpc_register.add_rpc(self)

+        # Error popups
+        self.error_utility = ErrorPopupUtility()
+
        self._thread_pool = QThreadPool.globalInstance()

    def submit_task(self, fn, *args, on_complete: pyqtSlot = None, **kwargs) -> Worker:
@@ -288,6 +293,8 @@ class BECConnector:
            print("No more connections. Shutting down GUI BEC client.")
            self.bec_dispatcher.disconnect_all()
            self.client.shutdown()
+        if hasattr(super(), "cleanup"):
+            super().cleanup()

    # def closeEvent(self, event):
    #     self.cleanup()
--- a/bec_widgets/utils/bec_designer.py
+++ b/bec_widgets/utils/bec_designer.py
@@ -73,26 +73,28 @@ def patch_designer():  # pragma: no cover
    os.environ["PY_MAJOR_VERSION"] = str(major_version)
    os.environ["PY_MINOR_VERSION"] = str(minor_version)

-    if sys.platform == "linux":
+    if sys.platform == "win32":
+        if is_virtual_env():
+            _extend_path_var("PATH", os.fspath(Path(sys._base_executable).parent), True)
+    else:
+        if sys.platform == "linux":
+            suffix = f"{sys.abiflags}.so"
+            env_var = "LD_PRELOAD"
+        elif sys.platform == "darwin":
+            suffix = ".dylib"
+            env_var = "DYLD_INSERT_LIBRARIES"
+        else:
+            raise RuntimeError(f"Unsupported platform: {sys.platform}")
        version = f"{major_version}.{minor_version}"
-        library_name = f"libpython{version}{sys.abiflags}.so"
-        if is_pyenv_python():
-            library_name = str(Path(sysconfig.get_config_var("LIBDIR")) / library_name)
-        os.environ["LD_PRELOAD"] = library_name
-    elif sys.platform == "darwin":
-        library_name = f"libpython{major_version}.{minor_version}.dylib"
+        library_name = f"libpython{version}{suffix}"
        lib_path = str(Path(sysconfig.get_config_var("LIBDIR")) / library_name)
-        os.environ["DYLD_INSERT_LIBRARIES"] = lib_path
+        os.environ[env_var] = lib_path

        if is_pyenv_python() or is_virtual_env():
            # append all editable packages to the PYTHONPATH
            editable_packages = list_editable_packages()
            for pckg in editable_packages:
                _extend_path_var("PYTHONPATH", pckg, True)
-    elif sys.platform == "win32":
-        if is_virtual_env():
-            _extend_path_var("PATH", os.fspath(Path(sys._base_executable).parent), True)
-
    qt_tool_wrapper(ui_tool_binary("designer"), sys.argv[1:])


--- a/bec_widgets/utils/bec_dispatcher.py
+++ b/bec_widgets/utils/bec_dispatcher.py
@@ -8,7 +8,7 @@ import redis
 from bec_lib.client import BECClient
 from bec_lib.redis_connector import MessageObject, RedisConnector
 from bec_lib.service_config import ServiceConfig
-from qtpy.QtCore import PYQT5, PYQT6, PYSIDE2, PYSIDE6, QCoreApplication, QObject
+from qtpy.QtCore import PYQT6, PYSIDE6, QCoreApplication, QObject
 from qtpy.QtCore import Signal as pyqtSignal

 if TYPE_CHECKING:
@@ -127,14 +127,17 @@ class BECDispatcher:
            return

        # shutdown QCoreApp if it exists
-        if PYQT5 or PYQT6:
+        if PYQT6:
            cls.qapp.exit()
-        elif PYSIDE2 or PYSIDE6:
+        elif PYSIDE6:
            cls.qapp.shutdown()
        cls.qapp = None

    def connect_slot(
-        self, slot: Callable, topics: Union[EndpointInfo, str, list[Union[EndpointInfo, str]]]
+        self,
+        slot: Callable,
+        topics: Union[EndpointInfo, str, list[Union[EndpointInfo, str]]],
+        **kwargs,
    ) -> None:
        """Connect widget's pyqt slot, so that it is called on new pub/sub topic message.

@@ -144,7 +147,7 @@ class BECDispatcher:
            topics (EndpointInfo | str | list): A topic or list of topics that can typically be acquired via bec_lib.MessageEndpoints
        """
        slot = QtThreadSafeCallback(slot)
-        self.client.connector.register(topics, cb=slot)
+        self.client.connector.register(topics, cb=slot, **kwargs)
        topics_str, _ = self.client.connector._convert_endpointinfo(topics)
        self._slots[slot].update(set(topics_str))

--- a/bec_widgets/utils/bec_widget.py
+++ b/bec_widgets/utils/bec_widget.py
@@ -0,0 +1,8 @@
+class BECWidget:
+    """Base class for all BEC widgets."""
+
+    def closeEvent(self, event):
+        if hasattr(self, "cleanup"):
+            self.cleanup()
+        if hasattr(super(), "closeEvent"):
+            super().closeEvent(event)
--- a/bec_widgets/utils/colors.py
+++ b/bec_widgets/utils/colors.py
@@ -1,10 +1,37 @@
+import itertools
 import re
 from typing import Literal

 import numpy as np
 import pyqtgraph as pg
+import qdarkstyle
 from pydantic_core import PydanticCustomError
+from qdarkstyle import DarkPalette, LightPalette
 from qtpy.QtGui import QColor
+from qtpy.QtWidgets import QApplication
+
+CURRENT_THEME = "dark"
+
+
+def get_theme_palette():
+    return DarkPalette if CURRENT_THEME == "dark" else LightPalette
+
+
+def apply_theme(theme: Literal["dark", "light"]):
+    global CURRENT_THEME
+    CURRENT_THEME = theme
+
+    app = QApplication.instance()
+    # go through all pyqtgraph widgets and set background
+    children = itertools.chain.from_iterable(
+        top.findChildren(pg.GraphicsLayoutWidget) for top in app.topLevelWidgets()
+    )
+    for pg_widget in children:
+        pg_widget.setBackground("k" if theme == "dark" else "w")
+
+    # now define stylesheet according to theme and apply it
+    style = qdarkstyle.load_stylesheet(palette=get_theme_palette())
+    app.setStyleSheet(style)


 class Colors:
--- a/bec_widgets/utils/entry_validator.py
+++ b/bec_widgets/utils/entry_validator.py
@@ -19,7 +19,7 @@ class EntryValidator:
        device = self.devices[name]
        description = device.describe()

-        if entry is None:
+        if entry is None or entry == "":
            entry = next(iter(device._hints), name) if hasattr(device, "_hints") else name
        if entry not in description:
            raise ValueError(f"Entry '{entry}' not found in device '{name}' signals")
--- a/bec_widgets/utils/generate_designer_plugin.py
+++ b/bec_widgets/utils/generate_designer_plugin.py
@@ -58,11 +58,12 @@ class DesignerPluginGenerator:
            os.path.dirname(os.path.abspath(__file__)), "plugin_templates"
        )

-    def run(self):
+    def run(self, validate=True):
        if self._excluded:
            print(f"Plugin {self.widget.__name__} is excluded from generation.")
            return
-        self._check_class_validity()
+        if validate:
+            self._check_class_validity()
        self._load_templates()
        self._write_templates()

@@ -142,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.dock import BECDockArea
+    from bec_widgets.widgets.spinner.spinner import SpinnerWidget

-    generator = DesignerPluginGenerator(BECDockArea)
-    generator.run()
+    generator = DesignerPluginGenerator(SpinnerWidget)
+    generator.run(validate=False)
--- a/bec_widgets/utils/plugin_utils.py
+++ b/bec_widgets/utils/plugin_utils.py
@@ -1,12 +1,13 @@
 import importlib
 import inspect
 import os
-from typing import Literal
+from dataclasses import dataclass

 from bec_lib.plugin_helper import _get_available_plugins
 from qtpy.QtWidgets import QGraphicsWidget, QWidget

 from bec_widgets.utils import BECConnector
+from bec_widgets.utils.bec_widget import BECWidget


 def get_plugin_widgets() -> dict[str, BECConnector]:
@@ -44,9 +45,74 @@ def _filter_plugins(obj):
    return inspect.isclass(obj) and issubclass(obj, BECConnector)


-def get_rpc_classes(
-    repo_name: str,
-) -> dict[Literal["connector_classes", "top_level_classes"], list[type]]:
+@dataclass
+class BECClassInfo:
+    name: str
+    module: str
+    file: str
+    obj: type
+    is_connector: bool = False
+    is_widget: bool = False
+    is_top_level: bool = False
+
+
+class BECClassContainer:
+    def __init__(self):
+        self._collection = []
+
+    def add_class(self, class_info: BECClassInfo):
+        """
+        Add a class to the collection.
+
+        Args:
+            class_info(BECClassInfo): The class information
+        """
+        self.collection.append(class_info)
+
+    @property
+    def collection(self):
+        """
+        Get the collection of classes.
+        """
+        return self._collection
+
+    @property
+    def connector_classes(self):
+        """
+        Get all connector classes.
+        """
+        return [info.obj for info in self.collection if info.is_connector]
+
+    @property
+    def top_level_classes(self):
+        """
+        Get all top-level classes.
+        """
+        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_top_level]
+
+    @property
+    def widgets(self):
+        """
+        Get all widgets. These are all classes inheriting from BECWidget.
+        """
+        return [info.obj for info in self.collection if info.is_widget]
+
+    @property
+    def rpc_top_level_classes(self):
+        """
+        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_top_level and info.is_connector]
+
+
+def get_rpc_classes(repo_name: str) -> BECClassContainer:
    """
    Get all RPC-enabled classes in the specified repository.

@@ -56,8 +122,7 @@ def get_rpc_classes(
    Returns:
        dict: A dictionary with keys "connector_classes" and "top_level_classes" and values as lists of classes.
    """
-    connector_classes = []
-    top_level_classes = []
+    collection = BECClassContainer()
    anchor_module = importlib.import_module(f"{repo_name}.widgets")
    directory = os.path.dirname(anchor_module.__file__)
    for root, _, files in sorted(os.walk(directory)):
@@ -78,11 +143,16 @@ def get_rpc_classes(
                obj = getattr(module, name)
                if not hasattr(obj, "__module__") or obj.__module__ != module.__name__:
                    continue
-                if isinstance(obj, type) and issubclass(obj, BECConnector):
-                    connector_classes.append(obj)
+                if isinstance(obj, type):
+                    class_info = BECClassInfo(name=name, module=module_name, file=path, obj=obj)
+                    if issubclass(obj, BECConnector):
+                        class_info.is_connector = True
+                    if issubclass(obj, BECWidget):
+                        class_info.is_widget = True
                    if len(subs) == 1 and (
                        issubclass(obj, QWidget) or issubclass(obj, QGraphicsWidget)
                    ):
-                        top_level_classes.append(obj)
+                        class_info.is_top_level = True
+                    collection.add_class(class_info)

-    return {"connector_classes": connector_classes, "top_level_classes": top_level_classes}
+    return collection
--- a/bec_widgets/utils/reference_utils.py
+++ b/bec_widgets/utils/reference_utils.py
@@ -0,0 +1,92 @@
+import os
+import sys
+
+from PIL import Image, ImageChops
+from qtpy.QtGui import QPixmap
+
+import bec_widgets
+
+REFERENCE_DIR = os.path.join(
+    os.path.dirname(os.path.dirname(bec_widgets.__file__)), "tests/references"
+)
+REFERENCE_DIR_FAILURES = os.path.join(
+    os.path.dirname(os.path.dirname(bec_widgets.__file__)), "tests/reference_failures"
+)
+
+
+def compare_images(image1_path: str, reference_image_path: str):
+    """
+    Load two images and compare them pixel by pixel
+
+    Args:
+        image1_path(str): The path to the first image
+        reference_image_path(str): The path to the reference image
+
+    Raises:
+        ValueError: If the images are different
+    """
+    image1 = Image.open(image1_path)
+    image2 = Image.open(reference_image_path)
+    if image1.size != image2.size:
+        raise ValueError("Image size has changed")
+    diff = ImageChops.difference(image1, image2)
+    if diff.getbbox():
+        # copy image1 to the reference directory to upload as artifact
+        os.makedirs(REFERENCE_DIR_FAILURES, exist_ok=True)
+        image_name = os.path.join(REFERENCE_DIR_FAILURES, os.path.basename(image1_path))
+        image1.save(image_name)
+        print(f"Image saved to {image_name}")
+
+        raise ValueError("Images are different")
+
+
+def snap_and_compare(widget: any, output_directory: str, suffix: str = ""):
+    """
+    Save a rendering of a widget and compare it to a reference image
+
+    Args:
+        widget(any): The widget to render
+        output_directory(str): The directory to save the image to
+        suffix(str): A suffix to append to the image name
+
+    Raises:
+        ValueError: If the images are different
+
+    Examples:
+        snap_and_compare(widget, tmpdir, suffix="started")
+
+    """
+
+    if not isinstance(output_directory, str):
+        output_directory = str(output_directory)
+
+    os_suffix = sys.platform
+
+    name = (
+        f"{widget.__class__.__name__}_{suffix}_{os_suffix}.png"
+        if suffix
+        else f"{widget.__class__.__name__}_{os_suffix}.png"
+    )
+
+    # Save the widget to a pixmap
+    test_image_path = os.path.join(output_directory, name)
+    pixmap = QPixmap(widget.size())
+    widget.render(pixmap)
+    pixmap.save(test_image_path)
+
+    try:
+        reference_path = os.path.join(REFERENCE_DIR, f"{widget.__class__.__name__}")
+        reference_image_path = os.path.join(reference_path, name)
+
+        if not os.path.exists(reference_image_path):
+            raise ValueError(f"Reference image not found: {reference_image_path}")
+
+        compare_images(test_image_path, reference_image_path)
+
+    except ValueError:
+        image = Image.open(test_image_path)
+        os.makedirs(REFERENCE_DIR_FAILURES, exist_ok=True)
+        image_name = os.path.join(REFERENCE_DIR_FAILURES, name)
+        image.save(image_name)
+        print(f"Image saved to {image_name}")
+        raise
--- a/bec_widgets/utils/ui_loader.py
+++ b/bec_widgets/utils/ui_loader.py
@@ -1,27 +1,45 @@
-from qtpy import QT_VERSION
+import os
+
+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_rpc_classes
+
+if PYSIDE6:
+    from PySide6.QtUiTools import QUiLoader
+
+    class CustomUiLoader(QUiLoader):
+        def __init__(self, baseinstance, custom_widgets: dict = None):
+            super().__init__(baseinstance)
+            self.custom_widgets = custom_widgets or {}
+
+            self.baseinstance = baseinstance
+
+        def createWidget(self, class_name, parent=None, name=""):
+            if class_name in self.custom_widgets:
+                widget = self.custom_widgets[class_name](parent)
+                widget.setObjectName(name)
+                return widget
+            return super().createWidget(class_name, parent, name)
+

 class UILoader:
-    """Universal UI loader for PyQt5, PyQt6, PySide2, and PySide6."""
+    """Universal UI loader for PyQt6 and PySide6."""

    def __init__(self, parent=None):
        self.parent = parent
-        if QT_VERSION.startswith("5"):
-            # PyQt5 or PySide2
-            from qtpy import uic

-            self.loader = uic.loadUi
-        elif QT_VERSION.startswith("6"):
-            # PyQt6 or PySide6
-            try:
-                from PySide6.QtUiTools import QUiLoader
+        widgets = get_rpc_classes("bec_widgets").top_level_classes

-                self.loader = self.load_ui_pyside6
-            except ImportError:
-                from PyQt6.uic import loadUi
+        self.custom_widgets = {widget.__name__: widget for widget in widgets}

-                self.loader = loadUi
+        if PYSIDE6:
+            self.loader = self.load_ui_pyside6
+        elif PYQT6:
+            self.loader = self.load_ui_pyqt6
+        else:
+            raise ImportError("No compatible Qt bindings found.")

    def load_ui_pyside6(self, ui_file, parent=None):
        """
@@ -33,9 +51,8 @@ class UILoader:
        Returns:
            QWidget: The loaded widget.
        """
-        from PySide6.QtUiTools import QUiLoader

-        loader = QUiLoader(parent)
+        loader = CustomUiLoader(parent, self.custom_widgets)
        file = QFile(ui_file)
        if not file.open(QIODevice.ReadOnly):
            raise IOError(f"Cannot open file: {ui_file}")
@@ -43,6 +60,71 @@ class UILoader:
        file.close()
        return widget

+    def load_ui_pyqt6(self, ui_file, parent=None):
+        """
+        Specific loader for PyQt6 using loadUi.
+        Args:
+            ui_file(str): Path to the .ui file.
+            parent(QWidget): Parent widget.
+
+        Returns:
+            QWidget: The loaded widget.
+        """
+        from PyQt6.uic.Loader.loader import DynamicUILoader
+
+        class CustomDynamicUILoader(DynamicUILoader):
+            def __init__(self, package, custom_widgets: dict = None):
+                super().__init__(package)
+                self.custom_widgets = custom_widgets or {}
+
+            def _handle_custom_widgets(self, el):
+                """Handle the <customwidgets> element."""
+
+                def header2module(header):
+                    """header2module(header) -> string
+
+                    Convert paths to C++ header files to according Python modules
+                    >>> header2module("foo/bar/baz.h")
+                    'foo.bar.baz'
+                    """
+
+                    if header.endswith(".h"):
+                        header = header[:-2]
+
+                    mpath = []
+                    for part in header.split("/"):
+                        # Ignore any empty parts or those that refer to the current
+                        # directory.
+                        if part not in ("", "."):
+                            if part == "..":
+                                # We should allow this for Python3.
+                                raise SyntaxError(
+                                    "custom widget header file name may not contain '..'."
+                                )
+
+                            mpath.append(part)
+
+                    return ".".join(mpath)
+
+                for custom_widget in el:
+                    classname = custom_widget.findtext("class")
+                    header = custom_widget.findtext("header")
+                    if header:
+                        header = self._translate_bec_widgets_header(header)
+                    self.factory.addCustomWidget(
+                        classname,
+                        custom_widget.findtext("extends") or "QWidget",
+                        header2module(header),
+                    )
+
+            def _translate_bec_widgets_header(self, header):
+                for name, value in self.custom_widgets.items():
+                    if header == DesignerPluginInfo.pascal_to_snake(name):
+                        return value.__module__
+                return header
+
+        return CustomDynamicUILoader("", self.custom_widgets).loadUi(ui_file, parent)
+
    def load_ui(self, ui_file, parent=None):
        """
        Universal UI loader method.
--- a/bec_widgets/utils/widget_io.py
+++ b/bec_widgets/utils/widget_io.py
@@ -44,8 +44,11 @@ class ComboBoxHandler(WidgetHandler):
    def get_value(self, widget: QComboBox) -> int:
        return widget.currentIndex()

-    def set_value(self, widget: QComboBox, value: int) -> None:
-        widget.setCurrentIndex(value)
+    def set_value(self, widget: QComboBox, value: int | str) -> None:
+        if isinstance(value, str):
+            value = widget.findText(value)
+        if isinstance(value, int):
+            widget.setCurrentIndex(value)


 class TableWidgetHandler(WidgetHandler):
@@ -142,6 +145,26 @@ class WidgetIO:
        elif not ignore_errors:
            raise ValueError(f"No handler for widget type: {type(widget)}")

+    @staticmethod
+    def check_and_adjust_limits(spin_box: QDoubleSpinBox, number: float):
+        """
+        Check if the new limits are within the current limits, if not adjust the limits.
+
+        Args:
+            number(float): The new value to check against the limits.
+        """
+
+        min_value = spin_box.minimum()
+        max_value = spin_box.maximum()
+
+        # Calculate the new limits
+        new_limit = number + 5 * number
+
+        if number < min_value:
+            spin_box.setMinimum(new_limit)
+        elif number > max_value:
+            spin_box.setMaximum(new_limit)
+
    @staticmethod
    def _find_handler(widget):
        """
--- a/bec_widgets/widgets/device_inputs/device_combobox/init.py
+++ b/bec_widgets/widgets/device_inputs/device_combobox/init.py
--- a/bec_widgets/widgets/device_inputs/device_input_base.py
+++ b/bec_widgets/widgets/device_inputs/device_input_base.py
@@ -25,6 +25,7 @@ class DeviceInputBase(BECConnector):
        super().__init__(client=client, config=config, gui_id=gui_id)

        self.get_bec_shortcuts()
+        self._device_filter = None
        self._devices = []

    @property
@@ -56,6 +57,7 @@ class DeviceInputBase(BECConnector):
        """
        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):
        """
--- a/bec_widgets/widgets/bec_status_box/bec_status_box.py
+++ b/bec_widgets/widgets/bec_status_box/bec_status_box.py
@@ -5,15 +5,16 @@ 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

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

-from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
+from bec_widgets.utils.bec_connector import BECConnector
+from bec_widgets.utils.colors import apply_theme
 from bec_widgets.widgets.bec_status_box.status_item import StatusItem

 if TYPE_CHECKING:
@@ -23,45 +24,18 @@ if TYPE_CHECKING:
 BECStatus = lazy_import_from("bec_lib.messages", ("BECStatus",))


-class BECStatusBoxConfig(ConnectionConfig):
-    pass
-
-
-class BECServiceInfoContainer(BaseModel):
+@dataclass
+class BECServiceInfoContainer:
    """Container to store information about the BEC services."""

    service_name: str
-    status: BECStatus | str = Field(
-        default="NOTCONNECTED",
-        description="The status of the service. Can be any of the BECStatus names, or NOTCONNECTED.",
-    )
+    status: str
    info: dict
    metrics: dict | None
-    model_config: dict = {"validate_assignment": True}
-
-    @field_validator("status")
-    @classmethod
-    def validate_status(cls, v):
-        """Validate input for status. Accept BECStatus and NOTCONNECTED.
-
-        Args:
-            v (BECStatus | str): The input value.
-
-        Returns:
-            str: The validated status.
-        """
-        if v in list(BECStatus.__members__.values()):
-            return v.name
-        if v in list(BECStatus.__members__.keys()) or v == "NOTCONNECTED":
-            return v
-        raise ValueError(
-            f"Status must be one of {BECStatus.__members__.values()} or 'NOTCONNECTED'. Input {v}"
-        )


 class BECServiceStatusMixin(QObject):
-    """A mixin class to update the service status, and metrics.
-    It emits a signal 'services_update' when the service status is updated.
+    """Mixin to receive the latest service status from the BEC server and emit it via services_update signal.

    Args:
        client (BECClient): The client object to connect to the BEC server.
@@ -69,29 +43,26 @@ class BECServiceStatusMixin(QObject):

    services_update = Signal(dict, dict)

-    def __init__(self, client: BECClient):
-        super().__init__()
+    def __init__(self, parent, client: BECClient):
+        super().__init__(parent)
        self.client = client
        self._service_update_timer = QTimer()
        self._service_update_timer.timeout.connect(self._get_service_status)
        self._service_update_timer.start(1000)

    def _get_service_status(self):
-        """Pull latest service and metrics updates from REDIS for all services, and emit both via 'services_update' signal."""
+        """Get the latest service status from the BEC server."""
        # pylint: disable=protected-access
        self.client._update_existing_services()
        self.services_update.emit(self.client._services_info, self.client._services_metric)


-class BECStatusBox(BECConnector, QTreeWidget):
-    """A widget to display the status of different BEC services.
-    This widget automatically updates the status of all running BEC services, and displays their status.
-    Information about the individual services is collapsible, and double clicking on
-    the individual service will display the metrics about the service.
+class BECStatusBox(BECConnector, QWidget):
+    """An autonomous widget to display the status of BEC services.

    Args:
        parent Optional : The parent widget for the BECStatusBox. Defaults to None.
-        service_name Optional(str): The name of the top service label. Defaults to "BEC Server".
+        box_name Optional(str): The name of the top service label. Defaults to "BEC Server".
        client Optional(BECClient): The client object to connect to the BEC server. Defaults to None
        config Optional(BECStatusBoxConfig | dict): The configuration for the status box. Defaults to None.
        gui_id Optional(str): The unique id for the widget. Defaults to None.
@@ -99,58 +70,67 @@ class BECStatusBox(BECConnector, QTreeWidget):

    CORE_SERVICES = ["DeviceServer", "ScanServer", "SciHub", "ScanBundler", "FileWriterManager"]

-    service_update = Signal(dict)
+    service_update = Signal(BECServiceInfoContainer)
    bec_core_state = Signal(str)

    def __init__(
        self,
        parent=None,
-        service_name: str = "BEC Server",
+        box_name: str = "BEC Server",
        client: BECClient = None,
-        config: BECStatusBoxConfig | dict = None,
        bec_service_status_mixin: BECServiceStatusMixin = None,
        gui_id: str = None,
    ):
-        if config is None:
-            config = BECStatusBoxConfig(widget_class=self.__class__.__name__)
-        else:
-            if isinstance(config, dict):
-                config = BECStatusBoxConfig(**config)
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        QTreeWidget.__init__(self, parent=parent)
+        super().__init__(client=client, gui_id=gui_id)
+        QWidget.__init__(self, parent=parent)
+        self.tree = QTreeWidget(self)
+        self.layout = QHBoxLayout(self)

-        self.service_name = service_name
-        self.config = config
-
-        self.bec_service_info_container = {}
-        self.tree_items = {}
-        self.tree_top_item = None
+        self.box_name = box_name
+        self.status_container = defaultdict(lambda: {"info": None, "item": None, "widget": None})

        if not bec_service_status_mixin:
-            bec_service_status_mixin = BECServiceStatusMixin(client=self.client)
+            bec_service_status_mixin = BECServiceStatusMixin(self, client=self.client)
        self.bec_service_status = bec_service_status_mixin

        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.itemDoubleClicked.connect(self.on_tree_item_double_clicked)
+        self.tree.itemDoubleClicked.connect(self.on_tree_item_double_clicked)
+        self.layout.addWidget(self.tree)

    def init_ui(self) -> None:
-        """Initialize the UI for the status box, and add QTreeWidget as the basis for the status box."""
+        """Init the UI for the BECStatusBox widget, should only take place once."""
        self.init_ui_tree_widget()
-        top_label = self._create_status_widget(self.service_name, status=BECStatus.IDLE)
-        self.tree_top_item = QTreeWidgetItem()
-        self.tree_top_item.setExpanded(True)
-        self.tree_top_item.setDisabled(True)
-        self.addTopLevelItem(self.tree_top_item)
-        self.setItemWidget(self.tree_top_item, 0, top_label)
+        top_label = self._create_status_widget(self.box_name, status=BECStatus.IDLE)
+        tree_item = QTreeWidgetItem()
+        tree_item.setExpanded(True)
+        tree_item.setDisabled(True)
+        self.status_container[self.box_name].update({"item": tree_item, "widget": top_label})
+        self.tree.addTopLevelItem(tree_item)
+        self.tree.setItemWidget(tree_item, 0, top_label)
        self.service_update.connect(top_label.update_config)
+        self._initialized = True
+
+    def init_ui_tree_widget(self) -> None:
+        """Initialise the tree widget for the status box."""
+        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 {}"
+        )

    def _create_status_widget(
        self, service_name: str, status=BECStatus, info: dict = None, metrics: dict = None
    ) -> StatusItem:
        """Creates a StatusItem (QWidget) for the given service, and stores all relevant
-        information about the service in the bec_service_info_container.
+        information about the service in the status_container.

        Args:
            service_name (str): The name of the service.
@@ -163,16 +143,8 @@ class BECStatusBox(BECConnector, QTreeWidget):
        """
        if info is None:
            info = {}
-        self._update_bec_service_container(service_name, status, info, metrics)
-        item = StatusItem(
-            parent=self,
-            config={
-                "service_name": service_name,
-                "status": status.name,
-                "info": info,
-                "metrics": metrics,
-            },
-        )
+        self._update_status_container(service_name, status, info, metrics)
+        item = StatusItem(parent=self, config=self.status_container[service_name]["info"])
        return item

    @Slot(str)
@@ -183,30 +155,35 @@ class BECStatusBox(BECConnector, QTreeWidget):
        Args:
            status (BECStatus): The state of the core services.
        """
-        self.bec_service_info_container[self.service_name].status = status
-        self.service_update.emit(self.bec_service_info_container[self.service_name].model_dump())
+        self.status_container[self.box_name]["info"].status = status
+        self.service_update.emit(self.status_container[self.box_name]["info"])

-    def _update_bec_service_container(
+    def _update_status_container(
        self, service_name: str, status: BECStatus, info: dict, metrics: dict = None
    ) -> None:
-        """Update the bec_service_info_container with the newest status and metrics for the BEC service.
+        """Update the status_container with the newest status and metrics for the BEC service.
        If information about the service already exists, it will create a new entry.

        Args:
            service_name (str): The name of the service.
-            service_info (StatusMessage): A class containing the service status.
-            service_metric (ServiceMetricMessage): A class containing the service metrics.
+            status (BECStatus): The status of the service.
+            info (dict): The information about the service.
+            metrics (dict): The metrics of the service.
        """
-        container = self.bec_service_info_container.get(service_name, None)
+        container = self.status_container[service_name].get("info", None)
+
        if container:
-            container.status = status
+            container.status = status.name
            container.info = info
            container.metrics = metrics
            return
        service_info_item = BECServiceInfoContainer(
-            service_name=service_name, status=status, info=info, metrics=metrics
+            service_name=service_name,
+            status=status.name if isinstance(status, BECStatus) else status,
+            info=info,
+            metrics=metrics,
        )
-        self.bec_service_info_container.update({service_name: service_info_item})
+        self.status_container[service_name].update({"info": service_info_item})

    @Slot(dict, dict)
    def update_service_status(self, services_info: dict, services_metric: dict) -> None:
@@ -217,7 +194,7 @@ class BECStatusBox(BECConnector, QTreeWidget):
            services_info (dict): A dictionary containing the service status for all running BEC services.
            services_metric (dict): A dictionary containing the service metrics for all running BEC services.
        """
-        checked = []
+        checked = [self.box_name]
        services_info = self.update_core_services(services_info, services_metric)
        checked.extend(self.CORE_SERVICES)

@@ -225,28 +202,19 @@ class BECStatusBox(BECConnector, QTreeWidget):
            checked.append(service_name)
            metric_msg = services_metric.get(service_name, None)
            metrics = metric_msg.metrics if metric_msg else None
-            if service_name in self.tree_items:
-                self._update_bec_service_container(
-                    service_name=service_name, status=msg.status, info=msg.info, metrics=metrics
-                )
-                self.service_update.emit(self.bec_service_info_container[service_name].model_dump())
+            if service_name in self.status_container:
+                if not msg:
+                    self.add_tree_item(service_name, "NOTCONNECTED", {}, metrics)
+                    continue
+                self._update_status_container(service_name, msg.status, msg.info, metrics)
+                self.service_update.emit(self.status_container[service_name]["info"])
                continue

-            item_widget = self._create_status_widget(
-                service_name=service_name, status=msg.status, info=msg.info, metrics=metrics
-            )
-            item = QTreeWidgetItem()
-            item.setDisabled(True)
-            self.service_update.connect(item_widget.update_config)
-            self.tree_top_item.addChild(item)
-            self.setItemWidget(item, 0, item_widget)
-            self.tree_items.update({service_name: (item, item_widget)})
-
+            self.add_tree_item(service_name, msg.status, msg.info, metrics)
        self.check_redundant_tree_items(checked)

    def update_core_services(self, services_info: dict, services_metric: dict) -> dict:
-        """Method to process status and metrics updates of core services (stored in CORE_SERVICES).
-        If a core services is not connected, it should not be removed from the status widget
+        """Update the core services of BEC, and emit the updated status to the BECStatusBox.

        Args:
            services_info (dict): A dictionary containing the service status of different services.
@@ -255,28 +223,28 @@ class BECStatusBox(BECConnector, QTreeWidget):
        Returns:
            dict: The services_info dictionary after removing the info updates related to the CORE_SERVICES
        """
-        bec_core_state = "RUNNING"
+        core_state = BECStatus.RUNNING
        for service_name in sorted(self.CORE_SERVICES):
            metric_msg = services_metric.get(service_name, None)
            metrics = metric_msg.metrics if metric_msg else None
-            if service_name not in services_info:
-                self.bec_service_info_container[service_name].status = "NOTCONNECTED"
-                bec_core_state = "ERROR"
-            else:
-                msg = services_info.pop(service_name)
-                self._update_bec_service_container(
-                    service_name=service_name, status=msg.status, info=msg.info, metrics=metrics
-                )
-                bec_core_state = (
-                    "RUNNING" if (msg.status.value > 1 and bec_core_state == "RUNNING") else "ERROR"
-                )
-
-            if service_name in self.tree_items:
-                self.service_update.emit(self.bec_service_info_container[service_name].model_dump())
+            msg = services_info.pop(service_name, None)
+            if service_name not in self.status_container:
+                if not msg:
+                    self.add_tree_item(service_name, "NOTCONNECTED", {}, metrics)
+                    continue
+                self.add_tree_item(service_name, msg.status, msg.info, metrics)
                continue
-            self.add_tree_item(service_name, msg.status, msg.info, metrics)
+            if not msg:
+                self.status_container[service_name]["info"].status = "NOTCONNECTED"
+                core_state = None
+            else:
+                self._update_status_container(service_name, msg.status, msg.info, metrics)
+                if core_state:
+                    core_state = msg.status if msg.status.value < core_state.value else core_state

-        self.bec_core_state.emit(bec_core_state)
+            self.service_update.emit(self.status_container[service_name]["info"])
+
+        self.bec_core_state.emit(core_state.name if core_state else "NOTCONNECTED")
        return services_info

    def check_redundant_tree_items(self, checked: list) -> None:
@@ -285,11 +253,12 @@ class BECStatusBox(BECConnector, QTreeWidget):
        Args:
            checked (list): A list of services that are currently running.
        """
-        to_be_deleted = [key for key in self.tree_items if key not in checked]
+        to_be_deleted = [key for key in self.status_container if key not in checked]

        for key in to_be_deleted:
-            item, _ = self.tree_items.pop(key)
-            self.tree_top_item.removeChild(item)
+            obj = self.status_container.pop(key)
+            item = obj["item"]
+            self.status_container[self.box_name]["item"].removeChild(item)

    def add_tree_item(
        self, service_name: str, status: BECStatus, info: dict = None, metrics: dict = None
@@ -298,30 +267,16 @@ class BECStatusBox(BECConnector, QTreeWidget):

        Args:
            service_name (str): The name of the service.
-            service_status_msg (StatusMessage): The status of the service.
+            status (BECStatus): The status of the service.
+            info (dict): The information about the service.
            metrics (dict): The metrics of the service.
        """
-        item_widget = self._create_status_widget(
-            service_name=service_name, status=status, info=info, metrics=metrics
-        )
+        item_widget = self._create_status_widget(service_name, status, info, metrics)
        item = QTreeWidgetItem()
        self.service_update.connect(item_widget.update_config)
-        self.tree_top_item.addChild(item)
-        self.setItemWidget(item, 0, item_widget)
-        self.tree_items.update({service_name: (item, item_widget)})
-
-    def init_ui_tree_widget(self) -> None:
-        """Initialise the tree widget for the status box."""
-        self.setHeaderHidden(True)
-        self.setStyleSheet(
-            "QTreeWidget::item:!selected "
-            "{ "
-            "border: 1px solid gainsboro; "
-            "border-left: none; "
-            "border-top: none; "
-            "}"
-            "QTreeWidget::item:selected {}"
-        )
+        self.status_container[self.box_name]["item"].addChild(item)
+        self.tree.setItemWidget(item, 0, item_widget)
+        self.status_container[service_name].update({"item": item, "widget": item_widget})

    @Slot(QTreeWidgetItem, int)
    def on_tree_item_double_clicked(self, item: QTreeWidgetItem, column: int) -> None:
@@ -331,13 +286,18 @@ class BECStatusBox(BECConnector, QTreeWidget):
            item (QTreeWidgetItem): The item that was double clicked.
            column (int): The column that was double clicked.
        """
-        for _, (tree_item, status_widget) in self.tree_items.items():
-            if tree_item == item:
-                status_widget.show_popup()
+        for _, objects in self.status_container.items():
+            if objects["item"] == item:
+                objects["widget"].show_popup()

    def closeEvent(self, event):
+        """Upon closing the widget, clean up the BECStatusBox and the QWidget.
+
+        Args:
+            event: The close event.
+        """
        super().cleanup()
-        QTreeWidget().closeEvent(event)
+        super().closeEvent(event)


 def main():
@@ -346,7 +306,7 @@ def main():
    from qtpy.QtWidgets import QApplication

    app = QApplication(sys.argv)
-    qdarktheme.setup_theme("auto")
+    apply_theme("dark")
    main_window = BECStatusBox()
    main_window.show()
    sys.exit(app.exec())
--- a/bec_widgets/widgets/bec_status_box/bec_status_box.pyproject
+++ b/bec_widgets/widgets/bec_status_box/bec_status_box.pyproject
@@ -0,0 +1 @@
+{'files': ['bec_status_box.py']}
--- a/bec_widgets/widgets/bec_status_box/bec_status_box_plugin.py
+++ b/bec_widgets/widgets/bec_status_box/bec_status_box_plugin.py
@@ -0,0 +1,54 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtGui import QIcon
+
+from bec_widgets.widgets.bec_status_box.bec_status_box import BECStatusBox
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='BECStatusBox' name='bec_status_box'>
+    </widget>
+</ui>
+"""
+
+
+class BECStatusBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = BECStatusBox(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return ""
+
+    def icon(self):
+        return QIcon()
+
+    def includeFile(self):
+        return "bec_status_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 "BECStatusBox"
+
+    def toolTip(self):
+        return "An autonomous widget to display the status of BEC services."
+
+    def whatsThis(self):
+        return self.toolTip()
--- a/bec_widgets/widgets/bec_status_box/register_bec_status_box.py
+++ b/bec_widgets/widgets/bec_status_box/register_bec_status_box.py
@@ -0,0 +1,15 @@
+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.bec_status_box.bec_status_box_plugin import BECStatusBoxPlugin
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(BECStatusBoxPlugin())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()
--- a/bec_widgets/widgets/bec_status_box/status_item.py
+++ b/bec_widgets/widgets/bec_status_box/status_item.py
@@ -2,17 +2,12 @@
 The widget is bound to be used with the BECStatusBox widget."""

 import enum
-import sys
 from datetime import datetime

-import qdarktheme
 from bec_lib.utils.import_utils import lazy_import_from
-from pydantic import Field
 from qtpy.QtCore import Qt, Slot
 from qtpy.QtWidgets import QDialog, QHBoxLayout, QLabel, QStyle, QVBoxLayout, QWidget

-from bec_widgets.utils.bec_connector import ConnectionConfig
-
 # TODO : Put normal imports back when Pydantic gets faster
 BECStatus = lazy_import_from("bec_lib.messages", ("BECStatus",))

@@ -27,39 +22,29 @@ class IconsEnum(enum.Enum):
    NOTCONNECTED = "SP_TitleBarContextHelpButton"


-class StatusWidgetConfig(ConnectionConfig):
-    """Configuration class for the status item widget."""
-
-    service_name: str
-    status: str
-    info: dict
-    metrics: dict | None
-    icon_size: tuple = Field(default=(24, 24), description="The size of the icon in the widget.")
-    font_size: int = Field(16, description="The font size of the text in the widget.")
-
-
 class StatusItem(QWidget):
    """A widget to display the status of a service.

    Args:
        parent: The parent widget.
-        config (dict): The configuration for the service.
+        config (dict): The configuration for the service, must be a BECServiceInfoContainer.
    """

-    def __init__(self, parent=None, config: dict = None):
-        if config is None:
-            config = StatusWidgetConfig(widget_class=self.__class__.__name__)
-        else:
-            if isinstance(config, dict):
-                config = StatusWidgetConfig(**config)
-            self.config = config
+    def __init__(self, parent: QWidget = None, config=None):
        QWidget.__init__(self, parent=parent)
+        if config is None:
+            # needed because we need parent to be the first argument for QT Designer
+            raise ValueError(
+                "Please initialize the StatusItem with a BECServiceInfoContainer for config, received None."
+            )
+        self.config = config
        self.parent = parent
        self.layout = None
-        self.config = config
-        self._popup_label_ref = {}
        self._label = None
        self._icon = None
+        self.icon_size = (24, 24)
+
+        self._popup_label_ref = {}
        self.init_ui()

    def init_ui(self) -> None:
@@ -74,23 +59,21 @@ class StatusItem(QWidget):
        self.update_ui()

    @Slot(dict)
-    def update_config(self, config: dict) -> None:
-        """Update the configuration of the status item widget.
-        This method is invoked from the parent widget.
-        The UI values are later updated based on the new configuration.
+    def update_config(self, config) -> None:
+        """Update the config of the status item widget.

        Args:
-            config (dict): Config updates from parent widget.
+            config (dict): Config updates from parent widget, must be a BECServiceInfoContainer.
        """
-        if config["service_name"] != self.config.service_name:
+        if self.config is None or config.service_name != self.config.service_name:
            return
-        self.config.status = config["status"]
-        self.config.info = config["info"]
-        self.config.metrics = config["metrics"]
+        self.config = config
        self.update_ui()

    def update_ui(self) -> None:
        """Update the UI of the labels, and popup dialog."""
+        if self.config is None:
+            return
        self.set_text()
        self.set_status()
        self._set_popup_text()
@@ -99,8 +82,8 @@ class StatusItem(QWidget):
        """Set the text of the QLabel basae on the config."""
        service = self.config.service_name
        status = self.config.status
-        if "BECClient" in service.split("/"):
-            service = service.split("/")[0] + "/..." + service.split("/")[1][-4:]
+        if len(service.split("/")) > 1 and service.split("/")[0].startswith("BEC"):
+            service = service.split("/", maxsplit=1)[0] + "/..." + service.split("/")[1][-4:]
        if status == "NOTCONNECTED":
            status = "NOT CONNECTED"
        text = f"{service} is {status}"
@@ -110,7 +93,7 @@ class StatusItem(QWidget):
        """Set the status icon for the status item widget."""
        icon_name = IconsEnum[self.config.status].value
        icon = self.style().standardIcon(getattr(QStyle.StandardPixmap, icon_name))
-        self._icon.setPixmap(icon.pixmap(*self.config.icon_size))
+        self._icon.setPixmap(icon.pixmap(*self.icon_size))
        self._icon.setAlignment(Qt.AlignmentFlag.AlignRight)

    def show_popup(self) -> None:
@@ -153,19 +136,3 @@ class StatusItem(QWidget):
    def _cleanup_popup_label(self) -> None:
        """Cleanup the popup label."""
        self._popup_label_ref.clear()
-
-
-def main():
-    """Run the status item widget."""
-    # pylint: disable=import-outside-toplevel
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    qdarktheme.setup_theme("auto")
-    main_window = StatusItem()
-    main_window.show()
-    sys.exit(app.exec())
-
-
-if __name__ == "__main__":
-    main()
--- a/bec_widgets/widgets/buttons/init.py
+++ b/bec_widgets/widgets/buttons/init.py
@@ -1 +0,0 @@
-from .stop_button.stop_button import StopButton
--- a/bec_widgets/widgets/device_inputs/device_line_edit/init.py
+++ b/bec_widgets/widgets/device_inputs/device_line_edit/init.py
--- a/bec_widgets/widgets/color_button/assets/color_button.png
+++ b/bec_widgets/widgets/color_button/assets/color_button.png
--- a/bec_widgets/widgets/color_button/color_button.py
+++ b/bec_widgets/widgets/color_button/color_button.py
@@ -0,0 +1,36 @@
+from __future__ import annotations
+
+from typing import Literal
+
+import pyqtgraph as pg
+
+
+class ColorButton(pg.ColorButton):
+    """
+    A ColorButton that opens a dialog to select a color. Inherits from pyqtgraph.ColorButton.
+    Patches event loop of the ColorDialog, if opened in another QDialog.
+    """
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+    def selectColor(self):
+        self.origColor = self.color()
+        self.colorDialog.setCurrentColor(self.color())
+        self.colorDialog.open()
+        self.colorDialog.exec()
+
+    def get_color(self, format: Literal["RGBA", "HEX"] = "RGBA") -> tuple | str:
+        """
+        Get the color of the button in the specified format.
+
+        Args:
+            format(Literal["RGBA", "HEX"]): The format of the returned color.
+
+        Returns:
+            tuple|str: The color in the specified format.
+        """
+        if format == "RGBA":
+            return self.color().getRgb()
+        if format == "HEX":
+            return self.color().name()
--- a/bec_widgets/widgets/color_button/color_button.pyproject
+++ b/bec_widgets/widgets/color_button/color_button.pyproject
@@ -0,0 +1 @@
+{'files': ['color_button.py']}
--- a/bec_widgets/widgets/color_button/color_button_plugin.py
+++ b/bec_widgets/widgets/color_button/color_button_plugin.py
@@ -0,0 +1,55 @@
+import os
+
+from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtGui import QIcon
+
+from bec_widgets.widgets.color_button.color_button import ColorButton
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='ColorButton' name='color_button'>
+    </widget>
+</ui>
+"""
+
+
+class ColorButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = ColorButton(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return "BEC Buttons"
+
+    def icon(self):
+        current_path = os.path.dirname(__file__)
+        icon_path = os.path.join(current_path, "assets", "color_button.png")
+        return QIcon(icon_path)
+
+    def includeFile(self):
+        return "color_button"
+
+    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 "ColorButton"
+
+    def toolTip(self):
+        return "ColorButton which opens a color dialog."
+
+    def whatsThis(self):
+        return self.toolTip()
--- a/bec_widgets/widgets/color_button/register_color_button.py
+++ b/bec_widgets/widgets/color_button/register_color_button.py
@@ -0,0 +1,15 @@
+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.color_button.color_button_plugin import ColorButtonPlugin
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(ColorButtonPlugin())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()
--- a/bec_widgets/widgets/color_map_selector/init.py
+++ b/bec_widgets/widgets/color_map_selector/init.py
--- a/bec_widgets/widgets/color_map_selector/assets/color_map_selector_icon.png
+++ b/bec_widgets/widgets/color_map_selector/assets/color_map_selector_icon.png
--- a/bec_widgets/widgets/color_map_selector/color_map_selector.py
+++ b/bec_widgets/widgets/color_map_selector/color_map_selector.py
@@ -0,0 +1,111 @@
+import pyqtgraph as pg
+from qtpy.QtCore import Property, Signal, Slot
+from qtpy.QtGui import QColor, QFontMetrics, QImage
+from qtpy.QtWidgets import QApplication, QComboBox, QStyledItemDelegate, QVBoxLayout, QWidget
+
+
+class ColormapDelegate(QStyledItemDelegate):
+    def __init__(self, parent=None):
+        super(ColormapDelegate, self).__init__(parent)
+        self.image_width = 25
+        self.image_height = 10
+        self.gap = 10
+
+    def paint(self, painter, option, index):
+        text = index.data()
+        colormap = pg.colormap.get(text)
+        colors = colormap.getLookupTable(start=0.0, stop=1.0, alpha=False)
+
+        font_metrics = QFontMetrics(painter.font())
+        text_width = font_metrics.width(text)
+        text_height = font_metrics.height()
+
+        total_height = max(text_height, self.image_height)
+
+        image = QImage(self.image_width, self.image_height, QImage.Format_RGB32)
+        for i in range(self.image_width):
+            color = QColor(*colors[int(i * (len(colors) - 1) / (self.image_width - 1))])
+            for j in range(self.image_height):
+                image.setPixel(i, j, color.rgb())
+
+        painter.drawImage(
+            option.rect.x(), option.rect.y() + (total_height - self.image_height) // 2, image
+        )
+        painter.drawText(
+            option.rect.x() + self.image_width + self.gap,
+            option.rect.y() + (total_height - text_height) // 2 + font_metrics.ascent(),
+            text,
+        )
+
+
+class ColormapSelector(QWidget):
+    """
+    Simple colormap combobox widget. By  default it loads all the available colormaps in pyqtgraph.
+    """
+
+    colormap_changed_signal = Signal(str)
+
+    def __init__(self, parent=None, default_colormaps=None):
+        super().__init__(parent)
+        self._colormaps = []
+        self.initUI(default_colormaps)
+
+    def initUI(self, default_colormaps=None):
+        self.layout = QVBoxLayout(self)
+        self.combo = QComboBox()
+        self.combo.setItemDelegate(ColormapDelegate())
+        self.combo.currentTextChanged.connect(self.colormap_changed)
+        self.available_colormaps = pg.colormap.listMaps()
+        if default_colormaps is None:
+            default_colormaps = self.available_colormaps
+        self.add_color_maps(default_colormaps)
+        self.layout.addWidget(self.combo)
+
+    @Slot()
+    def colormap_changed(self):
+        """
+        Emit the colormap changed signal with the current colormap selected in the combobox.
+        """
+        self.colormap_changed_signal.emit(self.combo.currentText())
+
+    def add_color_maps(self, colormaps=None):
+        """
+        Add colormaps to the combobox.
+
+        Args:
+            colormaps(list): List of colormaps to add to the combobox. If None, all available colormaps are added.
+        """
+        self.combo.clear()
+        if colormaps is not None:
+            for name in colormaps:
+                if name in self.available_colormaps:
+                    self.combo.addItem(name)
+        else:
+            for name in self.available_colormaps:
+                self.combo.addItem(name)
+        self._colormaps = colormaps if colormaps is not None else self.available_colormaps
+
+    @Property("QStringList")
+    def colormaps(self):
+        """
+        Property to get and set the colormaps in the combobox.
+        """
+        return self._colormaps
+
+    @colormaps.setter
+    def colormaps(self, value):
+        """
+        Set the colormaps in the combobox.
+        """
+        if self._colormaps != value:
+            self._colormaps = value
+            self.add_color_maps(value)
+
+
+if __name__ == "__main__":  # pragma: no cover
+    import sys
+
+    app = QApplication(sys.argv)
+    ex = ColormapSelector()
+    ex.show()
+    sys.exit(app.exec_())
--- a/bec_widgets/widgets/color_map_selector/color_map_selector.pyproject
+++ b/bec_widgets/widgets/color_map_selector/color_map_selector.pyproject
@@ -0,0 +1 @@
+{'files': ['color_map_selector.py']}
--- a/bec_widgets/widgets/color_map_selector/color_map_selector_plugin.py
+++ b/bec_widgets/widgets/color_map_selector/color_map_selector_plugin.py
@@ -0,0 +1,57 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
+
+from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtGui import QIcon
+
+from bec_widgets.widgets.color_map_selector.color_map_selector import ColormapSelector
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='ColormapSelector' name='color_map_selector'>
+    </widget>
+</ui>
+"""
+
+
+class ColormapSelectorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = ColormapSelector(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return "BEC Buttons"
+
+    def icon(self):
+        current_path = os.path.dirname(__file__)
+        icon_path = os.path.join(current_path, "assets", "color_map_selector_icon.png")
+        return QIcon(icon_path)
+
+    def includeFile(self):
+        return "color_map_selector"
+
+    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 "ColormapSelector"
+
+    def toolTip(self):
+        return "A custom QComboBox widget for selecting colormaps."
+
+    def whatsThis(self):
+        return self.toolTip()
--- a/bec_widgets/widgets/color_map_selector/register_color_map_selector.py
+++ b/bec_widgets/widgets/color_map_selector/register_color_map_selector.py
@@ -0,0 +1,17 @@
+def main():  # pragma: no cover
+    from qtpy import PYSIDE6
+
+    if not PYSIDE6:
+        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
+        return
+    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
+
+    from bec_widgets.widgets.color_map_selector.color_map_selector_plugin import (
+        ColormapSelectorPlugin,
+    )
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(ColormapSelectorPlugin())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()
--- a/bec_widgets/widgets/console/console.py
+++ b/bec_widgets/widgets/console/console.py
@@ -222,7 +222,7 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
    Start ``Backend`` process and render Pyte output as text.
    """

-    def __init__(self, parent, numColumns, numLines, **kwargs):
+    def __init__(self, parent, numColumns=125, numLines=50, **kwargs):
        super().__init__(parent)

        # file descriptor to communicate with the subprocess
--- a/bec_widgets/widgets/motor_control/motor_table/init.py
+++ b/bec_widgets/widgets/motor_control/motor_table/init.py
--- a/bec_widgets/widgets/device_box/device_box.py
+++ b/bec_widgets/widgets/device_box/device_box.py
@@ -0,0 +1,197 @@
+import os
+import uuid
+
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.messages import ScanQueueMessage
+from qtpy.QtCore import Property, Signal, Slot
+from qtpy.QtGui import QDoubleValidator
+from qtpy.QtWidgets import QDoubleSpinBox, QVBoxLayout, QWidget
+
+from bec_widgets.utils import UILoader
+from bec_widgets.utils.bec_connector import BECConnector
+from bec_widgets.utils.colors import apply_theme
+
+
+class DeviceBox(BECConnector, QWidget):
+    device_changed = Signal(str, str)
+
+    def __init__(self, parent=None, device=None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        QWidget.__init__(self, parent=parent)
+        self.get_bec_shortcuts()
+        self._device = ""
+        self._limits = None
+
+        self.init_ui()
+
+        if device is not None:
+            self.device = device
+            self.init_device()
+
+    def init_ui(self):
+        self.device_changed.connect(self.on_device_change)
+
+        current_path = os.path.dirname(__file__)
+        self.ui = UILoader(self).loader(os.path.join(current_path, "device_box.ui"))
+
+        self.layout = QVBoxLayout(self)
+        self.layout.addWidget(self.ui)
+        self.layout.setSpacing(0)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+
+        # fix the size of the device box
+        db = self.ui.device_box
+        db.setFixedHeight(234)
+        db.setFixedWidth(224)
+
+        self.ui.step_size.setStepType(QDoubleSpinBox.AdaptiveDecimalStepType)
+        self.ui.stop.clicked.connect(self.on_stop)
+        self.ui.tweak_right.clicked.connect(self.on_tweak_right)
+        self.ui.tweak_right.setToolTip("Tweak right")
+        self.ui.tweak_left.clicked.connect(self.on_tweak_left)
+        self.ui.tweak_left.setToolTip("Tweak left")
+        self.ui.setpoint.returnPressed.connect(self.on_setpoint_change)
+
+        self.setpoint_validator = QDoubleValidator()
+        self.ui.setpoint.setValidator(self.setpoint_validator)
+        self.ui.spinner_widget.start()
+
+    def init_device(self):
+        if self.device in self.dev:
+            data = self.dev[self.device].read()
+            self.on_device_readback({"signals": data}, {})
+
+    @Property(str)
+    def device(self):
+        return self._device
+
+    @device.setter
+    def device(self, value):
+        if not value or not isinstance(value, str):
+            return
+        old_device = self._device
+        self._device = value
+        self.device_changed.emit(old_device, value)
+
+    @Slot(str, str)
+    def on_device_change(self, old_device: str, new_device: str):
+        if new_device not in self.dev:
+            print(f"Device {new_device} not found in the device list")
+            return
+        print(f"Device changed from {old_device} to {new_device}")
+        self.init_device()
+        self.bec_dispatcher.disconnect_slot(
+            self.on_device_readback, MessageEndpoints.device_readback(old_device)
+        )
+        self.bec_dispatcher.connect_slot(
+            self.on_device_readback, MessageEndpoints.device_readback(new_device)
+        )
+        self.ui.device_box.setTitle(new_device)
+        self.ui.readback.setToolTip(f"{self.device} readback")
+        self.ui.setpoint.setToolTip(f"{self.device} setpoint")
+        self.ui.step_size.setToolTip(f"Step size for {new_device}")
+
+        precision = self.dev[new_device].precision
+        if precision is not None:
+            self.ui.step_size.setDecimals(precision)
+            self.ui.step_size.setValue(10**-precision * 10)
+
+    @Slot(dict, dict)
+    def on_device_readback(self, msg_content: dict, metadata: dict):
+        signals = msg_content.get("signals", {})
+        # pylint: disable=protected-access
+        hinted_signals = self.dev[self.device]._hints
+        precision = self.dev[self.device].precision
+
+        readback_val = None
+        setpoint_val = None
+
+        if len(hinted_signals) == 1:
+            signal = hinted_signals[0]
+            readback_val = signals.get(signal, {}).get("value")
+
+        if f"{self.device}_setpoint" in signals:
+            setpoint_val = signals.get(f"{self.device}_setpoint", {}).get("value")
+
+        if f"{self.device}_motor_is_moving" in signals:
+            is_moving = signals.get(f"{self.device}_motor_is_moving", {}).get("value")
+            if is_moving:
+                self.ui.spinner_widget.start()
+                self.ui.spinner_widget.setToolTip("Device is moving")
+            else:
+                self.ui.spinner_widget.stop()
+                self.ui.spinner_widget.setToolTip("Device is idle")
+
+        if readback_val is not None:
+            self.ui.readback.setText(f"{readback_val:.{precision}f}")
+
+        if setpoint_val is not None:
+            self.ui.setpoint.setText(f"{setpoint_val:.{precision}f}")
+
+        limits = self.dev[self.device].limits
+        self.update_limits(limits)
+        if limits is not None and readback_val is not None and limits[0] != limits[1]:
+            pos = (readback_val - limits[0]) / (limits[1] - limits[0])
+            self.ui.position_indicator.on_position_update(pos)
+
+    def update_limits(self, limits):
+        if limits == self._limits:
+            return
+        self._limits = limits
+        if limits is not None and limits[0] != limits[1]:
+            self.ui.position_indicator.setToolTip(f"Min: {limits[0]}, Max: {limits[1]}")
+            self.setpoint_validator.setRange(limits[0], limits[1])
+        else:
+            self.ui.position_indicator.setToolTip("No limits set")
+            self.setpoint_validator.setRange(float("-inf"), float("inf"))
+
+    @Slot()
+    def on_stop(self):
+        request_id = str(uuid.uuid4())
+        params = {
+            "device": self.device,
+            "rpc_id": request_id,
+            "func": "stop",
+            "args": [],
+            "kwargs": {},
+        }
+        msg = ScanQueueMessage(
+            scan_type="device_rpc",
+            parameter=params,
+            queue="emergency",
+            metadata={"RID": request_id, "response": False},
+        )
+        self.client.connector.send(MessageEndpoints.scan_queue_request(), msg)
+
+    @property
+    def step_size(self):
+        return self.ui.step_size.value()
+
+    @Slot()
+    def on_tweak_right(self):
+        self.dev[self.device].move(self.step_size, relative=True)
+
+    @Slot()
+    def on_tweak_left(self):
+        self.dev[self.device].move(-self.step_size, relative=True)
+
+    @Slot()
+    def on_setpoint_change(self):
+        self.ui.setpoint.clearFocus()
+        setpoint = self.ui.setpoint.text()
+        self.dev[self.device].move(float(setpoint), relative=False)
+        self.ui.tweak_left.setToolTip(f"Tweak left by {self.step_size}")
+        self.ui.tweak_right.setToolTip(f"Tweak right by {self.step_size}")
+
+
+if __name__ == "__main__":  # pragma: no cover
+    import sys
+
+    from qtpy.QtWidgets import QApplication
+
+    app = QApplication(sys.argv)
+    apply_theme("light")
+    widget = DeviceBox(device="samx")
+
+    widget.show()
+    sys.exit(app.exec_())
--- a/bec_widgets/widgets/device_box/device_box.pyproject
+++ b/bec_widgets/widgets/device_box/device_box.pyproject
@@ -0,0 +1 @@
+{'files': ['device_box.py']}
--- a/bec_widgets/widgets/device_box/device_box.ui
+++ b/bec_widgets/widgets/device_box/device_box.ui
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>251</width>
+    <height>289</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>192</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>16777215</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="device_box">
+     <property name="title">
+      <string>Device Name</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0">
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <item row="3" column="1">
+       <widget class="QDoubleSpinBox" name="step_size"/>
+      </item>
+      <item row="3" column="2">
+       <widget class="QToolButton" name="tweak_right">
+        <property name="minimumSize">
+         <size>
+          <width>50</width>
+          <height>50</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>50</width>
+          <height>50</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>30</width>
+          <height>30</height>
+         </size>
+        </property>
+        <property name="arrowType">
+         <enum>Qt::ArrowType::RightArrow</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="3">
+       <widget class="QLineEdit" name="setpoint"/>
+      </item>
+      <item row="3" column="0">
+       <widget class="QToolButton" name="tweak_left">
+        <property name="minimumSize">
+         <size>
+          <width>50</width>
+          <height>50</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>50</width>
+          <height>50</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>30</width>
+          <height>30</height>
+         </size>
+        </property>
+        <property name="arrowType">
+         <enum>Qt::ArrowType::LeftArrow</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" colspan="3">
+       <widget class="QPushButton" name="stop">
+        <property name="text">
+         <string>Stop</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="3">
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Orientation::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Policy::Expanding</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="SpinnerWidget" name="spinner_widget">
+            <property name="minimumSize">
+             <size>
+              <width>25</width>
+              <height>25</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>25</width>
+              <height>25</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="PositionIndicator" name="position_indicator"/>
+        </item>
+        <item>
+         <widget class="QLabel" name="readback">
+          <property name="text">
+           <string>Position</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignmentFlag::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SpinnerWidget</class>
+   <extends>QWidget</extends>
+   <header>spinner_widget</header>
+  </customwidget>
+  <customwidget>
+   <class>PositionIndicator</class>
+   <extends>QWidget</extends>
+   <header>position_indicator</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
--- a/bec_widgets/widgets/device_box/device_box_plugin.py
+++ b/bec_widgets/widgets/device_box/device_box_plugin.py
@@ -0,0 +1,54 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtGui import QIcon
+
+from bec_widgets.widgets.device_box.device_box import DeviceBox
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='DeviceBox' name='device_box'>
+    </widget>
+</ui>
+"""
+
+
+class DeviceBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = DeviceBox(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return "Device Control"
+
+    def icon(self):
+        return QIcon()
+
+    def includeFile(self):
+        return "device_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 "DeviceBox"
+
+    def toolTip(self):
+        return "A widget for controlling a single positioner. "
+
+    def whatsThis(self):
+        return self.toolTip()
--- a/bec_widgets/widgets/device_box/register_device_box.py
+++ b/bec_widgets/widgets/device_box/register_device_box.py
@@ -0,0 +1,15 @@
+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.device_box.device_box_plugin import DeviceBoxPlugin
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceBoxPlugin())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()
--- a/bec_widgets/widgets/motor_control/movement_absolute/init.py
+++ b/bec_widgets/widgets/motor_control/movement_absolute/init.py
--- a/bec_widgets/widgets/device_combobox/assets/device_combobox_icon.png
+++ b/bec_widgets/widgets/device_combobox/assets/device_combobox_icon.png
--- a/bec_widgets/widgets/device_inputs/device_combobox/device_combobox.py
+++ b/bec_widgets/widgets/device_inputs/device_combobox/device_combobox.py
@@ -2,10 +2,10 @@ from typing import TYPE_CHECKING

 from qtpy.QtWidgets import QComboBox

-from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputBase, DeviceInputConfig
+from bec_widgets.widgets.base_classes.device_input_base import DeviceInputBase, DeviceInputConfig

 if TYPE_CHECKING:
-    from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputConfig
+    from bec_widgets.widgets.base_classes.device_input_base import DeviceInputConfig


 class DeviceComboBox(DeviceInputBase, QComboBox):
@@ -89,4 +89,4 @@ class DeviceComboBox(DeviceInputBase, QComboBox):

    def closeEvent(self, event):
        super().cleanup()
-        QComboBox().closeEvent(event)
+        return QComboBox.closeEvent(self, event)
--- a/bec_widgets/widgets/device_combobox/device_combobox.pyproject
+++ b/bec_widgets/widgets/device_combobox/device_combobox.pyproject
@@ -0,0 +1,3 @@
+{
+    "files": ["device_combobox.py"]
+}
--- a/bec_widgets/widgets/device_inputs/device_combobox/device_combobox_plugin.py
+++ b/bec_widgets/widgets/device_inputs/device_combobox/device_combobox_plugin.py
@@ -1,10 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os

 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon

-from bec_widgets.widgets.device_inputs import DeviceComboBox
+from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox

 DOM_XML = """
 <ui language='c++'>
@@ -27,10 +28,12 @@ class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
        return DOM_XML

    def group(self):
-        return ""
+        return "BEC Device Inputs"

    def icon(self):
-        return QIcon()
+        current_path = os.path.dirname(__file__)
+        icon_path = os.path.join(current_path, "assets", "device_combobox_icon.png")
+        return QIcon(icon_path)

    def includeFile(self):
        return "device_combobox"
--- a/bec_widgets/widgets/device_inputs/device_combobox/register_device_combobox.py
+++ b/bec_widgets/widgets/device_inputs/device_combobox/register_device_combobox.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.device_inputs.device_combobox.device_combobox_plugin import (
-        DeviceComboBoxPlugin,
-    )
+    from bec_widgets.widgets.device_combobox.device_combobox_plugin import DeviceComboBoxPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceComboBoxPlugin())

--- a/bec_widgets/widgets/device_inputs/init.py
+++ b/bec_widgets/widgets/device_inputs/init.py
@@ -1,2 +0,0 @@
-from .device_combobox.device_combobox import DeviceComboBox
-from .device_line_edit.device_line_edit import DeviceLineEdit
--- a/bec_widgets/widgets/device_inputs/device_combobox/device_combobox.pyproject
+++ b/bec_widgets/widgets/device_inputs/device_combobox/device_combobox.pyproject
@@ -1,4 +0,0 @@
-{
-    "files": ["device_combobox.py", "launch_device_combobox.py",
-    ]
-}
--- a/bec_widgets/widgets/device_inputs/device_combobox/launch_device_combobox.py
+++ b/bec_widgets/widgets/device_inputs/device_combobox/launch_device_combobox.py
@@ -1,11 +0,0 @@
-from bec_widgets.widgets.device_inputs import DeviceComboBox
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    w = DeviceComboBox()
-    w.show()
-    sys.exit(app.exec_())
--- a/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.pyproject
+++ b/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.pyproject
@@ -1,4 +0,0 @@
-{
-    "files": ["device_line_edit.py", "launch_device_line_edit.py",
-    ]
-}
--- a/bec_widgets/widgets/device_inputs/device_line_edit/launch_device_line_edit.py
+++ b/bec_widgets/widgets/device_inputs/device_line_edit/launch_device_line_edit.py
@@ -1,11 +0,0 @@
-from bec_widgets.widgets.device_inputs import DeviceLineEdit
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    w = DeviceLineEdit()
-    w.show()
-    sys.exit(app.exec_())
--- a/bec_widgets/widgets/motor_control/movement_relative/init.py
+++ b/bec_widgets/widgets/motor_control/movement_relative/init.py
--- a/bec_widgets/widgets/device_line_edit/assets/line_edit_icon.png
+++ b/bec_widgets/widgets/device_line_edit/assets/line_edit_icon.png
--- a/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.py
+++ b/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.py
@@ -3,10 +3,10 @@ from typing import TYPE_CHECKING
 from qtpy.QtCore import QSize
 from qtpy.QtWidgets import QCompleter, QLineEdit, QSizePolicy

-from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputBase, DeviceInputConfig
+from bec_widgets.widgets.base_classes.device_input_base import DeviceInputBase, DeviceInputConfig

 if TYPE_CHECKING:
-    from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputConfig
+    from bec_widgets.widgets.base_classes.device_input_base import DeviceInputConfig


 class DeviceLineEdit(DeviceInputBase, QLineEdit):
@@ -101,4 +101,4 @@ class DeviceLineEdit(DeviceInputBase, QLineEdit):

    def closeEvent(self, event):
        super().cleanup()
-        QLineEdit().closeEvent(event)
+        return QLineEdit.closeEvent(self, event)
--- a/bec_widgets/widgets/device_line_edit/device_line_edit.pyproject
+++ b/bec_widgets/widgets/device_line_edit/device_line_edit.pyproject
@@ -0,0 +1,3 @@
+{
+    "files": ["device_line_edit.py"]
+}
--- a/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit_plugin.py
+++ b/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit_plugin.py
@@ -1,10 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os

 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon

-from bec_widgets.widgets.device_inputs import DeviceLineEdit
+from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit

 DOM_XML = """
 <ui language='c++'>
@@ -27,10 +28,12 @@ class DeviceLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
        return DOM_XML

    def group(self):
-        return ""
+        return "BEC Device Inputs"

    def icon(self):
-        return QIcon()
+        current_path = os.path.dirname(__file__)
+        icon_path = os.path.join(current_path, "assets", "line_edit_icon.png")
+        return QIcon(icon_path)

    def includeFile(self):
        return "device_line_edit"
--- a/bec_widgets/widgets/device_inputs/device_line_edit/register_device_line_edit.py
+++ b/bec_widgets/widgets/device_inputs/device_line_edit/register_device_line_edit.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.device_inputs.device_line_edit.device_line_edit_plugin import (
-        DeviceLineEditPlugin,
-    )
+    from bec_widgets.widgets.device_line_edit.device_line_edit_plugin import DeviceLineEditPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceLineEditPlugin())

--- a/bec_widgets/widgets/figure/figure.py
+++ b/bec_widgets/widgets/figure/figure.py
@@ -7,13 +7,13 @@ from typing import Literal, Optional

 import numpy as np
 import pyqtgraph as pg
-import qdarktheme
 from pydantic import Field, ValidationError, field_validator
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtWidgets import QWidget
 from typeguard import typechecked

 from bec_widgets.utils import BECConnector, ConnectionConfig, WidgetContainerUtils
+from bec_widgets.utils.colors import apply_theme
 from bec_widgets.widgets.figure.plots.image.image import BECImageShow, ImageConfig
 from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap, MotorMapConfig
 from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
@@ -227,106 +227,12 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
        """
        self._widgets = value

-    def _init_waveform(
-        self,
-        waveform,
-        x_name: str = None,
-        y_name: str = None,
-        z_name: str = None,
-        x_entry: str = None,
-        y_entry: str = None,
-        z_entry: str = None,
-        x: list | np.ndarray = None,
-        y: list | np.ndarray = None,
-        color: str | None = None,
-        color_map_z: str | None = "plasma",
-        label: str | None = None,
-        validate: bool = True,
-        dap: str | None = None,
-    ) -> BECWaveform:
-        """
-        Configure the waveform based on the provided parameters.
-
-        Args:
-            waveform (BECWaveform): The waveform to configure.
-            x (list | np.ndarray): Custom x data to plot.
-            y (list | np.ndarray): Custom y data to plot.
-            x_name (str): The name of the device for the x-axis.
-            y_name (str): The name of the device for the y-axis.
-            z_name (str): The name of the device for the z-axis.
-            x_entry (str): The name of the entry for the x-axis.
-            y_entry (str): The name of the entry for the y-axis.
-            z_entry (str): The name of the entry for the z-axis.
-            color (str): The color of the curve.
-            color_map_z (str): The color map to use for the z-axis.
-            label (str): The label of the curve.
-            validate (bool): If True, validate the device names and entries.
-            dap (str): The DAP model to use for the curve.
-        """
-        if x is not None and y is None:
-            if isinstance(x, np.ndarray):
-                if x.ndim == 1:
-                    y = np.arange(x.size)
-                    waveform.add_curve_custom(x=np.arange(x.size), y=x, color=color, label=label)
-                    return waveform
-                if x.ndim == 2:
-                    waveform.add_curve_custom(x=x[:, 0], y=x[:, 1], color=color, label=label)
-                    return waveform
-            elif isinstance(x, list):
-                y = np.arange(len(x))
-                waveform.add_curve_custom(x=np.arange(len(x)), y=x, color=color, label=label)
-                return waveform
-            else:
-                raise ValueError(
-                    "Invalid input. Provide either device names (x_name, y_name) or custom data."
-                )
-        if x is not None and y is not None:
-            waveform.add_curve_custom(x=x, y=y, color=color, label=label)
-            return waveform
-        # User wants to add scan curve -> 1D Waveform
-        if x_name is not None and y_name is not None and z_name is None and x is None and y is None:
-            waveform.plot(
-                x_name=x_name,
-                y_name=y_name,
-                x_entry=x_entry,
-                y_entry=y_entry,
-                validate=validate,
-                color=color,
-                label=label,
-                dap=dap,
-            )
-        # User wants to add scan curve -> 2D Waveform Scatter
-        if (
-            x_name is not None
-            and y_name is not None
-            and z_name is not None
-            and x is None
-            and y is None
-        ):
-            waveform.plot(
-                x_name=x_name,
-                y_name=y_name,
-                z_name=z_name,
-                x_entry=x_entry,
-                y_entry=y_entry,
-                z_entry=z_entry,
-                color=color,
-                color_map_z=color_map_z,
-                label=label,
-                validate=validate,
-                dap=dap,
-            )
-        # User wants to add custom curve
-        elif x is not None and y is not None and x_name is None and y_name is None:
-            waveform.add_curve_custom(x=x, y=y, color=color, label=label)
-
-        return waveform
-
    @typechecked
    def plot(
        self,
-        x: list | np.ndarray | None = None,
+        arg1: list | np.ndarray | str | None = None,
        y: list | np.ndarray | None = None,
+        x: list | np.ndarray | None = None,
        x_name: str | None = None,
        y_name: str | None = None,
        z_name: str | None = None,
@@ -348,8 +254,9 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
        Add a 1D waveform plot to the figure. Always access the first waveform widget in the figure.

        Args:
-            x(list | np.ndarray): Custom x data to plot.
+            arg1(list | np.ndarray | str | None): First argument which can be x data, y data, or y_name.
            y(list | np.ndarray): Custom y data to plot.
+            x(list | np.ndarray): Custom x data to plot.
            x_name(str): The name of the device for the x-axis.
            y_name(str): The name of the device for the y-axis.
            z_name(str): The name of the device for the z-axis.
@@ -376,23 +283,23 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
        if config is not None:
            return waveform

-        # Passing args to init_waveform
-        waveform = self._init_waveform(
-            waveform=waveform,
-            x=x,
-            y=y,
-            x_name=x_name,
-            y_name=y_name,
-            z_name=z_name,
-            x_entry=x_entry,
-            y_entry=y_entry,
-            z_entry=z_entry,
-            color=color,
-            color_map_z=color_map_z,
-            label=label,
-            validate=validate,
-            dap=dap,
-        )
+        if arg1 is not None or y_name is not None or (y is not None and x is not None):
+            waveform.plot(
+                arg1=arg1,
+                y=y,
+                x=x,
+                x_name=x_name,
+                y_name=y_name,
+                z_name=z_name,
+                x_entry=x_entry,
+                y_entry=y_entry,
+                z_entry=z_entry,
+                color=color,
+                color_map_z=color_map_z,
+                label=label,
+                validate=validate,
+                dap=dap,
+            )
        return waveform

    def _init_image(
@@ -670,9 +577,8 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
        Args:
            theme(Literal["dark","light"]): The theme to set for the figure widget.
        """
-        qdarktheme.setup_theme(theme)
-        self.setBackground("k" if theme == "dark" else "w")
        self.config.theme = theme
+        apply_theme(theme)
        for plot in self.widget_list:
            plot.set_x_label(plot.plot_item.getAxis("bottom").label.toPlainText())
            plot.set_y_label(plot.plot_item.getAxis("left").label.toPlainText())
@@ -830,6 +736,6 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
            widget_class=self.__class__.__name__, gui_id=self.gui_id, theme=theme
        )

-    def cleanup(self):
-        self.clear_all()
-        super().cleanup()
+    # def cleanup(self):
+    #     self.clear_all()
+    #     super().cleanup()
--- a/bec_widgets/widgets/figure/plots/axis_settings.py
+++ b/bec_widgets/widgets/figure/plots/axis_settings.py
@@ -0,0 +1,61 @@
+import os
+
+from qtpy.QtCore import Slot
+from qtpy.QtWidgets import QVBoxLayout, QWidget
+
+from bec_widgets.utils import UILoader
+from bec_widgets.utils.colors import apply_theme
+from bec_widgets.utils.widget_io import WidgetIO
+
+
+class AxisSettings(QWidget):
+    def __init__(self, parent=None, *args, **kwargs):
+        super().__init__(parent=parent, *args, **kwargs)
+
+        current_path = os.path.dirname(__file__)
+        self.ui = UILoader().load_ui(os.path.join(current_path, "axis_settings.ui"), self)
+
+        self.layout = QVBoxLayout(self)
+        self.layout.addWidget(self.ui)
+
+        # Hardcoded values for best appearance
+        self.setMinimumHeight(280)
+        self.setMaximumHeight(280)
+        self.resize(380, 280)
+
+    @Slot(dict)
+    def display_current_settings(self, axis_config: dict):
+        # Top Box
+        WidgetIO.set_value(self.ui.plot_title, axis_config["title"])
+
+        # X Axis Box
+        WidgetIO.set_value(self.ui.x_label, axis_config["x_label"])
+        WidgetIO.set_value(self.ui.x_scale, axis_config["x_scale"])
+        WidgetIO.set_value(self.ui.x_grid, axis_config["x_grid"])
+        if axis_config["x_lim"] is not None:
+            WidgetIO.check_and_adjust_limits(self.ui.x_min, axis_config["x_lim"][0])
+            WidgetIO.check_and_adjust_limits(self.ui.x_max, axis_config["x_lim"][1])
+            WidgetIO.set_value(self.ui.x_min, axis_config["x_lim"][0])
+            WidgetIO.set_value(self.ui.x_max, axis_config["x_lim"][1])
+
+        # Y Axis Box
+        WidgetIO.set_value(self.ui.y_label, axis_config["y_label"])
+        WidgetIO.set_value(self.ui.y_scale, axis_config["y_scale"])
+        WidgetIO.set_value(self.ui.y_grid, axis_config["y_grid"])
+        if axis_config["y_lim"] is not None:
+            WidgetIO.check_and_adjust_limits(self.ui.y_min, axis_config["y_lim"][0])
+            WidgetIO.check_and_adjust_limits(self.ui.y_max, axis_config["y_lim"][1])
+            WidgetIO.set_value(self.ui.y_min, axis_config["y_lim"][0])
+            WidgetIO.set_value(self.ui.y_max, axis_config["y_lim"][1])
+
+
+if __name__ == "__main__":
+    import sys
+
+    from qtpy.QtWidgets import QApplication
+
+    app = QApplication(sys.argv)
+    apply_theme("dark")
+    window = AxisSettings()
+    window.show()
+    sys.exit(app.exec_())
--- a/bec_widgets/widgets/figure/plots/axis_settings.ui
+++ b/bec_widgets/widgets/figure/plots/axis_settings.ui
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+    <class>Form</class>
+    <widget class="QWidget" name="Form">
+        <property name="geometry">
+            <rect>
+                <x>0</x>
+                <y>0</y>
+                <width>417</width>
+                <height>250</height>
+            </rect>
+        </property>
+        <property name="minimumSize">
+            <size>
+                <width>0</width>
+                <height>250</height>
+            </size>
+        </property>
+        <property name="maximumSize">
+            <size>
+                <width>16777215</width>
+                <height>278</height>
+            </size>
+        </property>
+        <property name="windowTitle">
+            <string>Form</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout">
+            <item row="0" column="0" colspan="3">
+                <layout class="QHBoxLayout" name="horizontalLayout">
+                    <item>
+                        <widget class="QLabel" name="plot_title_label">
+                            <property name="text">
+                                <string>Plot Title</string>
+                            </property>
+                        </widget>
+                    </item>
+                    <item>
+                        <widget class="QLineEdit" name="plot_title"/>
+                    </item>
+                </layout>
+            </item>
+            <item row="1" column="0" colspan="3">
+                <widget class="Line" name="line_H">
+                    <property name="orientation">
+                        <enum>Qt::Orientation::Horizontal</enum>
+                    </property>
+                </widget>
+            </item>
+            <item row="2" column="0">
+                <widget class="QGroupBox" name="x_axis_box">
+                    <property name="title">
+                        <string>X Axis</string>
+                    </property>
+                    <layout class="QGridLayout" name="gridLayout_4">
+                        <item row="3" column="0">
+                            <widget class="QLabel" name="x_scale_label">
+                                <property name="text">
+                                    <string>Scale</string>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="1" column="2">
+                            <widget class="QDoubleSpinBox" name="x_min">
+                                <property name="alignment">
+                                    <set>Qt::AlignmentFlag::AlignCenter</set>
+                                </property>
+                                <property name="minimum">
+                                    <double>-9999.000000000000000</double>
+                                </property>
+                                <property name="maximum">
+                                    <double>9999.000000000000000</double>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="1" column="0" colspan="2">
+                            <widget class="QLabel" name="x_min_label">
+                                <property name="text">
+                                    <string>Min</string>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="2" column="2">
+                            <widget class="QDoubleSpinBox" name="x_max">
+                                <property name="alignment">
+                                    <set>Qt::AlignmentFlag::AlignCenter</set>
+                                </property>
+                                <property name="minimum">
+                                    <double>-9999.000000000000000</double>
+                                </property>
+                                <property name="maximum">
+                                    <double>9999.000000000000000</double>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="3" column="2">
+                            <widget class="QComboBox" name="x_scale">
+                                <item>
+                                    <property name="text">
+                                        <string>linear</string>
+                                    </property>
+                                </item>
+                                <item>
+                                    <property name="text">
+                                        <string>log</string>
+                                    </property>
+                                </item>
+                            </widget>
+                        </item>
+                        <item row="2" column="0">
+                            <widget class="QLabel" name="x_max_label">
+                                <property name="text">
+                                    <string>Max</string>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="0" column="2">
+                            <widget class="QLineEdit" name="x_label"/>
+                        </item>
+                        <item row="0" column="0">
+                            <widget class="QLabel" name="x_label_label">
+                                <property name="text">
+                                    <string>Label</string>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="4" column="2">
+                            <widget class="QCheckBox" name="x_grid">
+                                <property name="text">
+                                    <string/>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="4" column="0">
+                            <widget class="QLabel" name="x_grid_label">
+                                <property name="text">
+                                    <string>Grid</string>
+                                </property>
+                            </widget>
+                        </item>
+                    </layout>
+                </widget>
+            </item>
+            <item row="2" column="1">
+                <widget class="Line" name="line_V">
+                    <property name="orientation">
+                        <enum>Qt::Orientation::Vertical</enum>
+                    </property>
+                </widget>
+            </item>
+            <item row="2" column="2">
+                <widget class="QGroupBox" name="y_axis_box">
+                    <property name="title">
+                        <string>Y Axis</string>
+                    </property>
+                    <layout class="QGridLayout" name="gridLayout_5">
+                        <item row="3" column="2">
+                            <widget class="QComboBox" name="y_scale">
+                                <item>
+                                    <property name="text">
+                                        <string>linear</string>
+                                    </property>
+                                </item>
+                                <item>
+                                    <property name="text">
+                                        <string>log</string>
+                                    </property>
+                                </item>
+                            </widget>
+                        </item>
+                        <item row="2" column="2">
+                            <widget class="QDoubleSpinBox" name="y_max">
+                                <property name="alignment">
+                                    <set>Qt::AlignmentFlag::AlignCenter</set>
+                                </property>
+                                <property name="minimum">
+                                    <double>-9999.000000000000000</double>
+                                </property>
+                                <property name="maximum">
+                                    <double>9999.000000000000000</double>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="1" column="0" colspan="2">
+                            <widget class="QLabel" name="y_min_label">
+                                <property name="text">
+                                    <string>Min</string>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="1" column="2">
+                            <widget class="QDoubleSpinBox" name="y_min">
+                                <property name="alignment">
+                                    <set>Qt::AlignmentFlag::AlignCenter</set>
+                                </property>
+                                <property name="minimum">
+                                    <double>-9999.000000000000000</double>
+                                </property>
+                                <property name="maximum">
+                                    <double>9999.000000000000000</double>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="0" column="2">
+                            <widget class="QLineEdit" name="y_label"/>
+                        </item>
+                        <item row="3" column="0">
+                            <widget class="QLabel" name="y_scale_label">
+                                <property name="text">
+                                    <string>Scale</string>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="0" column="0">
+                            <widget class="QLabel" name="y_label_label">
+                                <property name="text">
+                                    <string>Label</string>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="2" column="0">
+                            <widget class="QLabel" name="y_max_label">
+                                <property name="text">
+                                    <string>Max</string>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="4" column="2">
+                            <widget class="QCheckBox" name="y_grid">
+                                <property name="text">
+                                    <string/>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="4" column="0">
+                            <widget class="QLabel" name="y_grid_label">
+                                <property name="text">
+                                    <string>Grid</string>
+                                </property>
+                            </widget>
+                        </item>
+                    </layout>
+                </widget>
+            </item>
+        </layout>
+    </widget>
+    <resources/>
+    <connections/>
+</ui>
--- a/bec_widgets/widgets/figure/plots/motor_map/motor_map.py
+++ b/bec_widgets/widgets/figure/plots/motor_map/motor_map.py
@@ -10,7 +10,7 @@ from pydantic import Field, ValidationError, field_validator
 from pydantic_core import PydanticCustomError
 from qtpy import QtCore, QtGui
 from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
+from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QWidget

 from bec_widgets.utils import Colors, EntryValidator
@@ -24,7 +24,7 @@ class MotorMapConfig(SubplotConfig):
        (255, 255, 255, 255), description="The color of the last point of current position."
    )
    scatter_size: Optional[int] = Field(5, description="Size of the scatter points.")
-    max_points: Optional[int] = Field(1000, description="Maximum number of points to display.")
+    max_points: Optional[int] = Field(5000, description="Maximum number of points to display.")
    num_dim_points: Optional[int] = Field(
        100,
        description="Number of points to dim before the color remains same for older recorded position.",
@@ -59,6 +59,7 @@ class BECMotorMap(BECPlotBase):
        "set_scatter_size",
        "get_data",
        "remove",
+        "reset_history",
    ]

    # QT Signals
@@ -120,7 +121,7 @@ class BECMotorMap(BECPlotBase):
                motor_y_entry=self.config.signals.y.entry,
            )

-    @pyqtSlot(str, str, str, str, bool)
+    @Slot(str, str, str, str, bool)
    def change_motors(
        self,
        motor_x: str,
@@ -139,6 +140,8 @@ class BECMotorMap(BECPlotBase):
            motor_y_entry(str): Motor entry for the Y axis.
            validate_bec(bool, optional): If True, validate the signal with BEC. Defaults to True.
        """
+        self.plot_item.clear()
+
        motor_x_entry, motor_y_entry = self._validate_signal_entries(
            motor_x, motor_y, motor_x_entry, motor_y_entry, validate_bec
        )
@@ -164,13 +167,22 @@ class BECMotorMap(BECPlotBase):
    def get_data(self) -> dict:
        """
        Get the data of the motor map.
+
        Returns:
            dict: Data of the motor map.
        """
        data = {"x": self.database_buffer["x"], "y": self.database_buffer["y"]}
        return data

-    def set_color(self, color: [str | tuple]):
+    def reset_history(self):
+        """
+        Reset the history of the motor map.
+        """
+        self.database_buffer["x"] = [self.database_buffer["x"][-1]]
+        self.database_buffer["y"] = [self.database_buffer["y"][-1]]
+        self.update_signal.emit()
+
+    def set_color(self, color: str | tuple):
        """
        Set color of the motor trace.

@@ -259,11 +271,12 @@ class BECMotorMap(BECPlotBase):
    def _swap_limit_map(self):
        """Swap the limit map."""
        self.plot_item.removeItem(self.plot_components["limit_map"])
-        self.plot_components["limit_map"] = self._make_limit_map(
-            self.config.signals.x.limits, self.config.signals.y.limits
-        )
-        self.plot_components["limit_map"].setZValue(-1)
-        self.plot_item.addItem(self.plot_components["limit_map"])
+        if self.config.signals.x.limits is not None and self.config.signals.y.limits is not None:
+            self.plot_components["limit_map"] = self._make_limit_map(
+                self.config.signals.x.limits, self.config.signals.y.limits
+            )
+            self.plot_components["limit_map"].setZValue(-1)
+            self.plot_item.addItem(self.plot_components["limit_map"])

    def _make_motor_map(self):
        """
@@ -272,9 +285,10 @@ class BECMotorMap(BECPlotBase):
        # Create limit map
        motor_x_limit = self.config.signals.x.limits
        motor_y_limit = self.config.signals.y.limits
-        self.plot_components["limit_map"] = self._make_limit_map(motor_x_limit, motor_y_limit)
-        self.plot_item.addItem(self.plot_components["limit_map"])
-        self.plot_components["limit_map"].setZValue(-1)
+        if motor_x_limit is not None or motor_y_limit is not None:
+            self.plot_components["limit_map"] = self._make_limit_map(motor_x_limit, motor_y_limit)
+            self.plot_item.addItem(self.plot_components["limit_map"])
+            self.plot_components["limit_map"].setZValue(-1)

        # Create scatter plot
        scatter_size = self.config.scatter_size
@@ -428,6 +442,7 @@ class BECMotorMap(BECPlotBase):
            print(f"The device '{motor}' does not have defined limits.")
            return None

+    @Slot()
    def _update_plot(self):
        """Update the motor map plot."""
        # If the number of points exceeds max_points, delete the oldest points
@@ -477,7 +492,7 @@ class BECMotorMap(BECPlotBase):
            f"Motor position: ({round(float(current_x),precision)}, {round(float(current_y),precision)})"
        )

-    @pyqtSlot(dict)
+    @Slot(dict)
    def on_device_readback(self, msg: dict) -> None:
        """
        Update the motor map plot with the new motor position.
--- a/bec_widgets/widgets/figure/plots/waveform/waveform.py
+++ b/bec_widgets/widgets/figure/plots/waveform/waveform.py
--- a/bec_widgets/widgets/figure/plots/waveform/waveform_curve.py
+++ b/bec_widgets/widgets/figure/plots/waveform/waveform_curve.py
@@ -2,6 +2,7 @@ from __future__ import annotations

 from typing import TYPE_CHECKING, Any, Literal, Optional

+import numpy as np
 import pyqtgraph as pg
 from pydantic import BaseModel, Field, field_validator
 from pydantic_core import PydanticCustomError
@@ -28,7 +29,7 @@ class Signal(BaseModel):
    """The configuration of a signal in the 1D waveform widget."""

    source: str
-    x: SignalData  # TODO maybe add metadata for config gui later
+    x: Optional[SignalData] = None
    y: SignalData
    z: Optional[SignalData] = None
    dap: Optional[str] = None
@@ -248,9 +249,15 @@ class BECCurve(BECConnector, pg.PlotDataItem):
        Returns:
            tuple[np.ndarray,np.ndarray]: X and Y data of the curve.
        """
-        x_data, y_data = self.getData()
+        try:
+            x_data, y_data = self.getData()
+        except TypeError:
+            x_data, y_data = np.array([]), np.array([])
        return x_data, y_data

+    def clear_data(self):
+        self.setData([], [])
+
    def remove(self):
        """Remove the curve from the plot."""
        # self.parent_item.removeItem(self)
--- a/bec_widgets/widgets/motor_control/motor_control.py
+++ b/bec_widgets/widgets/motor_control/motor_control.py
@@ -1,252 +0,0 @@
-# pylint: disable = no-name-in-module,missing-module-docstring
-from enum import Enum
-
-from bec_lib.alarm_handler import AlarmBase
-from bec_lib.device import Positioner
-from qtpy.QtCore import QThread
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtWidgets import QMessageBox, QWidget
-
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
-
-CONFIG_DEFAULT = {
-    "motor_control": {
-        "motor_x": "samx",
-        "motor_y": "samy",
-        "step_size_x": 3,
-        "step_size_y": 50,
-        "precision": 4,
-        "step_x_y_same": False,
-        "move_with_arrows": False,
-    }
-}
-
-
-class MotorControlWidget(QWidget):
-    """Base class for motor control widgets."""
-
-    def __init__(self, parent=None, client=None, motor_thread=None, config=None):
-        super().__init__(parent)
-        self.client = client
-        self.motor_thread = motor_thread
-        self.config = config
-
-        self.motor_x = None
-        self.motor_y = None
-
-        if not self.client:
-            bec_dispatcher = BECDispatcher()
-            self.client = bec_dispatcher.client
-
-        if not self.motor_thread:
-            self.motor_thread = MotorThread(client=self.client)
-
-        self._load_ui()
-
-        if self.config is None:
-            print(f"No initial config found for {self.__class__.__name__}")
-            self._init_ui()
-        else:
-            self.on_config_update(self.config)
-
-    def _load_ui(self):
-        """Load the UI from the .ui file."""
-
-    def _init_ui(self):
-        """Initialize the UI components specific to the widget."""
-
-    @pyqtSlot(dict)
-    def on_config_update(self, config):
-        """Handle configuration updates."""
-        self.config = config
-        self._init_ui()
-
-
-class MotorControlErrors:
-    """Class for displaying formatted error messages."""
-
-    @staticmethod
-    def display_error_message(error_message: str) -> None:
-        """
-        Display a critical error message.
-        Args:
-            error_message(str): Error message to display.
-        """
-        # Create a QMessageBox
-        msg = QMessageBox()
-        msg.setIcon(QMessageBox.Critical)
-        msg.setWindowTitle("Critical Error")
-
-        # Format the message
-        formatted_message = MotorControlErrors._format_error_message(error_message)
-        msg.setText(formatted_message)
-
-        # Display the message box
-        msg.exec_()
-
-    @staticmethod
-    def _format_error_message(error_message: str) -> str:
-        """
-        Format the error message.
-        Args:
-            error_message(str): Error message to format.
-
-        Returns:
-            str: Formatted error message.
-        """
-        # Split the message into lines
-        lines = error_message.split("\n")
-        formatted_lines = [
-            f"<b>{line.strip()}</b>" if i == 0 else line.strip()
-            for i, line in enumerate(lines)
-            if line.strip()
-        ]
-
-        # Join the lines with double breaks for empty lines in between
-        formatted_message = "<br><br>".join(formatted_lines)
-
-        return formatted_message
-
-
-class MotorActions(Enum):
-    """Enum for motor actions."""
-
-    MOVE_ABSOLUTE = "move_absolute"
-    MOVE_RELATIVE = "move_relative"
-
-
-class MotorThread(QThread):
-    """
-    QThread subclass for controlling motor actions asynchronously.
-
-    Signals:
-        coordinates_updated (pyqtSignal): Signal to emit current coordinates.
-        motor_error (pyqtSignal): Signal to emit when there is an error with the motors.
-        lock_gui (pyqtSignal): Signal to lock/unlock the GUI.
-    """
-
-    coordinates_updated = pyqtSignal(float, float)  # Signal to emit current coordinates
-    motor_error = pyqtSignal(str)  # Signal to emit when there is an error with the motors
-    lock_gui = pyqtSignal(bool)  # Signal to lock/unlock the GUI
-
-    def __init__(self, parent=None, client=None):
-        super().__init__(parent)
-
-        bec_dispatcher = BECDispatcher()
-        self.client = bec_dispatcher.client if client is None else client
-        self.dev = self.client.device_manager.devices
-        self.scans = self.client.scans
-        self.queue = self.client.queue
-        self.action = None
-
-        self.motor = None
-        self.motor_x = None
-        self.motor_y = None
-        self.target_coordinates = None
-        self.value = None
-
-    def get_all_motors_names(self) -> list:
-        """
-        Get all the motors names.
-        Returns:
-            list: List of all the motors names.
-        """
-        all_devices = self.client.device_manager.devices.enabled_devices
-        all_motors_names = [motor.name for motor in all_devices if isinstance(motor, Positioner)]
-        return all_motors_names
-
-    def get_coordinates(self, motor_x: str, motor_y: str) -> tuple:
-        """
-        Get the current coordinates of the motors.
-        Args:
-            motor_x(str): Motor X to get positions from.
-            motor_y(str): Motor Y to get positions from.
-
-        Returns:
-            tuple: Current coordinates of the motors.
-        """
-        x = self.dev[motor_x].readback.get()
-        y = self.dev[motor_y].readback.get()
-        return x, y
-
-    def move_absolute(self, motor_x: str, motor_y: str, target_coordinates: tuple) -> None:
-        """
-        Wrapper for moving the motor to the target coordinates.
-        Args:
-            motor_x(str): Motor X to move.
-            motor_y(str): Motor Y to move.
-            target_coordinates(tuple): Target coordinates.
-        """
-        self.action = MotorActions.MOVE_ABSOLUTE
-        self.motor_x = motor_x
-        self.motor_y = motor_y
-        self.target_coordinates = target_coordinates
-        self.start()
-
-    def move_relative(self, motor: str, value: float) -> None:
-        """
-        Wrapper for moving the motor relative to the current position.
-        Args:
-            motor(str): Motor to move.
-            value(float): Value to move.
-        """
-        self.action = MotorActions.MOVE_RELATIVE
-        self.motor = motor
-        self.value = value
-        self.start()
-
-    def run(self):
-        """
-        Run the thread.
-        Possible actions:
-            - Move to coordinates
-            - Move relative
-        """
-        if self.action == MotorActions.MOVE_ABSOLUTE:
-            self._move_motor_absolute(self.motor_x, self.motor_y, self.target_coordinates)
-        elif self.action == MotorActions.MOVE_RELATIVE:
-            self._move_motor_relative(self.motor, self.value)
-
-    def _move_motor_absolute(self, motor_x: str, motor_y: str, target_coordinates: tuple) -> None:
-        """
-        Move the motor to the target coordinates.
-        Args:
-            motor_x(str): Motor X to move.
-            motor_y(str): Motor Y to move.
-            target_coordinates(tuple): Target coordinates.
-        """
-        self.lock_gui.emit(False)
-        try:
-            status = self.scans.mv(
-                self.dev[motor_x],
-                target_coordinates[0],
-                self.dev[motor_y],
-                target_coordinates[1],
-                relative=False,
-            )
-            status.wait()
-        except AlarmBase as e:
-            self.motor_error.emit(str(e))
-        finally:
-            self.lock_gui.emit(True)
-
-    def _move_motor_relative(self, motor, value: float) -> None:
-        """
-        Move the motor relative to the current position.
-        Args:
-            motor(str): Motor to move.
-            value(float): Value to move.
-        """
-        self.lock_gui.emit(False)
-        try:
-            status = self.scans.mv(self.dev[motor], value, relative=True)
-            status.wait()
-        except AlarmBase as e:
-            self.motor_error.emit(str(e))
-        finally:
-            self.lock_gui.emit(True)
-
-    def stop_movement(self):
-        self.queue.request_scan_abortion()
-        self.queue.request_queue_reset()
--- a/bec_widgets/widgets/motor_control/motor_table/motor_table.py
+++ b/bec_widgets/widgets/motor_control/motor_table/motor_table.py
@@ -1,484 +0,0 @@
-# pylint: disable = no-name-in-module,missing-module-docstring
-import os
-
-from qtpy import uic
-from qtpy.QtCore import Qt
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtGui import QDoubleValidator, QKeySequence
-from qtpy.QtWidgets import (
-    QCheckBox,
-    QLineEdit,
-    QMessageBox,
-    QPushButton,
-    QShortcut,
-    QTableWidget,
-    QTableWidgetItem,
-)
-
-from bec_widgets.utils import UILoader
-from bec_widgets.widgets.motor_control.motor_control import MotorControlWidget
-
-
-class MotorCoordinateTable(MotorControlWidget):
-    """
-    Widget to save coordinates from motor, display them in the table and move back to them.
-    There are two modes of operation:
-        - Individual: Each row is a single coordinate.
-        - Start/Stop: Each pair of rows is a start and end coordinate.
-    Signals:
-        plot_coordinates_signal (pyqtSignal(list, str, str)): Signal to plot the coordinates in the MotorMap.
-    Slots:
-        add_coordinate (pyqtSlot(tuple)): Slot to add a coordinate to the table.
-        mode_switch (pyqtSlot): Slot to switch between individual and start/stop mode.
-    """
-
-    plot_coordinates_signal = pyqtSignal(list, str, str)
-
-    def _load_ui(self):
-        """Load the UI for the coordinate table."""
-        current_path = os.path.dirname(__file__)
-        self.ui = UILoader().load_ui(os.path.join(current_path, "motor_table.ui"), self)
-
-    def _init_ui(self):
-        """Initialize the UI"""
-        # Setup table behaviour
-        self._setup_table()
-        self.ui.table.setSelectionBehavior(QTableWidget.SelectRows)
-
-        # for tag columns default tag
-        self.tag_counter = 1
-
-        # Connect signals and slots
-        self.ui.checkBox_resize_auto.stateChanged.connect(self.resize_table_auto)
-        self.ui.comboBox_mode.currentIndexChanged.connect(self.mode_switch)
-
-        # Keyboard shortcuts for deleting a row
-        self.delete_shortcut = QShortcut(QKeySequence(Qt.Key_Delete), self.ui.table)
-        self.delete_shortcut.activated.connect(self.delete_selected_row)
-        self.backspace_shortcut = QShortcut(QKeySequence(Qt.Key_Backspace), self.ui.table)
-        self.backspace_shortcut.activated.connect(self.delete_selected_row)
-
-        # Warning message for mode switch enable/disable
-        self.warning_message = True
-
-    @pyqtSlot(dict)
-    def on_config_update(self, config: dict) -> None:
-        """
-        Update config dict
-        Args:
-            config(dict): New config dict
-        """
-        self.config = config
-
-        # Get motor names
-        self.motor_x, self.motor_y = (
-            self.config["motor_control"]["motor_x"],
-            self.config["motor_control"]["motor_y"],
-        )
-
-        # Decimal precision of the table coordinates
-        self.precision = self.config["motor_control"].get("precision", 3)
-
-        # Mode switch default option
-        self.mode = self.config["motor_control"].get("mode", "Individual")
-
-        # Set combobox to default mode
-        self.ui.comboBox_mode.setCurrentText(self.mode)
-
-        self._init_ui()
-
-    def _setup_table(self):
-        """Setup the table with appropriate headers and configurations."""
-        mode = self.ui.comboBox_mode.currentText()
-
-        if mode == "Individual":
-            self._setup_individual_mode()
-        elif mode == "Start/Stop":
-            self._setup_start_stop_mode()
-            self.start_stop_counter = 0  # TODO: remove this??
-
-        self.wipe_motor_map_coordinates()
-
-    def _setup_individual_mode(self):
-        """Setup the table for individual mode."""
-        self.ui.table.setColumnCount(5)
-        self.ui.table.setHorizontalHeaderLabels(["Show", "Move", "Tag", "X", "Y"])
-        self.ui.table.verticalHeader().setVisible(False)
-
-    def _setup_start_stop_mode(self):
-        """Setup the table for start/stop mode."""
-        self.ui.table.setColumnCount(8)
-        self.ui.table.setHorizontalHeaderLabels(
-            [
-                "Show",
-                "Move [start]",
-                "Move [end]",
-                "Tag",
-                "X [start]",
-                "Y [start]",
-                "X [end]",
-                "Y [end]",
-            ]
-        )
-        self.ui.table.verticalHeader().setVisible(False)
-        # Set flag to track if the coordinate is stat or the end of the entry
-        self.is_next_entry_end = False
-
-    def mode_switch(self):
-        """Switch between individual and start/stop mode."""
-        last_selected_index = self.ui.comboBox_mode.currentIndex()
-
-        if self.ui.table.rowCount() > 0 and self.warning_message is True:
-            msgBox = QMessageBox()
-            msgBox.setIcon(QMessageBox.Critical)
-            msgBox.setText(
-                "Switching modes will delete all table entries. Do you want to continue?"
-            )
-            msgBox.setStandardButtons(QMessageBox.Ok | QMessageBox.Cancel)
-            returnValue = msgBox.exec()
-
-            if returnValue is QMessageBox.Cancel:
-                self.ui.comboBox_mode.blockSignals(True)  # Block signals
-                self.ui.comboBox_mode.setCurrentIndex(last_selected_index)
-                self.ui.comboBox_mode.blockSignals(False)  # Unblock signals
-                return
-
-        # Wipe table
-        self.wipe_motor_map_coordinates()
-
-        # Initiate new table with new mode
-        self._setup_table()
-
-    @pyqtSlot(tuple)
-    def add_coordinate(self, coordinates: tuple):
-        """
-        Add a coordinate to the table.
-        Args:
-            coordinates(tuple): Coordinates (x,y) to add to the table.
-        """
-        tag = f"Pos {self.tag_counter}"
-        self.tag_counter += 1
-        x, y = coordinates
-        self._add_row(tag, x, y)
-
-    def _add_row(self, tag: str, x: float, y: float) -> None:
-        """
-        Add a row to the table.
-        Args:
-            tag(str): Tag of the coordinate.
-            x(float): X coordinate.
-            y(float): Y coordinate.
-        """
-
-        mode = self.ui.comboBox_mode.currentText()
-        if mode == "Individual":
-            checkbox_pos = 0
-            button_pos = 1
-            tag_pos = 2
-            x_pos = 3
-            y_pos = 4
-            coordinate_reference = "Individual"
-            color = "green"
-
-            # Add new row -> new entry
-            row_count = self.ui.table.rowCount()
-            self.ui.table.insertRow(row_count)
-
-            # Add Widgets
-            self._add_widgets(
-                tag,
-                x,
-                y,
-                row_count,
-                checkbox_pos,
-                tag_pos,
-                button_pos,
-                x_pos,
-                y_pos,
-                coordinate_reference,
-                color,
-            )
-
-        if mode == "Start/Stop":
-            # These positions are always fixed
-            checkbox_pos = 0
-            tag_pos = 3
-
-            if self.is_next_entry_end is False:  # It is the start position of the entry
-                print("Start position")
-                button_pos = 1
-                x_pos = 4
-                y_pos = 5
-                coordinate_reference = "Start"
-                color = "blue"
-
-                # Add new row -> new entry
-                row_count = self.ui.table.rowCount()
-                self.ui.table.insertRow(row_count)
-
-                # Add Widgets
-                self._add_widgets(
-                    tag,
-                    x,
-                    y,
-                    row_count,
-                    checkbox_pos,
-                    tag_pos,
-                    button_pos,
-                    x_pos,
-                    y_pos,
-                    coordinate_reference,
-                    color,
-                )
-
-                # Next entry will be the end of the current entry
-                self.is_next_entry_end = True
-
-            elif self.is_next_entry_end is True:  # It is the end position of the entry
-                print("End position")
-                row_count = self.ui.table.rowCount() - 1  # Current row
-                button_pos = 2
-                x_pos = 6
-                y_pos = 7
-                coordinate_reference = "Stop"
-                color = "red"
-
-                # Add Widgets
-                self._add_widgets(
-                    tag,
-                    x,
-                    y,
-                    row_count,
-                    checkbox_pos,
-                    tag_pos,
-                    button_pos,
-                    x_pos,
-                    y_pos,
-                    coordinate_reference,
-                    color,
-                )
-                self.is_next_entry_end = False  # Next entry will be the start of the new entry
-
-        # Auto table resize
-        self.resize_table_auto()
-
-    def _add_widgets(
-        self,
-        tag: str,
-        x: float,
-        y: float,
-        row: int,
-        checkBox_pos: int,
-        tag_pos: int,
-        button_pos: int,
-        x_pos: int,
-        y_pos: int,
-        coordinate_reference: str,
-        color: str,
-    ) -> None:
-        """
-        Add widgets to the table.
-        Args:
-            tag(str): Tag of the coordinate.
-            x(float): X coordinate.
-            y(float): Y coordinate.
-            row(int): Row of the QTableWidget where to add the widgets.
-            checkBox_pos(int): Column where to put CheckBox.
-            tag_pos(int): Column where to put Tag.
-            button_pos(int): Column where to put Move button.
-            x_pos(int): Column where to link x coordinate.
-            y_pos(int): Column where to link y coordinate.
-            coordinate_reference(str): Reference to the coordinate for MotorMap.
-            color(str): Color of the coordinate for MotorMap.
-        """
-        # Add widgets
-        self._add_checkbox(row, checkBox_pos, x_pos, y_pos)
-        self._add_move_button(row, button_pos, x_pos, y_pos)
-        self.ui.table.setItem(row, tag_pos, QTableWidgetItem(tag))
-        self._add_line_edit(x, row, x_pos, x_pos, y_pos, coordinate_reference, color)
-        self._add_line_edit(y, row, y_pos, x_pos, y_pos, coordinate_reference, color)
-
-        # # Emit the coordinates to be plotted
-        self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
-
-        # Connect item edit to emit coordinates
-        self.ui.table.itemChanged.connect(
-            lambda: print(f"item changed from {coordinate_reference} slot \n {x}-{y}-{color}")
-        )
-        self.ui.table.itemChanged.connect(
-            lambda: self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
-        )
-
-    def _add_checkbox(self, row: int, checkBox_pos: int, x_pos: int, y_pos: int):
-        """
-        Add a checkbox to the table.
-        Args:
-            row(int): Row of QTableWidget where to add the checkbox.
-            checkBox_pos(int): Column where to put CheckBox.
-            x_pos(int): Column where to link x coordinate.
-            y_pos(int): Column where to link y coordinate.
-        """
-        show_checkbox = QCheckBox()
-        show_checkbox.setChecked(True)
-        show_checkbox.stateChanged.connect(lambda: self.emit_plot_coordinates(x_pos, y_pos))
-        self.ui.table.setCellWidget(row, checkBox_pos, show_checkbox)
-
-    def _add_move_button(self, row: int, button_pos: int, x_pos: int, y_pos: int) -> None:
-        """
-        Add a move button to the table.
-        Args:
-            row(int): Row of QTableWidget where to add the move button.
-            button_pos(int): Column where to put move button.
-            x_pos(int): Column where to link x coordinate.
-            y_pos(int): Column where to link y coordinate.
-        """
-        move_button = QPushButton("Move")
-        move_button.clicked.connect(lambda: self.handle_move_button_click(x_pos, y_pos))
-        self.ui.table.setCellWidget(row, button_pos, move_button)
-
-    def _add_line_edit(
-        self,
-        value: float,
-        row: int,
-        line_pos: int,
-        x_pos: int,
-        y_pos: int,
-        coordinate_reference: str,
-        color: str,
-    ) -> None:
-        """
-        Add a QLineEdit to the table.
-        Args:
-            value(float): Initial value of the QLineEdit.
-            row(int): Row of QTableWidget where to add the QLineEdit.
-            line_pos(int): Column where to put QLineEdit.
-            x_pos(int): Column where to link x coordinate.
-            y_pos(int): Column where to link y coordinate.
-            coordinate_reference(str): Reference to the coordinate for MotorMap.
-            color(str): Color of the coordinate for MotorMap.
-        """
-        # Adding validator
-        validator = QDoubleValidator()
-        validator.setDecimals(self.precision)
-
-        # Create line edit
-        edit = QLineEdit(str(f"{value:.{self.precision}f}"))
-        edit.setValidator(validator)
-        edit.setAlignment(Qt.AlignmentFlag.AlignCenter)
-
-        # Add line edit to the table
-        self.ui.table.setCellWidget(row, line_pos, edit)
-        edit.textChanged.connect(
-            lambda: self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
-        )
-
-    def wipe_motor_map_coordinates(self):
-        """Wipe the motor map coordinates."""
-        try:
-            self.ui.table.itemChanged.disconnect()  # Disconnect all previous connections
-        except TypeError:
-            print("No previous connections to disconnect")
-        self.ui.table.setRowCount(0)
-        reference_tags = ["Individual", "Start", "Stop"]
-        for reference_tag in reference_tags:
-            self.plot_coordinates_signal.emit([], reference_tag, "green")
-
-    def handle_move_button_click(self, x_pos: int, y_pos: int) -> None:
-        """
-        Handle the move button click.
-        Args:
-            x_pos(int): X position of the coordinate.
-            y_pos(int): Y position of the coordinate.
-        """
-        button = self.sender()
-        row = self.ui.table.indexAt(button.pos()).row()
-
-        x = self.get_coordinate(row, x_pos)
-        y = self.get_coordinate(row, y_pos)
-        self.move_motor(x, y)
-
-    def emit_plot_coordinates(self, x_pos: float, y_pos: float, reference_tag: str, color: str):
-        """
-        Emit the coordinates to be plotted.
-        Args:
-            x_pos(float): X position of the coordinate.
-            y_pos(float): Y position of the coordinate.
-            reference_tag(str): Reference tag of the coordinate.
-            color(str): Color of the coordinate.
-        """
-        print(
-            f"Emitting plot coordinates: x_pos={x_pos}, y_pos={y_pos}, reference_tag={reference_tag}, color={color}"
-        )
-        coordinates = []
-        for row in range(self.ui.table.rowCount()):
-            show = self.ui.table.cellWidget(row, 0).isChecked()
-            x = self.get_coordinate(row, x_pos)
-            y = self.get_coordinate(row, y_pos)
-
-            coordinates.append((x, y, show))  # (x, y, show_flag)
-        self.plot_coordinates_signal.emit(coordinates, reference_tag, color)
-
-    def get_coordinate(self, row: int, column: int) -> float:
-        """
-        Helper function to get the coordinate from the table QLineEdit cells.
-        Args:
-            row(int): Row of the table.
-            column(int): Column of the table.
-        Returns:
-            float: Value of the coordinate.
-        """
-        edit = self.ui.table.cellWidget(row, column)
-        value = float(edit.text()) if edit and edit.text() != "" else None
-        if value:
-            return value
-
-    def delete_selected_row(self):
-        """Delete the selected row from the table."""
-        selected_rows = self.ui.table.selectionModel().selectedRows()
-        for row in selected_rows:
-            self.ui.table.removeRow(row.row())
-        if self.ui.comboBox_mode.currentText() == "Start/Stop":
-            self.emit_plot_coordinates(x_pos=4, y_pos=5, reference_tag="Start", color="blue")
-            self.emit_plot_coordinates(x_pos=6, y_pos=7, reference_tag="Stop", color="red")
-            self.is_next_entry_end = False
-        elif self.ui.comboBox_mode.currentText() == "Individual":
-            self.emit_plot_coordinates(x_pos=3, y_pos=4, reference_tag="Individual", color="green")
-
-    def resize_table_auto(self):
-        """Resize the table to fit the contents."""
-        if self.ui.checkBox_resize_auto.isChecked():
-            self.ui.table.resizeColumnsToContents()
-
-    def move_motor(self, x: float, y: float) -> None:
-        """
-        Move the motor to the target coordinates.
-        Args:
-            x(float): Target x coordinate.
-            y(float): Target y coordinate.
-        """
-        self.motor_thread.move_absolute(self.motor_x, self.motor_y, (x, y))
-
-    @pyqtSlot(str, str)
-    def change_motors(self, motor_x: str, motor_y: str) -> None:
-        """
-        Change the active motors and update config.
-        Can be connected to the selected_motors_signal from MotorControlSelection.
-        Args:
-            motor_x(str): New motor X to be controlled.
-            motor_y(str): New motor Y to be controlled.
-        """
-        self.motor_x = motor_x
-        self.motor_y = motor_y
-        self.config["motor_control"]["motor_x"] = motor_x
-        self.config["motor_control"]["motor_y"] = motor_y
-
-    @pyqtSlot(int)
-    def set_precision(self, precision: int) -> None:
-        """
-        Set the precision of the coordinates.
-        Args:
-            precision(int): Precision of the coordinates.
-        """
-        self.precision = precision
-        self.config["motor_control"]["precision"] = precision
--- a/bec_widgets/widgets/motor_control/motor_table/motor_table.ui
+++ b/bec_widgets/widgets/motor_control/motor_table/motor_table.ui
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>676</width>
-    <height>667</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Motor Coordinates Table</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <spacer name="horizontalSpacer_4">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="checkBox_resize_auto">
-       <property name="text">
-        <string>Resize Auto</string>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushButton_editColumns">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Edit Custom Column</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Entries Mode:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="comboBox_mode">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <item>
-        <property name="text">
-         <string>Individual</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Start/Stop</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QTableWidget" name="table">
-     <property name="gridStyle">
-      <enum>Qt::SolidLine</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="pushButton_importCSV">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Import CSV</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushButton_exportCSV">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Export CSV</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
--- a/bec_widgets/widgets/motor_control/movement_absolute/movement_absolute.py
+++ b/bec_widgets/widgets/motor_control/movement_absolute/movement_absolute.py
@@ -1,159 +0,0 @@
-import os
-
-from qtpy import uic
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtWidgets import QWidget
-
-from bec_widgets.utils import UILoader
-from bec_widgets.widgets.motor_control.motor_control import MotorControlErrors, MotorControlWidget
-
-
-class MotorControlAbsolute(MotorControlWidget):
-    """
-    Widget for controlling the motors to absolute coordinates.
-
-    Signals:
-        coordinates_signal (pyqtSignal(tuple)): Signal to emit the coordinates.
-    Slots:
-        change_motors (pyqtSlot): Slot to change the active motors.
-        enable_motor_controls (pyqtSlot(bool)): Slot to enable/disable the motor controls.
-    """
-
-    coordinates_signal = pyqtSignal(tuple)
-
-    def _load_ui(self):
-        """Load the UI from the .ui file."""
-        current_path = os.path.dirname(__file__)
-        self.ui = UILoader().load_ui(os.path.join(current_path, "movement_absolute.ui"), self)
-
-    def _init_ui(self):
-        """Initialize the UI."""
-
-        # Check if there are any motors connected
-        if self.motor_x is None or self.motor_y is None:
-            self.ui.motorControl_absolute.setEnabled(False)
-            return
-
-        # Move to absolute coordinates
-        self.ui.pushButton_go_absolute.clicked.connect(
-            lambda: self.move_motor_absolute(
-                self.ui.spinBox_absolute_x.value(), self.ui.spinBox_absolute_y.value()
-            )
-        )
-
-        self.ui.pushButton_set.clicked.connect(self.save_absolute_coordinates)
-        self.ui.pushButton_save.clicked.connect(self.save_current_coordinates)
-        self.ui.pushButton_stop.clicked.connect(self.motor_thread.stop_movement)
-
-        # Enable/Disable GUI
-        self.motor_thread.lock_gui.connect(self.enable_motor_controls)
-
-        # Error messages
-        self.motor_thread.motor_error.connect(
-            lambda error: MotorControlErrors.display_error_message(error)
-        )
-
-        # Keyboard shortcuts
-        self._init_keyboard_shortcuts()
-
-    @pyqtSlot(dict)
-    def on_config_update(self, config: dict) -> None:
-        """Update config dict"""
-        self.config = config
-
-        # Get motor names
-        self.motor_x, self.motor_y = (
-            self.config["motor_control"]["motor_x"],
-            self.config["motor_control"]["motor_y"],
-        )
-
-        # Update step precision
-        self.precision = self.config["motor_control"]["precision"]
-
-        self._init_ui()
-
-    @pyqtSlot(bool)
-    def enable_motor_controls(self, enable: bool) -> None:
-        """
-        Enable or disable the motor controls.
-        Args:
-            enable(bool): True to enable, False to disable.
-        """
-
-        # Disable or enable all controls within the motorControl_absolute group box
-        for widget in self.ui.motorControl_absolute.findChildren(QWidget):
-            widget.setEnabled(enable)
-
-        # Enable the pushButton_stop if the motor is moving
-        self.ui.pushButton_stop.setEnabled(True)
-
-    @pyqtSlot(str, str)
-    def change_motors(self, motor_x: str, motor_y: str):
-        """
-        Change the active motors and update config.
-        Can be connected to the selected_motors_signal from MotorControlSelection.
-        Args:
-            motor_x(str): New motor X to be controlled.
-            motor_y(str): New motor Y to be controlled.
-        """
-        self.motor_x = motor_x
-        self.motor_y = motor_y
-        self.config["motor_control"]["motor_x"] = motor_x
-        self.config["motor_control"]["motor_y"] = motor_y
-
-    @pyqtSlot(int)
-    def set_precision(self, precision: int) -> None:
-        """
-        Set the precision of the coordinates.
-        Args:
-            precision(int): Precision of the coordinates.
-        """
-        self.precision = precision
-        self.config["motor_control"]["precision"] = precision
-        self.ui.spinBox_absolute_x.setDecimals(precision)
-        self.ui.spinBox_absolute_y.setDecimals(precision)
-
-    def move_motor_absolute(self, x: float, y: float) -> None:
-        """
-        Move the motor to the target coordinates.
-        Args:
-            x(float): Target x coordinate.
-            y(float): Target y coordinate.
-        """
-        # self._enable_motor_controls(False)
-        target_coordinates = (x, y)
-        self.motor_thread.move_absolute(self.motor_x, self.motor_y, target_coordinates)
-        if self.ui.checkBox_save_with_go.isChecked():
-            self.save_absolute_coordinates()
-
-    def _init_keyboard_shortcuts(self):
-        """Initialize the keyboard shortcuts."""
-        # Go absolute button
-        self.ui.pushButton_go_absolute.setShortcut("Ctrl+G")
-        self.ui.pushButton_go_absolute.setToolTip("Ctrl+G")
-
-        # Set absolute coordinates
-        self.ui.pushButton_set.setShortcut("Ctrl+D")
-        self.ui.pushButton_set.setToolTip("Ctrl+D")
-
-        # Save Current coordinates
-        self.ui.pushButton_save.setShortcut("Ctrl+S")
-        self.ui.pushButton_save.setToolTip("Ctrl+S")
-
-        # Stop Button
-        self.ui.pushButton_stop.setShortcut("Ctrl+X")
-        self.ui.pushButton_stop.setToolTip("Ctrl+X")
-
-    def save_absolute_coordinates(self):
-        """Emit the setup coordinates from the spinboxes"""
-
-        x, y = round(self.ui.spinBox_absolute_x.value(), self.precision), round(
-            self.ui.spinBox_absolute_y.value(), self.precision
-        )
-        self.coordinates_signal.emit((x, y))
-
-    def save_current_coordinates(self):
-        """Emit the current coordinates from the motor thread"""
-        x, y = self.motor_thread.get_coordinates(self.motor_x, self.motor_y)
-        self.coordinates_signal.emit((round(x, self.precision), round(y, self.precision)))
--- a/bec_widgets/widgets/motor_control/movement_absolute/movement_absolute.ui
+++ b/bec_widgets/widgets/motor_control/movement_absolute/movement_absolute.ui
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>285</width>
-    <height>220</height>
-   </rect>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>285</width>
-    <height>220</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>285</width>
-    <height>220</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Move Movement Absolute</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <widget class="QGroupBox" name="motorControl_absolute">
-     <property name="minimumSize">
-      <size>
-       <width>261</width>
-       <height>195</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>261</width>
-       <height>195</height>
-      </size>
-     </property>
-     <property name="title">
-      <string>Move Movement Absolute</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QCheckBox" name="checkBox_save_with_go">
-        <property name="text">
-         <string>Save position with Go</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QGridLayout" name="gridLayout_3">
-        <item row="1" column="1">
-         <widget class="QDoubleSpinBox" name="spinBox_absolute_y">
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-          <property name="minimum">
-           <double>-500.000000000000000</double>
-          </property>
-          <property name="maximum">
-           <double>500.000000000000000</double>
-          </property>
-          <property name="singleStep">
-           <double>0.100000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QDoubleSpinBox" name="spinBox_absolute_x">
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-          <property name="minimum">
-           <double>-500.000000000000000</double>
-          </property>
-          <property name="maximum">
-           <double>500.000000000000000</double>
-          </property>
-          <property name="singleStep">
-           <double>0.100000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QLabel" name="label_7">
-          <property name="text">
-           <string>Y</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="label_6">
-          <property name="text">
-           <string>X</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QPushButton" name="pushButton_save">
-          <property name="text">
-           <string>Save</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pushButton_set">
-          <property name="text">
-           <string>Set</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pushButton_go_absolute">
-          <property name="text">
-           <string>Go</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QPushButton" name="pushButton_stop">
-        <property name="text">
-         <string>Stop Movement</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
--- a/bec_widgets/widgets/motor_control/movement_relative/movement_relative.py
+++ b/bec_widgets/widgets/motor_control/movement_relative/movement_relative.py
@@ -1,230 +0,0 @@
-import os
-
-from qtpy import uic
-from qtpy.QtCore import Qt
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtGui import QKeySequence
-from qtpy.QtWidgets import QDoubleSpinBox, QShortcut, QWidget
-
-from bec_widgets.utils import UILoader
-from bec_widgets.widgets.motor_control.motor_control import MotorControlWidget
-
-
-class MotorControlRelative(MotorControlWidget):
-    """
-    Widget for controlling the motors to relative coordinates.
-
-    Signals:
-        precision_signal (pyqtSignal): Signal to emit the precision of the coordinates.
-    Slots:
-        change_motors (pyqtSlot(str,str)): Slot to change the active motors.
-        enable_motor_controls (pyqtSlot): Slot to enable/disable the motor controls.
-    """
-
-    precision_signal = pyqtSignal(int)
-
-    def _load_ui(self):
-        """Load the UI from the .ui file."""
-        # Loading UI
-        current_path = os.path.dirname(__file__)
-        self.ui = UILoader().load_ui(os.path.join(current_path, "movement_relative.ui"), self)
-
-    def _init_ui(self):
-        """Initialize the UI."""
-        self._init_ui_motor_control()
-        self._init_keyboard_shortcuts()
-
-    @pyqtSlot(dict)
-    def on_config_update(self, config: dict) -> None:
-        """
-        Update config dict
-        Args:
-            config(dict): New config dict
-        """
-        self.config = config
-
-        # Get motor names
-        self.motor_x, self.motor_y = (
-            self.config["motor_control"]["motor_x"],
-            self.config["motor_control"]["motor_y"],
-        )
-
-        # Update step precision
-        self.precision = self.config["motor_control"]["precision"]
-        self.ui.spinBox_precision.setValue(self.precision)
-
-        # Update step sizes
-        self.ui.spinBox_step_x.setValue(self.config["motor_control"]["step_size_x"])
-        self.ui.spinBox_step_y.setValue(self.config["motor_control"]["step_size_y"])
-
-        # Checkboxes for keyboard shortcuts and x/y step size link
-        self.ui.checkBox_same_xy.setChecked(self.config["motor_control"]["step_x_y_same"])
-        self.ui.checkBox_enableArrows.setChecked(self.config["motor_control"]["move_with_arrows"])
-
-        self._init_ui()
-
-    def _init_ui_motor_control(self) -> None:
-        """Initialize the motor control elements"""
-
-        # Connect checkbox and spinBoxes
-        self.ui.checkBox_same_xy.stateChanged.connect(self._sync_step_sizes)
-        self.ui.spinBox_step_x.valueChanged.connect(self._update_step_size_x)
-        self.ui.spinBox_step_y.valueChanged.connect(self._update_step_size_y)
-
-        self.ui.toolButton_right.clicked.connect(
-            lambda: self.move_motor_relative(self.motor_x, "x", 1)
-        )
-        self.ui.toolButton_left.clicked.connect(
-            lambda: self.move_motor_relative(self.motor_x, "x", -1)
-        )
-        self.ui.toolButton_up.clicked.connect(
-            lambda: self.move_motor_relative(self.motor_y, "y", 1)
-        )
-        self.ui.toolButton_down.clicked.connect(
-            lambda: self.move_motor_relative(self.motor_y, "y", -1)
-        )
-
-        # Switch between key shortcuts active
-        self.ui.checkBox_enableArrows.stateChanged.connect(self._update_arrow_key_shortcuts)
-        self._update_arrow_key_shortcuts()
-
-        # Enable/Disable GUI
-        self.motor_thread.lock_gui.connect(self.enable_motor_controls)
-
-        # Precision update
-        self.ui.spinBox_precision.valueChanged.connect(lambda x: self._update_precision(x))
-
-        # Error messages
-        self.motor_thread.motor_error.connect(
-            lambda error: MotorControlErrors.display_error_message(error)
-        )
-
-        # Stop Button
-        self.ui.pushButton_stop.clicked.connect(self.motor_thread.stop_movement)
-
-    def _init_keyboard_shortcuts(self) -> None:
-        """Initialize the keyboard shortcuts"""
-
-        # Increase/decrease step size for X motor
-        increase_x_shortcut = QShortcut(QKeySequence("Ctrl+A"), self)
-        decrease_x_shortcut = QShortcut(QKeySequence("Ctrl+Z"), self)
-        increase_x_shortcut.activated.connect(
-            lambda: self._change_step_size(self.ui.spinBox_step_x, 2)
-        )
-        decrease_x_shortcut.activated.connect(
-            lambda: self._change_step_size(self.ui.spinBox_step_x, 0.5)
-        )
-        self.ui.spinBox_step_x.setToolTip("Increase step size: Ctrl+A\nDecrease step size: Ctrl+Z")
-
-        # Increase/decrease step size for Y motor
-        increase_y_shortcut = QShortcut(QKeySequence("Alt+A"), self)
-        decrease_y_shortcut = QShortcut(QKeySequence("Alt+Z"), self)
-        increase_y_shortcut.activated.connect(
-            lambda: self._change_step_size(self.ui.spinBox_step_y, 2)
-        )
-        decrease_y_shortcut.activated.connect(
-            lambda: self._change_step_size(self.ui.spinBox_step_y, 0.5)
-        )
-        self.ui.spinBox_step_y.setToolTip("Increase step size: Alt+A\nDecrease step size: Alt+Z")
-
-        # Stop Button
-        self.ui.pushButton_stop.setShortcut("Ctrl+X")
-        self.ui.pushButton_stop.setToolTip("Ctrl+X")
-
-    def _update_arrow_key_shortcuts(self) -> None:
-        """Update the arrow key shortcuts based on the checkbox state."""
-        if self.ui.checkBox_enableArrows.isChecked():
-            # Set the arrow key shortcuts for motor movement
-            self.ui.toolButton_right.setShortcut(Qt.Key_Right)
-            self.ui.toolButton_left.setShortcut(Qt.Key_Left)
-            self.ui.toolButton_up.setShortcut(Qt.Key_Up)
-            self.ui.toolButton_down.setShortcut(Qt.Key_Down)
-        else:
-            # Clear the shortcuts
-            self.ui.toolButton_right.setShortcut("")
-            self.ui.toolButton_left.setShortcut("")
-            self.ui.toolButton_up.setShortcut("")
-            self.ui.toolButton_down.setShortcut("")
-
-    def _update_precision(self, precision: int) -> None:
-        """
-        Update the precision of the coordinates.
-        Args:
-            precision(int): Precision of the coordinates.
-        """
-        self.ui.spinBox_step_x.setDecimals(precision)
-        self.ui.spinBox_step_y.setDecimals(precision)
-        self.precision_signal.emit(precision)
-
-    def _change_step_size(self, spinBox: QDoubleSpinBox, factor: float) -> None:
-        """
-        Change the step size of the spinbox.
-        Args:
-            spinBox(QDoubleSpinBox): Spinbox to change the step size.
-            factor(float): Factor to change the step size.
-        """
-        old_step = spinBox.value()
-        new_step = old_step * factor
-        spinBox.setValue(new_step)
-
-    def _sync_step_sizes(self):
-        """Sync step sizes based on checkbox state."""
-        if self.ui.checkBox_same_xy.isChecked():
-            value = self.ui.spinBox_step_x.value()
-            self.ui.spinBox_step_y.setValue(value)
-
-    def _update_step_size_x(self):
-        """Update step size for x if checkbox is checked."""
-        if self.ui.checkBox_same_xy.isChecked():
-            value = self.ui.spinBox_step_x.value()
-            self.ui.spinBox_step_y.setValue(value)
-
-    def _update_step_size_y(self):
-        """Update step size for y if checkbox is checked."""
-        if self.ui.checkBox_same_xy.isChecked():
-            value = self.ui.spinBox_step_y.value()
-            self.ui.spinBox_step_x.setValue(value)
-
-    @pyqtSlot(str, str)
-    def change_motors(self, motor_x: str, motor_y: str):
-        """
-        Change the active motors and update config.
-        Can be connected to the selected_motors_signal from MotorControlSelection.
-        Args:
-            motor_x(str): New motor X to be controlled.
-            motor_y(str): New motor Y to be controlled.
-        """
-        self.motor_x = motor_x
-        self.motor_y = motor_y
-        self.config["motor_control"]["motor_x"] = motor_x
-        self.config["motor_control"]["motor_y"] = motor_y
-
-    @pyqtSlot(bool)
-    def enable_motor_controls(self, disable: bool) -> None:
-        """
-        Enable or disable the motor controls.
-        Args:
-            disable(bool): True to disable, False to enable.
-        """
-
-        # Disable or enable all controls within the motorControl_absolute group box
-        for widget in self.ui.motorControl.findChildren(QWidget):
-            widget.setEnabled(disable)
-
-        # Enable the pushButton_stop if the motor is moving
-        self.ui.pushButton_stop.setEnabled(True)
-
-    def move_motor_relative(self, motor, axis: str, direction: int) -> None:
-        """
-        Move the motor relative to the current position.
-        Args:
-            motor: Motor to move.
-            axis(str): Axis to move.
-            direction(int): Direction to move. 1 for positive, -1 for negative.
-        """
-        if axis == "x":
-            step = direction * self.ui.spinBox_step_x.value()
-        elif axis == "y":
-            step = direction * self.ui.spinBox_step_y.value()
-        self.motor_thread.move_relative(motor, step)
--- a/bec_widgets/widgets/motor_control/movement_relative/movement_relative.ui
+++ b/bec_widgets/widgets/motor_control/movement_relative/movement_relative.ui
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>285</width>
-    <height>405</height>
-   </rect>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>285</width>
-    <height>405</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Motor Control Relative</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="motorControl">
-     <property name="minimumSize">
-      <size>
-       <width>261</width>
-       <height>394</height>
-      </size>
-     </property>
-     <property name="title">
-      <string>Motor Control Relative</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_5">
-      <item>
-       <widget class="QCheckBox" name="checkBox_enableArrows">
-        <property name="text">
-         <string>Move with arrow keys</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="checkBox_same_xy">
-        <property name="text">
-         <string>Step [X] = Step [Y]</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QGridLayout" name="step_grid">
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_step_y">
-          <property name="minimumSize">
-           <size>
-            <width>111</width>
-            <height>19</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Step [Y]</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="label_2">
-          <property name="minimumSize">
-           <size>
-            <width>111</width>
-            <height>19</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Decimal</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QDoubleSpinBox" name="spinBox_step_x">
-          <property name="minimumSize">
-           <size>
-            <width>110</width>
-            <height>19</height>
-           </size>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-          <property name="minimum">
-           <double>0.000000000000000</double>
-          </property>
-          <property name="maximum">
-           <double>99.000000000000000</double>
-          </property>
-          <property name="singleStep">
-           <double>0.100000000000000</double>
-          </property>
-          <property name="value">
-           <double>1.000000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_step_x">
-          <property name="minimumSize">
-           <size>
-            <width>111</width>
-            <height>19</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Step [X]</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QDoubleSpinBox" name="spinBox_step_y">
-          <property name="minimumSize">
-           <size>
-            <width>110</width>
-            <height>19</height>
-           </size>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-          <property name="minimum">
-           <double>0.000000000000000</double>
-          </property>
-          <property name="maximum">
-           <double>99.000000000000000</double>
-          </property>
-          <property name="singleStep">
-           <double>0.100000000000000</double>
-          </property>
-          <property name="value">
-           <double>1.000000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QSpinBox" name="spinBox_precision">
-          <property name="minimumSize">
-           <size>
-            <width>110</width>
-            <height>19</height>
-           </size>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-          <property name="maximum">
-           <number>8</number>
-          </property>
-          <property name="value">
-           <number>2</number>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QGridLayout" name="direction_grid">
-        <property name="sizeConstraint">
-         <enum>QLayout::SetDefaultConstraint</enum>
-        </property>
-        <item row="1" column="2" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
-         <widget class="QToolButton" name="toolButton_up">
-          <property name="minimumSize">
-           <size>
-            <width>26</width>
-            <height>26</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="arrowType">
-           <enum>Qt::UpArrow</enum>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="4">
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="3" column="2" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
-         <widget class="QToolButton" name="toolButton_down">
-          <property name="minimumSize">
-           <size>
-            <width>26</width>
-            <height>26</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="arrowType">
-           <enum>Qt::DownArrow</enum>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QToolButton" name="toolButton_left">
-          <property name="minimumSize">
-           <size>
-            <width>26</width>
-            <height>26</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="arrowType">
-           <enum>Qt::LeftArrow</enum>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="2">
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="2" column="3">
-         <widget class="QToolButton" name="toolButton_right">
-          <property name="minimumSize">
-           <size>
-            <width>26</width>
-            <height>26</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="arrowType">
-           <enum>Qt::RightArrow</enum>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="4" column="2">
-         <spacer name="verticalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QPushButton" name="pushButton_stop">
-        <property name="text">
-         <string>Stop Movement</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
--- a/bec_widgets/widgets/motor_control/selection/selection.py
+++ b/bec_widgets/widgets/motor_control/selection/selection.py
@@ -1,110 +0,0 @@
-# pylint: disable = no-name-in-module,missing-module-docstring
-import os
-
-from qtpy import uic
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtWidgets import QComboBox
-
-from bec_widgets.widgets.motor_control.motor_control import MotorControlWidget
-
-
-class MotorControlSelection(MotorControlWidget):
-    """
-    Widget for selecting the motors to control.
-
-    Signals:
-        selected_motors_signal (pyqtSignal(str,str)): Signal to emit the selected motors.
-    Slots:
-        get_available_motors (pyqtSlot): Slot to populate the available motors in the combo boxes and set the index based on the configuration.
-        enable_motor_controls (pyqtSlot(bool)): Slot to enable/disable the motor controls GUI.
-        on_config_update (pyqtSlot(dict)): Slot to update the config dict.
-    """
-
-    selected_motors_signal = pyqtSignal(str, str)
-
-    def _load_ui(self):
-        """Load the UI from the .ui file."""
-        current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "selection.ui"), self)
-
-    def _init_ui(self):
-        """Initialize the UI."""
-        # Lock GUI while motors are moving
-        self.motor_thread.lock_gui.connect(self.enable_motor_controls)
-
-        self.pushButton_connecMotors.clicked.connect(self.select_motor)
-        self.get_available_motors()
-
-        # Connect change signals to change color
-        self.comboBox_motor_x.currentIndexChanged.connect(
-            lambda: self.set_combobox_style(self.comboBox_motor_x, "#ffa700")
-        )
-        self.comboBox_motor_y.currentIndexChanged.connect(
-            lambda: self.set_combobox_style(self.comboBox_motor_y, "#ffa700")
-        )
-
-    @pyqtSlot(dict)
-    def on_config_update(self, config: dict) -> None:
-        """
-        Update config dict
-        Args:
-            config(dict): New config dict
-        """
-        self.config = config
-
-        # Get motor names
-        self.motor_x, self.motor_y = (
-            self.config["motor_control"]["motor_x"],
-            self.config["motor_control"]["motor_y"],
-        )
-
-        self._init_ui()
-
-    @pyqtSlot(bool)
-    def enable_motor_controls(self, enable: bool) -> None:
-        """
-        Enable or disable the motor controls.
-        Args:
-            enable(bool): True to enable, False to disable.
-        """
-        self.motorSelection.setEnabled(enable)
-
-    @pyqtSlot()
-    def get_available_motors(self) -> None:
-        """
-        Slot to populate the available motors in the combo boxes and set the index based on the configuration.
-        """
-        # Get all available motors
-        self.motor_list = self.motor_thread.get_all_motors_names()
-
-        # Populate the combo boxes
-        self.comboBox_motor_x.addItems(self.motor_list)
-        self.comboBox_motor_y.addItems(self.motor_list)
-
-        # Set the index based on the config if provided
-        if self.config:
-            index_x = self.comboBox_motor_x.findText(self.motor_x)
-            index_y = self.comboBox_motor_y.findText(self.motor_y)
-            self.comboBox_motor_x.setCurrentIndex(index_x if index_x != -1 else 0)
-            self.comboBox_motor_y.setCurrentIndex(index_y if index_y != -1 else 0)
-
-    def set_combobox_style(self, combobox, color: str) -> None:
-        """
-        Set the combobox style to a specific color.
-        Args:
-            combobox(QComboBox): Combobox to change the color.
-            color(str): Color to set the combobox to.
-        """
-        combobox.setStyleSheet(f"QComboBox {{ background-color: {color}; }}")
-
-    def select_motor(self):
-        """Emit the selected motors"""
-        motor_x = self.comboBox_motor_x.currentText()
-        motor_y = self.comboBox_motor_y.currentText()
-
-        # Reset the combobox color to normal after selection
-        self.set_combobox_style(self.comboBox_motor_x, "")
-        self.set_combobox_style(self.comboBox_motor_y, "")
-
-        self.selected_motors_signal.emit(motor_x, motor_y)
--- a/bec_widgets/widgets/motor_control/selection/selection.ui
+++ b/bec_widgets/widgets/motor_control/selection/selection.ui
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>285</width>
-    <height>156</height>
-   </rect>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>285</width>
-    <height>156</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Motor Control Selection</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="motorSelection">
-     <property name="minimumSize">
-      <size>
-       <width>261</width>
-       <height>145</height>
-      </size>
-     </property>
-     <property name="title">
-      <string>Motor Selection</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_4">
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>Motor X</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="comboBox_motor_x"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_8">
-        <property name="text">
-         <string>Motor Y</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="2">
-       <widget class="QPushButton" name="pushButton_connecMotors">
-        <property name="text">
-         <string>Connect Motors</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QComboBox" name="comboBox_motor_y"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
--- a/bec_widgets/widgets/motor_control/selection/init.py
+++ b/bec_widgets/widgets/motor_control/selection/init.py
--- a/bec_widgets/widgets/motor_map/assets/connection.svg
+++ b/bec_widgets/widgets/motor_map/assets/connection.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 0 24 24" width="48px" fill="#FFFFFF">
+    <path d="M0 0h24v24H0V0z" fill="none"/>
+    <path d="M17 7h-4v2h4c1.65 0 3 1.35 3 3s-1.35 3-3 3h-4v2h4c2.76 0 5-2.24 5-5s-2.24-5-5-5zm-6 8H7c-1.65 0-3-1.35-3-3s1.35-3 3-3h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-2zm-3-4h8v2H8z"/>
+</svg>
--- a/bec_widgets/widgets/motor_map/assets/history.svg
+++ b/bec_widgets/widgets/motor_map/assets/history.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 0 24 24" width="48px" fill="#FFFFFF">
+    <path d="M0 0h24v24H0V0z" fill="none"/>
+    <path d="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89.07.14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13 21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.25 2.52.77-1.28-3.52-2.09V8z"/>
+</svg>
--- a/bec_widgets/widgets/motor_map/assets/motor_map.png
+++ b/bec_widgets/widgets/motor_map/assets/motor_map.png
--- a/bec_widgets/widgets/motor_map/assets/settings.svg
+++ b/bec_widgets/widgets/motor_map/assets/settings.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 0 24 24" width="48px" fill="#FFFFFF">
+    <path d="M0 0h24v24H0V0z" fill="none"/>
+    <path d="M19.43 12.98c.04-.32.07-.64.07-.98 0-.34-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.09-.16-.26-.25-.44-.25-.06 0-.12.01-.17.03l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.06-.02-.12-.03-.18-.03-.17 0-.34.09-.43.25l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98 0 .33.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.09.16.26.25.44.25.06 0 .12-.01.17-.03l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.06.02.12.03.18.03.17 0 .34-.09.43-.25l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zm-1.98-1.71c.04.31.05.52.05.73 0 .21-.02.43-.05.73l-.14 1.13.89.7 1.08.84-.7 1.21-1.27-.51-1.04-.42-.9.68c-.43.32-.84.56-1.25.73l-1.06.43-.16 1.13-.2 1.35h-1.4l-.19-1.35-.16-1.13-1.06-.43c-.43-.18-.83-.41-1.23-.71l-.91-.7-1.06.43-1.27.51-.7-1.21 1.08-.84.89-.7-.14-1.13c-.03-.31-.05-.54-.05-.74s.02-.43.05-.73l.14-1.13-.89-.7-1.08-.84.7-1.21 1.27.51 1.04.42.9-.68c.43-.32.84-.56 1.25-.73l1.06-.43.16-1.13.2-1.35h1.39l.19 1.35.16 1.13 1.06.43c.43.18.83.41 1.23.71l.91.7 1.06-.43 1.27-.51.7 1.21-1.07.85-.89.7.14 1.13zM12 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 6c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"/>
+</svg>
--- a/bec_widgets/widgets/motor_map/bec_motor_map_widget.pyproject
+++ b/bec_widgets/widgets/motor_map/bec_motor_map_widget.pyproject
@@ -0,0 +1 @@
+{'files': ['motor_map_widget.py','motor_map_widget_plugin.py']}
--- a/bec_widgets/widgets/motor_map/bec_motor_map_widget_plugin.py
+++ b/bec_widgets/widgets/motor_map/bec_motor_map_widget_plugin.py
@@ -0,0 +1,55 @@
+import os
+
+from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtGui import QIcon
+
+from bec_widgets.widgets.motor_map.motor_map_widget import BECMotorMapWidget
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='BECMotorMapWidget' name='bec_motor_map_widget'>
+    </widget>
+</ui>
+"""
+
+
+class BECMotorMapWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = BECMotorMapWidget(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return "BEC Visualization Widgets"
+
+    def icon(self):
+        current_path = os.path.dirname(__file__)
+        icon_path = os.path.join(current_path, "assets", "motor_map.png")
+        return QIcon(icon_path)
+
+    def includeFile(self):
+        return "bec_motor_map_widget"
+
+    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 "BECMotorMapWidget"
+
+    def toolTip(self):
+        return "BECMotorMapWidget"
+
+    def whatsThis(self):
+        return self.toolTip()
--- a/bec_widgets/widgets/motor_map/motor_map_dialog/init.py
+++ b/bec_widgets/widgets/motor_map/motor_map_dialog/init.py
--- a/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py
+++ b/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py
@@ -0,0 +1,47 @@
+import os
+
+from qtpy.QtCore import Slot
+from qtpy.QtWidgets import QVBoxLayout
+
+from bec_widgets.qt_utils.settings_dialog import SettingWidget
+from bec_widgets.utils import UILoader
+from bec_widgets.utils.widget_io import WidgetIO
+
+
+class MotorMapSettings(SettingWidget):
+    def __init__(self, parent=None, *args, **kwargs):
+        super().__init__(parent, *args, **kwargs)
+        current_path = os.path.dirname(__file__)
+
+        self.ui = UILoader(self).loader(os.path.join(current_path, "motor_map_settings.ui"))
+
+        self.layout = QVBoxLayout(self)
+        self.layout.addWidget(self.ui)
+
+    @Slot(dict)
+    def display_current_settings(self, config: dict):
+        WidgetIO.set_value(self.ui.max_points, config["max_points"])
+        WidgetIO.set_value(self.ui.trace_dim, config["num_dim_points"])
+        WidgetIO.set_value(self.ui.precision, config["precision"])
+        WidgetIO.set_value(self.ui.scatter_size, config["scatter_size"])
+        background_intensity = int((config["background_value"] / 255) * 100)
+        WidgetIO.set_value(self.ui.background_value, background_intensity)
+        color = config["color"]
+        self.ui.color.setColor(color)
+
+    @Slot()
+    def accept_changes(self):
+        max_points = WidgetIO.get_value(self.ui.max_points)
+        num_dim_points = WidgetIO.get_value(self.ui.trace_dim)
+        precision = WidgetIO.get_value(self.ui.precision)
+        scatter_size = WidgetIO.get_value(self.ui.scatter_size)
+        background_intensity = int(WidgetIO.get_value(self.ui.background_value) * 0.01 * 255)
+        color = self.ui.color.get_color("RGBA")
+
+        if self.target_widget is not None:
+            self.target_widget.set_max_points(max_points)
+            self.target_widget.set_num_dim_points(num_dim_points)
+            self.target_widget.set_precision(precision)
+            self.target_widget.set_scatter_size(scatter_size)
+            self.target_widget.set_background_value(background_intensity)
+            self.target_widget.set_color(color)
--- a/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.ui
+++ b/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.ui
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>243</width>
+    <height>233</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="3" column="1">
+    <widget class="QSpinBox" name="scatter_size">
+     <property name="maximum">
+      <number>20</number>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="trace_label">
+     <property name="text">
+      <string>Trace Dim</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="precision_label">
+     <property name="text">
+      <string>Precision</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="background_label">
+     <property name="text">
+      <string>Background Intensity</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QSpinBox" name="precision">
+     <property name="maximum">
+      <number>15</number>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QSpinBox" name="background_value">
+     <property name="maximum">
+      <number>100</number>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="max_point_label">
+     <property name="text">
+      <string>Max Points</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="scatter_size_label">
+     <property name="text">
+      <string>Scatter Size</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QSpinBox" name="max_points">
+     <property name="maximum">
+      <number>10000</number>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QSpinBox" name="trace_dim">
+     <property name="maximum">
+      <number>1000</number>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="color_label">
+     <property name="text">
+      <string>Color</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="ColorButton" name="color"/>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ColorButton</class>
+   <extends>QPushButton</extends>
+   <header>color_button</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
--- a/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py
+++ b/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py
@@ -0,0 +1,59 @@
+import os
+
+from qtpy.QtCore import QSize
+from qtpy.QtGui import QAction, QIcon
+from qtpy.QtWidgets import QHBoxLayout, QLabel, QWidget
+
+from bec_widgets.qt_utils.toolbar import ToolBarAction
+from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
+
+
+class DeviceSelectionAction(ToolBarAction):
+    def __init__(self, label: str):
+        self.label = label
+        self.device_combobox = DeviceComboBox(device_filter="Positioner")
+
+        self.device_combobox.currentIndexChanged.connect(lambda: self.set_combobox_style("#ffa700"))
+
+    def add_to_toolbar(self, toolbar, target):
+        widget = QWidget()
+        layout = QHBoxLayout(widget)
+
+        label = QLabel(f"{self.label}")
+
+        layout.addWidget(label)
+        layout.addWidget(self.device_combobox)
+        toolbar.addWidget(widget)
+
+    def set_combobox_style(self, color: str):
+        self.device_combobox.setStyleSheet(f"QComboBox {{ background-color: {color}; }}")
+
+
+class ConnectAction(ToolBarAction):
+    def add_to_toolbar(self, toolbar, target):
+        current_path = os.path.dirname(__file__)
+        parent_path = os.path.dirname(current_path)
+        icon = QIcon()
+        icon.addFile(os.path.join(parent_path, "assets", "connection.svg"), size=QSize(20, 20))
+        self.action = QAction(icon, "Connect Motors", target)
+        toolbar.addAction(self.action)
+
+
+class ResetHistoryAction(ToolBarAction):
+    def add_to_toolbar(self, toolbar, target):
+        current_path = os.path.dirname(__file__)
+        parent_path = os.path.dirname(current_path)
+        icon = QIcon()
+        icon.addFile(os.path.join(parent_path, "assets", "history.svg"), size=QSize(20, 20))
+        self.action = QAction(icon, "Reset Trace History", target)
+        toolbar.addAction(self.action)
+
+
+class SettingsAction(ToolBarAction):
+    def add_to_toolbar(self, toolbar, target):
+        current_path = os.path.dirname(__file__)
+        parent_path = os.path.dirname(current_path)
+        icon = QIcon()
+        icon.addFile(os.path.join(parent_path, "assets", "settings.svg"), size=QSize(20, 20))
+        self.action = QAction(icon, "Open Configuration Dialog", target)
+        toolbar.addAction(self.action)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
wyzula-jan	5d1879e8e7	feat(qt_utils): added warning utility with simple API to setup warning message	2024-07-16 17:47:27 +02:00
wyzula-jan	9ce2279533	feat(qt_utils): added error handle utility with popup messageBoxes	2024-07-16 17:47:19 +02:00
semantic-release	9a91583ed0	0.85.0 Automatically generated by python-semantic-release	2024-07-16 10:53:17 +00:00
wyzula-jan	b98fd00ade	feat(color_map_selector): added colormap selector with plugin	2024-07-15 22:26:14 +02:00
semantic-release	d5c5e12589	0.84.0 Automatically generated by python-semantic-release	2024-07-15 15:23:17 +00:00
wyzula-jan	e495fd30c4	fix(waveform): timestamp are not converted to human readable format	2024-07-15 16:51:22 +02:00
wyzula-jan	8516a1d639	fix(waveform): set_x method various bugs fixed	2024-07-14 19:32:38 +02:00
wyzula-jan	006992e43c	test(waveform): tests extended	2024-07-14 19:32:36 +02:00
wyzula-jan	48911e9348	refactor(waveform): plot can be prompted without specifying kwargs	2024-07-14 19:29:32 +02:00
wyzula-jan	e4e1a905d1	fix(waveform): x axis switching logic fixed when axis are not compatible	2024-07-14 19:29:32 +02:00
wyzula-jan	fc935d9fc8	refactor(jupyter_console_window): added more examples of waveforms	2024-07-14 19:13:15 +02:00
wyzula-jan	0c6a9f2310	feat(waveform): async readback update implemented for async devices	2024-07-14 19:12:19 +02:00
wyzula-jan	d23fd8bd07	fix(waveform): dap leaked RID for all daps in current process; dap RID is now f"{scan_id}-{gui_id}" to distinguish for each plot instance	2024-07-14 19:12:19 +02:00
wyzula-jan	9d6ae87d0f	fix(waveform): only one type of x axis allowed; x mode validated	2024-07-14 19:12:19 +02:00
wyzula-jan	fc5a8bdd8b	fix(waveform): data for axis are taken by separate method; validation consolidated	2024-07-14 19:12:19 +02:00
wyzula-jan	b8717f1327	feat(waveform): data are taken directly from ScanItem which is defined from scan_status endpoint; scan update is triggered from scan_segment; plots can be added just specifying y_name -> best effort for setting x reported device	2024-07-14 19:12:19 +02:00
wyzula-jan	0aa317aae5	fix(bec_dispatcher): connect_slot can accept kwargs	2024-07-14 19:12:19 +02:00
semantic-release	edc19bdff8	0.83.1 Automatically generated by python-semantic-release	2024-07-14 17:09:51 +00:00
wyzula-jan	11a7204c98	test(toolbar): added reference pngs for spinner for Darwin	2024-07-14 16:49:33 +02:00
wyzula-jan	eab7883979	fix(toolbar): default transparent background	2024-07-14 16:49:04 +02:00
Mathias Guijarro	2d4249e73a	fix: use apply_theme	2024-07-10 15:36:32 +02:00
Mathias Guijarro	63db1352ee	fix: spinner: update reference image for widget test, use apply_theme	2024-07-10 15:36:06 +02:00
Mathias Guijarro	8308115f36	fix: replace pyqtdarktheme by qdarkstyle, add 'apply_theme' function (in utils/colors.py)	2024-07-10 15:36:06 +02:00
semantic-release	02fce838db	0.83.0 Automatically generated by python-semantic-release	2024-07-08 22:48:46 +00:00
wakonig_k	360d171355	fix(terminal): added default args to avoid designer crashes on startup	2024-07-09 00:40:15 +02:00
wakonig_k	eb26e2a11b	test(vscode): fixed vscode tests for new cleanup routine	2024-07-09 00:40:15 +02:00
wakonig_k	2b29e34b52	fix(widget): fixed widget cleanup routine	2024-07-09 00:40:15 +02:00
wakonig_k	fd8766ed87	fix(bec_widget): added cleanup method to bec widget base class	2024-07-09 00:40:15 +02:00
wakonig_k	5de8804da1	test(vscode): improved vscode test	2024-07-09 00:40:15 +02:00
wakonig_k	2988fd387e	feat: added reference utils to compare renderings of widgets	2024-07-09 00:40:15 +02:00
wakonig_k	1b017edfad	feat(widgets): added device box with spinner	2024-07-09 00:40:15 +02:00
wakonig_k	903ce7d46b	fix(website): fixed dummy input	2024-07-09 00:40:15 +02:00
wakonig_k	41bcb80167	feat(designer): added option to skip the widget validation for DesignerPluginGenerator	2024-07-09 00:40:15 +02:00
semantic-release	d3f85060ca	0.82.2 Automatically generated by python-semantic-release	2024-07-08 14:24:06 +00:00
wakonig_k	90178e2f61	fix(rpc_server): pass cli config to server	2024-07-07 23:25:45 +02:00
semantic-release	b9f9a003a2	0.82.1 Automatically generated by python-semantic-release	2024-07-07 21:12:19 +00:00
wyzula-jan	734f4c7750	tests(motor_map_widget): tests added	2024-07-07 22:59:02 +02:00
wyzula-jan	c78cd898f2	fix(motor_map): bug where motors without limits were selected	2024-07-07 22:59:02 +02:00
wyzula-jan	74a249bd06	test(setting_dialog): tests added	2024-07-07 22:59:02 +02:00
wyzula-jan	2020953b93	feat(settings_dialog):apply button	2024-07-07 22:59:02 +02:00
wyzula-jan	3826bb3d9e	refactor(setting_dialog): moved to qt_utils	2024-07-07 22:59:02 +02:00
wyzula-jan	7ffc06f3c7	refactor(toolbar): toolbar moved from widgets to qt_utils	2024-07-07 22:59:02 +02:00
semantic-release	eea1a75d4a	0.82.0 Automatically generated by python-semantic-release	2024-07-07 20:58:30 +00:00
wakonig_k	b9bff38b64	feat(toggle): added angular component-like toggle	2024-07-07 22:50:25 +02:00
wyzula-jan	f04862933f	refactor(device_input): DeviceComboBox and DeviceLineEdit moved to top layer of widgets	2024-07-07 18:53:32 +02:00
wyzula-jan	f5b8375fd3	refactor(stop_button): moved to top layer, plugin added	2024-07-07 18:53:32 +02:00
wyzula-jan	db1cdf4280	refactor(motor_map_widget): removed restriction of only PySide6 for widget	2024-07-07 18:42:51 +02:00
wyzula-jan	fa1e86ff07	refactor(color_button): ColorButton moved to top level of widgets	2024-07-07 18:42:51 +02:00
semantic-release	9a95454723	0.81.2 Automatically generated by python-semantic-release	2024-07-07 16:28:57 +00:00
wyzula-jan	dd1875ea5c	fix(waveform): scan_history error check for IndexError	2024-07-07 18:21:08 +02:00
semantic-release	df4fabb32a	0.81.1 Automatically generated by python-semantic-release	2024-07-07 11:45:09 +00:00
wyzula-jan	99114f14f6	fix(motor_control): temporary remove of motor control widgets	2024-07-07 11:41:07 +02:00
semantic-release	fc3a69bbb0	0.81.0 Automatically generated by python-semantic-release	2024-07-06 12:24:27 +00:00
wyzula-jan	9594be2606	feat(color_button): can get colors in RGBA or HEX	2024-07-06 12:31:29 +02:00
semantic-release	96fd239608	0.80.1 Automatically generated by python-semantic-release	2024-07-06 10:24:27 +00:00
wyzula-jan	61de7e9e22	fix(entry_validator): check for entry == ""	2024-07-06 12:16:29 +02:00
semantic-release	24c4cdc39f	0.80.0 Automatically generated by python-semantic-release	2024-07-06 10:14:47 +00:00
wakonig_k	fadbf77866	feat(qt5): dropped support for qt5; pyside2 and pyqt5	2024-07-06 12:00:35 +02:00
wakonig_k	03819a3d90	feat(plugins): moved plugin dict to dataclass and container	2024-07-06 12:00:35 +02:00
wakonig_k	d6d0777113	feat(plugins): added support for pyqt6 ui files	2024-07-05 22:50:19 +02:00
wakonig_k	1aa83e0ef1	feat(plugins): added bec widgets base class	2024-07-05 21:22:51 +02:00
semantic-release	b09c644e01	0.79.3 Automatically generated by python-semantic-release	2024-07-05 08:25:43 +00:00
appel_c	e403870874	fix: changed inheritance to adress qt designer bug in rendering	2024-07-05 08:06:10 +02:00
appel_c	1586ce2d6c	fix: add designer plugin classes	2024-07-05 08:05:20 +02:00
appel_c	576353cfe8	refactor: simplify logic in bec_status_box	2024-07-05 08:05:20 +02:00
semantic-release	cefc415c98	0.79.2 Automatically generated by python-semantic-release	2024-07-04 22:45:13 +00:00
Mathias Guijarro	bc0ef7893e	fix: overwrite closeEvent and call super class	2024-07-04 17:27:29 +02:00
semantic-release	0e802d8194	0.79.1 Automatically generated by python-semantic-release	2024-07-03 09:34:03 +00:00
Mathias Guijarro	d7718d4dcb	fix: use libdir env var to preload Python library, also for Linux platform	2024-07-03 11:07:30 +02:00
semantic-release	4c2e02e912	0.79.0 Automatically generated by python-semantic-release	2024-07-03 08:45:07 +00:00
wyzula-jan	b8774e0b0b	fix(toolbar): change default color to black to match BECFigure theme	2024-07-03 10:34:05 +02:00
wyzula-jan	6e75642090	feat(motor_map_widget): standalone MotorMap Widget with toolbar + plugin	2024-07-03 10:34:05 +02:00
wyzula-jan	aaa0d1003d	fix(motor_map): fixed bug with residual trace after changing motors	2024-07-03 10:34:05 +02:00
wyzula-jan	5960918137	feat(motor_map): method to reset history trace	2024-07-03 10:34:05 +02:00
wyzula-jan	3dc0532df0	fix(widget_io): widget handler adjusted for spinboxes and comboboxes	2024-07-03 10:34:05 +02:00
wyzula-jan	96863adf53	refactor(toolbar): cleanup and adjusted colors	2024-07-03 10:34:05 +02:00
semantic-release	08425a623e	0.78.1 Automatically generated by python-semantic-release	2024-07-02 21:06:54 +00:00
wyzula-jan	b787759f44	fix(ui_loader): ui loader is compatible with bec plugins	2024-07-02 22:07:24 +02:00
semantic-release	25ef7c05e6	0.78.0 Automatically generated by python-semantic-release	2024-07-02 20:03:45 +00:00
wyzula-jan	c36bb80d6a	feat(color_button): patched ColorButton from pyqtgraph to be able to be opened in another QDialog	2024-07-02 20:54:39 +02:00
				`@@ -1 +0,0 @@`
				`from .stop_button.stop_button import StopButton`
				`@@ -0,0 +1 @@`
				`{'files': ['motor_map_widget.py','motor_map_widget_plugin.py']}`