diff --git a/Cargo.toml b/Cargo.toml
index 9bd02cc..86be97c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ tiny-skia = { version = "0.12", default-features = false, features = [
   "std",
   "simd",
 ] }
-smithay-client-toolkit = { version = "0.20.0", default-features = false }
+smithay-client-toolkit = { git = "https://github.com/ids1024/client-toolkit", branch = "dispatch2", default-features = false }
 
 # Draw title text using crossfont `--features crossfont`
 crossfont = { version = "0.9.0", optional = true }
diff --git a/src/lib.rs b/src/lib.rs
index aedd1bb..4d42065 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -63,7 +63,7 @@ type SkiaResult = Option<()>;
 #[derive(Debug)]
 pub struct AdwaitaFrame<State> {
     /// The base surface used to create the window.
-    base_surface: WlTyped<WlSurface, SurfaceData>,
+    base_surface: WlTyped<WlSurface, SurfaceData<()>>,
 
     compositor: Arc<CompositorState>,
 
@@ -110,7 +110,7 @@ pub struct AdwaitaFrame<State> {
 
 impl<State> AdwaitaFrame<State>
 where
-    State: Dispatch<WlSurface, SurfaceData> + Dispatch<WlSubsurface, SubsurfaceData> + 'static,
+    State: Dispatch<WlSurface, SurfaceData<()>> + Dispatch<WlSubsurface, SubsurfaceData> + 'static,
 {
     pub fn new(
         base_surface: &impl WaylandSurface,
@@ -378,7 +378,7 @@ where
 
 impl<State> DecorationsFrame for AdwaitaFrame<State>
 where
-    State: Dispatch<WlSurface, SurfaceData> + Dispatch<WlSubsurface, SubsurfaceData> + 'static,
+    State: Dispatch<WlSurface, SurfaceData<()>> + Dispatch<WlSubsurface, SubsurfaceData> + 'static,
 {
     fn update_state(&mut self, state: WindowState) {
         let difference = self.state.symmetric_difference(state);
diff --git a/src/parts.rs b/src/parts.rs
index 0b7f75b..bd5c468 100644
--- a/src/parts.rs
+++ b/src/parts.rs
@@ -53,12 +53,13 @@ pub struct DecorationParts {
 
 impl DecorationParts {
     pub fn new<State>(
-        base_surface: &WlTyped<WlSurface, SurfaceData>,
+        base_surface: &WlTyped<WlSurface, SurfaceData<()>>,
         subcompositor: &SubcompositorState,
         queue_handle: &QueueHandle<State>,
     ) -> Self
     where
-        State: Dispatch<WlSurface, SurfaceData> + Dispatch<WlSubsurface, SubsurfaceData> + 'static,
+        State:
+            Dispatch<WlSurface, SurfaceData<()>> + Dispatch<WlSubsurface, SubsurfaceData> + 'static,
     {
         let parts = [
             Part::new(base_surface, subcompositor, queue_handle),
@@ -295,7 +296,7 @@ pub struct Rect {
 
 #[derive(Debug)]
 pub struct Part {
-    pub surface: WlTyped<WlSurface, SurfaceData>,
+    pub surface: WlTyped<WlSurface, SurfaceData<()>>,
     pub subsurface: WlTyped<WlSubsurface, SubsurfaceData>,
 
     /// Positioned relative to the main surface.
@@ -310,12 +311,13 @@ pub struct Part {
 
 impl Part {
     fn new<State>(
-        parent: &WlTyped<WlSurface, SurfaceData>,
+        parent: &WlTyped<WlSurface, SurfaceData<()>>,
         subcompositor: &SubcompositorState,
         queue_handle: &QueueHandle<State>,
     ) -> Part
     where
-        State: Dispatch<WlSurface, SurfaceData> + Dispatch<WlSubsurface, SubsurfaceData> + 'static,
+        State:
+            Dispatch<WlSurface, SurfaceData<()>> + Dispatch<WlSubsurface, SubsurfaceData> + 'static,
     {
         let (subsurface, surface) =
             subcompositor.create_subsurface(parent.inner().clone(), queue_handle);