diff --git a/lua/tokyonight/extra/yazi.lua b/lua/tokyonight/extra/yazi.lua
index 45fb2e458..2cd5e7a00 100644
--- a/lua/tokyonight/extra/yazi.lua
+++ b/lua/tokyonight/extra/yazi.lua
@@ -8,20 +8,20 @@ function M.generate(colors)
   colors.pmenusel = util.blend_bg(colors.fg_gutter, 0.8)
   local yazi = util.template(
     [[
-[mgr]
-# NOTE: can be combined with tmTheme (sublime colorshceme file) for preview code highlight
-# syntect_theme = "path/to/tmTheme"
+#:schema = "https://yazi-rs.github.io/schemas/theme.json"
+[app]
+overall = { bg = "${bg_dark}"}
 
+[mgr]
 cwd = { fg = "${fg_dark}", italic = true }
 
-# Hovered
-hovered         = { bg = "${bg_highlight}" }
-preview_hovered = { bg = "${bg_highlight}" }
-
 # Find
 find_keyword  = { fg = "${bg_dark}", bg = "${orange}", bold = true }
 find_position = { fg = "${info}", bg = "${search_bg}", bold = true }
 
+# Symlink
+symlink_target = {italic = true}
+
 # Marker
 marker_copied   = { fg = "${green}", bg = "${green}" }
 marker_cut      = { fg = "${red}", bg = "${red}" }
@@ -37,6 +37,9 @@ count_selected = { fg = "${bg_dark}", bg = "${blue}" }
 border_symbol = "│"
 border_style  = { fg = "${border_highlight}" }
 
+# NOTE: can be combined with tmTheme (sublime colorshceme file) for preview code highlight
+# syntect_theme = "path/to/tmTheme"
+
 # Tab
 [tabs]
 active   = { fg = "${black}", bg = "${blue}" }
@@ -52,16 +55,17 @@ select_alt  = { fg = "${magenta}", bg = "${fg_gutter}" }
 unset_main  = { fg = "${black}", bg = "${purple}", bold = true }
 unset_alt   = { fg = "${purple}", bg = "${fg_gutter}" }
 
+# Hover
+[indicator]
+parent         = { bg = "${bg_highlight}" }
+current         = { bg = "${bg_highlight}" }
+preview = { bg = "${bg_highlight}" }
+
 [status]
 overall   = { fg = "${fg}", bg = "${bg_dark}" }
 sep_left  = { open = "", close = "" }
 sep_right = { open = "", close = "" }
 
-# Progress
-progress_label  = { fg = "${fg}", bold = true }
-progress_normal = { fg = "${blue0}", bg = "${bg_highlight}" }
-progress_error  = { fg = "${red1}", bg = "${bg_highlight}" }
-
 # Permissions
 perm_type  = { fg = "${blue}" }
 perm_read  = { fg = "${yellow}" }
@@ -69,33 +73,10 @@ perm_write = { fg = "${red}" }
 perm_exec  = { fg = "${green}" }
 perm_sep   = { fg = "${terminal_black}" }
 
-[pick]
-border   = { fg = "${border_highlight}" }
-active   = { fg = "${fg}",  bg = "${bg_visual}" }
-inactive = { fg = "${fg}" }
-
-# Input
-[input]
-border   = { fg = "${blue2}" }
-title    = { fg = "${blue2}" }
-value    = { fg = "${purple}" }
-selected = { bg = "${bg_visual}" }
-
-# Completion
-[cmp]
-border   = { fg = "${blue2}" }
-active   = { fg = "${fg}", bg = "${pmenusel}" }
-inactive = { fg = "${fg}" }
-
-icon_file    = ""
-icon_folder  = ""
-icon_command = ""
-
-# Tasks
-[tasks]
-border  = { fg = "${border_highlight}" }
-title   = { fg = "${border_highlight}" }
-hovered = { fg = "${fg}", bg = "${bg_visual}" }
+# Progress
+progress_label  = { fg = "${fg}", bold = true }
+progress_normal = { fg = "${blue0}", bg = "${bg_highlight}" }
+progress_error  = { fg = "${red1}", bg = "${bg_highlight}" }
 
 # Which
 [which]
@@ -111,28 +92,59 @@ separator_style = { fg = "${comment}" }
 [confirm]
 border  = { fg = "${blue2}" }
 title   = { fg = "${border_highlight}" }
-content = {}
+body = {}
 list    = {}
 btn_yes = { bg = "${bg_visual}" }
 btn_no  = {}
 btn_labels = [ "  [Y]es  ", "  (N)o  " ]
 
-# Spot
+# Spottter
 [spot]
 border  = { fg = "${border_highlight}" }
 title   = { fg = "${border_highlight}" }
 
-# Notify
+# Notification
 [notify]
 title_info  = { fg = "${info}" }
 title_warn  = { fg = "${warning}" }
 title_error = { fg = "${error}" }
 
-icon_error = ""
-icon_warn = ""
+# Icons
 icon_info = ""
+icon_warn = ""
+icon_error = ""
+
+# Picker
+[pick]
+border   = { fg = "${border_highlight}" }
+active   = { fg = "${fg}",  bg = "${bg_visual}" }
+inactive = { fg = "${fg}" }
+
+# Input
+[input]
+border   = { fg = "${blue2}" }
+title    = { fg = "${blue2}" }
+value    = { fg = "${purple}" }
+selected = { bg = "${bg_visual}" }
+
+# Completion
+[cmp]
+border   = { fg = "${blue2}" }
+active   = { fg = "${fg}", bg = "${pmenusel}" }
+inactive = { fg = "${fg}" }
 
-# Help
+# Icons
+icon_file    = ""
+icon_folder  = ""
+icon_command = ""
+
+# Task manager
+[tasks]
+border  = { fg = "${border_highlight}" }
+title   = { fg = "${border_highlight}" }
+hovered = { fg = "${fg}", bg = "${bg_visual}" }
+
+# Help menu
 [help]
 on      = { fg = "${green}" }
 run     = { fg = "${magenta}" }
@@ -140,8 +152,8 @@ desc    = { fg = "${cyan}" }
 hovered = { bg = "${bg_highlight}" }
 footer  = { fg = "${fg}", bg = "${bg}" }
 
+# File-specific styles
 [filetype]
-
 rules = [
 	# Images
 	{ mime = "image/*", fg = "${yellow}" },
@@ -160,12 +172,12 @@ rules = [
 	# { mime = "inode/x-empty", fg = "${red}" },
 
 	# Special files
-	{ name = "*", is = "orphan", bg = "${red}" },
-	{ name = "*", is = "exec"  , fg = "${green}" },
+	{ url = "*", is = "orphan", bg = "${red}" },
+	{ url = "*", is = "exec"  , fg = "${green}" },
 
 	# Fallback
-	{ name = "*/", fg = "${blue}" },
-	{ name = "*", fg = "${fg}" }
+	{ url = "*/", fg = "${blue}" },
+	{ url = "*", fg = "${fg}" }
 ]
     ]],
     colors