diff --git a/templates/Classic/admin/templates/filetemplates_add.tpl b/templates/Classic/admin/templates/filetemplates_add.tpl
index be75afba..9efb890e 100644
--- a/templates/Classic/admin/templates/filetemplates_add.tpl
+++ b/templates/Classic/admin/templates/filetemplates_add.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'templates'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
diff --git a/templates/Classic/admin/templates/filetemplates_edit.tpl b/templates/Classic/admin/templates/filetemplates_edit.tpl
index 068ec50e..e042334a 100644
--- a/templates/Classic/admin/templates/filetemplates_edit.tpl
+++ b/templates/Classic/admin/templates/filetemplates_edit.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'templates'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
diff --git a/templates/Classic/admin/templates/templates.tpl b/templates/Classic/admin/templates/templates.tpl
index a2388a00..bdc04367 100644
--- a/templates/Classic/admin/templates/templates.tpl
+++ b/templates/Classic/admin/templates/templates.tpl
@@ -11,7 +11,7 @@ $header
 		$templates
 		<if $add>
 		<tr>
-			<td colspan="4" class="field_display_border_left"><a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['templates']['template_add']}</a></td>
+			<td colspan="4" class="field_display_border_left"><a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['templates']['template_add']}</a></td>
 		</tr>
 		</if>
 	</table>
@@ -28,7 +28,7 @@ $header
 		$filetemplates
 		<if $filetemplateadd>
 		<tr>
-			<td colspan="4" class="field_display_border_left"><a href="$filename?page=$page&amp;action=add&amp;s=$s&amp;files=files">{$lng['admin']['templates']['template_add']}</a></td>
+			<td colspan="4" class="field_display_border_left"><a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'add', 'files' => 'files'))}">{$lng['admin']['templates']['template_add']}</a></td>
 		</tr>
 		</if>
 	</table>
diff --git a/templates/Classic/admin/templates/templates_add_1.tpl b/templates/Classic/admin/templates/templates_add_1.tpl
index 9d11b893..ff84a0fa 100644
--- a/templates/Classic/admin/templates/templates_add_1.tpl
+++ b/templates/Classic/admin/templates/templates_add_1.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'templates'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
diff --git a/templates/Classic/admin/templates/templates_add_2.tpl b/templates/Classic/admin/templates/templates_add_2.tpl
index da81b663..84c12c2e 100644
--- a/templates/Classic/admin/templates/templates_add_2.tpl
+++ b/templates/Classic/admin/templates/templates_add_2.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'templates'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
diff --git a/templates/Classic/admin/templates/templates_edit.tpl b/templates/Classic/admin/templates/templates_edit.tpl
index d224e6bd..edad06c3 100644
--- a/templates/Classic/admin/templates/templates_edit.tpl
+++ b/templates/Classic/admin/templates/templates_edit.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'templates'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
diff --git a/templates/Classic/admin/templates/templates_filetemplate.tpl b/templates/Classic/admin/templates/templates_filetemplate.tpl
index 0841e15a..594eb432 100644
--- a/templates/Classic/admin/templates/templates_filetemplate.tpl
+++ b/templates/Classic/admin/templates/templates_filetemplate.tpl
@@ -1,5 +1,5 @@
 		<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
 			<td class="field_name_border_left">{$lng['admin']['templates'][$row['varname']]}</td>
-			<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=deletef&amp;id={$row['id']}">{$lng['panel']['delete']}</a></td>
-			<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=editf&amp;id={$row['id']}">{$lng['panel']['edit']}</a></td>
+			<td class="field_name"><a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'deletef', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></td>
+			<td class="field_name"><a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'editf', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
 		</tr>
diff --git a/templates/Classic/admin/templates/templates_template.tpl b/templates/Classic/admin/templates/templates_template.tpl
index 2a1909fc..b9c44990 100644
--- a/templates/Classic/admin/templates/templates_template.tpl
+++ b/templates/Classic/admin/templates/templates_template.tpl
@@ -1,6 +1,6 @@
 		<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
 			<td class="field_name_border_left">{$language}</td>
 			<td class="field_name">{$template}</td>
-			<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;subjectid=$subjectid&amp;mailbodyid=$mailbodyid">{$lng['panel']['delete']}</a></td>
-			<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;subjectid=$subjectid&amp;mailbodyid=$mailbodyid">{$lng['panel']['edit']}</a></td>
+			<td class="field_name"><a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'delete', 'subjectid' => $subjectid, 'mailbodyid' => $mailbodyid))}">{$lng['panel']['delete']}</a></td>
+			<td class="field_name"><a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'edit', 'subjectid' => $subjectid, 'mailbodyid' => $mailbodyid))}">{$lng['panel']['edit']}</a></td>
 		</tr>
diff --git a/templates/Froxlor/admin/templates/filetemplates_add.tpl b/templates/Froxlor/admin/templates/filetemplates_add.tpl
index 48e4d589..6bac13fa 100644
--- a/templates/Froxlor/admin/templates/filetemplates_add.tpl
+++ b/templates/Froxlor/admin/templates/filetemplates_add.tpl
@@ -9,7 +9,7 @@ $header
 
 		<section class="fullform bradiusodd">
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'templates'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/admin/templates/filetemplates_edit.tpl b/templates/Froxlor/admin/templates/filetemplates_edit.tpl
index e435b13e..9b20e384 100644
--- a/templates/Froxlor/admin/templates/filetemplates_edit.tpl
+++ b/templates/Froxlor/admin/templates/filetemplates_edit.tpl
@@ -9,7 +9,7 @@ $header
 
 		<section class="fullform bradiusodd">
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'templates'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/admin/templates/templates.tpl b/templates/Froxlor/admin/templates/templates.tpl
index 95b69415..7916dbdd 100644
--- a/templates/Froxlor/admin/templates/templates.tpl
+++ b/templates/Froxlor/admin/templates/templates.tpl
@@ -24,7 +24,7 @@ $header
 			<if $add>
 				<div class="overviewadd">
 					<img src="images/Froxlor/icons/templates_add.png" alt="" />&nbsp;
-					<a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['templates']['template_add']}</a>
+					<a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['templates']['template_add']}</a>
 				</div>
 			</if>
 
@@ -56,7 +56,7 @@ $header
 			<if $filetemplateadd>
 				<div class="overviewadd">
 					<img src="images/Froxlor/icons/templates_add.png" alt="" />&nbsp;
-					<a href="$filename?page=$page&amp;action=add&amp;s=$s&amp;files=files">{$lng['admin']['templates']['template_add']}</a>
+					<a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'add', 'files' => 'files'))}">{$lng['admin']['templates']['template_add']}</a>
 				</div>
 			</if>
 		</section>
diff --git a/templates/Froxlor/admin/templates/templates_add_1.tpl b/templates/Froxlor/admin/templates/templates_add_1.tpl
index 7d33b418..f33b3cb2 100644
--- a/templates/Froxlor/admin/templates/templates_add_1.tpl
+++ b/templates/Froxlor/admin/templates/templates_add_1.tpl
@@ -8,7 +8,7 @@ $header
 		</header>
 
 		<section class="tinyform bradiusodd">
-			<form method="post" action="$filename" enctype="application/x-www-form-urlencoded">
+			<form method="post" action="{$linker->getLink(array('section' => 'templates'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changelanguage']}</legend>
 				<p>
diff --git a/templates/Froxlor/admin/templates/templates_add_2.tpl b/templates/Froxlor/admin/templates/templates_add_2.tpl
index 35d1ae2c..b31e023c 100644
--- a/templates/Froxlor/admin/templates/templates_add_2.tpl
+++ b/templates/Froxlor/admin/templates/templates_add_2.tpl
@@ -9,7 +9,7 @@ $header
 
 		<section class="fullform bradiusodd">
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'templates'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/admin/templates/templates_edit.tpl b/templates/Froxlor/admin/templates/templates_edit.tpl
index 6d5d61ce..ae31fb37 100644
--- a/templates/Froxlor/admin/templates/templates_edit.tpl
+++ b/templates/Froxlor/admin/templates/templates_edit.tpl
@@ -9,7 +9,7 @@ $header
 
 		<section class="fullform bradiusodd">
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'templates'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/admin/templates/templates_filetemplate.tpl b/templates/Froxlor/admin/templates/templates_filetemplate.tpl
index 8cf9e0fb..df9077a0 100644
--- a/templates/Froxlor/admin/templates/templates_filetemplate.tpl
+++ b/templates/Froxlor/admin/templates/templates_filetemplate.tpl
@@ -1,10 +1,10 @@
 <tr>
 	<td>{$lng['admin']['templates'][$row['varname']]}</td>
 	<td>
-		<a href="$filename?s=$s&amp;page=$page&amp;action=editf&amp;id={$row['id']}">
+		<a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'editf', 'id' => $row['id']))}">
 			<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
 		</a>&nbsp;
-		<a href="$filename?s=$s&amp;page=$page&amp;action=deletef&amp;id={$row['id']}">
+		<a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'deletef', 'id' => $row['id']))}">
 			<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
 		</a>
 	</td>
diff --git a/templates/Froxlor/admin/templates/templates_template.tpl b/templates/Froxlor/admin/templates/templates_template.tpl
index 25dfbfc9..4ecc0088 100644
--- a/templates/Froxlor/admin/templates/templates_template.tpl
+++ b/templates/Froxlor/admin/templates/templates_template.tpl
@@ -2,10 +2,10 @@
 	<td>{$language}</td>
 	<td>{$template}</td>
 	<td>
-		<a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;subjectid=$subjectid&amp;mailbodyid=$mailbodyid" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'edit', 'subjectid' => $subjectid, 'mailbodyid' => $mailbodyid))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
 		</a>&nbsp;	
-		<a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;subjectid=$subjectid&amp;mailbodyid=$mailbodyid" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'delete', 'subjectid' => $subjectid, 'mailbodyid' => $mailbodyid))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
 		</a>
 	</td>