diff --git a/nvim/.config/nvim/after/plugin/marks.lua b/nvim/.config/nvim/after/plugin/marks.lua
new file mode 100644
index 0000000..adc896c
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/marks.lua
@@ -0,0 +1,14 @@
+local remap     = vim.api.nvim_set_keymap
+local opts      = { noremap=true, silent=true, unique=true }
+
+require'marks'.setup {
+  cyclic           = true,
+  default_mappings = true,
+  builtin_marks    = { "'", ".", "<", ">", "^" },
+}
+
+remap('n', '<Leader>mt', ':MarksToggleSigns<CR>', opts)
+remap('n', '<Leader>mb', ':MarksListBuf<CR>'    , opts)
+remap('n', '<Leader>mg', ':MarksListGlobal<CR>' , opts)
+remap('n', '<Leader>ma', ':MarksListAll<CR>'    , opts)
+remap('n', '<Leader>mB', ':BookmarksListAll<CR>', opts)
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index d940af1..e98ebf5 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -121,7 +121,7 @@ local init = function ()
   }
   -- Marks and registers
   use {
-    'kshenoy/vim-signature',
+    'chentau/marks.nvim',
   }
   -- Snippets
   use 'hrsh7th/vim-vsnip'