diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 03fc23f..4e637f7 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -104,19 +104,20 @@
   "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
   "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" },
   "rainbow_csv": { "branch": "master", "commit": "6955d13a65e0161e8dad488b6045441d527d62ec" },
+  "smart-open.nvim": { "branch": "0.2.x", "commit": "026091fe7f9b283aa1f5f4bb8c56aa5bcad43dbd" },
   "smart-splits.nvim": { "branch": "master", "commit": "b41a4753120b78babb711f2ff9e5fe6b19fc13a7" },
   "sqlite.lua": { "branch": "master", "commit": "40701b6151f8883980c1548647116de39b763540" },
   "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" },
   "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
   "tailwind-sorter.nvim": { "branch": "main", "commit": "3bde5890457e6272550c8b853c13bfb57457f47f" },
   "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "bc25c56083939f274edcfe395c6ff7de23b67c50" },
-  "telescope-bookmarks.nvim": { "branch": "main", "commit": "309cbf2cdb9ec04551553acd3dcd759d9e9f3840" },
   "telescope-file-browser.nvim": { "branch": "master", "commit": "8839e3f8070dfafa5b0c0e4652700298e7b872c4" },
   "telescope-frecency.nvim": { "branch": "master", "commit": "bd52772bf2e8d3e83f1575a018cf4a0e8c3c09a3" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
   "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
   "telescope-github.nvim": { "branch": "master", "commit": "ee95c509901c3357679e9f2f9eaac3561c811736" },
   "telescope-heading.nvim": { "branch": "main", "commit": "23ce2c9ef252aecbaa37300c1209b5ef2b51e6c5" },
+  "telescope-import.nvim": { "branch": "main", "commit": "baa2d50be46c769a1cc942a9d5be049f314f4206" },
   "telescope-live-grep-args.nvim": { "branch": "master", "commit": "731a046da7dd3adff9de871a42f9b7fb85f60f47" },
   "telescope-node-modules.nvim": { "branch": "main", "commit": "b846d33ff5763176dc14fc74c30941a2067c82fd" },
   "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
diff --git a/nvim/lua/plugins/mason.lua b/nvim/lua/plugins/mason.lua
index caa5a9e..fd21af2 100644
--- a/nvim/lua/plugins/mason.lua
+++ b/nvim/lua/plugins/mason.lua
@@ -23,7 +23,6 @@ return {
       "prettierd",
       "pyright",
       "rubocop",
-      "ruby",
       "rubyfmt",
       "shellcheck",
       "stylua",
diff --git a/nvim/lua/plugins/telecope-heading.lua b/nvim/lua/plugins/telecope-heading.lua
index 26bab3f..6fb9dd4 100644
--- a/nvim/lua/plugins/telecope-heading.lua
+++ b/nvim/lua/plugins/telecope-heading.lua
@@ -5,7 +5,7 @@ return {
   dependencies = {
     "crispgm/telescope-heading.nvim",
     keys = {
-      { "<leader>sl", "<cmd>Telescope heading<cr>", desc = "Headlines" },
+      { ";h", "<cmd>Telescope heading<cr>", desc = "Headlines" },
     },
     opts = {
       extensions = {
diff --git a/nvim/lua/plugins/telescope-bookmarks.lua b/nvim/lua/plugins/telescope-bookmarks.lua
deleted file mode 100644
index 8d33a76..0000000
--- a/nvim/lua/plugins/telescope-bookmarks.lua
+++ /dev/null
@@ -1,22 +0,0 @@
--- Telescope extension to open your Browser bookmarks
--- https://github.com/dhruvmanila/telescope-bookmarks.nvim
-return {
-  "telescope.nvim",
-  dependencies = {
-    "dhruvmanila/telescope-bookmarks.nvim",
-    keys = {
-      { "<leader>sR", "<cmd>Telescope bookmarks<cr>", desc = "Brave Bookmarks" },
-    },
-    opts = {
-      extensions = {
-        bookmarks = {
-          selected_browser = "brave",
-          url_open_command = "open",
-        },
-      },
-    },
-    config = function()
-      require("telescope").load_extension("bookmarks")
-    end,
-  },
-}
diff --git a/nvim/lua/plugins/telescope-file-browser.lua b/nvim/lua/plugins/telescope-file-browser.lua
index 238d479..9c3f962 100644
--- a/nvim/lua/plugins/telescope-file-browser.lua
+++ b/nvim/lua/plugins/telescope-file-browser.lua
@@ -5,7 +5,11 @@ return {
   dependencies = {
     "nvim-telescope/telescope-file-browser.nvim",
     keys = {
-      { "<leader>sB", ":Telescope file_browser path=%:p:h=%:p:h<cr>", desc = "Browse Files" },
+      {
+        ";t",
+        "<cmd>Telescope file_browser respect_gitignore=false hidden=true grouped=true<cr>",
+        desc = "File Browser",
+      },
     },
     opts = {
       extensions = {
diff --git a/nvim/lua/plugins/telescope-frecency.lua b/nvim/lua/plugins/telescope-frecency.lua
index 9ad6f67..507ea68 100644
--- a/nvim/lua/plugins/telescope-frecency.lua
+++ b/nvim/lua/plugins/telescope-frecency.lua
@@ -8,7 +8,7 @@ return {
       "kkharji/sqlite.lua",
     },
     keys = {
-      { "<leader>sf", "<cmd>Telescope frecency<cr>", desc = "Frecency" },
+      { ";mr", "<cmd>Telescope frecency<cr>", desc = "Most recently used files" },
     },
     opts = {
       extensions = {
diff --git a/nvim/lua/plugins/telescope-import.lua b/nvim/lua/plugins/telescope-import.lua
new file mode 100644
index 0000000..079080c
--- /dev/null
+++ b/nvim/lua/plugins/telescope-import.lua
@@ -0,0 +1,12 @@
+-- Import modules with ease
+-- https://github.com/piersolenski/telescope-import.nvim
+return {
+  "piersolenski/telescope-import.nvim",
+  dependencies = "nvim-telescope/telescope.nvim",
+  keys = {
+    { ";i", "<cmd>Telescope import<cr>", desc = "Import Modules" },
+  },
+  config = function()
+    require("telescope").load_extension("import")
+  end,
+}
diff --git a/nvim/lua/plugins/telescope-live-grep-args.lua b/nvim/lua/plugins/telescope-live-grep-args.lua
index 1f7bd9c..316b5ed 100644
--- a/nvim/lua/plugins/telescope-live-grep-args.lua
+++ b/nvim/lua/plugins/telescope-live-grep-args.lua
@@ -11,6 +11,9 @@ return {
         },
       },
     },
+    keys = {
+      { ";s", "<cmd>Telescope live_grep_args<cr>", desc = "Live Grep" },
+    },
     config = function()
       require("telescope").load_extension("live_grep_args")
     end,
diff --git a/nvim/lua/plugins/telescope-node-modules.lua b/nvim/lua/plugins/telescope-node-modules.lua
index ad160fe..c694095 100644
--- a/nvim/lua/plugins/telescope-node-modules.lua
+++ b/nvim/lua/plugins/telescope-node-modules.lua
@@ -5,7 +5,7 @@ return {
   dependencies = {
     "nvim-telescope/telescope-node-modules.nvim",
     keys = {
-      { "<leader>sN", "<cmd>Telescope node_modules list<cr>", desc = "Node Modules" },
+      { ";N", "<cmd>Telescope node_modules list<cr>", desc = "Node Modules" },
     },
     config = function()
       require("telescope").load_extension("node_modules")
diff --git a/nvim/lua/plugins/telescope-smart-open.lua b/nvim/lua/plugins/telescope-smart-open.lua
new file mode 100644
index 0000000..262e98d
--- /dev/null
+++ b/nvim/lua/plugins/telescope-smart-open.lua
@@ -0,0 +1,16 @@
+-- Neovim plugin for fast file-finding
+-- https://github.com/danielfalk/smart-open.nvim
+return {
+  "danielfalk/smart-open.nvim",
+  branch = "0.2.x",
+  keys = {
+    { ";o", "<cmd>Telescope smart_open<cr>", desc = "Smart Open" },
+  },
+  config = function()
+    require("telescope").load_extension("smart_open")
+  end,
+  dependencies = {
+    "kkharji/sqlite.lua",
+    { "nvim-telescope/telescope-fzy-native.nvim" },
+  },
+}
diff --git a/nvim/lua/plugins/telescope-undo.lua b/nvim/lua/plugins/telescope-undo.lua
index 2bf71cd..bbe8bac 100644
--- a/nvim/lua/plugins/telescope-undo.lua
+++ b/nvim/lua/plugins/telescope-undo.lua
@@ -6,6 +6,9 @@ return {
     "nvim-lua/plenary.nvim",
     "debugloop/telescope-undo.nvim",
   },
+  keys = {
+    { ";u", "<cmd>Telescope undo<cr>", desc = "Undo Tree" },
+  },
   opts = {
     extensions = {
       undo = {
diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua
index 16e2f02..d3353e4 100644
--- a/nvim/lua/plugins/telescope.lua
+++ b/nvim/lua/plugins/telescope.lua
@@ -8,17 +8,8 @@ return {
     { ";cs", "<cmd>Telescope spell_suggest<cr>", desc = "Spell Suggest" },
     { ";d", "<cmd>Telescope diagnostics<cr>", desc = "Diagnostics" },
     { ";f", "<cmd>Telescope find_files<cr>", desc = "Find Files" },
-    { ";mr", "<cmd>Telescope frecency<cr>", desc = "Most recently used files" },
     { ";n", "<cmd>Telescope notify<cr>", desc = "Notify" },
     { ";r", "<cmd>Telescope resume<cr>", desc = "Resume" },
-    { ";s", "<cmd>Telescope live_grep_args<cr>", desc = "Live Grep" },
-    {
-      ";t",
-      "<cmd>Telescope file_browser respect_gitignore=false hidden=true grouped=true<cr>",
-      desc = "File Browser",
-    },
-    { ";o", "<cmd>TodoTelescope<cr>", desc = "Todo Comments" },
-    { ";u", "<cmd>Telescope undo<cr>", desc = "Undo Tree" },
     { "<C-p>", "<cmd>Telescope find_files<cr>", desc = "Find Files" },
     { "<C-t>", "<cmd>Telescope<cr>", desc = "Telescope" },
     { "<M-b>", "<cmd>Telescope buffers previewer=false shorten_path=true theme=dropdown<cr>", desc = "Buffers" },
diff --git a/nvim/lua/plugins/todo-comments.lua b/nvim/lua/plugins/todo-comments.lua
new file mode 100644
index 0000000..5b3e42d
--- /dev/null
+++ b/nvim/lua/plugins/todo-comments.lua
@@ -0,0 +1,7 @@
+return {
+  "folke/todo-comments.nvim",
+  dependencies = { "nvim-lua/plenary.nvim" },
+  keys = {
+    { ";O", "<cmd>TodoTelescope<cr>", desc = "Todo Comments" },
+  },
+}