diff --git a/lua/keybindings.lua b/lua/keybindings.lua
index 788a538..25b5199 100644
--- a/lua/keybindings.lua
+++ b/lua/keybindings.lua
@@ -33,11 +33,16 @@ vim.keymap.set('n', '<leader>C', ":Calendar -view=year -split=vertical -width=27
 vim.keymap.set('n', '<space>o', ":silent !chromium '%'<cr>", { desc = "Open in browser" })
 
 -- org mode mappings
-if vim.loop.os_gethostname() == 'ccflow' then
-  -- Open org file folder in neotree
-  vim.keymap.set('n', '<leader>of', ':silent :Neotree dir=/home/saschal/Documents/Eigene\\ (Briefe\\ etc.)/org<cr>',
-    { desc = "Open org folder" })
-end
+-- Open org file folder in neotree
+vim.keymap.set('n', '<leader>of',
+  function()
+    require('neo-tree.command').execute({
+      dir = sl_opt.org_base_folder,
+      reveal = true,
+      toggle = true
+    })
+  end,
+  { desc = "Open org folder" })
 vim.keymap.set('n', '<leader>a', ':silent Org agenda t<cr>', { desc = "Org Agenda" })
 
 -- toggle colorscheme between dark and light
diff --git a/lua/options.lua b/lua/options.lua
index 85155c6..c2945fa 100644
--- a/lua/options.lua
+++ b/lua/options.lua
@@ -1,30 +1,22 @@
 ---------------------------------------------------
 --
--- Global settings
+-- Global settings - this file is read first
 --
 ---------------------------------------------------
 
--- global
-
-sl_opt = {}
-
-
 -- this is specific for a machine
 if vim.loop.os_gethostname() == 'ccflow' then
-  sl_opt = {
-    org_agenda_files = '~/Documents/Eigene (Briefe etc.)/org/*.org',
-    org_default_notes_file = '~/Documents/Eigene (Briefe etc.)/org/refile.org',
-    org_archive_location = '~/Documents/Eigene (Briefe etc.)/org/.archive.org',
-    org_roam_folder = '~/Documents/Eigene (Briefe etc.)/org/roam',
-  }
+  _G.ORG_BASE_FOLDER = '~/Documents/Eigene (Briefe etc.)/org'
 else
-  sl_opt = {
-    org_agenda_files = '~/OneDrive - Stadt Rosenheim/Desktop/orgfiles/*.org',
-    org_default_notes_file = '~/OneDrive - Stadt Rosenheim/Desktop/orgfiles/refile.org',
-    org_archive_location = '~/OneDrive - Stadt Rosenheim/Desktop/orgfiles/archive.org',
-    org_roam_folder = '~/OneDrive - Stadt Rosenheim/Desktop/orgfiles/roam',
-  }
+  _G.ORG_BASE_FOLDER = '~/OneDrive - Stadt Rosenheim/Desktop/orgfiles'
 end
+sl_opt = {
+  org_base_folder = ORG_BASE_FOLDER,
+  org_agenda_files = ORG_BASE_FOLDER .. '/*.org',
+  org_default_notes_file = ORG_BASE_FOLDER .. '/refile.org',
+  org_archive_location = ORG_BASE_FOLDER .. '/.archive.org',
+  org_roam_folder = ORG_BASE_FOLDER .. '/roam',
+}
 
 ---------------------------------------------------
 --