Add jade syntax and rename things