diff --git a/dots/.config/nvim/lua/plugins/configs/neorg.lua b/dots/.config/nvim/lua/plugins/configs/neorg.lua
index 1cba6d72..34666281 100644
--- a/dots/.config/nvim/lua/plugins/configs/neorg.lua
+++ b/dots/.config/nvim/lua/plugins/configs/neorg.lua
@@ -8,9 +8,9 @@ return {
             { "nvim-treesitter/nvim-treesitter" },
         },
         keys = {
-            { "<leader>o",  desc = "> Neorg" },
-            { "<leader>oj", ":Neorg journal custom<CR>", desc = "Neorg: Journal" },
-            { "<leader>ot", ":Neorg toc<CR>",            desc = "Neorg: Table of Contents" },
+            { "<leader>N", desc = "> Neorg" },
+            { "<leader>Nj", ":Neorg journal custom<CR>", desc = "Neorg: Journal" },
+            { "<leader>Nt", ":Neorg toc<CR>", desc = "Neorg: Table of Contents" },
         },
         config = function()
             require("neorg").setup({
diff --git a/dots/.config/nvim/lua/plugins/configs/org-mode.lua b/dots/.config/nvim/lua/plugins/configs/org-mode.lua
new file mode 100644
index 00000000..f0cde96d
--- /dev/null
+++ b/dots/.config/nvim/lua/plugins/configs/org-mode.lua
@@ -0,0 +1,42 @@
+return {
+    {
+        "nvim-orgmode/orgmode",
+        dependencies = {
+            { "nvim-treesitter/nvim-treesitter" },
+            {
+                "akinsho/org-bullets.nvim",
+                opts = {
+                    concealcursor = true,
+                    symbols = {
+                        headlines = {
+                            "󰀘",
+                            "",
+                            "󰺕",
+                            "",
+                            "󰬪",
+                            "󱆭",
+                        }
+                    }
+                }
+            }
+        },
+        ft = { "org" },
+        keys = {
+            { "<leader>o",  desc = "> Org" },
+        },
+        config = function()
+            -- Load treesitter grammar for org
+            require("orgmode").setup_ts_grammar()
+
+            -- Setup orgmode
+            require("orgmode").setup({
+                org_agenda_files = "~/Notes/**/*",
+                org_default_notes_file = "~/Notes/refile.org",
+                org_startup_folded = "inherit"
+            })
+            if vim.bo.filetype == "org" then
+                vim.cmd.edit()
+            end
+        end,
+    }
+}