diff --git a/hm/desktop.nix b/hm/desktop.nix
index f7a5920..41446bb 100644
--- a/hm/desktop.nix
+++ b/hm/desktop.nix
@@ -593,6 +593,7 @@
     };
     services = {
       unclutter.enable = true;
+      # FIXME Not starting on curacao_test
       dunst =
         {
           enable = true;
diff --git a/hm/style.nix b/hm/style.nix
index 50b1792..b29c368 100644
--- a/hm/style.nix
+++ b/hm/style.nix
@@ -1,10 +1,7 @@
-{ pkgs, config, ... }:
+{ pkgs, config, fetchFromGitHub, ... }:
 let
-  stylix = builtins.fetchGit {
-    url = "https://github.com/danth/stylix.git";
-    # No 23.11 branch last I checked
-    rev = "8b3f61727f3b86c27096c3c014ae602aa40670ba";
-  };
+  # Currently last commit in https://github.com/danth/stylix/pull/194
+  stylix = builtins.fetchTarball "https://github.com/willemml/stylix/archive/2ed2b0086b41d582aca26e083c19c0e47c8991e3.tar.gz";
 in
 {
   imports = [ (import stylix).homeManagerModules.stylix ];
@@ -28,7 +25,6 @@ in
     };
 
     targets = {
-      vim.enable = false; # FIXME Not compatible with nixvim for now (there's a MR)
       i3.enable = false; # I prefer my own styles
       tmux.enable = false; # Using another theme
     };
diff --git a/hm/vim.nix b/hm/vim.nix
index d234871..bf82131 100644
--- a/hm/vim.nix
+++ b/hm/vim.nix
@@ -68,12 +68,6 @@ in
     globals = {
       netrw_fastbrowse = 0; # Close the file explorer once you select a file
     };
-    colorschemes.base16 = {
-      # FIXME Dynamic... or use stylix
-      enable = true;
-      colorscheme = "solarized-light";
-
-    };
     plugins = {
       # Catches attention when cursor changed position
       # TODO Unmapped, do I still want to use it?
@@ -339,14 +333,15 @@ in
     '';
     autoCmd = [
       # Turn off relativenumber only for insert mode
-      { event = "InsertEnter *"; command = "set norelativenumber"; }
-      { event = "InsertLeave *"; command = "set relativenumber"; }
+      { event = "InsertEnter"; pattern = "*"; command = "set norelativenumber"; }
+      { event = "InsertLeave"; pattern = "*"; command = "set relativenumber"; }
 
       # Additional extensions
-      { event = "BufNewFile,BufRead"; pattern = "*.jinja"; command = "set filetype=jinja2"; } # TODO Probably GH-specific?
+      { event = "BufRead"; pattern = "*.jinja"; command = "set filetype=jinja2"; } # TODO Probably GH-specific?
+      { event = "BufNewFile"; pattern = "*.jinja"; command = "set filetype=jinja2"; }
 
       # vim-easy-align: Align Markdown tables
-      { event = "FileType markdown"; command = "vmap <Bar> :EasyAlign*<Bar><Enter>"; }
+      { event = "FileType"; pattern = "markdown"; command = "vmap <Bar> :EasyAlign*<Bar><Enter>"; }
     ];
 
     userCommands = {
diff --git a/hm/vim/feline.lua b/hm/vim/feline.lua
index 2b5d8fe..41460d4 100644
--- a/hm/vim/feline.lua
+++ b/hm/vim/feline.lua
@@ -2,32 +2,30 @@ vim.cmd([[
     set noshowmode
     set laststatus=2
 ]])
--- local base16_colors = require('base16-colorscheme').colors
--- FIXME Color setting doesn't work, see ./feline_test.vim for a reproducible use case
--- that works on Arch but not on Nix (with Plug stuff removed)
+local base16_colors = require('base16-colorscheme').colors
 local vi_mode_utils = require('feline.providers.vi_mode')
 local lsp = require('feline.providers.lsp')
 require('feline').setup({
-    -- default_bg = 'base01',
-    -- default_fg = 'base04',
-    -- theme = {
-    --     base00 = base16_colors.base00,
-    --     base01 = base16_colors.base01,
-    --     base02 = base16_colors.base02,
-    --     base03 = base16_colors.base03,
-    --     base04 = base16_colors.base04,
-    --     base05 = base16_colors.base05,
-    --     base06 = base16_colors.base06,
-    --     base07 = base16_colors.base07,
-    --     base08 = base16_colors.base08,
-    --     base09 = base16_colors.base09,
-    --     base0A = base16_colors.base0A,
-    --     base0B = base16_colors.base0B,
-    --     base0C = base16_colors.base0C,
-    --     base0D = base16_colors.base0D,
-    --     base0E = base16_colors.base0E,
-    --     base0F = base16_colors.base0F,
-    -- },
+    default_bg = 'base01',
+    default_fg = 'base04',
+    theme = {
+        base00 = base16_colors.base00,
+        base01 = base16_colors.base01,
+        base02 = base16_colors.base02,
+        base03 = base16_colors.base03,
+        base04 = base16_colors.base04,
+        base05 = base16_colors.base05,
+        base06 = base16_colors.base06,
+        base07 = base16_colors.base07,
+        base08 = base16_colors.base08,
+        base09 = base16_colors.base09,
+        base0A = base16_colors.base0A,
+        base0B = base16_colors.base0B,
+        base0C = base16_colors.base0C,
+        base0D = base16_colors.base0D,
+        base0E = base16_colors.base0E,
+        base0F = base16_colors.base0F,
+    },
     components = {
         active = {
             {