diff --git a/nvim/init.vim b/nvim/init.vim
index 6cc1207..3a8a320 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -33,19 +33,29 @@ Plug 'Mofiqul/dracula.nvim'
 
 " Lang. Support
 Plug 'fatih/vim-go'
+
 Plug 'artur-shaik/vim-javacomplete2'
 autocmd FileType java setlocal omnifunc=javacomplete#Complete
+
 "Plug 'Valloric/YouCompleteMe', { 'do': './install.py' }
 Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 Plug 'zchee/deoplete-jedi'
 Plug 'davidhalter/jedi-vim'
+
 Plug 'rust-lang/rust.vim'
+Plug 'simrat39/rust-tools.nvim'
+Plug 'neovim/nvim-lspconfig'
+
 Plug 'preservim/nerdcommenter'
 Plug 'mattn/emmet-vim'
 
 " Code Folding
 Plug 'tmhedberg/SimpylFold'
 
+" Code Formatting
+Plug 'Chiel92/vim-autoformat'
+noremap <F3> :Autoformat<CR>
+
 " Indent Blanklines
 Plug 'lukas-reineke/indent-blankline.nvim'
 
@@ -54,7 +64,22 @@ Plug 'junegunn/goyo.vim'
 Plug 'lervag/vimtex'
 Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' }
 " Plug 'conornewton/vim-latex-preview'
-
+let g:tex_flavor='latex'
+let g:vimtex_view_method='zathura'
+let g:vimtex_quickfix_mode=0
+let g:livepreview_previewer = 'zathura'
+let g:livepreview_engine = 'xelatex'
+
+set conceallevel=1
+let g:tex_conceal='abdmg'
+
+"Ultisnips
+Plug 'sirver/ultisnips'
+Plug 'honza/vim-snippets'
+let g:UltiSnipsExpandTrigger = '<tab>'
+let g:UltiSnipsJumpForwardTrigger="<c-b>"
+let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+let g:UltiSnipsListSnippets="<c-;>"
 "Zoxide
 Plug 'nanotee/zoxide.vim'
 
@@ -76,8 +101,8 @@ Plug 'tpope/vim-fugitive'
 " Icons
 Plug 'ryanoasis/vim-devicons'
 
-" ASCII
-Plug 'jbyuki/venn.nvim'
+" Lightspeed
+Plug 'ggandor/lightspeed.nvim'
 
 call plug#end()
 
@@ -97,19 +122,21 @@ colorscheme dracula
 set nocompatible
 set encoding=UTF-8
 set clipboard+=unnamedplus
-
 set mouse=a
+
 " Map Leader
 let mapleader = ","
 
-
 " Note taking (Mardown, Spelling)
 let g:vimwiki_list = [{'path': '~/vimwiki/',
                       \ 'syntax': 'markdown', 'ext': '.md'}]
 
 :map <F11> :setlocal spell! spelllang=en_gb<CR>
-au BufNewFile ~/vimwiki/diary/*.md :silent 0r !~/.config/nvim/generate-vimwiki-diary-template '%'
 
+"Quick spellcheck
+inoremap <F10> <c-g>u<Esc>[s1z=`]a<c-g>u
+
+au BufNewFile ~/vimwiki/diary/*.md :silent 0r !~/.config/nvim/generate-vimwiki-diary-template '%'
 
 let NERDTreeMapOpenInTab='<ENTER>'
 
@@ -131,7 +158,7 @@ nnoremap <silent> <leader>h :History<CR>
 nnoremap <silent> <leader>G :GFiles<CR>
 " nnoremap <silent> <leader>GS :GFiles?<CR>
 
-" Easy to update and reload nvim init file
+" Easy update and reload nvim init file
 nnoremap <Leader>e :e $MYVIMRC<CR>
 nnoremap <Leader>S :source $MYVIMRC<CR>
 
@@ -143,8 +170,9 @@ let g:jedi#use_splits_not_buffers = "right"
 " g:deoplete#sources#jedi#python_path = 'python3'
 let g:python3_host_prog = '/usr/bin/python3'
 
-" Limeligt Binds
+" Limeligt + Goyo Binds
 nnoremap <Leader>l :Limelight!!<CR>
+nnoremap <Leader>g :Goyo<CR>
 let g:limelight_conceal_guifg = 'DarkGray'
 let g:limelight_conceal_guifg = '#777777'
 let g:limelight_conceal_ctermfg = 'gray'
@@ -184,7 +212,7 @@ vmap < <gv
 vmap > >gv
 
 " Open NERDTree
-nnoremap <leader>N :NERDTreeToggle<CR>
+nnoremap <leader><enter> :NERDTreeToggle<CR>
 
 " Vimwiki md2html
 let g:vimwiki_list = [{
@@ -200,5 +228,9 @@ let g:vimwiki_list = [{
 " Vimwiki 
 nnoremap <leader>T :VimwikiTable<CR>
 
+" Rust
+let g:rustfmt_autosave = 1
+
+" Fullscreen on nvim in kitty term
 autocmd VimLeave * :silent !kitty @ set-spacing padding=20 margin=20
 autocmd VimEnter * :silent !kitty @ set-spacing padding=0 margin=0
diff --git a/nvim/spell/en.utf-8.add b/nvim/spell/en.utf-8.add
index 9f0ae62..c27d65e 100644
--- a/nvim/spell/en.utf-8.add
+++ b/nvim/spell/en.utf-8.add
@@ -147,3 +147,12 @@ OpenWeatherMap
 json
 loadJson
 WeatherAPI
+sizeof
+int
+ptr
+naddr
+addr
+max
+of
+maxptr
+scanf
diff --git a/nvim/spell/en.utf-8.add.spl b/nvim/spell/en.utf-8.add.spl
index 8f40563..6cb867d 100644
Binary files a/nvim/spell/en.utf-8.add.spl and b/nvim/spell/en.utf-8.add.spl differ
diff --git a/qutebrowser/config.py b/qutebrowser/config.py
index 44f0b91..a05b632 100644
--- a/qutebrowser/config.py
+++ b/qutebrowser/config.py
@@ -227,6 +227,7 @@ config.bind('xt', 'config-cycle tabs.show always never')
 config.bind('xx', 'config-cycle tabs.show always never;; config-cycle statusbar.show always never')
 
 c.url.searchengines["g"] = "https://www.google.co.uk/search?q={}"
+c.url.searchengines = {'DEFAULT': 'https://www.google.co.uk/search?q={}'}
 c.url.searchengines["ddg"] = "https://www.duckduckgo.com/?q={}"
 c.url.searchengines["b"] = "https://search.brave.com/search?q={}"
 c.url.searchengines["aw"] = "https://wiki.archlinux.org/?search={}"
diff --git a/qutebrowser/qsettings/QtProject.conf b/qutebrowser/qsettings/QtProject.conf
new file mode 100644
index 0000000..06f54e4
--- /dev/null
+++ b/qutebrowser/qsettings/QtProject.conf
@@ -0,0 +1,8 @@
+[FileDialog]
+history=file:///home/simon/Calibre Library/Jason Cannon/Linux for Beginners_ An Introduction to the Linux Operating System and Command Line (7), file:///home/simon/Calibre Library/Jonathan Moeller/The Linux Command Line Beginner's Guide (6), file:///home/simon, file:///home/simon/Downloads
+lastVisited=file:///home/simon/Downloads
+qtVersion=5.15.2
+shortcuts=file:, file:///home/simon
+sidebarWidth=97
+treeViewHeader="@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1\xeb\0\0\0\x4\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x4\0\0\x1\b\0\0\0\x1\0\0\0\0\0\0\0;\0\0\0\x1\0\0\0\0\0\0\0@\0\0\0\x1\0\0\0\0\0\0\0h\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\xff\xff\xff\xff)"
+viewMode=Detail