346c346,349
< 	if ( file_exists(TEMPLATEPATH . "/{$type}.php") )
---
> 	if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/{$type}.php") )
> 		$template = STYLESHEETPATH . "/{$type}.php";
> 
> 	elseif ( file_exists(TEMPLATEPATH . "/{$type}.php") )
366c369,371
< 	if ( file_exists(TEMPLATEPATH . "/category-" . absint( get_query_var('cat') ) . '.php') )
---
> 	if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/category-" . absint( get_query_var('cat') ) . '.php') )
> 		$template = STYLESHEETPATH . "/category-" . absint( get_query_var('cat') ) . '.php';
> 	elseif ( file_exists(TEMPLATEPATH . "/category-" . absint( get_query_var('cat') ) . '.php') )
367a373,374
> 	elseif ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/category.php") )
> 		$template = STYLESHEETPATH . "/category.php";
376c383,385
< 	if ( file_exists(TEMPLATEPATH . "/tag-" . get_query_var('tag') . '.php') )
---
> 	if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/tag-" . get_query_var('tag') . '.php') )
> 		$template = STYLESHEETPATH . "/tag-" . get_query_var('tag') . '.php';
> 	elseif ( file_exists(TEMPLATEPATH . "/tag-" . get_query_var('tag') . '.php') )
377a387,389
> 
> 	elseif ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/tag.php") )
> 		$template = STYLESHEETPATH . "/tag.php";
388c400,403
< 	if ( $taxonomy && $term && file_exists(TEMPLATEPATH . "/taxonomy-$taxonomy-$term.php") )
---
> 
> 	if ( TEMPLATEPATH !== STYLESHEETPATH && ($taxonomy && $term && file_exists(STYLESHEETPATH . "/taxonomy-$taxonomy-$term.php") ) )
> 		$template = STYLESHEETPATH . "/taxonomy-$taxonomy-$term.php";
> 	elseif ( $taxonomy && $term && file_exists(TEMPLATEPATH . "/taxonomy-$taxonomy-$term.php") )
389a405,407
> 
> 	elseif (TEMPLATEPATH !== STYLESHEETPATH && ( $taxonomy && file_exists(STYLESHEETPATH . "/taxonomy-$taxonomy.php") ) )
> 		$template = STYLESHEETPATH . "/taxonomy-$taxonomy.php";
391a410,412
> 
> 	elseif ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/taxonomy.php") )
> 		$template = STYLESHEETPATH . "/taxonomy.php";
405c426,428
< 	if ( file_exists(TEMPLATEPATH . "/home.php") )
---
> 	if (TEMPLATEPATH !== STYLESHEETPATH &&  file_exists(STYLESHEETPATH . "/home.php") )
> 			$template = STYLESHEETPATH . "/home.php";
> 	elseif ( file_exists(TEMPLATEPATH . "/home.php") )
406a430,432
> 
>  	elseif ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/index.php") )
> 		$template = STYLESHEETPATH . "/index.php";
422c448,450
< 	if ( !empty($template) && !validate_file($template) && file_exists(TEMPLATEPATH . "/$template") )
---
> 	if ( TEMPLATEPATH !== STYLESHEETPATH && (!empty($template) && !validate_file($template) && file_exists(STYLESHEETPATH . "/$template") ) )
> 		$template = STYLESHEETPATH. "/$template";
> 	elseif ( !empty($template) && !validate_file($template) && file_exists(TEMPLATEPATH . "/$template") )
423a452,454
> 
> 	elseif (TEMPLATEPATH !== STYLESHEETPATH &&  file_exists(STYLESHEETPATH . "/page.php") )
> 		$template = STYLESHEETPATH . "/page.php";
458c489,491
< 	if ( file_exists( TEMPLATEPATH . '/comments-popup.php') )
---
> 	if (TEMPLATEPATH !== STYLESHEETPATH &&  file_exists(STYLESHEETPATH . "/comments-popup.php") )
> 		$template = STYLESHEETPATH . "/comments-popup.php";
> 	elseif ( file_exists( TEMPLATEPATH . '/comments-popup.php') )
461c494
< 		$template = get_theme_root() . '/default/comments-popup.php';
---
> 		$template = WP_CONTENT_DIR . '/themes/default/comments-popup.php';