diff --git a/users/tsv/nvim/lua/tsv/remap.lua b/users/tsv/nvim/lua/tsv/remap.lua
index b607e4a..9a22d74 100644
--- a/users/tsv/nvim/lua/tsv/remap.lua
+++ b/users/tsv/nvim/lua/tsv/remap.lua
@@ -6,15 +6,52 @@ local builtin = require('telescope.builtin')
 vim.keymap.set('n', '<leader>tf', builtin.find_files, {}) -- Open files
 vim.keymap.set('n', '<leader>ts', builtin.live_grep, {})  -- Grep files
 vim.keymap.set('n', '<leader>tb', builtin.buffers, {})    -- Neovim buffers
-vim.keymap.set('n', '<leader>tr', builtin.resume, {})
--- Git functionality (all start tg)
+vim.keymap.set('n', '<leader>tm', builtin.man_pages, {}) -- man pages
+vim.keymap.set('n', '<leader>tp', builtin.registers, {}) -- Paste from registers
+vim.keymap.set('n', '<leader>tt', builtin.resume, {}) -- Last open Telescope
+vim.keymap.set('n', '<leader>to', builtin.oldfiles, {}) -- Recently opened files
+-- Git functionality (tg prefix)
 vim.keymap.set('n', '<leader>tgf', builtin.git_files, {})
 vim.keymap.set('n', '<leader>tgc', builtin.git_commits, {})
-vim.keymap.set('n', '<leader>tgb', builtin.git_branches, {})
--- Then checkout with CR, track with C-t and rebase with C-r!
+vim.keymap.set('n', '<leader>tgh', builtin.git_bcommits, {}) -- Current buffer's commits
+vim.keymap.set('n', '<leader>tgb', builtin.git_branches, {}) -- CR: checkout, C-t: track, C-r: rebase, C-a: create, C-s: switch, C-d: delete, C-y: merge
+vim.keymap.set('n', '<leader>tgs', builtin.git_stash, {}) -- List stash, apply with CR
+-- LSP functionality (tl prefix)
+vim.keymap.set('n', '<leader>tlr', builtin.lsp_references, {})
+vim.keymap.set('n', '<leader>tli', builtin.lsp_incoming_calls, {})
+vim.keymap.set('n', '<leader>tlo', builtin.lsp_outgoing_calls, {})
+vim.keymap.set('n', '<leader>tld', builtin.lsp_definitions, {})
+vim.keymap.set('n', '<leader>tlt', builtin.lsp_type_definitions, {})
+vim.keymap.set("n", "<leader>tlf", vim.lsp.buf.format) -- Format code
+
+-- Custom Telescope commands for Rails
+vim.keymap.set('n', '<leader>trj', function()
+    builtin.find_files({ search_dirs = { "app/javascript", "app/assets/javascripts" } })
+end, { desc = "Open Rails Javascripts" } )
+vim.keymap.set('n', '<leader>trsj', function()
+    builtin.live_grep({ search_dirs = { "app/javascript", "app/assets/javascripts" } })
+end, { desc = "Grep Rails Javascripts" } )
+vim.keymap.set('n', '<leader>trm', function()
+    builtin.find_files({ search_dirs = { "app/models" } })
+end, { desc = "Open Rails Models" } )
+vim.keymap.set('n', '<leader>trsm', function()
+    builtin.live_grep({ search_dirs = { "app/models" } })
+end, { desc = "Grep Rails Models" } )
+vim.keymap.set('n', '<leader>trc', function()
+    builtin.find_files({ search_dirs = { "app/controllers" } })
+end, { desc = "Open Rails Controllers" } )
+vim.keymap.set('n', '<leader>trsc', function()
+    builtin.live_grep({ search_dirs = { "app/controllers" } })
+end, { desc = "Grep Rails Controllers" } )
+vim.keymap.set('n', '<leader>trv', function()
+    builtin.find_files({ search_dirs = { "app/views" } })
+end, { desc = "Open Rails Views" } )
+vim.keymap.set('n', '<leader>trsv', function()
+    builtin.live_grep({ search_dirs = { "app/views" } })
+end, { desc = "Grep Rails Views" } )
 
 -- Fugitive
-vim.keymap.set("n", "<leader>gs", vim.cmd.Git);
+vim.keymap.set('n', '<leader>gs', vim.cmd.Git);
 vim.keymap.set('n', '<leader>ds', ':Gvdiffsplit!<CR>');
 vim.keymap.set('n', '<leader>gl', ':diffget //2<CR>'); -- 'Get left' window
 vim.keymap.set('n', '<leader>gr', ':diffget //3<CR>'); -- 'Get right' window