Can not use Elegant Themes Shortcode with Serene

Hi. Great work on all the Elegant Themes.
There is bug in Serene that prevents your own ET Shortcodes from being used with this theme

function et_shortcodes_main_load(){
if ( function_exists( ‘et_setup_theme’ ) ) return;
require_once( ET_SHORTCODES_PLUGIN_DIR . '/shortcodes.php' );
}

I assume this checks if the theme being used is an Elegant Theme. If that is the case, it returns immediately, because it is assumed that all Elegant Themes come with ePanel, which provides the ET shortcodes already. However, that is not the case for Serene, which does not come with ePanel *but* still has the et_setup_theme() function. I changed this function to check if ePanel is used instead:

function et_shortcodes_main_load(){
if ( function_exists( ‘et_add_epanel’ ) ) return;
require_once( ET_SHORTCODES_PLUGIN_DIR . '/shortcodes.php' );
}

This allows me to use the ET shortcodes in Serene. Though the et_setup_theme() function could have been renamed too.
Hope that helps