--- a/.chezmoitemplates/init.lua	Tue Mar 14 20:56:58 2023 +0100
+++ b/.chezmoitemplates/init.lua	Wed Mar 15 12:07:42 2023 +0100
@@ -550,13 +550,18 @@
       local colors
       if os.getenv 'DARKMODE' then
         colors = require('catppuccin.palettes').get_palette 'macchiato'
+        colors.diag_warn = utils.get_highlight('DiagnosticSignWarn').fg
+        colors.diag_error = utils.get_highlight('DiagnosticSignError').fg
       else
-        colors = require('tutti-colori.colors').setup()
+        colors = {
+          blue = '#2f6f9f',
+          green = '#73b00a',
+          orange = '#e9a700',
+          diag_warn = '#e9a700',
+          diag_error = '#f93232',
+        }
       end
 
-      colors.diag_warn = utils.get_highlight('DiagnosticSignWarn').fg
-      colors.diag_error = utils.get_highlight('DiagnosticSignError').fg
-
       require('heirline').load_colors(colors)
 
       local align = { provider = '%=' }
@@ -676,13 +681,9 @@
   -- Colorscheme
   {
     'zegervdv/espresso-tutti-colori.nvim',
-    name = 'tutti-colori',
     cond = not os.getenv 'DARKMODE',
     dev = true,
-    config = function()
-      require('tutti-colori').setup()
-      require('tutti-colori').load()
-    end,
+    config = function() vim.cmd.colorscheme 'espresso_tutti_colori' end,
     priority = 1000,
     lazy = false,
   },

--- a/.chezmoitemplates/lazy-lock.json	Tue Mar 14 20:56:58 2023 +0100
+++ b/.chezmoitemplates/lazy-lock.json	Wed Mar 15 12:07:42 2023 +0100
@@ -1,6 +1,6 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20" },
-  "catppuccin": { "branch": "main", "commit": "9784b64e84fe2134cc866be3f33cb8194c0c3ede" },
+  "catppuccin": { "branch": "main", "commit": "128af65c3a23c94b324dc8d7f02a34feee8722d4" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
@@ -8,36 +8,35 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
   "dirbuf.nvim": { "branch": "main", "commit": "ac7ad3c8e61630d15af1f6266441984f54f54fd2" },
-  "firenvim": { "branch": "master", "commit": "87c9f70d3e6aa2790982aafef3c696dbe962d35b" },
-  "fzf-lua": { "branch": "main", "commit": "8089b5f2aea09836eef2a2bab8a96fe3493ed041" },
+  "firenvim": { "branch": "master", "commit": "d6d69b087c2b3430d837ec80ff71671112b2874b" },
+  "fzf-lua": { "branch": "main", "commit": "d666abc60fff12af9e91812666d42ff7f2555934" },
   "gitignore": { "branch": "master", "commit": "061c5c756713f42b92b6b69b0a081075319a60d0" },
-  "goto-preview": { "branch": "main", "commit": "390a8bf9f83cc0e31a5154357bc4bfad8e79b889" },
-  "heirline.nvim": { "branch": "master", "commit": "00f7e271775362792116e252d931590a9344d6a9" },
+  "goto-preview": { "branch": "main", "commit": "9d130e91ea309255e79443aea522710949dedaf8" },
+  "heirline.nvim": { "branch": "master", "commit": "a7cc90b6ef4b599fef8f0d61a88c389bfd7fdb10" },
   "inc-rename.nvim": { "branch": "main", "commit": "21c23c379342a731a0c90f226601ec0434627b26" },
   "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
-  "lazy.nvim": { "branch": "main", "commit": "5b4444f0d7e556deba3f7ca949a2ba0e2c3369fb" },
+  "lazy.nvim": { "branch": "main", "commit": "e27c9df5fe039e9d2833ef4fcf7305595d5ccda7" },
   "lsp-format-modifications.nvim": { "branch": "main", "commit": "83eb1f4480785405f5551b69fc6bae24c2bbee78" },
-  "luasnip": { "branch": "master", "commit": "436857749a905b48c1e8205b996639c28f006556" },
+  "luasnip": { "branch": "master", "commit": "a835e3d680c5940b61780c6af07885db95382478" },
   "navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
   "neodev.nvim": { "branch": "main", "commit": "78fb6373437eb400f1629b17d4a529669fa2a062" },
   "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" },
   "notifier.nvim": { "branch": "master", "commit": "afc9bf7ef8c31cfc716a2b849c34943a9788508b" },
   "nrpattern.nvim": { "branch": "lua", "commit": "d9f692b4be3e41a3c25ba4651c2e595bac71b234" },
-  "null-ls.nvim": { "branch": "main", "commit": "e172e1e3011e3d032dbeba6414644ba968570828" },
+  "null-ls.nvim": { "branch": "main", "commit": "09e99259f4cdd929e7fb5487bf9d92426ccf7cc1" },
   "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" },
   "nvim-cmp": { "branch": "main", "commit": "feed47fd1da7a1bad2c7dca456ea19c8a5a9823a" },
   "nvim-lspconfig": { "branch": "master", "commit": "4bb0f1845c5cc6465aecedc773fc2d619fcd8faf" },
   "nvim-osc52": { "branch": "main", "commit": "47ce7ee2396fa3ee4fb6b0e0ef14ba06f9c9bd31" },
-  "nvim-surround": { "branch": "main", "commit": "177c95c12542cf20a422b19a87ba1ae80254445a" },
-  "nvim-treesitter": { "branch": "master", "commit": "e3ebc8ec5d586162f3c408417621daa59ba8ea62" },
+  "nvim-surround": { "branch": "main", "commit": "b98862527c4727c171f8626e04d8ae88ef6cb736" },
+  "nvim-treesitter": { "branch": "master", "commit": "cd436f92f65def9c7e74a7324d3eab422ef85643" },
   "nvim-treesitter-refactor": { "branch": "master", "commit": "75f5895cc662d61eb919da8050b7a0124400d589" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "542e0879d524ba717234fcba049b6c2da7989d5a" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5b2bcb9ca8315879181f468b37a897100d631005" },
   "persistence.nvim": { "branch": "main", "commit": "adcf6913693a0434665d162ee45a186230496f8a" },
   "playground": { "branch": "master", "commit": "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56" },
   "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
   "refactoring.nvim": { "branch": "master", "commit": "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a" },
   "targets.vim": { "branch": "master", "commit": "642d3a4ce306264b05ea3219920b13ea80931767" },
-  "tutti-colori": { "branch": "master", "commit": "5c07256563848976da0e2bdff88ab73857986f7e" },
   "vim-abolish": { "branch": "master", "commit": "880a562ff9176773897930b5a26a496f68e5a985" },
   "vim-editorconfig": { "branch": "master", "commit": "5c3a5b4e7830a6885ec3e70fa5151c59afde2ad5" },
   "vim-eunuch": { "branch": "master", "commit": "291ef1f8c8996ca7715df1032a35a27b12d7b5cf" },