Made some progress. The hard part of making the actual theme related features still loom....