Fixed theme support in ajax decorated version