diff --git a/lua/keybindings.lua b/lua/keybindings.lua
index b596cbc..6ede26d 100644
--- a/lua/keybindings.lua
+++ b/lua/keybindings.lua
@@ -32,11 +32,13 @@ vim.keymap.set('n', '<leader>C', ":Calendar -view=year -split=vertical -width=27
 -- Open current file in browser (chromium)
 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
+vim.keymap.set('n', '<leader>a', ':silent Org agenda t<cr>', { desc = "Org Agenda" })
 
 -- toggle colorscheme between dark and light
 vim.keymap.set('n', '<leader>m', function()
@@ -112,6 +114,9 @@ vim.keymap.set('n', '<M-Down>', ":m +1<cr>", { desc = "Move current line down" }
 vim.keymap.set('i', '<M-Up>', "<c-o>:m -2<cr>", { desc = "Move current line up" })
 vim.keymap.set('i', '<M-Down>', "<c-o>:m +1<cr>", { desc = "Move current line down" })
 
+vim.keymap.set('v', '<M-Up>', ":m '<-2<cr>gv=gv", { desc = "Move current selection up" })
+vim.keymap.set('v', '<M-Down>', ":m '>+1<cr>gv=gv", { desc = "Move current selection down" })
+
 ------------------------------------------
 --
 -- Shortcuts which are known from Emacs
diff --git a/lua/lsp.lua b/lua/lsp.lua
index 538ec8e..6f77d88 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -99,7 +99,7 @@ if vim.loop.os_gethostname() == 'ccflow' then
     'gopls',
     'bashls',
     'html',
-    'lua_ls',
+    'emmylua_ls',
     'jsonls',     -- arch extra: vscode-json-languageserver
     'kotlin_lsp', -- arch aur: kotlin-lsp-bin
     'lemminx',    -- arch aur: lemminx
@@ -110,6 +110,7 @@ if vim.loop.os_gethostname() == 'ccflow' then
 else
   -- any lsp which should be enabled in all situations
   enable_this_lsp = {
+    'emmylua_ls',
   }
 end
 
diff --git a/lua/options.lua b/lua/options.lua
index 8a78ed3..28ce2a8 100644
--- a/lua/options.lua
+++ b/lua/options.lua
@@ -11,17 +11,19 @@ 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_roam_folder = '~/Documents/Eigene (Briefe etc.)/org/roam',
-}
+  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',
+  }
 else
-sl_opt = {
-  org_agenda_files = '~/OneDrive - Stadt Rosenheim/Desktop/orgfiles/*.org',
-  org_default_notes_file = '~/OneDrive - Stadt Rosenheim/Desktop/orgfiles/refile.org',
-  org_roam_folder = '~/OneDrive - Stadt Rosenheim/Desktop/orgfiles/roam',
-}
+  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',
+  }
 end
 
 ---------------------------------------------------
diff --git a/lua/plugins.lua b/lua/plugins.lua
index e2b3f5e..5e5e4d7 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -197,6 +197,7 @@ require("lazy").setup({
         -- org_default_notes_file = '~/orgfiles/refile.org',
         org_agenda_files = sl_opt.org_agenda_files,
         org_default_notes_file = sl_opt.org_default_notes_file,
+        org_archive_location = sl_opt.org_archive_location,
         org_todo_keywords = { 'TODO(t)', 'STARTED(s)', 'PLANNED(p)', '|', 'DONE(d)', 'UNPLANNED(u)' },
         org_custom_exports = {
           f = {