theme dependecies reorg