diff --git a/.config/nvim/init/general.vim b/.config/nvim/init/general.vim
index 78cfb77..be2e54b 100644
--- a/.config/nvim/init/general.vim
+++ b/.config/nvim/init/general.vim
@@ -5,7 +5,8 @@ set undofile
 set wildmode=longest,list,full " Auto-completion for cmdline
 set clipboard+=unnamedplus " Merge with system clipboard
 
-set tabstop=4 shiftwidth=4 " Indentation
+set shiftwidth=2 " Indentation
+"set shiftwidth=4 tabstop = 4 " Indentation for programming
 
 " visuals
 set number relativenumber " Relative line numbering on the left
@@ -34,8 +35,10 @@ set foldopen+=jump " Automatically open folds on jump
 " FILETYPES
 syntax on
 filetype plugin on
-autocmd FileType json syntax match Comment +\/\/.\+$+ " Comment highlighting in JSON
-autocmd Filetype * set formatoptions-=o " Don't automatically comment on o
+" comments
+autocmd Filetype * setlocal formatoptions-=o | setlocal formatoptions+=qn1jr " Change comment behavior
+autocmd Filetype json syntax match Comment +\/\/.\+$+ " Comment highlighting in JSON
+autocmd Filetype markdown let &comments = "b:*,b:-,b:+," . &comments
 " custom hardcoded types
 autocmd BufRead,BufNewFile $CONFIG_SHELLS/*,$CONFIG_ZSH/* setlocal filetype=zsh
 autocmd BufRead $XDG_CONFIG_HOME/yadm/bootstrap setlocal filetype=sh
diff --git a/.config/nvim/init/keys.vim b/.config/nvim/init/keys.vim
index a5c7f8c..ee53aa2 100644
--- a/.config/nvim/init/keys.vim
+++ b/.config/nvim/init/keys.vim
@@ -38,7 +38,6 @@ nnoremap gl $
 nnoremap gh 0
 nnoremap gk H
 nnoremap gj L
-nnoremap gt gg
 nnoremap gb G
 
  " Enable and disable auto comment
diff --git a/.config/nvim/init/plug.vim b/.config/nvim/init/plug.vim
index c7236c6..1797eeb 100644
--- a/.config/nvim/init/plug.vim
+++ b/.config/nvim/init/plug.vim
@@ -55,13 +55,15 @@ Plug 'nathanaelkane/vim-indent-guides'
 let g:indent_guides_enable_on_vim_startup = 1
 
 " Integrations
-Plug 'xerus2000/vim-dokuwiki'
+Plug 'dhruvasagar/vim-table-mode'
+let g:table_mode_corner='|'
 Plug 'neoclide/coc.nvim', {'branch': 'release' }
 Plug 'udalov/kotlin-vim'
 Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app & yarn install'  }
 Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } }
 Plug 'mipmip/vim-scimark' " Edit markdown tables
 Plug 'APZelos/blamer.nvim' " Inline git blame
+" Plug 'xerus2000/vim-dokuwiki'
 
 call plug#end()
 
diff --git a/.config/nvim/init/pluginConfig.vim b/.config/nvim/init/pluginConfig.vim
index 7491582..a90b955 100644
--- a/.config/nvim/init/pluginConfig.vim
+++ b/.config/nvim/init/pluginConfig.vim
@@ -54,7 +54,9 @@ let g:firenvim_config = {
         \ '.*notion\.so.*': { 'priority': 9, 'takeover': 'never', },
         \ '.*docs\.google\.com.*': { 'priority': 9, 'takeover': 'never', },
         \ '.*mail\.protonmail\.com.*': { 'priority': 9, 'takeover': 'never', },
-		\ '.*cloud.atomtoast.xyz.*': { 'priority': 9, 'takeover': 'never', },
+	\ '.*cloud.atomtoast.xyz.*': { 'priority': 9, 'takeover': 'never', },
+	\ 'https://bigbluebutton.*': { 'priority': 9, 'takeover': 'never', },
+	\ 'https://dhall-lang.org.*': { 'priority': 9, 'takeover': 'never', },
     \ }
 \ }
 if exists('g:started_by_firenvim')