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

Change-Id: I76ddff63e150da9ee1465c9b3de4440822b8931b