diff --git a/LICENSE.txt b/LICENSE.txt
index d398cb905fef4bb5d275934c2eac9a500ad6022d..2c095c8d3f42488e8168f9710a4ffbfc4125a159 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,3 @@
-$Id$
 GNU GENERAL PUBLIC LICENSE
 
               Version 2, June 1991
diff --git a/README.txt b/README.txt
index 32ef8a3abacb8967933510e59f1067e447310a0b..d63cd0a901a21e371443436e996939379fc5e3c5 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,3 @@
-$Id$
 
 DrupalChat provides one on one chat. It provides a static sleek chat bar at 
 the bottom of the web browser. There is a selectable list of Online Users like
diff --git a/drupalchat-subpanel.tpl.php b/drupalchat-subpanel.tpl.php
index b544e1d2560bc86e659ea1c6b7da6867e1c6dc08..b8578bd32e754de2b7c6e0abb2e0dc04a598a854 100644
--- a/drupalchat-subpanel.tpl.php
+++ b/drupalchat-subpanel.tpl.php
@@ -1,5 +1,4 @@
 <?php 
-// $Id$
 ?>
 
 <a href="#" class="<?php print $subpanel['name']; ?> subpanel_toggle">
diff --git a/drupalchat.admin.inc b/drupalchat.admin.inc
index c8dfe97a6fb06a3a804ee815859415838a8980fe..f371fbc31540d888ad6e865c17c6657de1f9dd3c 100644
--- a/drupalchat.admin.inc
+++ b/drupalchat.admin.inc
@@ -1,5 +1,4 @@
 <?php
-//$Id$
 /**
  * @file
  * Administrative functions to configure DrupalChat.
diff --git a/drupalchat.admin.js b/drupalchat.admin.js
index ffdd04a31a8f0b9d95b18b616f59edebd0ec9a20..93c639a65fdeab5405bd30df41564f940021996a 100644
--- a/drupalchat.admin.js
+++ b/drupalchat.admin.js
@@ -1,4 +1,3 @@
-//$Id$
 $(document).ready(function() {
 	$("input[name=drupalchat_polling_method]").change(function() {
 	    if ($("input[name=drupalchat_polling_method]:checked").val() == '0') {
diff --git a/drupalchat.info b/drupalchat.info
index 4793af7c0ad9c11e69aebf14acffb01c76ac8abc..a451bc0c262a0ebc7c9b9b87e195abb426c52d4f 100644
--- a/drupalchat.info
+++ b/drupalchat.info
@@ -1,4 +1,3 @@
-; $Id$
 name = DrupalChat
 package = DrupalChat
 description = Allows users to communicate via instant chat messaging. Provides multiple AJAX implementations.
diff --git a/drupalchat.install b/drupalchat.install
index 61ec1e10264fd89889123a6194526957c0bd0172..aaa54b19ed5b716bb14af4078ae623e6ba2fe1bf 100644
--- a/drupalchat.install
+++ b/drupalchat.install
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/drupalchat.module b/drupalchat.module
index 6f9a49d39c4220861126f31b484538ee27bdfbb7..62a593fdab45f94622228b534a6dd0cae21f0b5f 100644
--- a/drupalchat.module
+++ b/drupalchat.module
@@ -1,5 +1,4 @@
 <?php 
-// $Id$
 
 /**
  * @file
diff --git a/drupalchat.tpl.php b/drupalchat.tpl.php
index a4fbbddfd1077f5c47a4ad7437a241103daeb6eb..04171921250ed58da143509072fc94f461c91366 100644
--- a/drupalchat.tpl.php
+++ b/drupalchat.tpl.php
@@ -1,5 +1,4 @@
 <?php 
-// $Id$
 ?>
 
 <div id="drupalchat-wrapper">
diff --git a/drupalchat_notifications/drupalchat_notifications.info b/drupalchat_notifications/drupalchat_notifications.info
index 725871906aa473fcc1d001481f818b9c10da2bcb..f768417fe3d492f4fff09b172925c48d2ee8dc1e 100644
--- a/drupalchat_notifications/drupalchat_notifications.info
+++ b/drupalchat_notifications/drupalchat_notifications.info
@@ -1,4 +1,3 @@
-; $Id$
 name = DrupalChat Notifications
 package = DrupalChat
 description = Provides a notifications interface to the DrupalChat bar. Notifications can be sent by any module and are displayed in real time.
diff --git a/drupalchat_notifications/drupalchat_notifications.install b/drupalchat_notifications/drupalchat_notifications.install
index f0c3ac05ea3516020ff2405a53a6095b2c8c70a8..9aae471cdb7c576e7c83c5db52ba5478565d47ea 100644
--- a/drupalchat_notifications/drupalchat_notifications.install
+++ b/drupalchat_notifications/drupalchat_notifications.install
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/drupalchat_notifications/drupalchat_notifications.module b/drupalchat_notifications/drupalchat_notifications.module
index f48f42c213bb7ca54f12a22e7e160ee465734a93..2bee7622b3d14f249bfe1c5d8e8520ba8f6e4be6 100644
--- a/drupalchat_notifications/drupalchat_notifications.module
+++ b/drupalchat_notifications/drupalchat_notifications.module
@@ -1,5 +1,4 @@
 <?php 
-// $Id$
 
 /**
  * @file
diff --git a/js/ba-emotify.js b/js/ba-emotify.js
index 6407de31ea6fdd2763dc3144f57c0a602d066d05..c49cac0fbd0f1bfc2a56208ed09ebd03c5c52a8a 100644
--- a/js/ba-emotify.js
+++ b/js/ba-emotify.js
@@ -1,4 +1,3 @@
-//$Id$
 /**
  * Has been modified.
  */
diff --git a/js/drupalchat-jstorage.js b/js/drupalchat-jstorage.js
index f773dddf02608fa65e05aeb08fea2e0ee912e6ec..3a711b66e7505cc9c48303b0ad8798608c1bdee4 100644
--- a/js/drupalchat-jstorage.js
+++ b/js/drupalchat-jstorage.js
@@ -1,4 +1,3 @@
-//$Id$
 //Has been modified for DrupalChat module.
 /*
  * ----------------------------- JSTORAGE -------------------------------------
diff --git a/js/drupalchat-min.js b/js/drupalchat-min.js
index 8ad0033a39eb8cfbe9ad5f105b85732f72d227b2..dadd2c577544de65fee9bcec761f80b0e31ab0d7 100644
--- a/js/drupalchat-min.js
+++ b/js/drupalchat-min.js
@@ -1,2 +1 @@
-//$Id$
 var drupalchat={username:null,uid:null,send_current_message:null,last_timestamp:0,send_current_uid2:0,attach_messages_in_queue:0,running:0,smilies:{":)":["glad.png","happy",":-)"],":(":["sad.png","sad",":-("],";)":["wink.png","winking",";-)"],":D":["lol.png","big grin",":-D"],"^_^":["muhaha.gif","happy eyes"],">:o":["haha.gif","laughing eyes"],":3":["hohoho.png","laughing eyes"],">:-(":["waiting.png","grumpy","X-(","X(","x-(","x("],":'(":["crying.png","crying"],":o":["omg.png","shocked",":-o"],"8)":["cool.png","glass","8-)","B)","B-)"],"8-|":["ouch.png","cool","8-|"],":p":["tongue.png","tongue",":-p",":P",":-P"],"O.o":["stupid-idea.png","woot?!"],"-_-":["huh-where.png","dark emote"],":/":["oopsy.png","duhhh",":-/",":\\",":-\\"],":*":["kiss.png","kiss",":-*"],"<3":["love.png","heart",],"3:)":["very-devil-plan.png","devil smile"],"O:)":["idiotic-smile.png","angel"]}};$(document).ready(function(){YUI().use('gallery-storage-lite',function(Y){Y.StorageLite.on('storage-lite:ready',function(){if(Y.StorageLite.getItem('username')!=null){drupalchat.username=Y.StorageLite.getItem('username');drupalchat.uid=Y.StorageLite.getItem('uid');drupalchat.send_current_message=Y.StorageLite.getItem('send_current_message');drupalchat.last_timestamp=Y.StorageLite.getItem('last_timestamp');drupalchat.send_current_uid2=Y.StorageLite.getItem('send_current_uid2');drupalchat.attach_messages_in_queue=Y.StorageLite.getItem('attach_messages_in_queue');drupalchat.running=Y.StorageLite.getItem('running');if(Y.StorageLite.getItem('drupalchat').length){$('#drupalchat').html(Y.StorageLite.getItem('drupalchat'))}}})});emotify.emoticons(Drupal.settings.drupalchat.smileyURL,drupalchat.smilies);$.fn.adjustPanel=function(){$(this).find("ul, .subpanel").css({'height':'auto'});var windowHeight=$(window).height();var panelsub=$(this).find(".subpanel").height();var panelAdjust=windowHeight-100;var ulAdjust=panelAdjust-25;if(panelsub>panelAdjust){$(this).find(".subpanel").css({'height':panelAdjust});$(this).find("ul").css({'height':panelAdjust})}else{$(this).find("ul").css({'height':'auto'})}};$("#chatpanel").adjustPanel();$(window).resize(function(){$("#chatpanel").adjustPanel()});$("<div><object id=\"drupalchatbeep\" classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" width=\"1\" height=\"1\"><param name=\"movie\" value=\""+Drupal.settings.drupalchat.sound+"\"/><!--[if !IE]>--><object type=\"application/x-shockwave-flash\" data=\""+Drupal.settings.drupalchat.sound+"\" width=\"1\" height=\"1\"></object><!--<![endif]--></object></div>").appendTo($("body"));swfobject.registerObject("drupalchatbeep","9");$("#mainpanel li a.subpanel_toggle, .chatbox a.chatboxhead").live('click',function(){if($(this).next(".subpanel").is(':visible')){$(this).next(".subpanel").hide();$("#drupalchat li a").removeClass('active')}else{$(".subpanel").hide();$(this).next(".subpanel").toggle();$("#drupalchat li a").removeClass('active');$(this).toggleClass('active');var isTextarea=$(this).next(".subpanel").children(".chatboxinput").children(".chatboxtextarea");if(isTextarea.length>0){isTextarea[0].focus();$(this).next(".subpanel").children(".chatboxcontent").scrollTop($(this).next(".subpanel").children(".chatboxcontent")[0].scrollHeight)}}return false});$('.subpanel .subpanel_title').live('click',function(){$(".subpanel").hide();$("#drupalchat li a").removeClass('active')});$('.subpanel ul').click(function(e){});$("#chatpanel .subpanel li:not(.link) a").live('click',function(){chatWith($(this).attr("class"),$(this).text())});$(".chatbox .subpanel_title span:not(.min)").live('click',function(){closeChatBox($(this).attr('class'))});if(Drupal.settings.drupalchat.status==1){$(".chat_options .chat_loading").removeClass('chat_loading').addClass('status-2').html(Drupal.settings.drupalchat.goIdle);$("#chatpanel .icon").attr("src",Drupal.settings.drupalchat.images+"chat-1.png")}else if(Drupal.settings.drupalchat.status==2){$(".chat_options .chat_loading").removeClass('chat_loading').addClass('status-1').html(Drupal.settings.drupalchat.goOnline);$("#chatpanel .icon").attr("src",Drupal.settings.drupalchat.images+"chat-2.png")}$(".chat_options .status-1").live('click',function(){$(".chat_options .status-1").removeClass('status-1').addClass('chat_loading');$.post(Drupal.settings.drupalchat.statusUrl,{status:"1"},function(data){$(".chat_options .chat_loading").removeClass('chat_loading').addClass('status-2').html(Drupal.settings.drupalchat.goIdle);$("#chatpanel .icon").attr("src",Drupal.settings.drupalchat.images+"chat-1.png")})});$(".chat_options .status-2").live('click',function(){$(".chat_options .status-2").removeClass('status-2').addClass('chat_loading');$.post(Drupal.settings.drupalchat.statusUrl,{status:"2"},function(data){$(".chat_options .chat_loading").removeClass('chat_loading').addClass('status-1').html(Drupal.settings.drupalchat.goOnline);$("#chatpanel .icon").attr("src",Drupal.settings.drupalchat.images+"chat-2.png")})});$(".chat_options .options").live('click',function(){alert('Under Construction')});setTimeout(function(){chatPoll()},500)});function chatWith(chatboxtitle,chatboxname){createChatBox(chatboxtitle,chatboxname);$("#chatbox_"+chatboxtitle+" a:first").click();$("#chatbox_"+chatboxtitle+" .chatboxtextarea").focus()}function createChatBox(chatboxtitle,chatboxname,chatboxblink){if($("#chatbox_"+chatboxtitle).length>0){if($("#chatbox_"+chatboxtitle).css('display')=='none'){$("#chatbox_"+chatboxtitle).css('display','block')}$("#chatbox_"+chatboxtitle+" .chatboxtextarea").focus();return}$(" <li />").attr("id","chatbox_"+chatboxtitle).addClass("chatbox").html('<a href="#" class="chatboxhead"><span class="subpanel_title_text">'+chatboxname+'</span></a><div class="subpanel"><div class="subpanel_title"><span class="'+chatboxtitle+'">x</span><span class="min">_</span>'+chatboxname+'</div><div class="chatboxcontent"></div><div class="chatboxinput"><textarea class="chatboxtextarea" onkeydown="javascript:return checkChatBoxInputKey(event,this,\''+chatboxtitle+'\');"></textarea></div></div>').prependTo($("#mainpanel"));if(chatboxblink==1){$('#chatbox_'+chatboxtitle+' .chatboxhead').addClass("chatboxblink")}$("#chatbox_"+chatboxtitle+" .chatboxtextarea").blur(function(){$("#chatbox_"+chatboxtitle+" .chatboxtextarea").removeClass('chatboxtextareaselected')}).focus(function(){$('#chatbox_'+chatboxtitle+' .chatboxhead').removeClass('chatboxblink');$("#chatbox_"+chatboxtitle+" .chatboxtextarea").addClass('chatboxtextareaselected')});$("#chatbox_"+chatboxtitle).click(function(){if($('#chatbox_'+chatboxtitle+' .chatboxcontent').css('display')!='none'){$("#chatbox_"+chatboxtitle+" .chatboxtextarea").focus()}});$("#chatbox_"+chatboxtitle).show()}function chatPoll(){if(Drupal.settings.drupalchat.polling_method=='0'){setInterval(function(){$.post(Drupal.settings.drupalchat.pollUrl,{drupalchat_last_timestamp:drupalchat.last_timestamp},processChatData)},(Drupal.settings.drupalchat.refresh_rate)*1000)}else{$.post(Drupal.settings.drupalchat.pollUrl,{drupalchat_last_timestamp:drupalchat.last_timestamp},processChatData)}}function processChatData(data){var drupalchat_messages=Drupal.parseJson(data);if((!drupalchat_messages.status||drupalchat_messages.status==0)){if(drupalchat_messages.messages.length>0){var obj=swfobject.getObjectById("drupalchatbeep");if(obj){obj.drupalchatbeep()}}$.each(drupalchat_messages.messages,function(index,value){chatboxtitle=value.uid1;if($("#chatbox_"+chatboxtitle).length<=0){createChatBox(chatboxtitle,value.name,1)}else if($("#chatbox_"+chatboxtitle+" .subpanel").is(':hidden')){if($("#chatbox_"+chatboxtitle).css('display')=='none'){$("#chatbox_"+chatboxtitle).css('display','block')}$("#chatbox_"+chatboxtitle+" a:first").click();$("#chatbox_"+chatboxtitle+" .chatboxtextarea").focus()}value.message=value.message.replace(/{{drupalchat_newline}}/g,"<br />");value.message=emotify(value.message);if($("#chatbox_"+chatboxtitle+" .chatboxcontent .chatboxusername a:last").html()==value.name){$("#chatbox_"+chatboxtitle+" .chatboxcontent").append('<p>'+value.message+'</p>')}else{var currentTime=new Date();var hours=currentTime.getHours();var minutes=currentTime.getMinutes();if(hours<10){hours="0"+hours}if(minutes<10){minutes="0"+minutes}$("#chatbox_"+chatboxtitle+" .chatboxcontent").append('<div class="chatboxusername"><span class="chatboxtime">'+hours+':'+minutes+'</span><a href="'+Drupal.settings.basePath+'user/'+chatboxtitle+'">'+value.name+'</a></div><p>'+value.message+'</p>')}$("#chatbox_"+chatboxtitle+" .chatboxcontent").scrollTop($("#chatbox_"+chatboxtitle+" .chatboxcontent")[0].scrollHeight);$.titleAlert(Drupal.settings.drupalchat.newMessage,{requireBlur:true,stopOnFocus:true,interval:800})});$('#chatpanel .subpanel ul').empty();$.each(drupalchat_messages.buddylist,function(key,value){if(key!='total'){if(key!=Drupal.settings.drupalchat.uid){$('#chatpanel .subpanel ul').append('<li class="status-'+value.status+'"><a class="'+key+'" href="#">'+value.name+'</a></li>')}}else{$('#chatpanel .online-count').html(value)}});$('#chatpanel .subpanel ul li:last-child').addClass('last');if($('#chatpanel .subpanel ul li').length<=0){$('#chatpanel .subpanel ul').append(Drupal.settings.drupalchat.noUsers)}drupalchat.last_timestamp=drupalchat_messages.last_timestamp}if(Drupal.settings.drupalchat.polling_method!='0'){chatPoll()}}function closeChatBox(chatboxtitle){$('#chatbox_'+chatboxtitle).css('display','none')}function sendMessages(){$.post(Drupal.settings.drupalchat.sendUrl,{drupalchat_uid2:drupalchat.send_current_uid2,drupalchat_message:drupalchat.send_current_message})}function checkChatBoxInputKey(event,chatboxtextarea,chatboxtitle){if(event.keyCode==13&&event.shiftKey==0){message=$(chatboxtextarea).val();message=message.replace(/^\s+|\s+$/g,"");message=message.substr(0,255);$(chatboxtextarea).val('');$(chatboxtextarea).focus();$(chatboxtextarea).css('height','44px');var currentTime=new Date();var hours=currentTime.getHours();var minutes=currentTime.getMinutes();if(hours<10){hours="0"+hours}if(minutes<10){minutes="0"+minutes}if(message!=''){if(Drupal.settings.drupalchat.polling_method=='0'){drupalchat.send_current_uid2=chatboxtitle;if(drupalchat.attach_messages_in_queue==0){setTimeout(function(){sendMessages();drupalchat.attach_messages_in_queue=0},(Drupal.settings.drupalchat.send_rate)*1000);drupalchat.send_current_message=message;drupalchat.attach_messages_in_queue=1}else{drupalchat.send_current_message+='{{drupalchat_newline}}'+message}}else{drupalchat.send_current_uid2=chatboxtitle;drupalchat.send_current_message=message;sendMessages()}message=message.replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/\"/g,"&quot;");message=emotify(message);if($("#chatbox_"+chatboxtitle+" .chatboxcontent .chatboxusername a:last").html()==Drupal.settings.drupalchat.username){$("#chatbox_"+chatboxtitle+" .chatboxcontent").append('<p>'+message+'</p>')}else{$("#chatbox_"+chatboxtitle+" .chatboxcontent").append('<div class="chatboxusername"><span class="chatboxtime">'+hours+':'+minutes+'</span><a href="'+Drupal.settings.basePath+'user/'+Drupal.settings.drupalchat.uid+'">'+Drupal.settings.drupalchat.username+'</a></div><p>'+message+'</p>')}$("#chatbox_"+chatboxtitle+" .chatboxcontent").scrollTop($("#chatbox_"+chatboxtitle+" .chatboxcontent")[0].scrollHeight)}return false}var adjustedHeight=chatboxtextarea.clientHeight;var maxHeight=94;if(maxHeight>adjustedHeight){adjustedHeight=Math.max(chatboxtextarea.scrollHeight,adjustedHeight);if(maxHeight)adjustedHeight=Math.min(maxHeight,adjustedHeight);if(adjustedHeight>chatboxtextarea.clientHeight)$(chatboxtextarea).css('height',adjustedHeight+8+'px')}else{$(chatboxtextarea).css('overflow','auto')}}$(window).unload(function(){YUI().use('gallery-storage-lite','node-base',function(Y){Y.StorageLite.on('storage-lite:ready',function(){Y.StorageLite.setItem('username',drupalchat.username);Y.StorageLite.setItem('uid',drupalchat.uid);Y.StorageLite.setItem('send_current_message',drupalchat.send_current_message);Y.StorageLite.setItem('last_timestamp',drupalchat.last_timestamp);Y.StorageLite.setItem('send_current_uid2',drupalchat.send_current_uid2);Y.StorageLite.setItem('attach_messages_in_queue',drupalchat.attach_messages_in_queue);Y.StorageLite.setItem('running',drupalchat.running);Y.StorageLite.setItem('drupalchat',$('#drupalchat').html())})})});
\ No newline at end of file
diff --git a/js/drupalchat.js b/js/drupalchat.js
index 6b38daace92c58c2e8328e1a6b1af481ff70f6cc..4b19e1c0aa0f8ea9d99a7ba5cc026bb508e254a9 100644
--- a/js/drupalchat.js
+++ b/js/drupalchat.js
@@ -1,4 +1,3 @@
-//$Id$
 var drupalchat = {
 	username: null,
 	uid: null,
diff --git a/js/storage-lite.js b/js/storage-lite.js
index 486bcd8c98275c38dc4719227dd1e63ed509f144..889252af828c16a7dc13af356c9f14e6f869a624 100644
--- a/js/storage-lite.js
+++ b/js/storage-lite.js
@@ -1,4 +1,3 @@
-//$Id$
 /*global YUI */
 /*jslint onevar: true, browser: true, undef: true, bitwise: true, regexp: true, newcap: true, immed: true */
 
diff --git a/themes/dark/dark.css b/themes/dark/dark.css
index 81c267328ca0a1e41f12c9b450c0470b7caf914d..682be860d3f20b7224f882abe4a3a1b90f9c1e9a 100644
--- a/themes/dark/dark.css
+++ b/themes/dark/dark.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /**
  * @file
diff --git a/themes/light/light.css b/themes/light/light.css
index fa862a5418988fa6e35e10ee6ae5a7321217b509..52fc80a9538795dd72797312894c6fe98d299f56 100644
--- a/themes/light/light.css
+++ b/themes/light/light.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /**
  * @file