diff --git a/templates/Classic/customer/domains/domainlist.tpl b/templates/Classic/customer/domains/domainlist.tpl
index d13cd1df..d7822ffc 100644
--- a/templates/Classic/customer/domains/domainlist.tpl
+++ b/templates/Classic/customer/domains/domainlist.tpl
@@ -1,5 +1,5 @@
 $header
-	<form action="$filename" method="post">
+	<form action="{$linker->getLink(array('section' => 'domains'))}" 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">
@@ -9,7 +9,7 @@ $header
 			</tr>
 			<if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && 15 < $domains_count && $parentdomains_count != 0 >
 			<tr>
-				<td class="field_display_border_left" colspan="4"><a href="$filename?page=domains&amp;action=add&amp;s=$s">{$lng['domains']['subdomain_add']}</a></td>
+				<td class="field_display_border_left" colspan="4"><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'add'))}">{$lng['domains']['subdomain_add']}</a></td>
 			</tr>
 			</if>
 			<tr>
@@ -25,7 +25,7 @@ $header
 			</if>
 			<if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && $parentdomains_count != 0 >
 			<tr>
-				<td class="field_display_border_left" colspan="4"><a href="$filename?page=domains&amp;action=add&amp;s=$s">{$lng['domains']['subdomain_add']}</a></td>
+				<td class="field_display_border_left" colspan="4"><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'add'))}">{$lng['domains']['subdomain_add']}</a></td>
 			</tr>
 			</if>
 		</table>
diff --git a/templates/Classic/customer/domains/domains_add.tpl b/templates/Classic/customer/domains/domains_add.tpl
index a619ac57..3708f374 100644
--- a/templates/Classic/customer/domains/domains_add.tpl
+++ b/templates/Classic/customer/domains/domains_add.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'domains'))}">
 		<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/domains/domains_domain.tpl b/templates/Classic/customer/domains/domains_domain.tpl
index 8d462fa3..d8d54ba3 100644
--- a/templates/Classic/customer/domains/domains_domain.tpl
+++ b/templates/Classic/customer/domains/domains_domain.tpl
@@ -1,6 +1,6 @@
 <tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
 	<td class="field_name_border_left"><a href="http://{$row['domain']}" target="_blank">{$row['domain']}</a></td>
 	<td class="field_name"><if $row['aliasdomain'] == ''>{$row['documentroot']}</if><if isset($row['aliasdomainid']) && $row['aliasdomainid'] != 0>{$lng['domains']['aliasdomain']} {$row['aliasdomain']}</if></td>
-	<td class="field_name"><if $row['caneditdomain'] == '1'><a href="$filename?page=domains&amp;action=edit&amp;id={$row['id']}&amp;s=$s">{$lng['panel']['edit']}</a></if></td>
-	<td class="field_name"><if $row['parentdomainid'] != '0' && !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)><a href="$filename?page=domains&amp;action=delete&amp;id={$row['id']}&amp;s=$s">{$lng['panel']['delete']}</a></if><if $row['parentdomainid'] == '0' && !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)>{$lng['domains']['isassigneddomain']}</if><if isset($row['domainaliasid']) && $row['domainaliasid'] != 0><a href="$filename?page=domains&amp;searchfield=d.aliasdomain&amp;searchtext={$row['id']}&amp;s=$s">{$lng['domains']['hasaliasdomains']}</a></if></td>
+	<td class="field_name"><if $row['caneditdomain'] == '1'><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></if></td>
+	<td class="field_name"><if $row['parentdomainid'] != '0' && !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></if><if $row['parentdomainid'] == '0' && !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)>{$lng['domains']['isassigneddomain']}</if><if isset($row['domainaliasid']) && $row['domainaliasid'] != 0><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'searchfield' => 'd.aliasdomain', 'searchtext' => $row['id']))}">{$lng['domains']['hasaliasdomains']}</a></if></td>
 </tr>
diff --git a/templates/Classic/customer/domains/domains_edit.tpl b/templates/Classic/customer/domains/domains_edit.tpl
index b525daa6..066a15e0 100644
--- a/templates/Classic/customer/domains/domains_edit.tpl
+++ b/templates/Classic/customer/domains/domains_edit.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'domains'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="id" value="$id" />
diff --git a/templates/Froxlor/customer/domains/domainlist.tpl b/templates/Froxlor/customer/domains/domainlist.tpl
index a5a934ec..5442f998 100644
--- a/templates/Froxlor/customer/domains/domainlist.tpl
+++ b/templates/Froxlor/customer/domains/domainlist.tpl
@@ -9,7 +9,7 @@
 
 		<section>
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
 
 			<div class="overviewsearch">
 				{$searchcode}
@@ -18,7 +18,7 @@
 			<if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && 15 < $domains_count && $parentdomains_count != 0 >
 				<div class="overviewadd">
 					<img src="images/Froxlor/icons/domain_add.png" alt="" />&nbsp;
-					<a href="$filename?page=domains&amp;action=add&amp;s=$s">{$lng['domains']['subdomain_add']}</a>
+					<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'add'))}">{$lng['domains']['subdomain_add']}</a>
 				</div>
 			</if>
 
@@ -52,7 +52,7 @@
 			<if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && $parentdomains_count != 0 >
 				<div class="overviewadd">
 					<img src="images/Froxlor/icons/domain_add.png" alt="" />&nbsp;
-					<a href="$filename?page=domains&amp;action=add&amp;s=$s">{$lng['domains']['subdomain_add']}</a>
+					<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'add'))}">{$lng['domains']['subdomain_add']}</a>
 				</div>
 			</if>
 
diff --git a/templates/Froxlor/customer/domains/domains_add.tpl b/templates/Froxlor/customer/domains/domains_add.tpl
index 6107bcd1..544c94d0 100644
--- a/templates/Froxlor/customer/domains/domains_add.tpl
+++ b/templates/Froxlor/customer/domains/domains_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' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/customer/domains/domains_domain.tpl b/templates/Froxlor/customer/domains/domains_domain.tpl
index f57080e9..e178556e 100644
--- a/templates/Froxlor/customer/domains/domains_domain.tpl
+++ b/templates/Froxlor/customer/domains/domains_domain.tpl
@@ -6,12 +6,12 @@
 	</td>
 	<td>
 		<if $row['caneditdomain'] == '1'>
-			<a href="$filename?page=domains&amp;action=edit&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
+			<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">
 				<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
 			</a>&nbsp;
 		</if>
 		<if $row['parentdomainid'] != '0' && !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)>
-			<a href="$filename?page=domains&amp;action=delete&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
+			<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'delete', 'id' => $row['id']))}" style="text-decoration:none;">
 				<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
 			</a>&nbsp;
 		</if>
@@ -19,7 +19,7 @@
 			({$lng['domains']['isassigneddomain']})&nbsp;
 		</if>
 		<if isset($row['domainaliasid']) && $row['domainaliasid'] != 0>
-			<a href="$filename?page=domains&amp;searchfield=d.aliasdomain&amp;searchtext={$row['id']}&amp;s=$s">{$lng['domains']['hasaliasdomains']}</a>
+			<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'searchfield' => 'd.aliasdomain', 'searchtext' => $row['id']))}">{$lng['domains']['hasaliasdomains']}</a>
 		</if>
 	</td>
 </tr>
diff --git a/templates/Froxlor/customer/domains/domains_edit.tpl b/templates/Froxlor/customer/domains/domains_edit.tpl
index 9959d727..1731bacd 100644
--- a/templates/Froxlor/customer/domains/domains_edit.tpl
+++ b/templates/Froxlor/customer/domains/domains_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' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>