diff --git a/25x.pattern.php b/25x.pattern.php
deleted file mode 100644
index 0d15be5..0000000
--- a/25x.pattern.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-$pattern['Pure_default_prefilter_index']['S']['table_content_begin']='#<div id="content" class="content\{if isset\(\$MENUBAR\)\} contentWithMenu\{/if\}">#';
-$pattern['Pure_default_prefilter_index']['R']['table_content_begin']='<div id="content" class="content{if isset($MENUBAR)} contentWithMenu{/if}">
-  <table id="table_content" border="0" cellspacing="0" cellpadding="0">
-    <tr>
-      <td id="section_up_left">&nbsp;</td>
-      <td id="section_up">&nbsp;</td>
-      <td id="section_up_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_left">&nbsp;</td>
-      <td id="section_in">
-';
-$pattern['Pure_default_prefilter_index']['S']['table_content_end']='#\{if \!empty\(\$PLUGIN_INDEX_CONTENT_END\)\}\{\$PLUGIN_INDEX_CONTENT_END\}\{/if\}#';
-$pattern['Pure_default_prefilter_index']['R']['table_content_end']='{if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_END}{/if}
-      </td>
-	  <td id="section_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_bottom_left">&nbsp;</td>
-      <td id="section_bottom" >&nbsp;</td>
-      <td id="section_bottom_right" >&nbsp;</td>
-    </tr>
-  </table>
-';
-
-$pattern['Pure_default_prefilter_picture']['S']['table_content_begin']='#<div id="content" \{if isset\(\$MENUBAR\)\}class="contentWithMenu"\{/if\}>#';
-$pattern['Pure_default_prefilter_picture']['R']['table_content_begin']='<div id="content" {if isset($MENUBAR)}class="contentWithMenu"{/if}>
-  <table id="table_content" border="0" cellspacing="0" cellpadding="0">
-    <tr>
-      <td id="section_up_left">&nbsp;</td>
-      <td id="section_up">&nbsp;</td>
-      <td id="section_up_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_left">&nbsp;</td>
-      <td id="section_in">
-';
-$pattern['Pure_default_prefilter_picture']['S']['table_content_end']='#\{if \!empty\(\$PLUGIN_PICTURE_AFTER\)\}\{\$PLUGIN_PICTURE_AFTER\}\{/if\}#';  
-$pattern['Pure_default_prefilter_picture']['R']['table_content_end']='{if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if}
-      </td>
-	  <td id="section_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_bottom_left">&nbsp;</td>
-      <td id="section_bottom" >&nbsp;</td>
-      <td id="section_bottom_right" >&nbsp;</td>
-    </tr>
-  </table>
-';
-/**************************** identification.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_identification']['S']['autre_content_begin']='#<form action="\{\$F_LOGIN_ACTION\}" method="post" name="login_form" class="properties">#';  
-$pattern['Pure_default_prefilter_identification']['R']['autre_content_begin']= '<div id="autre_content">
-<form action="{$F_LOGIN_ACTION}" method="post" name="login_form" class="properties">
-';
-$pattern['Pure_default_prefilter_identification']['S']['autre_content_end']='#</div>[\s]*<\!-- content -->#';  
-$pattern['Pure_default_prefilter_identification']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-/**************************** nbm.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_nbm']['S']['autre_content_begin']='#\{if not empty(\$errors)\}#';  
-$pattern['Pure_default_prefilter_nbm']['R']['autre_content_begin']= '<div id="autre_content">
-{if not empty($errors)}
-';
-$pattern['Pure_default_prefilter_nbm']['S']['autre_content_end']='#\{/if\}[\s]*</div>#';  
-$pattern['Pure_default_prefilter_nbm']['R']['autre_content_end']='<{/if}
-	</div>
-	</div> <!-- content -->';
-/**************************** notification.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_notification']['S']['autre_content_begin']='#<div id="content" class="content\{if isset\(\$MENUBAR\)\} contentWithMenu\{/if\}">#';  
-$pattern['Pure_default_prefilter_notification']['R']['autre_content_begin']= '<div id="autre_content" {if isset($MENUBAR)}class="contentWithMenu{/if}"><div id="content" class="content">';
-$pattern['Pure_default_prefilter_notification']['S']['autre_content_end']='#</dt>[\s]*</dl>#';  
-$pattern['Pure_default_prefilter_notification']['R']['autre_content_end']='</dt>
-	</dl>
-</div>';
-/**************************** password.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_password']['S']['autre_content_begin']='#<form action=#';  
-$pattern['Pure_default_prefilter_password']['R']['autre_content_begin']= '<div id="autre_content">
-<form action=';
-$pattern['Pure_default_prefilter_password']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
-$pattern['Pure_default_prefilter_password']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-/**************************** tags.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_tags']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
-$pattern['Pure_default_prefilter_tags']['R']['autre_content_begin']= '</h2>
-  </div>
-<div id="autre_content">';
-$pattern['Pure_default_prefilter_tags']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
-$pattern['Pure_default_prefilter_tags']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-/**************************** about.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_about']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
-$pattern['Pure_default_prefilter_about']['R']['autre_content_begin']= '</h2>
-  </div>
-<div id="autre_content">';
-$pattern['Pure_default_prefilter_about']['S']['autre_content_end']='#\{/if\}[\s]*</div>#';  
-$pattern['Pure_default_prefilter_about']['R']['autre_content_end']='{/if}
-  </div>
-  </div>';
-/**************************** popuphelp.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_popuphelp']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
-$pattern['Pure_default_prefilter_popuphelp']['R']['autre_content_begin']= '</h2>
-  </div>
-<div id="autre_content">';
-$pattern['Pure_default_prefilter_popuphelp']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
-$pattern['Pure_default_prefilter_popuphelp']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-
-?>
diff --git a/26x.pattern.php b/26x.pattern.php
deleted file mode 100644
index 0d15be5..0000000
--- a/26x.pattern.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-$pattern['Pure_default_prefilter_index']['S']['table_content_begin']='#<div id="content" class="content\{if isset\(\$MENUBAR\)\} contentWithMenu\{/if\}">#';
-$pattern['Pure_default_prefilter_index']['R']['table_content_begin']='<div id="content" class="content{if isset($MENUBAR)} contentWithMenu{/if}">
-  <table id="table_content" border="0" cellspacing="0" cellpadding="0">
-    <tr>
-      <td id="section_up_left">&nbsp;</td>
-      <td id="section_up">&nbsp;</td>
-      <td id="section_up_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_left">&nbsp;</td>
-      <td id="section_in">
-';
-$pattern['Pure_default_prefilter_index']['S']['table_content_end']='#\{if \!empty\(\$PLUGIN_INDEX_CONTENT_END\)\}\{\$PLUGIN_INDEX_CONTENT_END\}\{/if\}#';
-$pattern['Pure_default_prefilter_index']['R']['table_content_end']='{if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_END}{/if}
-      </td>
-	  <td id="section_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_bottom_left">&nbsp;</td>
-      <td id="section_bottom" >&nbsp;</td>
-      <td id="section_bottom_right" >&nbsp;</td>
-    </tr>
-  </table>
-';
-
-$pattern['Pure_default_prefilter_picture']['S']['table_content_begin']='#<div id="content" \{if isset\(\$MENUBAR\)\}class="contentWithMenu"\{/if\}>#';
-$pattern['Pure_default_prefilter_picture']['R']['table_content_begin']='<div id="content" {if isset($MENUBAR)}class="contentWithMenu"{/if}>
-  <table id="table_content" border="0" cellspacing="0" cellpadding="0">
-    <tr>
-      <td id="section_up_left">&nbsp;</td>
-      <td id="section_up">&nbsp;</td>
-      <td id="section_up_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_left">&nbsp;</td>
-      <td id="section_in">
-';
-$pattern['Pure_default_prefilter_picture']['S']['table_content_end']='#\{if \!empty\(\$PLUGIN_PICTURE_AFTER\)\}\{\$PLUGIN_PICTURE_AFTER\}\{/if\}#';  
-$pattern['Pure_default_prefilter_picture']['R']['table_content_end']='{if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if}
-      </td>
-	  <td id="section_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_bottom_left">&nbsp;</td>
-      <td id="section_bottom" >&nbsp;</td>
-      <td id="section_bottom_right" >&nbsp;</td>
-    </tr>
-  </table>
-';
-/**************************** identification.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_identification']['S']['autre_content_begin']='#<form action="\{\$F_LOGIN_ACTION\}" method="post" name="login_form" class="properties">#';  
-$pattern['Pure_default_prefilter_identification']['R']['autre_content_begin']= '<div id="autre_content">
-<form action="{$F_LOGIN_ACTION}" method="post" name="login_form" class="properties">
-';
-$pattern['Pure_default_prefilter_identification']['S']['autre_content_end']='#</div>[\s]*<\!-- content -->#';  
-$pattern['Pure_default_prefilter_identification']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-/**************************** nbm.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_nbm']['S']['autre_content_begin']='#\{if not empty(\$errors)\}#';  
-$pattern['Pure_default_prefilter_nbm']['R']['autre_content_begin']= '<div id="autre_content">
-{if not empty($errors)}
-';
-$pattern['Pure_default_prefilter_nbm']['S']['autre_content_end']='#\{/if\}[\s]*</div>#';  
-$pattern['Pure_default_prefilter_nbm']['R']['autre_content_end']='<{/if}
-	</div>
-	</div> <!-- content -->';
-/**************************** notification.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_notification']['S']['autre_content_begin']='#<div id="content" class="content\{if isset\(\$MENUBAR\)\} contentWithMenu\{/if\}">#';  
-$pattern['Pure_default_prefilter_notification']['R']['autre_content_begin']= '<div id="autre_content" {if isset($MENUBAR)}class="contentWithMenu{/if}"><div id="content" class="content">';
-$pattern['Pure_default_prefilter_notification']['S']['autre_content_end']='#</dt>[\s]*</dl>#';  
-$pattern['Pure_default_prefilter_notification']['R']['autre_content_end']='</dt>
-	</dl>
-</div>';
-/**************************** password.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_password']['S']['autre_content_begin']='#<form action=#';  
-$pattern['Pure_default_prefilter_password']['R']['autre_content_begin']= '<div id="autre_content">
-<form action=';
-$pattern['Pure_default_prefilter_password']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
-$pattern['Pure_default_prefilter_password']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-/**************************** tags.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_tags']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
-$pattern['Pure_default_prefilter_tags']['R']['autre_content_begin']= '</h2>
-  </div>
-<div id="autre_content">';
-$pattern['Pure_default_prefilter_tags']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
-$pattern['Pure_default_prefilter_tags']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-/**************************** about.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_about']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
-$pattern['Pure_default_prefilter_about']['R']['autre_content_begin']= '</h2>
-  </div>
-<div id="autre_content">';
-$pattern['Pure_default_prefilter_about']['S']['autre_content_end']='#\{/if\}[\s]*</div>#';  
-$pattern['Pure_default_prefilter_about']['R']['autre_content_end']='{/if}
-  </div>
-  </div>';
-/**************************** popuphelp.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_popuphelp']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
-$pattern['Pure_default_prefilter_popuphelp']['R']['autre_content_begin']= '</h2>
-  </div>
-<div id="autre_content">';
-$pattern['Pure_default_prefilter_popuphelp']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
-$pattern['Pure_default_prefilter_popuphelp']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-
-?>
diff --git a/27x.pattern.php b/27x.pattern.php
deleted file mode 100644
index 0d15be5..0000000
--- a/27x.pattern.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-$pattern['Pure_default_prefilter_index']['S']['table_content_begin']='#<div id="content" class="content\{if isset\(\$MENUBAR\)\} contentWithMenu\{/if\}">#';
-$pattern['Pure_default_prefilter_index']['R']['table_content_begin']='<div id="content" class="content{if isset($MENUBAR)} contentWithMenu{/if}">
-  <table id="table_content" border="0" cellspacing="0" cellpadding="0">
-    <tr>
-      <td id="section_up_left">&nbsp;</td>
-      <td id="section_up">&nbsp;</td>
-      <td id="section_up_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_left">&nbsp;</td>
-      <td id="section_in">
-';
-$pattern['Pure_default_prefilter_index']['S']['table_content_end']='#\{if \!empty\(\$PLUGIN_INDEX_CONTENT_END\)\}\{\$PLUGIN_INDEX_CONTENT_END\}\{/if\}#';
-$pattern['Pure_default_prefilter_index']['R']['table_content_end']='{if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_END}{/if}
-      </td>
-	  <td id="section_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_bottom_left">&nbsp;</td>
-      <td id="section_bottom" >&nbsp;</td>
-      <td id="section_bottom_right" >&nbsp;</td>
-    </tr>
-  </table>
-';
-
-$pattern['Pure_default_prefilter_picture']['S']['table_content_begin']='#<div id="content" \{if isset\(\$MENUBAR\)\}class="contentWithMenu"\{/if\}>#';
-$pattern['Pure_default_prefilter_picture']['R']['table_content_begin']='<div id="content" {if isset($MENUBAR)}class="contentWithMenu"{/if}>
-  <table id="table_content" border="0" cellspacing="0" cellpadding="0">
-    <tr>
-      <td id="section_up_left">&nbsp;</td>
-      <td id="section_up">&nbsp;</td>
-      <td id="section_up_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_left">&nbsp;</td>
-      <td id="section_in">
-';
-$pattern['Pure_default_prefilter_picture']['S']['table_content_end']='#\{if \!empty\(\$PLUGIN_PICTURE_AFTER\)\}\{\$PLUGIN_PICTURE_AFTER\}\{/if\}#';  
-$pattern['Pure_default_prefilter_picture']['R']['table_content_end']='{if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if}
-      </td>
-	  <td id="section_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_bottom_left">&nbsp;</td>
-      <td id="section_bottom" >&nbsp;</td>
-      <td id="section_bottom_right" >&nbsp;</td>
-    </tr>
-  </table>
-';
-/**************************** identification.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_identification']['S']['autre_content_begin']='#<form action="\{\$F_LOGIN_ACTION\}" method="post" name="login_form" class="properties">#';  
-$pattern['Pure_default_prefilter_identification']['R']['autre_content_begin']= '<div id="autre_content">
-<form action="{$F_LOGIN_ACTION}" method="post" name="login_form" class="properties">
-';
-$pattern['Pure_default_prefilter_identification']['S']['autre_content_end']='#</div>[\s]*<\!-- content -->#';  
-$pattern['Pure_default_prefilter_identification']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-/**************************** nbm.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_nbm']['S']['autre_content_begin']='#\{if not empty(\$errors)\}#';  
-$pattern['Pure_default_prefilter_nbm']['R']['autre_content_begin']= '<div id="autre_content">
-{if not empty($errors)}
-';
-$pattern['Pure_default_prefilter_nbm']['S']['autre_content_end']='#\{/if\}[\s]*</div>#';  
-$pattern['Pure_default_prefilter_nbm']['R']['autre_content_end']='<{/if}
-	</div>
-	</div> <!-- content -->';
-/**************************** notification.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_notification']['S']['autre_content_begin']='#<div id="content" class="content\{if isset\(\$MENUBAR\)\} contentWithMenu\{/if\}">#';  
-$pattern['Pure_default_prefilter_notification']['R']['autre_content_begin']= '<div id="autre_content" {if isset($MENUBAR)}class="contentWithMenu{/if}"><div id="content" class="content">';
-$pattern['Pure_default_prefilter_notification']['S']['autre_content_end']='#</dt>[\s]*</dl>#';  
-$pattern['Pure_default_prefilter_notification']['R']['autre_content_end']='</dt>
-	</dl>
-</div>';
-/**************************** password.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_password']['S']['autre_content_begin']='#<form action=#';  
-$pattern['Pure_default_prefilter_password']['R']['autre_content_begin']= '<div id="autre_content">
-<form action=';
-$pattern['Pure_default_prefilter_password']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
-$pattern['Pure_default_prefilter_password']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-/**************************** tags.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_tags']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
-$pattern['Pure_default_prefilter_tags']['R']['autre_content_begin']= '</h2>
-  </div>
-<div id="autre_content">';
-$pattern['Pure_default_prefilter_tags']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
-$pattern['Pure_default_prefilter_tags']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-/**************************** about.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_about']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
-$pattern['Pure_default_prefilter_about']['R']['autre_content_begin']= '</h2>
-  </div>
-<div id="autre_content">';
-$pattern['Pure_default_prefilter_about']['S']['autre_content_end']='#\{/if\}[\s]*</div>#';  
-$pattern['Pure_default_prefilter_about']['R']['autre_content_end']='{/if}
-  </div>
-  </div>';
-/**************************** popuphelp.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_popuphelp']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
-$pattern['Pure_default_prefilter_popuphelp']['R']['autre_content_begin']= '</h2>
-  </div>
-<div id="autre_content">';
-$pattern['Pure_default_prefilter_popuphelp']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
-$pattern['Pure_default_prefilter_popuphelp']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-
-?>
diff --git a/28x.pattern.php b/28x.pattern.php
deleted file mode 100644
index 0d15be5..0000000
--- a/28x.pattern.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-$pattern['Pure_default_prefilter_index']['S']['table_content_begin']='#<div id="content" class="content\{if isset\(\$MENUBAR\)\} contentWithMenu\{/if\}">#';
-$pattern['Pure_default_prefilter_index']['R']['table_content_begin']='<div id="content" class="content{if isset($MENUBAR)} contentWithMenu{/if}">
-  <table id="table_content" border="0" cellspacing="0" cellpadding="0">
-    <tr>
-      <td id="section_up_left">&nbsp;</td>
-      <td id="section_up">&nbsp;</td>
-      <td id="section_up_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_left">&nbsp;</td>
-      <td id="section_in">
-';
-$pattern['Pure_default_prefilter_index']['S']['table_content_end']='#\{if \!empty\(\$PLUGIN_INDEX_CONTENT_END\)\}\{\$PLUGIN_INDEX_CONTENT_END\}\{/if\}#';
-$pattern['Pure_default_prefilter_index']['R']['table_content_end']='{if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_END}{/if}
-      </td>
-	  <td id="section_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_bottom_left">&nbsp;</td>
-      <td id="section_bottom" >&nbsp;</td>
-      <td id="section_bottom_right" >&nbsp;</td>
-    </tr>
-  </table>
-';
-
-$pattern['Pure_default_prefilter_picture']['S']['table_content_begin']='#<div id="content" \{if isset\(\$MENUBAR\)\}class="contentWithMenu"\{/if\}>#';
-$pattern['Pure_default_prefilter_picture']['R']['table_content_begin']='<div id="content" {if isset($MENUBAR)}class="contentWithMenu"{/if}>
-  <table id="table_content" border="0" cellspacing="0" cellpadding="0">
-    <tr>
-      <td id="section_up_left">&nbsp;</td>
-      <td id="section_up">&nbsp;</td>
-      <td id="section_up_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_left">&nbsp;</td>
-      <td id="section_in">
-';
-$pattern['Pure_default_prefilter_picture']['S']['table_content_end']='#\{if \!empty\(\$PLUGIN_PICTURE_AFTER\)\}\{\$PLUGIN_PICTURE_AFTER\}\{/if\}#';  
-$pattern['Pure_default_prefilter_picture']['R']['table_content_end']='{if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if}
-      </td>
-	  <td id="section_right">&nbsp;</td>
-    </tr>
-    <tr>
-      <td id="section_bottom_left">&nbsp;</td>
-      <td id="section_bottom" >&nbsp;</td>
-      <td id="section_bottom_right" >&nbsp;</td>
-    </tr>
-  </table>
-';
-/**************************** identification.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_identification']['S']['autre_content_begin']='#<form action="\{\$F_LOGIN_ACTION\}" method="post" name="login_form" class="properties">#';  
-$pattern['Pure_default_prefilter_identification']['R']['autre_content_begin']= '<div id="autre_content">
-<form action="{$F_LOGIN_ACTION}" method="post" name="login_form" class="properties">
-';
-$pattern['Pure_default_prefilter_identification']['S']['autre_content_end']='#</div>[\s]*<\!-- content -->#';  
-$pattern['Pure_default_prefilter_identification']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-/**************************** nbm.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_nbm']['S']['autre_content_begin']='#\{if not empty(\$errors)\}#';  
-$pattern['Pure_default_prefilter_nbm']['R']['autre_content_begin']= '<div id="autre_content">
-{if not empty($errors)}
-';
-$pattern['Pure_default_prefilter_nbm']['S']['autre_content_end']='#\{/if\}[\s]*</div>#';  
-$pattern['Pure_default_prefilter_nbm']['R']['autre_content_end']='<{/if}
-	</div>
-	</div> <!-- content -->';
-/**************************** notification.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_notification']['S']['autre_content_begin']='#<div id="content" class="content\{if isset\(\$MENUBAR\)\} contentWithMenu\{/if\}">#';  
-$pattern['Pure_default_prefilter_notification']['R']['autre_content_begin']= '<div id="autre_content" {if isset($MENUBAR)}class="contentWithMenu{/if}"><div id="content" class="content">';
-$pattern['Pure_default_prefilter_notification']['S']['autre_content_end']='#</dt>[\s]*</dl>#';  
-$pattern['Pure_default_prefilter_notification']['R']['autre_content_end']='</dt>
-	</dl>
-</div>';
-/**************************** password.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_password']['S']['autre_content_begin']='#<form action=#';  
-$pattern['Pure_default_prefilter_password']['R']['autre_content_begin']= '<div id="autre_content">
-<form action=';
-$pattern['Pure_default_prefilter_password']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
-$pattern['Pure_default_prefilter_password']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-/**************************** tags.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_tags']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
-$pattern['Pure_default_prefilter_tags']['R']['autre_content_begin']= '</h2>
-  </div>
-<div id="autre_content">';
-$pattern['Pure_default_prefilter_tags']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
-$pattern['Pure_default_prefilter_tags']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-/**************************** about.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_about']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
-$pattern['Pure_default_prefilter_about']['R']['autre_content_begin']= '</h2>
-  </div>
-<div id="autre_content">';
-$pattern['Pure_default_prefilter_about']['S']['autre_content_end']='#\{/if\}[\s]*</div>#';  
-$pattern['Pure_default_prefilter_about']['R']['autre_content_end']='{/if}
-  </div>
-  </div>';
-/**************************** popuphelp.tpl *****************************************************************/
-$pattern['Pure_default_prefilter_popuphelp']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
-$pattern['Pure_default_prefilter_popuphelp']['R']['autre_content_begin']= '</h2>
-  </div>
-<div id="autre_content">';
-$pattern['Pure_default_prefilter_popuphelp']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
-$pattern['Pure_default_prefilter_popuphelp']['R']['autre_content_end']='</div>
-	</div> <!-- content -->';
-
-?>
diff --git a/local_head.tpl b/local_head.tpl
index 615d694..650b01e 100644
--- a/local_head.tpl
+++ b/local_head.tpl
@@ -1,4 +1,4 @@
-{if isset($PHPWG_VERSION_01) and $PHPWG_VERSION_01!="24"}
+{if isset($PHPWG_VERSION_01) and $PHPWG_VERSION_01 eq "23"}
 {footer_script require='jquery'}
 {literal} 
 var max_dim_width = 0;
diff --git a/themeconf.inc.php b/themeconf.inc.php
index 3aeb9bf..48492bb 100644
--- a/themeconf.inc.php
+++ b/themeconf.inc.php
@@ -37,51 +37,29 @@ function  pwg_v() {
 function load_pattern()
 {
   global $pattern;
+
   $pwgversion=str_replace('.','',PHPWG_VERSION);
-  $pwgversion_array=explode('.', PHPWG_VERSION);
+  $pwgversion_branch = str_replace('.','', get_branch_from_version(PHPWG_VERSION));
+
   if (file_exists($pwgversion.'pattern.php'))
   {
     include($pwgversion.'.pattern.php');
     return true;
   }
-  elseif (file_exists(PHPWG_ROOT_PATH.'themes/Pure_default/'.$pwgversion_array[0].$pwgversion_array[1].'x.pattern.php'))
+  elseif (file_exists(PHPWG_ROOT_PATH.'themes/Pure_default/'.$pwgversion_branch.'x.pattern.php'))
+  {
+    include(PHPWG_ROOT_PATH.'themes/Pure_default/'.$pwgversion_branch.'x.pattern.php');
+    return true;
+  }
+  elseif (version_compare(PHPWG_VERSION, '2.4', '>='))
   {
-    include(PHPWG_ROOT_PATH.'themes/Pure_default/'.$pwgversion_array[0].$pwgversion_array[1].'x.pattern.php');
+    include(PHPWG_ROOT_PATH.'themes/Pure_default/24x.pattern.php');
     return true;
   }
   else
   {
-    $list_pattern_path=array();
-    $dir=PHPWG_ROOT_PATH.'themes/Pure_default';
-    $dh = opendir($dir);
-    while (($file = readdir ($dh)) !== false ) {
-      if ($file !== '.' && $file !== '..') {
-        $path =$dir.'/'.$file;
-        if (!is_dir ($path)) { 
-          if(strpos($file,'pattern.php')!==false) { //On ne prend que les .pattern.php
-            $list_pattern_path[]=$file;
-          }
-        }
-      }
-    }
-    closedir($dh);
-    $f=0;
-    for($i = 10; $i >=0; $i--)
-    {
-      if (in_array($pwgversion_array[0].$i.'.pattern.php',$list_pattern_path))
-      {
-        include($pwgversion_array[0].$i.'.pattern.php');
-        return true;
-        $f=1;
-        break;
-      }
-    }
-    if ($f=0)
-    {
-      return false;
-    }
+    return false;
   }
-  
 }
 if(!load_pattern())
 {