Both these branches need to be merged into master. v6 merge is almost done. The mousify branch merge will require a bunch of configuration option to be added.