fix(test): add a temporary test

fix(bec dispatcher): make a new BECClient in _BECDispatcher constructor and process events while waiting
fix: producer->connector, remove unused '_rpc_update_handler' static method
2026-04-08 01:37:53 +02:00 · 2024-02-27 14:09:54 +01:00 · 2024-02-27 14:09:54 +01:00 · 2024-02-27 14:09:54 +01:00
135 changed files with 6517 additions and 7094 deletions
--- a/.git_hooks/pre-commit
+++ b/.git_hooks/pre-commit
@@ -1,3 +1,2 @@
-black --line-length=100 $(git diff --cached --name-only --diff-filter=ACM -- '*.py')
-isort --line-length=100 --profile=black --multi-line=3 --trailing-comma $(git diff --cached --name-only --diff-filter=ACM -- '*.py')
-git add $(git diff --cached --name-only --diff-filter=ACM -- '*.py')
+black --line-length=100 $(git diff --cached --name-only --diff-filter=ACM -- '***.py')
+git add $(git diff --cached --name-only --diff-filter=ACM -- '***.py')
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,24 +1,10 @@
 # This file is a template, and might need editing before it works on your project.
 # Official language image. Look for the different tagged releases at:
 # https://hub.docker.com/r/library/python/tags/
-image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.10
+image: $CI_DOCKER_REGISTRY/python:3.9
 #commands to run in the Docker container before starting each job.
 variables:
  DOCKER_TLS_CERTDIR: ""
-  BEC_CORE_BRANCH: "main"
-  OPHYD_DEVICES_BRANCH: "main"
-  CHILD_PIPELINE_BRANCH: "main"
-
-workflow:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-    - if: $CI_PIPELINE_SOURCE == "parent_pipeline"
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
-      when: never
-    - if: $CI_COMMIT_BRANCH

 include:
  - template: Security/Secret-Detection.gitlab-ci.yml
@@ -29,30 +15,20 @@ stages:
  - Formatter
  - test
  - AdditionalTests
-  - End2End
  - Deploy

-before_script:
-  - if [[ "$CI_PROJECT_PATH" != "bec/bec_widgets" ]]; then 
-    test -d bec_widgets || git clone --branch $CHILD_PIPELINE_BRANCH https://gitlab.psi.ch/bec/bec_widgets.git; cd bec_widgets;
-    fi
-
 formatter:
  stage: Formatter
  needs: []
  script:
-    - pip install black isort
-    - isort --check --diff ./
-    - black --check --diff --color ./
-  rules:
-    - if: $CI_PROJECT_PATH == "bec/bec_widgets"
-
+    - pip install black
+    - black --check --diff --color --line-length=100 ./
 pylint:
  stage: Formatter
  needs: []
  before_script:
    - pip install pylint pylint-exit anybadge
-    - pip install -e .[dev,pyqt6]
+    - pip install -e .[dev]
  script:
    - mkdir ./pylint
    - pylint ./bec_widgets --output-format=text --output=./pylint/pylint.log | tee ./pylint/pylint.log || pylint-exit $?
@@ -63,8 +39,6 @@ pylint:
    paths:
      - ./pylint/
    expire_in: 1 week
-  rules:
-    - if: $CI_PROJECT_PATH == "bec/bec_widgets"    

 pylint-check:
  stage: Formatter
@@ -96,8 +70,6 @@ pylint-check:
    paths:
      - ./pylint/
    expire_in: 1 week
-  rules:
-    - if: $CI_PROJECT_PATH == "bec/bec_widgets"    

 tests:
  stage: test
@@ -105,14 +77,10 @@ tests:
  variables:
      QT_QPA_PLATFORM: "offscreen"
  script:
-    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
-    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
-    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
    - apt-get update
    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
-    - pip install -e ./bec/bec_lib[dev]
-    - pip install -e .[dev,pyqt6]
-    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - pip install .[dev]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests
    - coverage report
    - coverage xml
  coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
@@ -123,65 +91,35 @@ tests:
        coverage_format: cobertura
        path: coverage.xml

+#tests-3.9-pyqt5: #todo enable when we decide what qt distributions we want to support
+#  extends: "tests"
+#  stage: AdditionalTests
+#  image: $CI_DOCKER_REGISTRY/python:3.9
+#  script:
+#    - apt-get update
+#    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+#    - pip install .[dev,pyqt5]
+#    - pytest -v --random-order ./tests
+
+tests-3.10:
+  extends: "tests"
+  stage: AdditionalTests
+  image: $CI_DOCKER_REGISTRY/python:3.10
+  allow_failure: true
+

 tests-3.11:
  extends: "tests"
  stage: AdditionalTests
-  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.11
+  image: $CI_DOCKER_REGISTRY/python:3.11
  allow_failure: true

 tests-3.12:
  extends: "tests"
  stage: AdditionalTests
-  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.12
+  image: $CI_DOCKER_REGISTRY/python:3.12
  allow_failure: true

-end-2-end-conda:
-  stage: End2End
-  needs: []
-  image: continuumio/miniconda3
-  allow_failure: false
-  variables:
-    QT_QPA_PLATFORM: "offscreen"
-  script:
-    - apt-get update
-    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
-    - conda config --prepend channels conda-forge
-    - conda config --set channel_priority strict
-    - conda config --set always_yes yes --set changeps1 no
-    - conda create -q -n test-environment python=3.10
-    - conda init bash
-    - source ~/.bashrc
-    - conda activate test-environment
-
-    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
-    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
-    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
-
-    - cd ./bec
-    - source ./bin/install_bec_dev.sh -t
-
-    - pip install -e ./bec_lib[dev]
-    - pip install -e ./bec_ipython_client[dev]
-    - cd ../
-    - pip install -e .[dev,pyqt6]
-    - cd ./tests/end-2-end
-    - pytest --start-servers --flush-redis --random-order
-
-  artifacts:
-    when: on_failure
-    paths:
-      - ./logs/*.log
-    expire_in: 1 week
-
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
-    - if: '$CI_PIPELINE_SOURCE == "web"'
-    - if: '$CI_PIPELINE_SOURCE == "pipeline"'
-    - if: '$CI_PIPELINE_SOURCE == "parent_pipeline"'
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"'
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "production"'
-

 semver:
  stage: Deploy
@@ -197,19 +135,19 @@ semver:
    - git fetch --tags
    - git tag

-    # build and publish package
-    - pip install python-semantic-release==9.* wheel build twine
+    # build
+    - pip install python-semantic-release==7.* wheel
    - export GL_TOKEN=$CI_UPDATES
-    - semantic-release -vv version
-    
-    # check if any artifacts were created
-    - if [ ! -d dist ]; then echo No release will be made; exit 0; fi
-    - twine upload dist/* -u __token__ -p $CI_PYPI_TOKEN --skip-existing
-    - semantic-release publish
+    - export REPOSITORY_USERNAME=__token__
+    - export REPOSITORY_PASSWORD=$CI_PYPI_TOKEN
+    - >
+      semantic-release publish -v DEBUG 
+      -D version_variable=./setup.py:__version__  
+      -D hvcs=gitlab 

  allow_failure: false
  rules:
-    - if: '$CI_COMMIT_REF_NAME == "main" && $CI_PROJECT_PATH == "bec/bec_widgets"'
+    - if: '$CI_COMMIT_REF_NAME == "master"'

 pages:
  stage: Deploy
@@ -220,6 +158,6 @@ pages:
    - if: '$CI_COMMIT_TAG != null'
      variables:
        TARGET_BRANCH: $CI_COMMIT_TAG
-    - if: '$CI_COMMIT_REF_NAME == "main" && $CI_PROJECT_PATH == "bec/bec_widgets"'
+    - if: '$CI_COMMIT_REF_NAME == "master"'
  script:
    - curl -X POST -d "branches=$CI_COMMIT_REF_NAME" -d "token=$RTD_TOKEN" https://readthedocs.org/api/v2/webhook/bec-widgets/253243/
--- a/.pylintrc
+++ b/.pylintrc
@@ -52,7 +52,7 @@ persistent=yes

 # Minimum Python version to use for version dependent checks. Will default to
 # the version used to run pylint.
-py-version=3.10
+py-version=3.9

 # When enabled, pylint would attempt to guess common misconfiguration and emit
 # user-friendly hints instead of false-positive error messages.
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -9,7 +9,7 @@ version: 2
 build:
  os: ubuntu-20.04
  tools:
-    python: "3.10"
+    python: "3.9"

 # Build documentation in the docs/ directory with Sphinx
 sphinx:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,176 +1,859 @@
-# CHANGELOG
+# Changelog

+<!--next-version-placeholder-->

-
-## v0.53.1 (2024-05-09)
-
-### Ci
-
-* ci: fixed rtd pages url ([`8ff3610`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8ff36105d1e637c429915b4bfc2852d54a3c6f19))
+## v0.41.1 (2024-02-26)

 ### Fix

-* fix: docs config ([`0f6a5e5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0f6a5e5fa9530969c98a9266c9ca7b89a378ff70))
+* **bec_dispatcher:** Handle redis connection errors more gracefully ([`a2ed2eb`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a2ed2ebe00c623eb183b03f8182ffd672fbf9e1e))
+* **bec_dispatcher:** Adapt code to redis connector refactoring ([`8127fc2`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/8127fc2960bebd3e862dbe55ac9401af4a6dccb6))

+## v0.41.0 (2024-02-26)

-## v0.53.0 (2024-05-09)
+### Feature

-### Ci
+* **widgets/waveform1d:** Data can be exported from rendered curve ([`5fc8047`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/5fc8047c8ff971cdc2807d02743eae56d288f4d7))
+* **widgets/figure:** Clear_all method for BECFigure ([`0363fd5`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/0363fd5194320a7ea868ef883f8022ea464d0298))
+* **widgets/Waveform1D:** Waveform1D can be fully constructed by config ([`9a5c86e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/9a5c86ea35178b9cab270fc35e668dd22f3ec8da))
+* **widgets/figure.py:** Dark/light theme changer ([`08534a4`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/08534a4739ec8e85d82a00ab639411dd0198e9d8))
+* **utils/entry_validator:** Possibility to validate add_scan_curve with current BEC session ([`1db77b9`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/1db77b969bcf9b38716ae3d38bf4695b2b8c1f37))
+* **cli:** Added cli interface, rebased ([`a61bf36`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a61bf36df5d54ad44f78479c2474c4e38e68ed26))
+* Curve can be modified after adding to the plot ([`684592a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/684592ae37e9dd5328a96018c78ca242e10395b2))
+* Waveform1d.py curves can be removed by identifier by order(int) or by curve_id(str) ([`f0ed243`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/f0ed243c9197b7d1aab0d99a15e9ba175708ec90))
+* Waveform1d.py curves can be stylised; access scan history by index or scanID ([`cba3863`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/cba3863e5a9ac1187ea643be67db6cfc36b44ee2))
+* Start method for BECFigure, jupyter console .ui added to git ([`1d26b23`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/1d26b2322147d9ea5a6a245e1648c00986f80881))
+* Added @user_access from bec_lib.utils ([`b827e9e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b827e9eaa77f8b64433bb7a54e40ab5ccd86f4b6))
+* Plot can be removed from BECFigure ([`60d150a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/60d150a41193aa7659285cf3612965f1a3c57244))
+* Figure.py create widget factory ([`c781b1b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/c781b1b4e4121c4ec6fc8871a4cdf6f494913138))
+* Waveform1d.py draft ([`565e475`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/565e475ace72ccc103d71ea98af1dcaf04f37861))
+* Rpc decorator to add methods to USER_ACCESS ([`b676877`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b6768772424a3ad5ee7e271de19131f8065eef09))
+* BECFigure and BECPlotBase created ([`9ef331c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/9ef331c272b88f725de9b8497fdf906056c0738b))
+* BECConnector -> mixin class for all BEC Widget to hook them to BEC client ([`91447a2`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/91447a2d6234de1e8f2bac792e822bfda556abba))

-* ci: use formatter config of toml file ([`5cc816d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5cc816d0af73e20c648e044a027c589704ab1625))
+### Fix
+
+* **cli/client_utils:** "__rpc__" pop from msg_results ([`ebb36f6`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ebb36f62ddc1c5013435f9e7727648b977b6b732))
+* **tests:** BECDispatcher fixture putted back ([`644f103`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/644f1031f6ff27064111565b0882cb8b2544aa2f))
+* **cli/rpc:** Rpc client can return any type of object + config dict of the widgets ([`fd711b4`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/fd711b475f268fbdb59739da0a428f0355b25bac))
+* **cli/rpc:** Server access children widget.find_widget_by_id(gui_id) ([`57132a4`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/57132a472165c55bf99e1994d09f5fe3586c24da))
+* **cli:** Fixed property access, rebased ([`f71dc5c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/f71dc5c5abdd6b8b585cb9b502b11ef513d7813e))
+* **rpc_server:** Fixed gui_id lookup ([`4630d78`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/4630d78fc28109da7daf53e49dd3cdb9b8084941))
+* **cli:** Fixed rpc construction of nested widgets ([`da640e8`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/da640e888d575b536fdd5d7adbf1df3eda802219))
+* **plots/waveform1d:** Pandas import clean up, export curves with none skipped ([`35cd4fd`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/35cd4fd6f176ba670fad5d9fec44b305094280d6))
+* **widgets/plots:** Added placeholder for cleanup method to BECPlotBase ([`24c7737`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/24c77376b232c3846a1d6be360ec46acc077b48d))
+* **widget/figure:** Add cleanup method to disconnect all slots before removing Waveform1D from layout ([`a28b9c8`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a28b9c8981d1058e4dc4146463f16c53413e8db9))
+* **rpc:** Added annotations to pass py3.9 tests ([`c6bdf0b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/c6bdf0b6a5b12c054863b101a3944efc366686cb))
+* **rpc:** Connection to on_rpc_update done through bec_dispatcher ([`1c2fb8b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/1c2fb8b972d4cb28cead11989461aea010c4571d))
+* After removing plot from BECFigure, the coordinates are correctly resigned ([`d678a85`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/d678a85957c13c1fda2b52692c0d3b9b7ff40834))
+* Removed DI references, fixed set when adding plot by fig ([`7c15d75`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/7c15d750117aec9e75111853074630a44dca87ae))
+
+## v0.40.1 (2024-02-23)
+
+### Fix
+
+* **utils/bec_dispatcher:** _do_disconnect_slot will shutdown consumer of slots/signals which were already disconnected ([`feca7a3`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/feca7a3dcde6d0befa415db64fc8f9bbf0c06e52))
+
+## v0.40.0 (2024-02-16)
+
+### Feature
+
+* **utils.colors:** Golden_angle_color utility can return colors as a  list of QColor, RGB or HEC ([`5125909`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/51259097fa23ff861eac3f7c63624ea591bf1bd3))
+
+## v0.39.0 (2024-02-12)
+
+### Feature
+
+* Added full app with all motor movement related widgets into motor_control_compilations.py ([`fa4ca93`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/fa4ca935bb39fdba4c6500ce9569d47400190e65))
+* MotorCoordinateTable mode_switch added for "Individual" and "Start/Stop" modes ([`2f96e10`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/2f96e10b9deb76eedd8f6b6e201ba3b0e526a6f0))
+* Motor_control.py MotorCoordinateTable added basic version to store coordinates and show them in motor_map.py ([`031cb09`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/031cb094e7f8a7be4a295bea99b7ca8e095db8d7))
+* Active motors from motor_map.py can be changed by slot without changing the whole config ([`17f1458`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/17f14581d7c4662a2f5814ea477dfae8ef6de555))
+* Control panels compilations ([`8361736`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/83617366796ce2926650e38a1a9cec296befd3c6))
+* Comboboxes of motor selection are changed to orange if the motors are not connected yet ([`0b9927f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/0b9927fcf5f46410d05187b2e5a83f97a6ca9246))
+* Motor_control.py MotorControl widgets - Absolute + Relative movement, MotorSelection, ErrorMessage popups ([`6fe08e6`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/6fe08e6b8206bcaaa292b7ff0e6b0d32b883f24f))
+
+## v0.38.2 (2024-02-07)
+
+### Fix
+
+* Adapt code to BEC 1.0 ([`b36131e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b36131eed5c3a3ea58c0fa4d083e63a3717cdf22))
+
+## v0.38.1 (2024-01-26)
+
+### Fix
+
+* Monitor.py replots last scan after changing config with new signals; config_dialog.py checks if the new config is valid with BEC ([`ab275b8`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ab275b8e5f226d6c5d22a844c4c0fae0fdc66108))

 ### Documentation

-* docs: update install instructions ([`57ee735`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/57ee735e5c2436d45a285507cdc939daa20e8e8f))
+* 2D waveform scatter plot changed to 2D scatter plot ([`812ffaf`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/812ffaf8eafc3f8c3a6973717149e4befba2c395))
+* Documentation for example apps and widgets updated ([`f7a4967`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/f7a496723c3fd113867a712928e06636e3212e1a))
+
+## v0.38.0 (2024-01-23)

 ### Feature

-* feat: moved to pyproject.toml; closes #162 ([`c86ce30`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c86ce302a964d71ee631f0817609ab5aa0e3ab0f))
+* BECMonitor2DScatter for plotting x/y/z signal as a mesh of scatter plot ([`75090b8`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/75090b857526fa642218986806d0daeb1dec0914))

 ### Fix

-* fix: fixed semver job and upgraded to v9 ([`32e1a9d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/32e1a9d8472eb1c25d30697d407a8ffecd04e75d))
+* Monitor_scatter_2D.py changed to new BECDispatcher definition ([`747e97e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/747e97e0c924cdedb85e9fe7d47512002b791b10))

-### Refactor
-
-* refactor: applied formatter ([`4117fd7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4117fd7b5b2090ff4fb7ad9e0d92cc87cd13ed5f))
-
-
-## v0.52.1 (2024-05-08)
+## v0.37.1 (2024-01-23)

 ### Fix

-* fix(docstrings): docstrings formating fixed for sphinx to properly format readdocs ([`7f2f7cd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7f2f7cd07a14876617cd83cedde8c281fdc52c3a))
+* **tests:** Ensure BEC service is shutdown after bec dispatcher test ([`4664568`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/46645686725a2acb7196dbd1a504c98dbf2e4b5d))
+* **tests:** Ensure threads started during plot tests are properly stopped ([`3fb6644`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/3fb6644543b4065236216b70a583641956a09a60))

-
-## v0.52.0 (2024-05-07)
-
-### Ci
-
-* ci: fixed support for child pipelines ([`e65c7f3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e65c7f3be895ada407bd358edf67d569d2cab08e))
+## v0.37.0 (2024-01-17)

 ### Feature

-* feat(utils/layout_manager): added GridLayoutManager to extend functionalities of native QGridLayout ([`fcd6ef0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fcd6ef0975dc872f69c9d6fb2b8a1ad04a423aae))
+* Independent motor_map widget ([`1a429b3`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/1a429b3024e76446ed530bee71ed797c20843fba))

-* feat(widget/dock): BECDock and BECDock area for dockable windows ([`d8ff8af`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d8ff8afcd474660a6069bbdab05f10a65f221727))
+## v0.36.2 (2024-01-17)

 ### Fix

-* fix(widgets/dock): BECDockArea close overwrites the default pyqtgraph Container close + minor improvements ([`ceae979`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ceae979f375ecc33c5c97148f197655c1ca57b6c))
+* Bec_dispatcher.py can partially disconnect topics from slot ([`7607d7a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/7607d7a3b64b3861f4833c9b8f5afc360f31b38d))
+* Bec_dispatcher.py can connect multiple topics to one callback slot ([`e51be04`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/e51be04b95f1a9549a4a3b00d76944aa58b0526a))

-### Refactor
+## v0.36.1 (2024-01-15)

-* refactor(widget/plots): WidgetConfig changed to SubplotConfig ([`03fa1f2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/03fa1f26d0fa6b58ed05556fb2438d1e62f6c107))
+### Fix

+* Motor_example.py fix to the new .read() structure from bec_lib ([`f9c5c82`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/f9c5c82381907a19582bf9132740fe27b48d48cc))

-## v0.51.0 (2024-05-07)
-
-### Build
-
-* build(cli): changed repo name to bec_widgets ([`799ea55`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/799ea554de9a7f3720d100be4886a63f02c6a390))
-
-* build(setup): fakeredis added to dev env ([`df32350`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/df323504fea024a97304d96c2e39e61450714069))
-
-* build(setup): PyQt6 version is set to 6.7 ([`0ab8aa3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0ab8aa3a2fe51b5c38b25fca44c1c422bb42478d))
-
-### Ci
-
-* ci: added rule for parent-child pipelines ([`e085125`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e0851250eecb85503db929d37f75d2ba366308a6))
+## v0.36.0 (2024-01-12)

 ### Feature

-* feat(utils): added plugin helper to find and load ([`5ece269`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5ece269adb0e9b0c2a468f1dfbaa6212e86d3561))
+* Bec_dispatcher can link multiple endpoints topics for one qt slot ([`58721be`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/58721bea1a2b4b06220ef0e3b2dcec8c1656213d))

-
-## v0.50.2 (2024-04-30)
-
-### Fix
-
-* fix: &#39;disconnect_slot&#39; has to be symmetric with &#39;connect_slot&#39; regarding QtThreadSafeCallback ([`0dfcaa4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0dfcaa4b708948af0a40ec7cf34d03ff1e96ffac))
-
-
-## v0.50.1 (2024-04-29)
-
-### Fix
-
-* fix(cli): BECFigure takes the port to connect to redis from the current BECClient, supporting plugins ([`57cb136`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/57cb136a098e87a452414bf44e627edb562f6799))
-
-
-## v0.50.0 (2024-04-29)
+## v0.35.0 (2024-01-12)

 ### Feature

-* feat(plots): universal cleanup and remove also for children items ([`381d713`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/381d713837bb9217c58ba1d8b89691aa35c9f5ec))
-
-* feat(rpc/rpc_register): singleton rpc register for all rpc connections for session ([`a898e7e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a898e7e4f14e9ae854703dddbd1eb8c50cb640ff))
+* Monitor.py can access custom data send through redis ([`6e4775a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/6e4775a1248153f6027be754054f3f43c18514d1))
+* Monitor.py access data directly from scan storage ([`26c07c3`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/26c07c3205debaf88a346410a8ebab0a3ab7a5d9))

 ### Fix

-* fix(widgets/figure): access pattern changed for getting widgets by coordinates for rpc ([`13c018a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/13c018a79704a7497c140df57179d294e43ecffa))
+* Monitor.py clear command from BECPlotter CLI clear now flush database and clear the plots ([`ebd4fcc`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ebd4fccda2321aa0dc108a5436fb4cc717911d4b))
+* Monitor.py crosshair enabled by default ([`97dcc5a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/97dcc5ac768cc4f0122382591238fd5a9d035270))
+* Monitor.py change import of ConfigDialog from relative to absolute in order to make BECPlotter be able to open it ([`6061b31`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/6061b3150e990141eafb8d5b17c7e931c7bf8631))
+* Monitor_config_validator.py changed to check .describe() instead of signals ([`5ab82bc`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/5ab82bc13340adb992c921a7211e8e2265861f7a))
+* Monitor.py fixed not updating config changes after receiving refresh from BECPlotter ([`00ef3ae`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/00ef3ae9256a368f4842c1dc38a407131181ec1d))
+* Monitor_config_validator.py valid color is Literal['black','white'] ([`86c5f25`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/86c5f25205dbaa45b7b2efd255f3a3cb2d3eb0b1))
+* Monitor.py fixed scan mode ([`a706da2`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a706da2490f4cce80e9515633e8437b3667b0db0))
+* Motor_config_validation changed to new monitor config structure ([`d67bdd2`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/d67bdd26167dca6c65627192dbd098af08355d06))

-* fix(plots): cleanup policy reviewed for children items ([`8f20a0b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8f20a0b3b1b5dd117b36b45645717190b9ee9cbf))
-
-* fix(rpc/client_utils): getoutput more transparent + error handling ([`6b6a6b2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6b6a6b2249f24d3d02bd5fcd7ef1c63ed794c304))
-
-* fix(rpc_register): thread lock for listign all connections ([`2ca3267`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2ca32675ec3f00137e2140259db51f6e5aa7bb71))
-
-### Test
-
-* test(cli/rpc_register): e2e RPCRegister ([`4f261be`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4f261be4c7cfe54501443d031f9266f4f838f6e2))
-
-* test(cli/rpc_register): rpc_register tests added ([`40eb75f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/40eb75f85a4d99d498b086a37e799276a9d2ac3f))
-
-
-## v0.49.1 (2024-04-26)
-
-### Build
-
-* build(pyqt6): fixing PyQt6-Qt6 package to 6.6.3 ([`a222298`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a22229849cbb57c15e4c1bae02d7e52e672f8c4c))
+## v0.34.1 (2023-12-12)

 ### Fix

-* fix(widgets/editor): qscintilla editor removed ([`ab85374`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ab8537483da6c87cb9a0b0f01706208c964f292d))
+* Formatter and tests fixed ([`186c42d`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/186c42d6676a495bc2f66d8b7ed37dbf7d0be747))

+### Documentation

-## v0.49.0 (2024-04-24)
+* Readdocs updated ([`af995a7`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/af995a74f34d59eeaff5d9100117f103ec79765d))
+* Readme.md updated ([`cba8131`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/cba81313671acfee0a40410753c1974008316d07))
+* Gitlab templates for issues and merge requests from main bec repo ([`831eddc`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/831eddc13600cc06b67de92d39509af37bb05002))
+
+## v0.34.0 (2023-12-08)

 ### Feature

-* feat(rpc/client_utils): timeout for rpc response ([`6500a00`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6500a00682a2a7ca535a138bd9496ed8470856a8))
+* Monitor.py error message popup ([`a3b24f9`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a3b24f92420420c8968ef4793342c3857c826e57))

 ### Fix

-* fix(rpc/client_utils): close clean up policy for BECFigure ([`9602085`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9602085f82cbc983f89b5bfe48bf35f08438fa87))
+* Monitor_config_validator.py - Signal validation changed from field_validator to model_validator to check first name and then entry ([`0868047`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/086804780d19956331d8385381d2f7f9c181e77c))
+* Monitor_config_validator.py fix entry validation executed only if name validator is successful ([`af71e35`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/af71e35e73733472228c4be0061faefaf655b769))

-
-## v0.48.0 (2024-04-24)
+## v0.33.0 (2023-12-07)

 ### Feature

-* feat(cli): added auto updates plugin support ([`6238693`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6238693ffb44b47a56b969bc4129f2af7a2c04fe))
+* Added axis_width and axis_color as optional plot settings ([`504944f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/504944f696a7b2881adec06d29c271fec7e2c981))

+### Fix

-## v0.47.0 (2024-04-23)
+* Fixed default config options ([`03bdf98`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/03bdf980bcfc37e217cde1beb258d11cee97e0eb))
+* Added hooks to react to incoming config messages and instructions ([`1084bc0`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/1084bc0a803ff73cfa2ab53819bc9809588fa622))
+
+## v0.32.2 (2023-12-06)
+
+### Fix
+
+* Changed exec_ to exec for all apps ([`080c258`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/080c258d1542aaace093bca74225297b30453f77))
+* Yaml_dialog.py changed to use native solution of OS -> should prevent crashing on py3.11 ([`5adde23`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/5adde23a457bbd3ae1488b77d4b927b5bded0473))
+
+## v0.32.1 (2023-12-06)
+
+### Fix
+
+* Widget_io print_widget_hierarchy fix comboboxes ([`d1f9979`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/d1f9979ab1372c2f650c8aff12ccb17d668b52eb))
+* WidgetIO combobox fixed for qt6 distributions ([`4f70097`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/4f700976ddd78a6f06e358950786b731ef9051ce))
+
+## v0.32.0 (2023-11-30)

 ### Feature

-* feat(utils/thread_checker): util class to check the thread leakage for closeEvent in qt ([`71cb80d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/71cb80d544c5f4ef499379a431ce0c17907c7ce8))
-
-### Refactor
-
-* refactor(utils/container_utils): part of the logic regarding locating widgets moved from BECFigure to utility class ([`77ff796`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/77ff7962cc91bce15d1c91b67b75b66fbea612c3))
-
-
-## v0.46.7 (2024-04-21)
+* Jupyter rich console added as alternative to default QTextEdit terminal output ([`016b26f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/016b26f5cf05e90da144487a9359ac2a54c8e549))
+* Editor.py basic signature calltip ([`045b1ba`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/045b1baa60a93d2266800821940d7aa29bd8bbe1))
+* Editor.py jedi autocomplete hooked ([`fb555b2`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/fb555b278a5139f180592280408742d34dc5fa84))
+* Editor.py added splitter between editor and terminal ([`c70ddb3`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/c70ddb3cb19fecf7ce14b551d7d265e2e0cff357))
+* Toolbar.py proof-of-concept ([`286e62d`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/286e62df92927d2efe0b4ab07995f7b5e36a0435))
+* Basic text editor + running terminal output ([`9487844`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/94878448c8f39a69e9e65df2789da029a9acfc0e))

 ### Fix

-* fix(plot/image): monitors are now validated with current bec session ([`67a99a1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/67a99a1a19c261f9a1f09635f274cd9fbfe53639))
+* Added missing dependency jedi ([`d978740`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/d978740f9879580d01e092ad1fead46786d3ed5c))
+* Editor.py switch to disable docstring ([`3cc05cd`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/3cc05cde147cd520b98f0896beb64781ea47d816))
+* Editor.py compact signature on tooltip ([`f96cacc`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/f96caccfcb43c904887ebfc0b34fd779ffff8bf1))
+* Editor.py removed automatic background behind edited text ([`d865e2f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/d865e2f1af6eb3d5fb31f9c53088b629a232343f))
+* Toolbar.py automatic initialisation works ([`8ad3059`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/8ad305959257a58b297896218baae06d09520ee1))
+* Terminal output as QThread ([`a0d172e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a0d172e3dc35bdc2d7e1b43185e31bb9a3629631))

+## v0.31.0 (2023-11-13)

-## v0.46.6 (2024-04-19)
+### Feature
+
+* Pydantic validation module for monitor.py ([`7fec0c7`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/7fec0c7e4411c221413d69aeeb4d68ade10d502b))
+
+### Documentation
+
+* Pydantic validation module docs ([`92a5325`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/92a5325aad02fe308caaf9088a3c4386ca055124))
+
+## v0.30.0 (2023-11-10)
+
+### Feature
+
+* WidgetIO support for QLabel ([`aa4c7c3`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/aa4c7c3385f52e4bbc805ee2aced181929943a89))
+* Scan_control.py added option to limit scan selection from list of strings as init parameter ([`0fe06ad`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/0fe06ade5b44d13a9188aef474364b36baa480ef))
+* Scan_control.py a general widget which can generate GUI for scan input ([`088fa51`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/088fa516a8876d112a98cd60aa2a5701dff6b97c))

 ### Fix

-* fix(cli): fixed support for devices as cli input ([`1111610`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1111610f3206c5c46db6b4bd1e8827f1a4cd9e3f))
+* Added imports to __init__.py in widget for ScanControl class ([`b85cc89`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b85cc898d521df1c99a65e579b8fe853bb04cc32))
+* Scan_control.py args_size_max fixed ([`da9025e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/da9025e032c2bc9b34cf359a20745e3156d2f731))
+* Scan_control.py default spinBox limits increases ([`5c67026`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/5c67026637472d9c77185a59e1bf9a24cfe01307))
+* Scan_control.py supports minimum and maximum number of args ([`ee2f36f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ee2f36fb402d626c300a018afacbd57eff14a665))
+* Scan_control.py wipe table and reinitialise devices when scan is changed ([`5ac3526`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/5ac3526384b9ee0eb94568bac035b348eaa52abd))
+* Widget_IO.py added handler for QCheckBox ([`18a7025`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/18a702572f6bed41081d368e39c8fc69122c6203))
+* Scan_control.py scan can be executed from GUI ([`2e42ba1`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/2e42ba174f7abe1590b9afb099dc2d068eb848ae))
+* Scan_control.py all kwargs are rendered ([`4b7592c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/4b7592c2795a26591b3e30870c73aa406316588d))
+* Scan_control.py kwargs and args are added to the correct layouts ([`b311069`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b311069722226b95a7902f42815d2c1e219e9584))
+
+## v0.29.0 (2023-10-31)
+
+### Feature
+
+* Widget_hierarchy.py tool to inspect hierarchy of the widget ([`cda8dae`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/cda8daeb35b36692316173a19fb29f1cc0dbdb7c))
+* Yaml_dialog.py interactive QFileDialog window to load/save .yaml files to/from dict ([`2b29b6c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/2b29b6cfe2ea94a974da4a332c47473176ddddff))
+* Qt_utils custom class for class where one can delete the row with backspace or delete ([`a6616f5`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a6616f5986d59ad8d065105234f5b704731cce71))
+* Modular_app.py, device_monitor.py, config_dialog.py linked together, plot configuration can be done through GUI ([`bf2a09e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/bf2a09e6307da63ecf02a1286095a19e5f1dcab4))
+* Config_dialog.py interactive editor of plot settings ([`c9e5dd5`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/c9e5dd542c9eb7c9069d1c0f1256a634a166eb40))
+
+### Fix
+
+* Yaml_dialog.py added support for .yml files ([`10539f0`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/10539f0ba59be716102b2c0577ea62f5c4a3136a))
+* Yaml_dialog.py added return None if no file path is specified ([`ff1d918`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ff1d918d43f0f2e5fe8d78c6de9051c50e0e12c1))
+* Wrong __init__.py in modular_app ([`d52aa15`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/d52aa15aac42f09487c828836e377c78596037bd))
+* Test_bec_monitor.py config loaded fresh in the test function to avoid parameter leak ([`3866d7c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/3866d7ce4de3391fe57ef872808f7620562eeeb0))
+* Test_bec_monitor.py setup_monitor help function changed to pytest.fixture ([`989cd51`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/989cd51162147805db1229b50b330af29f275204))
+* Test_config_dialog.py - QApplication removed ([`1cdd760`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/1cdd760e4062de1f19837737766ce05edc9ac2da))
+* Test_config_dialog.py - test_add_new_plot_and_modify qtbot action .click() changed -> function called directly ([`1333e6c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/1333e6cbca18943b0a61206dc1ba63720b031b40))
+* Test_config_dialog.py disabled ([`4e710dd`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/4e710dda5e88b2e82ec87db350e8b1fe6aa09181))
+* Test_bec_monitor.py QApplication instance removed ([`77e1d09`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/77e1d0925db2dc6669159fbe3fb08daf330cb5c8))
+* Test_config_dialog.py QApplication instance added ([`60e864b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/60e864b2590d121e1b0ad645d39d1a028abe8d7b))
+* Device_monitor.py BECDeviceMonitor can be promoted in the QtDesigner and then setup in the modular app ([`afab283`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/afab283988a1acc008bc53ae5a56a8f67504da81))
+* Device_monitor.py crosshairs can be attached again ([`644a97a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/644a97aee848c973125375d5f28d3edf2ffc20cf))
+* Config_dialog.py prevents to add one scan twice ([`12469c8`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/12469c8c1e45f83cc0c65708bd412103a8ec1838))
+* Config_dialog.py export to .yaml fixed ([`7e99920`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/7e99920fc565acd59cb3a4286ac5ee40597d8af4))
+* Config_dialog.py scan_type structure implemented ([`e41d81c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/e41d81cbd9371f8633c1e7de82c8f9b64fcb721b))
+* Config_dialog.py config from default mode can be exported to dict ([`55b5ca7`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/55b5ca7381dc33119baac0f48c76fc9d9e8215ae))
+* Config_dialog.py tabs for scans and plots are closable now ([`ec88564`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ec88564e6577cd6579c30f36193c4a0e5fcbc483))
+* Modular_app.py configs are linked to the actual version of the state of the device monitor ([`d78940d`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/d78940da3f114062aa397b87c169f26cbc131a5f))
+* Config_dialog.py can load the current configuration of the plot ([`f94a29b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/f94a29bf4be0a883abc200821746c3d81a0c00d4))
+
+### Documentation
+
+* Config_dialog.py comments added to example cases ([`4a6e73f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/4a6e73f4f791d2152ff29680a4e28529a8df0b47))
+* Device_monitor.py update docstrings ([`a785bca`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a785bca8806613f9e1e4b67380e72867b581fe6e))
+* Added sphinx base structure ([`9d36b96`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/9d36b9686e31b2c4b4206ad47b385c8f2769c641))
+
+## v0.28.1 (2023-10-19)
+
+### Fix
+
+* Stream_plot.py on_dap_update data dict opened correctly ([`28908dd`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/28908dd07c1eef8a9d3213a581393e665b310d1b))
+
+## v0.28.0 (2023-10-13)
+
+### Feature
+
+* BECDeviceMonitor modular class which can be used to replace placeholder in .ui file. ([`f3f55a7`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/f3f55a7ee0ad58aab74526a24f27436fd2bef61d))
+* Placeholders initialised ([`75af040`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/75af0404b3aa5f454528255e8971af07c4e8b39b))
+
+### Fix
+
+* Scan_mode for BECDeviceMonitor fixed init_ui ([`59bba14`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/59bba1429c1f8aeeb562b539583e71303506bd58))
+
+## v0.27.2 (2023-10-12)
+
+### Fix
+
+* Scan_plot tests ([`f7cbdbc`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/f7cbdbc5ca318d60a9501df3fa03c7dea15b5b21))
+
+## v0.27.1 (2023-10-10)
+
+### Fix
+
+* Extreme.py default config file changed to the config_example.yaml ([`5814113`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/5814113f73fb1c4552bb715b27d3330decd9c878))
+* Extreme.py retry action fixed in ErrorHandler ([`5162270`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/5162270d28ca8eab4eac9d9665e2fb4c5e8a33a3))
+* Extreme.py advanced error handling with possibility to reload different config ([`51c3a9e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/51c3a9e9ee3d75c8324300afac366dcdb9adb876))
+* Extreme.py error in configuration are displayed as messagebox ([`9750039`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/9750039097c9e4b9a45603dcefe76e5b2e8920fd))
+* Extreme.py validation function to check config key component structure ([`824ce82`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/824ce821cd5f060f2c550b970afb1f3479a006ef))
+* Extreme.py improved error handling for scan types mode ([`fbd299c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/fbd299c7e7cf548886e2b1787d8e188c708ee8cd))
+* Extreme.py init_ui changed > to >= for setting number of columns ([`6c773c7`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/6c773c7c94e5eee700b74a792657978be86dbbf4))
+* Extreme.py init_plot_background error handling ([`c525eba`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/c525eba88576e0094063019d00fba6a43c52b42e))
+* Extreme.py ui is initialised for the first scan of config in scan mode ([`fc60984`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/fc6098414e328e14ec9ab6006538f46e36f17723))
+* Extreme.py client and device manager initialisation ([`ae79faa`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ae79faa7ed8e9d8f680e1be1afefe43706305d9a))
+* Extreme.py default config file changed to the config_example.yaml ([`d356cf7`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/d356cf734b81fd7ed2c9b48ee85a1722af179d83))
+* Extreme.py retry action fixed in ErrorHandler ([`b76df1b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b76df1b583a5922229f97876f9e65e0cad64c88e))
+* Extreme.py advanced error handling with possibility to reload different config ([`d623cf9`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/d623cf95391adfc89837cd54ca1b2a1b6e491a3c))
+* Extreme.py error in configuration are displayed as messagebox ([`89a52a0`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/89a52a0948ee300e57bb7198eac339ee771bff06))
+* Extreme.py validation function to check config key component structure ([`5a7ac86`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/5a7ac860a8cf5cef53ae699b2869e649c1721f9d))
+* Extreme.py improved error handling for scan types mode ([`ece1859`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ece1859a63b83b1d56b33cc610efea6876dd9e1f))
+* Extreme.py init_ui changed > to >= for setting number of columns ([`a0a89fe`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a0a89fe704db6c11a99a26a080051af1c677ba7a))
+* Extreme.py init_plot_background error handling ([`dafb6fa`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/dafb6fae7a526d5b311ded1d0424ac4dbb3c8b74))
+* Extreme.py ui is initialised for the first scan of config in scan mode ([`82bebe6`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/82bebe6b41004befcb1b54db141e20ff844f76e5))
+* Extreme.py client and device manager initialisation ([`cf15163`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/cf15163bd91291e9851662c147b2e799ae022b9e))
+* Formatter fixed ([`153c5f4`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/153c5f4f9d168f433380bd2deddd2b17a45916a3))
+
+## v0.27.0 (2023-09-25)
+
+### Feature
+
+* Motor_example.py in start/end mode new button allowing user to go to end position ([`65b045e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/65b045e1a26a0f799311e9dca25e2a9dfd7f7147))
+
+### Fix
+
+* Epics removed from requirements ([`44cc881`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/44cc881ac9e69c68f1f5296fea62a14daa55d4e3))
+* Motor_example.py load .csv logic fixed ([`b78152b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b78152b14999ba5c07d7cd2ef2e3309df1ba5ca6))
+* Motor_example.py export .csv logic fixed ([`85841cd`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/85841cdf1fc44472cfcc7e3e6529a41018140896))
+* Motor_example.py precision in duplicate table fixed ([`05f48de`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/05f48de3f1f6793de3f6a8bc2c5e3ad3261dfcf0))
+* Motor_example.py duplicate table fixed ([`401fec8`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/401fec85395886ea2816b6993bf8084b6e652967))
+* Motor_example.py manual changing coordinates in start/stop works again ([`b13509e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b13509e9eb88b55a59b141b0cec06f3c8a983151))
+* Motor_example.py replot points logic simplified ([`a15860a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a15860abac984328382868b0a953960c44792c41))
+* Motor_example.py new independent mapping relying on the table ([`673ed32`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/673ed325d1f56505035899549ea555497823a31f))
+* Extreme.py formatting fixed ([`63f52fc`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/63f52fc8419cd53856a32af6be3f548f8e077cd1))
+* Line_plot.py ROI interactions fixed ([`e4f23f5`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/e4f23f51012b54cde5cd41bb9ab356a277ef4b2f))
+* Online changes e21543 ([`b41d63e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b41d63ea4d6e15c80a7baab7a70c607079152d0a))
+* Motor_example.py user is blocked to duplicate last entry in start/end mode if end coordinate was not defined ([`418480f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/418480f1fcdc72c05887e8b73c24f76e1e8475b2))
+* Motor_example.py - new more robust logic for getting coordinates for table go buttons ([`08f508f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/08f508f4c3c3e1f3c2d4c6dda0d8e6693e9331b5))
+
+### Performance
+
+* Motor_example.py replot logic optimizes ([`a4fb6bd`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a4fb6bd1d2c819740077cdc7291daf28a9e4abdd))
+
+## v0.26.7 (2023-09-19)
+
+### Fix
+
+* Eiger_plot_hist.py removed ([`abe35bf`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/abe35bf96757a38395733bddbd8702a29fd26f42))
+
+## v0.26.6 (2023-09-19)
+
+### Fix
+
+* Extreme.py saved to .yaml works correctly for different scans configurations ([`cb144c7`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/cb144c7c2cba50fc49ba53b0a9e3293b549665be))
+* Extreme.py fixed logic of loading new config.yaml during app operation ([`4287ac8`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/4287ac888591abf27a4e4ce8c23f94d54bc6c2a9))
+
+### Documentation
+
+* Extreme.py updated documentation ([`7ff72b4`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/7ff72b4086e5e340d591d130f011f83fc8370315))
+
+## v0.26.5 (2023-09-13)
+
+### Fix
+
+* Motor_example.py help extended ([`a5c6ffa`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a5c6ffaa024a0dd6901976c81ea9146e5be016ec))
+
+## v0.26.4 (2023-09-12)
+
+### Fix
+
+* Logic fixed ([`7cb56e9`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/7cb56e9e7f2cbeee5a141c4a52a3489c26963839))
+
+## v0.26.3 (2023-09-12)
+
+### Fix
+
+* Import works for both modes ([`b867f25`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b867f25c780ba97393ca65fe76c1cb492f365ded))
+
+## v0.26.2 (2023-09-12)
+
+### Fix
+
+* Import with start/stop mode works again ([`cacc076`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/cacc076959cdd55218b74de2974d890e583c3d94))
+
+## v0.26.1 (2023-09-12)
+
+### Fix
+
+* Removed scipy from eiger_plot.py ([`0e634ee`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/0e634ee2ac58b8be43b7f4e64fbc08ef08675aa1))
+
+## v0.26.0 (2023-09-12)
+
+### Feature
+
+* Plot different signals and plot configurations based on different scans ([`57e6990`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/57e69907d55f7693e97d48026f3bb426adfb4870))
+
+## v0.25.1 (2023-09-12)
+
+### Fix
+
+* Specific config for csaxs ([`8ff983f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/8ff983f16e78d881582d4aaaa0261e10d9d62bf2))
+* Mode lock in config to disable changing the mode for users ([`10ccf0c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/10ccf0cc977cae30c0c185a920e15b9cf2def58f))
+
+## v0.25.0 (2023-09-12)
+
+### Feature
+
+* ComboBox to switch between entries mode ([`f2fde2c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/f2fde2cf5c4b219520eb0257c1c8e02ce66cde87))
+
+### Fix
+
+* Extra columns works again ([`2123361`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/2123361ada9767333792d34de56d6f1447f67cda))
+* Resize table is user controlled ([`63e3896`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/63e389672560e505159de2014846d1506b05633f))
+
+## v0.24.2 (2023-09-12)
+
+### Fix
+
+* Changes e20643 ([`2657440`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/265744076cc53bd054b45c12de3bb24b23e1845c))
+
+## v0.24.1 (2023-09-08)
+
+### Fix
+
+* Typo fixed in mca_plot.py ([`3b12f1b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/3b12f1bc1d65772fc3613f62013809445dcead7a))
+
+## v0.24.0 (2023-09-08)
+
+### Feature
+
+* HistogramLUT for mca_plot ([`ae04072`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ae040727fc60160de8b50ac1af51fba676106e52))
+
+## v0.23.0 (2023-09-08)
+
+### Feature
+
+* Added key bindings and help dialog ([`ade893d`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ade893d33d07f1190994de19b84d4021586bcbcb))
+
+## v0.22.0 (2023-09-08)
+
+### Feature
+
+* Added FFT ([`b984f0f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b984f0f36e2178690eaaec091d4a7b9443f2378f))
+
+## v0.21.2 (2023-09-08)
+
+### Fix
+
+* Moved mask as a last step of image processing ([`87d5467`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/87d546764318679cd80e56d17d590f0e31e51504))
+
+## v0.21.1 (2023-09-08)
+
+### Fix
+
+* Update_signal typo fixed ([`43f03b5`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/43f03b543083da9b743828139a92f87732187dd9))
+
+## v0.21.0 (2023-09-08)
+
+### Feature
+
+* Added functionality to load mask ([`33d1193`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/33d1193c9623b157cc74883184677a727b8e33ce))
+
+### Fix
+
+* Path to mask fixed ([`ef42921`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ef42921c9a585bce8a97fc8bb251e27a9455a771))
+
+## v0.20.0 (2023-09-08)
+
+### Feature
+
+* Added rotate and transpose logic ([`acd7a3b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/acd7a3bc92746c7e56dc8699c4378d2ab778267f))
+
+### Fix
+
+* Added missing .ui file to git ([`ae8fc94`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ae8fc9497954ca49c16d76eaeea7ecc7659c1269))
+
+## v0.19.2 (2023-09-08)
+
+### Fix
+
+* Rotation logic fixed ([`6733371`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/6733371c2ccb4e233d9aa9421e21d627978925d7))
+
+## v0.19.1 (2023-09-08)
+
+### Fix
+
+* Rotation always counter-clockwise ([`00385ab`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/00385abbf98add7945af170b292774d377473a70))
+
+## v0.19.0 (2023-09-08)
+
+### Feature
+
+* Rotation of the image to the left/right by 90, 180, 270 degree ([`327f6b3`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/327f6b3df300d1f88b475973a86175379688aa9b))
+* Simulation stream with Gaussian peak in 1st quadrant ([`4fa8d46`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/4fa8d46631ff822d5465564434d173dd766a6b1a))
+* Eiger_plot.py in example folder with new GUI ([`5cbedec`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/5cbedec5d9f6a6ae763e2cb336ecb40c4d3e1ed1))
+
+## v0.18.1 (2023-09-08)
+
+### Fix
+
+* Online changes ([`29c983f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/29c983fb268bb2dbcfe552453501ff42442f075f))
+
+## v0.18.0 (2023-09-08)
+
+### Feature
+
+* Eigerplot added ([`70d74c7`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/70d74c774d2b318d99c049f0f03743e77812df98))
+
+## v0.17.1 (2023-09-08)
+
+### Fix
+
+* Start_device_consumer changed from EP device_status to scan_status ([`46a3981`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/46a3981e7dfd5ded7b7f325301d2a25c47abd16f))
+
+## v0.17.0 (2023-09-07)
+
+### Feature
+
+* Console arguments added for Redis port, device, and sub_device tag ([`fb52b2a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/fb52b2a8e59fca556764e0dc32bd4edc167e31d3))
+* Plot flips every second row ([`c368871`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/c36887191914d23e85a1b480dac324be0eefb963))
+* Device_consumer is getting scanID and initialise stream_consumer ([`9271b91`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/9271b91113a3bbd46f0bffdaef7b50b629e4f44f))
+* Simulation and simple 2D plot for mca card stream ([`bfef713`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/bfef71382e6a1180d750d2c800650942c5da7a21))
+
+## v0.16.4 (2023-09-06)
+
+### Fix
+
+* Self.limit_map_data fixed to be initialised only with integers from limits ([`b62509a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b62509a28e970358c3ffd4f7d55c2a6bbef35970))
+
+## v0.16.3 (2023-09-06)
+
+### Fix
+
+* Limit spinBoxes morphed to doubleSpinBoxes ([`a1264fe`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a1264fe4e2e0c864c68786d6db16550f489b00fa))
+
+### Documentation
+
+* PyqtGraph controls in help ([`2397af1`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/2397af140f2f9ee23ed5e62ef9bdf4d0aba249a1))
+
+## v0.16.2 (2023-09-06)
+
+### Fix
+
+* X and y motor can be linked again ([`f45512e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/f45512e0ae9c189a1d26456333c5b348cd681ce7))
+
+## v0.16.1 (2023-09-06)
+
+### Fix
+
+* Default values fixed from .yaml ([`8a6e2da`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/8a6e2daaf95cb5417951cbe3cca0cb3e909b08b4))
+
+## v0.16.0 (2023-09-06)
+
+### Feature
+
+* Added help button ([`2087d19`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/2087d19d3c2349e160327880210a5cf129852f09))
+* Table can be loaded from .csv ([`15d995f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/15d995f66b892f55526bd8b0954b6886d8f861ea))
+* Table can be exported to csv ([`772f18f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/772f18fa09bef54c849d2fdd58e02e8dada84a4e))
+* Additional extra rows takes values from previous row ([`1235294`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/1235294b034dae50ff9a2ea93bc1a318383cbbf5))
+* Additional columns can be added through .yaml ([`fa76acb`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/fa76acbd6dda1695add1c1159c4a96c33741a4c7))
+
+### Fix
+
+* Help extended ([`9fba033`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/9fba0334a0389f66344b84dd434d4d9a39b1565e))
+* Table loads number of columns correctly ([`bf12963`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/bf129632471da2e6dc5d637a5b02c321d8d3dcac))
+* Content always aligned to centre ([`74884a3`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/74884a37076cd047e2dc75e07246f73e5f93167e))
+
+## v0.15.0 (2023-09-06)
+
+### Feature
+
+* Step for x and y can be linked or separated ([`16ab746`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/16ab746f54007ee0647b6602b7d74a4a59401705))
+* User can choose if to save coordinates when moving to absolute coordinates ([`6324199`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/632419929921fbe4e970149ce8d4e617566f71fc))
+
+### Fix
+
+* Table checkbox fixed ([`7e6244c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/7e6244c5d3698e6fea944b9501064470b6c884c7))
+* Partial fix to table checkBox ([`75f5c8f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/75f5c8fcd6e80288e1f3bc1b9c0c0b3edd1335bc))
+* Coordinates markers are updated on the map, if X, Y in table manually is changed ([`0aa667b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/0aa667b70d48356bdda59b879baa3862c5e2e756))
+* Added float validator to the table ([`be1bd81`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/be1bd81d60373a0d9e776dc3f0d879d1bf905f7a))
+* Table bug, when deleted multiple rows ([`9d83a45`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/9d83a455e899e3018364123707064882076c4eb0))
+* Table bug, when user deleted row and wanted to go to the previous position ([`63e6d61`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/63e6d61c2e6f9cbc069c9d55c7006d18b6b34b4d))
+
+## v0.14.2 (2023-09-05)
+
+### Fix
+
+* Bec_config initialisation by command line argument ([`b7a1b8b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b7a1b8bca1b89df859c9ed0ed17862bb6d533de7))
+
+## v0.14.1 (2023-09-05)
+
+### Fix
+
+* Gui default tab changed to coordinates table ([`3c74fa5`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/3c74fa59b7b83976b13afc821c1333868e62a686))
+
+## v0.14.0 (2023-09-05)
+
+### Feature
+
+* Enable gui button, in the case that motor movement is not finished ([`84155d2`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/84155d22640e229820fa5104975d2675f63cef31))
+* Saved coordinates are shown on the map ([`0ca665a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/0ca665a1e91d9c5dee9af0218c2e211de8304b26))
+
+### Fix
+
+* Motor position points can be switched on/off if points were deleted ([`5b30dfd`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/5b30dfd43fcbe4b9941e26cab76005ffeb21d95f))
+* Highlight disapear with new motor ([`3fb8651`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/3fb8651dd5777861488928b414d5bdacb517d0e9))
+* New points do not make invisible points visible again ([`fb10551`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/fb105513e52bcd9c62dfead16e91b45ecd817612))
+* Checkbox visibility toggle is working. ([`a178c43`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a178c434b1d9efc1795b6f5115e2a8b9685ccdf2))
+* Saved coordinates can be removed from table and from the map again ([`c32e95a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/c32e95a57d3faec46652b413581d830698855367))
+
+## v0.13.0 (2023-09-05)
+
+### Feature
+
+* Crosshair highlight at motor position ([`9228e5a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/9228e5aea3d5e4192733539643654fd635c63559))
+* Increase step size double with key bindings ([`e9ef1e3`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/e9ef1e315bc7222c38c1f2f3f410f5cdff994f08))
+* Go, set, save current coordinates and keyboard shortcuts ([`5d6a328`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/5d6a328728a017eb4f1d191c96d2659800d41941))
+
+### Fix
+
+* Spinbox limits in ui file ([`8de08cf`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/8de08cf9ccb092b3cfa5cf751f69fbf5edd2b217))
+* Precision updated correctly ([`172ccc6`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/172ccc69056380abcddf572f668a4ddbd5d34eec))
+
+## v0.12.0 (2023-09-04)
+
+### Feature
+
+* Config from .yaml file ([`1a67758`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/1a677584708e1c91491fe84db169103bdda488e5))
+* Removal of motor configurations from user ([`34212d4`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/34212d4d45c88a7bba75f289a25e5488ff95fc73))
+
+### Fix
+
+* Error message if motor do not have limits attribute ([`bf93b02`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/bf93b02cdc82086b32e2bd16f4b506c1bb76c65d))
+
+### Documentation
+
+* Added documentation to all classes and methods ([`4afaa1b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/4afaa1b0ce1f29e4193e6999ecc13b1f0f662213))
+
+## v0.11.0 (2023-09-04)
+
+### Feature
+
+* Colorbutton next to each curve in the table to be able to set up colors ([`2c6719c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/2c6719cf390e6638cadbc814eb0c085bb45c3c6c))
+
+### Fix
+
+* User selected colors are preserved with the new scan ([`8e7885f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/8e7885f36dd2812e3285c4d2d101212055644c7b))
+* Colorbutton change now symbols as well ([`6d2e1c9`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/6d2e1c9d08595a45f502287c6490905e8df3db10))
+
+## v0.10.0 (2023-09-01)
+
+### Feature
+
+* Load and export configuration into .yaml from GUI ([`e527353`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/e5273539741a1261e69b1bf76af78c7c1ab0d901))
+* Error messages if name or entry is wrong ([`415c4ee`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/415c4ee3f232c02ee5a00a82352c7fbb0d324449))
+* Number of columns can be dynamically changed ([`65bfccc`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/65bfccce8fce158150652fead769721de805d99e))
+* Multi window interface created for extreme BL ([`69c38d6`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/69c38d67e4e9b8a30767f6f67defce6c5c2e5b16))
+
+### Fix
+
+* Check if num_columns is not higher that actual number of plots ([`aac6e17`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/aac6e172f6e4583e751bee00db6f381aaff8ac69))
+* Add max number of columns according to the number of plots ([`fbd71c1`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/fbd71c131386508a9ec7bb5963afefc13f8b1618))
+* More specific error messages ([`583e643`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/583e643dacac3d7aaa744751baef2da69f6f892e))
+* Bec_dispatcher.py can take multiple workers as a list ([`7bcf88d`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/7bcf88d5eb139aa3cf491185b9fb3f45aa5e39a2))
+* Config.yaml can be passed as a console argument to extreme.py ([`b8aa373`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b8aa37321d6ac0ebd9f2237c8d2ed6594b614b57))
+* Columns span generalised for any number of columns ([`2d851b6`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/2d851b6b4eb0002e32908c2effbfb79122f18c24))
+
+### Documentation
+
+* Updated documentation and TODOs ([`0ebe35a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/0ebe35ac7a144db84c323f9ecb85dfdf6de66c21))
+* Fixed documentation ([`2f7c1b9`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/2f7c1b92a9624741f6dea44fc8f3c19a8a506fd9))
+
+## v0.9.0 (2023-08-29)
+
+### Feature
+
+* Migrate to .yaml config file instead of argparse ([`a9f1688`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a9f16884b0b274e36fdb531b56a26343692a78f5))
+* Better color coding of curves ([`0eff18f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/0eff18f5a074ea806d43d52ae72bf87f0187a26d))
+
+## v0.8.1 (2023-08-29)
+
+### Fix
+
+* Added missing local .ui file ([`f0589b7`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/f0589b79ec7f50ee9d040b911d1874b4232659d5))
+
+## v0.8.0 (2023-08-29)
+
+### Feature
+
+* User can specify tuple of (x,y) devices which wants to plot ([`3344f1b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/3344f1b92a7e4f4ecd2e63c66aa01d3a4c325070))
+* Fit table hardcode to "gaussian_fit_worker_3" ([`3af57ab`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/3af57abc4888dfcd0224bf50708488dc8192be84))
+* Crosshair snapped to x, y data automatically, clicked coordinates glows ([`49ba6fe`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/49ba6feb3a8494336c5772a06e9569d611fc240a))
+* Crosshair snaps to data, but it is activated with button due to debug ([`223f102`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/223f102aa9f0e625fecef37c827c55f9062330d7))
+* Dap fit plotted as curve, data as scatter ([`118f6af`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/118f6af2b97188398a3dd0e2121f73328c53465b))
+* Oneplot can receive one motor and one monitor signal ([`ff545bf`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ff545bf5c9e707f2dd9b43f9d059aa8605f3916b))
+* Oneplot initialized as an example app for plotting motor vs monitor signals + dispatcher loop over msg ([`98c0c64`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/98c0c64e8577f7e40eb0324dfe97d0ae4670c3a2))
+
+### Fix
+
+* User can disable dap_worker and just choose signals to plot ([`cab5354`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/cab53543e644921df69c57c70ad2b3a03bbafcc1))
+* Crosshair snaps correctly to x dataset ([`2ed5d72`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/2ed5d7208c42f8a1175a49236d706ebf503875e4))
+
+## v0.7.0 (2023-08-28)
+
+### Feature
+
+* Labels of current motors are shown in motors limits ([`413e435`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/413e4356cfde6e2432682332e470eb69427ad397))
+* Total number of points, scatter size and number of point to dim after last position can be changed from GUI ([`e0b52fc`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/e0b52fcedca46d913d1677b45f9815eccd92e8f7))
+* Speed and frequency can be updated from GUI ([`f391a2f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/f391a2fd004f1dc8187cfe12d60f856427ae01ec))
+* Speed and frequency is retrieved from devices ([`ce98164`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ce9816480b82373895b602d1a1bca7d1d9725f01))
+* Delete coordinate table row by DELETE or BACKSPACE key ([`5dd0af6`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/5dd0af6894a5d97457d60ef18b098e40856e4875))
+* Motor selection ([`cab32be`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/cab32be0092185870b5a12398103475342c8b1fd))
+* New GUI ([`0226188`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/0226188079f1dac4eece6b1a6fa330620f1504bc))
+* Keyboard shortcut to go to coordinates ([`3c0e595`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/3c0e5955d40a67935b8fb064d5c52fd3f29bd1a1))
+* Ability to choose how many points should be dimmed before reaching the threshold + total number of point which should be stored. ([`9eae697`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/9eae697df8a2f3961454db9ed397353f110c0e67))
+* Stop movement function, one callback function for 2 motors, move_finished is emitted in move_motor function not in callback ([`187c748`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/187c748e87264448d5026d9fa2f15b5fc9a55949))
+* Controls are disabled while motor is moving and enabled when motor movement is finished ([`ed84293`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ed842931971fbf87ed2f3e366eb822531ef5aacc))
+* Motor coordinates are now scatter instead of image ([`3f6d5c6`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/3f6d5c66411459703c402f7449e8b1abae9a2b08))
+* Going to absolute coordinates saves coordinate in the table for later use with tag ([`8be98c9`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/8be98c9bb6af941a69c593c62d5c52339d2262bc))
+* Table with coordinates getting initial coordinates of motor ([`92388c3`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/92388c3cab7e024978aaa2906afbd698015dec66))
+* Motor move to absolute (X,Y) coordinates ([`cbe27e4`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/cbe27e46cfb6282c71844641e1ed6059e8fa96bf))
+* Motor limits can be changed by spinBoxes ([`2d1665c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/2d1665c76b8174d9fffa3442afa98fe1ea6ac207))
+* Switch for keyboard shortcuts for motor movement ([`cac4562`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/cac45626fc9a315f9012b110760a92e27e5ed226))
+* Setting map according to motor limits ([`512e698`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/512e698e26d9eef05b4f430475ccc268b68ad632))
+* Map of motor position ([`e6952a6`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/e6952a6d13c84487fd6ab08056f1f5b46d594b8a))
+* Motor_example.py created, motor samx and samy can be moved by buttons ([`947ba9f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/947ba9f8b730e96082cb51ff6894734a0e119ca1))
+
+### Fix
+
+* Line_plot.py default changed back to "gauss_bpm" ([`64708bc`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/64708bc1b2e6a4256da9123d0215fc87e0afa455))
+* Motor selection is disabled while motor is moving ([`c7e35d7`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/c7e35d7da69853343aa7eee53c8ad988eb490d93))
+* Init_motor_map receive motor position from motor_thread ([`95ead71`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/95ead7117e59e0979aec51b85b49537ab728cad4))
+* Motor movement absolute fixed - movement by thread ([`11aa15f`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/11aa15fefda7433e885cc8586f93c97af83b0c48))
+
+## v0.6.3 (2023-08-17)
+
+### Fix
+
+* Crosshair handles dynamic changes of number of curves in 1D plot ([`242737b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/242737b516af7c524a6c8a98db566815f0f4ab65))
+
+### Documentation
+
+* Crosshair class documentation ([`8a60cad`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/8a60cad9187df2b2bc93dc78dd01ceb42df9c9af))
+
+## v0.6.2 (2023-08-17)
+
+### Fix
+
+* Correct coordinates for cursor table ([`ce54daf`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/ce54daf754cb2410790216585467c0ffcc8e3587))
+
+## v0.6.1 (2023-08-14)
+
+### Fix
+
+* Crosshair snaps to correct coordinates also with logx and logy ([`167a891`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/167a891c474b09ef7738e473c4a2e89dbbcbe881))
+
+## v0.6.0 (2023-08-11)
+
+### Feature
+
+* New GUI for line_plot.py ([`b57b3bb`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/b57b3bb1afc7c85acc7ed328ac8a219f392869f1))
+* Cursor universal signals ([`20e9516`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/20e951659558b7fc023e357bfe07d812c5fd020a))
+
+## v0.5.0 (2023-08-11)
+
+### Feature
+
+* Add generic connect function for slots ([`6a3df34`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/6a3df34cdfbec2434153362ded630305e5dc5e28))
+* Add possibility to provide service config ([`8c9a9c9`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/8c9a9c93535ee77c0622b483a3157af367ebce1f))
+
+### Fix
+
+* Dispatcher argparse and scan_plot tests ([`67f619e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/67f619ee897e0040c6310e67d69fbb2e0685293d))
+* Gui event removing bugs ([`a9dd191`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a9dd191629295ca476e2f9a1b9944ff355216583))
+
+## v0.4.0 (2023-08-11)
+
+### Feature
+
+* Cursor universal for 1D and 2D ([`f75554b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/f75554bd7b072207847956a8720b9a62c20ba2c8))
+* Added qt_utils package with general Crosshair function ([`5353fed`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/5353fed7bfe1819819fa3348ec93d2d0ba540628))
+* 2D plot updating ([`d32088b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/d32088b643a4d0613c32fb464a0a55a3b6b684d6))
+* Metadata available on_dap_update ([`18b5d46`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/18b5d46678619a972815532629ce96c121f5fcc9))
+* Plotting from streamer ([`bb806c1`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/bb806c149dee88023ecb647b523cbd5189ea9001))
+* Added Legend to plot ([`0feca4b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/0feca4b1578820ec1f5f3ead3073e4d45c23798b))
+* Cursor coordinate as a QTable ([`a999f76`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a999f7669a12910ad66e10a6d2e75197b2dce1c2))
+* Changed from PlotItem to GraphicsLayoutWidget, added LabelItem ([`075cc79`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/075cc79d6fa011803cf4a06fbff8faa951c1b59f))
+* Add display_ui_file.py ([`91d8ffa`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/91d8ffacffcbeebdf7623caf62e07244c4dcee16))
+* Add disconnect_dap_slot ([`1325704`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/1325704750ebab897e3dcae80c9d455bfbbf886f))
+* Inherit from GraphicsView for consistency with 2D plot ([`d8c101c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/d8c101cdd7f960a152a1f318911cac6eecf6bad4))
+* Add BECScanPlot2D ([`67905e8`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/67905e896c81383f57c268db544b3314104bda38))
+* Emit the full bec message to slots ([`1bb3020`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/1bb30207038f3a54c0e96dbbbcd1ea7f6c70eca2))
+
+### Fix
+
+* Q selection for gui_event signal ([`0bf452a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/0bf452ad1b7d9ad941e2ef4b8d61ec4ed5266415))
+* Fixed logic in data subscription ([`c2d469b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/c2d469b4543fcf237b274399b83969cc2213b61b))
+* Scan_plot to accept metadata from dap signal ([`7bec0b5`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/7bec0b5e6c1663670f8fcc2fc6aa6c8b6df28b61))
+* Plotting latest 1d curves ([`378be81`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/378be81bf6dd5e9239f8f1fb908cafc97161c79d))
+* Testing the data structure of plotting ([`4fb0a3b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/4fb0a3b058957f5b37227ff7c8e9bdf5259a1cde))
+* Fix examples when run directly as a script ([`cd11ee5`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/cd11ee51c1c725255e748a32b89a74487e84a631))
+* Module paths ([`e7f644c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/e7f644c5079a8665d7d872eb0b27ed7da6cbd078))
+
+## v0.3.0 (2023-07-19)
+
+### Feature
+
+* Add auto-computed color_list from colormaps ([`3e1708b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/3e1708bf48bc15a25c0d01242fff28d6db868e02))
+* Add functionality for plotting multiple signals ([`10e2906`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/10e29064455f50bc3b66c55b4361575957db1489))
+* Added lineplot widget ([`989a3f0`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/989a3f080839b98f1e1c2118600cddf449120124))
+* Added ctrl_c from grum ([`8fee13a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/8fee13a67bef3ed6ed6de9d47438f04687f548d8))
+
+### Fix
+
+* Add warning for non-existing signalz ([`48075e4`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/48075e4fe3187f6ac8d0b61f94f8df73b8fd6daf))
+* Documentation and bugfix for mouse_moved ([`a460f3c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a460f3c0bd7b9e106a758bc330f361868407b1e3))
+
+### Documentation
+
+* Add notes about qt designer install via conda-forge ([`d8038a8`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/d8038a8cd0efa3a16df403390164603e4e8afdd8))
+* Added license ([`db2d33e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/db2d33e8912dc493cce9ee7f09d8336155110079))
+
+## v0.2.1 (2023-07-13)
+
+### Fix
+
+* Fixed setup config (wrong name) ([`947db1e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/947db1e0f32b067e67f94a7c8321da5194b1547b))
+* Fixed bec_lib dependency ([`86f4def`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/86f4deffd899111e8997010487ec54c6c62c43ab))
+
+## v0.2.0 (2023-07-13)
+
+### Feature
+
+* Move ivan's qtwidgets to bec-widgets ([`34e5ed2`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/34e5ed2cf7e6128a51c110db8870d9560f2b2831))
+
+## v0.1.0 (2023-07-11)
+
+### Feature
+
+* Added config plotter ([`db274c6`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/db274c644f643f830c35b6a92edd328bf7e24f59))
--- a/README.md
+++ b/README.md
@@ -6,33 +6,32 @@ BEC Widgets is a GUI framework designed for interaction with [BEC (Beamline Expe
 Use the package manager [pip](https://pip.pypa.io/en/stable/) to install BEC Widgets:

 ```bash
-pip install bec_widgets PyQt6
+pip install bec-widgets
 ```

 For development purposes, you can clone the repository and install the package locally in editable mode:

 ```bash
 git clone https://gitlab.psi.ch/bec/bec-widgets
-cd bec_widgets
-pip install -e .[dev,pyqt6]
+cd bec-widgets
+pip install -e .[dev]
 ```

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

 To select a specific Python Qt distribution, install the package with an additional tag:

 ```bash
-pip install bec_widgets[pyqt6]
+pip install bec-widgets[pyqt6]
 ```
 or 

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

-Documentation of BEC Widgets can be found [here](https://bec-widgets.readthedocs.io/en/latest/). The documentation of the BEC can be found [here](https://bec.readthedocs.io/en/latest/).
+Documentation of BEC Widgets can be found [here](https://bec-widgets.readthedocs.io/en/latest/). The documentation of the BEC can be found [here](https://beamline-experiment-control.readthedocs.io/en/latest/).

 ## Contributing

--- a/bec_widgets/cli/init.py
+++ b/bec_widgets/cli/init.py
@@ -1,2 +0,0 @@
-from .auto_updates import AutoUpdates, ScanInfo
-from .client import BECDockArea, BECFigure
--- a/bec_widgets/cli/auto_updates.py
+++ b/bec_widgets/cli/auto_updates.py
@@ -1,118 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from pydantic import BaseModel
-
-if TYPE_CHECKING:
-    from .client import BECFigure
-
-
-class ScanInfo(BaseModel):
-    scan_id: str
-    scan_number: int
-    scan_name: str
-    scan_report_devices: list
-    monitored_devices: list
-    status: str
-
-
-class AutoUpdates:
-    def __init__(self, figure: BECFigure, enabled: bool = True):
-        self.enabled = enabled
-        self.figure = figure
-
-    @staticmethod
-    def get_scan_info(msg) -> ScanInfo:
-        """
-        Update the script with the given data.
-        """
-        info = msg.info
-        status = msg.status
-        scan_id = msg.scan_id
-        scan_number = info.get("scan_number", 0)
-        scan_name = info.get("scan_name", "Unknown")
-        scan_report_devices = info.get("scan_report_devices", [])
-        monitored_devices = info.get("readout_priority", {}).get("monitored", [])
-        monitored_devices = [dev for dev in monitored_devices if dev not in scan_report_devices]
-        return ScanInfo(
-            scan_id=scan_id,
-            scan_number=scan_number,
-            scan_name=scan_name,
-            scan_report_devices=scan_report_devices,
-            monitored_devices=monitored_devices,
-            status=status,
-        )
-
-    def run(self, msg):
-        """
-        Run the update function if enabled.
-        """
-        if not self.enabled:
-            return
-        if msg.status != "open":
-            return
-        info = self.get_scan_info(msg)
-        self.handler(info)
-
-    @staticmethod
-    def get_selected_device(monitored_devices, selected_device):
-        """
-        Get the selected device for the plot. If no device is selected, the first
-        device in the monitored devices list is selected.
-        """
-        if selected_device:
-            return selected_device
-        if len(monitored_devices) > 0:
-            sel_device = monitored_devices[0]
-            return sel_device
-        return None
-
-    def handler(self, info: ScanInfo) -> None:
-        """
-        Default update function.
-        """
-        if info.scan_name == "line_scan" and info.scan_report_devices:
-            self.simple_line_scan(info)
-            return
-        if info.scan_name == "grid_scan" and info.scan_report_devices:
-            self.simple_grid_scan(info)
-            return
-        if info.scan_report_devices:
-            self.best_effort(info)
-            return
-
-    def simple_line_scan(self, info: ScanInfo) -> None:
-        """
-        Simple line scan.
-        """
-        dev_x = info.scan_report_devices[0]
-        dev_y = self.get_selected_device(info.monitored_devices, self.figure.selected_device)
-        if not dev_y:
-            return
-        self.figure.clear_all()
-        plt = self.figure.plot(dev_x, dev_y)
-        plt.set(title=f"Scan {info.scan_number}", x_label=dev_x, y_label=dev_y)
-
-    def simple_grid_scan(self, info: ScanInfo) -> None:
-        """
-        Simple grid scan.
-        """
-        dev_x = info.scan_report_devices[0]
-        dev_y = info.scan_report_devices[1]
-        dev_z = self.get_selected_device(info.monitored_devices, self.figure.selected_device)
-        self.figure.clear_all()
-        plt = self.figure.plot(dev_x, dev_y, dev_z, label=f"Scan {info.scan_number}")
-        plt.set(title=f"Scan {info.scan_number}", x_label=dev_x, y_label=dev_y)
-
-    def best_effort(self, info: ScanInfo) -> None:
-        """
-        Best effort scan.
-        """
-        dev_x = info.scan_report_devices[0]
-        dev_y = self.get_selected_device(info.monitored_devices, self.figure.selected_device)
-        if not dev_y:
-            return
-        self.figure.clear_all()
-        plt = self.figure.plot(dev_x, dev_y, label=f"Scan {info.scan_number}")
-        plt.set(title=f"Scan {info.scan_number}", x_label=dev_x, y_label=dev_y)
--- a/bec_widgets/cli/bec_widgets_icon.png
+++ b/bec_widgets/cli/bec_widgets_icon.png
--- a/bec_widgets/cli/client.py
+++ b/bec_widgets/cli/client.py
--- a/bec_widgets/cli/client_utils.py
+++ b/bec_widgets/cli/client_utils.py
@@ -1,29 +1,16 @@
-from __future__ import annotations
-
 import importlib
-import importlib.metadata as imd
-import os
 import select
 import subprocess
-import sys
-import threading
-import time
 import uuid
-from functools import wraps
-from typing import TYPE_CHECKING

-from bec_lib import MessageEndpoints, ServiceConfig, messages
-from bec_lib.connector import MessageObject
-from bec_lib.device import DeviceBase
+from functools import wraps
+
 from qtpy.QtCore import QCoreApplication

 import bec_widgets.cli.client as client
-from bec_widgets.cli.auto_updates import AutoUpdates
+from bec_lib import MessageEndpoints, messages
 from bec_widgets.utils.bec_dispatcher import BECDispatcher

-if TYPE_CHECKING:
-    from bec_widgets.cli.client import BECDockArea, BECFigure
-

 def rpc_call(func):
    """
@@ -38,72 +25,15 @@ def rpc_call(func):

    @wraps(func)
    def wrapper(self, *args, **kwargs):
-        # we could rely on a strict type check here, but this is more flexible
-        # moreover, it would anyway crash for objects...
-        out = []
-        for arg in args:
-            if hasattr(arg, "name"):
-                arg = arg.name
-            out.append(arg)
-        args = tuple(out)
-        for key, val in kwargs.items():
-            if hasattr(val, "name"):
-                kwargs[key] = val.name
-        if not self.gui_is_alive():
-            raise RuntimeError("GUI is not alive")
        return self._run_rpc(func.__name__, *args, **kwargs)

    return wrapper


-class BECGuiClientMixin:
+class BECFigureClientMixin:
    def __init__(self, **kwargs) -> None:
        super().__init__(**kwargs)
        self._process = None
-        self.update_script = self._get_update_script()
-        self._target_endpoint = MessageEndpoints.scan_status()
-        self._selected_device = None
-        self.stderr_output = []
-
-    def _get_update_script(self) -> AutoUpdates:
-        eps = imd.entry_points(group="bec.widgets.auto_updates")
-        for ep in eps:
-            if ep.name == "plugin_widgets_update":
-                return ep.load()(figure=self)
-        return None
-
-    @property
-    def selected_device(self):
-        """
-        Selected device for the plot.
-        """
-        return self._selected_device
-
-    @selected_device.setter
-    def selected_device(self, device: str | DeviceBase):
-        if isinstance(device, DeviceBase):
-            self._selected_device = device.name
-        elif isinstance(device, str):
-            self._selected_device = device
-        else:
-            raise ValueError("Device must be a string or a device object")
-
-    def _start_update_script(self) -> None:
-        self._client.connector.register(
-            self._target_endpoint, cb=self._handle_msg_update, parent=self
-        )
-
-    @staticmethod
-    def _handle_msg_update(msg: MessageObject, parent: BECGuiClientMixin) -> None:
-        if parent.update_script is not None:
-            # pylint: disable=protected-access
-            parent._update_script_msg_parser(msg.value)
-
-    def _update_script_msg_parser(self, msg: messages.BECMessage) -> None:
-        if isinstance(msg, messages.ScanStatusMessage):
-            if not self.gui_is_alive():
-                return
-            self.update_script.run(msg)

    def show(self) -> None:
        """
@@ -111,9 +41,6 @@ class BECGuiClientMixin:
        """
        if self._process is None or self._process.poll() is not None:
            self._start_plot_process()
-        while not self.gui_is_alive():
-            print("Waiting for GUI to start...")
-            time.sleep(1)

    def close(self) -> None:
        """
@@ -121,42 +48,22 @@ class BECGuiClientMixin:
        """
        if self._process is None:
            return
-        if self.gui_is_alive():
-            self._run_rpc("close", (), wait_for_rpc_response=True)
-        else:
-            self._run_rpc("close", (), wait_for_rpc_response=False)
-        self._process.terminate()
-        self._process_output_processing_thread.join()
+        self._run_rpc("close", (), wait_for_rpc_response=False)
+        self._process.kill()
        self._process = None
-        self._client.shutdown()

    def _start_plot_process(self) -> None:
        """
        Start the plot in a new process.
        """
-        self._start_update_script()
        # pylint: disable=subprocess-run-check
-        config = self._client._service_config.redis
        monitor_module = importlib.import_module("bec_widgets.cli.server")
        monitor_path = monitor_module.__file__
-        gui_class = self.__class__.__name__

-        command = [
-            sys.executable,
-            "-u",
-            monitor_path,
-            "--id",
-            self._gui_id,
-            "--config",
-            config,
-            "--gui_class",
-            gui_class,
-        ]
+        command = f"python {monitor_path} --id {self._gui_id}"
        self._process = subprocess.Popen(
-            command, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+            command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
        )
-        self._process_output_processing_thread = threading.Thread(target=self._get_output)
-        self._process_output_processing_thread.start()

    def print_log(self) -> None:
        """
@@ -164,38 +71,22 @@ class BECGuiClientMixin:
        """
        if self._process is None:
            return
-        print("".join(self.stderr_output))
-        # Flush list
-        self.stderr_output.clear()
+        print(self._get_stderr_output())

-    def _get_output(self) -> str:
-        try:
-            os.set_blocking(self._process.stdout.fileno(), False)
-            os.set_blocking(self._process.stderr.fileno(), False)
-            while self._process.poll() is None:
-                readylist, _, _ = select.select(
-                    [self._process.stdout, self._process.stderr], [], [], 1
-                )
-                if self._process.stdout in readylist:
-                    output = self._process.stdout.read(1024)
-                    if output:
-                        print(output, end="")
-                if self._process.stderr in readylist:
-                    error_output = self._process.stderr.read(1024)
-                    if error_output:
-                        print(error_output, end="", file=sys.stderr)
-                        self.stderr_output.append(error_output)
-        except Exception as e:
-            print(f"Error reading process output: {str(e)}")
+    def _get_stderr_output(self) -> str:
+        stderr_output = []
+        while self._process.poll() is not None:
+            readylist, _, _ = select.select([self._process.stderr], [], [], 0.1)
+            if not readylist:
+                break
+            line = self._process.stderr.readline()
+            if not line:
+                break
+            stderr_output.append(line.decode("utf-8"))
+        return "".join(stderr_output)

-
-class RPCResponseTimeoutError(Exception):
-    """Exception raised when an RPC response is not received within the expected time."""
-
-    def __init__(self, request_id, timeout):
-        super().__init__(
-            f"RPC response not received within {timeout} seconds for request ID {request_id}"
-        )
+    def __del__(self) -> None:
+        self.close()


 class RPCBase:
@@ -205,12 +96,7 @@ class RPCBase:
        self._gui_id = gui_id if gui_id is not None else str(uuid.uuid4())
        self._parent = parent
        super().__init__()
-        # print(f"RPCBase: {self._gui_id}")
-
-    def __repr__(self):
-        type_ = type(self)
-        qualname = type_.__qualname__
-        return f"<{qualname} object at {hex(id(self))}>"
+        print(f"RPCBase: {self._gui_id}")

    @property
    def _root(self):
@@ -243,10 +129,10 @@ class RPCBase:
            parameter={"args": args, "kwargs": kwargs, "gui_id": self._gui_id},
            metadata={"request_id": request_id},
        )
-
+        print(f"RPCBase: {rpc_msg}")
        # pylint: disable=protected-access
        receiver = self._root._gui_id
-        self._client.connector.set_and_publish(MessageEndpoints.gui_instructions(receiver), rpc_msg)
+        self._client.connector.send(MessageEndpoints.gui_instructions(receiver), rpc_msg)

        if not wait_for_rpc_response:
            return None
@@ -264,9 +150,7 @@ class RPCBase:
            return [self._create_widget_from_msg_result(res) for res in msg_result]
        if isinstance(msg_result, dict):
            if "__rpc__" not in msg_result:
-                return {
-                    key: self._create_widget_from_msg_result(val) for key, val in msg_result.items()
-                }
+                return msg_result
            cls = msg_result.pop("widget_class", None)
            msg_result.pop("__rpc__", None)

@@ -274,38 +158,18 @@ class RPCBase:
                return msg_result

            cls = getattr(client, cls)
-            # print(msg_result)
+            print(msg_result)
            return cls(parent=self, **msg_result)
        return msg_result

-    def _wait_for_response(self, request_id: str, timeout: int = 5):
+    def _wait_for_response(self, request_id):
        """
        Wait for the response from the server.
-
-        Args:
-            request_id(str): The request ID.
-            timeout(int): The timeout in seconds.
-
-        Returns:
-            The response from the server.
        """
-        start_time = time.time()
        response = None
-
-        while response is None and self.gui_is_alive() and (time.time() - start_time) < timeout:
+        while response is None:
            response = self._client.connector.get(
                MessageEndpoints.gui_instruction_response(request_id)
            )
            QCoreApplication.processEvents()  # keep UI responsive (and execute signals/slots)
-            time.sleep(0.1)
-        if response is None and (time.time() - start_time) >= timeout:
-            raise RPCResponseTimeoutError(request_id, timeout)
-
        return response
-
-    def gui_is_alive(self):
-        """
-        Check if the GUI is alive.
-        """
-        heart = self._client.connector.get(MessageEndpoints.gui_heartbeat(self._root._gui_id))
-        return heart is not None
--- a/bec_widgets/cli/generate_cli.py
+++ b/bec_widgets/cli/generate_cli.py
@@ -1,28 +1,11 @@
-# pylint: disable=missing-module-docstring
-from __future__ import annotations
-
 import inspect
-import sys
-
-import black
-
-if sys.version_info >= (3, 11):
-    from typing import get_overloads
-else:
-    print(
-        "Python version is less than 3.11, using dummy function for get_overloads. "
-        "If you want to use the real function 'typing.get_overloads()', please use Python 3.11 or later."
-    )
-
-    def get_overloads(obj):
-        # Dummy function for Python versions before 3.11
-        return []
+import typing


 class ClientGenerator:
    def __init__(self):
        self.header = """# This file was automatically generated by generate_cli.py\n
-from bec_widgets.cli.client_utils import rpc_call, RPCBase, BECGuiClientMixin
+from bec_widgets.cli.client_utils import rpc_call, RPCBase, BECFigureClientMixin
 from typing import Literal, Optional, overload"""

        self.content = ""
@@ -41,7 +24,6 @@ from typing import Literal, Optional, overload"""
    def generate_content_for_class(self, cls):
        """
        Generate the content for the class.
-
        Args:
            cls: The class for which to generate the content.
        """
@@ -54,9 +36,9 @@ from typing import Literal, Optional, overload"""
        # from {module} import {class_name}"""

        # Generate the content
-        if cls.__name__ == "BECDockArea":
+        if cls.__name__ == "BECFigure":
            self.content += f"""
-class {class_name}(RPCBase, BECGuiClientMixin):"""
+class {class_name}(RPCBase, BECFigureClientMixin):"""
        else:
            self.content += f"""
 class {class_name}(RPCBase):"""
@@ -71,7 +53,7 @@ class {class_name}(RPCBase):"""
            else:
                sig = str(inspect.signature(obj))
                doc = inspect.getdoc(obj)
-                overloads = get_overloads(obj)
+                overloads = typing.get_overloads(obj)
                for overload in overloads:
                    sig_overload = str(inspect.signature(overload))
                    self.content += f"""
@@ -89,46 +71,26 @@ class {class_name}(RPCBase):"""

    def write(self, file_name: str):
        """
-        Write the content to a file, automatically formatted with black.
+        Write the content to a file.

        Args:
            file_name(str): The name of the file to write to.
        """
-        # Combine header and content, then format with black
-        full_content = self.header + "\n" + self.content
-        try:
-            formatted_content = black.format_str(full_content, mode=black.FileMode(line_length=100))
-        except black.NothingChanged:
-            formatted_content = full_content
-
        with open(file_name, "w", encoding="utf-8") as file:
-            file.write(formatted_content)
+            file.write(self.header)
+            file.write(self.content)


-if __name__ == "__main__":  # pragma: no cover
+if __name__ == "__main__":
    import os

-    from bec_widgets.utils import BECConnector
-    from bec_widgets.widgets.dock import BECDock, BECDockArea
    from bec_widgets.widgets.figure import BECFigure
-    from bec_widgets.widgets.plots import BECImageShow, BECMotorMap, BECPlotBase, BECWaveform
-    from bec_widgets.widgets.plots.image import BECImageItem
-    from bec_widgets.widgets.plots.waveform import BECCurve
+    from bec_widgets.widgets.plots import BECPlotBase, BECWaveform1D  # ,BECCurve
+    from bec_widgets.widgets.plots.waveform1d import BECCurve

    current_path = os.path.dirname(__file__)
    client_path = os.path.join(current_path, "client.py")
-    clss = [
-        BECPlotBase,
-        BECWaveform,
-        BECFigure,
-        BECCurve,
-        BECImageShow,
-        BECConnector,
-        BECImageItem,
-        BECMotorMap,
-        BECDock,
-        BECDockArea,
-    ]
+    clss = [BECPlotBase, BECWaveform1D, BECFigure, BECCurve]
    generator = ClientGenerator()
    generator.generate_client(clss)
    generator.write(client_path)
--- a/bec_widgets/cli/rpc_register.py
+++ b/bec_widgets/cli/rpc_register.py
@@ -1,80 +0,0 @@
-from threading import Lock
-from weakref import WeakValueDictionary
-
-from qtpy.QtCore import QObject
-
-
-class RPCRegister:
-    """
-    A singleton class that keeps track of all the RPC objects registered in the system for CLI usage.
-    """
-
-    _instance = None
-    _initialized = False
-    _lock = Lock()
-
-    def __new__(cls, *args, **kwargs):
-        if cls._instance is None:
-            cls._instance = super(RPCRegister, cls).__new__(cls)
-            cls._initialized = False
-        return cls._instance
-
-    def __init__(self):
-        if self._initialized:
-            return
-        self._rpc_register = WeakValueDictionary()
-        self._initialized = True
-
-    def add_rpc(self, rpc: QObject):
-        """
-        Add an RPC object to the register.
-
-        Args:
-            rpc(QObject): The RPC object to be added to the register.
-        """
-        if not hasattr(rpc, "gui_id"):
-            raise ValueError("RPC object must have a 'gui_id' attribute.")
-        self._rpc_register[rpc.gui_id] = rpc
-
-    def remove_rpc(self, rpc: str):
-        """
-        Remove an RPC object from the register.
-
-        Args:
-            rpc(str): The RPC object to be removed from the register.
-        """
-        if not hasattr(rpc, "gui_id"):
-            raise ValueError(f"RPC object {rpc} must have a 'gui_id' attribute.")
-        self._rpc_register.pop(rpc.gui_id, None)
-
-    def get_rpc_by_id(self, gui_id: str) -> QObject:
-        """
-        Get an RPC object by its ID.
-
-        Args:
-            gui_id(str): The ID of the RPC object to be retrieved.
-
-        Returns:
-            QObject: The RPC object with the given ID.
-        """
-        rpc_object = self._rpc_register.get(gui_id, None)
-        return rpc_object
-
-    def list_all_connections(self) -> dict:
-        """
-        List all the registered RPC objects.
-
-        Returns:
-            dict: A dictionary containing all the registered RPC objects.
-        """
-        with self._lock:
-            connections = dict(self._rpc_register)
-        return connections
-
-    @classmethod
-    def reset_singleton(cls):
-        """
-        Reset the singleton instance.
-        """
-        cls._instance = None
-        cls._initialized = False
--- a/bec_widgets/cli/rpc_wigdet_handler.py
+++ b/bec_widgets/cli/rpc_wigdet_handler.py
@@ -1,25 +0,0 @@
-from bec_widgets.utils import BECConnector
-from bec_widgets.widgets.figure import BECFigure
-
-
-class RPCWidgetHandler:
-    """Handler class for creating widgets from RPC messages."""
-
-    widget_classes = {"BECFigure": BECFigure}
-
-    @staticmethod
-    def create_widget(widget_type, **kwargs) -> BECConnector:
-        """
-        Create a widget from an RPC message.
-
-        Args:
-            widget_type(str): The type of the widget.
-            **kwargs: The keyword arguments for the widget.
-
-        Returns:
-            widget(BECConnector): The created widget.
-        """
-        widget_class = RPCWidgetHandler.widget_classes.get(widget_type)
-        if widget_class:
-            return widget_class(**kwargs)
-        raise ValueError(f"Unknown widget type: {widget_type}")
--- a/bec_widgets/cli/server.py
+++ b/bec_widgets/cli/server.py
@@ -1,55 +1,39 @@
 import inspect
-import threading
-import time
-from typing import Literal, Union

 from bec_lib import MessageEndpoints, messages
-from qtpy.QtCore import QTimer

-from bec_widgets.cli.rpc_register import RPCRegister
 from bec_widgets.utils import BECDispatcher
 from bec_widgets.utils.bec_connector import BECConnector
-from bec_widgets.widgets.dock.dock_area import BECDockArea
 from bec_widgets.widgets.figure import BECFigure
-from bec_widgets.widgets.plots import BECCurve, BECImageShow, BECWaveform
+from bec_widgets.widgets.plots import BECCurve, BECWaveform1D


 class BECWidgetsCLIServer:
-    WIDGETS = [BECWaveform, BECFigure, BECCurve, BECImageShow]
+    WIDGETS = [BECWaveform1D, BECFigure, BECCurve]

-    def __init__(
-        self,
-        gui_id: str = None,
-        dispatcher: BECDispatcher = None,
-        client=None,
-        config=None,
-        gui_class: Union["BECFigure", "BECDockArea"] = BECFigure,
-    ) -> None:
-        self.dispatcher = BECDispatcher(config=config) if dispatcher is None else dispatcher
-        self.client = self.dispatcher.client if client is None else client
+    def __init__(self, gui_id: str = None, dispatcher: BECDispatcher = None) -> None:
+        self.dispatcher = BECDispatcher() if dispatcher is None else dispatcher
+        self.client = self.dispatcher.client
        self.client.start()
        self.gui_id = gui_id
-        self.gui = gui_class(gui_id=self.gui_id)
-        self.rpc_register = RPCRegister()
-        self.rpc_register.add_rpc(self.gui)
+        self.fig = BECFigure(gui_id=self.gui_id)
+        print(f"Server started with gui_id {self.gui_id}")

        self.dispatcher.connect_slot(
            self.on_rpc_update, MessageEndpoints.gui_instructions(self.gui_id)
        )

-        # Setup QTimer for heartbeat
-        self._shutdown_event = False
-        self._heartbeat_timer = QTimer()
-        self._heartbeat_timer.timeout.connect(self.emit_heartbeat)
-        self._heartbeat_timer.start(200)  # Emit heartbeat every 1 seconds
+    def start(self):
+        """Start the figure window."""
+        self.fig.start()

    def on_rpc_update(self, msg: dict, metadata: dict):
        request_id = metadata.get("request_id")
        try:
-            obj = self.get_object_from_config(msg["parameter"])
            method = msg["action"]
            args = msg["parameter"].get("args", [])
            kwargs = msg["parameter"].get("kwargs", {})
+            obj = self.get_object_from_config(msg["parameter"])
            res = self.run_rpc(obj, method, args, kwargs)
        except Exception as e:
            print(e)
@@ -58,7 +42,7 @@ class BECWidgetsCLIServer:
            self.send_response(request_id, True, {"result": res})

    def send_response(self, request_id: str, accepted: bool, msg: dict):
-        self.client.connector.set_and_publish(
+        self.client.connector.set(
            MessageEndpoints.gui_instruction_response(request_id),
            messages.RequestResponseMessage(accepted=accepted, message=msg),
            expire=60,
@@ -66,10 +50,23 @@ class BECWidgetsCLIServer:

    def get_object_from_config(self, config: dict):
        gui_id = config.get("gui_id")
-        obj = self.rpc_register.get_rpc_by_id(gui_id)
-        if obj is None:
-            raise ValueError(f"Object with gui_id {gui_id} not found")
-        return obj
+        # check if the object is the figure
+        if gui_id == self.fig.gui_id:
+            return self.fig
+        # check if the object is a widget
+        if gui_id in self.fig.widgets:
+            obj = self.fig.widgets[config["gui_id"]]
+            return obj
+        if self.fig.widgets:
+            for widget in self.fig.widgets.values():
+                item = widget.find_widget_by_id(gui_id)
+                if item:
+                    return item
+                raise NotImplementedError(
+                    f"gui_id lookup for widget of type {widget.__class__.__name__} not implemented"
+                )
+
+        raise ValueError(f"Object with gui_id {gui_id} not found")

    def run_rpc(self, obj, method, args, kwargs):
        method_obj = getattr(obj, method)
@@ -85,8 +82,6 @@ class BECWidgetsCLIServer:

        if isinstance(res, list):
            res = [self.serialize_object(obj) for obj in res]
-        elif isinstance(res, dict):
-            res = {key: self.serialize_object(val) for key, val in res.items()}
        else:
            res = self.serialize_object(res)
        return res
@@ -101,67 +96,15 @@ class BECWidgetsCLIServer:
            }
        return obj

-    def emit_heartbeat(self):
-        if self._shutdown_event is False:
-            self.client.connector.set(
-                MessageEndpoints.gui_heartbeat(self.gui_id),
-                messages.StatusMessage(name=self.gui_id, status=1, info={}),
-                expire=10,
-            )

-    def shutdown(self):  # TODO not sure if needed when cleanup is done at level of BECConnector
-        self._shutdown_event = True
-        self._heartbeat_timer.stop()
-        self.client.shutdown()
-
-
-if __name__ == "__main__":  # pragma: no cover
+if __name__ == "__main__":
    import argparse
-    import os
-    import sys
-
-    from qtpy.QtCore import QSize
-    from qtpy.QtGui import QIcon
-    from qtpy.QtWidgets import QApplication, QMainWindow
-
-    app = QApplication(sys.argv)
-    app.setApplicationName("BEC Figure")
-    current_path = os.path.dirname(__file__)
-    icon = QIcon()
-    icon.addFile(os.path.join(current_path, "bec_widgets_icon.png"), size=QSize(48, 48))
-    app.setWindowIcon(icon)
-
-    win = QMainWindow()
-    win.setWindowTitle("BEC Widgets")

    parser = argparse.ArgumentParser(description="BEC Widgets CLI Server")
    parser.add_argument("--id", type=str, help="The id of the server")
-    parser.add_argument(
-        "--gui_class",
-        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 to connect to redis.")

    args = parser.parse_args()

-    if args.gui_class == "BECFigure":
-        gui_class = BECFigure
-    elif args.gui_class == "BECDockArea":
-        gui_class = BECDockArea
-    else:
-        print(
-            "Please specify a valid gui_class to run. Use -h for help."
-            "\n Starting with default gui_class BECFigure."
-        )
-        gui_class = BECFigure
-
-    server = BECWidgetsCLIServer(gui_id=args.id, config=args.config, gui_class=gui_class)
-
-    gui = server.gui
-    win.setCentralWidget(gui)
-    win.resize(800, 600)
-    win.show()
-
-    app.aboutToQuit.connect(server.shutdown)
-    sys.exit(app.exec())
+    server = BECWidgetsCLIServer(gui_id=args.id)
+    # server = BECWidgetsCLIServer(gui_id="test")
+    server.start()
--- a/bec_widgets/examples/init.py
+++ b/bec_widgets/examples/init.py
@@ -2,8 +2,8 @@ from .motor_movement import (
    MotorControlApp,
    MotorControlMap,
    MotorControlPanel,
-    MotorControlPanelAbsolute,
    MotorControlPanelRelative,
+    MotorControlPanelAbsolute,
    MotorCoordinateTable,
    MotorThread,
 )
--- a/bec_widgets/examples/crosshair_example/init.py
+++ b/bec_widgets/examples/crosshair_example/init.py
--- a/bec_widgets/examples/crosshair_example/crosshair_example.py
+++ b/bec_widgets/examples/crosshair_example/crosshair_example.py
@@ -0,0 +1,168 @@
+import numpy as np
+import pyqtgraph as pg
+from qtpy.QtWidgets import (
+    QApplication,
+    QVBoxLayout,
+    QLabel,
+    QWidget,
+    QHBoxLayout,
+    QTableWidget,
+    QTableWidgetItem,
+    QSpinBox,
+)
+from pyqtgraph import mkPen
+from pyqtgraph.Qt import QtCore
+from bec_widgets.utils import Crosshair
+
+
+class ExampleApp(QWidget):
+    def __init__(self):
+        super().__init__()
+
+        # Layout
+        self.layout = QHBoxLayout()
+        self.setLayout(self.layout)
+
+        ##########################
+        # 1D Plot
+        ##########################
+
+        # PlotWidget
+        self.plot_widget_1d = pg.PlotWidget(title="1D PlotWidget with multiple curves")
+        self.plot_item_1d = self.plot_widget_1d.getPlotItem()
+        self.plot_item_1d.setLogMode(True, True)
+
+        # 1D Datasets
+        self.x_data = np.linspace(0, 10, 1000)
+
+        def gauss(x, mu, sigma):
+            return (1 / (sigma * np.sqrt(2 * np.pi))) * np.exp(-0.5 * ((x - mu) / sigma) ** 2)
+
+        # same convention as in line_plot.py
+        self.y_value_list = [
+            gauss(self.x_data, 1, 1),
+            gauss(self.x_data, 1.5, 3),
+            abs(np.sin(self.x_data)),
+            abs(np.cos(self.x_data)),
+            abs(np.sin(2 * self.x_data)),
+        ]  # List of y-values for multiple curves
+
+        self.curve_names = ["Gauss(1,1)", "Gauss(1.5,3)", "Abs(Sine)", "Abs(Cosine)", "Abs(Sine2x)"]
+        self.curves = []
+
+        ##########################
+        # 2D Plot
+        ##########################
+        self.plot_widget_2d = pg.PlotWidget(title="2D plot with crosshair and ROI square")
+        self.data_2D = np.random.random((100, 200))
+        self.plot_item_2d = self.plot_widget_2d.getPlotItem()
+        self.image_item = pg.ImageItem(self.data_2D)
+        self.plot_item_2d.addItem(self.image_item)
+
+        ##########################
+        # Table
+        ##########################
+        self.table = QTableWidget(len(self.curve_names), 2)
+        self.table.setHorizontalHeaderLabels(["(X, Y) - Moved", "(X, Y) - Clicked"])
+        self.table.setVerticalHeaderLabels(self.curve_names)
+        self.table.resizeColumnsToContents()
+
+        ##########################
+        # Spinbox for N curves
+        ##########################
+        self.spin_box = QSpinBox()
+        self.spin_box.setMinimum(0)
+        self.spin_box.setMaximum(len(self.y_value_list))
+        self.spin_box.setValue(2)
+        self.spin_box.valueChanged.connect(lambda: self.update_curves(self.spin_box.value()))
+
+        ##########################
+        # Adding widgets to layout
+        ##########################
+
+        ##### left side #####
+        self.column1 = QVBoxLayout()
+        self.layout.addLayout(self.column1)
+
+        # SpinBox
+        self.spin_row = QHBoxLayout()
+        self.column1.addLayout(self.spin_row)
+        self.spin_row.addWidget(QLabel("Number of curves:"))
+        self.spin_row.addWidget(self.spin_box)
+
+        # label
+        self.clicked_label_1d = QLabel("Clicked Coordinates (1D):")
+        self.column1.addWidget(self.clicked_label_1d)
+
+        # table
+        self.column1.addWidget(self.table)
+
+        # 1D plot
+        self.column1.addWidget(self.plot_widget_1d)
+
+        ##### left side #####
+        self.column2 = QVBoxLayout()
+        self.layout.addLayout(self.column2)
+
+        # labels
+        self.clicked_label_2d = QLabel("Clicked Coordinates (2D):")
+        self.moved_label_2d = QLabel("Moved Coordinates (2D):")
+        self.column2.addWidget(self.clicked_label_2d)
+        self.column2.addWidget(self.moved_label_2d)
+
+        # 2D plot
+        self.column2.addWidget(self.plot_widget_2d)
+
+        self.update_curves(2)  # just Gaussian curves
+
+    def hook_crosshair(self):
+        self.crosshair_1d = Crosshair(self.plot_item_1d, precision=10)
+        self.crosshair_1d.coordinatesChanged1D.connect(
+            lambda x, y: self.update_table(self.table, x, y, column=0)
+        )
+        self.crosshair_1d.coordinatesClicked1D.connect(
+            lambda x, y: self.update_table(self.table, x, y, column=1)
+        )
+        # 2D
+        self.crosshair_2d = Crosshair(self.plot_item_2d)
+        self.crosshair_2d.coordinatesChanged2D.connect(
+            lambda x, y: self.moved_label_2d.setText(f"Mouse Moved Coordinates (2D): x={x}, y={y}")
+        )
+        self.crosshair_2d.coordinatesClicked2D.connect(
+            lambda x, y: self.clicked_label_2d.setText(f"Clicked Coordinates (2D): x={x}, y={y}")
+        )
+
+    def update_table(self, table_widget, x, y_values, column):
+        """Update the table with the new coordinates"""
+        for i, y in enumerate(y_values):
+            table_widget.setItem(i, column, QTableWidgetItem(f"({x}, {y})"))
+            table_widget.resizeColumnsToContents()
+
+    def update_curves(self, num_curves):
+        """Update the number of curves"""
+
+        self.plot_item_1d.clear()
+
+        # Curves
+        color_list = ["#384c6b", "#e28a2b", "#5E3023", "#e41a1c", "#984e83", "#4daf4a"]
+        self.plot_item_1d.addLegend()
+        self.curves = []
+
+        y_value_list = self.y_value_list[:num_curves]
+
+        for ii, y_value in enumerate(y_value_list):
+            pen = mkPen(color=color_list[ii], width=2, style=QtCore.Qt.DashLine)
+            curve = pg.PlotDataItem(
+                self.x_data, y_value, pen=pen, skipFiniteCheck=True, name=self.curve_names[ii]
+            )
+            self.plot_item_1d.addItem(curve)
+            self.curves.append(curve)
+
+        self.hook_crosshair()
+
+
+if __name__ == "__main__":
+    app = QApplication([])
+    window = ExampleApp()
+    window.show()
+    app.exec()
--- a/bec_widgets/examples/eiger_plot/eiger_plot.py
+++ b/bec_widgets/examples/eiger_plot/eiger_plot.py
@@ -6,11 +6,20 @@ import h5py
 import numpy as np
 import pyqtgraph as pg
 import zmq
-from pyqtgraph.Qt import uic
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtGui import QKeySequence
-from qtpy.QtWidgets import QDialog, QFileDialog, QFrame, QLabel, QShortcut, QVBoxLayout, QWidget
+from qtpy.QtWidgets import (
+    QWidget,
+    QFileDialog,
+    QShortcut,
+    QDialog,
+    QVBoxLayout,
+    QLabel,
+    QFrame,
+)
+from pyqtgraph.Qt import uic
+

 # from scipy.stats import multivariate_normal

@@ -298,7 +307,6 @@ class EigerPlot(QWidget):

 if __name__ == "__main__":
    import sys
-
    from qtpy.QtWidgets import QApplication

    app = QApplication(sys.argv)
--- a/bec_widgets/examples/jupyter_console/jupyter_console_window.py
+++ b/bec_widgets/examples/jupyter_console/jupyter_console_window.py
@@ -1,159 +0,0 @@
-import os
-
-import numpy as np
-import pyqtgraph as pg
-from pyqtgraph.Qt import QtWidgets, uic
-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 bec_widgets.cli.rpc_register import RPCRegister
-from bec_widgets.utils import BECDispatcher
-from bec_widgets.widgets import BECFigure
-from bec_widgets.widgets.dock.dock_area import BECDockArea
-
-
-class JupyterConsoleWidget(RichJupyterWidget):  # pragma: no cover:
-    def __init__(self):
-        super().__init__()
-
-        self.kernel_manager = QtInProcessKernelManager()
-        self.kernel_manager.start_kernel(show_banner=False)
-        self.kernel_client = self.kernel_manager.client()
-        self.kernel_client.start_channels()
-
-        self.kernel_manager.kernel.shell.push({"np": np, "pg": pg})
-        # self.set_console_font_size(70)
-
-    def shutdown_kernel(self):
-        self.kernel_client.stop_channels()
-        self.kernel_manager.shutdown_kernel()
-
-
-class JupyterConsoleWindow(QWidget):  # pragma: no cover:
-    """A widget that contains a Jupyter console linked to BEC Widgets with full API access (contains Qt and pyqtgraph API)."""
-
-    def __init__(self, parent=None):
-        super().__init__(parent)
-
-        current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "jupyter_console_window.ui"), self)
-
-        self._init_ui()
-
-        self.splitter.setSizes([200, 100])
-        self.safe_close = False
-        # self.figure.clean_signal.connect(self.confirm_close)
-
-        self.register = RPCRegister()
-        self.register.add_rpc(self.figure)
-
-        # console push
-        self.console.kernel_manager.kernel.shell.push(
-            {
-                "fig": self.figure,
-                "register": self.register,
-                "dock": self.dock,
-                "w1": self.w1,
-                "w2": self.w2,
-                "w3": self.w3,
-                "d1": self.d1,
-                "d2": self.d2,
-                "d3": self.d3,
-                "b2a": self.button_2_a,
-                "b2b": self.button_2_b,
-                "b2c": self.button_2_c,
-                "bec": self.figure.client,
-                "scans": self.figure.client.scans,
-                "dev": self.figure.client.device_manager.devices,
-            }
-        )
-
-    def _init_ui(self):
-        # Plotting window
-        self.glw_1_layout = QVBoxLayout(self.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.dock_layout = QVBoxLayout(self.dock_placeholder)
-        self.dock = BECDockArea(gui_id="remote")
-        self.dock_layout.addWidget(self.dock)
-
-        # add stuff to figure
-        self._init_figure()
-
-        # init dock for testing
-        self._init_dock()
-
-        self.console_layout = QVBoxLayout(self.widget_console)
-        self.console = JupyterConsoleWidget()
-        self.console_layout.addWidget(self.console)
-        self.console.set_default_style("linux")
-
-    def _init_figure(self):
-        self.figure.plot("samx", "bpm4d")
-        self.figure.motor_map("samx", "samy")
-        self.figure.image("eiger", color_map="viridis", vrange=(0, 100))
-
-        self.figure.change_layout(2, 2)
-
-        self.w1 = self.figure[0, 0]
-        self.w2 = self.figure[0, 1]
-        self.w3 = self.figure[1, 0]
-
-        # curves for w1
-        self.w1.add_curve_scan("samx", "samy", "bpm4i", pen_style="dash")
-        self.w1.add_curve_scan("samx", "samy", "bpm3a", pen_style="dash")
-        self.c1 = self.w1.get_config()
-
-    def _init_dock(self):
-        self.button_1 = QtWidgets.QPushButton("Button 1 ")
-        self.button_2_a = QtWidgets.QPushButton("Button to be added at place 0,0 in d3")
-        self.button_2_b = QtWidgets.QPushButton("button after without postions specified")
-        self.button_2_c = QtWidgets.QPushButton("button super late")
-        self.button_3 = QtWidgets.QPushButton("Button above Figure ")
-        self.label_1 = QtWidgets.QLabel("some scan info label with useful information")
-
-        self.label_2 = QtWidgets.QLabel("label which is added separately")
-        self.label_3 = QtWidgets.QLabel("Label above figure")
-
-        self.d1 = self.dock.add_dock(widget=self.button_1, position="left")
-        self.d1.addWidget(self.label_2)
-        self.d2 = self.dock.add_dock(widget=self.label_1, position="right")
-        self.d3 = self.dock.add_dock(name="figure")
-        self.fig_dock3 = BECFigure()
-        self.fig_dock3.plot("samx", "bpm4d")
-        self.d3.add_widget(self.label_3)
-        self.d3.add_widget(self.button_3)
-        self.d3.add_widget(self.fig_dock3)
-
-        self.dock.save_state()
-
-    def closeEvent(self, event):
-        """Override to handle things when main window is closed."""
-        self.dock.cleanup()
-        self.figure.clear_all()
-        self.figure.client.shutdown()
-        super().closeEvent(event)
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    bec_dispatcher = BECDispatcher()
-    client = bec_dispatcher.client
-    client.start()
-
-    app = QApplication(sys.argv)
-    app.setApplicationName("Jupyter Console")
-    app.setApplicationDisplayName("Jupyter Console")
-    icon = QIcon()
-    icon.addFile("terminal_icon.png", size=QSize(48, 48))
-    app.setWindowIcon(icon)
-    win = JupyterConsoleWindow()
-    win.show()
-
-    app.aboutToQuit.connect(win.close)
-    sys.exit(app.exec_())
--- 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/jupyter_console/terminal_icon.png
+++ b/bec_widgets/examples/jupyter_console/terminal_icon.png
--- a/bec_widgets/examples/mca_readout/mca_plot.py
+++ b/bec_widgets/examples/mca_readout/mca_plot.py
@@ -1,15 +1,19 @@
 # import simulation_progress as SP
 import numpy as np
 import pyqtgraph as pg
+from qtpy.QtCore import Signal as pyqtSignal, Slot as pyqtSlot
+from qtpy.QtWidgets import (
+    QApplication,
+    QVBoxLayout,
+    QWidget,
+)
+
 from bec_lib import MessageEndpoints, messages
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget


 class StreamApp(QWidget):
    update_signal = pyqtSignal()
-    new_scan_id = pyqtSignal(str)
+    new_scanID = pyqtSignal(str)

    def __init__(self, device, sub_device):
        super().__init__()
@@ -19,7 +23,7 @@ class StreamApp(QWidget):
        self.setWindowTitle("MCA readout")

        self.data = None
-        self.scan_id = None
+        self.scanID = None
        self.stream_consumer = None

        self.device = device
@@ -29,7 +33,7 @@ class StreamApp(QWidget):

        # self.start_device_consumer(self.device)  # for simulation

-        self.new_scan_id.connect(self.create_new_stream_consumer)
+        self.new_scanID.connect(self.create_new_stream_consumer)
        self.update_signal.connect(self.plot_new)

    def init_ui(self):
@@ -60,17 +64,17 @@ class StreamApp(QWidget):
        # self.glw.addItem(self.hist)

    @pyqtSlot(str)
-    def create_new_stream_consumer(self, scan_id: str):
-        print(f"Creating new stream consumer for scan_id: {scan_id}")
+    def create_new_stream_consumer(self, scanID: str):
+        print(f"Creating new stream consumer for scanID: {scanID}")

-        self.connect_stream_consumer(scan_id, self.device)
+        self.connect_stream_consumer(scanID, self.device)

-    def connect_stream_consumer(self, scan_id, device):
+    def connect_stream_consumer(self, scanID, device):
        if self.stream_consumer is not None:
            self.stream_consumer.shutdown()

        self.stream_consumer = connector.stream_consumer(
-            topics=MessageEndpoints.device_async_readback(scan_id=scan_id, device=device),
+            topics=MessageEndpoints.device_async_readback(scanID=scanID, device=device),
            cb=self._streamer_cb,
            parent=self,
        )
@@ -121,25 +125,24 @@ class StreamApp(QWidget):

        msgDEV = msg.value

-        current_scan_id = msgDEV.content["scan_id"]
+        current_scanID = msgDEV.content["scanID"]

-        if parent.scan_id is None:
-            parent.scan_id = current_scan_id
-            parent.new_scan_id.emit(current_scan_id)
-            print(f"New scan_id: {current_scan_id}")
+        if parent.scanID is None:
+            parent.scanID = current_scanID
+            parent.new_scanID.emit(current_scanID)
+            print(f"New scanID: {current_scanID}")

-        if current_scan_id != parent.scan_id:
-            parent.scan_id = current_scan_id
+        if current_scanID != parent.scanID:
+            parent.scanID = current_scanID
            # parent.data = None
            # parent.imageItem.clear()
-            parent.new_scan_id.emit(current_scan_id)
+            parent.new_scanID.emit(current_scanID)

-            print(f"New scan_id: {current_scan_id}")
+            print(f"New scanID: {current_scanID}")


 if __name__ == "__main__":
    import argparse
-
    from bec_lib import RedisConnector

    parser = argparse.ArgumentParser(description="Stream App.")
--- a/bec_widgets/examples/mca_readout/mca_sim.py
+++ b/bec_widgets/examples/mca_readout/mca_sim.py
@@ -1,23 +1,28 @@
+from bec_lib import messages, MessageEndpoints, RedisConnector
 import time

-from bec_lib import MessageEndpoints, RedisConnector, messages
-
 connector = RedisConnector("localhost:6379")
 metadata = {}

-scan_id = "ScanID1"
+scanID = "ScanID1"

 metadata.update(
-    {"scan_id": scan_id, "async_update": "append"}  # this will be different for each scan
+    {
+        "scanID": scanID,  # this will be different for each scan
+        "async_update": "append",
+    }
 )
 for ii in range(20):
    data = {"mca1": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], "mca2": [10, 9, 8, 7, 6, 5, 4, 3, 2, 1]}
-    msg = messages.DeviceMessage(signals=data, metadata=metadata).dumps()
+    msg = messages.DeviceMessage(
+        signals=data,
+        metadata=metadata,
+    ).dumps()

    connector.xadd(
        topic=MessageEndpoints.device_async_readback(
-            scan_id=scan_id, device="mca"
-        ),  # scan_id will be different for each scan
+            scanID=scanID, device="mca"
+        ),  # scanID will be different for each scan
        msg={"data": msg},  # TODO should be msg_dict
        expire=1800,
    )
--- a/bec_widgets/examples/modular_app/modular_app.py
+++ b/bec_widgets/examples/modular_app/modular_app.py
@@ -1,7 +1,7 @@
 import os

 from qtpy import uic
-from qtpy.QtWidgets import QApplication, QMainWindow
+from qtpy.QtWidgets import QMainWindow, QApplication

 from bec_widgets.utils.bec_dispatcher import BECDispatcher
 from bec_widgets.widgets import BECMonitor
@@ -106,7 +106,10 @@ CONFIG_SCAN_MODE = {
                "sources": [
                    {
                        "type": "scan_segment",
-                        "signals": {"x": [{"name": "samy"}], "y": [{"name": "gauss_adc2"}]},
+                        "signals": {
+                            "x": [{"name": "samy"}],
+                            "y": [{"name": "gauss_adc2"}],
+                        },
                    }
                ],
            },
--- a/bec_widgets/examples/motor_movement/init.py
+++ b/bec_widgets/examples/motor_movement/init.py
@@ -2,8 +2,8 @@ from .motor_control_compilations import (
    MotorControlApp,
    MotorControlMap,
    MotorControlPanel,
-    MotorControlPanelAbsolute,
    MotorControlPanelRelative,
+    MotorControlPanelAbsolute,
    MotorCoordinateTable,
    MotorThread,
 )
--- a/bec_widgets/examples/motor_movement/motor_control_compilations.py
+++ b/bec_widgets/examples/motor_movement/motor_control_compilations.py
@@ -1,17 +1,22 @@
 # pylint: disable = no-name-in-module,missing-class-docstring, missing-module-docstring

 import qdarktheme
+from qtpy.QtWidgets import QApplication
+from qtpy.QtWidgets import QVBoxLayout
+from qtpy.QtWidgets import (
+    QWidget,
+    QSplitter,
+)
 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 import (
    MotorControlAbsolute,
    MotorControlRelative,
    MotorControlSelection,
-    MotorCoordinateTable,
-    MotorMap,
    MotorThread,
+    MotorMap,
+    MotorCoordinateTable,
 )

 CONFIG_DEFAULT = {
@@ -42,7 +47,7 @@ CONFIG_DEFAULT = {
                "x": [{"name": "samx", "entry": "samx"}],
                "y": [{"name": "samy", "entry": "samy"}],
            },
-        }
+        },
    ],
 }

@@ -237,19 +242,19 @@ if __name__ == "__main__":  # pragma: no cover
    qdarktheme.setup_theme("auto")

    if args.variant == "app":
-        window = MotorControlApp(client=client)  # , config=CONFIG_DEFAULT)
+        window = MotorControlApp(client=client, config=CONFIG_DEFAULT)
    elif args.variant == "map":
-        window = MotorControlMap(client=client)  # , config=CONFIG_DEFAULT)
+        window = MotorControlMap(client=client, config=CONFIG_DEFAULT)
    elif args.variant == "panel":
-        window = MotorControlPanel(client=client)  # , config=CONFIG_DEFAULT)
+        window = MotorControlPanel(client=client, config=CONFIG_DEFAULT)
    elif args.variant == "panel_abs":
-        window = MotorControlPanelAbsolute(client=client)  # , config=CONFIG_DEFAULT)
+        window = MotorControlPanelAbsolute(client=client, config=CONFIG_DEFAULT)
    elif args.variant == "panel_rel":
-        window = MotorControlPanelRelative(client=client)  # , config=CONFIG_DEFAULT)
+        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 = 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
@@ -883,7 +883,7 @@
         </column>
         <column>
          <property name="text">
-           <string>scan_id</string>
+           <string>scanID</string>
          </property>
         </column>
         <column>
--- a/bec_widgets/examples/motor_movement/motor_example.py
+++ b/bec_widgets/examples/motor_movement/motor_example.py
@@ -5,28 +5,29 @@ from functools import partial

 import numpy as np
 import pyqtgraph as pg
-from bec_lib import MessageEndpoints, messages
-from pyqtgraph.Qt import QtCore, QtWidgets, uic
 from qtpy import QtGui
-from qtpy.QtCore import Qt, QThread
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtGui import QDoubleValidator, QKeySequence
+from qtpy.QtCore import QThread, Slot as pyqtSlot
+from qtpy.QtCore import Signal as pyqtSignal, Qt
+from qtpy.QtGui import QDoubleValidator
+from qtpy.QtGui import QKeySequence
 from qtpy.QtWidgets import (
    QApplication,
-    QDialog,
-    QFileDialog,
-    QFrame,
-    QLabel,
-    QMessageBox,
-    QPushButton,
-    QShortcut,
-    QVBoxLayout,
    QWidget,
+    QFileDialog,
+    QDialog,
+    QVBoxLayout,
+    QLabel,
+    QPushButton,
+    QFrame,
 )
+from qtpy.QtWidgets import QMessageBox
+from qtpy.QtWidgets import QShortcut
+from pyqtgraph.Qt import QtWidgets, uic, QtCore

+from bec_lib import MessageEndpoints, messages
 from bec_widgets.utils import DoubleValidationDelegate

+
 # TODO - General features
 #  - put motor status (moving, stopped, etc)
 #  - add mouse interactions with the plot -> click to select coordinates, double click to move?
@@ -1068,7 +1069,10 @@ class MotorApp(QWidget):

        # PyQtGraph Controls
        layout.addWidget(QLabel("Graph Window Controls:"))
-        graph_controls = [("Left Drag", "Pan the view"), ("Right Drag or Scroll", "Zoom in/out")]
+        graph_controls = [
+            ("Left Drag", "Pan the view"),
+            ("Right Drag or Scroll", "Zoom in/out"),
+        ]
        for action, description in graph_controls:
            layout.addWidget(QLabel(f"{action} - {description}"))

@@ -1108,7 +1112,10 @@ class MotorControl(QThread):
    motors_selected = pyqtSignal(object, object)  # Signal to emit when the motors are selected
    # progress_updated = pyqtSignal(int)  #TODO  Signal to emit progress percentage

-    def __init__(self, parent=None):
+    def __init__(
+        self,
+        parent=None,
+    ):
        super().__init__(parent)

        self.action = None
@@ -1125,7 +1132,10 @@ class MotorControl(QThread):
        self.motor_x_name = motor_x_name
        self.motor_y_name = motor_y_name

-        self.motor_x, self.motor_y = (dev[self.motor_x_name], dev[self.motor_y_name])
+        self.motor_x, self.motor_y = (
+            dev[self.motor_x_name],
+            dev[self.motor_y_name],
+        )

        (self.current_x, self.current_y) = self.get_coordinates()

@@ -1296,9 +1306,9 @@ class MotorControl(QThread):


 if __name__ == "__main__":
+    import yaml
    import argparse

-    import yaml
    from bec_lib import BECClient, ServiceConfig

    parser = argparse.ArgumentParser(description="Motor App")
--- a/bec_widgets/examples/oneplot/init.py
+++ b/bec_widgets/examples/oneplot/init.py
--- a/bec_widgets/examples/oneplot/config_gaussworker.yaml
+++ b/bec_widgets/examples/oneplot/config_gaussworker.yaml
@@ -0,0 +1,3 @@
+x_value: "samx"
+y_values: ["gauss_bpm", "gauss_adc1", "gauss_adc2"]
+dap_worker: "gaussian_fit_worker_3"
--- a/bec_widgets/examples/oneplot/config_noworker.yaml
+++ b/bec_widgets/examples/oneplot/config_noworker.yaml
@@ -0,0 +1,3 @@
+x_value: "samx"
+y_values: ["gauss_bpm", "gauss_adc1", "gauss_adc2"]
+dap_worker: None
--- a/bec_widgets/examples/oneplot/oneplot.py
+++ b/bec_widgets/examples/oneplot/oneplot.py
@@ -0,0 +1,271 @@
+import os
+
+import numpy as np
+import qtpy.QtWidgets
+import pyqtgraph as pg
+from bec_lib import MessageEndpoints
+from qtpy.QtCore import Signal as pyqtSignal, Slot as pyqtSlot
+from qtpy.QtWidgets import QApplication, QTableWidgetItem, QWidget
+from pyqtgraph import mkBrush, mkColor, mkPen
+from pyqtgraph.Qt import QtCore, uic
+
+from bec_widgets.utils import Crosshair, ctrl_c
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
+
+
+# TODO implement:
+#   - implement scanID database for visualizing previous scans
+#   - multiple signals for different monitors
+#   - change how dap is handled in bec_dispatcher to handle more workers
+
+
+class PlotApp(QWidget):
+    """
+    Main class for the PlotApp used to plot two signals from the BEC.
+
+    Attributes:
+        update_signal (pyqtSignal): Signal to trigger plot updates.
+        update_dap_signal (pyqtSignal): Signal to trigger DAP updates.
+
+    Args:
+        x_value (str): The x device/signal for plotting.
+        y_values (list of str): List of y device/signals for plotting.
+        dap_worker (str, optional): DAP process to specify. Set to None to disable.
+        parent (QWidget, optional): Parent widget.
+    """
+
+    update_signal = pyqtSignal()
+    update_dap_signal = pyqtSignal()
+
+    def __init__(self, x_value, y_values, dap_worker=None, parent=None):
+        super(PlotApp, self).__init__(parent)
+        current_path = os.path.dirname(__file__)
+        uic.loadUi(os.path.join(current_path, "oneplot.ui"), self)
+
+        self.x_value = x_value
+        self.y_values = y_values
+        self.dap_worker = dap_worker
+
+        self.scanID = None
+        self.data_x = []
+        self.data_y = []
+
+        self.dap_x = np.array([])
+        self.dap_y = np.array([])
+
+        self.fit = None
+
+        self.init_ui()
+        self.init_curves()
+        self.hook_crosshair()
+
+        self.proxy_update_plot = pg.SignalProxy(
+            self.update_signal, rateLimit=25, slot=self.update_plot
+        )
+        self.proxy_update_fit = pg.SignalProxy(
+            self.update_dap_signal, rateLimit=25, slot=self.update_fit_table
+        )
+
+    def init_ui(self) -> None:
+        """Initialize the UI components."""
+        self.plot = pg.PlotItem()
+        self.glw.addItem(self.plot)
+        self.plot.setLabel("bottom", self.x_value)
+        self.plot.setLabel("left", ", ".join(self.y_values))
+        self.plot.addLegend()
+
+    def init_curves(self) -> None:
+        """Initialize curve data and properties."""
+        self.plot.clear()
+
+        self.curves_data = []
+        self.curves_dap = []
+
+        colors_y_values = PlotApp.golden_angle_color(colormap="CET-R2", num=len(self.y_values))
+        # colors_y_daps = PlotApp.golden_angle_color(
+        #     colormap="CET-I2", num=len(self.dap_worker)
+        # )  # TODO adapt for multiple dap_workers
+
+        # Initialize curves for y_values
+        for ii, (signal, color) in enumerate(zip(self.y_values, colors_y_values)):
+            pen_curve = mkPen(color=color, width=2, style=QtCore.Qt.DashLine)
+            brush_curve = mkBrush(color=color)
+            curve_data = pg.PlotDataItem(
+                symbolSize=5,
+                symbolBrush=brush_curve,
+                pen=pen_curve,
+                skipFiniteCheck=True,
+                name=f"{signal}",
+            )
+            self.curves_data.append(curve_data)
+            self.plot.addItem(curve_data)
+
+        # Initialize curves for DAP if dap_worker is not None
+        if self.dap_worker is not None:
+            # for ii, (monitor, color) in enumerate(zip(self.dap_worker, colors_y_daps)):#TODO adapt for multiple dap_workers
+            pen_dap = mkPen(color="#3b5998", width=2, style=QtCore.Qt.DashLine)
+            curve_dap = pg.PlotDataItem(
+                pen=pen_dap, skipFiniteCheck=True, symbolSize=5, name=f"{self.dap_worker}"
+            )
+            self.curves_dap.append(curve_dap)
+            self.plot.addItem(curve_dap)
+
+        self.tableWidget_crosshair.setRowCount(len(self.y_values))
+        self.tableWidget_crosshair.setVerticalHeaderLabels(self.y_values)
+        self.hook_crosshair()
+
+    def hook_crosshair(self) -> None:
+        """Attach the crosshair to the plot."""
+        self.crosshair_1d = Crosshair(self.plot, precision=3)
+        self.crosshair_1d.coordinatesChanged1D.connect(
+            lambda x, y: self.update_table(self.tableWidget_crosshair, x, y, column=0)
+        )
+        self.crosshair_1d.coordinatesClicked1D.connect(
+            lambda x, y: self.update_table(self.tableWidget_crosshair, x, y, column=1)
+        )
+
+    def update_table(
+        self, table_widget: qtpy.QtWidgets.QTableWidget, x: float, y_values: list, column: int
+    ) -> None:
+        for i, y in enumerate(y_values):
+            table_widget.setItem(i, column, QTableWidgetItem(f"({x}, {y})"))
+            table_widget.resizeColumnsToContents()
+
+    def update_plot(self) -> None:
+        """Update the plot data."""
+        for ii, curve in enumerate(self.curves_data):
+            curve.setData(self.data_x, self.data_y[ii])
+
+        if self.dap_worker is not None:
+            # for ii, curve in enumerate(self.curves_dap): #TODO adapt for multiple dap_workers
+            #     curve.setData(self.dap_x, self.dap_y[ii])
+            self.curves_dap[0].setData(self.dap_x, self.dap_y)
+
+    def update_fit_table(self):
+        """Update the table for fit data."""
+
+        self.tableWidget_fit.setData(self.fit)
+
+    @pyqtSlot(dict, dict)
+    def on_dap_update(self, msg: dict, metadata: dict) -> None:
+        """
+        Update DAP  related data.
+
+        Args:
+            msg (dict): Message received with data.
+            metadata (dict): Metadata of the DAP.
+        """
+
+        # TODO adapt for multiple dap_workers
+        self.dap_x = msg[self.dap_worker]["x"]
+        self.dap_y = msg[self.dap_worker]["y"]
+
+        self.fit = metadata["fit_parameters"]
+
+        self.update_dap_signal.emit()
+
+    @pyqtSlot(dict, dict)
+    def on_scan_segment(self, msg: dict, metadata: dict):
+        """
+        Handle new scan segments.
+
+        Args:
+            msg (dict): Message received with scan data.
+            metadata (dict): Metadata of the scan.
+        """
+        current_scanID = msg["scanID"]
+
+        if current_scanID != self.scanID:
+            self.scanID = current_scanID
+            self.data_x = []
+            self.data_y = [[] for _ in self.y_values]
+            self.init_curves()
+
+        dev_x = self.x_value
+        data_x = msg["data"][dev_x][dev[dev_x]._hints[0]]["value"]
+        self.data_x.append(data_x)
+
+        for ii, dev_y in enumerate(self.y_values):
+            data_y = msg["data"][dev_y][dev[dev_y]._hints[0]]["value"]
+            self.data_y[ii].append(data_y)
+
+        self.update_signal.emit()
+
+    @staticmethod
+    def golden_ratio(num: int) -> list:
+        """Calculate the golden ratio for a given number of angles.
+
+        Args:
+            num (int): Number of angles
+        """
+        phi = 2 * np.pi * ((1 + np.sqrt(5)) / 2)
+        angles = []
+        for ii in range(num):
+            x = np.cos(ii * phi)
+            y = np.sin(ii * phi)
+            angle = np.arctan2(y, x)
+            angles.append(angle)
+        return angles
+
+    @staticmethod
+    def golden_angle_color(colormap: str, num: int) -> list:
+        """
+        Extract num colors for from the specified colormap following golden angle distribution.
+
+        Args:
+            colormap (str): Name of the colormap
+            num (int): Number of requested colors
+
+        Returns:
+            list: List of colors with length <num>
+
+        Raises:
+            ValueError: If the number of requested colors is greater than the number of colors in the colormap.
+        """
+
+        cmap = pg.colormap.get(colormap)
+        cmap_colors = cmap.color
+        if num > len(cmap_colors):
+            raise ValueError(
+                f"Number of colors requested ({num}) is greater than the number of colors in the colormap ({len(cmap_colors)})"
+            )
+        angles = PlotApp.golden_ratio(len(cmap_colors))
+        color_selection = np.round(np.interp(angles, (-np.pi, np.pi), (0, len(cmap_colors))))
+        colors = [
+            mkColor(tuple((cmap_colors[int(ii)] * 255).astype(int))) for ii in color_selection[:num]
+        ]
+        return colors
+
+
+if __name__ == "__main__":
+    import yaml
+
+    with open("config_noworker.yaml", "r") as file:
+        config = yaml.safe_load(file)
+
+    x_value = config["x_value"]
+    y_values = config["y_values"]
+    dap_worker = config["dap_worker"]
+
+    dap_worker = None if dap_worker == "None" else dap_worker
+
+    # BECclient global variables
+    bec_dispatcher = BECDispatcher()
+    client = bec_dispatcher.client
+    client.start()
+
+    dev = client.device_manager.devices
+    scans = client.scans
+    queue = client.queue
+
+    app = QApplication([])
+    plotApp = PlotApp(x_value=x_value, y_values=y_values, dap_worker=dap_worker)
+
+    # Connecting signals from bec_dispatcher
+    bec_dispatcher.connect_slot(plotApp.on_dap_update, MessageEndpoints.processed_data(dap_worker))
+    bec_dispatcher.connect_slot(plotApp.on_scan_segment, MessageEndpoints.scan_segment())
+    ctrl_c.setup(app)
+
+    window = plotApp
+    window.show()
+    app.exec()
--- a/bec_widgets/examples/oneplot/oneplot.ui
+++ b/bec_widgets/examples/oneplot/oneplot.ui
@@ -0,0 +1,75 @@
+<?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>547</width>
+    <height>653</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="1,2">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="2,1">
+     <item>
+      <widget class="QGroupBox" name="groupBox">
+       <property name="title">
+        <string>Cursor</string>
+       </property>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0">
+         <widget class="QTableWidget" name="tableWidget_crosshair">
+          <column>
+           <property name="text">
+            <string>Moved</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Clicked</string>
+           </property>
+          </column>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox_2">
+       <property name="title">
+        <string>Fit</string>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
+         <widget class="TableWidget" name="tableWidget_fit"/>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="GraphicsLayoutWidget" name="glw"/>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>GraphicsLayoutWidget</class>
+   <extends>QGraphicsView</extends>
+   <header>pyqtgraph.h</header>
+  </customwidget>
+  <customwidget>
+   <class>TableWidget</class>
+   <extends>QTableWidget</extends>
+   <header>pyqtgraph.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
--- a/bec_widgets/examples/plot_app/init.py
+++ b/bec_widgets/examples/plot_app/init.py
--- a/bec_widgets/examples/plot_app/config_example.yaml
+++ b/bec_widgets/examples/plot_app/config_example.yaml
@@ -0,0 +1,130 @@
+plot_settings:
+  background_color: "black"
+  num_columns: 2
+  colormap: "plasma"
+  scan_types: False # True to show scan types
+
+# example to use without scan_type -> only one general configuration
+plot_data:
+  - plot_name: "BPM4i plots vs samy"
+    x:
+      label: 'Motor Y'
+      signals:
+        - name: "samy"
+#          entry: "samy" # here I also forgot to specify entry
+    y:
+      label: 'bpm4i'
+      signals:
+        - name: "bpm4i"
+          entry: "bpm4i"
+          # I will not specify entry, because I want to take hint from gauss_adc2
+  - plot_name: "BPM4i plots vs samx"
+    x:
+      label: 'Motor Y'
+      signals:
+        - name: "samy"
+#          entry: "samy" # here I also forgot to specify entry
+    y:
+      label: 'bpm4i'
+      signals:
+        - name: "bpm4i"
+          entry: "bpm4i"
+          # I will not specify entry, because I want to take hint from gauss_adc2
+  - plot_name: "MCS Channel 4 (Cyberstar) vs samx"
+    x:
+      label: 'Motor X'
+      signals:
+        - name: "samx"
+          entry: "samx"
+    y:
+      label: 'mcs4 cyberstar'
+      signals:
+        - name: "mcs"
+          entry: "mca4"
+  - plot_name: "MCS Channel 4 (Cyberstar) vs samy"
+    x:
+      label: 'Motor X'
+      signals:
+        - name: "samy"
+          entry: "samy"
+    y:
+      label: 'mcs4 cyberstar'
+      signals:
+        - name: "mcs"
+          entry: "mca4"
+
+
+
+# example to use with scan_type -> different configuration for different scan types
+#plot_data:
+#  line_scan:
+#    - plot_name: "BPM plot"
+#      x:
+#        label: 'Motor X'
+#        signals:
+#          - name: "samx"
+#  #          entry: "samx"
+#      y:
+#        label: 'BPM'
+#        signals:
+#          - name: "gauss_bpm"
+#            entry: "gauss_bpm"
+#          - name: "gauss_adc1"
+#            entry: "gauss_adc1"
+#          - name: "gauss_adc2"
+#            entry: "gauss_adc2"
+#
+#    - plot_name: "Multi"
+#      x:
+#        label: 'Motor X'
+#        signals:
+#          - name: "samx"
+#            entry: "samx"
+#      y:
+#        label: 'Multi'
+#        signals:
+#          - name: "gauss_bpm"
+#            entry: "gauss_bpm"
+#          - name: "samx"
+#            entry: ["samx", "samx_setpoint"]
+#
+#  grid_scan:
+#    - plot_name: "Grid plot 1"
+#      x:
+#        label: 'Motor X'
+#        signals:
+#          - name: "samx"
+#            entry: "samx"
+#      y:
+#        label: 'BPM'
+#        signals:
+#          - name: "gauss_bpm"
+#            entry: "gauss_bpm"
+#          - name: "gauss_adc1"
+#            entry: "gauss_adc1"
+#    - plot_name: "Grid plot 2"
+#      x:
+#        label: 'Motor X'
+#        signals:
+#          - name: "samx"
+#            entry: "samx"
+#      y:
+#        label: 'BPM'
+#        signals:
+#          - name: "gauss_bpm"
+#            entry: "gauss_bpm"
+#          - name: "gauss_adc1"
+#            entry: "gauss_adc1"
+#
+#    - plot_name: "Grid plot 3"
+#      x:
+#        label: 'Motor Y'
+#        signals:
+#          - name: "samy"
+#            entry: "samy"
+#      y:
+#        label: 'BPM'
+#        signals:
+#          - name: "gauss_bpm"
+#            entry: "gauss_bpm"
+
--- a/bec_widgets/examples/plot_app/config_scans_example.yaml
+++ b/bec_widgets/examples/plot_app/config_scans_example.yaml
@@ -0,0 +1,91 @@
+plot_settings:
+  background_color: "black"
+  num_columns: 2
+  colormap: "plasma"
+  scan_types: True # True to show scan types
+
+# example to use with scan_type -> different configuration for different scan types
+plot_data:
+  line_scan:
+    - plot_name: "BPM plot"
+      x:
+        label: 'Motor X'
+        signals:
+          - name: "samx"
+  #          entry: "samx"
+      y:
+        label: 'BPM'
+        signals:
+          - name: "gauss_bpm"
+            entry: "gauss_bpm"
+          - name: "gauss_adc1"
+            entry: "gauss_adc1"
+          - name: "gauss_adc2"
+            entry: "gauss_adc2"
+
+    - plot_name: "Multi"
+      x:
+        label: 'Motor X'
+        signals:
+          - name: "samx"
+            entry: "samx"
+      y:
+        label: 'Multi'
+        signals:
+          - name: "gauss_bpm"
+            entry: "gauss_bpm"
+          - name: "samx"
+            entry: ["samx", "samx_setpoint"]
+
+  grid_scan:
+    - plot_name: "Grid plot 1"
+      x:
+        label: 'Motor X'
+        signals:
+          - name: "samx"
+            entry: "samx"
+      y:
+        label: 'BPM'
+        signals:
+          - name: "gauss_bpm"
+            entry: "gauss_bpm"
+          - name: "gauss_adc1"
+            entry: "gauss_adc1"
+    - plot_name: "Grid plot 2"
+      x:
+        label: 'Motor X'
+        signals:
+          - name: "samx"
+            entry: "samx"
+      y:
+        label: 'BPM'
+        signals:
+          - name: "gauss_bpm"
+            entry: "gauss_bpm"
+          - name: "gauss_adc1"
+            entry: "gauss_adc1"
+
+    - plot_name: "Grid plot 3"
+      x:
+        label: 'Motor Y'
+        signals:
+          - name: "samy"
+            entry: "samy"
+      y:
+        label: 'BPM'
+        signals:
+          - name: "gauss_bpm"
+            entry: "gauss_bpm"
+
+    - plot_name: "Grid plot 4"
+      x:
+        label: 'Motor Y'
+        signals:
+          - name: "samy"
+            entry: "samy"
+      y:
+        label: 'BPM'
+        signals:
+          - name: "gauss_adc3"
+            entry: "gauss_adc3"
+
--- a/bec_widgets/examples/plot_app/plot_app.py
+++ b/bec_widgets/examples/plot_app/plot_app.py
@@ -0,0 +1,730 @@
+import logging
+import os
+
+# import traceback
+
+import pyqtgraph
+import pyqtgraph as pg
+
+from qtpy.QtCore import Signal as pyqtSignal, Slot as pyqtSlot
+
+from qtpy.QtWidgets import (
+    QApplication,
+    QWidget,
+    QTableWidgetItem,
+    QTableWidget,
+    QFileDialog,
+    QMessageBox,
+)
+from pyqtgraph import ColorButton
+from pyqtgraph import mkBrush, mkPen
+from pyqtgraph.Qt import QtCore, uic
+from pyqtgraph.Qt import QtWidgets
+
+from bec_lib import MessageEndpoints
+from bec_widgets.utils import Crosshair, Colors
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
+
+
+# TODO implement:
+#   - implement scanID database for visualizing previous scans
+
+
+class PlotApp(QWidget):
+    """
+    Main class for PlotApp, designed to plot multiple signals in a grid layout
+    based on a flexible YAML configuration.
+
+    Attributes:
+        update_signal (pyqtSignal): Signal to trigger plot updates.
+        plot_data (list of dict): List of dictionaries containing plot configurations.
+                                  Each dictionary specifies x and y signals, including their
+                                  name and entry, for a particular plot.
+
+    Args:
+        config (dict): Configuration dictionary containing all settings for the plotting app.
+                      It should include the following keys:
+                      - 'plot_settings': Dictionary containing global plot settings.
+                      - 'plot_data': List of dictionaries specifying the signals to plot.
+        parent (QWidget, optional): Parent widget.
+
+    Example:
+        General Plot Configuration:
+        {
+            'plot_settings': {'background_color': 'black', 'num_columns': 2, 'colormap': 'plasma', 'scan_types': False},
+            'plot_data': [
+                {
+                    'plot_name': 'Plot A',
+                    'x': {'label': 'X-axis', 'signals': [{'name': 'device_x', 'entry': 'entry_x'}]},
+                    'y': {'label': 'Y-axis', 'signals': [{'name': 'device_y', 'entry': 'entry_y'}]}
+                }
+            ]
+        }
+
+        Different Scans Mode Configuration:
+        {
+            'plot_settings': {'background_color': 'black', 'num_columns': 2, 'colormap': 'plasma', 'scan_types': True},
+            'plot_data': {
+                'scan_type_1': [
+                    {
+                        'plot_name': 'Plot 1',
+                        'x': {'label': 'X-axis', 'signals': [{'name': 'device_x1', 'entry': 'entry_x1'}]},
+                        'y': {'label': 'Y-axis', 'signals': [{'name': 'device_y1', 'entry': 'entry_y1'}]}
+                    }
+                ],
+                'scan_type_2': [
+                    {
+                        'plot_name': 'Plot 2',
+                        'x': {'label': 'X-axis', 'signals': [{'name': 'device_x2', 'entry': 'entry_x2'}]},
+                        'y': {'label': 'Y-axis', 'signals': [{'name': 'device_y2', 'entry': 'entry_y2'}]}
+                    }
+                ]
+            }
+        }
+    """
+
+    update_signal = pyqtSignal()
+    update_dap_signal = pyqtSignal()
+
+    def __init__(self, config: dict, client=None, parent=None):
+        super(PlotApp, self).__init__(parent)
+
+        # Error handler
+        self.error_handler = ErrorHandler(parent=self)
+
+        # Client and device manager from BEC
+        self.client = BECDispatcher().client if client is None else client
+        self.dev = self.client.device_manager.devices
+
+        # Loading UI
+        current_path = os.path.dirname(__file__)
+        uic.loadUi(os.path.join(current_path, "plot_app.ui"), self)
+
+        self.data = {}
+
+        self.crosshairs = None
+        self.plots = None
+        self.curves_data = None
+        self.grid_coordinates = None
+        self.scanID = None
+
+        self.user_colors = {}  # key: (plot_name, y_name, y_entry), value: color
+
+        # Default config
+        self.config = config
+
+        # Validate the configuration before proceeding
+        self.load_config(self.config)
+
+        # Default splitter size
+        self.splitter.setSizes([400, 100])
+
+        # Buttons
+        self.pushButton_save.clicked.connect(self.save_settings_to_yaml)
+        self.pushButton_load.clicked.connect(self.load_settings_from_yaml)
+
+        # Connect the update signal to the update plot method
+        self.proxy_update_plot = pg.SignalProxy(
+            self.update_signal, rateLimit=25, slot=self.update_plot
+        )
+
+        # Change layout of plots when the number of columns is changed in GUI
+        self.spinBox_N_columns.valueChanged.connect(lambda x: self.init_ui(x))
+
+    def load_config(self, config: dict) -> None:
+        """
+        Load and validate the configuration, retrying until a valid configuration is provided or the user cancels.
+        Args:
+            config (dict): Configuration dictionary form .yaml file.
+
+        Returns:
+            None
+        """
+        valid_config = False
+        self.error_handler.set_retry_action(self.load_settings_from_yaml)
+        while not valid_config:
+            if config is None:
+                self.config = (
+                    self.load_settings_from_yaml()
+                )  # Load config if it hasn't been loaded yet
+            try:  # Validate loaded config file
+                self.error_handler.validate_config_file(config)
+                valid_config = True
+            except ValueError as e:
+                self.config = None  # Reset config_to_test to force reloading configuration
+                self.config = self.error_handler.handle_error(str(e))
+        if valid_config is True:  # Initialize config if validation succeeds
+            self.init_config(self.config)
+
+    def init_config(self, config: dict) -> None:
+        """
+        Initializes or update the configuration settings for the PlotApp.
+
+        Args:
+            config (dict): Dictionary containing plot settings and data configurations.
+        """
+
+        # YAML config
+        self.plot_settings = config.get("plot_settings", {})
+        self.plot_data_config = config.get("plot_data", {})
+        self.scan_types = self.plot_settings.get("scan_types", False)
+
+        if self.scan_types is False:  # Device tracking mode
+            self.plot_data = self.plot_data_config  # TODO logic has to be improved
+        else:  # setup first line scan as default, then changed with different scan type
+            self.plot_data = self.plot_data_config[list(self.plot_data_config.keys())[0]]
+
+        # Setting global plot settings
+        self.init_plot_background(self.plot_settings["background_color"])
+
+        # Initialize the UI
+        self.init_ui(self.plot_settings["num_columns"])
+        self.spinBox_N_columns.setValue(
+            self.plot_settings["num_columns"]
+        )  # TODO has to be checked if it will not setup more columns than plots
+        self.spinBox_N_columns.setMaximum(len(self.plot_data))
+
+    def init_plot_background(self, background_color: str) -> None:
+        """
+        Initialize plot settings based on the background color.
+
+        Args:
+            background_color (str): The background color ('white' or 'black').
+
+        This method sets the background and foreground colors for pyqtgraph.
+        If the background is dark ('black'), the foreground will be set to 'white',
+        and vice versa.
+        """
+        if background_color.lower() == "black":
+            pg.setConfigOption("background", "k")
+            pg.setConfigOption("foreground", "w")
+        elif background_color.lower() == "white":
+            pg.setConfigOption("background", "w")
+            pg.setConfigOption("foreground", "k")
+        else:
+            raise ValueError(
+                f"Invalid background color {background_color}. Allowed values are 'white' or 'black'."
+            )
+
+        # TODO simplify -> find way how to setup also foreground color
+        # if background_color.lower() not in ["black", "white"]:
+        #     raise ValueError(
+        #         f"Invalid background color {background_color}. Allowed values are 'white' or 'black'."
+        #     )
+        # self.glw.setBackground(background_color.lower())
+
+    def init_ui(self, num_columns: int = 3) -> None:
+        """
+        Initialize the UI components, create plots and store their grid positions.
+
+        Args:
+            num_columns (int): Number of columns to wrap the layout.
+
+        This method initializes a dictionary `self.plots` to store the plot objects
+        along with their corresponding x and y signal names. It dynamically arranges
+        the plots in a grid layout based on the given number of columns and dynamically
+        stretches the last plots to fit the remaining space.
+        """
+        self.glw.clear()
+        self.plots = {}
+        self.grid_coordinates = []
+
+        num_plots = len(self.plot_data)
+
+        # Check if num_columns exceeds the number of plots
+        if num_columns >= num_plots:
+            num_columns = num_plots
+            self.plot_settings["num_columns"] = num_columns  # Update the settings
+            print(
+                f"Warning: num_columns in the YAML file was greater than the number of plots. Resetting num_columns to number of plots:{num_columns}."
+            )
+        else:
+            self.plot_settings["num_columns"] = num_columns  # Update the settings
+
+        num_rows = num_plots // num_columns
+        last_row_cols = num_plots % num_columns
+        remaining_space = num_columns - last_row_cols
+
+        for i, plot_config in enumerate(self.plot_data):
+            row, col = i // num_columns, i % num_columns
+            colspan = 1
+
+            if row == num_rows and remaining_space > 0:
+                if last_row_cols == 1:
+                    colspan = num_columns
+                else:
+                    colspan = remaining_space // last_row_cols + 1
+                    remaining_space -= colspan - 1
+                    last_row_cols -= 1
+
+            plot_name = plot_config.get("plot_name", "")
+            x_label = plot_config["x"].get("label", "")
+            y_label = plot_config["y"].get("label", "")
+
+            plot = self.glw.addPlot(row=row, col=col, colspan=colspan, title=plot_name)
+            plot.setLabel("bottom", x_label)
+            plot.setLabel("left", y_label)
+            plot.addLegend()
+
+            self.plots[plot_name] = plot
+            self.grid_coordinates.append((row, col))
+
+        self.init_curves()
+
+    def init_curves(self) -> None:
+        """
+        Initialize curve data and properties, and update table row labels.
+
+        This method initializes a nested dictionary `self.curves_data` to store
+        the curve objects for each x and y signal pair. It also updates the row labels
+        in `self.tableWidget_crosshair` to include the grid position for each y-value.
+        """
+        self.curves_data = {}
+        row_labels = []
+
+        for idx, plot_config in enumerate(self.plot_data):
+            plot_name = plot_config.get("plot_name", "")
+            plot = self.plots[plot_name]
+            plot.clear()
+
+            y_configs = plot_config["y"]["signals"]
+            colors_ys = Colors.golden_angle_color(
+                colormap=self.plot_settings["colormap"], num=len(y_configs)
+            )
+
+            curve_list = []
+            for i, (y_config, color) in enumerate(zip(y_configs, colors_ys)):
+                # print(y_config)
+                y_name = y_config["name"]
+                y_entries = y_config.get("entry", [y_name])
+
+                if not isinstance(y_entries, list):
+                    y_entries = [y_entries]
+
+                for y_entry in y_entries:
+                    user_color = self.user_colors.get((plot_name, y_name, y_entry), None)
+                    color_to_use = user_color if user_color else color
+
+                    pen_curve = mkPen(color=color_to_use, width=2, style=QtCore.Qt.DashLine)
+                    brush_curve = mkBrush(color=color_to_use)
+
+                    curve_data = pg.PlotDataItem(
+                        symbolSize=5,
+                        symbolBrush=brush_curve,
+                        pen=pen_curve,
+                        skipFiniteCheck=True,
+                        name=f"{y_name} ({y_entry})",
+                    )
+
+                    curve_list.append((y_name, y_entry, curve_data))
+                    plot.addItem(curve_data)
+                    row_labels.append(f"{y_name} ({y_entry}) - {plot_name}")
+
+                    # Create a ColorButton and set its color
+                    color_btn = ColorButton()
+                    color_btn.setColor(color_to_use)
+                    color_btn.sigColorChanged.connect(
+                        lambda btn=color_btn, plot=plot_name, yname=y_name, yentry=y_entry, curve=curve_data: self.change_curve_color(
+                            btn, plot, yname, yentry, curve
+                        )
+                    )
+
+                    # Add the ColorButton as a QWidget to the table
+                    color_widget = QtWidgets.QWidget()
+                    layout = QtWidgets.QHBoxLayout()
+                    layout.addWidget(color_btn)
+                    layout.setContentsMargins(0, 0, 0, 0)
+                    color_widget.setLayout(layout)
+
+                    row = len(row_labels) - 1  # The row index in the table
+                    self.tableWidget_crosshair.setCellWidget(row, 2, color_widget)
+
+            self.curves_data[plot_name] = curve_list
+
+        self.tableWidget_crosshair.setRowCount(len(row_labels))
+        self.tableWidget_crosshair.setVerticalHeaderLabels(row_labels)
+        self.hook_crosshair()
+
+    def change_curve_color(
+        self,
+        btn: pyqtgraph.ColorButton,
+        plot_name: str,
+        y_name: str,
+        y_entry: str,
+        curve: pyqtgraph.PlotDataItem,
+    ) -> None:
+        """
+        Change the color of a curve and update the corresponding ColorButton.
+
+        Args:
+            btn (ColorButton): The ColorButton that was clicked.
+            plot_name (str): The name of the plot where the curve belongs.
+            y_name (str): The name of the y signal.
+            y_entry (str): The entry of the y signal.
+            curve (PlotDataItem): The curve to be changed.
+        """
+        color = btn.color()
+        pen_curve = mkPen(color=color, width=2, style=QtCore.Qt.DashLine)
+        brush_curve = mkBrush(color=color)
+        curve.setPen(pen_curve)
+        curve.setSymbolBrush(brush_curve)
+        self.user_colors[(plot_name, y_name, y_entry)] = color
+
+    def hook_crosshair(self) -> None:
+        """Attach crosshairs to each plot and connect them to the update_table method."""
+        self.crosshairs = {}
+        for plot_name, plot in self.plots.items():
+            crosshair = Crosshair(plot, precision=3)
+            crosshair.coordinatesChanged1D.connect(
+                lambda x, y, plot=plot: self.update_table(
+                    self.tableWidget_crosshair, x, y, column=0, plot=plot
+                )
+            )
+            crosshair.coordinatesClicked1D.connect(
+                lambda x, y, plot=plot: self.update_table(
+                    self.tableWidget_crosshair, x, y, column=1, plot=plot
+                )
+            )
+            self.crosshairs[plot_name] = crosshair
+
+    def update_table(
+        self, table_widget: QTableWidget, x: float, y_values: list, column: int, plot: pg.PlotItem
+    ) -> None:
+        """
+        Update the table with coordinates based on cursor movements and clicks.
+
+        Args:
+            table_widget (QTableWidget): The table to be updated.
+            x (float): The x-coordinate from the plot.
+            y_values (list): The y-coordinates from the plot.
+            column (int): The column in the table to be updated.
+            plot (PlotItem): The plot from which the coordinates are taken.
+
+        This method calculates the correct row in the table for each y-value
+        and updates the cell at (row, column) with the new x and y coordinates.
+        """
+        plot_name = [name for name, value in self.plots.items() if value == plot][0]
+
+        starting_row = 0
+        for plot_config in self.plot_data:
+            if plot_config.get("plot_name", "") == plot_name:
+                break
+            for y_config in plot_config.get("y", {}).get("signals", []):
+                y_entries = y_config.get("entry", [y_config.get("name", "")])
+                if not isinstance(y_entries, list):
+                    y_entries = [y_entries]
+                starting_row += len(y_entries)
+
+        for i, y in enumerate(y_values):
+            row = starting_row + i
+            table_widget.setItem(row, column, QTableWidgetItem(f"({x}, {y})"))
+            table_widget.resizeColumnsToContents()
+
+    def update_plot(self) -> None:
+        """Update the plot data based on the stored data dictionary."""
+        for plot_name, curve_list in self.curves_data.items():
+            for y_name, y_entry, curve in curve_list:
+                x_config = next(
+                    (pc["x"] for pc in self.plot_data if pc.get("plot_name") == plot_name), {}
+                )
+                x_signal_config = x_config["signals"][0]
+                x_name = x_signal_config.get("name", "")
+                x_entry = x_signal_config.get("entry", x_name)
+
+                key = (x_name, x_entry, y_name, y_entry)
+                data_x = self.data.get(key, {}).get("x", [])
+                data_y = self.data.get(key, {}).get("y", [])
+
+                curve.setData(data_x, data_y)
+
+    @pyqtSlot(dict, dict)
+    def on_scan_segment(
+        self, msg, metadata
+    ) -> None:  # TODO the logic should be separated from GUI operation
+        """
+        Handle new scan segments and saves data to a dictionary. Linked through bec_dispatcher.
+
+        Args:
+            msg (dict): Message received with scan data.
+            metadata (dict): Metadata of the scan.
+        """
+
+        current_scanID = msg.get("scanID", None)
+        if current_scanID is None:
+            return
+
+        if current_scanID != self.scanID:
+            if self.scan_types is False:
+                self.plot_data = self.plot_data_config
+            elif self.scan_types is True:
+                currentName = metadata.get("scan_name")
+                if currentName is None:
+                    raise ValueError(
+                        f"Scan name not found in metadata. Please check the scan_name in the YAML config or in bec "
+                        f"configuration."
+                    )
+                self.plot_data = self.plot_data_config.get(currentName, [])
+                if self.plot_data == []:
+                    raise ValueError(
+                        f"Scan name {currentName} not found in the YAML config. Please check the scan_name in the "
+                        f"YAML config or in bec configuration."
+                    )
+
+                # Init UI
+                self.init_ui(self.plot_settings["num_columns"])
+                self.spinBox_N_columns.setValue(
+                    self.plot_settings["num_columns"]
+                )  # TODO has to be checked if it will not setup more columns than plots
+                self.spinBox_N_columns.setMaximum(len(self.plot_data))
+
+            self.scanID = current_scanID
+            self.data = {}
+            self.init_curves()
+
+        for plot_config in self.plot_data:
+            plot_name = plot_config.get("plot_name", "Unnamed Plot")
+            x_config = plot_config["x"]
+            x_signal_config = x_config["signals"][0]  # Assuming there's at least one signal for x
+
+            x_name = x_signal_config.get("name", "")
+            if not x_name:
+                raise ValueError(f"Name for x signal must be specified in plot: {plot_name}.")
+
+            x_entry_list = x_signal_config.get("entry", [])
+            if not x_entry_list:
+                x_entry_list = (
+                    self.dev[x_name]._hints if hasattr(self.dev[x_name], "_hints") else [x_name]
+                )
+
+            if not isinstance(x_entry_list, list):
+                x_entry_list = [x_entry_list]
+
+            y_configs = plot_config["y"]["signals"]
+
+            for x_entry in x_entry_list:
+                for y_config in y_configs:
+                    y_name = y_config.get("name", "")
+                    if not y_name:
+                        raise ValueError(
+                            f"Name for y signal must be specified in plot: {plot_name}."
+                        )
+
+                    y_entry_list = y_config.get("entry", [])
+                    if not y_entry_list:
+                        y_entry_list = (
+                            self.dev[y_name]._hints
+                            if hasattr(self.dev[y_name], "_hints")
+                            else [y_name]
+                        )
+
+                    if not isinstance(y_entry_list, list):
+                        y_entry_list = [y_entry_list]
+
+                    for y_entry in y_entry_list:
+                        key = (x_name, x_entry, y_name, y_entry)
+
+                        data_x = msg["data"].get(x_name, {}).get(x_entry, {}).get("value", None)
+                        data_y = msg["data"].get(y_name, {}).get(y_entry, {}).get("value", None)
+
+                        if data_x is None:
+                            raise ValueError(
+                                f"Incorrect entry '{x_entry}' specified for x in plot: {plot_name}, x name: {x_name}"
+                            )
+
+                        if data_y is None:
+                            if hasattr(self.dev[y_name], "_hints"):
+                                raise ValueError(
+                                    f"Incorrect entry '{y_entry}' specified for y in plot: {plot_name}, y name: {y_name}"
+                                )
+                            else:
+                                raise ValueError(
+                                    f"No hints available for y in plot: {plot_name}, and name '{y_name}' did not work as entry"
+                                )
+
+                        if data_x is not None:
+                            self.data.setdefault(key, {}).setdefault("x", []).append(data_x)
+
+                        if data_y is not None:
+                            self.data.setdefault(key, {}).setdefault("y", []).append(data_y)
+
+        self.update_signal.emit()
+
+    def save_settings_to_yaml(self):
+        """Save the current settings to a .yaml file using a file dialog."""
+        options = QFileDialog.Options()
+        options |= QFileDialog.DontUseNativeDialog
+        file_path, _ = QFileDialog.getSaveFileName(
+            self, "Save Settings", "", "YAML Files (*.yaml);;All Files (*)", options=options
+        )
+
+        if file_path:
+            try:
+                if not file_path.endswith(".yaml"):
+                    file_path += ".yaml"
+
+                with open(file_path, "w") as file:
+                    yaml.dump(
+                        {"plot_settings": self.plot_settings, "plot_data": self.plot_data_config},
+                        file,
+                    )
+                print(f"Settings saved to {file_path}")
+            except Exception as e:
+                print(f"An error occurred while saving the settings to {file_path}: {e}")
+
+    def load_settings_from_yaml(self) -> dict:  # TODO can be replace by the utils function
+        """Load settings from a .yaml file using a file dialog and update the current settings."""
+        options = QFileDialog.Options()
+        options |= QFileDialog.DontUseNativeDialog
+        file_path, _ = QFileDialog.getOpenFileName(
+            self, "Load Settings", "", "YAML Files (*.yaml);;All Files (*)", options=options
+        )
+
+        if file_path:
+            try:
+                with open(file_path, "r") as file:
+                    self.config = yaml.safe_load(file)
+                    self.load_config(self.config)  # validate new config
+                return config
+            except FileNotFoundError:
+                print(f"The file {file_path} was not found.")
+            except Exception as e:
+                print(f"An error occurred while loading the settings from {file_path}: {e}")
+                return None  # Return None on exception to indicate failure
+
+
+class ErrorHandler:
+    def __init__(self, parent=None):
+        self.parent = parent
+        self.errors = []
+        self.retry_action = None
+        logging.basicConfig(level=logging.ERROR)  # Configure logging
+
+    def set_retry_action(self, action):
+        self.retry_action = action  # Store a reference to the retry action
+
+    def handle_error(self, error_message: str):
+        # logging.error(f"{error_message}\n{traceback.format_exc()}") #TODO decide if useful
+
+        choice = QMessageBox.critical(
+            self.parent,
+            "Error",
+            f"{error_message}\n\nWould you like to retry?",
+            QMessageBox.Retry | QMessageBox.Cancel,
+        )
+        if choice == QMessageBox.Retry and self.retry_action is not None:
+            return self.retry_action()
+        else:
+            exit(1)  # Exit the program if the user selects Cancel or if no retry_action is provided
+
+    def validate_config_file(self, config: dict) -> None:
+        """
+        Validate the configuration dictionary.
+        Args:
+            config (dict): Configuration dictionary form .yaml file.
+
+        Returns:
+            None
+        """
+        self.errors = []
+
+        # Validate common keys
+        required_top_level_keys = ["plot_settings", "plot_data"]
+        for key in required_top_level_keys:
+            if key not in config:
+                self.errors.append(f"Missing required key: {key}")
+
+        # Only continue if no errors so far
+        if not self.errors:
+            # Determine the configuration mode (device or scan)
+            plot_settings = config.get("plot_settings", {})
+            scan_types = plot_settings.get("scan_types", False)
+
+            plot_data = config.get("plot_data", [])
+
+            if scan_types:
+                # Validate scan mode configuration
+                for scan_type, plots in plot_data.items():
+                    for i, plot_config in enumerate(plots):
+                        self.validate_plot_config(plot_config, i)
+            else:
+                # Validate device mode configuration
+                for i, plot_config in enumerate(plot_data):
+                    self.validate_plot_config(plot_config, i)
+
+        if self.errors != []:
+            self.handle_error("\n".join(self.errors))
+
+    def validate_plot_config(self, plot_config: dict, i: int):
+        """
+        Validate individual plot configuration.
+        Args:
+            plot_config (dict): Individual plot configuration.
+            i (int): Index of the plot configuration.
+
+        Returns:
+            None
+        """
+        for axis in ["x", "y"]:
+            axis_config = plot_config.get(axis)
+            plot_name = plot_config.get("plot_name", "")
+            if axis_config is None:
+                error_msg = f"Missing '{axis}' configuration in plot {i} - {plot_name}"
+                logging.error(error_msg)  # Log the error
+                self.errors.append(error_msg)
+
+            signals_config = axis_config.get("signals")
+            if signals_config is None:
+                error_msg = (
+                    f"Missing 'signals' configuration for {axis} axis in plot {i} - '{plot_name}'"
+                )
+                logging.error(error_msg)  # Log the error
+                self.errors.append(error_msg)
+            elif not isinstance(signals_config, list) or len(signals_config) == 0:
+                error_msg = (
+                    f"'signals' configuration for {axis} axis in plot {i} must be a non-empty list"
+                )
+                logging.error(error_msg)  # Log the error
+                self.errors.append(error_msg)
+            # TODO add condition for name and entry
+
+
+if __name__ == "__main__":
+    import yaml
+    import argparse
+
+    # from bec_widgets import ctrl_c
+    parser = argparse.ArgumentParser(description="Plotting App")
+    parser.add_argument(
+        "--config",
+        "-c",
+        help="Path to the .yaml configuration file",
+        default="config_example.yaml",
+    )
+    args = parser.parse_args()
+
+    try:
+        with open(args.config, "r") as file:
+            config = yaml.safe_load(file)
+
+    except FileNotFoundError:
+        print(f"The file {args.config} was not found.")
+        exit(1)
+    except Exception as e:
+        print(f"An error occurred while loading the config file: {e}")
+        exit(1)
+
+    # BECclient global variables
+    bec_dispatcher = BECDispatcher()
+    client = bec_dispatcher.client
+    client.start()
+
+    app = QApplication([])
+    plotApp = PlotApp(config=config, client=client)
+
+    # Connecting signals from bec_dispatcher
+    bec_dispatcher.connect_slot(plotApp.on_scan_segment, MessageEndpoints.scan_segment())
+    # ctrl_c.setup(app)
+
+    window = plotApp
+    window.show()
+    app.exec()
--- a/bec_widgets/examples/plot_app/plot_app.ui
+++ b/bec_widgets/examples/plot_app/plot_app.ui
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MultiWindow</class>
+ <widget class="QWidget" name="MultiWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1248</width>
+    <height>564</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MultiWindow</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QSplitter" name="splitter">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="GraphicsLayoutWidget" name="glw"/>
+     <widget class="QWidget" name="">
+      <layout class="QGridLayout" name="gridLayout_2">
+       <item row="1" 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="2" column="0" colspan="3">
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Cursor</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
+           <widget class="QTableWidget" name="tableWidget_crosshair">
+            <column>
+             <property name="text">
+              <string>Moved</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
+              <string>Clicked</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
+              <string>Color</string>
+             </property>
+            </column>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Number of Columns:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2">
+        <widget class="QSpinBox" name="spinBox_N_columns">
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <number>10</number>
+         </property>
+         <property name="value">
+          <number>3</number>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QPushButton" name="pushButton_load">
+         <property name="text">
+          <string>Load Config</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="2">
+        <widget class="QPushButton" name="pushButton_save">
+         <property name="text">
+          <string>Save Config</string>
+         </property>
+        </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/examples/stream_plot/stream_plot.py
+++ b/bec_widgets/examples/stream_plot/stream_plot.py
@@ -5,15 +5,14 @@ import time
 import numpy as np
 import pyqtgraph
 import pyqtgraph as pg
-from bec_lib import MessageEndpoints, messages
+from bec_lib import messages, MessageEndpoints
 from bec_lib.redis_connector import RedisConnector
+from qtpy.QtCore import Slot as pyqtSlot
+from qtpy.QtWidgets import QTableWidgetItem
 from pyqtgraph import mkBrush, mkPen
 from pyqtgraph.Qt import QtCore, QtWidgets, uic
 from pyqtgraph.Qt.QtCore import pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtWidgets import QTableWidgetItem
-
-from bec_widgets.utils import Colors, Crosshair
+from bec_widgets.utils import Crosshair, Colors
 from bec_widgets.utils.bec_dispatcher import BECDispatcher


--- a/bec_widgets/qtdesigner_plugins/init.py
+++ b/bec_widgets/qtdesigner_plugins/init.py
--- a/bec_widgets/qtdesigner_plugins/scan2d_plot_plugin.py
+++ b/bec_widgets/qtdesigner_plugins/scan2d_plot_plugin.py
@@ -0,0 +1,56 @@
+from qtpy.QtDesigner import QPyDesignerCustomWidgetPlugin
+from qtpy.QtGui import QIcon
+
+from bec_widgets.widgets.scan_plot.scan2d_plot import BECScanPlot2D
+
+
+class BECScanPlot2DPlugin(QPyDesignerCustomWidgetPlugin):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        self._initialized = False
+
+    def initialize(self, formEditor):
+        if self._initialized:
+            return
+
+        self._initialized = True
+
+    def isInitialized(self):
+        return self._initialized
+
+    def createWidget(self, parent):
+        return BECScanPlot2D(parent)
+
+    def name(self):
+        return "BECScanPlot2D"
+
+    def group(self):
+        return "BEC widgets"
+
+    def icon(self):
+        return QIcon()
+
+    def toolTip(self):
+        return "BEC plot for 2D scans"
+
+    def whatsThis(self):
+        return "BEC plot for 2D scans"
+
+    def isContainer(self):
+        return False
+
+    def domXml(self):
+        return (
+            '<widget class="BECScanPlot2D" name="BECScanPlot2D">\n'
+            ' <property name="toolTip" >\n'
+            "  <string>BEC plot for 2D scans</string>\n"
+            " </property>\n"
+            ' <property name="whatsThis" >\n'
+            "  <string>BEC plot for 2D scans in Python using PyQt.</string>\n"
+            " </property>\n"
+            "</widget>\n"
+        )
+
+    def includeFile(self):
+        return "scan2d_plot"
--- a/bec_widgets/qtdesigner_plugins/scan_plot_plugin.py
+++ b/bec_widgets/qtdesigner_plugins/scan_plot_plugin.py
@@ -0,0 +1,56 @@
+from qtpy.QtDesigner import QPyDesignerCustomWidgetPlugin
+from qtpy.QtGui import QIcon
+
+from bec_widgets.widgets.scan_plot.scan_plot import BECScanPlot
+
+
+class BECScanPlotPlugin(QPyDesignerCustomWidgetPlugin):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        self._initialized = False
+
+    def initialize(self, formEditor):
+        if self._initialized:
+            return
+
+        self._initialized = True
+
+    def isInitialized(self):
+        return self._initialized
+
+    def createWidget(self, parent):
+        return BECScanPlot(parent)
+
+    def name(self):
+        return "BECScanPlot"
+
+    def group(self):
+        return "BEC widgets"
+
+    def icon(self):
+        return QIcon()
+
+    def toolTip(self):
+        return "BEC plot for scans"
+
+    def whatsThis(self):
+        return "BEC plot for scans"
+
+    def isContainer(self):
+        return False
+
+    def domXml(self):
+        return (
+            '<widget class="BECScanPlot" name="BECScanPlot">\n'
+            ' <property name="toolTip" >\n'
+            "  <string>BEC plot for scans</string>\n"
+            " </property>\n"
+            ' <property name="whatsThis" >\n'
+            "  <string>BEC plot for scans in Python using PyQt.</string>\n"
+            " </property>\n"
+            "</widget>\n"
+        )
+
+    def includeFile(self):
+        return "scan_plot"
--- a/bec_widgets/simulations/init.py
+++ b/bec_widgets/simulations/init.py
--- a/bec_widgets/utils/init.py
+++ b/bec_widgets/utils/init.py
@@ -1,10 +1,8 @@
+from .crosshair import Crosshair
+from .colors import Colors
+from .validator_delegate import DoubleValidationDelegate
+from .bec_table import BECTable
 from .bec_connector import BECConnector, ConnectionConfig
 from .bec_dispatcher import BECDispatcher
-from .bec_table import BECTable
-from .colors import Colors
-from .container_utils import WidgetContainerUtils
-from .crosshair import Crosshair
+from .rpc_decorator import rpc_public, register_rpc_methods
 from .entry_validator import EntryValidator
-from .layout_manager import GridLayoutManager
-from .rpc_decorator import register_rpc_methods, rpc_public
-from .validator_delegate import DoubleValidationDelegate
--- a/bec_widgets/utils/bec_connector.py
+++ b/bec_widgets/utils/bec_connector.py
@@ -2,12 +2,11 @@
 from __future__ import annotations

 import time
-from typing import Optional, Type
+from typing import Type, Optional

 from pydantic import BaseModel, Field, field_validator
 from qtpy.QtCore import Slot as pyqtSlot

-from bec_widgets.cli.rpc_register import RPCRegister
 from bec_widgets.utils.bec_dispatcher import BECDispatcher


@@ -32,16 +31,13 @@ class ConnectionConfig(BaseModel):
 class BECConnector:
    """Connection mixin class for all BEC widgets, to handle BEC client and device manager"""

-    USER_ACCESS = ["config_dict", "get_all_rpc"]
-
    def __init__(self, client=None, config: ConnectionConfig = None, gui_id: str = None):
        # BEC related connections
-        self.bec_dispatcher = BECDispatcher(client=client)
+        self.bec_dispatcher = BECDispatcher()
        self.client = self.bec_dispatcher.client if client is None else client

        if config:
            self.config = config
-            self.config.widget_class = self.__class__.__name__
        else:
            print(
                f"No initial config found for {self.__class__.__name__}.\n"
@@ -55,50 +51,10 @@ class BECConnector:
        else:
            self.gui_id = self.config.gui_id

-        # register widget to rpc register
-        self.rpc_register = RPCRegister()
-        self.rpc_register.add_rpc(self)
-
-    def get_all_rpc(self) -> dict:
-        """Get all registered RPC objects."""
-        all_connections = self.rpc_register.list_all_connections()
-        return dict(all_connections)
-
-    @property
-    def rpc_id(self) -> str:
-        """Get the RPC ID of the widget."""
-        return self.gui_id
-
-    @rpc_id.setter
-    def rpc_id(self, rpc_id: str) -> None:
-        """Set the RPC ID of the widget."""
-        self.gui_id = rpc_id
-
-    @property
-    def config_dict(self) -> dict:
-        """
-        Get the configuration of the widget.
-
-        Returns:
-            dict: The configuration of the widget.
-        """
-        return self.config.model_dump()
-
-    @config_dict.setter
-    def config_dict(self, config: BaseModel) -> None:
-        """
-        Get the configuration of the widget.
-
-        Returns:
-            dict: The configuration of the widget.
-        """
-        self.config = config
-
    @pyqtSlot(str)
    def set_gui_id(self, gui_id: str) -> None:
        """
        Set the GUI ID for the widget.
-
        Args:
            gui_id(str): GUI ID
        """
@@ -119,7 +75,6 @@ class BECConnector:

    def update_client(self, client) -> None:
        """Update the client and device manager from BEC and create object for BEC shortcuts.
-
        Args:
            client: BEC client
        """
@@ -130,7 +85,6 @@ class BECConnector:
    def on_config_update(self, config: ConnectionConfig | dict) -> None:
        """
        Update the configuration for the widget.
-
        Args:
            config(ConnectionConfig): Configuration settings.
        """
@@ -143,10 +97,8 @@ class BECConnector:
    def get_config(self, dict_output: bool = True) -> dict | BaseModel:
        """
        Get the configuration of the widget.
-
        Args:
            dict_output(bool): If True, return the configuration as a dictionary. If False, return the configuration as a pydantic model.
-
        Returns:
            dict: The configuration of the plot widget.
        """
@@ -154,15 +106,3 @@ class BECConnector:
            return self.config.model_dump()
        else:
            return self.config
-
-    def cleanup(self):
-        """Cleanup the widget."""
-        self.rpc_register.remove_rpc(self)
-        all_connections = self.rpc_register.list_all_connections()
-        if len(all_connections) == 0:
-            print("No more connections. Shutting down GUI BEC client.")
-            self.client.shutdown()
-
-    # def closeEvent(self, event):
-    #     self.cleanup()
-    #     super().closeEvent(event)
--- a/bec_widgets/utils/bec_dispatcher.py
+++ b/bec_widgets/utils/bec_dispatcher.py
@@ -1,154 +1,157 @@
 from __future__ import annotations

 import argparse
-import collections
+import itertools
+import os
 from collections.abc import Callable
-from typing import TYPE_CHECKING, Union
+from typing import Union

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

-if TYPE_CHECKING:
-    from bec_lib.endpoints import EndpointInfo
+# Adding a new pyqt signal requires a class factory, as they must be part of the class definition
+# and cannot be dynamically added as class attributes after the class has been defined.
+_signal_class_factory = (
+    type(f"Signal{i}", (QObject,), dict(signal=pyqtSignal(dict, dict))) for i in itertools.count()
+)


-class QtThreadSafeCallback(QObject):
-    cb_signal = pyqtSignal(dict, dict)
-
-    def __init__(self, cb):
-        super().__init__()
-
-        self.cb = cb
-        self.cb_signal.connect(self.cb)
-
-    def __hash__(self):
-        # make 2 differents QtThreadSafeCallback to look
-        # identical when used as dictionary keys, if the
-        # callback is the same
-        return id(self.cb)
-
-    def __call__(self, msg_content, metadata):
-        self.cb_signal.emit(msg_content, metadata)
-
-
-class QtRedisConnector(RedisConnector):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    def _execute_callback(self, cb, msg, kwargs):
-        if not isinstance(cb, QtThreadSafeCallback):
-            return super()._execute_callback(cb, msg, kwargs)
-        # if msg.msg_type == "bundle_message":
-        #    # big warning: how to handle bundle messages?
-        #    # message with messages inside ; which slot to call?
-        #    # bundle_msg = msg
-        #    # for msg in bundle_msg:
-        #    #    ...
-        #    # for now, only consider the 1st message
-        #    msg = msg[0]
-        #    raise RuntimeError(f"
-        if isinstance(msg, MessageObject):
-            if isinstance(msg.value, list):
-                msg = msg.value[0]
-            else:
-                msg = msg.value
-
-            # we can notice kwargs are lost when passed to Qt slot
-            metadata = msg.metadata
-            cb(msg.content, metadata)
-        else:
-            # from stream
-            msg = msg["data"]
-            cb(msg.content, msg.metadata)
-
-
-class BECDispatcher:
+class _Connection:
    """Utility class to keep track of slots connected to a particular redis connector"""

-    _instance = None
-    _initialized = False
+    def __init__(self, callback) -> None:
+        self.callback = callback

-    def __new__(cls, client=None, config: str = None, *args, **kwargs):
-        if cls._instance is None:
-            cls._instance = super(BECDispatcher, cls).__new__(cls)
-            cls._initialized = False
-        return cls._instance
+        self.slots = set()
+        # keep a reference to a new signal class, so it is not gc'ed
+        self._signal_container = next(_signal_class_factory)()
+        self.signal: pyqtSignal = self._signal_container.signal

-    def __init__(self, client=None, config: str = None):
-        if self._initialized:
-            return

-        self._slots = collections.defaultdict(set)
-        self.client = client
+class _BECDispatcher(QObject):
+    """Utility class to keep track of slots connected to a particular redis connector"""

-        if self.client is None:
-            if config is not None:
-                host, port = config.split(":")
-                redis_config = {"host": host, "port": port}
-                self.client = BECClient(
-                    config=ServiceConfig(redis=redis_config), connector_cls=QtRedisConnector
-                )  # , forced=True)
-            else:
-                self.client = BECClient(connector_cls=QtRedisConnector)  # , forced=True)
-        else:
-            if self.client.started:
-                # have to reinitialize client to use proper connector
-                self.client.shutdown()
-            self.client._BECClient__init_params["connector_cls"] = QtRedisConnector
+    def __init__(self, bec_config=None):
+        super().__init__()
+        self.client = BECClient(forced=True)  # make a new instance
+
+        # TODO: this is a workaround for now to provide service config within qtdesigner, but is
+        # it possible to provide config via a cli arg?
+        if bec_config is None and os.path.isfile("bec_config.yaml"):
+            bec_config = "bec_config.yaml"

        try:
-            self.client.start()
-        except redis.exceptions.ConnectionError:
-            print("Could not connect to Redis, skipping start of BECClient.")
-
-        self._initialized = True
-
-    @classmethod
-    def reset_singleton(cls):
-        cls._instance = None
-        cls._initialized = False
+            self.client.initialize(config=ServiceConfig(config_path=bec_config))
+        except redis.exceptions.ConnectionError as e:
+            print(f"Failed to initialize BECClient: {e}")
+        self._connections = {}

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

        Args:
            slot (Callable): A slot method/function that accepts two inputs: content and metadata of
                the corresponding pub/sub message
-            topics (EndpointInfo | str | list): A topic or list of topics that can typically be acquired via bec_lib.MessageEndpoints
+            topics (str | list): A topic or list of topics that can typically be acquired via bec_lib.MessageEndpoints
+            single_callback_for_all_topics (bool): If True, use the same callback for all topics, otherwise use
+                separate callbacks.
        """
-        slot = QtThreadSafeCallback(slot)
-        self.client.connector.register(topics, cb=slot)
-        topics_str, _ = self.client.connector._convert_endpointinfo(topics)
-        self._slots[slot].update(set(topics_str))
+        if isinstance(topics, str):
+            topics = [topics]

-    def disconnect_slot(self, slot: Callable, topics: Union[str, list]):
-        # find the right slot to disconnect from ;
-        # slot callbacks are wrapped in QtThreadSafeCallback objects,
-        # but the slot we receive here is the original callable
-        for connected_slot in self._slots:
-            if connected_slot.cb == slot:
-                break
-        else:
-            return
-        self.client.connector.unregister(topics, cb=connected_slot)
-        topics_str, _ = self.client.connector._convert_endpointinfo(topics)
-        self._slots[slot].difference_update(set(topics_str))
-        if not self._slots[slot]:
-            del self._slots[slot]
+        # Ensure topics_key is a tuple, whether single_callback_for_all_topics is True or False.
+        topics_key = tuple(sorted(topics)) if single_callback_for_all_topics else tuple(topics)

-    def disconnect_topics(self, topics: Union[str, list]):
-        self.client.connector.unregister(topics)
-        topics_str, _ = self.client.connector._convert_endpointinfo(topics)
-        for slot in list(self._slots.keys()):
-            slot_topics = self._slots[slot]
-            slot_topics.difference_update(set(topics_str))
-            if not slot_topics:
-                del self._slots[slot]
+        if topics_key not in self._connections:
+            self._connections[topics_key] = self._create_connection(topics)
+        connection = self._connections[topics_key]
+        if slot not in connection.slots:
+            connection.signal.connect(slot)
+            connection.slots.add(slot)

-    def disconnect_all(self, *args, **kwargs):
-        self.disconnect_topics(self.client.connector._topics_cb)
+    def _create_connection(self, topics: list) -> _Connection:
+        """Creates a new connection for given topics."""
+
+        def cb(msg):
+            msg = msg.value
+            for connection_key, connection in self._connections.items():
+                if set(topics).intersection(connection_key):
+                    connection.signal.emit(msg.content, msg.metadata)
+
+        try:
+            self.client.connector.register(topics=topics, cb=cb)
+        except redis.exceptions.ConnectionError:
+            print("Could not connect to Redis, skipping registration of topics.")
+
+        return _Connection(cb)
+
+    def _do_disconnect_slot(self, topic, slot):
+        print(f"Disconnecting {slot} from {topic}")
+        connection = self._connections[topic]
+        try:
+            connection.signal.disconnect(slot)
+        except TypeError:
+            print(f"Could not disconnect slot:'{slot}' from topic:'{topic}'")
+            print("Continue to remove slot:'{slot}' from 'connection.slots'.")
+        connection.slots.remove(slot)
+        if not connection.slots:
+            del self._connections[topic]
+
+    def _disconnect_slot_from_topic(self, slot: Callable, topic: str) -> None:
+        """A helper method to disconnect a slot from a specific topic.
+
+        Args:
+            slot (Callable): A slot to be disconnected
+            topic (str): A corresponding topic that can typically be acquired via
+                bec_lib.MessageEndpoints
+        """
+        connection = self._connections.get(topic)
+        if connection and slot in connection.slots:
+            self._do_disconnect_slot(topic, slot)
+
+    def disconnect_slot(self, slot: Callable, topics: Union[str, list]) -> None:
+        """Disconnect widget's pyqt slot from pub/sub updates on a topic.
+
+        Args:
+            slot (Callable): A slot to be disconnected
+            topics (str | list): A corresponding topic or list of topics that can typically be acquired via
+                bec_lib.MessageEndpoints
+        """
+        if isinstance(topics, str):
+            topics = [topics]
+
+        for key, connection in list(self._connections.items()):
+            if slot in connection.slots:
+                common_topics = set(topics).intersection(key)
+                if common_topics:
+                    remaining_topics = set(key) - set(topics)
+                    # Disconnect slot from common topics
+                    self._do_disconnect_slot(key, slot)
+                    # Reconnect slot to remaining topics if any
+                    if remaining_topics:
+                        self.connect_slot(slot, list(remaining_topics), True)
+
+    def disconnect_all(self):
+        """Disconnect all slots from all topics."""
+        for key, connection in list(self._connections.items()):
+            for slot in list(connection.slots):
+                self._disconnect_slot_from_topic(slot, key)
+
+
+# variable holding the Singleton instance of BECDispatcher
+_bec_dispatcher = None
+
+
+def BECDispatcher():
+    global _bec_dispatcher
+    if _bec_dispatcher is None:
+        parser = argparse.ArgumentParser()
+        parser.add_argument("--bec-config", default=None)
+        args, _ = parser.parse_known_args()
+
+        _bec_dispatcher = _BECDispatcher(args.bec_config)
+    return _bec_dispatcher
--- a/bec_widgets/utils/bec_table.py
+++ b/bec_widgets/utils/bec_table.py
@@ -1,5 +1,5 @@
-from qtpy.QtCore import Qt
 from qtpy.QtWidgets import QTableWidget
+from qtpy.QtCore import Qt


 class BECTable(QTableWidget):
@@ -8,7 +8,6 @@ class BECTable(QTableWidget):
    def keyPressEvent(self, event) -> None:
        """
        Delete selected rows with backspace or delete key
-
        Args:
            event: keyPressEvent
        """
--- a/bec_widgets/utils/container_utils.py
+++ b/bec_widgets/utils/container_utils.py
@@ -1,48 +0,0 @@
-import itertools
-from typing import Type
-
-from qtpy.QtWidgets import QWidget
-
-
-class WidgetContainerUtils:
-
-    @staticmethod
-    def generate_unique_widget_id(container: dict, prefix: str = "widget") -> str:
-        """
-        Generate a unique widget ID.
-
-        Args:
-            container(dict): The container of widgets.
-            prefix(str): The prefix of the widget ID.
-
-        Returns:
-            widget_id(str): The unique widget ID.
-        """
-        existing_ids = set(container.keys())
-        for i in itertools.count(1):
-            widget_id = f"{prefix}_{i}"
-            if widget_id not in existing_ids:
-                return widget_id
-
-    @staticmethod
-    def find_first_widget_by_class(
-        container: dict, widget_class: Type[QWidget], can_fail: bool = True
-    ) -> QWidget | None:
-        """
-        Find the first widget of a given class in the figure.
-
-        Args:
-            container(dict): The container of widgets.
-            widget_class(Type): The class of the widget to find.
-            can_fail(bool): If True, the method will return None if no widget is found. If False, it will raise an error.
-
-        Returns:
-            widget: The widget of the given class.
-        """
-        for widget_id, widget in container.items():
-            if isinstance(widget, widget_class):
-                return widget
-        if can_fail:
-            return None
-        else:
-            raise ValueError(f"No widget of class {widget_class} found.")
--- a/bec_widgets/utils/crosshair.py
+++ b/bec_widgets/utils/crosshair.py
@@ -2,8 +2,7 @@ import numpy as np
 import pyqtgraph as pg

 # from qtpy.QtCore import QObject, pyqtSignal
-from qtpy.QtCore import QObject
-from qtpy.QtCore import Signal as pyqtSignal
+from qtpy.QtCore import QObject, Signal as pyqtSignal


 class Crosshair(QObject):
@@ -17,7 +16,6 @@ class Crosshair(QObject):
    def __init__(self, plot_item: pg.PlotItem, precision: int = None, parent=None):
        """
        Crosshair for 1D and 2D plots.
-
        Args:
            plot_item (pyqtgraph.PlotItem): The plot item to which the crosshair will be attached.
            precision (int, optional): Number of decimal places to round the coordinates to. Defaults to None.
--- a/bec_widgets/utils/ctrl_c.py
+++ b/bec_widgets/utils/ctrl_c.py
@@ -0,0 +1,39 @@
+# TODO haven't found yet how to deal with QAbstractSocket in qtpy
+# import signal
+# import socket
+# from PyQt5.QtNetwork import QAbstractSocket
+#
+#
+# def setup(app):
+#     app.signalwatchdog = SignalWatchdog()  # need to store to keep socket pair alive
+#     signal.signal(signal.SIGINT, make_quit_handler(app))
+#
+#
+# def make_quit_handler(app):
+#     def handler(*args):
+#         print()  # make ^C appear on its own line
+#         app.quit()
+#
+#     return handler
+#
+#
+# class SignalWatchdog(QAbstractSocket):
+#     def __init__(self):
+#         """
+#         Propagates system signals from Python to QEventLoop
+#         adapted from https://stackoverflow.com/a/65802260/655404
+#         """
+#         super().__init__(QAbstractSocket.SctpSocket, None)
+#
+#         self.writer, self.reader = writer, reader = socket.socketpair()
+#         writer.setblocking(False)
+#
+#         fd_writer = writer.fileno()
+#         fd_reader = reader.fileno()
+#
+#         signal.set_wakeup_fd(fd_writer)  # Python hook
+#         self.setSocketDescriptor(fd_reader)  # Qt hook
+#
+#         self.readyRead.connect(
+#             lambda: None
+#         )  # dummy function call that lets the Python interpreter run
--- a/bec_widgets/utils/entry_validator.py
+++ b/bec_widgets/utils/entry_validator.py
@@ -3,16 +3,6 @@ class EntryValidator:
        self.devices = devices

    def validate_signal(self, name: str, entry: str = None) -> str:
-        """
-        Validate a signal entry for a given device. If the entry is not provided, the first signal entry will be used from the device hints.
-
-        Args:
-            name(str): Device name
-            entry(str): Signal entry
-
-        Returns:
-            str: Signal entry
-        """
        if name not in self.devices:
            raise ValueError(f"Device '{name}' not found in current BEC session")

@@ -25,18 +15,3 @@ class EntryValidator:
            raise ValueError(f"Entry '{entry}' not found in device '{name}' signals")

        return entry
-
-    def validate_monitor(self, monitor: str) -> str:
-        """
-        Validate a monitor entry for a given device.
-
-        Args:
-            monitor(str): Monitor entry
-
-        Returns:
-            str: Monitor entry
-        """
-        if monitor not in self.devices:
-            raise ValueError(f"Device '{monitor}' not found in current BEC session")
-
-        return monitor
--- a/bec_widgets/utils/layout_manager.py
+++ b/bec_widgets/utils/layout_manager.py
@@ -1,121 +0,0 @@
-from collections import OrderedDict
-from typing import Literal
-
-from qtpy.QtWidgets import QGridLayout, QWidget
-
-
-class GridLayoutManager:
-    """
-    GridLayoutManager class is used to manage widgets in a QGridLayout and extend its functionality.
-
-    The GridLayoutManager class provides methods to add, move, and check the position of widgets in a QGridLayout.
-    It also provides a method to get the positions of all widgets in the layout.
-
-    Args:
-        layout(QGridLayout): The layout to manage.
-    """
-
-    def __init__(self, layout: QGridLayout):
-        self.layout = layout
-
-    def is_position_occupied(self, row: int, col: int) -> bool:
-        """
-        Check if the position in the layout is occupied by a widget.
-
-        Args:
-            row(int): The row to check.
-            col(int): The column to check.
-
-        Returns:
-            bool: True if the position is occupied, False otherwise.
-        """
-        for i in range(self.layout.count()):
-            widget_row, widget_col, _, _ = self.layout.getItemPosition(i)
-            if widget_row == row and widget_col == col:
-                return True
-        return False
-
-    def shift_widgets(
-        self,
-        direction: Literal["down", "up", "left", "right"] = "down",
-        start_row: int = 0,
-        start_col: int = 0,
-    ):
-        """
-        Shift widgets in the layout in the specified direction starting from the specified position.
-
-        Args:
-            direction(str): The direction to shift the widgets. Can be "down", "up", "left", or "right".
-            start_row(int): The row to start shifting from. Default is 0.
-            start_col(int): The column to start shifting from. Default is 0.
-        """
-        for i in reversed(range(self.layout.count())):
-            widget_item = self.layout.itemAt(i)
-            widget = widget_item.widget()
-            row, col, rowspan, colspan = self.layout.getItemPosition(i)
-            if direction == "down" and row >= start_row:
-                self.layout.addWidget(widget, row + 1, col, rowspan, colspan)
-            elif direction == "up" and row > start_row:
-                self.layout.addWidget(widget, row - 1, col, rowspan, colspan)
-            elif direction == "right" and col >= start_col:
-                self.layout.addWidget(widget, row, col + 1, rowspan, colspan)
-            elif direction == "left" and col > start_col:
-                self.layout.addWidget(widget, row, col - 1, rowspan, colspan)
-
-    def move_widget(self, widget: QWidget, new_row: int, new_col: int):
-        """
-        Move a widget to a new position in the layout.
-
-        Args:
-            widget(QWidget): The widget to move.
-            new_row(int): The new row to move the widget to.
-            new_col(int): The new column to move the widget to.
-        """
-        self.layout.removeWidget(widget)
-        self.layout.addWidget(widget, new_row, new_col)
-
-    def add_widget(
-        self,
-        widget: QWidget,
-        row=None,
-        col=0,
-        rowspan=1,
-        colspan=1,
-        shift: Literal["down", "up", "left", "right"] = "down",
-    ):
-        """
-        Add a widget to the layout at the specified position.
-
-        Args:
-            widget(QWidget): The widget to add.
-            row(int): The row to add the widget to. If None, the widget will be added to the next available row.
-            col(int): The column to add the widget to. Default is 0.
-            rowspan(int): The number of rows the widget will span. Default is 1.
-            colspan(int): The number of columns the widget will span. Default is 1.
-            shift(str): The direction to shift the widgets if the position is occupied. Can be "down", "up", "left", or "right".
-        """
-        if row is None:
-            row = self.layout.rowCount()
-        if self.is_position_occupied(row, col):
-            self.shift_widgets(shift, start_row=row)
-        self.layout.addWidget(widget, row, col, rowspan, colspan)
-
-    def get_widgets_positions(self) -> dict:
-        """
-        Get the positions of all widgets in the layout.
-        Returns:
-            dict: A dictionary with the positions of the widgets in the layout.
-
-        """
-        positions = []
-        for i in range(self.layout.count()):
-            widget_item = self.layout.itemAt(i)
-            widget = widget_item.widget()
-            if widget:
-                position = self.layout.getItemPosition(i)
-                positions.append((position, widget))
-        positions.sort(key=lambda x: (x[0][0], x[0][1], x[0][2], x[0][3]))
-        ordered_positions = OrderedDict()
-        for pos, widget in positions:
-            ordered_positions[pos] = widget
-        return ordered_positions
--- a/bec_widgets/utils/plugin_utils.py
+++ b/bec_widgets/utils/plugin_utils.py
@@ -1,40 +0,0 @@
-import inspect
-
-from bec_lib.plugin_helper import _get_available_plugins
-
-from bec_widgets.utils import BECConnector
-
-
-def get_plugin_widgets() -> dict[str, BECConnector]:
-    """
-    Get all available widgets from the plugin directory. Widgets are classes that inherit from BECConnector.
-    The plugins are provided through python plugins and specified in the respective pyproject.toml file using
-    the following key:
-
-        [project.entry-points."bec.widgets.user_widgets"]
-        plugin_widgets = "path.to.plugin.module"
-
-    e.g.
-        [project.entry-points."bec.widgets.user_widgets"]
-        plugin_widgets = "pxiii_bec.bec_widgets.widgets"
-
-        assuming that the widgets module for the package pxiii_bec is located at pxiii_bec/bec_widgets/widgets and
-        contains the widgets to be loaded within the pxiii_bec/bec_widgets/widgets/__init__.py file.
-
-    Returns:
-        dict[str, BECConnector]: A dictionary of widget names and their respective classes.
-    """
-    modules = _get_available_plugins("bec.widgets.user_widgets")
-    loaded_plugins = {}
-    print(modules)
-    for module in modules:
-        mods = inspect.getmembers(module, predicate=_filter_plugins)
-        for name, mod_cls in mods:
-            if name in loaded_plugins:
-                print(f"Duplicated widgets plugin {name}.")
-            loaded_plugins[name] = mod_cls
-    return loaded_plugins
-
-
-def _filter_plugins(obj):
-    return inspect.isclass(obj) and issubclass(obj, BECConnector)
--- a/bec_widgets/utils/thread_checker.py
+++ b/bec_widgets/utils/thread_checker.py
@@ -1,37 +0,0 @@
-import threading
-
-
-class ThreadTracker:
-    def __init__(self, exclude_names=None):
-        self.exclude_names = exclude_names if exclude_names else []
-        self.initial_threads = self._capture_threads()
-
-    def _capture_threads(self):
-        return set(
-            th
-            for th in threading.enumerate()
-            if not any(ex_name in th.name for ex_name in self.exclude_names)
-            and th is not threading.main_thread()
-        )
-
-    def _thread_info(self, threads):
-        return ", \n".join(f"{th.name}(ID: {th.ident})" for th in threads)
-
-    def check_unfinished_threads(self):
-        current_threads = self._capture_threads()
-        additional_threads = current_threads - self.initial_threads
-        closed_threads = self.initial_threads - current_threads
-        if additional_threads:
-            raise Exception(
-                f"###### Initial threads ######:\n {self._thread_info(self.initial_threads)}\n"
-                f"###### Current threads ######:\n {self._thread_info(current_threads)}\n"
-                f"###### Closed threads ######:\n {self._thread_info(closed_threads)}\n"
-                f"###### Unfinished threads ######:\n {self._thread_info(additional_threads)}"
-            )
-        else:
-            print(
-                "All threads properly closed.\n"
-                f"###### Initial threads ######:\n {self._thread_info(self.initial_threads)}\n"
-                f"###### Current threads ######:\n {self._thread_info(current_threads)}\n"
-                f"###### Closed threads ######:\n {self._thread_info(closed_threads)}"
-            )
--- a/bec_widgets/utils/validator_delegate.py
+++ b/bec_widgets/utils/validator_delegate.py
@@ -2,7 +2,7 @@
 # from qtpy.QtWidgets import QStyledItemDelegate, QLineEdit

 from qtpy.QtGui import QDoubleValidator
-from qtpy.QtWidgets import QLineEdit, QStyledItemDelegate
+from qtpy.QtWidgets import QStyledItemDelegate, QLineEdit


 class DoubleValidationDelegate(QStyledItemDelegate):
--- a/bec_widgets/utils/widget_io.py
+++ b/bec_widgets/utils/widget_io.py
@@ -3,16 +3,16 @@ from abc import ABC, abstractmethod

 from qtpy.QtWidgets import (
    QApplication,
-    QCheckBox,
-    QComboBox,
-    QDoubleSpinBox,
-    QLabel,
+    QWidget,
    QLineEdit,
-    QSpinBox,
+    QComboBox,
    QTableWidget,
+    QSpinBox,
+    QDoubleSpinBox,
    QTableWidgetItem,
    QVBoxLayout,
-    QWidget,
+    QCheckBox,
+    QLabel,
 )


@@ -114,7 +114,6 @@ class WidgetIO:
    def get_value(widget, ignore_errors=False):
        """
        Retrieve value from the widget instance.
-
        Args:
            widget: Widget instance.
            ignore_errors(bool, optional): Whether to ignore if no handler is found.
@@ -130,7 +129,6 @@ class WidgetIO:
    def set_value(widget, value, ignore_errors=False):
        """
        Set a value on the widget instance.
-
        Args:
            widget: Widget instance.
            value: Value to set.
@@ -157,7 +155,6 @@ class WidgetHierarchy:
    ) -> None:
        """
        Print the widget hierarchy to the console.
-
        Args:
            widget: Widget to print the hierarchy of
            indent(int, optional): Level of indentation.
@@ -199,7 +196,6 @@ class WidgetHierarchy:
    ) -> dict:
        """
        Export the widget hierarchy to a dictionary.
-
        Args:
            widget: Widget to print the hierarchy of.
            config(dict,optional): Dictionary to export the hierarchy to.
@@ -249,7 +245,6 @@ class WidgetHierarchy:
    def import_config_from_dict(widget, config: dict, set_values: bool = False) -> None:
        """
        Import the widget hierarchy from a dictionary.
-
        Args:
            widget: Widget to import the hierarchy to.
            config:
--- a/bec_widgets/utils/yaml_dialog.py
+++ b/bec_widgets/utils/yaml_dialog.py
@@ -1,7 +1,6 @@
 # pylint: disable=no-name-in-module

 from typing import Union
-
 import yaml
 from qtpy.QtWidgets import QFileDialog

@@ -9,7 +8,6 @@ from qtpy.QtWidgets import QFileDialog
 def load_yaml(instance) -> Union[dict, None]:
    """
    Load YAML file from disk.
-
    Args:
        instance: Instance of the calling widget.

@@ -41,7 +39,6 @@ def load_yaml(instance) -> Union[dict, None]:
 def save_yaml(instance, config: dict) -> None:
    """
    Save YAML file to disk.
-
    Args:
        instance: Instance of the calling widget.
        config: Configuration data to be saved.
--- a/bec_widgets/validation/monitor_config_validator.py
+++ b/bec_widgets/validation/monitor_config_validator.py
@@ -1,6 +1,6 @@
-from typing import Literal, Optional, Union
+from typing import Optional, Union, Literal

-from pydantic import BaseModel, Field, ValidationError, field_validator, model_validator
+from pydantic import BaseModel, Field, field_validator, model_validator, ValidationError
 from pydantic_core import PydanticCustomError


@@ -8,7 +8,7 @@ class Signal(BaseModel):
    """
    Represents a signal in a plot configuration.

-    Args:
+    Attributes:
        name (str): The name of the signal.
        entry (Optional[str]): The entry point of the signal, optional.
    """
@@ -21,7 +21,6 @@ class Signal(BaseModel):
    def validate_fields(cls, values):
        """Validate the fields of the model.
        First validate the 'name' field, then validate the 'entry' field.
-
        Args:
            values (dict): The values to be validated."""
        devices = MonitorConfigValidator.devices
@@ -93,12 +92,12 @@ class SourceHistoryValidator(BaseModel):
    """History source validator
    Attributes:
        type (str): type of source - history
-        scan_id (str): Scan ID for history source.
+        scanID (str): Scan ID for history source.
        signals (list): Signal for the source.
    """

    type: Literal["history"]
-    scan_id: str  # TODO can be validated if it is a valid scan_id
+    scanID: str  # TODO can be validated if it is a valid scanID
    signals: AxisSignal


@@ -132,12 +131,12 @@ class Source(BaseModel):  # TODO decide if it should stay for general Source val
    General source validation, includes all Optional arguments of all other sources.
    Attributes:
        type (list): type of source (scan_segment, history)
-        scan_id (Optional[str]): Scan ID for history source.
+        scanID (Optional[str]): Scan ID for history source.
        signals (Optional[AxisSignal]): Signal for the source.
    """

    type: Literal["scan_segment", "history", "redis"]
-    scan_id: Optional[str] = None
+    scanID: Optional[str] = None
    signals: Optional[dict] = None


--- a/bec_widgets/widgets/init.py
+++ b/bec_widgets/widgets/init.py
@@ -1,13 +1,15 @@
-from .dock import BECDock, BECDockArea
-from .figure import BECFigure, FigureConfig
-from .monitor import BECMonitor
-from .motor_control import (
-    MotorControlAbsolute,
-    MotorControlRelative,
-    MotorControlSelection,
-    MotorCoordinateTable,
-    MotorThread,
-)
+from .monitor import BECMonitor, ConfigDialog
 from .motor_map import MotorMap
-from .plots import BECCurve, BECMotorMap, BECWaveform
 from .scan_control import ScanControl
+from .toolbar import ModularToolBar
+from .editor import BECEditor
+from .monitor_scatter_2D import BECMonitor2DScatter
+from .motor_control import (
+    MotorControlRelative,
+    MotorControlAbsolute,
+    MotorControlSelection,
+    MotorThread,
+    MotorCoordinateTable,
+)
+from .figure import FigureConfig, BECFigure
+from .plots import BECWaveform1D, BECCurve, BECPlotBase
--- a/bec_widgets/widgets/dock/init.py
+++ b/bec_widgets/widgets/dock/init.py
@@ -1,2 +0,0 @@
-from .dock import BECDock
-from .dock_area import BECDockArea
--- a/bec_widgets/widgets/dock/dock.py
+++ b/bec_widgets/widgets/dock/dock.py
@@ -1,269 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Literal, Optional
-
-from pydantic import Field
-from pyqtgraph.dockarea import Dock
-
-from bec_widgets.cli.rpc_wigdet_handler import RPCWidgetHandler
-from bec_widgets.utils import BECConnector, ConnectionConfig, GridLayoutManager
-
-if TYPE_CHECKING:
-    from qtpy.QtWidgets import QWidget
-
-    from bec_widgets.widgets import BECDockArea
-
-
-class DockConfig(ConnectionConfig):
-    widgets: dict[str, ConnectionConfig] = Field({}, description="The widgets in the dock.")
-    position: Literal["bottom", "top", "left", "right", "above", "below"] = Field(
-        "bottom", description="The position of the dock."
-    )
-    parent_dock_area: Optional[str] = Field(
-        None, description="The GUI ID of parent dock area of the dock."
-    )
-
-
-class BECDock(BECConnector, Dock):
-    USER_ACCESS = [
-        "rpc_id",
-        "widget_list",
-        "show_title_bar",
-        "hide_title_bar",
-        "get_widgets_positions",
-        "set_title",
-        "add_widget_bec",
-        "list_eligible_widgets",
-        "move_widget",
-        "remove_widget",
-        "remove",
-        "attach",
-        "detach",
-    ]
-
-    def __init__(
-        self,
-        parent: QWidget | None = None,
-        parent_dock_area: BECDockArea | None = None,
-        config: DockConfig | None = None,
-        name: str | None = None,
-        client=None,
-        gui_id: str | None = None,
-        **kwargs,
-    ) -> None:
-        if config is None:
-            config = DockConfig(
-                widget_class=self.__class__.__name__, parent_dock_area=parent_dock_area.gui_id
-            )
-        else:
-            if isinstance(config, dict):
-                config = DockConfig(**config)
-            self.config = config
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        Dock.__init__(self, name=name, **kwargs)
-
-        self.parent_dock_area = parent_dock_area
-
-        # Layout Manager
-        self.layout_manager = GridLayoutManager(self.layout)
-
-    def dropEvent(self, event):
-        source = event.source()
-        old_area = source.area
-        self.setOrientation("horizontal", force=True)
-        super().dropEvent(event)
-        if old_area in self.parent_dock_area.tempAreas and old_area != self.parent_dock_area:
-            self.parent_dock_area.removeTempArea(old_area)
-
-    def float(self):
-        """
-        Float the dock.
-        Overwrites the default pyqtgraph dock float.
-        """
-
-        # need to check if the dock is temporary and if it is the only dock in the area
-        # fixes bug in pyqtgraph detaching
-        if self.area.temporary == True and len(self.area.docks) <= 1:
-            return
-        elif self.area.temporary == True and len(self.area.docks) > 1:
-            self.area.docks.pop(self.name(), None)
-            super().float()
-        else:
-            super().float()
-
-    @property
-    def widget_list(self) -> list:
-        """
-        Get the widgets in the dock.
-
-        Returns:
-            widgets(list): The widgets in the dock.
-        """
-        return self.widgets
-
-    @widget_list.setter
-    def widget_list(self, value: list):
-        self.widgets = value
-
-    def hide_title_bar(self):
-        """
-        Hide the title bar of the dock.
-        """
-        # self.hideTitleBar() #TODO pyqtgraph looks bugged ATM, doing my implementation
-        self.label.hide()
-        self.labelHidden = True
-
-    def show_title_bar(self):
-        """
-        Hide the title bar of the dock.
-        """
-        # self.showTitleBar() #TODO pyqtgraph looks bugged ATM, doing my implementation
-        self.label.show()
-        self.labelHidden = False
-
-    def set_title(self, title: str):
-        """
-        Set the title of the dock.
-
-        Args:
-            title(str): The title of the dock.
-        """
-        self.parent_dock_area.docks[title] = self.parent_dock_area.docks.pop(self.name())
-        self.setTitle(title)
-
-    def get_widgets_positions(self) -> dict:
-        """
-        Get the positions of the widgets in the dock.
-
-        Returns:
-            dict: The positions of the widgets in the dock as dict -> {(row, col, rowspan, colspan):widget}
-        """
-        return self.layout_manager.get_widgets_positions()
-
-    def list_eligible_widgets(
-        self,
-    ) -> list:  # TODO can be moved to some util mixin like container class for rpc widgets
-        """
-        List all widgets that can be added to the dock.
-
-        Returns:
-            list: The list of eligible widgets.
-        """
-        return list(RPCWidgetHandler.widget_classes.keys())
-
-    def add_widget_bec(
-        self,
-        widget_type: str,
-        row=None,
-        col=0,
-        rowspan=1,
-        colspan=1,
-        shift: Literal["down", "up", "left", "right"] = "down",
-    ):
-        """
-        Add a widget to the dock.
-
-        Args:
-            widget_type(str): The widget to add. Only BEC RPC widgets from RPCWidgetHandler are allowed.
-            row(int): The row to add the widget to. If None, the widget will be added to the next available row.
-            col(int): The column to add the widget to.
-            rowspan(int): The number of rows the widget should span.
-            colspan(int): The number of columns the widget should span.
-            shift(Literal["down", "up", "left", "right"]): The direction to shift the widgets if the position is occupied.
-        """
-        if row is None:
-            row = self.layout.rowCount()
-
-        if self.layout_manager.is_position_occupied(row, col):
-            self.layout_manager.shift_widgets(shift, start_row=row)
-
-        widget = RPCWidgetHandler.create_widget(widget_type)
-        self.addWidget(widget, row=row, col=col, rowspan=rowspan, colspan=colspan)
-
-        return widget
-
-    def add_widget(
-        self,
-        widget: QWidget,
-        row=None,
-        col=0,
-        rowspan=1,
-        colspan=1,
-        shift: Literal["down", "up", "left", "right"] = "down",
-    ):
-        """
-        Add a widget to the dock.
-
-        Args:
-            widget(QWidget): The widget to add.
-            row(int): The row to add the widget to. If None, the widget will be added to the next available row.
-            col(int): The column to add the widget to.
-            rowspan(int): The number of rows the widget should span.
-            colspan(int): The number of columns the widget should span.
-            shift(Literal["down", "up", "left", "right"]): The direction to shift the widgets if the position is occupied.
-        """
-        if row is None:
-            row = self.layout.rowCount()
-
-        if self.layout_manager.is_position_occupied(row, col):
-            self.layout_manager.shift_widgets(shift, start_row=row)
-
-        self.addWidget(widget, row=row, col=col, rowspan=rowspan, colspan=colspan)
-
-    def move_widget(self, widget: QWidget, new_row: int, new_col: int):
-        """
-        Move a widget to a new position in the layout.
-
-        Args:
-            widget(QWidget): The widget to move.
-            new_row(int): The new row to move the widget to.
-            new_col(int): The new column to move the widget to.
-        """
-        self.layout_manager.move_widget(widget, new_row, new_col)
-
-    def attach(self):
-        """
-        Attach the dock to the parent dock area.
-        """
-        self.parent_dock_area.removeTempArea(self.area)
-
-    def detach(self):
-        """
-        Detach the dock from the parent dock area.
-        """
-        self.float()
-
-    def remove_widget(self, widget_rpc_id: str):
-        """
-        Remove a widget from the dock.
-
-        Args:
-            widget_rpc_id(str): The ID of the widget to remove.
-        """
-        widget = self.rpc_register.get_rpc_by_id(widget_rpc_id)
-        self.layout.removeWidget(widget)
-        widget.close()
-
-    def remove(self):
-        """
-        Remove the dock from the parent dock area.
-        """
-        # self.cleanup()
-        self.parent_dock_area.remove_dock(self.name())
-
-    def cleanup(self):
-        """
-        Clean up the dock, including all its widgets.
-        """
-        for widget in self.widgets:
-            if hasattr(widget, "cleanup"):
-                widget.cleanup()
-        super().cleanup()
-
-    def close(self):
-        """
-        Close the dock area and cleanup.
-        Has to be implemented to overwrite pyqtgraph event accept in Container close.
-        """
-        self.cleanup()
-        super().close()
--- a/bec_widgets/widgets/dock/dock_area.py
+++ b/bec_widgets/widgets/dock/dock_area.py
@@ -1,222 +0,0 @@
-from __future__ import annotations
-
-from typing import Literal, Optional
-from weakref import WeakValueDictionary
-
-from pydantic import Field
-from pyqtgraph.dockarea.DockArea import DockArea
-from qtpy.QtCore import Qt
-from qtpy.QtGui import QPainter, QPaintEvent
-from qtpy.QtWidgets import QWidget
-
-from bec_widgets.utils import BECConnector, ConnectionConfig, WidgetContainerUtils
-
-from .dock import BECDock, DockConfig
-
-
-class DockAreaConfig(ConnectionConfig):
-    docks: dict[str, DockConfig] = Field({}, description="The docks in the dock area.")
-
-
-class BECDockArea(BECConnector, DockArea):
-    USER_ACCESS = [
-        "panels",
-        "save_state",
-        "remove_dock",
-        "restore_state",
-        "add_dock",
-        "clear_all",
-        "detach_dock",
-        "attach_all",
-        "get_all_rpc",
-    ]
-
-    def __init__(
-        self,
-        parent: QWidget | None = None,
-        config: DockAreaConfig | None = None,
-        client=None,
-        gui_id: str = None,
-    ) -> None:
-        if config is None:
-            config = DockAreaConfig(widget_class=self.__class__.__name__)
-        else:
-            if isinstance(config, dict):
-                config = DockAreaConfig(**config)
-            self.config = config
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        DockArea.__init__(self, parent=parent)
-
-        self._instructions_visible = True
-
-    def paintEvent(self, event: QPaintEvent):
-        super().paintEvent(event)
-        if self._instructions_visible:
-            painter = QPainter(self)
-            painter.drawText(self.rect(), Qt.AlignCenter, "Add docks using 'add_dock' method")
-
-    @property
-    def panels(self) -> dict:
-        """
-        Get the docks in the dock area.
-        Returns:
-            dock_dict(dict): The docks in the dock area.
-        """
-        return dict(self.docks)
-
-    @panels.setter
-    def panels(self, value: dict):
-
-        self.docks = WeakValueDictionary(value)
-
-    def restore_state(
-        self, state: dict = None, missing: Literal["ignore", "error"] = "ignore", extra="bottom"
-    ):
-        """
-        Restore the state of the dock area. If no state is provided, the last state is restored.
-
-        Args:
-            state(dict): The state to restore.
-            missing(Literal['ignore','error']): What to do if a dock is missing.
-            extra(str): Extra docks that are in the dockarea but that are not mentioned in state will be added to the bottom of the dockarea, unless otherwise specified by the extra argument.
-        """
-        if state is None:
-            state = self._last_state
-        self.restoreState(state, missing=missing, extra=extra)
-
-    def save_state(self) -> dict:
-        """
-        Save the state of the dock area.
-
-        Returns:
-            dict: The state of the dock area.
-        """
-        self._last_state = self.saveState()
-        return self._last_state
-
-    def remove_dock(self, name: str):
-        """
-        Remove a dock by name and ensure it is properly closed and cleaned up.
-
-        Args:
-            name(str): The name of the dock to remove.
-        """
-        dock = self.docks.pop(name, None)
-        if dock:
-            dock.close()
-            if len(self.docks) <= 1:
-                for dock in self.docks.values():
-                    dock.hide_title_bar()
-
-        else:
-            raise ValueError(f"Dock with name {name} does not exist.")
-
-    def add_dock(
-        self,
-        name: str = None,
-        position: Literal["bottom", "top", "left", "right", "above", "below"] = None,
-        relative_to: BECDock | None = None,
-        closable: bool = False,
-        prefix: str = "dock",
-        widget: str | QWidget | None = None,
-        row: int = None,
-        col: int = 0,
-        rowspan: int = 1,
-        colspan: int = 1,
-    ) -> BECDock:
-        """
-        Add a dock to the dock area. Dock has QGridLayout as layout manager by default.
-
-        Args:
-            name(str): The name of the dock to be displayed and for further references. Has to be unique.
-            position(Literal["bottom", "top", "left", "right", "above", "below"]): The position of the dock.
-            relative_to(BECDock): The dock to which the new dock should be added relative to.
-            closable(bool): Whether the dock is closable.
-            prefix(str): The prefix for the dock name if no name is provided.
-            widget(str|QWidget|None): The widget to be added to the dock. While using RPC, only BEC RPC widgets from RPCWidgetHandler are allowed.
-            row(int): The row of the added widget.
-            col(int): The column of the added widget.
-            rowspan(int): The rowspan of the added widget.
-            colspan(int): The colspan of the added widget.
-
-        Returns:
-            BECDock: The created dock.
-        """
-        if name is None:
-            name = WidgetContainerUtils.generate_unique_widget_id(
-                container=self.docks, prefix=prefix
-            )
-
-        if name in set(self.docks.keys()):
-            raise ValueError(f"Dock with name {name} already exists.")
-
-        if position is None:
-            position = "bottom"
-
-        dock = BECDock(name=name, parent_dock_area=self, closable=closable)
-        dock.config.position = position
-        self.config.docks[name] = dock.config
-
-        self.addDock(dock=dock, position=position, relativeTo=relative_to)
-
-        if len(self.docks) <= 1:
-            dock.hide_title_bar()
-        elif len(self.docks) > 1:
-            for dock in self.docks.values():
-                dock.show_title_bar()
-
-        if widget is not None and isinstance(widget, str):
-            dock.add_widget_bec(
-                widget_type=widget, row=row, col=col, rowspan=rowspan, colspan=colspan
-            )
-        elif widget is not None and isinstance(widget, QWidget):
-            dock.addWidget(widget, row=row, col=col, rowspan=rowspan, colspan=colspan)
-        if self._instructions_visible:
-            self._instructions_visible = False
-            self.update()
-        return dock
-
-    def detach_dock(self, dock_name: str) -> BECDock:
-        """
-        Undock a dock from the dock area.
-
-        Args:
-            dock_name(str): The dock to undock.
-
-        Returns:
-            BECDock: The undocked dock.
-        """
-        dock = self.docks[dock_name]
-        self.floatDock(dock)
-        return dock
-
-    def attach_all(self):
-        """
-        Return all floating docks to the dock area.
-        """
-        while self.tempAreas:
-            for temp_area in self.tempAreas:
-                self.removeTempArea(temp_area)
-
-    def clear_all(self):
-        """
-        Close all docks and remove all temp areas.
-        """
-        self.attach_all()
-        for dock in dict(self.docks).values():
-            dock.remove()
-
-    def cleanup(self):
-        """
-        Cleanup the dock area.
-        """
-        self.clear_all()
-        super().cleanup()
-
-    def close(self):
-        """
-        Close the dock area and cleanup.
-        Has to be implemented to overwrite pyqtgraph event accept in Container close.
-        """
-        self.cleanup()
-        super().close()
--- a/bec_widgets/widgets/editor/init.py
+++ b/bec_widgets/widgets/editor/init.py
@@ -0,0 +1 @@
+from .editor import BECEditor
--- a/bec_widgets/widgets/editor/editor.py
+++ b/bec_widgets/widgets/editor/editor.py
@@ -0,0 +1,415 @@
+import subprocess
+
+import qdarktheme
+from jedi import Script
+from jedi.api import Completion
+
+# pylint: disable=no-name-in-module
+from qtpy.Qsci import QsciScintilla, QsciLexerPython, QsciAPIs
+from qtpy.QtCore import Qt
+from qtpy.QtCore import Signal, QThread
+from qtpy.QtGui import QColor, QFont
+from qtpy.QtWidgets import (
+    QApplication,
+    QFileDialog,
+    QTextEdit,
+    QVBoxLayout,
+    QWidget,
+)
+from qtpy.QtWidgets import QSplitter
+from qtconsole.manager import QtKernelManager
+from qtconsole.rich_jupyter_widget import RichJupyterWidget
+
+from bec_widgets.widgets import ModularToolBar
+
+
+class AutoCompleter(QThread):
+    """Initializes the AutoCompleter thread for handling autocompletion and signature help.
+
+    Args:
+        file_path (str): The path to the file for which autocompletion is required.
+        api (QsciAPIs): The QScintilla API instance used for managing autocompletions.
+        enable_docstring (bool, optional): Flag to determine if docstrings should be included in the signatures.
+    """
+
+    def __init__(self, file_path: str, api: QsciAPIs, enable_docstring: bool = False):
+        super().__init__(None)
+        self.file_path = file_path
+        self.script: Script = None
+        self.api: QsciAPIs = api
+        self.completions: list[Completion] = None
+        self.line = 0
+        self.index = 0
+        self.text = ""
+
+        # TODO so far disabled, quite buggy, docstring extraction has to be generalised
+        self.enable_docstring = enable_docstring
+
+    def update_script(self, text: str):
+        """Updates the script for Jedi completion based on the current editor text.
+
+        Args:
+            text (str): The current text of the editor.
+        """
+        if self.script is None or self.script.path != text:
+            self.script = Script(text, path=self.file_path)
+
+    def run(self):
+        """Runs the thread for generating autocompletions. Overrides QThread.run."""
+        self.update_script(self.text)
+        try:
+            self.completions = self.script.complete(self.line, self.index)
+            self.load_autocomplete(self.completions)
+        except Exception as err:
+            print(err)
+        self.finished.emit()
+
+    def get_function_signature(self, line: int, index: int, text: str) -> str:
+        """Fetches the function signature for a given position in the text.
+
+        Args:
+            line (int): The line number in the editor.
+            index (int): The index (column number) in the line.
+            text (str): The current text of the editor.
+
+        Returns:
+            str: A string containing the function signature or an empty string if not available.
+        """
+        self.update_script(text)
+        try:
+            signatures = self.script.get_signatures(line, index)
+            if signatures and self.enable_docstring is True:
+                full_docstring = signatures[0].docstring(raw=True)
+                compact_docstring = self.get_compact_docstring(full_docstring)
+                return compact_docstring
+            if signatures and self.enable_docstring is False:
+                return signatures[0].to_string()
+        except Exception as err:
+            print(f"Signature Error:{err}")
+        return ""
+
+    def load_autocomplete(self, completions: list):
+        """Loads the autocomplete suggestions into the QScintilla API.
+
+        Args:
+            completions (list[Completion]): A list of Completion objects to be added to the API.
+        """
+        self.api.clear()
+        for i in completions:
+            self.api.add(i.name)
+        self.api.prepare()
+
+    def get_completions(self, line: int, index: int, text: str):
+        """Starts the autocompletion process for a given position in the text.
+
+        Args:
+            line (int): The line number in the editor.
+            index (int): The index (column number) in the line.
+            text (str): The current text of the editor.
+        """
+        self.line = line
+        self.index = index
+        self.text = text
+        self.start()
+
+    def get_compact_docstring(self, full_docstring):
+        """Generates a compact version of a function's docstring.
+
+        Args:
+            full_docstring (str): The full docstring of a function.
+
+        Returns:
+            str: A compact version of the docstring.
+        """
+        lines = full_docstring.split("\n")
+        # TODO make it also for different docstring styles, now it is only for numpy style
+        cutoff_indices = [
+            i
+            for i, line in enumerate(lines)
+            if line.strip().lower() in ["parameters", "returns", "examples", "see also", "warnings"]
+        ]
+
+        if cutoff_indices:
+            lines = lines[: cutoff_indices[0]]
+
+        compact_docstring = "\n".join(lines).strip()
+        return compact_docstring
+
+
+class ScriptRunnerThread(QThread):
+    """Initializes the thread for running a Python script.
+
+    Args:
+        script (str): The script to be executed.
+    """
+
+    outputSignal = Signal(str)
+
+    def __init__(self, script):
+        super().__init__()
+        self.script = script
+
+    def run(self):
+        """Executes the script in a subprocess and emits output through a signal. Overrides QThread.run."""
+        process = subprocess.Popen(
+            ["python", "-u", "-c", self.script],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            bufsize=1,
+            universal_newlines=True,
+            text=True,
+        )
+
+        while True:
+            output = process.stdout.readline()
+            if output == "" and process.poll() is not None:
+                break
+            if output:
+                self.outputSignal.emit(output)
+        error = process.communicate()[1]
+        if error:
+            self.outputSignal.emit(error)
+
+
+class BECEditor(QWidget):
+    """Initializes the BEC Editor widget.
+
+    Args:
+        toolbar_enabled (bool, optional): Determines if the toolbar should be enabled. Defaults to True.
+    """
+
+    def __init__(
+        self, toolbar_enabled=True, jupyter_terminal_enabled=False, docstring_tooltip=False
+    ):
+        super().__init__()
+
+        self.script_runner_thread = None
+        self.file_path = None
+        self.docstring_tooltip = docstring_tooltip
+        self.jupyter_terminal_enabled = jupyter_terminal_enabled
+        # TODO just temporary solution, could be extended to other languages
+        self.is_python_file = True
+
+        # Initialize the editor and terminal
+        self.editor = QsciScintilla()
+        if self.jupyter_terminal_enabled:
+            self.terminal = self.make_jupyter_widget_with_kernel()
+        else:
+            self.terminal = QTextEdit()
+            self.terminal.setReadOnly(True)
+
+        # Layout
+        self.layout = QVBoxLayout()
+
+        # Initialize and add the toolbar if enabled
+        if toolbar_enabled:
+            self.toolbar = ModularToolBar(self)
+            self.layout.addWidget(self.toolbar)
+
+        # Initialize the splitter
+        self.splitter = QSplitter(Qt.Orientation.Vertical, self)
+        self.splitter.addWidget(self.editor)
+        self.splitter.addWidget(self.terminal)
+        self.splitter.setSizes([400, 200])
+
+        # Add Splitter to layout
+        self.layout.addWidget(self.splitter)
+        self.setLayout(self.layout)
+
+        self.setup_editor()
+
+    def setup_editor(self):
+        """Sets up the editor with necessary configurations like lexer, auto indentation, and line numbers."""
+        # Set the lexer for Python
+        self.lexer = QsciLexerPython()
+        self.editor.setLexer(self.lexer)
+
+        # Enable auto indentation and competition within the editor
+        self.editor.setAutoIndent(True)
+        self.editor.setIndentationsUseTabs(False)
+        self.editor.setIndentationWidth(4)
+        self.editor.setAutoCompletionSource(QsciScintilla.AutoCompletionSource.AcsAll)
+        self.editor.setAutoCompletionThreshold(1)
+
+        # Autocomplete for python file
+        # Connect cursor position change signal for autocompletion
+        self.editor.cursorPositionChanged.connect(self.on_cursor_position_changed)
+
+        # if self.is_python_file: #TODO can be changed depending on supported languages
+        self.__api = QsciAPIs(self.lexer)
+        self.auto_completer = AutoCompleter(
+            self.editor.text(), self.__api, enable_docstring=self.docstring_tooltip
+        )
+        self.auto_completer.finished.connect(self.loaded_autocomplete)
+
+        # Enable line numbers in the margin
+        self.editor.setMarginType(0, QsciScintilla.MarginType.NumberMargin)
+        self.editor.setMarginWidth(0, "0000")  # Adjust the width as needed
+
+        # Additional UI elements like menu for load/save can be added here
+        self.set_editor_style()
+
+    @staticmethod
+    def make_jupyter_widget_with_kernel() -> object:
+        """Start a kernel, connect to it, and create a RichJupyterWidget to use it"""
+        kernel_manager = QtKernelManager(kernel_name="python3")
+        kernel_manager.start_kernel()
+
+        kernel_client = kernel_manager.client()
+        kernel_client.start_channels()
+
+        jupyter_widget = RichJupyterWidget()
+        jupyter_widget.set_default_style("linux")
+        jupyter_widget.kernel_manager = kernel_manager
+        jupyter_widget.kernel_client = kernel_client
+        return jupyter_widget
+
+    def show_call_tip(self, position):
+        """Shows a call tip at the given position in the editor.
+
+        Args:
+            position (int): The position in the editor where the call tip should be shown.
+        """
+        line, index = self.editor.lineIndexFromPosition(position)
+        signature = self.auto_completer.get_function_signature(line + 1, index, self.editor.text())
+        if signature:
+            self.editor.showUserList(1, [signature])
+
+    def on_cursor_position_changed(self, line, index):
+        """Handles the event of cursor position change in the editor.
+
+        Args:
+            line (int): The current line number where the cursor is.
+            index (int): The current column index where the cursor is.
+        """
+        # if self.is_python_file: #TODO can be changed depending on supported languages
+        # Get completions
+        self.auto_completer.get_completions(line + 1, index, self.editor.text())
+        self.editor.autoCompleteFromAPIs()
+
+        # Show call tip - signature
+        position = self.editor.positionFromLineIndex(line, index)
+        self.show_call_tip(position)
+
+    def loaded_autocomplete(self):
+        """Placeholder method for actions after autocompletion data is loaded."""
+
+    def set_editor_style(self):
+        """Sets the style and color scheme for the editor."""
+        # Dracula Theme Colors
+        background_color = QColor("#282a36")
+        text_color = QColor("#f8f8f2")
+        keyword_color = QColor("#8be9fd")
+        string_color = QColor("#f1fa8c")
+        comment_color = QColor("#6272a4")
+        class_function_color = QColor("#50fa7b")
+
+        # Set Font
+        font = QFont()
+        font.setFamily("Consolas")
+        font.setPointSize(10)
+        self.editor.setFont(font)
+        self.editor.setMarginsFont(font)
+
+        # Set Editor Colors
+        self.editor.setMarginsBackgroundColor(background_color)
+        self.editor.setMarginsForegroundColor(text_color)
+        self.editor.setCaretForegroundColor(text_color)
+        self.editor.setCaretLineBackgroundColor(QColor("#44475a"))
+        self.editor.setPaper(background_color)  # Set the background color for the entire paper
+        self.editor.setColor(text_color)
+
+        # Set editor
+        # Syntax Highlighting Colors
+        lexer = self.editor.lexer()
+        if lexer:
+            lexer.setDefaultPaper(background_color)  # Set the background color for the text area
+            lexer.setDefaultColor(text_color)
+            lexer.setColor(keyword_color, QsciLexerPython.Keyword)
+            lexer.setColor(string_color, QsciLexerPython.DoubleQuotedString)
+            lexer.setColor(string_color, QsciLexerPython.SingleQuotedString)
+            lexer.setColor(comment_color, QsciLexerPython.Comment)
+            lexer.setColor(class_function_color, QsciLexerPython.ClassName)
+            lexer.setColor(class_function_color, QsciLexerPython.FunctionMethodName)
+
+        # Set the style for all text to have a transparent background
+        # TODO find better way how to do it!
+        for style in range(
+            128
+        ):  # QsciScintilla supports 128 styles by default, this set all to transparent background
+            self.lexer.setPaper(background_color, style)
+
+    def run_script(self):
+        """Runs the current script in the editor."""
+        if self.jupyter_terminal_enabled:
+            script = self.editor.text()
+            self.terminal.execute(script)
+
+        else:
+            script = self.editor.text()
+            self.script_runner_thread = ScriptRunnerThread(script)
+            self.script_runner_thread.outputSignal.connect(self.update_terminal)
+            self.script_runner_thread.start()
+
+    def update_terminal(self, text):
+        """Updates the terminal with new text.
+
+        Args:
+            text (str): The text to be appended to the terminal.
+        """
+        self.terminal.append(text)
+
+    def enable_docstring_tooltip(self):
+        """Enables the docstring tooltip."""
+        self.docstring_tooltip = True
+        self.auto_completer.enable_docstring = True
+
+    def open_file(self):
+        """Opens a file dialog for selecting and opening a Python file in the editor."""
+        options = QFileDialog.Options()
+        options |= QFileDialog.DontUseNativeDialog
+        file_path, _ = QFileDialog.getOpenFileName(
+            self, "Open file", "", "Python files (*.py);;All Files (*)", options=options
+        )
+
+        if not file_path:
+            return
+        try:
+            with open(file_path, "r") as file:
+                text = file.read()
+            self.editor.setText(text)
+        except FileNotFoundError:
+            print(f"The file {file_path} was not found.")
+        except Exception as e:
+            print(f"An error occurred while opening the file {file_path}: {e}")
+
+    def save_file(self):
+        """Opens a save file dialog for saving the current script in the editor."""
+        options = QFileDialog.Options()
+        options |= QFileDialog.DontUseNativeDialog
+        file_path, _ = QFileDialog.getSaveFileName(
+            self, "Save file", "", "Python files (*.py);;All Files (*)", options=options
+        )
+
+        if not file_path:
+            return
+        try:
+            if not file_path.endswith(".py"):
+                file_path += ".py"
+
+            with open(file_path, "w") as file:
+                text = self.editor.text()
+                file.write(text)
+                print(f"File saved to {file_path}")
+        except Exception as e:
+            print(f"An error occurred while saving the file to {file_path}: {e}")
+
+
+if __name__ == "__main__":  # pragma: no cover
+    app = QApplication([])
+    qdarktheme.setup_theme("auto")
+
+    mainWin = BECEditor(jupyter_terminal_enabled=True)
+
+    mainWin.show()
+    app.exec()
--- a/bec_widgets/widgets/figure/init.py
+++ b/bec_widgets/widgets/figure/init.py
@@ -1 +1 @@
-from .figure import BECFigure, FigureConfig
+from .figure import FigureConfig, BECFigure
--- a/bec_widgets/widgets/figure/figure.py
+++ b/bec_widgets/widgets/figure/figure.py
@@ -1,7 +1,8 @@
 # pylint: disable = no-name-in-module,missing-module-docstring
 from __future__ import annotations

-import uuid
+import itertools
+import os
 from collections import defaultdict
 from typing import Literal, Optional

@@ -9,20 +10,12 @@ import numpy as np
 import pyqtgraph as pg
 import qdarktheme
 from pydantic import Field
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtWidgets import QWidget
+from pyqtgraph.Qt import uic
+from qtpy.QtWidgets import QApplication, QWidget
+from qtpy.QtWidgets import QVBoxLayout, QMainWindow

-from bec_widgets.utils import BECConnector, ConnectionConfig, WidgetContainerUtils
-from bec_widgets.widgets.plots import (
-    BECImageShow,
-    BECMotorMap,
-    BECPlotBase,
-    BECWaveform,
-    SubplotConfig,
-    Waveform1DConfig,
-)
-from bec_widgets.widgets.plots.image import ImageConfig
-from bec_widgets.widgets.plots.motor_map import MotorMapConfig
+from bec_widgets.utils import BECConnector, BECDispatcher, ConnectionConfig
+from bec_widgets.widgets.plots import BECPlotBase, BECWaveform1D, Waveform1DConfig, WidgetConfig


 class FigureConfig(ConnectionConfig):
@@ -31,7 +24,7 @@ class FigureConfig(ConnectionConfig):
    theme: Literal["dark", "light"] = Field("dark", description="The theme of the figure widget.")
    num_cols: int = Field(1, description="The number of columns in the figure widget.")
    num_rows: int = Field(1, description="The number of rows in the figure widget.")
-    widgets: dict[str, SubplotConfig] = Field(
+    widgets: dict[str, WidgetConfig] = Field(
        {}, description="The list of widgets to be added to the figure widget."
    )

@@ -41,10 +34,8 @@ class WidgetHandler:

    def __init__(self):
        self.widget_factory = {
-            "PlotBase": (BECPlotBase, SubplotConfig),
-            "Waveform1D": (BECWaveform, Waveform1DConfig),
-            "ImShow": (BECImageShow, ImageConfig),
-            "MotorMap": (BECMotorMap, MotorMapConfig),
+            "PlotBase": (BECPlotBase, WidgetConfig),
+            "Waveform1D": (BECWaveform1D, Waveform1DConfig),
        }

    def create_widget(
@@ -74,8 +65,6 @@ class WidgetHandler:
            raise ValueError(f"Unsupported widget type: {widget_type}")

        widget_class, config_class = entry
-        if config is not None and isinstance(config, config_class):
-            config = config.model_dump()
        widget_config_dict = {
            "widget_class": widget_class.__name__,
            "parent_id": parent_id,
@@ -94,26 +83,7 @@ class WidgetHandler:


 class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
-    USER_ACCESS = [
-        "rpc_id",
-        "config_dict",
-        "axes",
-        "widgets",
-        "add_plot",
-        "add_image",
-        "add_motor_map",
-        "plot",
-        "image",
-        "motor_map",
-        "remove",
-        "change_layout",
-        "change_theme",
-        "clear_all",
-        "get_all_rpc",
-        "widget_list",
-    ]
-
-    clean_signal = pyqtSignal()
+    USER_ACCESS = ["add_plot", "remove", "change_layout", "change_theme", "clear_all"]

    def __init__(
        self,
@@ -134,83 +104,26 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
        self.widget_handler = WidgetHandler()

        # Widget container to reference widgets by 'widget_id'
-        self._widgets = defaultdict(dict)
+        self.widgets = defaultdict(dict)

        # Container to keep track of the grid
        self.grid = []

-    def __getitem__(self, key: tuple | str):
-        if isinstance(key, tuple) and len(key) == 2:
-            return self.axes(*key)
-        elif isinstance(key, str):
-            widget = self._widgets.get(key)
-            if widget is None:
-                raise KeyError(f"No widget with ID {key}")
-            return self._widgets.get(key)
-        else:
-            raise TypeError(
-                "Key must be a string (widget id) or a tuple of two integers (grid coordinates)"
-            )
-
-    @property
-    def widget_list(self) -> list[BECPlotBase]:
+    def change_theme(self, theme: Literal["dark", "light"]) -> None:
        """
-        Access all widget in BECFigure as a list
-        Returns:
-            list[BECPlotBase]: List of all widgets in the figure.
+        Change the theme of the figure widget.
+        Args:
+            theme(Literal["dark","light"]): The theme to set for the figure widget.
        """
-        axes = [value for value in self._widgets.values() if isinstance(value, BECPlotBase)]
-        return axes
-
-    @widget_list.setter
-    def widget_list(self, value: list[BECPlotBase]):
-        """
-        Access all widget in BECFigure as a list
-        Returns:
-            list[BECPlotBase]: List of all widgets in the figure.
-        """
-        self._axes = value
-
-    @property
-    def widgets(self) -> dict:
-        """
-        All widgets within the figure with gui ids as keys.
-        Returns:
-            dict: All widgets within the figure.
-        """
-        return self._widgets
-
-    @widgets.setter
-    def widgets(self, value: dict):
-        """
-        All widgets within the figure with gui ids as keys.
-        Returns:
-            dict: All widgets within the figure.
-        """
-        self._widgets = value
+        qdarktheme.setup_theme(theme)
+        self.setBackground("k" if theme == "dark" else "w")
+        self.config.theme = theme

    def add_plot(
-        self,
-        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: Optional[str] = None,
-        color_map_z: Optional[str] = "plasma",
-        label: Optional[str] = None,
-        validate: bool = True,
-        row: int = None,
-        col: int = None,
-        config=None,
-        **axis_kwargs,
-    ) -> BECWaveform:
+        self, widget_id: str = None, row: int = None, col: int = None, config=None, **axis_kwargs
+    ) -> BECWaveform1D:
        """
        Add a Waveform1D plot to the figure at the specified position.
-
        Args:
            widget_id(str): The unique identifier of the widget. If not provided, a unique ID will be generated.
            row(int): The row coordinate of the widget in the figure. If not provided, the next empty row will be used.
@@ -218,8 +131,7 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
            config(dict): Additional configuration for the widget.
            **axis_kwargs(dict): Additional axis properties to set on the widget after creation.
        """
-        widget_id = str(uuid.uuid4())
-        waveform = self.add_widget(
+        return self.add_widget(
            widget_type="Waveform1D",
            widget_id=widget_id,
            row=row,
@@ -228,321 +140,9 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
            **axis_kwargs,
        )

-        # TODO remove repetition from .plot method
-
-        # 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.add_curve_scan(
-                x_name=x_name,
-                y_name=y_name,
-                x_entry=x_entry,
-                y_entry=y_entry,
-                validate=validate,
-                color=color,
-                label=label,
-            )
-        # 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.add_curve_scan(
-                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,
-            )
-        # 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
-
-    def plot(
-        self,
-        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: Optional[str] = None,
-        color_map_z: Optional[str] = "plasma",
-        label: Optional[str] = None,
-        validate: bool = True,
-        **axis_kwargs,
-    ) -> BECWaveform:
-        """
-        Add a 1D waveform plot to the figure. Always access the first waveform widget in the figure.
-
-        Args:
-            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.
-            x(list | np.ndarray): Custom x data to plot.
-            y(list | np.ndarray): Custom y data to plot.
-            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.
-            **axis_kwargs: Additional axis properties to set on the widget after creation.
-
-        Returns:
-            BECWaveform: The waveform plot widget.
-        """
-        waveform = WidgetContainerUtils.find_first_widget_by_class(
-            self._widgets, BECWaveform, can_fail=True
-        )
-        if waveform is not None:
-            if axis_kwargs:
-                waveform.set(**axis_kwargs)
-        else:
-            waveform = self.add_plot(**axis_kwargs)
-
-        # 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.add_curve_scan(
-                x_name=x_name,
-                y_name=y_name,
-                x_entry=x_entry,
-                y_entry=y_entry,
-                color=color,
-                color_map_z="plasma",
-                label=label,
-                validate=validate,
-            )
-        # User wants to add scan curve -> 2D Waveform Scatter
-        elif (
-            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.add_curve_scan(
-                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,
-            )
-        # 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 and z_name is None
-        ):
-            waveform.add_curve_custom(x=x, y=y, color=color, label=label)
-        else:
-            raise ValueError(
-                "Invalid input. Provide either device names (x_name, y_name) or custom data."
-            )
-        return waveform
-
-    def image(
-        self,
-        monitor: str = None,
-        color_bar: Literal["simple", "full"] = "full",
-        color_map: str = "magma",
-        data: np.ndarray = None,
-        vrange: tuple[float, float] = None,
-        **axis_kwargs,
-    ) -> BECImageShow:
-        """
-        Add an image to the figure. Always access the first image widget in the figure.
-
-        Args:
-            monitor(str): The name of the monitor to display.
-            color_bar(Literal["simple","full"]): The type of color bar to display.
-            color_map(str): The color map to use for the image.
-            data(np.ndarray): Custom data to display.
-            vrange(tuple[float, float]): The range of values to display.
-            **axis_kwargs: Additional axis properties to set on the widget after creation.
-
-        Returns:
-            BECImageShow: The image widget.
-        """
-        image = WidgetContainerUtils.find_first_widget_by_class(
-            self._widgets, BECImageShow, can_fail=True
-        )
-        if image is not None:
-            if axis_kwargs:
-                image.set(**axis_kwargs)
-        else:
-            image = self.add_image(color_bar=color_bar, **axis_kwargs)
-
-        # Setting data #TODO check logic if monitor or data are already created
-        if monitor is not None and data is None:
-            image.add_monitor_image(
-                monitor=monitor, color_map=color_map, vrange=vrange, color_bar=color_bar
-            )
-        elif data is not None and monitor is None:
-            image.add_custom_image(
-                name="custom", data=data, color_map=color_map, vrange=vrange, color_bar=color_bar
-            )
-        elif data is None and monitor is None:
-            # Setting appearance
-            if vrange is not None:
-                image.set_vrange(vmin=vrange[0], vmax=vrange[1])
-            if color_map is not None:
-                image.set_color_map(color_map)
-        else:
-            raise ValueError("Invalid input. Provide either monitor name or custom data.")
-        return image
-
-    def add_image(
-        self,
-        monitor: str = None,
-        color_bar: Literal["simple", "full"] = "full",
-        color_map: str = "magma",
-        data: np.ndarray = None,
-        vrange: tuple[float, float] = None,
-        row: int = None,
-        col: int = None,
-        config=None,
-        **axis_kwargs,
-    ) -> BECImageShow:
-        """
-        Add an image to the figure at the specified position.
-
-        Args:
-            monitor(str): The name of the monitor to display.
-            color_bar(Literal["simple","full"]): The type of color bar to display.
-            color_map(str): The color map to use for the image.
-            data(np.ndarray): Custom data to display.
-            vrange(tuple[float, float]): The range of values to display.
-            row(int): The row coordinate of the widget in the figure. If not provided, the next empty row will be used.
-            col(int): The column coordinate of the widget in the figure. If not provided, the next empty column will be used.
-            config(dict): Additional configuration for the widget.
-            **axis_kwargs: Additional axis properties to set on the widget after creation.
-
-        Returns:
-            BECImageShow: The image widget.
-        """
-
-        widget_id = str(uuid.uuid4())
-        if config is None:
-            config = ImageConfig(
-                widget_class="BECImageShow",
-                gui_id=widget_id,
-                parent_id=self.gui_id,
-                color_map=color_map,
-                color_bar=color_bar,
-                vrange=vrange,
-            )
-        image = self.add_widget(
-            widget_type="ImShow",
-            widget_id=widget_id,
-            row=row,
-            col=col,
-            config=config,
-            **axis_kwargs,
-        )
-        # TODO remove repetition from .image method
-        if monitor is not None and data is None:
-            image.add_monitor_image(
-                monitor=monitor, color_map=color_map, vrange=vrange, color_bar=color_bar
-            )
-        elif data is not None and monitor is None:
-            image.add_custom_image(
-                name="custom", data=data, color_map=color_map, vrange=vrange, color_bar=color_bar
-            )
-        elif data is None and monitor is None:
-            # Setting appearance
-            if vrange is not None:
-                image.set_vrange(vmin=vrange[0], vmax=vrange[1])
-            if color_map is not None:
-                image.set_color_map(color_map)
-
-        return image
-
-    def motor_map(self, motor_x: str = None, motor_y: str = None, **axis_kwargs) -> BECMotorMap:
-        """
-        Add a motor map to the figure. Always access the first motor map widget in the figure.
-
-        Args:
-            motor_x(str): The name of the motor for the X axis.
-            motor_y(str): The name of the motor for the Y axis.
-            **axis_kwargs: Additional axis properties to set on the widget after creation.
-
-        Returns:
-            BECMotorMap: The motor map widget.
-        """
-        motor_map = WidgetContainerUtils.find_first_widget_by_class(
-            self._widgets, BECMotorMap, can_fail=True
-        )
-        if motor_map is not None:
-            if axis_kwargs:
-                motor_map.set(**axis_kwargs)
-        else:
-            motor_map = self.add_motor_map(**axis_kwargs)
-
-        if motor_x is not None and motor_y is not None:
-            motor_map.change_motors(motor_x, motor_y)
-
-        return motor_map
-
-    def add_motor_map(
-        self,
-        motor_x: str = None,
-        motor_y: str = None,
-        row: int = None,
-        col: int = None,
-        config=None,
-        **axis_kwargs,
-    ) -> BECMotorMap:
-        """
-
-        Args:
-            motor_x(str): The name of the motor for the X axis.
-            motor_y(str): The name of the motor for the Y axis.
-            row(int): The row coordinate of the widget in the figure. If not provided, the next empty row will be used.
-            col(int): The column coordinate of the widget in the figure. If not provided, the next empty column will be used.
-            config(dict): Additional configuration for the widget.
-            **axis_kwargs:
-
-        Returns:
-            BECMotorMap: The motor map widget.
-        """
-        widget_id = str(uuid.uuid4())
-        if config is None:
-            config = MotorMapConfig(
-                widget_class="BECMotorMap", gui_id=widget_id, parent_id=self.gui_id
-            )
-        motor_map = self.add_widget(
-            widget_type="MotorMap",
-            widget_id=widget_id,
-            row=row,
-            col=col,
-            config=config,
-            **axis_kwargs,
-        )
-
-        if motor_x is not None and motor_y is not None:
-            motor_map.change_motors(motor_x, motor_y)
-
-        return motor_map
-
    def add_widget(
        self,
-        widget_type: Literal["PlotBase", "Waveform1D", "ImShow"] = "PlotBase",
+        widget_type: Literal["PlotBase", "Waveform1D"] = "PlotBase",
        widget_id: str = None,
        row: int = None,
        col: int = None,
@@ -551,7 +151,6 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
    ) -> BECPlotBase:
        """
        Add a widget to the figure at the specified position.
-
        Args:
            widget_type(Literal["PlotBase","Waveform1D"]): The type of the widget to add.
            widget_id(str): The unique identifier of the widget. If not provided, a unique ID will be generated.
@@ -561,8 +160,8 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
            **axis_kwargs(dict): Additional axis properties to set on the widget after creation.
        """
        if not widget_id:
-            widget_id = str(uuid.uuid4())
-        if widget_id in self._widgets:
+            widget_id = self._generate_unique_widget_id()
+        if widget_id in self.widgets:
            raise ValueError(f"Widget with ID '{widget_id}' already exists.")

        widget = self.widget_handler.create_widget(
@@ -598,7 +197,7 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):

        # Saving config for future referencing
        self.config.widgets[widget_id] = widget.config
-        self._widgets[widget_id] = widget
+        self.widgets[widget_id] = widget

        # Reflect the grid coordinates
        self._change_grid(widget_id, row, col)
@@ -614,7 +213,6 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
    ) -> None:
        """
        Remove a widget from the figure. Can be removed by its unique identifier or by its coordinates.
-
        Args:
            row(int): The row coordinate of the widget to remove.
            col(int): The column coordinate of the widget to remove.
@@ -630,53 +228,53 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
        else:
            raise ValueError("Must provide either widget_id or coordinates for removal.")

-    def change_theme(self, theme: Literal["dark", "light"]) -> None:
-        """
-        Change the theme of the figure widget.
-
-        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
-
    def _remove_by_coordinates(self, row: int, col: int) -> None:
        """
        Remove a widget from the figure by its coordinates.
-
        Args:
            row(int): The row coordinate of the widget to remove.
            col(int): The column coordinate of the widget to remove.
        """
-        widget = self.axes(row, col)
+        widget = self._get_widget_by_coordinates(row, col)
        if widget:
            widget_id = widget.config.gui_id
-            if widget_id in self._widgets:
+            if widget_id in self.widgets:
                self._remove_by_id(widget_id)

    def _remove_by_id(self, widget_id: str) -> None:
        """
        Remove a widget from the figure by its unique identifier.
-
        Args:
            widget_id(str): The unique identifier of the widget to remove.
        """
-        if widget_id in self._widgets:
-            widget = self._widgets.pop(widget_id)
+        if widget_id in self.widgets:
+            widget = self.widgets.pop(widget_id)
            widget.cleanup()
            self.removeItem(widget)
            self.grid[widget.config.row][widget.config.col] = None
            self._reindex_grid()
            if widget_id in self.config.widgets:
                self.config.widgets.pop(widget_id)
+            print(f"Removed widget {widget_id}.")
        else:
            raise ValueError(f"Widget with ID '{widget_id}' does not exist.")

-    def axes(self, row: int, col: int) -> BECPlotBase:
+    def __getitem__(self, key: tuple | str):
+        if isinstance(key, tuple) and len(key) == 2:
+            return self._get_widget_by_coordinates(*key)
+        elif isinstance(key, str):
+            widget = self.widgets.get(key)
+            if widget is None:
+                raise KeyError(f"No widget with ID {key}")
+            return self.widgets.get(key)
+        else:
+            raise TypeError(
+                "Key must be a string (widget id) or a tuple of two integers (grid coordinates)"
+            )
+
+    def _get_widget_by_coordinates(self, row: int, col: int) -> BECPlotBase:
        """
        Get widget by its coordinates in the figure.
-
        Args:
            row(int): the row coordinate
            col(int): the column coordinate
@@ -696,10 +294,17 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
            row += 1
        return row, col

+    def _generate_unique_widget_id(self):
+        """Generate a unique widget ID."""
+        existing_ids = set(self.widgets.keys())
+        for i in itertools.count(1):
+            widget_id = f"widget_{i}"
+            if widget_id not in existing_ids:
+                return widget_id
+
    def _change_grid(self, widget_id: str, row: int, col: int):
        """
        Change the grid to reflect the new position of the widget.
-
        Args:
            widget_id(str): The unique identifier of the widget.
            row(int): The new row coordinate of the widget in the figure.
@@ -714,6 +319,7 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):

    def _reindex_grid(self):
        """Reindex the grid to remove empty rows and columns."""
+        print(f"old grid: {self.grid}")
        new_grid = []
        for row in self.grid:
            new_row = [widget for widget in row if widget is not None]
@@ -723,10 +329,7 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
        # Update the config of each object to reflect its new position
        for row_idx, row in enumerate(new_grid):
            for col_idx, widget in enumerate(row):
-                self._widgets[widget].config.row, self._widgets[widget].config.col = (
-                    row_idx,
-                    col_idx,
-                )
+                self.widgets[widget].config.row, self.widgets[widget].config.col = row_idx, col_idx

        self.grid = new_grid
        self._replot_layout()
@@ -736,7 +339,7 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
        self.clear()
        for row_idx, row in enumerate(self.grid):
            for col_idx, widget in enumerate(row):
-                self.addItem(self._widgets[widget], row=row_idx, col=col_idx)
+                self.addItem(self.widgets[widget], row=row_idx, col=col_idx)

    def change_layout(self, max_columns=None, max_rows=None):
        """
@@ -748,7 +351,7 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
            max_rows (Optional[int]): The new maximum number of rows in the figure.
        """
        # Calculate total number of widgets
-        total_widgets = len(self._widgets)
+        total_widgets = len(self.widgets)

        if max_columns:
            # Calculate the required number of rows based on max_columns
@@ -764,7 +367,7 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):

        # Populate the new grid with widgets' IDs
        current_idx = 0
-        for widget_id, widget in self._widgets.items():
+        for widget_id, widget in self.widgets.items():
            row = current_idx // len(new_grid[0])
            col = current_idx % len(new_grid[0])
            new_grid[row][col] = widget_id
@@ -780,16 +383,142 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):

    def clear_all(self):
        """Clear all widgets from the figure and reset to default state"""
-        for widget in list(self._widgets.values()):
-            widget.remove()
-        # self.clear()
-        self._widgets = defaultdict(dict)
+        self.clear()
+        self.widgets = defaultdict(dict)
        self.grid = []
        theme = self.config.theme
        self.config = FigureConfig(
            widget_class=self.__class__.__name__, gui_id=self.gui_id, theme=theme
        )

-    def cleanup(self):
-        self.clear_all()
-        super().cleanup()
+    def start(self):
+        import sys
+
+        app = QApplication(sys.argv)
+        win = QMainWindow()
+        win.setCentralWidget(self)
+        win.show()
+
+        sys.exit(app.exec_())
+
+
+##################################################
+##################################################
+# Debug window
+##################################################
+##################################################
+
+from qtconsole.inprocess import QtInProcessKernelManager
+from qtconsole.rich_jupyter_widget import RichJupyterWidget
+
+
+class JupyterConsoleWidget(RichJupyterWidget):  # pragma: no cover:
+    def __init__(self):
+        super().__init__()
+
+        self.kernel_manager = QtInProcessKernelManager()
+        self.kernel_manager.start_kernel(show_banner=False)
+        self.kernel_client = self.kernel_manager.client()
+        self.kernel_client.start_channels()
+
+        self.kernel_manager.kernel.shell.push({"np": np, "pg": pg})
+
+    def shutdown_kernel(self):
+        self.kernel_client.stop_channels()
+        self.kernel_manager.shutdown_kernel()
+
+
+class DebugWindow(QWidget):  # pragma: no cover:
+    """Debug window for BEC widgets"""
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        current_path = os.path.dirname(__file__)
+        uic.loadUi(os.path.join(current_path, "figure_debug_minimal.ui"), self)
+
+        self._init_ui()
+
+        self.splitter.setSizes([200, 100])
+
+        # console push
+        self.console.kernel_manager.kernel.shell.push(
+            {"fig": self.figure, "w1": self.w1, "w2": self.w2}
+        )
+
+    def _init_ui(self):
+        # Plotting window
+        self.glw_1_layout = QVBoxLayout(self.glw)  # Create a new QVBoxLayout
+        self.figure = BECFigure(parent=self)  # Create a new BECDeviceMonitor
+        self.glw_1_layout.addWidget(self.figure)  # Add BECDeviceMonitor to the layout
+
+        # add stuff to figure
+        self._init_figure()
+
+        self.console_layout = QVBoxLayout(self.widget_console)
+        self.console = JupyterConsoleWidget()
+        self.console_layout.addWidget(self.console)
+        self.console.set_default_style("linux")
+
+    def _init_figure(self):
+        self.figure.add_widget(widget_type="Waveform1D", row=0, col=0, title="Widget 1")
+        self.figure.add_widget(widget_type="Waveform1D", row=1, col=0, title="Widget 2")
+        self.figure.add_widget(widget_type="Waveform1D", row=0, col=1, title="Widget 3")
+        self.figure.add_widget(widget_type="Waveform1D", row=1, col=1, title="Widget 4")
+
+        self.w1 = self.figure[0, 0]
+        self.w2 = self.figure[1, 0]
+        self.w3 = self.figure[0, 1]
+        self.w4 = self.figure[1, 1]
+
+        # curves for w1
+        self.w1.add_curve_scan("samx", "bpm4i", pen_style="dash")
+        self.w1.add_curve_custom(
+            x=[1, 2, 3, 4, 5],
+            y=[1, 2, 3, 4, 5],
+            label="curve-custom",
+            color="blue",
+            pen_style="dashdot",
+        )
+        self.c1 = self.w1.get_config()
+
+        # curves for w2
+        self.w2.add_curve_scan("samx", "bpm3a", pen_style="solid")
+        self.w2.add_curve_scan("samx", "bpm4d", pen_style="dot")
+        self.w2.add_curve_custom(
+            x=[1, 2, 3, 4, 5], y=[5, 4, 3, 2, 1], color="red", pen_style="dashdot"
+        )
+
+        # curves for w3
+        self.w3.add_curve_scan("samx", "bpm4i", pen_style="dash")
+        self.w3.add_curve_custom(
+            x=[1, 2, 3, 4, 5],
+            y=[1, 2, 3, 4, 5],
+            label="curve-custom",
+            color="blue",
+            pen_style="dashdot",
+        )
+
+        # curves for w4
+        self.w4.add_curve_scan("samx", "bpm4i", pen_style="dash")
+        self.w4.add_curve_custom(
+            x=[1, 2, 3, 4, 5],
+            y=[1, 2, 3, 4, 5],
+            label="curve-custom",
+            color="blue",
+            pen_style="dashdot",
+        )
+
+
+if __name__ == "__main__":  # pragma: no cover
+    import sys
+
+    bec_dispatcher = BECDispatcher()
+    client = bec_dispatcher.client
+    client.start()
+
+    app = QApplication(sys.argv)
+    win = DebugWindow()
+    win.show()
+
+    sys.exit(app.exec_())
--- a/bec_widgets/widgets/figure/figure_debug_minimal.ui
+++ b/bec_widgets/widgets/figure/figure_debug_minimal.ui
@@ -0,0 +1,35 @@
+<?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>901</width>
+    <height>1000</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <widget class="QSplitter" name="splitter_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <widget class="QSplitter" name="splitter">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <widget class="QWidget" name="glw" native="true"/>
+     </widget>
+     <widget class="QWidget" name="widget_console" native="true"/>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
--- a/bec_widgets/widgets/monitor/init.py
+++ b/bec_widgets/widgets/monitor/init.py
@@ -1 +1,2 @@
 from .monitor import BECMonitor
+from .config_dialog import ConfigDialog
--- a/bec_widgets/widgets/monitor/config_dialog.py
+++ b/bec_widgets/widgets/monitor/config_dialog.py
@@ -1,22 +1,23 @@
 import os

-from pydantic import ValidationError
 from qtpy import uic
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtWidgets import (
    QApplication,
-    QLineEdit,
-    QMessageBox,
-    QTableWidget,
-    QTableWidgetItem,
-    QTabWidget,
-    QVBoxLayout,
    QWidget,
+    QVBoxLayout,
+    QTableWidget,
+    QTabWidget,
+    QTableWidgetItem,
+    QLineEdit,
 )

-from bec_widgets.utils.bec_dispatcher import BECDispatcher
 from bec_widgets.utils.yaml_dialog import load_yaml, save_yaml
 from bec_widgets.validation import MonitorConfigValidator
+from pydantic import ValidationError
+from qtpy.QtWidgets import QApplication, QMessageBox
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
+

 current_path = os.path.dirname(__file__)
 Ui_Form, BaseClass = uic.loadUiType(os.path.join(current_path, "config_dialog.ui"))
@@ -113,7 +114,10 @@ CONFIG_SCAN_MODE = {
                "sources": [
                    {
                        "type": "scan_segment",
-                        "signals": {"x": [{"name": "samy"}], "y": [{"name": "gauss_adc2"}]},
+                        "signals": {
+                            "x": [{"name": "samy"}],
+                            "y": [{"name": "gauss_adc2"}],
+                        },
                    }
                ],
            },
@@ -169,7 +173,12 @@ CONFIG_SCAN_MODE = {
 class ConfigDialog(QWidget, Ui_Form):
    config_updated = pyqtSignal(dict)

-    def __init__(self, client=None, default_config=None, skip_validation: bool = False):
+    def __init__(
+        self,
+        client=None,
+        default_config=None,
+        skip_validation: bool = False,
+    ):
        super(ConfigDialog, self).__init__()
        self.setupUi(self)

@@ -378,7 +387,15 @@ class ConfigDialog(QWidget, Ui_Form):
            "plot_name": self.safe_text(ui.lineEdit_plot_title),
            "x_label": self.safe_text(ui.lineEdit_x_label),
            "y_label": self.safe_text(ui.lineEdit_y_label),
-            "sources": [{"type": "scan_segment", "signals": {"x": x_signals, "y": y_signals}}],
+            "sources": [
+                {
+                    "type": "scan_segment",
+                    "signals": {
+                        "x": x_signals,
+                        "y": y_signals,
+                    },
+                }
+            ],
        }

        return plot_data
--- a/bec_widgets/widgets/monitor/monitor.py
+++ b/bec_widgets/widgets/monitor/monitor.py
@@ -11,9 +11,8 @@ from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QApplication, QMessageBox

 from bec_widgets.utils import Colors, Crosshair, yaml_dialog
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
 from bec_widgets.validation import MonitorConfigValidator
-from bec_widgets.widgets.monitor.config_dialog import ConfigDialog
+from bec_widgets.utils.bec_dispatcher import BECDispatcher

 # just for demonstration purposes if script run directly
 CONFIG_SCAN_MODE = {
@@ -60,7 +59,10 @@ CONFIG_SCAN_MODE = {
                "sources": [
                    {
                        "type": "scan_segment",
-                        "signals": {"x": [{"name": "samy"}], "y": [{"name": "bpm4i"}]},
+                        "signals": {
+                            "x": [{"name": "samy"}],
+                            "y": [{"name": "bpm4i"}],
+                        },
                    }
                ],
            },
@@ -135,7 +137,7 @@ CONFIG_WRONG = {
                },
                {
                    "type": "history",
-                    "scan_id": "<scan_id>",
+                    "scanID": "<scanID>",
                    "signals": {
                        "x": [{"name": "samy"}],
                        "y": [{"name": "bpm4i", "entry": "bpm4i"}],
@@ -168,8 +170,11 @@ CONFIG_WRONG = {
                {
                    "signals": {
                        "x": [{"name": "samx", "entry": "samx"}],
-                        "y": [{"name": "samx"}, {"name": "samy", "entry": "samx"}],
-                    }
+                        "y": [
+                            {"name": "samx"},
+                            {"name": "samy", "entry": "samx"},
+                        ],
+                    },
                }
            ],
        },
@@ -310,7 +315,7 @@ class BECMonitor(pg.GraphicsLayoutWidget):
        self.plots = None
        self.curves_data = None
        self.grid_coordinates = None
-        self.scan_id = None
+        self.scanID = None

        # TODO make colors accessible to users
        self.user_colors = {}  # key: (plot_name, y_name, y_entry), value: color
@@ -347,7 +352,7 @@ class BECMonitor(pg.GraphicsLayoutWidget):
        # Initialize the UI
        self._init_ui(self.plot_settings["num_columns"])

-        if self.scan_id is not None:
+        if self.scanID is not None:
            self.replot_last_scan()

    def _init_database(self, plot_data_config: dict, source_type_to_init=None) -> dict:
@@ -597,6 +602,7 @@ class BECMonitor(pg.GraphicsLayoutWidget):

    def show_config_dialog(self):
        """Show the configuration dialog."""
+        from bec_widgets.widgets import ConfigDialog

        dialog = ConfigDialog(
            client=self.client, default_config=self.config, skip_validation=self.skip_validation
@@ -723,11 +729,11 @@ class BECMonitor(pg.GraphicsLayoutWidget):
            msg (dict): Message received with scan data.
            metadata (dict): Metadata of the scan.
        """
-        current_scan_id = msg.get("scan_id", None)
-        if current_scan_id is None:
+        current_scanID = msg.get("scanID", None)
+        if current_scanID is None:
            return

-        if current_scan_id != self.scan_id:
+        if current_scanID != self.scanID:
            if self.scan_types is False:
                self.plot_data = self.plot_data_config
            elif self.scan_types is True:
@@ -747,10 +753,10 @@ class BECMonitor(pg.GraphicsLayoutWidget):
                # Init UI
                self._init_ui(self.plot_settings["num_columns"])

-            self.scan_id = current_scan_id
-            self.scan_data = self.queue.scan_storage.find_scan_by_ID(self.scan_id)
+            self.scanID = current_scanID
+            self.scan_data = self.queue.scan_storage.find_scan_by_ID(self.scanID)
            if not self.scan_data:
-                print(f"No data found for scan_id: {self.scan_id}")  # TODO better error
+                print(f"No data found for scanID: {self.scanID}")  # TODO better error
                return
            self.flush(source_type_to_flush="scan_segment")

@@ -760,7 +766,7 @@ class BECMonitor(pg.GraphicsLayoutWidget):

    def scan_segment_update(self):
        """
-        Update the database with data from scan storage based on the provided scan_id.
+        Update the database with data from scan storage based on the provided scanID.
        """
        scan_data = self.scan_data.data
        for device_name, device_entries in self.database.get("scan_segment", {}).items():
@@ -834,7 +840,11 @@ if __name__ == "__main__":  # pragma: no cover
    client = BECDispatcher().client
    client.start()
    app = QApplication(sys.argv)
-    monitor = BECMonitor(config=config, gui_id=args.id, skip_validation=False)
+    monitor = BECMonitor(
+        config=config,
+        gui_id=args.id,
+        skip_validation=False,
+    )
    monitor.show()
    # just to test redis data
    # redis_data = {
--- a/bec_widgets/widgets/monitor_scatter_2D/init.py
+++ b/bec_widgets/widgets/monitor_scatter_2D/init.py
@@ -0,0 +1 @@
+from .monitor_scatter_2D import BECMonitor2DScatter
--- a/bec_widgets/widgets/monitor_scatter_2D/monitor_scatter_2D.py
+++ b/bec_widgets/widgets/monitor_scatter_2D/monitor_scatter_2D.py
@@ -0,0 +1,382 @@
+# pylint: disable = no-name-in-module,missing-module-docstring
+import time
+from collections import defaultdict
+
+import numpy as np
+import pyqtgraph as pg
+from qtpy.QtCore import Signal as pyqtSignal
+from qtpy.QtCore import Slot as pyqtSlot
+from qtpy.QtWidgets import QApplication
+from qtpy.QtWidgets import QVBoxLayout, QWidget
+
+from bec_lib import MessageEndpoints
+from bec_widgets.utils import yaml_dialog
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
+
+CONFIG_DEFAULT = {
+    "plot_settings": {
+        "colormap": "CET-L4",
+        "num_columns": 1,
+    },
+    "waveform2D": [
+        {
+            "plot_name": "Waveform 2D Scatter (1)",
+            "x_label": "Sam X",
+            "y_label": "Sam Y",
+            "signals": {
+                "x": [{"name": "samx", "entry": "samx"}],
+                "y": [{"name": "samy", "entry": "samy"}],
+                "z": [{"name": "gauss_bpm", "entry": "gauss_bpm"}],
+            },
+        },
+        {
+            "plot_name": "Waveform 2D Scatter (2)",
+            "x_label": "Sam Y",
+            "y_label": "Sam X",
+            "signals": {
+                "x": [{"name": "samy", "entry": "samy"}],
+                "y": [{"name": "samx", "entry": "samx"}],
+                "z": [{"name": "gauss_bpm", "entry": "gauss_bpm"}],
+            },
+        },
+    ],
+}
+
+
+class BECMonitor2DScatter(QWidget):
+    update_signal = pyqtSignal()
+
+    def __init__(
+        self,
+        parent=None,
+        client=None,
+        config: dict = None,
+        enable_crosshair: bool = True,
+        gui_id=None,
+        skip_validation: bool = True,
+        toolbar_enabled=True,
+    ):
+        super().__init__(parent=parent)
+
+        # Client and device manager from BEC
+        self.plot_data = None
+        bec_dispatcher = BECDispatcher()
+        self.client = bec_dispatcher.client if client is None else client
+        self.dev = self.client.device_manager.devices
+        self.queue = self.client.queue
+
+        self.validator = None  # TODO implement validator when ready
+        self.gui_id = gui_id
+
+        if self.gui_id is None:
+            self.gui_id = self.__class__.__name__ + str(time.time())
+
+        # Connect dispatcher slots #TODO connect endpoints related to CLI
+        bec_dispatcher.connect_slot(self.on_scan_segment, MessageEndpoints.scan_segment())
+
+        # Config related variables
+        self.plot_data = None
+        self.plot_settings = None
+        self.num_columns = None
+        self.database = {}
+        self.plots = {}
+        self.grid_coordinates = []
+
+        self.curves_data = {}
+        # Current configuration
+        self.config = config
+        self.skip_validation = skip_validation
+
+        # Enable crosshair
+        self.enable_crosshair = enable_crosshair
+
+        # Displayed Data
+        self.database = {}
+
+        self.crosshairs = None
+        self.plots = None
+        self.curves_data = None
+        self.grid_coordinates = None
+        self.scanID = None
+
+        # Connect the update signal to the update plot method
+        self.proxy_update_plot = pg.SignalProxy(
+            self.update_signal, rateLimit=10, slot=self.update_plot
+        )
+
+        # Init UI
+        self.layout = QVBoxLayout(self)
+        self.setLayout(self.layout)
+        if toolbar_enabled:  # TODO implement toolbar when ready
+            self._init_toolbar()
+
+        self.glw = pg.GraphicsLayoutWidget()
+        self.layout.addWidget(self.glw)
+
+        if self.config is None:
+            print("No initial config found for BECDeviceMonitor")
+        else:
+            self.on_config_update(self.config)
+
+    def _init_toolbar(self):
+        """Initialize the toolbar."""
+        # TODO implement toolbar when ready
+        # from bec_widgets.widgets import ModularToolBar
+        #
+        # # Create and configure the toolbar
+        # self.toolbar = ModularToolBar(self)
+        #
+        # # Add the toolbar to the layout
+        # self.layout.addWidget(self.toolbar)
+
+    def _init_config(self):
+        """Initialize the configuration."""
+        # Global widget settings
+        self._get_global_settings()
+
+        # Plot data
+        self.plot_data = self.config.get("waveform2D", [])
+
+        # Initiate database
+        self.database = self._init_database()
+
+        # Initialize the plot UI
+        self._init_ui()
+
+    def _get_global_settings(self):
+        """Get the global widget settings."""
+
+        self.plot_settings = self.config.get("plot_settings", {})
+
+        self.num_columns = self.plot_settings.get("num_columns", 1)
+        self.colormap = self.plot_settings.get("colormap", "viridis")
+
+    def _init_database(self) -> dict:
+        """
+        Initialize the database to store the data for each plot.
+        Returns:
+            dict: The database.
+        """
+
+        database = defaultdict(lambda: defaultdict(lambda: defaultdict(list)))
+
+        return database
+
+    def _init_ui(self, num_columns: int = 3) -> None:
+        """
+        Initialize the UI components, create plots and store their grid positions.
+
+        Args:
+            num_columns (int): Number of columns to wrap the layout.
+
+        This method initializes a dictionary `self.plots` to store the plot objects
+        along with their corresponding x and y signal names. It dynamically arranges
+        the plots in a grid layout based on the given number of columns and dynamically
+        stretches the last plots to fit the remaining space.
+        """
+        self.glw.clear()
+        self.plots = {}
+        self.imageItems = {}
+        self.grid_coordinates = []
+        self.scatterPlots = {}
+        self.colorBars = {}
+
+        num_plots = len(self.plot_data)
+        # Check if num_columns exceeds the number of plots
+        if num_columns >= num_plots:
+            num_columns = num_plots
+            self.plot_settings["num_columns"] = num_columns  # Update the settings
+            print(
+                "Warning: num_columns in the YAML file was greater than the number of plots."
+                f" Resetting num_columns to number of plots:{num_columns}."
+            )
+        else:
+            self.plot_settings["num_columns"] = num_columns  # Update the settings
+
+        num_rows = num_plots // num_columns
+        last_row_cols = num_plots % num_columns
+        remaining_space = num_columns - last_row_cols
+
+        for i, plot_config in enumerate(self.plot_data):
+            row, col = i // num_columns, i % num_columns
+            colspan = 1
+
+            if row == num_rows and remaining_space > 0:
+                if last_row_cols == 1:
+                    colspan = num_columns
+                else:
+                    colspan = remaining_space // last_row_cols + 1
+                    remaining_space -= colspan - 1
+                    last_row_cols -= 1
+
+            plot_name = plot_config.get("plot_name", "")
+
+            x_label = plot_config.get("x_label", "")
+            y_label = plot_config.get("y_label", "")
+
+            plot = self.glw.addPlot(row=row, col=col, colspan=colspan, title=plot_name)
+            plot.setLabel("bottom", x_label)
+            plot.setLabel("left", y_label)
+            plot.addLegend()
+
+            self.plots[plot_name] = plot
+
+            self.grid_coordinates.append((row, col))
+
+        self._init_curves()
+
+    def _init_curves(self):
+        """Init scatter plot pg containers"""
+        self.scatterPlots = {}
+        for i, plot_config in enumerate(self.plot_data):
+            plot_name = plot_config.get("plot_name", "")
+            plot = self.plots[plot_name]
+            plot.clear()
+
+            # Create ScatterPlotItem for each plot
+            scatterPlot = pg.ScatterPlotItem(size=10)
+            plot.addItem(scatterPlot)
+            self.scatterPlots[plot_name] = scatterPlot
+
+    @pyqtSlot(dict)
+    def on_config_update(self, config: dict):
+        """
+        Validate and update the configuration settings.
+        Args:
+            config(dict): Configuration settings
+        """
+        # TODO implement BEC CLI commands similar to BECPlotter
+        # convert config from BEC CLI to correct formatting
+        config_tag = config.get("config", None)
+        if config_tag is not None:
+            config = config["config"]
+
+        if self.skip_validation is True:
+            self.config = config
+            self._init_config()
+
+        else:  # TODO implement validator
+            print("Do validation")
+
+    def flush(self):
+        """Reset current plot"""
+
+        self.database = self._init_database()
+        self._init_curves()
+
+    @pyqtSlot(dict, dict)
+    def on_scan_segment(self, msg, metadata):
+        """
+        Handle new scan segments and saves data to a dictionary. Linked through bec_dispatcher.
+
+        Args:
+            msg (dict): Message received with scan data.
+            metadata (dict): Metadata of the scan.
+        """
+
+        # TODO check if this is correct
+        current_scanID = msg.get("scanID", None)
+        if current_scanID is None:
+            return
+
+        if current_scanID != self.scanID:
+            self.scanID = current_scanID
+            self.scan_data = self.queue.scan_storage.find_scan_by_ID(self.scanID)
+            if not self.scan_data:
+                print(f"No data found for scanID: {self.scanID}")  # TODO better error
+                return
+            self.flush()
+
+        # Update the database with new data
+        self.update_database_with_scan_data(msg)
+
+        # Emit signal to update plot #TODO could be moved to update_database_with_scan_data just for coresponding plot name
+        self.update_signal.emit()
+
+    def update_database_with_scan_data(self, msg):
+        """
+        Update the database with data from the new scan segment.
+
+        Args:
+            msg (dict): Message containing the new scan data.
+        """
+        data = msg.get("data", {})
+        for plot_config in self.plot_data:  # Iterate over the list
+            plot_name = plot_config["plot_name"]
+            x_signal = plot_config["signals"]["x"][0]["name"]
+            y_signal = plot_config["signals"]["y"][0]["name"]
+            z_signal = plot_config["signals"]["z"][0]["name"]
+
+            if x_signal in data and y_signal in data and z_signal in data:
+                x_value = data[x_signal][x_signal]["value"]
+                y_value = data[y_signal][y_signal]["value"]
+                z_value = data[z_signal][z_signal]["value"]
+
+                # Update database for the corresponding plot
+                self.database[plot_name]["x"][x_signal].append(x_value)
+                self.database[plot_name]["y"][y_signal].append(y_value)
+                self.database[plot_name]["z"][z_signal].append(z_value)
+
+    def update_plot(self):
+        """
+        Update the plots with the latest data from the database.
+        """
+        for plot_name, scatterPlot in self.scatterPlots.items():
+            x_data = self.database[plot_name]["x"]
+            y_data = self.database[plot_name]["y"]
+            z_data = self.database[plot_name]["z"]
+
+            if x_data and y_data and z_data:
+                # Extract values for each axis
+                x_values = next(iter(x_data.values()), [])
+                y_values = next(iter(y_data.values()), [])
+                z_values = next(iter(z_data.values()), [])
+
+                # Check if the data lists are not empty
+                if x_values and y_values and z_values:
+                    # Normalize z_values for color mapping
+                    z_min, z_max = np.min(z_values), np.max(z_values)
+                    if z_max != z_min:  # Ensure that there is a range in the z values
+                        z_values_norm = (z_values - z_min) / (z_max - z_min)
+                        colormap = pg.colormap.get(
+                            self.colormap
+                        )  # using colormap from global settings
+                        colors = [colormap.map(z) for z in z_values_norm]
+
+                        # Update scatter plot data with colors
+                        scatterPlot.setData(x=x_values, y=y_values, brush=colors)
+                    else:
+                        # Handle case where all z values are the same (e.g., avoid division by zero)
+                        scatterPlot.setData(x=x_values, y=y_values)  # Default brush can be used
+
+
+if __name__ == "__main__":  # pragma: no cover
+    import argparse
+    import json
+    import sys
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--config_file", help="Path to the config file.")
+    parser.add_argument("--config", help="Path to the config file.")
+    parser.add_argument("--id", help="GUI ID.")
+    args = parser.parse_args()
+
+    if args.config is not None:
+        # Load config from file
+        config = json.loads(args.config)
+    elif args.config_file is not None:
+        # Load config from file
+        config = yaml_dialog.load_yaml(args.config_file)
+    else:
+        config = CONFIG_DEFAULT
+
+    client = BECDispatcher().client
+    client.start()
+    app = QApplication(sys.argv)
+    monitor = BECMonitor2DScatter(
+        config=config,
+        gui_id=args.id,
+        skip_validation=True,
+    )
+    monitor.show()
+    sys.exit(app.exec())
--- a/bec_widgets/widgets/motor_control/init.py
+++ b/bec_widgets/widgets/motor_control/init.py
@@ -1,7 +1,7 @@
 from .motor_control import (
-    MotorControlAbsolute,
    MotorControlRelative,
+    MotorControlAbsolute,
    MotorControlSelection,
-    MotorCoordinateTable,
    MotorThread,
+    MotorCoordinateTable,
 )
--- a/bec_widgets/widgets/motor_control/motor_control.py
+++ b/bec_widgets/widgets/motor_control/motor_control.py
@@ -2,26 +2,25 @@
 import os
 from enum import Enum

-from bec_lib.alarm_handler import AlarmBase
-from bec_lib.device import Positioner
 from qtpy import uic
-from qtpy.QtCore import Qt, QThread
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtGui import QDoubleValidator, QKeySequence
+from qtpy.QtCore import QThread, Slot as pyqtSlot
+from qtpy.QtCore import Signal as pyqtSignal, Qt
+from qtpy.QtGui import QKeySequence, QDoubleValidator
+from qtpy.QtWidgets import QMessageBox
 from qtpy.QtWidgets import (
-    QCheckBox,
    QComboBox,
+    QWidget,
    QDoubleSpinBox,
-    QLineEdit,
-    QMessageBox,
-    QPushButton,
    QShortcut,
    QTableWidget,
+    QPushButton,
    QTableWidgetItem,
-    QWidget,
+    QCheckBox,
+    QLineEdit,
 )

+from bec_lib.alarm_handler import AlarmBase
+from bec_lib.device import Positioner
 from bec_widgets.utils.bec_dispatcher import BECDispatcher

 CONFIG_DEFAULT = {
@@ -46,9 +45,6 @@ class MotorControlWidget(QWidget):
        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
--- a/bec_widgets/widgets/motor_map/motor_map.py
+++ b/bec_widgets/widgets/motor_map/motor_map.py
@@ -7,13 +7,14 @@ from typing import Any, Union
 import numpy as np
 import pyqtgraph as pg
 from bec_lib import MessageEndpoints
-from qtpy import QtCore, QtGui
+from qtpy import QtCore
+from qtpy import QtGui
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QApplication

-from bec_widgets.utils.bec_dispatcher import BECDispatcher
 from bec_widgets.utils.yaml_dialog import load_yaml
+from bec_widgets.utils.bec_dispatcher import BECDispatcher

 CONFIG_DEFAULT = {
    "plot_settings": {
@@ -214,7 +215,11 @@ class MotorMap(pg.GraphicsLayoutWidget):
            endpoints.append(MessageEndpoints.device_readback(motor))

        # Connect all topics to a single slot
-        bec_dispatcher.connect_slot(self.on_device_readback, endpoints)
+        bec_dispatcher.connect_slot(
+            self.on_device_readback,
+            endpoints,
+            single_callback_for_all_topics=True,
+        )

    def _add_limits_to_plot_data(self):
        """
@@ -488,7 +493,11 @@ class MotorMap(pg.GraphicsLayoutWidget):

                # Update the scatter plot
                self.curves_data[plot_name]["pos"].setData(
-                    x=motor_x_data, y=motor_y_data, brush=brushes, pen=None, size=self.scatter_size
+                    x=motor_x_data,
+                    y=motor_y_data,
+                    brush=brushes,
+                    pen=None,
+                    size=self.scatter_size,
                )

                # Get last know position for crosshair
@@ -588,7 +597,11 @@ if __name__ == "__main__":  # pragma: no cover
    client = BECDispatcher().client
    client.start()
    app = QApplication(sys.argv)
-    motor_map = MotorMap(config=config, gui_id=args.id, skip_validation=True)
+    motor_map = MotorMap(
+        config=config,
+        gui_id=args.id,
+        skip_validation=True,
+    )
    motor_map.show()

    sys.exit(app.exec())
--- a/bec_widgets/widgets/plots/init.py
+++ b/bec_widgets/widgets/plots/init.py
@@ -1,4 +1,2 @@
-from .image import BECImageItem, BECImageShow, ImageItemConfig
-from .motor_map import BECMotorMap, MotorMapConfig
-from .plot_base import AxisConfig, BECPlotBase, SubplotConfig
-from .waveform import BECCurve, BECWaveform, Waveform1DConfig
+from .plot_base import AxisConfig, WidgetConfig, BECPlotBase
+from .waveform1d import Waveform1DConfig, BECWaveform1D, BECCurve
--- a/bec_widgets/widgets/plots/image.py
+++ b/bec_widgets/widgets/plots/image.py
@@ -1,970 +0,0 @@
-from __future__ import annotations
-
-from collections import defaultdict
-from typing import Any, Literal, Optional
-
-import numpy as np
-import pyqtgraph as pg
-from bec_lib import MessageEndpoints
-from pydantic import BaseModel, Field, ValidationError
-from qtpy.QtCore import QObject, QThread
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtWidgets import QWidget
-
-from bec_widgets.utils import BECConnector, ConnectionConfig, EntryValidator
-
-from .plot_base import BECPlotBase, SubplotConfig
-
-
-class ProcessingConfig(BaseModel):
-    fft: Optional[bool] = Field(False, description="Whether to perform FFT on the monitor data.")
-    log: Optional[bool] = Field(False, description="Whether to perform log on the monitor data.")
-    center_of_mass: Optional[bool] = Field(
-        False, description="Whether to calculate the center of mass of the monitor data."
-    )
-    transpose: Optional[bool] = Field(
-        False, description="Whether to transpose the monitor data before displaying."
-    )
-    rotation: Optional[int] = Field(
-        None, description="The rotation angle of the monitor data before displaying."
-    )
-
-
-class ImageItemConfig(ConnectionConfig):
-    parent_id: Optional[str] = Field(None, description="The parent plot of the image.")
-    monitor: Optional[str] = Field(None, description="The name of the monitor.")
-    source: Optional[str] = Field(None, description="The source of the curve.")
-    color_map: Optional[str] = Field("magma", description="The color map of the image.")
-    downsample: Optional[bool] = Field(True, description="Whether to downsample the image.")
-    opacity: Optional[float] = Field(1.0, description="The opacity of the image.")
-    vrange: Optional[tuple[int, int]] = Field(
-        None, description="The range of the color bar. If None, the range is automatically set."
-    )
-    color_bar: Optional[Literal["simple", "full"]] = Field(
-        "simple", description="The type of the color bar."
-    )
-    autorange: Optional[bool] = Field(True, description="Whether to autorange the color bar.")
-    processing: ProcessingConfig = Field(
-        default_factory=ProcessingConfig, description="The post processing of the image."
-    )
-
-
-class ImageConfig(SubplotConfig):
-    images: dict[str, ImageItemConfig] = Field(
-        {},
-        description="The configuration of the images. The key is the name of the image (source).",
-    )
-
-
-class BECImageItem(BECConnector, pg.ImageItem):
-    USER_ACCESS = [
-        "rpc_id",
-        "config_dict",
-        "set",
-        "set_fft",
-        "set_log",
-        "set_rotation",
-        "set_transpose",
-        "set_opacity",
-        "set_autorange",
-        "set_color_map",
-        "set_auto_downsample",
-        "set_monitor",
-        "set_vrange",
-        "get_data",
-    ]
-
-    def __init__(
-        self,
-        config: Optional[ImageItemConfig] = None,
-        gui_id: Optional[str] = None,
-        parent_image: Optional[BECImageItem] = None,
-        **kwargs,
-    ):
-        if config is None:
-            config = ImageItemConfig(widget_class=self.__class__.__name__)
-            self.config = config
-        else:
-            self.config = config
-        super().__init__(config=config, gui_id=gui_id)
-        pg.ImageItem.__init__(self)
-
-        self.parent_image = parent_image
-        self.colorbar_bar = None
-
-        self._add_color_bar(
-            self.config.color_bar, self.config.vrange
-        )  # TODO can also support None to not have any colorbar
-        self.apply_config()
-        if kwargs:
-            self.set(**kwargs)
-
-    def apply_config(self):
-        """
-        Apply current configuration.
-        """
-        self.set_color_map(self.config.color_map)
-        self.set_auto_downsample(self.config.downsample)
-        if self.config.vrange is not None:
-            self.set_vrange(vrange=self.config.vrange)
-
-    def set(self, **kwargs):
-        """
-        Set the properties of the image.
-
-        Args:
-            **kwargs: Keyword arguments for the properties to be set.
-
-        Possible properties:
-            - downsample
-            - color_map
-            - monitor
-            - opacity
-            - vrange
-            - fft
-            - log
-            - rot
-            - transpose
-        """
-        method_map = {
-            "downsample": self.set_auto_downsample,
-            "color_map": self.set_color_map,
-            "monitor": self.set_monitor,
-            "opacity": self.set_opacity,
-            "vrange": self.set_vrange,
-            "fft": self.set_fft,
-            "log": self.set_log,
-            "rot": self.set_rotation,
-            "transpose": self.set_transpose,
-        }
-        for key, value in kwargs.items():
-            if key in method_map:
-                method_map[key](value)
-            else:
-                print(f"Warning: '{key}' is not a recognized property.")
-
-    def set_fft(self, enable: bool = False):
-        """
-        Set the FFT of the image.
-
-        Args:
-            enable(bool): Whether to perform FFT on the monitor data.
-        """
-        self.config.processing.fft = enable
-
-    def set_log(self, enable: bool = False):
-        """
-        Set the log of the image.
-
-        Args:
-            enable(bool): Whether to perform log on the monitor data.
-        """
-        self.config.processing.log = enable
-        if enable and self.color_bar and self.config.color_bar == "full":
-            self.color_bar.autoHistogramRange()
-
-    def set_rotation(self, deg_90: int = 0):
-        """
-        Set the rotation of the image.
-
-        Args:
-            deg_90(int): The rotation angle of the monitor data before displaying.
-        """
-        self.config.processing.rotation = deg_90
-
-    def set_transpose(self, enable: bool = False):
-        """
-        Set the transpose of the image.
-
-        Args:
-            enable(bool): Whether to transpose the image.
-        """
-        self.config.processing.transpose = enable
-
-    def set_opacity(self, opacity: float = 1.0):
-        """
-        Set the opacity of the image.
-
-        Args:
-            opacity(float): The opacity of the image.
-        """
-        self.setOpacity(opacity)
-        self.config.opacity = opacity
-
-    def set_autorange(self, autorange: bool = False):
-        """
-        Set the autorange of the color bar.
-
-        Args:
-            autorange(bool): Whether to autorange the color bar.
-        """
-        self.config.autorange = autorange
-        if self.color_bar is not None:
-            self.color_bar.autoHistogramRange()
-
-    def set_color_map(self, cmap: str = "magma"):
-        """
-        Set the color map of the image.
-
-        Args:
-            cmap(str): The color map of the image.
-        """
-        self.setColorMap(cmap)
-        if self.color_bar is not None:
-            if self.config.color_bar == "simple":
-                self.color_bar.setColorMap(cmap)
-            elif self.config.color_bar == "full":
-                self.color_bar.gradient.loadPreset(cmap)
-        self.config.color_map = cmap
-
-    def set_auto_downsample(self, auto: bool = True):
-        """
-        Set the auto downsample of the image.
-
-        Args:
-            auto(bool): Whether to downsample the image.
-        """
-        self.setAutoDownsample(auto)
-        self.config.downsample = auto
-
-    def set_monitor(self, monitor: str):
-        """
-        Set the monitor of the image.
-
-        Args:
-            monitor(str): The name of the monitor.
-        """
-        self.config.monitor = monitor
-
-    def set_vrange(self, vmin: float = None, vmax: float = None, vrange: tuple[int, int] = None):
-        """
-        Set the range of the color bar.
-
-        Args:
-            vmin(float): Minimum value of the color bar.
-            vmax(float): Maximum value of the color bar.
-        """
-        if vrange is not None:
-            vmin, vmax = vrange
-        self.setLevels([vmin, vmax])
-        self.config.vrange = (vmin, vmax)
-        self.config.autorange = False
-        if self.color_bar is not None:
-            if self.config.color_bar == "simple":
-                self.color_bar.setLevels(low=vmin, high=vmax)
-            elif self.config.color_bar == "full":
-                self.color_bar.setLevels(min=vmin, max=vmax)
-                self.color_bar.setHistogramRange(vmin - 0.1 * vmin, vmax + 0.1 * vmax)
-
-    def get_data(self) -> np.ndarray:
-        """
-        Get the data of the image.
-        Returns:
-            np.ndarray: The data of the image.
-        """
-        return self.image
-
-    def _add_color_bar(
-        self, color_bar_style: str = "simple", vrange: Optional[tuple[int, int]] = None
-    ):
-        """
-        Add color bar to the layout.
-
-        Args:
-            style(Literal["simple,full"]): The style of the color bar.
-            vrange(tuple[int,int]): The range of the color bar.
-        """
-        if color_bar_style == "simple":
-            self.color_bar = pg.ColorBarItem(colorMap=self.config.color_map)
-            if vrange is not None:
-                self.color_bar.setLevels(low=vrange[0], high=vrange[1])
-            self.color_bar.setImageItem(self)
-            self.parent_image.addItem(self.color_bar)  # , row=0, col=1)
-            self.config.color_bar = "simple"
-        elif color_bar_style == "full":
-            # Setting histogram
-            self.color_bar = pg.HistogramLUTItem()
-            self.color_bar.setImageItem(self)
-            self.color_bar.gradient.loadPreset(self.config.color_map)
-            if vrange is not None:
-                self.color_bar.setLevels(min=vrange[0], max=vrange[1])
-                self.color_bar.setHistogramRange(
-                    vrange[0] - 0.1 * vrange[0], vrange[1] + 0.1 * vrange[1]
-                )
-
-            # Adding histogram to the layout
-            self.parent_image.addItem(self.color_bar)  # , row=0, col=1)
-
-            # save settings
-            self.config.color_bar = "full"
-        else:
-            raise ValueError("style should be 'simple' or 'full'")
-
-
-class BECImageShow(BECPlotBase):
-    USER_ACCESS = [
-        "rpc_id",
-        "config_dict",
-        "add_image_by_config",
-        "get_image_config",
-        "get_image_dict",
-        "add_monitor_image",
-        "add_custom_image",
-        "set_vrange",
-        "set_color_map",
-        "set_autorange",
-        "set_monitor",
-        "set_processing",
-        "set_image_properties",
-        "set_fft",
-        "set_log",
-        "set_rotation",
-        "set_transpose",
-        "toggle_threading",
-        "set",
-        "set_title",
-        "set_x_label",
-        "set_y_label",
-        "set_x_scale",
-        "set_y_scale",
-        "set_x_lim",
-        "set_y_lim",
-        "set_grid",
-        "lock_aspect_ratio",
-        "plot",
-        "remove",
-        "images",
-    ]
-
-    def __init__(
-        self,
-        parent: Optional[QWidget] = None,
-        parent_figure=None,
-        config: Optional[ImageConfig] = None,
-        client=None,
-        gui_id: Optional[str] = None,
-    ):
-        if config is None:
-            config = ImageConfig(widget_class=self.__class__.__name__)
-        super().__init__(
-            parent=parent, parent_figure=parent_figure, config=config, client=client, gui_id=gui_id
-        )
-        # Get bec shortcuts dev, scans, queue, scan_storage, dap
-        self.get_bec_shortcuts()
-        self.entry_validator = EntryValidator(self.dev)
-        self._images = defaultdict(dict)
-        self.apply_config(self.config)
-        self.processor = ImageProcessor()
-        self.use_threading = False  # TODO WILL be moved to the init method and to figure method
-
-    def _create_thread_worker(self, device: str, image: np.ndarray):
-        thread = QThread()
-        worker = ProcessorWorker(self.processor)
-        worker.moveToThread(thread)
-
-        # Connect signals and slots
-        thread.started.connect(lambda: worker.process_image(device, image))
-        worker.processed.connect(self.update_image)
-        worker.finished.connect(thread.quit)
-        worker.finished.connect(thread.wait)
-        worker.finished.connect(worker.deleteLater)
-        thread.finished.connect(thread.deleteLater)
-
-        thread.start()
-
-    def find_image_by_monitor(self, item_id: str) -> BECImageItem:
-        """
-        Find the widget by its gui_id.
-
-        Args:
-            item_id(str): The gui_id of the widget.
-
-        Returns:
-            BECImageItem: The widget with the given gui_id.
-        """
-        for source, images in self._images.items():
-            for key, value in images.items():
-                if key == item_id and isinstance(value, BECImageItem):
-                    return value
-                elif isinstance(value, dict):
-                    result = self.find_image_by_monitor(item_id)
-                    if result is not None:
-                        return result
-
-    def apply_config(self, config: dict | SubplotConfig):
-        """
-        Apply the configuration to the 1D waveform widget.
-
-        Args:
-            config(dict|SubplotConfig): Configuration settings.
-            replot_last_scan(bool, optional): If True, replot the last scan. Defaults to False.
-        """
-        if isinstance(config, dict):
-            try:
-                config = ImageConfig(**config)
-            except ValidationError as e:
-                print(f"Validation error when applying config to BECImageShow: {e}")
-                return
-        self.config = config
-        self.plot_item.clear()
-
-        self.apply_axis_config()
-        self._images = defaultdict(dict)
-
-        # TODO extend by adding image by config
-
-    def change_gui_id(self, new_gui_id: str):
-        """
-        Change the GUI ID of the image widget and update the parent_id in all associated curves.
-
-        Args:
-            new_gui_id (str): The new GUI ID to be set for the image widget.
-        """
-        self.gui_id = new_gui_id
-        self.config.gui_id = new_gui_id
-
-        for source, images in self._images.items():
-            for id, image_item in images.items():
-                image_item.config.parent_id = new_gui_id
-
-    def add_image_by_config(self, config: ImageItemConfig | dict) -> BECImageItem:
-        """
-        Add an image to the widget by configuration.
-
-        Args:
-            config(ImageItemConfig|dict): The configuration of the image.
-
-        Returns:
-            BECImageItem: The image object.
-        """
-        if isinstance(config, dict):
-            config = ImageItemConfig(**config)
-            config.parent_id = self.gui_id
-        name = config.monitor if config.monitor is not None else config.gui_id
-        image = self._add_image_object(source=config.source, name=name, config=config)
-        return image
-
-    def get_image_config(self, image_id, dict_output: bool = True) -> ImageItemConfig | dict:
-        """
-        Get the configuration of the image.
-
-        Args:
-            image_id(str): The ID of the image.
-            dict_output(bool): Whether to return the configuration as a dictionary. Defaults to True.
-
-        Returns:
-            ImageItemConfig|dict: The configuration of the image.
-        """
-        for source, images in self._images.items():
-            for id, image in images.items():
-                if id == image_id:
-                    if dict_output:
-                        return image.config.dict()
-                    else:
-                        return image.config  # TODO check if this works
-
-    @property
-    def images(self) -> list[BECImageItem]:
-        """
-        Get the list of images.
-        Returns:
-            list[BECImageItem]: The list of images.
-        """
-        images = []
-        for source, images_dict in self._images.items():
-            for id, image in images_dict.items():
-                images.append(image)
-        return images
-
-    @images.setter
-    def images(self, value: dict[str, dict[str, BECImageItem]]):
-        """
-        Set the images from a dictionary.
-
-        Args:
-            value (dict[str, dict[str, BECImageItem]]): The images to set, organized by source and id.
-        """
-        self._images = value
-
-    def get_image_dict(self) -> dict[str, dict[str, BECImageItem]]:
-        """
-        Get all images.
-
-        Returns:
-            dict[str, dict[str, BECImageItem]]: The dictionary of images.
-        """
-        return self._images
-
-    def add_monitor_image(
-        self,
-        monitor: str,
-        color_map: Optional[str] = "magma",
-        color_bar: Optional[Literal["simple", "full"]] = "simple",
-        downsample: Optional[bool] = True,
-        opacity: Optional[float] = 1.0,
-        vrange: Optional[tuple[int, int]] = None,
-        # post_processing: Optional[PostProcessingConfig] = None,
-        **kwargs,
-    ) -> BECImageItem:
-        image_source = "device_monitor"
-
-        image_exits = self._check_image_id(monitor, self._images)
-        if image_exits:
-            raise ValueError(
-                f"Monitor with ID '{monitor}' already exists in widget '{self.gui_id}'."
-            )
-
-        monitor = self.entry_validator.validate_monitor(monitor)
-
-        image_config = ImageItemConfig(
-            widget_class="BECImageItem",
-            parent_id=self.gui_id,
-            color_map=color_map,
-            color_bar=color_bar,
-            downsample=downsample,
-            opacity=opacity,
-            vrange=vrange,
-            # post_processing=post_processing,
-            **kwargs,
-        )
-
-        image = self._add_image_object(source=image_source, name=monitor, config=image_config)
-        self._connect_device_monitor(monitor)
-        return image
-
-    def add_custom_image(
-        self,
-        name: str,
-        data: Optional[np.ndarray] = None,
-        color_map: Optional[str] = "magma",
-        color_bar: Optional[Literal["simple", "full"]] = "simple",
-        downsample: Optional[bool] = True,
-        opacity: Optional[float] = 1.0,
-        vrange: Optional[tuple[int, int]] = None,
-        # post_processing: Optional[PostProcessingConfig] = None,
-        **kwargs,
-    ):
-        image_source = "device_monitor"
-
-        image_exits = self._check_curve_id(name, self._images)
-        if image_exits:
-            raise ValueError(f"Monitor with ID '{name}' already exists in widget '{self.gui_id}'.")
-
-        image_config = ImageItemConfig(
-            widget_class="BECImageItem",
-            parent_id=self.gui_id,
-            monitor=name,
-            color_map=color_map,
-            color_bar=color_bar,
-            downsample=downsample,
-            opacity=opacity,
-            vrange=vrange,
-            # post_processing=post_processing,
-            **kwargs,
-        )
-
-        image = self._add_image_object(source=image_source, config=image_config, data=data)
-        return image
-
-    def apply_setting_to_images(
-        self, setting_method_name: str, args: list, kwargs: dict, image_id: str = None
-    ):
-        """
-        Apply a setting to all images or a specific image by its ID.
-
-        Args:
-            setting_method_name (str): The name of the method to apply (e.g., 'set_color_map').
-            args (list): Positional arguments for the setting method.
-            kwargs (dict): Keyword arguments for the setting method.
-            image_id (str, optional): The ID of the specific image to apply the setting to. If None, applies to all images.
-        """
-        if image_id:
-            image = self.find_image_by_monitor(image_id)
-            if image:
-                getattr(image, setting_method_name)(*args, **kwargs)
-        else:
-            for source, images in self._images.items():
-                for _, image in images.items():
-                    getattr(image, setting_method_name)(*args, **kwargs)
-
-    def set_vrange(self, vmin: float, vmax: float, name: str = None):
-        """
-        Set the range of the color bar.
-        If name is not specified, then set vrange for all images.
-
-        Args:
-            vmin(float): Minimum value of the color bar.
-            vmax(float): Maximum value of the color bar.
-            name(str): The name of the image. If None, apply to all images.
-        """
-        self.apply_setting_to_images("set_vrange", args=[vmin, vmax], kwargs={}, image_id=name)
-
-    def set_color_map(self, cmap: str, name: str = None):
-        """
-        Set the color map of the image.
-        If name is not specified, then set color map for all images.
-
-        Args:
-            cmap(str): The color map of the image.
-            name(str): The name of the image. If None, apply to all images.
-        """
-        self.apply_setting_to_images("set_color_map", args=[cmap], kwargs={}, image_id=name)
-
-    def set_autorange(self, enable: bool = False, name: str = None):
-        """
-        Set the autoscale of the image.
-
-        Args:
-            enable(bool): Whether to autoscale the color bar.
-            name(str): The name of the image. If None, apply to all images.
-        """
-        self.apply_setting_to_images("set_autorange", args=[enable], kwargs={}, image_id=name)
-
-    def set_monitor(self, monitor: str, name: str = None):
-        """
-        Set the monitor of the image.
-        If name is not specified, then set monitor for all images.
-
-        Args:
-            monitor(str): The name of the monitor.
-            name(str): The name of the image. If None, apply to all images.
-        """
-        self.apply_setting_to_images("set_monitor", args=[monitor], kwargs={}, image_id=name)
-
-    def set_processing(self, name: str = None, **kwargs):
-        """
-        Set the post processing of the image.
-        If name is not specified, then set post processing for all images.
-
-        Args:
-            name(str): The name of the image. If None, apply to all images.
-            **kwargs: Keyword arguments for the properties to be set.
-        Possible properties:
-            - fft: bool
-            - log: bool
-            - rot: int
-            - transpose: bool
-        """
-        self.apply_setting_to_images("set", args=[], kwargs=kwargs, image_id=name)
-
-    def set_image_properties(self, name: str = None, **kwargs):
-        """
-        Set the properties of the image.
-
-        Args:
-            name(str): The name of the image. If None, apply to all images.
-            **kwargs: Keyword arguments for the properties to be set.
-        Possible properties:
-            - downsample: bool
-            - color_map: str
-            - monitor: str
-            - opacity: float
-            - vrange: tuple[int,int]
-            - fft: bool
-            - log: bool
-            - rot: int
-            - transpose: bool
-        """
-        self.apply_setting_to_images("set", args=[], kwargs=kwargs, image_id=name)
-
-    def set_fft(self, enable: bool = False, name: str = None):
-        """
-        Set the FFT of the image.
-        If name is not specified, then set FFT for all images.
-
-        Args:
-            enable(bool): Whether to perform FFT on the monitor data.
-            name(str): The name of the image. If None, apply to all images.
-        """
-        self.apply_setting_to_images("set_fft", args=[enable], kwargs={}, image_id=name)
-
-    def set_log(self, enable: bool = False, name: str = None):
-        """
-        Set the log of the image.
-        If name is not specified, then set log for all images.
-
-        Args:
-            enable(bool): Whether to perform log on the monitor data.
-            name(str): The name of the image. If None, apply to all images.
-        """
-        self.apply_setting_to_images("set_log", args=[enable], kwargs={}, image_id=name)
-
-    def set_rotation(self, deg_90: int = 0, name: str = None):
-        """
-        Set the rotation of the image.
-        If name is not specified, then set rotation for all images.
-
-        Args:
-            deg_90(int): The rotation angle of the monitor data before displaying.
-            name(str): The name of the image. If None, apply to all images.
-        """
-        self.apply_setting_to_images("set_rotation", args=[deg_90], kwargs={}, image_id=name)
-
-    def set_transpose(self, enable: bool = False, name: str = None):
-        """
-        Set the transpose of the image.
-        If name is not specified, then set transpose for all images.
-
-        Args:
-            enable(bool): Whether to transpose the monitor data before displaying.
-            name(str): The name of the image. If None, apply to all images.
-        """
-        self.apply_setting_to_images("set_transpose", args=[enable], kwargs={}, image_id=name)
-
-    def toggle_threading(self, use_threading: bool):
-        """
-        Toggle threading for the widgets postprocessing and updating.
-
-        Args:
-            use_threading(bool): Whether to use threading.
-        """
-        self.use_threading = use_threading
-        if self.use_threading is False and self.thread.isRunning():
-            self.cleanup()
-
-    @pyqtSlot(dict)
-    def on_image_update(self, msg: dict):
-        """
-        Update the image of the device monitor from bec.
-
-        Args:
-            msg(dict): The message from bec.
-        """
-        data = msg["data"]
-        device = msg["device"]
-        image_to_update = self._images["device_monitor"][device]
-        processing_config = image_to_update.config.processing
-        self.processor.set_config(processing_config)
-        if self.use_threading:
-            self._create_thread_worker(device, data)
-        else:
-            data = self.processor.process_image(data)
-            self.update_image(device, data)
-
-    @pyqtSlot(str, np.ndarray)
-    def update_image(self, device: str, data: np.ndarray):
-        """
-        Update the image of the device monitor.
-
-        Args:
-            device(str): The name of the device.
-            data(np.ndarray): The data to be updated.
-        """
-        image_to_update = self._images["device_monitor"][device]
-        image_to_update.updateImage(data, autoLevels=image_to_update.config.autorange)
-
-    def _connect_device_monitor(self, monitor: str):
-        """
-        Connect to the device monitor.
-
-        Args:
-            monitor(str): The name of the monitor.
-        """
-        image_item = self.find_image_by_monitor(monitor)
-        try:
-            previous_monitor = image_item.config.monitor
-        except AttributeError:
-            previous_monitor = None
-        if previous_monitor != monitor:
-            if previous_monitor:
-                self.bec_dispatcher.disconnect_slot(
-                    self.on_image_update, MessageEndpoints.device_monitor(previous_monitor)
-                )
-            if monitor:
-                self.bec_dispatcher.connect_slot(
-                    self.on_image_update, MessageEndpoints.device_monitor(monitor)
-                )
-                image_item.set_monitor(monitor)
-
-    def _add_image_object(
-        self, source: str, name: str, config: ImageItemConfig, data=None
-    ) -> BECImageItem:  # TODO fix types
-        config.parent_id = self.gui_id
-        image = BECImageItem(config=config, parent_image=self)
-        self.plot_item.addItem(image)
-        self._images[source][name] = image
-        self.config.images[name] = config
-        if data is not None:
-            image.setImage(data)
-        return image
-
-    def _check_image_id(self, val: Any, dict_to_check: dict) -> bool:
-        """
-        Check if val is in the values of the dict_to_check or in the values of the nested dictionaries.
-
-        Args:
-            val(Any): Value to check.
-            dict_to_check(dict): Dictionary to check.
-
-        Returns:
-            bool: True if val is in the values of the dict_to_check or in the values of the nested dictionaries, False otherwise.
-        """
-        if val in dict_to_check.keys():
-            return True
-        for key in dict_to_check:
-            if isinstance(dict_to_check[key], dict):
-                if self._check_image_id(val, dict_to_check[key]):
-                    return True
-        return False
-
-    def _validate_monitor(self, monitor: str, validate_bec: bool = True):
-        """
-        Validate the monitor name.
-
-        Args:
-            monitor(str): The name of the monitor.
-            validate_bec(bool): Whether to validate the monitor name with BEC.
-
-        Returns:
-            bool: True if the monitor name is valid, False otherwise.
-        """
-        if not monitor or monitor == "":
-            return False
-        if validate_bec:
-            return monitor in self.dev
-        return True
-
-    def cleanup(self):
-        """
-        Clean up the widget.
-        """
-        for monitor in self._images["device_monitor"]:
-            self.bec_dispatcher.disconnect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(monitor)
-            )
-        for image in self.images:
-            image.cleanup()
-
-        super().cleanup()
-
-
-class ImageProcessor:
-    """
-    Class for processing the image data.
-    """
-
-    def __init__(self, config: ProcessingConfig = None):
-        if config is None:
-            config = ProcessingConfig()
-        self.config = config
-
-    def set_config(self, config: ProcessingConfig):
-        """
-        Set the configuration of the processor.
-
-        Args:
-            config(ProcessingConfig): The configuration of the processor.
-        """
-        self.config = config
-
-    def FFT(self, data: np.ndarray) -> np.ndarray:
-        """
-        Perform FFT on the data.
-
-        Args:
-            data(np.ndarray): The data to be processed.
-
-        Returns:
-            np.ndarray: The processed data.
-        """
-        return np.abs(np.fft.fftshift(np.fft.fft2(data)))
-
-    def rotation(self, data: np.ndarray, rotate_90: int) -> np.ndarray:
-        """
-        Rotate the data by 90 degrees n times.
-
-        Args:
-            data(np.ndarray): The data to be processed.
-            rotate_90(int): The number of 90 degree rotations.
-
-        Returns:
-            np.ndarray: The processed data.
-        """
-        return np.rot90(data, k=rotate_90, axes=(0, 1))
-
-    def transpose(self, data: np.ndarray) -> np.ndarray:
-        """
-        Transpose the data.
-
-        Args:
-            data(np.ndarray): The data to be processed.
-
-        Returns:
-            np.ndarray: The processed data.
-        """
-        return np.transpose(data)
-
-    def log(self, data: np.ndarray) -> np.ndarray:
-        """
-        Perform log on the data.
-
-        Args:
-            data(np.ndarray): The data to be processed.
-
-        Returns:
-            np.ndarray: The processed data.
-        """
-        # TODO this is not final solution -> data should stay as int16
-        data = data.astype(np.float32)
-        offset = 1e-6
-        data_offset = data + offset
-        return np.log10(data_offset)
-
-    # def center_of_mass(self, data: np.ndarray) -> tuple:  # TODO check functionality
-    #     return np.unravel_index(np.argmax(data), data.shape)
-
-    def process_image(self, data: np.ndarray) -> np.ndarray:
-        """
-        Process the data according to the configuration.
-
-        Args:
-            data(np.ndarray): The data to be processed.
-
-        Returns:
-            np.ndarray: The processed data.
-        """
-        if self.config.fft:
-            data = self.FFT(data)
-        if self.config.rotation is not None:
-            data = self.rotation(data, self.config.rotation)
-        if self.config.transpose:
-            data = self.transpose(data)
-        if self.config.log:
-            data = self.log(data)
-        return data
-
-
-class ProcessorWorker(QObject):
-    """
-    Worker for processing the image data.
-    """
-
-    processed = pyqtSignal(str, np.ndarray)
-    stopRequested = pyqtSignal()
-    finished = pyqtSignal()
-
-    def __init__(self, processor):
-        super().__init__()
-        self.processor = processor
-        self._isRunning = False
-        self.stopRequested.connect(self.stop)
-
-    @pyqtSlot(str, np.ndarray)
-    def process_image(self, device: str, image: np.ndarray):
-        """
-        Process the image data.
-
-        Args:
-            device(str): The name of the device.
-            image(np.ndarray): The image data.
-        """
-        self._isRunning = True
-        processed_image = self.processor.process_image(image)
-        self._isRunning = False
-        if not self._isRunning:
-            self.processed.emit(device, processed_image)
-            self.finished.emit()
-
-    def stop(self):
-        self._isRunning = False
--- a/bec_widgets/widgets/plots/motor_map.py
+++ b/bec_widgets/widgets/plots/motor_map.py
@@ -1,435 +0,0 @@
-from __future__ import annotations
-
-from collections import defaultdict
-from typing import Optional, Union
-
-import numpy as np
-import pyqtgraph as pg
-from bec_lib import MessageEndpoints
-from pydantic import Field
-from qtpy import QtCore, QtGui
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtWidgets import QWidget
-
-from bec_widgets.utils import EntryValidator
-from bec_widgets.widgets.plots.plot_base import BECPlotBase, SubplotConfig
-from bec_widgets.widgets.plots.waveform import Signal, SignalData
-
-
-class MotorMapConfig(SubplotConfig):
-    signals: Optional[Signal] = Field(None, description="Signals of the motor map")
-    color_map: Optional[str] = Field(
-        "Greys", description="Color scheme of the motor position gradient."
-    )  # TODO decide if useful for anything, or just keep GREYS always
-    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.")
-    num_dim_points: Optional[int] = Field(
-        100,
-        description="Number of points to dim before the color remains same for older recorded position.",
-    )
-    precision: Optional[int] = Field(2, description="Decimal precision of the motor position.")
-    background_value: Optional[int] = Field(
-        25, description="Background value of the motor map."
-    )  # TODO can be percentage from 255 calculated
-
-
-class BECMotorMap(BECPlotBase):
-    USER_ACCESS = [
-        "config_dict",
-        "change_motors",
-        "set_max_points",
-        "set_precision",
-        "set_num_dim_points",
-        "set_background_value",
-        "set_scatter_size",
-        "get_data",
-    ]
-
-    # QT Signals
-    update_signal = pyqtSignal()
-
-    def __init__(
-        self,
-        parent: Optional[QWidget] = None,
-        parent_figure=None,
-        config: Optional[MotorMapConfig] = None,
-        client=None,
-        gui_id: Optional[str] = None,
-    ):
-        if config is None:
-            config = MotorMapConfig(widget_class=self.__class__.__name__)
-        super().__init__(
-            parent=parent, parent_figure=parent_figure, config=config, client=client, gui_id=gui_id
-        )
-
-        # Get bec shortcuts dev, scans, queue, scan_storage, dap
-        self.get_bec_shortcuts()
-        self.entry_validator = EntryValidator(self.dev)
-
-        self.motor_x = None
-        self.motor_y = None
-        self.database_buffer = {"x": [], "y": []}
-        self.plot_components = defaultdict(dict)  # container for plot components
-
-        # connect update signal to update plot
-        self.proxy_update_plot = pg.SignalProxy(
-            self.update_signal, rateLimit=25, slot=self._update_plot
-        )
-
-    # TODO decide if needed to implement, maybe there will be no children widgets for motormap for now...
-    # def find_widget_by_id(self, item_id: str) -> BECCurve:
-    #     """
-    #     Find the curve by its ID.
-    #     Args:
-    #         item_id(str): ID of the curve.
-    #
-    #     Returns:
-    #         BECCurve: The curve object.
-    #     """
-    #     for curve in self.plot_item.curves:
-    #         if curve.gui_id == item_id:
-    #             return curve
-
-    @pyqtSlot(str, str, str, str, bool)
-    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.
-        """
-        motor_x_entry, motor_y_entry = self._validate_signal_entries(
-            motor_x, motor_y, motor_x_entry, motor_y_entry, validate_bec
-        )
-
-        motor_x_limit = self._get_motor_limit(motor_x)
-        motor_y_limit = self._get_motor_limit(motor_y)
-
-        signal = Signal(
-            source="device_readback",
-            x=SignalData(name=motor_x, entry=motor_x_entry, limits=motor_x_limit),
-            y=SignalData(name=motor_y, entry=motor_y_entry, limits=motor_y_limit),
-        )
-        self.config.signals = signal
-
-        # reconnect the signals
-        self._connect_motor_to_slots()
-
-        # Redraw the motor map
-        self._make_motor_map()
-
-    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
-
-    # TODO setup all visual properties
-    def set_max_points(self, max_points: int) -> None:
-        """
-        Set the maximum number of points to display.
-
-        Args:
-            max_points(int): Maximum number of points to display.
-        """
-        self.config.max_points = max_points
-
-    def set_precision(self, precision: int) -> None:
-        """
-        Set the decimal precision of the motor position.
-
-        Args:
-            precision(int): Decimal precision of the motor position.
-        """
-        self.config.precision = precision
-
-    def set_num_dim_points(self, num_dim_points: int) -> None:
-        """
-        Set the number of dim points for the motor map.
-
-        Args:
-            num_dim_points(int): Number of dim points.
-        """
-        self.config.num_dim_points = num_dim_points
-
-    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.
-        """
-        self.config.background_value = background_value
-
-    def set_scatter_size(self, scatter_size: int) -> None:
-        """
-        Set the scatter size of the motor map plot.
-
-        Args:
-            scatter_size(int): Size of the scatter points.
-        """
-        self.config.scatter_size = scatter_size
-
-    def _disconnect_current_motors(self):
-        """Disconnect the current motors from the slots."""
-        if self.motor_x is not None and self.motor_y is not None:
-            endpoints = [
-                MessageEndpoints.device_readback(self.motor_x),
-                MessageEndpoints.device_readback(self.motor_y),
-            ]
-            self.bec_dispatcher.disconnect_slot(self.on_device_readback, endpoints)
-
-    def _connect_motor_to_slots(self):
-        """Connect motors to slots."""
-        self._disconnect_current_motors()
-
-        self.motor_x = self.config.signals.x.name
-        self.motor_y = self.config.signals.y.name
-
-        endpoints = [
-            MessageEndpoints.device_readback(self.motor_x),
-            MessageEndpoints.device_readback(self.motor_y),
-        ]
-
-        self.bec_dispatcher.connect_slot(self.on_device_readback, endpoints)
-
-    def _make_motor_map(self):
-        """
-        Create the motor map plot.
-        """
-        # 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)
-
-        # Create scatter plot
-        scatter_size = self.config.scatter_size
-        self.plot_components["scatter"] = pg.ScatterPlotItem(
-            size=scatter_size, brush=pg.mkBrush(255, 255, 255, 255)
-        )
-        self.plot_item.addItem(self.plot_components["scatter"])
-        self.plot_components["scatter"].setZValue(0)
-
-        # Enable Grid
-        self.set_grid(True, True)
-
-        # Add the crosshair for initial motor coordinates
-        initial_position_x = self._get_motor_init_position(
-            self.motor_x, self.config.signals.x.entry, self.config.precision
-        )
-        initial_position_y = self._get_motor_init_position(
-            self.motor_y, self.config.signals.y.entry, self.config.precision
-        )
-
-        self.database_buffer["x"] = [initial_position_x]
-        self.database_buffer["y"] = [initial_position_y]
-
-        self.plot_components["scatter"].setData([initial_position_x], [initial_position_y])
-        self._add_coordinantes_crosshair(initial_position_x, initial_position_y)
-
-        # Set default labels for the plot
-        self.set(x_label=f"Motor X ({self.motor_x})", y_label=f"Motor Y ({self.motor_y})")
-
-    def _add_coordinantes_crosshair(self, x: float, y: float) -> None:
-        """
-        Add crosshair to the plot to highlight the current position.
-
-        Args:
-            x(float): X coordinate.
-            y(float): Y coordinate.
-        """
-
-        # Crosshair to highlight the current position
-        highlight_H = pg.InfiniteLine(
-            angle=0, movable=False, pen=pg.mkPen(color="r", width=1, style=QtCore.Qt.DashLine)
-        )
-        highlight_V = pg.InfiniteLine(
-            angle=90, movable=False, pen=pg.mkPen(color="r", width=1, style=QtCore.Qt.DashLine)
-        )
-
-        # Add crosshair to the curve list for future referencing
-        self.plot_components["highlight_H"] = highlight_H
-        self.plot_components["highlight_V"] = highlight_V
-
-        # Add crosshair to the plot
-        self.plot_item.addItem(highlight_H)
-        self.plot_item.addItem(highlight_V)
-
-        highlight_V.setPos(x)
-        highlight_H.setPos(y)
-
-    def _make_limit_map(self, limits_x: list, limits_y: list) -> pg.ImageItem:
-        """
-        Create a limit map for the motor map plot.
-
-        Args:
-            limits_x(list): Motor limits for the x axis.
-            limits_y(list): Motor limits for the y axis.
-
-        Returns:
-            pg.ImageItem: Limit map.
-        """
-        limit_x_min, limit_x_max = limits_x
-        limit_y_min, limit_y_max = limits_y
-
-        map_width = int(limit_x_max - limit_x_min + 1)
-        map_height = int(limit_y_max - limit_y_min + 1)
-
-        # Create limits map
-        background_value = self.config.background_value
-        limit_map_data = np.full((map_width, map_height), background_value, dtype=np.float32)
-        limit_map = pg.ImageItem()
-        limit_map.setImage(limit_map_data)
-
-        # Translate and scale the image item to match the motor coordinates
-        tr = QtGui.QTransform()
-        tr.translate(limit_x_min, limit_y_min)
-        limit_map.setTransform(tr)
-
-        return limit_map
-
-    def _get_motor_init_position(self, name: str, entry: str, precision: int) -> float:
-        """
-        Get the motor initial position from the config.
-
-        Args:
-            name(str): Motor name.
-            entry(str): Motor entry.
-            precision(int): Decimal precision of the motor position.
-
-        Returns:
-            float: Motor initial position.
-        """
-        init_position = round(self.dev[name].read()[entry]["value"], precision)
-        return init_position
-
-    def _validate_signal_entries(
-        self,
-        x_name: str,
-        y_name: str,
-        x_entry: str | None,
-        y_entry: str | None,
-        validate_bec: bool = True,
-    ) -> tuple[str, str]:
-        """
-        Validate the signal name and entry.
-
-        Args:
-            x_name(str): Name of the x signal.
-            y_name(str): Name of the y signal.
-            x_entry(str|None): Entry of the x signal.
-            y_entry(str|None): Entry of the y signal.
-            validate_bec(bool, optional): If True, validate the signal with BEC. Defaults to True.
-
-        Returns:
-            tuple[str,str]: Validated x and y entries.
-        """
-        if validate_bec:
-            x_entry = self.entry_validator.validate_signal(x_name, x_entry)
-            y_entry = self.entry_validator.validate_signal(y_name, y_entry)
-        else:
-            x_entry = x_name if x_entry is None else x_entry
-            y_entry = y_name if y_entry is None else y_entry
-        return x_entry, y_entry
-
-    def _get_motor_limit(self, motor: str) -> Union[list | None]:  # TODO check if works correctly
-        """
-        Get the motor limit from the config.
-
-        Args:
-            motor(str): Motor name.
-
-        Returns:
-            float: Motor limit.
-        """
-        try:
-            limits = self.dev[motor].limits
-            if limits == [0, 0]:
-                return None
-            return limits
-        except AttributeError:  # TODO maybe not needed, if no limits it returns [0,0]
-            # If the motor doesn't have a 'limits' attribute, return a default value or raise a custom exception
-            print(f"The device '{motor}' does not have defined limits.")
-            return None
-
-    def _update_plot(self):
-        """Update the motor map plot."""
-        x = self.database_buffer["x"]
-        y = self.database_buffer["y"]
-
-        # Setup gradient brush for history
-        brushes = [pg.mkBrush(50, 50, 50, 255)] * len(x)
-
-        # Calculate the decrement step based on self.num_dim_points
-        num_dim_points = self.config.num_dim_points
-        decrement_step = (255 - 50) / num_dim_points
-        for i in range(1, min(num_dim_points + 1, len(x) + 1)):
-            brightness = max(60, 255 - decrement_step * (i - 1))
-            brushes[-i] = pg.mkBrush(brightness, brightness, brightness, 255)
-        brushes[-1] = pg.mkBrush(255, 255, 255, 255)  # Newest point is always full brightness
-        scatter_size = self.config.scatter_size
-
-        # Update the scatter plot
-        self.plot_components["scatter"].setData(
-            x=x, y=y, brush=brushes, pen=None, size=scatter_size
-        )
-
-        # Get last know position for crosshair
-        current_x = x[-1]
-        current_y = y[-1]
-
-        # Update the crosshair
-        self.plot_components["highlight_V"].setPos(current_x)
-        self.plot_components["highlight_H"].setPos(current_y)
-
-        # TODO not update title but some label
-        # Update plot title
-        precision = self.config.precision
-        self.set_title(
-            f"Motor position: ({round(current_x,precision)}, {round(current_y,precision)})"
-        )
-
-    @pyqtSlot(dict)
-    def on_device_readback(self, msg: dict) -> None:
-        """
-        Update the motor map plot with the new motor position.
-
-        Args:
-            msg(dict): Message from the device readback.
-        """
-        if self.motor_x is None or self.motor_y is None:
-            return
-
-        if self.motor_x in msg["signals"]:
-            x = msg["signals"][self.motor_x]["value"]
-            self.database_buffer["x"].append(x)
-            self.database_buffer["y"].append(self.database_buffer["y"][-1])
-
-        elif self.motor_y in msg["signals"]:
-            y = msg["signals"][self.motor_y]["value"]
-            self.database_buffer["y"].append(y)
-            self.database_buffer["x"].append(self.database_buffer["x"][-1])
-
-        self.update_signal.emit()
-
-    def cleanup(self):
-        """Cleanup the widget."""
-        self._disconnect_current_motors()
-        super().cleanup()
--- a/bec_widgets/widgets/plots/plot_base.py
+++ b/bec_widgets/widgets/plots/plot_base.py
@@ -4,6 +4,7 @@ from typing import Literal, Optional

 import numpy as np
 import pyqtgraph as pg
+
 from pydantic import BaseModel, Field
 from qtpy.QtWidgets import QWidget

@@ -22,7 +23,7 @@ class AxisConfig(BaseModel):
    y_grid: bool = Field(False, description="Show grid on the y-axis.")


-class SubplotConfig(ConnectionConfig):
+class WidgetConfig(ConnectionConfig):
    parent_id: Optional[str] = Field(None, description="The parent figure of the plot.")

    # Coordinates in the figure
@@ -35,9 +36,8 @@ class SubplotConfig(ConnectionConfig):
    )


-class BECPlotBase(BECConnector, pg.GraphicsLayout):
+class BECPlotBase(BECConnector, pg.PlotItem):
    USER_ACCESS = [
-        "config_dict",
        "set",
        "set_title",
        "set_x_label",
@@ -47,8 +47,7 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
        "set_x_lim",
        "set_y_lim",
        "set_grid",
-        "lock_aspect_ratio",
-        "plot",
+        "plot_data",
        "remove",
    ]

@@ -56,27 +55,24 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
        self,
        parent: Optional[QWidget] = None,  # TODO decide if needed for this class
        parent_figure=None,
-        config: Optional[SubplotConfig] = None,
+        config: Optional[WidgetConfig] = None,
        client=None,
        gui_id: Optional[str] = None,
    ):
        if config is None:
-            config = SubplotConfig(widget_class=self.__class__.__name__)
+            config = WidgetConfig(widget_class=self.__class__.__name__)
        super().__init__(client=client, config=config, gui_id=gui_id)
-        pg.GraphicsLayout.__init__(self, parent)
+        pg.PlotItem.__init__(self, parent)

        self.figure = parent_figure
-        self.plot_item = self.addPlot(row=0, col=0)

        self.add_legend()

    def set(self, **kwargs) -> None:
        """
        Set the properties of the plot widget.
-
        Args:
            **kwargs: Keyword arguments for the properties to be set.
-
        Possible properties:
            - title: str
            - x_label: str
@@ -119,51 +115,46 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
    def set_title(self, title: str):
        """
        Set the title of the plot widget.
-
        Args:
            title(str): Title of the plot widget.
        """
-        self.plot_item.setTitle(title)
+        self.setTitle(title)
        self.config.axis.title = title

    def set_x_label(self, label: str):
        """
        Set the label of the x-axis.
-
        Args:
            label(str): Label of the x-axis.
        """
-        self.plot_item.setLabel("bottom", label)
+        self.setLabel("bottom", label)
        self.config.axis.x_label = label

    def set_y_label(self, label: str):
        """
        Set the label of the y-axis.
-
        Args:
            label(str): Label of the y-axis.
        """
-        self.plot_item.setLabel("left", label)
+        self.setLabel("left", label)
        self.config.axis.y_label = label

    def set_x_scale(self, scale: Literal["linear", "log"] = "linear"):
        """
        Set the scale of the x-axis.
-
        Args:
            scale(Literal["linear", "log"]): Scale of the x-axis.
        """
-        self.plot_item.setLogMode(x=(scale == "log"))
+        self.setLogMode(x=(scale == "log"))
        self.config.axis.x_scale = scale

    def set_y_scale(self, scale: Literal["linear", "log"] = "linear"):
        """
        Set the scale of the y-axis.
-
        Args:
            scale(Literal["linear", "log"]): Scale of the y-axis.
        """
-        self.plot_item.setLogMode(y=(scale == "log"))
+        self.setLogMode(y=(scale == "log"))
        self.config.axis.y_scale = scale

    def set_x_lim(self, *args) -> None:
@@ -186,7 +177,7 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
        else:
            raise ValueError("set_x_lim expects either two separate arguments or a single tuple")

-        self.plot_item.setXRange(x_min, x_max)
+        self.setXRange(x_min, x_max)
        self.config.axis.x_lim = (x_min, x_max)

    def set_y_lim(self, *args) -> None:
@@ -209,38 +200,26 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
        else:
            raise ValueError("set_y_lim expects either two separate arguments or a single tuple")

-        self.plot_item.setYRange(y_min, y_max)
+        self.setYRange(y_min, y_max)
        self.config.axis.y_lim = (y_min, y_max)

    def set_grid(self, x: bool = False, y: bool = False):
        """
        Set the grid of the plot widget.
-
        Args:
            x(bool): Show grid on the x-axis.
            y(bool): Show grid on the y-axis.
        """
-        self.plot_item.showGrid(x, y)
+        self.showGrid(x, y)
        self.config.axis.x_grid = x
        self.config.axis.y_grid = y

    def add_legend(self):
-        """Add legend to the plot"""
-        self.plot_item.addLegend()
+        self.addLegend()

-    def lock_aspect_ratio(self, lock):
-        """
-        Lock aspect ratio.
-
-        Args:
-            lock(bool): True to lock, False to unlock.
-        """
-        self.plot_item.setAspectLocked(lock)
-
-    def plot(self, data_x: list | np.ndarray, data_y: list | np.ndarray, **kwargs):
+    def plot_data(self, data_x: list | np.ndarray, data_y: list | np.ndarray, **kwargs):
        """
        Plot custom data on the plot widget. These data are not saved in config.
-
        Args:
            data_x(list|np.ndarray): x-axis data
            data_y(list|np.ndarray): y-axis data
@@ -248,14 +227,12 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
        """
        # TODO very basic so far, add more options
        # TODO decide name of the method
-        self.plot_item.plot(data_x, data_y, **kwargs)
+        self.plot(data_x, data_y, **kwargs)

    def remove(self):
        """Remove the plot widget from the figure."""
        if self.figure is not None:
-            self.cleanup()
            self.figure.remove(widget_id=self.gui_id)

    def cleanup(self):
        """Cleanup the plot widget."""
-        super().cleanup()
--- a/bec_widgets/widgets/plots/waveform1d.py
+++ b/bec_widgets/widgets/plots/waveform1d.py
@@ -1,40 +1,39 @@
 from __future__ import annotations

 from collections import defaultdict
-from typing import Any, Literal, Optional
+from typing import Literal, Optional, Any

 import numpy as np
 import pyqtgraph as pg
-from bec_lib import MessageEndpoints
-from bec_lib.scan_data import ScanData
-from pydantic import BaseModel, Field, ValidationError
+from pydantic import Field, BaseModel, ValidationError
 from pyqtgraph import mkBrush
 from qtpy import QtCore
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QWidget

-from bec_widgets.utils import BECConnector, Colors, ConnectionConfig, EntryValidator
-from bec_widgets.widgets.plots.plot_base import BECPlotBase, SubplotConfig
+from bec_lib import MessageEndpoints
+from bec_lib.scan_data import ScanData
+from bec_widgets.utils import Colors, ConnectionConfig, BECConnector, EntryValidator
+from bec_widgets.widgets.plots import BECPlotBase, WidgetConfig


 class SignalData(BaseModel):
    """The data configuration of a signal in the 1D waveform widget for x and y axis."""

+    # TODO add validator on name and entry
    name: str
    entry: str
    unit: Optional[str] = None  # todo implement later
    modifier: Optional[str] = None  # todo implement later
-    limits: Optional[list[float]] = None  # todo implement later


 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
+    source: str  # TODO add validator on the source type
+    x: SignalData
    y: SignalData
-    z: Optional[SignalData] = None


 class CurveConfig(ConnectionConfig):
@@ -48,15 +47,16 @@ class CurveConfig(ConnectionConfig):
    pen_style: Optional[Literal["solid", "dash", "dot", "dashdot"]] = Field(
        "solid", description="The style of the pen of the curve."
    )
-    source: Optional[str] = Field(None, description="The source of the curve.")
+    source: Optional[str] = Field(
+        None, description="The source of the curve."
+    )  # TODO here on or curve??
    signals: Optional[Signal] = Field(None, description="The signal of the curve.")
-    colormap: Optional[str] = Field("plasma", description="The colormap of the curves z gradient.")


-class Waveform1DConfig(SubplotConfig):
+class Waveform1DConfig(WidgetConfig):
    color_palette: Literal["plasma", "viridis", "inferno", "magma"] = Field(
        "plasma", description="The color palette of the figure widget."
-    )  # TODO can be extended to all colormaps from current pyqtgraph session
+    )
    curves: dict[str, CurveConfig] = Field(
        {}, description="The list of curves to be added to the 1D waveform widget."
    )
@@ -64,13 +64,9 @@ class Waveform1DConfig(SubplotConfig):

 class BECCurve(BECConnector, pg.PlotDataItem):
    USER_ACCESS = [
-        "remove",
-        "rpc_id",
-        "config_dict",
        "set",
        "set_data",
        "set_color",
-        "set_colormap",
        "set_symbol",
        "set_symbol_color",
        "set_symbol_size",
@@ -84,7 +80,6 @@ class BECCurve(BECConnector, pg.PlotDataItem):
        name: Optional[str] = None,
        config: Optional[CurveConfig] = None,
        gui_id: Optional[str] = None,
-        parent_item: Optional[pg.PlotItem] = None,
        **kwargs,
    ):
        if config is None:
@@ -96,7 +91,6 @@ class BECCurve(BECConnector, pg.PlotDataItem):
        super().__init__(config=config, gui_id=gui_id)
        pg.PlotDataItem.__init__(self, name=name)

-        self.parent_item = parent_item
        self.apply_config()
        if kwargs:
            self.set(**kwargs)
@@ -129,10 +123,8 @@ class BECCurve(BECConnector, pg.PlotDataItem):
    def set(self, **kwargs):
        """
        Set the properties of the curve.
-
        Args:
            **kwargs: Keyword arguments for the properties to be set.
-
        Possible properties:
            - color: str
            - symbol: str
@@ -145,7 +137,6 @@ class BECCurve(BECConnector, pg.PlotDataItem):
        # Mapping of keywords to setter methods
        method_map = {
            "color": self.set_color,
-            "colormap": self.set_colormap,
            "symbol": self.set_symbol,
            "symbol_color": self.set_symbol_color,
            "symbol_size": self.set_symbol_size,
@@ -161,7 +152,6 @@ class BECCurve(BECConnector, pg.PlotDataItem):
    def set_color(self, color: str, symbol_color: Optional[str] = None):
        """
        Change the color of the curve.
-
        Args:
            color(str): Color of the curve.
            symbol_color(str, optional): Color of the symbol. Defaults to None.
@@ -173,7 +163,6 @@ class BECCurve(BECConnector, pg.PlotDataItem):
    def set_symbol(self, symbol: str):
        """
        Change the symbol of the curve.
-
        Args:
            symbol(str): Symbol of the curve.
        """
@@ -183,7 +172,6 @@ class BECCurve(BECConnector, pg.PlotDataItem):
    def set_symbol_color(self, symbol_color: str):
        """
        Change the symbol color of the curve.
-
        Args:
            symbol_color(str): Color of the symbol.
        """
@@ -193,7 +181,6 @@ class BECCurve(BECConnector, pg.PlotDataItem):
    def set_symbol_size(self, symbol_size: int):
        """
        Change the symbol size of the curve.
-
        Args:
            symbol_size(int): Size of the symbol.
        """
@@ -203,7 +190,6 @@ class BECCurve(BECConnector, pg.PlotDataItem):
    def set_pen_width(self, pen_width: int):
        """
        Change the pen width of the curve.
-
        Args:
            pen_width(int): Width of the pen.
        """
@@ -213,22 +199,12 @@ class BECCurve(BECConnector, pg.PlotDataItem):
    def set_pen_style(self, pen_style: Literal["solid", "dash", "dot", "dashdot"]):
        """
        Change the pen style of the curve.
-
        Args:
            pen_style(Literal["solid", "dash", "dot", "dashdot"]): Style of the pen.
        """
        self.config.pen_style = pen_style
        self.apply_config()

-    def set_colormap(self, colormap: str):
-        """
-        Set the colormap for the scatter plot z gradient.
-
-        Args:
-            colormap(str): Colormap for the scatter plot.
-        """
-        self.config.colormap = colormap
-
    def get_data(self) -> tuple[np.ndarray, np.ndarray]:
        """
        Get the data of the curve.
@@ -238,37 +214,19 @@ class BECCurve(BECConnector, pg.PlotDataItem):
        x_data, y_data = self.getData()
        return x_data, y_data

-    def remove(self):
-        """Remove the curve from the plot."""
-        self.parent_item.removeItem(self)
-        self.cleanup()

-
-class BECWaveform(BECPlotBase):
+class BECWaveform1D(BECPlotBase):
    USER_ACCESS = [
-        "rpc_id",
-        "config_dict",
        "add_curve_scan",
        "add_curve_custom",
        "remove_curve",
        "scan_history",
        "curves",
+        "curves_data",
        "get_curve",
        "get_curve_config",
        "apply_config",
        "get_all_data",
-        "set",
-        "set_title",
-        "set_x_label",
-        "set_y_label",
-        "set_x_scale",
-        "set_y_scale",
-        "set_x_lim",
-        "set_y_lim",
-        "set_grid",
-        "lock_aspect_ratio",
-        "plot",
-        "remove",
    ]
    scan_signal_update = pyqtSignal()

@@ -286,8 +244,8 @@ class BECWaveform(BECPlotBase):
            parent=parent, parent_figure=parent_figure, config=config, client=client, gui_id=gui_id
        )

-        self._curves_data = defaultdict(dict)
-        self.scan_id = None
+        self.curves_data = defaultdict(dict)
+        self.scanID = None

        # Scan segment update proxy
        self.proxy_update_plot = pg.SignalProxy(
@@ -302,15 +260,23 @@ class BECWaveform(BECPlotBase):

        self.entry_validator = EntryValidator(self.dev)

-        self.add_legend()
+        self.addLegend()
        self.apply_config(self.config)

-    def apply_config(self, config: dict | SubplotConfig, replot_last_scan: bool = False):
+    # TODO check config assigning
+    # TODO check the functionality of config generator
+    def find_widget_by_id(
+        self, item_id: str
+    ):  # TODO implement this on level of BECConnector and all other widgets
+        for curve in self.curves:
+            if curve.gui_id == item_id:
+                return curve
+
+    def apply_config(self, config: dict | WidgetConfig, replot_last_scan: bool = False):
        """
        Apply the configuration to the 1D waveform widget.
-
        Args:
-            config(dict|SubplotConfig): Configuration settings.
+            config(dict|WidgetConfig): Configuration settings.
            replot_last_scan(bool, optional): If True, replot the last scan. Defaults to False.
        """
        if isinstance(config, dict):
@@ -321,12 +287,12 @@ class BECWaveform(BECPlotBase):
                return

        self.config = config
-        self.plot_item.clear()  # TODO not sure if on the plot or layout level
+        self.clear()

        self.apply_axis_config()
        # Reset curves
        self._curves_data = defaultdict(dict)
-        self._curves = self.plot_item.curves
+        self._curves = []
        for curve_id, curve_config in self.config.curves.items():
            self.add_curve_by_config(curve_config)
        if replot_last_scan:
@@ -349,10 +315,8 @@ class BECWaveform(BECPlotBase):
    def add_curve_by_config(self, curve_config: CurveConfig | dict) -> BECCurve:
        """
        Add a curve to the plot widget by its configuration.
-
        Args:
            curve_config(CurveConfig|dict): Configuration of the curve to be added.
-
        Returns:
            BECCurve: The curve object.
        """
@@ -366,14 +330,12 @@ class BECWaveform(BECPlotBase):
    def get_curve_config(self, curve_id: str, dict_output: bool = True) -> CurveConfig | dict:
        """
        Get the configuration of a curve by its ID.
-
        Args:
            curve_id(str): ID of the curve.
-
        Returns:
            CurveConfig|dict: Configuration of the curve.
        """
-        for source, curves in self._curves_data.items():
+        for source, curves in self.curves_data.items():
            if curve_id in curves:
                if dict_output:
                    return curves[curve_id].config.model_dump()
@@ -381,7 +343,7 @@ class BECWaveform(BECPlotBase):
                    return curves[curve_id].config

    @property
-    def curves(self) -> list[BECCurve]:
+    def curves(self) -> list[BECCurve]:  # TODO discuss if it should be marked as @property for RPC
        """
        Get the curves of the plot widget as a list
        Returns:
@@ -393,20 +355,31 @@ class BECWaveform(BECPlotBase):
    def curves(self, value: list[BECCurve]):
        self._curves = value

+    @property
+    def curves_data(self) -> dict:  # TODO discuss if it should be marked as @property for RPC
+        """
+        Get the curves data of the plot widget as a dictionary
+        Returns:
+            dict: Dictionary of curves data.
+        """
+        return self._curves_data
+
+    @curves_data.setter
+    def curves_data(self, value: dict):
+        self._curves_data = value
+
    def get_curve(self, identifier) -> BECCurve:
        """
        Get the curve by its index or ID.
-
        Args:
            identifier(int|str): Identifier of the curve. Can be either an integer (index) or a string (curve_id).
-
        Returns:
            BECCurve: The curve object.
        """
        if isinstance(identifier, int):
-            return self.plot_item.curves[identifier]
+            return self.curves[identifier]
        elif isinstance(identifier, str):
-            for source_type, curves in self._curves_data.items():
+            for source_type, curves in self.curves_data.items():
                if identifier in curves:
                    return curves[identifier]
            raise ValueError(f"Curve with ID '{identifier}' not found.")
@@ -423,7 +396,6 @@ class BECWaveform(BECPlotBase):
    ) -> BECCurve:
        """
        Add a custom data curve to the plot widget.
-
        Args:
            x(list|np.ndarray): X data of the curve.
            y(list|np.ndarray): Y data of the curve.
@@ -435,9 +407,9 @@ class BECWaveform(BECPlotBase):
            BECCurve: The curve object.
        """
        curve_source = "custom"
-        curve_id = label or f"Curve {len(self.plot_item.curves) + 1}"
+        curve_id = label or f"Curve {len(self.curves) + 1}"

-        curve_exits = self._check_curve_id(curve_id, self._curves_data)
+        curve_exits = self._check_curve_id(curve_id, self.curves_data)
        if curve_exits:
            raise ValueError(
                f"Curve with ID '{curve_id}' already exists in widget '{self.gui_id}'."
@@ -446,7 +418,7 @@ class BECWaveform(BECPlotBase):
        color = (
            color
            or Colors.golden_angle_color(
-                colormap=self.config.color_palette, num=len(self.plot_item.curves) + 1, format="HEX"
+                colormap=self.config.color_palette, num=len(self.curves) + 1, format="HEX"
            )[-1]
        )

@@ -474,19 +446,17 @@ class BECWaveform(BECPlotBase):
    ) -> BECCurve:
        """
        Add a curve object to the plot widget.
-
        Args:
            name(str): ID of the curve.
            source(str): Source of the curve.
            config(CurveConfig): Configuration of the curve.
            data(tuple[list|np.ndarray,list|np.ndarray], optional): Data (x,y) to be plotted. Defaults to None.
-
        Returns:
            BECCurve: The curve object.
        """
-        curve = BECCurve(config=config, name=name, parent_item=self.plot_item)
-        self._curves_data[source][name] = curve
-        self.plot_item.addItem(curve)
+        curve = BECCurve(config=config, name=name)
+        self.curves_data[source][name] = curve
+        self.addItem(curve)
        self.config.curves[name] = curve.config
        if data is not None:
            curve.setData(data[0], data[1])
@@ -496,28 +466,21 @@ class BECWaveform(BECPlotBase):
        self,
        x_name: str,
        y_name: str,
-        z_name: Optional[str] = None,
        x_entry: Optional[str] = None,
        y_entry: Optional[str] = None,
-        z_entry: Optional[str] = None,
        color: Optional[str] = None,
-        color_map_z: Optional[str] = "plasma",
        label: Optional[str] = None,
        validate_bec: bool = True,
        **kwargs,
    ) -> BECCurve:
        """
        Add a curve to the plot widget from the scan segment.
-
        Args:
            x_name(str): Name of the x signal.
            x_entry(str): Entry of the x signal.
            y_name(str): Name of the y signal.
            y_entry(str): Entry of the y signal.
-            z_name(str): Name of the z signal.
-            z_entry(str): Entry of the z signal.
            color(str, optional): Color of the curve. Defaults to None.
-            color_map_z(str): The color map to use for the z-axis.
            label(str, optional): Label of the curve. Defaults to None.
            **kwargs: Additional keyword arguments for the curve configuration.

@@ -528,23 +491,20 @@ class BECWaveform(BECPlotBase):
        curve_source = "scan_segment"

        # Get entry if not provided and validate
-        x_entry, y_entry, z_entry = self._validate_signal_entries(
-            x_name, y_name, z_name, x_entry, y_entry, z_entry, validate_bec
+        x_entry, y_entry = self._validate_signal_entries(
+            x_name, y_name, x_entry, y_entry, validate_bec
        )

-        if z_name is not None and z_entry is not None:
-            label = label or f"{z_name}-{z_entry}"
-        else:
-            label = label or f"{y_name}-{y_entry}"
+        label = label or f"{y_name}-{y_entry}"

-        curve_exits = self._check_curve_id(label, self._curves_data)
+        curve_exits = self._check_curve_id(label, self.curves_data)
        if curve_exits:
            raise ValueError(f"Curve with ID '{label}' already exists in widget '{self.gui_id}'.")

        color = (
            color
            or Colors.golden_angle_color(
-                colormap=self.config.color_palette, num=len(self.plot_item.curves) + 1, format="HEX"
+                colormap=self.config.color_palette, num=len(self.curves) + 1, format="HEX"
            )[-1]
        )

@@ -554,13 +514,11 @@ class BECWaveform(BECPlotBase):
            parent_id=self.gui_id,
            label=label,
            color=color,
-            color_map=color_map_z,
            source=curve_source,
            signals=Signal(
                source=curve_source,
                x=SignalData(name=x_name, entry=x_entry),
                y=SignalData(name=y_name, entry=y_entry),
-                z=SignalData(name=z_name, entry=z_entry) if z_name else None,
            ),
            **kwargs,
        )
@@ -571,42 +529,32 @@ class BECWaveform(BECPlotBase):
        self,
        x_name: str,
        y_name: str,
-        z_name: str | None,
        x_entry: str | None,
        y_entry: str | None,
-        z_entry: str | None,
        validate_bec: bool = True,
-    ) -> tuple[str, str, str | None]:
+    ) -> tuple[str, str]:
        """
        Validate the signal name and entry.
-
        Args:
            x_name(str): Name of the x signal.
            y_name(str): Name of the y signal.
-            z_name(str): Name of the z signal.
            x_entry(str|None): Entry of the x signal.
            y_entry(str|None): Entry of the y signal.
-            z_entry(str|None): Entry of the z signal.
            validate_bec(bool, optional): If True, validate the signal with BEC. Defaults to True.
-
        Returns:
-            tuple[str,str,str|None]: Validated x, y, z entries.
+            tuple[str,str]: Validated x and y entries.
        """
        if validate_bec:
            x_entry = self.entry_validator.validate_signal(x_name, x_entry)
            y_entry = self.entry_validator.validate_signal(y_name, y_entry)
-            if z_name:
-                z_entry = self.entry_validator.validate_signal(z_name, z_entry)
        else:
            x_entry = x_name if x_entry is None else x_entry
            y_entry = y_name if y_entry is None else y_entry
-            z_entry = z_name if z_entry is None else z_entry
-        return x_entry, y_entry, z_entry
+        return x_entry, y_entry

    def _check_curve_id(self, val: Any, dict_to_check: dict) -> bool:
        """
        Check if val is in the values of the dict_to_check or in the values of the nested dictionaries.
-
        Args:
            val(Any): Value to check.
            dict_to_check(dict): Dictionary to check.
@@ -625,7 +573,6 @@ class BECWaveform(BECPlotBase):
    def remove_curve(self, *identifiers):
        """
        Remove a curve from the plot widget.
-
        Args:
            *identifiers: Identifier of the curve to be removed. Can be either an integer (index) or a string (curve_id).
        """
@@ -642,34 +589,32 @@ class BECWaveform(BECPlotBase):
    def _remove_curve_by_id(self, curve_id):
        """
        Remove a curve by its ID from the plot widget.
-
        Args:
            curve_id(str): ID of the curve to be removed.
        """
-        for source, curves in self._curves_data.items():
+        for source, curves in self.curves_data.items():
            if curve_id in curves:
                curve = curves.pop(curve_id)
-                self.plot_item.removeItem(curve)
+                self.removeItem(curve)
                del self.config.curves[curve_id]
-                if curve in self.plot_item.curves:
-                    self.plot_item.curves.remove(curve)
+                if curve in self.curves:
+                    self.curves.remove(curve)
                return
        raise KeyError(f"Curve with ID '{curve_id}' not found.")

    def _remove_curve_by_order(self, N):
        """
        Remove a curve by its order from the plot widget.
-
        Args:
            N(int): Order of the curve to be removed.
        """
-        if N < len(self.plot_item.curves):
-            curve = self.plot_item.curves[N]
+        if N < len(self.curves):
+            curve = self.curves[N]
            curve_id = curve.name()  # Assuming curve's name is used as its ID
-            self.plot_item.removeItem(curve)
+            self.removeItem(curve)
            del self.config.curves[curve_id]
            # Remove from self.curve_data
-            for source, curves in self._curves_data.items():
+            for source, curves in self.curves_data.items():
                if curve_id in curves:
                    del curves[curve_id]
                    break
@@ -685,14 +630,14 @@ class BECWaveform(BECPlotBase):
            msg (dict): Message received with scan data.
            metadata (dict): Metadata of the scan.
        """
-        current_scan_id = msg.get("scan_id", None)
-        if current_scan_id is None:
+        current_scanID = msg.get("scanID", None)
+        if current_scanID is None:
            return

-        if current_scan_id != self.scan_id:
-            self.scan_id = current_scan_id
+        if current_scanID != self.scanID:
+            self.scanID = current_scanID
            self.scan_segment_data = self.queue.scan_storage.find_scan_by_ID(
-                self.scan_id
+                self.scanID
            )  # TODO do scan access through BECFigure

        self.scan_signal_update.emit()
@@ -705,88 +650,48 @@ class BECWaveform(BECPlotBase):
    def _update_scan_curves(self, data: ScanData):
        """
        Update the scan curves with the data from the scan segment.
-
        Args:
            data(ScanData): Data from the scan segment.
        """
-        data_x = None
-        data_y = None
-        data_z = None
-        for curve_id, curve in self._curves_data["scan_segment"].items():
+        for curve_id, curve in self.curves_data["scan_segment"].items():
            x_name = curve.config.signals.x.name
            x_entry = curve.config.signals.x.entry
            y_name = curve.config.signals.y.name
            y_entry = curve.config.signals.y.entry
-            if curve.config.signals.z:
-                z_name = curve.config.signals.z.name
-                z_entry = curve.config.signals.z.entry

            try:
                data_x = data[x_name][x_entry].val
                data_y = data[y_name][y_entry].val
-                if curve.config.signals.z:
-                    data_z = data[z_name][z_entry].val
-                    color_z = self._make_z_gradient(
-                        data_z, curve.config.colormap
-                    )  # TODO decide how to implement custom gradient
            except TypeError:
                continue

-            if data_z is not None and color_z is not None:
-                curve.setData(x=data_x, y=data_y, symbolBrush=color_z)
-            else:
-                curve.setData(data_x, data_y)
+            curve.setData(data_x, data_y)

-    def _make_z_gradient(self, data_z: list | np.ndarray, colormap: str) -> list | None:
-        """
-        Make a gradient color for the z values.
-
-        Args:
-            data_z(list|np.ndarray): Z values.
-            colormap(str): Colormap for the gradient color.
-
-        Returns:
-            list: List of colors for the z values.
-        """
-        # Normalize z_values for color mapping
-        z_min, z_max = np.min(data_z), np.max(data_z)
-
-        if z_max != z_min:  # Ensure that there is a range in the z values
-            z_values_norm = (data_z - z_min) / (z_max - z_min)
-            colormap = pg.colormap.get(colormap)  # using colormap from global settings
-            colors = [colormap.map(z, mode="qcolor") for z in z_values_norm]
-            return colors
-        else:
-            return None
-
-    def scan_history(self, scan_index: int = None, scan_id: str = None):
+    def scan_history(self, scan_index: int = None, scanID: str = None):
        """
        Update the scan curves with the data from the scan storage.
-        Provide only one of scan_id or scan_index.
-
+        Provide only one of scanID or scan_index.
        Args:
-            scan_id(str, optional): ScanID of the scan to be updated. Defaults to None.
+            scanID(str, optional): ScanID of the scan to be updated. Defaults to None.
            scan_index(int, optional): Index of the scan to be updated. Defaults to None.
        """
-        if scan_index is not None and scan_id is not None:
-            raise ValueError("Only one of scan_id or scan_index can be provided.")
+        if scan_index is not None and scanID is not None:
+            raise ValueError("Only one of scanID or scan_index can be provided.")

        if scan_index is not None:
-            self.scan_id = self.queue.scan_storage.storage[scan_index].scan_id
-            data = self.queue.scan_storage.find_scan_by_ID(self.scan_id).data
-        elif scan_id is not None:
-            self.scan_id = scan_id
-            data = self.queue.scan_storage.find_scan_by_ID(self.scan_id).data
+            self.scanID = self.queue.scan_storage.storage[scan_index].scanID
+            data = self.queue.scan_storage.find_scan_by_ID(self.scanID).data
+        elif scanID is not None:
+            self.scanID = scanID
+            data = self.queue.scan_storage.find_scan_by_ID(self.scanID).data

        self._update_scan_curves(data)

    def get_all_data(self, output: Literal["dict", "pandas"] = "dict") -> dict | pd.DataFrame:
        """
        Extract all curve data into a dictionary or a pandas DataFrame.
-
        Args:
            output (Literal["dict", "pandas"]): Format of the output data.
-
        Returns:
            dict | pd.DataFrame: Data of all curves in the specified format.
        """
@@ -804,7 +709,7 @@ class BECWaveform(BECPlotBase):
                )
                output = "dict"

-        for curve in self.plot_item.curves:
+        for curve in self.curves:
            x_data, y_data = curve.get_data()
            if x_data is not None or y_data is not None:
                if output == "dict":
@@ -814,9 +719,9 @@ class BECWaveform(BECPlotBase):

        if output == "pandas" and pd is not None:
            combined_data = pd.concat(
-                [data[curve.name()] for curve in self.plot_item.curves],
+                [data[curve.name()] for curve in self.curves],
                axis=1,
-                keys=[curve.name() for curve in self.plot_item.curves],
+                keys=[curve.name() for curve in self.curves],
            )
            return combined_data
        return data
@@ -824,6 +729,3 @@ class BECWaveform(BECPlotBase):
    def cleanup(self):
        """Cleanup the widget connection from BECDispatcher."""
        self.bec_dispatcher.disconnect_slot(self.on_scan_segment, MessageEndpoints.scan_segment())
-        for curve in self.curves:
-            curve.cleanup()
-        super().cleanup()
--- a/bec_widgets/widgets/scan_control/scan_control.py
+++ b/bec_widgets/widgets/scan_control/scan_control.py
@@ -1,28 +1,28 @@
 import msgpack
-from bec_lib import MessageEndpoints
 from qtpy.QtWidgets import (
    QApplication,
-    QCheckBox,
+    QWidget,
    QComboBox,
-    QDoubleSpinBox,
-    QFrame,
-    QGridLayout,
-    QGroupBox,
-    QHBoxLayout,
-    QHeaderView,
-    QLabel,
-    QLayout,
-    QLineEdit,
    QPushButton,
+    QVBoxLayout,
+    QGroupBox,
+    QLabel,
+    QLineEdit,
+    QDoubleSpinBox,
    QSpinBox,
+    QCheckBox,
+    QFrame,
+    QHBoxLayout,
+    QLayout,
+    QGridLayout,
    QTableWidget,
    QTableWidgetItem,
-    QVBoxLayout,
-    QWidget,
+    QHeaderView,
 )

-from bec_widgets.utils.bec_dispatcher import BECDispatcher
+from bec_lib import MessageEndpoints
 from bec_widgets.utils.widget_io import WidgetIO
+from bec_widgets.utils.bec_dispatcher import BECDispatcher


 class ScanArgType:
@@ -109,7 +109,6 @@ class ScanControl(QWidget):
    def add_horizontal_separator(self, layout) -> None:
        """
        Adds a horizontal separator to the given layout
-
        Args:
            layout: Layout to add the separator to
        """
@@ -143,7 +142,6 @@ class ScanControl(QWidget):
    def add_labels_to_layout(self, labels: list, grid_layout: QGridLayout) -> None:
        """
        Adds labels to the given grid layout as a separate row.
-
        Args:
            labels (list): List of label names to add.
            grid_layout (QGridLayout): The grid layout to which labels will be added.
@@ -159,7 +157,6 @@ class ScanControl(QWidget):
    ) -> None:  # TODO could be moved to BECTable
        """
        Adds labels to the given table widget as a header row.
-
        Args:
            labels(list): List of label names to add.
            table(QTableWidget): The table widget to which labels will be added.
@@ -169,8 +166,7 @@ class ScanControl(QWidget):

    def generate_args_input_fields(self, scan_info: dict) -> None:
        """
-        Generates input fields for args.
-
+        Generates input fields for args
        Args:
            scan_info(dict): Scan signature dictionary from BEC.
        """
@@ -192,7 +188,6 @@ class ScanControl(QWidget):
    def generate_kwargs_input_fields(self, scan_info: dict) -> None:
        """
        Generates input fields for kwargs
-
        Args:
            scan_info(dict): Scan signature dictionary from BEC.
        """
@@ -218,13 +213,12 @@ class ScanControl(QWidget):
    def generate_widgets_from_signature(self, items: list, signature: dict = None) -> list:
        """
        Generates widgets from the given list of items.
-
        Args:
            items(list): List of items to create widgets for.
            signature(dict, optional): Scan signature dictionary from BEC.

        Returns:
-            list: List of widgets created from the given items.
+
        """
        widgets = []  # Initialize an empty list to hold the widgets

@@ -339,7 +333,6 @@ class ScanControl(QWidget):
    def clear_and_delete_layout(self, layout: QLayout):
        """
        Clears and deletes the given layout and all its child widgets.
-
        Args:
            layout(QLayout): Layout to clear and delete
        """
@@ -390,7 +383,6 @@ class ScanControl(QWidget):
    def extract_args_from_table(self, table: QTableWidget) -> list:
        """
        Extracts the arguments from the given table widget.
-
        Args:
            table(QTableWidget): Table widget from which to extract the arguments
        """
@@ -438,7 +430,9 @@ if __name__ == "__main__":  # pragma: no cover
    client.start()

    app = QApplication([])
-    scan_control = ScanControl(client=client)  # allowed_scans=["line_scan", "grid_scan"])
+    scan_control = ScanControl(
+        client=client,
+    )  # allowed_scans=["line_scan", "grid_scan"])

    window = scan_control
    window.show()
--- a/bec_widgets/widgets/scan_plot/init.py
+++ b/bec_widgets/widgets/scan_plot/init.py
--- a/bec_widgets/widgets/scan_plot/scan2d_plot.py
+++ b/bec_widgets/widgets/scan_plot/scan2d_plot.py
@@ -0,0 +1,152 @@
+from threading import RLock
+
+import numpy as np
+import pyqtgraph as pg
+from bec_lib import MessageEndpoints
+from bec_lib.logger import bec_logger
+from qtpy.QtCore import Property as pyqtProperty, Slot as pyqtSlot
+
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
+
+logger = bec_logger.logger
+
+
+pg.setConfigOptions(background="w", foreground="k", antialias=True)
+
+
+class BECScanPlot2D(pg.GraphicsView):
+    def __init__(self, parent=None, background="default"):
+        super().__init__(parent, background)
+        BECDispatcher().connect_slot(self.on_scan_segment, MessageEndpoints.scan_segment())
+
+        self._scanID = None
+        self._scanID_lock = RLock()
+
+        self._x_channel = ""
+        self._y_channel = ""
+        self._z_channel = ""
+
+        self._xpos = []
+        self._ypos = []
+
+        self._x_ind = None
+        self._y_ind = None
+
+        self.plot_item = pg.PlotItem()
+        self.setCentralItem(self.plot_item)
+        self.plot_item.setAspectLocked(True)
+
+        self.imageItem = pg.ImageItem()
+        self.plot_item.addItem(self.imageItem)
+
+    def reset_plots(self, _scan_segment, metadata):
+        # TODO: Do we reset in case of a scan type change?
+        self.imageItem.clear()
+
+        # TODO: better to check the number of coordinates in metadata["positions"]?
+        if metadata["scan_name"] != "grid_scan":
+            return
+
+        positions = [sorted(set(pos)) for pos in zip(*metadata["positions"])]
+
+        motors = metadata["scan_motors"]
+        if self.x_channel and self.y_channel:
+            self._x_ind = motors.index(self.x_channel) if self.x_channel in motors else None
+            self._y_ind = motors.index(self.y_channel) if self.y_channel in motors else None
+        elif not self.x_channel and not self.y_channel:
+            # Plot the first and second motors along x and y axes respectively
+            self._x_ind = 0
+            self._y_ind = 1
+        else:
+            logger.warning(
+                f"X and Y channels should be either both empty or both set in {self.objectName()}"
+            )
+
+        if self._x_ind is None or self._y_ind is None:
+            return
+
+        xpos = positions[self._x_ind]
+        ypos = positions[self._y_ind]
+
+        self._xpos = xpos
+        self._ypos = ypos
+
+        self.imageItem.setImage(np.zeros(shape=(len(xpos), len(ypos))))
+
+        w = max(xpos) - min(xpos)
+        h = max(ypos) - min(ypos)
+        w_pix = w / (len(xpos) - 1)
+        h_pix = h / (len(ypos) - 1)
+        self.imageItem.setRect(min(xpos) - w_pix / 2, min(ypos) - h_pix / 2, w + w_pix, h + h_pix)
+
+        self.plot_item.setLabel("bottom", motors[self._x_ind])
+        self.plot_item.setLabel("left", motors[self._y_ind])
+
+    @pyqtSlot(dict, dict)
+    def on_scan_segment(self, scan_segment, metadata):
+        # reset plots on scanID change
+        with self._scanID_lock:
+            scan_id = scan_segment["scanID"]
+            if self._scanID != scan_id:
+                self._scanID = scan_id
+                self.reset_plots(scan_segment, metadata)
+
+        if not self.z_channel or metadata["scan_name"] != "grid_scan":
+            return
+
+        if self._x_ind is None or self._y_ind is None:
+            return
+
+        point_coord = metadata["positions"][scan_segment["point_id"]]
+
+        x_coord_ind = self._xpos.index(point_coord[self._x_ind])
+        y_coord_ind = self._ypos.index(point_coord[self._y_ind])
+
+        data = scan_segment["data"]
+        z_new = data[self.z_channel][self.z_channel]["value"]
+
+        image = self.imageItem.image
+        image[x_coord_ind, y_coord_ind] = z_new
+        self.imageItem.setImage()
+
+    @pyqtProperty(str)
+    def x_channel(self):
+        return self._x_channel
+
+    @x_channel.setter
+    def x_channel(self, new_val):
+        self._x_channel = new_val
+        self.plot_item.setLabel("bottom", new_val)
+
+    @pyqtProperty(str)
+    def y_channel(self):
+        return self._y_channel
+
+    @y_channel.setter
+    def y_channel(self, new_val):
+        self._y_channel = new_val
+        self.plot_item.setLabel("left", new_val)
+
+    @pyqtProperty(str)
+    def z_channel(self):
+        return self._z_channel
+
+    @z_channel.setter
+    def z_channel(self, new_val):
+        self._z_channel = new_val
+
+
+if __name__ == "__main__":
+    import sys
+
+    from qtpy.QtWidgets import QApplication
+
+    app = QApplication(sys.argv)
+
+    plot = BECScanPlot2D()
+    # If x_channel and y_channel are both omitted, they will be inferred from each running grid scan
+    plot.z_channel = "bpm3y"
+
+    plot.show()
+
+    sys.exit(app.exec())
--- a/bec_widgets/widgets/scan_plot/scan_plot.py
+++ b/bec_widgets/widgets/scan_plot/scan_plot.py
@@ -0,0 +1,152 @@
+import itertools
+from threading import RLock
+
+import pyqtgraph as pg
+from bec_lib import MessageEndpoints
+from bec_lib.logger import bec_logger
+from qtpy.QtCore import Property as pyqtProperty, Slot as pyqtSlot
+
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
+
+logger = bec_logger.logger
+
+
+pg.setConfigOptions(background="w", foreground="k", antialias=True)
+COLORS = ["#fd7f6f", "#7eb0d5", "#b2e061", "#bd7ebe", "#ffb55a"]
+
+
+class BECScanPlot(pg.GraphicsView):
+    def __init__(self, parent=None, background="default"):
+        super().__init__(parent, background)
+        BECDispatcher().connect_slot(self.on_scan_segment, MessageEndpoints.scan_segment())
+
+        self.view = pg.PlotItem()
+        self.setCentralItem(self.view)
+
+        self._scanID = None
+        self._scanID_lock = RLock()
+
+        self._x_channel = ""
+        self._y_channel_list = []
+
+        self.scan_curves = {}
+        self.dap_curves = {}
+
+    def reset_plots(self, _scan_segment, _metadata):
+        for plot_curve in {**self.scan_curves, **self.dap_curves}.values():
+            plot_curve.setData(x=[], y=[])
+
+    @pyqtSlot(dict, dict)
+    def on_scan_segment(self, scan_segment, metadata):
+        # reset plots on scanID change
+        with self._scanID_lock:
+            scan_id = scan_segment["scanID"]
+            if self._scanID != scan_id:
+                self._scanID = scan_id
+                self.reset_plots(scan_segment, metadata)
+
+        if not self.x_channel:
+            return
+
+        data = scan_segment["data"]
+
+        if self.x_channel not in data:
+            logger.warning(f"Unknown channel `{self.x_channel}` for X data in {self.objectName()}")
+            return
+
+        x_new = data[self.x_channel][self.x_channel]["value"]
+        for chan, plot_curve in self.scan_curves.items():
+            if not chan:
+                continue
+
+            if chan not in data:
+                logger.warning(f"Unknown channel `{chan}` for Y data in {self.objectName()}")
+                continue
+
+            y_new = data[chan][chan]["value"]
+            x, y = plot_curve.getData()  # TODO: is it a good approach?
+            if x is None:
+                x = []
+            if y is None:
+                y = []
+
+            plot_curve.setData(x=[*x, x_new], y=[*y, y_new])
+
+    @pyqtSlot(dict, dict)
+    def redraw_dap(self, content, _metadata):
+        data = content["data"]
+        for chan, plot_curve in self.dap_curves.items():
+            if not chan:
+                continue
+
+            if chan not in data:
+                logger.warning(f"Unknown channel `{chan}` for DAP data in {self.objectName()}")
+                continue
+
+            x_new = data[chan]["x"]
+            y_new = data[chan]["y"]
+
+            plot_curve.setData(x=x_new, y=y_new)
+
+    @pyqtProperty("QStringList")
+    def y_channel_list(self):
+        return self._y_channel_list
+
+    @y_channel_list.setter
+    def y_channel_list(self, new_list):
+        bec_dispatcher = BECDispatcher()
+        # TODO: do we want to care about dap/not dap here?
+        chan_removed = [chan for chan in self._y_channel_list if chan not in new_list]
+        if chan_removed and chan_removed[0].startswith("dap."):
+            chan_removed = chan_removed[0].partition("dap.")[-1]
+            chan_removed_ep = MessageEndpoints.processed_data(chan_removed)
+            bec_dispatcher.disconnect_slot(self.redraw_dap, chan_removed_ep)
+
+        self._y_channel_list = new_list
+
+        # Prepare plot for a potentially different list of y channels
+        self.view.clear()
+
+        self.view.addLegend()
+        colors = itertools.cycle(COLORS)
+
+        for y_chan in new_list:
+            if y_chan.startswith("dap."):
+                y_chan = y_chan.partition("dap.")[-1]
+                curves = self.dap_curves
+                y_chan_ep = MessageEndpoints.processed_data(y_chan)
+                bec_dispatcher.connect_slot(self.redraw_dap, y_chan_ep)
+            else:
+                curves = self.scan_curves
+
+            curves[y_chan] = self.view.plot(
+                x=[], y=[], pen=pg.mkPen(color=next(colors), width=2), name=y_chan
+            )
+
+        if len(new_list) == 1:
+            self.view.setLabel("left", new_list[0])
+
+    @pyqtProperty(str)
+    def x_channel(self):
+        return self._x_channel
+
+    @x_channel.setter
+    def x_channel(self, new_val):
+        self._x_channel = new_val
+        self.view.setLabel("bottom", new_val)
+
+
+if __name__ == "__main__":
+    import sys
+
+    from qtpy.QtWidgets import QApplication
+
+    app = QApplication(sys.argv)
+
+    plot = BECScanPlot()
+    plot.x_channel = "samx"
+    plot.y_channel_list = ["bpm3y", "bpm6y"]
+
+    plot.show()
+
+    sys.exit(app.exec())
--- a/bec_widgets/widgets/toolbar/toolbar.py
+++ b/bec_widgets/widgets/toolbar/toolbar.py
@@ -1,9 +1,11 @@
 from abc import ABC, abstractmethod

 # pylint: disable=no-name-in-module
-from qtpy.QtCore import QSize, QTimer
+from qtpy.QtCore import QSize
+from qtpy.QtWidgets import QToolBar, QStyle, QApplication
+from qtpy.QtCore import QTimer
 from qtpy.QtGui import QAction
-from qtpy.QtWidgets import QApplication, QStyle, QToolBar, QWidget
+from qtpy.QtWidgets import QWidget


 class ToolBarAction(ABC):
@@ -82,7 +84,6 @@ class RunScriptAction:

 class ModularToolBar(QToolBar):
    """Modular toolbar with optional automatic initialization.
-
    Args:
        parent (QWidget, optional): The parent widget of the toolbar. Defaults to None.
        auto_init (bool, optional): If True, automatically populates the toolbar based on the parent widget.
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -9,8 +9,6 @@
 import os
 import pathlib

-import tomli
-
 project = "BEC Widgets"
 copyright = "2023, Paul Scherrer Institute"
 author = "Paul Scherrer Institute"
@@ -19,14 +17,17 @@ author = "Paul Scherrer Institute"
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

 current_path = pathlib.Path(__file__).parent.parent.resolve()
-version_path = f"{current_path}/pyproject.toml"


 def get_version():
    """load the version from the version file"""
-    with open(version_path, "r", encoding="utf-8") as file:
-        res = tomli.loads(file.read())
-    return res["project"]["version"]
+    version_file = os.path.join(current_path, "setup.py")
+    with open(version_file, "r", encoding="utf-8") as file:
+        res = file.readline()
+        while not res.startswith("__version__"):
+            res = file.readline()
+        version = res.split("=")[1]
+    return version.strip().strip('"')


 release = get_version()
@@ -78,4 +79,7 @@ html_theme = "pydata_sphinx_theme"
 html_static_path = ["_static"]
 html_css_files = ["css/custom.css"]
 html_logo = "_static/bec.png"
-html_theme_options = {"show_nav_level": 1, "navbar_align": "content"}
+html_theme_options = {
+    "show_nav_level": 1,
+    "navbar_align": "content",
+}
--- a/docs/developer/developer.md
+++ b/docs/developer/developer.md
@@ -1,26 +1,16 @@
 (developer)=
 # Development

-```{toctree}
---
-maxdepth: 1
-hidden: true
---
-reference/
-```
-
 To contribute to the development of BEC Widgets, start by setting up the development environment:

 1. **Clone the Repository**: 
 ```bash
-git clone https://gitlab.psi.ch/bec/bec_widgets
-cd bec_widgets
+git clone https://gitlab.psi.ch/bec/bec-widgets
+cd bec-widgets
 ```
 2. **Install in Editable Mode**:

 Installing the package in editable mode allows you to make changes to the code and test them in real-time.
 ```bash
-pip install -e .[dev,pyqt6]
-```
-
-
+pip install -e .[dev]
+```
--- a/docs/developer/reference.md
+++ b/docs/developer/reference.md
@@ -1,10 +0,0 @@
-## API Reference
-
-```{eval-rst}
-.. autosummary::
-   :toctree: _autosummary
-   :template: custom-module-template.rst
-   :recursive:
-
-   bec_widgets
-```
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -7,4 +7,3 @@ sphinx-copybutton
 myst-parser
 sphinx-design
 bec-widgets
-tomli
--- a/docs/user/installation.md
+++ b/docs/user/installation.md
@@ -6,7 +6,7 @@

 Before installing BEC Widgets, please ensure the following requirements are met:

-1. **Python Version:** BEC Widgets requires Python version 3.10 or higher. Verify your Python version to ensure compatibility.
+1. **Python Version:** BEC Widgets requires Python version 3.9 or higher. Verify your Python version to ensure compatibility.
 2. **BEC Installation:** BEC Widgets works in conjunction with BEC. While BEC is a dependency and will be installed automatically, you can find more information about BEC and its installation process in the [BEC documentation](https://beamline-experiment-control.readthedocs.io/en/latest/).

 **Standard Installation**
@@ -14,7 +14,7 @@ Before installing BEC Widgets, please ensure the following requirements are met:
 Install BEC Widgets using the pip package manager. Open your terminal and execute:

 ```bash
-pip install bec_widgets
+pip install bec-widgets
 ```

 This command installs BEC Widgets along with its dependencies, including the default PyQt6.
@@ -26,13 +26,13 @@ BEC Widgets supports both PyQt5 and PyQt6. To install a specific version, use:
 For PyQt6:

 ```bash
-pip install bec_widgets[pyqt6]
+pip install bec-widgets[pyqt6]
 ```

 For PyQt5:

 ```bash
-pip install bec_widgets[pyqt5]
+pip install bec-widgets[pyqt5]
 ```

 **Troubleshooting**
@@ -43,4 +43,4 @@ If you encounter issues during installation, particularly with PyQt, try purging
 pip cache purge
 ```

-This can resolve conflicts or issues with package installations.
+This can resolve conflicts or issues with package installations.
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,94 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "bec_widgets"
-version = "0.53.1"
-description = "BEC Widgets"
-requires-python = ">=3.10"
-classifiers = [
-    "Development Status :: 3 - Alpha",
-    "Programming Language :: Python :: 3",
-    "Topic :: Scientific/Engineering",
-]
-dependencies = [
-    "pydantic",
-    "qtconsole",
-    "jedi",
-    "qtpy",
-    "pyqtgraph",
-    "bec_lib",
-    "zmq",
-    "h5py",
-    "pyqtdarktheme",
-    "black",
-]
-
-
-[project.optional-dependencies]
-dev = [
-    "pytest",
-    "pytest-random-order",
-    "pytest-timeout",
-    "coverage",
-    "pytest-qt",
-    "isort",
-    "fakeredis",
-]
-pyqt5 = ["PyQt5>=5.9"]
-pyqt6 = ["PyQt6>=6.7"]
-
-[project.urls]
-"Bug Tracker" = "https://gitlab.psi.ch/bec/bec_widgets/issues"
-Homepage = "https://gitlab.psi.ch/bec/bec_widgets"
-
-[tool.hatch.build.targets.wheel]
-include = ["*"]
-
-[tool.black]
-line-length = 100
-skip-magic-trailing-comma = true
-
-[tool.isort]
-profile = "black"
-line_length = 100
-multi_line_output = 3
-include_trailing_comma = true
-
-[tool.semantic_release]
-build_command = "python -m build"
-version_toml = ["pyproject.toml:project.version"]
-
-[tool.semantic_release.commit_author]
-env = "GIT_COMMIT_AUTHOR"
-default = "semantic-release <semantic-release>"
-
-[tool.semantic_release.commit_parser_options]
-allowed_tags = [
-    "build",
-    "chore",
-    "ci",
-    "docs",
-    "feat",
-    "fix",
-    "perf",
-    "style",
-    "refactor",
-    "test",
-]
-minor_tags = ["feat"]
-patch_tags = ["fix", "perf"]
-default_bump_level = 0
-
-[tool.semantic_release.remote]
-name = "origin"
-type = "gitlab"
-ignore_token_for_push = false
-
-[tool.semantic_release.remote.token]
-env = "GL_TOKEN"
-
-[tool.semantic_release.publish]
-dist_glob_patterns = ["dist/*"]
-upload_to_vcs_release = true
--- a/setup.cfg
+++ b/setup.cfg
@@ -0,0 +1,21 @@
+[metadata]
+name = bec_widgets
+description = BEC Widgets
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://gitlab.psi.ch/bec/bec-widgets
+project_urls =
+    Bug Tracker = https://gitlab.psi.ch/bec/bec-widgets/issues
+classifiers =
+    Programming Language :: Python :: 3
+    Development Status :: 3 - Alpha
+    Topic :: Scientific/Engineering
+
+[options]
+package_dir =
+    = .
+packages = find:
+python_requires = >=3.9
+
+[options.packages.find]
+where = .
--- a/setup.py
+++ b/setup.py
@@ -0,0 +1,50 @@
+# pylint: disable= missing-module-docstring
+from setuptools import setup, find_packages
+
+__version__ = "0.41.1"
+
+# Default to PyQt6 if no other Qt binding is installed
+QT_DEPENDENCY = "PyQt6>=6.0"
+QSCINTILLA_DEPENDENCY = "PyQt6-QScintilla"
+
+# pylint: disable=unused-import
+try:
+    import PyQt5
+except ImportError:
+    pass
+else:
+    QT_DEPENDENCY = "PyQt5>=5.9"
+    QSCINTILLA_DEPENDENCY = "QScintilla"
+
+if __name__ == "__main__":
+    setup(
+        install_requires=[
+            "pydantic",
+            "qtconsole",
+            QT_DEPENDENCY,
+            QSCINTILLA_DEPENDENCY,
+            "jedi",
+            "qtpy",
+            "pyqtgraph",
+            "bec_lib",
+            "zmq",
+            "h5py",
+            "pyqtdarktheme",
+        ],
+        extras_require={
+            "dev": [
+                "pytest",
+                "pytest-random-order",
+                "pytest-timeout",
+                "coverage",
+                "pytest-qt",
+                "black",
+            ],
+            "pyqt5": ["PyQt5>=5.9"],
+            "pyqt6": ["PyQt6>=6.0"],
+        },
+        version=__version__,
+        packages=find_packages(),
+        include_package_data=True,
+        package_data={"": ["*.ui", "*.yaml"]},
+    )
--- a/tests/client_mocks.py
+++ b/tests/client_mocks.py
@@ -0,0 +1,77 @@
+# pylint: disable = no-name-in-module,missing-class-docstring, missing-module-docstring
+
+import pytest
+from unittest.mock import MagicMock
+
+
+class FakeDevice:
+    """Fake minimal positioner class for testing."""
+
+    def __init__(self, name, enabled=True):
+        self.name = name
+        self.enabled = enabled
+        self.signals = {self.name: {"value": 1.0}}
+        self.description = {self.name: {"source": self.name}}
+
+    def __contains__(self, item):
+        return item == self.name
+
+    @property
+    def _hints(self):
+        return [self.name]
+
+    def set_value(self, fake_value: float = 1.0) -> None:
+        """
+        Setup fake value for device readout
+        Args:
+            fake_value(float): Desired fake value
+        """
+        self.signals[self.name]["value"] = fake_value
+
+    def describe(self) -> dict:
+        """
+        Get the description of the device
+        Returns:
+            dict: Description of the device
+        """
+        return self.description
+
+
+def get_mocked_device(device_name: str):
+    """
+    Helper function to mock the devices
+    Args:
+        device_name(str): Name of the device to mock
+    """
+    return FakeDevice(name=device_name, enabled=True)
+
+
+@pytest.fixture(scope="function")
+def mocked_client():
+    # Create a dictionary of mocked devices
+    device_names = [
+        "samx",
+        "samy",
+        "gauss_bpm",
+        "gauss_adc1",
+        "gauss_adc2",
+        "gauss_adc3",
+        "bpm4i",
+        "bpm3a",
+        "bpm3i",
+    ]
+    mocked_devices = {name: get_mocked_device(name) for name in device_names}
+
+    # Create a MagicMock object
+    client = MagicMock()
+
+    # Mock the device_manager.devices attribute
+    client.device_manager.devices = MagicMock()
+    client.device_manager.devices.__getitem__.side_effect = lambda x: mocked_devices.get(x)
+    client.device_manager.devices.__contains__.side_effect = lambda x: x in mocked_devices
+
+    # Set each device as an attribute of the mock
+    for name, device in mocked_devices.items():
+        setattr(client.device_manager.devices, name, device)
+
+    return client
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -0,0 +1,35 @@
+import pytest
+import threading
+
+from bec_lib.bec_service import BECService
+from bec_widgets.utils import bec_dispatcher as bec_dispatcher_module
+
+
+@pytest.fixture()
+def threads_check():
+    current_threads = set(
+        th
+        for th in threading.enumerate()
+        if "loguru" not in th.name and th is not threading.main_thread()
+    )
+    yield
+    threads_after = set(
+        th
+        for th in threading.enumerate()
+        if "loguru" not in th.name and th is not threading.main_thread()
+    )
+    additional_threads = threads_after - current_threads
+    assert (
+        len(additional_threads) == 0
+    ), f"Test creates {len(additional_threads)} threads that are not cleaned: {additional_threads}"
+
+
+@pytest.fixture(autouse=True)
+def bec_dispatcher(threads_check):
+    bec_dispatcher = bec_dispatcher_module.BECDispatcher()
+    yield bec_dispatcher
+    bec_dispatcher.disconnect_all()
+    # clean BEC client
+    BECService.shutdown(bec_dispatcher.client)
+    # reinitialize singleton for next test
+    bec_dispatcher_module._bec_dispatcher = None
--- a/tests/end-2-end/conftest.py
+++ b/tests/end-2-end/conftest.py
@@ -1,40 +0,0 @@
-import pytest
-
-from bec_widgets.cli.rpc_register import RPCRegister
-from bec_widgets.cli.server import BECWidgetsCLIServer
-from bec_widgets.utils import BECDispatcher
-from bec_widgets.widgets import BECDockArea, BECFigure
-
-
-@pytest.fixture(autouse=True)
-def rpc_register():
-    yield RPCRegister()
-    RPCRegister.reset_singleton()
-
-
-@pytest.fixture
-def rpc_server_figure(qtbot, bec_client_lib, threads_check):
-    dispatcher = BECDispatcher(client=bec_client_lib)  # Has to init singleton with fixture client
-    server = BECWidgetsCLIServer(gui_id="figure", gui_class=BECFigure)
-    qtbot.addWidget(server.gui)
-    qtbot.waitExposed(server.gui)
-    qtbot.wait(1000)  # 1s long to wait until gui is ready
-    yield server
-    dispatcher.disconnect_all()
-    server.client.shutdown()
-    server.shutdown()
-    dispatcher.reset_singleton()
-
-
-@pytest.fixture
-def rpc_server_dock(qtbot, bec_client_lib, threads_check):
-    dispatcher = BECDispatcher(client=bec_client_lib)  # Has to init singleton with fixture client
-    server = BECWidgetsCLIServer(gui_id="figure", gui_class=BECDockArea)
-    qtbot.addWidget(server.gui)
-    qtbot.waitExposed(server.gui)
-    qtbot.wait(1000)  # 1s long to wait until gui is ready
-    yield server
-    dispatcher.disconnect_all()
-    server.client.shutdown()
-    server.shutdown()
-    dispatcher.reset_singleton()
--- a/tests/end-2-end/test_bec_dock_rpc_e2e.py
+++ b/tests/end-2-end/test_bec_dock_rpc_e2e.py
@@ -1,145 +0,0 @@
-import numpy as np
-import pytest
-from bec_lib import MessageEndpoints
-
-from bec_widgets.cli.client import BECDockArea, BECFigure, BECImageShow, BECMotorMap, BECWaveform
-
-
-def test_rpc_add_dock_with_figure_e2e(rpc_server_dock, qtbot):
-    dock = BECDockArea(rpc_server_dock.gui_id)
-    dock_server = rpc_server_dock.gui
-
-    # BEC client shortcuts
-    client = rpc_server_dock.client
-    dev = client.device_manager.devices
-    scans = client.scans
-    queue = client.queue
-
-    # Create 3 docks
-    d0 = dock.add_dock("dock_0")
-    d1 = dock.add_dock("dock_1")
-    d2 = dock.add_dock("dock_2")
-
-    assert len(dock_server.docks) == 3
-
-    # Add 3 figures with some widgets
-    fig0 = d0.add_widget_bec("BECFigure")
-    fig1 = d1.add_widget_bec("BECFigure")
-    fig2 = d2.add_widget_bec("BECFigure")
-
-    assert len(dock_server.docks) == 3
-    assert len(dock_server.docks["dock_0"].widgets) == 1
-    assert len(dock_server.docks["dock_1"].widgets) == 1
-    assert len(dock_server.docks["dock_2"].widgets) == 1
-
-    assert fig1.__class__.__name__ == "BECFigure"
-    assert fig1.__class__ == BECFigure
-    assert fig2.__class__.__name__ == "BECFigure"
-    assert fig2.__class__ == BECFigure
-
-    mm = fig0.motor_map("samx", "samy")
-    plt = fig1.plot("samx", "bpm4i")
-    im = fig2.image("eiger")
-
-    assert mm.__class__.__name__ == "BECMotorMap"
-    assert mm.__class__ == BECMotorMap
-    assert plt.__class__.__name__ == "BECWaveform"
-    assert plt.__class__ == BECWaveform
-    assert im.__class__.__name__ == "BECImageShow"
-    assert im.__class__ == BECImageShow
-
-    assert mm.config_dict["signals"] == {
-        "source": "device_readback",
-        "x": {
-            "name": "samx",
-            "entry": "samx",
-            "unit": None,
-            "modifier": None,
-            "limits": [-50.0, 50.0],
-        },
-        "y": {
-            "name": "samy",
-            "entry": "samy",
-            "unit": None,
-            "modifier": None,
-            "limits": [-50.0, 50.0],
-        },
-        "z": None,
-    }
-    assert plt.config_dict["curves"]["bpm4i-bpm4i"]["signals"] == {
-        "source": "scan_segment",
-        "x": {"name": "samx", "entry": "samx", "unit": None, "modifier": None, "limits": None},
-        "y": {"name": "bpm4i", "entry": "bpm4i", "unit": None, "modifier": None, "limits": None},
-        "z": None,
-    }
-    assert im.config_dict["images"]["eiger"]["monitor"] == "eiger"
-
-    # check initial position of motor map
-    initial_pos_x = dev.samx.read()["samx"]["value"]
-    initial_pos_y = dev.samy.read()["samy"]["value"]
-
-    # Try to make a scan
-    status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
-
-    # wait for scan to finish
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
-
-    # plot
-    plt_last_scan_data = queue.scan_storage.storage[-1].data
-    plt_data = plt.get_all_data()
-    assert plt_data["bpm4i-bpm4i"]["x"] == plt_last_scan_data["samx"]["samx"].val
-    assert plt_data["bpm4i-bpm4i"]["y"] == plt_last_scan_data["bpm4i"]["bpm4i"].val
-
-    # image
-    last_image_device = client.connector.get_last(MessageEndpoints.device_monitor("eiger"))[
-        "data"
-    ].data
-    qtbot.wait(500)
-    last_image_plot = im.images[0].get_data()
-    np.testing.assert_equal(last_image_device, last_image_plot)
-
-    # motor map
-    final_pos_x = dev.samx.read()["samx"]["value"]
-    final_pos_y = dev.samy.read()["samy"]["value"]
-
-    # check final coordinates of motor map
-    motor_map_data = mm.get_data()
-
-    np.testing.assert_equal(
-        [motor_map_data["x"][0], motor_map_data["y"][0]], [initial_pos_x, initial_pos_y]
-    )
-    np.testing.assert_equal(
-        [motor_map_data["x"][-1], motor_map_data["y"][-1]], [final_pos_x, final_pos_y]
-    )
-
-
-def test_dock_manipulations_e2e(rpc_server_dock, qtbot):
-    dock = BECDockArea(rpc_server_dock.gui_id)
-    dock_server = rpc_server_dock.gui
-
-    d0 = dock.add_dock("dock_0")
-    d1 = dock.add_dock("dock_1")
-    d2 = dock.add_dock("dock_2")
-    assert len(dock_server.docks) == 3
-
-    d0.detach()
-    dock.detach_dock("dock_2")
-    assert len(dock_server.docks) == 3
-    assert len(dock_server.tempAreas) == 2
-
-    d0.attach()
-    assert len(dock_server.docks) == 3
-    assert len(dock_server.tempAreas) == 1
-
-    d2.remove()
-    qtbot.wait(200)
-
-    assert len(dock_server.docks) == 2
-    docks_list = list(dict(dock_server.docks).keys())
-    assert ["dock_0", "dock_1"] == docks_list
-
-    dock.clear_all()
-
-    assert len(dock_server.docks) == 0
-    assert len(dock_server.tempAreas) == 0
--- a/tests/end-2-end/test_bec_figure_rpc_e2e.py
+++ b/tests/end-2-end/test_bec_figure_rpc_e2e.py
@@ -1,165 +0,0 @@
-import numpy as np
-import pytest
-from bec_lib import MessageEndpoints
-
-from bec_widgets.cli.client import BECFigure, BECImageShow, BECMotorMap, BECWaveform
-
-
-def test_rpc_waveform1d_custom_curve(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
-    fig_server = rpc_server_figure.gui
-
-    ax = fig.add_plot()
-    curve = ax.add_curve_custom([1, 2, 3], [1, 2, 3])
-    curve.set_color("red")
-    curve = ax.curves[0]
-    curve.set_color("blue")
-
-    assert len(fig_server.widgets) == 1
-    assert len(fig_server.widgets[ax.rpc_id].curves) == 1
-
-
-def test_rpc_plotting_shortcuts_init_configs(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
-    fig_server = rpc_server_figure.gui
-
-    plt = fig.plot("samx", "bpm4i")
-    im = fig.image("eiger")
-    motor_map = fig.motor_map("samx", "samy")
-    plt_z = fig.add_plot("samx", "samy", "bpm4i")
-
-    # Checking if classes are correctly initialised
-    assert len(fig_server.widgets) == 4
-    assert plt.__class__.__name__ == "BECWaveform"
-    assert plt.__class__ == BECWaveform
-    assert im.__class__.__name__ == "BECImageShow"
-    assert im.__class__ == BECImageShow
-    assert motor_map.__class__.__name__ == "BECMotorMap"
-    assert motor_map.__class__ == BECMotorMap
-
-    # check if the correct devices are set
-    # plot
-    assert plt.config_dict["curves"]["bpm4i-bpm4i"]["signals"] == {
-        "source": "scan_segment",
-        "x": {"name": "samx", "entry": "samx", "unit": None, "modifier": None, "limits": None},
-        "y": {"name": "bpm4i", "entry": "bpm4i", "unit": None, "modifier": None, "limits": None},
-        "z": None,
-    }
-    # image
-    assert im.config_dict["images"]["eiger"]["monitor"] == "eiger"
-    # motor map
-    assert motor_map.config_dict["signals"] == {
-        "source": "device_readback",
-        "x": {
-            "name": "samx",
-            "entry": "samx",
-            "unit": None,
-            "modifier": None,
-            "limits": [-50.0, 50.0],
-        },
-        "y": {
-            "name": "samy",
-            "entry": "samy",
-            "unit": None,
-            "modifier": None,
-            "limits": [-50.0, 50.0],
-        },
-        "z": None,
-    }
-    # plot with z scatter
-    assert plt_z.config_dict["curves"]["bpm4i-bpm4i"]["signals"] == {
-        "source": "scan_segment",
-        "x": {"name": "samx", "entry": "samx", "unit": None, "modifier": None, "limits": None},
-        "y": {"name": "samy", "entry": "samy", "unit": None, "modifier": None, "limits": None},
-        "z": {"name": "bpm4i", "entry": "bpm4i", "unit": None, "modifier": None, "limits": None},
-    }
-
-
-def test_rpc_waveform_scan(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
-
-    # add 3 different curves to track
-    plt = fig.plot("samx", "bpm4i")
-    fig.plot("samx", "bpm3a")
-    fig.plot("samx", "bpm4d")
-
-    client = rpc_server_figure.client
-    dev = client.device_manager.devices
-    scans = client.scans
-    queue = client.queue
-
-    status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
-
-    # wait for scan to finish
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
-
-    last_scan_data = queue.scan_storage.storage[-1].data
-
-    # get data from curves
-    plt_data = plt.get_all_data()
-
-    # check plotted data
-    assert plt_data["bpm4i-bpm4i"]["x"] == last_scan_data["samx"]["samx"].val
-    assert plt_data["bpm4i-bpm4i"]["y"] == last_scan_data["bpm4i"]["bpm4i"].val
-    assert plt_data["bpm3a-bpm3a"]["x"] == last_scan_data["samx"]["samx"].val
-    assert plt_data["bpm3a-bpm3a"]["y"] == last_scan_data["bpm3a"]["bpm3a"].val
-    assert plt_data["bpm4d-bpm4d"]["x"] == last_scan_data["samx"]["samx"].val
-    assert plt_data["bpm4d-bpm4d"]["y"] == last_scan_data["bpm4d"]["bpm4d"].val
-
-
-def test_rpc_image(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
-
-    im = fig.image("eiger")
-
-    client = rpc_server_figure.client
-    dev = client.device_manager.devices
-    scans = client.scans
-
-    status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
-
-    # wait for scan to finish
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
-
-    last_image_device = client.connector.get_last(MessageEndpoints.device_monitor("eiger"))[
-        "data"
-    ].data
-    qtbot.wait(500)
-    last_image_plot = im.images[0].get_data()
-
-    # check plotted data
-    np.testing.assert_equal(last_image_device, last_image_plot)
-
-
-def test_rpc_motor_map(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
-    fig_server = rpc_server_figure.gui
-
-    motor_map = fig.motor_map("samx", "samy")
-
-    client = rpc_server_figure.client
-    dev = client.device_manager.devices
-    scans = client.scans
-
-    initial_pos_x = dev.samx.read()["samx"]["value"]
-    initial_pos_y = dev.samy.read()["samy"]["value"]
-
-    status = scans.mv(dev.samx, 1, dev.samy, 2, relative=True)
-
-    # wait for scan to finish
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
-    final_pos_x = dev.samx.read()["samx"]["value"]
-    final_pos_y = dev.samy.read()["samy"]["value"]
-
-    # check plotted data
-    motor_map_data = motor_map.get_data()
-
-    np.testing.assert_equal(
-        [motor_map_data["x"][0], motor_map_data["y"][0]], [initial_pos_x, initial_pos_y]
-    )
-    np.testing.assert_equal(
-        [motor_map_data["x"][-1], motor_map_data["y"][-1]], [final_pos_x, final_pos_y]
-    )
--- a/tests/end-2-end/test_rpc_register_e2e.py
+++ b/tests/end-2-end/test_rpc_register_e2e.py
@@ -1,50 +0,0 @@
-import pytest
-
-from bec_widgets.cli.client import BECFigure, BECImageShow, BECMotorMap, BECWaveform
-
-
-def find_deepest_value(d: dict):
-    """
-    Recursively find the deepest value in a dictionary
-    Args:
-        d(dict): Dictionary to search
-
-    Returns:
-        The deepest value in the dictionary.
-    """
-    if isinstance(d, dict):
-        if d:
-            return find_deepest_value(next(iter(d.values())))
-    return d
-
-
-def test_rpc_register_list_connections(rpc_server_figure, rpc_register, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
-    fig_server = rpc_server_figure.gui
-
-    plt = fig.plot("samx", "bpm4i")
-    im = fig.image("eiger")
-    motor_map = fig.motor_map("samx", "samy")
-    plt_z = fig.add_plot("samx", "samy", "bpm4i")
-
-    all_connections = rpc_register.list_all_connections()
-
-    # Construct dict of all rpc items manually
-    all_subwidgets_expected = dict(fig_server.widgets)
-    curve_1D = find_deepest_value(fig_server.widgets[plt.rpc_id]._curves_data)
-    curve_2D = find_deepest_value(fig_server.widgets[plt_z.rpc_id]._curves_data)
-    curves_expected = {curve_1D.rpc_id: curve_1D, curve_2D.rpc_id: curve_2D}
-    fig_expected = {fig.rpc_id: fig_server}
-    image_item_expected = {
-        fig_server.widgets[im.rpc_id].images[0].rpc_id: fig_server.widgets[im.rpc_id].images[0]
-    }
-
-    all_connections_expected = {
-        **all_subwidgets_expected,
-        **curves_expected,
-        **fig_expected,
-        **image_item_expected,
-    }
-
-    assert len(all_connections) == 8
-    assert all_connections == all_connections_expected
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mathias Guijarro	d996ff9284	fix(test): add a temporary test	2024-02-27 14:09:54 +01:00
Mathias Guijarro	8b43eba282	fix(bec dispatcher): make a new BECClient in _BECDispatcher constructor and process events while waiting	2024-02-27 14:09:54 +01:00
Mathias Guijarro	9c822ec480	fix: producer->connector, remove unused '_rpc_update_handler' static method	2024-02-27 14:09:54 +01:00
				`@@ -0,0 +1 @@`
				`from .monitor_scatter_2D import BECMonitor2DScatter`