diff --git a/lua/custom/plugins/obsidian.lua b/lua/custom/plugins/obsidian.lua
index 8dfbe4a2..13b8e886 100644
--- a/lua/custom/plugins/obsidian.lua
+++ b/lua/custom/plugins/obsidian.lua
@@ -1,73 +1,46 @@
 return {
-  'epwalsh/obsidian.nvim',
-  version = '*', -- Use the latest release
+  'obsidian-nvim/obsidian.nvim',
+  version = '*', -- use latest release, remove to use latest commit
   lazy = true,
   event = {
-    -- Load obsidian.nvim only when opening files in the vault
-    'BufReadPre '
-      .. vim.fn.expand '~/AdisObsidianSyncVault'
-      .. '/*.md',
-    'BufNewFile ' .. vim.fn.expand '~/AdisObsidianSyncVault' .. '/*.md',
+    -- If you want to use the home shortcut '~' here, you need to call 'vim.fn.expand'.
+    "BufReadPre " .. vim.fn.expand "~" .. "/AdisObsidianSyncVault/**.md",
+    "BufNewFile " .. vim.fn.expand "~" .. "/AdisObsidianSyncVault/**.md",
   },
-
   dependencies = {
-    'nvim-lua/plenary.nvim', -- Required dependency
-    'hrsh7th/nvim-cmp',
+    'nvim-lua/plenary.nvim',
   },
-
-  opts = function(_, opts)
-    vim.api.nvim_create_autocmd('FileType', {
-      pattern = { 'markdown', 'md' },
-      callback = function()
-        vim.wo.conceallevel = 1
-      end,
-    })
-    return {
-      workspaces = {
-        {
-          name = 'work',
-          path = '~/AdisObsidianSyncVault', -- Define your vault path
-        },
+  cmd = {
+    "ObsidianOpen",
+    "ObsidianNew",
+    "ObsidianQuickSwitch",
+    "ObsidianFollowLink",
+    "ObsidianBacklinks",
+    "ObsidianTags",
+    "ObsidianToday",
+    "ObsidianYesterday",
+    "ObsidianTomorrow",
+    "ObsidianDailies",
+    "ObsidianTemplate",
+    "ObsidianSearch",
+    "ObsidianLink",
+    "ObsidianLinkNew",
+    "ObsidianLinks",
+    "ObsidianExtractNote",
+    "ObsidianWorkspace",
+    "ObsidianPasteImg",
+    "ObsidianRename",
+    "ObsidianTOC",
+  },
+  ---@module 'obsidian'
+  ---@type obsidian.config
+  opts = {
+    legacy_commands = false, -- this will be removed in the next major release
+    workspaces = {
+      {
+        name = 'MyOnlyVault',
+        path = '~/AdisObsidianSyncVault',
       },
-      templates = {
-        folder = '~/AdisObsidianSyncVault/Templates',
-        date_format = '%d.%m.%Y',
-        time_format = '%H:%M',
-      },
-      -- Optional, completion of wiki links, local markdown links, and tags using nvim-cmp.
-      completion = {
-        -- Set to false to disable completion.
-        nvim_cmp = true,
-        -- Trigger completion at 2 chars.
-        min_chars = 2,
-      },
-
-      ui = {
-        -- recommended here: https://github.com/MeanderingProgrammer/render-markdown.nvim
-        enabled = false,
-      },
-
-      note_id_func = function(title)
-        -- Create note IDs in a Zettelkasten format with a timestamp and a suffix.
-        -- In this case a note with the title 'My new note' will be given an ID that looks
-        -- like '1657296016-my-new-note', and therefore the file name '1657296016-my-new-note.md'
-        local suffix = ''
-        if title ~= nil then
-          -- If title is given, transform it into valid file name.
-          suffix = title:gsub(' ', '-'):gsub('[^A-Za-z0-9-]', ''):lower()
-        else
-          -- If title is nil, just add 4 random uppercase letters to the suffix.
-          for _ = 1, 4 do
-            suffix = suffix .. string.char(math.random(65, 90))
-          end
-        end
-        return tostring(os.time()) .. '-' .. suffix
-      end,
-
-      note_path_func = function(spec)
-        local path = spec.dir / tostring(spec.title)
-        return path:with_suffix '.md'
-      end,
-    }
-  end,
+    },
+  },
 }
diff --git a/lua/custom/plugins/render-markdown.lua b/lua/custom/plugins/render-markdown.lua
index 533b6a4c..845bb621 100644
--- a/lua/custom/plugins/render-markdown.lua
+++ b/lua/custom/plugins/render-markdown.lua
@@ -1,6 +1,7 @@
 return {
   "MeanderingProgrammer/render-markdown.nvim",
   dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.nvim" }, -- if you use the mini.nvim suite
+  ft = { "markdown" },
   -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins
   -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons
   ---@module 'render-markdown'
diff --git a/lua/keymaps.lua b/lua/keymaps.lua
index 8ada39a4..ea6434df 100644
--- a/lua/keymaps.lua
+++ b/lua/keymaps.lua
@@ -55,12 +55,9 @@ map('n', '<leader>r', ' Render Markdown')
 map('n', '<leader>rt', '<Cmd>RenderMarkdown toggle<CR>', { desc = 'toggle render markdown', silent = true })
 map('n', '<leader>re', '<Cmd>RenderMarkdown expand<CR>', { desc = 'Increase anti-conceal margin above and below by 1', silent = true })
 map('n', '<leader>re', '<Cmd>RenderMarkdown expand<CR>', { desc = 'Decrease anti-conceal margin above and below by 1', silent = true })
-map('n', '<leader>os', '<Cmd>ObsidianSearch<CR>', { silent = true })
-map('n', '<leader>ob', '<Cmd>ObsidianBacklink<CR>', { silent = true })
-map('n', '<leader>ot', '<Cmd>ObsidianToday<CR>', { silent = true })
-map('n', '<leader>od', '<Cmd>ObsidianDailies<CR>', { silent = true })
-map('n', '<leader>oq', '<Cmd>ObsidianQuickSwitch<CR>', { silent = true })
-map('n', '<leader>on', '<Cmd>ObsidianNew<CR>', { silent = true })
+map('n', '<leader>ot', '<Cmd>Obsidian today<CR>', { silent = true })
+map('n', '<leader>od', '<Cmd>Obsidian dailies<CR>', { silent = true })
+map('n', '<leader>oq', '<Cmd>Obsidian quick_switch<CR>', { silent = true })
 
 map('n', '<leader>e', '<Cmd>Neotree toggle<CR>')
 map('n', '<leader><Tab>', '<Cmd>bn<CR>', { desc = 'next buffer' })