Update to match new theme and token API