141 files changed, 46 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index 42260b9..b7ebd0a 100644
--- a/Makefile
+++ b/Makefile
@@ -86,10 +86,10 @@ man:
 	done
 
 luadoc:
-	@cd luadoc && ldoc . && sed -e "s/RELEASE/${VERSION}/" -i index.html
+	@cd lua/doc && ldoc . && sed -e "s/RELEASE/${VERSION}/" -i index.html
 
 luadoc-all:
-	@cd luadoc && ldoc -a . && sed -e "s/RELEASE/${VERSION}/" -i index.html
+	@cd lua/doc && ldoc -a . && sed -e "s/RELEASE/${VERSION}/" -i index.html
 
 install: vis vis-menu
 	@echo stripping executable
@@ -109,7 +109,7 @@ install: vis vis-menu
 	@test ${CONFIG_LUA} -eq 0 || { \
 		echo installing support files to ${DESTDIR}${SHAREPREFIX}/vis; \
 		mkdir -p ${DESTDIR}${SHAREPREFIX}/vis; \
-		cp -r visrc.lua vis.lua lexers ${DESTDIR}${SHAREPREFIX}/vis; \
+		cp -r lua/* ${DESTDIR}${SHAREPREFIX}/vis; \
 	}
 	@echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
diff --git a/lexers/template.txt b/lexers/template.txt
deleted file mode 100644
index 4f8c560..0000000
--- a/lexers/template.txt
+++ /dev/null
@@ -1,20 +0,0 @@
--- ? LPeg lexer.
-
-local l = require('lexer')
-local token, word_match = l.token, l.word_match
-local P, R, S = lpeg.P, lpeg.R, lpeg.S
-
-local M = {_NAME = '?'}
-
--- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
-
-M._rules = {
-  {'whitespace', ws},
-}
-
-M._tokenstyles = {
-
-}
-
-return M
diff --git a/luadoc/README.md b/lua/doc/README.md
index 17531da..17531da 100644
--- a/luadoc/README.md
+++ b/lua/doc/README.md
diff --git a/luadoc/config.ld b/lua/doc/config.ld
index 8567a89..a955b38 100644
--- a/luadoc/config.ld
+++ b/lua/doc/config.ld
@@ -8,7 +8,7 @@ sort=true
 merge=true
 no_space_before_args=true
 file={
-	"../vis-lua.c",
+	"../../vis-lua.c",
 	"../vis.lua",
 }
 	
\ No newline at end of file
diff --git a/lua/lexer.lua b/lua/lexer.lua
new file mode 120000
index 0000000..9d757ac
--- /dev/null
+++ b/lua/lexer.lua
@@ -0,0 +1 @@
+lexers/lexer.lua
\ No newline at end of file
diff --git a/lexers/LICENSE b/lua/lexers/LICENSE
index 627e560..627e560 100644
--- a/lexers/LICENSE
+++ b/lua/lexers/LICENSE
diff --git a/lexers/README.md b/lua/lexers/README.md
index 6e43e94..69c136d 100644
--- a/lexers/README.md
+++ b/lua/lexers/README.md
@@ -9,7 +9,7 @@ based lexers from the [Scintillua](http://foicica.com/scintillua/) project.
 Vis searches the lexers in the following locations:
 
  * `$VIS_PATH/lexers`
- * `./lexers` relative to the binary location (using `/proc/self/exe`)
+ * `./lua/lexers` relative to the binary location (using `/proc/self/exe`)
  * `$XDG_CONFIG_HOME/vis/lexers`
  * `/usr/local/share/vis/lexers`
  * `/usr/share/vis/lexers`
@@ -36,9 +36,34 @@ the table found at the end of the [vis.lua](/vis.lua) file.
 
 Changes to existing lexers should also be sent upstream for consideration.
 
+A template for new lexers:
+
+```
+-- ? LPeg lexer.
+
+local l = require('lexer')
+local token, word_match = l.token, l.word_match
+local P, R, S = lpeg.P, lpeg.R, lpeg.S
+
+local M = {_NAME = '?'}
+
+-- Whitespace.
+local ws = token(l.WHITESPACE, l.space^1)
+
+M._rules = {
+  {'whitespace', ws},
+}
+
+M._tokenstyles = {
+
+}
+
+return M
+```
+
 # Color Themes
 
-The `themes` sub directory contains the color schemes. At startup the
+The `../themes` directory contains the color schemes. At startup the
 `default.lua` theme which should be a symlink to your prefered style is
 used. Themes can be changed at runtime via the `:set theme <name>`
 command where `<name>` does not include the `.lua` file extension.
diff --git a/lexers/actionscript.lua b/lua/lexers/actionscript.lua
index a913a45..a913a45 100644
--- a/lexers/actionscript.lua
+++ b/lua/lexers/actionscript.lua
diff --git a/lexers/ada.lua b/lua/lexers/ada.lua
index 7258431..7258431 100644
--- a/lexers/ada.lua
+++ b/lua/lexers/ada.lua
diff --git a/lexers/ansi_c.lua b/lua/lexers/ansi_c.lua
index 5c8e007..5c8e007 100644
--- a/lexers/ansi_c.lua
+++ b/lua/lexers/ansi_c.lua
diff --git a/lexers/antlr.lua b/lua/lexers/antlr.lua
index 91dbd60..91dbd60 100644
--- a/lexers/antlr.lua
+++ b/lua/lexers/antlr.lua
diff --git a/lexers/apdl.lua b/lua/lexers/apdl.lua
index 1c91a08..1c91a08 100644
--- a/lexers/apdl.lua
+++ b/lua/lexers/apdl.lua
diff --git a/lexers/apl.lua b/lua/lexers/apl.lua
index 4fa492e..4fa492e 100644
--- a/lexers/apl.lua
+++ b/lua/lexers/apl.lua
diff --git a/lexers/applescript.lua b/lua/lexers/applescript.lua
index 07cf1d3..07cf1d3 100644
--- a/lexers/applescript.lua
+++ b/lua/lexers/applescript.lua
diff --git a/lexers/asm.lua b/lua/lexers/asm.lua
index e599f72..e599f72 100644
--- a/lexers/asm.lua
+++ b/lua/lexers/asm.lua
diff --git a/lexers/asp.lua b/lua/lexers/asp.lua
index dc1b0e9..dc1b0e9 100644
--- a/lexers/asp.lua
+++ b/lua/lexers/asp.lua
diff --git a/lexers/autoit.lua b/lua/lexers/autoit.lua
index 1a3bc55..1a3bc55 100644
--- a/lexers/autoit.lua
+++ b/lua/lexers/autoit.lua
diff --git a/lexers/awk.lua b/lua/lexers/awk.lua
index 944c698..944c698 100644
--- a/lexers/awk.lua
+++ b/lua/lexers/awk.lua
diff --git a/lexers/bash.lua b/lua/lexers/bash.lua
index 7bf7957..7bf7957 100644
--- a/lexers/bash.lua
+++ b/lua/lexers/bash.lua
diff --git a/lexers/batch.lua b/lua/lexers/batch.lua
index a39d20a..a39d20a 100644
--- a/lexers/batch.lua
+++ b/lua/lexers/batch.lua
diff --git a/lexers/bibtex.lua b/lua/lexers/bibtex.lua
index b47770c..b47770c 100644
--- a/lexers/bibtex.lua
+++ b/lua/lexers/bibtex.lua
diff --git a/lexers/boo.lua b/lua/lexers/boo.lua
index aadacc4..aadacc4 100644
--- a/lexers/boo.lua
+++ b/lua/lexers/boo.lua
diff --git a/lexers/caml.lua b/lua/lexers/caml.lua
index be0f241..be0f241 100644
--- a/lexers/caml.lua
+++ b/lua/lexers/caml.lua
diff --git a/lexers/chuck.lua b/lua/lexers/chuck.lua
index 3efe704..3efe704 100644
--- a/lexers/chuck.lua
+++ b/lua/lexers/chuck.lua
diff --git a/lexers/cmake.lua b/lua/lexers/cmake.lua
index 278d96a..278d96a 100644
--- a/lexers/cmake.lua
+++ b/lua/lexers/cmake.lua
diff --git a/lexers/coffeescript.lua b/lua/lexers/coffeescript.lua
index 366d390..366d390 100644
--- a/lexers/coffeescript.lua
+++ b/lua/lexers/coffeescript.lua
diff --git a/lexers/container.lua b/lua/lexers/container.lua
index c3a6900..c3a6900 100644
--- a/lexers/container.lua
+++ b/lua/lexers/container.lua
diff --git a/lexers/context.lua b/lua/lexers/context.lua
index 30ec1b0..30ec1b0 100644
--- a/lexers/context.lua
+++ b/lua/lexers/context.lua
diff --git a/lexers/cpp.lua b/lua/lexers/cpp.lua
index 518fe64..518fe64 100644
--- a/lexers/cpp.lua
+++ b/lua/lexers/cpp.lua
diff --git a/lexers/crystal.lua b/lua/lexers/crystal.lua
index 8766e96..8766e96 100644
--- a/lexers/crystal.lua
+++ b/lua/lexers/crystal.lua
diff --git a/lexers/csharp.lua b/lua/lexers/csharp.lua
index 6212d37..6212d37 100644
--- a/lexers/csharp.lua
+++ b/lua/lexers/csharp.lua
diff --git a/lexers/css.lua b/lua/lexers/css.lua
index cb3e26b..cb3e26b 100644
--- a/lexers/css.lua
+++ b/lua/lexers/css.lua
diff --git a/lexers/cuda.lua b/lua/lexers/cuda.lua
index c24c778..c24c778 100644
--- a/lexers/cuda.lua
+++ b/lua/lexers/cuda.lua
diff --git a/lexers/dart.lua b/lua/lexers/dart.lua
index c237128..c237128 100644
--- a/lexers/dart.lua
+++ b/lua/lexers/dart.lua
diff --git a/lexers/desktop.lua b/lua/lexers/desktop.lua
index 22c95f3..22c95f3 100644
--- a/lexers/desktop.lua
+++ b/lua/lexers/desktop.lua
diff --git a/lexers/diff.lua b/lua/lexers/diff.lua
index 9bc63f1..9bc63f1 100644
--- a/lexers/diff.lua
+++ b/lua/lexers/diff.lua
diff --git a/lexers/django.lua b/lua/lexers/django.lua
index 19bcc05..19bcc05 100644
--- a/lexers/django.lua
+++ b/lua/lexers/django.lua
diff --git a/lexers/dmd.lua b/lua/lexers/dmd.lua
index f73763a..f73763a 100644
--- a/lexers/dmd.lua
+++ b/lua/lexers/dmd.lua
diff --git a/lexers/dockerfile.lua b/lua/lexers/dockerfile.lua
index 3f6ca7f..3f6ca7f 100644
--- a/lexers/dockerfile.lua
+++ b/lua/lexers/dockerfile.lua
diff --git a/lexers/dot.lua b/lua/lexers/dot.lua
index 5ff845b..5ff845b 100644
--- a/lexers/dot.lua
+++ b/lua/lexers/dot.lua
diff --git a/lexers/dsv.lua b/lua/lexers/dsv.lua
index ad2b286..ad2b286 100644
--- a/lexers/dsv.lua
+++ b/lua/lexers/dsv.lua
diff --git a/lexers/eiffel.lua b/lua/lexers/eiffel.lua
index 7dd08d1..7dd08d1 100644
--- a/lexers/eiffel.lua
+++ b/lua/lexers/eiffel.lua
diff --git a/lexers/elixir.lua b/lua/lexers/elixir.lua
index 5ec27c0..5ec27c0 100644
--- a/lexers/elixir.lua
+++ b/lua/lexers/elixir.lua
diff --git a/lexers/erlang.lua b/lua/lexers/erlang.lua
index a741d63..a741d63 100644
--- a/lexers/erlang.lua
+++ b/lua/lexers/erlang.lua
diff --git a/lexers/faust.lua b/lua/lexers/faust.lua
index 34c925e..34c925e 100644
--- a/lexers/faust.lua
+++ b/lua/lexers/faust.lua
diff --git a/lexers/fish.lua b/lua/lexers/fish.lua
index 24ee2df..24ee2df 100644
--- a/lexers/fish.lua
+++ b/lua/lexers/fish.lua
diff --git a/lexers/forth.lua b/lua/lexers/forth.lua
index d61aa55..d61aa55 100644
--- a/lexers/forth.lua
+++ b/lua/lexers/forth.lua
diff --git a/lexers/fortran.lua b/lua/lexers/fortran.lua
index 2a1fe97..2a1fe97 100644
--- a/lexers/fortran.lua
+++ b/lua/lexers/fortran.lua
diff --git a/lexers/fsharp.lua b/lua/lexers/fsharp.lua
index 383ab6a..383ab6a 100644
--- a/lexers/fsharp.lua
+++ b/lua/lexers/fsharp.lua
diff --git a/lexers/fstab.lua b/lua/lexers/fstab.lua
index fd0df74..fd0df74 100644
--- a/lexers/fstab.lua
+++ b/lua/lexers/fstab.lua
diff --git a/lexers/gap.lua b/lua/lexers/gap.lua
index 3d9f7a4..3d9f7a4 100644
--- a/lexers/gap.lua
+++ b/lua/lexers/gap.lua
diff --git a/lexers/gettext.lua b/lua/lexers/gettext.lua
index 8556d01..8556d01 100644
--- a/lexers/gettext.lua
+++ b/lua/lexers/gettext.lua
diff --git a/lexers/gherkin.lua b/lua/lexers/gherkin.lua
index c4f4dae..c4f4dae 100644
--- a/lexers/gherkin.lua
+++ b/lua/lexers/gherkin.lua
diff --git a/lexers/glsl.lua b/lua/lexers/glsl.lua
index 6d59da8..6d59da8 100644
--- a/lexers/glsl.lua
+++ b/lua/lexers/glsl.lua
diff --git a/lexers/gnuplot.lua b/lua/lexers/gnuplot.lua
index 26913db..26913db 100644
--- a/lexers/gnuplot.lua
+++ b/lua/lexers/gnuplot.lua
diff --git a/lexers/go.lua b/lua/lexers/go.lua
index 431c622..431c622 100644
--- a/lexers/go.lua
+++ b/lua/lexers/go.lua
diff --git a/lexers/groovy.lua b/lua/lexers/groovy.lua
index d23a5a1..d23a5a1 100644
--- a/lexers/groovy.lua
+++ b/lua/lexers/groovy.lua
diff --git a/lexers/gtkrc.lua b/lua/lexers/gtkrc.lua
index 02e4d45..02e4d45 100644
--- a/lexers/gtkrc.lua
+++ b/lua/lexers/gtkrc.lua
diff --git a/lexers/haskell.lua b/lua/lexers/haskell.lua
index de247e1..de247e1 100644
--- a/lexers/haskell.lua
+++ b/lua/lexers/haskell.lua
diff --git a/lexers/html.lua b/lua/lexers/html.lua
index 3a3b78c..3a3b78c 100644
--- a/lexers/html.lua
+++ b/lua/lexers/html.lua
diff --git a/lexers/icon.lua b/lua/lexers/icon.lua
index 6d0286f..6d0286f 100644
--- a/lexers/icon.lua
+++ b/lua/lexers/icon.lua
diff --git a/lexers/idl.lua b/lua/lexers/idl.lua
index 8d2399c..8d2399c 100644
--- a/lexers/idl.lua
+++ b/lua/lexers/idl.lua
diff --git a/lexers/inform.lua b/lua/lexers/inform.lua
index 94049fa..94049fa 100644
--- a/lexers/inform.lua
+++ b/lua/lexers/inform.lua
diff --git a/lexers/ini.lua b/lua/lexers/ini.lua
index e5df55a..e5df55a 100644
--- a/lexers/ini.lua
+++ b/lua/lexers/ini.lua
diff --git a/lexers/io_lang.lua b/lua/lexers/io_lang.lua
index 0d8b483..0d8b483 100644
--- a/lexers/io_lang.lua
+++ b/lua/lexers/io_lang.lua
diff --git a/lexers/java.lua b/lua/lexers/java.lua
index 8773f60..8773f60 100644
--- a/lexers/java.lua
+++ b/lua/lexers/java.lua
diff --git a/lexers/javascript.lua b/lua/lexers/javascript.lua
index f879948..f879948 100644
--- a/lexers/javascript.lua
+++ b/lua/lexers/javascript.lua
diff --git a/lexers/json.lua b/lua/lexers/json.lua
index 6dcebec..6dcebec 100644
--- a/lexers/json.lua
+++ b/lua/lexers/json.lua
diff --git a/lexers/jsp.lua b/lua/lexers/jsp.lua
index 44f53d2..44f53d2 100644
--- a/lexers/jsp.lua
+++ b/lua/lexers/jsp.lua
diff --git a/lexers/latex.lua b/lua/lexers/latex.lua
index f1febe9..f1febe9 100644
--- a/lexers/latex.lua
+++ b/lua/lexers/latex.lua
diff --git a/lexers/ledger.lua b/lua/lexers/ledger.lua
index 1632241..1632241 100644
--- a/lexers/ledger.lua
+++ b/lua/lexers/ledger.lua
diff --git a/lexers/less.lua b/lua/lexers/less.lua
index 2ca3c38..2ca3c38 100644
--- a/lexers/less.lua
+++ b/lua/lexers/less.lua
diff --git a/lexers/lexer.lua b/lua/lexers/lexer.lua
index 5653bb2..b896344 100644
--- a/lexers/lexer.lua
+++ b/lua/lexers/lexer.lua
@@ -1039,7 +1039,7 @@ function M.load(name, alt_name)
 
   -- Load the language lexer with its rules, styles, etc.
   M.WHITESPACE = (alt_name or name)..'_whitespace'
-  local lexer_file, error = package.searchpath(name, M.LEXERPATH)
+  local lexer_file, error = package.searchpath('lexers/'..name, M.LEXERPATH)
   local ok, lexer = pcall(dofile, lexer_file or '')
   if not ok then
     return nil
diff --git a/lexers/lilypond.lua b/lua/lexers/lilypond.lua
index f5af771..f5af771 100644
--- a/lexers/lilypond.lua
+++ b/lua/lexers/lilypond.lua
diff --git a/lexers/lisp.lua b/lua/lexers/lisp.lua
index 2d8a907..2d8a907 100644
--- a/lexers/lisp.lua
+++ b/lua/lexers/lisp.lua
diff --git a/lexers/litcoffee.lua b/lua/lexers/litcoffee.lua
index f31a2d1..f31a2d1 100644
--- a/lexers/litcoffee.lua
+++ b/lua/lexers/litcoffee.lua
diff --git a/lexers/lua.lua b/lua/lexers/lua.lua
index fba4600..fba4600 100644
--- a/lexers/lua.lua
+++ b/lua/lexers/lua.lua
diff --git a/lexers/makefile.lua b/lua/lexers/makefile.lua
index 45eb310..45eb310 100644
--- a/lexers/makefile.lua
+++ b/lua/lexers/makefile.lua
diff --git a/lexers/man.lua b/lua/lexers/man.lua
index 557e11d..557e11d 100644
--- a/lexers/man.lua
+++ b/lua/lexers/man.lua
diff --git a/lexers/markdown.lua b/lua/lexers/markdown.lua
index 0257010..0257010 100644
--- a/lexers/markdown.lua
+++ b/lua/lexers/markdown.lua
diff --git a/lexers/matlab.lua b/lua/lexers/matlab.lua
index 5385a41..5385a41 100644
--- a/lexers/matlab.lua
+++ b/lua/lexers/matlab.lua
diff --git a/lexers/moonscript.lua b/lua/lexers/moonscript.lua
index 8cbe765..8cbe765 100644
--- a/lexers/moonscript.lua
+++ b/lua/lexers/moonscript.lua
diff --git a/lexers/nemerle.lua b/lua/lexers/nemerle.lua
index 3bab7a7..3bab7a7 100644
--- a/lexers/nemerle.lua
+++ b/lua/lexers/nemerle.lua
diff --git a/lexers/networkd.lua b/lua/lexers/networkd.lua
index 3f27bae..3f27bae 100644
--- a/lexers/networkd.lua
+++ b/lua/lexers/networkd.lua
diff --git a/lexers/nim.lua b/lua/lexers/nim.lua
index 8fa438c..8fa438c 100644
--- a/lexers/nim.lua
+++ b/lua/lexers/nim.lua
diff --git a/lexers/nsis.lua b/lua/lexers/nsis.lua
index 184858a..184858a 100644
--- a/lexers/nsis.lua
+++ b/lua/lexers/nsis.lua
diff --git a/lexers/null.lua b/lua/lexers/null.lua
index c2e70c2..c2e70c2 100644
--- a/lexers/null.lua
+++ b/lua/lexers/null.lua
diff --git a/lexers/objective_c.lua b/lua/lexers/objective_c.lua
index 4722c2c..4722c2c 100644
--- a/lexers/objective_c.lua
+++ b/lua/lexers/objective_c.lua
diff --git a/lexers/pascal.lua b/lua/lexers/pascal.lua
index 6cb6a2e..6cb6a2e 100644
--- a/lexers/pascal.lua
+++ b/lua/lexers/pascal.lua
diff --git a/lexers/perl.lua b/lua/lexers/perl.lua
index f77893e..f77893e 100644
--- a/lexers/perl.lua
+++ b/lua/lexers/perl.lua
diff --git a/lexers/php.lua b/lua/lexers/php.lua
index 22eb960..22eb960 100644
--- a/lexers/php.lua
+++ b/lua/lexers/php.lua
diff --git a/lexers/pico8.lua b/lua/lexers/pico8.lua
index 44364f3..44364f3 100644
--- a/lexers/pico8.lua
+++ b/lua/lexers/pico8.lua
diff --git a/lexers/pike.lua b/lua/lexers/pike.lua
index 9367ea2..9367ea2 100644
--- a/lexers/pike.lua
+++ b/lua/lexers/pike.lua
diff --git a/lexers/pkgbuild.lua b/lua/lexers/pkgbuild.lua
index f08f114..f08f114 100644
--- a/lexers/pkgbuild.lua
+++ b/lua/lexers/pkgbuild.lua
diff --git a/lexers/powershell.lua b/lua/lexers/powershell.lua
index 4a3ba07..4a3ba07 100644
--- a/lexers/powershell.lua
+++ b/lua/lexers/powershell.lua
diff --git a/lexers/prolog.lua b/lua/lexers/prolog.lua
index bda9b53..bda9b53 100644
--- a/lexers/prolog.lua
+++ b/lua/lexers/prolog.lua
diff --git a/lexers/props.lua b/lua/lexers/props.lua
index 5602787..5602787 100644
--- a/lexers/props.lua
+++ b/lua/lexers/props.lua
diff --git a/lexers/protobuf.lua b/lua/lexers/protobuf.lua
index c257e7e..c257e7e 100644
--- a/lexers/protobuf.lua
+++ b/lua/lexers/protobuf.lua
diff --git a/lexers/ps.lua b/lua/lexers/ps.lua
index c8a0ac4..c8a0ac4 100644
--- a/lexers/ps.lua
+++ b/lua/lexers/ps.lua
diff --git a/lexers/pure.lua b/lua/lexers/pure.lua
index 256a2dc..256a2dc 100644
--- a/lexers/pure.lua
+++ b/lua/lexers/pure.lua
diff --git a/lexers/python.lua b/lua/lexers/python.lua
index 42b931d..42b931d 100644
--- a/lexers/python.lua
+++ b/lua/lexers/python.lua
diff --git a/lexers/rails.lua b/lua/lexers/rails.lua
index 1ecfa16..1ecfa16 100644
--- a/lexers/rails.lua
+++ b/lua/lexers/rails.lua
diff --git a/lexers/rebol.lua b/lua/lexers/rebol.lua
index 3ab7691..3ab7691 100644
--- a/lexers/rebol.lua
+++ b/lua/lexers/rebol.lua
diff --git a/lexers/rest.lua b/lua/lexers/rest.lua
index 8a355be..8a355be 100644
--- a/lexers/rest.lua
+++ b/lua/lexers/rest.lua
diff --git a/lexers/rexx.lua b/lua/lexers/rexx.lua
index c750168..c750168 100644
--- a/lexers/rexx.lua
+++ b/lua/lexers/rexx.lua
diff --git a/lexers/rhtml.lua b/lua/lexers/rhtml.lua
index 3886e20..3886e20 100644
--- a/lexers/rhtml.lua
+++ b/lua/lexers/rhtml.lua
diff --git a/lexers/rstats.lua b/lua/lexers/rstats.lua
index 19e43e8..19e43e8 100644
--- a/lexers/rstats.lua
+++ b/lua/lexers/rstats.lua
diff --git a/lexers/ruby.lua b/lua/lexers/ruby.lua
index d923917..d923917 100644
--- a/lexers/ruby.lua
+++ b/lua/lexers/ruby.lua
diff --git a/lexers/rust.lua b/lua/lexers/rust.lua
index 60834fb..60834fb 100644
--- a/lexers/rust.lua
+++ b/lua/lexers/rust.lua
diff --git a/lexers/sass.lua b/lua/lexers/sass.lua
index 002df27..002df27 100644
--- a/lexers/sass.lua
+++ b/lua/lexers/sass.lua
diff --git a/lexers/scala.lua b/lua/lexers/scala.lua
index d455996..d455996 100644
--- a/lexers/scala.lua
+++ b/lua/lexers/scala.lua
diff --git a/lexers/scheme.lua b/lua/lexers/scheme.lua
index dba2d48..dba2d48 100644
--- a/lexers/scheme.lua
+++ b/lua/lexers/scheme.lua
diff --git a/lexers/smalltalk.lua b/lua/lexers/smalltalk.lua
index 735ea47..735ea47 100644
--- a/lexers/smalltalk.lua
+++ b/lua/lexers/smalltalk.lua
diff --git a/lexers/sml.lua b/lua/lexers/sml.lua
index 40c0540..40c0540 100644
--- a/lexers/sml.lua
+++ b/lua/lexers/sml.lua
diff --git a/lexers/snobol4.lua b/lua/lexers/snobol4.lua
index 08e5a9b..08e5a9b 100644
--- a/lexers/snobol4.lua
+++ b/lua/lexers/snobol4.lua
diff --git a/lexers/sql.lua b/lua/lexers/sql.lua
index 7ea207f..7ea207f 100644
--- a/lexers/sql.lua
+++ b/lua/lexers/sql.lua
diff --git a/lexers/systemd.lua b/lua/lexers/systemd.lua
index 5f9e618..5f9e618 100644
--- a/lexers/systemd.lua
+++ b/lua/lexers/systemd.lua
diff --git a/lexers/taskpaper.lua b/lua/lexers/taskpaper.lua
index 5652f3a..5652f3a 100644
--- a/lexers/taskpaper.lua
+++ b/lua/lexers/taskpaper.lua
diff --git a/lexers/tcl.lua b/lua/lexers/tcl.lua
index f76e6ee..f76e6ee 100644
--- a/lexers/tcl.lua
+++ b/lua/lexers/tcl.lua
diff --git a/lexers/tex.lua b/lua/lexers/tex.lua
index ec1e717..ec1e717 100644
--- a/lexers/tex.lua
+++ b/lua/lexers/tex.lua
diff --git a/lexers/texinfo.lua b/lua/lexers/texinfo.lua
index 34f9eb2..34f9eb2 100644
--- a/lexers/texinfo.lua
+++ b/lua/lexers/texinfo.lua
diff --git a/lexers/text.lua b/lua/lexers/text.lua
index 51b4f11..51b4f11 100644
--- a/lexers/text.lua
+++ b/lua/lexers/text.lua
diff --git a/lexers/toml.lua b/lua/lexers/toml.lua
index 5a27c97..5a27c97 100644
--- a/lexers/toml.lua
+++ b/lua/lexers/toml.lua
diff --git a/lexers/vala.lua b/lua/lexers/vala.lua
index 46f074c..46f074c 100644
--- a/lexers/vala.lua
+++ b/lua/lexers/vala.lua
diff --git a/lexers/vb.lua b/lua/lexers/vb.lua
index 453a74c..453a74c 100644
--- a/lexers/vb.lua
+++ b/lua/lexers/vb.lua
diff --git a/lexers/vbscript.lua b/lua/lexers/vbscript.lua
index 1fcc6d7..1fcc6d7 100644
--- a/lexers/vbscript.lua
+++ b/lua/lexers/vbscript.lua
diff --git a/lexers/vcard.lua b/lua/lexers/vcard.lua
index 2057451..2057451 100644
--- a/lexers/vcard.lua
+++ b/lua/lexers/vcard.lua
diff --git a/lexers/verilog.lua b/lua/lexers/verilog.lua
index 9160e0f..9160e0f 100644
--- a/lexers/verilog.lua
+++ b/lua/lexers/verilog.lua
diff --git a/lexers/vhdl.lua b/lua/lexers/vhdl.lua
index 6bbba11..6bbba11 100644
--- a/lexers/vhdl.lua
+++ b/lua/lexers/vhdl.lua
diff --git a/lexers/wsf.lua b/lua/lexers/wsf.lua
index 21da83c..21da83c 100644
--- a/lexers/wsf.lua
+++ b/lua/lexers/wsf.lua
diff --git a/lexers/xml.lua b/lua/lexers/xml.lua
index 2692b2a..2692b2a 100644
--- a/lexers/xml.lua
+++ b/lua/lexers/xml.lua
diff --git a/lexers/xtend.lua b/lua/lexers/xtend.lua
index cc2bf8e..cc2bf8e 100644
--- a/lexers/xtend.lua
+++ b/lua/lexers/xtend.lua
diff --git a/lexers/yaml.lua b/lua/lexers/yaml.lua
index 2263f3f..2263f3f 100644
--- a/lexers/yaml.lua
+++ b/lua/lexers/yaml.lua
diff --git a/lexers/themes/dark-16.lua b/lua/themes/dark-16.lua
index 986c4b3..986c4b3 100644
--- a/lexers/themes/dark-16.lua
+++ b/lua/themes/dark-16.lua
diff --git a/lexers/themes/default-16.lua b/lua/themes/default-16.lua
index 51192b4..51192b4 120000
--- a/lexers/themes/default-16.lua
+++ b/lua/themes/default-16.lua
diff --git a/lexers/themes/default-256.lua b/lua/themes/default-256.lua
index 8479b1b..8479b1b 120000
--- a/lexers/themes/default-256.lua
+++ b/lua/themes/default-256.lua
diff --git a/lexers/themes/light-16.lua b/lua/themes/light-16.lua
index b4ba391..b4ba391 100644
--- a/lexers/themes/light-16.lua
+++ b/lua/themes/light-16.lua
diff --git a/lexers/themes/solarized.lua b/lua/themes/solarized.lua
index fcbd704..fcbd704 100644
--- a/lexers/themes/solarized.lua
+++ b/lua/themes/solarized.lua
diff --git a/vis.lua b/lua/vis.lua
index 7d07b4b..7d07b4b 100644
--- a/vis.lua
+++ b/lua/vis.lua
diff --git a/visrc.lua b/lua/visrc.lua
index 95aa1c0..95aa1c0 100644
--- a/visrc.lua
+++ b/lua/visrc.lua
diff --git a/vis-lua.c b/vis-lua.c
index b88a1d1..f3b0114 100644
--- a/vis-lua.c
+++ b/vis-lua.c
@@ -1804,10 +1804,8 @@ bool vis_lua_path_add(Vis *vis, const char *path) {
 	lua_getglobal(L, "package");
 	lua_pushstring(L, path);
 	lua_pushstring(L, "/?.lua;");
-	lua_pushstring(L, path);
-	lua_pushstring(L, "/lexers/?.lua;");
-	lua_getfield(L, -5, "path");
-	lua_concat(L, 5);
+	lua_getfield(L, -3, "path");
+	lua_concat(L, 3);
 	lua_setfield(L, -2, "path");
 	lua_pop(L, 1); /* package */
 	return true;
@@ -1888,7 +1886,17 @@ void vis_lua_init(Vis *vis) {
 	ssize_t len = readlink("/proc/self/exe", path, sizeof(path)-1);
 	if (len > 0) {
 		path[len] = '\0';
-		vis_lua_path_add(vis, dirname(path));
+		/* some idotic dirname(3) implementations return pointers to statically
+		 * allocated memory, hence we use memmove to copy it back */
+		char *dir = dirname(path);
+		if (dir) {
+			size_t len = strlen(dir)+1;
+			if (len < sizeof(path) - sizeof("/lua")) {
+				memmove(path, dir, len);
+				strcat(path, "/lua");
+				vis_lua_path_add(vis, path);
+			}
+		}
 	}
 
 	vis_lua_path_add(vis, getenv("VIS_PATH"));