diff --git a/flake.nix b/flake.nix
index 4b9be45..9d1a457 100644
--- a/flake.nix
+++ b/flake.nix
@@ -285,7 +285,6 @@
               home-manager.sharedModules = [
                 { home.stateVersion = "22.11"; }
                 # keep-sorted start
-                self.homeModules.adwaita
                 self.homeModules.git
                 self.homeModules.gnome-extensions
                 self.homeModules.nano
@@ -298,32 +297,6 @@
               home-manager.users = home-manager-users;
             }
 
-            (
-              { pkgs, ... }:
-              {
-                stylix = {
-                  enable = true;
-                  base16Scheme = "${pkgs.base16-schemes}/share/themes/edge-dark.yaml";
-                  polarity = "dark";
-                  targets = {
-                    gnome.enable = false;
-                  };
-                  fonts = {
-                    monospace = {
-                      name = "FiraCode Nerd Font Mono";
-                      package = pkgs.nerd-fonts.fira-code;
-                    };
-                  };
-                  /*
-                    homeManagerIntegration = {
-                      autoImport = false;
-                      followSystem = false;
-                    };
-                  */
-                };
-              }
-            )
-
             # keep-sorted start
             home-manager.nixosModules.home-manager
             self.nixosModules.en-de
@@ -336,6 +309,7 @@
             self.nixosModules.pkgs-unstable
             self.nixosModules.pkgs-vscode-extensions
             self.nixosModules.quiet-boot
+            self.nixosModules.stylix
             servicepoint-cli.nixosModules.default
             servicepoint-simulator.nixosModules.default
             servicepoint-tanks.nixosModules.default
diff --git a/homeConfigurations/ronja/vscode.nix b/homeConfigurations/ronja/vscode.nix
index 5a4ac7f..5226411 100644
--- a/homeConfigurations/ronja/vscode.nix
+++ b/homeConfigurations/ronja/vscode.nix
@@ -27,7 +27,6 @@
           "files.autoSaveWhenNoErrors" = true;
           "files.autoSaveWorkspaceFilesOnly" = true;
 
-          "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
           "editor.fontLigatures" = true;
           "editor.formatOnSave" = true;
           "editor.formatOnSaveMode" = "modificationsIfAvailable";
diff --git a/homeConfigurations/vinzenz/fonts.nix b/homeConfigurations/vinzenz/fonts.nix
index 6553c2a..ebda673 100644
--- a/homeConfigurations/vinzenz/fonts.nix
+++ b/homeConfigurations/vinzenz/fonts.nix
@@ -1,12 +1,9 @@
 { pkgs, ... }:
 {
-  fonts.fontconfig = {
-    enable = true;
-    defaultFonts.monospace = [ "FiraCode Nerd Font Mono" ];
-  };
+  fonts.fontconfig.enable = true;
   home.packages = with pkgs; [
-    nerd-fonts.fira-code
     roboto-mono
     recursive
+    font-awesome
   ];
 }
diff --git a/homeConfigurations/vinzenz/fuzzel.nix b/homeConfigurations/vinzenz/fuzzel.nix
index faf3814..bf33708 100644
--- a/homeConfigurations/vinzenz/fuzzel.nix
+++ b/homeConfigurations/vinzenz/fuzzel.nix
@@ -7,22 +7,8 @@
         terminal = "${lib.getBin pkgs.gnome-console}/bin/kgx";
         icon-theme = "Adwaita";
         counter = true;
-        font = "sans:size=11";
         launch-prefix = "niri msg action spawn --";
       };
-      colors = {
-        border = "0003B3FF";
-        background = "0F0F0FFF";
-        text = "657b83ff";
-        prompt = "586e75ff";
-        placeholder = "93a1a1ff";
-        input = "657b83ff";
-        match = "cb4b16ff";
-        selection = "eee8d5ff";
-        selection-text = "586e75ff";
-        selection-match = "cb4b16ff";
-        counter = "93a1a1ff";
-      };
       border = {
         radius = 30;
         width = 3;
diff --git a/homeConfigurations/vinzenz/starship.nix b/homeConfigurations/vinzenz/starship.nix
index 003e022..458058d 100644
--- a/homeConfigurations/vinzenz/starship.nix
+++ b/homeConfigurations/vinzenz/starship.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ lib, ... }:
 {
   config.programs.starship = {
     enable = true;
@@ -15,7 +15,8 @@
         + "([ $cmd_duration$status](bg:color_y fg:text_y))[](fg:color_y)"
         + "$line_break$character ";
 
-      palette = "color_me_surprised";
+      # TODO: replace with base16 theme
+      palette = lib.mkForce "color_me_surprised";
       palettes.color_me_surprised = {
         "color_r" = "#a30262";
         "color_g" = "#d162a4";
@@ -210,121 +211,6 @@
       swift.symbol = "";
       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 481d02f..80bb967 100644
--- a/homeConfigurations/vinzenz/vscode.nix
+++ b/homeConfigurations/vinzenz/vscode.nix
@@ -37,7 +37,6 @@
           "files.autoSaveWhenNoErrors" = true;
           "files.autoSaveWorkspaceFilesOnly" = true;
 
-          "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
           "editor.fontLigatures" = true;
           "editor.formatOnSave" = true;
           "editor.formatOnSaveMode" = "modificationsIfAvailable";
diff --git a/homeConfigurations/vinzenz/waybar.nix b/homeConfigurations/vinzenz/waybar.nix
index da1516b..44d7099 100644
--- a/homeConfigurations/vinzenz/waybar.nix
+++ b/homeConfigurations/vinzenz/waybar.nix
@@ -13,7 +13,7 @@
     enable = true;
     systemd.enable = true;
     systemd.target = "graphical-session.target";
-    style = ./waybar.css;
+    style = lib.mkAfter (builtins.readFile ./waybar.css);
     settings = {
       mainBar = {
         layer = "top";
diff --git a/homeModules/adwaita.nix b/homeModules/adwaita.nix
deleted file mode 100644
index 96d24c7..0000000
--- a/homeModules/adwaita.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  gtk = {
-    enable = true;
-    iconTheme.name = "Adwaita";
-    cursorTheme.name = "Adwaita";
-    theme = {
-      name = "adw-gtk3-dark";
-      package = pkgs.adw-gtk3;
-    };
-  };
-}
diff --git a/nixosModules/stylix.nix b/nixosModules/stylix.nix
new file mode 100644
index 0000000..fe10652
--- /dev/null
+++ b/nixosModules/stylix.nix
@@ -0,0 +1,35 @@
+{ pkgs, ... }:
+{
+  stylix = {
+    enable = true;
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+    polarity = "dark";
+    targets = {
+      gnome.enable = false;
+      gtk.enable = false;
+      gtksourceview.enable = false;
+      fontconfig.enable = true;
+    };
+    fonts = {
+      sansSerif = {
+        name = "Inter";
+        package = pkgs.inter;
+      };
+      monospace = {
+        name = "FiraCode Nerd Font Mono";
+        package = pkgs.nerd-fonts.fira-code;
+      };
+    };
+    icons = {
+      enable = true;
+      dark = "Adwaita";
+      light = "Adwaita";
+      package = pkgs.adwaita-icon-theme;
+    };
+    cursor = {
+      name = "Adwaita";
+      size = 16;
+      package = pkgs.adwaita-icon-theme;
+    };
+  };
+}