WIP: new structure moving config into the theme