WiP on Theme Management, part of #5.