7c7,9
< 	if ( file_exists( TEMPLATEPATH . '/header.php') )
---
> 	 if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/header.php') )
> 		load_template( STYLESHEETPATH . '/header.php');
> 	elseif ( file_exists( TEMPLATEPATH . '/header.php') )
16c18,21
< 	if ( file_exists( TEMPLATEPATH . '/footer.php') )
---
> 
> 	 if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/footer.php') )
> 		load_template( STYLESHEETPATH . '/footer.php');
> 	elseif ( file_exists( TEMPLATEPATH . '/footer.php') )
25c30,33
< 	if ( isset($name) && file_exists( TEMPLATEPATH . "/sidebar-{$name}.php") )
---
> 
> 	if ( TEMPLATEPATH !== STYLESHEETPATH && ( isset($name) && file_exists( STYLESHEETPATH . "/sidebar-{$name}.php") ) )
> 		load_template( STYLESHEETPATH . "/sidebar-{$name}.php");
> 	elseif ( isset($name) && file_exists( TEMPLATEPATH . "/sidebar-{$name}.php") )
26a35,37
> 	 elseif ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/sidebar.php') )
> 		load_template( STYLESHEETPATH . '/sidebar.php');
>