diff --git a/home-manager/modules/colors.nix b/home-manager/modules/colors.nix
index a292118..3773621 100644
--- a/home-manager/modules/colors.nix
+++ b/home-manager/modules/colors.nix
@@ -175,31 +175,63 @@ in
         name = "colors-${themeHash}";
         is_dark = true;
         colors = {
-          "accent-color" = "#${cfg.base16.base02}";
-          "primary-color" = "#${cfg.base16.base08}";
-          "warning-color" = "#${cfg.base16.base0F}";
+          # "accent-color" = "#${cfg.base16.base02}";
+          # "primary-color" = "#${cfg.base16.base08}";
+          # "warning-color" = "#${cfg.base16.base0F}";
 
-          "sidebar-color" = "#${cfg.base16.base01}";
-          "roomlist-background-color" = "#${cfg.base16.base00}";
+          # "sidebar-color" = "#${cfg.base16.base01}";
+          # "roomlist-background-color" = "#${cfg.base16.base00}";
+          # "roomlist-text-color" = "#${cfg.base16.base05}";
+          # "roomlist-text-secondary-color" = "${cfg.base16.base06}";
+          # "roomlist-highlights-color" = "#${cfg.base16.base02}";
+          # "roomlist-separator-color" = "#${cfg.base16.base05}";
+
+          # "timeline-background-color" = "#${cfg.base16.base00}";
+          # "timeline-text-color" = "#${cfg.base16.base07}";
+          # "timeline-text-secondary-color" = "#${cfg.base16.base05}";
+          # "timeline-highlights-color" = "#${cfg.base16.base02}";
+          # "reaction-row-button-selected-bg-color" = "#${cfg.base16.base0B}";
+
+          "accent-color" = "#${cfg.base16.base02}";
+          "accent" = "#${cfg.base16.base02}";
+          "primary-color" = "#${cfg.base16.base0B}";
+          "warning-color" = "#${cfg.base16.base08}";
+          "alert" = "#${cfg.base16.base08}";
+
+          "sidebar-color" = "#${cfg.base16.base00}";
+          "roomlist-background-color" = "#${cfg.base16.base01}";
           "roomlist-text-color" = "#${cfg.base16.base05}";
-          "roomlist-text-secondary-color" = "${cfg.base16.base06}";
-          "roomlist-highlights-color" = "#${cfg.base16.base02}";
+          "roomlist-text-secondary-color" = "${cfg.base16.base09}";
+          "roomlist-highlights-color" = "#${cfg.base16.base08}";
           "roomlist-separator-color" = "#${cfg.base16.base05}";
 
           "timeline-background-color" = "#${cfg.base16.base00}";
-          "timeline-text-color" = "#${cfg.base16.base07}";
-          "timeline-text-secondary-color" = "#${cfg.base16.base05}";
-          "timeline-highlights-color" = "#${cfg.base16.base02}";
-          "reaction-row-button-selected-bg-color" = "#${cfg.base16.base0B}";
+          "timeline-text-color" = "#${cfg.base16.base05}";
+          "secondary-content" = "#${cfg.base16.base05}";
+          "tertiary-content" = "#${cfg.base16.base05}";
+          "timeline-text-secondary-color" = "#${cfg.base16.base06}";
+          "timeline-highlights-color" = "#${cfg.base16.base03}";
+
+          "reaction-row-button-selected-bg-color" = "#${cfg.base16.base04}";
+          "menu-selected-color" = "#${cfg.base16.base04}";
+          "focus-bg-color" = "#${cfg.base16.base04}";
+          "room-highlight-color" = "#${cfg.base16.base04}";
+          "other-user-pill-bg-color" = "#${cfg.base16.base04}";
+          "togglesw-off-color" = "#${cfg.base16.base04}";
+
+          "username-colors" = [ "#${cfg.base16.base08}" "#${cfg.base16.base09}" "#${cfg.base16.base0A}" "#${cfg.base16.base0B}" "#${cfg.base16.base0C}" "#${cfg.base16.base0D}" "#${cfg.base16.base0E}" "#${cfg.base16.base0F}" ];
+          # "avatar-background-colors" = [ "#${cfg.base16.base03}" "#${cfg.base16.base04}" "#${cfg.base16.base05}" ];
         };
       };
 
       elementConfig = {
         settingDefaults.custom_themes = [ elementTheme ];
 
-        settingDefaults.theme = "custom-${elementTheme.name}";
+        settingDefaults.theme = "${elementTheme.name}";
+        default_theme = "${elementTheme.name}";
 
         showLabsSettings = true;
+        show_labs_settings = true;
       };
 
       base16FromImageSrc = pkgs.runCommandNoCC "auto-image-base16" { } ''
@@ -218,6 +250,9 @@ in
       # Element
       xdg.configFile."Riot/config.json".text = builtins.toJSON elementConfig;
       xdg.configFile."Element/config.json".text = builtins.toJSON elementConfig;
+      # And in case you want to do something with the generated theme yourself
+      xdg.configFile."Riot/theme.json".text = builtins.toJSON elementTheme;
+      xdg.configFile."Element/theme.json".text = builtins.toJSON elementTheme;
 
       # Mako
       programs.mako = {
diff --git a/home-manager/modules/de2u.nix b/home-manager/modules/de2u.nix
index 1efac27..2a9504f 100644
--- a/home-manager/modules/de2u.nix
+++ b/home-manager/modules/de2u.nix
@@ -37,7 +37,6 @@ in
       };
     };
 
-    programs.chromium.enable = lib.mkDefault true;
     programs.firefox = {
       enable = lib.mkDefault true;