reorg themes dependencies