Theme updates - BID-3415