diff --git a/home/.config/nvim/lua/mappings.lua b/home/.config/nvim/lua/mappings.lua
index ac28c97..567f6bf 100644
--- a/home/.config/nvim/lua/mappings.lua
+++ b/home/.config/nvim/lua/mappings.lua
@@ -88,17 +88,6 @@ wk.register({
     K = {name = 'Hover'},
     z = {name = 'Misc utils'},
 
-    -- Don't need to show bufferline numbers
-    ['<leader>1'] = 'which_key_ignore',
-    ['<leader>2'] = 'which_key_ignore',
-    ['<leader>3'] = 'which_key_ignore',
-    ['<leader>4'] = 'which_key_ignore',
-    ['<leader>5'] = 'which_key_ignore',
-    ['<leader>6'] = 'which_key_ignore',
-    ['<leader>7'] = 'which_key_ignore',
-    ['<leader>8'] = 'which_key_ignore',
-    ['<leader>9'] = 'which_key_ignore',
-
     -- Move between tabs
     ['<TAB>'] = {'<Cmd>BufferLineCycleNext<CR>', 'Next buffer'},
     ['<S-TAB>'] = {'<Cmd>BufferLineCyclePrev<CR>', 'Previous buffer'},
@@ -218,13 +207,6 @@ wk.register({
 
     n = {':NnnPicker %:p:h<CR>', 'File picker'},
 
-    -- orgmode.nvim
-    o = {
-        name = 'Org',
-        a = 'Agenda',
-        c = 'Capture'
-    },
-
     -- Tab related
     t = {
         name = 'Tab',
@@ -268,7 +250,10 @@ autocmd FileType html lua whichkeyHtml()
 _G.whichkeyOrg = function()
     wk.register({
         ['<leader>o'] = {
+            name = 'Org',
+            a = 'Agenda',
             A = 'Toggle ARCHIVE',
+            c = 'Capture',
             e = 'Export',
             i = {
                 name = 'Insert',
diff --git a/home/.config/nvim/lua/modules/bufferline.lua b/home/.config/nvim/lua/modules/bufferline.lua
index 61092b8..d221650 100644
--- a/home/.config/nvim/lua/modules/bufferline.lua
+++ b/home/.config/nvim/lua/modules/bufferline.lua
@@ -1,7 +1,6 @@
 return require('bufferline').setup {
     options = {
         numbers = 'none',
-        mappings = true,
         max_name_length = 16,
         max_prefix_length = 14,
         tab_size = 20,
diff --git a/home/.config/nvim/lua/modules/gitgutter.lua b/home/.config/nvim/lua/modules/gitgutter.lua
index df6f26f..55a9f24 100644
--- a/home/.config/nvim/lua/modules/gitgutter.lua
+++ b/home/.config/nvim/lua/modules/gitgutter.lua
@@ -29,12 +29,14 @@ return require('gitsigns').setup {
         follow_files = true
     },
     current_line_blame = false,
-    current_line_blame_delay = 1000,
-    current_line_blame_position = 'eol',
+    current_line_blame_opts = {
+        delay = 1000,
+        virt_text = true,
+        virt_text_pos = 'eol'
+    },
     sign_priority = 6,
     update_debounce = 100,
     status_formatter = nil, -- Use default
     word_diff = false,
-    use_decoration_api = true,
     use_internal_diff = true  -- If luajit is present
 }
diff --git a/home/.config/nvim/lua/plugins.lua b/home/.config/nvim/lua/plugins.lua
index 4daf363..b7404a3 100644
--- a/home/.config/nvim/lua/plugins.lua
+++ b/home/.config/nvim/lua/plugins.lua
@@ -323,6 +323,7 @@ return require('packer').startup(
         }
         use {
             'kristijanhusak/orgmode.nvim', -- shouldn't be lazy-loaded (otherwise bindings don't work)
+            ft = 'org',
             config = function()
                 require('modules.org')
             end