diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 3119d15..b689030 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -2,18 +2,16 @@ require('plugins')
 require('keymap')
 require('options')
 require("lsp")
-require("completion")
 
 require'nvim-tree'.setup {}
 
-require'nvim-treesitter.configs'.setup {
-  highlight = { enable = true }
-}
+require("plugConfig.treesitter")
+require("completion")
 
 require'which-key'.setup()
 
 require('lualine').setup()
 
 require('plugConfig.notes')
-require('plugConfig.neorg')
-
+--require('plugConfig.neorg')
+require('plugConfig.orgmode')
diff --git a/.config/nvim/lua/completion.lua b/.config/nvim/lua/completion.lua
index 8c25e62..2a1a439 100644
--- a/.config/nvim/lua/completion.lua
+++ b/.config/nvim/lua/completion.lua
@@ -3,7 +3,6 @@ require("luasnip.loaders.from_vscode").lazy_load()
 
 local cmp = require'cmp'
 
-
 local kind_icons = {
   Text = "",
   Method = "",
@@ -72,6 +71,7 @@ cmp.setup({
     }),
     sources = {
       { name = 'nvim_lsp' },
+			{ name = 'orgmode' }, -- orgmode plugin
       -- { name = 'vsnip' }, -- For vsnip users.
       { name = 'luasnip' }, -- For luasnip users.
       -- { name = 'ultisnips' }, -- For ultisnips users.
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index 0519790..892e591 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -3,3 +3,4 @@ vim.o.number = true
 vim.o.relativenumber = true
 vim.o.mouse = "a"
 vim.o.tabstop = 2
+
diff --git a/.config/nvim/lua/plugConfig/orgmode.lua b/.config/nvim/lua/plugConfig/orgmode.lua
new file mode 100644
index 0000000..a5e7edf
--- /dev/null
+++ b/.config/nvim/lua/plugConfig/orgmode.lua
@@ -0,0 +1,9 @@
+
+
+require('orgmode').setup_ts_grammar()
+
+require('orgmode').setup({
+  org_agenda_files = {'~/notes/org/**/*'},
+  org_default_notes_file = '~/notes/org/inbox.org',
+
+})
diff --git a/.config/nvim/lua/plugConfig/treesitter.lua b/.config/nvim/lua/plugConfig/treesitter.lua
new file mode 100644
index 0000000..30a622d
--- /dev/null
+++ b/.config/nvim/lua/plugConfig/treesitter.lua
@@ -0,0 +1,9 @@
+--require('orgmode').setup_ts_grammar()
+
+require'nvim-treesitter.configs'.setup {
+  ensure_installed = {'lua', 'javascript', 'typescript', 'tsx', 'org'},
+  highlight = {
+      enable = true,
+			additional_vim_regex_highlighting = {'org'}
+  }
+}
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index e35b2df..e68bc3e 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -46,11 +46,16 @@ use "neovim/nvim-lspconfig"
 -- Notes
 use 'renerocksai/telekasten.nvim'
 
-use {
-    "nvim-neorg/neorg",
+--use {
+--    "nvim-neorg/neorg",
     -- tag = "latest",
     --ft = "norg",
     --after = {"nvim-treesitter", "nvim-telescope"},
+--}
+
+use {'nvim-orgmode/orgmode', config = function()
+        require('orgmode').setup{}
+end
 }
 
 -- Util