diff --git a/lua/nix_smart_send.lua b/lua/nix_smart_send.lua
index 1f82383..c03af4c 100644
--- a/lua/nix_smart_send.lua
+++ b/lua/nix_smart_send.lua
@@ -22,11 +22,9 @@ local COMMENT_TYPES = {
 }
 
 function M.get_current_node()
+  local ts_utils = require('nvim-treesitter.ts_utils')
   local cur_win = vim.api.nvim_get_current_win()
-  return vim.treesitter.get_node({
-    winid = cur_win,
-    ignore_injections = true,
-  })
+  return ts_utils.get_node_at_cursor(cur_win, true)
 end
 
 function M.detect_global_node()
@@ -52,6 +50,7 @@ function M.detect_global_node()
 end
 
 function M.move_to_next_non_empty_line()
+  local ts_utils = require('nvim-treesitter.ts_utils')
   -- Search for the next non-empty line
   local line_num = vim.fn.search("[^;\\s]", "W")
 
@@ -87,27 +86,25 @@ function M.move_to_next_non_empty_line()
     line_content = vim.api.nvim_buf_get_lines(0, line_num - 1, line_num, false)[1]
     first_non_ws = line_content:find("%S") or 1
     vim.api.nvim_win_set_cursor(0, { line_num, first_non_ws - 1 })
-    node = vim.treesitter.get_node()
+    node = ts_utils.get_node_at_cursor()
   end
 
   return true
 end
 
 function M.vselect_node(node)
+  local ts_utils = require('nvim-treesitter.ts_utils')
   if not node then
     return false
   end
 
-  local start_row, _, end_row, _ = node:range()
-
-  vim.api.nvim_win_set_cursor(0, { start_row + 1, 0 })
-  vim.cmd("normal! V")
-  vim.api.nvim_win_set_cursor(0, { end_row + 1, 0 })
-
+  local cur_buf = vim.api.nvim_get_current_buf()
+  ts_utils.update_selection(cur_buf, node, "V")
   return true
 end
 
 function M.select_until_global(global_nodes)
+  local ts_utils = require('nvim-treesitter.ts_utils')
   local root_node = M.detect_global_node()
   if not root_node and global_nodes then
     root_node = global_nodes[1]
@@ -116,7 +113,7 @@ function M.select_until_global(global_nodes)
   -- Use empty table if no global nodes provided
   global_nodes = global_nodes or {}
 
-  local node = vim.treesitter.get_node()
+  local node = ts_utils.get_node_at_cursor()
   if not node then
     -- print("No syntax node found at cursor position")
     return nil
@@ -170,6 +167,7 @@ function M.slime_send_region()
 end
 
 function M.send_repl(global_nodes)
+  local ts_utils = require('nvim-treesitter.ts_utils')
   local cur_node = M.get_current_node()
 
   if not cur_node then
@@ -191,9 +189,7 @@ function M.send_repl(global_nodes)
   M.slime_send_region()
 
   -- Move cursor and continue
-  local _, _, er, ec = sel_node:range()
-  vim.api.nvim_win_set_cursor(0, { er + 1, ec })
-
+  ts_utils.goto_node(sel_node, true)
   M.move_to_next_non_empty_line()
 end
 
diff --git a/plugin/00_options.lua b/plugin/00_options.lua
index e824333..2b4485b 100644
--- a/plugin/00_options.lua
+++ b/plugin/00_options.lua
@@ -176,7 +176,7 @@ if vim.g.neovide then
   vim.g.neovide_cursor_short_animation_length = 0
   vim.g.neovide_font_hinting = 'none'
   vim.g.neovide_font_edging = 'subpixelantialias'
-  vim.o.guifont = 'JetBrainsMono Nerd Font,Symbols Nerd Font:h14:#e-subpixelantialias:#h-none'
+  vim.o.guifont = 'Iosevka Nerd Font,Symbols Nerd Font:h14:#e-subpixelantialias:#h-none'
   vim.g.neovide_floating_corner_radius = 0.35
   vim.keymap.set("n", "<leader>nf", "<cmd>NeovideFullscreen<CR>", { desc = "Toggle Neovide Fullscreen" })
 end