Revert "Revert "development: TRDS 3.0 and new theme engine preparation (2/4)""

This reverts commit 62ce977a8b9683f90937ff600feb19a234b64c51.