diff --git a/system/pages/characters.php b/system/pages/characters.php
index 0a1a8d83..77b3391d 100644
--- a/system/pages/characters.php
+++ b/system/pages/characters.php
@@ -19,8 +19,6 @@ function generate_search_form($autofocus = false)
 	global $config, $twig;
 	return $twig->render('characters.form.html.twig', array(
 		'link' => getPageLink('characters'),
-		'vdarkborder' => $config['vdarkborder'],
-		'darkborder' => $config['darkborder'],
 		'autofocus' => $autofocus
 	));
 }
diff --git a/system/pages/createaccount.php b/system/pages/createaccount.php
index f834dbef..42cccdea 100644
--- a/system/pages/createaccount.php
+++ b/system/pages/createaccount.php
@@ -279,6 +279,7 @@ If you haven\'t registered on ' . $config['lua']['serverName'] . ' please ignore
 		'countries' => isset($countries) ? $countries : null,
 		'accept_rules' => isset($_POST['accept_rules']) ? $_POST['accept_rules'] : false,
 		'country_recognized' => $country_recognized,
+		'country' => isset($country) ? $country : null,
 		'errors' => $errors
 	));
 ?>
\ No newline at end of file
diff --git a/system/pages/forum.php b/system/pages/forum.php
index b776550b..adc1a3e8 100644
--- a/system/pages/forum.php
+++ b/system/pages/forum.php
@@ -737,7 +737,6 @@ if($action == 'move_thread')
 					'post_id' => $post['id'],
 					'sections' => $sections,
 					'section_link' => getForumBoardLink($post['section']),
-					'config' => $config
 				));
 			}
 		}
diff --git a/system/pages/lostaccount.php b/system/pages/lostaccount.php
index b67bd4be..c6fb9456 100644
--- a/system/pages/lostaccount.php
+++ b/system/pages/lostaccount.php
@@ -22,16 +22,10 @@ $config_salt_enabled = fieldExist('salt', 'accounts');
 $action_type = isset($_REQUEST['action_type']) ? $_REQUEST['action_type'] : '';
 if($action == '')
 {
-	echo $twig->render('account.lost.form.html.twig', array(
-		'vdarkborder' => $config['vdarkborder'],
-		'darkborder' => $config['darkborder'],
-		'template_path' => $template_path
-	));
+	echo $twig->render('account.lost.form.html.twig');
 }
 else if($action == 'step1' && $action_type == '') {
-	echo $twig->render('account.lost.noaction.html.twig', array(
-		'template_path' => $template_path
-	));
+	echo $twig->render('account.lost.noaction.html.twig');
 }
 elseif($action == 'step1' && $action_type == 'email')
 {
diff --git a/system/pages/screenshots.php b/system/pages/screenshots.php
index e31c8c02..da121dfc 100644
--- a/system/pages/screenshots.php
+++ b/system/pages/screenshots.php
@@ -60,8 +60,6 @@ if($canEdit) {
 			'link' => getPageLink('screenshots', ($action == 'edit' ? 'edit' : 'add')),
 			'action' => $action,
 			'id' => isset($id) ? $id : null,
-			'vdarkborder' => $config['vdarkborder'],
-			'darkborder' => $config['darkborder'],
 			'comment' => isset($comment) ? $comment : null,
 			'image' => isset($image) ? $image : null,
 			'author' => isset($author) ? $author : null
diff --git a/system/templates/account.lost.form.html.twig b/system/templates/account.lost.form.html.twig
index d8283cab..50cd9b36 100644
--- a/system/templates/account.lost.form.html.twig
+++ b/system/templates/account.lost.form.html.twig
@@ -3,20 +3,20 @@ The Lost Account Interface can help you to get back your account name and passwo
 	<input type="hidden" name="character" value="">
 	<table cellspacing="1" cellpadding="4" border="0" width="100%">
 		<tr>
-			<td bgcolor="{{ vdarkborder }}" class="white"><b>Please enter your character name</b></td>
+			<td bgcolor="{{ config.vdarkborder }}" class="white"><b>Please enter your character name</b></td>
 		</tr>
 		<tr>
-			<td bgcolor="{{ darkborder }}">
+			<td bgcolor="{{ config.darkborder }}">
 				<input type="text" name="nick" size="40" autofocus/><br>
 			</td>
 		</tr>
 	</table>
 	<table cellspacing="1" cellpadding="4" border="0" width="100%">
 		<tr>
-			<td bgcolor="{{ vdarkborder }}" class="white"><b>What do you want?</b></td>
+			<td bgcolor="{{ config.vdarkborder }}" class="white"><b>What do you want?</b></td>
 		</tr>
 		<tr>
-			<td bgcolor="{{ darkborder }}">
+			<td bgcolor="{{ config.darkborder }}">
 				<input type="radio" name="action_type" id="action_type_email" value="email">
 				<label for="action_type_email"> Send me new password and my account name to account e-mail adress.</label><br/>
 				<input type=radio name="action_type" id="action_type_key" value="reckey">
diff --git a/system/templates/characters.form.html.twig b/system/templates/characters.form.html.twig
index 9fcc0fae..08bedc54 100644
--- a/system/templates/characters.form.html.twig
+++ b/system/templates/characters.form.html.twig
@@ -1,7 +1,7 @@
 <form action="{{ link }}" method="post">
 	<table width="100%" border="0" cellspacing="1" cellpadding="4">
-		<tr><td bgcolor="{{ vdarkborder }}" class="white"><B>Search Character</B></TD></TR>
-		<tr><td bgcolor="{{ darkborder }}">
+		<tr><td bgcolor="{{ config.vdarkborder }}" class="white"><B>Search Character</B></TD></TR>
+		<tr><td bgcolor="{{ config.darkborder }}">
 			<table border="0" cellpadding="1">
 				<tr>
 					<td>Name:</td><td><input name="name" value="" size="29" maxlength="29"{% if autofocus %} autofocus{% endif %}></TD>
diff --git a/system/templates/screenshots.form.html.twig b/system/templates/screenshots.form.html.twig
index 0ff77e49..f6cc45ba 100644
--- a/system/templates/screenshots.form.html.twig
+++ b/system/templates/screenshots.form.html.twig
@@ -4,10 +4,10 @@
 	{% endif %}
 	<table width="100%" border="0" cellspacing="1" cellpadding="4">
 		<tr>
-			<td bgcolor="{{ vdarkborder }}" class="white"><b>{% if action == 'edit' %}Edit{% else %}Add{% endif %} screenshot</b></td>
+			<td bgcolor="{{ config.vdarkborder }}" class="white"><b>{% if action == 'edit' %}Edit{% else %}Add{% endif %} screenshot</b></td>
 		</tr>
 		<tr>
-			<td bgcolor="{{ darkborder }}">
+			<td bgcolor="{{ config.darkborder }}">
 				<table border="0" cellpadding="1">
 					<tr>
 						<td>Comment:</td>