diff --git a/flake.lock b/flake.lock
index 59dacee..f0e3317 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,49 +1,5 @@
 {
   "nodes": {
-    "binding": {
-      "inputs": {
-        "binding": "binding_2",
-        "nixpkgs": [
-          "servicepoint-tanks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1759096792,
-        "narHash": "sha256-CW4D1yJecw7Id6AxIEJOW3OpcX3Y4Ehng76/YlR1I9w=",
-        "ref": "refs/heads/main",
-        "rev": "8df2996504866f3193fbe51860ab173d25724e5e",
-        "revCount": 307,
-        "type": "git",
-        "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-binding-csharp.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-binding-csharp.git"
-      }
-    },
-    "binding_2": {
-      "inputs": {
-        "nixpkgs": [
-          "servicepoint-tanks",
-          "binding",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1759093963,
-        "narHash": "sha256-nis9Xps/P1f/v9FC3LoMLGGCOMMbdrOniDSklqLsH8o=",
-        "ref": "refs/heads/main",
-        "rev": "44ef4bb6d707c46af1bed6244f17a16f26f246c1",
-        "revCount": 304,
-        "type": "git",
-        "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-binding-uniffi.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-binding-uniffi.git"
-      }
-    },
     "fenix": {
       "inputs": {
         "nixpkgs": [
@@ -90,6 +46,24 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -169,11 +143,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1761187190,
-        "narHash": "sha256-5ln16iOeWpEX5MO7M3jzFEBNFE42gpFsCvSvPjtF6tQ=",
+        "lastModified": 1760106247,
+        "narHash": "sha256-6eoVSzv2sNlZx3wgIGvwYrbL8X/FpCb/5cw/N/f/v6c=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "77a07f5d3b775fba67550c38122ebb8d3ee3ba1c",
+        "rev": "8ba0df9f335050044eddae848a7be8d9269ecc76",
         "type": "github"
       },
       "original": {
@@ -202,11 +176,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1760940149,
-        "narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=",
+        "lastModified": 1759395653,
+        "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5",
+        "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec",
         "type": "github"
       },
       "original": {
@@ -247,16 +221,17 @@
     },
     "nix-vscode-extensions": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1761240986,
-        "narHash": "sha256-EjePxTz1P2cdFCPG+M33CGUpBVkD2W+zllZF0Cv1uDY=",
+        "lastModified": 1760071578,
+        "narHash": "sha256-MZUsqax6PoXPDzhpLyduHoPY4CYYrzL97uKbsx/iGPE=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "868d9f20e2d57e78cc53598f760c547a516f6ba7",
+        "rev": "65365fe8c09b6c1b6bba1885a126723815376b1b",
         "type": "github"
       },
       "original": {
@@ -267,11 +242,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761016216,
-        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
+        "lastModified": 1759994382,
+        "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
+        "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7",
         "type": "github"
       },
       "original": {
@@ -283,11 +258,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1760965567,
-        "narHash": "sha256-0JDOal5P7xzzAibvD0yTE3ptyvoVOAL0rcELmDdtSKg=",
+        "lastModified": 1759977445,
+        "narHash": "sha256-LYr4IDfuihCkFAkSYz5//gT2r1ewcWBYgd5AxPzPLIo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cb82756ecc37fa623f8cf3e88854f9bf7f64af93",
+        "rev": "2dad7af78a183b6c486702c18af8a9544f298377",
         "type": "github"
       },
       "original": {
@@ -306,7 +281,6 @@
         "nixpkgs-unstable": "nixpkgs-unstable",
         "servicepoint-cli": "servicepoint-cli",
         "servicepoint-simulator": "servicepoint-simulator",
-        "servicepoint-tanks": "servicepoint-tanks",
         "zerforschen-plus": "zerforschen-plus"
       }
     },
@@ -388,26 +362,19 @@
         "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git"
       }
     },
-    "servicepoint-tanks": {
-      "inputs": {
-        "binding": "binding",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
+    "systems": {
       "locked": {
-        "lastModified": 1760288584,
-        "narHash": "sha256-2eY1f4LV9s5Hc/tb1iuJYPewE4Seyeguf7VdzC9bbbo=",
-        "ref": "service-improvements",
-        "rev": "1bb73d664dac78c5d69a02ae67169d76cca7aab4",
-        "revCount": 218,
-        "type": "git",
-        "url": "https://git.berlin.ccc.de/vinzenz/servicepoint-tanks.git"
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
       },
       "original": {
-        "ref": "service-improvements",
-        "type": "git",
-        "url": "https://git.berlin.ccc.de/vinzenz/servicepoint-tanks.git"
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
       }
     },
     "xwayland-satellite-stable": {
@@ -430,11 +397,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1761173223,
-        "narHash": "sha256-FumZh+fPRaKXkl9Y1uTh5KV7Io/AyOZso+UkqLhLArs=",
+        "lastModified": 1759707084,
+        "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "bf745144acda1343934e9a094cf9458a54d57889",
+        "rev": "a9188e70bd748118b4d56a529871b9de5adb9988",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index b046911..863a4c0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,11 +14,6 @@
       inputs.nixpkgs-stable.follows = "nixpkgs";
     };
 
-    nix-vscode-extensions = {
-      url = "github:nix-community/nix-vscode-extensions";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     zerforschen-plus = {
       url = "git+https://git.berlin.ccc.de/vinzenz/zerforschen.plus";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -34,8 +29,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    servicepoint-tanks = {
-      url = "git+https://git.berlin.ccc.de/vinzenz/servicepoint-tanks.git?ref=service-improvements";
+    nix-vscode-extensions = {
+      url = "github:nix-community/nix-vscode-extensions";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -48,10 +43,10 @@
       niri,
       zerforschen-plus,
       nixpkgs-unstable,
-      nix-vscode-extensions,
       servicepoint-cli,
       servicepoint-simulator,
-      servicepoint-tanks,
+      nix-vscode-extensions,
+      ...
     }:
     let
       devices = {
@@ -256,7 +251,6 @@
             home-manager.nixosModules.home-manager
             servicepoint-simulator.nixosModules.default
             servicepoint-cli.nixosModules.default
-            servicepoint-tanks.nixosModules.default
           ])
           ++ additional-modules;
         }
diff --git a/homeConfigurations/vinzenz/starship.nix b/homeConfigurations/vinzenz/starship.nix
index 480c748..1478bf3 100644
--- a/homeConfigurations/vinzenz/starship.nix
+++ b/homeConfigurations/vinzenz/starship.nix
@@ -10,21 +10,19 @@
       format =
         "[](fg:color_r)[$username $os $hostname ($container )](bg:color_r fg:text_r)[ ](fg:color_r bg:color_g)"
         + "[$directory ](bg:color_g fg:text_g)[ ](fg:color_g bg:color_b)"
-        + "([(\\[$git_state$git_branch$git_commit$git_status\\] )"
-        + "$all](bg:color_b fg:text_b))[](fg:color_b bg:color_y)"
-        + "([ $cmd_duration$status](bg:color_y fg:text_y))[](fg:color_y)"
-        + "$line_break$character ";
+        + "([($git_state$git_branch$git_commit$git_status)"
+        + "$all](bg:color_b fg:text_b))[ ](fg:color_b)"
+        + "$cmd_duration"
+        + "$line_break$character$status > ";
 
       palette = "color_me_surprised";
       palettes.color_me_surprised = {
-        "color_r" = "#a30262";
-        "color_g" = "#d162a4";
-        "color_b" = "#5BCEFA";
-        "color_y" = "white";
+        "color_r" = "red";
+        "color_g" = "green";
+        "color_b" = "blue";
         "text_r" = "white";
         "text_g" = "black";
-        "text_b" = "black";
-        "text_y" = "black";
+        "text_b" = "white";
       };
 
       username = {
@@ -32,9 +30,6 @@
         style_user = "bg:color_r fg:text_r";
         style_root = "bold bg:color_r fg:text_r";
         show_always = true;
-        aliases = {
-          "vinzenz" = "müde";
-        };
       };
       os = {
         disabled = false;
@@ -70,21 +65,19 @@
       };
 
       git_state = {
-        style = "fg:text_b bg:color_b";
+        style = "fg:white bg:color_b";
       };
       git_branch = {
-        style = "fg:text_b bg:color_b";
+        style = "fg:white bg:color_b";
         format = "[$symbol $branch(:$remote_branch) ]($style)";
-        symbol = "";
       };
       git_commit = {
         format = "[$hash$tag ]($style)";
-        style = "fg:text_b bg:color_b";
-        tag_symbol = "";
+        style = "fg:white bg:color_b";
       };
       git_status = {
-        format = "[$all_status$ahead_behind]($style)";
-        style = "fg:text_b bg:color_b";
+        format = "[$all_status$ahead_behind ]($style)";
+        style = "fg:white bg:color_b";
         ahead = "⇡$count";
         behind = "⇣$count";
         diverged = "⇕⇡$ahead_count⇣$behind_count";
@@ -98,27 +91,26 @@
       rust = {
         symbol = "󱘗";
         format = "$symbol$version ";
-        version_format = "$major.$minor";
+        version_format = "$\{raw\}";
       };
       nix_shell = {
         symbol = "";
         format = "$symbol( \($name\))";
       };
 
+      character = {
+        success_symbol = "[](bold fg:green)";
+        error_symbol = "[✗](bold fg:color_r)";
+      };
       status = {
         disabled = false;
         format = "[$symbol$status_common_meaning$status_signal_name$status_maybe_int]($style)";
         map_symbol = true;
         pipestatus = true;
-        style = "bg:color_y fg:text_y";
+        symbol = "🔴";
       };
       cmd_duration = {
-        format = "󱦟 $duration ";
-      };
-
-      character = {
-        success_symbol = "[](bold)";
-        error_symbol = "[✗](bold fg:color_r)";
+        format = "[󱦟 $duration]($style)";
       };
 
       # icons
@@ -138,6 +130,8 @@
       fennel.symbol = "";
       fossil_branch.symbol = "";
       gcloud.symbol = " ";
+      git_branch.symbol = "";
+      git_commit.tag_symbol = " ";
       golang.symbol = "";
       guix_shell.symbol = "";
       haskell.symbol = "";
@@ -211,120 +205,6 @@
       zig.symbol = "";
       gradle.symbol = "";
 
-      palettes = {
-        catppuccin_mocha = {
-          rosewater = "#f5e0dc";
-          flamingo = "#f2cdcd";
-          pink = "#f5c2e7";
-          mauve = "#cba6f7";
-          red = "#f38ba8";
-          maroon = "#eba0ac";
-          peach = "#fab387";
-          yellow = "#f9e2af";
-          green = "#a6e3a1";
-          teal = "#94e2d5";
-          sky = "#89dceb";
-          sapphire = "#74c7ec";
-          blue = "#89b4fa";
-          lavender = "#b4befe";
-          text = "#cdd6f4";
-          subtext1 = "#bac2de";
-          subtext0 = "#a6adc8";
-          overlay2 = "#9399b2";
-          overlay1 = "#7f849c";
-          overlay0 = "#6c7086";
-          surface2 = "#585b70";
-          surface1 = "#45475a";
-          surface0 = "#313244";
-          base = "#1e1e2e";
-          mantle = "#181825";
-          crust = "#11111b";
-        };
-        catppuccin_frappe = {
-          rosewater = "#f2d5cf";
-          flamingo = "#eebebe";
-          pink = "#f4b8e4";
-          mauve = "#ca9ee6";
-          red = "#e78284";
-          maroon = "#ea999c";
-          peach = "#ef9f76";
-          yellow = "#e5c890";
-          green = "#a6d189";
-          teal = "#81c8be";
-          sky = "#99d1db";
-          sapphire = "#85c1dc";
-          blue = "#8caaee";
-          lavender = "#babbf1";
-          text = "#c6d0f5";
-          subtext1 = "#b5bfe2";
-          subtext0 = "#a5adce";
-          overlay2 = "#949cbb";
-          overlay1 = "#838ba7";
-          overlay0 = "#737994";
-          surface2 = "#626880";
-          surface1 = "#51576d";
-          surface0 = "#414559";
-          base = "#303446";
-          mantle = "#292c3c";
-          crust = "#232634";
-        };
-        catppuccin_latte = {
-          rosewater = "#dc8a78";
-          flamingo = "#dd7878";
-          pink = "#ea76cb";
-          mauve = "#8839ef";
-          red = "#d20f39";
-          maroon = "#e64553";
-          peach = "#fe640b";
-          yellow = "#df8e1d";
-          green = "#40a02b";
-          teal = "#179299";
-          sky = "#04a5e5";
-          sapphire = "#209fb5";
-          blue = "#1e66f5";
-          lavender = "#7287fd";
-          text = "#4c4f69";
-          subtext1 = "#5c5f77";
-          subtext0 = "#6c6f85";
-          overlay2 = "#7c7f93";
-          overlay1 = "#8c8fa1";
-          overlay0 = "#9ca0b0";
-          surface2 = "#acb0be";
-          surface1 = "#bcc0cc";
-          surface0 = "#ccd0da";
-          base = "#eff1f5";
-          mantle = "#e6e9ef";
-          crust = "#dce0e8";
-        };
-        catppuccin_macchiato = {
-          rosewater = "#f4dbd6";
-          flamingo = "#f0c6c6";
-          pink = "#f5bde6";
-          mauve = "#c6a0f6";
-          red = "#ed8796";
-          maroon = "#ee99a0";
-          peach = "#f5a97f";
-          yellow = "#eed49f";
-          green = "#a6da95";
-          teal = "#8bd5ca";
-          sky = "#91d7e3";
-          sapphire = "#7dc4e4";
-          blue = "#8aadf4";
-          lavender = "#b7bdf8";
-          text = "#cad3f5";
-          subtext1 = "#b8c0e0";
-          subtext0 = "#a5adcb";
-          overlay2 = "#939ab7";
-          overlay1 = "#8087a2";
-          overlay0 = "#6e738d";
-          surface2 = "#5b6078";
-          surface1 = "#494d64";
-          surface0 = "#363a4f";
-          base = "#24273a";
-          mantle = "#1e2030";
-          crust = "#181926";
-        };
-      };
     };
   };
 }
diff --git a/homeConfigurations/vinzenz/vscode.nix b/homeConfigurations/vinzenz/vscode.nix
index 27b77fd..c4ff381 100644
--- a/homeConfigurations/vinzenz/vscode.nix
+++ b/homeConfigurations/vinzenz/vscode.nix
@@ -22,7 +22,6 @@
             mkhl.direnv
             muhammad-sammy.csharp
             davidanson.vscode-markdownlint
-            #mermaidchart.vscode-mermaid-chart
           ]
           ++ (with pkgs.vscode-extensions; [
             vadimcn.vscode-lldb
@@ -71,8 +70,7 @@
             };
           };
 
-          "dotnetAcquisitionExtension.sharedExistingDotnetPath" =
-            "${lib.getBin pkgs.dotnetCorePackages.sdk_9_0}/bin/dotnet";
+          "dotnetAcquisitionExtension.sharedExistingDotnetPath" = "${lib.getBin pkgs.dotnet-sdk}/bin/dotnet";
 
           "\[makefile\]" = {
             "editor.insertSpaces" = false;
diff --git a/nixosConfigurations/vinzenz-lpt2/default.nix b/nixosConfigurations/vinzenz-lpt2/default.nix
index 38e9a3f..255dd7a 100644
--- a/nixosConfigurations/vinzenz-lpt2/default.nix
+++ b/nixosConfigurations/vinzenz-lpt2/default.nix
@@ -42,16 +42,5 @@
       8776
       1337
     ];
-
-    services.servicepoint-tanks = {
-      enable = false;
-      urls = [
-        "http://localhost:5666"
-        "http://localhost:5667"
-      ];
-    };
-    nixpkgs.config.permittedInsecurePackages = [
-      "mbedtls-2.28.10"
-    ];
   };
 }
diff --git a/nixosModules/nix-ld.nix b/nixosModules/nix-ld.nix
index 0d09078..382aa3d 100644
--- a/nixosModules/nix-ld.nix
+++ b/nixosModules/nix-ld.nix
@@ -17,7 +17,6 @@
       util-linux
       xz
       systemd
-      icu
     ];
   };
 }
diff --git a/nixosModules/user-vinzenz.nix b/nixosModules/user-vinzenz.nix
index 13ccf11..b48e750 100644
--- a/nixosModules/user-vinzenz.nix
+++ b/nixosModules/user-vinzenz.nix
@@ -3,7 +3,7 @@
   users.users.vinzenz = {
     isNormalUser = true;
     name = "vinzenz";
-    description = "müde";
+    description = "Vinzenz";
     home = "/home/vinzenz";
     extraGroups = [
       "networkmanager"