Rename directive. Add image toggle.