Remove fnr marker less from themes, and into fnr