Rework theme addons and introduce the notion of "group"