diff --git a/lua/plugins/config/orgmode.lua b/lua/plugins/config/orgmode.lua
new file mode 100644
index 0000000..d019681
--- /dev/null
+++ b/lua/plugins/config/orgmode.lua
@@ -0,0 +1,24 @@
+--[[
+    Copyright 2023 Oscar Wallberg
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+]]
+
+-- https://github.com/nvim-orgmode/orgmode
+
+local orgmode = require('orgmode')
+orgmode.setup_ts_grammar()
+orgmode.setup({
+  org_agenda_files = {'~/Dropbox/org/*', '~/my-orgs/**/*'},
+  org_default_notes_file = '~/Dropbox/org/refile.org',
+})
diff --git a/lua/plugins/config/treesitter.lua b/lua/plugins/config/treesitter.lua
index 3a2c90e..408cc8a 100644
--- a/lua/plugins/config/treesitter.lua
+++ b/lua/plugins/config/treesitter.lua
@@ -38,7 +38,7 @@ require("nvim-treesitter.configs").setup({
     indent = {
         enable = true,
     },
-
+    additional_vim_regex_highlighting = { "org", },
 })
 
 vim.opt.foldmethod = "expr"
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index 8706510..6525f58 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -222,6 +222,10 @@ local plugins = {
         },
         config = function () require("plugins.config.noice") end,
     },
+    {
+        "nvim-orgmode/orgmode",
+        config = function () require("plugins.config.orgmode") end,
+    },
 }
 
 local opts = {}