diff --git a/.config/nvim/after/plugin/colors.lua b/.config/nvim/after/plugin/colors.lua
index 3513b4f..8c5107a 100644
--- a/.config/nvim/after/plugin/colors.lua
+++ b/.config/nvim/after/plugin/colors.lua
@@ -1,15 +1,8 @@
-vim.g.dobiadi_colorscheme = "tokyonight"
-
---require("tokyonight").setup({
---    transparent = true,
---    styles = {
---        sidebars = "transparent",
---    },
---})
+vim.g.dobiadi_colorscheme = "tokyonight-night"
 
 function ColorMyPencils()
-    vim.g.tokyonight_transparent = true
     vim.g.tokyonight_transparent_sidebar = true
+    vim.g.tokyonight_transparent = true
     vim.opt.background = "dark"
 
     vim.cmd("colorscheme " .. vim.g.dobiadi_colorscheme)
diff --git a/.config/nvim/after/plugin/keymap.lua b/.config/nvim/after/plugin/keymap.lua
index 474d50d..45b36ff 100644
--- a/.config/nvim/after/plugin/keymap.lua
+++ b/.config/nvim/after/plugin/keymap.lua
@@ -1,7 +1,10 @@
 -- Space yoink to system clipboard
-vim.keymap.set('v', '<space>y', '"+y', { noremap=true, silent=true })
-vim.keymap.set('n', '<space>y', '"+y', { noremap=true, silent=true })
-vim.keymap.set('n', '<space>Y', '"+yg_', { noremap=true, silent=true })
+vim.keymap.set('v', '<leader>y', '"+y', { noremap=true, silent=true })
+vim.keymap.set('n', '<leader>y', '"+y', { noremap=true, silent=true })
+vim.keymap.set('n', '<leader>Y', '"+yg_', { noremap=true, silent=true })
+
+-- Space paste doesn't overwrite paste register
+vim.keymap.set('x', '<leader>p', "\"_dP", { noremap=true, silent=true })
 
 -- Telescope binding
 local builtin = require('telescope.builtin')
diff --git a/.config/nvim/lua/dobiadi/set.lua b/.config/nvim/lua/dobiadi/set.lua
index 7d21609..7ec999a 100644
--- a/.config/nvim/lua/dobiadi/set.lua
+++ b/.config/nvim/lua/dobiadi/set.lua
@@ -25,3 +25,5 @@ vim.opt.colorcolumn = "80,100,120"
 
 vim.opt.cursorline = true
 vim.opt.mouse = ""
+
+vim.g.mapleader = " "
diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua
index 6515f0a..fbfff70 100644
--- a/.config/nvim/plugin/packer_compiled.lua
+++ b/.config/nvim/plugin/packer_compiled.lua
@@ -49,8 +49,8 @@ local function save_profiles(threshold)
 end
 
 time([[Luarocks path setup]], true)
-local package_path_str = "/home/dobiadi/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/dobiadi/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/dobiadi/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/dobiadi/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/home/dobiadi/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
+local package_path_str = "/home/dobi/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/dobi/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/dobi/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/dobi/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/home/dobi/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
 if not string.find(package.path, package_path_str, 1, true) then
   package.path = package.path .. ';' .. package_path_str
 end
@@ -76,97 +76,97 @@ time([[Defining packer_plugins]], true)
 _G.packer_plugins = {
   LuaSnip = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/LuaSnip",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/LuaSnip",
     url = "https://github.com/L3MON4D3/LuaSnip"
   },
   ["cmp-buffer"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/cmp-buffer",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/cmp-buffer",
     url = "https://github.com/hrsh7th/cmp-buffer"
   },
   ["cmp-nvim-lsp"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
     url = "https://github.com/hrsh7th/cmp-nvim-lsp"
   },
   ["cmp-nvim-lsp-signature-help"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help",
     url = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help"
   },
   ["cmp-path"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/cmp-path",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/cmp-path",
     url = "https://github.com/hrsh7th/cmp-path"
   },
   cmp_luasnip = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
     url = "https://github.com/saadparwaiz1/cmp_luasnip"
   },
   fd = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/fd",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/fd",
     url = "https://github.com/sharkdp/fd"
   },
   ["lualine.nvim"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/lualine.nvim",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/lualine.nvim",
     url = "https://github.com/nvim-lualine/lualine.nvim"
   },
   ["null-ls.nvim"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/null-ls.nvim",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/null-ls.nvim",
     url = "https://github.com/jose-elias-alvarez/null-ls.nvim"
   },
   ["nvim-cmp"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/nvim-cmp",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/nvim-cmp",
     url = "https://github.com/hrsh7th/nvim-cmp"
   },
   ["nvim-lspconfig"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
     url = "https://github.com/neovim/nvim-lspconfig"
   },
   ["nvim-treesitter"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
     url = "https://github.com/nvim-treesitter/nvim-treesitter"
   },
   ["nvim-treesitter-context"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/nvim-treesitter-context",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/nvim-treesitter-context",
     url = "https://github.com/nvim-treesitter/nvim-treesitter-context"
   },
   ["nvim-web-devicons"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
     url = "https://github.com/kyazdani42/nvim-web-devicons"
   },
   ["packer.nvim"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/packer.nvim",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/packer.nvim",
     url = "https://github.com/wbthomason/packer.nvim"
   },
   ["plenary.nvim"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/plenary.nvim",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/plenary.nvim",
     url = "https://github.com/nvim-lua/plenary.nvim"
   },
   ripgrep = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/ripgrep",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/ripgrep",
     url = "https://github.com/BurntSushi/ripgrep"
   },
   ["telescope.nvim"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/telescope.nvim",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/telescope.nvim",
     url = "https://github.com/nvim-telescope/telescope.nvim"
   },
   ["tokyonight.nvim"] = {
     loaded = true,
-    path = "/home/dobiadi/.local/share/nvim/site/pack/packer/start/tokyonight.nvim",
+    path = "/home/dobi/.local/share/nvim/site/pack/packer/start/tokyonight.nvim",
     url = "https://github.com/folke/tokyonight.nvim"
   }
 }