diff --git a/templates/Classic/admin/domains/domains.tpl b/templates/Classic/admin/domains/domains.tpl
index 6bbca57b..7622319f 100644
--- a/templates/Classic/admin/domains/domains.tpl
+++ b/templates/Classic/admin/domains/domains.tpl
@@ -1,7 +1,7 @@
 $header
-	<form action="$filename" method="post">
-                <input type="hidden" name="s" value="$s"/>
-                <input type="hidden" name="page" value="$page"/>
+	<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">
 			<tr>
 				<td class="maintitle_search_left"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['domains']}</b>&nbsp;({$domainscount})</td>
@@ -9,7 +9,7 @@ $header
 			</tr>
 			<if ($userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && 15 < $count && 0 < $countcustomers >
 			<tr>
-				<td class="field_display_border_left" colspan="5"><a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['domain_add']}</a></td>
+				<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['domain_add']}</a></td>
 			</tr>
 			</if>
 			<tr>
@@ -26,12 +26,12 @@ $header
 			</if>
 			<if ($userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && $countcustomers !=0 >
 			<tr>
-				<td class="field_display_border_left" colspan="5"><a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['domain_add']}</a></td>
+				<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['domain_add']}</a></td>
 			</tr>
 			</if>
 			<if $countcustomers == 0 >
 			<tr>
-				<td class="field_display_border_left" colspan="5"><a href="admin_customers.php?s=$s&amp;page=customers&amp;action=add">{$lng['admin']['domain_nocustomeraddingavailable']}</a></td>
+				<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'add'))}">{$lng['admin']['domain_nocustomeraddingavailable']}</a></td>
 			</tr>
 			</if>
 		</table>
diff --git a/templates/Classic/admin/domains/domains_add.tpl b/templates/Classic/admin/domains/domains_add.tpl
index 81ae6d73..78a6fead 100644
--- a/templates/Classic/admin/domains/domains_add.tpl
+++ b/templates/Classic/admin/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/admin/domains/domains_domain.tpl b/templates/Classic/admin/domains/domains_domain.tpl
index 4e142b4a..8080f9c4 100644
--- a/templates/Classic/admin/domains/domains_domain.tpl
+++ b/templates/Classic/admin/domains/domains_domain.tpl
@@ -1,16 +1,16 @@
 <tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
 	<td class="field_name_border_left"><font size="-1">{$row['domain']}<if (isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])> ({$lng['admin']['stdsubdomain']})</if></font></td>
 	<td class="field_name"><font size="-1">{$row['ipandport']}</font></td>
-	<td class="field_name"><font size="-1">{$row['customername']} (<a href="admin_customers.php?s=$s&amp;page=customers&amp;action=su&amp;id={$row['customerid']}" target="_blank">{$row['loginname']}</a>)</font></td>
-	<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['id']}">{$lng['panel']['edit']}</a></td>
+	<td class="field_name"><font size="-1">{$row['customername']} (<a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $row['customerid']))}" target="_blank">{$row['loginname']}</a>)</font></td>
+	<td class="field_name"><a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
 	<td class="field_name">
 		<if !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)>
 			<if !(isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>
-				<a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['id']}">{$lng['panel']['delete']}</a>
+				<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a>
 			</if>
 		</if>
 		<if isset($row['domainaliasid']) && $row['domainaliasid'] != 0>
-			<a href="$filename?s=$s&amp;page=$page&amp;searchfield=d.aliasdomain&amp;searchtext={$row['id']}">{$lng['domains']['hasaliasdomains']}</a>
+			<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'searchfield' => 'd.aliasdomain', 'searchtext' => $row['id']))}">{$lng['domains']['hasaliasdomains']}</a>
 		</if>
 	</td>
 </tr>
diff --git a/templates/Classic/admin/domains/domains_edit.tpl b/templates/Classic/admin/domains/domains_edit.tpl
index 947008d6..ec339ec4 100644
--- a/templates/Classic/admin/domains/domains_edit.tpl
+++ b/templates/Classic/admin/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="action" value="$action" />
diff --git a/templates/Froxlor/admin/domains/domains.tpl b/templates/Froxlor/admin/domains/domains.tpl
index 2f4370c5..774ede02 100644
--- a/templates/Froxlor/admin/domains/domains.tpl
+++ b/templates/Froxlor/admin/domains/domains.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['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && 15 < $count && 0 < $countcustomers >
 				<div class="overviewadd">
 					<img src="images/Froxlor/icons/domain_add.png" alt="" />&nbsp;
-					<a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['domain_add']}</a>
+					<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['domain_add']}</a>
 				</div>
 			</if>
 
@@ -54,7 +54,7 @@
 				<div class="warningcontainer bradius">
 					<div class="warningtitle">{$lng['admin']['warning']}</div>
 					<div class="warning">
-						<a href="admin_customers.php?s=$s&amp;page=customers&amp;action=add">{$lng['admin']['domain_nocustomeraddingavailable']}</a>
+						<a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'add'))}">{$lng['admin']['domain_nocustomeraddingavailable']}</a>
 					</div>
 				</div>
 			</if>
@@ -62,7 +62,7 @@
 			<if ($userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && $countcustomers !=0 >
 				<div class="overviewadd">
 					<img src="images/Froxlor/icons/domain_add.png" alt="" />&nbsp;
-					<a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['domain_add']}</a>
+					<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['domain_add']}</a>
 				</div>
 			</if>
 
diff --git a/templates/Froxlor/admin/domains/domains_add.tpl b/templates/Froxlor/admin/domains/domains_add.tpl
index 6e06e80c..38f322c8 100644
--- a/templates/Froxlor/admin/domains/domains_add.tpl
+++ b/templates/Froxlor/admin/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/admin/domains/domains_domain.tpl b/templates/Froxlor/admin/domains/domains_domain.tpl
index 5598ae36..48450829 100644
--- a/templates/Froxlor/admin/domains/domains_domain.tpl
+++ b/templates/Froxlor/admin/domains/domains_domain.tpl
@@ -6,21 +6,21 @@
 	</td>
 	<td>{$row['ipandport']}</td>
 	<td>{$row['customername']}&nbsp;
-		(<a href="admin_customers.php?s=$s&amp;page=customers&amp;action=su&amp;id={$row['customerid']}" rel="external">{$row['loginname']}</a>)
+		(<a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $row['customerid']))}" rel="external">{$row['loginname']}</a>)
 	</td>
 	<td>
-		<a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['id']}" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
 		</a>
 		<if !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)>
 			<if !(isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>
-				&nbsp;<a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['id']}" style="text-decoration:none;">
+				&nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}" style="text-decoration:none;">
 					<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
 				</a>
 			</if>
 		</if>
 		<if isset($row['domainaliasid']) && $row['domainaliasid'] != 0>
-			&nbsp;<a href="$filename?s=$s&amp;page=$page&amp;searchfield=d.aliasdomain&amp;searchtext={$row['id']}">{$lng['domains']['hasaliasdomains']}</a>
+			&nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'searchfield' => 'd.aliasdomain', 'searchtext' => $row['id']))}">{$lng['domains']['hasaliasdomains']}</a>
 		</if>
 	</td>
 </tr>
diff --git a/templates/Froxlor/admin/domains/domains_edit.tpl b/templates/Froxlor/admin/domains/domains_edit.tpl
index 74eb5e8f..156e18f4 100644
--- a/templates/Froxlor/admin/domains/domains_edit.tpl
+++ b/templates/Froxlor/admin/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>