WIP: Making themes work with the new track API