Refactor forms, styles, guardfile watch