diff --git a/templates/Classic/admin/configfiles/choose.tpl b/templates/Classic/admin/configfiles/choose.tpl
index 06c84aca..472d4cd2 100644
--- a/templates/Classic/admin/configfiles/choose.tpl
+++ b/templates/Classic/admin/configfiles/choose.tpl
@@ -1,7 +1,7 @@
 $header
 	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable_40">
 		<tr>
-			<td class="maintitle"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</b> [<a href="$filename?page=configfiles&amp;s=$s">{$lng['admin']['configfiles']['wizard']}</a>]</td>
+			<td class="maintitle"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</b> [<a href={$linker->getLink(array('section' => 'configfiles', 'page' => 'configfiles'))}">{$lng['admin']['configfiles']['wizard']}</a>]</td>
 		</tr>
 		$distributions
 	</table>
diff --git a/templates/Classic/admin/configfiles/choose_daemon.tpl b/templates/Classic/admin/configfiles/choose_daemon.tpl
index 91afa1e9..f96fde68 100644
--- a/templates/Classic/admin/configfiles/choose_daemon.tpl
+++ b/templates/Classic/admin/configfiles/choose_daemon.tpl
@@ -1,2 +1,2 @@
-&nbsp;&nbsp;&nbsp;&raquo;&nbsp;<a href="$filename?page=$page&amp;distribution=$distribution_name&amp;service=$service_name&amp;daemon=$daemon_name&amp;s=$s">{$daemon_details['label']}</a>
+&nbsp;&nbsp;&nbsp;&raquo;&nbsp;<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution_name, 'service' => $service_name, 'daemon' => $daemon_name))}">{$daemon_details['label']}</a>
 <br />
\ No newline at end of file
diff --git a/templates/Classic/admin/configfiles/configfiles.tpl b/templates/Classic/admin/configfiles/configfiles.tpl
index 12576fd5..b1b94646 100644
--- a/templates/Classic/admin/configfiles/configfiles.tpl
+++ b/templates/Classic/admin/configfiles/configfiles.tpl
@@ -1,7 +1,7 @@
 $header
 	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable_60">
 		<tr>
-			<td class="maintitle"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$configfiles[$distribution]['label']}&nbsp;&raquo;&nbsp;{$configfiles[$distribution]['services'][$service]['label']}&nbsp;&raquo;&nbsp;{$configfiles[$distribution]['services'][$service]['daemons'][$daemon]['label']}</b> [<a href="$filename?s=$s&amp;page=$page&amp;distribution=$distribution&amp;service=$service">{$lng['panel']['back']}</a>]</td>
+			<td class="maintitle"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$configfiles[$distribution]['label']}&nbsp;&raquo;&nbsp;{$configfiles[$distribution]['services'][$service]['label']}&nbsp;&raquo;&nbsp;{$configfiles[$distribution]['services'][$service]['daemons'][$daemon]['label']}</b> [<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution, 'service' => $service))}">{$lng['panel']['back']}</a>]</td>
 		</tr>
 		{$configpage}
 		<if $restart != ''>
diff --git a/templates/Classic/admin/configfiles/wizard.tpl b/templates/Classic/admin/configfiles/wizard.tpl
index 82aa044a..c083b021 100644
--- a/templates/Classic/admin/configfiles/wizard.tpl
+++ b/templates/Classic/admin/configfiles/wizard.tpl
@@ -4,19 +4,19 @@ $header
 		<input type="hidden" name="page" value="$page" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_40">
 			<tr>
-				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</b> [<a href="$filename?page=overview&amp;s=$s">{$lng['admin']['configfiles']['overview']}</a>]</td>
+				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</b> [<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview'))}">{$lng['admin']['configfiles']['overview']}</a>]</td>
 			</tr>
 			<tr>
 				<td class="main_field_name"><b>{$lng['admin']['configfiles']['distribution']}:</b></td>
-				<td class="main_field_display" nowrap="nowrap"><if $distribution != ''><input type="hidden" name="distribution" value="$distribution"/><a href="$filename?s=$s&amp;page=$page">{$configfiles[$distribution]['label']}</a><else><select name="distribution" onchange="javascript: window.location.href='$filename?s=$s&amp;page=$page&amp;distribution=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['choosedistribution']}</option>{$distributions_select}</select></if></td>
+				<td class="main_field_display" nowrap="nowrap"><if $distribution != ''><input type="hidden" name="distribution" value="$distribution"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}">{$configfiles[$distribution]['label']}</a><else><select name="distribution" onchange="javascript: window.location.href='{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}&amp;distribution=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['choosedistribution']}</option>{$distributions_select}</select></if></td>
 			</tr>
 			<tr>
 				<td class="main_field_name"><b>{$lng['admin']['configfiles']['service']}:</b></td>
-				<td class="main_field_display" nowrap="nowrap"><if $service != ''><input type="hidden" name="service" value="$service"/><a href="$filename?s=$s&amp;page=$page&amp;distribution=$distribution">{$configfiles[$distribution]['services'][$service]['label']}</a><else><select name="service" onchange="javascript: window.location.href='$filename?s=$s&amp;page=$page&amp;distribution=$distribution&amp;service=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['chooseservice']}</option>{$services_select}</select></if></td>
+				<td class="main_field_display" nowrap="nowrap"><if $service != ''><input type="hidden" name="service" value="$service"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}">{$configfiles[$distribution]['services'][$service]['label']}</a><else><select name="service" onchange="javascript: window.location.href='{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}&amp;service=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['chooseservice']}</option>{$services_select}</select></if></td>
 			</tr>
 			<tr>
 				<td class="main_field_name"><b>{$lng['admin']['configfiles']['daemon']}:</b></td>
-				<td class="main_field_display" nowrap="nowrap"><select name="daemon" onchange="javascript: window.location.href='$filename?s=$s&amp;page=$page&amp;distribution=$distribution&amp;service=$service&amp;daemon=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['choosedaemon']}</option>{$daemons_select}</select></td>
+				<td class="main_field_display" nowrap="nowrap"><select name="daemon" onchange="javascript: window.location.href='{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution, 'service' => $service))}&amp;daemon=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['choosedaemon']}</option>{$daemons_select}</select></td>
 			</tr>
 			<tr>
 				<td class="main_field_confirm" colspan="2"><input class="bottom" type="submit" value="{$lng['panel']['next']}" /></td>
diff --git a/templates/Froxlor/admin/configfiles/choose.tpl b/templates/Froxlor/admin/configfiles/choose.tpl
index 575c7739..13ce6f1d 100644
--- a/templates/Froxlor/admin/configfiles/choose.tpl
+++ b/templates/Froxlor/admin/configfiles/choose.tpl
@@ -4,17 +4,17 @@ $header
 			<h2>
 				<img src="images/Froxlor/icons/settings.png" alt="{$lng['admin']['configfiles']['serverconfiguration']}" />&nbsp;
 				{$lng['admin']['configfiles']['serverconfiguration']} &nbsp;
-				[<a href="$filename?page=configfiles&amp;s=$s">{$lng['admin']['configfiles']['wizard']}</a>]
+				[<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'configfiles'))}">{$lng['admin']['configfiles']['wizard']}</a>]
 			</h2>
 		</header>
 
 		<section class="fullform bradiusodd">
-			<form action="$filename" method="get" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'configfiles'))}" method="get" enctype="application/x-www-form-urlencoded">
 			<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</legend>
 						<input type="hidden" name="s" value="$s" />
 						<input type="hidden" name="page" value="$page" />
-						
+
 						<table class="formtable">
 							$distributions
 						</table>
diff --git a/templates/Froxlor/admin/configfiles/choose_daemon.tpl b/templates/Froxlor/admin/configfiles/choose_daemon.tpl
index be6fb069..6b37905e 100644
--- a/templates/Froxlor/admin/configfiles/choose_daemon.tpl
+++ b/templates/Froxlor/admin/configfiles/choose_daemon.tpl
@@ -1 +1 @@
-<li><a href="$filename?page=$page&amp;distribution=$distribution_name&amp;service=$service_name&amp;daemon=$daemon_name&amp;s=$s">{$daemon_details['label']}</a></li>
+<li><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution_name, 'service' => $service_name, 'daemon' => $daemon_name))}">{$daemon_details['label']}</a></li>
diff --git a/templates/Froxlor/admin/configfiles/configfiles.tpl b/templates/Froxlor/admin/configfiles/configfiles.tpl
index 66cd9500..27125caa 100644
--- a/templates/Froxlor/admin/configfiles/configfiles.tpl
+++ b/templates/Froxlor/admin/configfiles/configfiles.tpl
@@ -6,10 +6,10 @@ $header
 				{$configfiles[$distribution]['label']}&nbsp;&raquo;&nbsp;
 				{$configfiles[$distribution]['services'][$service]['label']}&nbsp;&raquo;&nbsp;
 				{$configfiles[$distribution]['services'][$service]['daemons'][$daemon]['label']}&nbsp;
-[<a href="$filename?s=$s&amp;page=$page&amp;distribution=$distribution&amp;service=$service">{$lng['panel']['back']}</a>]
+[<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution, 'service' => $service))}">{$lng['panel']['back']}</a>]
 			</h2>
 		</header>
-		
+
 		<section class="fullform bradiusodd">
         	<table class="formtable">
 				{$configpage}
diff --git a/templates/Froxlor/admin/configfiles/wizard.tpl b/templates/Froxlor/admin/configfiles/wizard.tpl
index 3715179b..9d8c09ff 100644
--- a/templates/Froxlor/admin/configfiles/wizard.tpl
+++ b/templates/Froxlor/admin/configfiles/wizard.tpl
@@ -4,7 +4,7 @@ $header
 			<h2>
 				<img src="images/Froxlor/icons/settings.png" alt="{$lng['admin']['configfiles']['serverconfiguration']}" />&nbsp;
 				{$lng['admin']['configfiles']['serverconfiguration']} &nbsp;
-				[<a href="$filename?page=overview&amp;s=$s">{$lng['admin']['configfiles']['overview']}</a>]
+				[<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview'))}">{$lng['admin']['configfiles']['overview']}</a>]
 			</h2>
 		</header>
 
@@ -14,26 +14,26 @@ $header
 					<legend>Froxlor&nbsp;-&nbsp;Wizard</legend>
 						<input type="hidden" name="s" value="$s" />
 						<input type="hidden" name="page" value="$page" />
-						
+
 						<table class="formtable">
 							<tr>
 								<td><b>{$lng['admin']['configfiles']['distribution']}:</b></td>
-								<td><if $distribution != ''><input type="hidden" name="distribution" value="$distribution"/><a href="$filename?s=$s&amp;page=$page">{$configfiles[$distribution]['label']}</a><else><select name="distribution" onchange="javascript: window.location.href='$filename?s=$s&amp;page=$page&amp;distribution=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['choosedistribution']}</option>{$distributions_select}</select></if></td>
+								<td><if $distribution != ''><input type="hidden" name="distribution" value="$distribution"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}">{$configfiles[$distribution]['label']}</a><else><select name="distribution" onchange="javascript: window.location.href='{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}&amp;distribution=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['choosedistribution']}</option>{$distributions_select}</select></if></td>
 							</tr>
 							<tr>
 								<td><b>{$lng['admin']['configfiles']['service']}:</b></td>
-								<td><if $service != ''><input type="hidden" name="service" value="$service"/><a href="$filename?s=$s&amp;page=$page&amp;distribution=$distribution">{$configfiles[$distribution]['services'][$service]['label']}</a><else><select name="service" onchange="javascript: window.location.href='$filename?s=$s&amp;page=$page&amp;distribution=$distribution&amp;service=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['chooseservice']}</option>{$services_select}</select></if></td>
+								<td><if $service != ''><input type="hidden" name="service" value="$service"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}">{$configfiles[$distribution]['services'][$service]['label']}</a><else><select name="service" onchange="javascript: window.location.href='{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}&amp;service=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['chooseservice']}</option>{$services_select}</select></if></td>
 							</tr>
 							<tr>
 								<td><b>{$lng['admin']['configfiles']['daemon']}:</b></td>
-								<td><select name="daemon" onchange="javascript: window.location.href='$filename?s=$s&amp;page=$page&amp;distribution=$distribution&amp;service=$service&amp;daemon=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['choosedaemon']}</option>{$daemons_select}</select></td>
+								<td><select name="daemon" onchange="javascript: window.location.href='{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution, 'service' => $service))}&amp;service=$service&amp;daemon=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['choosedaemon']}</option>{$daemons_select}</select></td>
 							</tr>
 							<tr>
 								<td><input class="bottom" type="submit" value="{$lng['panel']['next']}" /></td>
 							</tr>
 						</table>
 			</fieldset>
-			</form>	
+			</form>
 		</section>
 	</article>
 $footer