diff --git a/Admin/Templates/config.tpl b/Admin/Templates/config.tpl
index 3d501554..e85e58ce 100644
--- a/Admin/Templates/config.tpl
+++ b/Admin/Templates/config.tpl
@@ -92,6 +92,26 @@ $editIcon = '<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke=
     <tr><td><?php echo CONF_SERV_PEACESYST ?> <em class="tooltip">?<span class="classic"><?php echo CONF_SERV_PEACESYST_TOOLTIP ?></span></em></td><td><?php echo (["None", "Normal", "Christmas", "New Year", "Easter"])[PEACE]; ?></td></tr>
     <tr><td><?php echo CONF_SERV_GRAPHICPACK ?> <em class="tooltip">?<span class="classic"><?php echo CONF_SERV_GRAPHICPACK_TOOLTIP ?></span></em></td><td><?php echo GP_ENABLE ? "<span class='badge green'>Enabled</span>" : "<span class='badge red'>Disabled</span>"; ?></td></tr>
     <tr><td><?php echo CONF_SERV_ERRORREPORT ?> <em class="tooltip">?<span class="classic"><?php echo CONF_SERV_ERRORREPORT_TOOLTIP ?></span></em></td><td><b><?php echo (ERROR_REPORT=="error_reporting (0);")? "No": "Yes";?></b></td></tr>
+	<tr>
+      <td>Server graphic pack <em class="tooltip">?<span class="classic">The graphic pack every player sees by default, read from the gpack/ folder.</span></em></td>
+      <td><b><?php echo defined('GP_LOCATE') ? GP_LOCATE : 'gpack/travian_default/'; ?></b></td>
+    </tr>
+    <tr>
+      <td>Player graphic packs <em class="tooltip">?<span class="classic">When enabled, players can point their profile at their own graphic pack (Profile &rarr; Graphics). When disabled, everyone sees the server pack.</span></em></td>
+      <td><b><?php echo (defined('GP_ENABLE') && GP_ENABLE) ? 'Yes' : 'No'; ?></b></td>
+    </tr>
+    <tr>
+      <td><?php echo ADM_HERO_BASE_REGENERATION; ?><em class="tooltip">?<span class="classic"><?php echo ADM_HIT_POINTS_THE_HERO_RECOVERS_PER_DAY_INDEPEN; ?></span></em></td>
+      <td><b><?php echo defined('HERO_BASE_REGEN') ? (int) HERO_BASE_REGEN : 10; ?></b><?php echo ADM_HP_DAY; ?></td>
+    </tr>
+    <tr>
+      <td><?php echo ADM_HERO_EXCHANGE_RATES; ?><em class="tooltip">?<span class="classic"><?php echo ADM_RATES_OF_THE_EXCHANGE_OFFICE_IN_THE_AUCTION; ?></span></em></td>
+      <td><?php echo ADM_1_GOLD; ?><b><?php echo defined('HERO_SILVER_PER_GOLD') ? (int) HERO_SILVER_PER_GOLD : 10; ?></b><?php echo ADM_SILVER_2; ?><b><?php echo defined('HERO_SILVER_TO_GOLD') ? (int) HERO_SILVER_TO_GOLD : 25; ?></b><?php echo ADM_SILVER_1_GOLD; ?></td>
+    </tr>
+    <tr>
+      <td><?php echo ADM_HERO_RESOURCE_PRODUCTION; ?><em class="tooltip">?<span class="classic"><?php echo ADM_HOURLY_RESOURCES_PRODUCED_BY_EACH_POINT_THE; ?></span></em></td>
+      <td><b><?php echo defined('HERO_RES_PER_POINT_ALL') ? (int) HERO_RES_PER_POINT_ALL : 3; ?></b> <?php echo ADM_OF_EACH; ?><b><?php echo defined('HERO_RES_PER_POINT_ONE') ? (int) HERO_RES_PER_POINT_ONE : 10; ?></b> <?php echo ADM_OF_ONE_TYPE; ?></td>
+    </tr>
   </table>
 </div>
 
@@ -220,18 +240,6 @@ $cronKeyMasked = ($cronKey === '')
 <div class="config-card">
   <div class="config-head"><span><?php echo ADM_NEW_MECHANICS_AND_FUNCTIONS; ?></span><a href="admin.php?p=editNewFunctions" title="<?php echo ADM_EDIT_NEW_MECHANICS_AND_FUNCTIONS; ?>" class="edit-btn"><?php echo $editIcon; ?></a></div>
   <table class="config-table">
-    <tr>
-      <td><?php echo ADM_HERO_BASE_REGENERATION; ?><em class="tooltip">?<span class="classic"><?php echo ADM_HIT_POINTS_THE_HERO_RECOVERS_PER_DAY_INDEPEN; ?></span></em></td>
-      <td><b><?php echo defined('HERO_BASE_REGEN') ? (int) HERO_BASE_REGEN : 10; ?></b><?php echo ADM_HP_DAY; ?></td>
-    </tr>
-    <tr>
-      <td><?php echo ADM_HERO_EXCHANGE_RATES; ?><em class="tooltip">?<span class="classic"><?php echo ADM_RATES_OF_THE_EXCHANGE_OFFICE_IN_THE_AUCTION; ?></span></em></td>
-      <td><?php echo ADM_1_GOLD; ?><b><?php echo defined('HERO_SILVER_PER_GOLD') ? (int) HERO_SILVER_PER_GOLD : 10; ?></b><?php echo ADM_SILVER_2; ?><b><?php echo defined('HERO_SILVER_TO_GOLD') ? (int) HERO_SILVER_TO_GOLD : 25; ?></b><?php echo ADM_SILVER_1_GOLD; ?></td>
-    </tr>
-    <tr>
-      <td><?php echo ADM_HERO_RESOURCE_PRODUCTION; ?><em class="tooltip">?<span class="classic"><?php echo ADM_HOURLY_RESOURCES_PRODUCED_BY_EACH_POINT_THE; ?></span></em></td>
-      <td><b><?php echo defined('HERO_RES_PER_POINT_ALL') ? (int) HERO_RES_PER_POINT_ALL : 3; ?></b><?php echo ADM_OF_EACH; ?><b><?php echo defined('HERO_RES_PER_POINT_ONE') ? (int) HERO_RES_PER_POINT_ONE : 10; ?></b><?php echo ADM_OF_ONE_TYPE; ?></td>
-    </tr>
     <tr><td class="b"><?php echo SERV_VARIABLE ?></td><td class="b"><?php echo SERV_VALUE ?></td></tr>
     <tr><td><?php echo ADM_DISPLAY_OASIS_IN_PROFILE; ?><em class="tooltip">?<span class="classic"><?php echo ADM_ENABLE_DISABLE_THE_DISPLAY_OF_OASES_OF_EACH; ?></span></em></td><td><?php echo NEW_FUNCTIONS_OASIS ? "<span class='badge green'>Enabled</span>" : "<span class='badge red'>Disabled</span>"; ?></td></tr>
     <tr><td><?php echo ADM_ALLIANCE_INVITATION_MESSAGE; ?><em class="tooltip">?<span class="classic"><?php echo ADM_ENABLE_DISABLE_SENDING_AN_IN_GAME_MESSAGE_TO; ?></span></em></td><td><?php echo NEW_FUNCTIONS_ALLIANCE_INVITATION ? "<span class='badge green'>Enabled</span>" : "<span class='badge red'>Disabled</span>"; ?></td></tr>
diff --git a/Admin/Templates/editServerSet.tpl b/Admin/Templates/editServerSet.tpl
index 58189150..4b198681 100644
--- a/Admin/Templates/editServerSet.tpl
+++ b/Admin/Templates/editServerSet.tpl
@@ -369,6 +369,33 @@ function refresh(tz) {
                         </select>
                     </td>
                 </tr>
+                <tr>
+                    <td class="b">Server graphic pack <em class="tooltip">?<span class="classic">The graphic pack every player sees by default. Packs are read from the gpack/ folder &mdash; a folder counts as a pack when it contains travian.css. Changing this switches the whole server's look.</span></em></td>
+                    <td>
+                        <select name="gp_locate">
+                        <?php
+                            $gpCurrent = defined('GP_LOCATE') ? GP_LOCATE : 'gpack/travian_default/';
+                            $gpList    = function_exists('tz_available_gpacks') ? tz_available_gpacks() : array();
+
+                            if (!$gpList) {
+                                $gpList = array($gpCurrent => $gpCurrent);
+                            }
+
+                            // pachetul din config poate lipsi de pe disc: il aratam oricum,
+                            // ca adminul sa vada ce e setat acum
+                            if (!isset($gpList[$gpCurrent])) {
+                                $gpList[$gpCurrent] = $gpCurrent . ' (?)';
+                            }
+
+                            foreach ($gpList as $gpPath => $gpLabel) {
+                                echo '<option value="' . htmlspecialchars($gpPath, ENT_QUOTES, 'UTF-8') . '"'
+                                   . ($gpCurrent === $gpPath ? ' selected' : '') . '>'
+                                   . htmlspecialchars($gpLabel, ENT_QUOTES, 'UTF-8') . '</option>';
+                            }
+                        ?>
+                        </select>
+                    </td>
+                </tr>
                 <tr>
                     <td class="b"><?php echo CONF_SERV_GRAPHICPACK ?> <em class="tooltip">?<span class="classic"><?php echo CONF_SERV_GRAPHICPACK_TOOLTIP ?></span></em></td>
                     <td>
diff --git a/GameEngine/Admin/Mods/config_template.php b/GameEngine/Admin/Mods/config_template.php
index abeb84de..32008ba9 100644
--- a/GameEngine/Admin/Mods/config_template.php
+++ b/GameEngine/Admin/Mods/config_template.php
@@ -1,4 +1,152 @@
 <?php
+
+/**
+ * Scrie in siguranta o valoare in sablonul de configuratie.
+ *
+ * DE CE EXISTA: pana acum fiecare modul facea direct
+ *     $text = preg_replace("'%SERVERNAME%'", $_POST['servername'], $text);
+ * adica lua valoarea din formular si o punea nefiltrata intr-un fisier PHP
+ * care se include la fiecare cerere. Consecinte reale:
+ *   - un nume de server cu ghilimele strica config.php (server oprit)
+ *   - o valoare potrivita executa cod PHP la fiecare pagina
+ *   - o constanta booleana pusa direct devenea sirul vid: define("X",);
+ *
+ * Aici valoarea e verificata dupa CONTEXTUL in care ajunge:
+ *   'bare'   - inlocuieste cod PHP nud: se accepta doar numere si true/false
+ *   'string' - ajunge intre ghilimele: se escapeaza si se taie randurile noi
+ *   'code'   - fragment de cod: doar dintr-o lista alba
+ *
+ * $type poate fi omis: se deduce din sablon (daca placeholderul e intre
+ * ghilimele => string, altfel => bare).
+ */
+if (!function_exists('tz_config_set')) {
+
+    function tz_config_detect_type($text, $placeholder)
+    {
+        $q = preg_quote($placeholder, '/');
+
+        // %X% intre ghilimele simple sau duble => context de sir
+        if (preg_match('/["\']\s*' . $q . '\s*["\']/', $text)) {
+            return 'string';
+        }
+
+        return 'bare';
+    }
+
+    function tz_config_sanitize($value, $type)
+    {
+        if ($type === 'bare') {
+            if (is_bool($value)) {
+                return $value ? 'true' : 'false';
+            }
+
+            $v = trim((string) $value);
+
+            // Booleeni. Formularele din panou trimit "True"/"False" cu majuscula
+            // (asa sunt scrise <option value="True">), iar instalarea trimite
+            // "true"/"false". Le acceptam pe toate si le normalizam la litere
+            // mici, care e forma canonica in PHP.
+            $lower = strtolower($v);
+
+            if ($lower === 'true' || $lower === 'false') {
+                return $lower;
+            }
+
+            // Numere simple.
+            if (preg_match('/^-?\d+(\.\d+)?$/', $v)) {
+                return $v;
+            }
+
+            // Expresii aritmetice din constante de timp, ca "(3600*24*7)" pentru
+            // intervalul de medalii. Le acceptam pentru ca sunt in config-ul
+            // livrat si sunt lizibile, dar STRICT: doar cifre, + - * / ( ) si
+            // spatii. Nimic care sa poata apela o functie sau citi o variabila.
+            if (preg_match('/^[0-9+\-*\/() ]+$/', $v) && preg_match('/[0-9]/', $v)) {
+                return $v;
+            }
+
+            // Orice altceva ar fi cod. Nu punem direct 0, fiindca o valoare ca
+            // SPEED=0 ar strica jocul; convertim la intreg, ceea ce pastreaza
+            // partea numerica de la inceput ("1); system(...)" -> 1) si e mereu
+            // un literal sigur.
+            return (string) (int) $v;
+        }
+
+        if ($type === 'code') {
+            $allowed = array(
+                'error_reporting (E_ALL ^ E_NOTICE);',
+                'error_reporting (E_ALL ^ E_NOTICE ^ E_DEPRECATED);',
+                'error_reporting (0);',
+            );
+
+            $v = trim((string) $value);
+
+            return in_array($v, $allowed, true) ? $v : 'error_reporting (0);';
+        }
+
+        // context de sir: scoatem randurile noi si caracterele de control, apoi
+        // escapam ce ar putea inchide sirul sau introduce interpolare
+        $v = (string) $value;
+        $v = preg_replace('/[\x00-\x1F\x7F]/', '', $v);
+
+        return addcslashes($v, "\\'\"$");
+    }
+
+    /**
+     * Inlocuieste un placeholder cu o valoare curatata.
+     * Se foloseste in locul apelurilor preg_replace directe din module.
+     */
+    function tz_config_set(&$text, $placeholder, $value, $type = null)
+    {
+        if (strpos($text, $placeholder) === false) {
+            return false;
+        }
+
+        if ($type === null) {
+            $type = tz_config_detect_type($text, $placeholder);
+        }
+
+        $text = str_replace($placeholder, tz_config_sanitize($value, $type), $text);
+
+        return true;
+    }
+}
+
+
+/**
+ * Pachetele grafice disponibile pe server.
+ *
+ * Un director din gpack/ conteaza ca pachet valid daca are travian.css - acelasi
+ * criteriu pe care il verifica si jocul cand incarca stilurile. Se intoarce o
+ * lista cale => nume afisabil, folosita atat de panoul de administrare, cat si de
+ * pagina de profil a jucatorului.
+ */
+if (!function_exists('tz_available_gpacks')) {
+    function tz_available_gpacks($root = null)
+    {
+        $root = $root ?: dirname(__DIR__, 3) . '/gpack';
+        $out  = array();
+
+        if (!is_dir($root)) {
+            return $out;
+        }
+
+        foreach (scandir($root) as $dir) {
+            if ($dir === '.' || $dir === '..' || $dir === 'download') {
+                continue;
+            }
+
+            if (!is_dir($root . '/' . $dir) || !is_file($root . '/' . $dir . '/travian.css')) {
+                continue;
+            }
+
+            $label = ucwords(str_replace('_', ' ', $dir));
+            $out['gpack/' . $dir . '/'] = $label;
+        }
+
+        return $out;
+    }
+}
 #################################################################################
 ##              -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =-                 ##
 ## --------------------------------------------------------------------------- ##
@@ -110,6 +258,32 @@ if (!function_exists('admin_config_template_path')) {
             }
         }
 
+        // Pachetul grafic si comutatorul de pachete proprii.
+        //
+        // ATENTIE LA ORDINE: acest bloc trebuie sa ruleze DUPA bucla de
+        // override-uri de mai sus. Rulat inainte, ar inlocui %GP% cu valoarea
+        // CURENTA din config, iar override-ul trimis de editServerSet (alegerea
+        // adminului) nu ar mai avea ce inlocui - deci comutatorul parea ca se
+        // intoarce singur pe Disabled la fiecare salvare.
+        //
+        // Rolul blocului e doar de REZERVA, pentru modulele care nu trimit
+        // aceste valori (editNewFunctions, editPlusSet etc.): ele trebuie sa
+        // pastreze setarea existenta, nu s-o piarda.
+        //
+        // Valoarea se scrie explicit ca 'true'/'false'. Inainte, trei module
+        // puneau direct constanta GP_ENABLE in preg_replace; cand era false,
+        // PHP o convertea la sirul vid si in config ajungea
+        // define("GP_ENABLE",); - eroare de parsare care dobora serverul.
+        if (strpos($text, '%GP%') !== false) {
+            $gpEnable = (defined('GP_ENABLE') && GP_ENABLE) ? 'true' : 'false';
+            $text = str_replace('%GP%', $gpEnable, $text);
+        }
+
+        if (strpos($text, '%GP_LOCATE%') !== false) {
+            $gpLocate = defined('GP_LOCATE') ? GP_LOCATE : 'gpack/travian_default/';
+            $text = str_replace('%GP_LOCATE%', $gpLocate, $text);
+        }
+
         foreach ($cleanupDefaults as $placeholder => $info) {
             if (strpos($text, $placeholder) === false) {
                 continue;
diff --git a/GameEngine/Admin/Mods/editAdminInfo.php b/GameEngine/Admin/Mods/editAdminInfo.php
index 7d7700b4..aaf47f26 100755
--- a/GameEngine/Admin/Mods/editAdminInfo.php
+++ b/GameEngine/Admin/Mods/editAdminInfo.php
@@ -36,7 +36,6 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
 
 		$ERRORREPORT=ERROR_REPORT;
 		$T4=(T4_COMING==false)? "false":"true";
-		$GP_ENABLE=(GP_ENABLE==false)? "false":"true";
 		$QUEST=(QUEST==false)? "false":"true";
 		$WW=(WW==false)? "false":"true";
 		$SHOW_NATARS=(SHOW_NATARS==false)? "false":"true";
@@ -82,121 +81,119 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
 		
 
 		$text = admin_config_template_contents();
-		$text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text);
-		$text = preg_replace("'%ERROR%'", $ERRORREPORT, $text);
-		$text = preg_replace("'%SERVERNAME%'", SERVER_NAME, $text);
-		$text = preg_replace("'%STIMEZONE%'", TIMEZONE, $text);
-		$text = preg_replace("'%STARTTIME%'", COMMENCE, $text);
-		$text = preg_replace("'%SSTARTDATE%'", START_DATE, $text);
-		$text = preg_replace("'%SSTARTTIME%'", START_TIME, $text);
-		$text = preg_replace("'%LANG%'", (defined('SERVER_LANG') ? SERVER_LANG : LANG), $text);
-		$text = preg_replace("'%SPEED%'", SPEED, $text);
-		$text = preg_replace("'%MAX%'", WORLD_MAX, $text);
-		$text = preg_replace("'%GP%'", $GP_ENABLE, $text);
-		$text = preg_replace("'%GP_LOCATE%'", "gpack/travian_default/", $text);
-		$text = preg_replace("'%INCSPEED%'", INCREASE_SPEED, $text);
-		$text = preg_replace("'%EVASIONSPEED%'", EVASION_SPEED, $text);
-		$text = preg_replace("'%TRADERCAP%'", TRADER_CAPACITY, $text);
-		$text = preg_replace("'%CRANNYCAP%'", CRANNY_CAPACITY, $text);
-		$text = preg_replace("'%TRAPPERCAP%'", TRAPPER_CAPACITY, $text);
-		$text = preg_replace("'%VILLAGE_EXPAND%'", CP, $text);
-		$text = preg_replace("'%DEMOLISH%'", DEMOLISH_LEVEL_REQ, $text);
-		$text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text);
-		$text = preg_replace("'%QUEST%'", $QUEST, $text);
-		$text = preg_replace("'%QTYPE%'", QTYPE, $text);
-		$text = preg_replace("'%BEGINNER%'", PROTECTION, $text);
-		$text = preg_replace("'%WW%'", $WW, $text);
-		$text = preg_replace("'%SHOW_NATARS%'", $SHOW_NATARS, $text);
-		$text = preg_replace("'%NATARS_UNITS%'", NATARS_UNITS, $text);
-		$text = preg_replace("'%NATARS_SPAWN_TIME%'", NATARS_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATARS_WW_SPAWN_TIME%'", NATARS_WW_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%'", NATARS_WW_BUILDING_PLAN_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATURE_REGTIME%'", NATURE_REGTIME, $text);
-		$text = preg_replace("'%OASIS_WOOD_MULTIPLIER%'", OASIS_WOOD_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_CLAY_MULTIPLIER%'", OASIS_CLAY_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_IRON_MULTIPLIER%'", OASIS_IRON_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_CROP_MULTIPLIER%'", OASIS_CROP_MULTIPLIER, $text);
-		$text = preg_replace("'%T4_COMING%'", $T4, $text);
-		$text = preg_replace("'%ACTIVATE%'", $AUTH_EMAIL, $text);
-		$text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text);
-		$text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text);
-		$text = preg_replace("'%MEDALINTERVAL%'", MEDALINTERVAL, $text);
-		$text = preg_replace("'%GREAT_WKS%'", $GREAT_WKS, $text);
-		$text = preg_replace("'%TS_THRESHOLD%'", TS_THRESHOLD, $text);
-		$text = preg_replace("'%REG_OPEN%'", $REG_OPEN, $text);
-		$text = preg_replace("'%PEACE%'", PEACE, $text);
-		$text = preg_replace("'%LOGBUILD%'", $LOG_BUILD, $text);
-		$text = preg_replace("'%LOGTECH%'", $LOG_TECH, $text);
-		$text = preg_replace("'%LOGLOGIN%'", $LOG_LOGIN, $text);
-		$text = preg_replace("'%LOGGOLDFIN%'", $LOG_GOLD_FIN, $text);
-		$text = preg_replace("'%LOGADMIN%'", $LOG_ADMIN, $text);
-		$text = preg_replace("'%LOGWAR%'", $LOG_WAR, $text);
-		$text = preg_replace("'%LOGMARKET%'", $LOG_MARKET, $text);
-		$text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text);
-		$text = preg_replace("'%BOX1%'", $NEWSBOX1, $text);
-		$text = preg_replace("'%BOX2%'", $NEWSBOX2, $text);
-		$text = preg_replace("'%BOX3%'", $NEWSBOX3, $text);
-		$text = preg_replace("'%SSERVER%'", SQL_SERVER, $text);
+		tz_config_set($text, '%ERRORREPORT%', $ERRORREPORT);
+		tz_config_set($text, '%ERROR%', $ERRORREPORT, 'code');
+		tz_config_set($text, '%SERVERNAME%', SERVER_NAME);
+		tz_config_set($text, '%STIMEZONE%', TIMEZONE);
+		tz_config_set($text, '%STARTTIME%', COMMENCE);
+		tz_config_set($text, '%SSTARTDATE%', START_DATE);
+		tz_config_set($text, '%SSTARTTIME%', START_TIME);
+		tz_config_set($text, '%LANG%', (defined('SERVER_LANG') ? SERVER_LANG : LANG));
+		tz_config_set($text, '%SPEED%', SPEED);
+		tz_config_set($text, '%MAX%', WORLD_MAX);
+		tz_config_set($text, '%INCSPEED%', INCREASE_SPEED);
+		tz_config_set($text, '%EVASIONSPEED%', EVASION_SPEED);
+		tz_config_set($text, '%TRADERCAP%', TRADER_CAPACITY);
+		tz_config_set($text, '%CRANNYCAP%', CRANNY_CAPACITY);
+		tz_config_set($text, '%TRAPPERCAP%', TRAPPER_CAPACITY);
+		tz_config_set($text, '%VILLAGE_EXPAND%', CP);
+		tz_config_set($text, '%DEMOLISH%', DEMOLISH_LEVEL_REQ);
+		tz_config_set($text, '%STORAGE_MULTIPLIER%', STORAGE_MULTIPLIER);
+		tz_config_set($text, '%QUEST%', $QUEST);
+		tz_config_set($text, '%QTYPE%', QTYPE);
+		tz_config_set($text, '%BEGINNER%', PROTECTION);
+		tz_config_set($text, '%WW%', $WW);
+		tz_config_set($text, '%SHOW_NATARS%', $SHOW_NATARS);
+		tz_config_set($text, '%NATARS_UNITS%', NATARS_UNITS);
+		tz_config_set($text, '%NATARS_SPAWN_TIME%', NATARS_SPAWN_TIME);
+		tz_config_set($text, '%NATARS_WW_SPAWN_TIME%', NATARS_WW_SPAWN_TIME);
+		tz_config_set($text, '%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%', NATARS_WW_BUILDING_PLAN_SPAWN_TIME);
+		tz_config_set($text, '%NATURE_REGTIME%', NATURE_REGTIME);
+		tz_config_set($text, '%OASIS_WOOD_MULTIPLIER%', OASIS_WOOD_MULTIPLIER);
+		tz_config_set($text, '%OASIS_CLAY_MULTIPLIER%', OASIS_CLAY_MULTIPLIER);
+		tz_config_set($text, '%OASIS_IRON_MULTIPLIER%', OASIS_IRON_MULTIPLIER);
+		tz_config_set($text, '%OASIS_CROP_MULTIPLIER%', OASIS_CROP_MULTIPLIER);
+		tz_config_set($text, '%T4_COMING%', $T4);
+		tz_config_set($text, '%ACTIVATE%', $AUTH_EMAIL);
+		tz_config_set($text, '%PLUS_TIME%', PLUS_TIME);
+		tz_config_set($text, '%PLUS_PRODUCTION%', PLUS_PRODUCTION);
+		tz_config_set($text, '%MEDALINTERVAL%', MEDALINTERVAL);
+		tz_config_set($text, '%GREAT_WKS%', $GREAT_WKS);
+		tz_config_set($text, '%TS_THRESHOLD%', TS_THRESHOLD);
+		tz_config_set($text, '%REG_OPEN%', $REG_OPEN);
+		tz_config_set($text, '%PEACE%', PEACE);
+		tz_config_set($text, '%LOGBUILD%', $LOG_BUILD);
+		tz_config_set($text, '%LOGTECH%', $LOG_TECH);
+		tz_config_set($text, '%LOGLOGIN%', $LOG_LOGIN);
+		tz_config_set($text, '%LOGGOLDFIN%', $LOG_GOLD_FIN);
+		tz_config_set($text, '%LOGADMIN%', $LOG_ADMIN);
+		tz_config_set($text, '%LOGWAR%', $LOG_WAR);
+		tz_config_set($text, '%LOGMARKET%', $LOG_MARKET);
+		tz_config_set($text, '%LOGILLEGAL%', $LOG_ILLEGAL);
+		tz_config_set($text, '%BOX1%', $NEWSBOX1);
+		tz_config_set($text, '%BOX2%', $NEWSBOX2);
+		tz_config_set($text, '%BOX3%', $NEWSBOX3);
+		tz_config_set($text, '%SSERVER%', SQL_SERVER);
 		$text = str_replace("%SPORT%", SQL_PORT, $text);
-		$text = preg_replace("'%SUSER%'", SQL_USER, $text);
-		$text = preg_replace("'%SPASS%'", SQL_PASS, $text);
-		$text = preg_replace("'%SDB%'", SQL_DB, $text);
-		$text = preg_replace("'%PREFIX%'", TB_PREFIX, $text);
-		$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
-		$text = preg_replace("'%LIMIT_MAILBOX%'", $LIMIT_MAILBOX, $text);
-		$text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text);
-		$text = preg_replace("'%ARANK%'", $_POST['admin_rank'], $text);
-		$text = preg_replace("'%AEMAIL%'", $_POST['aemail'], $text);
-		$text = preg_replace("'%ANAME%'", $_POST['aname'], $text);
-		$text = preg_replace("'%ASUPPMSGS%'", ($_POST['admin_support_msgs'] == 'True' ? 'true' : 'false'), $text);
-		$text = preg_replace("'%ARAIDS%'", ($_POST['admin_raidable'] == 'True' ? 'true' : 'false'), $text);
-		$text = preg_replace("'%UTRACK%'", "", $text);
-		$text = preg_replace("'%UTOUT%'", "", $text);
-		$text = preg_replace("'%DOMAIN%'", DOMAIN, $text);
-		$text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text);
-		$text = preg_replace("'%SERVER%'", SERVER, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_OASIS%'", $NEW_FUNCTIONS_OASIS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_ALLIANCE_INVITATION%'", $NEW_FUNCTIONS_ALLIANCE_INVITATION, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_EMBASSY_MECHANICS%'", $NEW_FUNCTIONS_EMBASSY_MECHANICS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_FORUM_POST_MESSAGE%'", $NEW_FUNCTIONS_FORUM_POST_MESSAGE, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_TRIBE_IMAGES%'", $NEW_FUNCTIONS_TRIBE_IMAGES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MHS_IMAGES%'", $NEW_FUNCTIONS_MHS_IMAGES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_ARTIFACT%'", $NEW_FUNCTIONS_DISPLAY_ARTIFACT, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_WONDER%'", $NEW_FUNCTIONS_DISPLAY_WONDER, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_VACATION%'", $NEW_FUNCTIONS_VACATION, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%'", $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MANUAL_NATURENATARS%'", $NEW_FUNCTIONS_MANUAL_NATURENATARS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_LINKS%'", $NEW_FUNCTIONS_DISPLAY_LINKS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_3YEAR%'", $NEW_FUNCTIONS_MEDAL_3YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_5YEAR%'", $NEW_FUNCTIONS_MEDAL_5YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_10YEAR%'", $NEW_FUNCTIONS_MEDAL_10YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM%'", $NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MILESTONES%'", $NEW_FUNCTIONS_MILESTONES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_HERO_T4%'", $NEW_FUNCTIONS_HERO_T4, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_HUNS%'", $NEW_FUNCTION_TRIBE_HUNS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_EGIPTEANS%'", $NEW_FUNCTION_TRIBE_EGIPTEANS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_SPARTANS%'", $NEW_FUNCTION_TRIBE_SPARTANS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_VIKINGS%'", $NEW_FUNCTION_TRIBE_VIKINGS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_RESET%'", $NEW_FUNCTIONS_MEDAL_RESET, $text);
+		tz_config_set($text, '%SUSER%', SQL_USER);
+		tz_config_set($text, '%SPASS%', SQL_PASS);
+		tz_config_set($text, '%SDB%', SQL_DB);
+		tz_config_set($text, '%PREFIX%', TB_PREFIX);
+		tz_config_set($text, '%CONNECTT%', DB_TYPE);
+		tz_config_set($text, '%LIMIT_MAILBOX%', $LIMIT_MAILBOX);
+		tz_config_set($text, '%MAX_MAILS%', MAX_MAIL);
+		tz_config_set($text, '%ARANK%', $_POST['admin_rank'] ?? '');
+		tz_config_set($text, '%AEMAIL%', $_POST['aemail'] ?? '');
+		tz_config_set($text, '%ANAME%', $_POST['aname'] ?? '');
+		tz_config_set($text, '%ASUPPMSGS%', ($_POST['admin_support_msgs'] == 'True' ? 'true' : 'false'));
+		tz_config_set($text, '%ARAIDS%', ($_POST['admin_raidable'] == 'True' ? 'true' : 'false'));
+		tz_config_set($text, '%UTRACK%', "");
+		tz_config_set($text, '%UTOUT%', "");
+		tz_config_set($text, '%DOMAIN%', DOMAIN);
+		tz_config_set($text, '%HOMEPAGE%', HOMEPAGE);
+		tz_config_set($text, '%SERVER%', SERVER);
+		tz_config_set($text, '%NEW_FUNCTIONS_OASIS%', $NEW_FUNCTIONS_OASIS);
+		tz_config_set($text, '%NEW_FUNCTIONS_ALLIANCE_INVITATION%', $NEW_FUNCTIONS_ALLIANCE_INVITATION);
+		tz_config_set($text, '%NEW_FUNCTIONS_EMBASSY_MECHANICS%', $NEW_FUNCTIONS_EMBASSY_MECHANICS);
+		tz_config_set($text, '%NEW_FUNCTIONS_FORUM_POST_MESSAGE%', $NEW_FUNCTIONS_FORUM_POST_MESSAGE);
+		tz_config_set($text, '%NEW_FUNCTIONS_TRIBE_IMAGES%', $NEW_FUNCTIONS_TRIBE_IMAGES);
+		tz_config_set($text, '%NEW_FUNCTIONS_MHS_IMAGES%', $NEW_FUNCTIONS_MHS_IMAGES);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_ARTIFACT%', $NEW_FUNCTIONS_DISPLAY_ARTIFACT);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_WONDER%', $NEW_FUNCTIONS_DISPLAY_WONDER);
+		tz_config_set($text, '%NEW_FUNCTIONS_VACATION%', $NEW_FUNCTIONS_VACATION);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%', $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET);
+		tz_config_set($text, '%NEW_FUNCTIONS_MANUAL_NATURENATARS%', $NEW_FUNCTIONS_MANUAL_NATURENATARS);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_LINKS%', $NEW_FUNCTIONS_DISPLAY_LINKS);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_3YEAR%', $NEW_FUNCTIONS_MEDAL_3YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_5YEAR%', $NEW_FUNCTIONS_MEDAL_5YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_10YEAR%', $NEW_FUNCTIONS_MEDAL_10YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM%', $NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM);
+		tz_config_set($text, '%NEW_FUNCTIONS_MILESTONES%', $NEW_FUNCTIONS_MILESTONES);
+		tz_config_set($text, '%NEW_FUNCTIONS_HERO_T4%', $NEW_FUNCTIONS_HERO_T4);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_HUNS%', $NEW_FUNCTION_TRIBE_HUNS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_EGIPTEANS%', $NEW_FUNCTION_TRIBE_EGIPTEANS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_SPARTANS%', $NEW_FUNCTION_TRIBE_SPARTANS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_VIKINGS%', $NEW_FUNCTION_TRIBE_VIKINGS);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_RESET%', $NEW_FUNCTIONS_MEDAL_RESET);
 		// Preserve registration-bonus-gold settings (owned by editNewFunctions.php).
-		$text = preg_replace("'%NEW_FUNCTION_REGISTRATION_GOLD%'", (defined('NEW_FUNCTION_REGISTRATION_GOLD') && NEW_FUNCTION_REGISTRATION_GOLD ? 'true' : 'false'), $text);
-		$text = preg_replace("'%NEW_FUNCTION_REGISTRATION_GOLD_VALUE%'", (string) (defined('NEW_FUNCTION_REGISTRATION_GOLD_VALUE') ? (int) NEW_FUNCTION_REGISTRATION_GOLD_VALUE : 200), $text);
+		tz_config_set($text, '%NEW_FUNCTION_REGISTRATION_GOLD%', (defined('NEW_FUNCTION_REGISTRATION_GOLD') && NEW_FUNCTION_REGISTRATION_GOLD ? 'true' : 'false'));
+		tz_config_set($text, '%NEW_FUNCTION_REGISTRATION_GOLD_VALUE%', (string) (defined('NEW_FUNCTION_REGISTRATION_GOLD_VALUE') ? (int) NEW_FUNCTION_REGISTRATION_GOLD_VALUE : 200));
 
 		// PLUS settings need to be kept intact
-		$text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text);
-		$text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text);
-		$text = preg_replace("'%PAYPAL_EMAIL%'", (defined('PAYPAL_EMAIL') ? PAYPAL_EMAIL : 'martin@martinambrus.com'), $text);
-		$text = preg_replace("'%PAYPAL_CURRENCY%'", (defined('PAYPAL_CURRENCY') ? PAYPAL_CURRENCY : 'EUR'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_A_PRICE%'", (defined('PLUS_PACKAGE_A_PRICE') ? PLUS_PACKAGE_A_PRICE : '1,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_A_GOLD%'", (defined('PLUS_PACKAGE_A_GOLD') ? PLUS_PACKAGE_A_GOLD : '60'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_B_PRICE%'", (defined('PLUS_PACKAGE_B_PRICE') ? PLUS_PACKAGE_B_PRICE : '4,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_B_GOLD%'", (defined('PLUS_PACKAGE_B_GOLD') ? PLUS_PACKAGE_B_GOLD : '120'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_C_PRICE%'", (defined('PLUS_PACKAGE_C_PRICE') ? PLUS_PACKAGE_C_PRICE : '9,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_C_GOLD%'", (defined('PLUS_PACKAGE_C_GOLD') ? PLUS_PACKAGE_C_GOLD : '360'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_D_PRICE%'", (defined('PLUS_PACKAGE_D_PRICE') ? PLUS_PACKAGE_D_PRICE : '19,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_D_GOLD%'", (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_E_PRICE%'", (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_E_GOLD%'", (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'), $text);
+		tz_config_set($text, '%PLUS_TIME%', PLUS_TIME);
+		tz_config_set($text, '%PLUS_PRODUCTION%', PLUS_PRODUCTION);
+		tz_config_set($text, '%PAYPAL_EMAIL%', (defined('PAYPAL_EMAIL') ? PAYPAL_EMAIL : 'martin@martinambrus.com'));
+		tz_config_set($text, '%PAYPAL_CURRENCY%', (defined('PAYPAL_CURRENCY') ? PAYPAL_CURRENCY : 'EUR'));
+		tz_config_set($text, '%PLUS_PACKAGE_A_PRICE%', (defined('PLUS_PACKAGE_A_PRICE') ? PLUS_PACKAGE_A_PRICE : '1,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_A_GOLD%', (defined('PLUS_PACKAGE_A_GOLD') ? PLUS_PACKAGE_A_GOLD : '60'));
+		tz_config_set($text, '%PLUS_PACKAGE_B_PRICE%', (defined('PLUS_PACKAGE_B_PRICE') ? PLUS_PACKAGE_B_PRICE : '4,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_B_GOLD%', (defined('PLUS_PACKAGE_B_GOLD') ? PLUS_PACKAGE_B_GOLD : '120'));
+		tz_config_set($text, '%PLUS_PACKAGE_C_PRICE%', (defined('PLUS_PACKAGE_C_PRICE') ? PLUS_PACKAGE_C_PRICE : '9,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_C_GOLD%', (defined('PLUS_PACKAGE_C_GOLD') ? PLUS_PACKAGE_C_GOLD : '360'));
+		tz_config_set($text, '%PLUS_PACKAGE_D_PRICE%', (defined('PLUS_PACKAGE_D_PRICE') ? PLUS_PACKAGE_D_PRICE : '19,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_D_GOLD%', (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'));
+		tz_config_set($text, '%PLUS_PACKAGE_E_PRICE%', (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_E_GOLD%', (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'));
 
 		fwrite($fh, $text);
 		fclose($fh);
diff --git a/GameEngine/Admin/Mods/editExtraSet.php b/GameEngine/Admin/Mods/editExtraSet.php
index c12d6fe3..0cea5602 100755
--- a/GameEngine/Admin/Mods/editExtraSet.php
+++ b/GameEngine/Admin/Mods/editExtraSet.php
@@ -36,7 +36,6 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
 
 		$ERRORREPORT=ERROR_REPORT;
 		$T4=(T4_COMING==false)? "false":"true";
-		$GP_ENABLE=(GP_ENABLE==false)? "false":"true";
 		$QUEST=(QUEST==false)? "false":"true";
 		$WW=(WW==false)? "false":"true";
 		$SHOW_NATARS=(SHOW_NATARS==false)? "false":"true";
@@ -80,119 +79,117 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
 		$NEW_FUNCTION_TRIBE_VIKINGS = (defined('NEW_FUNCTION_TRIBE_VIKINGS') && NEW_FUNCTION_TRIBE_VIKINGS ? 'true' : 'false');
 
 		$text = admin_config_template_contents();
-		$text = preg_replace("'%ERRORREPORT%'", ERROR_REPORT, $text);
-		$text = preg_replace("'%ERROR%'", ERROR_REPORT, $text);
-		$text = preg_replace("'%SERVERNAME%'", SERVER_NAME, $text);
-		$text = preg_replace("'%STIMEZONE%'", TIMEZONE, $text);
-		$text = preg_replace("'%STARTTIME%'", COMMENCE, $text);
-		$text = preg_replace("'%SSTARTDATE%'", START_DATE, $text);
-		$text = preg_replace("'%SSTARTTIME%'", START_TIME, $text);
-		$text = preg_replace("'%LANG%'", (defined('SERVER_LANG') ? SERVER_LANG : LANG), $text);
-		$text = preg_replace("'%SPEED%'", SPEED, $text);
-		$text = preg_replace("'%MAX%'", WORLD_MAX, $text);
-		$text = preg_replace("'%GP%'", GP_ENABLE, $text);
-		$text = preg_replace("'%GP_LOCATE%'", GP_LOCATE, $text);
-		$text = preg_replace("'%INCSPEED%'", INCREASE_SPEED, $text);
-		$text = preg_replace("'%EVASIONSPEED%'", EVASION_SPEED, $text);
-		$text = preg_replace("'%TRADERCAP%'", TRADER_CAPACITY, $text);
-		$text = preg_replace("'%CRANNYCAP%'", CRANNY_CAPACITY, $text);
-		$text = preg_replace("'%TRAPPERCAP%'", TRAPPER_CAPACITY, $text);
-		$text = preg_replace("'%VILLAGE_EXPAND%'", CP, $text);
-		$text = preg_replace("'%DEMOLISH%'", DEMOLISH_LEVEL_REQ, $text);
-		$text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text);
-		$text = preg_replace("'%QUEST%'", QUEST, $text);
-		$text = preg_replace("'%QTYPE%'", QTYPE, $text);
-		$text = preg_replace("'%BEGINNER%'", PROTECTION, $text);
-		$text = preg_replace("'%WW%'", (WW ? 'true' : 'false'), $text);
-		$text = preg_replace("'%SHOW_NATARS%'", (SHOW_NATARS ? 'true' : 'false'), $text);
-		$text = preg_replace("'%NATARS_UNITS%'", NATARS_UNITS, $text);
-		$text = preg_replace("'%NATARS_SPAWN_TIME%'", NATARS_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATARS_WW_SPAWN_TIME%'", NATARS_WW_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%'", NATARS_WW_BUILDING_PLAN_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATURE_REGTIME%'", NATURE_REGTIME, $text);
-		$text = preg_replace("'%OASIS_WOOD_MULTIPLIER%'", OASIS_WOOD_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_CLAY_MULTIPLIER%'", OASIS_CLAY_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_IRON_MULTIPLIER%'", OASIS_IRON_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_CROP_MULTIPLIER%'", OASIS_CROP_MULTIPLIER, $text);
-		$text = preg_replace("'%T4_COMING%'", (T4_COMING ? 'true' : 'false'), $text);
-		$text = preg_replace("'%ACTIVATE%'", (AUTH_EMAIL ? 'true' : 'false'), $text);
-		$text = preg_replace("'%MEDALINTERVAL%'", MEDALINTERVAL, $text);
-		$text = preg_replace("'%GREAT_WKS%'", (GREAT_WKS ? 'true' : 'false'), $text);
-		$text = preg_replace("'%TS_THRESHOLD%'", TS_THRESHOLD, $text);
-		$text = preg_replace("'%REG_OPEN%'", REG_OPEN, $text);
-		$text = preg_replace("'%PEACE%'", PEACE, $text);
-		$text = preg_replace("'%LOGBUILD%'", (LOG_BUILD ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGTECH%'", (LOG_TECH ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGLOGIN%'", (LOG_LOGIN ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGGOLDFIN%'", (LOG_GOLD_FIN ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGADMIN%'", (LOG_ADMIN ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGWAR%'", (LOG_WAR ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGMARKET%'", (LOG_MARKET ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGILLEGAL%'", (LOG_ILLEGAL ? 'true' : 'false'), $text);
-		$text = preg_replace("'%BOX1%'", (NEWSBOX1 ? 'true' : 'false'), $text);
-		$text = preg_replace("'%BOX2%'", (NEWSBOX2 ? 'true' : 'false'), $text);
-		$text = preg_replace("'%BOX3%'", (NEWSBOX3 ? 'true' : 'false'), $text);
-		$text = preg_replace("'%SSERVER%'", SQL_SERVER, $text);
+		tz_config_set($text, '%ERRORREPORT%', ERROR_REPORT);
+		tz_config_set($text, '%ERROR%', ERROR_REPORT, 'code');
+		tz_config_set($text, '%SERVERNAME%', SERVER_NAME);
+		tz_config_set($text, '%STIMEZONE%', TIMEZONE);
+		tz_config_set($text, '%STARTTIME%', COMMENCE);
+		tz_config_set($text, '%SSTARTDATE%', START_DATE);
+		tz_config_set($text, '%SSTARTTIME%', START_TIME);
+		tz_config_set($text, '%LANG%', (defined('SERVER_LANG') ? SERVER_LANG : LANG));
+		tz_config_set($text, '%SPEED%', SPEED);
+		tz_config_set($text, '%MAX%', WORLD_MAX);
+		tz_config_set($text, '%INCSPEED%', INCREASE_SPEED);
+		tz_config_set($text, '%EVASIONSPEED%', EVASION_SPEED);
+		tz_config_set($text, '%TRADERCAP%', TRADER_CAPACITY);
+		tz_config_set($text, '%CRANNYCAP%', CRANNY_CAPACITY);
+		tz_config_set($text, '%TRAPPERCAP%', TRAPPER_CAPACITY);
+		tz_config_set($text, '%VILLAGE_EXPAND%', CP);
+		tz_config_set($text, '%DEMOLISH%', DEMOLISH_LEVEL_REQ);
+		tz_config_set($text, '%STORAGE_MULTIPLIER%', STORAGE_MULTIPLIER);
+		tz_config_set($text, '%QUEST%', QUEST);
+		tz_config_set($text, '%QTYPE%', QTYPE);
+		tz_config_set($text, '%BEGINNER%', PROTECTION);
+		tz_config_set($text, '%WW%', (WW ? 'true' : 'false'));
+		tz_config_set($text, '%SHOW_NATARS%', (SHOW_NATARS ? 'true' : 'false'));
+		tz_config_set($text, '%NATARS_UNITS%', NATARS_UNITS);
+		tz_config_set($text, '%NATARS_SPAWN_TIME%', NATARS_SPAWN_TIME);
+		tz_config_set($text, '%NATARS_WW_SPAWN_TIME%', NATARS_WW_SPAWN_TIME);
+		tz_config_set($text, '%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%', NATARS_WW_BUILDING_PLAN_SPAWN_TIME);
+		tz_config_set($text, '%NATURE_REGTIME%', NATURE_REGTIME);
+		tz_config_set($text, '%OASIS_WOOD_MULTIPLIER%', OASIS_WOOD_MULTIPLIER);
+		tz_config_set($text, '%OASIS_CLAY_MULTIPLIER%', OASIS_CLAY_MULTIPLIER);
+		tz_config_set($text, '%OASIS_IRON_MULTIPLIER%', OASIS_IRON_MULTIPLIER);
+		tz_config_set($text, '%OASIS_CROP_MULTIPLIER%', OASIS_CROP_MULTIPLIER);
+		tz_config_set($text, '%T4_COMING%', (T4_COMING ? 'true' : 'false'));
+		tz_config_set($text, '%ACTIVATE%', (AUTH_EMAIL ? 'true' : 'false'));
+		tz_config_set($text, '%MEDALINTERVAL%', MEDALINTERVAL);
+		tz_config_set($text, '%GREAT_WKS%', (GREAT_WKS ? 'true' : 'false'));
+		tz_config_set($text, '%TS_THRESHOLD%', TS_THRESHOLD);
+		tz_config_set($text, '%REG_OPEN%', REG_OPEN);
+		tz_config_set($text, '%PEACE%', PEACE);
+		tz_config_set($text, '%LOGBUILD%', (LOG_BUILD ? 'true' : 'false'));
+		tz_config_set($text, '%LOGTECH%', (LOG_TECH ? 'true' : 'false'));
+		tz_config_set($text, '%LOGLOGIN%', (LOG_LOGIN ? 'true' : 'false'));
+		tz_config_set($text, '%LOGGOLDFIN%', (LOG_GOLD_FIN ? 'true' : 'false'));
+		tz_config_set($text, '%LOGADMIN%', (LOG_ADMIN ? 'true' : 'false'));
+		tz_config_set($text, '%LOGWAR%', (LOG_WAR ? 'true' : 'false'));
+		tz_config_set($text, '%LOGMARKET%', (LOG_MARKET ? 'true' : 'false'));
+		tz_config_set($text, '%LOGILLEGAL%', (LOG_ILLEGAL ? 'true' : 'false'));
+		tz_config_set($text, '%BOX1%', (NEWSBOX1 ? 'true' : 'false'));
+		tz_config_set($text, '%BOX2%', (NEWSBOX2 ? 'true' : 'false'));
+		tz_config_set($text, '%BOX3%', (NEWSBOX3 ? 'true' : 'false'));
+		tz_config_set($text, '%SSERVER%', SQL_SERVER);
 		$text = str_replace("%SPORT%", SQL_PORT, $text);
-		$text = preg_replace("'%SUSER%'", SQL_USER, $text);
-		$text = preg_replace("'%SPASS%'", SQL_PASS, $text);
-		$text = preg_replace("'%SDB%'", SQL_DB, $text);
-		$text = preg_replace("'%PREFIX%'", TB_PREFIX, $text);
-		$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
-		$text = preg_replace("'%LIMIT_MAILBOX%'", $_POST['limit_mailbox'], $text);
-		$text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text);
-		$text = preg_replace("'%ARANK%'", (INCLUDE_ADMIN ? 'true' : 'false'), $text);
-		$text = preg_replace("'%AEMAIL%'", ADMIN_EMAIL, $text);
-		$text = preg_replace("'%ANAME%'", ADMIN_NAME, $text);
-		$text = preg_replace("'%ASUPPMSGS%'", $SUPPORT_MSGS_IN_ADMIN, $text);
-		$text = preg_replace("'%ARAIDS%'", $ADMINS_RAIDABLE, $text);
-		$text = preg_replace("'%UTRACK%'", "TRACK_USR", $text); // not in use, text only in a comment
-		$text = preg_replace("'%UTOUT%'", "USER_TIMEOUT", $text); // not in use, text only in a comment
-		$text = preg_replace("'%DOMAIN%'", DOMAIN, $text);
-		$text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text);
-		$text = preg_replace("'%SERVER%'", SERVER, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_OASIS%'", $NEW_FUNCTIONS_OASIS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_ALLIANCE_INVITATION%'", $NEW_FUNCTIONS_ALLIANCE_INVITATION, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_EMBASSY_MECHANICS%'", $NEW_FUNCTIONS_EMBASSY_MECHANICS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_FORUM_POST_MESSAGE%'", $NEW_FUNCTIONS_FORUM_POST_MESSAGE, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_TRIBE_IMAGES%'", $NEW_FUNCTIONS_TRIBE_IMAGES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MHS_IMAGES%'", $NEW_FUNCTIONS_MHS_IMAGES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_ARTIFACT%'", $NEW_FUNCTIONS_DISPLAY_ARTIFACT, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_WONDER%'", $NEW_FUNCTIONS_DISPLAY_WONDER, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_VACATION%'", $NEW_FUNCTIONS_VACATION, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%'", $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MANUAL_NATURENATARS%'", $NEW_FUNCTIONS_MANUAL_NATURENATARS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_LINKS%'", $NEW_FUNCTIONS_DISPLAY_LINKS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_3YEAR%'", $NEW_FUNCTIONS_MEDAL_3YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_5YEAR%'", $NEW_FUNCTIONS_MEDAL_5YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_10YEAR%'", $NEW_FUNCTIONS_MEDAL_10YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM%'", $NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MILESTONES%'", $NEW_FUNCTIONS_MILESTONES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_RESET%'", $NEW_FUNCTIONS_MEDAL_RESET, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_HERO_T4%'", $NEW_FUNCTIONS_HERO_T4, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_HUNS%'", $NEW_FUNCTION_TRIBE_HUNS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_EGIPTEANS%'", $NEW_FUNCTION_TRIBE_EGIPTEANS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_SPARTANS%'", $NEW_FUNCTION_TRIBE_SPARTANS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_VIKINGS%'", $NEW_FUNCTION_TRIBE_VIKINGS, $text);
+		tz_config_set($text, '%SUSER%', SQL_USER);
+		tz_config_set($text, '%SPASS%', SQL_PASS);
+		tz_config_set($text, '%SDB%', SQL_DB);
+		tz_config_set($text, '%PREFIX%', TB_PREFIX);
+		tz_config_set($text, '%CONNECTT%', DB_TYPE);
+		tz_config_set($text, '%LIMIT_MAILBOX%', $_POST['limit_mailbox'] ?? '');
+		tz_config_set($text, '%MAX_MAILS%', MAX_MAIL);
+		tz_config_set($text, '%ARANK%', (INCLUDE_ADMIN ? 'true' : 'false'));
+		tz_config_set($text, '%AEMAIL%', ADMIN_EMAIL);
+		tz_config_set($text, '%ANAME%', ADMIN_NAME);
+		tz_config_set($text, '%ASUPPMSGS%', $SUPPORT_MSGS_IN_ADMIN);
+		tz_config_set($text, '%ARAIDS%', $ADMINS_RAIDABLE);
+		tz_config_set($text, '%UTRACK%', "TRACK_USR"); // not in use, text only in a comment
+		tz_config_set($text, '%UTOUT%', "USER_TIMEOUT"); // not in use, text only in a comment
+		tz_config_set($text, '%DOMAIN%', DOMAIN);
+		tz_config_set($text, '%HOMEPAGE%', HOMEPAGE);
+		tz_config_set($text, '%SERVER%', SERVER);
+		tz_config_set($text, '%NEW_FUNCTIONS_OASIS%', $NEW_FUNCTIONS_OASIS);
+		tz_config_set($text, '%NEW_FUNCTIONS_ALLIANCE_INVITATION%', $NEW_FUNCTIONS_ALLIANCE_INVITATION);
+		tz_config_set($text, '%NEW_FUNCTIONS_EMBASSY_MECHANICS%', $NEW_FUNCTIONS_EMBASSY_MECHANICS);
+		tz_config_set($text, '%NEW_FUNCTIONS_FORUM_POST_MESSAGE%', $NEW_FUNCTIONS_FORUM_POST_MESSAGE);
+		tz_config_set($text, '%NEW_FUNCTIONS_TRIBE_IMAGES%', $NEW_FUNCTIONS_TRIBE_IMAGES);
+		tz_config_set($text, '%NEW_FUNCTIONS_MHS_IMAGES%', $NEW_FUNCTIONS_MHS_IMAGES);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_ARTIFACT%', $NEW_FUNCTIONS_DISPLAY_ARTIFACT);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_WONDER%', $NEW_FUNCTIONS_DISPLAY_WONDER);
+		tz_config_set($text, '%NEW_FUNCTIONS_VACATION%', $NEW_FUNCTIONS_VACATION);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%', $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET);
+		tz_config_set($text, '%NEW_FUNCTIONS_MANUAL_NATURENATARS%', $NEW_FUNCTIONS_MANUAL_NATURENATARS);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_LINKS%', $NEW_FUNCTIONS_DISPLAY_LINKS);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_3YEAR%', $NEW_FUNCTIONS_MEDAL_3YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_5YEAR%', $NEW_FUNCTIONS_MEDAL_5YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_10YEAR%', $NEW_FUNCTIONS_MEDAL_10YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM%', $NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM);
+		tz_config_set($text, '%NEW_FUNCTIONS_MILESTONES%', $NEW_FUNCTIONS_MILESTONES);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_RESET%', $NEW_FUNCTIONS_MEDAL_RESET);
+		tz_config_set($text, '%NEW_FUNCTIONS_HERO_T4%', $NEW_FUNCTIONS_HERO_T4);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_HUNS%', $NEW_FUNCTION_TRIBE_HUNS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_EGIPTEANS%', $NEW_FUNCTION_TRIBE_EGIPTEANS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_SPARTANS%', $NEW_FUNCTION_TRIBE_SPARTANS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_VIKINGS%', $NEW_FUNCTION_TRIBE_VIKINGS);
 		// Preserve registration-bonus-gold settings (owned by editNewFunctions.php).
-		$text = preg_replace("'%NEW_FUNCTION_REGISTRATION_GOLD%'", (defined('NEW_FUNCTION_REGISTRATION_GOLD') && NEW_FUNCTION_REGISTRATION_GOLD ? 'true' : 'false'), $text);
-		$text = preg_replace("'%NEW_FUNCTION_REGISTRATION_GOLD_VALUE%'", (string) (defined('NEW_FUNCTION_REGISTRATION_GOLD_VALUE') ? (int) NEW_FUNCTION_REGISTRATION_GOLD_VALUE : 200), $text);
+		tz_config_set($text, '%NEW_FUNCTION_REGISTRATION_GOLD%', (defined('NEW_FUNCTION_REGISTRATION_GOLD') && NEW_FUNCTION_REGISTRATION_GOLD ? 'true' : 'false'));
+		tz_config_set($text, '%NEW_FUNCTION_REGISTRATION_GOLD_VALUE%', (string) (defined('NEW_FUNCTION_REGISTRATION_GOLD_VALUE') ? (int) NEW_FUNCTION_REGISTRATION_GOLD_VALUE : 200));
 
 		// PLUS settings need to be kept intact
-		$text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text);
-		$text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text);
-		$text = preg_replace("'%PAYPAL_EMAIL%'", (defined('PAYPAL_EMAIL') ? PAYPAL_EMAIL : 'martin@martinambrus.com'), $text);
-		$text = preg_replace("'%PAYPAL_CURRENCY%'", (defined('PAYPAL_CURRENCY') ? PAYPAL_CURRENCY : 'EUR'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_A_PRICE%'", (defined('PLUS_PACKAGE_A_PRICE') ? PLUS_PACKAGE_A_PRICE : '1,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_A_GOLD%'", (defined('PLUS_PACKAGE_A_GOLD') ? PLUS_PACKAGE_A_GOLD : '60'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_B_PRICE%'", (defined('PLUS_PACKAGE_B_PRICE') ? PLUS_PACKAGE_B_PRICE : '4,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_B_GOLD%'", (defined('PLUS_PACKAGE_B_GOLD') ? PLUS_PACKAGE_B_GOLD : '120'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_C_PRICE%'", (defined('PLUS_PACKAGE_C_PRICE') ? PLUS_PACKAGE_C_PRICE : '9,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_C_GOLD%'", (defined('PLUS_PACKAGE_C_GOLD') ? PLUS_PACKAGE_C_GOLD : '360'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_D_PRICE%'", (defined('PLUS_PACKAGE_D_PRICE') ? PLUS_PACKAGE_D_PRICE : '19,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_D_GOLD%'", (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_E_PRICE%'", (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_E_GOLD%'", (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'), $text);
+		tz_config_set($text, '%PLUS_TIME%', PLUS_TIME);
+		tz_config_set($text, '%PLUS_PRODUCTION%', PLUS_PRODUCTION);
+		tz_config_set($text, '%PAYPAL_EMAIL%', (defined('PAYPAL_EMAIL') ? PAYPAL_EMAIL : 'martin@martinambrus.com'));
+		tz_config_set($text, '%PAYPAL_CURRENCY%', (defined('PAYPAL_CURRENCY') ? PAYPAL_CURRENCY : 'EUR'));
+		tz_config_set($text, '%PLUS_PACKAGE_A_PRICE%', (defined('PLUS_PACKAGE_A_PRICE') ? PLUS_PACKAGE_A_PRICE : '1,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_A_GOLD%', (defined('PLUS_PACKAGE_A_GOLD') ? PLUS_PACKAGE_A_GOLD : '60'));
+		tz_config_set($text, '%PLUS_PACKAGE_B_PRICE%', (defined('PLUS_PACKAGE_B_PRICE') ? PLUS_PACKAGE_B_PRICE : '4,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_B_GOLD%', (defined('PLUS_PACKAGE_B_GOLD') ? PLUS_PACKAGE_B_GOLD : '120'));
+		tz_config_set($text, '%PLUS_PACKAGE_C_PRICE%', (defined('PLUS_PACKAGE_C_PRICE') ? PLUS_PACKAGE_C_PRICE : '9,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_C_GOLD%', (defined('PLUS_PACKAGE_C_GOLD') ? PLUS_PACKAGE_C_GOLD : '360'));
+		tz_config_set($text, '%PLUS_PACKAGE_D_PRICE%', (defined('PLUS_PACKAGE_D_PRICE') ? PLUS_PACKAGE_D_PRICE : '19,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_D_GOLD%', (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'));
+		tz_config_set($text, '%PLUS_PACKAGE_E_PRICE%', (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_E_GOLD%', (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'));
 
 		fwrite($fh, $text);
 		fclose($fh);
diff --git a/GameEngine/Admin/Mods/editLogSet.php b/GameEngine/Admin/Mods/editLogSet.php
index 271d46f6..03040f27 100755
--- a/GameEngine/Admin/Mods/editLogSet.php
+++ b/GameEngine/Admin/Mods/editLogSet.php
@@ -36,7 +36,6 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
 
 		$ERRORREPORT=ERROR_REPORT;
 		$T4=(T4_COMING==false)? "false":"true";
-		$GP_ENABLE=(GP_ENABLE==false)? "false":"true";
 		$QUEST=(QUEST==false)? "false":"true";
 		$WW=(WW==false)? "false":"true";
 		$SHOW_NATARS=(SHOW_NATARS==false)? "false":"true";
@@ -76,123 +75,121 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
 		$NEW_FUNCTION_TRIBE_VIKINGS = (defined('NEW_FUNCTION_TRIBE_VIKINGS') && NEW_FUNCTION_TRIBE_VIKINGS ? 'true' : 'false');
 
 		$text = admin_config_template_contents();
-		$text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text);
-		$text = preg_replace("'%ERROR%'", $ERRORREPORT, $text);
-		$text = preg_replace("'%SERVERNAME%'", SERVER_NAME, $text);
-		$text = preg_replace("'%STIMEZONE%'", TIMEZONE, $text);
-		$text = preg_replace("'%STARTTIME%'", COMMENCE, $text);
-		$text = preg_replace("'%SSTARTDATE%'", START_DATE, $text);
-		$text = preg_replace("'%SSTARTTIME%'", START_TIME, $text);
-		$text = preg_replace("'%LANG%'", (defined('SERVER_LANG') ? SERVER_LANG : LANG), $text);
-		$text = preg_replace("'%SPEED%'", SPEED, $text);
-		$text = preg_replace("'%MAX%'", WORLD_MAX, $text);
-		$text = preg_replace("'%GP%'", $GP_ENABLE, $text);
-		$text = preg_replace("'%GP_LOCATE%'", "gpack/travian_default/", $text);
-		$text = preg_replace("'%INCSPEED%'", INCREASE_SPEED, $text);
-		$text = preg_replace("'%EVASIONSPEED%'", EVASION_SPEED, $text);
-		$text = preg_replace("'%TRADERCAP%'", TRADER_CAPACITY, $text);
-		$text = preg_replace("'%CRANNYCAP%'", CRANNY_CAPACITY, $text);
-		$text = preg_replace("'%TRAPPERCAP%'", TRAPPER_CAPACITY, $text);
-		$text = preg_replace("'%VILLAGE_EXPAND%'", CP, $text);
-		$text = preg_replace("'%DEMOLISH%'", DEMOLISH_LEVEL_REQ, $text);
-		$text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text);
-		$text = preg_replace("'%QUEST%'", $QUEST, $text);
-		$text = preg_replace("'%QTYPE%'", QTYPE, $text);
-		$text = preg_replace("'%BEGINNER%'", PROTECTION, $text);
-		$text = preg_replace("'%WW%'", $WW, $text);
-		$text = preg_replace("'%SHOW_NATARS%'", $SHOW_NATARS, $text);
-		$text = preg_replace("'%NATARS_UNITS%'", NATARS_UNITS, $text);
-		$text = preg_replace("'%NATARS_SPAWN_TIME%'", NATARS_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATARS_WW_SPAWN_TIME%'", NATARS_WW_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%'", NATARS_WW_BUILDING_PLAN_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATURE_REGTIME%'", NATURE_REGTIME, $text);
-		$text = preg_replace("'%OASIS_WOOD_MULTIPLIER%'", OASIS_WOOD_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_CLAY_MULTIPLIER%'", OASIS_CLAY_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_IRON_MULTIPLIER%'", OASIS_IRON_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_CROP_MULTIPLIER%'", OASIS_CROP_MULTIPLIER, $text);
-		$text = preg_replace("'%T4_COMING%'", $T4, $text);
-		$text = preg_replace("'%ACTIVATE%'", $AUTH_EMAIL, $text);
-		$text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text);
-		$text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text);
-		$text = preg_replace("'%MEDALINTERVAL%'", MEDALINTERVAL, $text);
-		$text = preg_replace("'%GREAT_WKS%'", $GREAT_WKS, $text);
-		$text = preg_replace("'%TS_THRESHOLD%'", TS_THRESHOLD, $text);
-		$text = preg_replace("'%REG_OPEN%'", $REG_OPEN, $text);
-		$text = preg_replace("'%PEACE%'", PEACE, $text);
+		tz_config_set($text, '%ERRORREPORT%', $ERRORREPORT);
+		tz_config_set($text, '%ERROR%', $ERRORREPORT, 'code');
+		tz_config_set($text, '%SERVERNAME%', SERVER_NAME);
+		tz_config_set($text, '%STIMEZONE%', TIMEZONE);
+		tz_config_set($text, '%STARTTIME%', COMMENCE);
+		tz_config_set($text, '%SSTARTDATE%', START_DATE);
+		tz_config_set($text, '%SSTARTTIME%', START_TIME);
+		tz_config_set($text, '%LANG%', (defined('SERVER_LANG') ? SERVER_LANG : LANG));
+		tz_config_set($text, '%SPEED%', SPEED);
+		tz_config_set($text, '%MAX%', WORLD_MAX);
+		tz_config_set($text, '%INCSPEED%', INCREASE_SPEED);
+		tz_config_set($text, '%EVASIONSPEED%', EVASION_SPEED);
+		tz_config_set($text, '%TRADERCAP%', TRADER_CAPACITY);
+		tz_config_set($text, '%CRANNYCAP%', CRANNY_CAPACITY);
+		tz_config_set($text, '%TRAPPERCAP%', TRAPPER_CAPACITY);
+		tz_config_set($text, '%VILLAGE_EXPAND%', CP);
+		tz_config_set($text, '%DEMOLISH%', DEMOLISH_LEVEL_REQ);
+		tz_config_set($text, '%STORAGE_MULTIPLIER%', STORAGE_MULTIPLIER);
+		tz_config_set($text, '%QUEST%', $QUEST);
+		tz_config_set($text, '%QTYPE%', QTYPE);
+		tz_config_set($text, '%BEGINNER%', PROTECTION);
+		tz_config_set($text, '%WW%', $WW);
+		tz_config_set($text, '%SHOW_NATARS%', $SHOW_NATARS);
+		tz_config_set($text, '%NATARS_UNITS%', NATARS_UNITS);
+		tz_config_set($text, '%NATARS_SPAWN_TIME%', NATARS_SPAWN_TIME);
+		tz_config_set($text, '%NATARS_WW_SPAWN_TIME%', NATARS_WW_SPAWN_TIME);
+		tz_config_set($text, '%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%', NATARS_WW_BUILDING_PLAN_SPAWN_TIME);
+		tz_config_set($text, '%NATURE_REGTIME%', NATURE_REGTIME);
+		tz_config_set($text, '%OASIS_WOOD_MULTIPLIER%', OASIS_WOOD_MULTIPLIER);
+		tz_config_set($text, '%OASIS_CLAY_MULTIPLIER%', OASIS_CLAY_MULTIPLIER);
+		tz_config_set($text, '%OASIS_IRON_MULTIPLIER%', OASIS_IRON_MULTIPLIER);
+		tz_config_set($text, '%OASIS_CROP_MULTIPLIER%', OASIS_CROP_MULTIPLIER);
+		tz_config_set($text, '%T4_COMING%', $T4);
+		tz_config_set($text, '%ACTIVATE%', $AUTH_EMAIL);
+		tz_config_set($text, '%PLUS_TIME%', PLUS_TIME);
+		tz_config_set($text, '%PLUS_PRODUCTION%', PLUS_PRODUCTION);
+		tz_config_set($text, '%MEDALINTERVAL%', MEDALINTERVAL);
+		tz_config_set($text, '%GREAT_WKS%', $GREAT_WKS);
+		tz_config_set($text, '%TS_THRESHOLD%', TS_THRESHOLD);
+		tz_config_set($text, '%REG_OPEN%', $REG_OPEN);
+		tz_config_set($text, '%PEACE%', PEACE);
 		//update
-		$text = preg_replace("'%LOGBUILD%'", $_POST['log_build'], $text);
-		$text = preg_replace("'%LOGTECH%'", $_POST['log_tech'], $text);
-		$text = preg_replace("'%LOGLOGIN%'", $_POST['log_login'], $text);
-		$text = preg_replace("'%LOGGOLDFIN%'", $_POST['log_gold_fin'], $text);
-		$text = preg_replace("'%LOGADMIN%'", $_POST['log_admin'], $text);
-		$text = preg_replace("'%LOGWAR%'", $_POST['log_war'], $text);
-		$text = preg_replace("'%LOGMARKET%'", $_POST['log_market'], $text);
-		$text = preg_replace("'%LOGILLEGAL%'", $_POST['log_illegal'], $text);
+		tz_config_set($text, '%LOGBUILD%', $_POST['log_build'] ?? '');
+		tz_config_set($text, '%LOGTECH%', $_POST['log_tech'] ?? '');
+		tz_config_set($text, '%LOGLOGIN%', $_POST['log_login'] ?? '');
+		tz_config_set($text, '%LOGGOLDFIN%', $_POST['log_gold_fin'] ?? '');
+		tz_config_set($text, '%LOGADMIN%', $_POST['log_admin'] ?? '');
+		tz_config_set($text, '%LOGWAR%', $_POST['log_war'] ?? '');
+		tz_config_set($text, '%LOGMARKET%', $_POST['log_market'] ?? '');
+		tz_config_set($text, '%LOGILLEGAL%', $_POST['log_illegal'] ?? '');
 		//end update
-		$text = preg_replace("'%BOX1%'", $NEWSBOX1, $text);
-		$text = preg_replace("'%BOX2%'", $NEWSBOX2, $text);
-		$text = preg_replace("'%BOX3%'", $NEWSBOX3, $text);
-		$text = preg_replace("'%SSERVER%'", SQL_SERVER, $text);
+		tz_config_set($text, '%BOX1%', $NEWSBOX1);
+		tz_config_set($text, '%BOX2%', $NEWSBOX2);
+		tz_config_set($text, '%BOX3%', $NEWSBOX3);
+		tz_config_set($text, '%SSERVER%', SQL_SERVER);
 		$text = str_replace("%SPORT%", SQL_PORT, $text);
-		$text = preg_replace("'%SUSER%'", SQL_USER, $text);
-		$text = preg_replace("'%SPASS%'", SQL_PASS, $text);
-		$text = preg_replace("'%SDB%'", SQL_DB, $text);
-		$text = preg_replace("'%PREFIX%'", TB_PREFIX, $text);
-		$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
-		$text = preg_replace("'%LIMIT_MAILBOX%'", $LIMIT_MAILBOX, $text);
-		$text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text);
-		$text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text);
-		$text = preg_replace("'%AEMAIL%'", ADMIN_EMAIL, $text);
-		$text = preg_replace("'%ANAME%'", ADMIN_NAME, $text);
-		$text = preg_replace("'%ASUPPMSGS%'", $SUPPORT_MSGS_IN_ADMIN, $text);
-		$text = preg_replace("'%ARAIDS%'", $ADMINS_RAIDABLE, $text);
-		$text = preg_replace("'%UTRACK%'", "", $text);
-		$text = preg_replace("'%UTOUT%'", "", $text);
-		$text = preg_replace("'%DOMAIN%'", DOMAIN, $text);
-		$text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text);
-		$text = preg_replace("'%SERVER%'", SERVER, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_OASIS%'", $NEW_FUNCTIONS_OASIS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_ALLIANCE_INVITATION%'", $NEW_FUNCTIONS_ALLIANCE_INVITATION, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_EMBASSY_MECHANICS%'", $NEW_FUNCTIONS_EMBASSY_MECHANICS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_FORUM_POST_MESSAGE%'", $NEW_FUNCTIONS_FORUM_POST_MESSAGE, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_TRIBE_IMAGES%'", $NEW_FUNCTIONS_TRIBE_IMAGES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MHS_IMAGES%'", $NEW_FUNCTIONS_MHS_IMAGES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_ARTIFACT%'", $NEW_FUNCTIONS_DISPLAY_ARTIFACT, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_WONDER%'", $NEW_FUNCTIONS_DISPLAY_WONDER, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_VACATION%'", $NEW_FUNCTIONS_VACATION, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%'", $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MANUAL_NATURENATARS%'", $NEW_FUNCTIONS_MANUAL_NATURENATARS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_LINKS%'", $NEW_FUNCTIONS_DISPLAY_LINKS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_3YEAR%'", $NEW_FUNCTIONS_MEDAL_3YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_5YEAR%'", $NEW_FUNCTIONS_MEDAL_5YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_10YEAR%'", $NEW_FUNCTIONS_MEDAL_10YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM%'", $NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MILESTONES%'", $NEW_FUNCTIONS_MILESTONES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_RESET%'", $NEW_FUNCTIONS_MEDAL_RESET, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_HERO_T4%'", $NEW_FUNCTIONS_HERO_T4, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_HUNS%'", $NEW_FUNCTION_TRIBE_HUNS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_EGIPTEANS%'", $NEW_FUNCTION_TRIBE_EGIPTEANS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_SPARTANS%'", $NEW_FUNCTION_TRIBE_SPARTANS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_VIKINGS%'", $NEW_FUNCTION_TRIBE_VIKINGS, $text);
+		tz_config_set($text, '%SUSER%', SQL_USER);
+		tz_config_set($text, '%SPASS%', SQL_PASS);
+		tz_config_set($text, '%SDB%', SQL_DB);
+		tz_config_set($text, '%PREFIX%', TB_PREFIX);
+		tz_config_set($text, '%CONNECTT%', DB_TYPE);
+		tz_config_set($text, '%LIMIT_MAILBOX%', $LIMIT_MAILBOX);
+		tz_config_set($text, '%MAX_MAILS%', MAX_MAIL);
+		tz_config_set($text, '%ARANK%', $INCLUDE_ADMIN);
+		tz_config_set($text, '%AEMAIL%', ADMIN_EMAIL);
+		tz_config_set($text, '%ANAME%', ADMIN_NAME);
+		tz_config_set($text, '%ASUPPMSGS%', $SUPPORT_MSGS_IN_ADMIN);
+		tz_config_set($text, '%ARAIDS%', $ADMINS_RAIDABLE);
+		tz_config_set($text, '%UTRACK%', "");
+		tz_config_set($text, '%UTOUT%', "");
+		tz_config_set($text, '%DOMAIN%', DOMAIN);
+		tz_config_set($text, '%HOMEPAGE%', HOMEPAGE);
+		tz_config_set($text, '%SERVER%', SERVER);
+		tz_config_set($text, '%NEW_FUNCTIONS_OASIS%', $NEW_FUNCTIONS_OASIS);
+		tz_config_set($text, '%NEW_FUNCTIONS_ALLIANCE_INVITATION%', $NEW_FUNCTIONS_ALLIANCE_INVITATION);
+		tz_config_set($text, '%NEW_FUNCTIONS_EMBASSY_MECHANICS%', $NEW_FUNCTIONS_EMBASSY_MECHANICS);
+		tz_config_set($text, '%NEW_FUNCTIONS_FORUM_POST_MESSAGE%', $NEW_FUNCTIONS_FORUM_POST_MESSAGE);
+		tz_config_set($text, '%NEW_FUNCTIONS_TRIBE_IMAGES%', $NEW_FUNCTIONS_TRIBE_IMAGES);
+		tz_config_set($text, '%NEW_FUNCTIONS_MHS_IMAGES%', $NEW_FUNCTIONS_MHS_IMAGES);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_ARTIFACT%', $NEW_FUNCTIONS_DISPLAY_ARTIFACT);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_WONDER%', $NEW_FUNCTIONS_DISPLAY_WONDER);
+		tz_config_set($text, '%NEW_FUNCTIONS_VACATION%', $NEW_FUNCTIONS_VACATION);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%', $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET);
+		tz_config_set($text, '%NEW_FUNCTIONS_MANUAL_NATURENATARS%', $NEW_FUNCTIONS_MANUAL_NATURENATARS);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_LINKS%', $NEW_FUNCTIONS_DISPLAY_LINKS);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_3YEAR%', $NEW_FUNCTIONS_MEDAL_3YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_5YEAR%', $NEW_FUNCTIONS_MEDAL_5YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_10YEAR%', $NEW_FUNCTIONS_MEDAL_10YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM%', $NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM);
+		tz_config_set($text, '%NEW_FUNCTIONS_MILESTONES%', $NEW_FUNCTIONS_MILESTONES);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_RESET%', $NEW_FUNCTIONS_MEDAL_RESET);
+		tz_config_set($text, '%NEW_FUNCTIONS_HERO_T4%', $NEW_FUNCTIONS_HERO_T4);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_HUNS%', $NEW_FUNCTION_TRIBE_HUNS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_EGIPTEANS%', $NEW_FUNCTION_TRIBE_EGIPTEANS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_SPARTANS%', $NEW_FUNCTION_TRIBE_SPARTANS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_VIKINGS%', $NEW_FUNCTION_TRIBE_VIKINGS);
 		// Preserve registration-bonus-gold settings (owned by editNewFunctions.php).
-		$text = preg_replace("'%NEW_FUNCTION_REGISTRATION_GOLD%'", (defined('NEW_FUNCTION_REGISTRATION_GOLD') && NEW_FUNCTION_REGISTRATION_GOLD ? 'true' : 'false'), $text);
-		$text = preg_replace("'%NEW_FUNCTION_REGISTRATION_GOLD_VALUE%'", (string) (defined('NEW_FUNCTION_REGISTRATION_GOLD_VALUE') ? (int) NEW_FUNCTION_REGISTRATION_GOLD_VALUE : 200), $text);
+		tz_config_set($text, '%NEW_FUNCTION_REGISTRATION_GOLD%', (defined('NEW_FUNCTION_REGISTRATION_GOLD') && NEW_FUNCTION_REGISTRATION_GOLD ? 'true' : 'false'));
+		tz_config_set($text, '%NEW_FUNCTION_REGISTRATION_GOLD_VALUE%', (string) (defined('NEW_FUNCTION_REGISTRATION_GOLD_VALUE') ? (int) NEW_FUNCTION_REGISTRATION_GOLD_VALUE : 200));
 
 		// PLUS settings need to be kept intact
-		$text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text);
-		$text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text);
-		$text = preg_replace("'%PAYPAL_EMAIL%'", (defined('PAYPAL_EMAIL') ? PAYPAL_EMAIL : 'martin@martinambrus.com'), $text);
-		$text = preg_replace("'%PAYPAL_CURRENCY%'", (defined('PAYPAL_CURRENCY') ? PAYPAL_CURRENCY : 'EUR'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_A_PRICE%'", (defined('PLUS_PACKAGE_A_PRICE') ? PLUS_PACKAGE_A_PRICE : '1,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_A_GOLD%'", (defined('PLUS_PACKAGE_A_GOLD') ? PLUS_PACKAGE_A_GOLD : '60'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_B_PRICE%'", (defined('PLUS_PACKAGE_B_PRICE') ? PLUS_PACKAGE_B_PRICE : '4,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_B_GOLD%'", (defined('PLUS_PACKAGE_B_GOLD') ? PLUS_PACKAGE_B_GOLD : '120'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_C_PRICE%'", (defined('PLUS_PACKAGE_C_PRICE') ? PLUS_PACKAGE_C_PRICE : '9,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_C_GOLD%'", (defined('PLUS_PACKAGE_C_GOLD') ? PLUS_PACKAGE_C_GOLD : '360'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_D_PRICE%'", (defined('PLUS_PACKAGE_D_PRICE') ? PLUS_PACKAGE_D_PRICE : '19,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_D_GOLD%'", (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_E_PRICE%'", (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_E_GOLD%'", (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'), $text);
+		tz_config_set($text, '%PLUS_TIME%', PLUS_TIME);
+		tz_config_set($text, '%PLUS_PRODUCTION%', PLUS_PRODUCTION);
+		tz_config_set($text, '%PAYPAL_EMAIL%', (defined('PAYPAL_EMAIL') ? PAYPAL_EMAIL : 'martin@martinambrus.com'));
+		tz_config_set($text, '%PAYPAL_CURRENCY%', (defined('PAYPAL_CURRENCY') ? PAYPAL_CURRENCY : 'EUR'));
+		tz_config_set($text, '%PLUS_PACKAGE_A_PRICE%', (defined('PLUS_PACKAGE_A_PRICE') ? PLUS_PACKAGE_A_PRICE : '1,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_A_GOLD%', (defined('PLUS_PACKAGE_A_GOLD') ? PLUS_PACKAGE_A_GOLD : '60'));
+		tz_config_set($text, '%PLUS_PACKAGE_B_PRICE%', (defined('PLUS_PACKAGE_B_PRICE') ? PLUS_PACKAGE_B_PRICE : '4,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_B_GOLD%', (defined('PLUS_PACKAGE_B_GOLD') ? PLUS_PACKAGE_B_GOLD : '120'));
+		tz_config_set($text, '%PLUS_PACKAGE_C_PRICE%', (defined('PLUS_PACKAGE_C_PRICE') ? PLUS_PACKAGE_C_PRICE : '9,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_C_GOLD%', (defined('PLUS_PACKAGE_C_GOLD') ? PLUS_PACKAGE_C_GOLD : '360'));
+		tz_config_set($text, '%PLUS_PACKAGE_D_PRICE%', (defined('PLUS_PACKAGE_D_PRICE') ? PLUS_PACKAGE_D_PRICE : '19,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_D_GOLD%', (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'));
+		tz_config_set($text, '%PLUS_PACKAGE_E_PRICE%', (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_E_GOLD%', (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'));
 
 		fwrite($fh, $text);
 		fclose($fh);
diff --git a/GameEngine/Admin/Mods/editNewFunctions.php b/GameEngine/Admin/Mods/editNewFunctions.php
index 7f6b4c74..ab72279e 100644
--- a/GameEngine/Admin/Mods/editNewFunctions.php
+++ b/GameEngine/Admin/Mods/editNewFunctions.php
@@ -42,122 +42,120 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
 		$QUEST = (QUEST == false ? 'false' : 'true');
 
 		// SERVER SETTINGS - we need to keep these intact
-		$text = preg_replace("'%ERRORREPORT%'", ERROR_REPORT, $text);
-		$text = preg_replace("'%ERROR%'", ERROR_REPORT, $text);
-		$text = preg_replace("'%SERVERNAME%'", SERVER_NAME, $text);
-		$text = preg_replace("'%STIMEZONE%'", TIMEZONE, $text);
-		$text = preg_replace("'%STARTTIME%'", COMMENCE, $text);
-		$text = preg_replace("'%SSTARTDATE%'", START_DATE, $text);
-		$text = preg_replace("'%SSTARTTIME%'", START_TIME, $text);
-		$text = preg_replace("'%LANG%'", (defined('SERVER_LANG') ? SERVER_LANG : LANG), $text);
-		$text = preg_replace("'%SPEED%'", SPEED, $text);
-		$text = preg_replace("'%MAX%'", WORLD_MAX, $text);
-		$text = preg_replace("'%GP%'", GP_ENABLE, $text);
-		$text = preg_replace("'%GP_LOCATE%'", GP_LOCATE, $text);
-		$text = preg_replace("'%INCSPEED%'", INCREASE_SPEED, $text);
-		$text = preg_replace("'%EVASIONSPEED%'", EVASION_SPEED, $text);
-		$text = preg_replace("'%TRADERCAP%'", TRADER_CAPACITY, $text);
-		$text = preg_replace("'%CRANNYCAP%'", CRANNY_CAPACITY, $text);
-		$text = preg_replace("'%TRAPPERCAP%'", TRAPPER_CAPACITY, $text);
-		$text = preg_replace("'%VILLAGE_EXPAND%'", CP, $text);
-		$text = preg_replace("'%DEMOLISH%'", DEMOLISH_LEVEL_REQ, $text);
-		$text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text);
-		$text = preg_replace("'%QUEST%'", $QUEST, $text);
-		$text = preg_replace("'%QTYPE%'", QTYPE, $text);
-		$text = preg_replace("'%BEGINNER%'", PROTECTION, $text);
-		$text = preg_replace("'%WW%'", (WW ? 'true' : 'false'), $text);
-		$text = preg_replace("'%SHOW_NATARS%'", (SHOW_NATARS ? 'true' : 'false'), $text);
-		$text = preg_replace("'%NATARS_UNITS%'", NATARS_UNITS, $text);
-		$text = preg_replace("'%NATARS_SPAWN_TIME%'", NATARS_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATARS_WW_SPAWN_TIME%'", NATARS_WW_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%'", NATARS_WW_BUILDING_PLAN_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATURE_REGTIME%'", NATURE_REGTIME, $text);
-		$text = preg_replace("'%OASIS_WOOD_MULTIPLIER%'", OASIS_WOOD_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_CLAY_MULTIPLIER%'", OASIS_CLAY_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_IRON_MULTIPLIER%'", OASIS_IRON_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_CROP_MULTIPLIER%'", OASIS_CROP_MULTIPLIER, $text);
-		$text = preg_replace("'%T4_COMING%'", (T4_COMING ? 'true' : 'false'), $text);
-		$text = preg_replace("'%ACTIVATE%'", (AUTH_EMAIL ? 'true' : 'false'), $text);
-		$text = preg_replace("'%MEDALINTERVAL%'", MEDALINTERVAL, $text);
-		$text = preg_replace("'%GREAT_WKS%'", (GREAT_WKS ? 'true' : 'false'), $text);
-		$text = preg_replace("'%TS_THRESHOLD%'", TS_THRESHOLD, $text);
-		$text = preg_replace("'%REG_OPEN%'", $REG_OPEN, $text);
-		$text = preg_replace("'%PEACE%'", PEACE, $text);
-		$text = preg_replace("'%LOGBUILD%'", (LOG_BUILD ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGTECH%'", (LOG_TECH ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGLOGIN%'", (LOG_LOGIN ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGGOLDFIN%'", (LOG_GOLD_FIN ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGADMIN%'", (LOG_ADMIN ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGWAR%'", (LOG_WAR ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGMARKET%'", (LOG_MARKET ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGILLEGAL%'", (LOG_ILLEGAL ? 'true' : 'false'), $text);
-		$text = preg_replace("'%BOX1%'", (NEWSBOX1 ? 'true' : 'false'), $text);
-		$text = preg_replace("'%BOX2%'", (NEWSBOX2 ? 'true' : 'false'), $text);
-		$text = preg_replace("'%BOX3%'", (NEWSBOX3 ? 'true' : 'false'), $text);
-		$text = preg_replace("'%SSERVER%'", SQL_SERVER, $text);
+		tz_config_set($text, '%ERRORREPORT%', ERROR_REPORT);
+		tz_config_set($text, '%ERROR%', ERROR_REPORT, 'code');
+		tz_config_set($text, '%SERVERNAME%', SERVER_NAME);
+		tz_config_set($text, '%STIMEZONE%', TIMEZONE);
+		tz_config_set($text, '%STARTTIME%', COMMENCE);
+		tz_config_set($text, '%SSTARTDATE%', START_DATE);
+		tz_config_set($text, '%SSTARTTIME%', START_TIME);
+		tz_config_set($text, '%LANG%', (defined('SERVER_LANG') ? SERVER_LANG : LANG));
+		tz_config_set($text, '%SPEED%', SPEED);
+		tz_config_set($text, '%MAX%', WORLD_MAX);
+		tz_config_set($text, '%INCSPEED%', INCREASE_SPEED);
+		tz_config_set($text, '%EVASIONSPEED%', EVASION_SPEED);
+		tz_config_set($text, '%TRADERCAP%', TRADER_CAPACITY);
+		tz_config_set($text, '%CRANNYCAP%', CRANNY_CAPACITY);
+		tz_config_set($text, '%TRAPPERCAP%', TRAPPER_CAPACITY);
+		tz_config_set($text, '%VILLAGE_EXPAND%', CP);
+		tz_config_set($text, '%DEMOLISH%', DEMOLISH_LEVEL_REQ);
+		tz_config_set($text, '%STORAGE_MULTIPLIER%', STORAGE_MULTIPLIER);
+		tz_config_set($text, '%QUEST%', $QUEST);
+		tz_config_set($text, '%QTYPE%', QTYPE);
+		tz_config_set($text, '%BEGINNER%', PROTECTION);
+		tz_config_set($text, '%WW%', (WW ? 'true' : 'false'));
+		tz_config_set($text, '%SHOW_NATARS%', (SHOW_NATARS ? 'true' : 'false'));
+		tz_config_set($text, '%NATARS_UNITS%', NATARS_UNITS);
+		tz_config_set($text, '%NATARS_SPAWN_TIME%', NATARS_SPAWN_TIME);
+		tz_config_set($text, '%NATARS_WW_SPAWN_TIME%', NATARS_WW_SPAWN_TIME);
+		tz_config_set($text, '%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%', NATARS_WW_BUILDING_PLAN_SPAWN_TIME);
+		tz_config_set($text, '%NATURE_REGTIME%', NATURE_REGTIME);
+		tz_config_set($text, '%OASIS_WOOD_MULTIPLIER%', OASIS_WOOD_MULTIPLIER);
+		tz_config_set($text, '%OASIS_CLAY_MULTIPLIER%', OASIS_CLAY_MULTIPLIER);
+		tz_config_set($text, '%OASIS_IRON_MULTIPLIER%', OASIS_IRON_MULTIPLIER);
+		tz_config_set($text, '%OASIS_CROP_MULTIPLIER%', OASIS_CROP_MULTIPLIER);
+		tz_config_set($text, '%T4_COMING%', (T4_COMING ? 'true' : 'false'));
+		tz_config_set($text, '%ACTIVATE%', (AUTH_EMAIL ? 'true' : 'false'));
+		tz_config_set($text, '%MEDALINTERVAL%', MEDALINTERVAL);
+		tz_config_set($text, '%GREAT_WKS%', (GREAT_WKS ? 'true' : 'false'));
+		tz_config_set($text, '%TS_THRESHOLD%', TS_THRESHOLD);
+		tz_config_set($text, '%REG_OPEN%', $REG_OPEN);
+		tz_config_set($text, '%PEACE%', PEACE);
+		tz_config_set($text, '%LOGBUILD%', (LOG_BUILD ? 'true' : 'false'));
+		tz_config_set($text, '%LOGTECH%', (LOG_TECH ? 'true' : 'false'));
+		tz_config_set($text, '%LOGLOGIN%', (LOG_LOGIN ? 'true' : 'false'));
+		tz_config_set($text, '%LOGGOLDFIN%', (LOG_GOLD_FIN ? 'true' : 'false'));
+		tz_config_set($text, '%LOGADMIN%', (LOG_ADMIN ? 'true' : 'false'));
+		tz_config_set($text, '%LOGWAR%', (LOG_WAR ? 'true' : 'false'));
+		tz_config_set($text, '%LOGMARKET%', (LOG_MARKET ? 'true' : 'false'));
+		tz_config_set($text, '%LOGILLEGAL%', (LOG_ILLEGAL ? 'true' : 'false'));
+		tz_config_set($text, '%BOX1%', (NEWSBOX1 ? 'true' : 'false'));
+		tz_config_set($text, '%BOX2%', (NEWSBOX2 ? 'true' : 'false'));
+		tz_config_set($text, '%BOX3%', (NEWSBOX3 ? 'true' : 'false'));
+		tz_config_set($text, '%SSERVER%', SQL_SERVER);
 		$text = str_replace("%SPORT%", SQL_PORT, $text);
-		$text = preg_replace("'%SUSER%'", SQL_USER, $text);
-		$text = preg_replace("'%SPASS%'", SQL_PASS, $text);
-		$text = preg_replace("'%SDB%'", SQL_DB, $text);
-		$text = preg_replace("'%PREFIX%'", TB_PREFIX, $text);
-		$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
-		$text = preg_replace("'%LIMIT_MAILBOX%'", (LIMIT_MAILBOX ? 'true' : 'false'), $text);
-		$text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text);
-		$text = preg_replace("'%ARANK%'", (INCLUDE_ADMIN ? 'true' : 'false'), $text);
-		$text = preg_replace("'%AEMAIL%'", ADMIN_EMAIL, $text);
-		$text = preg_replace("'%ANAME%'", ADMIN_NAME, $text);
-		$text = preg_replace("'%ASUPPMSGS%'", $SUPPORT_MSGS_IN_ADMIN, $text);
-		$text = preg_replace("'%ARAIDS%'", $ADMINS_RAIDABLE, $text);
-		$text = preg_replace("'%UTRACK%'", "TRACK_USR", $text); // not in use, text only in a comment
-		$text = preg_replace("'%UTOUT%'", "USER_TIMEOUT", $text); // not in use, text only in a comment
-		$text = preg_replace("'%DOMAIN%'", DOMAIN, $text);
-		$text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text);
-		$text = preg_replace("'%SERVER%'", SERVER, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_OASIS%'", $_POST['new_functions_oasis'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_ALLIANCE_INVITATION%'", $_POST['new_functions_alliance_invitation'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_EMBASSY_MECHANICS%'", $_POST['new_functions_embassy_mechanics'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_FORUM_POST_MESSAGE%'", $_POST['new_functions_forum_post_message'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_TRIBE_IMAGES%'", $_POST['new_functions_tribe_images'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MHS_IMAGES%'", $_POST['new_functions_mhs_images'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_ARTIFACT%'", $_POST['new_functions_display_artifact'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_WONDER%'", $_POST['new_functions_display_wonder'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_VACATION%'", $_POST['new_functions_vacation'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%'", $_POST['new_functions_display_catapult_target'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MANUAL_NATURENATARS%'", $_POST['new_functions_manual_naturenatars'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_LINKS%'", $_POST['new_functions_display_links'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_3YEAR%'", $_POST['new_functions_medal_3year'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_5YEAR%'", $_POST['new_functions_medal_5year'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_10YEAR%'", $_POST['new_functions_medal_10year'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM%'", $_POST['new_functions_special_medals_system'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MILESTONES%'", $_POST['new_functions_milestones'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_RESET%'", $_POST['new_functions_medal_reset'], $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_HERO_T4%'", $_POST['new_functions_hero_t4'], $text);	
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_HUNS%'", $_POST['new_function_tribe_huns'], $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_EGIPTEANS%'", $_POST['new_function_tribe_egipteans'], $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_SPARTANS%'", $_POST['new_function_tribe_spartans'], $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_VIKINGS%'", $_POST['new_function_tribe_vikings'], $text);
+		tz_config_set($text, '%SUSER%', SQL_USER);
+		tz_config_set($text, '%SPASS%', SQL_PASS);
+		tz_config_set($text, '%SDB%', SQL_DB);
+		tz_config_set($text, '%PREFIX%', TB_PREFIX);
+		tz_config_set($text, '%CONNECTT%', DB_TYPE);
+		tz_config_set($text, '%LIMIT_MAILBOX%', (LIMIT_MAILBOX ? 'true' : 'false'));
+		tz_config_set($text, '%MAX_MAILS%', MAX_MAIL);
+		tz_config_set($text, '%ARANK%', (INCLUDE_ADMIN ? 'true' : 'false'));
+		tz_config_set($text, '%AEMAIL%', ADMIN_EMAIL);
+		tz_config_set($text, '%ANAME%', ADMIN_NAME);
+		tz_config_set($text, '%ASUPPMSGS%', $SUPPORT_MSGS_IN_ADMIN);
+		tz_config_set($text, '%ARAIDS%', $ADMINS_RAIDABLE);
+		tz_config_set($text, '%UTRACK%', "TRACK_USR"); // not in use, text only in a comment
+		tz_config_set($text, '%UTOUT%', "USER_TIMEOUT"); // not in use, text only in a comment
+		tz_config_set($text, '%DOMAIN%', DOMAIN);
+		tz_config_set($text, '%HOMEPAGE%', HOMEPAGE);
+		tz_config_set($text, '%SERVER%', SERVER);
+		tz_config_set($text, '%NEW_FUNCTIONS_OASIS%', $_POST['new_functions_oasis'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_ALLIANCE_INVITATION%', $_POST['new_functions_alliance_invitation'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_EMBASSY_MECHANICS%', $_POST['new_functions_embassy_mechanics'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_FORUM_POST_MESSAGE%', $_POST['new_functions_forum_post_message'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_TRIBE_IMAGES%', $_POST['new_functions_tribe_images'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_MHS_IMAGES%', $_POST['new_functions_mhs_images'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_ARTIFACT%', $_POST['new_functions_display_artifact'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_WONDER%', $_POST['new_functions_display_wonder'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_VACATION%', $_POST['new_functions_vacation'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%', $_POST['new_functions_display_catapult_target'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_MANUAL_NATURENATARS%', $_POST['new_functions_manual_naturenatars'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_LINKS%', $_POST['new_functions_display_links'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_3YEAR%', $_POST['new_functions_medal_3year'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_5YEAR%', $_POST['new_functions_medal_5year'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_10YEAR%', $_POST['new_functions_medal_10year'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM%', $_POST['new_functions_special_medals_system'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_MILESTONES%', $_POST['new_functions_milestones'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_RESET%', $_POST['new_functions_medal_reset'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTIONS_HERO_T4%', $_POST['new_functions_hero_t4'] ?? '');	
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_HUNS%', $_POST['new_function_tribe_huns'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_EGIPTEANS%', $_POST['new_function_tribe_egipteans'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_SPARTANS%', $_POST['new_function_tribe_spartans'] ?? '');
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_VIKINGS%', $_POST['new_function_tribe_vikings'] ?? '');
 		// Registration bonus gold: owned by THIS Mod (edited from the New Functions form).
 		$__reg_gold_on  = (isset($_POST['new_function_registration_gold']) && strtolower((string)$_POST['new_function_registration_gold']) === 'true') ? 'true' : 'false';
 		$__reg_gold_val = (int) ($_POST['new_function_registration_gold_value'] ?? 200);
 		if ($__reg_gold_val < 0) { $__reg_gold_val = 0; }
-		$text = preg_replace("'%NEW_FUNCTION_REGISTRATION_GOLD%'", $__reg_gold_on, $text);
-		$text = preg_replace("'%NEW_FUNCTION_REGISTRATION_GOLD_VALUE%'", (string) $__reg_gold_val, $text);
+		tz_config_set($text, '%NEW_FUNCTION_REGISTRATION_GOLD%', $__reg_gold_on);
+		tz_config_set($text, '%NEW_FUNCTION_REGISTRATION_GOLD_VALUE%', (string) $__reg_gold_val);
 
 		// PLUS settings need to be kept intact
-		$text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text);
-		$text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text);
-		$text = preg_replace("'%PAYPAL_EMAIL%'", (defined('PAYPAL_EMAIL') ? PAYPAL_EMAIL : 'martin@martinambrus.com'), $text);
-		$text = preg_replace("'%PAYPAL_CURRENCY%'", (defined('PAYPAL_CURRENCY') ? PAYPAL_CURRENCY : 'EUR'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_A_PRICE%'", (defined('PLUS_PACKAGE_A_PRICE') ? PLUS_PACKAGE_A_PRICE : '1,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_A_GOLD%'", (defined('PLUS_PACKAGE_A_GOLD') ? PLUS_PACKAGE_A_GOLD : '60'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_B_PRICE%'", (defined('PLUS_PACKAGE_B_PRICE') ? PLUS_PACKAGE_B_PRICE : '4,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_B_GOLD%'", (defined('PLUS_PACKAGE_B_GOLD') ? PLUS_PACKAGE_B_GOLD : '120'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_C_PRICE%'", (defined('PLUS_PACKAGE_C_PRICE') ? PLUS_PACKAGE_C_PRICE : '9,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_C_GOLD%'", (defined('PLUS_PACKAGE_C_GOLD') ? PLUS_PACKAGE_C_GOLD : '360'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_D_PRICE%'", (defined('PLUS_PACKAGE_D_PRICE') ? PLUS_PACKAGE_D_PRICE : '19,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_D_GOLD%'", (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_E_PRICE%'", (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_E_GOLD%'", (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'), $text);
+		tz_config_set($text, '%PLUS_TIME%', PLUS_TIME);
+		tz_config_set($text, '%PLUS_PRODUCTION%', PLUS_PRODUCTION);
+		tz_config_set($text, '%PAYPAL_EMAIL%', (defined('PAYPAL_EMAIL') ? PAYPAL_EMAIL : 'martin@martinambrus.com'));
+		tz_config_set($text, '%PAYPAL_CURRENCY%', (defined('PAYPAL_CURRENCY') ? PAYPAL_CURRENCY : 'EUR'));
+		tz_config_set($text, '%PLUS_PACKAGE_A_PRICE%', (defined('PLUS_PACKAGE_A_PRICE') ? PLUS_PACKAGE_A_PRICE : '1,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_A_GOLD%', (defined('PLUS_PACKAGE_A_GOLD') ? PLUS_PACKAGE_A_GOLD : '60'));
+		tz_config_set($text, '%PLUS_PACKAGE_B_PRICE%', (defined('PLUS_PACKAGE_B_PRICE') ? PLUS_PACKAGE_B_PRICE : '4,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_B_GOLD%', (defined('PLUS_PACKAGE_B_GOLD') ? PLUS_PACKAGE_B_GOLD : '120'));
+		tz_config_set($text, '%PLUS_PACKAGE_C_PRICE%', (defined('PLUS_PACKAGE_C_PRICE') ? PLUS_PACKAGE_C_PRICE : '9,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_C_GOLD%', (defined('PLUS_PACKAGE_C_GOLD') ? PLUS_PACKAGE_C_GOLD : '360'));
+		tz_config_set($text, '%PLUS_PACKAGE_D_PRICE%', (defined('PLUS_PACKAGE_D_PRICE') ? PLUS_PACKAGE_D_PRICE : '19,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_D_GOLD%', (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'));
+		tz_config_set($text, '%PLUS_PACKAGE_E_PRICE%', (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_E_GOLD%', (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'));
 
 		fwrite($fh, $text);
 		fclose($fh);
diff --git a/GameEngine/Admin/Mods/editNewsboxSet.php b/GameEngine/Admin/Mods/editNewsboxSet.php
index 67292fff..b7bf3b96 100755
--- a/GameEngine/Admin/Mods/editNewsboxSet.php
+++ b/GameEngine/Admin/Mods/editNewsboxSet.php
@@ -36,7 +36,6 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
 
 		$ERRORREPORT=ERROR_REPORT;
 		$T4=(T4_COMING==false)? "false":"true";
-		$GP_ENABLE=(GP_ENABLE==false)? "false":"true";
 		$QUEST=(QUEST==false)? "false":"true";
 		$WW=(WW==false)? "false":"true";
 		$SHOW_NATARS=(SHOW_NATARS==false)? "false":"true";
@@ -82,123 +81,121 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
 		$NEW_FUNCTION_TRIBE_VIKINGS = (defined('NEW_FUNCTION_TRIBE_VIKINGS') && NEW_FUNCTION_TRIBE_VIKINGS ? 'true' : 'false');
 
 		$text = admin_config_template_contents();
-		$text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text);
-		$text = preg_replace("'%ERROR%'", $ERRORREPORT, $text);
-		$text = preg_replace("'%SERVERNAME%'", SERVER_NAME, $text);
-		$text = preg_replace("'%STIMEZONE%'", TIMEZONE, $text);
-		$text = preg_replace("'%STARTTIME%'", COMMENCE, $text);
-		$text = preg_replace("'%SSTARTDATE%'", START_DATE, $text);
-		$text = preg_replace("'%SSTARTTIME%'", START_TIME, $text);
-		$text = preg_replace("'%LANG%'", (defined('SERVER_LANG') ? SERVER_LANG : LANG), $text);
-		$text = preg_replace("'%SPEED%'", SPEED, $text);
-		$text = preg_replace("'%MAX%'", WORLD_MAX, $text);
-		$text = preg_replace("'%GP%'", $GP_ENABLE, $text);
-		$text = preg_replace("'%GP_LOCATE%'", "gpack/travian_default/", $text);
-		$text = preg_replace("'%INCSPEED%'", INCREASE_SPEED, $text);
-		$text = preg_replace("'%EVASIONSPEED%'", EVASION_SPEED, $text);
-		$text = preg_replace("'%TRADERCAP%'", TRADER_CAPACITY, $text);
-		$text = preg_replace("'%CRANNYCAP%'", CRANNY_CAPACITY, $text);
-		$text = preg_replace("'%TRAPPERCAP%'", TRAPPER_CAPACITY, $text);
-		$text = preg_replace("'%VILLAGE_EXPAND%'", CP, $text);
-		$text = preg_replace("'%DEMOLISH%'", DEMOLISH_LEVEL_REQ, $text);
-		$text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text);
-		$text = preg_replace("'%QUEST%'", $QUEST, $text);
-		$text = preg_replace("'%QTYPE%'", QTYPE, $text);
-		$text = preg_replace("'%BEGINNER%'", PROTECTION, $text);
-		$text = preg_replace("'%WW%'", $WW, $text);
-		$text = preg_replace("'%SHOW_NATARS%'", $SHOW_NATARS, $text);
-		$text = preg_replace("'%NATARS_UNITS%'", NATARS_UNITS, $text);
-		$text = preg_replace("'%NATARS_SPAWN_TIME%'", NATARS_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATARS_WW_SPAWN_TIME%'", NATARS_WW_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%'", NATARS_WW_BUILDING_PLAN_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATURE_REGTIME%'", NATURE_REGTIME, $text);
-		$text = preg_replace("'%OASIS_WOOD_MULTIPLIER%'", OASIS_WOOD_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_CLAY_MULTIPLIER%'", OASIS_CLAY_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_IRON_MULTIPLIER%'", OASIS_IRON_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_CROP_MULTIPLIER%'", OASIS_CROP_MULTIPLIER, $text);
-		$text = preg_replace("'%T4_COMING%'", $T4, $text);
-		$text = preg_replace("'%ACTIVATE%'", $AUTH_EMAIL, $text);
-		$text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text);
-		$text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text);
-		$text = preg_replace("'%MEDALINTERVAL%'", MEDALINTERVAL, $text);
-		$text = preg_replace("'%GREAT_WKS%'", $GREAT_WKS, $text);
-		$text = preg_replace("'%TS_THRESHOLD%'", TS_THRESHOLD, $text);
-		$text = preg_replace("'%REG_OPEN%'", $REG_OPEN, $text);
-		$text = preg_replace("'%PEACE%'", PEACE, $text);
-		$text = preg_replace("'%LOGBUILD%'", $LOG_BUILD, $text);
-		$text = preg_replace("'%LOGTECH%'", $LOG_TECH, $text);
-		$text = preg_replace("'%LOGLOGIN%'", $LOG_LOGIN, $text);
-		$text = preg_replace("'%LOGGOLDFIN%'", $LOG_GOLD_FIN, $text);
-		$text = preg_replace("'%LOGADMIN%'", $LOG_ADMIN, $text);
-		$text = preg_replace("'%LOGWAR%'", $LOG_WAR, $text);
-		$text = preg_replace("'%LOGMARKET%'", $LOG_MARKET, $text);
-		$text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text);
+		tz_config_set($text, '%ERRORREPORT%', $ERRORREPORT);
+		tz_config_set($text, '%ERROR%', $ERRORREPORT, 'code');
+		tz_config_set($text, '%SERVERNAME%', SERVER_NAME);
+		tz_config_set($text, '%STIMEZONE%', TIMEZONE);
+		tz_config_set($text, '%STARTTIME%', COMMENCE);
+		tz_config_set($text, '%SSTARTDATE%', START_DATE);
+		tz_config_set($text, '%SSTARTTIME%', START_TIME);
+		tz_config_set($text, '%LANG%', (defined('SERVER_LANG') ? SERVER_LANG : LANG));
+		tz_config_set($text, '%SPEED%', SPEED);
+		tz_config_set($text, '%MAX%', WORLD_MAX);
+		tz_config_set($text, '%INCSPEED%', INCREASE_SPEED);
+		tz_config_set($text, '%EVASIONSPEED%', EVASION_SPEED);
+		tz_config_set($text, '%TRADERCAP%', TRADER_CAPACITY);
+		tz_config_set($text, '%CRANNYCAP%', CRANNY_CAPACITY);
+		tz_config_set($text, '%TRAPPERCAP%', TRAPPER_CAPACITY);
+		tz_config_set($text, '%VILLAGE_EXPAND%', CP);
+		tz_config_set($text, '%DEMOLISH%', DEMOLISH_LEVEL_REQ);
+		tz_config_set($text, '%STORAGE_MULTIPLIER%', STORAGE_MULTIPLIER);
+		tz_config_set($text, '%QUEST%', $QUEST);
+		tz_config_set($text, '%QTYPE%', QTYPE);
+		tz_config_set($text, '%BEGINNER%', PROTECTION);
+		tz_config_set($text, '%WW%', $WW);
+		tz_config_set($text, '%SHOW_NATARS%', $SHOW_NATARS);
+		tz_config_set($text, '%NATARS_UNITS%', NATARS_UNITS);
+		tz_config_set($text, '%NATARS_SPAWN_TIME%', NATARS_SPAWN_TIME);
+		tz_config_set($text, '%NATARS_WW_SPAWN_TIME%', NATARS_WW_SPAWN_TIME);
+		tz_config_set($text, '%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%', NATARS_WW_BUILDING_PLAN_SPAWN_TIME);
+		tz_config_set($text, '%NATURE_REGTIME%', NATURE_REGTIME);
+		tz_config_set($text, '%OASIS_WOOD_MULTIPLIER%', OASIS_WOOD_MULTIPLIER);
+		tz_config_set($text, '%OASIS_CLAY_MULTIPLIER%', OASIS_CLAY_MULTIPLIER);
+		tz_config_set($text, '%OASIS_IRON_MULTIPLIER%', OASIS_IRON_MULTIPLIER);
+		tz_config_set($text, '%OASIS_CROP_MULTIPLIER%', OASIS_CROP_MULTIPLIER);
+		tz_config_set($text, '%T4_COMING%', $T4);
+		tz_config_set($text, '%ACTIVATE%', $AUTH_EMAIL);
+		tz_config_set($text, '%PLUS_TIME%', PLUS_TIME);
+		tz_config_set($text, '%PLUS_PRODUCTION%', PLUS_PRODUCTION);
+		tz_config_set($text, '%MEDALINTERVAL%', MEDALINTERVAL);
+		tz_config_set($text, '%GREAT_WKS%', $GREAT_WKS);
+		tz_config_set($text, '%TS_THRESHOLD%', TS_THRESHOLD);
+		tz_config_set($text, '%REG_OPEN%', $REG_OPEN);
+		tz_config_set($text, '%PEACE%', PEACE);
+		tz_config_set($text, '%LOGBUILD%', $LOG_BUILD);
+		tz_config_set($text, '%LOGTECH%', $LOG_TECH);
+		tz_config_set($text, '%LOGLOGIN%', $LOG_LOGIN);
+		tz_config_set($text, '%LOGGOLDFIN%', $LOG_GOLD_FIN);
+		tz_config_set($text, '%LOGADMIN%', $LOG_ADMIN);
+		tz_config_set($text, '%LOGWAR%', $LOG_WAR);
+		tz_config_set($text, '%LOGMARKET%', $LOG_MARKET);
+		tz_config_set($text, '%LOGILLEGAL%', $LOG_ILLEGAL);
 		//update
-		$text = preg_replace("'%BOX1%'", $_POST['box1'], $text);
-		$text = preg_replace("'%BOX2%'", $_POST['box2'], $text);
-		$text = preg_replace("'%BOX3%'", $_POST['box3'], $text);
+		tz_config_set($text, '%BOX1%', $_POST['box1'] ?? '');
+		tz_config_set($text, '%BOX2%', $_POST['box2'] ?? '');
+		tz_config_set($text, '%BOX3%', $_POST['box3'] ?? '');
 		//end update
-		$text = preg_replace("'%SSERVER%'", SQL_SERVER, $text);
+		tz_config_set($text, '%SSERVER%', SQL_SERVER);
 		$text = str_replace("%SPORT%", SQL_PORT, $text);
-		$text = preg_replace("'%SUSER%'", SQL_USER, $text);
-		$text = preg_replace("'%SPASS%'", SQL_PASS, $text);
-		$text = preg_replace("'%SDB%'", SQL_DB, $text);
-		$text = preg_replace("'%PREFIX%'", TB_PREFIX, $text);
-		$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
-		$text = preg_replace("'%LIMIT_MAILBOX%'", $LIMIT_MAILBOX, $text);
-		$text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text);
-		$text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text);
-		$text = preg_replace("'%AEMAIL%'", ADMIN_EMAIL, $text);
-		$text = preg_replace("'%ANAME%'", ADMIN_NAME, $text);
-		$text = preg_replace("'%ASUPPMSGS%'", $SUPPORT_MSGS_IN_ADMIN, $text);
-		$text = preg_replace("'%ARAIDS%'", $ADMINS_RAIDABLE, $text);
-		$text = preg_replace("'%UTRACK%'", "", $text);
-		$text = preg_replace("'%UTOUT%'", "", $text);
-		$text = preg_replace("'%DOMAIN%'", DOMAIN, $text);
-		$text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text);
-		$text = preg_replace("'%SERVER%'", SERVER, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_OASIS%'", $NEW_FUNCTIONS_OASIS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_ALLIANCE_INVITATION%'", $NEW_FUNCTIONS_ALLIANCE_INVITATION, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_EMBASSY_MECHANICS%'", $NEW_FUNCTIONS_EMBASSY_MECHANICS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_FORUM_POST_MESSAGE%'", $NEW_FUNCTIONS_FORUM_POST_MESSAGE, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_TRIBE_IMAGES%'", $NEW_FUNCTIONS_TRIBE_IMAGES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MHS_IMAGES%'", $NEW_FUNCTIONS_MHS_IMAGES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_ARTIFACT%'", $NEW_FUNCTIONS_DISPLAY_ARTIFACT, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_WONDER%'", $NEW_FUNCTIONS_DISPLAY_WONDER, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_VACATION%'", $NEW_FUNCTIONS_VACATION, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%'", $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MANUAL_NATURENATARS%'", $NEW_FUNCTIONS_MANUAL_NATURENATARS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_LINKS%'", $NEW_FUNCTIONS_DISPLAY_LINKS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_3YEAR%'", $NEW_FUNCTIONS_MEDAL_3YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_5YEAR%'", $NEW_FUNCTIONS_MEDAL_5YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_10YEAR%'", $NEW_FUNCTIONS_MEDAL_10YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM%'", $NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MILESTONES%'", $NEW_FUNCTIONS_MILESTONES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_RESET%'", $NEW_FUNCTIONS_MEDAL_RESET, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_HERO_T4%'", $NEW_FUNCTIONS_HERO_T4, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_HUNS%'", $NEW_FUNCTION_TRIBE_HUNS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_EGIPTEANS%'", $NEW_FUNCTION_TRIBE_EGIPTEANS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_SPARTANS%'", $NEW_FUNCTION_TRIBE_SPARTANS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_VIKINGS%'", $NEW_FUNCTION_TRIBE_VIKINGS, $text);
+		tz_config_set($text, '%SUSER%', SQL_USER);
+		tz_config_set($text, '%SPASS%', SQL_PASS);
+		tz_config_set($text, '%SDB%', SQL_DB);
+		tz_config_set($text, '%PREFIX%', TB_PREFIX);
+		tz_config_set($text, '%CONNECTT%', DB_TYPE);
+		tz_config_set($text, '%LIMIT_MAILBOX%', $LIMIT_MAILBOX);
+		tz_config_set($text, '%MAX_MAILS%', MAX_MAIL);
+		tz_config_set($text, '%ARANK%', $INCLUDE_ADMIN);
+		tz_config_set($text, '%AEMAIL%', ADMIN_EMAIL);
+		tz_config_set($text, '%ANAME%', ADMIN_NAME);
+		tz_config_set($text, '%ASUPPMSGS%', $SUPPORT_MSGS_IN_ADMIN);
+		tz_config_set($text, '%ARAIDS%', $ADMINS_RAIDABLE);
+		tz_config_set($text, '%UTRACK%', "");
+		tz_config_set($text, '%UTOUT%', "");
+		tz_config_set($text, '%DOMAIN%', DOMAIN);
+		tz_config_set($text, '%HOMEPAGE%', HOMEPAGE);
+		tz_config_set($text, '%SERVER%', SERVER);
+		tz_config_set($text, '%NEW_FUNCTIONS_OASIS%', $NEW_FUNCTIONS_OASIS);
+		tz_config_set($text, '%NEW_FUNCTIONS_ALLIANCE_INVITATION%', $NEW_FUNCTIONS_ALLIANCE_INVITATION);
+		tz_config_set($text, '%NEW_FUNCTIONS_EMBASSY_MECHANICS%', $NEW_FUNCTIONS_EMBASSY_MECHANICS);
+		tz_config_set($text, '%NEW_FUNCTIONS_FORUM_POST_MESSAGE%', $NEW_FUNCTIONS_FORUM_POST_MESSAGE);
+		tz_config_set($text, '%NEW_FUNCTIONS_TRIBE_IMAGES%', $NEW_FUNCTIONS_TRIBE_IMAGES);
+		tz_config_set($text, '%NEW_FUNCTIONS_MHS_IMAGES%', $NEW_FUNCTIONS_MHS_IMAGES);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_ARTIFACT%', $NEW_FUNCTIONS_DISPLAY_ARTIFACT);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_WONDER%', $NEW_FUNCTIONS_DISPLAY_WONDER);
+		tz_config_set($text, '%NEW_FUNCTIONS_VACATION%', $NEW_FUNCTIONS_VACATION);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%', $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET);
+		tz_config_set($text, '%NEW_FUNCTIONS_MANUAL_NATURENATARS%', $NEW_FUNCTIONS_MANUAL_NATURENATARS);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_LINKS%', $NEW_FUNCTIONS_DISPLAY_LINKS);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_3YEAR%', $NEW_FUNCTIONS_MEDAL_3YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_5YEAR%', $NEW_FUNCTIONS_MEDAL_5YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_10YEAR%', $NEW_FUNCTIONS_MEDAL_10YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM%', $NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM);
+		tz_config_set($text, '%NEW_FUNCTIONS_MILESTONES%', $NEW_FUNCTIONS_MILESTONES);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_RESET%', $NEW_FUNCTIONS_MEDAL_RESET);
+		tz_config_set($text, '%NEW_FUNCTIONS_HERO_T4%', $NEW_FUNCTIONS_HERO_T4);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_HUNS%', $NEW_FUNCTION_TRIBE_HUNS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_EGIPTEANS%', $NEW_FUNCTION_TRIBE_EGIPTEANS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_SPARTANS%', $NEW_FUNCTION_TRIBE_SPARTANS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_VIKINGS%', $NEW_FUNCTION_TRIBE_VIKINGS);
 		// Preserve registration-bonus-gold settings (owned by editNewFunctions.php).
-		$text = preg_replace("'%NEW_FUNCTION_REGISTRATION_GOLD%'", (defined('NEW_FUNCTION_REGISTRATION_GOLD') && NEW_FUNCTION_REGISTRATION_GOLD ? 'true' : 'false'), $text);
-		$text = preg_replace("'%NEW_FUNCTION_REGISTRATION_GOLD_VALUE%'", (string) (defined('NEW_FUNCTION_REGISTRATION_GOLD_VALUE') ? (int) NEW_FUNCTION_REGISTRATION_GOLD_VALUE : 200), $text);
+		tz_config_set($text, '%NEW_FUNCTION_REGISTRATION_GOLD%', (defined('NEW_FUNCTION_REGISTRATION_GOLD') && NEW_FUNCTION_REGISTRATION_GOLD ? 'true' : 'false'));
+		tz_config_set($text, '%NEW_FUNCTION_REGISTRATION_GOLD_VALUE%', (string) (defined('NEW_FUNCTION_REGISTRATION_GOLD_VALUE') ? (int) NEW_FUNCTION_REGISTRATION_GOLD_VALUE : 200));
 
 		// PLUS settings need to be kept intact
-		$text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text);
-		$text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text);
-		$text = preg_replace("'%PAYPAL_EMAIL%'", (defined('PAYPAL_EMAIL') ? PAYPAL_EMAIL : 'martin@martinambrus.com'), $text);
-		$text = preg_replace("'%PAYPAL_CURRENCY%'", (defined('PAYPAL_CURRENCY') ? PAYPAL_CURRENCY : 'EUR'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_A_PRICE%'", (defined('PLUS_PACKAGE_A_PRICE') ? PLUS_PACKAGE_A_PRICE : '1,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_A_GOLD%'", (defined('PLUS_PACKAGE_A_GOLD') ? PLUS_PACKAGE_A_GOLD : '60'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_B_PRICE%'", (defined('PLUS_PACKAGE_B_PRICE') ? PLUS_PACKAGE_B_PRICE : '4,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_B_GOLD%'", (defined('PLUS_PACKAGE_B_GOLD') ? PLUS_PACKAGE_B_GOLD : '120'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_C_PRICE%'", (defined('PLUS_PACKAGE_C_PRICE') ? PLUS_PACKAGE_C_PRICE : '9,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_C_GOLD%'", (defined('PLUS_PACKAGE_C_GOLD') ? PLUS_PACKAGE_C_GOLD : '360'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_D_PRICE%'", (defined('PLUS_PACKAGE_D_PRICE') ? PLUS_PACKAGE_D_PRICE : '19,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_D_GOLD%'", (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_E_PRICE%'", (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_E_GOLD%'", (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'), $text);
+		tz_config_set($text, '%PLUS_TIME%', PLUS_TIME);
+		tz_config_set($text, '%PLUS_PRODUCTION%', PLUS_PRODUCTION);
+		tz_config_set($text, '%PAYPAL_EMAIL%', (defined('PAYPAL_EMAIL') ? PAYPAL_EMAIL : 'martin@martinambrus.com'));
+		tz_config_set($text, '%PAYPAL_CURRENCY%', (defined('PAYPAL_CURRENCY') ? PAYPAL_CURRENCY : 'EUR'));
+		tz_config_set($text, '%PLUS_PACKAGE_A_PRICE%', (defined('PLUS_PACKAGE_A_PRICE') ? PLUS_PACKAGE_A_PRICE : '1,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_A_GOLD%', (defined('PLUS_PACKAGE_A_GOLD') ? PLUS_PACKAGE_A_GOLD : '60'));
+		tz_config_set($text, '%PLUS_PACKAGE_B_PRICE%', (defined('PLUS_PACKAGE_B_PRICE') ? PLUS_PACKAGE_B_PRICE : '4,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_B_GOLD%', (defined('PLUS_PACKAGE_B_GOLD') ? PLUS_PACKAGE_B_GOLD : '120'));
+		tz_config_set($text, '%PLUS_PACKAGE_C_PRICE%', (defined('PLUS_PACKAGE_C_PRICE') ? PLUS_PACKAGE_C_PRICE : '9,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_C_GOLD%', (defined('PLUS_PACKAGE_C_GOLD') ? PLUS_PACKAGE_C_GOLD : '360'));
+		tz_config_set($text, '%PLUS_PACKAGE_D_PRICE%', (defined('PLUS_PACKAGE_D_PRICE') ? PLUS_PACKAGE_D_PRICE : '19,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_D_GOLD%', (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'));
+		tz_config_set($text, '%PLUS_PACKAGE_E_PRICE%', (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_E_GOLD%', (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'));
 
 		fwrite($fh, $text);
 		fclose($fh);
diff --git a/GameEngine/Admin/Mods/editPlusSet.php b/GameEngine/Admin/Mods/editPlusSet.php
index af1e2342..aea93e9c 100644
--- a/GameEngine/Admin/Mods/editPlusSet.php
+++ b/GameEngine/Admin/Mods/editPlusSet.php
@@ -64,119 +64,117 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
 		$NEW_FUNCTION_TRIBE_VIKINGS = (defined('NEW_FUNCTION_TRIBE_VIKINGS') && NEW_FUNCTION_TRIBE_VIKINGS ? 'true' : 'false');
 
 		// SERVER SETTINGS - we need to keep these intact
-		$text = preg_replace("'%ERRORREPORT%'", ERROR_REPORT, $text);
-		$text = preg_replace("'%ERROR%'", ERROR_REPORT, $text);
-		$text = preg_replace("'%SERVERNAME%'", SERVER_NAME, $text);
-		$text = preg_replace("'%STIMEZONE%'", TIMEZONE, $text);
-		$text = preg_replace("'%STARTTIME%'", COMMENCE, $text);
-		$text = preg_replace("'%SSTARTDATE%'", START_DATE, $text);
-		$text = preg_replace("'%SSTARTTIME%'", START_TIME, $text);
-		$text = preg_replace("'%LANG%'", (defined('SERVER_LANG') ? SERVER_LANG : LANG), $text);
-		$text = preg_replace("'%SPEED%'", SPEED, $text);
-		$text = preg_replace("'%MAX%'", WORLD_MAX, $text);
-		$text = preg_replace("'%GP%'", GP_ENABLE, $text);
-		$text = preg_replace("'%GP_LOCATE%'", GP_LOCATE, $text);
-		$text = preg_replace("'%INCSPEED%'", INCREASE_SPEED, $text);
-		$text = preg_replace("'%EVASIONSPEED%'", EVASION_SPEED, $text);
-		$text = preg_replace("'%TRADERCAP%'", TRADER_CAPACITY, $text);
-		$text = preg_replace("'%CRANNYCAP%'", CRANNY_CAPACITY, $text);
-		$text = preg_replace("'%TRAPPERCAP%'", TRAPPER_CAPACITY, $text);
-		$text = preg_replace("'%VILLAGE_EXPAND%'", CP, $text);
-		$text = preg_replace("'%DEMOLISH%'", DEMOLISH_LEVEL_REQ, $text);
-		$text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text);
-		$text = preg_replace("'%QUEST%'", QUEST, $text);
-		$text = preg_replace("'%QTYPE%'", QTYPE, $text);
-		$text = preg_replace("'%BEGINNER%'", PROTECTION, $text);
-		$text = preg_replace("'%WW%'", (WW ? 'true' : 'false'), $text);
-		$text = preg_replace("'%SHOW_NATARS%'", (SHOW_NATARS ? 'true' : 'false'), $text);
-		$text = preg_replace("'%NATARS_UNITS%'", NATARS_UNITS, $text);
-		$text = preg_replace("'%NATARS_SPAWN_TIME%'", NATARS_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATARS_WW_SPAWN_TIME%'", NATARS_WW_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%'", NATARS_WW_BUILDING_PLAN_SPAWN_TIME, $text);
-		$text = preg_replace("'%NATURE_REGTIME%'", NATURE_REGTIME, $text);
-		$text = preg_replace("'%OASIS_WOOD_MULTIPLIER%'", OASIS_WOOD_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_CLAY_MULTIPLIER%'", OASIS_CLAY_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_IRON_MULTIPLIER%'", OASIS_IRON_MULTIPLIER, $text);
-		$text = preg_replace("'%OASIS_CROP_MULTIPLIER%'", OASIS_CROP_MULTIPLIER, $text);
-		$text = preg_replace("'%T4_COMING%'", (T4_COMING ? 'true' : 'false'), $text);
-		$text = preg_replace("'%ACTIVATE%'", (AUTH_EMAIL ? 'true' : 'false'), $text);
-		$text = preg_replace("'%MEDALINTERVAL%'", MEDALINTERVAL, $text);
-		$text = preg_replace("'%GREAT_WKS%'", (GREAT_WKS ? 'true' : 'false'), $text);
-		$text = preg_replace("'%TS_THRESHOLD%'", TS_THRESHOLD, $text);
-		$text = preg_replace("'%REG_OPEN%'", REG_OPEN, $text);
-		$text = preg_replace("'%PEACE%'", PEACE, $text);
-		$text = preg_replace("'%LOGBUILD%'", (LOG_BUILD ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGTECH%'", (LOG_TECH ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGLOGIN%'", (LOG_LOGIN ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGGOLDFIN%'", (LOG_GOLD_FIN ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGADMIN%'", (LOG_ADMIN ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGWAR%'", (LOG_WAR ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGMARKET%'", (LOG_MARKET ? 'true' : 'false'), $text);
-		$text = preg_replace("'%LOGILLEGAL%'", (LOG_ILLEGAL ? 'true' : 'false'), $text);
-		$text = preg_replace("'%BOX1%'", (NEWSBOX1 ? 'true' : 'false'), $text);
-		$text = preg_replace("'%BOX2%'", (NEWSBOX2 ? 'true' : 'false'), $text);
-		$text = preg_replace("'%BOX3%'", (NEWSBOX3 ? 'true' : 'false'), $text);
-		$text = preg_replace("'%SSERVER%'", SQL_SERVER, $text);
+		tz_config_set($text, '%ERRORREPORT%', ERROR_REPORT);
+		tz_config_set($text, '%ERROR%', ERROR_REPORT, 'code');
+		tz_config_set($text, '%SERVERNAME%', SERVER_NAME);
+		tz_config_set($text, '%STIMEZONE%', TIMEZONE);
+		tz_config_set($text, '%STARTTIME%', COMMENCE);
+		tz_config_set($text, '%SSTARTDATE%', START_DATE);
+		tz_config_set($text, '%SSTARTTIME%', START_TIME);
+		tz_config_set($text, '%LANG%', (defined('SERVER_LANG') ? SERVER_LANG : LANG));
+		tz_config_set($text, '%SPEED%', SPEED);
+		tz_config_set($text, '%MAX%', WORLD_MAX);
+		tz_config_set($text, '%INCSPEED%', INCREASE_SPEED);
+		tz_config_set($text, '%EVASIONSPEED%', EVASION_SPEED);
+		tz_config_set($text, '%TRADERCAP%', TRADER_CAPACITY);
+		tz_config_set($text, '%CRANNYCAP%', CRANNY_CAPACITY);
+		tz_config_set($text, '%TRAPPERCAP%', TRAPPER_CAPACITY);
+		tz_config_set($text, '%VILLAGE_EXPAND%', CP);
+		tz_config_set($text, '%DEMOLISH%', DEMOLISH_LEVEL_REQ);
+		tz_config_set($text, '%STORAGE_MULTIPLIER%', STORAGE_MULTIPLIER);
+		tz_config_set($text, '%QUEST%', QUEST);
+		tz_config_set($text, '%QTYPE%', QTYPE);
+		tz_config_set($text, '%BEGINNER%', PROTECTION);
+		tz_config_set($text, '%WW%', (WW ? 'true' : 'false'));
+		tz_config_set($text, '%SHOW_NATARS%', (SHOW_NATARS ? 'true' : 'false'));
+		tz_config_set($text, '%NATARS_UNITS%', NATARS_UNITS);
+		tz_config_set($text, '%NATARS_SPAWN_TIME%', NATARS_SPAWN_TIME);
+		tz_config_set($text, '%NATARS_WW_SPAWN_TIME%', NATARS_WW_SPAWN_TIME);
+		tz_config_set($text, '%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%', NATARS_WW_BUILDING_PLAN_SPAWN_TIME);
+		tz_config_set($text, '%NATURE_REGTIME%', NATURE_REGTIME);
+		tz_config_set($text, '%OASIS_WOOD_MULTIPLIER%', OASIS_WOOD_MULTIPLIER);
+		tz_config_set($text, '%OASIS_CLAY_MULTIPLIER%', OASIS_CLAY_MULTIPLIER);
+		tz_config_set($text, '%OASIS_IRON_MULTIPLIER%', OASIS_IRON_MULTIPLIER);
+		tz_config_set($text, '%OASIS_CROP_MULTIPLIER%', OASIS_CROP_MULTIPLIER);
+		tz_config_set($text, '%T4_COMING%', (T4_COMING ? 'true' : 'false'));
+		tz_config_set($text, '%ACTIVATE%', (AUTH_EMAIL ? 'true' : 'false'));
+		tz_config_set($text, '%MEDALINTERVAL%', MEDALINTERVAL);
+		tz_config_set($text, '%GREAT_WKS%', (GREAT_WKS ? 'true' : 'false'));
+		tz_config_set($text, '%TS_THRESHOLD%', TS_THRESHOLD);
+		tz_config_set($text, '%REG_OPEN%', REG_OPEN);
+		tz_config_set($text, '%PEACE%', PEACE);
+		tz_config_set($text, '%LOGBUILD%', (LOG_BUILD ? 'true' : 'false'));
+		tz_config_set($text, '%LOGTECH%', (LOG_TECH ? 'true' : 'false'));
+		tz_config_set($text, '%LOGLOGIN%', (LOG_LOGIN ? 'true' : 'false'));
+		tz_config_set($text, '%LOGGOLDFIN%', (LOG_GOLD_FIN ? 'true' : 'false'));
+		tz_config_set($text, '%LOGADMIN%', (LOG_ADMIN ? 'true' : 'false'));
+		tz_config_set($text, '%LOGWAR%', (LOG_WAR ? 'true' : 'false'));
+		tz_config_set($text, '%LOGMARKET%', (LOG_MARKET ? 'true' : 'false'));
+		tz_config_set($text, '%LOGILLEGAL%', (LOG_ILLEGAL ? 'true' : 'false'));
+		tz_config_set($text, '%BOX1%', (NEWSBOX1 ? 'true' : 'false'));
+		tz_config_set($text, '%BOX2%', (NEWSBOX2 ? 'true' : 'false'));
+		tz_config_set($text, '%BOX3%', (NEWSBOX3 ? 'true' : 'false'));
+		tz_config_set($text, '%SSERVER%', SQL_SERVER);
 		$text = str_replace("%SPORT%", SQL_PORT, $text);
-		$text = preg_replace("'%SUSER%'", SQL_USER, $text);
-		$text = preg_replace("'%SPASS%'", SQL_PASS, $text);
-		$text = preg_replace("'%SDB%'", SQL_DB, $text);
-		$text = preg_replace("'%PREFIX%'", TB_PREFIX, $text);
-		$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
-		$text = preg_replace("'%LIMIT_MAILBOX%'", (LIMIT_MAILBOX ? 'true' : 'false'), $text);
-		$text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text);
-		$text = preg_replace("'%ARANK%'", (INCLUDE_ADMIN ? 'true' : 'false'), $text);
-		$text = preg_replace("'%AEMAIL%'", ADMIN_EMAIL, $text);
-		$text = preg_replace("'%ANAME%'", ADMIN_NAME, $text);
-		$text = preg_replace("'%ASUPPMSGS%'", $SUPPORT_MSGS_IN_ADMIN, $text);
-		$text = preg_replace("'%ARAIDS%'", $ADMINS_RAIDABLE, $text);
-		$text = preg_replace("'%UTRACK%'", "TRACK_USR", $text); // not in use, text only in a comment
-		$text = preg_replace("'%UTOUT%'", "USER_TIMEOUT", $text); // not in use, text only in a comment
-		$text = preg_replace("'%DOMAIN%'", DOMAIN, $text);
-		$text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text);
-		$text = preg_replace("'%SERVER%'", SERVER, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_OASIS%'", $NEW_FUNCTIONS_OASIS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_ALLIANCE_INVITATION%'", $NEW_FUNCTIONS_ALLIANCE_INVITATION, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_EMBASSY_MECHANICS%'", $NEW_FUNCTIONS_EMBASSY_MECHANICS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_FORUM_POST_MESSAGE%'", $NEW_FUNCTIONS_FORUM_POST_MESSAGE, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_TRIBE_IMAGES%'", $NEW_FUNCTIONS_TRIBE_IMAGES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MHS_IMAGES%'", $NEW_FUNCTIONS_MHS_IMAGES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_ARTIFACT%'", $NEW_FUNCTIONS_DISPLAY_ARTIFACT, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_WONDER%'", $NEW_FUNCTIONS_DISPLAY_WONDER, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_VACATION%'", $NEW_FUNCTIONS_VACATION, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%'", $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MANUAL_NATURENATARS%'", $NEW_FUNCTIONS_MANUAL_NATURENATARS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_LINKS%'", $NEW_FUNCTIONS_DISPLAY_LINKS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_3YEAR%'", $NEW_FUNCTIONS_MEDAL_3YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_5YEAR%'", $NEW_FUNCTIONS_MEDAL_5YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_10YEAR%'", $NEW_FUNCTIONS_MEDAL_10YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM%'", $NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MILESTONES%'", $NEW_FUNCTIONS_MILESTONES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_RESET%'", $NEW_FUNCTIONS_MEDAL_RESET, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_HERO_T4%'", $NEW_FUNCTIONS_HERO_T4, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_HUNS%'", $NEW_FUNCTION_TRIBE_HUNS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_EGIPTEANS%'", $NEW_FUNCTION_TRIBE_EGIPTEANS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_SPARTANS%'", $NEW_FUNCTION_TRIBE_SPARTANS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_VIKINGS%'", $NEW_FUNCTION_TRIBE_VIKINGS, $text);
+		tz_config_set($text, '%SUSER%', SQL_USER);
+		tz_config_set($text, '%SPASS%', SQL_PASS);
+		tz_config_set($text, '%SDB%', SQL_DB);
+		tz_config_set($text, '%PREFIX%', TB_PREFIX);
+		tz_config_set($text, '%CONNECTT%', DB_TYPE);
+		tz_config_set($text, '%LIMIT_MAILBOX%', (LIMIT_MAILBOX ? 'true' : 'false'));
+		tz_config_set($text, '%MAX_MAILS%', MAX_MAIL);
+		tz_config_set($text, '%ARANK%', (INCLUDE_ADMIN ? 'true' : 'false'));
+		tz_config_set($text, '%AEMAIL%', ADMIN_EMAIL);
+		tz_config_set($text, '%ANAME%', ADMIN_NAME);
+		tz_config_set($text, '%ASUPPMSGS%', $SUPPORT_MSGS_IN_ADMIN);
+		tz_config_set($text, '%ARAIDS%', $ADMINS_RAIDABLE);
+		tz_config_set($text, '%UTRACK%', "TRACK_USR"); // not in use, text only in a comment
+		tz_config_set($text, '%UTOUT%', "USER_TIMEOUT"); // not in use, text only in a comment
+		tz_config_set($text, '%DOMAIN%', DOMAIN);
+		tz_config_set($text, '%HOMEPAGE%', HOMEPAGE);
+		tz_config_set($text, '%SERVER%', SERVER);
+		tz_config_set($text, '%NEW_FUNCTIONS_OASIS%', $NEW_FUNCTIONS_OASIS);
+		tz_config_set($text, '%NEW_FUNCTIONS_ALLIANCE_INVITATION%', $NEW_FUNCTIONS_ALLIANCE_INVITATION);
+		tz_config_set($text, '%NEW_FUNCTIONS_EMBASSY_MECHANICS%', $NEW_FUNCTIONS_EMBASSY_MECHANICS);
+		tz_config_set($text, '%NEW_FUNCTIONS_FORUM_POST_MESSAGE%', $NEW_FUNCTIONS_FORUM_POST_MESSAGE);
+		tz_config_set($text, '%NEW_FUNCTIONS_TRIBE_IMAGES%', $NEW_FUNCTIONS_TRIBE_IMAGES);
+		tz_config_set($text, '%NEW_FUNCTIONS_MHS_IMAGES%', $NEW_FUNCTIONS_MHS_IMAGES);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_ARTIFACT%', $NEW_FUNCTIONS_DISPLAY_ARTIFACT);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_WONDER%', $NEW_FUNCTIONS_DISPLAY_WONDER);
+		tz_config_set($text, '%NEW_FUNCTIONS_VACATION%', $NEW_FUNCTIONS_VACATION);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%', $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET);
+		tz_config_set($text, '%NEW_FUNCTIONS_MANUAL_NATURENATARS%', $NEW_FUNCTIONS_MANUAL_NATURENATARS);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_LINKS%', $NEW_FUNCTIONS_DISPLAY_LINKS);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_3YEAR%', $NEW_FUNCTIONS_MEDAL_3YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_5YEAR%', $NEW_FUNCTIONS_MEDAL_5YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_10YEAR%', $NEW_FUNCTIONS_MEDAL_10YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM%', $NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM);
+		tz_config_set($text, '%NEW_FUNCTIONS_MILESTONES%', $NEW_FUNCTIONS_MILESTONES);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_RESET%', $NEW_FUNCTIONS_MEDAL_RESET);
+		tz_config_set($text, '%NEW_FUNCTIONS_HERO_T4%', $NEW_FUNCTIONS_HERO_T4);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_HUNS%', $NEW_FUNCTION_TRIBE_HUNS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_EGIPTEANS%', $NEW_FUNCTION_TRIBE_EGIPTEANS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_SPARTANS%', $NEW_FUNCTION_TRIBE_SPARTANS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_VIKINGS%', $NEW_FUNCTION_TRIBE_VIKINGS);
 		// Preserve registration-bonus-gold settings (owned by editNewFunctions.php).
-		$text = preg_replace("'%NEW_FUNCTION_REGISTRATION_GOLD%'", (defined('NEW_FUNCTION_REGISTRATION_GOLD') && NEW_FUNCTION_REGISTRATION_GOLD ? 'true' : 'false'), $text);
-		$text = preg_replace("'%NEW_FUNCTION_REGISTRATION_GOLD_VALUE%'", (string) (defined('NEW_FUNCTION_REGISTRATION_GOLD_VALUE') ? (int) NEW_FUNCTION_REGISTRATION_GOLD_VALUE : 200), $text);
+		tz_config_set($text, '%NEW_FUNCTION_REGISTRATION_GOLD%', (defined('NEW_FUNCTION_REGISTRATION_GOLD') && NEW_FUNCTION_REGISTRATION_GOLD ? 'true' : 'false'));
+		tz_config_set($text, '%NEW_FUNCTION_REGISTRATION_GOLD_VALUE%', (string) (defined('NEW_FUNCTION_REGISTRATION_GOLD_VALUE') ? (int) NEW_FUNCTION_REGISTRATION_GOLD_VALUE : 200));
 
 		// PLUS SETTINGS
-		$text = preg_replace("'%PLUS_TIME%'", $_POST['plus_time'], $text);
-		$text = preg_replace("'%PLUS_PRODUCTION%'", $_POST['plus_production'], $text);
-		$text = preg_replace("'%PAYPAL_EMAIL%'", $_POST['paypal-email'], $text);
-		$text = preg_replace("'%PAYPAL_CURRENCY%'", $_POST['paypal-currency'], $text);
-		$text = preg_replace("'%PLUS_PACKAGE_A_GOLD%'", $_POST['plus-a-gold'], $text);
-		$text = preg_replace("'%PLUS_PACKAGE_A_PRICE%'", $_POST['plus-a-price'], $text);
-		$text = preg_replace("'%PLUS_PACKAGE_B_GOLD%'", $_POST['plus-b-gold'], $text);
-		$text = preg_replace("'%PLUS_PACKAGE_B_PRICE%'", $_POST['plus-b-price'], $text);
-		$text = preg_replace("'%PLUS_PACKAGE_C_GOLD%'", $_POST['plus-c-gold'], $text);
-		$text = preg_replace("'%PLUS_PACKAGE_C_PRICE%'", $_POST['plus-c-price'], $text);
-		$text = preg_replace("'%PLUS_PACKAGE_D_GOLD%'", $_POST['plus-d-gold'], $text);
-		$text = preg_replace("'%PLUS_PACKAGE_D_PRICE%'", $_POST['plus-d-price'], $text);
-		$text = preg_replace("'%PLUS_PACKAGE_E_GOLD%'", $_POST['plus-e-gold'], $text);
-		$text = preg_replace("'%PLUS_PACKAGE_E_PRICE%'", $_POST['plus-e-price'], $text);
+		tz_config_set($text, '%PLUS_TIME%', $_POST['plus_time'] ?? '');
+		tz_config_set($text, '%PLUS_PRODUCTION%', $_POST['plus_production'] ?? '');
+		tz_config_set($text, '%PAYPAL_EMAIL%', $_POST['paypal-email'] ?? '');
+		tz_config_set($text, '%PAYPAL_CURRENCY%', $_POST['paypal-currency'] ?? '');
+		tz_config_set($text, '%PLUS_PACKAGE_A_GOLD%', $_POST['plus-a-gold'] ?? '');
+		tz_config_set($text, '%PLUS_PACKAGE_A_PRICE%', $_POST['plus-a-price'] ?? '');
+		tz_config_set($text, '%PLUS_PACKAGE_B_GOLD%', $_POST['plus-b-gold'] ?? '');
+		tz_config_set($text, '%PLUS_PACKAGE_B_PRICE%', $_POST['plus-b-price'] ?? '');
+		tz_config_set($text, '%PLUS_PACKAGE_C_GOLD%', $_POST['plus-c-gold'] ?? '');
+		tz_config_set($text, '%PLUS_PACKAGE_C_PRICE%', $_POST['plus-c-price'] ?? '');
+		tz_config_set($text, '%PLUS_PACKAGE_D_GOLD%', $_POST['plus-d-gold'] ?? '');
+		tz_config_set($text, '%PLUS_PACKAGE_D_PRICE%', $_POST['plus-d-price'] ?? '');
+		tz_config_set($text, '%PLUS_PACKAGE_E_GOLD%', $_POST['plus-e-gold'] ?? '');
+		tz_config_set($text, '%PLUS_PACKAGE_E_PRICE%', $_POST['plus-e-price'] ?? '');
 
 		fwrite($fh, $text);
 		fclose($fh);
diff --git a/GameEngine/Admin/Mods/editServerSet.php b/GameEngine/Admin/Mods/editServerSet.php
index be079920..1ba36184 100755
--- a/GameEngine/Admin/Mods/editServerSet.php
+++ b/GameEngine/Admin/Mods/editServerSet.php
@@ -98,16 +98,33 @@ if ($heroResAll > 10000) { $heroResAll = 10000; }
 if ($heroResOne < 0)     { $heroResOne = 0; }
 if ($heroResOne > 10000) { $heroResOne = 10000; }
 
+// Pachetul grafic al serverului. Acceptam doar un director care exista si
+// contine travian.css - altfel jocul ar ramane fara stiluri.
+$gpLocate = defined('GP_LOCATE') ? GP_LOCATE : 'gpack/travian_default/';
+
+if (isset($_POST['gp_locate'])) {
+    $gpAvailable = tz_available_gpacks();
+
+    if (isset($gpAvailable[$_POST['gp_locate']])) {
+        $gpLocate = $_POST['gp_locate'];
+    }
+}
+
+// Comutatorul "pachete grafice proprii" (campul 'gpack' din formular).
+$gpEnable = (isset($_POST['gpack']) && $_POST['gpack'] === 'true') ? 'true' : 'false';
+
 $text = admin_config_template_contents(array(
+    '%GP%'                => $gpEnable,
+    '%GP_LOCATE%'         => $gpLocate,
     '%HEROBASEREGEN%'     => $heroBaseRegen,
     '%HEROSILVERPERGOLD%' => $silverPerGold,
     '%HEROSILVERTOGOLD%'  => $silverToGold,
     '%HERORESALL%'        => $heroResAll,
     '%HERORESONE%'        => $heroResOne,
 ));
-		$text = preg_replace("'%ERRORREPORT%'", $_POST['error'], $text);
-		$text = preg_replace("'%ERROR%'", $_POST['error'], $text);
-		$text = preg_replace("'%SERVERNAME%'", $_POST['servername'], $text);
+		tz_config_set($text, '%ERRORREPORT%', $_POST['error'] ?? '');
+		tz_config_set($text, '%ERROR%', $_POST['error'] ?? '', 'code');
+		tz_config_set($text, '%SERVERNAME%', $_POST['servername'] ?? '');
 		// Fusul orar se scrie intr-un fisier PHP (define("TIMEZONE","...")), deci
 		// valoarea NU are voie sa ajunga acolo nefiltrata: pana acum $_POST['tzone']
 		// era inserat ca atare, ceea ce permitea scrierea de cod in config.php.
@@ -124,9 +141,9 @@ $text = admin_config_template_contents(array(
 		}
 
 		$text = str_replace('%STIMEZONE%', $tzChosen, $text);
-		$text = preg_replace("'%STARTTIME%'", COMMENCE, $text);
-		$text = preg_replace("'%SSTARTDATE%'", START_DATE, $text);
-		$text = preg_replace("'%SSTARTTIME%'", START_TIME, $text);
+		tz_config_set($text, '%STARTTIME%', COMMENCE);
+		tz_config_set($text, '%SSTARTDATE%', START_DATE);
+		tz_config_set($text, '%SSTARTTIME%', START_TIME);
 		// FIX: limba selectata din formular era ignorata - se rescria mereu
 		// constanta deja incarcata, deci salvarea nu schimba nimic.
 		// Validam valoarea primita si verificam si ca fisierul de limba exista:
@@ -146,111 +163,109 @@ $text = admin_config_template_contents(array(
 
 		// str_replace, nu preg_replace: valoarea nu e o expresie regulata
 		$text = str_replace('%LANG%', $serverLang, $text);
-		$text = preg_replace("'%SPEED%'", $_POST['speed'], $text);
-		$text = preg_replace("'%MAX%'", WORLD_MAX, $text);
-		$text = preg_replace("'%GP%'", $_POST['gpack'], $text);
-		$text = preg_replace("'%GP_LOCATE%'", "gpack/travian_default/", $text);
-		$text = preg_replace("'%INCSPEED%'", $_POST['incspeed'], $text);
-		$text = preg_replace("'%EVASIONSPEED%'", $_POST['evasionspeed'], $text);
-		$text = preg_replace("'%TRADERCAP%'", $_POST['tradercap'], $text);
-		$text = preg_replace("'%CRANNYCAP%'", $_POST['crannycap'], $text);
-		$text = preg_replace("'%TRAPPERCAP%'", $_POST['trappercap'], $text);
-		$text = preg_replace("'%VILLAGE_EXPAND%'", $_POST['village_expand'], $text);
-		$text = preg_replace("'%DEMOLISH%'", $_POST['demolish'], $text);
-		$text = preg_replace("'%STORAGE_MULTIPLIER%'", $_POST['storage_multiplier'], $text);
-		$text = preg_replace("'%QUEST%'", $_POST['quest'], $text);
-		$text = preg_replace("'%QTYPE%'", $_POST['qtype'], $text);
-		$text = preg_replace("'%BEGINNER%'", $_POST['beginner'], $text);
-		$text = preg_replace("'%WW%'", $_POST['ww'], $text);
-		$text = preg_replace("'%SHOW_NATARS%'", $_POST['show_natars'], $text);
-		$text = preg_replace("'%NATARS_UNITS%'", $_POST['natars_units'], $text);
-		$text = preg_replace("'%NATARS_SPAWN_TIME%'", $_POST['natars_spawn_time'], $text);
-		$text = preg_replace("'%NATARS_WW_SPAWN_TIME%'", $_POST['natars_ww_spawn_time'], $text);
-		$text = preg_replace("'%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%'", $_POST['natars_ww_building_plan_spawn_time'], $text);
-		$text = preg_replace("'%NATURE_REGTIME%'", $_POST['nature_regtime'], $text);
-		$text = preg_replace("'%OASIS_WOOD_MULTIPLIER%'", $_POST['oasis_wood_multiplier'], $text);
-		$text = preg_replace("'%OASIS_CLAY_MULTIPLIER%'", $_POST['oasis_clay_multiplier'], $text);
-		$text = preg_replace("'%OASIS_IRON_MULTIPLIER%'", $_POST['oasis_iron_multiplier'], $text);
-		$text = preg_replace("'%OASIS_CROP_MULTIPLIER%'", $_POST['oasis_crop_multiplier'], $text);
-		$text = preg_replace("'%T4_COMING%'", $T4, $text);
-		$text = preg_replace("'%ACTIVATE%'", $_POST['activate'], $text);
-		$text = preg_replace("'%MEDALINTERVAL%'", $_POST['medalinterval'], $text);
-		$text = preg_replace("'%GREAT_WKS%'", $_POST['great_wks'], $text);
-		$text = preg_replace("'%TS_THRESHOLD%'", $_POST['ts_threshold'], $text);
-		$text = preg_replace("'%REG_OPEN%'", $_POST['reg_open'], $text);
-		$text = preg_replace("'%PEACE%'", $_POST['peace'], $text);
-		$text = preg_replace("'%LOGBUILD%'", $LOG_BUILD, $text);
-		$text = preg_replace("'%LOGTECH%'", $LOG_TECH, $text);
-		$text = preg_replace("'%LOGLOGIN%'", $LOG_LOGIN, $text);
-		$text = preg_replace("'%LOGGOLDFIN%'", $LOG_GOLD_FIN, $text);
-		$text = preg_replace("'%LOGADMIN%'", $LOG_ADMIN, $text);
-		$text = preg_replace("'%LOGWAR%'", $LOG_WAR, $text);
-		$text = preg_replace("'%LOGMARKET%'", $LOG_MARKET, $text);
-		$text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text);
-		$text = preg_replace("'%BOX1%'", $NEWSBOX1, $text);
-		$text = preg_replace("'%BOX2%'", $NEWSBOX2, $text);
-		$text = preg_replace("'%BOX3%'", $NEWSBOX3, $text);
-		$text = preg_replace("'%SSERVER%'", SQL_SERVER, $text);
+		tz_config_set($text, '%SPEED%', $_POST['speed'] ?? '');
+		tz_config_set($text, '%MAX%', WORLD_MAX);
+		tz_config_set($text, '%INCSPEED%', $_POST['incspeed'] ?? '');
+		tz_config_set($text, '%EVASIONSPEED%', $_POST['evasionspeed'] ?? '');
+		tz_config_set($text, '%TRADERCAP%', $_POST['tradercap'] ?? '');
+		tz_config_set($text, '%CRANNYCAP%', $_POST['crannycap'] ?? '');
+		tz_config_set($text, '%TRAPPERCAP%', $_POST['trappercap'] ?? '');
+		tz_config_set($text, '%VILLAGE_EXPAND%', $_POST['village_expand'] ?? '');
+		tz_config_set($text, '%DEMOLISH%', $_POST['demolish'] ?? '');
+		tz_config_set($text, '%STORAGE_MULTIPLIER%', $_POST['storage_multiplier'] ?? '');
+		tz_config_set($text, '%QUEST%', $_POST['quest'] ?? '');
+		tz_config_set($text, '%QTYPE%', $_POST['qtype'] ?? '');
+		tz_config_set($text, '%BEGINNER%', $_POST['beginner'] ?? '');
+		tz_config_set($text, '%WW%', $_POST['ww'] ?? '');
+		tz_config_set($text, '%SHOW_NATARS%', $_POST['show_natars'] ?? '');
+		tz_config_set($text, '%NATARS_UNITS%', $_POST['natars_units'] ?? '');
+		tz_config_set($text, '%NATARS_SPAWN_TIME%', $_POST['natars_spawn_time'] ?? '');
+		tz_config_set($text, '%NATARS_WW_SPAWN_TIME%', $_POST['natars_ww_spawn_time'] ?? '');
+		tz_config_set($text, '%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%', $_POST['natars_ww_building_plan_spawn_time'] ?? '');
+		tz_config_set($text, '%NATURE_REGTIME%', $_POST['nature_regtime'] ?? '');
+		tz_config_set($text, '%OASIS_WOOD_MULTIPLIER%', $_POST['oasis_wood_multiplier'] ?? '');
+		tz_config_set($text, '%OASIS_CLAY_MULTIPLIER%', $_POST['oasis_clay_multiplier'] ?? '');
+		tz_config_set($text, '%OASIS_IRON_MULTIPLIER%', $_POST['oasis_iron_multiplier'] ?? '');
+		tz_config_set($text, '%OASIS_CROP_MULTIPLIER%', $_POST['oasis_crop_multiplier'] ?? '');
+		tz_config_set($text, '%T4_COMING%', $T4);
+		tz_config_set($text, '%ACTIVATE%', $_POST['activate'] ?? '');
+		tz_config_set($text, '%MEDALINTERVAL%', $_POST['medalinterval'] ?? '');
+		tz_config_set($text, '%GREAT_WKS%', $_POST['great_wks'] ?? '');
+		tz_config_set($text, '%TS_THRESHOLD%', $_POST['ts_threshold'] ?? '');
+		tz_config_set($text, '%REG_OPEN%', $_POST['reg_open'] ?? '');
+		tz_config_set($text, '%PEACE%', $_POST['peace'] ?? '');
+		tz_config_set($text, '%LOGBUILD%', $LOG_BUILD);
+		tz_config_set($text, '%LOGTECH%', $LOG_TECH);
+		tz_config_set($text, '%LOGLOGIN%', $LOG_LOGIN);
+		tz_config_set($text, '%LOGGOLDFIN%', $LOG_GOLD_FIN);
+		tz_config_set($text, '%LOGADMIN%', $LOG_ADMIN);
+		tz_config_set($text, '%LOGWAR%', $LOG_WAR);
+		tz_config_set($text, '%LOGMARKET%', $LOG_MARKET);
+		tz_config_set($text, '%LOGILLEGAL%', $LOG_ILLEGAL);
+		tz_config_set($text, '%BOX1%', $NEWSBOX1);
+		tz_config_set($text, '%BOX2%', $NEWSBOX2);
+		tz_config_set($text, '%BOX3%', $NEWSBOX3);
+		tz_config_set($text, '%SSERVER%', SQL_SERVER);
 		$text = str_replace("%SPORT%", SQL_PORT, $text);
-		$text = preg_replace("'%SUSER%'", SQL_USER, $text);
-		$text = preg_replace("'%SPASS%'", SQL_PASS, $text);
-		$text = preg_replace("'%SDB%'", SQL_DB, $text);
-		$text = preg_replace("'%PREFIX%'", TB_PREFIX, $text);
-		$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
-		$text = preg_replace("'%LIMIT_MAILBOX%'", $LIMIT_MAILBOX, $text);
-		$text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text);
-		$text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text);
-		$text = preg_replace("'%AEMAIL%'", ADMIN_EMAIL, $text);
-		$text = preg_replace("'%ASUPPMSGS%'", $SUPPORT_MSGS_IN_ADMIN, $text);
-		$text = preg_replace("'%ARAIDS%'", $ADMINS_RAIDABLE, $text);
-		$text = preg_replace("'%ANAME%'", ADMIN_NAME, $text);
-		$text = preg_replace("'%UTRACK%'", "", $text);
-		$text = preg_replace("'%UTOUT%'", "", $text);
-		$text = preg_replace("'%DOMAIN%'", DOMAIN, $text);
-		$text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text);
-		$text = preg_replace("'%SERVER%'", SERVER, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_OASIS%'", $NEW_FUNCTIONS_OASIS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_ALLIANCE_INVITATION%'", $NEW_FUNCTIONS_ALLIANCE_INVITATION, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_EMBASSY_MECHANICS%'", $NEW_FUNCTIONS_EMBASSY_MECHANICS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_FORUM_POST_MESSAGE%'", $NEW_FUNCTIONS_FORUM_POST_MESSAGE, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_TRIBE_IMAGES%'", $NEW_FUNCTIONS_TRIBE_IMAGES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MHS_IMAGES%'", $NEW_FUNCTIONS_MHS_IMAGES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_ARTIFACT%'", $NEW_FUNCTIONS_DISPLAY_ARTIFACT, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_WONDER%'", $NEW_FUNCTIONS_DISPLAY_WONDER, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_VACATION%'", $NEW_FUNCTIONS_VACATION, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%'", $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MANUAL_NATURENATARS%'", $NEW_FUNCTIONS_MANUAL_NATURENATARS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_LINKS%'", $NEW_FUNCTIONS_DISPLAY_LINKS, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_3YEAR%'", $NEW_FUNCTIONS_MEDAL_3YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_5YEAR%'", $NEW_FUNCTIONS_MEDAL_5YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_10YEAR%'", $NEW_FUNCTIONS_MEDAL_10YEAR, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM%'", $NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MILESTONES%'", $NEW_FUNCTIONS_MILESTONES, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_MEDAL_RESET%'", $NEW_FUNCTIONS_MEDAL_RESET, $text);
-		$text = preg_replace("'%NEW_FUNCTIONS_HERO_T4%'", $NEW_FUNCTIONS_HERO_T4, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_HUNS%'", $NEW_FUNCTION_TRIBE_HUNS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_EGIPTEANS%'", $NEW_FUNCTION_TRIBE_EGIPTEANS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_SPARTANS%'", $NEW_FUNCTION_TRIBE_SPARTANS, $text);
-		$text = preg_replace("'%NEW_FUNCTION_TRIBE_VIKINGS%'", $NEW_FUNCTION_TRIBE_VIKINGS, $text);
+		tz_config_set($text, '%SUSER%', SQL_USER);
+		tz_config_set($text, '%SPASS%', SQL_PASS);
+		tz_config_set($text, '%SDB%', SQL_DB);
+		tz_config_set($text, '%PREFIX%', TB_PREFIX);
+		tz_config_set($text, '%CONNECTT%', DB_TYPE);
+		tz_config_set($text, '%LIMIT_MAILBOX%', $LIMIT_MAILBOX);
+		tz_config_set($text, '%MAX_MAILS%', MAX_MAIL);
+		tz_config_set($text, '%ARANK%', $INCLUDE_ADMIN);
+		tz_config_set($text, '%AEMAIL%', ADMIN_EMAIL);
+		tz_config_set($text, '%ASUPPMSGS%', $SUPPORT_MSGS_IN_ADMIN);
+		tz_config_set($text, '%ARAIDS%', $ADMINS_RAIDABLE);
+		tz_config_set($text, '%ANAME%', ADMIN_NAME);
+		tz_config_set($text, '%UTRACK%', "");
+		tz_config_set($text, '%UTOUT%', "");
+		tz_config_set($text, '%DOMAIN%', DOMAIN);
+		tz_config_set($text, '%HOMEPAGE%', HOMEPAGE);
+		tz_config_set($text, '%SERVER%', SERVER);
+		tz_config_set($text, '%NEW_FUNCTIONS_OASIS%', $NEW_FUNCTIONS_OASIS);
+		tz_config_set($text, '%NEW_FUNCTIONS_ALLIANCE_INVITATION%', $NEW_FUNCTIONS_ALLIANCE_INVITATION);
+		tz_config_set($text, '%NEW_FUNCTIONS_EMBASSY_MECHANICS%', $NEW_FUNCTIONS_EMBASSY_MECHANICS);
+		tz_config_set($text, '%NEW_FUNCTIONS_FORUM_POST_MESSAGE%', $NEW_FUNCTIONS_FORUM_POST_MESSAGE);
+		tz_config_set($text, '%NEW_FUNCTIONS_TRIBE_IMAGES%', $NEW_FUNCTIONS_TRIBE_IMAGES);
+		tz_config_set($text, '%NEW_FUNCTIONS_MHS_IMAGES%', $NEW_FUNCTIONS_MHS_IMAGES);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_ARTIFACT%', $NEW_FUNCTIONS_DISPLAY_ARTIFACT);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_WONDER%', $NEW_FUNCTIONS_DISPLAY_WONDER);
+		tz_config_set($text, '%NEW_FUNCTIONS_VACATION%', $NEW_FUNCTIONS_VACATION);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%', $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET);
+		tz_config_set($text, '%NEW_FUNCTIONS_MANUAL_NATURENATARS%', $NEW_FUNCTIONS_MANUAL_NATURENATARS);
+		tz_config_set($text, '%NEW_FUNCTIONS_DISPLAY_LINKS%', $NEW_FUNCTIONS_DISPLAY_LINKS);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_3YEAR%', $NEW_FUNCTIONS_MEDAL_3YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_5YEAR%', $NEW_FUNCTIONS_MEDAL_5YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_10YEAR%', $NEW_FUNCTIONS_MEDAL_10YEAR);
+		tz_config_set($text, '%NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM%', $NEW_FUNCTIONS_SPECIAL_MEDALS_SYSTEM);
+		tz_config_set($text, '%NEW_FUNCTIONS_MILESTONES%', $NEW_FUNCTIONS_MILESTONES);
+		tz_config_set($text, '%NEW_FUNCTIONS_MEDAL_RESET%', $NEW_FUNCTIONS_MEDAL_RESET);
+		tz_config_set($text, '%NEW_FUNCTIONS_HERO_T4%', $NEW_FUNCTIONS_HERO_T4);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_HUNS%', $NEW_FUNCTION_TRIBE_HUNS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_EGIPTEANS%', $NEW_FUNCTION_TRIBE_EGIPTEANS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_SPARTANS%', $NEW_FUNCTION_TRIBE_SPARTANS);
+		tz_config_set($text, '%NEW_FUNCTION_TRIBE_VIKINGS%', $NEW_FUNCTION_TRIBE_VIKINGS);
 		// Preserve registration-bonus-gold settings (owned by editNewFunctions.php).
-		$text = preg_replace("'%NEW_FUNCTION_REGISTRATION_GOLD%'", (defined('NEW_FUNCTION_REGISTRATION_GOLD') && NEW_FUNCTION_REGISTRATION_GOLD ? 'true' : 'false'), $text);
-		$text = preg_replace("'%NEW_FUNCTION_REGISTRATION_GOLD_VALUE%'", (string) (defined('NEW_FUNCTION_REGISTRATION_GOLD_VALUE') ? (int) NEW_FUNCTION_REGISTRATION_GOLD_VALUE : 200), $text);
+		tz_config_set($text, '%NEW_FUNCTION_REGISTRATION_GOLD%', (defined('NEW_FUNCTION_REGISTRATION_GOLD') && NEW_FUNCTION_REGISTRATION_GOLD ? 'true' : 'false'));
+		tz_config_set($text, '%NEW_FUNCTION_REGISTRATION_GOLD_VALUE%', (string) (defined('NEW_FUNCTION_REGISTRATION_GOLD_VALUE') ? (int) NEW_FUNCTION_REGISTRATION_GOLD_VALUE : 200));
 
 		// PLUS settings need to be kept intact
-		$text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text);
-		$text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text);
-		$text = preg_replace("'%PAYPAL_EMAIL%'", (defined('PAYPAL_EMAIL') ? PAYPAL_EMAIL : 'martin@martinambrus.com'), $text);
-		$text = preg_replace("'%PAYPAL_CURRENCY%'", (defined('PAYPAL_CURRENCY') ? PAYPAL_CURRENCY : 'EUR'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_A_PRICE%'", (defined('PLUS_PACKAGE_A_PRICE') ? PLUS_PACKAGE_A_PRICE : '1,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_A_GOLD%'", (defined('PLUS_PACKAGE_A_GOLD') ? PLUS_PACKAGE_A_GOLD : '60'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_B_PRICE%'", (defined('PLUS_PACKAGE_B_PRICE') ? PLUS_PACKAGE_B_PRICE : '4,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_B_GOLD%'", (defined('PLUS_PACKAGE_B_GOLD') ? PLUS_PACKAGE_B_GOLD : '120'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_C_PRICE%'", (defined('PLUS_PACKAGE_C_PRICE') ? PLUS_PACKAGE_C_PRICE : '9,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_C_GOLD%'", (defined('PLUS_PACKAGE_C_GOLD') ? PLUS_PACKAGE_C_GOLD : '360'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_D_PRICE%'", (defined('PLUS_PACKAGE_D_PRICE') ? PLUS_PACKAGE_D_PRICE : '19,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_D_GOLD%'", (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_E_PRICE%'", (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'), $text);
-		$text = preg_replace("'%PLUS_PACKAGE_E_GOLD%'", (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'), $text);
+		tz_config_set($text, '%PLUS_TIME%', PLUS_TIME);
+		tz_config_set($text, '%PLUS_PRODUCTION%', PLUS_PRODUCTION);
+		tz_config_set($text, '%PAYPAL_EMAIL%', (defined('PAYPAL_EMAIL') ? PAYPAL_EMAIL : 'martin@martinambrus.com'));
+		tz_config_set($text, '%PAYPAL_CURRENCY%', (defined('PAYPAL_CURRENCY') ? PAYPAL_CURRENCY : 'EUR'));
+		tz_config_set($text, '%PLUS_PACKAGE_A_PRICE%', (defined('PLUS_PACKAGE_A_PRICE') ? PLUS_PACKAGE_A_PRICE : '1,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_A_GOLD%', (defined('PLUS_PACKAGE_A_GOLD') ? PLUS_PACKAGE_A_GOLD : '60'));
+		tz_config_set($text, '%PLUS_PACKAGE_B_PRICE%', (defined('PLUS_PACKAGE_B_PRICE') ? PLUS_PACKAGE_B_PRICE : '4,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_B_GOLD%', (defined('PLUS_PACKAGE_B_GOLD') ? PLUS_PACKAGE_B_GOLD : '120'));
+		tz_config_set($text, '%PLUS_PACKAGE_C_PRICE%', (defined('PLUS_PACKAGE_C_PRICE') ? PLUS_PACKAGE_C_PRICE : '9,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_C_GOLD%', (defined('PLUS_PACKAGE_C_GOLD') ? PLUS_PACKAGE_C_GOLD : '360'));
+		tz_config_set($text, '%PLUS_PACKAGE_D_PRICE%', (defined('PLUS_PACKAGE_D_PRICE') ? PLUS_PACKAGE_D_PRICE : '19,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_D_GOLD%', (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'));
+		tz_config_set($text, '%PLUS_PACKAGE_E_PRICE%', (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'));
+		tz_config_set($text, '%PLUS_PACKAGE_E_GOLD%', (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'));
 
 		fwrite($fh, $text);
 		fclose($fh);
diff --git a/Templates/Profile/graphic.tpl b/Templates/Profile/graphic.tpl
index 66ed770d..90c2c083 100644
--- a/Templates/Profile/graphic.tpl
+++ b/Templates/Profile/graphic.tpl
@@ -200,35 +200,47 @@ if (isset($_GET["custom_url"])) {
 
     <tbody>
 
-        <tr>
-            <td class="nam"><?php echo TZ_TRAVIAN_DEFAULT; ?></td>
-            <td class="size">4</td>
-            <td class="act">
-                <a href="spieler.php?s=4&gp_type=custom&custom_url=gpack/travian_default/">
-                    Activate
-                </a>
-            </td>
-            <td class="down">
-                <a href="gpack/download/travian_default.zip" target="_blank">
-                    <?php echo TZ_DOWNLOAD; ?>
-                </a>
-            </td>
-        </tr>
+        <?php
+            // Lista pachetelor disponibile, citita din gpack/ - inainte erau doua
+            // intrari scrise de mana, deci orice pachet adaugat pe server nu
+            // aparea aici. Un director conteaza ca pachet daca are travian.css.
+            $gpHelper = __DIR__ . '/../../GameEngine/Admin/Mods/config_template.php';
 
+            if (!function_exists('tz_available_gpacks') && is_file($gpHelper)) {
+                include_once($gpHelper);
+            }
+
+            $gpPacks = function_exists('tz_available_gpacks')
+                ? tz_available_gpacks(__DIR__ . '/../../gpack')
+                : array('gpack/travian_default/' => 'Travian Default');
+
+            $gpActive = rtrim((string) $session->gpack, '/') . '/';
+
+            foreach ($gpPacks as $gpPath => $gpLabel) {
+                $gpIsActive = (rtrim($gpPath, '/') . '/') === $gpActive;
+                $gpZip      = 'gpack/download/' . basename(rtrim($gpPath, '/')) . '.zip';
+        ?>
         <tr>
-            <td class="nam"><?php echo TZ_TRAVIAN_T4_STYLE; ?></td>
+            <td class="nam"><?php echo htmlspecialchars($gpLabel, ENT_QUOTES, 'UTF-8'); ?></td>
             <td class="size">4</td>
             <td class="act">
-                <a href="spieler.php?s=4&gp_type=custom&custom_url=gpack/travian_t4/">
-                    Activate
-                </a>
+                <?php if ($gpIsActive) { ?>
+                    <b><?php echo defined('TZ_ACTIVE') ? TZ_ACTIVE : 'Active'; ?></b>
+                <?php } else { ?>
+                    <a href="spieler.php?s=4&amp;gp_type=custom&amp;custom_url=<?php echo urlencode($gpPath); ?>">
+                        <?php echo defined('ACTIVATE') ? ACTIVATE : 'Activate'; ?>
+                    </a>
+                <?php } ?>
             </td>
             <td class="down">
-                <a href="gpack/download/travian_default.zip" target="_blank">
-                    <?php echo TZ_DOWNLOAD; ?>
-                </a>
+                <?php if (is_file(__DIR__ . '/../../' . $gpZip)) { ?>
+                    <a href="<?php echo $gpZip; ?>" target="_blank"><?php echo TZ_DOWNLOAD; ?></a>
+                <?php } else { ?>
+                    &ndash;
+                <?php } ?>
             </td>
         </tr>
+        <?php } ?>
 
     </tbody>
 
diff --git a/install/data/constant_format.tpl b/install/data/constant_format.tpl
index 6ea92c7a..4bc0ed0d 100644
--- a/install/data/constant_format.tpl
+++ b/install/data/constant_format.tpl
@@ -147,9 +147,9 @@ define("WORLD_MAX", "%MAX%");
 // ***** Graphic Pack
 // true = enabled, false = disabled
 //!!!!!!!!!!!! DO NOT ENABLE !!!!!!!!!!!!
-define("GP_ENABLE",false);
+define("GP_ENABLE",%GP%);
 // Graphic pack location (default: gpack/travian_default/)
-define("GP_LOCATE", "gpack/travian_default/");
+define("GP_LOCATE", "%GP_LOCATE%");
 
 // ***** Troop Speed
 // Values: 1 (normal), 3 (3x speed) etc...
@@ -481,4 +481,4 @@ $requse = 0;
 ##                                                                             ##
 #################################################################################
 
-?>
+?>
\ No newline at end of file
diff --git a/install/process.php b/install/process.php
index 96fe44ab..e76a378f 100644
--- a/install/process.php
+++ b/install/process.php
@@ -191,7 +191,17 @@ class Process {
 		$findReplace["%VILLAGE_EXPAND%"] = $_POST['village_expand'];
 		$findReplace["%ERRORREPORT%"] = $_POST['error'];
 		$findReplace["%ERROR%"] = $_POST['error'];
-		//$findReplace["%GP_LOCATE%"] = $_POST['gp_locate'];
+		// Pachetul grafic al serverului. Linia era comentata, deci %GP_LOCATE%
+		// ramanea neinlocuit in config.php. Validam ca directorul chiar exista si
+		// contine travian.css, altfel jocul ar porni fara stiluri.
+		$gpLocate = isset($_POST['gp_locate']) ? (string) $_POST['gp_locate'] : 'gpack/travian_default/';
+
+		if (!preg_match('#^gpack/[A-Za-z0-9_\-]+/$#', $gpLocate)
+			|| !is_file('../' . $gpLocate . 'travian.css')) {
+			$gpLocate = 'gpack/travian_default/';
+		}
+
+		$findReplace["%GP_LOCATE%"] = $gpLocate;
 		$findReplace["%PLUS_TIME%"] = $_POST['plus_time'];
 		$findReplace["%PLUS_PRODUCTION%"] = $_POST['plus_production'];
 		$findReplace["%PAYPAL_EMAIL%"] = $_POST['paypal-email'];
diff --git a/install/templates/config.tpl b/install/templates/config.tpl
index 754dc79e..d0c33c50 100644
--- a/install/templates/config.tpl
+++ b/install/templates/config.tpl
@@ -312,6 +312,10 @@ foreach($mechs as $k => $l){
     <div><label>Hero base regeneration (HP/day)</label><input class="input" name="hero_base_regen" id="hero_base_regen" value="10"></div>
     <div><label>Silver received per 1 gold</label><input class="input" name="hero_silver_per_gold" id="hero_silver_per_gold" value="10"></div>
     <div><label>Silver needed for 1 gold</label><input class="input" name="hero_silver_to_gold" id="hero_silver_to_gold" value="25"></div>
+    <div><label>Graphic pack</label><select class="input" name="gp_locate">
+        <option value="gpack/travian_default/" selected>Travian Default (classic T3.6 look)</option>
+        <option value="gpack/travian_t4/">Travian T4 (T4-styled artwork)</option>
+    </select></div>
     <div><label>Hero resources per point (all four)</label><input class="input" name="hero_res_all" id="hero_res_all" value="3"></div>
     <div><label>Hero resources per point (single type)</label><input class="input" name="hero_res_one" id="hero_res_one" value="10"></div>
   </div>