Revert "Track New Theme Chooser..."

This reverts commit 8b26b30efd4f4caec93e94933a64d1460bc7f358.