diff --git a/hosts/catbook-j/modules/input.nix b/hosts/catbook-j/modules/input.nix
index fdb5785..f6d8fee 100644
--- a/hosts/catbook-j/modules/input.nix
+++ b/hosts/catbook-j/modules/input.nix
@@ -23,5 +23,5 @@
     sensitivity = 256;
   };
 
-  services.libinput.touchpad.tapping = true;
+  services.libinput.touchpad.tapping = false;
 }
diff --git a/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck b/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck
index 611590e..635de40 100644
--- a/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck
+++ b/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck
@@ -15,22 +15,18 @@
 (defwidget bottomBar []
   (overlay
     :class "bottomBar"
-    (transform
-      :translate-y "1.5px"
-      (centerbox
-        (box
-          :halign "start"
-          (workspaceWidget)
-        )
-        (box
-          :halign "center"
-          (traveldings)
-        )
-        (box
-          :halign "end"
-          ; (label :text "${iceData.speed}km/h")
-          (iceTacho)
-        )
+    (centerbox
+      (box
+        :halign "start"
+        (workspaceWidget)
+      )
+      (box
+        :halign "center"
+        (traveldings)
+      )
+      (box
+        :halign "end"
+        (label :text "${iceData.speed}km/h")
       )
     )
     (box
@@ -47,19 +43,8 @@
   )
 )
 
-(defwidget iceTacho []
-  (box
-    :class "iceTacho"
-    :tooltip "Tz${iceTachoData.tzn} (BR ${iceTachoData.br})"
-    (circular-progress
-      :value { iceTachoData.frac * 60 + 20 }
-      :thickness 3
-    )
-    (label :text "${iceTachoData.speed} km/h")
-  )
-)
-
-(deflisten iceTachoData
-  :initial "null"
-  { "~/.config/eww/scripts/iceTacho.nu" }
+(defpoll iceData
+  :interval "2s"
+  :initial ""
+  `(iw dev wlp4s0 link | grep "WIFIonICE" > /dev/null) && curl https://iceportal.de/api1/rs/status`
 )
diff --git a/modules/desktop-environment/home/panels/eww/configDir/scripts/iceTacho.nu b/modules/desktop-environment/home/panels/eww/configDir/scripts/iceTacho.nu
old mode 100755
new mode 100644
index fa82321..0be47c8
--- a/modules/desktop-environment/home/panels/eww/configDir/scripts/iceTacho.nu
+++ b/modules/desktop-environment/home/panels/eww/configDir/scripts/iceTacho.nu
@@ -1,38 +1,15 @@
 #!/usr/bin/env nu
 
-const TABLE = {
-  401: 280 
-  402: 280 
-  403: 330 
-  406: 330 
-  407: 320 
-  408: 320 
-  411: 230 
-  415: 230 
-  412: 265 
-  605: 200 
-};
-
-def main [ ] {
-  loop {
-    if ((iw dev wlp4s0 link | lines | filter {|it| $it =~ "WIFIonICE" } | length) == 1) {
-      let iceData = http get https://iceportal.de/api1/rs/status;
-      let tzn = $iceData.tzn;
-      let br = $iceData.series;
-      let speed = $iceData.speed;
-      let speedfrac = $speed / ($TABLE | get $br);
-
-      print ({
-        tzn: $tzn,
-        br: $br,
-        speed: $speed,
-        frac: $speedfrac
-      } | to json -r);
-
-      sleep 2sec;
-    } else {
-      print "null";
-      sleep 5sec;
-    }
-  }
-}
+const TABLE = [
+  [ br vmax ];
+  [ 401 280 ]
+  [ 402 280 ]
+  [ 403 330 ]
+  [ 406 330 ]
+  [ 407 320 ]
+  [ 408 320 ]
+  [ 411 230 ]
+  [ 415 230 ]
+  [ 412 265 ]
+  [ 605 200 ]
+];
diff --git a/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck b/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck
index bf20581..be4b25f 100644
--- a/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck
+++ b/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck
@@ -16,34 +16,31 @@
 (defwidget topBar []
   (overlay
     :class "topBar"
-    (transform
-      :translate-y "-1.5px"
-      (centerbox
-        (box
-          :halign "start"
-          :spacing 12
-          :space-evenly false
-          (label :text " ")
-          (cpu)
-          (sep)
-          (mem)
-          (sep)
-          (label :markup bat0)
-          (sep)
-          (label :markup bat1)
-        )
-        (box
-          :halign "center"
-          (systray
-            :icon-size 18
-            :spacing 3
-          )
-        )
-        (box
-          :halign "end"
-          (time)
+    (centerbox
+      (box
+        :halign "start"
+        :spacing 12
+        :space-evenly false
+        (label :text " ")
+        (cpu)
+        (sep)
+        (mem)
+        (sep)
+        (label :markup bat0)
+        (sep)
+        (label :markup bat1)
+      )
+      (box
+        :halign "center"
+        (systray
+          :icon-size 18
+          :spacing 3
         )
       )
+      (box
+        :halign "end"
+        (time)
+      )
     )
     (box
       :class "transFlag"
diff --git a/modules/desktop-environment/home/sway/default.nix b/modules/desktop-environment/home/sway/default.nix
index 2a2bee3..951afa5 100644
--- a/modules/desktop-environment/home/sway/default.nix
+++ b/modules/desktop-environment/home/sway/default.nix
@@ -79,7 +79,6 @@
           {class = "^Signal$";}
           {class = "^Element$";}
           {class = "^Evolution$";}
-          {class = "^teams-for-linux$";}
         ];
         "2" = [
           {app_id = "^firefox$";}
diff --git a/modules/desktop/social.nix b/modules/desktop/social.nix
index 10c05d0..b8569bc 100644
--- a/modules/desktop/social.nix
+++ b/modules/desktop/social.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: let
   cfg = config.jade.desktop.social;
@@ -17,17 +16,11 @@ in
         ...
       }: {
         home.packages = with pkgs; [
+          pkgs-stable.evolutionWithPlugins
           signal-desktop
           mumble
           element-desktop
-          pkgs.evolution-data-server-gtk4
         ];
       };
-      programs.evolution = {
-        enable = true;
-        plugins = [pkgs.evolution-ews];
-      };
-      services.gnome.evolution-data-server.enable = true;
-      services.gnome.evolution-data-server.plugins = [];
     };
   }