diff --git a/lua/plex/config/keymaps.lua b/lua/plex/config/keymaps.lua
index be6a2dd..4a5d166 100644
--- a/lua/plex/config/keymaps.lua
+++ b/lua/plex/config/keymaps.lua
@@ -116,8 +116,8 @@ map('n', 'o', 'o', { desc = 'Insert newline below' })
 map('i', '<S-Return>', '<C-o>o', { desc = 'Start Newline' })
 
 -- Split and join lines
-map('n', '<leader>j', ':join<CR>', { desc = 'Join lines', silent = true })
-map('n', '<leader>s', 'i<CR><ESC>k', { desc = 'Join lines', silent = true })
+map('n', '<leader>jj', ':join<CR>', { desc = 'Join lines', silent = true })
+map('n', '<leader>ss', 'i<CR><ESC>k', { desc = 'Join lines', silent = true })
 
 -- Re-select blocks after indenting in visual/select mode
 map('x', '<', '<gv', { desc = 'Indent Right and Re-select' })
diff --git a/lua/plex/plugins/coding.lua b/lua/plex/plugins/coding.lua
index a245637..74f2fff 100644
--- a/lua/plex/plugins/coding.lua
+++ b/lua/plex/plugins/coding.lua
@@ -219,7 +219,7 @@ return {
 		end,
 		opts = {
 			mappings = {
-				add = 'sa', -- Add surrounding in Normal and Visual modes
+				add = '<leader>sa', -- Add surrounding in Normal and Visual modes
 				delete = 'ds', -- Delete surrounding
 				find = 'gzf', -- Find surrounding (to the right)
 				find_left = 'gzF', -- Find surrounding (to the left)
@@ -281,13 +281,13 @@ return {
 		'echasnovski/mini.splitjoin',
 		keys = {
 			{
-				'sj',
+				'<leader>sj',
 				'<cmd>lua MiniSplitjoin.join()<CR>',
 				mode = { 'n', 'x' },
 				desc = 'Join arguments',
 			},
 			{
-				'sk',
+				'<leader>sk',
 				'<cmd>lua MiniSplitjoin.split()<CR>',
 				mode = { 'n', 'x' },
 				desc = 'Split arguments',
diff --git a/lua/plex/plugins/editor.lua b/lua/plex/plugins/editor.lua
index 1676b35..a3aa9ba 100644
--- a/lua/plex/plugins/editor.lua
+++ b/lua/plex/plugins/editor.lua
@@ -187,7 +187,7 @@ return {
 		'ggandor/leap.nvim',
 		-- stylua: ignore
 		keys = {
-			{ 'tt', '<Plug>(leap-forward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap forward to' },
+			{ 't', '<Plug>(leap-forward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap forward to' },
 			{ 'T', '<Plug>(leap-backward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap backward to' },
 			{ '<leader>wt', '<Plug>(leap-from-window)', mode = { 'n', 'x', 'o' }, desc = 'Leap from windows' },
 		},
@@ -405,8 +405,8 @@ return {
 
 			local mappings = {
 				{ '-', pick_window, desc = 'Pick window' },
-				{ 'sp', pick_window, desc = 'Pick window' },
-				{ 'sw', swap_window, desc = 'Swap picked window' },
+				{ '<leader>wp', pick_window, desc = 'Pick window' },
+				{ '<leader>ww', swap_window, desc = 'Swap picked window' },
 			}
 			return vim.list_extend(mappings, keys)
 		end,
diff --git a/lua/plex/plugins/extras/treesitter/treesj.lua b/lua/plex/plugins/extras/treesitter/treesj.lua
index 52cdb0a..0cc6162 100644
--- a/lua/plex/plugins/extras/treesitter/treesj.lua
+++ b/lua/plex/plugins/extras/treesitter/treesj.lua
@@ -3,8 +3,8 @@ return {
 		'Wansmer/treesj',
 		cmd = { 'TSJJoin', 'TSJSplit' },
 		keys = {
-			{ 'sj', '<cmd>TSJJoin<CR>' },
-			{ 'sk', '<cmd>TSJSplit<CR>' },
+			{ '<leader>sj', '<cmd>TSJJoin<CR>' },
+			{ '<leader>sk', '<cmd>TSJSplit<CR>' },
 		},
 	},
 }