diff --git a/bec_widgets/cli/client.py b/bec_widgets/cli/client.py
index c948a4dc..3e9d431e 100644
--- a/bec_widgets/cli/client.py
+++ b/bec_widgets/cli/client.py
@@ -1,9 +1,8 @@
 # This file was automatically generated by generate_cli.py
 
+from bec_widgets.cli.client_utils import rpc_call, RPCBase, BECGuiClientMixin
 from typing import Literal, Optional, overload
 
-from bec_widgets.cli.client_utils import BECGuiClientMixin, RPCBase, rpc_call
-
 
 class BECPlotBase(RPCBase):
     @property
@@ -1429,7 +1428,7 @@ class BECDock(RPCBase):
 
     @property
     @rpc_call
-    def widget_list(self) -> "list":
+    def widget_list(self) -> "list[BECConnector]":
         """
         Get the widgets in the dock.
 
@@ -1550,7 +1549,7 @@ class BECDockArea(RPCBase, BECGuiClientMixin):
 
     @property
     @rpc_call
-    def panels(self) -> "dict":
+    def panels(self) -> "dict[str, BECDock]":
         """
         Get the docks in the dock area.
         Returns:
diff --git a/bec_widgets/widgets/dock/dock.py b/bec_widgets/widgets/dock/dock.py
index d53cbe49..d550e977 100644
--- a/bec_widgets/widgets/dock/dock.py
+++ b/bec_widgets/widgets/dock/dock.py
@@ -93,7 +93,7 @@ class BECDock(BECConnector, Dock):
             super().float()
 
     @property
-    def widget_list(self) -> list:
+    def widget_list(self) -> list[BECConnector]:
         """
         Get the widgets in the dock.
 
@@ -103,7 +103,7 @@ class BECDock(BECConnector, Dock):
         return self.widgets
 
     @widget_list.setter
-    def widget_list(self, value: list):
+    def widget_list(self, value: list[BECConnector]):
         self.widgets = value
 
     def hide_title_bar(self):
diff --git a/bec_widgets/widgets/dock/dock_area.py b/bec_widgets/widgets/dock/dock_area.py
index 4900e42a..2f4b3a11 100644
--- a/bec_widgets/widgets/dock/dock_area.py
+++ b/bec_widgets/widgets/dock/dock_area.py
@@ -61,7 +61,7 @@ class BECDockArea(BECConnector, DockArea):
             painter.drawText(self.rect(), Qt.AlignCenter, "Add docks using 'add_dock' method")
 
     @property
-    def panels(self) -> dict:
+    def panels(self) -> dict[str, BECDock]:
         """
         Get the docks in the dock area.
         Returns:
@@ -70,7 +70,7 @@ class BECDockArea(BECConnector, DockArea):
         return dict(self.docks)
 
     @panels.setter
-    def panels(self, value: dict):
+    def panels(self, value: dict[str, BECDock]):
         self.docks = WeakValueDictionary(value)
 
     @property