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

Change-Id: I7841451df2225556700b84d10223bc9c9d72e925