Update to jade@1.0.0 and refactor some things