diff --git a/nvim/.config/nvim/lua/core/mappings.lua b/nvim/.config/nvim/lua/core/mappings.lua
index dab1ef0..c4be2ee 100644
--- a/nvim/.config/nvim/lua/core/mappings.lua
+++ b/nvim/.config/nvim/lua/core/mappings.lua
@@ -7,8 +7,8 @@ if is_available("which-key") then
 		{ "<leader>v", group = "vim" },
 		{ "<leader>s", group = "show" },
 		{ "<localleader>Z", group = "spelling" },
-		{ "]o", group = "options" },
-		{ "[o", group = "options" },
+		{ "]s", group = "switch" },
+		{ "[s", group = "switch" },
 	})
 end
 
diff --git a/nvim/.config/nvim/lua/plugins/base.lua b/nvim/.config/nvim/lua/plugins/base.lua
index a83507a..e0fcfb1 100644
--- a/nvim/.config/nvim/lua/plugins/base.lua
+++ b/nvim/.config/nvim/lua/plugins/base.lua
@@ -290,7 +290,7 @@ return {
 				desc = "floating file browser",
 			},
 			{
-				"[oi",
+				"[si",
 				function()
 					local c = vim.api.nvim_get_hl(0, { name = "Comment" })
 					vim.api.nvim_set_hl(0, "Comment", vim.tbl_extend("force", c, { italic = false }))
@@ -298,7 +298,7 @@ return {
 				desc = "no italic comments",
 			},
 			{
-				"]oi",
+				"]si",
 				function()
 					local c = vim.api.nvim_get_hl(0, { name = "Comment" })
 					vim.api.nvim_set_hl(0, "Comment", vim.tbl_extend("force", {}, c, { italic = true }))
diff --git a/nvim/.config/nvim/lua/plugins/prose.lua b/nvim/.config/nvim/lua/plugins/prose.lua
index 169faa0..542bca4 100644
--- a/nvim/.config/nvim/lua/plugins/prose.lua
+++ b/nvim/.config/nvim/lua/plugins/prose.lua
@@ -48,7 +48,7 @@ local prose_plugs = {
 		ft = prose_ft,
 		keys = {
 			{
-				"[ow",
+				"[sw",
 				function()
 					require("wrapping").soft_wrap_mode()
 				end,
@@ -56,7 +56,7 @@ local prose_plugs = {
 				desc = "soft wrap",
 			},
 			{
-				"]ow",
+				"]sw",
 				function()
 					require("wrapping").hard_wrap_mode()
 				end,
diff --git a/nvim/.config/nvim/lua/plugins/ui.lua b/nvim/.config/nvim/lua/plugins/ui.lua
index 22e5b26..49b614f 100644
--- a/nvim/.config/nvim/lua/plugins/ui.lua
+++ b/nvim/.config/nvim/lua/plugins/ui.lua
@@ -57,32 +57,36 @@ return {
 		},
 		keys = {
 			{
-				"[oc",
+				"[sc",
 				function()
 					require("colorizer").detach_from_buffer(0)
 				end,
-				{ silent = true, desc = "colorize disable" },
+				silent = true,
+				desc = "colorize disable",
 			},
 			{
-				"]oc",
+				"]sc",
 				function()
 					require("colorizer").attach_to_buffer(0)
 				end,
-				{ silent = true, desc = "colorize enable" },
+				silent = true,
+				desc = "colorize enable",
 			},
 			{
-				"]oC",
-				function()
-					require("colorizer").attach_to_buffer(0, { mode = "background" })
-				end,
-				{ silent = true, desc = "colorize bg" },
-			},
-			{
-				"[oC",
+				"[sC",
 				function()
 					require("colorizer").attach_to_buffer(0, { mode = "virtualtext" })
 				end,
-				{ silent = true, desc = "colorize eol" },
+				silent = true,
+				desc = "colorize eol",
+			},
+			{
+				"]sC",
+				function()
+					require("colorizer").attach_to_buffer(0, { mode = "background" })
+				end,
+				silent = true,
+				desc = "colorize bg",
 			},
 		},
 	},