Revert "Revert "Runtime resource overlay, iteration 2""

This reverts commit d5fe8343a886f7f6146ce51f4970ea6c68be92a8.
Revert "Revert "New Theme Engine [4/6]""

This reverts commit 81a5bd9b278e009f91aafa42532b24f39f8cdb22.