diff --git a/upload/blocks/1_notify.php b/upload/blocks/1_notify.php
deleted file mode 100644
index d9f7631..0000000
--- a/upload/blocks/1_notify.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-if(!defined("MCR")){ exit("Hacking Attempt!"); }
-
-class block_notify{
-	private $core, $db;
-
-	public function __construct($core){
-		$this->core = $core;
-		$this->db = $core->db;
-	}
-
-	public function content(){
-		if(!isset($_SESSION['mcr_notify'])){ return ''; }
-
-		$new_data = array(
-			"TYPE" => $this->db->HSC($_SESSION['notify_type']),
-			"TITLE" => $this->db->HSC($_SESSION['notify_title']),
-			"MESSAGE" => $this->db->HSC($_SESSION['notify_msg'])
-		);
-
-		$result = $this->core->sp(MCR_THEME_PATH."blocks/notify/alert.html", $new_data);
-	
-		unset($_SESSION['mcr_notify']);
-		unset($_SESSION['notify_type']);
-		unset($_SESSION['notify_title']);
-		unset($_SESSION['notify_msg']);
-
-		return $result;
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/upload/blocks/2_profile.php b/upload/blocks/2_profile.php
deleted file mode 100644
index 9f43399..0000000
--- a/upload/blocks/2_profile.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-if(!defined("MCR")){ exit("Hacking Attempt!"); }
-
-class block_profile{
-	private $core, $user;
-
-	public function __construct($core){
-		$this->core = $core;
-		$this->user = $core->user;
-	}
-
-	public function content(){
-		$authfile = (!$this->user->is_auth) ? "unauth" : "auth";
-
-		return $this->core->sp(MCR_THEME_PATH."blocks/profile/$authfile.html");
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/upload/blocks/3_monitor.php b/upload/blocks/3_monitor.php
deleted file mode 100644
index 78a693c..0000000
--- a/upload/blocks/3_monitor.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-if(!defined("MCR")){ exit("Hacking Attempt!"); }
-
-class block_monitor{
-	private $core, $db, $user, $lng;
-
-	public function __construct($core){
-		$this->core	= $core;
-		$this->db	= $core->db;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_b;
-	}
-
-	private function server_array(){
-		$query = $this->db->query("SELECT id, title, `text`, ip, `port`, `status`, online, slots, players FROM `mcr_monitoring`");
-
-		if(!$query || $this->db->num_rows($query)<=0){ return $this->lng['empty']; }
-
-		ob_start();
-
-		while($ar = $this->db->fetch_assoc($query)){
-
-			$status = (intval($ar['status'])===1) ? 'progress-info' : 'progress-danger';
-			$slots = intval($ar['slots']);
-			$online = intval($ar['online']);
-
-			$progress = ($online<=0) ? 0 : ceil(100 / ($slots / $online));
-
-			if(intval($ar['status'])!=1){ $progress = 100; }
-
-			$data = array(
-				'ID' => intval($ar['id']),
-				'TITLE' => $this->db->HSC($ar['title']),
-				'TEXT' => $this->db->HSC($ar['text']),
-				'IP' => $this->db->HSC($ar['ip']),
-				'PORT' => intval($ar['port']),
-				'PROGRESS' => $progress,
-				'STATUS' => $status,
-				'STATS' => (intval($ar['status'])===1) ? $online.' / '.$slots : $this->lng['offline'],
-			);
-
-			echo $this->core->sp(MCR_THEME_PATH."blocks/monitor/monitor-id.html", $data);
-		}
-
-		return ob_get_clean();
-	}
-
-	public function content(){
-		if(!$this->core->is_access("sys_monitoring")){ return; }
-
-		$data = array(
-			'CONTENT' => $this->server_array(),
-		);
-
-		return $this->core->sp(MCR_THEME_PATH."blocks/monitor/main.html", $data);
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/upload/blocks/4_banner.php b/upload/blocks/4_banner.php
deleted file mode 100644
index 5dfcf70..0000000
--- a/upload/blocks/4_banner.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-if(!defined("MCR")){ exit("Hacking Attempt!"); }
-
-class block_banner{
-	private $core;
-
-	public function __construct($core){
-		$this->core = $core;
-	}
-
-	public function content(){
-		if(!$this->core->is_access("sys_adm_main")){ return; }
-
-		return $this->core->sp(MCR_THEME_PATH."blocks/banner/main.html");
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/upload/blocks/banner.php b/upload/blocks/banner.php
new file mode 100644
index 0000000..8801fd4
--- /dev/null
+++ b/upload/blocks/banner.php
@@ -0,0 +1,22 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class block_banner{
+	private $core;
+
+	public function __construct($core){
+		$this->core = $core;
+	}
+
+	public function content(){
+
+		if(!$this->core->is_access(@$this->core->cfg_b['PERMISSIONS'])){ return; }
+
+		$this->core->header .= $this->core->sp(MCR_THEME_PATH."blocks/banner/header.html");
+
+		return $this->core->sp(MCR_THEME_PATH."blocks/banner/main.html");
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/blocks/monitor.php b/upload/blocks/monitor.php
new file mode 100644
index 0000000..800831b
--- /dev/null
+++ b/upload/blocks/monitor.php
@@ -0,0 +1,63 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class block_monitor{
+	private $core, $db, $user, $lng;
+
+	public function __construct($core){
+		$this->core	= $core;
+		$this->db	= $core->db;
+		$this->user	= $core->user;
+		$this->lng	= $core->lng_b;
+	}
+
+	private function server_array(){
+		$query = $this->db->query("SELECT id, title, `text`, ip, `port`, `status`, online, slots, players FROM `mcr_monitoring`");
+
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->lng['empty']; }
+
+		ob_start();
+
+		while($ar = $this->db->fetch_assoc($query)){
+
+			$status = (intval($ar['status'])===1) ? 'progress-info' : 'progress-danger';
+			$slots = intval($ar['slots']);
+			$online = intval($ar['online']);
+
+			$progress = ($online<=0) ? 0 : ceil(100 / ($slots / $online));
+
+			if(intval($ar['status'])!=1){ $progress = 100; }
+
+			$data = array(
+				'ID' => intval($ar['id']),
+				'TITLE' => $this->db->HSC($ar['title']),
+				'TEXT' => $this->db->HSC($ar['text']),
+				'IP' => $this->db->HSC($ar['ip']),
+				'PORT' => intval($ar['port']),
+				'PROGRESS' => $progress,
+				'STATUS' => $status,
+				'STATS' => (intval($ar['status'])===1) ? $online.' / '.$slots : $this->lng['offline'],
+			);
+
+			echo $this->core->sp(MCR_THEME_PATH."blocks/monitor/monitor-id.html", $data);
+		}
+
+		return ob_get_clean();
+	}
+
+	public function content(){
+
+		if(!$this->core->is_access(@$this->core->cfg_b['PERMISSIONS'])){ return; }
+
+		$this->core->header .= $this->core->sp(MCR_THEME_PATH."blocks/monitor/header.html");
+
+		$data = array(
+			'CONTENT' => $this->server_array(),
+		);
+
+		return $this->core->sp(MCR_THEME_PATH."blocks/monitor/main.html", $data);
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/blocks/notify.php b/upload/blocks/notify.php
new file mode 100644
index 0000000..bbbbf33
--- /dev/null
+++ b/upload/blocks/notify.php
@@ -0,0 +1,35 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class block_notify{
+	private $core, $db;
+
+	public function __construct($core){
+		$this->core = $core;
+		$this->db = $core->db;
+	}
+
+	public function content(){
+		$this->core->header .= $this->core->sp(MCR_THEME_PATH."blocks/notify/header.html");
+
+		if(!isset($_SESSION['mcr_notify'])){ return ''; }
+
+		$new_data = array(
+			"TYPE" => $this->db->HSC($_SESSION['notify_type']),
+			"TITLE" => $this->db->HSC($_SESSION['notify_title']),
+			"MESSAGE" => $this->db->HSC($_SESSION['notify_msg'])
+		);
+
+		$result = $this->core->sp(MCR_THEME_PATH."blocks/notify/alert.html", $new_data);
+	
+		unset($_SESSION['mcr_notify']);
+		unset($_SESSION['notify_type']);
+		unset($_SESSION['notify_title']);
+		unset($_SESSION['notify_msg']);
+
+		return $result;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/blocks/online.php b/upload/blocks/online.php
new file mode 100644
index 0000000..1a0cb7d
--- /dev/null
+++ b/upload/blocks/online.php
@@ -0,0 +1,23 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class block_online{
+	private $core, $user;
+
+	public function __construct($core){
+		$this->core = $core;
+		$this->user = $core->user;
+	}
+
+	public function content(){
+
+		if(!$this->core->is_access(@$this->core->cfg_b['PERMISSIONS'])){ return; }
+
+		$this->core->header .= $this->core->sp(MCR_THEME_PATH."blocks/online/header.html");
+
+		return $this->core->sp(MCR_THEME_PATH."blocks/online/main.html");
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/blocks/profile.php b/upload/blocks/profile.php
new file mode 100644
index 0000000..8176152
--- /dev/null
+++ b/upload/blocks/profile.php
@@ -0,0 +1,22 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class block_profile{
+	private $core, $user;
+
+	public function __construct($core){
+		$this->core = $core;
+		$this->user = $core->user;
+	}
+
+	public function content(){
+		$authfile = (!$this->user->is_auth) ? "unauth" : "auth";
+
+		$this->core->header .= $this->core->sp(MCR_THEME_PATH."blocks/profile/header.html");
+
+		return $this->core->sp(MCR_THEME_PATH."blocks/profile/$authfile.html");
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/configs/blocks/banner.php b/upload/configs/blocks/banner.php
new file mode 100644
index 0000000..e242214
--- /dev/null
+++ b/upload/configs/blocks/banner.php
@@ -0,0 +1,15 @@
+<?php
+$cfg = array (
+  'ENABLE' => true,
+  'POSITION' => 5,
+  'TITLE' => 'Разработчик',
+  'DESC' => 'Блок вывода баннера',
+  'AUTHOR' => 'Qexy',
+  'SITE' => 'http://qexy.org',
+  'EMAIL' => 'admin@qexy.org',
+  'VERSION' => '1.0',
+  'UPDATES' => true,
+  'UPDATER' => 'http://update.webmcr.com/?do=blocks&amp;amp;op=banner',
+  'PERMISSIONS' => 'block_banner',
+);
+?>
\ No newline at end of file
diff --git a/upload/configs/blocks/monitor.php b/upload/configs/blocks/monitor.php
new file mode 100644
index 0000000..e2077bc
--- /dev/null
+++ b/upload/configs/blocks/monitor.php
@@ -0,0 +1,15 @@
+<?php
+$cfg = array (
+  'ENABLE' => true,
+  'POSITION' => 3,
+  'TITLE' => 'Мониторинг',
+  'DESC' => 'Блок вывода мониторинга',
+  'AUTHOR' => 'Qexy',
+  'SITE' => 'http://qexy.org',
+  'EMAIL' => 'admin@qexy.org',
+  'VERSION' => '1.0',
+  'UPDATES' => true,
+  'UPDATER' => 'http://update.webmcr.com/?do=blocks&amp;amp;op=monitor',
+  'PERMISSIONS' => 'sys_monitoring',
+);
+?>
\ No newline at end of file
diff --git a/upload/configs/blocks/notify.php b/upload/configs/blocks/notify.php
new file mode 100644
index 0000000..a2a93a4
--- /dev/null
+++ b/upload/configs/blocks/notify.php
@@ -0,0 +1,16 @@
+<?php
+
+$cfg = array(
+	'ENABLE' => true,
+	'POSITION' => 1,
+	'TITLE' => 'Оповещения',
+	'DESC' => 'Блок вывода оповещений',
+	'AUTHOR' => 'Qexy',
+	'SITE' => 'http://qexy.org',
+	'EMAIL' => 'admin@qexy.org',
+	'VERSION' => '1.0',
+	'UPDATES' => true,
+	'UPDATER' => 'http://update.webmcr.com/?do=blocks&op=notify',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/configs/blocks/online.php b/upload/configs/blocks/online.php
new file mode 100644
index 0000000..643aae9
--- /dev/null
+++ b/upload/configs/blocks/online.php
@@ -0,0 +1,18 @@
+<?php
+
+$cfg = array(
+	'ENABLE' => true,
+	'POSITION' => 4,
+	'TITLE' => 'Онлайн статистика',
+	'DESC' => 'Блок вывода текущего онлайна на сайте',
+	'AUTHOR' => 'Qexy',
+	'SITE' => 'http://qexy.org',
+	'EMAIL' => 'admin@qexy.org',
+	'VERSION' => '1.0',
+	'UPDATES' => true,
+	'UPDATER' => 'http://update.webmcr.com/?do=blocks&op=online',
+	'PERMISSIONS' => 'block_online',
+	'TIMEOUT' => 60,
+);
+
+?>
\ No newline at end of file
diff --git a/upload/configs/blocks/profile.php b/upload/configs/blocks/profile.php
new file mode 100644
index 0000000..fbfd1fa
--- /dev/null
+++ b/upload/configs/blocks/profile.php
@@ -0,0 +1,16 @@
+<?php
+
+$cfg = array(
+	'ENABLE' => true,
+	'POSITION' => 2,
+	'TITLE' => 'Мини-профиль',
+	'DESC' => 'Блок вывода мини-профиля пользователя',
+	'AUTHOR' => 'Qexy',
+	'SITE' => 'http://qexy.org',
+	'EMAIL' => 'admin@qexy.org',
+	'VERSION' => '1.0',
+	'UPDATES' => true,
+	'UPDATER' => 'http://update.webmcr.com/?do=blocks&op=profile',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/configs/db.php b/upload/configs/db.php
index e30f037..808392c 100644
--- a/upload/configs/db.php
+++ b/upload/configs/db.php
@@ -3,9 +3,69 @@
   'host' => '127.0.0.1',
   'user' => 'root',
   'pass' => '',
-  'base' => 'minecraft',
+  'base' => '',
   'port' => 3306,
   'backend' => 'mysqli',
   'log' => true,
+  'tables' => 
+  array (
+    'ugroups' => 
+    array (
+      'name' => 'mcr_groups',
+      'fields' => 
+      array (
+        'id' => 'id',
+        'title' => 'title',
+        'text' => 'description',
+        'color' => 'color',
+        'perm' => 'permissions',
+      ),
+    ),
+    'iconomy' => 
+    array (
+      'name' => 'mcr_iconomy',
+      'fields' => 
+      array (
+        'id' => 'id',
+        'login' => 'login',
+        'money' => 'money',
+        'rm' => 'realmoney',
+        'bank' => 'bank',
+      ),
+    ),
+    'logs' => 
+    array (
+      'name' => 'mcr_logs',
+      'fields' => 
+      array (
+        'id' => 'id',
+        'uid' => 'uid',
+        'msg' => 'message',
+        'date' => 'date',
+      ),
+    ),
+    'users' => 
+    array (
+      'name' => 'mcr_users',
+      'fields' => 
+      array (
+        'id' => 'id',
+        'group' => 'gid',
+        'login' => 'login',
+        'email' => 'email',
+        'pass' => 'password',
+        'uuid' => 'uuid',
+        'salt' => 'salt',
+        'tmp' => 'tmp',
+        'is_skin' => 'is_skin',
+        'is_cloak' => 'is_cloak',
+        'ip_create' => 'ip_create',
+        'ip_last' => 'ip_last',
+        'color' => 'color',
+        'data' => 'data',
+        'ban_server' => 'ban_server',
+      ),
+    ),
+  ),
 );
-?>
+?>
\ No newline at end of file
diff --git a/upload/configs/main.php b/upload/configs/main.php
index f722765..5678f4c 100644
--- a/upload/configs/main.php
+++ b/upload/configs/main.php
@@ -6,14 +6,13 @@
   's_dpage' => 'news',
   's_theme' => 'default',
   'rewrite' => false,
-  'log' => false,
   'install' => true,
   'p_logic' => 'usual',
   'debug' => true,
   's_lang' => 'ru_RU',
   's_root' => '/',
-  's_root_full' => 'http://localhost',
-  'mcr_secury' => 'IRmMO5hR$U3IypSR@KBH',
+  's_root_full' => 'http://site.ru',
+  'mcr_secury' => '0Hv@tFOJxm3Zcfu6dM36',
   'crypt' => 0,
   'reg_accept' => true,
   'captcha' => 1,
@@ -21,5 +20,7 @@
   'rc_private' => '6LdNLf8SAAAAAO-XQUcGglTRw4ZZw2tO8163hudD',
   'kc_public' => '78758',
   'kc_private' => 'nBJjeiTqRAuXZlqwklPHSgtlCj',
+  'skin_path' => 'uploads/skins/',
+  'cloak_path' => 'uploads/cloaks/',
 );
 ?>
\ No newline at end of file
diff --git a/upload/cron/clear_logs.php b/upload/cron/clear_logs.php
new file mode 100644
index 0000000..3a22e2b
--- /dev/null
+++ b/upload/cron/clear_logs.php
@@ -0,0 +1,36 @@
+<?php
+
+define("DEBUG_PLT", microtime(true));
+define('MCR', '');
+define('ENABLE', true); // Вкл./Выкл. планировщик (true|false)
+define('DAYS', 10); // Максимальное время жизни логов (в днях)
+define('MCR_ROOT', str_replace('cron', '', dirname(__FILE__)));
+define('MCR_TOOL_PATH', MCR_ROOT.'engine/');
+define('MCR_CONF_PATH', MCR_ROOT.'configs/');
+
+if(!ENABLE){ exit('DISABLED'); }
+
+require_once(MCR_TOOL_PATH.'config.class.php');
+
+$cfg = new config();
+
+require_once(MCR_TOOL_PATH.'db/'.$cfg->db['backend'].'.class.php');
+
+$db = new db($cfg);
+
+$expire = time()-(3600*24*DAYS);
+
+$lt = $cfg->db['tables']['logs'];
+$fl = $lt['fields'];
+
+$delete = $db->remove_fast($lt['name'], "`date`<'$expire'");
+
+if(!$delete){ exit('Ошибка запроса! #'.__LINE__); }
+
+echo '<p>SUCCESS!</p>';
+echo '<p>DELETED ROWS: '.$db->affected_rows().'</p>';
+
+// Script load time
+echo '<p>PAGE LOAD TIME: '.number_format(microtime(true)-DEBUG_PLT,3).'</p>';
+
+?>
\ No newline at end of file
diff --git a/upload/engine/config.class.php b/upload/engine/config.class.php
index c32ec8f..8db338d 100644
--- a/upload/engine/config.class.php
+++ b/upload/engine/config.class.php
@@ -1,5 +1,7 @@
 <?php
 
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
 class config{
 	public $main	= array();
 	public $db		= array();
@@ -10,12 +12,12 @@
 
 	public function __construct(){
 		// Load main config
-		require_once(MCR_ROOT.'configs/main.php');
-		require_once(MCR_ROOT.'configs/mail.php');
-		require_once(MCR_ROOT.'configs/db.php');
-		require_once(MCR_ROOT.'configs/functions.php');
-		require_once(MCR_ROOT.'configs/pagin.php');
-		require_once(MCR_ROOT.'configs/search.php');
+		require_once(MCR_CONF_PATH.'main.php');
+		require_once(MCR_CONF_PATH.'mail.php');
+		require_once(MCR_CONF_PATH.'db.php');
+		require_once(MCR_CONF_PATH.'functions.php');
+		require_once(MCR_CONF_PATH.'pagin.php');
+		require_once(MCR_CONF_PATH.'search.php');
 
 		$this->main		= $main;
 		$this->mail		= $mail;
@@ -24,12 +26,16 @@
 		$this->pagin	= $pagin;
 		$this->search	= $search;
 	}
+
+	public function tabname($name){
+		return $this->db['tables'][$name]['name'];
+	}
 	
 	public function savecfg($cfg=array(), $file='main.php', $var='main'){
 
 		if(!is_array($cfg) || empty($cfg)){ return false; }
 
-		$filename = MCR_ROOT."configs/".$file;
+		$filename = MCR_CONF_PATH.$file;
 
 		$txt  = '<?php'.PHP_EOL;
 		$txt .= '$'.$var.' = '.var_export($cfg, true).';'.PHP_EOL;
diff --git a/upload/engine/core.class.php b/upload/engine/core.class.php
index 1ee24dc..6e98988 100644
--- a/upload/engine/core.class.php
+++ b/upload/engine/core.class.php
@@ -9,9 +9,9 @@
 
 	public $def_header	= '';
 
-	public $db, $user, $config = false;
+	public $db, $user, $cfg = false;
 
-	public $lng, $lng_m, $lng_b, $cfg_m = array();
+	public $lng, $lng_m, $lng_b, $cfg_m, $cfg_b = array();
 
 	public $csrf_time	= 3600;
 
@@ -23,16 +23,16 @@
 
 	public function __construct(){
 
-		// Load class config
-		require_once(MCR_TOOL_PATH.'config.class.php');
+		// Load class cfg
+		require(MCR_TOOL_PATH.'config.class.php');
 
-		// Create & set new object of config
-		$this->config = new config();
+		// Create & set new object of cfg
+		$this->cfg = new config();
 
-		if(!file_exists(MCR_LANG_PATH.$this->config->main['s_lang'].'/system.php')){ exit("Language path not found"); }
+		if(!file_exists(MCR_LANG_PATH.$this->cfg->main['s_lang'].'/system.php')){ exit("Language path not found"); }
 
 		// Load language package
-		require(MCR_LANG_PATH.$this->config->main['s_lang'].'/system.php');
+		require(MCR_LANG_PATH.$this->cfg->main['s_lang'].'/system.php');
 
 		// Set language var
 		$this->lng = $lng;
@@ -40,10 +40,10 @@
 		$this->title = $lng['t_main'];
 
 		// Load database class
-		require_once(MCR_TOOL_PATH.'db/'.$this->config->db['backend'].'.class.php');
+		require(MCR_TOOL_PATH.'db/'.$this->cfg->db['backend'].'.class.php');
 
 		// Create & set new object of database
-		$this->db = new db($this->config);
+		$this->db = new db($this->cfg);
 
 		// Load user class
 		require_once(MCR_TOOL_PATH.'user.class.php');
@@ -57,20 +57,25 @@
 		// Create & set new object of menu
 		$this->menu = new menu($this);
 
-		$base_url = ($this->config->main['install']) ? $this->base_url() : $this->config->main['s_root'];
+		$base_url = ($this->cfg->main['install']) ? $this->base_url() : $this->cfg->main['s_root'];
 
 		// Generate CSRF Secure key
 		define("MCR_SECURE_KEY", $this->gen_csrf_secure());// System constants
-		define('MCR_LANG', $this->config->main['s_lang']);
+		define('MCR_LANG', $this->cfg->main['s_lang']);
 		define('MCR_LANG_DIR', MCR_LANG_PATH.MCR_LANG.'/');
-		define('MCR_THEME_PATH', MCR_ROOT.'themes/'.$this->config->main['s_theme'].'/');
+		define('MCR_THEME_PATH', MCR_ROOT.'themes/'.$this->cfg->main['s_theme'].'/');
 		define('MCR_THEME_MOD', MCR_THEME_PATH.'modules/');
 		define('MCR_THEME_BLOCK', MCR_THEME_PATH.'blocks/');
 		define('BASE_URL', $base_url);
-		define('ADMIN_URL', BASE_URL.'?mode=admin');
-		define('STYLE_URL', BASE_URL.'themes/'.$this->config->main['s_theme'].'/');
+		define('ADMIN_MOD', 'mode=admin');
+		define('ADMIN_URL', BASE_URL.'?'.ADMIN_MOD);
+		define('STYLE_URL', BASE_URL.'themes/'.$this->cfg->main['s_theme'].'/');
 		define('UPLOAD_URL', BASE_URL.'uploads/');
+		define('SKIN_URL', BASE_URL.$this->cfg->main['skin_path']);
+		define('CLOAK_URL', BASE_URL.$this->cfg->main['cloak_path']);
 		define('LANG_URL', BASE_URL.'language/'.MCR_LANG.'/');
+		define('MCR_SKIN_PATH', MCR_ROOT.$this->cfg->main['skin_path']);
+		define('MCR_CLOAK_PATH', MCR_ROOT.$this->cfg->main['cloak_path']);
 
 		$bc = array(
 			$this->lng['e_msg'] => BASE_URL,
@@ -87,7 +92,7 @@
 
 		$time = time();
 
-		$new_key = $time.'_'.md5($this->user->ip.$this->config->main['mcr_secury'].$time);
+		$new_key = $time.'_'.md5($this->user->ip.$this->cfg->main['mcr_secury'].$time);
 
 		if(!isset($_COOKIE['mcr_secure'])){
 			setcookie("mcr_secure", $new_key, time()+$this->csrf_time, '/');
@@ -98,7 +103,7 @@
 
 		$old_time = intval($cookie[0]);
 
-		$old_key = md5($this->user->ip.$this->config->main['mcr_secury'].$old_time);
+		$old_key = md5($this->user->ip.$this->cfg->main['mcr_secury'].$old_time);
 
 		if(!isset($cookie[1]) || $cookie[1] !== $old_key || ($old_time+$this->csrf_time)<$time){
 			setcookie("mcr_secure", $new_key, time()+$this->csrf_time, '/');
@@ -224,7 +229,7 @@
 			// Prev pages +
 			$page_prev = '';
 
-			for($pp = $this->config->pagin['arrows']; $pp > 0; $pp--){
+			for($pp = $this->cfg->pagin['arrows']; $pp > 0; $pp--){
 
 				if($pid-$pp <= 0){ continue; }
 
@@ -249,7 +254,7 @@
 			// Next pages +
 			$page_next = '';
 
-			for($np = 1; $np <= $this->config->pagin['arrows']; $np++){
+			for($np = 1; $np <= $this->cfg->pagin['arrows']; $np++){
 
 				if($pid+$np > $max){ continue; }
 
@@ -313,7 +318,7 @@
 
 			$secure_var = $secure_key[1];
 			
-			$mcr_secure = $secure_time.'_'.md5($this->user->ip.$this->config->main['mcr_secury'].$secure_time);
+			$mcr_secure = $secure_time.'_'.md5($this->user->ip.$this->cfg->main['mcr_secury'].$secure_time);
 
 			if($mcr_secure!==$_POST['mcr_secure']){ $this->notify($this->lng['e_hack']); }
 		}
@@ -380,13 +385,14 @@
 
 		$data['LIST'] = $this->gen_bc_list($array);
 
-		if(!$this->config->func['breadcrumbs']){ return false; }
+		if(!$this->cfg->func['breadcrumbs']){ return false; }
 
 		return $this->sp(MCR_THEME_PATH."breadcrumbs/list.html", $data);
 	}
 
 	public function check_cfg($cfg){
-		$validator = array('MOD_ENABLE',
+		$validator = array(
+			'MOD_ENABLE',
 			'MOD_TITLE',
 			'MOD_DESC',
 			'MOD_AUTHOR',
@@ -406,6 +412,29 @@
 		return $result;
 	}
 
+	public function check_cfg_block($cfg){
+		$format = array(
+			'ENABLE',
+			'POSITION',
+			'TITLE',
+			'DESC',
+			'AUTHOR',
+			'SITE',
+			'EMAIL',
+			'VERSION',
+			'UPDATES',
+			'UPDATER'
+		);
+
+		$result = true;
+
+		foreach($format as $key => $val){
+			if(!isset($cfg[$val])){ $result = false; }
+		}
+
+		return $result;
+	}
+
 	/**
 	 * Подгрузчик модулей
 	 * @param String $mode - название модуля
@@ -436,8 +465,6 @@
 		$this->cfg_m = $cfg;
 
 		$module = new module($this);
-
-		@$module->cfg = $cfg;
 		
 		if(!method_exists($module, "content")){ return $this->lng['e_mode_method']; }
 
@@ -462,7 +489,7 @@
 	 * @return String
 	 */
 	public function gen_password($string='', $salt='', $crypt=false){
-		if($crypt===false){ $crypt = $this->config->main['crypt']; }
+		if($crypt===false){ $crypt = $this->cfg->main['crypt']; }
 
 		switch($crypt) {
 			case 1: return sha1($string); break;
@@ -509,7 +536,7 @@
 
 		require_once(MCR_CONF_PATH.'modules/'.$mode.'.php');
 
-		require(MCR_LANG_PATH.$this->config->main['s_lang'].'/'.$mode.'.php');
+		require(MCR_LANG_PATH.$this->cfg->main['s_lang'].'/'.$mode.'.php');
 
 		if(!$cfg['MOD_ENABLE']){ return $this->sp(MCR_THEME_PATH."default_sp/mod_disable.html"); }
 
@@ -519,8 +546,6 @@
 
 		$module = new module($this);
 
-		$module->cfg = $cfg;
-
 		return $module->content();
 	}
 
@@ -529,38 +554,61 @@
 	 * @return Buffer string or false
 	 */
 	public function load_def_blocks(){
-		$list = scandir(MCR_SIDE_PATH);
 
-		if(empty($list)){ return false; }
+		$format = array('ENABLE', 'POSITION', 'TITLE', 'DESC', 'AUTHOR', 'SITE', 'EMAIL', 'VERSION', 'UPDATES', 'UPDATER');
+
+		$configs = scandir(MCR_CONF_PATH.'blocks');
+
+		if(empty($configs)){ return false; }
 
 		$content = '';
+		$blocks = array();
 
-		foreach($list as $key => $file){
+		foreach($configs as $key => $file){
+			$this->cfg_b = $cfg = false;
+			$this->lng_b = $lng = array();
+
 			if($file=='.' || $file=='..' || substr($file, -4)!='.php'){ continue; }
 
-			$expl = explode('_', $file);
+			include(MCR_CONF_PATH.'blocks/'.$file);
 
-			if(file_exists(MCR_LANG_DIR.'blocks/'.$expl[1])){
-				require_once(MCR_LANG_DIR.'blocks/'.$expl[1]);
-				$this->lng_b = $lng;
-			}else{
-				$this->lng_b = array();
+			if($cfg===false){ continue; }
+
+			$cfg_keys = array_keys($cfg);
+
+			$diff = array_diff($format, $cfg_keys);
+
+			if(!empty($diff) || !$cfg['ENABLE']){ continue; }
+
+			if(!file_exists(MCR_SIDE_PATH.$file)){ continue; }
+
+			include(MCR_SIDE_PATH.$file);
+
+			if(file_exists(MCR_LANG_DIR.'blocks/'.$file)){
+				include(MCR_LANG_DIR.'blocks/'.$file);
 			}
 			
-			include_once(MCR_SIDE_PATH.$file);
+			$this->lng_b = $lng;
 
-			$classname = 'block_'.substr($expl[1], 0, -4);
+			$this->cfg_b = $cfg;
+
+			$classname = 'block_'.substr($file, 0, -4);
 
 			if(!class_exists($classname)){ continue; }
 
 			$obj = new $classname($this);
 
-			if(!method_exists($obj, 'content')){ continue; }
+			if(!method_exists($obj, 'content')){ unset($obj); continue; }
 
-			$content .= $obj->content();
+			$blocks[$cfg['POSITION']] = $obj->content();
 
 			unset($obj);
+		}
 
+		ksort($blocks);
+
+		foreach($blocks as $key => $val){
+			$content .= $val;
 		}
 
 		return $content;
@@ -586,7 +634,7 @@
 	 */
 	public function advice(){
 
-		if(!$this->config->func['advice']){ return ''; }
+		if(!$this->cfg->func['advice']){ return ''; }
 
 		$data = file(MCR_THEME_PATH."default_sp/advice.txt");
 		$size = count($data);
@@ -689,29 +737,29 @@
 
 		//$mail->SMTPDebug = 3;
 
-		if($this->config->mail['smtp']){
+		if($this->cfg->mail['smtp']){
 			$mail->isSMTP();
-			$mail->Host = $this->config->mail['smtp_host'];			// Specify main and backup SMTP servers
+			$mail->Host = $this->cfg->mail['smtp_host'];			// Specify main and backup SMTP servers
 			$mail->SMTPAuth = true;									// Enable SMTP authentication
-			$mail->Username = $this->config->mail['smtp_user'];		// SMTP username
-			$mail->Password = $this->config->mail['smtp_pass'];		// SMTP password
+			$mail->Username = $this->cfg->mail['smtp_user'];		// SMTP username
+			$mail->Password = $this->cfg->mail['smtp_pass'];		// SMTP password
 			$mail->SMTPSecure = 'tls';								// Enable TLS encryption, `ssl` also accepted
 			$mail->Port = 587;										// TCP port to connect to
 		}
 
 		$mail->CharSet = 'UTF-8';
 		$mail->setLanguage('ru', MCR_LANG_DIR.'smpt/');
-		$mail->From = ($this->config->mail['smtp']) ? $this->config->mail['smtp_user'] : $this->config->mail['from'];
-		$mail->FromName = $this->config->mail['from_name'];
+		$mail->From = ($this->cfg->mail['smtp']) ? $this->cfg->mail['smtp_user'] : $this->cfg->mail['from'];
+		$mail->FromName = $this->cfg->mail['from_name'];
 		if(is_array($to)){
 			foreach($to as $key => $value){ $mail->addAddress($value); }
 		}else{
 			$mail->addAddress($to);
 		}
 		
-		$mail->addReplyTo($this->config->mail['reply'], $this->config->mail['reply_name']);
-		if($this->config->mail['cc']){ $mail->addCC($this->config->mail['from']); }
-		//$mail->addBCC($this->config->mail['bcc']);
+		$mail->addReplyTo($this->cfg->mail['reply'], $this->cfg->mail['reply_name']);
+		if($this->cfg->mail['cc']){ $mail->addCC($this->cfg->mail['from']); }
+		//$mail->addBCC($this->cfg->mail['bcc']);
 
 		$mail->isHTML(true);										// Set email format to HTML
 
@@ -724,12 +772,12 @@
 
 	public function captcha_check(){
 
-		if(!isset($this->captcha[$this->config->main['captcha']])){ return true; }
+		if(!isset($this->captcha[$this->cfg->main['captcha']])){ return true; }
 
-		switch($this->config->main['captcha']){
+		switch($this->cfg->main['captcha']){
 			case 1:
 				$response = @$_POST['g-recaptcha-response'];
-				$request = file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=".$this->config->main['rc_private']."&response=".$response."&remoteip=".$this->user->ip);
+				$request = file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=".$this->cfg->main['rc_private']."&response=".$response."&remoteip=".$this->user->ip);
 				$request = json_decode($request);
 
 				if(!$request->success){ return false; }
@@ -753,7 +801,7 @@
 	}
 
 	public function captcha(){
-		switch($this->config->main['captcha']){
+		switch($this->cfg->main['captcha']){
 			case 1: $content = $this->sp(MCR_THEME_PATH."captcha/recaptcha.html"); break;
 
 			case 2: require(MCR_TOOL_PATH.'libs/keycaptcha.php'); $kc = new KeyCAPTCHA_CLASS('', $this);
@@ -795,11 +843,11 @@
 	}
 
 	private function search_array($active = 'news'){
-		if(empty($this->config->search)){ return; }
+		if(empty($this->cfg->search)){ return; }
 
 		ob_start();
 
-		foreach($this->config->search as $key => $value){
+		foreach($this->cfg->search as $key => $value){
 			if(!$this->is_access($value['permissions'])){ continue; }
 
 			$data = array(
diff --git a/upload/engine/db/mysql.class.php b/upload/engine/db/mysql.class.php
index 37ebe8d..cda9051 100644
--- a/upload/engine/db/mysql.class.php
+++ b/upload/engine/db/mysql.class.php
@@ -1,22 +1,24 @@
 <?php
 
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
 class db{
 	public $obj = false;
 
 	public $result = false;
 
-	private $config;
+	private $cfg;
 
 	public $count_queries = 0;
 	public $count_queries_real = 0;
 
-	public function __construct($config){
+	public function __construct($cfg){
 
-		$this->config = $config;
+		$this->cfg = $cfg;
 
-		$this->obj = @mysql_connect($config->db['host'].':'.$config->db['port'], $config->db['user'], $config->db['pass']);
+		$this->obj = @mysql_connect($cfg->db['host'].':'.$cfg->db['port'], $cfg->db['user'], $cfg->db['pass']);
 
-		if(!@mysql_select_db($config->db['base'], $this->obj)){ return; }
+		if(!@mysql_select_db($cfg->db['base'], $this->obj)){ return; }
 
 		@mysql_set_charset("UTF8", $this->obj);
 
@@ -77,14 +79,17 @@
 	}
 
 	public function actlog($msg='', $uid=0){
-		if(!$this->config->db['log']){ return false; }
+		if(!$this->cfg->db['log']){ return false; }
 
 		$uid = intval($uid);
 		$msg = $this->safesql($msg);
 		$date = time();
 
-		$insert = $this->query("INSERT INTO `mcr_logs`
-										(uid, `message`, `date`)
+		$ctables	= $this->cfg->db['tables'];
+		$logs_f		= $ctables['logs']['fields'];
+
+		$insert = $this->query("INSERT INTO `{$this->cfg->tabname('logs')}`
+										(`{$logs_f['uid']}`, `{$logs_f['msg']}`, `{$logs_f['date']}`)
 									VALUES
 										('$uid', '$msg', '$date')");
 
@@ -107,7 +112,12 @@
 
 		$data = $this->safesql(json_encode($data));
 
-		$update = $this->query("UPDATE `mcr_users` SET `ip_last`='{$user->ip}', `data`='$data' WHERE id='{$user->id}'");
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
+		$update = $this->query("UPDATE `{$this->cfg->tabname('users')}`
+								SET `{$us_f['ip_last']}`='{$user->ip}', `{$us_f['data']}`='$data'
+								WHERE `{$us_f['id']}`='{$user->id}'");
 
 		if(!$update){ return false; }
 
diff --git a/upload/engine/db/mysqli.class.php b/upload/engine/db/mysqli.class.php
index cdced56..408d8c0 100644
--- a/upload/engine/db/mysqli.class.php
+++ b/upload/engine/db/mysqli.class.php
@@ -1,20 +1,22 @@
 <?php
 
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
 class db{
 	public $obj = false;
 
 	public $result = false;
 
-	private $config;
+	private $cfg;
 
 	public $count_queries = 0;
 	public $count_queries_real = 0;
 
-	public function __construct($config){
+	public function __construct($cfg){
 
-		$this->config = $config;
+		$this->cfg = $cfg;
 
-		$this->obj = @new mysqli($config->db['host'], $config->db['user'], $config->db['pass'], $config->db['base'], $config->db['port']);
+		$this->obj = @new mysqli($cfg->db['host'], $cfg->db['user'], $cfg->db['pass'], $cfg->db['base'], $cfg->db['port']);
 
 		if($this->obj->connect_errno){ return; }
 
@@ -79,14 +81,17 @@
 	}
 
 	public function actlog($msg='', $uid=0){
-		if(!$this->config->db['log']){ return false; }
+		if(!$this->cfg->db['log']){ return false; }
 
 		$uid = intval($uid);
 		$msg = $this->safesql($msg);
 		$date = time();
 
-		$insert = $this->query("INSERT INTO `mcr_logs`
-										(uid, `message`, `date`)
+		$ctables	= $this->cfg->db['tables'];
+		$logs_f		= $ctables['logs']['fields'];
+
+		$insert = $this->query("INSERT INTO `{$this->cfg->tabname('logs')}`
+										(`{$logs_f['uid']}`, `{$logs_f['msg']}`, `{$logs_f['date']}`)
 									VALUES
 										('$uid', '$msg', '$date')");
 
@@ -109,7 +114,12 @@
 
 		$data = $this->safesql(json_encode($data));
 
-		$update = $this->query("UPDATE `mcr_users` SET `ip_last`='{$user->ip}', `data`='$data' WHERE id='{$user->id}'");
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
+		$update = $this->query("UPDATE `{$this->cfg->tabname('users')}`
+								SET `{$us_f['ip_last']}`='{$user->ip}', `{$us_f['data']}`='$data'
+								WHERE `{$us_f['id']}`='{$user->id}'");
 
 		if(!$update){ return false; }
 
diff --git a/upload/engine/libs/bbcode.parse.php b/upload/engine/libs/bbcode.parse.php
index 11e5c6b..e61ba4f 100644
--- a/upload/engine/libs/bbcode.parse.php
+++ b/upload/engine/libs/bbcode.parse.php
@@ -1,5 +1,7 @@
 <?php
 
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
 /**
  *
  * @author Qexy
diff --git a/upload/engine/libs/keycaptcha.php b/upload/engine/libs/keycaptcha.php
index aaac55b..77219bd 100644
--- a/upload/engine/libs/keycaptcha.php
+++ b/upload/engine/libs/keycaptcha.php
@@ -46,8 +46,8 @@
 		function __construct($a_js_code='', $core=false)
 		{
 			$this->core = $core;
-			$this->p_kc_user_id = $core->config->main['kc_public'];
-			$this->p_kc_private_key = $core->config->main['kc_private'];
+			$this->p_kc_user_id = $core->cfg->main['kc_public'];
+			$this->p_kc_private_key = $core->cfg->main['kc_private'];
 
 			if ( $a_js_code != '' ) {
 				$this->p_kc_js_code = $a_js_code;
diff --git a/upload/engine/libs/smiles.php b/upload/engine/libs/smiles.php
index c8379fb..b3e36fe 100644
--- a/upload/engine/libs/smiles.php
+++ b/upload/engine/libs/smiles.php
@@ -1,5 +1,7 @@
 <?php
 
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
 $smiles = array(
 	"[:)]"			=> "1.gif",
 	"[:(]"			=> "2.gif",
diff --git a/upload/engine/menu.class.php b/upload/engine/menu.class.php
index 4a1dda8..a7b8ea4 100644
--- a/upload/engine/menu.class.php
+++ b/upload/engine/menu.class.php
@@ -1,13 +1,15 @@
 <?php
 
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
 class menu{
-	private $core, $db; // , $user, $lng
+	private $core, $db, $user, $cfg;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		//$this->lng	= $core->lng;
 	}
 
@@ -48,8 +50,8 @@
 
 	private function is_active($url){
 
-		if($this->config->main['s_root']==$url || $this->config->main['s_root_full']==$url){
-			if(!isset($_GET['mode']) || @$_GET['mode']==$this->config->main['s_dpage']){
+		if($this->cfg->main['s_root']==$url || $this->cfg->main['s_root_full']==$url){
+			if(!isset($_GET['mode']) || @$_GET['mode']==$this->cfg->main['s_dpage']){
 				return true;
 			}
 		}else{
diff --git a/upload/engine/monitoring/XPawPing.php b/upload/engine/monitoring/XPawPing.php
new file mode 100644
index 0000000..a9f71e5
--- /dev/null
+++ b/upload/engine/monitoring/XPawPing.php
@@ -0,0 +1,71 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class XPawPing{
+
+	// Set default values
+	public $ip			= '127.0.0.1';
+	public $port		= 25565;
+
+	public $status		= 0; // server status
+	public $version		= '';
+	public $online		= 0;
+	public $slots		= 0;
+	public $players		= '';
+	public $motd		= '';
+	public $plugins		= '';
+	public $map			= '';
+	public $error		= '';
+
+	public function __construct(){
+		require_once(MCR_MON_PATH.'xpaw/MinecraftPing.php');
+		require_once(MCR_MON_PATH.'xpaw/MinecraftPingException.php');
+	}
+
+	public function connect($ip='127.0.0.1', $port=25565){
+		$this->status = $this->online = $this->slots = 0;
+		$this->version = $this->players = $this->motd = $this->plugins = $this->map = $this->error = '';
+		
+		$this->ip = $ip;
+		$this->port = $port;
+
+		$array = false;
+		$Query = null;
+
+		try{
+			$Query = new MinecraftPing($ip, $port, 3);
+
+			$array = $Query->Query();
+
+			if($array === false){
+				$Query->Close();
+				$Query->Connect();
+
+				$array = $Query->QueryOldPre17();
+			}
+		}catch(MinecraftPingException $e){
+			$Exception = $e;
+		}
+
+		if($Query !== null){ $Query->Close(); }
+
+		if(isset($Exception)){ return false; }
+
+		if($array == false){ return false; }
+
+		$this->status = 1;
+
+		$this->version = @$array['version']['name'];
+
+		$this->motd = @$array['description'];
+
+		$this->online = intval(@$array['players']['online']);
+
+		$this->slots = intval(@$array['players']['max']);
+
+		return true;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/engine/monitoring/XPawQuery.php b/upload/engine/monitoring/XPawQuery.php
new file mode 100644
index 0000000..d2dbbbf
--- /dev/null
+++ b/upload/engine/monitoring/XPawQuery.php
@@ -0,0 +1,66 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class XPawQuery{
+
+	// Set default values
+	public $ip			= '127.0.0.1';
+	public $port		= 25565;
+
+	public $status		= 0; // server status
+	public $version		= '';
+	public $online		= 0;
+	public $slots		= 0;
+	public $players		= '';
+	public $motd		= '';
+	public $plugins		= '';
+	public $map			= '';
+	public $error		= '';
+	private $object		= false;
+
+	public function __construct(){
+		require_once(MCR_MON_PATH.'xpaw/MinecraftQuery.php');
+		require_once(MCR_MON_PATH.'xpaw/MinecraftQueryException.php');
+
+		$this->object = new MinecraftQuery();
+	}
+
+	public function connect($ip='127.0.0.1', $port=25565){
+		$this->status = $this->online = $this->slots = 0;
+		$this->version = $this->players = $this->motd = $this->plugins = $this->map = $this->error = '';
+		
+		$this->ip = $ip;
+		$this->port = $port;
+
+		try{
+			$this->object->Connect($ip, $port, 3);
+		}catch(MinecraftQueryException $e){
+			$Exception = $e;
+		}
+
+		if(isset($Exception)){ return false; }
+
+		if(($array = $this->object->GetInfo()) == false){ return false; }
+
+		$this->status = 1;
+
+		$this->motd = $array['HostName'];
+
+		$this->version = @$array['Version'];
+
+		$this->online = intval(@$array['Players']);
+
+		$this->slots = intval(@$array['MaxPlayers']);
+
+		if(($players = $this->object->GetPlayers()) !== false){
+			$this->players = @implode(', ', $players);
+		}
+
+		$this->plugins = @implode(', ', @$array['Plugins']);
+
+		return true;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/engine/monitoring/xpaw/MinecraftPing.php b/upload/engine/monitoring/xpaw/MinecraftPing.php
new file mode 100644
index 0000000..c6f9b35
--- /dev/null
+++ b/upload/engine/monitoring/xpaw/MinecraftPing.php
@@ -0,0 +1,212 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class MinecraftPing {
+	/*
+	 * Queries Minecraft server
+	 * Returns array on success, false on failure.
+	 *
+	 * WARNING: This method was added in snapshot 13w41a (Minecraft 1.7)
+	 *
+	 * Written by xPaw
+	 *
+	 * Website: http://xpaw.me
+	 * GitHub: https://github.com/xPaw/PHP-Minecraft-Query
+	 *
+	 * ---------
+	 *
+	 * This method can be used to get server-icon.png too.
+	 * Something like this:
+	 *
+	 * $Server = new MinecraftPing( 'localhost' );
+	 * $Info = $Server->Query();
+	 * echo '<img width="64" height="64" src="' . Str_Replace( "\n", "", $Info[ 'favicon' ] ) . '">';
+	 *
+	 */
+
+	private $Socket;
+	private $ServerAddress;
+	private $ServerPort;
+	private $Timeout;
+
+	public function __construct( $Address, $Port = 25565, $Timeout = 2 )
+	{
+		$this->ServerAddress = $Address;
+		$this->ServerPort = (int)$Port;
+		$this->Timeout = (int)$Timeout;
+
+		$this->Connect( );
+	}
+
+	public function __destruct( )
+	{
+		$this->Close( );
+	}
+
+	public function Close( )
+	{
+		if( $this->Socket !== null )
+		{
+			fclose( $this->Socket );
+
+			$this->Socket = null;
+		}
+	}
+
+	public function Connect( )
+	{
+		$connectTimeout = $this->Timeout;
+		$this->Socket = @fsockopen( $this->ServerAddress, $this->ServerPort, $errno, $errstr, $connectTimeout );
+
+		if( !$this->Socket )
+		{
+			throw new MinecraftPingException( "Failed to connect or create a socket: $errno ($errstr)" );
+		}
+
+		// Set Read/Write timeout
+		stream_set_timeout( $this->Socket, $this->Timeout );
+	}
+
+	public function Query( )
+	{
+		$TimeStart = microtime(true); // for read timeout purposes
+
+		// See http://wiki.vg/Protocol (Status Ping)
+		$Data = "\x00"; // packet ID = 0 (varint)
+
+		$Data .= "\x04"; // Protocol version (varint)
+		$Data .= Pack( 'c', StrLen( $this->ServerAddress ) ) . $this->ServerAddress; // Server (varint len + UTF-8 addr)
+		$Data .= Pack( 'n', $this->ServerPort ); // Server port (unsigned short)
+		$Data .= "\x01"; // Next state: status (varint)
+
+		$Data = Pack( 'c', StrLen( $Data ) ) . $Data; // prepend length of packet ID + data
+
+		fwrite( $this->Socket, $Data ); // handshake
+		fwrite( $this->Socket, "\x01\x00" ); // status ping
+
+		$Length = $this->ReadVarInt( ); // full packet length
+
+		if( $Length < 10 )
+		{
+			return FALSE;
+		}
+
+		fgetc( $this->Socket ); // packet type, in server ping it's 0
+
+		$Length = $this->ReadVarInt( ); // string length
+
+		$Data = "";
+		do
+		{
+			if (microtime(true) - $TimeStart > $this->Timeout)
+			{
+				throw new MinecraftPingException( 'Server read timed out' );
+			}
+
+			$Remainder = $Length - StrLen( $Data );
+			$block = fread( $this->Socket, $Remainder ); // and finally the json string
+			// abort if there is no progress
+			if (!$block)
+			{
+				throw new MinecraftPingException( 'Server returned too few data' );
+			}
+
+			$Data .= $block;
+		} while( StrLen($Data) < $Length );
+
+		if( $Data === FALSE )
+		{
+			throw new MinecraftPingException( 'Server didn\'t return any data' );
+		}
+
+		$Data = JSON_Decode( $Data, true );
+
+		if( JSON_Last_Error( ) !== JSON_ERROR_NONE )
+		{
+			if( Function_Exists( 'json_last_error_msg' ) )
+			{
+				throw new MinecraftPingException( JSON_Last_Error_Msg( ) );
+			}
+			else
+			{
+				throw new MinecraftPingException( 'JSON parsing failed' );
+			}
+
+			return FALSE;
+		}
+
+		return $Data;
+	}
+
+	public function QueryOldPre17( )
+	{
+		fwrite( $this->Socket, "\xFE\x01" );
+		$Data = fread( $this->Socket, 512 );
+		$Len = StrLen( $Data );
+
+		if( $Len < 4 || $Data[ 0 ] !== "\xFF" )
+		{
+			return FALSE;
+		}
+
+		$Data = SubStr( $Data, 3 ); // Strip packet header (kick message packet and short length)
+		$Data = iconv( 'UTF-16BE', 'UTF-8', $Data );
+
+		// Are we dealing with Minecraft 1.4+ server?
+		if( $Data[ 1 ] === "\xA7" && $Data[ 2 ] === "\x31" )
+		{
+			$Data = Explode( "\x00", $Data );
+
+			return Array(
+				'HostName'   => $Data[ 3 ],
+				'Players'    => IntVal( $Data[ 4 ] ),
+				'MaxPlayers' => IntVal( $Data[ 5 ] ),
+				'Protocol'   => IntVal( $Data[ 1 ] ),
+				'Version'    => $Data[ 2 ]
+			);
+		}
+
+		$Data = Explode( "\xA7", $Data );
+
+		return Array(
+			'HostName'   => SubStr( $Data[ 0 ], 0, -1 ),
+			'Players'    => isset( $Data[ 1 ] ) ? IntVal( $Data[ 1 ] ) : 0,
+			'MaxPlayers' => isset( $Data[ 2 ] ) ? IntVal( $Data[ 2 ] ) : 0,
+			'Protocol'   => 0,
+			'Version'    => '1.3'
+		);
+	}
+
+	private function ReadVarInt( )
+	{
+		$i = 0;
+		$j = 0;
+
+		while( true )
+		{
+			$k = @fgetc( $this->Socket );
+
+			if( $k === FALSE )
+			{
+				return 0;
+			}
+
+			$k = Ord( $k );
+
+			$i |= ( $k & 0x7F ) << $j++ * 7;
+
+			if( $j > 5 )
+			{
+				throw new MinecraftPingException( 'VarInt too big' );
+			}
+
+			if( ( $k & 0x80 ) != 128 )
+			{
+				break;
+			}
+		}
+
+		return $i;
+	}
+}
diff --git a/upload/engine/monitoring/xpaw/MinecraftPingException.php b/upload/engine/monitoring/xpaw/MinecraftPingException.php
new file mode 100644
index 0000000..309c657
--- /dev/null
+++ b/upload/engine/monitoring/xpaw/MinecraftPingException.php
@@ -0,0 +1,7 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class MinecraftPingException extends \Exception {
+	// Exception thrown by MinecraftPing class
+}
diff --git a/upload/engine/monitoring/xpaw/MinecraftQuery.php b/upload/engine/monitoring/xpaw/MinecraftQuery.php
new file mode 100644
index 0000000..a77d578
--- /dev/null
+++ b/upload/engine/monitoring/xpaw/MinecraftQuery.php
@@ -0,0 +1,192 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class MinecraftQuery {
+	/*
+	 * Class written by xPaw
+	 *
+	 * Website: http://xpaw.me
+	 * GitHub: https://github.com/xPaw/PHP-Minecraft-Query
+	 */
+
+	const STATISTIC = 0x00;
+	const HANDSHAKE = 0x09;
+
+	private $Socket;
+	private $Players;
+	private $Info;
+
+	public function Connect( $Ip, $Port = 25565, $Timeout = 3 )
+	{
+		if( !is_int( $Timeout ) || $Timeout < 0 )
+		{
+			throw new \InvalidArgumentException( 'Timeout must be an integer.' );
+		}
+
+		$this->Socket = @FSockOpen( 'udp://' . $Ip, (int)$Port, $ErrNo, $ErrStr, $Timeout );
+
+		if( $ErrNo || $this->Socket === false )
+		{
+			throw new MinecraftQueryException( 'Could not create socket: ' . $ErrStr );
+		}
+
+		Stream_Set_Timeout( $this->Socket, $Timeout );
+		Stream_Set_Blocking( $this->Socket, true );
+
+		try
+		{
+			$Challenge = $this->GetChallenge( );
+
+			$this->GetStatus( $Challenge );
+		}
+		// We catch this because we want to close the socket, not very elegant
+		catch( MinecraftQueryException $e )
+		{
+			FClose( $this->Socket );
+
+			throw new MinecraftQueryException( $e->getMessage( ) );
+		}
+
+		FClose( $this->Socket );
+	}
+
+	public function GetInfo( )
+	{
+		return isset( $this->Info ) ? $this->Info : false;
+	}
+
+	public function GetPlayers( )
+	{
+		return isset( $this->Players ) ? $this->Players : false;
+	}
+
+	private function GetChallenge( )
+	{
+		$Data = $this->WriteData( self :: HANDSHAKE );
+
+		if( $Data === false )
+		{
+			throw new MinecraftQueryException( 'Failed to receive challenge.' );
+		}
+
+		return Pack( 'N', $Data );
+	}
+
+	private function GetStatus( $Challenge )
+	{
+		$Data = $this->WriteData( self :: STATISTIC, $Challenge . Pack( 'c*', 0x00, 0x00, 0x00, 0x00 ) );
+
+		if( !$Data )
+		{
+			throw new MinecraftQueryException( 'Failed to receive status.' );
+		}
+
+		$Last = '';
+		$Info = Array( );
+
+		$Data    = SubStr( $Data, 11 ); // splitnum + 2 int
+		$Data    = Explode( "\x00\x00\x01player_\x00\x00", $Data );
+
+		if( Count( $Data ) !== 2 )
+		{
+			throw new MinecraftQueryException( 'Failed to parse server\'s response.' );
+		}
+
+		$Players = SubStr( $Data[ 1 ], 0, -2 );
+		$Data    = Explode( "\x00", $Data[ 0 ] );
+
+		// Array with known keys in order to validate the result
+		// It can happen that server sends custom strings containing bad things (who can know!)
+		$Keys = Array(
+			'hostname'   => 'HostName',
+			'gametype'   => 'GameType',
+			'version'    => 'Version',
+			'plugins'    => 'Plugins',
+			'map'        => 'Map',
+			'numplayers' => 'Players',
+			'maxplayers' => 'MaxPlayers',
+			'hostport'   => 'HostPort',
+			'hostip'     => 'HostIp',
+			'game_id'    => 'GameName'
+		);
+
+		foreach( $Data as $Key => $Value )
+		{
+			if( ~$Key & 1 )
+			{
+				if( !Array_Key_Exists( $Value, $Keys ) )
+				{
+					$Last = false;
+					continue;
+				}
+
+				$Last = $Keys[ $Value ];
+				$Info[ $Last ] = '';
+			}
+			else if( $Last != false )
+			{
+				$Info[ $Last ] = mb_convert_encoding( $Value, 'UTF-8' );
+			}
+		}
+
+		// Ints
+		$Info[ 'Players' ]    = IntVal( $Info[ 'Players' ] );
+		$Info[ 'MaxPlayers' ] = IntVal( $Info[ 'MaxPlayers' ] );
+		$Info[ 'HostPort' ]   = IntVal( $Info[ 'HostPort' ] );
+
+		// Parse "plugins", if any
+		if( $Info[ 'Plugins' ] )
+		{
+			$Data = Explode( ": ", $Info[ 'Plugins' ], 2 );
+
+			$Info[ 'RawPlugins' ] = $Info[ 'Plugins' ];
+			$Info[ 'Software' ]   = $Data[ 0 ];
+
+			if( Count( $Data ) == 2 )
+			{
+				$Info[ 'Plugins' ] = Explode( "; ", $Data[ 1 ] );
+			}
+		}
+		else
+		{
+			$Info[ 'Software' ] = 'Vanilla';
+		}
+
+		$this->Info = $Info;
+
+		if( empty( $Players ) )
+		{
+			$this->Players = null;
+		}
+		else
+		{
+			$this->Players = Explode( "\x00", $Players );
+		}
+	}
+
+	private function WriteData( $Command, $Append = "" )
+	{
+		$Command = Pack( 'c*', 0xFE, 0xFD, $Command, 0x01, 0x02, 0x03, 0x04 ) . $Append;
+		$Length  = StrLen( $Command );
+
+		if( $Length !== FWrite( $this->Socket, $Command, $Length ) )
+		{
+			throw new MinecraftQueryException( "Failed to write on socket." );
+		}
+
+		$Data = FRead( $this->Socket, 4096 );
+
+		if( $Data === false )
+		{
+			throw new MinecraftQueryException( "Failed to read from socket." );
+		}
+
+		if( StrLen( $Data ) < 5 || $Data[ 0 ] != $Command[ 2 ] )
+		{
+			return false;
+		}
+
+		return SubStr( $Data, 5 );
+	}
+}
diff --git a/upload/engine/monitoring/xpaw/MinecraftQueryException.php b/upload/engine/monitoring/xpaw/MinecraftQueryException.php
new file mode 100644
index 0000000..9a55a89
--- /dev/null
+++ b/upload/engine/monitoring/xpaw/MinecraftQueryException.php
@@ -0,0 +1,7 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class MinecraftQueryException extends \Exception {
+	// Exception thrown by MinecraftQuery class
+}
diff --git a/upload/engine/user.class.php b/upload/engine/user.class.php
index 92f00a3..41732bb 100644
--- a/upload/engine/user.class.php
+++ b/upload/engine/user.class.php
@@ -1,8 +1,10 @@
 <?php
 
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
 class user{
 	// Set default system vars
-	private $core, $db, $config, $lng;
+	private $core, $db, $cfg, $lng;
 
 	// Set default user vars
 	public $email, $login, $login_v2, $group, $group_v2, $uuid, $group_desc, $password, $salt, $tmp, $ip, $ip_create, $data, $permissions, $permissions_v2, $gender;
@@ -30,7 +32,7 @@
 	public function __construct($core){
 		$this->core			= $core;
 		$this->db			= $core->db;
-		$this->config		= $core->config;
+		$this->cfg			= $core->cfg;
 		$this->lng			= $core->lng;
 
 		$this->login		= $this->lng['u_group_def'];
@@ -56,35 +58,43 @@
 		$uid	= intval($cookie[0]);
 		$hash	= $cookie[1];
 
-		$query = $this->db->query("SELECT `u`.gid, `u`.login, `u`.email, `u`.password, `u`.`salt`, `u`.`tmp`, `u`.ip_create, `u`.`data`, `u`.`is_skin`, `u`.`is_cloak`, `u`.`color`, `u`.`uuid`,
-											`g`.title, `g`.`description`, `g`.`permissions`, `g`.`color` AS `gcolor`,
-											`i`.`money`, `i`.realmoney, `i`.bank
-									FROM `mcr_users` AS `u`
-									INNER JOIN `mcr_groups` AS `g`
-										ON `g`.id=`u`.gid
-									LEFT JOIN `mcr_iconomy` AS `i`
-										ON `i`.login=`u`.login
-									WHERE `u`.id='$uid'");
+		$ctables	= $this->cfg->db['tables'];
+
+		$ug_f	= $ctables['ugroups']['fields'];
+		$us_f	= $ctables['users']['fields'];
+		$ic_f	= $ctables['iconomy']['fields'];
+
+		$query = $this->db->query("SELECT `u`.`{$us_f['group']}`, `u`.`{$us_f['login']}`, `u`.`{$us_f['email']}`, `u`.`{$us_f['pass']}`,
+											`u`.`{$us_f['salt']}`, `u`.`{$us_f['tmp']}`, `u`.`{$us_f['ip_create']}`, `u`.`{$us_f['data']}`,
+											`u`.`{$us_f['is_skin']}`, `u`.`{$us_f['is_cloak']}`, `u`.`{$us_f['color']}`, `u`.`{$us_f['uuid']}`,
+											`g`.`{$ug_f['title']}`, `g`.`{$ug_f['text']}`, `g`.`{$ug_f['perm']}`, `g`.`{$ug_f['color']}` AS `gcolor`,
+											`i`.`{$ic_f['money']}`, `i`.`{$ic_f['rm']}`, `i`.`{$ic_f['bank']}`
+									FROM `{$this->cfg->tabname('users')}` AS `u`
+									INNER JOIN `{$this->cfg->tabname('ugroups')}` AS `g`
+										ON `g`.`{$ug_f['id']}`=`u`.`{$us_f['group']}`
+									LEFT JOIN `{$this->cfg->tabname('iconomy')}` AS `i`
+										ON `i`.`{$ic_f['login']}`=`u`.`{$us_f['login']}`
+									WHERE `u`.`{$us_f['id']}`='$uid'");
 
 		if(!$query || $this->db->num_rows($query)<=0){ $this->set_unauth(); $this->core->notify(); }
 
 		$ar			= $this->db->fetch_assoc($query);
 
-		$tmp		= $this->db->HSC($ar['tmp']);
-		$password	= $this->db->HSC($ar['password']);
+		$tmp		= $this->db->HSC($ar[$us_f['tmp']]);
+		$password	= $this->db->HSC($ar[$us_f['pass']]);
 
-		$new_hash	= $uid.$tmp.$this->ip.md5($this->config->main['mcr_secury']);
+		$new_hash	= $uid.$tmp.$this->ip.md5($this->cfg->main['mcr_secury']);
 
 		$ar_hash	= $uid.'_'.md5($new_hash);
 
 		// Check security auth
 		if($_COOKIE['mcr_user'] !== $ar_hash){ $this->set_unauth(); $this->core->notify(); }
 
-		$login				= $this->db->HSC($ar['login']);
+		$login				= $this->db->HSC($ar[$us_f['login']]);
 
-		$color				= (!empty($ar['color'])) ? $this->db->HSC($ar['color']) : $this->db->HSC($ar['gcolor']);
+		$color				= (!empty($ar[$us_f['color']])) ? $this->db->HSC($ar[$us_f['color']]) : $this->db->HSC($ar['gcolor']);
 
-		$group				= $this->db->HSC($ar['title']);
+		$group				= $this->db->HSC($ar[$ug_f['title']]);
 
 		$gcolor				= $this->db->HSC($ar['gcolor']);
 
@@ -92,7 +102,7 @@
 		$this->id			= $uid;
 
 		// Group identificator
-		$this->gid			= intval($ar['gid']);
+		$this->gid			= intval($ar[$us_f['group']]);
 
 		// Username
 		$this->login		= $login;
@@ -101,25 +111,25 @@
 		$this->login_v2		= $this->core->colorize($login, $color);
 
 		// E-Mail
-		$this->email		= $this->db->HSC($ar['email']);
+		$this->email		= $this->db->HSC($ar[$us_f['email']]);
 
 		// UUID
-		$this->uuid			= $this->db->HSC($ar['uuid']);
+		$this->uuid			= $this->db->HSC($ar[$us_f['uuid']]);
 
 		// Password hash
 		$this->password		= $password;
 
 		// Salt of password
-		$this->salt			= $ar['salt'];
+		$this->salt			= $ar[$us_f['salt']];
 
 		// Temp hash
 		$this->tmp			= $tmp;
 
 		// Register ip
-		$this->ip_create	= $this->db->HSC($ar['ip_create']);
+		$this->ip_create	= $this->db->HSC($ar[$us_f['ip_create']]);
 
 		// Other information
-		$this->data			= json_decode($ar['data']);
+		$this->data			= json_decode($ar[$us_f['data']]);
 
 		// Group title
 		$this->group		= $group;
@@ -128,22 +138,22 @@
 		$this->group_v2		= $this->core->colorize($group, $gcolor);
 
 		// Group description
-		$this->group_desc	= $this->db->HSC($ar['description']);
+		$this->group_desc	= $this->db->HSC($ar[$ug_f['text']]);
 
 		// Permissions
-		$this->permissions	= @json_decode($ar['permissions']);
+		$this->permissions	= @json_decode($ar[$ug_f['perm']]);
 
 		// Permissions
-		$this->permissions_v2	= @json_decode($ar['permissions'], true);
+		$this->permissions_v2	= @json_decode($ar[$ug_f['perm']], true);
 
 		// Is auth status
 		$this->is_auth		= true;
 
 		// Is default skin
-		$this->is_skin		= (intval($ar['is_skin'])==1) ? true : false;
+		$this->is_skin		= (intval($ar[$us_f['is_skin']])==1) ? true : false;
 
 		// Is isset cloak
-		$this->is_cloak		= (intval($ar['is_cloak'])==1) ? true : false;
+		$this->is_cloak		= (intval($ar[$us_f['is_cloak']])==1) ? true : false;
 
 		$this->skin			= ($this->is_skin || $this->is_cloak) ? $this->login : 'default';
 
@@ -153,13 +163,13 @@
 		$this->gender		= (intval($this->data->gender)==1) ? $this->lng['gender_w'] : $this->lng['gender_m'];
 
 		// Game money balance
-		$this->money		= floatval($ar['money']);
+		$this->money		= floatval($ar[$ic_f['money']]);
 
 		// Real money balance
-		$this->realmoney	= floatval($ar['realmoney']);
+		$this->realmoney	= floatval($ar[$ic_f['rm']]);
 
 		// Bank money balance (for plugins)
-		$this->bank			= floatval($ar['bank']);
+		$this->bank			= floatval($ar[$ic_f['bank']]);
 
 	}
 
diff --git a/upload/index.php b/upload/index.php
index 614ccc0..9c7b1bf 100644
--- a/upload/index.php
+++ b/upload/index.php
@@ -6,12 +6,12 @@
 
 $core->def_header = $core->sp(MCR_THEME_PATH."header.html");
 
-$mode = (isset($_GET['mode'])) ? $_GET['mode'] : $core->config->main['s_dpage'];
+$mode = (isset($_GET['mode'])) ? $_GET['mode'] : $core->cfg->main['s_dpage'];
 
-if($core->config->main['install']){ $core->notify($core->lng['e_attention'], $core->lng['e_install'], 4, 'install/'); }
+if($core->cfg->main['install']){ $core->notify($core->lng['e_attention'], $core->lng['e_install'], 4, 'install/'); }
 
-if($core->config->func['close'] && !$core->is_access('sys_adm_main')){
-	if($core->config->func['close_time']<=0 || $core->config->func['close_time']>time()){
+if($core->cfg->func['close'] && !$core->is_access('sys_adm_main')){
+	if($core->cfg->func['close_time']<=0 || $core->cfg->func['close_time']>time()){
 		$mode = ($mode=='auth') ? 'auth' : 'close';
 	}
 }
@@ -46,7 +46,7 @@
 	"L_BLOCKS"		=> $core->load_def_blocks(),
 	"HEADER"		=> $core->header,
 	"DEF_HEADER"	=> $core->def_header,
-	"CFG"			=> $core->config->main,
+	"CFG"			=> $core->cfg->main,
 	"ADVICE"		=> $core->advice(),
 	"MENU"			=> $core->menu->_list(),
 	"BREADCRUMBS"	=> $core->bc,
@@ -56,7 +56,7 @@
 // Write global template
 echo $core->sp(MCR_THEME_PATH."global.html", $data_global);
 
-if(!$core->config->main['debug'] || !@$core->user->permissions->sys_debug){ exit; }
+if(!$core->cfg->main['debug'] || !@$core->user->permissions->sys_debug){ exit; }
 
 $data_debug = array(
 	"PLT" => number_format(microtime(true)-DEBUG_PLT,3),
diff --git a/upload/install/index.php b/upload/install/index.php
index 7ac295b..8c6e576 100644
--- a/upload/install/index.php
+++ b/upload/install/index.php
@@ -12,7 +12,7 @@
 
 $mode = (isset($_GET['mode'])) ? $_GET['mode'] : 'step_1';
 
-if(!$core->config->main['install'] && $mode!='finish'){ $core->notify('','', 3, 'install/?mode=finish'); }
+if(!$core->cfg->main['install'] && $mode!='finish'){ $core->notify('','', 3, 'install/?mode=finish'); }
 
 switch($mode){
 	case 'step_1':
@@ -50,35 +50,25 @@
 	);
 
 	ob_start();
-
 	foreach($array as $key => $value) {
-
 		if($mode==$key){
 			echo '<li class="active"><a href="javascript://">'.$value.'</a></li>';
 		}else{
 			echo '<li class="muted">'.$value.'</li>';
 		}
 	}
-
 	$data['ITEMS'] = ob_get_clean();
 
-	include(MCR_SIDE_PATH."1_notify.php");
-
-	require_once(MCR_LANG_DIR.'blocks/notify.php');
-	$core->lng_b = $lng;
-
-	$notify = new block_notify($core);
-
-	return $notify->content().$core->sp(MCR_ROOT."install/theme/left-block.html", $data);
+	return $core->sp(MCR_ROOT."install/theme/left-block.html", $data);
 }
 
 $data_global = array(
 	"CONTENT"		=> $content,
 	"TITLE"			=> $core->title,
-	"L_BLOCKS"		=> load_left_block($core, $mode),
+	"L_BLOCKS"		=> load_left_block($core, $mode).$core->load_def_blocks(),
 	"HEADER"		=> $core->header,
 	"DEF_HEADER"	=> $core->def_header,
-	"CFG"			=> $core->config->main,
+	"CFG"			=> $core->cfg->main,
 	"ADVICE"		=> '',//$core->advice(),
 	"MENU"			=> '',//$core->menu->_list(),
 	"BREADCRUMBS"	=> $core->bc,
diff --git a/upload/install/settings.php b/upload/install/settings.php
index 8961c50..64491f9 100644
--- a/upload/install/settings.php
+++ b/upload/install/settings.php
@@ -3,13 +3,13 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $lng, $lng_m, $user;
+	private $core, $db, $cfg, $lng, $lng_m, $user;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->lng		= $core->lng;
 		$this->lng_m	= $core->lng_m;
 
@@ -28,17 +28,17 @@
 		if(isset($_SESSION['settings'])){ $this->core->notify('', '', 4, 'install/?mode=finish'); }
 
 		if(!isset($_SESSION['fs_name'])){
-			$_SESSION['fs_name']		= $this->config->main['s_name'];
-			$_SESSION['fs_about']		= $this->config->main['s_about'];
-			$_SESSION['fs_keywords']	= $this->config->main['s_keywords'];
-			$_SESSION['fs_from']		= $this->config->mail['from'];
-			$_SESSION['fs_from_name']	= $this->config->mail['from_name'];
-			$_SESSION['fs_reply']		= $this->config->mail['reply'];
-			$_SESSION['fs_reply_name']	= $this->config->mail['reply_name'];
+			$_SESSION['fs_name']		= $this->cfg->main['s_name'];
+			$_SESSION['fs_about']		= $this->cfg->main['s_about'];
+			$_SESSION['fs_keywords']	= $this->cfg->main['s_keywords'];
+			$_SESSION['fs_from']		= $this->cfg->mail['from'];
+			$_SESSION['fs_from_name']	= $this->cfg->mail['from_name'];
+			$_SESSION['fs_reply']		= $this->cfg->mail['reply'];
+			$_SESSION['fs_reply_name']	= $this->cfg->mail['reply_name'];
 			$_SESSION['fs_smtp']		= '';
-			$_SESSION['fs_smtp_host']	= $this->config->mail['smtp_host'];
-			$_SESSION['fs_smtp_user']	= $this->config->mail['smtp_user'];
-			$_SESSION['fs_smtp_pass']	= $this->config->mail['smtp_pass'];
+			$_SESSION['fs_smtp_host']	= $this->cfg->mail['smtp_host'];
+			$_SESSION['fs_smtp_user']	= $this->cfg->mail['smtp_user'];
+			$_SESSION['fs_smtp_pass']	= $this->cfg->mail['smtp_pass'];
 		}
 
 		if($_SERVER['REQUEST_METHOD']=='POST'){
@@ -55,11 +55,11 @@
 			$_SESSION['fs_smtp_user']	= $this->db->HSC(@$_POST['smtp_user']);
 			$_SESSION['fs_smtp_pass']	= $this->db->HSC(@$_POST['smtp_pass']);
 
-			$this->config->main['s_name'] = $this->db->HSC($this->core->safestr(@$_POST['s_name']));
+			$this->cfg->main['s_name'] = $this->db->HSC($this->core->safestr(@$_POST['s_name']));
 
-			$this->config->main['s_about'] = $this->db->HSC($this->core->safestr(@$_POST['s_about']));
+			$this->cfg->main['s_about'] = $this->db->HSC($this->core->safestr(@$_POST['s_about']));
 
-			$this->config->main['s_keywords'] = $this->db->HSC($this->core->safestr(@$_POST['s_keywords']));
+			$this->cfg->main['s_keywords'] = $this->db->HSC($this->core->safestr(@$_POST['s_keywords']));
 
 			$url = substr($_SERVER['PHP_SELF'], 0, strpos($_SERVER['PHP_SELF'], 'install'));
 
@@ -67,35 +67,35 @@
 
 			$full_url = $http.'://'.$_SERVER['HTTP_HOST'];
 
-			$this->config->main['s_root'] = $url;
+			$this->cfg->main['s_root'] = $url;
 
-			$this->config->main['s_root_full'] = $full_url;
+			$this->cfg->main['s_root_full'] = $full_url;
 
-			$this->config->main['mcr_secury'] = $this->core->random(20, false);
+			$this->cfg->main['mcr_secury'] = $this->core->random(20, false);
 
-			$this->config->main['install'] = false;
+			$this->cfg->main['install'] = false;
 
-			$this->config->mail['from'] = $this->db->HSC($this->core->safestr(@$_POST['from']));
+			$this->cfg->mail['from'] = $this->db->HSC($this->core->safestr(@$_POST['from']));
 
-			$this->config->mail['from_name'] = $this->db->HSC($this->core->safestr(@$_POST['from_name']));
+			$this->cfg->mail['from_name'] = $this->db->HSC($this->core->safestr(@$_POST['from_name']));
 
-			$this->config->mail['reply'] = $this->db->HSC($this->core->safestr(@$_POST['reply']));
+			$this->cfg->mail['reply'] = $this->db->HSC($this->core->safestr(@$_POST['reply']));
 
-			$this->config->mail['reply_name'] = $this->db->HSC($this->core->safestr(@$_POST['reply_name']));
+			$this->cfg->mail['reply_name'] = $this->db->HSC($this->core->safestr(@$_POST['reply_name']));
 
-			$this->config->mail['smtp'] = (intval(@$_POST['smtp'])===1) ? true : false;
+			$this->cfg->mail['smtp'] = (intval(@$_POST['smtp'])===1) ? true : false;
 
-			$this->config->mail['smtp_host'] = $this->db->HSC($this->core->safestr(@$_POST['smtp_host']));
+			$this->cfg->mail['smtp_host'] = $this->db->HSC($this->core->safestr(@$_POST['smtp_host']));
 
-			$this->config->mail['smtp_user'] = $this->db->HSC($this->core->safestr(@$_POST['smtp_user']));
+			$this->cfg->mail['smtp_user'] = $this->db->HSC($this->core->safestr(@$_POST['smtp_user']));
 
-			$this->config->mail['smtp_pass'] = $this->db->HSC($this->core->safestr(@$_POST['smtp_pass']));
+			$this->cfg->mail['smtp_pass'] = $this->db->HSC($this->core->safestr(@$_POST['smtp_pass']));
 
-			if(!$this->config->savecfg($this->config->main, 'main.php', 'main')){
+			if(!$this->cfg->savecfg($this->cfg->main, 'main.php', 'main')){
 				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_settings'], 2, 'install/?mode=settings');
 			}
 
-			if(!$this->config->savecfg($this->config->mail, 'mail.php', 'mail')){
+			if(!$this->cfg->savecfg($this->cfg->mail, 'mail.php', 'mail')){
 				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_settings'], 2, 'install/?mode=settings');
 			}
 
diff --git a/upload/install/step_1.php b/upload/install/step_1.php
index 430b553..65efabb 100644
--- a/upload/install/step_1.php
+++ b/upload/install/step_1.php
@@ -3,13 +3,13 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $lng, $lng_m, $user;
+	private $core, $db, $cfg, $lng, $lng_m, $user;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->lng		= $core->lng;
 		$this->lng_m	= $core->lng_m;
 
@@ -65,13 +65,13 @@
 
 			if(!is_writable(MCR_ROOT.'uploads') || !is_readable(MCR_ROOT.'uploads')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_uploads'], 2, 'install/?mode=step_1'); }
 
-			if(!is_writable(MCR_ROOT.'uploads/cloaks') || !is_readable(MCR_ROOT.'uploads/cloaks')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_cloaks'], 2, 'install/?mode=step_1'); }
+			if(!is_writable(MCR_ROOT.$this->cfg->main['cloak_path']) || !is_readable(MCR_ROOT.$this->cfg->main['cloak_path'])){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_cloaks'], 2, 'install/?mode=step_1'); }
 
 			if(!is_writable(MCR_ROOT.'uploads/panel-icons') || !is_readable(MCR_ROOT.'uploads/panel-icons')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_icons'], 2, 'install/?mode=step_1'); }
 
-			if(!is_writable(MCR_ROOT.'uploads/skins') || !is_readable(MCR_ROOT.'uploads/skins')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_skins'], 2, 'install/?mode=step_1'); }
+			if(!is_writable(MCR_ROOT.$this->cfg->main['skin_path']) || !is_readable(MCR_ROOT.$this->cfg->main['skin_path'])){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_skins'], 2, 'install/?mode=step_1'); }
 
-			if(!is_writable(MCR_ROOT.'uploads/skins/interface') || !is_readable(MCR_ROOT.'uploads/skins/interface')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_intf'], 2, 'install/?mode=step_1'); }
+			if(!is_writable(MCR_ROOT.$this->cfg->main['skin_path'].'interface') || !is_readable(MCR_ROOT.$this->cfg->main['skin_path'].'interface')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_intf'], 2, 'install/?mode=step_1'); }
 
 			if(!is_writable(MCR_ROOT.'uploads/smiles') || !is_readable(MCR_ROOT.'uploads/smiles')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_smiles'], 2, 'install/?mode=step_1'); }
 
@@ -97,13 +97,13 @@
 
 			"FOLDER_UPLOADS" => (is_writable(MCR_ROOT.'uploads') && is_readable(MCR_ROOT.'uploads')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 
-			"FOLDER_CLOAKS" => (is_writable(MCR_ROOT.'uploads/cloaks') && is_readable(MCR_ROOT.'uploads/cloaks')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
+			"FOLDER_CLOAKS" => (is_writable(MCR_ROOT.$this->cfg->main['cloak_path']) && is_readable(MCR_ROOT.$this->cfg->main['cloak_path'])) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
+
+			"FOLDER_SKINS" => (is_writable(MCR_ROOT.$this->cfg->main['skin_path']) && is_readable(MCR_ROOT.$this->cfg->main['skin_path'])) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 
 			"FOLDER_ICONS" => (is_writable(MCR_ROOT.'uploads/panel-icons') && is_readable(MCR_ROOT.'uploads/panel-icons')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 
-			"FOLDER_SKINS" => (is_writable(MCR_ROOT.'uploads/skins') && is_readable(MCR_ROOT.'uploads/skins')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
-
-			"FOLDER_INTERF" => (is_writable(MCR_ROOT.'uploads/skins/interface') && is_readable(MCR_ROOT.'uploads/skins')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
+			"FOLDER_INTERF" => (is_writable(MCR_ROOT.$this->cfg->main['skin_path'].'interface') && is_readable(MCR_ROOT.$this->cfg->main['skin_path'])) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 
 			"FOLDER_SMILES" => (is_writable(MCR_ROOT.'uploads/smiles') && is_readable(MCR_ROOT.'uploads/smiles')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 		);
diff --git a/upload/install/step_2.php b/upload/install/step_2.php
index d9a3a56..a350883 100644
--- a/upload/install/step_2.php
+++ b/upload/install/step_2.php
@@ -3,13 +3,13 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $lng, $lng_m, $user;
+	private $core, $db, $cfg, $lng, $lng_m, $user;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->lng		= $core->lng;
 		$this->lng_m	= $core->lng_m;
 
@@ -28,7 +28,7 @@
 		if(isset($_SESSION['step_2'])){ $this->core->notify('', '', 4, 'install/?mode=step_3'); }
 
 		if(!isset($_SESSION['f_host'])){
-			$_SESSION['f_host'] = 'localhost';
+			$_SESSION['f_host'] = '127.0.0.1';
 			$_SESSION['f_port'] = 3306;
 			$_SESSION['f_base'] = '';
 			$_SESSION['f_backend'] = '';
@@ -37,30 +37,28 @@
 
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 
-			$this->config->db['host'] = @$_POST['host'];
+			$this->cfg->db['host'] = @$_POST['host'];
 			$_SESSION['f_host'] = $this->db->HSC(@$_POST['host']);
 
-			$this->config->db['port'] = intval(@$_POST['port']);
+			$this->cfg->db['port'] = intval(@$_POST['port']);
 			$_SESSION['f_port'] = intval(@$_POST['port']);
 
-			$this->config->db['base'] = @$_POST['base'];
+			$this->cfg->db['base'] = @$_POST['base'];
 			$_SESSION['f_base'] = $this->db->HSC(@$_POST['base']);
 
-			$this->config->db['user'] = @$_POST['user'];
+			$this->cfg->db['user'] = @$_POST['user'];
 			$_SESSION['f_user'] = $this->db->HSC(@$_POST['user']);
 
-			$this->config->db['pass'] = @$_POST['pass'];
+			$this->cfg->db['pass'] = @$_POST['pass'];
 
-			$this->config->db['backend'] = (@$_POST['type']=='mysqli') ? 'mysqli' : 'mysql';
+			$this->cfg->db['backend'] = (@$_POST['type']=='mysqli') ? 'mysqli' : 'mysql';
 			$_SESSION['f_backend'] = (@$_POST['type']=='mysql') ? 'selected' : '';
 
-			$connect = @mysql_connect($this->config->db['host'].':'.$this->config->db['port'], $this->config->db['user'], $this->config->db['pass']);
+			$this->db->__construct($this->cfg);
 
-			if(!@mysql_select_db($this->config->db['base'], $connect)){
-				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_set_base'], 2, 'install/?mode=step_2');
-			}
+			if($this->db->obj->connect_errno){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_set_base'], 2, 'install/?mode=step_2'); }
 
-			if(!$this->config->savecfg($this->config->db, 'db.php', 'db')){
+			if(!$this->cfg->savecfg($this->cfg->db, 'db.php', 'db')){
 				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_settings'], 2, 'install/?mode=step_2');
 			}
 
diff --git a/upload/install/step_3.php b/upload/install/step_3.php
index 905e35e..2d31dfc 100644
--- a/upload/install/step_3.php
+++ b/upload/install/step_3.php
@@ -3,13 +3,13 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $lng, $lng_m, $user;
+	private $core, $db, $cfg, $lng, $lng_m, $user;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->lng		= $core->lng;
 		$this->lng_m	= $core->lng_m;
 
@@ -59,30 +59,65 @@
 				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_email_format'], 2, 'install/?mode=step_3');
 			}
 
-			$login = $this->db->safesql(@$_POST['login']);
-			$email = $this->db->safesql(@$_POST['email']);
+			$login		= $this->db->safesql(@$_POST['login']);
+			$email		= $this->db->safesql(@$_POST['email']);
 
-			$salt = $this->db->safesql($this->core->random());
-			$password = $this->core->gen_password(@$_POST['password'], $salt, $method);
-			$password = $this->db->safesql($password);
-			$uuid = $this->db->safesql($this->user->logintouuid(@$_POST['login']));
-			$ip = $this->user->ip;
+			$salt		= $this->db->safesql($this->core->random());
+			$password	= $this->core->gen_password(@$_POST['password'], $salt, $method);
+			$password	= $this->db->safesql($password);
+			$uuid		= $this->db->safesql($this->user->logintouuid(@$_POST['login']));
+			$ip			= $this->user->ip;
 
 			$data = array(
-				"time_create" => time(),
-				"time_last" => time(),
-				"firstname" => "",
-				"lastname" => "",
-				"gender" => 0,
-				"birthday" => 0
+				"time_create"	=> time(),
+				"time_last"		=> time(),
+				"firstname"		=> "",
+				"lastname"		=> "",
+				"gender"		=> 0,
+				"birthday"		=> 0
 			);
 
 			$data = $this->db->safesql(json_encode($data));
 
 			$tables = file(MCR_ROOT.'install/tables.sql');
 
+			$ctables	= $this->cfg->db['tables'];
+
+			$ug_f		= $ctables['ugroups']['fields'];
+			$ic_f		= $ctables['iconomy']['fields'];
+			$logs_f		= $ctables['logs']['fields'];
+			$us_f		= $ctables['users']['fields'];
+
 			$string = "";
 
+			$search = array(
+				'~ug~',
+				'~ug_id~', '~ug_title~', '~ug_text~', '~ug_color~', '~ug_perm~',
+
+				'~ic~',
+				'~ic_id~', '~ic_login~', '~ic_money~', '~ic_rc~', '~ic_bank~',
+
+				'~logs~',
+				'~logs_id~', '~logs_uid~', '~logs_msg~', '~logs_date~',
+
+				'~us~',
+				'~us_id~', '~us_gid~', '~us_login~', '~us_email~', '~us_pass~', '~us_uuid~', '~us_salt~', '~us_tmp~', '~us_is_skin~', '~us_is_cloak~', '~us_ip_create~', '~us_ip_last~', '~us_color~', '~us_data~', '~us_ban_server~',
+			);
+
+			$replace = array(
+				$this->cfg->tabname('ugroups'),
+				$ug_f['id'], $ug_f['title'], $ug_f['text'], $ug_f['color'], $ug_f['perm'],
+
+				$this->cfg->tabname('iconomy'),
+				$ic_f['id'], $ic_f['login'], $ic_f['money'], $ic_f['rm'], $ic_f['bank'],
+
+				$this->cfg->tabname('logs'),
+				$logs_f['id'], $logs_f['uid'], $logs_f['msg'], $logs_f['date'],
+
+				$this->cfg->tabname('users'),
+				$us_f['id'], $us_f['group'], $us_f['login'], $us_f['email'], $us_f['pass'], $us_f['uuid'], $us_f['salt'], $us_f['tmp'], $us_f['is_skin'], $us_f['is_cloak'], $us_f['ip_create'], $us_f['ip_last'], $us_f['color'], $us_f['data'], $us_f['ban_server'],
+			);
+
 			foreach($tables as $key => $value){
 
 				$value = trim($value);
@@ -96,12 +131,14 @@
 					continue;
 				}
 
+				$value = str_replace($search, $replace, $value);
+
 				$string .= $value;
 
 			}
 
-			$sql1 = $this->db->query("INSERT INTO `mcr_users`
-											(`gid`, `login`, `email`, `password`, `uuid`, `salt`, `ip_create`, `ip_last`, `data`)
+			$sql1 = $this->db->query("INSERT INTO `{$this->cfg->tabname('users')}`
+											(`{$us_f['group']}`, `{$us_f['login']}`, `{$us_f['email']}`, `{$us_f['pass']}`, `{$us_f['uuid']}`, `{$us_f['salt']}`, `{$us_f['ip_create']}`, `{$us_f['ip_last']}`, `{$us_f['data']}`)
 										VALUES
 											('3', '$login', '$email', '$password', '$uuid', '$salt', '$ip', '$ip', '$data')");
 
@@ -109,24 +146,24 @@
 
 			$url = substr($_SERVER['PHP_SELF'], 0, strpos($_SERVER['PHP_SELF'], 'install'));
 
-			$sql2 = $this->db->query("INSERT INTO `mcr_iconomy`
-										(`login`, `money`, `realmoney`, `bank`)
+			$sql2 = $this->db->query("INSERT INTO `{$this->cfg->tabname('iconomy')}`
+										(`{$ic_f['login']}`, `{$ic_f['money']}`, `{$ic_f['rm']}`, `{$ic_f['bank']}`)
 									VALUES
 										('$login', 0, 0, 0)");
 
 			if(!$sql2){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_add_economy'], 2, 'install/?mode=step_3'); }
 			
-			$sql9 = $this->db->query("UPDATE `mcr_groups` SET id='0' WHERE id='4'");
+			$sql9 = $this->db->query("UPDATE `{$this->cfg->tabname('ugroups')}` SET `{$ug_f['id']}`='0' WHERE `{$ug_f['id']}`='4'");
 
 			if(!$sql9){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_upd_group'], 2, 'install/?mode=step_3'); }
 
-			$sql10 = $this->db->query("ALTER TABLE `mcr_groups` AUTO_INCREMENT=0");
+			$sql10 = $this->db->query("ALTER TABLE `{$this->cfg->tabname('ugroups')}` AUTO_INCREMENT=0");
 
 			if(!$sql10){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_upd_group'], 2, 'install/?mode=step_3'); }
 
-			$this->config->main['crypt'] = $method;
+			$this->cfg->main['crypt'] = $method;
 
-			if(!$this->config->savecfg($this->config->main, 'main.php', 'main')){
+			if(!$this->cfg->savecfg($this->cfg->main, 'main.php', 'main')){
 				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_settings'], 2, 'install/?mode=step_3');
 			}
 
diff --git a/upload/install/tables.sql b/upload/install/tables.sql
index 2534f7e..4dbcb59 100644
--- a/upload/install/tables.sql
+++ b/upload/install/tables.sql
@@ -22,37 +22,37 @@
   KEY `uid` (`uid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 #line
-CREATE TABLE IF NOT EXISTS `mcr_groups` (
-  `id` int(10) NOT NULL AUTO_INCREMENT,
-  `title` varchar(32) NOT NULL DEFAULT '',
-  `description` varchar(255) NOT NULL DEFAULT '',
-  `color` varchar(24) NOT NULL DEFAULT '',
-  `permissions` text NOT NULL,
-  PRIMARY KEY (`id`)
+CREATE TABLE IF NOT EXISTS `~ug~` (
+  `~ug_id~` int(10) NOT NULL AUTO_INCREMENT,
+  `~ug_title~` varchar(32) NOT NULL DEFAULT '',
+  `~ug_text~` varchar(255) NOT NULL DEFAULT '',
+  `~ug_color~` varchar(24) NOT NULL DEFAULT '',
+  `~ug_perm~` text NOT NULL,
+  PRIMARY KEY (`~ug_id~`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=4 ;
 #line
-INSERT INTO `mcr_groups` (`id`, `title`, `description`, `color`, `permissions`) VALUES
-(0, 'Заблокированный', 'Группа заблокированных пользователей', '', '{"sys_debug":false,"sys_max_file_size":0,"sys_max_ratio":0,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":false,"sys_profile_del_cloak":false,"sys_profile_skin":false,"sys_profile_cloak":false,"sys_profile_settings":false,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":false,"sys_comment_add":false,"sys_comment_edt":false,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":false,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":false,"sys_search_comments":false,"sys_news_like":false,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false}'),
-(1, 'Непроверенный', 'Группа непроверенных пользователей', '', '{"sys_debug":false,"sys_max_file_size":1024,"sys_max_ratio":0,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":false,"sys_profile_del_cloak":false,"sys_profile_skin":false,"sys_profile_cloak":false,"sys_profile_settings":false,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":false,"sys_comment_edt":false,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":true,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":true,"sys_search_comments":false,"sys_news_like":false,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false}'),
-(2, 'Пользователь', 'Зарегистрированные и проверенные пользователи', '', '{"sys_debug":false,"sys_max_file_size":1024,"sys_max_ratio":1,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":true,"sys_profile_del_cloak":true,"sys_profile_skin":true,"sys_profile_cloak":true,"sys_profile_settings":true,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":true,"sys_comment_edt":true,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":true,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":true,"sys_search_comments":true,"sys_news_like":true,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false}'),
-(3, 'Администратор', 'Группа администрации', '', '{"sys_debug":true,"sys_max_file_size":4096,"sys_max_ratio":32,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":true,"sys_profile_del_cloak":true,"sys_profile_skin":true,"sys_profile_cloak":true,"sys_profile_settings":true,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":true,"sys_comment_edt":true,"sys_comment_edt_all":true,"sys_comment_del":true,"sys_comment_del_all":true,"sys_auth":true,"sys_adm_main":true,"sys_adm_news":true,"sys_adm_news_cats":true,"sys_adm_news_views":true,"sys_adm_news_votes":true,"sys_adm_comments":true,"sys_adm_menu":true,"sys_adm_menu_adm":true,"sys_adm_menu_groups":true,"sys_adm_menu_icons":true,"sys_adm_users":true,"sys_adm_groups":true,"sys_adm_permissions":true,"sys_adm_statics":true,"sys_adm_info":true,"sys_adm_settings":true,"sys_adm_monitoring":true,"sys_adm_modules":true,"sys_search_news":true,"sys_search_comments":true,"sys_news_like":true,"sys_adm_m_g_main":true,"sys_adm_m_g_news":true,"sys_adm_m_g_users":true,"sys_adm_m_g_menu":true,"sys_adm_m_g_settings":true,"sys_adm_m_i_news":true,"sys_adm_m_i_news_cats":true,"sys_adm_m_i_comments":true,"sys_adm_m_i_news_views":true,"sys_adm_m_i_news_votes":true,"sys_adm_m_i_users":true,"sys_adm_m_i_groups":true,"sys_adm_m_i_permissions":true,"sys_adm_m_i_menu":true,"sys_adm_m_i_menu_adm":true,"sys_adm_m_i_menu_groups_adm":true,"sys_adm_m_i_icons":true,"sys_adm_m_i_statics":true,"sys_adm_m_i_settings":true,"sys_adm_m_i_monitor":true,"sys_adm_m_i_info":true,"sys_adm_m_i_modules":true,"sys_adm_m_i_logs":true,"sys_adm_manager":true,"sys_adm_logs":true,"sys_adm_permissions_add":true,"sys_adm_permissions_edit":true,"sys_adm_permissions_delete":true,"sys_adm_comments_add":true,"sys_adm_comments_edit":true,"sys_adm_comments_delete":true,"sys_adm_groups_add":true,"sys_adm_groups_edit":true,"sys_adm_groups_delete":true,"sys_adm_menu_add":true,"sys_adm_menu_edit":true,"sys_adm_menu_delete":true,"sys_adm_menu_adm_add":true,"sys_adm_menu_adm_edit":true,"sys_adm_menu_adm_delete":true,"sys_adm_menu_groups_add":true,"sys_adm_menu_groups_edit":true,"sys_adm_menu_groups_delete":true,"sys_adm_menu_icons_add":true,"sys_adm_menu_icons_edit":true,"sys_adm_menu_icons_delete":true,"sys_adm_monitoring_add":true,"sys_adm_monitoring_edit":true,"sys_adm_monitoring_delete":true,"sys_adm_news_add":true,"sys_adm_news_edit":true,"sys_adm_news_delete":true,"sys_adm_news_cats_add":true,"sys_adm_news_cats_edit":true,"sys_adm_news_cats_delete":true,"sys_adm_statics_add":true,"sys_adm_statics_edit":true,"sys_adm_statics_delete":true,"sys_adm_users_add":true,"sys_adm_users_edit":true,"sys_adm_users_delete":true,"sys_adm_users_ban":true,"sys_adm_modules_edit":true,"sys_adm_news_views_delete":true,"sys_adm_news_votes_delete":true}');
+INSERT INTO `~ug~` (`~ug_id~`, `~ug_title~`, `~ug_text~`, `~ug_color~`, `~ug_perm~`) VALUES
+(0, 'Заблокированный', 'Группа заблокированных пользователей', '', '{"color":0,"sys_debug":false,"sys_max_file_size":0,"sys_max_ratio":0,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":false,"sys_profile_del_cloak":false,"sys_profile_skin":false,"sys_profile_cloak":false,"sys_profile_settings":false,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":false,"sys_comment_add":false,"sys_comment_edt":false,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":false,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":false,"sys_search_comments":false,"sys_news_like":false,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false,"sys_adm_blocks":false,"sys_adm_m_i_blocks":false,"sys_adm_blocks_edit":false,"block_online":false,"block_banner":false}'),
+(1, 'Непроверенный', 'Группа непроверенных пользователей', '', '{"color":0,"sys_debug":false,"sys_max_file_size":1024,"sys_max_ratio":0,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":false,"sys_profile_del_cloak":false,"sys_profile_skin":false,"sys_profile_cloak":false,"sys_profile_settings":false,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":false,"sys_comment_edt":false,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":true,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":true,"sys_search_comments":false,"sys_news_like":false,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false,"sys_adm_blocks":false,"sys_adm_m_i_blocks":false,"sys_adm_blocks_edit":false,"block_online":true,"block_banner":false}'),
+(2, 'Пользователь', 'Зарегистрированные и проверенные пользователи', '', '{"color":0,"sys_debug":false,"sys_max_file_size":1024,"sys_max_ratio":1,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":true,"sys_profile_del_cloak":true,"sys_profile_skin":true,"sys_profile_cloak":true,"sys_profile_settings":true,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":true,"sys_comment_edt":true,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":true,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":true,"sys_search_comments":true,"sys_news_like":true,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false,"sys_adm_blocks":false,"sys_adm_m_i_blocks":false,"sys_adm_blocks_edit":false,"block_online":true,"block_banner":false}'),
+(3, 'Администратор', 'Группа администрации', '', '{"color":0,"sys_debug":true,"sys_max_file_size":4096,"sys_max_ratio":32,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":true,"sys_profile_del_cloak":true,"sys_profile_skin":true,"sys_profile_cloak":true,"sys_profile_settings":true,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":true,"sys_comment_edt":true,"sys_comment_edt_all":true,"sys_comment_del":true,"sys_comment_del_all":true,"sys_auth":true,"sys_adm_main":true,"sys_adm_news":true,"sys_adm_news_cats":true,"sys_adm_news_views":true,"sys_adm_news_votes":true,"sys_adm_comments":true,"sys_adm_menu":true,"sys_adm_menu_adm":true,"sys_adm_menu_groups":true,"sys_adm_menu_icons":true,"sys_adm_users":true,"sys_adm_groups":true,"sys_adm_permissions":true,"sys_adm_statics":true,"sys_adm_info":true,"sys_adm_settings":true,"sys_adm_monitoring":true,"sys_adm_modules":true,"sys_search_news":true,"sys_search_comments":true,"sys_news_like":true,"sys_adm_m_g_main":true,"sys_adm_m_g_news":true,"sys_adm_m_g_users":true,"sys_adm_m_g_menu":true,"sys_adm_m_g_settings":true,"sys_adm_m_i_news":true,"sys_adm_m_i_news_cats":true,"sys_adm_m_i_comments":true,"sys_adm_m_i_news_views":true,"sys_adm_m_i_news_votes":true,"sys_adm_m_i_users":true,"sys_adm_m_i_groups":true,"sys_adm_m_i_permissions":true,"sys_adm_m_i_menu":true,"sys_adm_m_i_menu_adm":true,"sys_adm_m_i_menu_groups_adm":true,"sys_adm_m_i_icons":true,"sys_adm_m_i_statics":true,"sys_adm_m_i_settings":true,"sys_adm_m_i_monitor":true,"sys_adm_m_i_info":true,"sys_adm_m_i_modules":true,"sys_adm_m_i_logs":true,"sys_adm_manager":true,"sys_adm_logs":true,"sys_adm_permissions_add":true,"sys_adm_permissions_edit":true,"sys_adm_permissions_delete":true,"sys_adm_comments_add":true,"sys_adm_comments_edit":true,"sys_adm_comments_delete":true,"sys_adm_groups_add":true,"sys_adm_groups_edit":true,"sys_adm_groups_delete":true,"sys_adm_menu_add":true,"sys_adm_menu_edit":true,"sys_adm_menu_delete":true,"sys_adm_menu_adm_add":true,"sys_adm_menu_adm_edit":true,"sys_adm_menu_adm_delete":true,"sys_adm_menu_groups_add":true,"sys_adm_menu_groups_edit":true,"sys_adm_menu_groups_delete":true,"sys_adm_menu_icons_add":true,"sys_adm_menu_icons_edit":true,"sys_adm_menu_icons_delete":true,"sys_adm_monitoring_add":true,"sys_adm_monitoring_edit":true,"sys_adm_monitoring_delete":true,"sys_adm_news_add":true,"sys_adm_news_edit":true,"sys_adm_news_delete":true,"sys_adm_news_cats_add":true,"sys_adm_news_cats_edit":true,"sys_adm_news_cats_delete":true,"sys_adm_statics_add":true,"sys_adm_statics_edit":true,"sys_adm_statics_delete":true,"sys_adm_users_add":true,"sys_adm_users_edit":true,"sys_adm_users_delete":true,"sys_adm_users_ban":true,"sys_adm_modules_edit":true,"sys_adm_news_views_delete":true,"sys_adm_news_votes_delete":true,"sys_adm_blocks":true,"sys_adm_m_i_blocks":true,"sys_adm_blocks_edit":true,"block_online":true,"block_banner":true}');
 #line
-CREATE TABLE IF NOT EXISTS `mcr_iconomy` (
-  `id` int(10) NOT NULL AUTO_INCREMENT,
-  `login` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '',
-  `money` decimal(10,2) NOT NULL DEFAULT '0.00',
-  `realmoney` decimal(10,2) NOT NULL DEFAULT '0.00',
-  `bank` decimal(10,2) NOT NULL DEFAULT '0.00',
-  PRIMARY KEY (`id`),
-  KEY `login` (`login`)
+CREATE TABLE IF NOT EXISTS `~ic~` (
+  `~ic_id~` int(10) NOT NULL AUTO_INCREMENT,
+  `~ic_login~` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '',
+  `~ic_money~` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `~ic_rc~` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `~ic_bank~` decimal(10,2) NOT NULL DEFAULT '0.00',
+  PRIMARY KEY (`~ic_id~`),
+  KEY `~ic_login~` (`~ic_login~`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 #line
-CREATE TABLE IF NOT EXISTS `mcr_logs` (
-  `id` int(10) NOT NULL AUTO_INCREMENT,
-  `uid` int(10) NOT NULL DEFAULT '0',
-  `message` varchar(255) NOT NULL DEFAULT '',
-  `date` int(10) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`)
+CREATE TABLE IF NOT EXISTS `~logs~` (
+  `~logs_id~` int(10) NOT NULL AUTO_INCREMENT,
+  `~logs_uid~` int(10) NOT NULL DEFAULT '0',
+  `~logs_msg~` varchar(255) NOT NULL DEFAULT '',
+  `~logs_date~` int(10) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`~logs_id~`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 #line
 CREATE TABLE IF NOT EXISTS `mcr_menu` (
@@ -65,6 +65,15 @@
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;
 #line
+CREATE TABLE IF NOT EXISTS `mcr_online` (
+  `id` int(10) NOT NULL AUTO_INCREMENT,
+  `ip` varchar(16) NOT NULL DEFAULT '127.0.0.1',
+  `online` tinyint(1) NOT NULL DEFAULT '0',
+  `date_create` int(10) NOT NULL DEFAULT '0',
+  `date_update` int(10) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+#line
 INSERT INTO `mcr_menu` (`id`, `title`, `parent`, `url`, `target`, `permissions`) VALUES
 (1, 'Главная', 0, '/', '_self', 'sys_share'),
 (2, 'ПУ', 0, '/?mode=admin', '_self', 'sys_adm_main');
@@ -94,14 +103,15 @@
 (8, 3, 'Группы', 'Управление группами пользователей и их привилегиями', '/?mode=admin&do=groups', '_self', 'sys_adm_m_i_groups', 2, 15),
 (9, 3, 'Привилегии', 'Управление доступными привилегиями', '/?mode=admin&do=permissions', '_self', 'sys_adm_m_i_permissions', 3, 17),
 (10, 4, 'Меню сайта', 'Управление пунктами основного меню', '/?mode=admin&do=menu', '_self', 'sys_adm_m_i_menu', 1, 7),
-(11, 4, 'Меню ПУ', 'Управление пунктами меню панели управления', '/?mode=admin&do=menu_adm', '_self', 'sys_adm_m_i_menu_adm', 2, 18),
+(11, 4, 'Меню ПУ', 'Управление пунктами меню панели управления', '/?mode=admin&do=menu_adm', '_self', 'sys_adm_m_i_menu_adm', 2, 24),
 (12, 4, 'Группы меню ПУ', 'Управление группами меню панели управления', '/?mode=admin&do=menu_groups', '_self', 'sys_adm_m_i_menu_groups_adm', 3, 11),
 (13, 4, 'Иконки', 'Управление иконками пунктов меню панели управления', '/?mode=admin&do=menu_icons', '_self', 'sys_adm_m_i_icons', 4, 19),
 (14, 1, 'Статические страницы', 'Управление статическими страницами ', '/?mode=admin&do=statics', '_self', 'sys_adm_m_i_statics', 2, 20),
 (15, 5, 'Настройки сайта', 'Основные настройки сайта', '/?mode=admin&do=settings', '_self', 'sys_adm_m_i_settings', 1, 6),
 (16, 1, 'Мониторинг серверов', 'Управление серверами мониторинга', '/?mode=admin&do=monitoring', '_self', 'sys_adm_m_i_monitor', 3, 21),
 (17, 1, 'Модули', 'Управление модулями', '/?mode=admin&do=modules', '_self', 'sys_adm_m_i_modules', 4, 22),
-(18, 1, 'Лог действий', 'Журнал действий пользователей', '/?mode=admin&do=logs', '_self', 'sys_adm_m_i_logs', 5, 23);
+(18, 1, 'Лог действий', 'Журнал действий пользователей', '/?mode=admin&do=logs', '_self', 'sys_adm_m_i_logs', 5, 23),
+(19, 1, 'Блоки', 'Управление Блоками', '/?mode=admin&do=blocks', '_self', 'sys_adm_m_i_blocks', 6, 18);
 #line
 CREATE TABLE IF NOT EXISTS `mcr_menu_adm_groups` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
@@ -149,7 +159,8 @@
 (20, 'Два листа', 'pages.png'),
 (21, 'Монитор', 'monitor.png'),
 (22, 'Сеть', 'network.png'),
-(23, 'Открытая книга', 'logs.png');
+(23, 'Открытая книга', 'logs.png'),
+(24, 'Пустое древо', 'gealogy.png');
 #line
 CREATE TABLE IF NOT EXISTS `mcr_monitoring` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
@@ -352,7 +363,12 @@
 (106, 'Бан/разбан пользователей', 'Доступ к банам и разбанам пользователей', 'sys_adm_users_ban', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
 (107, 'Редактирование модулей', 'Доступ к редактированию модулей', 'sys_adm_modules_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
 (108, 'Удаление просмотров', 'Доступ к удалению просмотров новостей', 'sys_adm_news_views_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
-(109, 'Удаление голосов', 'Доступ к удалению голосов новостей', 'sys_adm_news_votes_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}');
+(109, 'Удаление голосов', 'Доступ к удалению голосов новостей', 'sys_adm_news_votes_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(110, 'Управление блоками', 'Доступ к управлению блоками', 'sys_adm_blocks', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(111, 'Пункт меню "Блоки"', 'Доступ к пункту меню "Блоки" в панели управления.', 'sys_adm_m_i_blocks', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(112, 'Редактирование блоков', 'Доступ к редактированию блоков', 'sys_adm_blocks_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(113, 'Доступ к блоку онлайна', 'Дает доступ к просмотру блока онлайн статистики', 'block_online', 0, 'boolean', 'true', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(114, 'Доступ к блоку баннера', 'Дает доступ к просмотру блока баннера', 'block_banner', 1, 'boolean', 'true', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}');
 #line
 CREATE TABLE IF NOT EXISTS `mcr_statics` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
@@ -368,56 +384,56 @@
   KEY `uid` (`uid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 #line
-CREATE TABLE IF NOT EXISTS `mcr_users` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `gid` int(11) NOT NULL DEFAULT '1',
-  `login` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '',
-  `email` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '',
-  `password` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '',
-  `uuid` varchar(64) NOT NULL DEFAULT '',
-  `salt` varchar(10) NOT NULL DEFAULT '',
-  `tmp` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '',
-  `is_skin` tinyint(1) NOT NULL DEFAULT '0',
-  `is_cloak` tinyint(1) NOT NULL DEFAULT '0',
-  `ip_create` varchar(15) CHARACTER SET latin1 NOT NULL DEFAULT '127.0.0.1',
-  `ip_last` varchar(15) CHARACTER SET latin1 NOT NULL DEFAULT '127.0.0.1',
-  `color` varchar(24) NOT NULL DEFAULT '',
-  `data` text NOT NULL,
-  `ban_server` tinyint(1) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `login` (`login`,`email`),
-  KEY `gid` (`gid`),
-  KEY `login_2` (`login`)
+CREATE TABLE IF NOT EXISTS `~us~` (
+  `~us_id~` int(11) NOT NULL AUTO_INCREMENT,
+  `~us_gid~` int(11) NOT NULL DEFAULT '1',
+  `~us_login~` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '',
+  `~us_email~` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '',
+  `~us_pass~` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '',
+  `~us_uuid~` varchar(64) NOT NULL DEFAULT '',
+  `~us_salt~` varchar(10) NOT NULL DEFAULT '',
+  `~us_tmp~` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '',
+  `~us_is_skin~` tinyint(1) NOT NULL DEFAULT '0',
+  `~us_is_cloak~` tinyint(1) NOT NULL DEFAULT '0',
+  `~us_ip_create~` varchar(15) CHARACTER SET latin1 NOT NULL DEFAULT '127.0.0.1',
+  `~us_ip_last~` varchar(15) CHARACTER SET latin1 NOT NULL DEFAULT '127.0.0.1',
+  `~us_color~` varchar(24) NOT NULL DEFAULT '',
+  `~us_data~` text NOT NULL,
+  `~us_ban_server~` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`~us_id~`),
+  UNIQUE KEY `~us_login~` (`~us_login~`,`~us_email~`),
+  KEY `~us_gid~` (`~us_gid~`),
+  KEY `~us_login~_2` (`~us_login~`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 #line
 ALTER TABLE `mcr_comments`
-  ADD CONSTRAINT `mcr_comments_ibfk_2` FOREIGN KEY (`uid`) REFERENCES `mcr_users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  ADD CONSTRAINT `mcr_comments_ibfk_2` FOREIGN KEY (`uid`) REFERENCES `~us~` (`~us_id~`) ON DELETE CASCADE ON UPDATE CASCADE,
   ADD CONSTRAINT `mcr_comments_ibfk_1` FOREIGN KEY (`nid`) REFERENCES `mcr_news` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
 #line
 ALTER TABLE `mcr_files`
-  ADD CONSTRAINT `mcr_files_ibfk_1` FOREIGN KEY (`uid`) REFERENCES `mcr_users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+  ADD CONSTRAINT `mcr_files_ibfk_1` FOREIGN KEY (`uid`) REFERENCES `~us~` (`~us_id~`) ON DELETE CASCADE ON UPDATE CASCADE;
 #line
 ALTER TABLE `mcr_iconomy`
-  ADD CONSTRAINT `mcr_iconomy_ibfk_1` FOREIGN KEY (`login`) REFERENCES `mcr_users` (`login`) ON DELETE CASCADE ON UPDATE CASCADE;
+  ADD CONSTRAINT `mcr_iconomy_ibfk_1` FOREIGN KEY (`login`) REFERENCES `~us~` (`~us_login~`) ON DELETE CASCADE ON UPDATE CASCADE;
 #line
 ALTER TABLE `mcr_menu_adm`
   ADD CONSTRAINT `mcr_menu_adm_ibfk_1` FOREIGN KEY (`gid`) REFERENCES `mcr_menu_adm_groups` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
 #line
 ALTER TABLE `mcr_news`
   ADD CONSTRAINT `mcr_news_ibfk_1` FOREIGN KEY (`cid`) REFERENCES `mcr_news_cats` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  ADD CONSTRAINT `mcr_news_ibfk_2` FOREIGN KEY (`uid`) REFERENCES `mcr_users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+  ADD CONSTRAINT `mcr_news_ibfk_2` FOREIGN KEY (`uid`) REFERENCES `~us~` (`~us_id~`) ON DELETE CASCADE ON UPDATE CASCADE;
 #line
 ALTER TABLE `mcr_news_views`
-  ADD CONSTRAINT `mcr_news_views_ibfk_2` FOREIGN KEY (`uid`) REFERENCES `mcr_users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  ADD CONSTRAINT `mcr_news_views_ibfk_2` FOREIGN KEY (`uid`) REFERENCES `~us~` (`~us_id~`) ON DELETE CASCADE ON UPDATE CASCADE,
   ADD CONSTRAINT `mcr_news_views_ibfk_1` FOREIGN KEY (`nid`) REFERENCES `mcr_news` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
 #line
 ALTER TABLE `mcr_news_votes`
-  ADD CONSTRAINT `mcr_news_votes_ibfk_2` FOREIGN KEY (`uid`) REFERENCES `mcr_users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  ADD CONSTRAINT `mcr_news_votes_ibfk_2` FOREIGN KEY (`uid`) REFERENCES `~us~` (`~us_id~`) ON DELETE CASCADE ON UPDATE CASCADE,
   ADD CONSTRAINT `mcr_news_votes_ibfk_1` FOREIGN KEY (`nid`) REFERENCES `mcr_news` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
-
-ALTER TABLE `mcr_statics`
-  ADD CONSTRAINT `mcr_statics_ibfk_1` FOREIGN KEY (`uid`) REFERENCES `mcr_users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
 #line
-ALTER TABLE `mcr_users`
-  ADD CONSTRAINT `mcr_users_ibfk_1` FOREIGN KEY (`gid`) REFERENCES `mcr_groups` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `mcr_statics`
+  ADD CONSTRAINT `mcr_statics_ibfk_1` FOREIGN KEY (`uid`) REFERENCES `~us~` (`~us_id~`) ON DELETE CASCADE ON UPDATE CASCADE;
+#line
+ALTER TABLE `~us~`
+  ADD CONSTRAINT `~us~_ibfk_1` FOREIGN KEY (`~us_gid~`) REFERENCES `~ug~` (`~ug_id~`) ON DELETE CASCADE ON UPDATE CASCADE;
 #line
\ No newline at end of file
diff --git a/upload/install/theme/finish.html b/upload/install/theme/finish.html
index b40dc5b..0eddf34 100644
--- a/upload/install/theme/finish.html
+++ b/upload/install/theme/finish.html
@@ -12,7 +12,7 @@
 		<p><?php echo $this->lng_m['fs_msg1']; ?></p>
 		<p class="text-error"><?php echo $this->lng_m['fs_msg2']; ?> <b>install</b> <?php echo $this->lng_m['fs_msg3']; ?></p>
 
-		<p class="text-center"><a href="<?php echo BASE_URL; ?>" class="btn btn-success"><?php echo $this->lng_m['go_home']; ?></a> <a href="<?php echo BASE_URL; ?>?mode=admin" class="btn btn-success"><?php echo $this->lng_m['go_cp']; ?></a></p>
+		<p class="text-center"><a href="<?php echo BASE_URL; ?>" class="btn btn-success"><?php echo $this->lng_m['go_home']; ?></a> <a href="<?php echo ADMIN_URL; ?>" class="btn btn-success"><?php echo $this->lng_m['go_cp']; ?></a></p>
 
 		<br>
 		<div class="accordion" id="accordion2">
diff --git a/upload/install/theme/global.html b/upload/install/theme/global.html
index 537321e..86b0744 100644
--- a/upload/install/theme/global.html
+++ b/upload/install/theme/global.html
@@ -14,7 +14,7 @@
 </head>
 
 <body>
-<!-- <?php echo $this->config->main['rc_public']; ?> -->
+<!-- <?php echo $this->cfg->main['rc_public']; ?> -->
 <div class="navbar navbar-fixed-top">
 	<div class="navbar-inner">
 		<div class="container">
diff --git a/upload/install/theme/header.html b/upload/install/theme/header.html
index aecd01d..26eddd1 100644
--- a/upload/install/theme/header.html
+++ b/upload/install/theme/header.html
@@ -1,10 +1,10 @@
-<script src="<?php echo LANG_URL; ?>js/lang.js"></script>
+<script src="<?php echo LANG_URL; ?>js/global.js"></script>
 <link href="<?php echo STYLE_URL; ?>css/bootstrap.min.css" rel="stylesheet" media="screen">
 <link href="<?php echo STYLE_URL; ?>css/bootstrap-responsive.min.css" rel="stylesheet" media="screen">
-<link href="<?php echo STYLE_URL; ?>css/docs.css" rel="stylesheet" media="screen">
 <link href="<?php echo STYLE_URL; ?>css/global.css" rel="stylesheet" media="screen">
 <script src="<?php echo STYLE_URL; ?>js/jquery.min.js?1"></script>
 <script src="<?php echo STYLE_URL; ?>js/cookie.js"></script>
 <script src="<?php echo STYLE_URL; ?>js/bootstrap.min.js?2"></script>
 <script src="<?php echo STYLE_URL; ?>js/bootstrap.file-input.js"></script>
+<script src="<?php echo STYLE_URL; ?>js/jquery.minicolors.min.js"></script>
 <script src="<?php echo STYLE_URL; ?>js/global.js?3"></script>
\ No newline at end of file
diff --git a/upload/install/theme/step_1.html b/upload/install/theme/step_1.html
index 31bb2cd..98641c8 100644
--- a/upload/install/theme/step_1.html
+++ b/upload/install/theme/step_1.html
@@ -80,7 +80,7 @@
 				</tr>
 
 				<tr>
-					<td><?php echo $this->lng_m['read_write']; ?> | uploads/cloaks/</td>
+					<td><?php echo $this->lng_m['read_write']; ?> | <?php echo $this->cfg->main['cloak_path']; ?></td>
 					<td><?php echo $data["FOLDER_CLOAKS"]; ?></td>
 				</tr>
 
@@ -90,12 +90,12 @@
 				</tr>
 
 				<tr>
-					<td><?php echo $this->lng_m['read_write']; ?> | uploads/skins/</td>
+					<td><?php echo $this->lng_m['read_write']; ?> | <?php echo $this->cfg->main['skin_path']; ?></td>
 					<td><?php echo $data["FOLDER_SKINS"]; ?></td>
 				</tr>
 
 				<tr>
-					<td><?php echo $this->lng_m['read_write']; ?> | uploads/skins/interface/</td>
+					<td><?php echo $this->lng_m['read_write']; ?> | <?php echo $this->cfg->main['skin_path']; ?>interface/</td>
 					<td><?php echo $data["FOLDER_INTERF"]; ?></td>
 				</tr>
 
diff --git a/upload/language/ru_RU/admin.php b/upload/language/ru_RU/admin.php
index 75c4ba9..194165e 100644
--- a/upload/language/ru_RU/admin.php
+++ b/upload/language/ru_RU/admin.php
@@ -2,561 +2,6 @@
 
 $lng = array(
 	'mod_name' => 'Панель управления',
-	'action' => 'Действие',
-
-	'empty_panel_menu_group' => 'Нет доступного меню',
-	'empty_panel_menu_list' => 'Нет доступных пунктов меню',
-
-	'comments' => 'Комментарии',
-	'com_not_selected' => 'Не выбрано ни одного пункта',
-	'com_del_elements' => 'Удалено элементов: ',
-	'com_without_news' => 'Без новости',
-	'com_add' => 'Добавление',
-	'com_edit' => 'Редактирование',
-	'com_empty' => 'Не заполнено поле "Комментарий"',
-	'com_incorrect' => 'Не верно заполнено поле "Комментарий"',
-	'com_add_success' => 'Комментарий успешно добавлен',
-	'com_add_page_name' => 'Добавление комментария',
-	'com_add_btn' => 'Добавить',
-	'com_edit_success' => 'Комментарий успешно изменен',
-	'com_edit_page_name' => 'Редактирование комментария',
-	'com_edit_btn' => 'Сохранить',
-	'com_not_exist' => 'Нет доступных комментариев',
-	'com_col_comment' => 'Комментарий',
-	'com_col_news' => 'Новость',
-	'com_col_user' => 'Пользователь',
-	'com_action' => 'Действие с комментариями',
-	'com_accept' => 'Вы уверены, что хотите удалить выбранные комментарии',
-	'com_text' => 'Текст комментария',
-	'log_del_com' => 'Удаление комментариев',
-	'log_com' => 'в ПУ',
-	'log_add_com' => 'Добавление комментария',
-	'log_edit_com' => 'Редактирование комментария',
-	
-	'groups' => 'Группы пользователей',
-	'grp_not_selected' => 'Не выбрано ни одного пункта',
-	'grp_del_msg1' => 'Удалено элементов: ',
-	'grp_def_val' => 'Значение по умолчанию',
-	'grp_del_success' => 'Группа пользователей успешно добавлена',
-	'grp_add' => 'Добавление',
-	'grp_add_btn' => 'Добавить',
-	'grp_add_page_name' => 'Добавление группы',
-	'grp_edit' => 'Редактирование',
-	'grp_edit_success' => 'Группа пользователей успешно изменена',
-	'grp_edit_page_name' => 'Редактирование группы',
-	'grp_edit_btn' => 'Сохранить',
-	'grp_e_color_format' => 'Неверный формат цвета',
-	'grp_empty' => 'Нет доступных групп пользователей',
-	'grp_field_name' => 'Название',
-	'grp_field_desc' => 'Описание',
-	'grp_field_act' => 'Действие',
-	'grp_field_perm' => 'Привилегии',
-	'grp_action' => 'Действие с группами',
-	'grp_accept' => 'Удаление групп приведет к удалению всех входящих в них пользователей. Вы уверены, что хотите удалить выбранные элементы?',
-	'log_add_grp' => 'Добавление группы пользователей',
-	'log_del_grp' => 'Удаление групп пользователей',
-	'log_edit_grp' => 'Редактирование группы пользователей',
-	'log_grp' => 'в ПУ',
-
-	'info' => 'Информация',
-	'info_ext' => 'Дополнения',
-	'info_stats' => 'Статистика',
-	'info_and_stats' => 'Информация и статистика',
-	'info_news' => 'Новости',
-	'info_eng_ver' => 'Версия движка',
-	'info_eng_ver_now' => 'Текущая версия',
-	'info_eng_ver_last' => 'Последняя стабильная версия',
-	'info_eng_ver_git' => 'Версия на GitHub',
-	'info_eng_ver_dev' => 'Dev версия',
-	'info_news_stats' => 'Статистика новостей',
-	'info_count_news' => 'Новостей',
-	'info_count_views' => 'Просмотров',
-	'info_count_votes' => 'Голосов',
-	'info_count_cats' => 'Категорий',
-	'info_count_coms' => 'Комментариев',
-	'info_users_stats' => 'Статистика пользователей',
-	'info_count_users' => 'Всего пользователей',
-	'info_count_groups' => 'Всего групп',
-	'info_other' => 'Разное',
-	'info_count_statics' => 'Статических страниц',
-	'info_count_perms' => 'Привилегий',
-	'logs' => 'Лог действий',
-	'logs_views' => 'Просмотров',
-	'logs_user' => 'Пользователь',
-	'logs_date' => 'Дата',
-	'logs_action' => 'Действие',
-	'logs_empty' => 'Нет доступных логов',
-
-	'menu' => 'Меню сайта',
-	'menu_top_lvl' => 'Верхний уровень',
-	'menu_not_selected' => 'Не выбрано ни одного пункта',
-	'menu_del_elements' => 'Удалено элементов: ',
-	'menu_add' => 'Добавление',
-	'menu_edit' => 'Редактирование',
-	'menu_edit_btn' => 'Сохранить',
-	'menu_add_btn' => 'Добавить',
-	'menu_perm_not_exist' => 'Привилегия не существует',
-	'menu_add_success' => 'Пункт меню успешно добавлен',
-	'menu_edit_success' => 'Пункт меню успешно изменен',
-	'menu_add_page_name' => 'Добавление меню',
-	'menu_edit_page_name' => 'Редактирование меню',
-	'menu_field_name' => 'Название',
-	'menu_field_link' => 'Ссылка',
-	'menu_field_pos' => 'Позиция',
-	'menu_field_parent' => 'Родитель',
-	'menu_field_action' => 'Действие',
-	'menu_field_action2' => 'Действие с меню',
-	'menu_field_target' => 'Открытие',
-	'menu_target_self' => 'В текущей вкладке',
-	'menu_target_blank' => 'В новой вкладке',
-	'menu_field_access' => 'Уровень доступа',
-	'menu_accept' => 'Удаление пунктов меню приведет к удалению всех входящих в них пунктов. Вы уверены, что хотите удалить выбранные элементы?',
-	'menu_empty' => 'Нет доступных пунктов меню',
-	'log_add_menu' => 'Добавление пунктов меню сайта',
-	'log_del_menu' => 'Удаление пунктов меню сайта',
-	'log_edit_menu' => 'Редактирование пунктов меню сайта',
-	'log_menu' => 'в ПУ',
-
-	'manucp' => 'Меню ПУ',
-	'mcp_not_selected' => 'Не выбрано ни одного пункта',
-	'mcp_del_elements' => 'Удалено элементов: ',
-	'mcp_add' => 'Добавление',
-	'mcp_edit' => 'Редактирование',
-	'mcp_perm_not_exist' => 'Привилегия не существует',
-	'mcp_add_success' => 'Пункт меню успешно добавлен',
-	'mcp_edit_success' => 'Пункт меню успешно изменен',
-	'mcp_add_page_name' => 'Добавление меню',
-	'mcp_edit_page_name' => 'Редактирование меню',
-	'mcp_edit_btn' => 'Сохранить',
-	'mcp_add_btn' => 'Добавить',
-	'mcp_top_lvl' => 'Верхний уровень',
-	'mcp_field_name' => 'Название',
-	'mcp_field_group' => 'Группа',
-	'mcp_field_link' => 'Ссылка',
-	'mcp_field_desc' => 'Описание',
-	'mcp_field_priority' => 'Приоритет',
-	'mcp_field_icon' => 'Иконка',
-	'mcp_field_action' => 'Действие',
-	'mcp_field_action2' => 'Действие с меню',
-	'mcp_field_target' => 'Открытие',
-	'mcp_target_self' => 'В текущей вкладке',
-	'mcp_target_blank' => 'В новой вкладке',
-	'mcp_field_access' => 'Уровень доступа',
-	'mcp_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
-	'mcp_empty' => 'Нет доступных пунктов меню',
-	'log_add_mcp' => 'Добавление пункта меню панели управления',
-	'log_del_mcp' => 'Удаление пунктов меню панели управления',
-	'log_edit_mcp' => 'Редактирование пункта меню в панели управления',
-	'log_mcp' => 'в ПУ',
-
-	'menugrp' => 'Группы меню ПУ',
-	'mgrp_not_selected' => 'Не выбрано ни одного пункта',
-	'mgrp_del_elements' => 'Удалено элементов: ',
-	'mgrp_add' => 'Добавление',
-	'mgrp_edit' => 'Редактирование',
-	'mgrp_perm_not_exist' => 'Привилегия не существует',
-	'mgrp_add_success' => 'Группа меню успешно добавлена',
-	'mgrp_edit_success' => 'Группа меню успешно изменена',
-	'mgrp_add_page_name' => 'Добавление группы',
-	'mgrp_edit_page_name' => 'Редактирование группы',
-	'mgrp_edit_btn' => 'Сохранить',
-	'mgrp_add_btn' => 'Добавить',
-	'mgrp_field_name' => 'Название',
-	'mgrp_field_desc' => 'Описание',
-	'mgrp_field_priority' => 'Приоритет',
-	'mgrp_field_access' => 'Уровень доступа',
-	'mgrp_field_perm' => 'Привилегии',
-	'mgrp_field_action' => 'Действие',
-	'mgrp_field_action2' => 'Действие с меню',
-	'mgrp_accept' => 'Удаление групп меню приведет к удалению всех входящих в них элементов меню. Вы уверены, что хотите удалить выбранные элементы?',
-	'mgrp_empty' => 'Нет доступных групп меню',
-	'log_add_mgrp' => 'Добавление группы меню панели управления',
-	'log_del_mgrp' => 'Удаление групп меню панели управления',
-	'log_edit_mgrp' => 'Редактирование группы меню панели управления',
-	'log_mgrp' => 'в ПУ',
-
-	'menuicons' => 'Иконки',
-	'mi_not_selected' => 'Не выбрано ни одного пункта',
-	'mi_del_elements' => 'Удалено элементов: ',
-	'mi_add' => 'Добавление',
-	'mi_edit' => 'Редактирование',
-	'mi_perm_not_exist' => 'Привилегия не существует',
-	'mi_add_success' => 'Иконка меню успешно добавлена',
-	'mi_edit_success' => 'Иконка меню успешно изменена',
-	'mi_add_page_name' => 'Добавление иконки',
-	'mi_edit_page_name' => 'Редактирование иконки',
-	'mi_edit_btn' => 'Сохранить',
-	'mi_add_btn' => 'Добавить',
-	'mi_field_name' => 'Название',
-	'mi_field_img' => 'Изображение',
-	'mi_field_action' => 'Действие',
-	'mi_field_action2' => 'Действие с иконками',
-	'mi_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
-	'mi_empty' => 'Нет доступных иконок',
-	'log_add_mi' => 'Добавление группы меню панели управления',
-	'log_del_mi' => 'Удаление иконок',
-	'log_edit_mi' => 'Редактирование иконки',
-	'log_mi' => 'в ПУ',
-
-	'modules' => 'Модули',
-	'mod_cfg_not_found' => 'Конфигурация модуля не найдена',
-	'mod_cfg_incorrect' => 'Конфигурация модуля задана неверно',
-	'mod_cfg_unsave' => 'Конфигурация не сохранена',
-	'mod_edit' => 'Редактирование',
-	'mod_edit_success' => 'Модуль успешно изменен',
-	'mod_edit_page_name' => 'Редактирование модуля',
-	'mod_new_version' => 'Есть новая версия -',
-	'mod_download' => 'Скачать',
-	'mod_not_check' => '(Не удалось проверить версию)',
-	'mod_last_version' => '(У вас установлена последняя версия)',
-	'mod_on' => 'Включен',
-	'mod_off' => 'Выключен',
-	'mod_on1' => 'Включены',
-	'mod_off1' => 'Выключены',
-	'mod_edit_btn' => 'Сохранить',
-	'mod_field_name' => 'Название',
-	'mod_field_status' => 'Статус',
-	'mod_field_author' => 'Автор',
-	'mod_field_site' => 'Сайт',
-	'mod_field_email' => 'E-Mail',
-	'mod_field_ver' => 'Версия',
-	'mod_field_upd' => 'Обновления',
-	'mod_field_url' => 'Источник обновлений',
-	'mod_field_action' => 'Действие',
-	'mod_field_action2' => 'Действие с модулями',
-	'mod_empty' => 'Нет доступных модулей',
-	'log_add_mi' => 'Добавление группы меню панели управления',
-	'log_del_mi' => 'Удаление иконок',
-	'log_edit_mod' => 'Редактирование модуля',
-	'log_mod' => 'в ПУ',
-
-	'monitoring' => 'Мониторинг серверов',
-	'mon_not_selected' => 'Не выбрано ни одного пункта',
-	'mon_del_elements' => 'Удалено элементов: ',
-	'mon_add' => 'Добавление',
-	'mon_edit' => 'Редактирование',
-	'mon_perm_not_exist' => 'Привилегия не существует',
-	'mon_add_success' => 'Сервер успешно добавлен',
-	'mon_edit_success' => 'Сервер успешно изменен',
-	'mon_add_page_name' => 'Добавление сервера',
-	'mon_edit_page_name' => 'Редактирование сервера',
-	'mon_edit_btn' => 'Сохранить',
-	'mon_add_btn' => 'Добавить',
-	'mon_field_name' => 'Название',
-	'mon_field_desc' => 'Описание',
-	'mon_field_ip' => 'IP адрес',
-	'mon_field_port' => 'Порт',
-	'mon_field_addr' => 'Адрес',
-	'mon_field_type' => 'Тип',
-	'mon_field_error' => 'Последняя ошибка',
-	'mon_field_cache' => 'Время кэша (сек.)',
-	'mon_field_action' => 'Действие',
-	'mon_field_action2' => 'Действие с серверами',
-	'mon_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
-	'mon_empty' => 'Нет доступных серверов в мониторинге',
-	'log_add_mon' => 'Добавление сервера в мониторинг',
-	'log_del_mon' => 'Удаление серверов из мониторинга',
-	'log_edit_mon' => 'Редактирование сервера в мониторинг',
-	'log_mon' => 'в ПУ',
-
-	'news' => 'Новости',
-	'news_not_selected' => 'Не выбрано ни одного пункта',
-	'news_del_elements' => 'Удалено элементов: ',
-	'news_add' => 'Добавление',
-	'news_edit' => 'Редактирование',
-	'news_add_success' => 'Новость успешно добавлена',
-	'news_edit_success' => 'Новость успешно изменена',
-	'news_add_page_name' => 'Добавление новости',
-	'news_edit_page_name' => 'Редактирование новости',
-	'news_prew_page_name' => 'Предварительный просмотр',
-	'news_edit_btn' => 'Сохранить',
-	'news_add_btn' => 'Добавить',
-	'news_wo_cats' => 'Без категории',
-	'news_e_desc' => 'Не заполнено поле "Полное описание"',
-	'news_e_cat_not_exist' => 'Категория не существует',
-	'news_e_sdesc' => 'Не заполнено поле "Краткое описание"',
-	'news_field_name' => 'Название',
-	'news_field_cat' => 'Категория',
-	'news_field_desc' => 'Полное описание',
-	'news_field_sdesc' => 'Краткое описание',
-	'news_field_vote' => 'Включить голосования',
-	'news_field_com' => 'Включить комметарии',
-	'news_field_attach' => 'Закрепить',
-	'news_preview' => 'Предпросмотр',
-	'news_field_cdate' => 'Дата создания',
-	'news_field_tdate' => 'Время создания',
-	'news_go_home' => 'На главную',
-	'news_field_views' => 'Просмотров',
-	'news_field_action' => 'Действие',
-	'news_field_action2' => 'Действие с новостями',
-	'news_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
-	'news_empty' => 'Нет доступных новостей',
-	'log_add_news' => 'Добавление новости',
-	'log_del_news' => 'Удаление новостей',
-	'log_edit_news' => 'Редактирование новости',
-	'log_news' => 'в ПУ',
-
-	'categories' => 'Категории новостей',
-	'cn_not_selected' => 'Не выбрано ни одного пункта',
-	'cn_del_elements' => 'Удалено элементов: ',
-	'cn_del_elements4' => 'Выбранные элементы успешно удалены',
-	'cn_del_elements5' => 'голосов -',
-	'cn_add' => 'Добавление',
-	'cn_edit' => 'Редактирование',
-	'cn_add_success' => 'Категория успешно добавлена',
-	'cn_edit_success' => 'Категория успешно изменена',
-	'cn_add_page_name' => 'Добавление категории',
-	'cn_edit_page_name' => 'Редактирование категории',
-	'cn_edit_btn' => 'Сохранить',
-	'cn_add_btn' => 'Добавить',
-	'cn_field_name' => 'Название',
-	'cn_field_desc' => 'Описание',
-	'cn_field_action' => 'Действие',
-	'cn_field_action2' => 'Действие с категориями',
-	'cn_accept' => 'Удаление категорий приведет к удалению всех новостей в выбранных категориях. Вы уверены, что хотите удалить выбранные элементы?',
-	'cn_empty' => 'Нет доступных категорий',
-	'log_add_cn' => 'Добавление категории новостей',
-	'log_del_cn' => 'Удаление категорий новостей',
-	'log_edit_cn' => 'Редактирование категории новостей',
-	'log_cn' => 'в ПУ',
-
-	'views' => 'Просмотры',
-	'nv_not_selected' => 'Не выбрано ни одного пункта',
-	'nv_news_deleted' => 'Новость удалена',
-	'nv_del_elements' => 'Удалено элементов: ',
-	'nv_field_news' => 'Новость',
-	'nv_field_user' => 'Пользователь',
-	'nv_field_date' => 'Дата',
-	'nv_field_action' => 'Действие',
-	'nv_field_action2' => 'Действие с просмотрами',
-	'nv_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
-	'nv_empty' => 'Нет доступных просмотров',
-	'log_del_nv' => 'Удаление просмотров',
-	'log_nv' => 'в ПУ',
-
-	'votes' => 'Голоса',
-	'nvt_not_selected' => 'Не выбрано ни одного пункта',
-	'nvt_news_deleted' => 'Новость удалена',
-	'nvt_del_elements' => 'Удалено элементов: ',
-	'nvt_field_news' => 'Новость',
-	'nvt_field_user' => 'Пользователь',
-	'nvt_field_value' => 'Значение',
-	'nvt_field_date' => 'Дата',
-	'nvt_field_action' => 'Действие',
-	'nvt_field_action2' => 'Действие с голосами',
-	'nvt_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
-	'nvt_empty' => 'Нет доступных голосов',
-	'log_del_nvt' => 'Удаление голосов',
-	'log_nvt' => 'в ПУ',
-
-	'permissions' => 'Привилегии',
-	'perm_not_selected' => 'Не выбрано ни одного пункта',
-	'perm_del_elements' => 'Удалено элементов: ',
-	'perm_add' => 'Добавление',
-	'perm_edit' => 'Редактирование',
-	'perm_add_success' => 'Привилегия успешно добавлена',
-	'perm_edit_success' => 'Привилегия успешно изменена',
-	'perm_add_page_name' => 'Добавление привилегии',
-	'perm_edit_page_name' => 'Редактирование привилегии',
-	'perm_edit_btn' => 'Сохранить',
-	'perm_add_btn' => 'Добавить',
-	'perm_change_system' => 'Запрещено менять тип и значение системных привилегий',
-	'perm_def_value' => 'Значение по умолчанию',
-	'perm_boolean' => 'Булевое значение',
-	'perm_integer' => 'Целое число',
-	'perm_float' => 'Число с плавающей точкой',
-	'perm_string' => 'Строка',
-	'perm_system' => 'Системный элемент',
-	'perm_field_name' => 'Название',
-	'perm_field_desc' => 'Описание',
-	'perm_field_value' => 'Значение',
-	'perm_field_type' => 'Тип',
-	'perm_field_default' => 'По умолчанию',
-	'perm_field_action' => 'Действие',
-	'perm_field_action2' => 'Действие с привилегиями',
-	'perm_accept' => 'Удаление привилегий может повлиять на работу некоторых модулей. Вы уверены, что хотите удалить выбранные элементы?',
-	'perm_empty' => 'Нет доступных привилегий',
-	'log_add_perm' => 'Добавление привилегии',
-	'log_del_perm' => 'Удаление привилегий групп',
-	'log_edit_perm' => 'Редактирование привилегии',
-	'log_perm' => 'в ПУ',
-
-	'statics' => 'Статические страницы',
-	'stc_perm_not_exist' => 'ОТСУТСТВУЕТ',
-	'stc_not_selected' => 'Не выбрано ни одного пункта',
-	'stc_del_elements' => 'Удалено элементов: ',
-	'stc_add' => 'Добавление',
-	'stc_edit' => 'Редактирование',
-	'stc_add_success' => 'Статическая страница успешно добавлена',
-	'stc_edit_success' => 'Статическая страница успешно изменена',
-	'stc_add_page_name' => 'Добавление статической страницы',
-	'stc_edit_page_name' => 'Редактирование статической страницы',
-	'stc_edit_btn' => 'Сохранить',
-	'stc_add_btn' => 'Добавить',
-	'stc_e_text_empty' => 'Не заполнено поле "Текст страницы"',
-	'stc_e_text_incorrect' => 'Не верно заполнено поле "Текст страницы"',
-	'stc_field_name' => 'Название',
-	'stc_field_uniq' => 'Идентификатор',
-	'stc_field_access' => 'Уровень доступа',
-	'stc_field_text' => 'Текст страницы',
-	'stc_field_preview' => 'Предпросмотр',
-	'stc_field_perm' => 'Привилегии',
-	'stc_field_action' => 'Действие',
-	'stc_field_action2' => 'Действие со страницами',
-	'stc_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
-	'stc_empty' => 'Нет доступных статических страниц',
-	'stc_preview' => 'Предварительный просмотр',
-	'stc_go_home' => 'На главную',
-	'log_add_stc' => 'Добавление статической страницы',
-	'log_del_stc' => 'Удаление статических страниц',
-	'log_edit_stc' => 'Редактирование статической страницы',
-	'log_stc' => 'в ПУ',
-
-	'users' => 'Пользователи',
-	'user_ban' => 'забанены',
-	'user_unban' => 'разбанены',
-	'user_not_selected' => 'Не выбрано ни одного пункта',
-	'user_del_elements' => 'Удалено элементов: ',
-	'user_add' => 'Добавление',
-	'user_edit' => 'Редактирование',
-	'user_add_success' => 'Пользователь успешно добавлен',
-	'user_edit_success' => 'Пользователь успешно изменен',
-	'user_add_page_name' => 'Добавление пользователя',
-	'user_edit_page_name' => 'Редактирование пользователя',
-	'user_edit_btn' => 'Сохранить',
-	'user_add_btn' => 'Добавить',
-	'user_e_color_format' => 'Неверный формат цвета',
-	'user_success' => 'Выбранные пользователи успешно',
-	'user_not_found' => 'Пользователи не найдены',
-	'user_e_incorrect_fname' => 'Имя может состоять только из букв',
-	'user_e_incorrect_lname' => 'Фамилия может состоять только из букв',
-	'user_e_incorrect_bday' => 'Неверный формат даты рождения',
-	'user_group_not_found' => 'Группа не существует',
-	'user_e_reg_pass_length' => 'Пароль должен быть не менее 6-ти символов',
-	'user_e_skin_name' => 'Не удалось изменить название скина',
-	'user_e_cloak_name' => 'Не удалось изменить название плаща',
-	'user_field_action' => 'Действие',
-	'user_field_action2' => 'Действие с пользователями',
-	'user_accept' => 'Удаление пользователей приведет к удалению всей информации о них. Вы уверены, что хотите удалить выбранные элементы?',
-	'user_accept2' => 'Вы действительно хотите забанить выбранных пользователей на сервере?',
-	'user_accept3' => 'Вы действительно хотите разбанить выбранных пользователей на сервере?',
-	'user_empty' => 'Нет доступных пользователей',
-	'log_add_user' => 'Добавление нового пользователя',
-	'log_del_user' => 'Удаление пользователей',
-	'log_ban_user' => 'Изменение статуса бана пользователей',
-	'log_edit_user' => 'Редактирование пользователя',
-	'log_user' => 'в ПУ',
-
-	'settings' => 'Настройки',
-	'set_theme_incorrect' => 'Шаблон указан некорректно',
-	'set_captcha_incorrect' => 'Капча указана некорректно',
-	'set_e_cfg_save' => 'Не удалось сохранить файл конфигурации',
-	'set_save_success' => 'Настройки успешно сохранены',
-	'set_e_hash' => 'Неверная хэш-сумма полей',
-	'set_main' => 'Основные',
-	'set_pagin' => 'Постраничная навигация',
-	'set_mail' => 'Почта',
-	'set_search' => 'Поиск',
-	'set_func' => 'Функции',
-	'set_base' => 'База',
-	'set_base_host' => 'Адрес сервера',
-	'set_base_host_ph' => 'Адрес сервера баз данных',
-	'set_base_port' => 'Порт',
-	'set_base_port_ph' => 'Порт сервера',
-	'set_base_base' => 'Имя базы',
-	'set_base_base_ph' => 'Имя базы данных',
-	'set_base_user' => 'Пользователь',
-	'set_base_user_ph' => 'Пользователь баз данных',
-	'set_base_pass' => 'Пароль',
-	'set_base_pass_ph' => 'Пароль пользователя баз данных',
-	'set_base_type' => 'Тип',
-	'set_base_type_mysql' => 'MySQL',
-	'set_base_type_mysqli' => 'MySQLi (Рекомендуется)',
-	'set_base_type_pdo' => 'PDO (Не поддерживается)',
-	'set_func_advice' => 'Выводить советы',
-	'set_funt_bc' => 'Выводить хлебные крошки',
-	'set_funt_close' => 'Технические работы',
-	'set_funt_close_time' => 'Время до конца тех. работ',
-	'set_mail_from' => 'От кого',
-	'set_mail_from_ph' => 'От кого было отправлено сообщение',
-	'set_mail_from_name' => 'Имя отправителя',
-	'set_mail_from_name_ph' => 'Имя отправителя',
-	'set_mail_reply' => 'E-Mail ответа',
-	'set_mail_reply_ph' => 'E-Mail отправителя',
-	'set_mail_reply_name' => 'Имя отправителя ответа',
-	'set_mail_reply_name_ph' => 'Имя отправителя ответа',
-	'set_mail_smtp' => 'Настройки SMTP',
-	'set_mail_smtp_use' => 'Использовать SMTP',
-	'set_mail_smtp_host' => 'SMTP сервер',
-	'set_mail_smtp_host_ph' => 'Адрес SMTP сервера',
-	'set_mail_smtp_user' => 'Имя пользователя',
-	'set_mail_smtp_user_ph' => 'Имя пользователя SMTP сервера',
-	'set_mail_smtp_pass' => 'Пароль',
-	'set_mail_smtp_pass_ph' => 'Пароль пользователя SMTP сервера',
-	'set_main_sitename' => 'Название сайта',
-	'set_main_sitedesc' => 'Описание сайта',
-	'set_main_sitekeys' => 'Ключевые слова',
-	'set_main_start' => 'Начальная страница',
-	'set_main_theme' => 'Шаблон',
-	'set_main_log' => 'Лог ошибок',
-	'set_main_debug' => 'Отладка',
-	'set_main_montype' => 'Тип мониторинга',
-	'set_main_reg' => 'Подтверждение регистрации',
-	'set_main_captcha' => 'Капча',
-	'set_main_key_public' => 'Публичный ключ',
-	'set_main_key_private' => 'Приватный ключ',
-	'set_main_sockets' => 'Через сокеты',
-	'set_main_mtapi' => 'Через API MineTools',
-	'set_pagin_user_sect' => 'Пользовательская часть',
-	'set_pagin_arrows' => 'Кол-во стрелок',
-	'set_pagin_arrows_ph' => 'Кол-во стрелок с каждой стороны',
-	'set_pagin_news' => 'Новости',
-	'set_pagin_news_ph' => 'Кол-во новостей на одну страницу',
-	'set_pagin_comments' => 'Комментарии',
-	'set_pagin_comments_ph' => 'Кол-во комментариев на одну страницу',
-	'set_pagin_search_n' => 'Поиск по новостям',
-	'set_pagin_search_n_ph' => 'Кол-во новостей на одну страницу в поиске',
-	'set_pagin_search_c' => 'Поиск по комментариям',
-	'set_pagin_search_c_ph' => 'Кол-во комментариев на одну страницу в поиске',
-	'set_pagin_cp_sect' => 'Панель управления',
-	'set_pagin_cp_news' => 'Новости',
-	'set_pagin_cp_news_ph' => 'Кол-во новостей в ПУ',
-	'set_pagin_cp_coms' => 'Комментарии',
-	'set_pagin_cp_coms_ph' => 'Кол-во комментариев в ПУ',
-	'set_pagin_cp_cats' => 'Категории новостей',
-	'set_pagin_cp_cats_ph' => 'Кол-во категорий новостей в ПУ',
-	'set_pagin_cp_views' => 'Просмотров новости',
-	'set_pagin_cp_views_ph' => 'Кол-во просмотров новостей в ПУ',
-	'set_pagin_cp_votes' => 'Голосов новости',
-	'set_pagin_cp_votes_ph' => 'Кол-во голосов новостей в ПУ',
-	'set_pagin_cp_menu' => 'Пунктов меню',
-	'set_pagin_cp_menu_ph' => 'Кол-во пунктов меню сайта в ПУ',
-	'set_pagin_cp_menu_cp' => 'Пункты меню ПУ',
-	'set_pagin_cp_menu_cp_ph' => 'Кол-во пункты меню ПУ в ПУ',
-	'set_pagin_cp_mgroups' => 'Группы меню',
-	'set_pagin_cp_mgroups_ph' => 'Кол-во групп меню в ПУ',
-	'set_pagin_cp_icons' => 'Иконки меню',
-	'set_pagin_cp_icons_ph' => 'Кол-во иконок меню в ПУ',
-	'set_pagin_cp_users' => 'Пользователи',
-	'set_pagin_cp_users_ph' => 'Кол-во пользователей в ПУ',
-	'set_pagin_cp_mon' => 'Мониторинг',
-	'set_pagin_cp_mon_ph' => 'Кол-во серверов в мониторинге в ПУ',
-	'set_pagin_cp_groups' => 'Группы пользователей',
-	'set_pagin_cp_groups_ph' => 'Кол-во групп пользователей в ПУ',
-	'set_pagin_cp_prems' => 'Привилегии',
-	'set_pagin_cp_prems_ph' => 'Кол-во привилегий в ПУ',
-	'set_pagin_cp_stc' => 'Статические страницы',
-	'set_pagin_cp_stc_ph' => 'Кол-во статических страниц в ПУ',
-	'set_pagin_cp_logs' => 'Логи',
-	'set_pagin_cp_logs_ph' => 'Кол-во логов в ПУ',
-	'set_srch_name' => 'Название',
-	'set_srch_lvl' => 'Уровень доступа',
-	'log_set_main_save' => 'Редактирование основных настроек в ПУ',
-	'log_set_pagin_save' => 'Редактирование настроек постраничной навигации в ПУ',
-	'log_set_mail_save' => 'Редактирование настроек почты в ПУ',
-	'log_set_search_save' => 'Редактирование настроек поиска в ПУ',
-	'log_set_func_save' => 'Редактирование настроек функций в ПУ',
-	'log_set_base_save' => 'Редактирование настроек базы в ПУ',
 );
 
 ?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/blocks.php b/upload/language/ru_RU/admin/blocks.php
new file mode 100644
index 0000000..3175fec
--- /dev/null
+++ b/upload/language/ru_RU/admin/blocks.php
@@ -0,0 +1,39 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'blocks' => 'Блоки',
+	'block_cfg_not_found' => 'Конфигурация блока не найдена',
+	'block_cfg_incorrect' => 'Конфигурация блока задана неверно',
+	'block_cfg_unsave' => 'Конфигурация не сохранена',
+	'block_edit' => 'Редактирование',
+	'block_edit_success' => 'Блок успешно изменен',
+	'block_edit_page_name' => 'Редактирование блока',
+	'block_new_version' => 'Есть новая версия -',
+	'block_download' => 'Скачать',
+	'block_not_check' => '(Не удалось проверить версию)',
+	'block_last_version' => '(У вас установлена последняя версия)',
+	'block_on' => 'Включен',
+	'block_off' => 'Выключен',
+	'block_on1' => 'Включены',
+	'block_off1' => 'Выключены',
+	'block_edit_btn' => 'Сохранить',
+	'block_field_name' => 'Название',
+	'block_field_pos' => 'Позиция',
+	'block_field_status' => 'Статус',
+	'block_field_author' => 'Автор',
+	'block_field_site' => 'Сайт',
+	'block_field_email' => 'E-Mail',
+	'block_field_ver' => 'Версия',
+	'block_field_upd' => 'Обновления',
+	'block_field_url' => 'Источник обновлений',
+	'block_field_action' => 'Действие',
+	'block_field_action2' => 'Действие с блоками',
+	'block_empty' => 'Нет доступных блоков',
+	'log_add_bi' => 'Добавление группы меню панели управления',
+	'log_del_bi' => 'Удаление иконок',
+	'log_edit_block' => 'Редактирование блока',
+	'log_block' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/comments.php b/upload/language/ru_RU/admin/comments.php
new file mode 100644
index 0000000..410f482
--- /dev/null
+++ b/upload/language/ru_RU/admin/comments.php
@@ -0,0 +1,33 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'comments' => 'Комментарии',
+	'com_not_selected' => 'Не выбрано ни одного пункта',
+	'com_del_elements' => 'Удалено элементов: ',
+	'com_without_news' => 'Без новости',
+	'com_add' => 'Добавление',
+	'com_edit' => 'Редактирование',
+	'com_empty' => 'Не заполнено поле "Комментарий"',
+	'com_incorrect' => 'Не верно заполнено поле "Комментарий"',
+	'com_add_success' => 'Комментарий успешно добавлен',
+	'com_add_page_name' => 'Добавление комментария',
+	'com_add_btn' => 'Добавить',
+	'com_edit_success' => 'Комментарий успешно изменен',
+	'com_edit_page_name' => 'Редактирование комментария',
+	'com_edit_btn' => 'Сохранить',
+	'com_not_exist' => 'Нет доступных комментариев',
+	'com_col_comment' => 'Комментарий',
+	'com_col_news' => 'Новость',
+	'com_col_user' => 'Пользователь',
+	'com_action' => 'Действие с комментариями',
+	'com_accept' => 'Вы уверены, что хотите удалить выбранные комментарии',
+	'com_text' => 'Текст комментария',
+	'log_del_com' => 'Удаление комментариев',
+	'log_com' => 'в ПУ',
+	'log_add_com' => 'Добавление комментария',
+	'log_edit_com' => 'Редактирование комментария',
+	'action' => 'Действие',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/groups.php b/upload/language/ru_RU/admin/groups.php
new file mode 100644
index 0000000..1740a97
--- /dev/null
+++ b/upload/language/ru_RU/admin/groups.php
@@ -0,0 +1,31 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'groups' => 'Группы пользователей',
+	'grp_not_selected' => 'Не выбрано ни одного пункта',
+	'grp_del_msg1' => 'Удалено элементов: ',
+	'grp_def_val' => 'Значение по умолчанию',
+	'grp_del_success' => 'Группа пользователей успешно добавлена',
+	'grp_add' => 'Добавление',
+	'grp_add_btn' => 'Добавить',
+	'grp_add_page_name' => 'Добавление группы',
+	'grp_edit' => 'Редактирование',
+	'grp_edit_success' => 'Группа пользователей успешно изменена',
+	'grp_edit_page_name' => 'Редактирование группы',
+	'grp_edit_btn' => 'Сохранить',
+	'grp_e_color_format' => 'Неверный формат цвета',
+	'grp_empty' => 'Нет доступных групп пользователей',
+	'grp_field_name' => 'Название',
+	'grp_field_desc' => 'Описание',
+	'grp_field_act' => 'Действие',
+	'grp_field_perm' => 'Привилегии',
+	'grp_action' => 'Действие с группами',
+	'grp_accept' => 'Удаление групп приведет к удалению всех входящих в них пользователей. Вы уверены, что хотите удалить выбранные элементы?',
+	'log_add_grp' => 'Добавление группы пользователей',
+	'log_del_grp' => 'Удаление групп пользователей',
+	'log_edit_grp' => 'Редактирование группы пользователей',
+	'log_grp' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/info.php b/upload/language/ru_RU/admin/info.php
new file mode 100644
index 0000000..c509e71
--- /dev/null
+++ b/upload/language/ru_RU/admin/info.php
@@ -0,0 +1,29 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'info' => 'Информация',
+	'info_ext' => 'Дополнения',
+	'info_stats' => 'Статистика',
+	'info_and_stats' => 'Информация и статистика',
+	'info_news' => 'Новости',
+	'info_eng_ver' => 'Версия движка',
+	'info_eng_ver_now' => 'Текущая версия',
+	'info_eng_ver_last' => 'Последняя стабильная версия',
+	'info_eng_ver_git' => 'Версия на GitHub',
+	'info_eng_ver_dev' => 'Dev версия',
+	'info_news_stats' => 'Статистика новостей',
+	'info_count_news' => 'Новостей',
+	'info_count_views' => 'Просмотров',
+	'info_count_votes' => 'Голосов',
+	'info_count_cats' => 'Категорий',
+	'info_count_coms' => 'Комментариев',
+	'info_users_stats' => 'Статистика пользователей',
+	'info_count_users' => 'Всего пользователей',
+	'info_count_groups' => 'Всего групп',
+	'info_other' => 'Разное',
+	'info_count_statics' => 'Статических страниц',
+	'info_count_perms' => 'Привилегий',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/logs.php b/upload/language/ru_RU/admin/logs.php
new file mode 100644
index 0000000..eef4f8c
--- /dev/null
+++ b/upload/language/ru_RU/admin/logs.php
@@ -0,0 +1,14 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'logs' => 'Лог действий',
+	'logs_views' => 'Просмотров',
+	'logs_user' => 'Пользователь',
+	'logs_date' => 'Дата',
+	'logs_action' => 'Действие',
+	'logs_empty' => 'Нет доступных логов',
+	'user_deleted' => 'Пользователь удален',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/menu.php b/upload/language/ru_RU/admin/menu.php
new file mode 100644
index 0000000..cf21be9
--- /dev/null
+++ b/upload/language/ru_RU/admin/menu.php
@@ -0,0 +1,36 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'menu' => 'Меню сайта',
+	'menu_top_lvl' => 'Верхний уровень',
+	'menu_not_selected' => 'Не выбрано ни одного пункта',
+	'menu_del_elements' => 'Удалено элементов: ',
+	'menu_add' => 'Добавление',
+	'menu_edit' => 'Редактирование',
+	'menu_edit_btn' => 'Сохранить',
+	'menu_add_btn' => 'Добавить',
+	'menu_perm_not_exist' => 'Привилегия не существует',
+	'menu_add_success' => 'Пункт меню успешно добавлен',
+	'menu_edit_success' => 'Пункт меню успешно изменен',
+	'menu_add_page_name' => 'Добавление меню',
+	'menu_edit_page_name' => 'Редактирование меню',
+	'menu_field_name' => 'Название',
+	'menu_field_link' => 'Ссылка',
+	'menu_field_pos' => 'Позиция',
+	'menu_field_parent' => 'Родитель',
+	'menu_field_action' => 'Действие',
+	'menu_field_action2' => 'Действие с меню',
+	'menu_field_target' => 'Открытие',
+	'menu_target_self' => 'В текущей вкладке',
+	'menu_target_blank' => 'В новой вкладке',
+	'menu_field_access' => 'Уровень доступа',
+	'menu_accept' => 'Удаление пунктов меню приведет к удалению всех входящих в них пунктов. Вы уверены, что хотите удалить выбранные элементы?',
+	'menu_empty' => 'Нет доступных пунктов меню',
+	'log_add_menu' => 'Добавление пунктов меню сайта',
+	'log_del_menu' => 'Удаление пунктов меню сайта',
+	'log_edit_menu' => 'Редактирование пунктов меню сайта',
+	'log_menu' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/menu_adm.php b/upload/language/ru_RU/admin/menu_adm.php
new file mode 100644
index 0000000..37624d5
--- /dev/null
+++ b/upload/language/ru_RU/admin/menu_adm.php
@@ -0,0 +1,38 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'manucp' => 'Меню ПУ',
+	'mcp_not_selected' => 'Не выбрано ни одного пункта',
+	'mcp_del_elements' => 'Удалено элементов: ',
+	'mcp_add' => 'Добавление',
+	'mcp_edit' => 'Редактирование',
+	'mcp_perm_not_exist' => 'Привилегия не существует',
+	'mcp_add_success' => 'Пункт меню успешно добавлен',
+	'mcp_edit_success' => 'Пункт меню успешно изменен',
+	'mcp_add_page_name' => 'Добавление меню',
+	'mcp_edit_page_name' => 'Редактирование меню',
+	'mcp_edit_btn' => 'Сохранить',
+	'mcp_add_btn' => 'Добавить',
+	'mcp_top_lvl' => 'Верхний уровень',
+	'mcp_field_name' => 'Название',
+	'mcp_field_group' => 'Группа',
+	'mcp_field_link' => 'Ссылка',
+	'mcp_field_desc' => 'Описание',
+	'mcp_field_priority' => 'Приоритет',
+	'mcp_field_icon' => 'Иконка',
+	'mcp_field_action' => 'Действие',
+	'mcp_field_action2' => 'Действие с меню',
+	'mcp_field_target' => 'Открытие',
+	'mcp_target_self' => 'В текущей вкладке',
+	'mcp_target_blank' => 'В новой вкладке',
+	'mcp_field_access' => 'Уровень доступа',
+	'mcp_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
+	'mcp_empty' => 'Нет доступных пунктов меню',
+	'log_add_mcp' => 'Добавление пункта меню панели управления',
+	'log_del_mcp' => 'Удаление пунктов меню панели управления',
+	'log_edit_mcp' => 'Редактирование пункта меню в панели управления',
+	'log_mcp' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/menu_groups.php b/upload/language/ru_RU/admin/menu_groups.php
new file mode 100644
index 0000000..5a455e9
--- /dev/null
+++ b/upload/language/ru_RU/admin/menu_groups.php
@@ -0,0 +1,32 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'menugrp' => 'Группы меню ПУ',
+	'mgrp_not_selected' => 'Не выбрано ни одного пункта',
+	'mgrp_del_elements' => 'Удалено элементов: ',
+	'mgrp_add' => 'Добавление',
+	'mgrp_edit' => 'Редактирование',
+	'mgrp_perm_not_exist' => 'Привилегия не существует',
+	'mgrp_add_success' => 'Группа меню успешно добавлена',
+	'mgrp_edit_success' => 'Группа меню успешно изменена',
+	'mgrp_add_page_name' => 'Добавление группы',
+	'mgrp_edit_page_name' => 'Редактирование группы',
+	'mgrp_edit_btn' => 'Сохранить',
+	'mgrp_add_btn' => 'Добавить',
+	'mgrp_field_name' => 'Название',
+	'mgrp_field_desc' => 'Описание',
+	'mgrp_field_priority' => 'Приоритет',
+	'mgrp_field_access' => 'Уровень доступа',
+	'mgrp_field_perm' => 'Привилегии',
+	'mgrp_field_action' => 'Действие',
+	'mgrp_field_action2' => 'Действие с меню',
+	'mgrp_accept' => 'Удаление групп меню приведет к удалению всех входящих в них элементов меню. Вы уверены, что хотите удалить выбранные элементы?',
+	'mgrp_empty' => 'Нет доступных групп меню',
+	'log_add_mgrp' => 'Добавление группы меню панели управления',
+	'log_del_mgrp' => 'Удаление групп меню панели управления',
+	'log_edit_mgrp' => 'Редактирование группы меню панели управления',
+	'log_mgrp' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/menu_icons.php b/upload/language/ru_RU/admin/menu_icons.php
new file mode 100644
index 0000000..8501255
--- /dev/null
+++ b/upload/language/ru_RU/admin/menu_icons.php
@@ -0,0 +1,29 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'menuicons' => 'Иконки',
+	'mi_not_selected' => 'Не выбрано ни одного пункта',
+	'mi_del_elements' => 'Удалено элементов: ',
+	'mi_add' => 'Добавление',
+	'mi_edit' => 'Редактирование',
+	'mi_perm_not_exist' => 'Привилегия не существует',
+	'mi_add_success' => 'Иконка меню успешно добавлена',
+	'mi_edit_success' => 'Иконка меню успешно изменена',
+	'mi_add_page_name' => 'Добавление иконки',
+	'mi_edit_page_name' => 'Редактирование иконки',
+	'mi_edit_btn' => 'Сохранить',
+	'mi_add_btn' => 'Добавить',
+	'mi_field_name' => 'Название',
+	'mi_field_img' => 'Изображение',
+	'mi_field_action' => 'Действие',
+	'mi_field_action2' => 'Действие с иконками',
+	'mi_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
+	'mi_empty' => 'Нет доступных иконок',
+	'log_add_mi' => 'Добавление группы меню панели управления',
+	'log_del_mi' => 'Удаление иконок',
+	'log_edit_mi' => 'Редактирование иконки',
+	'log_mi' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/modules.php b/upload/language/ru_RU/admin/modules.php
new file mode 100644
index 0000000..3217fe9
--- /dev/null
+++ b/upload/language/ru_RU/admin/modules.php
@@ -0,0 +1,38 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'modules' => 'Модули',
+	'mod_cfg_not_found' => 'Конфигурация модуля не найдена',
+	'mod_cfg_incorrect' => 'Конфигурация модуля задана неверно',
+	'mod_cfg_unsave' => 'Конфигурация не сохранена',
+	'mod_edit' => 'Редактирование',
+	'mod_edit_success' => 'Модуль успешно изменен',
+	'mod_edit_page_name' => 'Редактирование модуля',
+	'mod_new_version' => 'Есть новая версия -',
+	'mod_download' => 'Скачать',
+	'mod_not_check' => '(Не удалось проверить версию)',
+	'mod_last_version' => '(У вас установлена последняя версия)',
+	'mod_on' => 'Включен',
+	'mod_off' => 'Выключен',
+	'mod_on1' => 'Включены',
+	'mod_off1' => 'Выключены',
+	'mod_edit_btn' => 'Сохранить',
+	'mod_field_name' => 'Название',
+	'mod_field_status' => 'Статус',
+	'mod_field_author' => 'Автор',
+	'mod_field_site' => 'Сайт',
+	'mod_field_email' => 'E-Mail',
+	'mod_field_ver' => 'Версия',
+	'mod_field_upd' => 'Обновления',
+	'mod_field_url' => 'Источник обновлений',
+	'mod_field_action' => 'Действие',
+	'mod_field_action2' => 'Действие с модулями',
+	'mod_empty' => 'Нет доступных модулей',
+	'log_add_mi' => 'Добавление группы меню панели управления',
+	'log_del_mi' => 'Удаление иконок',
+	'log_edit_mod' => 'Редактирование модуля',
+	'log_mod' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/monitoring.php b/upload/language/ru_RU/admin/monitoring.php
new file mode 100644
index 0000000..148970f
--- /dev/null
+++ b/upload/language/ru_RU/admin/monitoring.php
@@ -0,0 +1,35 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'monitoring' => 'Мониторинг серверов',
+	'mon_not_selected' => 'Не выбрано ни одного пункта',
+	'mon_del_elements' => 'Удалено элементов: ',
+	'mon_add' => 'Добавление',
+	'mon_edit' => 'Редактирование',
+	'mon_perm_not_exist' => 'Привилегия не существует',
+	'mon_add_success' => 'Сервер успешно добавлен',
+	'mon_edit_success' => 'Сервер успешно изменен',
+	'mon_add_page_name' => 'Добавление сервера',
+	'mon_edit_page_name' => 'Редактирование сервера',
+	'mon_edit_btn' => 'Сохранить',
+	'mon_add_btn' => 'Добавить',
+	'mon_field_name' => 'Название',
+	'mon_field_desc' => 'Описание',
+	'mon_field_ip' => 'IP адрес',
+	'mon_field_port' => 'Порт',
+	'mon_field_addr' => 'Адрес',
+	'mon_field_type' => 'Тип',
+	'mon_field_error' => 'Последняя ошибка',
+	'mon_field_cache' => 'Время кэша (сек.)',
+	'mon_field_action' => 'Действие',
+	'mon_field_action2' => 'Действие с серверами',
+	'mon_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
+	'mon_empty' => 'Нет доступных серверов в мониторинге',
+	'log_add_mon' => 'Добавление сервера в мониторинг',
+	'log_del_mon' => 'Удаление серверов из мониторинга',
+	'log_edit_mon' => 'Редактирование сервера в мониторинг',
+	'log_mon' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/news.php b/upload/language/ru_RU/admin/news.php
new file mode 100644
index 0000000..45d9474
--- /dev/null
+++ b/upload/language/ru_RU/admin/news.php
@@ -0,0 +1,43 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'news' => 'Новости',
+	'news_not_selected' => 'Не выбрано ни одного пункта',
+	'news_del_elements' => 'Удалено элементов: ',
+	'news_add' => 'Добавление',
+	'news_edit' => 'Редактирование',
+	'news_add_success' => 'Новость успешно добавлена',
+	'news_edit_success' => 'Новость успешно изменена',
+	'news_add_page_name' => 'Добавление новости',
+	'news_edit_page_name' => 'Редактирование новости',
+	'news_prew_page_name' => 'Предварительный просмотр',
+	'news_edit_btn' => 'Сохранить',
+	'news_add_btn' => 'Добавить',
+	'news_wo_cats' => 'Без категории',
+	'news_e_desc' => 'Не заполнено поле "Полное описание"',
+	'news_e_cat_not_exist' => 'Категория не существует',
+	'news_e_sdesc' => 'Не заполнено поле "Краткое описание"',
+	'news_field_name' => 'Название',
+	'news_field_cat' => 'Категория',
+	'news_field_desc' => 'Полное описание',
+	'news_field_sdesc' => 'Краткое описание',
+	'news_field_vote' => 'Включить голосования',
+	'news_field_com' => 'Включить комметарии',
+	'news_field_attach' => 'Закрепить',
+	'news_preview' => 'Предпросмотр',
+	'news_field_cdate' => 'Дата создания',
+	'news_field_tdate' => 'Время создания',
+	'news_go_home' => 'На главную',
+	'news_field_views' => 'Просмотров',
+	'news_field_action' => 'Действие',
+	'news_field_action2' => 'Действие с новостями',
+	'news_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
+	'news_empty' => 'Нет доступных новостей',
+	'log_add_news' => 'Добавление новости',
+	'log_del_news' => 'Удаление новостей',
+	'log_edit_news' => 'Редактирование новости',
+	'log_news' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/news_cats.php b/upload/language/ru_RU/admin/news_cats.php
new file mode 100644
index 0000000..36a1f40
--- /dev/null
+++ b/upload/language/ru_RU/admin/news_cats.php
@@ -0,0 +1,30 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'categories' => 'Категории новостей',
+	'cn_not_selected' => 'Не выбрано ни одного пункта',
+	'cn_del_elements' => 'Удалено элементов: ',
+	'cn_del_elements4' => 'Выбранные элементы успешно удалены',
+	'cn_del_elements5' => 'голосов -',
+	'cn_add' => 'Добавление',
+	'cn_edit' => 'Редактирование',
+	'cn_add_success' => 'Категория успешно добавлена',
+	'cn_edit_success' => 'Категория успешно изменена',
+	'cn_add_page_name' => 'Добавление категории',
+	'cn_edit_page_name' => 'Редактирование категории',
+	'cn_edit_btn' => 'Сохранить',
+	'cn_add_btn' => 'Добавить',
+	'cn_field_name' => 'Название',
+	'cn_field_desc' => 'Описание',
+	'cn_field_action' => 'Действие',
+	'cn_field_action2' => 'Действие с категориями',
+	'cn_accept' => 'Удаление категорий приведет к удалению всех новостей в выбранных категориях. Вы уверены, что хотите удалить выбранные элементы?',
+	'cn_empty' => 'Нет доступных категорий',
+	'log_add_cn' => 'Добавление категории новостей',
+	'log_del_cn' => 'Удаление категорий новостей',
+	'log_edit_cn' => 'Редактирование категории новостей',
+	'log_cn' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/news_views.php b/upload/language/ru_RU/admin/news_views.php
new file mode 100644
index 0000000..c927ada
--- /dev/null
+++ b/upload/language/ru_RU/admin/news_views.php
@@ -0,0 +1,20 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'views' => 'Просмотры',
+	'nv_not_selected' => 'Не выбрано ни одного пункта',
+	'nv_news_deleted' => 'Новость удалена',
+	'nv_del_elements' => 'Удалено элементов: ',
+	'nv_field_news' => 'Новость',
+	'nv_field_user' => 'Пользователь',
+	'nv_field_date' => 'Дата',
+	'nv_field_action' => 'Действие',
+	'nv_field_action2' => 'Действие с просмотрами',
+	'nv_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
+	'nv_empty' => 'Нет доступных просмотров',
+	'log_del_nv' => 'Удаление просмотров',
+	'log_nv' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/news_votes.php b/upload/language/ru_RU/admin/news_votes.php
new file mode 100644
index 0000000..d201940
--- /dev/null
+++ b/upload/language/ru_RU/admin/news_votes.php
@@ -0,0 +1,21 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'votes' => 'Голоса',
+	'nvt_not_selected' => 'Не выбрано ни одного пункта',
+	'nvt_news_deleted' => 'Новость удалена',
+	'nvt_del_elements' => 'Удалено элементов: ',
+	'nvt_field_news' => 'Новость',
+	'nvt_field_user' => 'Пользователь',
+	'nvt_field_value' => 'Значение',
+	'nvt_field_date' => 'Дата',
+	'nvt_field_action' => 'Действие',
+	'nvt_field_action2' => 'Действие с голосами',
+	'nvt_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
+	'nvt_empty' => 'Нет доступных голосов',
+	'log_del_nvt' => 'Удаление голосов',
+	'log_nvt' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/panel_menu.php b/upload/language/ru_RU/admin/panel_menu.php
new file mode 100644
index 0000000..7222487
--- /dev/null
+++ b/upload/language/ru_RU/admin/panel_menu.php
@@ -0,0 +1,9 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'empty_panel_menu_group' => 'Нет доступного меню',
+	'empty_panel_menu_list' => 'Нет доступных пунктов меню',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/permissions.php b/upload/language/ru_RU/admin/permissions.php
new file mode 100644
index 0000000..559e3e3
--- /dev/null
+++ b/upload/language/ru_RU/admin/permissions.php
@@ -0,0 +1,38 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'permissions' => 'Привилегии',
+	'perm_not_selected' => 'Не выбрано ни одного пункта',
+	'perm_del_elements' => 'Удалено элементов: ',
+	'perm_add' => 'Добавление',
+	'perm_edit' => 'Редактирование',
+	'perm_add_success' => 'Привилегия успешно добавлена',
+	'perm_edit_success' => 'Привилегия успешно изменена',
+	'perm_add_page_name' => 'Добавление привилегии',
+	'perm_edit_page_name' => 'Редактирование привилегии',
+	'perm_edit_btn' => 'Сохранить',
+	'perm_add_btn' => 'Добавить',
+	'perm_change_system' => 'Запрещено менять тип и значение системных привилегий',
+	'perm_def_value' => 'Значение по умолчанию',
+	'perm_boolean' => 'Булевое значение',
+	'perm_integer' => 'Целое число',
+	'perm_float' => 'Число с плавающей точкой',
+	'perm_string' => 'Строка',
+	'perm_system' => 'Системный элемент',
+	'perm_field_name' => 'Название',
+	'perm_field_desc' => 'Описание',
+	'perm_field_value' => 'Значение',
+	'perm_field_type' => 'Тип',
+	'perm_field_default' => 'По умолчанию',
+	'perm_field_action' => 'Действие',
+	'perm_field_action2' => 'Действие с привилегиями',
+	'perm_accept' => 'Удаление привилегий может повлиять на работу некоторых модулей. Вы уверены, что хотите удалить выбранные элементы?',
+	'perm_empty' => 'Нет доступных привилегий',
+	'log_add_perm' => 'Добавление привилегии',
+	'log_del_perm' => 'Удаление привилегий групп',
+	'log_edit_perm' => 'Редактирование привилегии',
+	'log_perm' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/settings.php b/upload/language/ru_RU/admin/settings.php
new file mode 100644
index 0000000..789e325
--- /dev/null
+++ b/upload/language/ru_RU/admin/settings.php
@@ -0,0 +1,117 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'settings' => 'Настройки',
+	'set_theme_incorrect' => 'Шаблон указан некорректно',
+	'set_captcha_incorrect' => 'Капча указана некорректно',
+	'set_e_cfg_save' => 'Не удалось сохранить файл конфигурации',
+	'set_save_success' => 'Настройки успешно сохранены',
+	'set_e_hash' => 'Неверная хэш-сумма полей',
+	'set_main' => 'Основные',
+	'set_pagin' => 'Постраничная навигация',
+	'set_mail' => 'Почта',
+	'set_search' => 'Поиск',
+	'set_func' => 'Функции',
+	'set_base' => 'База',
+	'set_base_host' => 'Адрес сервера',
+	'set_base_host_ph' => 'Адрес сервера баз данных',
+	'set_base_port' => 'Порт',
+	'set_base_port_ph' => 'Порт сервера',
+	'set_base_base' => 'Имя базы',
+	'set_base_base_ph' => 'Имя базы данных',
+	'set_base_user' => 'Пользователь',
+	'set_base_user_ph' => 'Пользователь баз данных',
+	'set_base_pass' => 'Пароль',
+	'set_base_pass_ph' => 'Пароль пользователя баз данных',
+	'set_base_type' => 'Тип',
+	'set_base_type_mysql' => 'MySQL',
+	'set_base_type_mysqli' => 'MySQLi (Рекомендуется)',
+	'set_base_type_pdo' => 'PDO (Не поддерживается)',
+	'set_func_advice' => 'Выводить советы',
+	'set_funt_bc' => 'Выводить хлебные крошки',
+	'set_funt_close' => 'Технические работы',
+	'set_funt_close_time' => 'Время до конца тех. работ',
+	'set_mail_from' => 'От кого',
+	'set_mail_from_ph' => 'От кого было отправлено сообщение',
+	'set_mail_from_name' => 'Имя отправителя',
+	'set_mail_from_name_ph' => 'Имя отправителя',
+	'set_mail_reply' => 'E-Mail ответа',
+	'set_mail_reply_ph' => 'E-Mail отправителя',
+	'set_mail_reply_name' => 'Имя отправителя ответа',
+	'set_mail_reply_name_ph' => 'Имя отправителя ответа',
+	'set_mail_smtp' => 'Настройки SMTP',
+	'set_mail_smtp_use' => 'Использовать SMTP',
+	'set_mail_smtp_host' => 'SMTP сервер',
+	'set_mail_smtp_host_ph' => 'Адрес SMTP сервера',
+	'set_mail_smtp_user' => 'Имя пользователя',
+	'set_mail_smtp_user_ph' => 'Имя пользователя SMTP сервера',
+	'set_mail_smtp_pass' => 'Пароль',
+	'set_mail_smtp_pass_ph' => 'Пароль пользователя SMTP сервера',
+	'set_main_sitename' => 'Название сайта',
+	'set_main_sitedesc' => 'Описание сайта',
+	'set_main_sitekeys' => 'Ключевые слова',
+	'set_main_start' => 'Начальная страница',
+	'set_main_theme' => 'Шаблон',
+	'set_main_log' => 'Лог ошибок',
+	'set_main_debug' => 'Отладка',
+	'set_main_montype' => 'Тип мониторинга',
+	'set_main_reg' => 'Подтверждение регистрации',
+	'set_main_captcha' => 'Капча',
+	'set_main_key_public' => 'Публичный ключ',
+	'set_main_key_private' => 'Приватный ключ',
+	'set_main_sockets' => 'Через сокеты',
+	'set_main_mtapi' => 'Через API MineTools',
+	'set_pagin_user_sect' => 'Пользовательская часть',
+	'set_pagin_arrows' => 'Кол-во стрелок',
+	'set_pagin_arrows_ph' => 'Кол-во стрелок с каждой стороны',
+	'set_pagin_news' => 'Новости',
+	'set_pagin_news_ph' => 'Кол-во новостей на одну страницу',
+	'set_pagin_comments' => 'Комментарии',
+	'set_pagin_comments_ph' => 'Кол-во комментариев на одну страницу',
+	'set_pagin_search_n' => 'Поиск по новостям',
+	'set_pagin_search_n_ph' => 'Кол-во новостей на одну страницу в поиске',
+	'set_pagin_search_c' => 'Поиск по комментариям',
+	'set_pagin_search_c_ph' => 'Кол-во комментариев на одну страницу в поиске',
+	'set_pagin_cp_sect' => 'Панель управления',
+	'set_pagin_cp_news' => 'Новости',
+	'set_pagin_cp_news_ph' => 'Кол-во новостей в ПУ',
+	'set_pagin_cp_coms' => 'Комментарии',
+	'set_pagin_cp_coms_ph' => 'Кол-во комментариев в ПУ',
+	'set_pagin_cp_cats' => 'Категории новостей',
+	'set_pagin_cp_cats_ph' => 'Кол-во категорий новостей в ПУ',
+	'set_pagin_cp_views' => 'Просмотров новости',
+	'set_pagin_cp_views_ph' => 'Кол-во просмотров новостей в ПУ',
+	'set_pagin_cp_votes' => 'Голосов новости',
+	'set_pagin_cp_votes_ph' => 'Кол-во голосов новостей в ПУ',
+	'set_pagin_cp_menu' => 'Пунктов меню',
+	'set_pagin_cp_menu_ph' => 'Кол-во пунктов меню сайта в ПУ',
+	'set_pagin_cp_menu_cp' => 'Пункты меню ПУ',
+	'set_pagin_cp_menu_cp_ph' => 'Кол-во пункты меню ПУ в ПУ',
+	'set_pagin_cp_mgroups' => 'Группы меню',
+	'set_pagin_cp_mgroups_ph' => 'Кол-во групп меню в ПУ',
+	'set_pagin_cp_icons' => 'Иконки меню',
+	'set_pagin_cp_icons_ph' => 'Кол-во иконок меню в ПУ',
+	'set_pagin_cp_users' => 'Пользователи',
+	'set_pagin_cp_users_ph' => 'Кол-во пользователей в ПУ',
+	'set_pagin_cp_mon' => 'Мониторинг',
+	'set_pagin_cp_mon_ph' => 'Кол-во серверов в мониторинге в ПУ',
+	'set_pagin_cp_groups' => 'Группы пользователей',
+	'set_pagin_cp_groups_ph' => 'Кол-во групп пользователей в ПУ',
+	'set_pagin_cp_prems' => 'Привилегии',
+	'set_pagin_cp_prems_ph' => 'Кол-во привилегий в ПУ',
+	'set_pagin_cp_stc' => 'Статические страницы',
+	'set_pagin_cp_stc_ph' => 'Кол-во статических страниц в ПУ',
+	'set_pagin_cp_logs' => 'Логи',
+	'set_pagin_cp_logs_ph' => 'Кол-во логов в ПУ',
+	'set_srch_name' => 'Название',
+	'set_srch_lvl' => 'Уровень доступа',
+	'log_set_main_save' => 'Редактирование основных настроек в ПУ',
+	'log_set_pagin_save' => 'Редактирование настроек постраничной навигации в ПУ',
+	'log_set_mail_save' => 'Редактирование настроек почты в ПУ',
+	'log_set_search_save' => 'Редактирование настроек поиска в ПУ',
+	'log_set_func_save' => 'Редактирование настроек функций в ПУ',
+	'log_set_base_save' => 'Редактирование настроек базы в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/statics.php b/upload/language/ru_RU/admin/statics.php
new file mode 100644
index 0000000..b485624
--- /dev/null
+++ b/upload/language/ru_RU/admin/statics.php
@@ -0,0 +1,37 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'statics' => 'Статические страницы',
+	'stc_perm_not_exist' => 'ОТСУТСТВУЕТ',
+	'stc_not_selected' => 'Не выбрано ни одного пункта',
+	'stc_del_elements' => 'Удалено элементов: ',
+	'stc_add' => 'Добавление',
+	'stc_edit' => 'Редактирование',
+	'stc_add_success' => 'Статическая страница успешно добавлена',
+	'stc_edit_success' => 'Статическая страница успешно изменена',
+	'stc_add_page_name' => 'Добавление статической страницы',
+	'stc_edit_page_name' => 'Редактирование статической страницы',
+	'stc_edit_btn' => 'Сохранить',
+	'stc_add_btn' => 'Добавить',
+	'stc_e_text_empty' => 'Не заполнено поле "Текст страницы"',
+	'stc_e_text_incorrect' => 'Не верно заполнено поле "Текст страницы"',
+	'stc_field_name' => 'Название',
+	'stc_field_uniq' => 'Идентификатор',
+	'stc_field_access' => 'Уровень доступа',
+	'stc_field_text' => 'Текст страницы',
+	'stc_field_preview' => 'Предпросмотр',
+	'stc_field_perm' => 'Привилегии',
+	'stc_field_action' => 'Действие',
+	'stc_field_action2' => 'Действие со страницами',
+	'stc_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
+	'stc_empty' => 'Нет доступных статических страниц',
+	'stc_preview' => 'Предварительный просмотр',
+	'stc_go_home' => 'На главную',
+	'log_add_stc' => 'Добавление статической страницы',
+	'log_del_stc' => 'Удаление статических страниц',
+	'log_edit_stc' => 'Редактирование статической страницы',
+	'log_stc' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/admin/users.php b/upload/language/ru_RU/admin/users.php
new file mode 100644
index 0000000..01fc866
--- /dev/null
+++ b/upload/language/ru_RU/admin/users.php
@@ -0,0 +1,41 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'users' => 'Пользователи',
+	'user_ban' => 'забанены',
+	'user_unban' => 'разбанены',
+	'user_not_selected' => 'Не выбрано ни одного пункта',
+	'user_del_elements' => 'Удалено элементов: ',
+	'user_add' => 'Добавление',
+	'user_edit' => 'Редактирование',
+	'user_add_success' => 'Пользователь успешно добавлен',
+	'user_edit_success' => 'Пользователь успешно изменен',
+	'user_add_page_name' => 'Добавление пользователя',
+	'user_edit_page_name' => 'Редактирование пользователя',
+	'user_edit_btn' => 'Сохранить',
+	'user_add_btn' => 'Добавить',
+	'user_e_color_format' => 'Неверный формат цвета',
+	'user_success' => 'Выбранные пользователи успешно',
+	'user_not_found' => 'Пользователи не найдены',
+	'user_e_incorrect_fname' => 'Имя может состоять только из букв',
+	'user_e_incorrect_lname' => 'Фамилия может состоять только из букв',
+	'user_e_incorrect_bday' => 'Неверный формат даты рождения',
+	'user_group_not_found' => 'Группа не существует',
+	'user_e_reg_pass_length' => 'Пароль должен быть не менее 6-ти символов',
+	'user_e_skin_name' => 'Не удалось изменить название скина',
+	'user_e_cloak_name' => 'Не удалось изменить название плаща',
+	'user_field_action' => 'Действие',
+	'user_field_action2' => 'Действие с пользователями',
+	'user_accept' => 'Удаление пользователей приведет к удалению всей информации о них. Вы уверены, что хотите удалить выбранные элементы?',
+	'user_accept2' => 'Вы действительно хотите забанить выбранных пользователей на сервере?',
+	'user_accept3' => 'Вы действительно хотите разбанить выбранных пользователей на сервере?',
+	'user_empty' => 'Нет доступных пользователей',
+	'log_add_user' => 'Добавление нового пользователя',
+	'log_del_user' => 'Удаление пользователей',
+	'log_ban_user' => 'Изменение статуса бана пользователей',
+	'log_edit_user' => 'Редактирование пользователя',
+	'log_user' => 'в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/ajax.php b/upload/language/ru_RU/ajax.php
index 99b0677..3c2f927 100644
--- a/upload/language/ru_RU/ajax.php
+++ b/upload/language/ru_RU/ajax.php
@@ -8,6 +8,7 @@
 
 	'e_method' => 'Метод не поддерживаетя',
 	'ams_mod_not_selected' => 'Не выбрано ни одного модуля',
+	'ams_block_not_selected' => 'Не выбрано ни одного блока',
 	'ok' => 'OK',
 
 	'fm' => 'Файловый менеджер',
@@ -34,6 +35,7 @@
 	'mon_srv_success' => 'Серверы успешно получены',
 
 	'log_change_ams' => 'Изменение статусов модулей',
+	'log_change_abs' => 'Изменение статусов блоков',
 	'date_create' => 'Дата создания',
 	'time_create' => 'Время создания',
 );
diff --git a/upload/language/ru_RU/blocks/online.php b/upload/language/ru_RU/blocks/online.php
new file mode 100644
index 0000000..e4cde24
--- /dev/null
+++ b/upload/language/ru_RU/blocks/online.php
@@ -0,0 +1,13 @@
+<?php
+
+$lng = array(
+	'block_name' => 'Онлайн',
+	'empty' => 'Нет зарегистрированных пользователей',
+	'loading' => 'Загрузка статистики...',
+	'online_now' => 'Сейчас на сайте',
+	'count_all' => 'Всего',
+	'users' => 'Из них пользователей',
+	'guests' => 'гостей',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/blocks/profile.php b/upload/language/ru_RU/blocks/profile.php
index 6c80d20..5f62c1f 100644
--- a/upload/language/ru_RU/blocks/profile.php
+++ b/upload/language/ru_RU/blocks/profile.php
@@ -3,6 +3,7 @@
 $lng = array(
 	'miniprofile' => 'Мини-профиль',
 	'login' => 'Логин',
+	'login_or_email' => 'Логин или E-Mail',
 	'password' => 'Пароль',
 	'group' => 'Группа',
 	'balance' => 'Баланс',
diff --git a/upload/language/ru_RU/install.php b/upload/language/ru_RU/install.php
index 0d287f3..c98e2a3 100644
--- a/upload/language/ru_RU/install.php
+++ b/upload/language/ru_RU/install.php
@@ -82,8 +82,8 @@
 	'e_perm_uploads' => 'Отсутствуют права на чтение или запись папки uploads',
 	'e_perm_cloaks' => 'Отсутствуют права на чтение или запись папки uploads/cloaks/',
 	'e_perm_icons' => 'Отсутствуют права на чтение или запись папки uploads/panel-icons/',
-	'e_perm_skins' => 'Отсутствуют права на чтение или запись папки uploads/skins/',
-	'e_perm_intf' => 'Отсутствуют права на чтение или запись папки uploads/skins/interface/',
+	'e_perm_skins' => 'Отсутствуют права на чтение или запись папки скинов',
+	'e_perm_intf' => 'Отсутствуют права на чтение или запись папки скинов-интерфейсов',
 	'e_perm_smiles' => 'Отсутствуют права на чтение или запись папки uploads/smiles/',
 	'e_settings' => 'Настройки не могут быть сохранены',
 	'e_set_base' => 'Неверно указаны данные для подключения к базе',
diff --git a/upload/language/ru_RU/js/modules/blocks.js b/upload/language/ru_RU/js/modules/blocks.js
new file mode 100644
index 0000000..8ad80f1
--- /dev/null
+++ b/upload/language/ru_RU/js/modules/blocks.js
@@ -0,0 +1,4 @@
+var lng_block = {
+	e_change_status: 'Произошла непредвиденная ошибка изменения статуса блока. Попробуйте повторить попытку.',
+	not_selected: 'Не выбрано ни одного блока'
+};
\ No newline at end of file
diff --git a/upload/language/ru_RU/system.php b/upload/language/ru_RU/system.php
index 2534e80..68f30c1 100644
--- a/upload/language/ru_RU/system.php
+++ b/upload/language/ru_RU/system.php
@@ -27,6 +27,7 @@
 	"e_advice_found" => "Советов нет",
 
 	"target_blank" => "Ссылка откроется в новой вкладке",
+	"loading" => "Загрузка...",
 
 	// debug
 	'deb_name' => 'Отладка',
@@ -44,8 +45,8 @@
 	'deb_sec' => 'сек.',
 
 	// engine/skin.class.php
-	"skin_e_folder_perm" => "Отсутствуют права на запись папки uploads/skins",
-	"skin_e_intf_perm" => "Отсутствуют права на запись папки uploads/interface",
+	"skin_e_folder_perm" => "Отсутствуют права на запись папки скинов",
+	"skin_e_intf_perm" => "Отсутствуют права на запись папки скинов-интерфейсов",
 	"skin_e_size" => "Привышен максимально допустимый размер файла",
 	"skin_e" => "Ошибка загрузки скина!",
 	"skin_e_undefined" => "Неизвестная ошибка",
@@ -57,8 +58,8 @@
 	"skin_e_save" => "Ошибка сохранения скина",
 
 	// engine/cloak.class.php
-	"cloak_e_folder_perm" => "Отсутствуют права на запись папки uploads/cloaks",
-	"cloak_e_intf_perm" => "Отсутствуют права на запись папки uploads/interface",
+	"cloak_e_folder_perm" => "Отсутствуют права на запись папки плащей",
+	"cloak_e_intf_perm" => "Отсутствуют права на запись папки плащей-интерфейсов",
 	"cloak_e_size" => "Привышен максимально допустимый размер файла",
 	"cloak_e" => "Ошибка загрузки скина!",
 	"cloak_e_undefined" => "Неизвестная ошибка",
diff --git a/upload/modules/admin.php b/upload/modules/admin.php
index ea4063c..dce4fbf 100644
--- a/upload/modules/admin.php
+++ b/upload/modules/admin.php
@@ -3,18 +3,17 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $user, $lng;
-	public $cfg = array();
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin"
+			$this->lng['mod_name'] => ADMIN_URL
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -39,6 +38,8 @@
 		if(!class_exists('submodule')){
 			$this->core->notify($this->core->lng['404'], $this->core->lng['e_404']);
 		}
+
+		$this->core->lng_m = $this->core->load_language('admin/'.$do);
 		
 		$submodule = new submodule($this->core);
 
diff --git a/upload/modules/admin/blocks.class.php b/upload/modules/admin/blocks.class.php
new file mode 100644
index 0000000..1526721
--- /dev/null
+++ b/upload/modules/admin/blocks.class.php
@@ -0,0 +1,169 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $cfg, $user, $lng;
+
+	public function __construct($core){
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
+
+		if(!$this->core->is_access('sys_adm_blocks')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
+
+		$bc = array(
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['blocks'] => ADMIN_URL."&do=blocks"
+		);
+
+		$this->core->bc = $this->core->gen_bc($bc);
+
+		$this->core->header .= '<script src="'.LANG_URL.'js/modules/blocks.js"></script>';
+		$this->core->header .= '<script src="'.STYLE_URL.'js/modules/admin/blocks.js"></script>';
+	}
+
+	private function block_array(){
+
+		$list = $this->filter_folder(scandir(MCR_CONF_PATH.'blocks'));
+
+		if(!is_array($list) || count($list)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/blocks/block-none.html"); }
+
+		ob_start();
+
+		foreach($list as $id => $name){
+
+			include(MCR_CONF_PATH.'blocks/'.$name.'.php');
+
+			$page_data = array(
+				"STATUS"	=> (@$cfg['ENABLE']) ? 'icon_status_on' : 'icon_status_off',
+				"NAME"		=> $this->db->HSC($name),
+				"TITLE"		=> $this->db->HSC(@$cfg['TITLE']),
+				"AUTHOR"	=> $this->db->HSC(@$cfg['AUTHOR']),
+				"VERSION"	=> $this->db->HSC(@$cfg['VERSION']),
+			);
+		
+			echo $this->core->sp(MCR_THEME_MOD."admin/blocks/block-id.html", $page_data);
+		}
+
+		return ob_get_clean();
+	}
+
+	private function filter_folder($array){
+
+		$filtered = array();
+
+		foreach($array as $key => $value){
+			if($value=='..' || $value=='.'){ continue; }
+			if(is_dir(MCR_SIDE_PATH.$value)){ continue; }
+			if(!file_exists(MCR_CONF_PATH.'blocks/'.$value)){ continue; }
+
+			$expl = explode('.', $value);
+
+			if(count($expl)!=2 || !isset($expl[1]) || $expl[1]!='php'){ continue; }
+
+			$filtered[] = $expl[0];
+		}
+
+		return $filtered;
+	}
+
+	private function block_list(){
+
+		$data = array(
+			"BLOCKS" => $this->block_array()
+		);
+
+		return $this->core->sp(MCR_THEME_MOD."admin/blocks/block-list.html", $data);
+	}
+
+	private function check_update($cfg){
+		if(empty($cfg['UPDATER'])){ return $this->lng['block_not_check']; }
+
+		$json = file_get_contents($cfg['UPDATER']);
+
+		if(!$json){ return $this->lng['block_not_check']; }
+
+		if(!isset($json['version'])){ return $this->lng['block_not_check']; }
+		if(!isset($json['url'])){ return $this->lng['block_not_check']; }
+
+		if($cfg['VERSION']==$json['version']){ return $this->lng['block_last_version']; }
+
+		return '(<a href="'.$this->db->HSC($json['url']).'" target="_blank" title="'.$this->lng['block_download'].'">'.$this->lng['block_new_version'].' '.$this->db->HSC($json['version']).'</a>)';
+	}
+
+	private function edit(){
+		if(!$this->core->is_access('sys_adm_blocks_edit')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=blocks'); }
+
+		$name = @$_GET['id'];
+
+		if(!file_exists(MCR_CONF_PATH.'blocks/'.$name.'.php')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['block_cfg_not_found'], 2, '?mode=admin&do=blocks'); }
+
+		require(MCR_CONF_PATH.'blocks/'.$name.'.php');
+
+		if(!$this->core->check_cfg_block($cfg)){
+			$this->core->notify($this->core->lng["e_msg"], $this->lng['block_cfg_incorrect'], 2, '?mode=admin&do=blocks');
+		}
+
+		$bc = array(
+			$this->lng['mod_name'] => ADMIN_URL."",
+			$this->lng['blocks'] => ADMIN_URL."&do=blocks",
+			$this->lng['block_edit'] => ADMIN_URL."&do=blocks&op=edit&id=$name"
+		);
+
+		$this->core->bc = $this->core->gen_bc($bc);
+
+		if($_SERVER['REQUEST_METHOD']=='POST'){
+			$cfg['ENABLE'] = (intval(@$_POST['status'])==1) ? true : false;
+			$cfg['UPDATES'] = (intval(@$_POST['updates'])==1) ? true : false;
+			$cfg['UPDATER'] = $this->core->safestr(@$_POST['updater']);
+			$cfg['POSITION'] = intval(@$_POST['position']);
+
+			if(!$this->cfg->savecfg($cfg, 'blocks/'.$name.'.php', 'cfg')){
+				$this->core->notify($this->core->lng["e_msg"], $this->lng['block_cfg_unsave'], 3, '?mode=admin&do=blocks');
+			}
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_edit_block']." #$name ".$this->lng['log_mod'], $this->user->id);
+			
+			$this->core->notify($this->core->lng["e_success"], $this->lng['block_edit_success'], 3, '?mode=admin&do=blocks');
+		}
+
+		$update_result = $this->check_update($cfg);
+
+		$data = array(
+			"PAGE"			=> $this->lng['block_edit_page_name'],
+			"STATUS"		=> ($cfg['ENABLE']) ? 'selected' : '',
+			"TITLE"			=> $this->db->HSC($cfg['TITLE']),
+			"POSITION"		=> intval($cfg['POSITION']),
+			"DESC"			=> $this->db->HSC($cfg['DESC']),
+			"AUTHOR"		=> $this->db->HSC($cfg['AUTHOR']),
+			"SITE"			=> $this->db->HSC($cfg['SITE']),
+			"EMAIL"			=> $this->db->HSC($cfg['EMAIL']),
+			"VERSION"		=> $this->db->HSC($cfg['VERSION']),
+			"UPDATE_URL"	=> $this->db->HSC($cfg['UPDATER']),
+			"UPDATE_CHECK"	=> ($cfg['UPDATES']) ? 'selected' : '',
+			"UPDATE_RESULT"	=> $update_result,
+			"BUTTON"		=> $this->lng['block_edit_btn']
+		);
+
+		return $this->core->sp(MCR_THEME_MOD."admin/blocks/block-add.html", $data);
+	}
+
+	public function content(){
+
+		$op = (isset($_GET['op'])) ? $_GET['op'] : 'list';
+
+		switch($op){
+			case 'edit':	$content = $this->edit(); break;
+
+			default:		$content = $this->block_list(); break;
+		}
+
+		return $content;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/admin/comments.class.php b/upload/modules/admin/comments.class.php
index 0c03a7c..0e1e739 100644
--- a/upload/modules/admin/comments.class.php
+++ b/upload/modules/admin/comments.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_comments')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['comments'] => BASE_URL."?mode=admin&do=comments"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['comments'] => ADMIN_URL."&do=comments"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,13 +24,18 @@
 
 	private function comment_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_comments'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_comments']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['adm_comments'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_comments']; // Set end pagination
 
 		$where		= "";
 		$sort		= "`c`.id";
 		$sortby		= "DESC";
 
+		$ctables	= $this->cfg->db['tables'];
+
+		$ug_f		= $ctables['ugroups']['fields'];
+		$us_f		= $ctables['users']['fields'];
+
 		if(isset($_GET['sort']) && !empty($_GET['sort'])){
 			$expl = explode(' ', $_GET['sort']);
 
@@ -39,7 +44,7 @@
 			switch(@$expl[1]){
 				case 'comment': $sort = "`c`.text_html"; break;
 				case 'news': $sort = "`n`.title"; break;
-				case 'user': $sort = "`u`.login"; break;
+				case 'user': $sort = "`u`.`{$us_f['login']}`"; break;
 			}
 		}
 
@@ -49,14 +54,14 @@
 		}
 
 		$query = $this->db->query("SELECT `c`.id, `c`.nid, `c`.text_html, `n`.title AS `new`,
-											`u`.login, `u`.`color`, `g`.`color` AS `gcolor`
+											`u`.`{$us_f['login']}`, `u`.`{$us_f['color']}`, `g`.`{$ug_f['color']}` AS `gcolor`
 									FROM `mcr_comments` AS `c`
 									LEFT JOIN `mcr_news` AS `n`
 										ON `n`.id=`c`.nid
-									LEFT JOIN `mcr_users` AS `u`
-										ON `u`.id=`c`.uid
-									LEFT JOIN `mcr_groups` AS `g`
-										ON `g`.id=`u`.gid
+									LEFT JOIN `{$this->cfg->tabname('users')}` AS `u`
+										ON `u`.`{$us_f['id']}`=`c`.uid
+									LEFT JOIN `{$this->cfg->tabname('ugroups')}` AS `g`
+										ON `g`.`{$ug_f['id']}`=`u`.`{$us_f['group']}`
 									$where
 									ORDER BY $sort $sortby
 									LIMIT $start, $end");
@@ -73,9 +78,9 @@
 
 			$new = (empty($ar['new'])) ? 'Новость удалена' : $this->db->HSC($ar['new']);
 
-			$login = (is_null($ar['login'])) ? 'Пользователь удален' : $this->db->HSC($ar['login']);
+			$login = (is_null($ar[$us_f['login']])) ? 'Пользователь удален' : $this->db->HSC($ar[$us_f['login']]);
 
-			$color = (empty($ar['color'])) ? $this->db->HSC($ar['gcolor']) : $this->db->HSC($ar['color']);
+			$color = (empty($ar[$us_f['color']])) ? $this->db->HSC($ar['gcolor']) : $this->db->HSC($ar[$us_f['color']]);
 
 			$page_data = array(
 				"ID" => intval($ar['id']),
@@ -114,7 +119,7 @@
 		$ar = $this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_comments'], $page.'&pid=', $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_comments'], $page.'&pid=', $ar[0]),
 			"COMMENTS" => $this->comment_array()
 		);
 
@@ -186,9 +191,9 @@
 		if(!$this->core->is_access('sys_adm_comments_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=comments'); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['comments'] => BASE_URL."?mode=admin&do=comments",
-			$this->lng['com_add'] => BASE_URL."?mode=admin&do=comments&op=add",
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['comments'] => ADMIN_URL."&do=comments",
+			$this->lng['com_add'] => ADMIN_URL."&do=comments&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -272,9 +277,9 @@
 		$data = json_decode($ar['data']);
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['comments'] => BASE_URL."?mode=admin&do=comments",
-			$this->lng['com_edit'] => BASE_URL."?mode=admin&do=comments&op=edit&id=$id"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['comments'] => ADMIN_URL."&do=comments",
+			$this->lng['com_edit'] => ADMIN_URL."&do=comments&op=edit&id=$id"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
diff --git a/upload/modules/admin/groups.class.php b/upload/modules/admin/groups.class.php
index f2814a9..1aa2b28 100644
--- a/upload/modules/admin/groups.class.php
+++ b/upload/modules/admin/groups.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->user		= $core->user;
 		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_groups')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['groups'] => BASE_URL."?mode=admin&do=groups"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['groups'] => ADMIN_URL."&do=groups"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,8 +24,12 @@
 
 	private function group_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_groups'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_groups']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['adm_groups'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_groups']; // Set end pagination
+
+		$ctables	= $this->cfg->db['tables'];
+
+		$ug_f	= $ctables['ugroups']['fields'];
 
 		$where		= "";
 		$sort		= "id";
@@ -33,7 +37,7 @@
 
 		if(isset($_GET['search']) && !empty($_GET['search'])){
 			$search = $this->db->safesql(urldecode($_GET['search']));
-			$where = "WHERE title LIKE '%$search%'";
+			$where = "WHERE `{$ug_f['title']}` LIKE '%$search%'";
 		}
 
 		if(isset($_GET['sort']) && !empty($_GET['sort'])){
@@ -42,13 +46,13 @@
 			$sortby = ($expl[0]=='asc') ? "ASC" : "DESC";
 
 			switch(@$expl[1]){
-				case 'title': $sort = "title"; break;
-				case 'desc': $sort = "description"; break;
+				case 'title': $sort = "`{$ug_f['title']}`"; break;
+				case 'desc': $sort = "`{$ug_f['text']}`"; break;
 			}
 		}
 
-		$query = $this->db->query("SELECT id, title, `color`, description
-									FROM `mcr_groups`
+		$query = $this->db->query("SELECT `{$ug_f['id']}`, `{$ug_f['title']}`, `{$ug_f['color']}`, `{$ug_f['text']}`
+									FROM `{$this->cfg->tabname('ugroups')}`
 									$where
 									ORDER BY $sort $sortby
 									LIMIT $start, $end");
@@ -59,12 +63,12 @@
 
 		while($ar = $this->db->fetch_assoc($query)){
 
-			$color = $this->db->HSC($ar['color']);
+			$color = $this->db->HSC($ar[$ug_f['color']]);
 
 			$page_data = array(
-				"ID" => intval($ar['id']),
-				"TITLE" => $this->core->colorize($this->db->HSC($ar['title']), $color),
-				"TEXT" => $this->db->HSC($ar['description']),
+				"ID" => intval($ar[$ug_f['id']]),
+				"TITLE" => $this->core->colorize($this->db->HSC($ar[$ug_f['title']]), $color),
+				"TEXT" => $this->db->HSC($ar[$ug_f['text']]),
 			);
 		
 			echo $this->core->sp(MCR_THEME_MOD."admin/groups/group-id.html", $page_data);
@@ -75,12 +79,15 @@
 
 	private function group_list(){
 
-		$sql = "SELECT COUNT(*) FROM `mcr_groups`";
+		$ctables	= $this->cfg->db['tables'];
+		$ug_f		= $ctables['ugroups']['fields'];
+
+		$sql = "SELECT COUNT(*) FROM `{$this->cfg->tabname('ugroups')}`";
 		$page = "?mode=admin&do=groups";
 
 		if(isset($_GET['search']) && !empty($_GET['search'])){
 			$search = $this->db->safesql(urldecode($_GET['search']));
-			$sql = "SELECT COUNT(*) FROM `mcr_groups` WHERE title LIKE '%$search%'";
+			$sql = "SELECT COUNT(*) FROM `{$this->cfg->tabname('ugroups')}` WHERE `{$ug_f['title']}` LIKE '%$search%'";
 			$search = $this->db->HSC(urldecode($_GET['search']));
 			$page = "?mode=admin&do=groups&search=$search";
 		}
@@ -96,7 +103,7 @@
 		$ar = $this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_groups'], $page.'&pid=', $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_groups'], $page.'&pid=', $ar[0]),
 			"GROUPS" => $this->group_array()
 		);
 
@@ -118,7 +125,10 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
-		if(!$this->db->remove_fast("mcr_groups", "id IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=groups'); }
+		$ctables	= $this->cfg->db['tables'];
+		$ug_f		= $ctables['ugroups']['fields'];
+
+		if(!$this->db->remove_fast($this->cfg->tabname('ugroups'), "`{$ug_f['id']}` IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=groups'); }
 
 		$count = $this->db->affected_rows();
 
@@ -171,7 +181,9 @@
 			$data["TITLE"] = $this->db->HSC($ar['title']);
 			$data["VALUE"] = $this->db->HSC($ar['value']);
 
-			$data['DEFAULT'] = @$this->get_default_value($ar['value'], $json[$ar['value']], $ar['type']);
+			$value = (!isset($json[$ar['value']])) ? $ar['default'] : $json[$ar['value']];
+
+			$data['DEFAULT'] = @$this->get_default_value($ar['value'], $value, $ar['type']);
 
 			echo $this->core->sp(MCR_THEME_MOD."admin/groups/perm-id.html", $data);
 		}
@@ -197,13 +209,16 @@
 		if(!$this->core->is_access('sys_adm_groups_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=groups'); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['groups'] => BASE_URL."?mode=admin&do=groups",
-			$this->lng['grp_add'] => BASE_URL."?mode=admin&do=groups&op=add",
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['groups'] => ADMIN_URL."&do=groups",
+			$this->lng['grp_add'] => ADMIN_URL."&do=groups&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
 
+		$ctables	= $this->cfg->db['tables'];
+		$ug_f		= $ctables['ugroups']['fields'];
+
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 			$title			= $this->db->safesql(@$_POST['title']);
 			$text			= $this->db->safesql(@$_POST['text']);
@@ -218,8 +233,8 @@
 
 			$new_permissions = $this->db->safesql($this->gen_permissions($perm_data));
 
-			$insert = $this->db->query("INSERT INTO `mcr_groups`
-											(title, description, `color`, `permissions`)
+			$insert = $this->db->query("INSERT INTO `{$this->cfg->tabname('ugroups')}`
+											(`{$ug_f['title']}`, `{$ug_f['text']}`, `{$ug_f['color']}`, `{$ug_f['perm']}`)
 										VALUES
 											('$title', '$text', '$color', '$new_permissions')");
 
@@ -253,18 +268,21 @@
 
 		$id = intval($_GET['id']);
 
-		$query = $this->db->query("SELECT title, `description`, `color`, `permissions`
-									FROM `mcr_groups`
-									WHERE id='$id'");
+		$ctables	= $this->cfg->db['tables'];
+		$ug_f		= $ctables['ugroups']['fields'];
+
+		$query = $this->db->query("SELECT `{$ug_f['title']}`, `{$ug_f['text']}`, `{$ug_f['color']}`, `{$ug_f['perm']}`
+									FROM `{$this->cfg->tabname('ugroups')}`
+									WHERE `{$ug_f['id']}`='$id'");
 
 		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=groups'); }
 
 		$ar = $this->db->fetch_assoc($query);
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['groups'] => BASE_URL."?mode=admin&do=groups",
-			$this->lng['grp_edit'] => BASE_URL."?mode=admin&do=groups&op=edit&id=$id",
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['groups'] => ADMIN_URL."&do=groups",
+			$this->lng['grp_edit'] => ADMIN_URL."&do=groups&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -283,9 +301,9 @@
 
 			$new_permissions = $this->db->safesql($this->gen_permissions($perm_data));
 
-			$update = $this->db->query("UPDATE `mcr_groups`
-										SET title='$title', `color`='$color', description='$text', `permissions`='$new_permissions'
-										WHERE id='$id'");
+			$update = $this->db->query("UPDATE `{$this->cfg->tabname('ugroups')}`
+										SET `{$ug_f['title']}`='$title', `{$ug_f['color']}`='$color', `{$ug_f['text']}`='$text', `{$ug_f['perm']}`='$new_permissions'
+										WHERE `{$ug_f['id']}`='$id'");
 
 			if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=groups&op=edit&id='.$id); }
 
@@ -300,10 +318,10 @@
 
 		$data = array(
 			"PAGE"			=> $this->lng['grp_edit_page_name'],
-			"TITLE"			=> $this->db->HSC($ar['title']),
-			"COLOR"			=> $this->db->HSC($ar['color']),
-			"TEXT"			=> $this->db->HSC($ar['description']),
-			"PERMISSIONS"	=> $this->perm_list($ar['permissions']),
+			"TITLE"			=> $this->db->HSC($ar[$ug_f['title']]),
+			"COLOR"			=> $this->db->HSC($ar[$ug_f['color']]),
+			"TEXT"			=> $this->db->HSC($ar[$ug_f['text']]),
+			"PERMISSIONS"	=> $this->perm_list($ar[$ug_f['perm']]),
 			"BUTTON"		=> $this->lng['grp_edit_btn']
 		);
 
diff --git a/upload/modules/admin/info.class.php b/upload/modules/admin/info.class.php
index 9efe293..6b2e771 100644
--- a/upload/modules/admin/info.class.php
+++ b/upload/modules/admin/info.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_info')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['info'] => BASE_URL."?mode=admin&do=statics"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['info'] => ADMIN_URL."&do=statics"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -31,18 +31,23 @@
 	}
 
 	private function users_stats(){
-		$query = $this->db->query("SELECT `g`.id, `g`.title, COUNT(`u`.`id`) AS `count`
-									FROM `mcr_groups` AS `g`
-									LEFT JOIN `mcr_users` AS `u`
-										ON `u`.`gid`=`g`.`id`
-									GROUP BY `g`.`id`");
+		$ctables	= $this->cfg->db['tables'];
+
+		$ug_f		= $ctables['ugroups']['fields'];
+		$us_f		= $ctables['users']['fields'];
+
+		$query = $this->db->query("SELECT `g`.`{$ug_f['id']}`, `g`.`{$ug_f['title']}`, COUNT(`u`.`{$us_f['id']}`) AS `count`
+									FROM `{$this->cfg->tabname('ugroups')}` AS `g`
+									LEFT JOIN `{$this->cfg->tabname('users')}` AS `u`
+										ON `u`.`{$us_f['group']}`=`g`.`{$ug_f['id']}`
+									GROUP BY `g`.`{$ug_f['id']}`");
 		if(!$query || $this->db->num_rows($query)<=0){ return; }
 
 		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
-			switch(intval($ar['id'])){
+			switch(intval($ar[$ug_f['id']])){
 				case 0: $class='error'; break;
 				case 1: $class='warning'; break;
 				case 2: $class='success'; break;
@@ -53,7 +58,7 @@
 
 			$data = array(
 				"CLASS" => $class,
-				"TITLE" => $this->db->HSC($ar['title']),
+				"TITLE" => $this->db->HSC($ar[$ug_f['title']]),
 				"COUNT" => intval($ar['count'])
 			);
 
@@ -70,11 +75,11 @@
 										(SELECT COUNT(*) FROM `mcr_news_cats`) AS `categories`,
 										(SELECT COUNT(*) FROM `mcr_comments`) AS `comments`,
 										(SELECT COUNT(*) FROM `mcr_statics`) AS `statics`,
-										(SELECT COUNT(*) FROM `mcr_groups`) AS `groups`,
+										(SELECT COUNT(*) FROM `{$this->cfg->tabname('ugroups')}`) AS `groups`,
 										(SELECT COUNT(*) FROM `mcr_news_views`) AS `views`,
 										(SELECT COUNT(*) FROM `mcr_news_votes`) AS `votes`,
 										(SELECT COUNT(*) FROM `mcr_permissions`) AS `permissions`
-									FROM `mcr_users`");
+									FROM `{$this->cfg->tabname('users')}`");
 
 		if(!$query || $this->db->num_rows($query)<=0){ return; }
 
diff --git a/upload/modules/admin/logs.class.php b/upload/modules/admin/logs.class.php
index d24d505..1e1d494 100644
--- a/upload/modules/admin/logs.class.php
+++ b/upload/modules/admin/logs.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_logs')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['logs'] => BASE_URL."?mode=admin&do=logs"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['logs'] => ADMIN_URL."&do=logs"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,16 +24,22 @@
 
 	private function logs_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_logs'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_logs']; // Set end pagination
+		$ctables	= $this->cfg->db['tables'];
+
+		$ug_f		= $ctables['ugroups']['fields'];
+		$logs_f		= $ctables['logs']['fields'];
+		$us_f		= $ctables['users']['fields'];
+
+		$start		= $this->core->pagination($this->cfg->pagin['adm_logs'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_logs']; // Set end pagination
 
 		$where		= "";
-		$sort		= "`l`.id";
+		$sort		= "`l`.`{$logs_f['id']}`";
 		$sortby		= "DESC";
 
 		if(isset($_GET['search']) && !empty($_GET['search'])){
 			$search = $this->db->safesql(urldecode($_GET['search']));
-			$where = "WHERE `l`.`message` LIKE '%$search%'";
+			$where = "WHERE `l`.`{$logs_f['msg']}` LIKE '%$search%'";
 		}
 
 		if(isset($_GET['sort']) && !empty($_GET['sort'])){
@@ -42,18 +48,19 @@
 			$sortby = ($expl[0]=='asc') ? "ASC" : "DESC";
 
 			switch(@$expl[1]){
-				case 'user': $sort = "`u`.login"; break;
-				case 'msg': $sort = "`l`.`message`"; break;
-				case 'date': $sort = "`l`.`date`"; break;
+				case 'user': $sort = "`u`.`{$logs_f['login']}`"; break;
+				case 'msg': $sort = "`l`.`{$logs_f['msg']}`"; break;
+				case 'date': $sort = "`l`.`{$logs_f['date']}`"; break;
 			}
 		}
 
-		$query = $this->db->query("SELECT `l`.id, `l`.uid, `l`.`message`, `l`.`date`, `u`.login, `u`.`color`, `g`.`color` AS `gcolor`
-									FROM `mcr_logs` AS `l`
-									LEFT JOIN `mcr_users` AS `u`
-										ON `u`.id=`l`.uid
-									LEFT JOIN `mcr_groups` AS `g`
-										ON `g`.id=`u`.gid
+		$query = $this->db->query("SELECT `l`.`{$logs_f['id']}`, `l`.`{$logs_f['uid']}`, `l`.`{$logs_f['msg']}`, `l`.`{$logs_f['date']}`,
+										`u`.`{$us_f['login']}`, `u`.`{$us_f['color']}`, `g`.`{$ug_f['color']}` AS `gcolor`
+									FROM `{$this->cfg->tabname('logs')}` AS `l`
+									LEFT JOIN `{$this->cfg->tabname('users')}` AS `u`
+										ON `u`.`{$us_f['id']}`=`l`.`{$logs_f['uid']}`
+									LEFT JOIN `{$this->cfg->tabname('ugroups')}` AS `g`
+										ON `g`.`{$ug_f['id']}`=`u`.`{$us_f['group']}`
 									$where
 									ORDER BY $sort $sortby
 									LIMIT $start, $end");
@@ -64,15 +71,15 @@
 
 		while($ar = $this->db->fetch_assoc($query)){
 
-			$color = (empty($ar['color'])) ? $this->db->HSC($ar['gcolor']) : $this->db->HSC($ar['color']);
+			$color = (empty($ar[$us_f['color']])) ? $this->db->HSC($ar['gcolor']) : $this->db->HSC($ar[$us_f['color']]);
 
-			$login = (!is_null($ar['login'])) ? $this->db->HSC($ar['login']) : 'Пользователь удален';
+			$login = (!is_null($ar[$us_f['login']])) ? $this->db->HSC($ar['login']) : $this->lng['mod_name'];
 
 			$page_data = array(
-				"ID" => intval($ar['id']),
-				"UID" => intval($ar['uid']),
-				"MESSAGE" => $this->db->HSC($ar['message']),
-				"DATE" => date("d.m.Y в H:i:s", $ar['date']),
+				"ID" => intval($ar[$logs_f['id']]),
+				"UID" => intval($ar[$logs_f['uid']]),
+				"MESSAGE" => $this->db->HSC($ar[$logs_f['msg']]),
+				"DATE" => date("d.m.Y в H:i:s", $ar[$logs_f['date']]),
 				"LOGIN" => $this->core->colorize($login, $color),
 			);
 		
@@ -84,12 +91,15 @@
 
 	private function logs_list(){
 
-		$sql = "SELECT COUNT(*) FROM `mcr_logs`";
+		$ctables	= $this->cfg->db['tables'];
+		$logs_f		= $ctables['logs']['fields'];
+
+		$sql = "SELECT COUNT(*) FROM `{$this->cfg->tabname('logs')}`";
 		$page = "?mode=admin&do=logs";
 
 		if(isset($_GET['search']) && !empty($_GET['search'])){
 			$search = $this->db->safesql(urldecode($_GET['search']));
-			$sql = "SELECT COUNT(*) FROM `mcr_logs` WHERE `message` LIKE '%$search%'";
+			$sql = "SELECT COUNT(*) FROM `{$this->cfg->tabname('logs')}` WHERE `{$logs_f['msg']}` LIKE '%$search%'";
 			$search = $this->db->HSC(urldecode($_GET['search']));
 			$page = "?mode=admin&do=logs&search=$search";
 		}
@@ -103,7 +113,7 @@
 		$ar = @$this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_logs'], $page.'&pid=', $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_logs'], $page.'&pid=', $ar[0]),
 			"LOGS" => $this->logs_array()
 		);
 
diff --git a/upload/modules/admin/menu.class.php b/upload/modules/admin/menu.class.php
index 5df80b4..75af907 100644
--- a/upload/modules/admin/menu.class.php
+++ b/upload/modules/admin/menu.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_menu')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['menu'] => BASE_URL."?mode=admin&do=menu"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['menu'] => ADMIN_URL."&do=menu"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,8 +24,8 @@
 
 	private function menu_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_menu'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_menu']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['adm_menu'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_menu']; // Set end pagination
 
 		$where		= "";
 		$sort		= "`m`.id";
@@ -101,7 +101,7 @@
 		$ar = $this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_menu'], $page.'&pid=', $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_menu'], $page.'&pid=', $ar[0]),
 			"MENU" => $this->menu_array()
 		);
 
@@ -141,9 +141,9 @@
 		if(!$this->core->is_access('sys_adm_menu_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu'); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['menu'] => BASE_URL."?mode=admin&do=menu",
-			$this->lng['menu_add'] => BASE_URL."?mode=admin&do=menu&op=add",
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['menu'] => ADMIN_URL."&do=menu",
+			$this->lng['menu_add'] => ADMIN_URL."&do=menu&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -202,9 +202,9 @@
 		$ar = $this->db->fetch_assoc($query);
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['menu'] => BASE_URL."?mode=admin&do=menu",
-			$this->lng['menu_edit'] => BASE_URL."?mode=admin&do=menu&op=edit&id=$id",
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['menu'] => ADMIN_URL."&do=menu",
+			$this->lng['menu_edit'] => ADMIN_URL."&do=menu&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
diff --git a/upload/modules/admin/menu_adm.class.php b/upload/modules/admin/menu_adm.class.php
index 2c883d5..5d0abe3 100644
--- a/upload/modules/admin/menu_adm.class.php
+++ b/upload/modules/admin/menu_adm.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_menu_adm')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['manucp'] => BASE_URL."?mode=admin&do=menu_adm"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['manucp'] => ADMIN_URL."&do=menu_adm"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,8 +24,8 @@
 
 	private function menu_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_menu_adm'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_menu_adm']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['adm_menu_adm'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_menu_adm']; // Set end pagination
 
 		$where		= "";
 		$sort		= "`m`.`id`";
@@ -97,7 +97,7 @@
 		$ar = @$this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_menu_adm'], $page.'&pid=', $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_menu_adm'], $page.'&pid=', $ar[0]),
 			"MENU" => $this->menu_array()
 		);
 
@@ -201,9 +201,9 @@
 		if(!$this->core->is_access('sys_adm_menu_adm_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu_adm'); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['manucp'] => BASE_URL."?mode=admin&do=menu_adm",
-			$this->lng['mcp_add'] => BASE_URL."?mode=admin&do=menu_adm&op=add",
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['manucp'] => ADMIN_URL."&do=menu_adm",
+			$this->lng['mcp_add'] => ADMIN_URL."&do=menu_adm&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -272,9 +272,9 @@
 		$ar = $this->db->fetch_assoc($query);
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['manucp'] => BASE_URL."?mode=admin&do=menu_adm",
-			$this->lng['mcp_edit'] => BASE_URL."?mode=admin&do=menu_adm&op=edit&id=$id",
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['manucp'] => ADMIN_URL."&do=menu_adm",
+			$this->lng['mcp_edit'] => ADMIN_URL."&do=menu_adm&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
diff --git a/upload/modules/admin/menu_groups.class.php b/upload/modules/admin/menu_groups.class.php
index b6adaa0..d68fe0a 100644
--- a/upload/modules/admin/menu_groups.class.php
+++ b/upload/modules/admin/menu_groups.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_menu_groups')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['menugrp'] => BASE_URL."?mode=admin&do=menu_groups"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['menugrp'] => ADMIN_URL."&do=menu_groups"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,8 +24,8 @@
 
 	private function group_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_menu_groups'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_menu_groups']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['adm_menu_groups'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_menu_groups']; // Set end pagination
 
 		$where		= "";
 		$sort		= "`g`.`id`";
@@ -98,7 +98,7 @@
 		$ar = $this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_menu_groups'], $page.'&pid=', $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_menu_groups'], $page.'&pid=', $ar[0]),
 			"GROUPS" => $this->group_array()
 		);
 
@@ -138,9 +138,9 @@
 		if(!$this->core->is_access('sys_adm_menu_groups_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu_groups'); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['menugrp'] => BASE_URL."?mode=admin&do=menu_groups",
-			$this->lng['mgrp_add'] => BASE_URL."?mode=admin&do=menu_groups&op=add",
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['menugrp'] => ADMIN_URL."&do=menu_groups",
+			$this->lng['mgrp_add'] => ADMIN_URL."&do=menu_groups&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -197,9 +197,9 @@
 		$ar = $this->db->fetch_assoc($query);
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['menugrp'] => BASE_URL."?mode=admin&do=menu_groups",
-			$this->lng['mgrp_edit'] => BASE_URL."?mode=admin&do=menu_groups&op=edit&id=$id",
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['menugrp'] => ADMIN_URL."&do=menu_groups",
+			$this->lng['mgrp_edit'] => ADMIN_URL."&do=menu_groups&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
diff --git a/upload/modules/admin/menu_icons.class.php b/upload/modules/admin/menu_icons.class.php
index 70f141e..4f82e1e 100644
--- a/upload/modules/admin/menu_icons.class.php
+++ b/upload/modules/admin/menu_icons.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_menu_icons')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['menuicons'] => BASE_URL."?mode=admin&do=menu_icons"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['menuicons'] => ADMIN_URL."&do=menu_icons"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,8 +24,8 @@
 
 	private function icon_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_menu_icons'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_menu_icons']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['adm_menu_icons'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_menu_icons']; // Set end pagination
 
 		$where		= "";
 		$sort		= "id";
@@ -93,7 +93,7 @@
 		$ar = $this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_menu_icons'], $page.'&pid=', $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_menu_icons'], $page.'&pid=', $ar[0]),
 			"ICONS" => $this->icon_array()
 		);
 
@@ -133,9 +133,9 @@
 		if(!$this->core->is_access('sys_adm_menu_icons_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu_icons'); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['menuicons'] => BASE_URL."?mode=admin&do=menu_icons",
-			$this->lng['mi_add'] => BASE_URL."?mode=admin&do=menu_icons&op=add",
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['menuicons'] => ADMIN_URL."&do=menu_icons",
+			$this->lng['mi_add'] => ADMIN_URL."&do=menu_icons&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -187,9 +187,9 @@
 		$ar = $this->db->fetch_assoc($query);
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['menuicons'] => BASE_URL."?mode=admin&do=menu_icons",
-			$this->lng['mi_edit'] => BASE_URL."?mode=admin&do=menu_icons&op=edit&id=$id",
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['menuicons'] => ADMIN_URL."&do=menu_icons",
+			$this->lng['mi_edit'] => ADMIN_URL."&do=menu_icons&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
diff --git a/upload/modules/admin/modules.class.php b/upload/modules/admin/modules.class.php
index 54f23de..95dfe02 100644
--- a/upload/modules/admin/modules.class.php
+++ b/upload/modules/admin/modules.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_modules')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['modules'] => BASE_URL."?mode=admin&do=modules"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['modules'] => ADMIN_URL."&do=modules"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -108,9 +108,9 @@
 		}
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['modules'] => BASE_URL."?mode=admin&do=modules",
-			$this->lng['mod_edit'] => BASE_URL."?mode=admin&do=modules&op=edit&id=$name"
+			$this->lng['mod_name'] => ADMIN_URL."",
+			$this->lng['modules'] => ADMIN_URL."&do=modules",
+			$this->lng['mod_edit'] => ADMIN_URL."&do=modules&op=edit&id=$name"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -120,7 +120,7 @@
 			$cfg['MOD_CHECK_UPDATE'] = (intval(@$_POST['updates'])==1) ? true : false;
 			$cfg['MOD_URL_UPDATE'] = $this->core->safestr(@$_POST['update_url']);
 
-			if(!$this->config->savecfg($cfg, 'modules/'.$name.'.php', 'cfg')){
+			if(!$this->cfg->savecfg($cfg, 'modules/'.$name.'.php', 'cfg')){
 				$this->core->notify($this->core->lng["e_msg"], $this->lng['mod_cfg_unsave'], 3, '?mode=admin&do=modules');
 			}
 
diff --git a/upload/modules/admin/monitoring.class.php b/upload/modules/admin/monitoring.class.php
index 2c967dd..6de5610 100644
--- a/upload/modules/admin/monitoring.class.php
+++ b/upload/modules/admin/monitoring.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_monitoring')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['monitoring'] => BASE_URL."?mode=admin&do=monitoring"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['monitoring'] => ADMIN_URL."&do=monitoring"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,8 +24,8 @@
 
 	private function monitor_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_monitoring'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_monitoring']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['adm_monitoring'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_monitoring']; // Set end pagination
 
 		$where		= "";
 		$sort		= "id";
@@ -95,7 +95,7 @@
 		$ar = $this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_monitoring'], $page.'&pid=', $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_monitoring'], $page.'&pid=', $ar[0]),
 			"SERVERS" => $this->monitor_array()
 		);
 
@@ -135,9 +135,9 @@
 		if(!$this->core->is_access('sys_adm_monitoring_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=monitoring'); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['monitoring'] => BASE_URL."?mode=admin&do=monitoring",
-			$this->lng['mon_add'] => BASE_URL."?mode=admin&do=monitoring&op=add",
+			$this->lng['mod_name'] => ADMIN_URL."",
+			$this->lng['monitoring'] => ADMIN_URL."&do=monitoring",
+			$this->lng['mon_add'] => ADMIN_URL."&do=monitoring&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -173,10 +173,10 @@
 			"PAGE"		=> $this->lng['mon_add_page_name'],
 			"TITLE"		=> "",
 			"TEXT"		=> "",
-			"IP"		=> "localhost",
+			"IP"		=> "127.0.0.1",
 			"PORT"		=> "25565",
 			"TYPES"		=> $this->types(),
-			"CACHE"		=> intval($ar['updater']),
+			"CACHE"		=> 60,
 			"ERROR"		=> "",
 			"BUTTON"	=> $this->lng['mon_add_btn']
 		);
@@ -198,9 +198,9 @@
 		$ar = $this->db->fetch_assoc($query);
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['monitoring'] => BASE_URL."?mode=admin&do=monitoring",
-			$this->lng['mon_edit'] => BASE_URL."?mode=admin&do=monitoring&op=edit&id=$id",
+			$this->lng['mod_name'] => ADMIN_URL."",
+			$this->lng['monitoring'] => ADMIN_URL."&do=monitoring",
+			$this->lng['mon_edit'] => ADMIN_URL."&do=monitoring&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
diff --git a/upload/modules/admin/news.class.php b/upload/modules/admin/news.class.php
index d15bb85..ffc6cec 100644
--- a/upload/modules/admin/news.class.php
+++ b/upload/modules/admin/news.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
 		$this->core = $core;
 		$this->db	= $core->db;
-		$this->config = $core->config;
+		$this->cfg	= $core->cfg;
 		$this->user	= $core->user;
 		$this->lng	= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_news')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['news'] => BASE_URL."?mode=admin&do=news"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['news'] => ADMIN_URL."&do=news"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,8 +24,8 @@
 
 	private function news_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_news'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_news']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['adm_news'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_news']; // Set end pagination
 
 		$where		= "";
 		$sort		= "`n`.id";
@@ -97,7 +97,7 @@
 		$ar = @$this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_news'], $page.'&pid=', $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_news'], $page.'&pid=', $ar[0]),
 			"NEWS" => $this->news_array()
 		);
 
@@ -179,9 +179,9 @@
 		if(!$this->core->is_access('sys_adm_news_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=news'); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['news'] => BASE_URL."?mode=admin&do=news",
-			$this->lng['news_add'] => BASE_URL."?mode=admin&do=news&op=add",
+			$this->lng['mod_name'] => ADMIN_URL."",
+			$this->lng['news'] => ADMIN_URL."&do=news",
+			$this->lng['news_add'] => ADMIN_URL."&do=news&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -316,9 +316,9 @@
 		$data = json_decode($ar['data']);
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['news'] => BASE_URL."?mode=admin&do=news",
-			$this->lng['news_edit'] => BASE_URL."?mode=admin&do=news&op=edit&id=$id"
+			$this->lng['mod_name'] => ADMIN_URL."",
+			$this->lng['news'] => ADMIN_URL."&do=news",
+			$this->lng['news_edit'] => ADMIN_URL."&do=news&op=edit&id=$id"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
diff --git a/upload/modules/admin/news_cats.class.php b/upload/modules/admin/news_cats.class.php
index 257a005..aae3a59 100644
--- a/upload/modules/admin/news_cats.class.php
+++ b/upload/modules/admin/news_cats.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_news_cats')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']);; }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['categories'] => BASE_URL."?mode=admin&do=news_cats"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['categories'] => ADMIN_URL."&do=news_cats"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,8 +24,8 @@
 
 	private function cats_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_news_cats'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_news_cats']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['adm_news_cats'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_news_cats']; // Set end pagination
 
 		$where		= "";
 		$sort		= "id";
@@ -93,7 +93,7 @@
 		$ar = $this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_news_cats'], $page.'&pid=', $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_news_cats'], $page.'&pid=', $ar[0]),
 			"CATEGORIES" => $this->cats_array()
 		);
 
@@ -133,9 +133,9 @@
 		if(!$this->core->is_access('sys_adm_news_cats_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=news_cats'); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['categories'] => BASE_URL."?mode=admin&do=news_cats",
-			$this->lng['cn_add'] => BASE_URL."?mode=admin&do=news_cats&op=add",
+			$this->lng['mod_name'] => ADMIN_URL."",
+			$this->lng['categories'] => ADMIN_URL."&do=news_cats",
+			$this->lng['cn_add'] => ADMIN_URL."&do=news_cats&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -193,9 +193,9 @@
 		$ar = $this->db->fetch_assoc($query);
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['categories'] => BASE_URL."?mode=admin&do=news_cats",
-			$this->lng['cn_edit'] => BASE_URL."?mode=admin&do=news_cats&op=edit&id=$id",
+			$this->lng['mod_name'] => ADMIN_URL."",
+			$this->lng['categories'] => ADMIN_URL."&do=news_cats",
+			$this->lng['cn_edit'] => ADMIN_URL."&do=news_cats&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
diff --git a/upload/modules/admin/news_views.class.php b/upload/modules/admin/news_views.class.php
index 950203b..338f287 100644
--- a/upload/modules/admin/news_views.class.php
+++ b/upload/modules/admin/news_views.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_news_views')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['views'] => BASE_URL."?mode=admin&do=news_views"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['views'] => ADMIN_URL."&do=news_views"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,8 +24,13 @@
 
 	private function views_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_news_views'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_news_views']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['adm_news_views'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_news_views']; // Set end pagination
+
+		$ctables	= $this->cfg->db['tables'];
+
+		$ug_f		= $ctables['ugroups']['fields'];
+		$us_f		= $ctables['users']['fields'];
 
 		$sort		= "`v`.id";
 		$sortby		= "DESC";
@@ -37,20 +42,20 @@
 
 			switch(@$expl[1]){
 				case 'news': $sort = "`n`.title"; break;
-				case 'user': $sort = "`u`.login"; break;
+				case 'user': $sort = "`u`.`{$us_f['login']}`"; break;
 				case 'date': $sort = "`v`.`time`"; break;
 			}
 		}
 
 		$query = $this->db->query("SELECT `v`.id, `v`.nid, `v`.uid, `v`.`time`, `n`.title,
-										`u`.login, `u`.`color`, `g`.`color` AS `gcolor`
+										`u`.`{$us_f['login']}`, `u`.`{$us_f['color']}`, `g`.`{$ug_f['color']}` AS `gcolor`
 									FROM `mcr_news_views` AS `v`
 									LEFT JOIN `mcr_news` AS `n`
 										ON `n`.id=`v`.nid
-									LEFT JOIN `mcr_users` AS `u`
-										ON `u`.id=`v`.uid
-									LEFT JOIN `mcr_groups` AS `g`
-										ON `g`.id=`u`.gid
+									LEFT JOIN `{$this->cfg->tabname('users')}` AS `u`
+										ON `u`.`{$us_f['id']}`=`v`.uid
+									LEFT JOIN `{$this->cfg->tabname('ugroups')}` AS `g`
+										ON `g`.`{$ug_f['id']}`=`u`.`{$us_f['group']}`
 									ORDER BY $sort $sortby
 									LIMIT $start, $end");
 
@@ -68,9 +73,9 @@
 				$new = $this->db->HSC($ar['title']);
 			}
 
-			$login = (is_null($ar['login'])) ? 'Пользователь удален' : $this->db->HSC($ar['login']);
+			$login = (is_null($ar[$us_f['login']])) ? 'Пользователь удален' : $this->db->HSC($ar[$us_f['login']]);
 
-			$color = (empty($ar['color'])) ? $this->db->HSC($ar['gcolor']) : $this->db->HSC($ar['color']);
+			$color = (empty($ar[$us_f['color']])) ? $this->db->HSC($ar['gcolor']) : $this->db->HSC($ar[$us_f['color']]);
 
 			$page_data = array(
 				"ID" => intval($ar['id']),
@@ -101,7 +106,7 @@
 		$ar = @$this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_news_views'], $page."&pid=", $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_news_views'], $page."&pid=", $ar[0]),
 			"VIEWS" => $this->views_array()
 		);
 
diff --git a/upload/modules/admin/news_votes.class.php b/upload/modules/admin/news_votes.class.php
index 52f21dc..a610b9a 100644
--- a/upload/modules/admin/news_votes.class.php
+++ b/upload/modules/admin/news_votes.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_news_votes')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['votes'] => BASE_URL."?mode=admin&do=news_votes"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['votes'] => ADMIN_URL."&do=news_votes"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,8 +24,13 @@
 
 	private function votes_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_news_votes'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_news_votes']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['adm_news_votes'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_news_votes']; // Set end pagination
+
+		$ctables	= $this->cfg->db['tables'];
+
+		$ug_f		= $ctables['ugroups']['fields'];
+		$us_f		= $ctables['users']['fields'];
 
 		$sort		= "`v`.id";
 		$sortby		= "DESC";
@@ -38,20 +43,20 @@
 			switch(@$expl[1]){
 				case 'news': $sort = "`n`.title"; break;
 				case 'value': $sort = "`v`.`value`"; break;
-				case 'user': $sort = "`u`.login"; break;
+				case 'user': $sort = "`u`.`{$us_f['login']}`"; break;
 				case 'date': $sort = "`v`.`time`"; break;
 			}
 		}
 
 		$query = $this->db->query("SELECT `v`.id, `v`.nid, `v`.uid, `v`.`value`, `v`.`time`, `n`.title,
-										`u`.login, `u`.`color`, `g`.`color` AS `gcolor`
+										`u`.`{$us_f['login']}`, `u`.`{$us_f['color']}`, `g`.`{$ug_f['color']}` AS `gcolor`
 									FROM `mcr_news_votes` AS `v`
 									LEFT JOIN `mcr_news` AS `n`
 										ON `n`.id=`v`.nid
-									LEFT JOIN `mcr_users` AS `u`
-										ON `u`.id=`v`.uid
-									LEFT JOIN `mcr_groups` AS `g`
-										ON `g`.id=`u`.gid
+									LEFT JOIN `{$this->cfg->tabname('users')}` AS `u`
+										ON `u`.`{$us_f['id']}`=`v`.uid
+									LEFT JOIN `{$this->cfg->tabname('ugroups')}` AS `g`
+										ON `g`.`{$ug_f['id']}`=`u`.`{$us_f['group']}`
 									ORDER BY $sort $sortby
 									LIMIT $start, $end");
 
@@ -71,9 +76,9 @@
 
 			$value = (intval($ar['value'])===1) ? 'icon-thumbs-up' : 'icon-thumbs-down';
 
-			$login = (is_null($ar['login'])) ? 'Пользователь удален' : $this->db->HSC($ar['login']);
+			$login = (is_null($ar[$us_f['login']])) ? 'Пользователь удален' : $this->db->HSC($ar[$us_f['login']]);
 
-			$color = (empty($ar['color'])) ? $this->db->HSC($ar['gcolor']) : $this->db->HSC($ar['color']);
+			$color = (empty($ar[$us_f['color']])) ? $this->db->HSC($ar['gcolor']) : $this->db->HSC($ar[$us_f['color']]);
 
 			$page_data = array(
 				"ID" => intval($ar['id']),
@@ -105,7 +110,7 @@
 		$ar = @$this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_news_votes'], $page."&pid=", $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_news_votes'], $page."&pid=", $ar[0]),
 			"VOTES" => $this->votes_array()
 		);
 
diff --git a/upload/modules/admin/panel_menu.class.php b/upload/modules/admin/panel_menu.class.php
index bc06971..3f3d901 100644
--- a/upload/modules/admin/panel_menu.class.php
+++ b/upload/modules/admin/panel_menu.class.php
@@ -3,17 +3,17 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin"
+			$this->lng['mod_name'] => ADMIN_URL
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
diff --git a/upload/modules/admin/permissions.class.php b/upload/modules/admin/permissions.class.php
index 5032860..76bc0d9 100644
--- a/upload/modules/admin/permissions.class.php
+++ b/upload/modules/admin/permissions.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_permissions')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['permissions'] => BASE_URL."?mode=admin&do=permissions"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['permissions'] => ADMIN_URL."&do=permissions"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,8 +24,8 @@
 
 	private function permissions_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_groups'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_groups']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['adm_groups'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_groups']; // Set end pagination
 
 		$where		= "";
 		$sort		= "id";
@@ -53,8 +53,6 @@
 									ORDER BY $sort $sortby
 									LIMIT $start, $end");
 
-		
-
 		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/permissions/perm-none.html"); }
 
 		ob_start();
@@ -101,7 +99,7 @@
 		$ar = $this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_groups'], $page.'&pid=', $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_groups'], $page.'&pid=', $ar[0]),
 			"PERMISSIONS" => $this->permissions_array()
 		);
 
@@ -168,9 +166,13 @@
 
 	private function update_groups(){
 
+		$ctables	= $this->cfg->db['tables'];
+
+		$ug_f		= $ctables['ugroups']['fields'];
+
 		$def_perm = $this->get_permissions();
 
-		$query = $this->db->query("SELECT id, `permissions` FROM `mcr_groups`");
+		$query = $this->db->query("SELECT `{$ug_f['id']}`, `{$ug_f['perm']}` FROM `{$this->cfg->tabname('ugroups')}`");
 
 		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"]); }
 
@@ -180,9 +182,9 @@
 
 		while($ar = $this->db->fetch_assoc($query)){
 
-			$group_perm = @json_decode($ar['permissions'], true);
+			$group_perm = @json_decode($ar[$ug_f['perm']], true);
 
-			$id = intval($ar['id']);
+			$id = intval($ar[$ug_f['id']]);
 
 			$new_perm = array();
 
@@ -192,9 +194,9 @@
 
 			$new_perm = $this->db->safesql(json_encode($new_perm));
 
-			$update = $this->db->obj->query("UPDATE `mcr_groups`
-										SET `permissions`='$new_perm'
-										WHERE id='$id'");
+			$update = $this->db->obj->query("UPDATE `{$this->cfg->tabname('ugroups')}`
+										SET `{$ug_f['perm']}`='$new_perm'
+										WHERE `{$ug_f['id']}`='$id'");
 			if(!$update){ $return = false; }
 		}
 
@@ -229,9 +231,9 @@
 		if(!$this->core->is_access('sys_adm_permissions_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=permissions'); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['permissions'] => BASE_URL."?mode=admin&do=permissions",
-			$this->lng['perm_add'] => BASE_URL."?mode=admin&do=permissions&op=add",
+			$this->lng['mod_name'] => ADMIN_URL."",
+			$this->lng['permissions'] => ADMIN_URL."&do=permissions",
+			$this->lng['perm_add'] => ADMIN_URL."&do=permissions&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -301,9 +303,9 @@
 		$ar = $this->db->fetch_assoc($query);
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['permissions'] => BASE_URL."?mode=admin&do=permissions",
-			$this->lng['perm_edit'] => BASE_URL."?mode=admin&do=permissions&op=edit&id=$id",
+			$this->lng['mod_name'] => ADMIN_URL."",
+			$this->lng['permissions'] => ADMIN_URL."&do=permissions",
+			$this->lng['perm_edit'] => ADMIN_URL."&do=permissions&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
diff --git a/upload/modules/admin/settings.class.php b/upload/modules/admin/settings.class.php
index 8a4f334..6c34455 100644
--- a/upload/modules/admin/settings.class.php
+++ b/upload/modules/admin/settings.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_settings')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['settings'] => BASE_URL."?mode=admin&do=settings"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['settings'] => ADMIN_URL."&do=settings"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -105,7 +105,7 @@
 
 	private function main(){
 
-		$cfg = $this->config->main;
+		$cfg = $this->cfg->main;
 
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 			$cfg['s_name']		= $this->core->safestr(@$_POST['s_name']);
@@ -139,7 +139,7 @@
 
 			$cfg['kc_private']	= $this->core->safestr(@$_POST['kc_private']);
 
-			if(!$this->config->savecfg($cfg)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings'); }
+			if(!$this->cfg->savecfg($cfg)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings'); }
 
 			// Последнее обновление пользователя
 			$this->db->update_user($this->user);
@@ -165,7 +165,7 @@
 	private function to_int_keys($array=array()){
 		if(empty($array)){ return false; }
 
-		$cfg = $this->config->pagin;
+		$cfg = $this->cfg->pagin;
 
 		foreach($array as $key => $value){
 			$cfg[$key] = (intval($value)<=0) ? 1 : intval($value);
@@ -176,7 +176,7 @@
 
 	private function pagin(){
 
-		$cfg = $this->config->pagin;
+		$cfg = $this->cfg->pagin;
 
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 			$post = $_POST;
@@ -194,7 +194,7 @@
 
 			$cfg = $this->to_int_keys($post);
 
-			if(!$this->config->savecfg($cfg, 'pagin.php', 'pagin')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings&op=pagin'); }
+			if(!$this->cfg->savecfg($cfg, 'pagin.php', 'pagin')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings&op=pagin'); }
 
 			// Последнее обновление пользователя
 			$this->db->update_user($this->user);
@@ -214,7 +214,7 @@
 
 	private function _mail(){
 
-		$cfg = $this->config->mail;
+		$cfg = $this->cfg->mail;
 
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 
@@ -234,7 +234,7 @@
 
 			$cfg['smtp_pass']		= $this->core->safestr(@$_POST['smtp_pass']);
 
-			if(!$this->config->savecfg($cfg, 'mail.php', 'mail')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings&op=mail'); }
+			if(!$this->cfg->savecfg($cfg, 'mail.php', 'mail')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings&op=mail'); }
 
 			// Последнее обновление пользователя
 			$this->db->update_user($this->user);
@@ -273,7 +273,7 @@
 
 	private function search(){
 
-		$cfg = $this->config->search;
+		$cfg = $this->cfg->search;
 
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 
@@ -288,7 +288,7 @@
 				"permissions" => $this->core->safestr(@$_POST['permissions']),
 			);
 
-			if(!$this->config->savecfg($cfg, 'search.php', 'search')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings&op=search'); }
+			if(!$this->cfg->savecfg($cfg, 'search.php', 'search')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings&op=search'); }
 
 			// Последнее обновление пользователя
 			$this->db->update_user($this->user);
@@ -310,7 +310,7 @@
 
 		$this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/settings/header.html");
 
-		$cfg = $this->config->func;
+		$cfg = $this->cfg->func;
 
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 
@@ -322,7 +322,7 @@
 
 			$cfg['close_time'] = (@$_POST['close_time']=='') ? 0 : intval(strtotime(@$_POST['close_time']));
 
-			if(!$this->config->savecfg($cfg, 'functions.php', 'func')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings&op=functions'); }
+			if(!$this->cfg->savecfg($cfg, 'functions.php', 'func')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings&op=functions'); }
 
 			// Последнее обновление пользователя
 			$this->db->update_user($this->user);
@@ -361,7 +361,7 @@
 			
 			$db['port'] = intval(@$_POST['port']);
 
-			if(!$this->config->savecfg($db, 'db.php', 'db')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings&op=base'); }
+			if(!$this->cfg->savecfg($db, 'db.php', 'db')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings&op=base'); }
 
 			// Последнее обновление пользователя
 			$this->db->update_user($this->user);
diff --git a/upload/modules/admin/statics.class.php b/upload/modules/admin/statics.class.php
index 5e9c342..41cc70b 100644
--- a/upload/modules/admin/statics.class.php
+++ b/upload/modules/admin/statics.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_statics')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['statics'] => BASE_URL."?mode=admin&do=statics"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['statics'] => ADMIN_URL."&do=statics"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,8 +24,8 @@
 
 	private function static_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_statics'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_statics']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['adm_statics'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_statics']; // Set end pagination
 
 		$where		= "";
 		$sort		= "`s`.`id`";
@@ -101,7 +101,7 @@
 		$ar = @$this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_statics'], $page.'&pid=', $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_statics'], $page.'&pid=', $ar[0]),
 			"STATICS" => $this->static_array()
 		);
 
@@ -141,9 +141,9 @@
 		if(!$this->core->is_access('sys_adm_statics_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=statics'); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['statics'] => BASE_URL."?mode=admin&do=statics",
-			$this->lng['stc_add'] => BASE_URL."?mode=admin&do=statics&op=add",
+			$this->lng['mod_name'] => ADMIN_URL."",
+			$this->lng['statics'] => ADMIN_URL."&do=statics",
+			$this->lng['stc_add'] => ADMIN_URL."&do=statics&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -260,9 +260,9 @@
 		$data = json_decode($ar['data']);
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['statics'] => BASE_URL."?mode=admin&do=statics",
-			$this->lng['stc_edit'] => BASE_URL."?mode=admin&do=statics&op=edit&id=$id"
+			$this->lng['mod_name'] => ADMIN_URL."",
+			$this->lng['statics'] => ADMIN_URL."&do=statics",
+			$this->lng['stc_edit'] => ADMIN_URL."&do=statics&op=edit&id=$id"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
diff --git a/upload/modules/admin/users.class.php b/upload/modules/admin/users.class.php
index 0153ffb..2679f59 100644
--- a/upload/modules/admin/users.class.php
+++ b/upload/modules/admin/users.class.php
@@ -3,20 +3,20 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_users')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['users'] => BASE_URL."?mode=admin&do=users"
+			$this->lng['mod_name'] => ADMIN_URL,
+			$this->lng['users'] => ADMIN_URL."&do=users"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,17 +24,22 @@
 
 	private function user_array(){
 
-		$start		= $this->core->pagination($this->config->pagin['adm_users'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['adm_users']; // Set end pagination
+		$ctables	= $this->cfg->db['tables'];
+
+		$ug_f		= $ctables['ugroups']['fields'];
+		$us_f		= $ctables['users']['fields'];
+
+		$start		= $this->core->pagination($this->cfg->pagin['adm_users'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['adm_users']; // Set end pagination
 
 		$where		= "";
-		$sort		= "`u`.id";
+		$sort		= "`u`.`{$us_f['id']}`";
 		$sortby		= "DESC";
 
 		if(isset($_GET['search']) && !empty($_GET['search'])){
 			$search = $this->db->safesql(urldecode($_GET['search']));
 			if(preg_match("/[а-яА-ЯёЁ]+/iu", $search)){ $search = ""; }
-			$table = (preg_match("/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i", $search)) ? 'ip_last' : 'login';
+			$table = (preg_match("/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i", $search)) ? $us_f['ip_last'] : $us_f['login'];
 			$where = "WHERE `u`.`$table` LIKE '%$search%'";
 		}
 
@@ -44,18 +49,19 @@
 			$sortby = ($expl[0]=='asc') ? "ASC" : "DESC";
 
 			switch(@$expl[1]){
-				case 'user': $sort = "`u`.login"; break;
-				case 'group': $sort = "`g`.title"; break;
-				case 'email': $sort = "`u`.email"; break;
-				case 'ip': $sort = "`u`.ip_last"; break;
+				case 'user': $sort = "`u`.`{$us_f['login']}`"; break;
+				case 'group': $sort = "`g`.`{$ug_f['title']}`"; break;
+				case 'email': $sort = "`u`.`{$us_f['email']}`"; break;
+				case 'ip': $sort = "`u`.`{$us_f['ip_last']}`"; break;
 			}
 		}
 
-		$query = $this->db->query("SELECT `u`.id, `u`.gid, `u`.login, `u`.email, `u`.`color`, `u`.ip_create, `u`.ip_last,
-										`g`.title AS `group`, `g`.`color` AS `gcolor`
-									FROM `mcr_users` AS `u`
-									LEFT JOIN `mcr_groups` AS `g`
-										ON `g`.id=`u`.gid
+		$query = $this->db->query("SELECT `u`.`{$us_f['id']}`, `u`.`{$us_f['group']}`, `u`.`{$us_f['login']}`, `u`.`{$us_f['email']}`,
+										`u`.`{$us_f['color']}`, `u`.`{$us_f['ip_create']}`, `u`.`{$us_f['ip_last']}`,
+										`g`.`{$ug_f['title']}` AS `group`, `g`.`{$ug_f['color']}` AS `gcolor`
+									FROM `{$this->cfg->tabname('users')}` AS `u`
+									LEFT JOIN `{$this->cfg->tabname('ugroups')}` AS `g`
+										ON `g`.`{$ug_f['id']}`=`u`.`{$us_f['group']}`
 									$where
 									ORDER BY $sort $sortby
 									LIMIT $start, $end");
@@ -66,17 +72,17 @@
 
 		while($ar = $this->db->fetch_assoc($query)){
 
-			$ucolor = (!empty($ar['color'])) ? $this->db->HSC($ar['color']) : $this->db->HSC($ar['gcolor']);
+			$ucolor = (!empty($ar[$us_f['color']])) ? $this->db->HSC($ar[$us_f['color']]) : $this->db->HSC($ar['gcolor']);
 			$gcolor = $this->db->HSC($ar['gcolor']);
 
 			$page_data = array(
-				"ID" => intval($ar['id']),
-				"GID" => intval($ar['gid']),
-				"LOGIN" => $this->core->colorize($this->db->HSC($ar['login']), $ucolor),
-				"EMAIL" => $this->db->HSC($ar['email']),
+				"ID" => intval($ar[$us_f['id']]),
+				"GID" => intval($ar[$us_f['group']]),
+				"LOGIN" => $this->core->colorize($this->db->HSC($ar[$us_f['login']]), $ucolor),
+				"EMAIL" => $this->db->HSC($ar[$us_f['email']]),
 				"GROUP" => $this->core->colorize($this->db->HSC($ar['group']), $gcolor),
-				"IP_LAST" => $this->db->HSC($ar['ip_last']),
-				"IP_CREATE" => $this->db->HSC($ar['ip_create']),
+				"IP_LAST" => $this->db->HSC($ar[$us_f['ip_last']]),
+				"IP_CREATE" => $this->db->HSC($ar[$us_f['ip_create']]),
 			);
 		
 			echo $this->core->sp(MCR_THEME_MOD."admin/users/user-id.html", $page_data);
@@ -87,14 +93,17 @@
 
 	private function user_list(){
 
-		$sql = "SELECT COUNT(*) FROM `mcr_users`";
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
+		$sql = "SELECT COUNT(*) FROM `{$this->cfg->tabname('users')}`";
 		$page = "?mode=admin&do=users";
 
 		if(isset($_GET['search']) && !empty($_GET['search'])){
 			$search = $this->db->safesql(urldecode($_GET['search']));
 			if(preg_match("/[а-яА-ЯёЁ]+/iu", $search)){ $search = ""; }
-			$table = (preg_match("/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i", $search)) ? "ip_last" : "login";
-			$sql = "SELECT COUNT(*) FROM `mcr_users` WHERE `$table` LIKE '%$search%'";
+			$table = (preg_match("/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i", $search)) ? $us_f['ip_last'] : $us_f['login'];
+			$sql = "SELECT COUNT(*) FROM `{$this->cfg->tabname('users')}` WHERE `$table` LIKE '%$search%'";
 			$search = $this->db->HSC(urldecode($_GET['search']));
 			$page = "?mode=admin&do=users&search=$search";
 		}
@@ -108,7 +117,7 @@
 		$ar = @$this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_users'], $page.'&pid=', $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['adm_users'], $page.'&pid=', $ar[0]),
 			"USERS" => $this->user_array()
 		);
 
@@ -118,7 +127,10 @@
 	private function ban($list, $ban=1){
 		if(!$this->core->is_access('sys_adm_users_ban')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=users'); }
 
-		$update = $this->db->query("UPDATE `mcr_users` SET ban_server='$ban' WHERE id IN ($list)");
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
+		$update = $this->db->query("UPDATE `{$this->cfg->tabname('users')}` SET `{$us_f['ban_server']}`='$ban' WHERE `{$us_f['id']}` IN ($list)");
 
 		if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
 
@@ -134,13 +146,16 @@
 	}
 
 	private function get_logins($list){
-		$query = $this->db->query("SELECT `login` FROM `mcr_users` WHERE id IN ($list)");
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
+		$query = $this->db->query("SELECT `{$us_f['login']}` FROM `{$this->cfg->tabname('users')}` WHERE `{$us_f['id']}` IN ($list)");
 
 		if(!$query || $this->db->num_rows($query)<=0){ return false; }
 
 		$logins = array();
 
-		while($ar = $this->db->fetch_assoc($query)){ $logins[] = $ar['login']; }
+		while($ar = $this->db->fetch_assoc($query)){ $logins[] = $ar[$us_f['login']]; }
 
 		return $logins;
 	}
@@ -172,7 +187,10 @@
 
 		if(!isset($_POST['delete'])){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=users'); }
 
-		if(!$this->db->remove_fast("mcr_users", "id IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
+		if(!$this->db->remove_fast($this->cfg->tabname('users'), "`{$us_f['id']}` IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
 
 		$count = $this->db->affected_rows();
 
@@ -194,8 +212,12 @@
 	}
 
 	private function exist_group($id){
+
+		$ctables	= $this->cfg->db['tables'];
+		$ug_f		= $ctables['ugroups']['fields'];
+
 		$id = intval($id);
-		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_groups` WHERE id='$id'");
+		$query = $this->db->query("SELECT COUNT(*) FROM `{$this->cfg->tabname('ugroups')}` WHERE `{$ug_f['id']}`='$id'");
 		if(!$query){ return false; }
 		$ar = $this->db->fetch_array($query);
 
@@ -208,9 +230,9 @@
 		if(!$this->core->is_access('sys_adm_users_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=users'); }
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['users'] => BASE_URL."?mode=admin&do=users",
-			$this->lng['user_add'] => BASE_URL."?mode=admin&do=users&op=add",
+			$this->lng['mod_name'] => ADMIN_URL."",
+			$this->lng['users'] => ADMIN_URL."&do=users",
+			$this->lng['user_add'] => ADMIN_URL."&do=users&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -261,8 +283,12 @@
 
 			$new_data = $this->db->safesql(json_encode($new_data));
 
-			$insert = $this->db->query("INSERT INTO `mcr_users`
-											(gid, login, email, password, `color`, `uuid`, `salt`, ip_create, ip_last, `data`)
+			$ctables	= $this->cfg->db['tables'];
+			$us_f		= $ctables['users']['fields'];
+			$ic_f		= $ctables['iconomy']['fields'];
+
+			$insert = $this->db->query("INSERT INTO `{$this->cfg->tabname('users')}`
+											(`{$us_f['group']}`, `{$us_f['login']}`, `{$us_f['email']}`, `{$us_f['pass']}`, `{$us_f['color']}`, `{$us_f['uuid']}`, `{$us_f['salt']}`, `{$us_f['ip_create']}`, `{$us_f['ip_last']}`, `{$us_f['data']}`)
 										VALUES
 											('$gid', '$login', '$email', '$password', '$color', '$uuid', '$salt', '{$this->user->ip}', '{$this->user->ip}', '$new_data')");
 
@@ -270,8 +296,8 @@
 
 			$id = $this->db->insert_id();
 			
-			$insert1 = $this->db->query("INSERT INTO `mcr_iconomy`
-											(login, `money`, `realmoney`)
+			$insert1 = $this->db->query("INSERT INTO `{$this->cfg->tabname('iconomy')}`
+											(`{$ic_f['login']}`, `{$ic_f['money']}`, `{$ic_f['rm']}`)
 										VALUES
 											('$login', '$money', '$realmoney')");
 
@@ -309,12 +335,16 @@
 
 		$id = intval($_GET['id']);
 
-		$query = $this->db->query("SELECT `u`.login, `u`.gid, `u`.email, `u`.`data`, `u`.`color`,
-											`i`.`money`, `i`.realmoney
-									FROM `mcr_users` AS `u`
-									LEFT JOIN `mcr_iconomy` AS `i`
-										ON `i`.login=`u`.login
-									WHERE `u`.id='$id'");
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+		$ic_f		= $ctables['iconomy']['fields'];
+
+		$query = $this->db->query("SELECT `u`.`{$us_f['login']}`, `u`.`{$us_f['group']}`, `u`.`{$us_f['email']}`, `u`.`{$us_f['data']}`, `u`.`{$us_f['color']}`,
+											`i`.`{$ic_f['money']}`, `i`.`{$ic_f['rm']}`
+									FROM `{$this->cfg->tabname('users')}` AS `u`
+									LEFT JOIN `{$this->cfg->tabname('iconomy')}` AS `i`
+										ON `i`.`{$ic_f['login']}`=`u`.`{$us_f['login']}`
+									WHERE `u`.`{$us_f['id']}`='$id'");
 
 		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
 
@@ -323,9 +353,9 @@
 		$data = json_decode($ar['data']);
 
 		$bc = array(
-			$this->lng['mod_name'] => BASE_URL."?mode=admin",
-			$this->lng['users'] => BASE_URL."?mode=admin&do=users",
-			$this->lng['user_edit'] => BASE_URL."?mode=admin&do=users&op=edit&id=$id",
+			$this->lng['mod_name'] => ADMIN_URL."",
+			$this->lng['users'] => ADMIN_URL."&do=users",
+			$this->lng['user_edit'] => ADMIN_URL."&do=users&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -383,14 +413,14 @@
 
 			$new_data = $this->db->safesql(json_encode($new_data));
 
-			$update = $this->db->query("UPDATE `mcr_users`
-										SET gid='$gid', login='$login', `color`='$color', gid='$gid', email='$email',
-											password=$password, `uuid`='$uuid', `salt`=$salt, `data`='$new_data'
-										WHERE id='$id'");
+			$update = $this->db->query("UPDATE `{$this->cfg->tabname('users')}`
+										SET `{$us_f['group']}`='$gid', `{$us_f['login']}`='$login', `{$us_f['color']}`='$color', `{$us_f['email']}`='$email',
+											`{$us_f['pass']}`=$password, `{$us_f['uuid']}`='$uuid', `{$us_f['salt']}`=$salt, `{$us_f['data']}`='$new_data'
+										WHERE `{$us_f['id']}`='$id'");
 
 			if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users&op=edit&id='.$id); }
 			
-			$old_login = $this->db->safesql($ar['login']);
+			$old_login = $this->db->safesql($ar[$us_f['login']]);
 
 			if(file_exists(MCR_SKIN_PATH.$old_login.'.png')){
 				if(!rename(MCR_SKIN_PATH.$old_login.'.png', MCR_SKIN_PATH.$login.'.png')){
@@ -404,9 +434,9 @@
 				}
 			}
 
-			$update2 = $this->db->query("UPDATE `mcr_iconomy`
-										SET login='$login', `money`='$money', `realmoney`='$realmoney'
-										WHERE login='$old_login'");
+			$update2 = $this->db->query("UPDATE `{$this->cfg->tabname('iconomy')}`
+										SET `{$ic_f['login']}`='$login', `{$ic_f['money']}`='$money', `{$ic_f['rm']}`='$realmoney'
+										WHERE `{$ic_f['login']}`='$old_login'");
 
 			if(!$update2){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users&op=edit&id='.$id); }
 
@@ -424,16 +454,16 @@
 
 		$data = array(
 			"PAGE" => $this->lng['user_edit_page_name'],
-			"LOGIN" => $this->db->HSC($ar['login']),
-			"EMAIL" => $this->db->HSC($ar['email']),
-			'COLOR' => $this->db->HSC($ar['color']),
+			"LOGIN" => $this->db->HSC($ar[$us_f['login']]),
+			"EMAIL" => $this->db->HSC($ar[$us_f['email']]),
+			'COLOR' => $this->db->HSC($ar[$us_f['color']]),
 			"FIRSTNAME" => $this->db->HSC($data->firstname),
 			"LASTNAME" => $this->db->HSC($data->lastname),
 			"BIRTHDAY" => $birthday,
 			"GENDER" => $gender,
-			"GROUPS" => $this->groups($ar['gid']),
-			"MONEY" => floatval($ar['money']),
-			"REALMONEY" => floatval($ar['realmoney']),
+			"GROUPS" => $this->groups($ar[$us_f['group']]),
+			"MONEY" => floatval($ar[$ic_f['money']]),
+			"REALMONEY" => floatval($ar[$ic_f['rm']]),
 			"BUTTON" => $this->lng['user_edit_btn']
 		);
 
@@ -442,21 +472,24 @@
 
 	private function groups($select=1){
 
+		$ctables	= $this->cfg->db['tables'];
+		$ug_f		= $ctables['ugroups']['fields'];
+
 		$select = intval($select);
 
-		$query = $this->db->query("SELECT id, title
-									FROM `mcr_groups`
-									ORDER BY title ASC");
+		$query = $this->db->query("SELECT `{$ug_f['id']}`, `{$ug_f['title']}`
+									FROM `{$this->cfg->tabname('ugroups')}`
+									ORDER BY `{$ug_f['title']}` ASC");
 
 		if(!$query || $this->db->num_rows($query)<=0){ return; }
 
 		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
-			$id = intval($ar['id']);
+			$id = intval($ar[$ug_f['id']]);
 			$selected = ($id == $select) ? "selected" : "";
 
-			$title = $this->db->HSC($ar['title']);
+			$title = $this->db->HSC($ar[$ug_f['title']]);
 
 			echo "<option value=\"$id\" $selected>$title</option>";
 		}
diff --git a/upload/modules/ajax.php b/upload/modules/ajax.php
index 785bb74..36d6a1b 100644
--- a/upload/modules/ajax.php
+++ b/upload/modules/ajax.php
@@ -3,14 +3,13 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $user, $config, $lng;
-	public $cfg = array();
+	private $core, $db, $user, $cfg, $lng;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->lng		= $core->lng_m;
 	}
 
@@ -18,11 +17,14 @@
 		
 		$ajax = (isset($_GET['do'])) ? $_GET['do'] : '';
 
-		if(!preg_match("/^[\w\.]+$/i", $ajax) || !file_exists(MCR_MODE_PATH.'ajax/'.$ajax.'.php')){
+		$list = explode('|', $ajax);
+		$path = implode('/', $list);
+
+		if(!preg_match("/^[\w\|]+$/i", $ajax) || !file_exists(MCR_MODE_PATH.'ajax/'.$path.'.php')){
 			$this->core->js_notify('Hacking Attempt!');
 		}
 
-		require_once(MCR_MODE_PATH.'ajax/'.$ajax.'.php');
+		require_once(MCR_MODE_PATH.'ajax/'.$path.'.php');
 
 		if(!class_exists("submodule")){ $this->core->js_notify($this->lng['class_not_found']); }
 
diff --git a/upload/modules/ajax/admin_blocks_status.php b/upload/modules/ajax/admin_blocks_status.php
new file mode 100644
index 0000000..9f5b536
--- /dev/null
+++ b/upload/modules/ajax/admin_blocks_status.php
@@ -0,0 +1,66 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $cfg, $user, $lng;
+
+	public function __construct($core){
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
+	}
+
+	private function change_status($act){
+
+		$ids = @$_POST['ids'];
+
+		$status = ($act=='enable') ? true : false;
+
+		if(empty($ids)){ $this->core->js_notify($this->lng['ams_block_not_selected']); }
+
+		$ids = explode(',', $ids);
+
+		foreach($ids as $key => $mod){
+			if(!file_exists(MCR_CONF_PATH.'blocks/'.$mod.'.php')){ continue; }
+			include(MCR_CONF_PATH.'blocks/'.$mod.'.php');
+
+			if(!isset($cfg['ENABLE'])){ continue; }
+
+			$cfg['ENABLE'] = $status;
+
+			if(!$this->cfg->savecfg($cfg, 'blocks/'.$mod.'.php', 'cfg')){ continue; }
+		}
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_change_abs'], $this->user->id);
+
+		$this->core->js_notify($this->lng['ok'], $this->lng['ok'], true);
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->lng['e_hack']); }
+
+		$act = @$_POST['act'];
+
+		switch($act){
+			case 'enable':
+			case 'disable':
+				$this->change_status($act);
+			break;
+
+			default: $this->core->js_notify($this->lng['e_hack']); break;
+		}
+
+		$this->core->js_notify($this->lng['e_hack']);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/admin_modules_status.php b/upload/modules/ajax/admin_modules_status.php
index 43c5788..068856b 100644
--- a/upload/modules/ajax/admin_modules_status.php
+++ b/upload/modules/ajax/admin_modules_status.php
@@ -3,14 +3,14 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 	}
 
 	private function change_status($act){
@@ -31,7 +31,7 @@
 
 			$cfg['MOD_ENABLE'] = $status;
 
-			if(!$this->config->savecfg($cfg, 'modules/'.$mod.'.php', 'cfg')){ continue; }
+			if(!$this->cfg->savecfg($cfg, 'modules/'.$mod.'.php', 'cfg')){ continue; }
 		}
 
 		// Последнее обновление пользователя
diff --git a/upload/modules/ajax/blocks/online/main.php b/upload/modules/ajax/blocks/online/main.php
new file mode 100644
index 0000000..67034b5
--- /dev/null
+++ b/upload/modules/ajax/blocks/online/main.php
@@ -0,0 +1,68 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $user, $db, $cfg;
+
+	public function __construct($core){
+		$this->core		= $core;
+		$this->user		= $core->user;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+
+		include(MCR_CONF_PATH.'blocks/online.php');
+
+		$this->core->cfg_b = $cfg;
+	}
+
+	public function content(){
+
+		$result = array(
+			'guests' => 0,
+			'users' => 0,
+			'all' => 0,
+			'list' => '',
+		);
+
+		if(!$this->core->is_access(@$this->core->cfg_b['PERMISSIONS'])){ $this->core->js_notify('', '', true, $result); }
+
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+		$ug_f		= $ctables['ugroups']['fields'];
+
+		$time = time();
+
+		$expire = $time-$this->core->cfg_b['TIMEOUT'];
+
+		$query = $this->db->query("SELECT `o`.online, `u`.`{$us_f['login']}`, `u`.`{$us_f['color']}`, `g`.`{$us_f['color']}` AS `gcolor`
+									FROM `mcr_online` AS `o`
+									LEFT JOIN `{$this->cfg->tabname('users')}` AS `u`
+										ON `u`.`{$us_f['ip_last']}`=`o`.ip
+									LEFT JOIN `{$this->cfg->tabname('ugroups')}` AS `g`
+										ON `g`.`{$ug_f['id']}`=`u`.`{$us_f['group']}`
+									WHERE `o`.`date_update`>='$expire'");
+
+		if(!$query){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		if($this->db->num_rows($query)<=0){ $this->core->js_notify($this->core->lng['e_success'], $this->core->lng['e_success'], true, $result); }
+
+		while($ar = $this->db->fetch_assoc($query)){
+			$result['all']++;
+			if(is_null($ar[$us_f['login']]) || intval($ar['online'])==1){ $result['guests']++; continue; }
+
+			$result['users']++;
+			
+			$color = (empty($ar[$us_f['color']])) ? $this->db->HSC($ar['gcolor']) : $this->db->HSC($ar[$us_f['color']]);
+			$login = $this->db->HSC($ar[$us_f['login']]);
+
+			$result['list'][] = $this->core->colorize($login, $color);
+		}
+
+		if(empty($result['list'])){ $result['list'] = 'Нет зарегистрированных пользователей'; }
+
+		$this->core->js_notify($this->core->lng['e_success'], $this->core->lng['e_success'], true, $result);
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/blocks/online/update_online.php b/upload/modules/ajax/blocks/online/update_online.php
new file mode 100644
index 0000000..15ae48f
--- /dev/null
+++ b/upload/modules/ajax/blocks/online/update_online.php
@@ -0,0 +1,47 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $user, $db, $cfg;
+
+	public function __construct($core){
+		$this->core		= $core;
+		$this->user		= $core->user;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+
+		include(MCR_CONF_PATH.'blocks/online.php');
+
+		$this->core->cfg_b = $cfg;
+	}
+
+	public function content(){
+
+		$online = ($this->user->is_auth) ? 0 : 1;
+
+		$time = time();
+
+		$expire = $time-$this->core->cfg_b['TIMEOUT'];
+
+		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_online` WHERE ip='{$this->user->ip}'");
+
+		if(!$query){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		$ar = $this->db->fetch_array($query);
+
+		if($ar[0]<=0){
+			$sql = "INSERT INTO `mcr_online` (ip, online, date_create, date_update) VALUES ('{$this->user->ip}', '$online', '$time', '$time')";
+		}else{
+			$sql = "UPDATE `mcr_online` SET online='$online', date_update='$time' WHERE ip='{$this->user->ip}'";
+		}
+
+		if(!$this->db->query($sql)){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		if(!$this->db->remove_fast('mcr_online', "`date_update`<'$expire'")){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		$this->core->js_notify('Поздравляем!', $this->core->lng['e_success'], true);
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/filemanager.php b/upload/modules/ajax/filemanager.php
index 882d88a..27cbb55 100644
--- a/upload/modules/ajax/filemanager.php
+++ b/upload/modules/ajax/filemanager.php
@@ -3,13 +3,13 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $user, $config, $lng;
+	private $core, $db, $user, $cfg, $lng;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_adm_manager')){ $this->core->js_notify($this->core->lng['e_403']); }
@@ -21,10 +21,13 @@
 		if($page<=0){ $this->core->js_notify($this->lng['fm_file_not_found']); }
 		$page = $page*$limit-$limit;
 
-		$query = $this->db->query("SELECT `f`.id, `f`.`uniq`, `f`.`name`, `f`.`oldname`, `f`.`data`, `f`.uid, `u`.login
+		$ctables	= $this->cfg->db['tables'];
+		$logs_f		= $ctables['logs']['fields'];
+
+		$query = $this->db->query("SELECT `f`.id, `f`.`uniq`, `f`.`name`, `f`.`oldname`, `f`.`data`, `f`.uid, `u`.`{$logs_f['uid']}`
 								FROM `mcr_files` AS `f`
-								LEFT JOIN `mcr_users` AS `u`
-									ON `u`.id=`f`.uid
+								LEFT JOIN `{$this->cfg->tabname('users')}` AS `u`
+									ON `u`.`{$logs_f['id']}`=`f`.uid
 								ORDER BY `f`.id DESC
 								LIMIT $page, $limit");
 
@@ -47,7 +50,7 @@
 			$list[] = array(
 				'link'		=> BASE_URL.'?mode=file&uniq='.$uniq,
 				'uid'		=> intval($ar['uid']),
-				'login'		=> $this->db->HSC($ar['login']),
+				'login'		=> $this->db->HSC($ar[$logs_f['login']]),
 				'oldname'	=> $this->db->HSC($oldname),
 				'date'		=> date('d.m.Y в H:i', $data['date_upload']),
 				'size'		=> floatval($data['size']),
diff --git a/upload/modules/ajax/modules/news/add_comment.php b/upload/modules/ajax/modules/news/add_comment.php
new file mode 100644
index 0000000..e6b3b6c
--- /dev/null
+++ b/upload/modules/ajax/modules/news/add_comment.php
@@ -0,0 +1,127 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $cfg, $user, $lng;
+
+	public function __construct($core){
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->load_language('news');
+	}
+
+	private function is_discus($nid=1){
+		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_news` WHERE id='$nid' AND discus='1'");
+
+		if(!$query){ return false; }
+
+		$ar = $this->db->fetch_array($query);
+
+		if($ar[0]<=0){ return false; }
+		
+		return true;
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); }
+		
+		if(!$this->core->is_access('sys_comment_add')){ $this->core->js_notify($this->lng['com_perm_add']); }
+
+		$nid = @$_POST['id'];
+		$nid = intval($nid);
+
+		if(!$this->is_discus($nid)){ $this->core->js_notify($this->lng['com_disabled']); }
+
+		$message = @$_POST['message'];
+
+		$message_trim = trim($message);
+
+		if(empty($message_trim)){ $this->core->js_notify($this->lng['com_msg_empty']); }
+
+		if(isset($_SESSION['add_comment'])){
+			if(intval($_SESSION['add_comment'])>time()){
+				$expire = intval($_SESSION['add_comment'])-time();
+				$this->core->js_notify($this->lng['com_wait']." $expire ".$this->lng['com_wait1']);
+			}else{
+				$_SESSION['add_comment'] = time()+30;
+			}
+		}else{
+			$_SESSION['add_comment'] = time()+30;
+		}
+
+		$bb = $this->core->load_bb_class(); // Object
+
+		$text_html		= $bb->parse($message);
+		$safe_text_html	= $this->db->safesql($text_html);
+
+		$text_bb		= $this->db->safesql($message);
+
+		$message_strip = trim(strip_tags($text_html, "<img><hr><iframe>"));
+
+		if(empty($message_strip)){ $this->core->js_notify($this->lng['com_msg_incorrect']); }
+
+		$newdata = array(
+			"time_create" => time(),
+			"time_last" => time()
+		);
+
+		$safedata = $this->db->safesql(json_encode($newdata));
+
+		$insert = $this->db->query("INSERT INTO `mcr_comments`
+										(nid, text_html, text_bb, uid, `data`)
+									VALUES
+										('$nid', '$safe_text_html', '$text_bb', '{$this->user->id}', '$safedata')");
+
+		if(!$insert){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		$id = $this->db->insert_id();
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_com_add']." #$id", $this->user->id);
+
+		$act_del = $act_edt = $act_get = '';
+
+		$data = array(
+			"ID" => $id,
+			"LNG" => $this->lng
+		);
+
+		if($this->core->is_access('sys_comment_del') || $this->core->is_access('sys_comment_del_all')){
+			$act_del = $this->core->sp(MCR_THEME_MOD."news/comments/comment-act-del.html", $data);
+		}
+
+		if($this->core->is_access('sys_comment_edt') || $this->core->is_access('sys_comment_edt_all')){
+			$act_edt = $this->core->sp(MCR_THEME_MOD."news/comments/comment-act-edt.html", $data);
+		}
+
+		if($this->user->is_auth){
+			$act_get = $this->core->sp(MCR_THEME_MOD."news/comments/comment-act-get.html", $data);
+		}
+
+		$com_data	= array(
+			"ID"				=> $id,
+			"NID"				=> $nid,
+			"TEXT"				=> $text_html,
+			"UID"				=> $this->user->id,
+			"DATA"				=> $newdata,
+			"LOGIN"				=> $this->user->login_v2,
+			"ACTION_DELETE"		=> $act_del,
+			"ACTION_EDIT"		=> $act_edt,
+			"ACTION_QUOTE"		=> $act_get
+		);
+
+		$content = $this->core->sp(MCR_THEME_MOD."news/comments/comment-id.html", $com_data);
+
+		$this->core->js_notify($this->lng['com_add_success'], $this->core->lng['e_success'], true, $content);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/modules/news/delete_comment.php b/upload/modules/ajax/modules/news/delete_comment.php
new file mode 100644
index 0000000..a98e634
--- /dev/null
+++ b/upload/modules/ajax/modules/news/delete_comment.php
@@ -0,0 +1,56 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $cfg, $user, $lng;
+
+	public function __construct($core){
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->load_language('news');
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); }
+		
+		if(!$this->core->is_access('sys_comment_del') && !$this->core->is_access('sys_comment_del_all')){ $this->core->js_notify($this->lng['com_perm_del']); }
+
+		$id = @$_POST['id'];
+		$id = intval($id);
+
+		$nid = @$_POST['nid'];
+		$nid = intval($nid);
+
+		$newdata = array(
+			"time_create" => time(),
+			"time_last" => time()
+		);
+
+		$cond = "id='$id' AND nid='$nid' AND uid='{$this->user->id}'";
+
+		if($this->core->is_access('sys_comment_del_all')){
+			$cond = "id='$id' AND nid='$nid'";
+		}
+
+		if(!$this->db->remove_fast("mcr_comments", $cond)){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		if($this->db->affected_rows()<=0){ 
+			$this->core->js_notify($this->lng['com_del_empty']);
+		}
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_com_del']." #$id", $this->user->id);
+
+		$this->core->js_notify($this->lng['com_del_success'], $this->core->lng['e_success'], true);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/modules/news/edit_comment.php b/upload/modules/ajax/modules/news/edit_comment.php
new file mode 100644
index 0000000..2f3753b
--- /dev/null
+++ b/upload/modules/ajax/modules/news/edit_comment.php
@@ -0,0 +1,109 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $cfg, $user, $lng;
+
+	public function __construct($core){
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->load_language('news');
+	}
+
+	private function is_discus($nid=1){
+		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_news` WHERE id='$nid' AND discus='1'");
+
+		if(!$query){ return false; }
+
+		$ar = $this->db->fetch_array($query);
+
+		if($ar[0]<=0){ return false; }
+		
+		return true;
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); }
+		
+		if(!$this->core->is_access('sys_comment_edt') && !$this->core->is_access('sys_comment_edt_all')){ $this->core->js_notify($this->lng['com_perm_edit']); }
+
+		$id = intval(@$_POST['id']);
+
+		$nid = intval(@$_POST['nid']);
+
+		if(!$this->is_discus($nid)){ $this->core->js_notify($this->lng['com_disabled']); }
+
+		$sql_query = "SELECT `data` FROM `mcr_comments` WHERE uid='{$this->user->id}' AND id='$id' AND nid='$nid'";
+
+		if($this->core->is_access('sys_comment_edt_all')){
+			$sql_query = "SELECT `data` FROM `mcr_comments` WHERE id='$id' AND nid='$nid'";
+		}
+
+		$query = $this->db->query($sql_query);
+
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->js_notify($this->core->lng['e_hack']); }
+
+		$ar = $this->db->fetch_assoc($query);
+
+		$data = json_decode($ar['data']);
+
+		$message = @$_POST['message'];
+
+		$message_trim = trim($message);
+
+		if(empty($message_trim)){ $this->core->js_notify($this->lng['com_msg_empty']); }
+
+		$bb = $this->core->load_bb_class(); // Object
+
+		$text_html		= $bb->parse($message);
+		$safe_text_html	= $this->db->safesql($text_html);
+
+		$text_bb		= $this->db->safesql($message);
+
+		$message_strip = trim(strip_tags($text_html, "<img><hr><iframe>"));
+
+		if(empty($message_strip)){ $this->core->js_notify($this->lng['com_msg_incorrect']); }
+
+		$newdata = array(
+			"time_create" => $data->time_create,
+			"time_last" => time()
+		);
+
+		$safedata = $this->db->safesql(json_encode($newdata));
+
+		$sql_update = "UPDATE `mcr_comments`
+						SET text_html='$safe_text_html',
+							text_bb='$text_bb',
+							`data`='$safedata'
+						WHERE id='$id' AND nid='$nid' AND uid='{$this->user->id}'";
+
+		if($this->core->is_access('sys_comment_edt_all')){
+
+			$sql_update = "UPDATE `mcr_comments`
+							SET text_html='$safe_text_html',
+								text_bb='$text_bb',
+								`data`='$safedata'
+							WHERE id='$id' AND nid='$nid'";
+
+		}
+
+		$update = $this->db->query($sql_update);
+
+		if(!$update){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_com_edit']." #$id", $this->user->id);
+
+		$this->core->js_notify($this->lng['com_edit_success'], $this->core->lng['e_success'], true, $text_html);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/modules/news/get_comment.php b/upload/modules/ajax/modules/news/get_comment.php
new file mode 100644
index 0000000..b74cc55
--- /dev/null
+++ b/upload/modules/ajax/modules/news/get_comment.php
@@ -0,0 +1,54 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $cfg, $user, $lng;
+
+	public function __construct($core){
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->load_language('news');
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); }
+
+		if(!$this->user->is_auth){ $this->core->js_notify($this->lng['com_unauth']); }
+
+		$id = intval(@$_POST['id']);
+
+		$nid = intval(@$_POST['nid']);
+
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
+		$query = $this->db->query("SELECT `c`.text_bb, `c`.`data`, `u`.`{$us_f['login']}`
+									FROM `mcr_comments` AS `c`
+									LEFT JOIN `{$this->cfg->tabname('users')}` AS `u`
+										ON `c`.uid=`u`.`{$us_f['id']}`
+									WHERE `c`.nid='$nid' AND `c`.id='$id'");
+
+		if(!$query){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		if($this->db->num_rows($query)<=0){ $this->core->js_notify($this->core->lng['e_hack']); }
+
+		$ar = $this->db->fetch_assoc($query);
+		
+		$data = json_decode($ar['data'], true);
+
+		$json = array(
+			'create' => date("d.m.Y - H:i:s", $data['time_create']),
+			'login' => $this->db->HSC($ar[$us_f['login']]),
+			'text' => $this->db->HSC($ar['text_bb']),
+		);
+
+		$this->core->js_notify($this->lng['com_load_success'], $this->core->lng['e_success'], true, $json);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/modules/news/news_attach.php b/upload/modules/ajax/modules/news/news_attach.php
new file mode 100644
index 0000000..ab68af0
--- /dev/null
+++ b/upload/modules/ajax/modules/news/news_attach.php
@@ -0,0 +1,49 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $cfg, $user, $lng;
+
+	public function __construct($core){
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->load_language('news');
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); }
+
+		if(!$this->core->is_access('sys_adm_news')){ $this->core->js_notify($this->core->lng['e_403']); }
+
+		$id = intval(@$_POST['id']);
+
+		$query = $this->db->query("SELECT `attach` FROM `mcr_news` WHERE id='$id'");
+
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->js_notify($this->lng['news_not_found']); }
+
+		$ar = $this->db->fetch_assoc($query);
+
+		$attach = (intval($ar['attach'])==1) ? 0 : 1;
+
+		$update = $this->db->query("UPDATE `mcr_news` SET `attach`='$attach' WHERE id='$id'");
+
+		if(!$update){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		$msg = ($attach===1) ? $this->lng['att_attach'] : $this->lng['att_unattach'];
+
+		// Лог действия
+		$this->db->actlog("$msg ".$this->lng['att_news']." #$id", $this->user->id);
+
+		$this->core->js_notify($this->lng['att_success'], $this->core->lng['e_success'], true);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/modules/news/news_delete.php b/upload/modules/ajax/modules/news/news_delete.php
new file mode 100644
index 0000000..b7dea2e
--- /dev/null
+++ b/upload/modules/ajax/modules/news/news_delete.php
@@ -0,0 +1,37 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $cfg, $user, $lng;
+
+	public function __construct($core){
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->load_language('news');
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); }
+
+		if(!$this->core->is_access('sys_adm_news')){ $this->core->js_notify($this->core->lng['e_403']); }
+
+		$id = intval(@$_POST['id']);
+
+		if(!$this->db->remove_fast("mcr_news", "id='$id'")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_sql_critical'].' #'.__LINE__, 2, '?mode=admin&do=menu'); }
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_new_del']." #$id", $this->user->id);
+
+		$this->core->js_notify($this->lng['new_success_del'], $this->core->lng['e_success'], true);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/modules/news/news_like.php b/upload/modules/ajax/modules/news/news_like.php
new file mode 100644
index 0000000..19eda54
--- /dev/null
+++ b/upload/modules/ajax/modules/news/news_like.php
@@ -0,0 +1,95 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $cfg, $user, $lng;
+
+	public function __construct($core){
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->load_language('news');
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); }
+		
+		if(!$this->core->is_access('sys_news_like')){ $this->core->js_notify($this->lng['com_vote_perm']); }
+
+		$nid = intval(@$_POST['nid']);
+
+		$value = intval(@$_POST['value']);
+
+		if($value<0 || $value>1){ $this->core->js_notify($this->core->lng['e_hack']); }
+
+		$query = $this->db->query("SELECT `n`.`vote`, COUNT(DISTINCT `l`.id) AS `likes`, COUNT(DISTINCT `d`.id) AS `dislikes`, `m`.`value`
+									FROM `mcr_news` AS `n`
+									LEFT JOIN `mcr_news_votes` AS `l`
+										ON `l`.nid=`n`.id AND `l`.`value`='1'
+									LEFT JOIN `mcr_news_votes` AS `d`
+										ON `d`.nid=`n`.id AND `d`.`value`='0'
+									LEFT JOIN `mcr_news_votes` AS `m`
+										ON `m`.nid=`n`.id AND (`m`.uid='{$this->user->id}' OR `m`.ip='{$this->user->ip}')
+									WHERE `n`.id='$nid'");
+
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->js_notify($this->core->lng['e_hack']); }
+
+		$ar = $this->db->fetch_assoc($query);
+
+		if(intval($ar['vote'])<=0){ $this->core->js_notify($this->lng['com_vote_disabled']); }
+
+		$likes = intval($ar['likes']);
+		$dislikes = intval($ar['dislikes']);
+
+		$uid = (!$this->user->is_auth) ? -1 : $this->user->id;
+		$time = time();
+
+		$old_value = $ar['value'];
+
+		if(is_null($old_value)){
+			$insert = $this->db->query("INSERT INTO `mcr_news_votes`
+											(nid, uid, `value`, ip, `time`)
+										VALUES
+											('$nid', '$uid', '$value', '{$this->user->ip}', '$time')");
+
+			if(!$insert){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+			$likes = ($value===1) ? $likes+1 : $likes;
+			$dislikes = ($value===0) ? $dislikes+1 : $dislikes;
+		}else{
+			$update = $this->db->query("UPDATE `mcr_news_votes`
+										SET uid='$uid', `value`='$value', `time`='$time'
+										WHERE nid='$nid' AND (uid='{$this->user->id}' OR ip='{$this->user->ip}')
+										LIMIT 1");
+
+			if(!$update){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+			if($value===1){
+				$likes = (intval($old_value)===1) ? $likes : $likes+1;
+				$dislikes = (intval($old_value)===1) ? $dislikes : $dislikes-1;
+			}else{
+				$likes = (intval($old_value)===0) ? $likes : $likes-1;
+				$dislikes = (intval($old_value)===0) ? $dislikes : $dislikes+1;
+			}
+		}
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_com_vote']." #$nid", $this->user->id);
+
+		$data = array(
+			'likes' => $likes,
+			'dislikes' => $dislikes
+		);
+
+		$this->core->js_notify($this->lng['com_vote_success'], $this->core->lng['e_success'], true, $data);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/monitoring.php b/upload/modules/ajax/monitoring.php
index 62bba24..4d19a72 100644
--- a/upload/modules/ajax/monitoring.php
+++ b/upload/modules/ajax/monitoring.php
@@ -3,13 +3,13 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $user, $config, $lng;
+	private $core, $db, $user, $cfg, $lng;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->lng		= $core->lng_m;
 
 		if(!$this->core->is_access('sys_monitoring')){ $this->core->js_notify($this->core->lng['e_403']); }
diff --git a/upload/modules/ajax/news.php b/upload/modules/ajax/news.php
deleted file mode 100644
index c150213..0000000
--- a/upload/modules/ajax/news.php
+++ /dev/null
@@ -1,366 +0,0 @@
-<?php
-
-if(!defined("MCR")){ exit("Hacking Attempt!"); }
-
-class submodule{
-	private $core, $db, $config, $user, $lng;
-
-	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->load_language('news');
-	}
-
-	private function is_discus($nid=1){
-		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_news` WHERE id='$nid' AND discus='1'");
-
-		if(!$query){ return false; }
-
-		$ar = $this->db->fetch_array($query);
-
-		if($ar[0]<=0){ return false; }
-		
-		return true;
-	}
-
-	private function add_comment(){
-
-		if(!$this->core->is_access('sys_comment_add')){ $this->core->js_notify($this->lng['com_perm_add']); }
-
-		$nid = @$_POST['id'];
-		$nid = intval($nid);
-
-		if(!$this->is_discus($nid)){ $this->core->js_notify($this->lng['com_disabled']); }
-
-		$message = @$_POST['message'];
-
-		$message_trim = trim($message);
-
-		if(empty($message_trim)){ $this->core->js_notify($this->lng['com_msg_empty']); }
-
-		if(isset($_SESSION['add_comment'])){
-			if(intval($_SESSION['add_comment'])>time()){
-				$expire = intval($_SESSION['add_comment'])-time();
-				$this->core->js_notify($this->lng['com_wait']." $expire ".$this->lng['com_wait1']);
-			}else{
-				$_SESSION['add_comment'] = time()+30;
-			}
-		}else{
-			$_SESSION['add_comment'] = time()+30;
-		}
-
-		$bb = $this->core->load_bb_class(); // Object
-
-		$text_html		= $bb->parse($message);
-		$safe_text_html	= $this->db->safesql($text_html);
-
-		$text_bb		= $this->db->safesql($message);
-
-		$message_strip = trim(strip_tags($text_html, "<img><hr><iframe>"));
-
-		if(empty($message_strip)){ $this->core->js_notify($this->lng['com_msg_incorrect']); }
-
-		$newdata = array(
-			"time_create" => time(),
-			"time_last" => time()
-		);
-
-		$safedata = $this->db->safesql(json_encode($newdata));
-
-		$insert = $this->db->query("INSERT INTO `mcr_comments`
-										(nid, text_html, text_bb, uid, `data`)
-									VALUES
-										('$nid', '$safe_text_html', '$text_bb', '{$this->user->id}', '$safedata')");
-
-		if(!$insert){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
-
-		$id = $this->db->insert_id();
-
-		// Последнее обновление пользователя
-		$this->db->update_user($this->user);
-
-		// Лог действия
-		$this->db->actlog($this->lng['log_com_add']." #$id", $this->user->id);
-
-		$act_del = $act_edt = $act_get = '';
-
-		$data = array(
-			"ID" => $id,
-			"LNG" => $this->lng
-		);
-
-		if($this->core->is_access('sys_comment_del') || $this->core->is_access('sys_comment_del_all')){
-			$act_del = $this->core->sp(MCR_THEME_MOD."news/comments/comment-act-del.html", $data);
-		}
-
-		if($this->core->is_access('sys_comment_edt') || $this->core->is_access('sys_comment_edt_all')){
-			$act_edt = $this->core->sp(MCR_THEME_MOD."news/comments/comment-act-edt.html", $data);
-		}
-
-		if($this->user->is_auth){
-			$act_get = $this->core->sp(MCR_THEME_MOD."news/comments/comment-act-get.html", $data);
-		}
-
-		$com_data	= array(
-			"ID"				=> $id,
-			"NID"				=> $nid,
-			"TEXT"				=> $text_html,
-			"UID"				=> $this->user->id,
-			"DATA"				=> $newdata,
-			"LOGIN"				=> $this->user->login_v2,
-			"ACTION_DELETE"		=> $act_del,
-			"ACTION_EDIT"		=> $act_edt,
-			"ACTION_QUOTE"		=> $act_get
-		);
-
-		$content = $this->core->sp(MCR_THEME_MOD."news/comments/comment-id.html", $com_data);
-
-		$this->core->js_notify($this->lng['com_add_success'], $this->core->lng['e_success'], true, $content);
-	}
-
-	private function edt_comment(){
-
-		if(!$this->core->is_access('sys_comment_edt') && !$this->core->is_access('sys_comment_edt_all')){ $this->core->js_notify($this->lng['com_perm_edit']); }
-
-		$id = intval(@$_POST['id']);
-
-		$nid = intval(@$_POST['nid']);
-
-		if(!$this->is_discus($nid)){ $this->core->js_notify($this->lng['com_disabled']); }
-
-		$sql_query = "SELECT `data` FROM `mcr_comments` WHERE uid='{$this->user->id}' AND id='$id' AND nid='$nid'";
-
-		if($this->core->is_access('sys_comment_edt_all')){
-			$sql_query = "SELECT `data` FROM `mcr_comments` WHERE id='$id' AND nid='$nid'";
-		}
-
-		$query = $this->db->query($sql_query);
-
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->js_notify($this->core->lng['e_hack']); }
-
-		$ar = $this->db->fetch_assoc($query);
-
-		$data = json_decode($ar['data']);
-
-		$message = @$_POST['message'];
-
-		$message_trim = trim($message);
-
-		if(empty($message_trim)){ $this->core->js_notify($this->lng['com_msg_empty']); }
-
-		$bb = $this->core->load_bb_class(); // Object
-
-		$text_html		= $bb->parse($message);
-		$safe_text_html	= $this->db->safesql($text_html);
-
-		$text_bb		= $this->db->safesql($message);
-
-		$message_strip = trim(strip_tags($text_html, "<img><hr><iframe>"));
-
-		if(empty($message_strip)){ $this->core->js_notify($this->lng['com_msg_incorrect']); }
-
-		$newdata = array(
-			"time_create" => $data->time_create,
-			"time_last" => time()
-		);
-
-		$safedata = $this->db->safesql(json_encode($newdata));
-
-		$sql_update = "UPDATE `mcr_comments`
-						SET 
-							text_html='$safe_text_html',
-							text_bb='$text_bb',
-							`data`='$safedata'
-						WHERE id='$id' AND nid='$nid' AND uid='{$this->user->id}'";
-
-		if($this->core->is_access('sys_comment_edt_all')){
-
-			$sql_update = "UPDATE `mcr_comments`
-							SET 
-								text_html='$safe_text_html',
-								text_bb='$text_bb',
-								`data`='$safedata'
-							WHERE id='$id' AND nid='$nid'";
-
-		}
-
-		$update = $this->db->query($sql_update);
-
-		if(!$update){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
-
-		// Последнее обновление пользователя
-		$this->db->update_user($this->user);
-
-		// Лог действия
-		$this->db->actlog($this->lng['log_com_edit']." #$id", $this->user->id);
-
-		$this->core->js_notify($this->lng['com_edit_success'], $this->core->lng['e_success'], true, $text_html);
-	}
-
-	private function del_comment(){
-
-		if(!$this->core->is_access('sys_comment_del') && !$this->core->is_access('sys_comment_del_all')){ $this->core->js_notify($this->lng['com_perm_del']); }
-
-		$id = @$_POST['id'];
-		$id = intval($id);
-
-		$nid = @$_POST['nid'];
-		$nid = intval($nid);
-
-		$newdata = array(
-			"time_create" => time(),
-			"time_last" => time()
-		);
-
-		$cond = "id='$id' AND nid='$nid' AND uid='{$this->user->id}'";
-
-		if($this->core->is_access('sys_comment_del_all')){
-			$cond = "id='$id' AND nid='$nid'";
-		}
-
-		if(!$this->db->remove_fast("mcr_comments", $cond)){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
-
-		if($this->db->affected_rows()<=0){ 
-			$this->core->js_notify($this->lng['com_del_empty']);
-		}
-
-		// Последнее обновление пользователя
-		$this->db->update_user($this->user);
-
-		// Лог действия
-		$this->db->actlog($this->lng['log_com_del']." #$id", $this->user->id);
-
-		$this->core->js_notify($this->lng['com_del_success'], $this->core->lng['e_success'], true);
-	}
-
-	private function get_comment(){
-
-		if(!$this->user->is_auth){ $this->core->js_notify($this->lng['com_unauth']); }
-
-		$id = intval(@$_POST['id']);
-
-		$nid = intval(@$_POST['nid']);
-
-		$query = $this->db->query("SELECT `c`.text_bb, `c`.`data`, `u`.login
-									FROM `mcr_comments` AS `c`
-									LEFT JOIN `mcr_users` AS `u`
-										ON `c`.uid=`u`.id
-									WHERE `c`.nid='$nid' AND `c`.id='$id'");
-
-		if(!$query){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
-
-		if($this->db->num_rows($query)<=0){ $this->core->js_notify($this->core->lng['e_hack']); }
-
-		$ar = $this->db->fetch_assoc($query);
-		
-		$data = json_decode($ar['data'], true);
-
-		$json = array(
-			'create' => date("d.m.Y - H:i:s", $data['time_create']),
-			'login' => $this->db->HSC($ar['login']),
-			'text' => $this->db->HSC($ar['text_bb']),
-		);
-
-		$this->core->js_notify($this->lng['com_load_success'], $this->core->lng['e_success'], true, $json);
-	}
-
-	private function like(){
-
-		if(!$this->core->is_access('sys_news_like')){ $this->core->js_notify($this->lng['com_vote_perm']); }
-
-		$nid = intval(@$_POST['nid']);
-
-		$value = intval(@$_POST['value']);
-
-		if($value<0 || $value>1){ $this->core->js_notify($this->core->lng['e_hack']); }
-
-		$query = $this->db->query("SELECT `n`.`vote`, COUNT(DISTINCT `l`.id) AS `likes`, COUNT(DISTINCT `d`.id) AS `dislikes`, `m`.`value`
-									FROM `mcr_news` AS `n`
-									LEFT JOIN `mcr_news_votes` AS `l`
-										ON `l`.nid=`n`.id AND `l`.`value`='1'
-									LEFT JOIN `mcr_news_votes` AS `d`
-										ON `d`.nid=`n`.id AND `d`.`value`='0'
-									LEFT JOIN `mcr_news_votes` AS `m`
-										ON `m`.nid=`n`.id AND (`m`.uid='{$this->user->id}' OR `m`.ip='{$this->user->ip}')
-									WHERE `n`.id='$nid'");
-
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->js_notify($this->core->lng['e_hack']); }
-
-		$ar = $this->db->fetch_assoc($query);
-
-		if(intval($ar['vote'])<=0){ $this->core->js_notify($this->lng['com_vote_disabled']); }
-
-		$likes = intval($ar['likes']);
-		$dislikes = intval($ar['dislikes']);
-
-		$uid = (!$this->user->is_auth) ? -1 : $this->user->id;
-		$time = time();
-
-		$old_value = $ar['value'];
-
-		if(is_null($old_value)){
-			$insert = $this->db->query("INSERT INTO `mcr_news_votes`
-											(nid, uid, `value`, ip, `time`)
-										VALUES
-											('$nid', '$uid', '$value', '{$this->user->ip}', '$time')");
-
-			if(!$insert){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
-
-			$likes = ($value===1) ? $likes+1 : $likes;
-			$dislikes = ($value===0) ? $dislikes+1 : $dislikes;
-		}else{
-			$update = $this->db->query("UPDATE `mcr_news_votes`
-										SET uid='$uid', `value`='$value', `time`='$time'
-										WHERE nid='$nid' AND (uid='{$this->user->id}' OR ip='{$this->user->ip}')
-										LIMIT 1");
-
-			if(!$update){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
-
-			if($value===1){
-				$likes = (intval($old_value)===1) ? $likes : $likes+1;
-				$dislikes = (intval($old_value)===1) ? $dislikes : $dislikes-1;
-			}else{
-				$likes = (intval($old_value)===0) ? $likes : $likes-1;
-				$dislikes = (intval($old_value)===0) ? $dislikes : $dislikes+1;
-			}
-		}
-
-		// Последнее обновление пользователя
-		$this->db->update_user($this->user);
-
-		// Лог действия
-		$this->db->actlog($this->lng['log_com_vote']." #$nid", $this->user->id);
-
-		$data = array(
-			'likes' => $likes,
-			'dislikes' => $dislikes
-		);
-
-		$this->core->js_notify($this->lng['com_vote_success'], $this->core->lng['e_success'], true, $data);
-	}
-
-	public function content(){
-
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); }
-		if(!isset($_POST['act']) || empty($_POST['act'])){ $this->core->js_notify($this->core->lng['e_hack']); }
-
-		$act = $_POST['act'];
-
-		switch($act){
-			case 'add_comment': $this->add_comment(); break;
-			case 'del_comment': $this->del_comment(); break;
-			case 'get_comment': $this->get_comment(); break;
-			case 'edt_comment': $this->edt_comment(); break;
-			case 'like': $this->like(); break;
-
-			default: $this->core->js_notify($this->core->lng['e_hack']); break;
-		}
-
-		exit;
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/upload/modules/ajax/news_attach.php b/upload/modules/ajax/news_attach.php
deleted file mode 100644
index 48a9106..0000000
--- a/upload/modules/ajax/news_attach.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-if(!defined("MCR")){ exit("Hacking Attempt!"); }
-
-class submodule{
-	private $core, $db, $config, $user, $lng;
-
-	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->load_language('news');
-	}
-
-	public function content(){
-
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); }
-
-		if(!$this->core->is_access('sys_adm_news')){ $this->core->js_notify($this->core->lng['e_403']); }
-
-		$id = intval(@$_POST['id']);
-
-		$query = $this->db->query("SELECT `attach` FROM `mcr_news` WHERE id='$id'");
-
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->js_notify($this->lng['news_not_found']); }
-
-		$ar = $this->db->fetch_assoc($query);
-
-		$attach = (intval($ar['attach'])==1) ? 0 : 1;
-
-		$update = $this->db->query("UPDATE `mcr_news` SET `attach`='$attach' WHERE id='$id'");
-
-		if(!$update){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
-
-		// Последнее обновление пользователя
-		$this->db->update_user($this->user);
-
-		$msg = ($attach===1) ? $this->lng['att_attach'] : $this->lng['att_unattach'];
-
-		// Лог действия
-		$this->db->actlog("$msg ".$this->lng['att_news']." #$id", $this->user->id);
-
-		$this->core->js_notify($this->lng['att_success'], $this->core->lng['e_success'], true);
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/upload/modules/ajax/news_delete.php b/upload/modules/ajax/news_delete.php
deleted file mode 100644
index 42277e5..0000000
--- a/upload/modules/ajax/news_delete.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-if(!defined("MCR")){ exit("Hacking Attempt!"); }
-
-class submodule{
-	private $core, $db, $config, $user, $lng;
-
-	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->load_language('news');
-	}
-
-	public function content(){
-
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); }
-
-		if(!$this->core->is_access('sys_adm_news')){ $this->core->js_notify($this->core->lng['e_403']); }
-
-		$id = intval(@$_POST['id']);
-
-		if(!$this->db->remove_fast("mcr_news", "id='$id'")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_sql_critical'].' #'.__LINE__, 2, '?mode=admin&do=menu'); }
-
-		// Последнее обновление пользователя
-		$this->db->update_user($this->user);
-
-		// Лог действия
-		$this->db->actlog($this->lng['log_new_del']." #$id", $this->user->id);
-
-		$this->core->js_notify($this->lng['new_success_del'], $this->core->lng['e_success'], true);
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/upload/modules/ajax/register.php b/upload/modules/ajax/register.php
index fa9f3f9..2fcf4c9 100644
--- a/upload/modules/ajax/register.php
+++ b/upload/modules/ajax/register.php
@@ -3,14 +3,14 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->load_language('register');
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->load_language('register');
 	}
 
 	public function content(){
@@ -31,7 +31,11 @@
 
 		if($login=='default'){ $this->core->js_notify($this->lng['e_exist']); }
 
-		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_users` WHERE login='$login' OR email='$email'");
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+		$ic_f		= $ctables['iconomy']['fields'];
+
+		$query = $this->db->query("SELECT COUNT(*) FROM `{$this->cfg->tabname('users')}` WHERE `{$us_f['login']}`='$login' OR `{$us_f['email']}`='$email'");
 
 		if(!$query){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
 
@@ -67,12 +71,13 @@
 
 		$newdata = $this->db->safesql(json_encode($newdata));
 
-		$gid = ($this->config->main['reg_accept']) ? 1 : 2;
+		$gid = ($this->cfg->main['reg_accept']) ? 1 : 2;
 
 		$notify_message = $this->core->lng['e_success'];
 
-		$insert = $this->db->query("INSERT INTO `mcr_users`
-										(gid, login, email, password, `uuid`, `salt`, `tmp`, ip_create, ip_last, `data`)
+		$insert = $this->db->query("INSERT INTO `{$this->cfg->tabname('users')}`
+										(`{$us_f['group']}`, `{$us_f['login']}`, `{$us_f['email']}`, `{$us_f['pass']}`, `{$us_f['uuid']}`,
+										`{$us_f['salt']}`, `{$us_f['tmp']}`, `{$us_f['ip_create']}`, `{$us_f['ip_last']}`, `{$us_f['data']}`)
 									VALUES
 										('$gid', '$login', '$email', '$password', '$uuid', '$salt', '$tmp', '$ip', '$ip', '$newdata')");
 
@@ -80,8 +85,8 @@
 			
 		$id = $this->db->insert_id();
 
-		$insert1 = $this->db->query("INSERT INTO `mcr_iconomy`
-										(login)
+		$insert1 = $this->db->query("INSERT INTO `{$this->cfg->tabname('iconomy')}`
+										(`{$ic_f['login']}`)
 									VALUES
 										('$login')");
 		if(!$insert1){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
@@ -89,11 +94,11 @@
 		// Лог действия
 		$this->db->actlog($this->lng['log_reg'], $id);
 
-		if($this->config->main['reg_accept']){
+		if($this->cfg->main['reg_accept']){
 			$data_mail = array(
-				"LINK" => $this->config->main['s_root_full'].BASE_URL.'?mode=register&op=accept&key='.$id.'_'.md5($salt),
-				"SITENAME" => $this->config->main['s_name'],
-				"SITEURL" => $this->config->main['s_root_full'].BASE_URL,
+				"LINK" => $this->cfg->main['s_root_full'].BASE_URL.'?mode=register&op=accept&key='.$id.'_'.md5($salt),
+				"SITENAME" => $this->cfg->main['s_name'],
+				"SITEURL" => $this->cfg->main['s_root_full'].BASE_URL,
 				"LNG" => $this->lng,
 			);
 
diff --git a/upload/modules/auth.php b/upload/modules/auth.php
index 0bd934f..62d81db 100644
--- a/upload/modules/auth.php
+++ b/upload/modules/auth.php
@@ -3,14 +3,13 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $user, $config, $lng;
-	public $cfg = array();
+	private $core, $db, $user, $cfg, $lng;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->lng		= $core->lng_m;
 	}
 
@@ -22,27 +21,31 @@
 		$login = $this->db->safesql($_POST['login']);
 		$remember = (isset($_POST['remember']) && intval($_POST['remember'])==1) ? true : false;
 
-		$query = $this->db->query("SELECT `u`.id, `u`.password, `u`.`salt`, `u`.`data`,
-											`g`.`permissions`
-									FROM `mcr_users` AS `u`
-									INNER JOIN `mcr_groups` AS `g`
-										ON `g`.id=`u`.gid
-									WHERE `u`.login='$login'
+		$ctables	= $this->cfg->db['tables'];
+		$ug_f		= $ctables['ugroups']['fields'];
+		$us_f		= $ctables['users']['fields'];
+
+		$query = $this->db->query("SELECT `u`.`{$us_f['id']}`, `u`.`{$us_f['pass']}`, `u`.`{$us_f['salt']}`, `u`.`{$us_f['data']}`,
+											`g`.`{$ug_f['perm']}`
+									FROM `{$this->cfg->tabname('users')}` AS `u`
+									INNER JOIN `{$this->cfg->tabname('ugroups')}` AS `g`
+										ON `g`.`{$ug_f['id']}`=`u`.`{$us_f['group']}`
+									WHERE `u`.`{$us_f['login']}`='$login' OR `u`.`{$us_f['email']}`='$login'
 									LIMIT 1");
 
 		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->lng['e_wrong_pass']); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		$uid = intval($ar['id']);
+		$uid = intval($ar[$us_f['id']]);
 
-		$password = $this->core->gen_password($_POST['password'], $ar['salt']);
+		$password = $this->core->gen_password($_POST['password'], $ar[$us_f['salt']]);
 
-		if($ar['password']!==$password){ $this->core->notify($this->core->lng["e_msg"], $this->lng['e_wrong_pass']); }
+		if($ar[$us_f['pass']]!==$password){ $this->core->notify($this->core->lng["e_msg"], $this->lng['e_wrong_pass']); }
 
-		$permissions = json_decode($ar['permissions'], true);
+		$permissions = json_decode($ar[$ug_f['perm']], true);
 
-		$data = json_decode($ar['data']);
+		$data = json_decode($ar[$us_f['data']]);
 
 		$new_data = array(
 			"time_create" => intval($data->time_create),
@@ -57,16 +60,16 @@
 		$new_data = $this->db->safesql(json_encode($new_data));
 		$new_ip = $this->user->ip;
 
-		$update = $this->db->query("UPDATE `mcr_users`
-									SET `tmp`='$new_tmp', ip_last='$new_ip', `data`='$new_data'
-									WHERE login='$login' AND password='$password'
+		$update = $this->db->query("UPDATE `{$this->cfg->tabname('users')}`
+									SET `{$us_f['tmp']}`='$new_tmp', `{$us_f['ip_last']}`='$new_ip', `{$us_f['data']}`='$new_data'
+									WHERE `{$us_f['id']}`='$uid' AND `{$us_f['pass']}`='$password'
 									LIMIT 1");
 
 		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical']); }
 
 		if(!@$permissions['sys_auth']){ $this->core->notify($this->core->lng['403'], $this->lng['e_access'], 2, '?mode=403'); }
 
-		$new_hash = $uid.$new_tmp.$new_ip.md5($this->config->main['mcr_secury']);
+		$new_hash = $uid.$new_tmp.$new_ip.md5($this->cfg->main['mcr_secury']);
 
 		$new_hash = $uid.'_'.md5($new_hash);
 
diff --git a/upload/modules/close.php b/upload/modules/close.php
index 2988bd9..9c1bc4f 100644
--- a/upload/modules/close.php
+++ b/upload/modules/close.php
@@ -3,13 +3,12 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $user, $lng;
-	public $cfg = array();
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->user		= $core->user;
 		$this->lng		= $core->lng_m;
 
@@ -22,14 +21,14 @@
 
 	public function content(){
 
-		if(!$this->config->func['close']){ $this->core->notify(); }
+		if(!$this->cfg->func['close']){ $this->core->notify(); }
 
 		$time = time();
 
-		if($this->config->func['close_time']<=0){
+		if($this->cfg->func['close_time']<=0){
 			$for_time = $this->lng['time_for1'];
 		}else{
-			$for_time = $this->lng['time_for2'].' '.date('H:i:s - d.m.Y', $this->config->func['close_time']);
+			$for_time = $this->lng['time_for2'].' '.date('H:i:s - d.m.Y', $this->cfg->func['close_time']);
 		}
 
 		$data = array(
diff --git a/upload/modules/file.php b/upload/modules/file.php
index 14d252a..6f75b8b 100644
--- a/upload/modules/file.php
+++ b/upload/modules/file.php
@@ -3,15 +3,14 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $user, $lng;
-	public $cfg = array();
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		$bc = array(
 			$this->lng['mod_name'] => BASE_URL."?mode=file"
diff --git a/upload/modules/logout.php b/upload/modules/logout.php
index fb597c0..b037cd7 100644
--- a/upload/modules/logout.php
+++ b/upload/modules/logout.php
@@ -3,13 +3,13 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $user, $lng;
-	public $cfg = array();
+	private $core, $db, $user, $lng, $cfg;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
+		$this->cfg		= $core->cfg;
 		$this->lng		= $core->lng_m;
 	}
 
@@ -36,7 +36,10 @@
 		$new_data = $this->db->safesql(json_encode($new_data));
 		$new_tmp = $this->db->safesql($this->core->random(16));
 
-		$update = $this->db->query("UPDATE `mcr_users` SET `tmp`='$new_tmp', `data`='$new_data' WHERE id='{$this->user->id}' LIMIT 1");
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
+		$update = $this->db->query("UPDATE `{$this->cfg->tabname('users')}` SET `{$us_f['tmp']}`='$new_tmp', `{$us_f['data']}`='$new_data' WHERE `{$us_f['id']}`='{$this->user->id}' LIMIT 1");
 
 		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical']); }
 
diff --git a/upload/modules/news.php b/upload/modules/news.php
index 23d8c70..f47c7e0 100644
--- a/upload/modules/news.php
+++ b/upload/modules/news.php
@@ -3,13 +3,12 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $user, $lng;
-	public $cfg = array();
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->user		= $core->user;
 		$this->lng		= $core->lng_m;
 
@@ -55,8 +54,8 @@
 
 	private function news_array($cid=false){
 
-		$start		= $this->core->pagination($this->config->pagin['news'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['news']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['news'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['news']; // Set end pagination
 
 		$where		= "";
 
@@ -140,7 +139,7 @@
 		$ar = $this->db->fetch_array($query);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['news'], $page, $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['news'], $page, $ar[0]),
 			"NEWS" => $this->news_array($cid)
 		);
 
@@ -154,17 +153,21 @@
 			return $this->core->sp(MCR_THEME_MOD."news/comments/comment-access.html");
 		}
 
-		$start		= $this->core->pagination($this->config->pagin['comments'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['comments']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['comments'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['comments']; // Set end pagination
+
+		$ctables	= $this->cfg->db['tables'];
+		$ug_f		= $ctables['ugroups']['fields'];
+		$us_f		= $ctables['users']['fields'];
 
 		$query = $this->db->query("SELECT `c`.id, `c`.text_html, `c`.uid, `c`.`data`,
-										`u`.login, `u`.`color`,
-										`g`.`color` AS `gcolor`
+										`u`.`{$us_f['login']}`, `u`.`{$us_f['color']}`,
+										`g`.`{$ug_f['color']}` AS `gcolor`
 									FROM `mcr_comments` AS `c`
-									LEFT JOIN `mcr_users` AS `u`
-										ON `u`.id=`c`.uid
-									LEFT JOIN `mcr_groups` AS `g`
-										ON `g`.id=`u`.gid
+									LEFT JOIN `{$this->cfg->tabname('users')}` AS `u`
+										ON `u`.`{$us_f['id']}`=`c`.uid
+									LEFT JOIN `{$this->cfg->tabname('ugroups')}` AS `g`
+										ON `g`.`{$ug_f['id']}`=`u`.`{$us_f['group']}`
 									WHERE `c`.nid='$nid'
 									ORDER BY `c`.id DESC
 									LIMIT $start, $end");
@@ -198,9 +201,9 @@
 				$act_get = $this->core->sp(MCR_THEME_MOD."news/comments/comment-act-get.html", $data);
 			}
 
-			$login = (is_null($ar['login'])) ? 'Пользователь удален' : $this->db->HSC($ar['login']);
+			$login = (is_null($ar[$us_f['login']])) ? 'Пользователь удален' : $this->db->HSC($ar[$us_f['login']]);
 
-			$color = (!empty($ar['color'])) ? $this->db->HSC($ar['color']) : $this->db->HSC($ar['gcolor']);
+			$color = (!empty($ar[$us_f['color']])) ? $this->db->HSC($ar['color']) : $this->db->HSC($ar[$us_f['color']]);
 
 			$com_data	= array(
 				"ID"				=> $id,
@@ -246,7 +249,7 @@
 		$count = intval($ar[0]);
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['comments'], $page, $count),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['comments'], $page, $count),
 			"COMMENTS" => $this->comments_array($nid),
 			"COUNT" => $count,
 			"COMMENTS_FORM"	=> $this->get_comment_form()
diff --git a/upload/modules/profile.php b/upload/modules/profile.php
index 01f5d18..716018a 100644
--- a/upload/modules/profile.php
+++ b/upload/modules/profile.php
@@ -3,15 +3,14 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $user, $lng;
-	public $cfg = array();
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng_m;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->cfg		= $core->cfg;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		$bc = array(
 			$this->lng['mod_name'] => BASE_URL."?mode=profile"
@@ -37,8 +36,11 @@
 			require_once(MCR_TOOL_PATH.'cloak.class.php');
 			$cloak = new cloak($this->core, $cloak);
 		}
+
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
 		
-		$update = $this->db->query("UPDATE `mcr_users` SET is_skin='0' WHERE id='{$this->user->id}'");
+		$update = $this->db->query("UPDATE `{$this->cfg->tabname('users')}` SET `{$us_f['is_skin']}`='0' WHERE `{$us_f['id']}`='{$this->user->id}'");
 		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical']); }
 
 		// Лог действия
@@ -69,8 +71,11 @@
 
 			$skin = new skin($this->core, $skin);
 		}
+
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
 		
-		$update = $this->db->query("UPDATE `mcr_users` SET is_cloak='0' WHERE id='{$this->user->id}'");
+		$update = $this->db->query("UPDATE `{$this->cfg->tabname('users')}` SET `{$us_f['is_cloak']}`='0' WHERE `{$us_f['id']}`='{$this->user->id}'");
 		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical']); }
 
 		// Лог действия
@@ -95,7 +100,10 @@
 			$cloak = new cloak($this->core, $cloak);
 		}
 
-		$update = $this->db->query("UPDATE `mcr_users` SET is_skin='1' WHERE id='{$this->user->id}'");
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
+		$update = $this->db->query("UPDATE `{$this->cfg->tabname('users')}` SET `{$us_f['is_skin']}`='1' WHERE `{$us_f['id']}`='{$this->user->id}'");
 
 		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical']); }
 
@@ -109,7 +117,10 @@
 		require_once(MCR_TOOL_PATH.'cloak.class.php');
 		$cloak = new cloak($this->core, $_FILES['cloak']); // create new cloak in folder
 
-		$update = $this->db->query("UPDATE `mcr_users` SET is_cloak='1' WHERE id='{$this->user->id}'");
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
+		$update = $this->db->query("UPDATE `{$this->cfg->tabname('users')}` SET `{$us_f['is_cloak']}`='1' WHERE `{$us_f['id']}`='{$this->user->id}'");
 
 		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical']); }
 
@@ -156,9 +167,12 @@
 
 		$newdata = $this->db->safesql(json_encode($newdata));
 
-		$update = $this->db->query("UPDATE `mcr_users`
-									SET `password`='$newpass', `salt`='$newsalt', ip_last='{$this->user->ip}', `data`='$newdata'
-									WHERE id='{$this->user->id}'");
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
+		$update = $this->db->query("UPDATE `{$this->cfg->tabname('users')}`
+									SET `{$us_f['pass']}`='$newpass', `{$us_f['salt']}`='$newsalt', `{$us_f['ip_last']}`='{$this->user->ip}', `{$us_f['data']}`='$newdata'
+									WHERE `{$us_f['id']}`='{$this->user->id}'");
 
 		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical'], 2, '?mode=profile'); }
 
diff --git a/upload/modules/register.php b/upload/modules/register.php
index 64a1a6a..788c845 100644
--- a/upload/modules/register.php
+++ b/upload/modules/register.php
@@ -3,14 +3,13 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $lng, $user;
-	public $cfg = array();
+	private $core, $db, $cfg, $lng, $user;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->lng		= $core->lng_m;
 
 		$bc = array(
@@ -43,7 +42,10 @@
 
 		$key = $array[1];
 
-		$query = $this->db->query("SELECT `salt`, `data` FROM `mcr_users` WHERE id='$uid' AND gid='1'");
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
+		$query = $this->db->query("SELECT `{$us_f['salt']}`, `{$us_f['data']}` FROM `{$this->cfg->tabname('users')}` WHERE `{$us_f['id']}`='$uid' AND `{$us_f['group']}`='1'");
 
 		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical'], 1, "?mode=register"); }
 
@@ -64,9 +66,9 @@
 
 		$newdata = $this->db->safesql(json_encode($newdata));
 
-		$update = $this->db->query("UPDATE `mcr_users`
-									SET gid='2', ip_last='{$this->user->ip}', `data`='$newdata'
-									WHERE id='$uid' AND gid='1'");
+		$update = $this->db->query("UPDATE `{$this->cfg->tabname('users')}`
+									SET `{$us_f['group']}`='2', `{$us_f['ip_last']}`='{$this->user->ip}', `{$us_f['data']}`='$newdata'
+									WHERE `{$us_f['id']}`='$uid' AND `{$us_f['group']}`='1'");
 
 		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical'], 1, "?mode=register"); }
 
diff --git a/upload/modules/restore.php b/upload/modules/restore.php
index f1c65db..04af34f 100644
--- a/upload/modules/restore.php
+++ b/upload/modules/restore.php
@@ -3,12 +3,12 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $lng, $user;
+	private $core, $db, $cfg, $lng, $user;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->user		= $core->user;
 		$this->lng		= $core->lng_m;
 
@@ -20,10 +20,12 @@
 	}
 
 	private function check_exist($value='', $email=false){
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
 
-		$selector = (!$email) ? "login='$value'" : "email='$value'";
+		$selector = (!$email) ? "`{$us_f['login']}`='$value'" : "`{$us_f['email']}`='$value'";
 
-		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_users` WHERE $selector");
+		$query = $this->db->query("SELECT COUNT(*) FROM `{$this->cfg->tabname('users')}` WHERE $selector");
 
 		if(!$query){ return true; }
 
@@ -46,19 +48,22 @@
 
 			if(empty($email)){ $this->core->notify($this->core->lng['e_msg'], $this->lng['invalid_email'], 1, "?mode=restore"); }
 
-			$query = $this->db->query("SELECT `id`, `tmp` FROM `mcr_users` WHERE email='$email'");
+			$ctables	= $this->cfg->db['tables'];
+			$us_f		= $ctables['users']['fields'];
+
+			$query = $this->db->query("SELECT `{$us_f['id']}`, `{$us_f['tmp']}` FROM `{$this->cfg->tabname('users')}` WHERE `{$us_f['email']}`='$email'");
 
 			if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng['e_msg'], $this->lng['email_not_found'], 1, "?mode=restore"); }
 
 			$ar = $this->db->fetch_assoc($query);
 
-			$id = intval($ar['id']);
-			$tmp = md5($ar['tmp']);
+			$id = intval($ar[$us_f['id']]);
+			$tmp = md5($ar[$us_f['tmp']]);
 
 			$data = array(
-				"LINK" => $this->config->main['s_root_full'].BASE_URL.'?mode=restore&op=accept&key='.$id.'_'.$tmp,
-				"SITENAME" => $this->config->main['s_name'],
-				"SITEURL" => $this->config->main['s_root_full'].BASE_URL
+				"LINK" => $this->cfg->main['s_root_full'].BASE_URL.'?mode=restore&op=accept&key='.$id.'_'.$tmp,
+				"SITENAME" => $this->cfg->main['s_name'],
+				"SITEURL" => $this->cfg->main['s_root_full'].BASE_URL
 			);
 
 			$message = $this->core->sp(MCR_THEME_PATH."modules/restore/body.mail.html", $data);
@@ -87,13 +92,16 @@
 
 		$key = $array[1];
 
-		$query = $this->db->query("SELECT `tmp`, `data` FROM `mcr_users` WHERE id='$uid'");
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
+		$query = $this->db->query("SELECT `{$us_f['tmp']}`, `{$us_f['data']}` FROM `{$this->cfg->tabname('users')}` WHERE `{$us_f['id']}`='$uid'");
 
 		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical'], 1, "?mode=restore"); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		if($key!==md5($ar['tmp'])){ $this->core->notify($this->core->lng['e_msg'], $this->core->lng['e_403'], 2, '?mode=403'); }
+		if($key!==md5($ar[$us_f['tmp']])){ $this->core->notify($this->core->lng['e_msg'], $this->core->lng['e_403'], 2, '?mode=403'); }
 
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 			$newpass = @$_POST['newpass'];
@@ -106,7 +114,7 @@
 
 			$password = $this->core->gen_password($newpass, $salt);
 
-			$data = json_decode($ar['data']);
+			$data = json_decode($ar[$us_f['data']]);
 
 			$newdata = array(
 				"time_create" => $data->time_create,
@@ -119,9 +127,9 @@
 
 			$newdata = $this->db->safesql(json_encode($newdata));
 
-			$update = $this->db->query("UPDATE `mcr_users`
-										SET password='$password', `salt`='$salt', `tmp`='$tmp', ip_last='{$this->user->ip}', `data`='$newdata'
-										WHERE id='$uid'");
+			$update = $this->db->query("UPDATE `{$this->cfg->tabname('users')}`
+										SET `{$us_f['pass']}`='$password', `{$us_f['salt']}`='$salt', `{$us_f['tmp']}`='$tmp', `{$us_f['ip_last']}`='{$this->user->ip}', `{$us_f['data']}`='$newdata'
+										WHERE `{$us_f['id']}`='$uid'");
 
 			if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical'], 1, "?mode=restore"); }
 
diff --git a/upload/modules/search.php b/upload/modules/search.php
index f3217fb..eef826a 100644
--- a/upload/modules/search.php
+++ b/upload/modules/search.php
@@ -3,13 +3,12 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $user, $lng;
-	public $cfg = array();
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->user		= $core->user;
 		$this->lng		= $core->lng_m;
 
diff --git a/upload/modules/search/comments.php b/upload/modules/search/comments.php
index 4155103..e1f7f0a 100644
--- a/upload/modules/search/comments.php
+++ b/upload/modules/search/comments.php
@@ -3,12 +3,12 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->user		= $core->user;
 		$this->lng		= $core->lng_m;
 
@@ -22,17 +22,20 @@
 
 	private function results_array($value){
 
-		$start		= $this->core->pagination($this->config->pagin['search_comments'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['search_comments']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['search_comments'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['search_comments']; // Set end pagination
 		
 		//, `n`.cid, `c`.title AS `category`
 
-		$query = $this->db->query("SELECT `c`.id, `c`.nid, `c`.uid, `c`.text_html, `c`.`data`, `n`.title, `u`.login
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
+		$query = $this->db->query("SELECT `c`.id, `c`.nid, `c`.uid, `c`.text_html, `c`.`data`, `n`.title, `u`.`{$us_f['login']}`
 									FROM `mcr_comments` AS `c`
 									LEFT JOIN `mcr_news` AS `n`
 										ON `n`.id=`c`.nid
-									LEFT JOIN `mcr_users` AS `u`
-										ON `u`.id=`c`.uid
+									LEFT JOIN `{$this->cfg->tabname('users')}` AS `u`
+										ON `u`.`{$us_f['id']}`=`c`.uid
 									WHERE `c`.text_bb LIKE '%$value%'
 									LIMIT $start, $end");
 
@@ -57,7 +60,7 @@
 				"NID"			=> intval($ar['nid']),
 				"UID"			=> intval($ar['uid']),
 				"TITLE"			=> $this->db->HSC($ar['title']),
-				"LOGIN"			=> $this->db->HSC($ar['login']),
+				"LOGIN"			=> $this->db->HSC($ar[$us_f['login']]),
 				"TIME_CREATE"	=> date("d.m.Y в H:i", $data->time_create),
 				//"CID"		=> intval($ar['cid']),
 				//"CATEGORY"	=> $this->db->HSC($ar['category']),
@@ -94,7 +97,7 @@
 		$page = "?mode=search&type=comments&value=$html_value&pid=";
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['search_comments'], $page, $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['search_comments'], $page, $ar[0]),
 			"RESULT" => $this->results_array($safe_value),
 			"QUERY" => $html_value,
 			"QUERY_COUNT" => intval($ar[0])
diff --git a/upload/modules/search/news.php b/upload/modules/search/news.php
index f63b551..c512d96 100644
--- a/upload/modules/search/news.php
+++ b/upload/modules/search/news.php
@@ -3,12 +3,12 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class submodule{
-	private $core, $db, $config, $user, $lng;
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->user		= $core->user;
 		$this->lng		= $core->lng_m;
 
@@ -22,8 +22,8 @@
 
 	private function results_array($value){
 
-		$start		= $this->core->pagination($this->config->pagin['search_news'], 0, 0); // Set start pagination
-		$end		= $this->config->pagin['search_news']; // Set end pagination
+		$start		= $this->core->pagination($this->cfg->pagin['search_news'], 0, 0); // Set start pagination
+		$end		= $this->cfg->pagin['search_news']; // Set end pagination
 		
 		//, `n`.cid, `c`.title AS `category`
 
@@ -92,7 +92,7 @@
 		$page = "?mode=search&type=news&value=$html_value&pid=";
 
 		$data = array(
-			"PAGINATION" => $this->core->pagination($this->config->pagin['search_news'], $page, $ar[0]),
+			"PAGINATION" => $this->core->pagination($this->cfg->pagin['search_news'], $page, $ar[0]),
 			"RESULT" => $this->results_array($safe_value),
 			"QUERY" => $html_value,
 			"QUERY_COUNT" => intval($ar[0])
diff --git a/upload/modules/statics.php b/upload/modules/statics.php
index d172abf..6cd077e 100644
--- a/upload/modules/statics.php
+++ b/upload/modules/statics.php
@@ -3,13 +3,12 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $user, $lng;
-	public $cfg = array();
+	private $core, $db, $cfg, $user, $lng;
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
-		$this->config	= $core->config;
+		$this->cfg		= $core->cfg;
 		$this->user		= $core->user;
 		$this->lng		= $core->lng_m;
 
@@ -22,21 +21,24 @@
 
 	public function content(){
 
-		if(!isset($_GET['id']) || empty($_GET['id'])){ $this->core->notify($this->core->lng['403'], $this->lng['e_403']); }
+		if(!isset($_GET['id']) || empty($_GET['id'])){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$uniq = $this->db->safesql(@$_GET['id']);
 
+		$ctables	= $this->cfg->db['tables'];
+		$us_f		= $ctables['users']['fields'];
+
 		$query = $this->db->query("SELECT `s`.title, `s`.text_html, `s`.uid, `s`.`permissions`, `s`.`data`,
-											`u`.login
+											`u`.`{$us_f['login']}`
 									FROM `mcr_statics` AS `s`
-									LEFT JOIN `mcr_users` AS `u`
-										ON `u`.id=`s`.uid
+									LEFT JOIN `{$this->cfg->tabname('users')}` AS `u`
+										ON `u`.`{$us_f['id']}`=`s`.uid
 									WHERE `s`.`uniq`='$uniq'");
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng['403'], $this->lng['e_403']); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		if(!$this->core->is_access($ar['permissions'])){ $this->core->notify($this->core->lng['403'], $this->lng['e_403']); }
+		if(!$this->core->is_access($ar['permissions'])){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$uniq = $this->db->HSC($uniq);
 		$title = $this->db->HSC($ar['title']);
@@ -52,7 +54,7 @@
 			"TITLE" => $this->db->HSC($ar['title']),
 			"TEXT" => $ar['text_html'],
 			"UID" => intval($ar['uid']),
-			"LOGIN" => $this->db->HSC($ar['login']),
+			"LOGIN" => $this->db->HSC($ar[$us_f['login']]),
 			"DATA" => json_decode($ar['data'], true),
 
 		);
diff --git a/upload/system.php b/upload/system.php
index fdeee42..a199b92 100644
--- a/upload/system.php
+++ b/upload/system.php
@@ -8,7 +8,7 @@
 
 // System constants
 define('PROGNAME', 'WebMCR Reloaded'. MCR);
-define('VERSION', 'WebMCR Beta 1.3.6');
+define('VERSION', 'WebMCR Beta 1.3.7');
 define('FEEDBACK', '<a href="http://webmcr.com" target="_blank">'.PROGNAME.'</a> &copy; 2013-'.date("Y").' Qexy'); 
 define('MCR_ROOT', dirname(__FILE__).'/');
 define('MCR_MODE_PATH', MCR_ROOT.'modules/');
@@ -19,8 +19,6 @@
 define('MCR_LANG_PATH', MCR_ROOT.'language/');
 define('MCR_CONF_PATH', MCR_ROOT.'configs/');
 define('MCR_UPL_PATH', MCR_ROOT.'uploads/');
-define('MCR_SKIN_PATH', MCR_UPL_PATH.'skins/');
-define('MCR_CLOAK_PATH', MCR_UPL_PATH.'cloaks/');
 define('MCR_CACHE_PATH', MCR_ROOT.'cache/');
 
 session_save_path(MCR_UPL_PATH.'tmp');
@@ -36,8 +34,8 @@
 $core = new core();
 
 // Debug
-ini_set("display_errors", $core->config->main['debug']);
-$warn_type = ($core->config->main['debug']) ? E_ALL : 0;
+ini_set("display_errors", $core->cfg->main['debug']);
+$warn_type = ($core->cfg->main['debug']) ? E_ALL : 0;
 error_reporting($warn_type);
 
 $meta_json_data = array(
diff --git a/upload/themes/default/blocks/banner/header.html b/upload/themes/default/blocks/banner/header.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/upload/themes/default/blocks/banner/header.html
diff --git a/upload/themes/default/blocks/monitor/header.html b/upload/themes/default/blocks/monitor/header.html
new file mode 100644
index 0000000..1a974ef
--- /dev/null
+++ b/upload/themes/default/blocks/monitor/header.html
@@ -0,0 +1,2 @@
+<link href="<?php echo STYLE_URL; ?>css/blocks/monitor/main.css" rel="stylesheet" media="screen">
+<script src="<?php echo STYLE_URL; ?>js/blocks/monitor/main.js"></script>
\ No newline at end of file
diff --git a/upload/themes/default/blocks/notify/header.html b/upload/themes/default/blocks/notify/header.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/upload/themes/default/blocks/notify/header.html
diff --git a/upload/themes/default/blocks/online/header.html b/upload/themes/default/blocks/online/header.html
new file mode 100644
index 0000000..059937b
--- /dev/null
+++ b/upload/themes/default/blocks/online/header.html
@@ -0,0 +1,2 @@
+<link href="<?php echo STYLE_URL; ?>css/blocks/online/main.css" rel="stylesheet" media="screen">
+<script src="<?php echo STYLE_URL; ?>js/blocks/online/main.js"></script>
\ No newline at end of file
diff --git a/upload/themes/default/blocks/online/main.html b/upload/themes/default/blocks/online/main.html
new file mode 100644
index 0000000..a4b33cf
--- /dev/null
+++ b/upload/themes/default/blocks/online/main.html
@@ -0,0 +1,19 @@
+<div class="form-block">
+
+	<div class="block-header"><?php echo $this->lng_b['block_name']; ?></div>
+
+	<div class="block-line"></div>
+
+	<div class="block-content">
+		<div class="block-online">
+			<div class="title"><?php echo $this->lng_b['online_now']; ?></div>
+			<div id="onl_list"><?php echo $this->lng_b['loading']; ?></div>
+			<div id="onl_count">
+				<p><?php echo $this->lng_b['count_all']; ?>: <span id="onl_all">0</span></p>
+				<p><?php echo $this->lng_b['users']; ?>: <span id="onl_users">0</span>, <?php echo $this->lng_b['guests']; ?>: <span id="onl_guests">0</span></p>
+			</div>
+
+		</div>
+	</div>
+
+</div>
\ No newline at end of file
diff --git a/upload/themes/default/blocks/profile/auth.html b/upload/themes/default/blocks/profile/auth.html
index 52b3b06..f35b881 100644
--- a/upload/themes/default/blocks/profile/auth.html
+++ b/upload/themes/default/blocks/profile/auth.html
@@ -6,7 +6,7 @@
 
 	<div class="block-content">
 		<form class="block-profile" method="post" action="<?php echo BASE_URL; ?>?mode=logout">
-			<div class="avatar"><img src="<?php echo BASE_URL; ?>uploads/skins/interface/<?php echo $this->user->skin; ?>_mini.png?<?php echo mt_rand(1000,9999); ?>" class="img-polaroid"></div>
+			<div class="avatar"><img src="<?php echo SKIN_URL; ?>interface/<?php echo $this->user->skin; ?>_mini.png?<?php echo mt_rand(1000,9999); ?>" class="img-polaroid"></div>
 			<ul class="info">
 				<li><i class="icon-user"></i> <b><?php echo $this->lng_b['login']; ?>:</b> <?php echo $this->user->login_v2; ?></li>
 				<li><i class="icon-list-alt"></i> <b><?php echo $this->lng_b['group']; ?>:</b> <?php echo $this->user->group_v2; ?></li>
diff --git a/upload/themes/default/blocks/profile/header.html b/upload/themes/default/blocks/profile/header.html
new file mode 100644
index 0000000..bd529c1
--- /dev/null
+++ b/upload/themes/default/blocks/profile/header.html
@@ -0,0 +1,2 @@
+<link href="<?php echo STYLE_URL; ?>css/blocks/profile/main.css" rel="stylesheet" media="screen">
+<!--<script src="<?php echo STYLE_URL; ?>js/blocks/profile/main.js"></script>-->
\ No newline at end of file
diff --git a/upload/themes/default/blocks/profile/unauth.html b/upload/themes/default/blocks/profile/unauth.html
index 4dcad10..a3b1ee7 100644
--- a/upload/themes/default/blocks/profile/unauth.html
+++ b/upload/themes/default/blocks/profile/unauth.html
@@ -8,7 +8,7 @@
 		<form method="post" class="block-auth" action="<?php echo BASE_URL; ?>?mode=auth">
 			<div class="input-prepend">
 				<span class="add-on"><i class="icon-user"></i></span>
-				<input type="text" name="login" autofocus placeholder="<?php echo $this->lng_b['login']; ?>">
+				<input type="text" name="login" autofocus placeholder="<?php echo $this->lng_b['login_or_email']; ?>">
 			</div>
 
 			<div class="input-prepend">
diff --git a/upload/themes/default/captcha/recaptcha.html b/upload/themes/default/captcha/recaptcha.html
index 3ad3eb4..fa9bb80 100644
--- a/upload/themes/default/captcha/recaptcha.html
+++ b/upload/themes/default/captcha/recaptcha.html
@@ -1,5 +1,5 @@
 <div class="control-group">
 	<div class="controls">
-		<div class="g-recaptcha" data-sitekey="<?php echo $this->config->main['rc_public']; ?>"></div>
+		<div class="g-recaptcha" data-sitekey="<?php echo $this->cfg->main['rc_public']; ?>"></div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/upload/themes/default/css/blocks/monitor/main.css b/upload/themes/default/css/blocks/monitor/main.css
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/upload/themes/default/css/blocks/monitor/main.css
diff --git a/upload/themes/default/css/blocks/online/main.css b/upload/themes/default/css/blocks/online/main.css
new file mode 100644
index 0000000..221426e
--- /dev/null
+++ b/upload/themes/default/css/blocks/online/main.css
@@ -0,0 +1,25 @@
+.block-online > .title {
+	border-bottom: 1px solid #eee;
+	margin-bottom: 5px;
+	font-weight: bold;
+	color: #888;
+}
+
+.block-online > #onl_list {
+	border-bottom: 1px solid #eee;
+	padding-bottom: 5px;
+	color: #aaa;
+}
+
+.block-online > #onl_count {
+	color: #888;
+	font-weight: bold;
+}
+
+.block-online > #onl_count p {
+	margin: 0px;
+}
+
+.block-online > #onl_count span {
+	margin-left: 3px;
+}
\ No newline at end of file
diff --git a/upload/themes/default/css/blocks/profile/main.css b/upload/themes/default/css/blocks/profile/main.css
new file mode 100644
index 0000000..259f944
--- /dev/null
+++ b/upload/themes/default/css/blocks/profile/main.css
@@ -0,0 +1,5 @@
+.form-block .block-content .block-profile { text-align: center; /* border: 1px solid; */ }
+.form-block .block-content .block-profile .avatar { display: inline-block; vertical-align: top; }
+.form-block .block-content .block-profile .avatar img { width: 128px; height: 128px; }
+.form-block .block-content .block-profile .info { text-align: left; display: inline-block; vertical-align: top; list-style: none; margin: 0px; margin-left: 20px; width: 50%; }
+.form-block .block-content .block-profile .info li { margin-bottom: 6px; }
\ No newline at end of file
diff --git a/upload/themes/default/css/global.css b/upload/themes/default/css/global.css
index e8bd677..0192cec 100644
--- a/upload/themes/default/css/global.css
+++ b/upload/themes/default/css/global.css
@@ -414,12 +414,6 @@
 .form-block .block-content .block-auth .checkbox { width: 60%; margin: auto; }
 .form-block .block-content .block-auth .buttons { text-align: center; margin-top: 8px; }
 
-.form-block .block-content .block-profile { text-align: center; /* border: 1px solid; */ }
-.form-block .block-content .block-profile .avatar { display: inline-block; vertical-align: top; }
-.form-block .block-content .block-profile .avatar img { width: 128px; height: 128px; }
-.form-block .block-content .block-profile .info { text-align: left; display: inline-block; vertical-align: top; list-style: none; margin: 0px; margin-left: 20px; width: 50%; }
-.form-block .block-content .block-profile .info li { margin-bottom: 6px; }
-
 .form-block.block-notify .block-content .alert,
 .main-content .alert.ajx { margin-bottom: 0px; }
 .main-content .alert.ajx { margin-top: 10px; }
diff --git a/upload/themes/default/global.html b/upload/themes/default/global.html
index 06b9a4a..92e3804 100644
--- a/upload/themes/default/global.html
+++ b/upload/themes/default/global.html
@@ -89,7 +89,7 @@
 	</div>
 </div>
 
-<div id="js-loader" title="Загрузка..."><img src="<?php echo STYLE_URL; ?>img/loading.gif" alt="Loading..." /></div>
+<div id="js-loader" title="<?php echo $this->lng['loading']; ?>"><img src="<?php echo STYLE_URL; ?>img/loading.gif" alt="<?php echo $this->lng['loading']; ?>" /></div>
 
 <div class="navbar navbar-fixed-bottom">
 	<div class="navbar-inner">
diff --git a/upload/themes/default/js/admin/global.js b/upload/themes/default/js/admin/global.js
deleted file mode 100644
index 5475d3c..0000000
--- a/upload/themes/default/js/admin/global.js
+++ /dev/null
@@ -1,27 +0,0 @@
-$(function(){
-	var search_param = mcr.getUrlParam('search');
-
-	if(search_param!=''){
-		$($('.adm-search').attr('data-for')).val(search_param);
-	}
-
-	$('body').on('click', '.adm-search', function(){
-
-		var elem = $(this).attr('data-for');
-
-		var val = $(elem).val();
-
-		if($.trim(val)==''){ mcr.changeUrlParam({search: false}); return false; }
-
-		mcr.changeUrlParam({search: val, pid: false});
-
-		return false;
-	});
-
-	$('.adm-search-input').on('keydown', function(e){
-		if(e.which == 13){
-			$(".adm-search").trigger("click");
-			return false;
-		}
-	});
-});
\ No newline at end of file
diff --git a/upload/themes/default/js/admin/info-extensions.js b/upload/themes/default/js/admin/info-extensions.js
deleted file mode 100644
index 3cb303f..0000000
--- a/upload/themes/default/js/admin/info-extensions.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function load_extensions(){
-
-	$.ajax({
-		url: "http://api.webmcr.com/?do=extensions&limit=12",
-		beforeSend: function(){ $(".adm-info-modules .thumbnails").html($.mcr.loader); },
-		dataType: "json",
-		success: function(json){
-			$(".adm-info-modules .thumbnails").text('');
-
-			if(json.type=='success'){
-				var len = json.data.length;
-
-				for(var i = 0; i < len; i++){
-
-					var ar = json.data[i];
-
-					var btn_name = (ar.pay.status) ? lng_ie.buy+' ('+ar.pay.price+' р.)' : lng_ie.download;
-
-					$(".adm-info-modules .thumbnails").append('<li class="span4"><div class="thumbnail"><img data-src="holder.js/150x100" src="'
-						+ ar.img + '" alt="img"><div class="title">'
-						+ ar.title + '</div><div class="read-more"><a href="'
-						+ ar.url.full + '" class="btn btn-block" target="_blank">'+lng_ie.readmore+'</a></div><div class="get-link"><a href="'
-						+ ar.url.get + '" class="btn btn-block btn-info" target="_blank">'+btn_name+'</a></div></div></li>');
-				}
-			}else{
-				$(".adm-info-modules .thumbnails").text(json.message);
-			}
-		}
-	});
-}
-
-$(function(){
-
-	if(!navigator.onLine){ notify(lng.error, lng_ie.e_connection, 1); return; }
-
-	$(".adm-info-modules .thumbnails").html("∞");
-
-	load_extensions();
-
-});
diff --git a/upload/themes/default/js/admin/info-main.js b/upload/themes/default/js/admin/info-main.js
deleted file mode 100644
index 8fe7cdf..0000000
--- a/upload/themes/default/js/admin/info-main.js
+++ /dev/null
@@ -1,68 +0,0 @@
-function load_last_version(){
-
-	$.ajax({
-		url: "http://api.webmcr.com/?do=versions&limit=1",
-		beforeSend: function(){ $("#api-engine-version").html(mcr.loader); },
-		dataType: "json",
-		success: function(json){
-			data = json.data[0];
-			if(json.type=='success'){
-				$("#api-engine-version").text(data.title+' '+data.version);
-			}else{
-				$("#api-engine-version").text(json.message);
-			}
-		}
-	});
-}
-
-function load_last_news(){
-
-	$.ajax({
-		url: "http://api.webmcr.com/?do=news&limit=1",
-		beforeSend: function(){ $("#api-engine-news").html(mcr.loader); },
-		dataType: "json",
-		error: function(data){
-			console.log(data);
-		},
-		success: function(json){
-			data = json.data[0];
-			if(json.type=='success'){
-				$("#api-engine-news").html('<p><b>'+data.title+'</b></p>'+data.text+'<p><span class="label">'+data.created+'</span></p>');
-			}else{
-				$("#api-engine-news").text(json.message);
-			}
-		}
-	});
-}
-
-function load_git_version(){
-	$.getJSON("https://api.github.com/repos/qexyorg/WebMCR/releases", function(json){
-
-		if($.isEmptyObject(json)){ return; }
-
-		$('#git-engine-version').html('<a href="'+json[0]['html_url']+'" target="_blank">'+json[0]['tag_name']+'</a>');
-	});
-}
-
-
-function load_git_dev_version(){
-	$.getJSON("https://api.github.com/repos/qexyorg/WebMCR/tags", function(json){
-
-		if($.isEmptyObject(json)){ return; }
-
-		$('#git-dev-version').html('<a href="'+json[0]['zipball_url']+'" target="_blank">'+json[0]['name']+'</a>');
-	});
-}
-
-$(function(){
-
-	if(!navigator.onLine){ notify(lng.error, lng_im.e_connection, 1); return; }
-
-	$("#api-engine-news, #api-engine-version, #git-engine-version, #git-dev-version").html("∞");
-
-	load_last_news();
-	load_last_version();
-	load_git_version();
-	load_git_dev_version();
-
-});
diff --git a/upload/themes/default/js/admin/permissions.js b/upload/themes/default/js/admin/permissions.js
deleted file mode 100644
index 1f552d8..0000000
--- a/upload/themes/default/js/admin/permissions.js
+++ /dev/null
@@ -1,24 +0,0 @@
-$(function(){
-	$('#perm-type').on("change", function(){
-
-		switch($(this).val()){
-			case 'boolean':
-				$('#perm-default').html('<select name="default" class="span8"><option value="false">FALSE</option><option value="true">TRUE</option></select>');
-			break;
-
-			case 'integer':
-				$('#perm-default').html('<input type="text" class="span8" name="default" value="1" id="inputDefault" placeholder="'+lng_per.default_val+'">');
-			break;
-
-			case 'float':
-				$('#perm-default').html('<input type="text" class="span8" name="default" value="1.5" id="inputDefault" placeholder="'+lng_per.default_val+'">');
-			break;
-
-			case 'string':
-				$('#perm-default').html('<input type="text" class="span8" name="default" value="string" id="inputDefault" placeholder="'+lng_per.default_val+'">');
-			break;
-
-			default: return false; break;
-		}
-	});
-});
\ No newline at end of file
diff --git a/upload/themes/default/js/blocks/monitor/main.js b/upload/themes/default/js/blocks/monitor/main.js
new file mode 100644
index 0000000..00f815d
--- /dev/null
+++ b/upload/themes/default/js/blocks/monitor/main.js
@@ -0,0 +1,49 @@
+function init_monitoring(){
+
+	if($('.monitor-id').length<=0){ return; }
+
+	mcr.loading();
+
+	var formdata = new FormData();
+		
+	formdata.append('mcr_secure', mcr.meta_data.secure);
+
+	$.ajax({
+		url: "index.php?mode=ajax&do=monitoring",
+		dataType: "json",
+		type: 'POST',
+		contentType: false,
+		processData: false,
+		data: formdata,
+		error: function(data){
+			mcr.logger(data);
+			mcr.notify(lng.error, lng.e_monitor);
+		},
+
+		success: function(data){
+
+			if(!data._type){ return mcr.notify(data._title, data._message); }
+
+			if(data._data.length<=0){ return mcr.loading(false); }
+
+			$.each(data._data, function(key, ar){
+				$('.monitor-id#'+ar.id+' .progress-bar').css('width', ar.progress+'%').removeClass('progress-bar-info').removeClass('progress-bar-danger');
+
+				if(ar.status==1){
+					$('.monitor-id#'+ar.id+' .progress-bar').addClass('progress-bar-info');
+					$('.monitor-id#'+ar.id+' .progress-bar > span').text(ar.online+' / '+ar.slots);
+				}else{
+					$('.monitor-id#'+ar.id+' .progress-bar').addClass('progress-bar-danger');
+					$('.monitor-id#'+ar.id+' .progress-bar > span').text(lng.offline);
+				}
+			});
+				
+			mcr.loading(false);
+		}
+	});
+}
+
+$(function(){
+	// Загрузка мониторинга
+	init_monitoring();
+});
\ No newline at end of file
diff --git a/upload/themes/default/js/blocks/online/main.js b/upload/themes/default/js/blocks/online/main.js
new file mode 100644
index 0000000..4ec0c04
--- /dev/null
+++ b/upload/themes/default/js/blocks/online/main.js
@@ -0,0 +1,80 @@
+function load_online(){
+
+	if(location.pathname == mcr.meta_data.base_url+'install/'){ return; }
+
+	mcr.loading();
+
+	var formdata = new FormData();
+	
+	formdata.append('mcr_secure', mcr.meta_data.secure);
+
+	$.ajax({
+		url: "index.php?mode=ajax&do=blocks|online|main",
+		dataType: "json",
+		type: 'POST',
+		contentType: false,
+		processData: false,
+		data: formdata,
+		timeout: 2000,
+		error: function(data){
+			mcr.logger(data);
+			mcr.notify(lng.error, 'error');
+		},
+
+		success: function(data){
+
+			$('.block-online #onl_list').text('');
+
+			if(!data._type){ return mcr.notify(data._title, data._message); }
+
+			if(data._data.list.length>0 && typeof data._data.list == 'object'){
+				$.each(data._data.list, function(key, val){
+					$('.block-online #onl_list').append(val);
+				});
+			}else{
+				$('.block-online #onl_list').append(data._data.list);
+			}
+
+			$('.block-online #onl_count #onl_all').text(data._data.all);
+			$('.block-online #onl_count #onl_users').text(data._data.users);
+			$('.block-online #onl_count #onl_guests').text(data._data.guests);
+
+			mcr.loading(false);
+		}
+		
+	});
+}
+
+function update_online(){
+
+	if(location.pathname == mcr.meta_data.base_url+'install/'){ return; }
+	
+	mcr.loading();
+
+	var formdata = new FormData();
+	
+	formdata.append('mcr_secure', mcr.meta_data.secure);
+
+	$.ajax({
+		url: "index.php?mode=ajax&do=blocks|online|update_online",
+		dataType: "json",
+		type: 'POST',
+		contentType: false,
+		processData: false,
+		data: formdata,
+		timeout: 2000,
+		error: function(data){
+			mcr.logger(data);
+			mcr.notify(lng.error, lng.error);
+		},
+
+		success: function(){ mcr.loading(false); }
+	});
+}
+
+$(function(){
+
+	setTimeout(update_online, 300);
+
+	setTimeout(load_online, 700);
+});
\ No newline at end of file
diff --git a/upload/themes/default/js/global.js b/upload/themes/default/js/global.js
index e82fdbb..b9e3281 100644
--- a/upload/themes/default/js/global.js
+++ b/upload/themes/default/js/global.js
@@ -6,10 +6,17 @@
 
 	// Функция показа/скрытия информации о загрузке
 	loading: function(status){
-		if(status===false){
-			$('#js-loader').fadeOut(300);
+
+		if(status!==false){
+			if(!$('#js-loader').hasClass('runclose') && !$('#js-loader').hasClass('runopen')){
+				$('#js-loader').addClass('runopen').fadeIn(300, function(){
+					$(this).removeClass('runopen');
+				});
+			}
 		}else{
-			$('#js-loader').fadeIn(300);
+			$('#js-loader').addClass('runclose').fadeOut(300, function(){
+				$(this).removeClass('runclose');
+			});
 		}
 	},
 
@@ -82,7 +89,7 @@
 
 		string = decodeURIComponent(string);
 
-		if(string==undefined){ return result; }
+		if(string==undefined || string=='undefined'){ return result; }
 
 		$.each(string.split('&'), function(key, val){
 			expl = val.split('=');
@@ -156,7 +163,7 @@
 
 		var formdata = new FormData();
 		
-		formdata.append('mcr_secure', mcr.meta_data.secure);
+		formdata.append('mcr_secure', that.meta_data.secure);
 
 		$.ajax({
 			url: "index.php?mode=ajax&do=monitoring",
@@ -166,15 +173,15 @@
 			processData: false,
 			data: formdata,
 			error: function(data){
-				mcr.logger(data);
-				mcr.notify(lng.error, lng.e_monitor);
+				that.logger(data);
+				that.notify(lng.error, lng.e_monitor);
 			},
 
 			success: function(data){
 
-				if(!data._type){ return mcr.notify(data._title, data._message); }
+				if(!data._type){ return that.notify(data._title, data._message); }
 
-				if(data._data.length<=0){ return mcr.loading(false); }
+				if(data._data.length<=0){ return that.loading(false); }
 
 				$.each(data._data, function(key, ar){
 					$('.monitor-id#'+ar.id+' .bar').css('width', ar.progress+'%');
@@ -189,7 +196,7 @@
 					}
 				});
 				
-				mcr.loading(false);
+				that.loading(false);
 			}
 		});
 	},
@@ -203,7 +210,7 @@
 
 		var formdata = new FormData();
 		
-		formdata.append('mcr_secure', mcr.meta_data.secure);
+		formdata.append('mcr_secure', that.meta_data.secure);
 		formdata.append('page', loadpage);
 
 		$.ajax({
@@ -214,8 +221,8 @@
 			processData: false,
 			data: formdata,
 			error: function(data){
-				mcr.logger(data);
-				mcr.notify(lng.error, lng.e_filemanager);
+				that.logger(data);
+				that.notify(lng.error, lng.e_filemanager);
 			},
 
 			success: function(data){
@@ -739,7 +746,7 @@
 		return false;
 	});
 
-	$('.cpp').minicolors();;
+	$('.cpp').minicolors();
 
 	$('body').on('click', '.is_auth_user', function(){
 		if(!mcr.meta_data.is_auth){ mcr.notify(lng.error, lng.e_auth, false); return false; }
diff --git a/upload/themes/default/js/modules/admin/blocks.js b/upload/themes/default/js/modules/admin/blocks.js
new file mode 100644
index 0000000..06822a7
--- /dev/null
+++ b/upload/themes/default/js/modules/admin/blocks.js
@@ -0,0 +1,50 @@
+$(function(){
+
+	$('body').on('click', '.panel-blocks #disable, .panel-blocks #enable', function(){
+
+		var status = $(this).attr('id');
+		var list = $('input.'+$(this).attr('data-for')+':checked');
+		var items = '';
+
+		var new_status = (status=='enable') ? 'icon_status_on' : 'icon_status_off';
+
+		if(list.length<=0){ return mcr.notify(lng.error, lng_block.not_selected); }
+
+		list.each(function(){
+			items += $(this).val()+',';
+		});
+
+		items = items.substr(0, items.length-1);
+
+		var formData = new FormData();
+
+		formData.append('mcr_secure', mcr.meta_data.secure);
+		formData.append('act', status);
+		formData.append('ids', items);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=admin_blocks_status",
+			dataType: "json",
+			type: "POST",
+			async: true,
+			cache: false,
+			contentType: false,
+			processData: false,
+			data: formData,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng_block.e_change_status);
+			},
+			success: function(data){
+
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				list.each(function(){
+					$(this).closest('tr').find('td.status i').attr('class', new_status);
+				});
+			}
+		});
+
+		return false;
+	});
+});
\ No newline at end of file
diff --git a/upload/themes/default/js/modules/news/news-admin.js b/upload/themes/default/js/modules/news/news-admin.js
index d17eaea..5c78c67 100644
--- a/upload/themes/default/js/modules/news/news-admin.js
+++ b/upload/themes/default/js/modules/news/news-admin.js
@@ -12,7 +12,7 @@
 		formdata.append('mcr_secure', mcr.meta_data.secure);
 
 		$.ajax({
-			url: "index.php?mode=ajax&do=news_attach",
+			url: "index.php?mode=ajax&do=modules|news|news_attach",
 			dataType: "json",
 			type: 'POST',
 			contentType: false,
@@ -47,7 +47,7 @@
 		formdata.append('mcr_secure', mcr.meta_data.secure);
 
 		$.ajax({
-			url: "index.php?mode=ajax&do=news_delete",
+			url: "index.php?mode=ajax&do=modules|news|news_delete",
 			dataType: "json",
 			type: 'POST',
 			contentType: false,
diff --git a/upload/themes/default/js/modules/news/news-full.js b/upload/themes/default/js/modules/news/news-full.js
index 7204ac8..16218bd 100644
--- a/upload/themes/default/js/modules/news/news-full.js
+++ b/upload/themes/default/js/modules/news/news-full.js
@@ -1,5 +1,4 @@
 $(function(){
-	
 	$("body").on("click", "#add_comment", function(){
 
 		mcr.loading();
@@ -9,12 +8,11 @@
 		var formdata = new FormData();
 		
 		formdata.append('id', nid);
-		formdata.append('act', 'add_comment');
 		formdata.append('message', message.value);
 		formdata.append('mcr_secure', mcr.meta_data.secure);
 
 		$.ajax({
-			url: "index.php?mode=ajax&do=news",
+			url: "index.php?mode=ajax&do=modules|news|add_comment",
 			dataType: "json",
 			type: 'POST',
 			contentType: false,
@@ -46,6 +44,8 @@
 
 	$("body").on("click", ".del_comment", function(){
 
+		var that = $(this);
+
 		if(!confirm(lng_nf.del_confirm_comment)){ return false; }
 		
 		mcr.loading();
@@ -55,12 +55,11 @@
 		var formdata = new FormData();
 		
 		formdata.append('id', id);
-		formdata.append('act', 'del_comment');
 		formdata.append('nid', nid);
 		formdata.append('mcr_secure', mcr.meta_data.secure);
 
 		$.ajax({
-			url: "index.php?mode=ajax&do=news",
+			url: "index.php?mode=ajax&do=modules|news|delete_comment",
 			dataType: "json",
 			type: 'POST',
 			contentType: false,
@@ -74,7 +73,7 @@
 
 				if(!data._type){ return mcr.notify(data._title, data._message); }
 
-				$(".comment-id#"+id).fadeOut(400, function(){
+				that.closest('.comment-id').fadeOut(400, function(){
 
 					$(this).remove();
 
@@ -98,12 +97,11 @@
 		var formdata = new FormData();
 		
 		formdata.append('id', id);
-		formdata.append('act', 'get_comment');
 		formdata.append('nid', nid);
 		formdata.append('mcr_secure', mcr.meta_data.secure);
 
 		$.ajax({
-			url: "index.php?mode=ajax&do=news",
+			url: "index.php?mode=ajax&do=modules|news|get_comment",
 			dataType: "json",
 			type: 'POST',
 			contentType: false,
@@ -136,12 +134,11 @@
 		var formdata = new FormData();
 		
 		formdata.append('id', id);
-		formdata.append('act', 'get_comment');
 		formdata.append('nid', nid);
 		formdata.append('mcr_secure', mcr.meta_data.secure);
 
 		$.ajax({
-			url: "index.php?mode=ajax&do=news",
+			url: "index.php?mode=ajax&do=modules|news|get_comment",
 			dataType: "json",
 			type: 'POST',
 			contentType: false,
@@ -176,13 +173,12 @@
 		var formdata = new FormData();
 		
 		formdata.append('id', id);
-		formdata.append('act', 'edt_comment');
 		formdata.append('nid', nid);
 		formdata.append('message', message.value);
 		formdata.append('mcr_secure', mcr.meta_data.secure);
 
 		$.ajax({
-			url: "index.php?mode=ajax&do=news",
+			url: "index.php?mode=ajax&do=modules|news|edit_comment",
 			dataType: "json",
 			type: 'POST',
 			contentType: false,
@@ -217,13 +213,12 @@
 
 		var formdata = new FormData();
 
-		formdata.append('act', 'like');
 		formdata.append('nid', nid);
 		formdata.append('value', value);
 		formdata.append('mcr_secure', mcr.meta_data.secure);
 
 		$.ajax({
-			url: "index.php?mode=ajax&do=news",
+			url: "index.php?mode=ajax&do=modules|news|news_like",
 			dataType: "json",
 			type: 'POST',
 			contentType: false,
diff --git a/upload/themes/default/js/modules/news/news-list.js b/upload/themes/default/js/modules/news/news-list.js
index 5083647..75d82bc 100644
--- a/upload/themes/default/js/modules/news/news-list.js
+++ b/upload/themes/default/js/modules/news/news-list.js
@@ -1,5 +1,5 @@
 $(function(){
-	$("body").on("click", ".like, .dislike", function(){
+	$("body").on("click", ".new-id .like, .new-id .dislike", function(){
 
 		mcr.loading();
 
@@ -8,12 +8,11 @@
 		var formdata = new FormData();
 		
 		formdata.append('mcr_secure', mcr.meta_data.secure);
-		formdata.append('act', 'like');
 		formdata.append('value', value);
 		formdata.append('nid', nid);
 
 		$.ajax({
-			url: "index.php?mode=ajax&do=news",
+			url: "index.php?mode=ajax&do=modules|news|news_like",
 			dataType: "json",
 			type: 'POST',
 			contentType: false,
@@ -23,6 +22,7 @@
 				mcr.logger(data);
 				mcr.notify(lng.error, lng_nl.e_vote);
 			},
+			
 			success: function(data){
 
 				if(!data._type){ return mcr.notify(data._title, data._message); }
diff --git a/upload/themes/default/modules/admin/blocks/block-add.html b/upload/themes/default/modules/admin/blocks/block-add.html
new file mode 100644
index 0000000..665cbcf
--- /dev/null
+++ b/upload/themes/default/modules/admin/blocks/block-add.html
@@ -0,0 +1,71 @@
+<div class="form-block">
+
+	<div class="block-header">
+		<div class="block-name"><?php echo $data['PAGE']; ?></div>
+	</div>
+
+	<div class="block-line"></div>
+
+	<form class="form-horizontal" method="post">
+		<h3><?php echo $data['TITLE']; ?></h3>
+		<small>- <?php echo $data['DESC']; ?></small>
+		<hr>
+		<address>
+			<dl class="dl-horizontal">
+
+				<dt><?php echo $this->lng_m['block_field_author']; ?>:</dt>
+				<dd><?php echo $data['AUTHOR']; ?></dd>
+
+				<dt><?php echo $this->lng_m['block_field_site']; ?>:</dt>
+				<dd><a href="<?php echo $data['SITE']; ?>" target="_blank"><?php echo $data['SITE']; ?></a></dd>
+
+				<dt><?php echo $this->lng_m['block_field_email']; ?>:</dt>
+				<dd><a href="mailto:<?php echo $data['EMAIL']; ?>"><?php echo $data['EMAIL']; ?></a></dd>
+
+				<dt><?php echo $this->lng_m['block_field_ver']; ?>:</dt>
+				<dd><?php echo $data['VERSION']; ?> <?php echo $data['UPDATE_RESULT']; ?></dd>
+			</dl>
+		</address>
+
+		<div class="control-group">
+			<label class="control-label" for="inputStatus"><?php echo $this->lng_m['block_field_status']; ?></label>
+			<div class="controls">
+				<select name="status" id="inputStatus">
+					<option value="0"><?php echo $this->lng_m['block_off']; ?></option>
+					<option value="1" <?php echo $data['STATUS']; ?>><?php echo $this->lng_m['block_on']; ?></option>
+				</select>
+			</div>
+		</div>
+
+		<div class="control-group">
+			<label class="control-label" for="inputUpdate"><?php echo $this->lng_m['block_field_upd']; ?></label>
+			<div class="controls">
+				<select name="updates" id="inputUpdate">
+					<option value="0"><?php echo $this->lng_m['block_off1']; ?></option>
+					<option value="1" <?php echo $data['UPDATE_CHECK']; ?>><?php echo $this->lng_m['block_on1']; ?></option>
+				</select>
+			</div>
+		</div>
+
+		<div class="control-group">
+			<label class="control-label" for="inputUrl"><?php echo $this->lng_m['block_field_url']; ?></label>
+			<div class="controls">
+				<input type="text" id="inputUrl" name="updater" value="<?php echo $data['UPDATE_URL']; ?>">
+			</div>
+		</div>
+
+		<div class="control-group">
+			<label class="control-label" for="inputPos"><?php echo $this->lng_m['block_field_pos']; ?></label>
+			<div class="controls">
+				<input type="text" id="inputPos" name="position" value="<?php echo $data['POSITION']; ?>">
+			</div>
+		</div>
+
+		<div class="control-group">
+			<div class="controls">
+				<button type="submit" class="btn" name="submit"><?php echo $data['BUTTON']; ?></button>
+			</div>
+		</div>
+	</form>
+		
+</div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/blocks/block-id.html b/upload/themes/default/modules/admin/blocks/block-id.html
new file mode 100644
index 0000000..7047c08
--- /dev/null
+++ b/upload/themes/default/modules/admin/blocks/block-id.html
@@ -0,0 +1,7 @@
+<tr>
+	<td class="status"><i class="<?php echo $data['STATUS']; ?>"></i></td>
+	<td><?php echo $data['TITLE']; ?></td>
+	<td><?php echo $data['AUTHOR']; ?></td>
+	<td><?php echo $data['VERSION']; ?></td>
+	<td class="action"><input type="checkbox"  name="id[]" class="check-input" value="<?php echo $data['NAME']; ?>"></td>
+</tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/blocks/block-list.html b/upload/themes/default/modules/admin/blocks/block-list.html
new file mode 100644
index 0000000..b0d48de
--- /dev/null
+++ b/upload/themes/default/modules/admin/blocks/block-list.html
@@ -0,0 +1,38 @@
+<form method="post" class="panel-blocks" action="<?php echo ADMIN_URL; ?>&do=blocks&op=delete">
+	<div class="form-block">
+
+		<div class="block-header">
+			<div class="block-name"><?php echo $this->lng_m['blocks']; ?></div>
+		</div>
+
+		<div class="block-line"></div>
+
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th><?php echo $this->lng_m['block_field_status']; ?></th>
+					<th><?php echo $this->lng_m['block_field_name']; ?></th>
+					<th><?php echo $this->lng_m['block_field_author']; ?></th>
+					<th><?php echo $this->lng_m['block_field_ver']; ?></th>
+					<th class="action"><?php echo $this->lng_m['block_field_action']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
+				</tr>
+			</thead>
+
+			<tbody>
+				<?php echo $data['BLOCKS']; ?>
+			</tbody>
+		</table>
+	</div>
+
+	<div class="form-block actions">
+		<div class="right-act">
+			<?php echo $this->lng_m['block_field_action2']; ?>: 
+			<div class="btn-group">
+				<a class="btn edit" data-for="check-input" data-link="<?php echo ADMIN_URL; ?>&do=blocks&op=edit&id=" href="#"><i class="icon-pencil"></i></a>
+				<button class="btn" id="enable" data-for="check-input"><i class="icon-play"></i></button>
+				<button class="btn" id="disable" data-for="check-input"><i class="icon-pause"></i></button>
+			</div>
+		</div>
+		
+	</div>
+</form>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/blocks/block-none.html b/upload/themes/default/modules/admin/blocks/block-none.html
new file mode 100644
index 0000000..661c66c
--- /dev/null
+++ b/upload/themes/default/modules/admin/blocks/block-none.html
@@ -0,0 +1,3 @@
+<tr>
+	<td colspan="4"><center><?php echo $this->lng_m['block_empty']; ?></center></td>
+</tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/info/extensions.html b/upload/themes/default/modules/admin/info/extensions.html
index 0cd88bf..a898b71 100644
--- a/upload/themes/default/modules/admin/info/extensions.html
+++ b/upload/themes/default/modules/admin/info/extensions.html
@@ -9,9 +9,9 @@
 	<div class="adm-info-modules">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=main"><?php echo $this->lng_m['info']; ?></a></li>
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=extensions"><?php echo $this->lng_m['info_ext']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=stats"><?php echo $this->lng_m['info_stats']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=info&op=main"><?php echo $this->lng_m['info']; ?></a></li>
+			<li class="active"><a href="<?php echo ADMIN_URL; ?>&do=info&op=extensions"><?php echo $this->lng_m['info_ext']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=info&op=stats"><?php echo $this->lng_m['info_stats']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
diff --git a/upload/themes/default/modules/admin/info/main.html b/upload/themes/default/modules/admin/info/main.html
index a26812d..7dafc28 100644
--- a/upload/themes/default/modules/admin/info/main.html
+++ b/upload/themes/default/modules/admin/info/main.html
@@ -9,9 +9,9 @@
 	<div class="adm-info-main">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=main"><?php echo $this->lng_m['info']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=extensions"><?php echo $this->lng_m['info_ext']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=stats"><?php echo $this->lng_m['info_stats']; ?></a></li>
+			<li class="active"><a href="<?php echo ADMIN_URL; ?>&do=info&op=main"><?php echo $this->lng_m['info']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=info&op=extensions"><?php echo $this->lng_m['info_ext']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=info&op=stats"><?php echo $this->lng_m['info_stats']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
diff --git a/upload/themes/default/modules/admin/info/stats.html b/upload/themes/default/modules/admin/info/stats.html
index 570fdb2..d831cd5 100644
--- a/upload/themes/default/modules/admin/info/stats.html
+++ b/upload/themes/default/modules/admin/info/stats.html
@@ -9,9 +9,9 @@
 	<div class="adm-info-stats">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=main"><?php echo $this->lng_m['info']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=extensions"><?php echo $this->lng_m['info_ext']; ?></a></li>
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=stats"><?php echo $this->lng_m['info_stats']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=info&op=main"><?php echo $this->lng_m['info']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=info&op=extensions"><?php echo $this->lng_m['info_ext']; ?></a></li>
+			<li class="active"><a href="<?php echo ADMIN_URL; ?>&do=info&op=stats"><?php echo $this->lng_m['info_stats']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
diff --git a/upload/themes/default/modules/admin/settings/base.html b/upload/themes/default/modules/admin/settings/base.html
index 5e1fe75..c8eb65c 100644
--- a/upload/themes/default/modules/admin/settings/base.html
+++ b/upload/themes/default/modules/admin/settings/base.html
@@ -9,12 +9,12 @@
 	<div class="adm-settings">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
+			<li class="active"><a href="<?php echo ADMIN_URL; ?>&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
diff --git a/upload/themes/default/modules/admin/settings/functions.html b/upload/themes/default/modules/admin/settings/functions.html
index e9db656..1c7a9a3 100644
--- a/upload/themes/default/modules/admin/settings/functions.html
+++ b/upload/themes/default/modules/admin/settings/functions.html
@@ -9,12 +9,12 @@
 	<div class="adm-settings">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
+			<li class="active"><a href="<?php echo ADMIN_URL; ?>&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
diff --git a/upload/themes/default/modules/admin/settings/mail.html b/upload/themes/default/modules/admin/settings/mail.html
index 7b5a12b..38d8397 100644
--- a/upload/themes/default/modules/admin/settings/mail.html
+++ b/upload/themes/default/modules/admin/settings/mail.html
@@ -9,12 +9,12 @@
 	<div class="adm-settings">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
+			<li class="active"><a href="<?php echo ADMIN_URL; ?>&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
diff --git a/upload/themes/default/modules/admin/settings/main.html b/upload/themes/default/modules/admin/settings/main.html
index de1302f..9bdb6e9 100644
--- a/upload/themes/default/modules/admin/settings/main.html
+++ b/upload/themes/default/modules/admin/settings/main.html
@@ -9,12 +9,12 @@
 	<div class="adm-settings">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
+			<li class="active"><a href="<?php echo ADMIN_URL; ?>&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
diff --git a/upload/themes/default/modules/admin/settings/pagin.html b/upload/themes/default/modules/admin/settings/pagin.html
index 91da9ca..e721d30 100644
--- a/upload/themes/default/modules/admin/settings/pagin.html
+++ b/upload/themes/default/modules/admin/settings/pagin.html
@@ -9,12 +9,12 @@
 	<div class="adm-settings">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
+			<li class="active"><a href="<?php echo ADMIN_URL; ?>&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
diff --git a/upload/themes/default/modules/admin/settings/search.html b/upload/themes/default/modules/admin/settings/search.html
index e8ebde5..bbf1698 100644
--- a/upload/themes/default/modules/admin/settings/search.html
+++ b/upload/themes/default/modules/admin/settings/search.html
@@ -9,12 +9,12 @@
 	<div class="adm-settings">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
+			<li class="active"><a href="<?php echo ADMIN_URL; ?>&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
+			<li><a href="<?php echo ADMIN_URL; ?>&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
diff --git a/upload/themes/default/modules/close/main.html b/upload/themes/default/modules/close/main.html
index 4a69b0d..d2334fb 100644
--- a/upload/themes/default/modules/close/main.html
+++ b/upload/themes/default/modules/close/main.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-	<title><?php echo $this->config->main['s_name']; ?> — Тех. работы</title>
+	<title><?php echo $this->cfg->main['s_name']; ?> — Тех. работы</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta charset="utf-8">
-	<meta name="description" content="<?php echo $this->config->main['s_about']; ?>">
-	<meta name="keywords" content="<?php echo $this->config->main['s_keywords']; ?>">
+	<meta name="description" content="<?php echo $this->cfg->main['s_about']; ?>">
+	<meta name="keywords" content="<?php echo $this->cfg->main['s_keywords']; ?>">
 	<meta name="author" content="NC22 &amp; Qexy.org">
 	<meta name='data' content='<?php echo META_JSON_DATA; ?>'>
 	<base href="<?php echo BASE_URL ?>">
@@ -20,7 +20,7 @@
 		<div class="container-fluid">
 			<div class="row-fluid">
 				<div class="span9">
-					<h1><?php echo $this->config->main['s_name']; ?></h1>
+					<h1><?php echo $this->cfg->main['s_name']; ?></h1>
 					<p class="lead">На сайте ведутся технические работы. Вход только для администрации.</p>
 				</div>
 			</div>
@@ -80,7 +80,7 @@
 <div class="navbar navbar-fixed-bottom">
 	<div class="navbar-inner">
 		<div class="footer-block">
-			<div class="left-side"><?php echo $this->lng['copy_pre']; ?> <?php echo $this->config->main['s_name']; ?> <?php echo $this->lng['copy_app']; ?></div>
+			<div class="left-side"><?php echo $this->lng['copy_pre']; ?> <?php echo $this->cfg->main['s_name']; ?> <?php echo $this->lng['copy_app']; ?></div>
 			<div class="right-side"><?php echo FEEDBACK; ?> | <?php echo VERSION; ?></div>
 		</div>
 	</div>
diff --git a/upload/themes/default/modules/news/new-admin.html b/upload/themes/default/modules/news/new-admin.html
index a5a6b43..c08421e 100644
--- a/upload/themes/default/modules/news/new-admin.html
+++ b/upload/themes/default/modules/news/new-admin.html
@@ -4,7 +4,7 @@
 
 	<ul class="dropdown-menu pull-right">
 		<li><a href="#" class="news-attach" data-id="<?php echo $data['ID']; ?>"><?php echo $data['ATTACH']; ?></a></li>
-		<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=news&op=edit&id=<?php echo $data['ID']; ?>"><?php echo $this->lng_m['com_edit']; ?></a></li>
+		<li><a href="<?php echo ADMIN_URL; ?>&do=news&op=edit&id=<?php echo $data['ID']; ?>"><?php echo $this->lng_m['com_edit']; ?></a></li>
 		<li><a href="#" class="news-delete" data-id="<?php echo $data['ID']; ?>"><?php echo $this->lng_m['com_delete']; ?></a></li>
 	
 	</ul>
diff --git a/upload/themes/default/modules/profile/profile.html b/upload/themes/default/modules/profile/profile.html
index b7ec492..01f8a3e 100644
--- a/upload/themes/default/modules/profile/profile.html
+++ b/upload/themes/default/modules/profile/profile.html
@@ -43,7 +43,7 @@
 				<div class="tab-pane" id="tab2">
 
 					<div class="skin-block">
-						<div class="profile-skin" style="background-image: url('<?php echo BASE_URL; ?>uploads/skins/interface/<?php echo $this->user->skin; ?>.png?<?php echo mt_rand(1000,9999); ?>');"></div>
+						<div class="profile-skin" style="background-image: url('<?php echo SKIN_URL; ?>interface/<?php echo $this->user->skin; ?>.png?<?php echo mt_rand(1000,9999); ?>');"></div>
 					</div>
 
 					<div class="uploader-forms">
diff --git a/upload/uploads/panel-icons/gealogy.png b/upload/uploads/panel-icons/gealogy.png
new file mode 100644
index 0000000..49776b2
--- /dev/null
+++ b/upload/uploads/panel-icons/gealogy.png
Binary files differ
diff --git a/upload/uploads/tmp/sess_fu601lcrg90trvnhd3c3tbj9n3 b/upload/uploads/tmp/sess_fu601lcrg90trvnhd3c3tbj9n3
deleted file mode 100644
index a4fdc6d..0000000
--- a/upload/uploads/tmp/sess_fu601lcrg90trvnhd3c3tbj9n3
+++ /dev/null
@@ -1 +0,0 @@
-views-new-1|b:1;add_comment|i:1464972140;
\ No newline at end of file