diff --git a/include/template.class.php b/include/template.class.php
index 614bcb888..43bed8ae0 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -170,18 +170,6 @@ class Template {
           { /* examples: Are best_rated, created-monthly-calendar, list, ... set? */
               $this->files[$handle] = '../.' . $localtpl; 
               /* assign their tpl-extension */
-              /* For test purpose: Do advanced users need a php access? */
-              // $localphp = '../.' . substr($localtpl,0,-3).'php';
-              // if (file_exists($localphp)) @include_once($localphp);
-              
-              /* Does it have a samename.css available */
-              $localcss = substr($localtpl,0,-3).'css';
-              if (file_exists($localcss))
-              {
-                $this->html_head_elements[] = 
-                '<link rel="stylesheet" type="text/css" href="'
-                . substr($localcss, 2) . '">';
-              }
           }
         }
       }
diff --git a/template-extension/distributed/samples/my-thumbnails2.tpl b/template-extension/distributed/samples/my-thumbnails2.tpl
index 33f6e0569..abd4096ae 100644
--- a/template-extension/distributed/samples/my-thumbnails2.tpl
+++ b/template-extension/distributed/samples/my-thumbnails2.tpl
@@ -1,6 +1,7 @@
 {* $Id$ *}
 <!-- This is a sample of template extensions -->
 {if !empty($thumbnails)}
+{html_head}<link rel="stylesheet" type="text/css" href="{$smarty.template|substr:6:-3}css">{/html_head}
 <ul class="thumbnails">
 {foreach from=$thumbnails item=thumbnail}
 	<li>