diff --git a/.gitmodules b/.gitmodules
index d748035..4d7a68c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,3 +46,9 @@
 [submodule "dot_config/noctalia/plugins-custom/workday-progress"]
 	path = dot_config/noctalia/plugins-custom/workday-progress
 	url = https://github.com/Cian-H/workday-progress
+[submodule "dot_config/yazi/plugins/clipboard.yazi"]
+	path = dot_config/yazi/plugins/clipboard.yazi
+	url = https://github.com/XYenon/clipboard.yazi.git
+[submodule "dot_config/yazi/plugins/yazi-rs-plugins"]
+	path = dot_config/yazi/plugins/yazi-rs-plugins
+	url = https://github.com/yazi-rs/plugins.git
diff --git a/dot_config/yazi/keymap.toml b/dot_config/yazi/keymap.toml
index 6ec3942..2c88937 100644
--- a/dot_config/yazi/keymap.toml
+++ b/dot_config/yazi/keymap.toml
@@ -250,7 +250,7 @@ keymap = [
     { on = "}", run = "tab_swap 1", desc = "Swap current tab with next tab" },
 
     # Tasks
-    { on = "w", run = "tasks_show", desc = "Show task manager" },
+    { on = "w", run = "tasks:show", desc = "Show task manager" },
 
     # Help
     { on = "~", run = "help", desc = "Open help" },
@@ -477,14 +477,14 @@ keymap = [
     { on = "<F1>", run = "help", desc = "Open help" },
 ]
 
-[completion]
+[cmp]
 
 keymap = [
     { on = "<A-c>", run = "close", desc = "Cancel completion" },
     { on = "<Tab>", run = "close --submit", desc = "Submit the completion" },
     { on = "<Enter>", run = [
         "close --submit",
-        "close_input --submit",
+        "input:close --submit",
     ], desc = "Submit the completion and input" },
 
     { on = "<A-k>", run = "arrow -1", desc = "Move cursor up" },
@@ -530,18 +530,7 @@ on = "T"
 run = "plugin --sync max-preview"
 desc = "Maximize or restore preview"
 
-[[mgr.prepend_keymap]]
-on = "<C-y>"
-run = ["plugin wl-clipboard"]
-desc = "Yank to wl-clipboard"
-
 [[mgr.prepend_keymap]]
 on = ["C"]
 run = "plugin ouch"
 desc = "Compress with ouch"
-
-[opener]
-extract = [
-    { run = 'ouch d -y "%*"', desc = "Extract here with ouch", for = "windows" },
-    { run = 'ouch d -y "$@"', desc = "Extract here with ouch", for = "unix" },
-]
diff --git a/dot_config/yazi/plugins/clipboard.yazi b/dot_config/yazi/plugins/clipboard.yazi
new file mode 160000
index 0000000..0ac0320
--- /dev/null
+++ b/dot_config/yazi/plugins/clipboard.yazi
@@ -0,0 +1 @@
+Subproject commit 0ac03203a88a6ca85539378fbb1b73b75fe8521e
diff --git a/dot_config/yazi/plugins/piper.yazi b/dot_config/yazi/plugins/piper.yazi
new file mode 120000
index 0000000..2d00454
--- /dev/null
+++ b/dot_config/yazi/plugins/piper.yazi
@@ -0,0 +1 @@
+yazi-rs-plugins/piper.yazi
\ No newline at end of file
diff --git a/dot_config/yazi/plugins/yazi-rs-plugins b/dot_config/yazi/plugins/yazi-rs-plugins
new file mode 160000
index 0000000..598cdb6
--- /dev/null
+++ b/dot_config/yazi/plugins/yazi-rs-plugins
@@ -0,0 +1 @@
+Subproject commit 598cdb671401574ac27aeee257e2f3b0c80610a1
diff --git a/dot_config/yazi/yazi.toml b/dot_config/yazi/yazi.toml
index 3c36069..1cfc417 100644
--- a/dot_config/yazi/yazi.toml
+++ b/dot_config/yazi/yazi.toml
@@ -1,10 +1,15 @@
+[opener]
+extract = [
+    { run = 'ouch d -y "%*"', desc = "Extract here with ouch", for = "windows" },
+    { run = 'ouch d -y "$@"', desc = "Extract here with ouch", for = "unix" },
+]
+
 [plugin]
 prepend_previewers = [
-    { url = "*.md", run = "glow" },
+    { url = "*.md", run = "piper -- CLICOLOR_FORCE=1 glow -w=$w -s=dark \"$1\"" },
     { url = "*.bin", run = "hexyl" },
 ]
 append_previewers = [
-    { url = "*.md", run = "glow" },
     { url = "*.csv", run = "rich-preview" },
     { url = "*.rst", run = "rich-preview" },
     { url = "*.ipynb", run = "rich-preview" },