ajax forms still return mixed themes

Don't know if it is relevant, but even after clearing my cache, I notice that themekey_menu_alter is not being called. I put some watchdog commands in there and it doesn't seem to be firing. However, themekey_ajax_base_page_theme does get called several times during my page render, so I'm not sure what is going on.

Yes, I set bypass and chose my themes as safe. Running drush rr made the menu_alter register. I did some more digging and found that at this point:

function themekey_ajax_base_page_theme() {
  watchdog('themekey ajax base theme called', 'in function');
  if (
    variable_get('themekey_unsafe_ajax_base_page_theme', 0) &&
    !empty($_POST['ajax_page_state']['theme']) &&
    !empty($_POST['ajax_page_state']['theme_token']) &&
    themekey_check_theme_enabled($_POST['ajax_page_state']['theme_token']) &&
    themekey_is_ajax_theme_safe($_POST['ajax_page_state']['theme_token'])
  ) {
    watchdog('themekey ajax base theme called', 'in return');
   return $_POST['ajax_page_state']['theme'];

if I remove themekey_check_theme_enabled and themekey_is_ajax_theme_safe, ajax starts working again. I'm not sure why those two checks are failing. I even checked 'Provide all themes for selection' in case that was the stumbling block. I'll add some more debug messages in there to find out why the enabled theme check and safe theme check are failing.

Yes they are, but I'm just thinking here... shouldn't the check be for themekey_check_theme_enabled($_POST['ajax_page_state']['theme']) and themekey_is_ajax_theme_safe($_POST['ajax_page_state']['theme'])

and not

themekey_check_theme_enabled($_POST['ajax_page_state']['theme_token']) &&
themekey_is_ajax_theme_safe($_POST['ajax_page_state']['theme_token'])

Seems like the enabled themes and safe themes are stored as theme machine names, not tokens.

changing theme_token to theme does make it work, if that helps.

WOOT!