diff --git a/nvim/colors/mine.vim b/nvim/colors/mine.vim
index 72d98c5..2c381c6 100644
--- a/nvim/colors/mine.vim
+++ b/nvim/colors/mine.vim
@@ -11,10 +11,10 @@ endif
 
 highlight Title gui=bold
 highlight Special gui=bold
-highlight SpellBad guibg=Normal guifg=Normal gui=undercurl guisp=red
-highlight SpellCap guibg=Normal guifg=Normal gui=undercurl guisp=blue
-highlight SpellLocal guibg=Normal guifg=Normal gui=undercurl guisp=pink
-highlight SpellRare guibg=Normal guifg=Normal gui=undercurl guisp=aqua
+highlight SpellBad guibg=Normal guifg=Normal gui=undercurl guisp=red ctermfg=NONE ctermbg=NONE term=underline cterm=undercurl
+highlight SpellCap guibg=Normal guifg=Normal gui=undercurl guisp=blue ctermfg=NONE ctermbg=NONE term=underline cterm=undercurl
+highlight SpellLocal guibg=Normal guifg=Normal gui=undercurl guisp=pink ctermfg=NONE ctermbg=NONE term=underline cterm=undercurl
+highlight SpellRare guibg=Normal guifg=Normal gui=undercurl guisp=aqua ctermfg=NONE ctermbg=NONE term=underline cterm=undercurl
 highlight Keyword gui=bold
 highlight Comment gui=italic
 highlight Constant guifg=#999999
diff --git a/nvim/init.vim b/nvim/init.vim
index 6c2428c..f368356 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -4,19 +4,14 @@ source ~/.vimrc
 
 call plug#begin()
 " Plug 'ellisonleao/gruvbox.nvim'
-" Plug 'folke/tokyonight.nvim'
+Plug 'folke/tokyonight.nvim'
 " Plug 'nvim-lua/plenary.nvim'
 " Plug 'nvim-tree/nvim-web-devicons'
 " Plug 'MunifTanjim/nui.nvim'
 " Plug 'nvim-neo-tree/neo-tree.nvim', { 'branch': 'v3.x' }
 Plug 'lewis6991/gitsigns.nvim' " OPTIONAL: for git status
 " Plug 'nvim-tree/nvim-web-devicons' " OPTIONAL: for file icons
-" Plug 'freddiehaddad/feline.nvim'
 " Plug 'neovim/nvim-lspconfig'
-" main one
-" Plug 'ms-jpq/coq_nvim', {'branch': 'coq'}
-" 9000+ Snippets
-" Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'}
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 Plug 'xiyaowong/transparent.nvim'
 " Plug 'justinhj/battery.nvim'
@@ -30,6 +25,7 @@ if exists("g:neovide")
 	set guifont=JetBrains_Mono:h13:cANSI:qDRAFT
 endif
 
+set termguicolors
 colo gruv
 set noshowmode
 set laststatus=2
diff --git a/nvim/lua/init.lua b/nvim/lua/init.lua
index 2b58cb5..0367bd3 100644
--- a/nvim/lua/init.lua
+++ b/nvim/lua/init.lua
@@ -25,8 +25,8 @@ vim.diagnostic.config({
   })
 --vim.api.nvim_set_hl(0,"DiagnosticUnderlineWarn",{undercurl=true,sp='DiagnosticWarn'})
 --For Alacritty:
-vim.api.nvim_create_autocmd("ExitPre", {
-	group = vim.api.nvim_create_augroup("Exit", { clear = true }),
-	command = "set guicursor=a:ver90-blinkwait250-blinkoff250-blinkon250",
-	desc = "Set cursor back to beam when leaving Neovim."
-})
+-- vim.api.nvim_create_autocmd("ExitPre", {
+-- 	group = vim.api.nvim_create_augroup("Exit", { clear = true }),
+-- 	command = "set guicursor=a:ver90-blinkwait250-blinkoff250-blinkon250",
+-- 	desc = "Set cursor back to beam when leaving Neovim."
+-- })
diff --git a/nvim/lua/plugins/matlab_ls.lua b/nvim/lua/plugins/matlab_ls.lua
index af6a2fa..7b903a9 100644
--- a/nvim/lua/plugins/matlab_ls.lua
+++ b/nvim/lua/plugins/matlab_ls.lua
@@ -1,8 +1,8 @@
-local util = require("lspconfig.util")
-require('lspconfig').matlab_ls.setup(
+vim.lsp.config.matlab_ls = 
     {
         cmd = { "node", os.getenv("HOME") .. "/MATLAB-language-server/out/index.js", "--stdio" },
-		root_dir = util.root_pattern('mw_anchor'),
+		root_markers = { 'mw_anchor' },
+		filetypes = { 'matlab' },
 		single_file_support = true,
         settings = {
     	    MATLAB = {
@@ -13,4 +13,5 @@ require('lspconfig').matlab_ls.setup(
             }
         }
     }
-)
+
+vim.lsp.enable({'matlab_ls'})
diff --git a/nvim/lua/plugins/statuscol.lua b/nvim/lua/plugins/statuscol.lua
index 67d55b2..5db7b28 100644
--- a/nvim/lua/plugins/statuscol.lua
+++ b/nvim/lua/plugins/statuscol.lua
@@ -2,6 +2,7 @@ local builtin = require("statuscol.builtin")
 require('statuscol').setup({
        relculright = true,
 	   ft_ignore = { 'neo-tree' },
+	   bt_ignore = { 'terminal' },
        segments = {
          {
            sign = { namespace={'diag*'} },
diff --git a/vim/.vimrc b/vim/.vimrc
index 0ad3cb4..b7cbfbf 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -6,7 +6,7 @@ syntax on
 set cursorline
 set cursorcolumn
 set nospell
-set autochdir
+"set autochdir
 
 " disable wrapping
 set nowrap
@@ -16,9 +16,9 @@ set number
 set relativenumber
 
 " colours
-set termguicolors
+"set termguicolors
 set bg=dark
-colo quiet
+colo default
 
 """ MARKDOWN
 " have j and k navigate visual lines rather than logical ones
@@ -33,6 +33,15 @@ autocmd FileType markdown
 			\setlocal spell|
 			\setlocal spelllang=en_gb|
 
+autocmd FileType typst 
+			\nmap <buffer> j gj|
+			\nmap <buffer> k gk|
+			\setlocal wrap|
+			\setlocal linebreak|
+			\setlocal nolist|
+			\setlocal spell|
+			\setlocal spelllang=en_gb|
+
 " use H and L for beginning/end of line
 map H ^
 map L $
@@ -41,3 +50,14 @@ set mouse=nv
 
 set shiftwidth=4
 set tabstop=4
+
+command! Q :q
+command! W :w
+command! Qa :qa
+command! Wq :wq
+
+noremap <C-C> "+y
+" noremap <C-V> "+p
+cnoremap <C-V> <C-r>+
+imap <C-V> <C-r>+
+inoremap jj <ESC>