Smoke grenades, refactored marker