diff --git a/applications/mimeinfo.cache b/applications/mimeinfo.cache
index 46467db..a7d4091 100644
--- a/applications/mimeinfo.cache
+++ b/applications/mimeinfo.cache
@@ -1,13 +1,26 @@
 [MIME Cache]
 application/json=firefox.desktop;
-application/pdf=zathura.desktop;
+application/pdf=firefox.desktop;wine-extension-pdf.desktop;
+application/rtf=wine-extension-rtf.desktop;
+application/vnd.ms-htmlhelp=wine-extension-chm.desktop;
+application/winhlp=wine-extension-hlp.desktop;
 application/x-binaryninja=binaryninja.desktop;
 application/x-extension-htm=wine-extension-htm.desktop;
 application/x-extension-html=wine-extension-html.desktop;
 application/x-ghidra=ghidra.desktop;
+application/x-mswinurl=wine-extension-url.desktop;
+application/x-mswrite=wine-extension-wri.desktop;
+application/x-wine-extension-ini=wine-extension-ini.desktop;
+application/x-wine-extension-msp=wine-extension-msp.desktop;
 application/x-xpinstall=firefox.desktop;
 application/xhtml+xml=firefox.desktop;
+application/xml=wine-extension-xml.desktop;
+image/gif=wine-extension-gif.desktop;
+image/jpeg=wine-extension-jfif.desktop;wine-extension-jpe.desktop;
+image/png=wine-extension-png.desktop;
 text/html=firefox.desktop;
+text/plain=wine-extension-txt.desktop;
+text/vbscript=wine-extension-vbs.desktop;
 text/xml=firefox.desktop;
 x-scheme-handler/binaryninja=binaryninja.desktop;
 x-scheme-handler/ghidra=ghidra.desktop;
diff --git a/applications/wine-extension-chm.desktop b/applications/wine-extension-chm.desktop
new file mode 100644
index 0000000..0e40682
--- /dev/null
+++ b/applications/wine-extension-chm.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=hh
+MimeType=application/vnd.ms-htmlhelp;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen chm.file %f
+NoDisplay=true
+StartupNotify=true
+Icon=D15F_hh.0
diff --git a/applications/wine-extension-gif.desktop b/applications/wine-extension-gif.desktop
new file mode 100644
index 0000000..245fe3d
--- /dev/null
+++ b/applications/wine-extension-gif.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Wine Internet Explorer
+MimeType=image/gif;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen giffile %f
+NoDisplay=true
+StartupNotify=true
+Icon=ECB7_iexplore.0
diff --git a/applications/wine-extension-hlp.desktop b/applications/wine-extension-hlp.desktop
new file mode 100644
index 0000000..a432ef8
--- /dev/null
+++ b/applications/wine-extension-hlp.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=winhlp32
+MimeType=application/winhlp;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen hlpfile %f
+NoDisplay=true
+StartupNotify=true
+Icon=C06E_winhlp32.0
diff --git a/applications/wine-extension-htm.desktop b/applications/wine-extension-htm.desktop
index 0728b20..fdbde64 100644
--- a/applications/wine-extension-htm.desktop
+++ b/applications/wine-extension-htm.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Name=winebrowser
 MimeType=application/x-extension-htm;
-Exec=env WINEPREFIX="/home/emh/.local/share/osu-wine/WINE.win32" wine start /ProgIDOpen htmlfile %f
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen htmlfile %f
 NoDisplay=true
 StartupNotify=true
 Icon=81F5_winebrowser.0
diff --git a/applications/wine-extension-html.desktop b/applications/wine-extension-html.desktop
index e6e1631..d1d2d29 100644
--- a/applications/wine-extension-html.desktop
+++ b/applications/wine-extension-html.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Name=winebrowser
 MimeType=application/x-extension-html;
-Exec=env WINEPREFIX="/home/emh/.local/share/osu-wine/WINE.win32" wine start /ProgIDOpen htmlfile %f
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen htmlfile %f
 NoDisplay=true
 StartupNotify=true
 Icon=81F5_winebrowser.0
diff --git a/applications/wine-extension-ini.desktop b/applications/wine-extension-ini.desktop
new file mode 100644
index 0000000..54dcac4
--- /dev/null
+++ b/applications/wine-extension-ini.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=notepad
+MimeType=application/x-wine-extension-ini;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen inifile %f
+NoDisplay=true
+StartupNotify=true
+Icon=2E40_notepad.0
diff --git a/applications/wine-extension-jfif.desktop b/applications/wine-extension-jfif.desktop
new file mode 100644
index 0000000..3bcc970
--- /dev/null
+++ b/applications/wine-extension-jfif.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Wine Internet Explorer
+MimeType=image/jpeg;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen pjpegfile %f
+NoDisplay=true
+StartupNotify=true
+Icon=ECB7_iexplore.0
diff --git a/applications/wine-extension-jpe.desktop b/applications/wine-extension-jpe.desktop
new file mode 100644
index 0000000..02bfcbd
--- /dev/null
+++ b/applications/wine-extension-jpe.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Wine Internet Explorer
+MimeType=image/jpeg;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen jpegfile %f
+NoDisplay=true
+StartupNotify=true
+Icon=ECB7_iexplore.0
diff --git a/applications/wine-extension-msp.desktop b/applications/wine-extension-msp.desktop
new file mode 100644
index 0000000..90ed7fb
--- /dev/null
+++ b/applications/wine-extension-msp.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Wine Installer
+MimeType=application/x-wine-extension-msp;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen Msi.Patch %f
+NoDisplay=true
+StartupNotify=true
+Icon=D23E_msiexec.0
diff --git a/applications/wine-extension-pdf.desktop b/applications/wine-extension-pdf.desktop
new file mode 100644
index 0000000..e287e2f
--- /dev/null
+++ b/applications/wine-extension-pdf.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=winebrowser
+MimeType=application/pdf;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen pdffile %f
+NoDisplay=true
+StartupNotify=true
+Icon=81F5_winebrowser.0
diff --git a/applications/wine-extension-png.desktop b/applications/wine-extension-png.desktop
new file mode 100644
index 0000000..66923e6
--- /dev/null
+++ b/applications/wine-extension-png.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Wine Internet Explorer
+MimeType=image/png;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen pngfile %f
+NoDisplay=true
+StartupNotify=true
+Icon=ECB7_iexplore.0
diff --git a/applications/wine-extension-rtf.desktop b/applications/wine-extension-rtf.desktop
new file mode 100644
index 0000000..2a7faf1
--- /dev/null
+++ b/applications/wine-extension-rtf.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=wordpad
+MimeType=application/rtf;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen rtffile %f
+NoDisplay=true
+StartupNotify=true
+Icon=3365_wordpad.0
diff --git a/applications/wine-extension-txt.desktop b/applications/wine-extension-txt.desktop
new file mode 100644
index 0000000..7f3d9ff
--- /dev/null
+++ b/applications/wine-extension-txt.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=notepad
+MimeType=text/plain;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen txtfile %f
+NoDisplay=true
+StartupNotify=true
+Icon=2E40_notepad.0
diff --git a/applications/wine-extension-url.desktop b/applications/wine-extension-url.desktop
new file mode 100644
index 0000000..44136e5
--- /dev/null
+++ b/applications/wine-extension-url.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=rundll32
+MimeType=application/x-mswinurl;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen InternetShortcut %f
+NoDisplay=true
+StartupNotify=true
+Icon=5742_rundll32.0
diff --git a/applications/wine-extension-vbs.desktop b/applications/wine-extension-vbs.desktop
new file mode 100644
index 0000000..077e1f0
--- /dev/null
+++ b/applications/wine-extension-vbs.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=wscript
+MimeType=text/vbscript;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen VBSFile %f
+NoDisplay=true
+StartupNotify=true
+Icon=2905_wscript.0
diff --git a/applications/wine-extension-wri.desktop b/applications/wine-extension-wri.desktop
new file mode 100644
index 0000000..cce8b04
--- /dev/null
+++ b/applications/wine-extension-wri.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=wordpad
+MimeType=application/x-mswrite;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen wrifile %f
+NoDisplay=true
+StartupNotify=true
+Icon=3365_wordpad.0
diff --git a/applications/wine-extension-xml.desktop b/applications/wine-extension-xml.desktop
new file mode 100644
index 0000000..dbcf118
--- /dev/null
+++ b/applications/wine-extension-xml.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=winebrowser
+MimeType=application/xml;
+Exec=env WINEPREFIX="/home/emh/.wine" wine start /ProgIDOpen xmlfile %f
+NoDisplay=true
+StartupNotify=true
+Icon=81F5_winebrowser.0
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 815a628..7c1352e 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -18,6 +18,11 @@ return require('packer').startup({function(use)
             'mustache/vim-mustache-handlebars'
     }
 
+    use {
+            'nvim-treesitter/nvim-treesitter',
+            run = ':TSUpdate'
+    }
+
     use {
             'petRUShka/vim-sage'
     }
@@ -123,7 +128,7 @@ return require('packer').startup({function(use)
 
 	use {
 		'neovim/nvim-lspconfig',
-        commit = "607ff48b970b89c3e4e3825b88d9cfd05b7aaea5",
+        -- commit = "607ff48b970b89c3e4e3825b88d9cfd05b7aaea5",
 		requires = {
 			'nvim-lua/lsp-status.nvim',
 			'ms-jpq/coq.thirdparty',
diff --git a/scripts/pngtex b/scripts/pngtex
index 366fd72..0518e78 100755
Binary files a/scripts/pngtex and b/scripts/pngtex differ