diff --git a/admin/admin_template/default/index_template.inc.php b/admin/admin_template/default/index_template.inc.php
index eded089b..c19db65c 100755
--- a/admin/admin_template/default/index_template.inc.php
+++ b/admin/admin_template/default/index_template.inc.php
@@ -1,27 +1,29 @@
 <?php
-  /**
-  * Akasia Template
-  *
-  * Copyright (C) 2015 Eddy Subratha (eddy.subratha@gmail.com)
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation; either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-  *
-  */
+/**
+ * Template for Backend
+ *
+ * Copyright (C) 2015 Arie Nugraha (dicarve@gmail.com)
+ * Create by Eddy Subratha (eddy.subratha@slims.web.id)
+ * 
+ * Slims 8 (Akasia)
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
-  // Need to modified script to adaptive new theme
-  include 'function.php';
+// Need to modified script to adaptive new theme
+include 'function.php';
 ?>
 <!-- =====================================================================
  ___  __    ____  __  __  ___      __    _  _    __    ___  ____    __
@@ -29,10 +31,7 @@
 \__ \ )(__  _)(_  )    ( \__ \   /(__)\  )  (  /(__)\ \__ \ _)(_  /(__)\
 (___/(____)(____)(_/\/\_)(___/  (__)(__)(_)\_)(__)(__)(___/(____)(__)(__)
 
-By Eddy Subratha (eddy.subratha@slims.web.id)
-
 ========================================================================== -->
-
 <!DOCTYPE html>
 <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
 <!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
@@ -125,7 +124,7 @@
   <?php 
   // Chat
   // =============================================
-  if($sysconf['chat_system']['enabled']) : ?>
+  if($sysconf['chat_system']['enabled'] && $sysconf['chat_system']['librarian']) : ?>
   <aside class="s-chat s-maximize">
     <a href="#" id="pchat-hide" class="s-chat-header"><?php echo __('Chat With Members'); ?></a>
     <div class="s-chat-content">
@@ -137,7 +136,7 @@
   </aside>
 
   <script>
-    $.get('../chat_server.php', {}, function(){});
+    $.get('../chatserver.php', {}, function(){});
     var Server;
     function log( text ) {
       $log = $('#log');
@@ -153,7 +152,7 @@ function send( text ) {
 
     $(document).ready(function() { 
      log('Connecting...');
-      Server = new FancyWebSocket("ws://<?php echo $sysconf['chat_system']['host'].':'.$sysconf['chat_system']['port']; ?>");
+      Server = new FancyWebSocket('ws://<?php echo $sysconf['chat_system']['server'] ?>:<?php echo $sysconf['chat_system']['server_port'] ?>');
       $('#message').keypress(function(e) {
         if ( e.keyCode == 13 && this.value ) {
           log( 'You: ' + this.value );
diff --git a/chat_server.php b/chat_server.php
deleted file mode 100644
index 3993fdd3..00000000
--- a/chat_server.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-// call configuration 
-define('INDEX_AUTH', '1');
-include 'sysconfig.inc.php';
-
-// prevent the server from timing out
-set_time_limit(0);
-
-// include the web sockets server script (the server is started at the far bottom of this file)
-require 'lib/phpwebsocket.php';
-
-// when a client sends data to the server
-function wsOnMessage($clientID, $message, $messageLength, $binary) {
-	global $Server;
-	$ip = long2ip( $Server->wsClients[$clientID][6] );
-
-	// check if message length is 0
-	if ($messageLength == 0) {
-		$Server->wsClose($clientID);
-		return;
-	}
-
-	//The speaker is the only person in the room. Don't let them feel lonely.
-	if ( sizeof($Server->wsClients) == 1 )
-		$Server->wsSend($clientID, "There isn't anyone else in the room, but I'll still listen to you. --Your Trusty Server");
-	else
-		//Send the message to everyone but the person who said it
-		foreach ( $Server->wsClients as $id => $client )
-			if ( $id != $clientID ) {
-				$_message = explode("|", $message);
-				$Server->wsSend($id, $_message[0]." ".$clientID." : ".$_message[1]);
-			}
-}
-
-// when a client connects
-function wsOnOpen($clientID)
-{
-	echo $clientID;
-	global $Server;
-	$ip = long2ip( $Server->wsClients[$clientID][6] );
-
-	$Server->log("Someone has connected." );
-
-	//Send a join notice to everyone but the person who joined
-	foreach ( $Server->wsClients as $id => $client )
-		if ( $id != $clientID )
-			$Server->wsSend($id, "Someone has joined the room.");
-}
-
-// when a client closes or lost connection
-function wsOnClose($clientID, $status) {
-	global $Server;
-	$ip = long2ip( $Server->wsClients[$clientID][6] );
-
-	$Server->log( "Someone has disconnected." );
-
-	//Send a user left notice to everyone in the room
-	foreach ( $Server->wsClients as $id => $client )
-		$Server->wsSend($id, "Someone has left the room.");
-}
-
-// start the server
-$Server = new PHPWebSocket();
-$Server->bind('message', 'wsOnMessage');
-$Server->bind('open', 'wsOnOpen');
-$Server->bind('close', 'wsOnClose');
-// for other computers to connect, you will probably need to change this to your LAN IP or external IP,
-// alternatively use: gethostbyaddr(gethostbyname($_SERVER['SERVER_NAME']))
-$Server->wsStartServer($sysconf['chat_system']['host'], $sysconf['chat_system']['port']);
-
-?>
\ No newline at end of file
diff --git a/chatserver.php b/chatserver.php
index 14e12e71..7a931e6e 100755
--- a/chatserver.php
+++ b/chatserver.php
@@ -2,11 +2,12 @@
 // prevent the server from timing out
 set_time_limit(0);
 
-define('INDEX_AUTH', 1);
+// call configuration 
+define('INDEX_AUTH', '1');
+require 'sysconfig.inc.php';
 
 // include the web sockets server script (the server is started at the far bottom of this file)
-require 'sysconfig.inc.php';
-require LIB.'phpwebsocket.php';
+require 'lib/phpwebsocket.php';
 
 // when a client sends data to the server
 function wsOnMessage($clientID, $message, $messageLength, $binary) {
@@ -25,22 +26,25 @@ function wsOnMessage($clientID, $message, $messageLength, $binary) {
 	else
 		//Send the message to everyone but the person who said it
 		foreach ( $Server->wsClients as $id => $client )
-			if ( $id != $clientID )
-				$Server->wsSend($id, "Visitor $clientID ($ip) said \"$message\"");
+			if ( $id != $clientID ) {
+				$_message = explode("|", $message);
+				$Server->wsSend($id, $_message[0]." ".$clientID." : ".$_message[1]);
+			}
 }
 
 // when a client connects
 function wsOnOpen($clientID)
 {
+	echo $clientID;
 	global $Server;
 	$ip = long2ip( $Server->wsClients[$clientID][6] );
 
-	$Server->log( "$ip ($clientID) has connected." );
+	$Server->log("Someone has connected." );
 
 	//Send a join notice to everyone but the person who joined
 	foreach ( $Server->wsClients as $id => $client )
 		if ( $id != $clientID )
-			$Server->wsSend($id, "Visitor $clientID ($ip) has joined the room.");
+			$Server->wsSend($id, "Someone has joined the room.");
 }
 
 // when a client closes or lost connection
@@ -48,11 +52,11 @@ function wsOnClose($clientID, $status) {
 	global $Server;
 	$ip = long2ip( $Server->wsClients[$clientID][6] );
 
-	$Server->log( "$ip ($clientID) has disconnected." );
+	$Server->log( "Someone has disconnected." );
 
 	//Send a user left notice to everyone in the room
 	foreach ( $Server->wsClients as $id => $client )
-		$Server->wsSend($id, "Visitor $clientID ($ip) has left the room.");
+		$Server->wsSend($id, "Someone has left the room.");
 }
 
 // start the server
@@ -62,4 +66,4 @@ function wsOnClose($clientID, $status) {
 $Server->bind('close', 'wsOnClose');
 // for other computers to connect, you will probably need to change this to your LAN IP or external IP,
 // alternatively use: gethostbyaddr(gethostbyname($_SERVER['SERVER_NAME']))
-$Server->wsStartServer($sysconf['chat_system']['server'], $sysconf['chat_system']['server_port']);
+$Server->wsStartServer($sysconf['chat_system']['server'], $sysconf['chat_system']['server_port']);
\ No newline at end of file
diff --git a/sysconfig.inc.php b/sysconfig.inc.php
index f924b790..3d74e289 100755
--- a/sysconfig.inc.php
+++ b/sysconfig.inc.php
@@ -596,22 +596,12 @@ function stripslashes_deep($value)
 $sysconf['social']['ym'] = 'Yahoo! Messenger';
 
 /* CHATTING SYSTEM */
-$sysconf['chat_system']['enabled']    = true;
-$sysconf['chat_system']['vendors']    = 'phpwebscoketchat';
-<<<<<<< HEAD
-$sysconf['chat_system']['opac']       = TRUE;
-$sysconf['chat_system']['librarian']  = TRUE;
-$sysconf['chat_system']['server']  = '127.0.0.1';
+$sysconf['chat_system']['enabled']    	= true;
+$sysconf['chat_system']['vendors']    	= 'phpwebscoketchat';
+$sysconf['chat_system']['opac']       	= true;
+$sysconf['chat_system']['librarian']  	= true;
+$sysconf['chat_system']['server']  		= '127.0.0.1';
 $sysconf['chat_system']['server_port']  = 9300;
-=======
-$sysconf['chat_system']['opac']       = false;
-$sysconf['chat_system']['librarian']  = false;
-$sysconf['chat_system']['librarian']  = '/usr/local/bin/php';
-$sysconf['chat_system']['host']       = '127.0.0.1'; // You need an IP Address to use Chat
-$sysconf['chat_system']['port']       = '9300'; // set Chat port
-
-
->>>>>>> 350294370b8751288e55357911b8c562dc726034
 
 // redirect to mobile template on mobile mode
 if (defined('LIGHTWEIGHT_MODE') AND !isset($_COOKIE['FULLSITE_MODE']) AND $sysconf['template']['responsive'] === false) {
diff --git a/template/default/index_template.inc.php b/template/default/index_template.inc.php
index 536e292e..ca684dda 100644
--- a/template/default/index_template.inc.php
+++ b/template/default/index_template.inc.php
@@ -209,7 +209,7 @@
 
 <?php 
 // Chat
-if($sysconf['chat_system']['enabled']) : 
+if($sysconf['chat_system']['enabled'] && $sysconf['chat_system']['opac']) : 
 ?>
 <a href="#" id="pchat-toggle" class="animated fadeInUp delay3"><i class="fa fa-comment-o"></i></a>
 <aside class="s-chat s-maximize">
@@ -238,12 +238,7 @@ function send( text ) {
 
   $(document).ready(function() {
     log('Connecting...');
-<<<<<<< HEAD
     Server = new FancyWebSocket('ws://<?php echo $sysconf['chat_system']['server'] ?>:<?php echo $sysconf['chat_system']['server_port'] ?>');
-=======
-    Server = new FancyWebSocket("ws://<?php echo $sysconf['chat_system']['host'].':'.$sysconf['chat_system']['port']; ?>");
->>>>>>> 350294370b8751288e55357911b8c562dc726034
-
     $('#message').keypress(function(e) {
       if ( e.keyCode == 13 && this.value ) {
         log( 'You: ' + this.value );
