diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json
index e8588deaa2832d2..799d3d40fdd85a7 100644
--- a/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/pkgs/applications/editors/vim/plugins/deprecated.json
@@ -1,18 +1,18 @@
 {
     "TrueZen-nvim": {
-        "date": "2022-09-02",
+        "date": "2022-07-27",
         "new": "true-zen-nvim"
     },
     "compe-tmux": {
-        "date": "2021-12-21",
+        "date": "2021-12-07",
         "new": "cmp-tmux"
     },
     "fern-vim": {
-        "date": "2024-05-28",
+        "date": "2024-05-12",
         "new": "vim-fern"
     },
     "gina-vim": {
-        "date": "2024-08-20",
+        "date": "2024-05-12",
         "new": "vim-gina"
     },
     "gist-vim": {
@@ -24,7 +24,7 @@
         "new": "lspsaga-nvim"
     },
     "lua-dev-nvim": {
-        "date": "2022-10-20",
+        "date": "2022-10-14",
         "new": "neodev-nvim"
     },
     "nvchad-extensions": {
@@ -32,7 +32,7 @@
         "new": "nvchad-ui"
     },
     "nvim-base16": {
-        "date": "2024-03-16",
+        "date": "2024-02-15",
         "new": "base16-nvim"
     },
     "nvim-bufferline-lua": {
@@ -64,7 +64,7 @@
         "new": "taskwarrior3 or taskwarrior2"
     },
     "vim-fsharp": {
-        "date": "2024-08-20",
+        "date": "2024-03-16",
         "new": "zarchive-vim-fsharp"
     },
     "vim-jade": {
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index fcba775f93bedb9..0638ada2a0eb632 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -111,7 +111,7 @@ https://github.com/jlanzarotta/bufexplorer/,,
 https://github.com/AndrewRadev/bufferize.vim/,HEAD,
 https://github.com/akinsho/bufferline.nvim/,,
 https://github.com/kwkarlwang/bufjump.nvim/,HEAD,
-https://github.com/dkarter/bullets.vim/,,
+https://github.com/bullets-vim/bullets.vim/,,
 https://github.com/itchyny/calendar.vim/,,
 https://github.com/bkad/camelcasemotion/,,
 https://github.com/catppuccin/nvim/,,catppuccin-nvim
@@ -241,7 +241,7 @@ https://github.com/ctrlpvim/ctrlp.vim/,,
 https://github.com/scottmckendry/cyberdream.nvim/,,
 https://github.com/dart-lang/dart-vim-plugin/,,
 https://github.com/rizzatti/dash.vim/,HEAD,
-https://github.com/glepnir/dashboard-nvim/,,
+https://github.com/nvimdev/dashboard-nvim/,,
 https://github.com/andrewferrier/debugprint.nvim/,HEAD,
 https://github.com/Verf/deepwhite.nvim/,,
 https://github.com/kristijanhusak/defx-git/,,
@@ -347,7 +347,6 @@ https://github.com/jsfaint/gen_tags.vim/,,
 https://github.com/gentoo/gentoo-syntax/,,
 https://github.com/ndmitchell/ghcid/,,
 https://github.com/eagletmt/ghcmod-vim/,,
-https://github.com/lambdalisue/gina.vim/,,
 https://github.com/f-person/git-blame.nvim/,,
 https://github.com/akinsho/git-conflict.nvim/,HEAD,
 https://github.com/rhysd/git-messenger.vim/,,
@@ -477,7 +476,7 @@ https://github.com/ggandor/lightspeed.nvim/,,
 https://github.com/junegunn/limelight.vim/,,
 https://github.com/lf-lang/lingua-franca.vim/,,
 https://github.com/tamago324/lir.nvim/,,
-https://github.com/tami5/lispdocs.nvim/,,
+https://github.com/kkharji/lispdocs.nvim/,,
 https://github.com/ldelossa/litee-calltree.nvim/,,
 https://github.com/ldelossa/litee-filetree.nvim/,,
 https://github.com/ldelossa/litee-symboltree.nvim/,,
@@ -495,7 +494,7 @@ https://github.com/nvim-lua/lsp_extensions.nvim/,,
 https://git.sr.ht/~whynothugo/lsp_lines.nvim,,
 https://github.com/ray-x/lsp_signature.nvim/,,
 https://github.com/lspcontainers/lspcontainers.nvim/,,
-https://github.com/onsails/lspkind-nvim/,,
+https://github.com/onsails/lspkind.nvim/,,
 https://github.com/nvimdev/lspsaga.nvim/,,
 https://github.com/barreiroleo/ltex_extra.nvim/,HEAD,
 https://github.com/arkav/lualine-lsp-progress/,,
@@ -525,7 +524,7 @@ https://github.com/savq/melange-nvim/,,
 https://github.com/lsig/messenger.nvim/,HEAD,
 https://github.com/xero/miasma.nvim/,,
 https://github.com/dasupradyumna/midnight.nvim/,,
-https://github.com/phaazon/mind.nvim/,HEAD,
+https://github.com/hadronized/mind.nvim/,HEAD,
 https://github.com/echasnovski/mini.nvim/,,
 https://github.com/wfxr/minimap.vim/,,
 https://github.com/jghauser/mkdir.nvim/,main,
@@ -593,7 +592,7 @@ https://github.com/weilbith/neotest-gradle/,HEAD,
 https://github.com/alfaix/neotest-gtest/,HEAD,
 https://github.com/MrcJkb/neotest-haskell/,HEAD,
 https://github.com/rcasia/neotest-java/,HEAD,
-https://github.com/haydenmeade/neotest-jest/,HEAD,
+https://github.com/nvim-neotest/neotest-jest/,HEAD,
 https://github.com/zidhuss/neotest-minitest/,HEAD,
 https://github.com/theutz/neotest-pest/,HEAD,
 https://github.com/olimorris/neotest-phpunit/,HEAD,
@@ -652,7 +651,7 @@ https://github.com/ojroques/nvim-bufdel/,,
 https://github.com/roxma/nvim-cm-racer/,,
 https://github.com/hrsh7th/nvim-cmp/,,
 https://github.com/weilbith/nvim-code-action-menu/,,
-https://github.com/noib3/nvim-cokeline/,HEAD,
+https://github.com/willothy/nvim-cokeline/,HEAD,
 https://github.com/nvchad/nvim-colorizer.lua/,,
 https://github.com/terrortylor/nvim-comment/,,
 https://github.com/hrsh7th/nvim-compe/,,
@@ -721,7 +720,7 @@ https://github.com/kylechui/nvim-surround/,main,
 https://github.com/svermeulen/nvim-teal-maker/,HEAD,
 https://github.com/norcalli/nvim-terminal.lua/,,
 https://github.com/klen/nvim-test/,,
-https://github.com/kyazdani42/nvim-tree.lua/,,
+https://github.com/nvim-tree/nvim-tree.lua/,,
 https://github.com/nvim-treesitter/nvim-treesitter/,,
 https://github.com/nvim-treesitter/nvim-treesitter-context/,,
 https://github.com/RRethy/nvim-treesitter-endwise/,HEAD,
@@ -733,15 +732,15 @@ https://github.com/windwp/nvim-ts-autotag/,,
 https://github.com/joosepalviste/nvim-ts-context-commentstring/,,
 https://github.com/kevinhwang91/nvim-ufo/,HEAD,
 https://github.com/samjwill/nvim-unception/,HEAD,
-https://github.com/kyazdani42/nvim-web-devicons/,,
+https://github.com/nvim-tree/nvim-web-devicons/,,
 https://github.com/AckslD/nvim-whichkey-setup.lua/,,
 https://github.com/s1n7ax/nvim-window-picker/,HEAD,
 https://github.com/roxma/nvim-yarp/,,
-https://github.com/haringsrob/nvim_context_vt/,,
+https://github.com/andersevenrud/nvim_context_vt/,,
 https://github.com/neovim/nvimdev.nvim/,,
-https://github.com/nvchad/nvterm/,HEAD,
+https://github.com/zbirenbaum/nvterm/,HEAD,
 https://github.com/epwalsh/obsidian.nvim/,HEAD,
-https://github.com/glepnir/oceanic-material/,,
+https://github.com/nvimdev/oceanic-material/,,
 https://github.com/mhartington/oceanic-next/,,
 https://github.com/pwntester/octo.nvim/,,
 https://github.com/stevearc/oil.nvim/,HEAD,
@@ -821,9 +820,9 @@ https://github.com/theprimeagen/refactoring.nvim/,,
 https://github.com/tversteeg/registers.nvim/,,
 https://github.com/vladdoster/remember.nvim/,,
 https://github.com/filipdutescu/renamer.nvim/,,
-https://github.com/MeanderingProgrammer/markdown.nvim/,,render-markdown
+https://github.com/MeanderingProgrammer/render-markdown.nvim/,,render-markdown
 https://github.com/gabrielpoca/replacer.nvim/,HEAD,
-https://github.com/NTBBloodbath/rest.nvim/,,
+https://github.com/rest-nvim/rest.nvim/,,
 https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim
 https://github.com/gu-fan/riv.vim/,,
 https://github.com/kevinhwang91/rnvimr/,,
@@ -849,7 +848,7 @@ https://github.com/megaannum/self/,,
 https://github.com/jaxbot/semantic-highlight.vim/,,
 https://github.com/numirias/semshi/,,
 https://github.com/junegunn/seoul256.vim/,,
-https://github.com/tjdevries/sg.nvim/,HEAD,
+https://github.com/sourcegraph/sg.nvim/,HEAD,
 https://github.com/osyo-manga/shabadou.vim/,,
 https://github.com/AndrewRadev/sideways.vim/,,
 https://github.com/lotabout/skim.vim/,,
@@ -874,7 +873,7 @@ https://github.com/stsewd/sphinx.nvim/,,
 https://github.com/sjl/splice.vim/,,
 https://github.com/vimlab/split-term.vim/,,
 https://github.com/AndrewRadev/splitjoin.vim/,,
-https://github.com/tami5/sqlite.lua/,,
+https://github.com/kkharji/sqlite.lua/,,
 https://github.com/srcery-colors/srcery-vim/,,
 https://github.com/chr4/sslsecure.vim/,,
 https://github.com/cshuaimin/ssr.nvim/,HEAD,
@@ -883,7 +882,7 @@ https://github.com/tamton-aquib/staline.nvim/,main,
 https://github.com/eigenfoo/stan-vim/,,
 https://github.com/josegamez82/starrynight/,HEAD,
 https://github.com/darfink/starsearch.vim/,,
-https://github.com/startup-nvim/startup.nvim/,HEAD,
+https://github.com/max397574/startup.nvim/,HEAD,
 https://github.com/luukvbaal/statuscol.nvim/,,
 https://github.com/folke/styler.nvim/,,
 https://github.com/teto/stylish.nvim/,HEAD,
@@ -913,7 +912,7 @@ https://github.com/themaxmarchuk/tailwindcss-colors.nvim/,HEAD,
 https://github.com/wellle/targets.vim/,,
 https://github.com/tools-life/taskwiki/,,
 https://github.com/tomtom/tcomment_vim/,,
-https://github.com/renerocksai/telekasten.nvim/,,
+https://github.com/nvim-telekasten/telekasten.nvim/,,
 https://github.com/GustavoKatel/telescope-asynctasks.nvim/,,
 https://github.com/nvim-telescope/telescope-cheat.nvim/,,
 https://github.com/fannheyward/telescope-coc.nvim/,,
@@ -1131,14 +1130,14 @@ https://github.com/dcharbon/vim-flatbuffers/,,
 https://github.com/voldikss/vim-floaterm/,,
 https://github.com/rbong/vim-flog/,,
 https://github.com/thosakwe/vim-flutter/,,
-https://github.com/fsharp/vim-fsharp/,,
 https://github.com/thinca/vim-ft-diff_fold/,,
 https://github.com/tommcdo/vim-fubitive/,,
 https://github.com/tpope/vim-fugitive/,,
 https://github.com/maxjacobson/vim-fzf-coauthorship/,,
-https://github.com/Shirk/vim-gas/,,
+https://github.com/HealsCodes/vim-gas/,,
 https://github.com/ruanyl/vim-gh-line/,,
 https://github.com/raghur/vim-ghost/,,
+https://github.com/lambdalisue/vim-gina/,,
 https://github.com/mattn/vim-gist/,,
 https://github.com/lambdalisue/vim-gista/,,
 https://github.com/tpope/vim-git/,,
@@ -1176,7 +1175,7 @@ https://github.com/w0ng/vim-hybrid/,,
 https://github.com/kristijanhusak/vim-hybrid-material/,,
 https://github.com/noc7c9/vim-iced-coffee-script/,,
 https://github.com/RRethy/vim-illuminate/,,
-https://github.com/nathanaelkane/vim-indent-guides/,,
+https://github.com/preservim/vim-indent-guides/,,
 https://github.com/michaeljsmith/vim-indent-object/,,
 https://github.com/jeetsukumaran/vim-indentwise/,,
 https://github.com/henrik/vim-indexed-search/,,
@@ -1206,7 +1205,7 @@ https://github.com/ludovicchabant/vim-lawrencium/,,
 https://github.com/hecal3/vim-leader-guide/,,
 https://github.com/mk12/vim-lean/,,
 https://github.com/ledger/vim-ledger/,,
-https://github.com/reedes/vim-lexical/,HEAD,
+https://github.com/preservim/vim-lexical/,HEAD,
 https://github.com/lfe-support/vim-lfe/,,
 https://github.com/josa42/vim-lightline-coc/,,
 https://github.com/tommcdo/vim-lion/,,
@@ -1276,7 +1275,7 @@ https://github.com/vim-pandoc/vim-pandoc-after/,,
 https://github.com/vim-pandoc/vim-pandoc-syntax/,,
 https://github.com/yorickpeterse/vim-paper/,HEAD,
 https://github.com/bhurlow/vim-parinfer/,,
-https://github.com/sickill/vim-pasta/,,
+https://github.com/ku1ik/vim-pasta/,,
 https://github.com/tpope/vim-pathogen/,,
 https://github.com/junegunn/vim-peekaboo/,,
 https://github.com/preservim/vim-pencil/,,
@@ -1290,7 +1289,7 @@ https://github.com/haya14busa/vim-poweryank/,,
 https://github.com/prettier/vim-prettier/,,
 https://github.com/thinca/vim-prettyprint/,,
 https://github.com/meain/vim-printer/,HEAD,
-https://github.com/pantharshit00/vim-prisma/,,
+https://github.com/prisma/vim-prisma/,,
 https://github.com/tpope/vim-projectionist/,,
 https://github.com/dhruvasagar/vim-prosession/,,
 https://github.com/uarun/vim-protobuf/,,
@@ -1350,7 +1349,7 @@ https://github.com/dstein64/vim-startuptime/,,
 https://github.com/axelf4/vim-strip-trailing-whitespace/,,
 https://github.com/nbouscal/vim-stylish-haskell/,,
 https://github.com/alx741/vim-stylishask/,,
-https://github.com/arzg/vim-substrata/,HEAD,
+https://github.com/lunacookies/vim-substrata/,HEAD,
 https://github.com/svermeulen/vim-subversive/,,
 https://github.com/lambdalisue/vim-suda/,,
 https://github.com/tpope/vim-surround/,,
@@ -1410,7 +1409,7 @@ https://github.com/joonty/vim-xdebug/,,
 https://github.com/lyokha/vim-xkbswitch/,,
 https://github.com/mg979/vim-xtabline/,,
 https://github.com/stephpy/vim-yaml/,,
-https://github.com/mindriot101/vim-yapf/,,
+https://github.com/simonrw/vim-yapf/,,
 https://github.com/michal-h21/vim-zettel/,HEAD,
 https://github.com/dag/vim2hs/,,
 https://github.com/monkoose/vim9-stargate/,HEAD,
@@ -1460,14 +1459,15 @@ https://github.com/HerringtonDarkholme/yats.vim/,,
 https://github.com/mikavilpas/yazi.nvim/,HEAD,
 https://github.com/lucasew/yescapsquit.vim/,HEAD,
 https://github.com/elkowar/yuck.vim/,HEAD,
+https://github.com/fsharp/zarchive-vim-fsharp/,,
 https://github.com/KabbAmine/zeavim.vim/,,
 https://github.com/swaits/zellij-nav.nvim/,HEAD,
 https://github.com/Lilja/zellij.nvim/,HEAD,
 https://github.com/folke/zen-mode.nvim/,,
-https://github.com/mcchrish/zenbones.nvim/,HEAD,
+https://github.com/zenbones-theme/zenbones.nvim/,HEAD,
 https://github.com/jnurmine/zenburn/,,
-https://github.com/glepnir/zephyr-nvim/,,
+https://github.com/nvimdev/zephyr-nvim/,,
 https://github.com/ziglang/zig.vim/,,
-https://github.com/mickael-menu/zk-nvim/,HEAD,
+https://github.com/zk-org/zk-nvim/,HEAD,
 https://github.com/troydm/zoomwintab.vim/,,
 https://github.com/nanotee/zoxide.vim/,,