Use proper #markup