diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,4 +1,5 @@
 libc.so.6
 libgcc_s.so.1
+libm.so.6
 libncursesw.so.5
 libstdc++.so.6
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
 name       : kakoune
-version    : 2018.09.04
-release    : 2
+version    : 2019.07.01
+release    : 3
 source     :
-    - https://github.com/mawww/kakoune/archive/v2018.09.04.tar.gz : 6c143cae27cbd692627aeb81c1de8344e8891e47fafb0f67a02cb8ba9ad8de41
+    - https://github.com/mawww/kakoune/releases/download/v2019.07.01/kakoune-2019.07.01.tar.bz2 : 8cf978499000bd71a78736eaee5663bd996f53c4e610c62a9bd97502a3ed6fd3
 license    : Unlicense
 component  : editor
 summary    : kakoune, mawww's experiment for a better code editor
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,15 +2,15 @@
     <Source>
         <Name>kakoune</Name>
         <Packager>
-            <Name>Christopher Nascone</Name>
-            <Email>chris@nasc.one</Email>
+            <Name>Stanislav Ch. Nikolov</Name>
+            <Email>stanislav.ltb@gmail.com</Email>
         </Packager>
         <License>Unlicense</License>
         <PartOf>editor</PartOf>
         <Summary xml:lang="en">kakoune, mawww&apos;s experiment for a better code editor</Summary>
         <Description xml:lang="en">Kakoune is a code editor that implements Vi’s &quot;keystrokes as a text editing language&quot; model. As it’s also a modal editor, it is somewhat similar to the Vim editor (after which Kakoune was originally inspired).
 </Description>
-        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
     </Source>
     <Package>
         <Name>kakoune</Name>
@@ -28,6 +28,7 @@
             <Path fileType="data">/usr/share/kak/colors/github.kak</Path>
             <Path fileType="data">/usr/share/kak/colors/gruvbox.kak</Path>
             <Path fileType="data">/usr/share/kak/colors/lucius.kak</Path>
+            <Path fileType="data">/usr/share/kak/colors/palenight.kak</Path>
             <Path fileType="data">/usr/share/kak/colors/red-phoenix.kak</Path>
             <Path fileType="data">/usr/share/kak/colors/reeder.kak</Path>
             <Path fileType="data">/usr/share/kak/colors/solarized-dark-termcolors.kak</Path>
@@ -46,6 +47,7 @@
             <Path fileType="data">/usr/share/kak/doc/faq.asciidoc</Path>
             <Path fileType="data">/usr/share/kak/doc/highlighters.asciidoc</Path>
             <Path fileType="data">/usr/share/kak/doc/hooks.asciidoc</Path>
+            <Path fileType="data">/usr/share/kak/doc/keymap.asciidoc</Path>
             <Path fileType="data">/usr/share/kak/doc/keys.asciidoc</Path>
             <Path fileType="data">/usr/share/kak/doc/mapping.asciidoc</Path>
             <Path fileType="data">/usr/share/kak/doc/modes.asciidoc</Path>
@@ -54,110 +56,114 @@
             <Path fileType="data">/usr/share/kak/doc/registers.asciidoc</Path>
             <Path fileType="data">/usr/share/kak/doc/scopes.asciidoc</Path>
             <Path fileType="data">/usr/share/kak/kakrc</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/autowrap.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/clojure.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/css.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/ctags.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/d.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/etc.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/file.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/fish.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/gas.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/git.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/go.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/haskell.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/html.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/ini.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/java.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/javascript.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/json.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/julia.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/lint.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/lisp.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/lua.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/mail.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/markdown.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/mercurial.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/ocaml.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/perl.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/restructuredtext.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/ruby.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/rust.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/scala.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/screen.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/spell.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/sql.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/swift.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/tmux.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/x11.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/base/yaml.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/core/asciidoc.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/core/c-family.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/core/comment.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/core/diff.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/core/doc.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/core/formatter.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/core/grep.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/core/kakrc.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/core/make.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/core/makefile.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/core/man.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/core/python.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/core/sh.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/arch-linux.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/autorestore.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/cabal.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/clang.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/cmake.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/coffee.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/cucumber.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/dart.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/dockerfile.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/editorconfig.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/elixir.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/elm.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/exherbo.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/git-tools.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/go-tools.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/haml.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/hbs.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/i3.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/iterm.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/jedi.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/just.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/kickstart.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/kitty.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/latex.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/modeline.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/moon.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/nim.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/php.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/pony.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/protobuf.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/pug.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/racer.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/ragel.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/ranger.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/sass.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/scheme.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/scss.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/systemd.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/taskpaper.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/tmux-repl.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/toml.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/tupfile.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/void-linux.kak</Path>
-            <Path fileType="data">/usr/share/kak/rc/extra/x11-repl.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/detection/editorconfig.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/detection/file.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/detection/modeline.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/arch-linux.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/asciidoc.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/awk.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/c-family.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/cabal.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/clojure.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/cmake.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/coffee.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/crystal.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/css.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/cucumber.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/d.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/dart.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/diff.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/dockerfile.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/elixir.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/elm.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/etc.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/exherbo.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/fish.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/gas.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/git.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/go.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/haml.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/haskell.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/hbs.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/html.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/i3.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/ini.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/java.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/javascript.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/json.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/julia.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/just.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/kakrc.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/kickstart.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/latex.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/lisp.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/lua.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/mail.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/makefile.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/markdown.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/mercurial.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/moon.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/nim.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/ocaml.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/perl.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/php.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/pony.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/protobuf.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/pug.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/python.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/r.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/ragel.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/restructuredtext.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/ruby.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/rust.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/sass.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/scala.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/scheme.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/scss.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/sh.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/sql.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/swift.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/systemd.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/taskpaper.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/toml.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/troff.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/tupfile.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/void-linux.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/filetype/yaml.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/autorestore.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/autowrap.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/clang.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/comment.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/ctags.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/doc.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/formatter.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/git.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/go/go-tools.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/grep.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/lint.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/make.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/man.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/python/jedi.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/rust/racer.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/tools/spell.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/windowing/iterm.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/windowing/kitty.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/windowing/new-client.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/windowing/repl/tmux.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/windowing/repl/x11.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/windowing/screen.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/windowing/tmux.kak</Path>
+            <Path fileType="data">/usr/share/kak/rc/windowing/x11.kak</Path>
             <Path fileType="man">/usr/share/man/man1/kak.1.gz</Path>
         </Files>
     </Package>
     <History>
-        <Update release="2">
-            <Date>2018-10-21</Date>
-            <Version>2018.09.04</Version>
+        <Update release="3">
+            <Date>2019-07-03</Date>
+            <Version>2019.07.01</Version>
             <Comment>Packaging update</Comment>
-            <Name>Christopher Nascone</Name>
-            <Email>chris@nasc.one</Email>
+            <Name>Stanislav Ch. Nikolov</Name>
+            <Email>stanislav.ltb@gmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file