diff --git a/modules/users/modules/default.nix b/modules/users/modules/default.nix
index d6ce96a..93a7755 100644
--- a/modules/users/modules/default.nix
+++ b/modules/users/modules/default.nix
@@ -10,6 +10,7 @@
     ./fontconfig/default.nix
     ./foot/default.nix
     ./mako/default.nix
+    ./neovim/default.nix
     ./obsidian/default.nix
     ./qutebrowser/default.nix
     ./rofi/default.nix
diff --git a/modules/users/modules/desktop/bar/waybar.nix b/modules/users/modules/desktop/bar/waybar.nix
index 93a4866..d200757 100644
--- a/modules/users/modules/desktop/bar/waybar.nix
+++ b/modules/users/modules/desktop/bar/waybar.nix
@@ -3,6 +3,8 @@
 with lib;
 let
   cfg = config.modules.waybar;
+  theme = config.theming;
+  colors = theme.colors;
 in {
   options.modules.waybar = {
     enable = mkEnableOption "waybar";
@@ -81,15 +83,16 @@ in {
           };
         };
       };
+      # TODO: Replace base03 color with named color
       style = ''
         window#waybar {
-          color: #${colors.base05};
-          background-color: #${colors.base00};
+          color: #${colors.fg};
+          background-color: #${colors.bg};
           border-style: none none solid none;
-          border-width: ${toString borderSize}px;
-          border-color: #${colors.base01};
+          border-width: ${toString theme.layout.borderSize}px;
+          border-color: #${colors.unfocused};
           font-size: 12px;
-          font-family: "${fonts.monospace.name}";
+          font-family: "${theme.fonts.monospace.name}";
         }
 
         .modules-right {
@@ -97,7 +100,7 @@ in {
         }
 
         #tags button {
-          color: #${colors.base03};
+          color: #${theme.schemeColors.base03};
           padding: 0 5px 1px 5px;
           border-radius: 0;
           font-size: 16px;
@@ -105,15 +108,11 @@ in {
         }
 
         #tags button.occupied {
-          color: #${colors.base05};
+          color: #${colors.fg};
         }
 
         #tags button.focused {
-          color: #${colors.base09};
-        }
-
-        #tags.button.bell {
-          color: #${colors.base0A};
+          color: #${colors.accent};
         }
       '';
     };
diff --git a/modules/users/modules/desktop/window-manager/river.nix b/modules/users/modules/desktop/window-manager/river.nix
index 97b9a95..24b9cb4 100644
--- a/modules/users/modules/desktop/window-manager/river.nix
+++ b/modules/users/modules/desktop/window-manager/river.nix
@@ -24,6 +24,9 @@ in {
         # Close waybar
         PATH="${pkgs.procps}/bin:$PATH" $DRY_RUN_CMD pkill waybar
 
+        # Kill rivertile
+        PATH="${pkgs.procps}/bin:$PATH" $DRY_RUN_CMD pkill rivertile
+
         # Restart river
         PATH="${pkgs.river}/bin:$PATH" $DRY_RUN_CMD ~/.config/river/init
       '';
diff --git a/modules/users/modules/neovim/default.nix b/modules/users/modules/neovim/default.nix
index 52a651e..9ddb1fc 100644
--- a/modules/users/modules/neovim/default.nix
+++ b/modules/users/modules/neovim/default.nix
@@ -3,6 +3,8 @@
 with lib;
 let
   cfg = config.modules.neovim;
+  theme = config.theming;
+  colors = theme.colors;
 in {
   options.modules.neovim = {
     enable = mkEnableOption "neovim";
@@ -96,7 +98,7 @@ in {
       highlight = {
         Comment = {
           italic = true;
-          fg = colors.withHashtag.base03;
+          fg = theme.schemeColors.withHashtag.base03; # TODO: Come up with a good name colors.muted maybe?
         };
 
       };
diff --git a/users/jan.nix b/users/jan.nix
index 63d06e6..8f6cd82 100644
--- a/users/jan.nix
+++ b/users/jan.nix
@@ -47,7 +47,7 @@
       # Color scheme
       themes.catppuccin = {
         enable = true;
-        flavor = "mocha";
+        flavor = "frappe";
       };
     };
   };