Move to svg + Add filter features