diff --git a/after/plugin/markdownpreview.lua b/after/plugin/markdownpreview.lua
new file mode 100644
index 0000000..26edc76
--- /dev/null
+++ b/after/plugin/markdownpreview.lua
@@ -0,0 +1,104 @@
+vim.cmd([[
+
+nmap <leader>mp <Plug>MarkdownPreview
+
+" set to 1, nvim will open the preview window after entering the markdown buffer
+" default: 0
+let g:mkdp_auto_start = 0
+
+" set to 1, the nvim will auto close current preview window when change
+" from markdown buffer to another buffer
+" default: 1
+let g:mkdp_auto_close = 1
+
+" set to 1, the vim will refresh markdown when save the buffer or
+" leave from insert mode, default 0 is auto refresh markdown as you edit or
+" move the cursor
+" default: 0
+let g:mkdp_refresh_slow = 0
+
+" set to 1, the MarkdownPreview command can be use for all files,
+" by default it can be use in markdown file
+" default: 0
+let g:mkdp_command_for_global = 0
+
+" set to 1, preview server available to others in your network
+" by default, the server listens on localhost (127.0.0.1)
+" default: 0
+let g:mkdp_open_to_the_world = 0
+
+" use custom IP to open preview page
+" useful when you work in remote vim and preview on local browser
+" more detail see: https://github.com/iamcco/markdown-preview.nvim/pull/9
+" default empty
+let g:mkdp_open_ip = ''
+
+" specify browser to open preview page
+" for path with space
+" valid: `/path/with\ space/xxx`
+" invalid: `/path/with\\ space/xxx`
+" default: ''
+let g:mkdp_browser = 'thorium-browser'
+
+" set to 1, echo preview page url in command line when open preview page
+" default is 0
+let g:mkdp_echo_preview_url = 0
+
+" a custom vim function name to open preview page
+" this function will receive url as param
+" default is empty
+let g:mkdp_browserfunc = ''
+
+" options for markdown render
+" mkit: markdown-it options for render
+" katex: katex options for math
+" uml: markdown-it-plantuml options
+" maid: mermaid options
+" disable_sync_scroll: if disable sync scroll, default 0
+" sync_scroll_type: 'middle', 'top' or 'relative', default value is 'middle'
+"   middle: mean the cursor position alway show at the middle of the preview page
+"   top: mean the vim top viewport alway show at the top of the preview page
+"   relative: mean the cursor position alway show at the relative positon of the preview page
+" hide_yaml_meta: if hide yaml metadata, default is 1
+" sequence_diagrams: js-sequence-diagrams options
+" content_editable: if enable content editable for preview page, default: v:false
+" disable_filename: if disable filename header for preview page, default: 0
+let g:mkdp_preview_options = {
+    \ 'mkit': {},
+    \ 'katex': {},
+    \ 'uml': {},
+    \ 'maid': {},
+    \ 'disable_sync_scroll': 0,
+    \ 'sync_scroll_type': 'middle',
+    \ 'hide_yaml_meta': 1,
+    \ 'sequence_diagrams': {},
+    \ 'flowchart_diagrams': {},
+    \ 'content_editable': v:false,
+    \ 'disable_filename': 0,
+    \ 'toc': {}
+    \ }
+
+" use a custom markdown style must be absolute path
+" like '/Users/username/markdown.css' or expand('~/markdown.css')
+let g:mkdp_markdown_css = '~/.local/share/github-markdown-dark.css'
+
+" use a custom highlight style must absolute path
+" like '/Users/username/highlight.css' or expand('~/highlight.css')
+let g:mkdp_highlight_css = ''
+
+" use a custom port to start server or empty for random
+let g:mkdp_port = ''
+
+" preview page title
+" ${name} will be replace with the file name
+let g:mkdp_page_title = '「${name}」'
+
+" recognized filetypes
+" these filetypes will have MarkdownPreview... commands
+let g:mkdp_filetypes = ['markdown']
+
+" set default theme (dark or light)
+" By default the theme is define according to the preferences of the system
+let g:mkdp_theme = 'dark'
+
+]])
diff --git a/after/plugin/vimtex.lua b/after/plugin/vimtex.lua
index 237e7ce..3f953ff 100755
--- a/after/plugin/vimtex.lua
+++ b/after/plugin/vimtex.lua
@@ -1,19 +1,14 @@
 vim.cmd([[
 
-let maplocalleader = " "
-
-let g:vimtex_compiler_method = 'latexmk'
+syntax enable
 
+let g:maplocalleader=' '
+let g:vimtex_view_method='zathura'
 let g:tex_flavor='latex' 
 let g:vimtex_quickfix_mode=0
-
-" settings for sumatraPDF
-let g:vimtex_view_general_viewer = 'C:\Users\andre\AppData\Local\SumatraPDF\SumatraPDF.exe'
-let g:vimtex_view_general_options
-  \ = '-reuse-instance -forward-search @tex @line @pdf'
-
 set conceallevel=1
 let g:tex_conceal='abdmg'
+let g:vimtex_view_forward_search_on_start=0 " Weird highlighting otherwise
 
 augroup vimtex_config
   au!
diff --git a/lua/andrew/packer.lua b/lua/andrew/packer.lua
index 764c554..d5404da 100755
--- a/lua/andrew/packer.lua
+++ b/lua/andrew/packer.lua
@@ -70,12 +70,15 @@ return require("packer").startup(function(use)
   -- Latex editing in vim
   use "lervag/vimtex"
 
-  -- Vim Games :D
-  use "ThePrimeagen/vim-be-good"
-
   -- Auto comment
   use "numToStr/Comment.nvim"
 
+  -- Markdown
+  use({
+      "agryphus/markdown-preview.nvim",
+      run = function() vim.fn["mkdp#util#install"]() end,
+  })
+
   -- Jupyter notebook integration
   use {
     "glacambre/firenvim",
diff --git a/lua/andrew/set.lua b/lua/andrew/set.lua
index 4e65ba2..75ca996 100755
--- a/lua/andrew/set.lua
+++ b/lua/andrew/set.lua
@@ -10,7 +10,7 @@ vim.opt.expandtab = true
 
 vim.opt.smartindent = true
 
-vim.opt.wrap = false
+vim.opt.wrap = true
 
 vim.opt.scrolloff = 8
 vim.opt.signcolumn = "auto"