diff --git a/dots/.config/nvim/after/ftplugin/markdown.lua b/dots/.config/nvim/after/ftplugin/markdown.lua
index 12ed941f..8ab4cb17 100644
--- a/dots/.config/nvim/after/ftplugin/markdown.lua
+++ b/dots/.config/nvim/after/ftplugin/markdown.lua
@@ -1,5 +1,4 @@
 vim.opt_local.tabstop = 2
-vim.opt_local.conceallevel = 0
 vim.opt_local.shiftwidth = 2
 vim.opt_local.textwidth = 120
 
diff --git a/dots/.config/nvim/after/queries/markdown/highlights.scm b/dots/.config/nvim/after/queries/markdown/highlights.scm
index 613bfe13..695acc60 100644
--- a/dots/.config/nvim/after/queries/markdown/highlights.scm
+++ b/dots/.config/nvim/after/queries/markdown/highlights.scm
@@ -4,11 +4,11 @@
     (list_marker_star)
     (list_marker_plus)
     (list_marker_minus)
-  ]) @markup.list.markdown
-  (#offset! @markup.list.markdown 0 0 0 -1)
+  ]) @markup.list
+  (#offset! @markup.list 0 0 0 -1)
   (#set! conceal "•")
 )
 
 ; checkboxes
-((task_list_marker_unchecked) @markup.list.unchecked.markdown (#set! conceal ""))
-((task_list_marker_checked) @markup.list.checked.markdown (#set! conceal "󰄲"))
+((task_list_marker_unchecked) @markup.list.unchecked (#set! conceal ""))
+((task_list_marker_checked) @markup.list.checked (#set! conceal "󰄲"))
diff --git a/dots/.config/nvim/after/queries/org/highlights.scm b/dots/.config/nvim/after/queries/org/highlights.scm
index 415afe88..6d156641 100644
--- a/dots/.config/nvim/after/queries/org/highlights.scm
+++ b/dots/.config/nvim/after/queries/org/highlights.scm
@@ -3,3 +3,27 @@
  @punctuation.special
  (#any-of? @punctuation.special "-" "*" "+")
  (#set! conceal "•"))
+
+((checkbox !status) @markup.list.unchecked (#set! conceal ""))
+
+((checkbox
+   status:
+   (expr)
+   @org-checkbox-content (#any-of? @org-checkbox-content "x" "X")) @markup.list.checked
+ (#set! conceal "󰄲"))
+
+((checkbox
+   status:
+   (expr)
+   @org-checkbox-content (#any-of? @org-checkbox-content "-")) @markup.list.indeterminate
+ (#set! conceal "󰍵"))
+
+; Table highlights
+(row
+  "|" @punctuation.special)
+(cell
+  "|" @punctuation.special)
+(table
+  (row
+    (cell (contents) @markup.heading))
+  (hr) @punctuation.special)
diff --git a/dots/.config/nvim/lua/plugins/configs/kanagawa.lua b/dots/.config/nvim/lua/plugins/configs/kanagawa.lua
index 393a4663..60d8a18b 100644
--- a/dots/.config/nvim/lua/plugins/configs/kanagawa.lua
+++ b/dots/.config/nvim/lua/plugins/configs/kanagawa.lua
@@ -221,9 +221,10 @@ return {
                         ["@OrgTSBlock.org"] = { fg = colors.fujiGray, bold = true, italic = true },
                         ["@OrgTSDirective.org"] = { link = "@OrgTSBlock.org" },
 
-                        -- Markdown specific
-                        ["@markdown_check_undone"] = { fg = colors.carpYellow },
-                        ["@markdown_check_ndone"] = { fg = colors.springGreen },
+                        -- Markup specific
+                        ["@markup.list.checked"] = { fg = colors.springGreen },
+                        ["@markup.list.indeterminate"] = { fg = colors.carpYellow },
+                        ["@markup.list.unchecked"] = { fg = colors.crystalBlue },
                     }
 
                     return overrides
diff --git a/dots/.config/nvim/lua/plugins/configs/org-mode.lua b/dots/.config/nvim/lua/plugins/configs/org-mode.lua
index 1b09a23c..1e3f2d7b 100644
--- a/dots/.config/nvim/lua/plugins/configs/org-mode.lua
+++ b/dots/.config/nvim/lua/plugins/configs/org-mode.lua
@@ -4,23 +4,6 @@ return {
         branch = "nightly",
         dependencies = {
             { "nvim-treesitter/nvim-treesitter" },
-            {
-                "akinsho/org-bullets.nvim",
-                opts = {
-                    concealcursor = true,
-                    symbols = {
-                        list = "",
-                        headlines = {
-                            "󰀘",
-                            "",
-                            "󰺕",
-                            "",
-                            "󰬪",
-                            "󱆭",
-                        },
-                    },
-                },
-            },
         },
         event = "VeryLazy",
         ft = { "org" },
diff --git a/dots/.config/nvim/syntax/org.vim b/dots/.config/nvim/syntax/org.vim
deleted file mode 100644
index 30fdaaf0..00000000
--- a/dots/.config/nvim/syntax/org.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-syn match org_table_sep /\(|\|\-\|+\)/  contained
-syn match org_table_header /|.*|/ contained contains=org_table_sep
-syn match org_table_header_region /|.*|\_s*|\_s*\(-+\|\-\).*|\_s*$/ contained contains=org_table_header
-syn match org_table /|.*|\_s*$/ contained contains=org_table_sep,org_table_header_region
-syn match org_table_region /^\s*|.*|\_s*$/ contains=org_table