diff --git a/nvim-config/init.vim b/nvim-config/init.vim
index 2a68dc6..951a78b 100644
--- a/nvim-config/init.vim
+++ b/nvim-config/init.vim
@@ -7,11 +7,8 @@ Plug 'vim-airline/vim-airline-themes'
 Plug 'https://github.com/tpope/vim-fugitive.git'
 " Shougos UI-Plugin
 Plug 'Shougo/denite.nvim'
-" Plug 'roxma/nvim-completion-manager'
 " showing function-signatures/doc on completion
 Plug 'Shougo/echodoc.vim'
-" Tab-Completion
-" Plug 'ervandew/supertab'
 
 " vim-sourround
 Plug 'https://github.com/tpope/vim-surround.git'
@@ -47,9 +44,8 @@ Plug 'terryma/vim-multiple-cursors'
 Plug 'ryanoasis/vim-devicons'
 
 " Markdown-Support
-Plug 'plasticboy/vim-markdown'
+Plug 'preservim/vim-markdown'
 Plug 'dhruvasagar/vim-table-mode'
-Plug 'suan/vim-instant-markdown'
 
 " Code-Folds
 Plug 'tmhedberg/SimpylFold'
@@ -78,6 +74,11 @@ Plug 'onsails/lspkind.nvim'
 " For vsnip users.
 Plug 'hrsh7th/cmp-vsnip'
 Plug 'hrsh7th/vim-vsnip'
+Plug 'rafamadriz/friendly-snippets'
+
+" markdown-preview
+" If you have nodejs
+Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app && npx --yes yarn install' }
 
 call plug#end()
 
@@ -159,8 +160,8 @@ tnoremap <C-t><C-t> <C-\><C-n>
 " FANCY NEOVIM-MAGIC
 
 " setup mason, language-server & nvim-cmp for completion
-lua <<EOF
 
+lua <<EOF
   require("mason").setup()
   require("mason-lspconfig").setup()
 
@@ -448,16 +449,136 @@ autocmd BufRead,BufNewFile *.markdown hi SpellBad guibg=#582828 gui=none
 " set languages to english and german
 set spelllang=de_de,en_us
 
-let g:vim_markdown_toc_autofit = 0
+
+" MARKDOWN Config
+let g:vim_markdown_toc_autofit = 1
 let g:vim_markdown_emphasis_multiline = 1
 let g:vim_markdown_math = 1
 let g:vim_markdown_new_list_item_indent = 2
-let g:vim_markdown_folding_level = 0
+" let g:vim_markdown_folding_level = 2
+let g:vim_markdown_folding_disabled = 1
+let g:vim_markdown_conceal_code_blocks = 0
+let g:vim_markdown_frontmatter = 1
+let g:vim_markdown_strikethrough = 1
+let g:vim_markdown_autowrite = 1
+let g:vim_markdown_borderless_table = 1
 
-" disable instant-markdown-preview
-let g:instant_markdown_autostart = 0
 au FileType markdown setl shell=bash
 
+" 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 changing
+" from Markdown buffer to another buffer
+" default: 1
+let g:mkdp_auto_close = 1
+
+" set to 1, Vim will refresh Markdown when saving the buffer or
+" when leaving 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 used for all files,
+" by default it can be use in Markdown files only
+" default: 0
+let g:mkdp_command_for_global = 0
+
+" set to 1, the preview server is 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.
+" For more details 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 = ''
+
+" set to 1, echo preview page URL in command line when opening 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 rendering
+" mkit: markdown-it options for rendering
+" katex: KaTeX options for math
+" uml: markdown-it-plantuml options
+" maid: mermaid options
+" disable_sync_scroll: whether to disable sync scroll, default 0
+" sync_scroll_type: 'middle', 'top' or 'relative', default value is 'middle'
+"   middle: means the cursor position is always at the middle of the preview page
+"   top: means the Vim top viewport always shows up at the top of the preview page
+"   relative: means the cursor position is always at relative positon of the preview page
+" hide_yaml_meta: whether to 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 an absolute path
+" like '/Users/username/markdown.css' or expand('~/markdown.css')
+let g:mkdp_markdown_css = ''
+
+" use a custom highlight style. Must be an 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}」'
+
+" use a custom location for images
+" let g:mkdp_images_path = /home/user/.markdown_images
+
+" recognized filetypes
+" these filetypes will have MarkdownPreview... commands
+let g:mkdp_filetypes = ['markdown']
+
+" set default theme (dark or light)
+" By default the theme is defined according to the preferences of the system
+" let g:mkdp_theme = 'dark'
+
+" combine preview window
+" default: 0
+" if enable it will reuse previous opened preview window when you preview markdown file.
+" ensure to set let g:mkdp_auto_close = 0 if you have enable this option
+let g:mkdp_combine_preview = 0
+
+" auto refetch combine preview contents when change markdown buffer
+" only when g:mkdp_combine_preview is 1
+let g:mkdp_combine_preview_auto_refresh = 1
+
+
+
 let g:haskell_enable_quantification   = 1 " enable highlighting of forall
 let g:haskell_enable_recursivedo      = 1 " enable highlighting of mdo and rec
 let g:haskell_enable_arrowsyntax      = 1 " enable highlighting of proc