diff --git a/phpgwapi/templates/default/nextmatchs.tpl b/phpgwapi/templates/default/nextmatchs.tpl
index e7eea4faaf..ebd0cbfe4c 100644
--- a/phpgwapi/templates/default/nextmatchs.tpl
+++ b/phpgwapi/templates/default/nextmatchs.tpl
@@ -1,12 +1,7 @@
 <!-- BEGIN nextmatchs -->
  <table width="{table_width}" border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0" cols="5">
   <tr>   {left}
-   <td align="center" bgcolor="{th_bg}" valign="top" width="92%"></td>   {right}
-  </tr>
-  <tr>
-   <td align="center" bgcolor="{th_bg}" valign="top" colspan="5">
-    {cats_search_filter_data}
-   </td>
+   <td align="center" bgcolor="{th_bg}" valign="top" width="92%">{cats_search_filter_data}</td>   {right}
   </tr>
  </table>
 
diff --git a/phpgwapi/templates/idsociety/nextmatchs.tpl b/phpgwapi/templates/idsociety/nextmatchs.tpl
deleted file mode 100755
index e7eea4faaf..0000000000
--- a/phpgwapi/templates/idsociety/nextmatchs.tpl
+++ /dev/null
@@ -1,107 +0,0 @@
-<!-- BEGIN nextmatchs -->
- <table width="{table_width}" border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0" cols="5">
-  <tr>   {left}
-   <td align="center" bgcolor="{th_bg}" valign="top" width="92%"></td>   {right}
-  </tr>
-  <tr>
-   <td align="center" bgcolor="{th_bg}" valign="top" colspan="5">
-    {cats_search_filter_data}
-   </td>
-  </tr>
- </table>
-
-<br>
-
-<!-- END nextmatchs -->
-
-
-<!-- BEGIN filter -->
-       <td>
-{select}
-        <noscript>
-         <input type="submit" value="{lang_filter}">
-        </noscript>
-       </td>
-<!-- END filter -->
-
-
-<!-- BEGIN form -->
-   <td width="2%" align="{align}" valign="top">
-    <form method="POST" action="{action}" name="{form_name}">
-{hidden}
-     <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
-      <tr>
-       <td align="{align}">
-        <input type="image" src="{img}" border="{border}" alt="{label}" width="12" height="12" name="start" value="{start}">
-       </td>
-      </tr>
-     </table>
-    </form>
-   </td>
-<!-- END form -->
-
-
-<!-- BEGIN icon -->
-<td width="2%" align="{align}">&nbsp;{_link}</td>
-<!-- END icon -->
-
-
-<!-- BEGIN link -->
-   <td width="2%" align="{align}" valign="top">
-    <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
-     <tr>
-      <td align="{align}">
-       <img src="{img}" border="{border}" width="12" height="12" alt="{label}">
-      </td>
-     </tr>
-    </table>
-   </td>
-<!-- END link -->
-
-
-<!-- BEGIN search -->
-       <td>
-        <input type="text" name="query" value="{query_value}">&nbsp;{searchby}<input type="submit" name="Search" value="{lang_search}">
-       </td>
-<!-- END search -->
-
-<!-- BEGIN cats -->
-       <td>
-        {lang_category}&nbsp;&nbsp;<select name="{cat_field}" onChange="this.form.submit();">
-         <option value="0">{lang_all}</option>
-         {categories}
-        </select>
-        <noscript><input type="submit" name="cats" value="{lang_select}"></noscript>
-       </td>
-<!-- END cats -->
-
-<!-- BEGIN search_filter -->
-    <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
-     <form method="POST" action="{form_action}" name="filter">
-      <input type="hidden" name="filter" value="{filter_value}">
-      <input type="hidden" name="qfield" value="{qfield_value}">
-      <input type="hidden" name="start" value="{start_value}">
-      <input type="hidden" name="order" value="{order_value}">
-      <input type="hidden" name="sort" value="{sort_value}">
-      <input type="hidden" name="query" value="{query_value}">
-      <tr>{search}<td>&nbsp;</td>{filter}
-      </tr>
-     </form>
-    </table>
-<!-- END search_filter -->
-
-<!-- BEGIN cats_search_filter -->
-    <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
-     <form method="POST" action="{form_action}" name="filter">
-      <input type="hidden" name="filter" value="{filter_value}">
-      <input type="hidden" name="qfield" value="{qfield_value}">
-      <input type="hidden" name="start" value="{start_value}">
-      <input type="hidden" name="order" value="{order_value}">
-      <input type="hidden" name="sort" value="{sort_value}">
-      <input type="hidden" name="query" value="{query_value}">
-      <tr>{cats}<td>&nbsp;</td>{search}<td>&nbsp;&nbsp;</td>{filter}
-      </tr>
-     </form>
-    </table>
-<!-- END cats_search_filter -->
-
diff --git a/phpgwapi/templates/justweb/nextmatchs.tpl b/phpgwapi/templates/justweb/nextmatchs.tpl
deleted file mode 100644
index e6cbb0f606..0000000000
--- a/phpgwapi/templates/justweb/nextmatchs.tpl
+++ /dev/null
@@ -1,107 +0,0 @@
-<!-- BEGIN nextmatchs -->
- <table width="{table_width}" border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0" cols="5">
-  <tr>   {left}
-   <td align="center" bgcolor="{th_bg}" valign="top" width="92%"></td>   {right}
-  </tr>
-  <tr>
-   <td align="center" bgcolor="{th_bg}" valign="top" colspan="5">
-    {cats_search_filter_data}
-   </td>
-  </tr>
- </table>
-
-<br>
-
-<!-- END nextmatchs -->
-
-
-<!-- BEGIN filter -->
-       <td>
-{select}
-        <noscript>
-         <input type="submit" value="{lang_filter}">
-        </noscript>
-       </td>
-<!-- END filter -->
-
-
-<!-- BEGIN form -->
-   <td width="2%" align="{align}" valign="top">
-    <form method="POST" action="{action}" name="{form_name}">
-{hidden}
-     <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
-      <tr>
-       <td align="{align}">
-        <input type="image" src="{img}" border="{border}" alt="{label}" width="12" height="12" name="start" value="{start}">
-       </td>
-      </tr>
-     </table>
-    </form>
-   </td>
-<!-- END form -->
-
-
-<!-- BEGIN icon -->
-<td width="2%" align="{align}">&nbsp;{_link}</td>
-<!-- END icon -->
-
-
-<!-- BEGIN link -->
-   <td width="2%" align="{align}" valign="top">
-    <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
-     <tr>
-      <td align="{align}">
-       <img src="{img}" border="{border}" width="12" height="12" alt="{label}">
-      </td>
-     </tr>
-    </table>
-   </td>
-<!-- END link -->
-
-
-<!-- BEGIN search -->
-       <td>
-        <input type="text" name="query" value="{query_value}">&nbsp;{searchby}<input type="submit" name="Search" value="{lang_search}">
-       </td>
-<!-- END search -->
-
-<!-- BEGIN cats -->
-       <td>
-        {lang_category}&nbsp;&nbsp;<select name="{cat_field}" onChange="this.form.submit();">
-         <option value="0">{lang_all}</option>
-         {categories}
-        </select>
-        <noscript><input type="submit" name="cats" value="{lang_select}"></noscript>
-       </td>
-<!-- END cats -->
-
-<!-- BEGIN search_filter -->
-    <form method="POST" action="{form_action}" name="filter">
-     <input type="hidden" name="filter" value="{filter_value}">
-     <input type="hidden" name="qfield" value="{qfield_value}">
-     <input type="hidden" name="start" value="{start_value}">
-     <input type="hidden" name="order" value="{order_value}">
-     <input type="hidden" name="sort" value="{sort_value}">
-     <input type="hidden" name="query" value="{query_value}">
-     <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
-      <tr>{search}<td>&nbsp;</td>{filter}
-      </tr>
-     </table>
-    </form>
-<!-- END search_filter -->
-
-<!-- BEGIN cats_search_filter -->
-    <form method="POST" action="{form_action}" name="filter">
-     <input type="hidden" name="filter" value="{filter_value}">
-     <input type="hidden" name="qfield" value="{qfield_value}">
-     <input type="hidden" name="start" value="{start_value}">
-     <input type="hidden" name="order" value="{order_value}">
-     <input type="hidden" name="sort" value="{sort_value}">
-     <input type="hidden" name="query" value="{query_value}">
-     <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
-      <tr>{cats}<td>&nbsp;</td>{search}<td>&nbsp;&nbsp;</td>{filter}
-      </tr>
-     </table>
-    </form>
-<!-- END cats_search_filter -->
-
diff --git a/phpgwapi/templates/verdilak/nextmatchs.tpl b/phpgwapi/templates/verdilak/nextmatchs.tpl
deleted file mode 100644
index e6cbb0f606..0000000000
--- a/phpgwapi/templates/verdilak/nextmatchs.tpl
+++ /dev/null
@@ -1,107 +0,0 @@
-<!-- BEGIN nextmatchs -->
- <table width="{table_width}" border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0" cols="5">
-  <tr>   {left}
-   <td align="center" bgcolor="{th_bg}" valign="top" width="92%"></td>   {right}
-  </tr>
-  <tr>
-   <td align="center" bgcolor="{th_bg}" valign="top" colspan="5">
-    {cats_search_filter_data}
-   </td>
-  </tr>
- </table>
-
-<br>
-
-<!-- END nextmatchs -->
-
-
-<!-- BEGIN filter -->
-       <td>
-{select}
-        <noscript>
-         <input type="submit" value="{lang_filter}">
-        </noscript>
-       </td>
-<!-- END filter -->
-
-
-<!-- BEGIN form -->
-   <td width="2%" align="{align}" valign="top">
-    <form method="POST" action="{action}" name="{form_name}">
-{hidden}
-     <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
-      <tr>
-       <td align="{align}">
-        <input type="image" src="{img}" border="{border}" alt="{label}" width="12" height="12" name="start" value="{start}">
-       </td>
-      </tr>
-     </table>
-    </form>
-   </td>
-<!-- END form -->
-
-
-<!-- BEGIN icon -->
-<td width="2%" align="{align}">&nbsp;{_link}</td>
-<!-- END icon -->
-
-
-<!-- BEGIN link -->
-   <td width="2%" align="{align}" valign="top">
-    <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
-     <tr>
-      <td align="{align}">
-       <img src="{img}" border="{border}" width="12" height="12" alt="{label}">
-      </td>
-     </tr>
-    </table>
-   </td>
-<!-- END link -->
-
-
-<!-- BEGIN search -->
-       <td>
-        <input type="text" name="query" value="{query_value}">&nbsp;{searchby}<input type="submit" name="Search" value="{lang_search}">
-       </td>
-<!-- END search -->
-
-<!-- BEGIN cats -->
-       <td>
-        {lang_category}&nbsp;&nbsp;<select name="{cat_field}" onChange="this.form.submit();">
-         <option value="0">{lang_all}</option>
-         {categories}
-        </select>
-        <noscript><input type="submit" name="cats" value="{lang_select}"></noscript>
-       </td>
-<!-- END cats -->
-
-<!-- BEGIN search_filter -->
-    <form method="POST" action="{form_action}" name="filter">
-     <input type="hidden" name="filter" value="{filter_value}">
-     <input type="hidden" name="qfield" value="{qfield_value}">
-     <input type="hidden" name="start" value="{start_value}">
-     <input type="hidden" name="order" value="{order_value}">
-     <input type="hidden" name="sort" value="{sort_value}">
-     <input type="hidden" name="query" value="{query_value}">
-     <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
-      <tr>{search}<td>&nbsp;</td>{filter}
-      </tr>
-     </table>
-    </form>
-<!-- END search_filter -->
-
-<!-- BEGIN cats_search_filter -->
-    <form method="POST" action="{form_action}" name="filter">
-     <input type="hidden" name="filter" value="{filter_value}">
-     <input type="hidden" name="qfield" value="{qfield_value}">
-     <input type="hidden" name="start" value="{start_value}">
-     <input type="hidden" name="order" value="{order_value}">
-     <input type="hidden" name="sort" value="{sort_value}">
-     <input type="hidden" name="query" value="{query_value}">
-     <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
-      <tr>{cats}<td>&nbsp;</td>{search}<td>&nbsp;&nbsp;</td>{filter}
-      </tr>
-     </table>
-    </form>
-<!-- END cats_search_filter -->
-