Update theme stucture emulate NW 3.1