[PR] Update repository to a single theme structure