Some fixes on lines and grammar, and changed dependencies to :Next compatible style.