diff --git a/nvim/init.lua b/nvim/init.lua
index fe677ef..b339048 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -22,6 +22,7 @@ opt.background = "dark"
 opt.listchars = "tab:→ ,trail:·,extends:↷,precedes:↶,nbsp:+,eol:↵"
 opt.list = true -- Show listchars
 opt.showtabline = 2
+opt.laststatus = 3
 
 -- undo
 opt.undodir = "/home/hjalmarlucius/.cache/vim/undo"
@@ -80,6 +81,7 @@ opt.foldenable = false
 opt.foldmethod = "expr"
 
 opt.completeopt = "menu,menuone,noinsert"
+vim.g.seoul256_background = 235
 
 -- ----------------------------------------
 -- AUTOCOMMANDS
@@ -300,7 +302,6 @@ require("packer").startup {
 
     use {
       "junegunn/seoul256.vim",
-      config = function() vim.g.seoul256_background = 235 end
     }
     vim.cmd "colorscheme seoul256"
 
@@ -379,14 +380,17 @@ require("packer").startup {
       requires = {"kyazdani42/nvim-web-devicons"},
       config = function()
         require("lualine").setup {
-          options = {theme = "auto"},
+          options = {theme = "auto", globalstatus = true},
           extensions = {"fugitive"},
           sections = {
             lualine_a = {"mode"},
             lualine_b = {"branch"},
-            lualine_c = {{"filename", file_status = true, path = 1}}, -- , {"diff", colored=false}, { "diagnostics", sources = {"nvim_lsp"}}
+            lualine_c = {
+              {"filename", file_status = true, path = 1},
+              {"diff", colored = true}, {"diagnostics", sources = {"nvim_lsp"}}
+            },
             lualine_x = {"filetype"},
-            lualine_y = {"progress"}, -- "encoding", "fileformat",
+            lualine_y = {"progress", "encoding", "fileformat"},
             lualine_z = {"location"}
           },
           inactive_sections = {
diff --git a/zathura/zathurarc b/zathura/zathurarc
index b02b317..16be27b 100644
--- a/zathura/zathurarc
+++ b/zathura/zathurarc
@@ -1,63 +1,29 @@
 # zathurarc
 
-# settings
-set window-height 1024
-set window-width 768
-set adjust-open width
-# set show-scrollbars true
+set zoom-min 0
+set zoom-max 10
 set first-page-column 2
-set window-title-basename true
-# set database sqlite
-set recolor-keephue
-set selection-clipboard clipboard
-# various hb
-set recolor
-set font "Fixed 12"
-set inputbar-fg "#222222"
-
-
-# key bindings
-# map <C-[> abort # Still doesn't work :(
-map [normal]     <F11> toggle_fullscreen
-map [fullscreen] <F11> toggle_fullscreen
-map [normal]     <C-l> reload
-map [fullscreen] <C-l> reload
-
-map [normal]     e scroll down
-map [fullscreen] e scroll down
-map [normal]     <C-e> scroll down
-map [fullscreen] <C-e> scroll down
-map [normal]     y scroll up
-map [fullscreen] y scroll up
-map [normal]     <C-y> scroll up
-map [fullscreen] <C-y> scroll up
+set pages-per-row 2
+set scroll-step 100
+set recolor-keephue "true"
+set scroll-page-aware "true"
+set smooth-scroll "true"
+set guioptions "csv"
+set adjust-open "best-fit"
+set selection-clipboard "clipboard"
 map [normal]     R rotate rotate-ccw
 map [fullscreen] R rotate rotate-ccw
-
 map [normal]     c recolor
 map [fullscreen] c recolor
-
-map [normal]     <PageUp>   navigate previous
-map [fullscreen] <PageUp>   navigate previous
-map [normal]     <PageDown> navigate next
-map [fullscreen] <PageDown> navigate next
-
-map [normal]     <A-1> set "first-page-column 1:1"
-map [fullscreen] <A-1> set "first-page-column 1:1"
-map [normal]     <A-2> set "first-page-column 1:2"
-map [fullscreen] <A-2> set "first-page-column 1:2"
-
-# Why are these only defined for normal mode by default?
-map [fullscreen] a adjust_window best-fit
-map [fullscreen] s adjust_window width
-map [fullscreen] f follow
-map [fullscreen] d toggle_page_mode 2
-map [fullscreen] <Tab> toggle_index
-map [fullscreen] j scroll down
-map [fullscreen] k scroll up
-map [fullscreen] <C-d> scroll half-down
-map [fullscreen] <C-u> scroll half-up
-map [fullscreen] <C-o> jumplist backward
-map [fullscreen] <C-i> jumplist forward
-
-map [index] q quit
+map [normal] f toggle_fullscreen
+map [fullscreen] f toggle_fullscreen
+map [normal] <A-1> set "pages-per-row 1"
+map [fullscreen] <A-1> set "pages-per-row 1"
+map [normal] <A-2> set "pages-per-row 2"
+map [fullscreen] <A-2> set "pages-per-row 2"
+map [normal] <A-3> set "pages-per-row 3"
+map [fullscreen] <A-3> set "pages-per-row 3"
+map [normal] <A-4> set "pages-per-row 4"
+map [fullscreen] <A-4> set "pages-per-row 4"
+map [normal] <A-5> set "pages-per-row 5"
+map [fullscreen] <A-5> set "pages-per-row 5"