diff --git a/nvim/after/plugin/behavior.lua b/nvim/after/plugin/behavior.lua
deleted file mode 100644
index 5162457..0000000
--- a/nvim/after/plugin/behavior.lua
+++ /dev/null
@@ -1,50 +0,0 @@
-require 'nvim-autopairs'
-    .setup()
-require 'better_escape'
-    .setup()
-require 'Comment'
-    .setup()
-
-local function nvim_tree_on_attach(bufnr)
-    local api = require'nvim-tree.api'
-    api.config.mappings.default_on_attach(bufnr)
-    local function opts(desc)
-      return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
-    end
-    local function open()
-        api.node.open.edit(nil, {
-            quit_on_open=true
-        })
-    end
-    vim.keymap.set('n', 'o', open, opts('Open'))
-    vim.keymap.set('n', '<CR>', open, opts('Open'))
-end
-require'nvim-tree'
-    .setup {
-       on_attach = nvim_tree_on_attach
-    }
-
-
-local conform = require 'conform'
-conform.setup {}
-
-vim.keymap.set('n', '<Leader><Leader>', vim.cmd.so)
-vim.keymap.set('n', '<Leader>e', 
-    function()
-        local tree = require("nvim-tree.api").tree
-        tree.open({ current_window = true })
-    end
-)
-vim.keymap.set('n', '<Leader>w', vim.cmd.write)
-vim.keymap.set('n', '<Leader>q', vim.cmd.quit)
-vim.keymap.set('n', '<Leader>b', vim.cmd.Buffers)
-vim.keymap.set('n', '<Leader>f', conform.format)
-vim.keymap.set('n', '<Leader>h', vim.cmd.History)
-vim.keymap.set('n', '<Leader>g', vim.cmd.Rg)
-vim.keymap.set('n', '<Leader>j', vim.cmd.FZF)
-vim.keymap.set('n', '<Leader>u', vim.cmd.UndotreeToggle)
-vim.keymap.set('n', '<Leader>5', ':vsplit<CR>:Files<CR>')
-vim.keymap.set('v', '<Leader>y', '"+y')
-vim.keymap.set('n', '<Leader>y', '"+y')
-vim.keymap.set('n', '<Leader>p', '"+p')
-vim.keymap.set('v', '<Leader>p', '"+p')
diff --git a/nvim/after/plugin/config.lua b/nvim/after/plugin/config.lua
new file mode 100644
index 0000000..e7f2162
--- /dev/null
+++ b/nvim/after/plugin/config.lua
@@ -0,0 +1,21 @@
+require 'nvim-autopairs'
+    .setup()
+require 'better_escape'
+    .setup()
+require 'Comment'
+    .setup()
+    
+vim.keymap.set('n', '<Leader><Leader>', vim.cmd.so)
+vim.keymap.set('n', '<Leader>e', ':Ex')
+vim.keymap.set('n', '<Leader>w', vim.cmd.write)
+vim.keymap.set('n', '<Leader>q', vim.cmd.quit)
+vim.keymap.set('n', '<Leader>b', vim.cmd.Buffers)
+vim.keymap.set('n', '<Leader>h', vim.cmd.History)
+vim.keymap.set('n', '<Leader>g', vim.cmd.Rg)
+vim.keymap.set('n', '<Leader>j', vim.cmd.FZF)
+vim.keymap.set('n', '<Leader>u', vim.cmd.UndotreeToggle)
+vim.keymap.set('n', '<Leader>5', ':vsplit<CR>:Files<CR>')
+vim.keymap.set('v', '<Leader>y', '"+y')
+vim.keymap.set('n', '<Leader>y', '"+y')
+vim.keymap.set('n', '<Leader>p', '"+p')
+vim.keymap.set('v', '<Leader>p', '"+p')
diff --git a/nvim/after/plugin/ui.lua b/nvim/after/plugin/ui.lua
deleted file mode 100644
index f306f9b..0000000
--- a/nvim/after/plugin/ui.lua
+++ /dev/null
@@ -1,15 +0,0 @@
--- if (os.getenv('TERM_PROGRAM') == 'Apple_Terminal') then
---     vim.cmd.colorscheme('slate')
--- else
-    -- require 'monokai'
-    --     .setup()
--- end
-vim.cmd.colorscheme('tokyonight-night')
-require 'lualine'
-    .setup({
-        options = {
-            theme = 'tokyonight'
-        }
-    })
-require 'highlight-undo'
-    .setup()
diff --git a/nvim/init.lua b/nvim/init.lua
index fa0c5f3..a1fa1f3 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -1,12 +1,12 @@
 vim.g.mapleader = ' '
 
-vim.opt.shortmess:append("I")
+vim.opt.shortmess:append('I')
 vim.opt.nu = true
 vim.opt.relativenumber = true
 vim.opt.wrap = true
 vim.opt.scrolloff = 8
 vim.opt.laststatus = 2
-vim.opt.colorcolumn = '80'
+vim.opt.colorcolumn = '120'
 vim.opt.signcolumn = 'no'
 vim.opt.tabstop = 4
 vim.opt.softtabstop = 4
@@ -22,20 +22,22 @@ vim.opt.hlsearch = true
 vim.opt.incsearch = true
 vim.opt.winborder = 'single'
 
+vim.cmd.colorscheme'habamax'
+
 vim.keymap.set('v', 'K', ':m \'<-2<CR>gv=gv')
 vim.keymap.set('v', 'J', ':m \'>+1<CR>gv=gv')
 
 vim.keymap.set('n', '<C-d>', '<C-d>zz')
 vim.keymap.set('n', '<C-u>', '<C-u>zz')
 
-vim.keymap.set("n", "n", "nzzzv")
-vim.keymap.set("n", "N", "Nzzzv")
+vim.keymap.set('n', 'n', 'nzzzv')
+vim.keymap.set('n', 'N', 'Nzzzv')
 
 vim.diagnostic.config({
     virtual_text = true,
     severity_sort = true,
     float = {
-        border = 'rounded',
+        border = 'single',
         source = 'if_many',
     },
 })
@@ -43,42 +45,32 @@ vim.diagnostic.config({
 local Plug = vim.fn['plug#']
 
 vim.call('plug#begin')
+    Plug('junegunn/fzf', { ['do'] = function() vim.call('fzf#install') end })
+    Plug 'junegunn/fzf.vim'
 
-Plug('junegunn/fzf', { ['do'] = function() vim.call('fzf#install') end })
-Plug 'junegunn/fzf.vim'
+    Plug 'numToStr/Comment.nvim'
+    Plug 'andymass/vim-matchup'
+    Plug 'windwp/nvim-autopairs'
 
-Plug 'nvim-lualine/lualine.nvim'
+    Plug 'mbbill/undotree'
 
--- Formatter
-Plug 'stevearc/conform.nvim'
+    Plug 'max397574/better-escape.nvim'
 
-Plug 'numToStr/Comment.nvim'
-Plug 'andymass/vim-matchup'
-Plug 'windwp/nvim-autopairs'
+    Plug 'tzachar/highlight-undo.nvim'
+    Plug 'folke/which-key.nvim'
+    Plug 'folke/noice.nvim'
 
-Plug 'mbbill/undotree'
-
-Plug 'max397574/better-escape.nvim'
-
-Plug 'tzachar/highlight-undo.nvim'
-Plug 'folke/which-key.nvim'
-Plug 'folke/tokyonight.nvim'
-Plug 'tanvirtin/monokai.nvim'
-Plug 'folke/noice.nvim'
-
-Plug 'nvim-tree/nvim-tree.lua'
-
--- tpope
-Plug 'tpope/vim-fugitive' -- git client
-Plug 'tpope/vim-sensible' -- "sensible" vim defaults
-Plug 'tpope/vim-vinegar' -- netrw changes
+    -- tpope
+    Plug 'tpope/vim-fugitive' -- git client
+    Plug 'tpope/vim-sensible' -- 'sensible' vim defaults
+    Plug 'tpope/vim-vinegar' -- netrw changes
 vim.call('plug#end')
 
 --[[
--- use this once v12 is stable
+-- use this once nvim v12 is stable
 vim.pack.add{
     { src='tpope/vim-fugitive' }, -- git client
-    { src='tpope/vim-sensible' }, -- "sensible" vim defaults
+    { src='tpope/vim-sensible' }, -- 'sensible' vim defaults
     { src='tpope/vim-vinegar' }, -- netrw changes    
 }
 ]]