diff --git a/9p b/9p
index 7c113c1..9bfcceb 160000
--- a/9p
+++ b/9p
@@ -1 +1 @@
-Subproject commit 7c113c1db4d791e9225132cf130c72f15e530860
+Subproject commit 9bfccebff64fba759f0798d1dd37e99c6bdc932b
diff --git a/core b/core
index e13bf55..6646740 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit e13bf552e7a000366a68f7c2d6da849fe231c0e0
+Subproject commit 6646740d676f15aa1123cefc6b46d6ed915d3145
diff --git a/mkfile b/mkfile
index f262d20..6f369cd 100755
--- a/mkfile
+++ b/mkfile
@@ -42,6 +42,7 @@ data:V:
 	cp -rf prompts/* $HOME/.config/ollie/prompts
 	cp -rf sandbox/* $HOME/.config/ollie/sandbox
 	cp -rf skills/* $HOME/.config/ollie/skills
+	cp -rf tools/_lib $HOME/.config/ollie/tools/_lib
 	cp -rf tools/* $HOME/.config/ollie/tools
 	cp doc/help.md $HOME/.config/ollie/help.md
 
diff --git a/tools/lsp_definition b/tools/lsp_definition
index 3004e31..3738c54 100755
--- a/tools/lsp_definition
+++ b/tools/lsp_definition
@@ -4,7 +4,7 @@
 
 import os
 import sys
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "_lib", ".."))
+sys.path.insert(0, os.environ.get('OLLIE_TOOLS_PATH', os.path.expanduser('~/.config/ollie/tools')))
 
 from _lib.lsp.client import request
 
diff --git a/tools/lsp_diagnostics b/tools/lsp_diagnostics
index a4cd158..8cb1522 100755
--- a/tools/lsp_diagnostics
+++ b/tools/lsp_diagnostics
@@ -4,7 +4,7 @@
 
 import os
 import sys
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "_lib", ".."))
+sys.path.insert(0, os.environ.get('OLLIE_TOOLS_PATH', os.path.expanduser('~/.config/ollie/tools')))
 
 from _lib.lsp.client import request
 
diff --git a/tools/lsp_hover b/tools/lsp_hover
index a96538a..b8b4b73 100755
--- a/tools/lsp_hover
+++ b/tools/lsp_hover
@@ -4,7 +4,7 @@
 
 import os
 import sys
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "_lib", ".."))
+sys.path.insert(0, os.environ.get('OLLIE_TOOLS_PATH', os.path.expanduser('~/.config/ollie/tools')))
 
 from _lib.lsp.client import request
 
diff --git a/tools/lsp_references b/tools/lsp_references
index b6e22e3..f81e42f 100755
--- a/tools/lsp_references
+++ b/tools/lsp_references
@@ -4,7 +4,7 @@
 
 import os
 import sys
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "_lib", ".."))
+sys.path.insert(0, os.environ.get('OLLIE_TOOLS_PATH', os.path.expanduser('~/.config/ollie/tools')))
 
 from _lib.lsp.client import request
 
diff --git a/tools/lsp_rename b/tools/lsp_rename
index 3440717..8280a8a 100755
--- a/tools/lsp_rename
+++ b/tools/lsp_rename
@@ -4,7 +4,7 @@
 
 import os
 import sys
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "_lib", ".."))
+sys.path.insert(0, os.environ.get('OLLIE_TOOLS_PATH', os.path.expanduser('~/.config/ollie/tools')))
 
 from _lib.lsp.client import request
 
diff --git a/tools/lsp_symbols b/tools/lsp_symbols
index f2d4487..e5eb9e9 100755
--- a/tools/lsp_symbols
+++ b/tools/lsp_symbols
@@ -4,7 +4,7 @@
 
 import os
 import sys
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "_lib", ".."))
+sys.path.insert(0, os.environ.get('OLLIE_TOOLS_PATH', os.path.expanduser('~/.config/ollie/tools')))
 
 from _lib.lsp.client import request