Update TRDS 3.0 and new theme engine preparation (4/4)