diff --git a/templates/Classic/admin/phpconfig/overview.tpl b/templates/Classic/admin/phpconfig/overview.tpl
index 0bc632db..5944eafa 100644
--- a/templates/Classic/admin/phpconfig/overview.tpl
+++ b/templates/Classic/admin/phpconfig/overview.tpl
@@ -13,9 +13,9 @@ $header
 		</tr>
 		$tablecontent
 		<tr>
-			<td class="field_display_border_left" colspan="5"><a href="$filename?s=$s&amp;page=$page&amp;action=add">{$lng['admin']['phpsettings']['addnew']}</a></td>
+			<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a></td>
 		</tr>
 	</table>
 	<br />
 	<br />
-$footer
\ No newline at end of file
+$footer
diff --git a/templates/Classic/admin/phpconfig/overview_add.tpl b/templates/Classic/admin/phpconfig/overview_add.tpl
index 629c507f..95d771be 100644
--- a/templates/Classic/admin/phpconfig/overview_add.tpl
+++ b/templates/Classic/admin/phpconfig/overview_add.tpl
@@ -1,5 +1,5 @@
 $header
-	<form action="$filename" method="post">
+	<form action="{$linker->getLink(array('section' => 'phpsettings'))}" method="post">
 		<input type="hidden" name="s" value="$s"/>
 		<input type="hidden" name="page" value="$page"/>
 		<input type="hidden" name="action" value="add"/>
@@ -64,4 +64,4 @@ $header
 	</table>
 	<br />
 	<br />
-$footer
\ No newline at end of file
+$footer
diff --git a/templates/Classic/admin/phpconfig/overview_edit.tpl b/templates/Classic/admin/phpconfig/overview_edit.tpl
index 205e7a56..871b1845 100644
--- a/templates/Classic/admin/phpconfig/overview_edit.tpl
+++ b/templates/Classic/admin/phpconfig/overview_edit.tpl
@@ -1,5 +1,5 @@
 $header
-	<form action="$filename" method="post">
+	<form action="{$linker->getLink(array('section' => 'phpsettings'))}" method="post">
 		<input type="hidden" name="s" value="$s"/>
 		<input type="hidden" name="page" value="$page"/>
 		<input type="hidden" name="action" value="edit"/>
@@ -65,4 +65,4 @@ $header
 	</table>
 	<br />
 	<br />
-$footer
\ No newline at end of file
+$footer
diff --git a/templates/Classic/admin/phpconfig/overview_overview.tpl b/templates/Classic/admin/phpconfig/overview_overview.tpl
index e844ff0d..64fdb4b9 100644
--- a/templates/Classic/admin/phpconfig/overview_overview.tpl
+++ b/templates/Classic/admin/phpconfig/overview_overview.tpl
@@ -4,7 +4,7 @@
 	<td class="field_name" valign="top">{$row['binary']}</td>
 	<td class="field_name" valign="top">{$row['file_extensions']}</td>
 	<td class="field_name" valign="top">
-		<a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['id']}">{$lng['panel']['edit']}</a><br/>
-		<if $row['id'] != 1><a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['id']}">{$lng['panel']['delete']}</a><br/></if>
+		<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a><br/>
+		<if $row['id'] != 1><a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a><br/></if>
 	</td>
-</tr>
\ No newline at end of file
+</tr>
diff --git a/templates/Froxlor/admin/phpconfig/overview.tpl b/templates/Froxlor/admin/phpconfig/overview.tpl
index 40521a3a..d32ccd7a 100644
--- a/templates/Froxlor/admin/phpconfig/overview.tpl
+++ b/templates/Froxlor/admin/phpconfig/overview.tpl
@@ -12,7 +12,7 @@ $header
 			<if 15 < $count>
 			<div class="overviewadd">
 				<img src="images/Froxlor/icons/phpsettings_add.png" alt="" />&nbsp;
-				<a href="$filename?s=$s&amp;page=$page&amp;action=add">{$lng['admin']['phpsettings']['addnew']}</a>
+				<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a>
 			</div>
 			</if>
 
@@ -32,7 +32,7 @@ $header
 
 			<div class="overviewadd">
 				<img src="images/Froxlor/icons/phpsettings_add.png" alt="" />&nbsp;
-				<a href="$filename?s=$s&amp;page=$page&amp;action=add">{$lng['admin']['phpsettings']['addnew']}</a>
+				<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a>
 			</div>
 
 		</section>
diff --git a/templates/Froxlor/admin/phpconfig/overview_add.tpl b/templates/Froxlor/admin/phpconfig/overview_add.tpl
index ff727b9d..fa953e26 100644
--- a/templates/Froxlor/admin/phpconfig/overview_add.tpl
+++ b/templates/Froxlor/admin/phpconfig/overview_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' => 'phpsettings'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/admin/phpconfig/overview_edit.tpl b/templates/Froxlor/admin/phpconfig/overview_edit.tpl
index aa19c38b..b6e6d193 100644
--- a/templates/Froxlor/admin/phpconfig/overview_edit.tpl
+++ b/templates/Froxlor/admin/phpconfig/overview_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' => 'phpsettings'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/admin/phpconfig/overview_overview.tpl b/templates/Froxlor/admin/phpconfig/overview_overview.tpl
index cf69f390..6182a449 100644
--- a/templates/Froxlor/admin/phpconfig/overview_overview.tpl
+++ b/templates/Froxlor/admin/phpconfig/overview_overview.tpl
@@ -4,11 +4,11 @@
 	<td style="vertical-align:top;">{$row['binary']}</td>
 	<td style="vertical-align:top;">{$row['file_extensions']}</td>
 	<td style="vertical-align:top;">
-		<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' => 'phpsettings', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
 		</a>
 		<if $row['id'] != 1>
-			&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' => 'phpsettings', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}" style="text-decoration:none;">
 				<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
 			</a>
 		</if>