diff --git a/tools/nvim/lua/plugins/lazy-nvim.lua b/tools/nvim/lua/plugins/lazy-nvim.lua
index a5b8fbf..c1396ee 100644
--- a/tools/nvim/lua/plugins/lazy-nvim.lua
+++ b/tools/nvim/lua/plugins/lazy-nvim.lua
@@ -19,4 +19,4 @@ vim.opt.rtp:prepend(lazypath)
 -- loading lazy.nvim so that mappings are correct.
 -- This is also a good place to setup other settings (vim.opt)
 vim.g.mapleader = " "
-vim.g.maplocalleader = "\\"
+vim.g.maplocalleader = "<C-k>"
diff --git a/tools/nvim/lua/plugins/lsp.lua b/tools/nvim/lua/plugins/lsp.lua
index 07a23ae..7bc52b0 100644
--- a/tools/nvim/lua/plugins/lsp.lua
+++ b/tools/nvim/lua/plugins/lsp.lua
@@ -1,7 +1,5 @@
 return {
   { import = "plugins.mod.nvim-lspconfig" },
-  { import = "plugins.mod.render-markdown" },
-  -- { import = "plugins.mod.markview" },
   {
     "lervag/vimtex",
     ft = { "tex", "bib" },
@@ -41,7 +39,8 @@ return {
     "NoahTheDuke/vim-just",
     ft = { "just" },
   },
-  { import = "plugins.mod.lang-org" },
+  { import = "plugins.mod.lang.org" },
+  { import = "plugins.mod.lang.markdown" },
   { import = "plugins.mod.trouble-nvim" },
   {
     "nvim-treesitter/nvim-treesitter",
diff --git a/tools/nvim/lua/plugins/misc.lua b/tools/nvim/lua/plugins/misc.lua
index db52927..c5a1af2 100644
--- a/tools/nvim/lua/plugins/misc.lua
+++ b/tools/nvim/lua/plugins/misc.lua
@@ -1,5 +1,5 @@
 return {
-  { "wakatime/vim-wakatime", lazy = false },
+  { "wakatime/vim-wakatime",          lazy = false },
   { import = "plugins.mod.toggleterm" },
   {
     "CRAG666/code_runner.nvim",
@@ -18,7 +18,6 @@ return {
       },
     },
   },
-  { import = "plugins.mod.obsidian-nvim" },
   { import = "plugins.mod.which-keys-nvim" },
   { import = "plugins.mod.copilot-lua" },
   { import = "plugins.mod.avante-nvim" },
diff --git a/tools/nvim/lua/plugins/mod/lang-org.lua b/tools/nvim/lua/plugins/mod/lang-org.lua
deleted file mode 100644
index 9cce736..0000000
--- a/tools/nvim/lua/plugins/mod/lang-org.lua
+++ /dev/null
@@ -1,45 +0,0 @@
-return {
-  "nvim-orgmode/orgmode",
-  dependencies = {
-    "nvim-telescope/telescope.nvim",
-    "nvim-orgmode/telescope-orgmode.nvim",
-    "nvim-orgmode/org-bullets.nvim",
-    "Saghen/blink.cmp",
-  },
-  event = "VeryLazy",
-  config = function()
-    require("orgmode").setup({
-      org_agenda_files = "~/OrgFiles/tasks/*",
-      org_default_notes_file = "~/OrgFiles/tasks/inbox.org",
-      org_archive_location = "~/OrgFiles/archive/%s_archive::",
-      org_todo_keywords = { "TODO(t)", "NEXT(n)", "WAIT(w)", "|", "DONE(d)", "CANCELLED(c)" },
-      org_hide_leading_stars = true,
-      org_hide_emphasis_markers = true,
-      org_log_into_drawer = "LOGBOOK",
-      org_highlight_latex_and_related = "native",
-      org_startup_indented = true,
-      org_deadline_warning_days = 10,
-    })
-    require("org-bullets").setup()
-    require("blink.cmp").setup({
-      sources = {
-        per_filetype = {
-          org = { "orgmode" },
-        },
-        providers = {
-          orgmode = {
-            name = "Orgmode",
-            module = "orgmode.org.autocompletion.blink",
-            fallbacks = { "buffer" },
-          },
-        },
-      },
-    })
-
-    require("telescope").setup()
-    require("telescope").load_extension("orgmode")
-    vim.keymap.set("n", "<leader>r", require("telescope").extensions.orgmode.refile_heading)
-    vim.keymap.set("n", "<leader>fh", require("telescope").extensions.orgmode.search_headings)
-    vim.keymap.set("n", "<leader>li", require("telescope").extensions.orgmode.insert_link)
-  end,
-}
diff --git a/tools/nvim/lua/plugins/mod/lang/markdown/init.lua b/tools/nvim/lua/plugins/mod/lang/markdown/init.lua
new file mode 100644
index 0000000..9374576
--- /dev/null
+++ b/tools/nvim/lua/plugins/mod/lang/markdown/init.lua
@@ -0,0 +1,6 @@
+return {
+  { import = "plugins.mod.lang.markdown.render-markdown" },
+  -- { import = "plugins.mod.lang.markdown.markview" },
+  { import = "plugins.mod.lang.markdown.obsidian-nvim" },
+  { "bullets-vim/bullets.vim" },
+}
diff --git a/tools/nvim/lua/plugins/mod/markview.lua b/tools/nvim/lua/plugins/mod/lang/markdown/markview.lua.bak
similarity index 100%
rename from tools/nvim/lua/plugins/mod/markview.lua
rename to tools/nvim/lua/plugins/mod/lang/markdown/markview.lua.bak
diff --git a/tools/nvim/lua/plugins/mod/obsidian-nvim.lua b/tools/nvim/lua/plugins/mod/lang/markdown/obsidian-nvim.lua
similarity index 100%
rename from tools/nvim/lua/plugins/mod/obsidian-nvim.lua
rename to tools/nvim/lua/plugins/mod/lang/markdown/obsidian-nvim.lua
diff --git a/tools/nvim/lua/plugins/mod/render-markdown.lua b/tools/nvim/lua/plugins/mod/lang/markdown/render-markdown.lua
similarity index 95%
rename from tools/nvim/lua/plugins/mod/render-markdown.lua
rename to tools/nvim/lua/plugins/mod/lang/markdown/render-markdown.lua
index 1eda692..f89a3e1 100644
--- a/tools/nvim/lua/plugins/mod/render-markdown.lua
+++ b/tools/nvim/lua/plugins/mod/lang/markdown/render-markdown.lua
@@ -14,14 +14,13 @@ return {
         top_pad = 0,
         bottom_pad = 0,
       },
-      heading = {
-        sign = false,
-        position = "inline",
-        width = "block",
-        left_margin = 0.5,
-        left_pad = 0.2,
-        right_pad = 0.2,
-      },
+      -- heading = {
+      --   position = "overlay",
+      --   width = "block",
+      --   left_margin = 0.5,
+      --   left_pad = 0.2,
+      --   right_pad = 0.2,
+      -- },
       link = {
         custom = {
           python = { pattern = "%.py", icon = " " },
diff --git a/tools/nvim/lua/plugins/mod/lang/org.lua b/tools/nvim/lua/plugins/mod/lang/org.lua
new file mode 100644
index 0000000..5f2bcbe
--- /dev/null
+++ b/tools/nvim/lua/plugins/mod/lang/org.lua
@@ -0,0 +1,82 @@
+return {
+  {
+    "nvim-orgmode/orgmode",
+    dependencies = {
+      "nvim-telescope/telescope.nvim",
+      "nvim-orgmode/telescope-orgmode.nvim",
+      "nvim-orgmode/org-bullets.nvim",
+      "Saghen/blink.cmp",
+    },
+    cmd = {
+      "Org",
+    },
+    keys = {
+      { "<leader>A", "<cmd>Org agenda<CR>", desc = "Org Agenda" },
+    },
+    event = "VeryLazy",
+    config = function()
+      require("orgmode").setup({
+        org_agenda_files = "~/OrgFiles/tasks/*",
+        org_default_notes_file = "~/OrgFiles/tasks/inbox.org",
+        org_archive_location = "~/OrgFiles/archive/%s_archive::",
+        org_todo_keywords = { "TODO(t)", "NEXT(n)", "WAIT(w)", "|", "DONE(d)", "CANCELLED(c)" },
+        org_hide_leading_stars = true,
+        org_hide_emphasis_markers = true,
+        org_log_into_drawer = "LOGBOOK",
+        org_highlight_latex_and_related = "native",
+        org_startup_indented = true,
+        org_deadline_warning_days = 10,
+        mappings = {
+          agenda = {
+            org_agenda_schedule = "<C-c><C-s>",
+            org_agenda_deadline = "<C-c><C-d>",
+            org_agenda_todo = "<C-c><C-t>",
+            org_agenda_set_tags = "<C-c><C-c>",
+            org_agenda_earlier = { "[[", "<" },
+            org_agenda_later = { "]]", ">" },
+          },
+          org = {
+            org_deadline = "<C-c><C-d>",
+            org_schedule = "<C-c><C-s>",
+            org_todo = "<C-c><C-t>",
+            org_set_tags_command = "<C-c><C-c>",
+          },
+        },
+      })
+      require("org-bullets").setup()
+      require("blink.cmp").setup({
+        sources = {
+          per_filetype = {
+            org = { "orgmode" },
+          },
+          providers = {
+            orgmode = {
+              name = "Orgmode",
+              module = "orgmode.org.autocompletion.blink",
+              fallbacks = { "buffer" },
+            },
+          },
+        },
+      })
+
+      require("telescope").setup()
+      require("telescope").load_extension("orgmode")
+      -- vim.keymap.set("n", "<leader>r", require("telescope").extensions.orgmode.refile_heading)
+      vim.keymap.set("n", "<leader>oP", require("telescope").extensions.orgmode.search_headings)
+      vim.keymap.set("n", "<leader>op", "<cmd>Telescope find_files cwd=~/OrgFiles<CR>")
+      -- vim.keymap.set("n", "<leader>li", require("telescope").extensions.orgmode.insert_link)
+    end,
+  },
+  -- {
+  --   dir = "~/Source/org-pomodoro.nvim",
+  --   name = "org-pomodoro.nvim",
+  --   lazy = false,
+  --   opts = {},
+  --   dependencies = {
+  --     "nvim-orgmode/orgmode",
+  --   },
+  --   cmd = {
+  --     "OrgPomodoro",
+  --   },
+  -- },
+}
diff --git a/tools/nvim/lua/plugins/mod/lualine/components.lua b/tools/nvim/lua/plugins/mod/lualine/components.lua
index daa319e..1ec6b4e 100644
--- a/tools/nvim/lua/plugins/mod/lualine/components.lua
+++ b/tools/nvim/lua/plugins/mod/lualine/components.lua
@@ -112,6 +112,13 @@ M.progress = {
   "progress",
 }
 
+-- TODO: Implement orgmode
+M.orgmode = {
+  function()
+    return _G.orgmode.statusline()
+  end,
+}
+
 -- local conditions = {
 --   buffer_not_empty = function()
 --     return vim.fn.empty(vim.fn.expand("%:t")) ~= 1
diff --git a/tools/nvim/lua/plugins/mod/lualine/init.lua b/tools/nvim/lua/plugins/mod/lualine/init.lua
index 5944677..7cdeb1c 100644
--- a/tools/nvim/lua/plugins/mod/lualine/init.lua
+++ b/tools/nvim/lua/plugins/mod/lualine/init.lua
@@ -36,6 +36,7 @@ local config = {
       components.diagnostics,
     },
     lualine_x = {
+      components.orgmode,
       components.indent,
       components.encoding,
       components.eol,