diff --git a/templates/Classic/customer/extras/backup.tpl b/templates/Classic/customer/extras/backup.tpl
index f2acfdcc..3616bf36 100644
--- a/templates/Classic/customer/extras/backup.tpl
+++ b/templates/Classic/customer/extras/backup.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'extras'))}">
 		<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/customer/extras/htaccess.tpl b/templates/Classic/customer/extras/htaccess.tpl
index 7f6ad368..b8a3821d 100644
--- a/templates/Classic/customer/extras/htaccess.tpl
+++ b/templates/Classic/customer/extras/htaccess.tpl
@@ -1,5 +1,5 @@
 $header
-	<form action="$filename" method="post">
+	<form action="{$linker->getLink(array('section' => 'extras'))}" method="post">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
@@ -23,7 +23,7 @@ $header
 			</tr>
 			</if>
 			<tr>
-				<td class="field_display_border_left" colspan="<if $cperlenabled == 1 >8<else>7</if>"><a href="$filename?page=htaccess&amp;action=add&amp;s=$s">{$lng['extras']['pathoptions_add']}</a></td>
+				<td class="field_display_border_left" colspan="<if $cperlenabled == 1 >8<else>7</if>"><a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'add'))}">{$lng['extras']['pathoptions_add']}</a></td>
 			</tr>
 		</table>
 	</form>
diff --git a/templates/Classic/customer/extras/htaccess_add.tpl b/templates/Classic/customer/extras/htaccess_add.tpl
index 7309138e..87af25b8 100644
--- a/templates/Classic/customer/extras/htaccess_add.tpl
+++ b/templates/Classic/customer/extras/htaccess_add.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'extras'))}">
 		<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/customer/extras/htaccess_edit.tpl b/templates/Classic/customer/extras/htaccess_edit.tpl
index 00adf6b0..291ee3b7 100644
--- a/templates/Classic/customer/extras/htaccess_edit.tpl
+++ b/templates/Classic/customer/extras/htaccess_edit.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'extras'))}">
 		<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/customer/extras/htaccess_htaccess.tpl b/templates/Classic/customer/extras/htaccess_htaccess.tpl
index 51631bb0..b407265f 100644
--- a/templates/Classic/customer/extras/htaccess_htaccess.tpl
+++ b/templates/Classic/customer/extras/htaccess_htaccess.tpl
@@ -5,6 +5,6 @@
 	<td class="field_name">{$row['error403path']}</td>
 	<td class="field_name">{$row['error500path']}</td>
 	<if $cperlenabled == 1 ><td class="field_name">{$row['options_cgi']}</td></if>
-	<td class="field_name"><a href="$filename?page=htaccess&amp;action=edit&amp;id={$row['id']}&amp;s=$s">{$lng['panel']['edit']}</a></td>
-	<td class="field_name"><a href="$filename?page=htaccess&amp;action=delete&amp;id={$row['id']}&amp;s=$s">{$lng['panel']['delete']}</a></td>
+	<td class="field_name"><a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
+	<td class="field_name"><a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></td>
 </tr>
diff --git a/templates/Classic/customer/extras/htpasswds.tpl b/templates/Classic/customer/extras/htpasswds.tpl
index f8f7607c..4f2b6203 100644
--- a/templates/Classic/customer/extras/htpasswds.tpl
+++ b/templates/Classic/customer/extras/htpasswds.tpl
@@ -1,5 +1,5 @@
 $header
-	<form action="$filename" method="post">
+	<form action="{$linker->getLink(array('section' => 'extras'))}" method="post">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
@@ -19,7 +19,7 @@ $header
 			</tr>
 			</if>
 			<tr>
-				<td class="field_display_border_left" colspan="4"><a href="$filename?page=htpasswds&amp;action=add&amp;s=$s">{$lng['extras']['directoryprotection_add']}</a></td>
+				<td class="field_display_border_left" colspan="4"><a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'add'))}">{$lng['extras']['directoryprotection_add']}</a></td>
 			</tr>
 		</table>
 	</form>
diff --git a/templates/Classic/customer/extras/htpasswds_add.tpl b/templates/Classic/customer/extras/htpasswds_add.tpl
index bfe1d611..34d43b1f 100644
--- a/templates/Classic/customer/extras/htpasswds_add.tpl
+++ b/templates/Classic/customer/extras/htpasswds_add.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'extras'))}">
 		<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/customer/extras/htpasswds_edit.tpl b/templates/Classic/customer/extras/htpasswds_edit.tpl
index 5cfee755..982ab11c 100644
--- a/templates/Classic/customer/extras/htpasswds_edit.tpl
+++ b/templates/Classic/customer/extras/htpasswds_edit.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'extras'))}">
 		<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/customer/extras/htpasswds_htpasswd.tpl b/templates/Classic/customer/extras/htpasswds_htpasswd.tpl
index 57cecb7a..f8850f71 100644
--- a/templates/Classic/customer/extras/htpasswds_htpasswd.tpl
+++ b/templates/Classic/customer/extras/htpasswds_htpasswd.tpl
@@ -1,6 +1,6 @@
 <tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
 	<td class="field_name_border_left">{$row['username']}</td>
 	<td class="field_name">{$row['path']}</td>
-	<td class="field_name"><a href="$filename?page=htpasswds&amp;action=edit&amp;id={$row['id']}&amp;s=$s">{$lng['panel']['edit']}</a></td>
-	<td class="field_name"><a href="$filename?page=htpasswds&amp;action=delete&amp;id={$row['id']}&amp;s=$s">{$lng['panel']['delete']}</a></td>
+	<td class="field_name"><a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
+	<td class="field_name"><a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></td>
 </tr>
diff --git a/templates/Froxlor/customer/extras/backup.tpl b/templates/Froxlor/customer/extras/backup.tpl
index 3d828814..a13ac1d5 100644
--- a/templates/Froxlor/customer/extras/backup.tpl
+++ b/templates/Froxlor/customer/extras/backup.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' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/customer/extras/htaccess.tpl b/templates/Froxlor/customer/extras/htaccess.tpl
index 9a1e2a19..8a103964 100644
--- a/templates/Froxlor/customer/extras/htaccess.tpl
+++ b/templates/Froxlor/customer/extras/htaccess.tpl
@@ -9,7 +9,7 @@
 
 		<section>
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 
 			<div class="overviewsearch">
 				{$searchcode}
@@ -18,7 +18,7 @@
 			<if 15 < $count >
 				<div class="overviewadd">
 					<img src="images/Froxlor/icons/htaccess_add.png" alt="" />&nbsp;
-					<a href="$filename?page=htaccess&amp;action=add&amp;s=$s">{$lng['extras']['pathoptions_add']}</a>
+					<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'add'))}">{$lng['extras']['pathoptions_add']}</a>
 				</div>
 			</if>
 
@@ -55,7 +55,7 @@
 
 			<div class="overviewadd">
 				<img src="images/Froxlor/icons/htaccess_add.png" alt="" />&nbsp;
-				<a href="$filename?page=htaccess&amp;action=add&amp;s=$s">{$lng['extras']['pathoptions_add']}</a>
+				<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'add'))}">{$lng['extras']['pathoptions_add']}</a>
 			</div>
 
 		</section>
diff --git a/templates/Froxlor/customer/extras/htaccess_add.tpl b/templates/Froxlor/customer/extras/htaccess_add.tpl
index 14eca14d..1e709af7 100644
--- a/templates/Froxlor/customer/extras/htaccess_add.tpl
+++ b/templates/Froxlor/customer/extras/htaccess_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' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/customer/extras/htaccess_edit.tpl b/templates/Froxlor/customer/extras/htaccess_edit.tpl
index 828b4b4d..d57d72d8 100644
--- a/templates/Froxlor/customer/extras/htaccess_edit.tpl
+++ b/templates/Froxlor/customer/extras/htaccess_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' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/customer/extras/htaccess_htaccess.tpl b/templates/Froxlor/customer/extras/htaccess_htaccess.tpl
index 5bd5cd55..728850ad 100644
--- a/templates/Froxlor/customer/extras/htaccess_htaccess.tpl
+++ b/templates/Froxlor/customer/extras/htaccess_htaccess.tpl
@@ -8,10 +8,10 @@
 	<td>{$row['options_cgi']}</td>
 	</if>
 	<td>
-		<a href="$filename?page=htaccess&amp;action=edit&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
 		</a>&nbsp;
-		<a href="$filename?page=htaccess&amp;action=delete&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'delete', 'id' => $row['id']))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
 		</a>
 	</td>
diff --git a/templates/Froxlor/customer/extras/htpasswds.tpl b/templates/Froxlor/customer/extras/htpasswds.tpl
index 477828ff..c0e2d4f2 100644
--- a/templates/Froxlor/customer/extras/htpasswds.tpl
+++ b/templates/Froxlor/customer/extras/htpasswds.tpl
@@ -9,7 +9,7 @@
 
 		<section>
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 
 			<div class="overviewsearch">
 				{$searchcode}
@@ -18,7 +18,7 @@
 			<if 15 < $count >
 				<div class="overviewadd">
 					<img src="images/Froxlor/icons/htpasswd_add.png" alt="" />&nbsp;
-					<a href="$filename?page=htpasswds&amp;action=add&amp;s=$s">{$lng['extras']['directoryprotection_add']}</a>
+					<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'add'))}">{$lng['extras']['directoryprotection_add']}</a>
 				</div>
 			</if>
 
@@ -51,7 +51,7 @@
 
 			<div class="overviewadd">
 				<img src="images/Froxlor/icons/htpasswd_add.png" alt="" />&nbsp;
-				<a href="$filename?page=htpasswds&amp;action=add&amp;s=$s">{$lng['extras']['directoryprotection_add']}</a>
+				<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'add'))}">{$lng['extras']['directoryprotection_add']}</a>
 			</div>
 
 		</section>
diff --git a/templates/Froxlor/customer/extras/htpasswds_add.tpl b/templates/Froxlor/customer/extras/htpasswds_add.tpl
index 87404177..486c78ec 100644
--- a/templates/Froxlor/customer/extras/htpasswds_add.tpl
+++ b/templates/Froxlor/customer/extras/htpasswds_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' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/customer/extras/htpasswds_edit.tpl b/templates/Froxlor/customer/extras/htpasswds_edit.tpl
index 8b848dc3..f8305f56 100644
--- a/templates/Froxlor/customer/extras/htpasswds_edit.tpl
+++ b/templates/Froxlor/customer/extras/htpasswds_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' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/customer/extras/htpasswds_htpasswd.tpl b/templates/Froxlor/customer/extras/htpasswds_htpasswd.tpl
index fb1ab016..4580dad5 100644
--- a/templates/Froxlor/customer/extras/htpasswds_htpasswd.tpl
+++ b/templates/Froxlor/customer/extras/htpasswds_htpasswd.tpl
@@ -2,10 +2,10 @@
 	<td>{$row['username']}</td>
 	<td>{$row['path']}</td>
 	<td>
-		<a href="$filename?page=htpasswds&amp;action=edit&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
 		</a>&nbsp;
-		<a href="$filename?page=htpasswds&amp;action=delete&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'delete', 'id' => $row['id']))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
 		</a>
 	</td>