diff --git a/frappe/public/less/chat.less b/frappe/public/less/chat.less
index c82a94ce8f..e9ea77d843 100644
--- a/frappe/public/less/chat.less
+++ b/frappe/public/less/chat.less
@@ -6,33 +6,33 @@
 @import "flex.less";
 
 // Typography
-@font-weight-bold:										700;
-@font-weight-heavy:										900;
+@font-weight-bold:								700;
+@font-weight-heavy:								900;
 
-@frappe-chat-toggle-height:								40px;
+@chat-toggle-height:							40px;
 
-@frappe-fab-box-shadow:                                 0 5px 15px rgba(0, 0, 0, .25);
-@frappe-fab-size:                                       48px;
-@frappe-fab-size-lg:                                    56px;
-@frappe-fab-margin:                                     20px;
+@fab-box-shadow:                                0 5px 15px rgba(0, 0, 0, .25);
+@fab-size:                                      48px;
+@fab-size-lg:                                   56px;
+@fab-margin:                                    20px;
 
-@frappe-chat-popper-margin:								@frappe-fab-margin;
-@frappe-chat-popper-panel-width:						350px;
-@frappe-chat-popper-panel-height:						500px;
+@chat-popper-margin:							@fab-margin;
+@chat-popper-panel-width:						350px;
+@chat-popper-panel-height:						500px;
 // z-index greater than FAB, lesser than modal.
-@frappe-chat-popper-z-index:							1035;
+@chat-popper-z-index:							1035;
 
 // BS modal's box-shadow
-@frappe-chat-popper-panel-box-shadow:					@frappe-fab-box-shadow;
+@chat-popper-panel-box-shadow:					@fab-box-shadow;
 
 // https://github.com/twbs/bootstrap/blob/v3.3.7/less/variables.less#L278
 // Keep z-index of the ChatPopper higher than others, lower than modal background.
 
-@frappe-chat-room-list-content-max-width:				180px;
+@chat-room-list-content-max-width:				180px;
 
-@frappe-chat-form-font-size:							12px;
-@frappe-chat-form-menu-border-radius:					4px;
-@frappe-chat-form-list-group-height:					150px; // Hints
+@chat-form-font-size:							12px;
+@chat-form-menu-border-radius:					4px;
+@chat-form-list-group-height:					150px; // Hints
 
 // Typography
 .font-bold  { font-weight: @font-weight-bold;  }
@@ -51,15 +51,15 @@
            bottom: 0;
             right: 0;
     border-radius: 50%;
-       box-shadow: @frappe-fab-box-shadow;
-           margin: @frappe-fab-margin;
-            width: @frappe-fab-size;
-           height: @frappe-fab-size;
+       box-shadow: @fab-box-shadow;
+           margin: @fab-margin;
+            width: @fab-size;
+           height: @fab-size;
     
     &.frappe-fab-lg
     {
-            width: @frappe-fab-size-lg;
-           height: @frappe-fab-size-lg;
+            width: @fab-size-lg;
+           height: @fab-size-lg;
     }
 }
 
@@ -67,7 +67,7 @@
 {
     .frappe-chat-toggle
     {
-            height: @frappe-chat-toggle-height;
+            height: @chat-toggle-height;
         text-align: center;
     }
 
@@ -81,8 +81,8 @@
          position: fixed;
            bottom: 0px;
             right: 0px;	
-           margin: @frappe-chat-popper-margin;
-          z-index: @frappe-chat-popper-z-index;
+           margin: @chat-popper-margin;
+          z-index: @chat-popper-z-index;
             
         & > .frappe-chat-popper-collapse
         {
@@ -91,9 +91,9 @@
                        position: relative;
                         display: flex;
                  flex-direction: column;
-                          width: @frappe-chat-popper-panel-width;
-                         height: @frappe-chat-popper-panel-height;
-                     box-shadow: @frappe-chat-popper-panel-box-shadow;
+                          width: @chat-popper-panel-width;
+                         height: @chat-popper-panel-height;
+                     box-shadow: @chat-popper-panel-box-shadow;
 
                 .vcenter
                 {
@@ -152,7 +152,7 @@
                         .media-heading, .media-subtitle
                         {
                             .ellipsis;
-                            max-width: @frappe-chat-room-list-content-max-width;
+                            max-width: @chat-room-list-content-max-width;
                         }
                     }
                 }
@@ -192,19 +192,19 @@
         {
             .form-control
             {
-                font-size: @frappe-chat-form-font-size;
+                font-size: @chat-form-font-size;
             }
     
             .dropdown-menu
             {
-                border-radius: @frappe-chat-form-menu-border-radius;
+                border-radius: @chat-form-menu-border-radius;
             }
     
             // Hints
             .hint-list.list-group
             {
                     margin: 0px;
-                max-height: @frappe-chat-form-list-group-height;
+                max-height: @chat-form-list-group-height;
                 overflow-y: auto;
                 
                 .hint-list-item.list-group-item:first-child, .hint-list-item.list-group-item:last-child
@@ -218,44 +218,44 @@
     }
 }
 
-@frappe-chat-color-grey:                        #8D99A6;
+@chat-color-grey:                        #8D99A6;
 
-@frappe-chat-base-font-size:                    12px;
-@frappe-chat-base-font-size-lg:                 14px;
+@chat-base-font-size:                    12px;
+@chat-base-font-size-lg:                 14px;
 
-@frappe-chat-base-spacing:                      5px;
+@chat-base-spacing:                      5px;
 
 // ChatForm
-@frappe-chat-form-border:                       1px solid #D1D8DD;
+@chat-form-border:                       1px solid #D1D8DD;
 
 // ChatList
-@frappe-chat-list-bg-color:                     #FAFBFC;
+@chat-list-bg-color:                     #FAFBFC;
 
 // ChatList.Item
-@frappe-chat-list-item-padding:                 @frappe-chat-base-spacing @frappe-chat-base-spacing * 2;
+@chat-list-item-padding:                 @chat-base-spacing @chat-base-spacing * 2;
 
 // ChatBubble
-@frappe-chat-bubble-padding:					@frappe-chat-base-spacing @frappe-chat-base-spacing * 2;
-@frappe-chat-bubble-min-width:                  25%;
-@frappe-chat-bubble-max-width:                  75%;
+@chat-bubble-padding:					@chat-base-spacing @chat-base-spacing * 2;
+@chat-bubble-min-width:                  25%;
+@chat-bubble-max-width:                  75%;
 
-@frappe-chat-bubble-box-shadow:                 0px 0.1px 0.5px 0px rgba(0,0,0,0.5);
+@chat-bubble-box-shadow:                 0px 0.1px 0.5px 0px rgba(0,0,0,0.5);
 
-@frappe-chat-bubble-border-size:                1px;
-@frappe-chat-bubble-border-radius:				@frappe-chat-base-spacing;
+@chat-bubble-border-size:                1px;
+@chat-bubble-border-radius:				@chat-base-spacing;
 
-@frappe-chat-bubble-l-color:			 	  #EBEFF2;
-@frappe-chat-bubble-r-color:				  #EBF7CF;
+@chat-bubble-l-color:			 	  #EBEFF2;
+@chat-bubble-r-color:				  #EBF7CF;
 
-@frappe-chat-bubble-l-groupable-margin-left:    40px;
+@chat-bubble-l-groupable-margin-left:    40px;
 
-@frappe-chat-bubble-author-font-size:           @frappe-chat-base-font-size;
+@chat-bubble-author-font-size:           @chat-base-font-size;
 
-@frappe-chat-bubble-content-margin-bottom:      @frappe-chat-base-spacing;
+@chat-bubble-content-margin-bottom:      @chat-base-spacing;
 
-@frappe-chat-bubble-meta-font-size:             @frappe-chat-base-spacing * 2;
+@chat-bubble-meta-font-size:             @chat-base-spacing * 2;
 
-@frappe-chat-bubble-check-font-size:            @frappe-chat-base-font-size;
+@chat-bubble-check-font-size:            @chat-base-font-size;
 
 .frappe-chat-popper-collapse
 {
@@ -263,11 +263,11 @@
     {
         & > .panel-heading
         {
-            padding: @frappe-chat-base-spacing @frappe-chat-base-spacing * 2;
+            padding: @chat-base-spacing @chat-base-spacing * 2;
 
             .btn-back
             {
-                margin-right: @frappe-chat-base-spacing;
+                margin-right: @chat-base-spacing;
             }
             
             .avatar
@@ -284,7 +284,7 @@
 {
     .chat-form
     {
-        border-top: @frappe-chat-form-border;
+        border-top: @chat-form-border;
     
         .input-group-btn
         {
@@ -308,7 +308,7 @@
         
         .fa
         {
-             font-size: @frappe-chat-base-font-size-lg;
+             font-size: @chat-base-font-size-lg;
             transition: color 0.5s; // Change, with grace. :)
         }
     }
@@ -318,7 +318,7 @@
 .chat-list
 {
         height: 100%; 
-    // background: @frappe-chat-list-bg-color;
+    // background: @chat-list-bg-color;
     overflow-y: scroll;
 
     .chat-list-item
@@ -336,39 +336,39 @@
         .cursor-pointer;
         
             border: none !important;
-           padding: @frappe-chat-list-item-padding;
+           padding: @chat-list-item-padding;
         background: transparent;
     
         .chat-bubble
         {
-            max-width: @frappe-chat-bubble-max-width;
+            max-width: @chat-bubble-max-width;
             display: inline-block;
-            padding: @frappe-chat-bubble-padding;
-            border-radius: @frappe-chat-bubble-border-radius;
+            padding: @chat-bubble-padding;
+            border-radius: @chat-bubble-border-radius;
             
-            -webkit-box-shadow: @frappe-chat-bubble-box-shadow;
-            -moz-box-shadow: @frappe-chat-bubble-box-shadow;
-            box-shadow: @frappe-chat-bubble-box-shadow;
+            -webkit-box-shadow: @chat-bubble-box-shadow;
+            -moz-box-shadow: @chat-bubble-box-shadow;
+            box-shadow: @chat-bubble-box-shadow;
             
             @media (max-width : 768px) {
-                min-width: @frappe-chat-bubble-min-width;
+                min-width: @chat-bubble-min-width;
             }
 
             &.chat-bubble-l
             {
                 &.chat-groupable
                 {
-                     margin-left: @frappe-chat-bubble-l-groupable-margin-left;
+                     margin-left: @chat-bubble-l-groupable-margin-left;
                 }
 
-                // background-color: @frappe-chat-bubble-l-color;
+                // background-color: @chat-bubble-l-color;
                 background-color: white;
 
                 .chat-bubble-meta
                 {
                     & > .chat-bubble-creation, & > .chat-bubble-check i
                     {
-                        color: darken(@frappe-chat-bubble-l-color, 50%) !important;
+                        color: darken(@chat-bubble-l-color, 50%) !important;
                     }
                 }
             }
@@ -376,20 +376,20 @@
             &.chat-bubble-r
             {
                       text-align: right;
-                background-color: @frappe-chat-bubble-r-color;
+                background-color: @chat-bubble-r-color;
 
                 .chat-bubble-meta
                 {
                     & > .chat-bubble-creation, & > .chat-bubble-check i
                     {
-                        color: darken(@frappe-chat-bubble-r-color, 50%) !important;
+                        color: darken(@chat-bubble-r-color, 50%) !important;
                     }
                 }
             }
     
             .chat-bubble-author
             {
-                font-size: @frappe-chat-bubble-author-font-size;
+                font-size: @chat-bubble-author-font-size;
     
                 a
                 {
@@ -401,21 +401,21 @@
         
             .chat-bubble-content
             {
-                margin-bottom: @frappe-chat-bubble-content-margin-bottom;
+                margin-bottom: @chat-bubble-content-margin-bottom;
                     word-wrap: break-word;
             }
         
             .chat-bubble-meta
             {
-                    font-size: @frappe-chat-bubble-meta-font-size;
+                    font-size: @chat-bubble-meta-font-size;
     
                 & > .chat-bubble-check
                 {
-                    margin-left: @frappe-chat-base-spacing;
+                    margin-left: @chat-base-spacing;
     
                     i
                     {
-                        font-size: @frappe-chat-bubble-check-font-size;
+                        font-size: @chat-bubble-check-font-size;
                     }
                 }
             }