Index: /extensions/AdditionalPages/index_menu.php
===================================================================
--- /extensions/AdditionalPages/index_menu.php	(revision 3609)
+++ /extensions/AdditionalPages/index_menu.php	(revision 6227)
@@ -24,8 +24,5 @@
   if ( ($block = $menu->get_block( 'mbAdditionalPages' ) ) != null )
   {
-    if (!file_exists(AP_PATH . 'template/' . $user['template'] . '.tpl'))
-    {
-      $user['template'] = 'yoga';
-    }
+    $template->set_template_dir(AP_PATH.'template/');
 
     load_language('plugin.lang', AP_PATH);
@@ -107,5 +104,5 @@
     {
       $block->set_title(isset($menu_langs[$user['language']]) ? $menu_langs[$user['language']] : $menu_langs['default']);
-      $block->template = dirname(__FILE__) . '/template/' . $user['template'] . '.tpl';
+      $block->template = 'AdditionalPages_menu.tpl';
       $block->data = $data;
     }
Index: /extensions/AdditionalPages/admin/admin.tpl
===================================================================
--- /extensions/AdditionalPages/admin/admin.tpl	(revision 3609)
+++ /extensions/AdditionalPages/admin/admin.tpl	(revision 6227)
@@ -9,5 +9,5 @@
 		<tr>
 			<td><br>{'ap_menu_name'|@translate} : &nbsp;&nbsp;</td>
-			<td><br>{'default_sort'|@translate}&nbsp;&nbsp;</td>
+			<td><br>{'Default'|@translate}&nbsp;&nbsp;</td>
 			<td><br><input type="text" size="50" maxlength="255" value="{$LANG_DEFAULT_VALUE}" name="menu_lang[default]"/></td>
 		</tr>
Index: /extensions/AdditionalPages/template/AdditionalPages_menu.tpl
===================================================================
--- /extensions/AdditionalPages/template/AdditionalPages_menu.tpl	(revision 6227)
+++ /extensions/AdditionalPages/template/AdditionalPages_menu.tpl	(revision 6227)
@@ -0,0 +1,10 @@
+<dt>{$block->get_title()}</dt>
+  <dd>
+    <ul>
+    {foreach from=$block->data item=data}
+      <li>
+        <a href="{$data.URL}">{$data.LABEL}</a>
+      </li>
+    {/foreach}
+    </ul>
+  </dd>
Index: /tensions/AdditionalPages/template/yoga.tpl
===================================================================
--- /extensions/AdditionalPages/template/yoga.tpl	(revision 3609)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<dt>{$block->get_title()}</dt>
-  <dd>
-    <ul>
-    {foreach from=$block->data item=data}
-      <li>
-        <a href="{$data.URL}">{$data.LABEL}</a>
-      </li>
-    {/foreach}
-    </ul>
-  </dd>