WIP: new structure using theme variable