I think it makes sense to decriminalize at the federal level and leave it to states to determine the appropriate level of local regulation.

Banning corporatization, advertising, and branding of these substances is an intriguing idea, and probably necessary to make progress in this country.