theme dependencies reorg