diff --git a/lua/rakshit/core/options.lua b/lua/rakshit/core/options.lua
index 51d996c5..ab8145b2 100644
--- a/lua/rakshit/core/options.lua
+++ b/lua/rakshit/core/options.lua
@@ -1,5 +1,5 @@
 -- Change the :Explore option to show in a tree styled format
-vim.cmd 'let g:netrw_liststyle = 3'
+vim.cmd("let g:netrw_liststyle = 3")
 
 -- [[ Setting options ]]
 -- See `:help vim.opt`
@@ -13,7 +13,7 @@ vim.opt.number = true
 vim.opt.relativenumber = true
 
 -- Enable mouse mode, can be useful for resizing splits for example!
-vim.opt.mouse = 'a'
+vim.opt.mouse = "a"
 
 -- Don't show the mode, since it's already in the status line
 vim.opt.showmode = false
@@ -23,7 +23,7 @@ vim.opt.showmode = false
 --  Remove this option if you want your OS clipboard to remain independent.
 --  See `:help 'clipboard'`
 vim.schedule(function()
-  vim.opt.clipboard = 'unnamedplus'
+  vim.opt.clipboard = "unnamedplus"
 end)
 
 -- Save undo history
@@ -34,7 +34,7 @@ vim.opt.ignorecase = true
 vim.opt.smartcase = true -- Really smart 😎
 
 -- Keep signcolumn on by default
-vim.opt.signcolumn = 'yes'
+vim.opt.signcolumn = "yes"
 
 -- Decrease update time
 vim.opt.updatetime = 250
@@ -52,19 +52,20 @@ vim.opt.splitbelow = true
 --  and `:help 'listchars'`
 vim.opt.list = true
 -- vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
-vim.opt.listchars = { tab = '  ', trail = '·', nbsp = '␣' }
+vim.opt.listchars = { tab = "  ", trail = "·", nbsp = "␣" }
 
 -- Preview substitutions live, as you type!
-vim.opt.inccommand = 'split'
+vim.opt.inccommand = "split"
 
 -- Show which line your cursor is on
 vim.opt.cursorline = true
+vim.opt.cursorlineopt = "both"
 
 -- Minimal number of screen lines to keep above and below the cursor.
 vim.opt.scrolloff = 10
 
 -- Allow backspace on indent, end of line or insert mode start position
-vim.opt.backspace = 'indent,eol,start'
+vim.opt.backspace = "indent,eol,start"
 
 -- Enable break indent
 vim.opt.breakindent = true
diff --git a/lua/rakshit/plugins/colorscheme.lua b/lua/rakshit/plugins/colorscheme.lua
index 98bb3c22..582360da 100644
--- a/lua/rakshit/plugins/colorscheme.lua
+++ b/lua/rakshit/plugins/colorscheme.lua
@@ -1,18 +1,19 @@
-return { -- You can easily change to a different colorscheme.
+return {
+  -- You can easily change to a different colorscheme.
   -- Change the name of the colorscheme plugin below, and then
   -- change the command in the config to whatever the name of that colorscheme is.
   --
   -- If you want to see what colorschemes are already installed,
   -- you can use `:Telescope colorscheme`.
-  'folke/tokyonight.nvim',
+  "folke/tokyonight.nvim",
   priority = 1000, -- Make sure to load this before all the other start plugins.
   init = function()
     -- Load the colorscheme here.
     -- Like many other themes, this one has different styles, and you could load
     -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
-    vim.cmd.colorscheme 'tokyonight-night'
+    vim.cmd.colorscheme("tokyonight-night")
 
     -- You can configure highlights by doing something like:
-    vim.cmd.hi 'Comment gui=none'
+    vim.cmd.hi("Comment gui=none")
   end,
 }
diff --git a/lua/rakshit/plugins/debug-mappings.lua b/lua/rakshit/plugins/debug-mappings.lua
deleted file mode 100644
index 3078cd5c..00000000
--- a/lua/rakshit/plugins/debug-mappings.lua
+++ /dev/null
@@ -1,36 +0,0 @@
-return {}
---   dap = {
---     plugin = true,
---     n = {
---       ['<leader>db'] = {
---         '<cmd> DapToggleBreakpoint <CR>',
---         'Add breakpoint at line',
---       },
---       ['<leader>dus'] = {
---         function()
---           local widgets = require('dap.ui.widgets')
---           local sidebar = widgets.sidebar(widgets.scopes)
---           sidebar.open()
---         end,
---         'Open debugging sidebar',
---       },
---     },
---   },
---   dap_go = {
---     plugin = true,
---     n = {
---       ['<leader>dgt'] = {
---         function()
---           require('dag-go').debug_test()
---         end,
---         'Debug go test',
---       },
---       ['<leader>dgl'] = {
---         function()
---           require('dap-go').debug_last()
---         end,
---         'Debug last go test',
---       },
---     },
---   },
--- }