TRDS 3.0 & new theme engine preparation [3/5]

Change-Id: Iac813d7a9f9b652985bf5194bdf6f0d45cc262d6