diff --git a/lua/plugins/config/orgmode.lua b/lua/plugins/config/orgmode.lua
index d019681..5cc3136 100644
--- a/lua/plugins/config/orgmode.lua
+++ b/lua/plugins/config/orgmode.lua
@@ -16,9 +16,32 @@
 
 -- https://github.com/nvim-orgmode/orgmode
 
-local orgmode = require('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',
+    org_agenda_files = { "~/Documents/org/**/*", },
+    org_default_notes_file = "~/Documents/org/notes.org",
+    org_todo_keywords = {
+        "TODO(t)",
+        "ACTIVE(a)",
+        "WAITING(w)",
+        "|",
+        "DONE(d)",
+        "DISCARDED(D)",
+    },
+    org_todo_keyword_faces = {
+        ACTIVE = ":foreground dodgerblue :weight bold",
+        WAITING = ":foreground lightgoldenrod :weight bold",
+        DISCARDED = ":foreground grey :weight bold",
+    },
+    win_split_mode = "float",
+    win_border = "single",
+    org_archive_location = "~/Documents/org/archive.org::",
+    org_log_done = "note",
+    org_log_into_drawer = "LOGBOOK",
+    org_highlight_latex_and_related = "entities",
+    org_agenda_span = "week",
+    org_agenda_skip_scheduled_if_done = true,
+    org_agenda_skip_deadline_if_done = true,
+
 })
diff --git a/lua/plugins/config/treesitter.lua b/lua/plugins/config/treesitter.lua
index 8950719..b606065 100644
--- a/lua/plugins/config/treesitter.lua
+++ b/lua/plugins/config/treesitter.lua
@@ -36,6 +36,7 @@ require("nvim-treesitter.configs").setup({
     highlight = {
         enable = true,
         disable = {},
+        additional_vim_regex_highlighting = { "org", },
     },
 
     -- Indentation based on treesitter for the = operator.
@@ -43,7 +44,6 @@ require("nvim-treesitter.configs").setup({
     indent = {
         enable = true,
     },
-    additional_vim_regex_highlighting = { "org", },
 })
 
 vim.opt.foldmethod = "expr"