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

until it is fully merged..

This reverts commit 9ee100c261a6636020bf8e4e363226af07f5bcde.