Core fixes
WP theme clickpick mode fix