diff --git a/nvim/init.vim b/nvim/init.vim
index c2b4650..8c663d9 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -1,8 +1,9 @@
 " mark: modules
 call plug#begin('~/.config/nvim/plugged')
 
-" Colorschemes
 Plug 'ayu-theme/ayu-vim'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
 
 Plug 'tpope/vim-commentary'
 Plug 'norcalli/nvim-colorizer.lua'
@@ -20,20 +21,18 @@ Plug 'alvan/vim-closetag'
 Plug 'turbio/bracey.vim', { 'do': 'npm install --prefix server' }
 Plug 'folke/zen-mode.nvim'
 Plug 'kyazdani42/nvim-web-devicons'
+Plug 'kevinoid/vim-jsonc'
 
 call plug#end()
 
 " mark: general
 syntax on
 
-set number
-
 set tabstop=2
-set softtabstop=2
 set shiftwidth=2
-set smartindent
 set expandtab
 
+set number
 set wrap
 set noswapfile
 set encoding=utf-8
@@ -43,6 +42,7 @@ set cmdheight=2
 set updatetime=300
 set shortmess+=c
 set mouse=nv
+set cursorline
 
 set termguicolors
 set guifont=Fira\ Code:h20
@@ -54,9 +54,16 @@ let mapleader = " "
 let ayucolor = 'mirage'
 colorscheme ayu
 
+" Airline
+let g:airline#extensions#tabline#enabled = 1
+let g:airline_theme = 'ayu_mirage'
+
 " Color highlighting
 lua require'colorizer'.setup()
 
+" Zen Mode plugin
+lua require'zen-mode'.setup()
+
 
 source $HOME/dotfiles/nvim/file-tree.vim
 source $HOME/dotfiles/nvim/remaps.vim
@@ -67,27 +74,8 @@ source $HOME/dotfiles/nvim/tabs.vim
 " Filetypes for markdown extension
 let g:mkdp_filetypes = ['md', 'mdx', 'markdown']
 
-
-
-
-"  ______     _______ _   _____ _____ 
-" / ___\ \   / / ____| | |_   _| ____|
-" \___ \\ \ / /|  _| | |   | | |  _|  
-"  ___) |\ V / | |___| |___| | | |___ 
-" |____/  \_/  |_____|_____|_| |_____|
-"                                    
-" mark: svelte
 let g:svelte_preprocessors = ['typescript', 'scss']
 
-
-
-"  _   _ _____ __  __ _     
-" | | | |_   _|  \/  | |    
-" | |_| | | | | |\/| | |    
-" |  _  | | | | |  | | |___ 
-" |_| |_| |_| |_|  |_|_____|
-"                          
-" mark: html
 let g:closetag_filenames = '*.html,*.svelte,*.jsx,*.tsx'
 let g:closetag_regions = {
     \ 'typescript.tsx': 'jsxRegion,tsxRegion',
@@ -100,28 +88,3 @@ let g:bracey_refresh_on_save = 1
 let g:bracey_server_allow_remote_connections = 1
 let g:bracey_server_port = 3000
 let g:bracey_eval_on_save = 1
-
-
-
-"  _____ _   _ ____________   __  _____ ___ _   _ ____  _____ ____  
-" |  ___| | | |__  /__  /\ \ / / |  ___|_ _| \ | |  _ \| ____|  _ \ 
-" | |_  | | | | / /  / /  \ V /  | |_   | ||  \| | | | |  _| | |_) |
-" |  _| | |_| |/ /_ / /_   | |   |  _|  | || |\  | |_| | |___|  _ < 
-" |_|    \___//____/____|  |_|   |_|   |___|_| \_|____/|_____|_| \_\
-"                                                                  
-" mark: fuzzy finder
-nnoremap <leader>f :FZF<CR>
-
-
-
-"  __________ _   _   __  __  ___  ____  _____ 
-" |__  / ____| \ | | |  \/  |/ _ \|  _ \| ____|
-"   / /|  _| |  \| | | |\/| | | | | | | |  _|  
-"  / /_| |___| |\  | | |  | | |_| | |_| | |___ 
-" /____|_____|_| \_| |_|  |_|\___/|____/|_____|
-"                                             
-" mark: zen mode
-lua << EOF
-require("zen-mode").setup {}
-EOF
-noremap <leader>z :ZenMode<CR>