diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php
index ce9d51499..3b2ab2eef 100644
--- a/e107_admin/admin_log.php
+++ b/e107_admin/admin_log.php
@@ -284,7 +284,7 @@ class admin_log_ui extends e_admin_ui
 		{
 			$mes = e107::getMessage();
 			$ns = e107::getRender();
-			$log = e107::getAdminLog();
+			$log = e107::getLog();
 			$frm = e107::getForm();
 			$sql = e107::getDb();
 
diff --git a/e107_admin/auth.php b/e107_admin/auth.php
index 2bf4b2edc..d496859ef 100644
--- a/e107_admin/auth.php
+++ b/e107_admin/auth.php
@@ -185,7 +185,7 @@ else
 
 			if (in_array(varset($pref['user_audit_class'], ''), $class_list))
 			{
-				e107::getAdminLog()->user_audit(USER_AUDIT_LOGIN, ['Login via admin page'], $row['user_id'], $row['user_name']);
+				e107::getLog()->user_audit(USER_AUDIT_LOGIN, ['Login via admin page'], $row['user_id'], $row['user_name']);
 			}
 
 			$edata_li = array("user_id"=>$row['user_id'], "user_name"=>$row['user_name'], 'class_list'=>implode(',', $class_list), 'user_admin'=> $row['user_admin']);
diff --git a/e107_admin/banlist_export.php b/e107_admin/banlist_export.php
index fb89f612b..0a3f9921c 100644
--- a/e107_admin/banlist_export.php
+++ b/e107_admin/banlist_export.php
@@ -135,7 +135,7 @@ function do_export($filename, $type_list='',$format_array=array(), $sep = ',', $
 // Log event to admin log
 function banlist_adminlog($msg_num='00', $woffle='')
 {
-	e107::getAdminLog()->add('BANLIST_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
+	e107::getLog()->add('BANLIST_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
 }
 
 
diff --git a/e107_admin/cache.php b/e107_admin/cache.php
index c5589928e..6925096fa 100644
--- a/e107_admin/cache.php
+++ b/e107_admin/cache.php
@@ -50,33 +50,33 @@ if (isset($_POST['submit_cache']))
 
 if (isset($_POST['trigger_empty_cache']))
 {
-	e107::getAdminLog()->logSuccess(CACLAN_6);
+	e107::getLog()->logSuccess(CACLAN_6);
 	switch ($_POST['option_clear_cache'])
 	{
 		case 'empty_contentcache':
 			e107::getCache()->clearAll('content');
-			e107::getAdminLog()->flushMessages(CACLAN_5);
+			e107::getLog()->flushMessages(CACLAN_5);
 		break;
 
 		case 'empty_syscache':
 			e107::getCache()->clearAll('system');
-			e107::getAdminLog()->flushMessages(CACLAN_16);
+			e107::getLog()->flushMessages(CACLAN_16);
 		break;
 
 		case 'empty_dbcache':
 			e107::getCache()->clearAll('db');
-			e107::getAdminLog()->flushMessages(CACLAN_24);
+			e107::getLog()->flushMessages(CACLAN_24);
 		break;
 
 		case 'empty_imgcache':
 			e107::getCache()->clearAll('image');
-			e107::getAdminLog()->flushMessages(CACLAN_25);
+			e107::getLog()->flushMessages(CACLAN_25);
 		break;
 		
 		// used in standard page output and internal JS includes
 		case 'empty_browsercache':
 			e107::getCache()->clearAll('browser');
-			e107::getAdminLog()->flushMessages(CACLAN_25);
+			e107::getLog()->flushMessages(CACLAN_25);
 		break;
 
 		case 'empty_jscss':
@@ -94,7 +94,7 @@ if (isset($_POST['trigger_empty_cache']))
 			e107::getCache()->clearAll('browser');
 			e107::getCache()->clearAll('js');
 			e107::getCache()->clearAll('css');
-			e107::getAdminLog()->flushMessages(CACLAN_26);
+			e107::getLog()->flushMessages(CACLAN_26);
 		break;
 	}
 }
diff --git a/e107_admin/db.php b/e107_admin/db.php
index 0790e50f7..bfdbb44bd 100644
--- a/e107_admin/db.php
+++ b/e107_admin/db.php
@@ -115,7 +115,7 @@ if(e_AJAX_REQUEST )
 		
 		echo DBLAN_62." <small>(".$dbfile.")</small>";
 
-		e107::getAdminLog()->addSuccess($zip." ".$dbfile, false)->save(DBLAN_63);
+		e107::getLog()->addSuccess($zip." ".$dbfile, false)->save(DBLAN_63);
 		
 	}
 	
diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php
index 8d9c22ce7..30c1a115e 100644
--- a/e107_admin/frontpage.php
+++ b/e107_admin/frontpage.php
@@ -716,7 +716,7 @@ require_once(e_ADMIN.'footer.php');
  */
 function frontpage_adminlog($msg_num = '00', $woffle = '')
 {
-	e107::getAdminLog()->add('FRONTPG_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
+	e107::getLog()->add('FRONTPG_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
 }
 
 
diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index f6a6ffe54..39b9b08d0 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -617,7 +617,7 @@ class mailout_main_ui extends e_admin_ui
 		else
 		{
 			$mes->addSuccess(LAN_MAILOUT_81. ' ('.$sendto.')');
-			e107::getAdminLog()->add('MAIL_01', $sendto, E_LOG_INFORMATIVE,'');
+			e107::getLog()->add('MAIL_01', $sendto, E_LOG_INFORMATIVE,'');
 		}
 
 		
@@ -723,7 +723,7 @@ class mailout_main_ui extends e_admin_ui
 	
 	private function emailSend($mailId)
 	{
-		$log 		= e107::getAdminLog();	
+		$log 		= e107::getLog();
 			
 		$notify 	= isset($_POST['mail_notify_complete']) ? 3 : 2;
 		$first 		= 0;
@@ -1539,7 +1539,7 @@ class mailout_main_ui extends e_admin_ui
 			if ($t === NULL) $t = '';
 		}
 		$pref = e107::pref('core');              		 	// Core Prefs Array.
-		if (e107::getAdminLog()->logArrayDiffs($temp, $pref, 'MAIL_03'))
+		if (e107::getLog()->logArrayDiffs($temp, $pref, 'MAIL_03'))
 		{
 			e107::getConfig()->updatePref($temp);
 			e107::getConfig()->save(false);		// Only save if changes - generates its own message
diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index 06da446e1..dcee783d5 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -965,7 +965,7 @@ class news_admin_ui extends e_admin_ui
 
 		if(e107::getConfig()->save(false))
 		{
-			e107::getAdminLog()->logArrayDiffs($temp, e107::getPref(), 'NEWS_06');
+			e107::getLog()->logArrayDiffs($temp, e107::getPref(), 'NEWS_06');
 			$this->clearCache();
 		}
 	}
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index e1c7c9413..68eb0f550 100755
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -594,7 +594,7 @@ class plugin_ui extends e_admin_ui
 		private function pluginUpgrade()
 		{
 			$pref 		= e107::getPref();
-			$admin_log 	= e107::getAdminLog();
+			$admin_log 	= e107::getLog();
 			$plugin 	= e107::getPlugin();
 
 		    $sql 		= e107::getDb();
diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index f8cc0c81e..3439c043c 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -241,7 +241,7 @@ if (e107::isInstalled('alt_auth'))
 
 function sendTest()
 {
-	$log = e107::getAdminLog();
+	$log = e107::getLog();
 	$mes = e107::getMessage();
 	
 	if(trim($_POST['testaddress']) == '')
diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php
index 85c2bad11..5f10599bc 100644
--- a/e107_admin/update_routines.php
+++ b/e107_admin/update_routines.php
@@ -457,7 +457,7 @@ function update_core_prefs($type='')
 	global $e107info; // $pref,  $pref must be kept as global 
 	
 	$pref = e107::getConfig('core', true, true)->getPref();
-	$admin_log = e107::getAdminLog();
+	$admin_log = e107::getLog();
 	$do_save = FALSE;
 	$should = get_default_prefs();
 
@@ -517,7 +517,7 @@ function update_core_database($type = '')
 	/** @var db_verify $dbv */
 	$dbv =  e107::getSingleton('db_verify', e_HANDLER."db_verify_class.php");
 
-	$log = e107::getAdminLog();
+	$log = e107::getLog();
 
 	if($plugUpgradeReq = e107::getPlugin()->updateRequired())
 	{
@@ -745,7 +745,7 @@ function update_706_to_800($type='')
 
 	//$mes = new messageLog;		// Combined logging and message displaying handler
 	//$mes = e107::getMessage();
-	$log 	= e107::getAdminLog();		// Used for combined logging and message displaying
+	$log 	= e107::getLog();		// Used for combined logging and message displaying
 	$sql 	= e107::getDb();
 	$sql2 	= e107::getDb('sql2');
 	$tp 	= e107::getParser();
diff --git a/e107_admin/users.php b/e107_admin/users.php
index eba1976a4..efed8c8bf 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -613,7 +613,7 @@ class users_admin_ui extends e_admin_ui
 
 		$vars = array('x'=>$sysuser->getId(), 'y'=> $sysuser->getName(), 'z'=> $sysuser->getValue('email'));
 
-		e107::getAdminLog()->add('USET_06', $tp->lanVars( USRLAN_162, $vars), E_LOG_INFORMATIVE);
+		e107::getLog()->add('USET_06', $tp->lanVars( USRLAN_162, $vars), E_LOG_INFORMATIVE);
 		e107::getMessage()->addSuccess("(".$sysuser->getId().".".$sysuser->getName()." - ".$sysuser->getValue('email').") ".USRLAN_9);
 		
 		// List data reload
@@ -629,7 +629,7 @@ class users_admin_ui extends e_admin_ui
 	{
 		$sql = e107::getDb();
 		$mes = e107::getMessage();
-		$admin_log = e107::getAdminLog();
+		$admin_log = e107::getLog();
 		$iph = e107::getIPHandler();
 		$tp = e107::getParser();
 		
@@ -690,7 +690,7 @@ class users_admin_ui extends e_admin_ui
 	public function ListVerifyTrigger($userid)
 	{
 		$e_event = e107::getEvent();
-		$admin_log = e107::getAdminLog();
+		$admin_log = e107::getLog();
 		$sysuser = e107::getSystemUser($userid, false);
 		$userMethods = e107::getUserSession();
 		$mes = e107::getMessage();
@@ -814,7 +814,7 @@ class users_admin_ui extends e_admin_ui
 			 // TODO - lan
 			$lan = 'Administrator --ADMIN_EMAIL-- (#--ADMIN_UID--, --ADMIN_NAME--) has logged out as the user --EMAIL-- (#--UID--, --NAME--)';
 			
-			e107::getAdminLog()->add('USET_101', str_replace($search, $replace, $lan), E_LOG_INFORMATIVE);
+			e107::getLog()->add('USET_101', str_replace($search, $replace, $lan), E_LOG_INFORMATIVE);
 			
 			$eventData = array('user_id' => $sysuser->getId(), 'admin_id' => $user->getId());
 			e107::getEvent()->trigger('logoutas', $eventData); //BC 
@@ -855,7 +855,7 @@ class users_admin_ui extends e_admin_ui
 				'z' => $user->getValue('email')
 			);
 			
-			e107::getAdminLog()->add('USET_08', $tp->lanVars(USRLAN_244,$vars), E_LOG_INFORMATIVE);
+			e107::getLog()->add('USET_08', $tp->lanVars(USRLAN_244,$vars), E_LOG_INFORMATIVE);
 			$this->redirect('list', 'main', true);
 		}
 
@@ -869,7 +869,7 @@ class users_admin_ui extends e_admin_ui
 			{
 				$vars = array('x'=>$sysuser->getId(), 'y'=>$sysuser->getName(), 'z'=>$sysuser->getValue('email'));
 
-				e107::getAdminLog()->add('USET_09',$tp->lanVars(USRLAN_165, $vars), E_LOG_INFORMATIVE);
+				e107::getLog()->add('USET_09',$tp->lanVars(USRLAN_165, $vars), E_LOG_INFORMATIVE);
 				$mes->addSuccess($sysuser->getName()." (".$sysuser->getValue('email').") ".USRLAN_6);
 				$this->getTreeModel()->loadBatch(true);
 			}
@@ -895,7 +895,7 @@ class users_admin_ui extends e_admin_ui
 		$sql = e107::getDb();
 		$user = e107::getUser();
 		$sysuser = e107::getSystemUser($userid, false);
-		$admin_log = e107::getAdminLog();
+		$admin_log = e107::getLog();
 		$mes = e107::getMessage();
 		$tp = e107::getParser();
 		
@@ -990,7 +990,7 @@ class users_admin_ui extends e_admin_ui
 		$response = $this->getResponse();
 		$sysuser = e107::getSystemUser($userid, false);
 		
-		$admin_log = e107::getAdminLog();
+		$admin_log = e107::getLog();
 		$e_userclass = e107::getUserClass();
 		$sql = e107::getDb();
 
@@ -1392,7 +1392,7 @@ class users_admin_ui extends e_admin_ui
 		$mes 			= e107::getMessage();
 		$sql 			= e107::getDb();
 		$e_event 		= e107::getEvent();
-		$admin_log		= e107::getAdminLog();
+		$admin_log		= e107::getLog();
 		$pref = e107::getPref();
 		
 		if (!$_POST['ac'] == md5(ADMINPWCHANGE))
diff --git a/e107_handlers/db_verify_class.php b/e107_handlers/db_verify_class.php
index adb2b8f82..b830a2749 100755
--- a/e107_handlers/db_verify_class.php
+++ b/e107_handlers/db_verify_class.php
@@ -827,7 +827,7 @@ class db_verify
 	function runFix($fixArray='')
 	{
 		$mes  = e107::getMessage();
-		$log = e107::getAdminLog();
+		$log = e107::getLog();
 		
 		if(!is_array($fixArray))
 		{
diff --git a/e107_handlers/file_class.php b/e107_handlers/file_class.php
index d6eadca55..6de23a608 100644
--- a/e107_handlers/file_class.php
+++ b/e107_handlers/file_class.php
@@ -538,7 +538,7 @@
 			{
 				if(E107_DEBUG_LEVEL > 0)
 				{
-					e107::getAdminLog()->addDebug('getRemoteFile() requires cURL to be installed in file_class.php');
+					e107::getLog()->addDebug('getRemoteFile() requires cURL to be installed in file_class.php');
 				}
 
 				return false;            // May not be installed
@@ -1301,7 +1301,7 @@
 			if($archive->create($filePaths, PCLZIP_OPT_REMOVE_PATH, $removePath) == 0)
 			{
 				$error = $archive->errorInfo(true);
-				e107::getAdminLog()->addError($error)->save('FILE', E_LOG_NOTICE);
+				e107::getLog()->addError($error)->save('FILE', E_LOG_NOTICE);
 
 				return false;
 			}
diff --git a/e107_handlers/iphandler_class.php b/e107_handlers/iphandler_class.php
index 4511731ce..8d9f567e8 100644
--- a/e107_handlers/iphandler_class.php
+++ b/e107_handlers/iphandler_class.php
@@ -938,7 +938,7 @@ class eIPHandler
 		$sql = e107::getDb();
 		$pref = e107::getPref();
 		$tp = e107::getParser();
-		$admin_log = e107::getAdminLog();
+		$admin_log = e107::getLog();
 
 		//$admin_log->addEvent(4,__FILE__."|".__FUNCTION__."@".__LINE__,"DBG","Check for Ban",$query,FALSE,LOG_TO_ROLLING);
 		if ($sql->select('banlist', '*', $query.' ORDER BY `banlist_bantype` DESC'))
diff --git a/e107_handlers/login.php b/e107_handlers/login.php
index b8cb00217..a4f6518f0 100644
--- a/e107_handlers/login.php
+++ b/e107_handlers/login.php
@@ -430,7 +430,7 @@ class userlogin
 	protected function checkUserPassword($username, $userpass, $response, $forceLogin)
 	{
 		$pref = e107::getPref();
-		$log = e107::getAdminLog();
+		$log = e107::getLog();
 		
 		if($forceLogin === 'provider') return true;
 		/*
diff --git a/e107_handlers/mail_manager_class.php b/e107_handlers/mail_manager_class.php
index 3df9a1019..c9ffcc10e 100644
--- a/e107_handlers/mail_manager_class.php
+++ b/e107_handlers/mail_manager_class.php
@@ -813,7 +813,7 @@ class e107MailManager
 
 				if (e107::callMethod($cls, 'sent', $email) === false)
 				{
-					e107::getAdminLog()->add($plug . ' sent process failed', $email, E_LOG_FATAL, 'SENT');
+					e107::getLog()->add($plug . ' sent process failed', $email, E_LOG_FATAL, 'SENT');
 				}
 			}
 		}
@@ -1580,13 +1580,13 @@ class e107MailManager
 
 					if (!$this->db->update('mail_content', '`mail_bounce_count` = `mail_bounce_count` + 1 WHERE `mail_source_id` = ' . $vals[1]))
 					{
-						e107::getAdminLog()->add('Unable to increment bounce-count on mail_source_id=' . $vals[1], $bounceInfo, E_LOG_FATAL, 'BOUNCE', LOG_TO_ROLLING);
+						e107::getLog()->add('Unable to increment bounce-count on mail_source_id=' . $vals[1], $bounceInfo, E_LOG_FATAL, 'BOUNCE', LOG_TO_ROLLING);
 					}
 
 
 					if (!$this->db->update('mail_recipients', '`mail_status` = ' . MAIL_STATUS_BOUNCED . ' WHERE `mail_target_id` = ' . $vals[2]))
 					{
-						e107::getAdminLog()->add('Unable to update recipient mail_status to bounce on mail_target_id = ' . $vals[2], $bounceInfo, E_LOG_FATAL, 'BOUNCE', LOG_TO_ROLLING);
+						e107::getLog()->add('Unable to update recipient mail_status to bounce on mail_target_id = ' . $vals[2], $bounceInfo, E_LOG_FATAL, 'BOUNCE', LOG_TO_ROLLING);
 					}
 
 					$addons = array_keys($row['mail_selectors']); // trigger e_mailout.php addons. 'bounce' method. 
@@ -1606,7 +1606,7 @@ class e107MailManager
 							{
 								if (e107::callMethod($cls, 'bounce', $bounceInfo) === false)
 								{
-									e107::getAdminLog()->add($plug . ' bounce process failed', $bounceInfo, E_LOG_FATAL, 'BOUNCE', LOG_TO_ROLLING);
+									e107::getLog()->add($plug . ' bounce process failed', $bounceInfo, E_LOG_FATAL, 'BOUNCE', LOG_TO_ROLLING);
 								}
 							}
 
@@ -1646,14 +1646,14 @@ class e107MailManager
 			$logErrors['bounceString'] = $bounceString;
 			$logString = $bounceString . ' (' . $emailAddress . ')[!br!]' . implode('[!br!]', $errors) . implode('[!br!]', $bounceInfo);
 			//	e107::getAdminLog()->addEvent(10,-1,'BOUNCE','Bounce receive error',$logString, FALSE,LOG_TO_ROLLING);
-			e107::getAdminLog()->add('Bounce receive error', $logErrors, E_LOG_WARNING, 'BOUNCE', LOG_TO_ROLLING);
+			e107::getLog()->add('Bounce receive error', $logErrors, E_LOG_WARNING, 'BOUNCE', LOG_TO_ROLLING);
 
 			return $errors;
 		}
 		else
 		{
 			//	e107::getAdminLog()->addEvent(10,-1,'BOUNCE','Bounce received/logged',$bounceInfo, FALSE,LOG_TO_ROLLING);
-			e107::getAdminLog()->add('Bounce received/logged', $bounceInfo, E_LOG_INFORMATIVE, 'BOUNCE', LOG_TO_ROLLING);
+			e107::getLog()->add('Bounce received/logged', $bounceInfo, E_LOG_INFORMATIVE, 'BOUNCE', LOG_TO_ROLLING);
 		}
 
 
@@ -1901,7 +1901,7 @@ class e107MailManager
 	public function sendEmails($templateName, $emailData, $recipientData, $options = false)
 	{
 
-		$log = e107::getAdminLog();
+		$log = e107::getLog();
 		$log->addDebug(print_r($emailData, true), true);
 		$log->addDebug(print_r($recipientData, true), true);
 		$log->toFile('mail_manager', 'Mail Manager Log', true);
diff --git a/e107_handlers/model_class.php b/e107_handlers/model_class.php
index 0cc6f79df..8045fdd69 100755
--- a/e107_handlers/model_class.php
+++ b/e107_handlers/model_class.php
@@ -1410,14 +1410,14 @@ class e_model extends e_object
 
 		if(!empty($logData))
 		{
-			e107::getAdminLog()->addArray($logData);
+			e107::getLog()->addArray($logData);
 		}
 		else
 		{
-			e107::getAdminLog()->addError($message,false);
+			e107::getLog()->addError($message,false);
 		}
 
-		e107::getAdminLog()->save('ADMINUI_04', E_LOG_WARNING);
+		e107::getLog()->save('ADMINUI_04', E_LOG_WARNING);
 
 		return $this;
 	}
@@ -2306,7 +2306,7 @@ class e_front_model extends e_model
 		}
 
 	//	$newData = $this->getPostedData();
-		e107::getAdminLog()->addArray($data,$oldData);
+		e107::getLog()->addArray($data,$oldData);
 	//	$this->addMessageDebug("NEWD".print_a($data,true));
 
 		$tp = e107::getParser();
@@ -2848,9 +2848,9 @@ class e_front_model extends e_model
 		}
 		$this->clearCache()->addMessageSuccess(LAN_UPDATED. " #".$this->getId());
 
-		e107::getAdminLog()->addSuccess('TABLE: '.$table, false);
-		e107::getAdminLog()->addSuccess('WHERE: '.$qry['WHERE'], false);
-		e107::getAdminLog()->save('ADMINUI_02');
+		e107::getLog()->addSuccess('TABLE: '.$table, false);
+		e107::getLog()->addSuccess('WHERE: '.$qry['WHERE'], false);
+		e107::getLog()->save('ADMINUI_02');
 
 
 		return $res;
@@ -3044,8 +3044,8 @@ class e_admin_model extends e_front_model
 			return false;
 		}
 
-	    e107::getAdminLog()->addSuccess('TABLE: '.$table, false);
-		e107::getAdminLog()->save('ADMINUI_01');
+	    e107::getLog()->addSuccess('TABLE: '.$table, false);
+		e107::getLog()->save('ADMINUI_01');
 	//	e107::getAdminLog()->clear()->addSuccess($table,false)->addArray($sqlQry)->save('ADMINUI_01');
 
 		// Set the reutrned ID
@@ -3145,8 +3145,8 @@ class e_admin_model extends e_front_model
 			if($table != 'admin_log')
 			{
 				$logData = array('TABLE'=>$table, 'WHERE'=>$where);
-				e107::getAdminLog()->addSuccess($table,false);
-				e107::getAdminLog()->addArray($logData)->save('ADMINUI_03');
+				e107::getLog()->addSuccess($table,false);
+				e107::getLog()->addArray($logData)->save('ADMINUI_03');
 			}
 
 			$this->clearCache();
@@ -4037,7 +4037,7 @@ class e_admin_tree_model extends e_front_tree_model
 		if($table != 'admin_log')
 		{
 			$logData = array('TABLE'=>$table, 'WHERE'=>$sqlQry);
-			e107::getAdminLog()->addArray($logData)->save('ADMINUI_03');
+			e107::getLog()->addArray($logData)->save('ADMINUI_03');
 		}
 		return $res;
 	}
diff --git a/e107_handlers/news_class.php b/e107_handlers/news_class.php
index a7350ce5e..de43211f5 100644
--- a/e107_handlers/news_class.php
+++ b/e107_handlers/news_class.php
@@ -38,7 +38,7 @@ class news {
 	{
 		$tp = e107::getParser();
 		$sql = e107::getDb();
-		$admin_log = e107::getAdminLog();
+		$admin_log = e107::getLog();
 		$pref = e107::getPref();
 		$e_event = e107::getEvent();
 		$e107cache = e107::getCache();
@@ -170,7 +170,7 @@ class news {
 			{
 				
 			
-				e107::getAdminLog()->addArray($logData)->save('NEWS_09');
+				e107::getLog()->addArray($logData)->save('NEWS_09');
 
 		
 				$data['data']['news_id'] = $news['news_id'];
@@ -224,7 +224,7 @@ class news {
 				e107::getCache()->clear('news.php');
 
 				//moved down - prevent wrong mysql_insert_id
-				e107::getAdminLog()->addArray($logData)->save('NEWS_08');
+				e107::getLog()->addArray($logData)->save('NEWS_08');
 				e107::getEvent()->trigger('newspost', $data['data']);
 				e107::getEvent()->trigger('admin_news_created', $data['data']);
 
diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index d7e4af4e7..61158b552 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -558,7 +558,7 @@ class e_plugin
 					if(!isset($pref[$path]))
 					{
 						$cfg->setPref('plug_installed/'.$path, $row['plugin_version']);
-						e107::getAdminLog()->addDebug($path)->save("plug_installed pref updated");
+						e107::getLog()->addDebug($path)->save("plug_installed pref updated");
 						$save = true;
 					}
 				}
@@ -582,7 +582,7 @@ class e_plugin
 
 			if($sql->delete('plugin', "plugin_id IN (".$delList.")"))
 			{
-				e107::getAdminLog()->addDebug("Deleted missing plugins with id(s): ".$delList)->save("Plugin Table Updated");
+				e107::getLog()->addDebug("Deleted missing plugins with id(s): ".$delList)->save("Plugin Table Updated");
 				// e107::getDebug()->log("Deleted missing plugins with id(s): ".$delList);
 			}
 		}
@@ -606,7 +606,7 @@ class e_plugin
 				if(!$id = $sql->insert('plugin',$row))
 				{
 					e107::getDebug()->log("Unable to insert plugin data into table".print_a($row,true));
-					e107::getAdminLog()->addDebug("Unable to insert plugin data into table".print_a($row,true))->save("plug_installed pref updated");
+					e107::getLog()->addDebug("Unable to insert plugin data into table".print_a($row,true))->save("plug_installed pref updated");
 				}
 				else
 				{
@@ -615,7 +615,7 @@ class e_plugin
 					$runUpdate = true;
 
 					e107::getDebug()->log("Inserting plugin data into table".print_a($row,true));
-					e107::getAdminLog()->addArray($row)->save("Plugin Table Entry Added");
+					e107::getLog()->addArray($row)->save("Plugin Table Entry Added");
 
 					if($row['plugin_installflag'] == 1)
 					{
@@ -1511,7 +1511,7 @@ class e107plugin
 	//	$xml 			= e107::getXml();
 		$mes 			= e107::getMessage();	
 		$needed 		= array();
-		$log 			= e107::getAdminLog();
+		$log 			= e107::getLog();
 
 		if(!$plugVersions = e107::getConfig('core')->get('plug_installed'))
 		{
@@ -1613,7 +1613,7 @@ class e107plugin
 		
 		$mes->addDebug("Updating plugins Table");
 		
-		$log = e107::getAdminLog();
+		$log = e107::getLog();
 
 		global $mySQLprefix, $menu_pref;
 		$pref = e107::getPref();
@@ -4345,7 +4345,7 @@ class e107plugin
 	public function uninstall($id, $options = array())
 	{
 		$pref = e107::getPref();
-		$admin_log = e107::getAdminLog();
+		$admin_log = e107::getLog();
 		$plugin = e107::getPlugin();
 		$tp = e107::getParser();
 
diff --git a/e107_handlers/pref_class.php b/e107_handlers/pref_class.php
index 16cf67fb1..aa01298e8 100644
--- a/e107_handlers/pref_class.php
+++ b/e107_handlers/pref_class.php
@@ -539,7 +539,7 @@ class e_pref extends e_front_model
 			return 0;
 		}
 
-		$log = e107::getAdminLog();
+		$log = e107::getLog();
 		$disallow_logs = $this->getParam('nologs', false);
 
 		//Save to DB
diff --git a/e107_handlers/session_handler.php b/e107_handlers/session_handler.php
index dc335f8e0..a166ca9de 100644
--- a/e107_handlers/session_handler.php
+++ b/e107_handlers/session_handler.php
@@ -945,7 +945,7 @@ class e_core_session extends e_session
 
 		$details .= $status."\n\n---------------------------------\n\n";
 
-		$log = e107::getAdminLog();
+		$log = e107::getLog();
 		$log->addDebug($details);
 
 		if(deftrue('e_DEBUG_SESSION'))
diff --git a/e107_handlers/upload_handler.php b/e107_handlers/upload_handler.php
index 5a530b577..d307cadc4 100644
--- a/e107_handlers/upload_handler.php
+++ b/e107_handlers/upload_handler.php
@@ -112,7 +112,7 @@ define('e_SAVE_FILETYPES', 'filetypes_.xml');
  */
 function process_uploaded_files($uploaddir, $fileinfo = FALSE, $options = NULL)
 {
-	$admin_log = e107::getAdminLog();
+	$admin_log = e107::getLog();
 
 	$ul_temp_dir = '';
 	if (ini_get('open_basedir') != '') // Need to move file to intermediate directory before we can read its contents to check it.
@@ -485,7 +485,7 @@ function handle_upload_messages(&$upload_array, $errors_only = TRUE, $use_handle
  */
 function file_upload($uploaddir, $avatar = FALSE, $fileinfo = "", $overwrite = "")
 {
-	$admin_log = e107::getAdminLog();
+	$admin_log = e107::getLog();
 	$options = array(
 		'extra_file_types'=>TRUE
 	); // As default, allow any filetype enabled in filetypes.php
@@ -893,7 +893,7 @@ function get_image_mime($filename, $extended = false)
 	function calc_max_upload_size($max_up = -1)
 	{
 		global $pref;
-		$admin_log = e107::getAdminLog();
+		$admin_log = e107::getLog();
 		// Work out maximum allowable file size
 		if (deftrue('UH_DEBUG'))
 		{
diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php
index cd299ca9a..d3208edc8 100644
--- a/e107_handlers/user_handler.php
+++ b/e107_handlers/user_handler.php
@@ -1072,7 +1072,7 @@ Following fields auto-filled in code as required:
 				{	// Only update if needed
 					$db->update('user', '`user_ban` = '.$newVal.', `user_email` = \'\' WHERE `user_id` = '.$row['user_id'].' LIMIT 1');
 					// Add to user audit log		TODO: Should we log to admin log as well?
-					$adminLog = e107::getAdminLog();
+					$adminLog = e107::getLog();
 					$adminLog->user_audit($logEvent, array('user_ban' => $newVal, 'user_email' => $row['user_email']), $row['user_id'], $row['user_loginname']);
 				}
 			}
diff --git a/e107_handlers/user_model.php b/e107_handlers/user_model.php
index c9763f401..5e28b598c 100644
--- a/e107_handlers/user_model.php
+++ b/e107_handlers/user_model.php
@@ -1659,7 +1659,7 @@ class e_user extends e_user_model
 		}
 
 		// TODO - lan
-		e107::getAdminLog()->add('Head Admin used Login As feature', 'Head Admin [#'.$this->getId().'] '.$this->getName().' logged in user account #'.$user_id);
+		e107::getLog()->add('Head Admin used Login As feature', 'Head Admin [#'.$this->getId().'] '.$this->getName().' logged in user account #'.$user_id);
 		//$this->loadAs(); - shouldn't be called here - loginAs should be called in Admin area only, loadAs - front-end
 		return true;
 	}
diff --git a/e107_handlers/xml_class.php b/e107_handlers/xml_class.php
index 76187c01c..b722a8ada 100644
--- a/e107_handlers/xml_class.php
+++ b/e107_handlers/xml_class.php
@@ -24,7 +24,7 @@ class parseXml extends xmlClass // BC with v1.x
 	function __construct()
 	{
 		$data = debug_backtrace(true);
-		$log = e107::getAdminLog();
+		$log = e107::getLog();
 		$log->addDebug('Deprecated XML Parser Used');
 		
 		$log->addArray($data);
@@ -50,7 +50,7 @@ class parseXml extends xmlClass // BC with v1.x
 	
 	function parseXmlContents ()
 	{
-		$log = e107::getAdminLog();
+		$log = e107::getLog();
 		
 		foreach($this -> xmlData as $key => $value)
 		{
diff --git a/e107_plugins/download/request.php b/e107_plugins/download/request.php
index f6b17eb0f..54faf6f49 100644
--- a/e107_plugins/download/request.php
+++ b/e107_plugins/download/request.php
@@ -8,7 +8,7 @@ if (!defined('e107_INIT'))
 e107::lan('download','download');
 
 
-$log = e107::getAdminLog(); 
+$log = e107::getLog();
 $id = FALSE;
 
 $sql = e107::getDb();
diff --git a/e107_plugins/forum/forum_class.php b/e107_plugins/forum/forum_class.php
index 39f58f945..550696aa4 100644
--- a/e107_plugins/forum/forum_class.php
+++ b/e107_plugins/forum/forum_class.php
@@ -1294,7 +1294,7 @@ class e107forum
 	{
 		$e107 = e107::getInstance();
 		$sql  = e107::getDb();
-		$log  = e107::getAdminLog(); 
+		$log  = e107::getLog();
 
 		$id = (int)$id;
 		if(!$id) { return; }
diff --git a/e107_plugins/gsitemap/admin_config.php b/e107_plugins/gsitemap/admin_config.php
index 1d7cb0fad..e5808bb6a 100644
--- a/e107_plugins/gsitemap/admin_config.php
+++ b/e107_plugins/gsitemap/admin_config.php
@@ -866,7 +866,7 @@ class gsitemap
 
 	function addLink()
 	{
-		$log = e107::getAdminLog();
+		$log = e107::getLog();
 		$sql = e107::getDb();
 		$tp  = e107::getParser();
 		
@@ -922,7 +922,7 @@ class gsitemap
 
 	function deleteSme()
 	{
-		$log = e107::getAdminLog();	
+		$log = e107::getLog();
 		$sql = e107::getDb();
 		
 		$d_idt = array_keys($_POST['delete']);
@@ -1099,7 +1099,7 @@ class gsitemap
 	{
 		$sql 	= e107::getDb();
 		$tp 	= e107::getParser();
-		$log 	= e107::getAdminLog();
+		$log 	= e107::getLog();
 
 
 		foreach($_POST['importid'] as $import)
diff --git a/e107_plugins/log/admin_config.php b/e107_plugins/log/admin_config.php
index 1c4da02e1..cd0647312 100644
--- a/e107_plugins/log/admin_config.php
+++ b/e107_plugins/log/admin_config.php
@@ -29,7 +29,7 @@ if(e_AJAX_REQUEST && varset($_GET['action']) == 'rebuild')
 	$totalFiles = $_SESSION['stats_log_files_total'] - 1;
 	//$process = true;
 
-	$lg = e107::getAdminLog();
+	$lg = e107::getLog();
 //	$lg->addDebug(print_r($logVals, true));
 
 
diff --git a/e107_plugins/log/log.php b/e107_plugins/log/log.php
index 21ea04316..f46db701e 100644
--- a/e107_plugins/log/log.php
+++ b/e107_plugins/log/log.php
@@ -91,7 +91,7 @@ else
 
 $logVals = str_replace('%3A',':',$logVals); // make the URLs a bit cleaner, while keeping any urlqueries encoded.
 
-$lg = e107::getAdminLog();
+$lg = e107::getLog();
 $lg->addDebug(print_r($logVals, true));
 $lg->toFile('SiteStats','Statistics Log', true);
 
diff --git a/e107_themes/bootstrap3/theme.xml b/e107_themes/bootstrap3/theme.xml
index f95b6dea8..f522461fb 100644
--- a/e107_themes/bootstrap3/theme.xml
+++ b/e107_themes/bootstrap3/theme.xml
@@ -30,7 +30,7 @@
 		<css file="css/corporate.css" name="Corporate" scope='admin' thumbnail='images/admin_corporate.jpg' exclude='bootstrap' />
 		<css file="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/flatly/bootstrap.min.css" name="Flatly" scope='admin' exclude='bootstrap'/>
         <css file="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/sandstone/bootstrap.min.css" name="Sandstone" scope='admin' exclude='bootstrap'/>
-        <css file="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/superhero/bootstrap.min.css" name="Superhero" thumbnail='images/admin_superhero.jpg' scope='admin' exclude='bootstrap'/>
+        <css file="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/superhero/bootstrap.min.css" name="Superhero" thumbnail='images/admin_superhero.jpg' scope='admin,wysiwyg' exclude='bootstrap'/>
         <css file="*" name="*"/>
 	</stylesheets>
 	<layouts>
diff --git a/fpw.php b/fpw.php
index 5ff2f719c..04ef07b0e 100644
--- a/fpw.php
+++ b/fpw.php
@@ -383,7 +383,7 @@ if (!empty($_POST['pwsubmit']))
 		}
 
 		// Log to user audit log
-		e107::getAdminLog()->user_audit(USER_AUDIT_PW_RES, $do_log, $row['user_id'], $row['user_name']);
+		e107::getLog()->user_audit(USER_AUDIT_PW_RES, $do_log, $row['user_id'], $row['user_name']);
 
 		$ns->tablerender(LAN_03, $text.e107::getMessage()->render());
 		require_once(FOOTERF);