diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
index a4b6b9fc..605f6b44 100644
--- a/.config/nvim/lua/config/keymaps.lua
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -66,13 +66,11 @@ map("n", "<C-c>", ":%y+<CR>", { desc = "Copy whole text to clipboard", silent =
 -- Select all text
 map("n", "<C-a>", "gg<S-V>G", { desc = "Select all text", silent = true, noremap = true })
 
+-- Paste options
+map("i", "<C-v>", '<C-r>"', { desc = "Paste on insert mode" })
 map("v", "p", '"_dP', { desc = "Paste without overwriting" })
 
-map("n", "c", '"_c', { desc = "Change without yanking" })
-map("n", "C", '"_C', { desc = "Change without yanking" })
-map("x", "c", '"_c', { desc = "Change without yanking" })
-map("x", "C", '"_C', { desc = "Change without yanking" })
-
+-- Deleting without yanking empty line
 map("n", "dd", function()
   local is_empty_line = vim.api.nvim_get_current_line():match("^%s*$")
   if is_empty_line then
diff --git a/.config/nvim/lua/config/neovide.lua b/.config/nvim/lua/config/neovide.lua
index cdb99ccd..37a8c517 100644
--- a/.config/nvim/lua/config/neovide.lua
+++ b/.config/nvim/lua/config/neovide.lua
@@ -11,16 +11,7 @@ ResizeGuiFont = function(delta)
   RefreshGuiFont()
 end
 
-ResetGuiFont = function()
-  vim.g.gui_font_size = vim.g.gui_font_default_size
-  RefreshGuiFont()
-end
-
--- Call function on startup to set default value
-ResetGuiFont()
-
 -- Keymaps
-
 local opts = { noremap = true, silent = true }
 
 vim.keymap.set({ "n", "i" }, "<C-+>", function()
@@ -29,9 +20,6 @@ end, opts)
 vim.keymap.set({ "n", "i" }, "<C-->", function()
   ResizeGuiFont(-1)
 end, opts)
-vim.keymap.set({ "n", "i" }, "<C-BS>", function()
-  ResetGuiFont()
-end, opts)
 
 vim.g.neovide_padding_top = 5
 vim.g.neovide_padding_right = 5
@@ -47,24 +35,3 @@ vim.g.neovide_cursor_antialiasing = false
 vim.g.neovide_cursor_vfx_mode = "pixiedust"
 
 vim.opt.winblend = 20
-
-if vim.fn.exists("g:terminal_color_0") == 0 then
-  vim.api.nvim_set_var("terminal_color_0", "#494D64")
-  vim.api.nvim_set_var("terminal_color_1", "#ED8796")
-  vim.api.nvim_set_var("terminal_color_2", "#A6DA95")
-  vim.api.nvim_set_var("terminal_color_3", "#EED49F")
-  vim.api.nvim_set_var("terminal_color_4", "#8AADF4")
-  vim.api.nvim_set_var("terminal_color_5", "#F5BDE6")
-  vim.api.nvim_set_var("terminal_color_6", "#8BD5CA")
-  vim.api.nvim_set_var("terminal_color_7", "#B8C0E0")
-  vim.api.nvim_set_var("terminal_color_8", "#5B6078")
-  vim.api.nvim_set_var("terminal_color_9", "#ED8796")
-  vim.api.nvim_set_var("terminal_color_10", "#A6DA95")
-  vim.api.nvim_set_var("terminal_color_11", "#EED49F")
-  vim.api.nvim_set_var("terminal_color_12", "#8AADF4")
-  vim.api.nvim_set_var("terminal_color_13", "#F5BDE6")
-  vim.api.nvim_set_var("terminal_color_14", "#8BD5CA")
-  vim.api.nvim_set_var("terminal_color_15", "#B8C0E0")
-end
-
-vim.g.neovide_theme = "catppuccin-macchiato"
diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua
index d54e1b52..2a6f7cd4 100644
--- a/.config/nvim/lua/config/options.lua
+++ b/.config/nvim/lua/config/options.lua
@@ -1,16 +1,16 @@
 -- Options are automatically loaded before lazy.nvim startup
 -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
 -- Add any additional options here
+-- Neovide options
 require("config.neovide")
 
+-- Optimizations on startup
 vim.loader.enable()
 
-vim.g.mapleader = " "
-
+-- Font
 vim.g.gui_font_default_size = 10
 vim.g.gui_font_size = vim.g.gui_font_default_size
 vim.g.gui_font_face = "JetBrainsMono Nerd Font"
 
-vim.o.winwidth = 10
-vim.o.winminwidth = 10
-vim.o.equalalways = false
+-- Define leader key
+vim.g.mapleader = " "