Merge branch 'pita'

Resolved conflicts:
	.gitignore
	src/static/js/ace.js
	src/static/js/ace2_inner.js
	src/static/js/broadcast.js
	src/static/js/domline.js
	src/static/pad.html
	src/static/timeslider.html

Ignored conflicts (please merge manually later):
	node/server.js
	src/node/utils/Minify.js

20 files changed, 843 insertions, 982 deletions

diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css
index 6a483c07..d2d2f977 100644
--- a/src/static/css/iframe_editor.css
+++ b/src/static/css/iframe_editor.css
@@ -170,34 +170,3 @@ p {
 }
 
 #overlaysdiv { position: absolute; left: -1000px; top: -1000px; }
-
-/* ---------- Used by JavaScript Lexer ---------- */
-.syntax .c { color: #bd3f00; font-style: italic } /* Comment */
-.syntax .o { font-weight: bold; } /* Operator */
-.syntax .p { font-weight: bold; } /* Punctuation */
-.syntax .k { color: blue; } /* Keyword */
-.syntax .kc { color: purple } /* Keyword.Constant */
-.syntax .nx { } /* Name.Other */
-.syntax .mf { color: purple } /* Literal.Number.Float */
-.syntax .mh { color: purple } /* Literal.Number.Hex */
-.syntax .mi { color: purple } /* Literal.Number.Integer */
-.syntax .sr { color: purple } /* Literal.String.Regex */
-.syntax .s2 { color: purple } /* Literal.String.Double */
-.syntax .s1 { color: purple } /* Literal.String.Single */
-.syntax .sd { color: purple } /* Literal.String.Doc */
-.syntax .cs { color: #00aa33; font-weight: bold; font-style: italic } /* Comment.Special */
-.syntax .err { color: #cc0000; font-weight: bold; text-decoration: underline; } /* Error */
-
-/* css */
-.syntax .nt { font-weight: bold; } /* tag */
-.syntax .nc { color: #336; } /* class */
-.syntax .nf { color: #336; } /* id */
-.syntax .nd { color: #999; } /* :foo */
-.syntax .m { color: purple } /* number */
-.syntax .nb { color: purple } /* built-in */
-.syntax .cp { color: #bd3f00; } /* !important */
-
-.syntax .flash { background-color: #adf !important; }
-.syntax .flashbad { background-color: #f55 !important; }
-
-
diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index e407b3a4..969d0027 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -65,6 +65,7 @@ a img
 {
   text-decoration: none;
   color: #ccc;
+  position: absolute;
 }
 
 #editbar ul li a span
@@ -75,11 +76,13 @@ a img
 
 #editbar ul li:hover {
   background: #fff;
+  background: linear-gradient(#f4f4f4, #e4e4e4);
 }
 
 #editbar ul li:active {
   background: #eee;
   background: linear-gradient(#ddd, #fff);
+  box-shadow: 0 0 8px rgba(0,0,0,.1) inset;
 }
 
 #editbar ul li.separator
@@ -798,12 +801,11 @@ ul#colorpickerswatches li:hover
 #chatlabel
 {
   font-size:13px;
-  line-height:16px;
   font-weight:bold;
   color:#555;
   text-decoration: none;
-  position: relative;
-  bottom: 3px;
+  margin-right: 3px;
+  vertical-align: middle;
 }
 
 #chatinput
@@ -816,8 +818,8 @@ ul#colorpickerswatches li:hover
 #chaticon
 {
   z-index: 400;
-  position:absolute;
-  bottom:0px;
+  position: fixed;
+  bottom: 0px;
   right: 20px;
   padding: 5px;
   border-left: 1px solid #999;
@@ -838,8 +840,7 @@ ul#colorpickerswatches li:hover
 {
   color:#555;
   font-size:9px;
-  position:relative;
-  bottom: 2px;
+  vertical-align: middle;
 }
 
 #titlebar
@@ -877,40 +878,6 @@ ul#colorpickerswatches li:hover
   margin-left: 3px;
   margin-right: 3px;
   margin-top:2px;
-}
-
-
-/* resizable stuff for chat */
-.ui-resizable {
-position: relative;
-} 
-.ui-resizable-handle { 
-  position: absolute;
-  font-size: 0.1px;
-  z-index: 99999;
-  display: block;
-    
-} 
-
-.ui-resizable-nw {
-  background-image: url("../../static/img/etherpad_lite_icons.png");
-  background-position: 0 -416px;
-  background-repeat: no-repeat;
-  background-size: 100% auto;
-  cursor: nw-resize;
-  height: 17px;
-  left: 3px;
-  top: 3px;
-  width: 17px;
-} 
-
-.ui-resizable-ne 
-{ 
-  cursor: ne-resize; 
-  width: 9px; 
-  height: 9px; 
-  right: -5px; 
-  top: -5px;
 } 
 
 .exporttype{
@@ -1060,6 +1027,8 @@ margin-top: 1px;
 .buttonicon-chat {
   background-position: 0px -102px;
   display: inline-block;
+  vertical-align: middle;
+  margin: 0 !important;
 }
 .buttonicon-showusers {
   background-position: 0px -183px;
@@ -1085,7 +1054,10 @@ width:33px !important;
 }
 
 #online_count{
-  color: #999;
+  color: #888;
+  font-size: 11px;
+  line-height: 18px;
+  position: fixed;
 }
 
 #qr_center {
@@ -1104,83 +1076,6 @@ width:33px !important;
   transform: scale(1.5);
 }
 
-@media screen and (max-width: 960px) {
-  .modaldialog {
-    position: relative;
-    margin: 0 auto;
-    width: 80%;
-    top: 40px;
-    left: 0;
-  }
-}
-
-@media screen and (max-width: 600px) {
-  #editbar ul li {
-    padding: 4px 1px;
-  }  
-}
-
-@media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
-  #editbar ul li {
-    padding: 4px 3px;
-  }
-  #editbar ul#menu_right > li {
-    padding: 4px 8px;
-    margin-top: 2px;
-  }
-  #chaticon {
-    opacity: .8;
-  }
-  #users {
-    right: 4px;
-  }
-  #mycolorpicker {
-    left: -72px; /* #mycolorpicker:width - #users:width */
-  }
-  #editorcontainer {
-    margin-bottom: 33px;
-  }
-  #editbar ul#menu_right  {
-    background: #f7f7f7;
-    background: linear-gradient(#f7f7f7, #f1f1f1 80%);
-    width: 100%;
-    overflow: hidden;
-    height: 32px;
-    position: fixed;
-    bottom: 0;
-    border-top: 1px solid #ccc;
-  }
-  #editbar ul#menu_right li:not(:last-child) {
-    display: none;
-  }
-  #editbar ul#menu_right li:last-child {
-    height: 24px;
-    border-radius: 0;
-    margin-top: 0;
-    border: 0;
-    float: right;
-  }
-  #chaticon {
-    bottom: 0;
-    right: 55px;
-    border-right: none;
-    border-radius: 0;
-    background: #f7f7f7;
-    background: linear-gradient(#f7f7f7, #f1f1f1 80%);
-    border: 0;
-  }
-  #chatbox {
-    bottom: 32px;
-    right: 0;
-    border-top-right-radius: 0;
-  }
-  #editbar ul li a span {
-    top: -3px;
-  }
-  #usericonback {
-    margin-top: 4px;
-  }
-}
 .rtl{
   direction:RTL;
 } 
@@ -1189,10 +1084,9 @@ width:33px !important;
  word-wrap: break-word;
 }
 
-/* fix for misaligned labels */
-label {
- position: relative;
- bottom: 1px;
+/* fix for misaligned checkboxes */
+input[type=checkbox] {
+ vertical-align: -1px;
 }
 
 .right {
@@ -1234,15 +1128,9 @@ label {
  margin: 5px 0;
 }
 
-.left_popup {
- float: left;
- width: 50%;
-}
-
-.right_popup {
+.column {
  float: left;
  width: 50%;
- box-sizing: border-box;
 }
 
 #settingsmenu, #importexport, #embed {
@@ -1262,3 +1150,121 @@ label {
  background: #eee !important;
  background: linear-gradient(#EEE, #F0F0F0) !important;
 }
+
+.stickyChat {
+ background-color: #f1f1f1 !important;
+ right: 0px !important;
+ top: 36px;
+ border-radius: 0px !important;
+ height: auto !important;
+ border: none !important;
+ border-left: 1px solid #ccc !important;
+ width: 185px !important;
+}
+
+@media screen and (max-width: 960px) {
+  .modaldialog {
+    position: relative;
+    margin: 0 auto;
+    width: 80%;
+    top: 40px;
+    left: 0;
+  }
+}
+
+@media screen and (max-width: 600px) {
+  #editbar ul li {
+    padding: 4px 1px;
+  }  
+}
+
+@media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
+  #editbar ul li {
+    padding: 4px 3px;
+  }
+  #users {
+    right: 0;
+    top: 36px;
+    bottom: 33px;
+    border-radius: none;
+  }
+  #mycolorpicker {
+    left: -72px; /* #mycolorpicker:width - #users:width */
+  }
+  #editorcontainer {
+    margin-bottom: 33px;
+  }
+  #editbar ul#menu_right  {
+    background: #f7f7f7;
+    background: linear-gradient(#f7f7f7, #f1f1f1 80%);
+    width: 100%;
+    overflow: hidden;
+    height: 32px;
+    position: fixed;
+    bottom: 0;
+    border-top: 1px solid #ccc;
+  }
+  #editbar ul#menu_right li:last-child {
+    height: 24px;
+    border-radius: 0;
+    margin-top: 0;
+    border: 0;
+    float: right;
+  }
+  #chaticon {
+    bottom: 3px;
+    right: 55px;
+    border-right: none;
+    border-radius: 0;
+    background: #f7f7f7;
+    background: linear-gradient(#f7f7f7, #f1f1f1 80%);
+    border: 0;
+  }
+  #chatbox {
+    bottom: 32px;
+    right: 0;
+    border-top-right-radius: 0;
+    border-right: none;
+  }
+  #editbar ul li a span {
+    top: -3px;
+  }
+  #usericonback {
+    margin-top: 4px;
+  }
+  #qrcode {
+    display: none;
+  }
+  #editbar ul#menu_right li:not(:last-child) {
+    display: block;
+  }
+  #editbar ul#menu_right > li {
+    background: none;
+    border: none;
+    margin-top: 4px;
+    padding: 4px 8px;
+  }
+  .selected {
+    background: none !important;
+  }
+  #timesliderlink {
+    display: none !important;
+  }
+  .popup {
+    border-radius: 0;
+    box-sizing: border-box;
+    width: 100%;
+  }
+  #settingsmenu, #importexport, #embed {
+    left: 0;
+    top: 0;
+    bottom: 33px;
+    right: 0; 
+  }
+  .separator {
+    display: none;
+  }
+  #online_count {
+    line-height: 24px;
+  }
+}
\ No newline at end of file
diff --git a/src/static/favicon.ico b/src/static/favicon.ico
index 2529c923..df7b6289 100644
--- a/src/static/favicon.ico
+++ b/src/static/favicon.ico
diff --git a/src/static/index.html b/src/static/index.html
index 97736d1e..58f68801 100644
--- a/src/static/index.html
+++ b/src/static/index.html
@@ -4,27 +4,24 @@
         <title>Etherpad Lite</title>
 
         <meta charset="utf-8"> 
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
 
-        <style> 
-            *{ margin:0;padding:0; }
+        <style>
             body {
-              background: rgba(0,0,0,.05);
+              margin: 0;
+              height: 100%;
               color: #333;
-              font: 14px helvetica,sans-serif;
-              background: #ccc;
+              font: 14px helvetica, sans-serif;
+              background: #ddd;
               background: -webkit-radial-gradient(circle,#aaa,#eee 60%) center fixed;
               background: -moz-radial-gradient(circle,#aaa,#eee 60%) center fixed;
               background: -ms-radial-gradient(circle,#aaa,#eee 60%) center fixed;
               background: -o-radial-gradient(circle,#aaa,#eee 60%) center fixed;
-              overflow-x: hidden;
               border-top: 8px solid rgba(51,51,51,.8);
             }
-            #container {
-              text-shadow: 0 1px 1px #fff;
+            #wrapper {
               border-top: 1px solid #999;
               margin-top: 160px;
-              text-align: center;
               padding: 15px;
               background: #eee;
               background: -webkit-linear-gradient(#fff,#ccc);
@@ -34,6 +31,10 @@
               opacity: .9;
               box-shadow: 0px 1px 8px rgba(0,0,0,0.3);
             }
+            #inner {
+              width: 300px;
+              margin: 0 auto;
+            }
             #button {
               margin: 0 auto;
               border-radius: 3px;
@@ -43,7 +44,6 @@
               text-shadow: 0 -1px 0 rgba(0,0,0,.8);
               height: 70px;
               line-height: 70px;
-              width: 300px;
               background: #555;
               background: -webkit-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
               background: -moz-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
@@ -65,64 +65,70 @@
             }
             #label {
               text-align: left;
-              margin: 0 auto;
-              width: 300px;
+              text-shadow: 0 1px 1px #fff;
+              margin: 16px auto 0;
             }
-            input {
-              vertical-align: middle;
+            form {
+              height: 38px;
+              background: #fff;
+              border: 1px solid #bbb;
+              border-radius: 3px;
+              position: relative;
+            }
+            button, input {
               font-weight: bold;
               font-size: 15px;
             }
             input[type="text"] {
-              width: 243px;
-              padding: 10px 47px 10px 10px;
-              background: #fff;
-              border: 1px solid #bbb;
-              outline: none;
               border-radius: 3px;
-              text-shadow: 0 0 1px #fff;
+              box-sizing: border-box;
+              -moz-box-sizing: border-box;   
+              padding: 0 45px 0 10px;
+              *padding: 0; /* IE7 hack */
+              width: 100%;
+              height: 100%;
+              outline: none;
+              border: none;
+              position: absolute;
             }
-            input[type="submit"] {
+            button[type="submit"] {
+              position: absolute;
+              right: 0;
               width: 45px;
-              margin-left: -50px;
-              padding: 8px;
+              height: 38px;
             }
-            input[type="submit"]::-moz-focus-inner { border: 0 }
-            @-moz-document url-prefix() { input[type="submit"] { padding: 7px } }     
             @media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
               body {
                 background: #bbb;
                 background: -webkit-linear-gradient(#aaa,#eee 60%) center fixed;
-                height: 100%;
+                background: -moz-linear-gradient(#aaa,#eee 60%) center fixed;
+                background: -ms-linear-gradient(#aaa,#eee 60%) center fixed;
               }
-              #container {
+              #wrapper {
                 margin-top: 0;
-                text-align: left;
               }
-              #button, #label {
-                text-align: center;
+              #inner {
                 width: 95%;        
               }
-              form {
-               text-align: center;
-              }
-              input[type=text] {
-                width: 75%;
+              #label {
+                text-align: center;
               }
             }
-        </style> 
-
+        </style>
         <link href="static/custom/index.css" rel="stylesheet"> 
-        <script src="static/custom/index.js"></script>
 
-        <div id="container"> 
-            <div id="button" onclick="go2Random()" class="translate">New Pad</div><br><div id="label" class="translate">or create/open a Pad with the name</div> 
-            <form action="#" onsubmit="go2Name();return false;"> 
+        <div id="wrapper">
+            <div id="inner">
+                <div id="button" onclick="go2Random()" class="translate">New Pad</div>
+                <div id="label" class="translate">or create/open a Pad with the name</div> 
+                <form action="#" onsubmit="go2Name();return false;"> 
                     <input type="text" id="padname" autofocus x-webkit-speech> 
-                    <input type="submit" value="OK"> 
-            </form> 
+                    <button type="submit">OK</button>
+                </form>
+            </div>
         </div>
 
+        <script src="static/custom/index.js"></script>
         <script> 
             function go2Name() 
             {
diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js
index 3108fc02..2eb89c53 100644
--- a/src/static/js/Changeset.js
+++ b/src/static/js/Changeset.js
@@ -29,12 +29,26 @@ var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFact
 
 var _opt = null;
 
-//var exports = {};
+/**
+ * ==================== General Util Functions =======================
+ */
+
+/**
+ * This method is called whenever there is an error in the sync process
+ * @param msg {string} Just some message
+ */
 exports.error = function error(msg) {
   var e = new Error(msg);
   e.easysync = true;
   throw e;
 };
+
+/**
+ * This method is user for assertions with Messages 
+ * if assert fails, the error function called.
+ * @param b {boolean} assertion condition
+ * @param msgParts {string} error to be passed if it fails
+ */
 exports.assert = function assert(b, msgParts) {
   if (!b) {
     var msg = Array.prototype.slice.call(arguments, 1).join('');
@@ -42,12 +56,30 @@ exports.assert = function assert(b, msgParts) {
   }
 };
 
+/**
+ * Parses a number from string base 36
+ * @param str {string} string of the number in base 36
+ * @returns {int} number
+ */
 exports.parseNum = function (str) {
   return parseInt(str, 36);
 };
+
+/**
+ * Writes a number in base 36 and puts it in a string
+ * @param num {int} number
+ * @returns {string} string
+ */
 exports.numToString = function (num) {
   return num.toString(36).toLowerCase();
 };
+
+/**
+ * Converts stuff before $ to base 10
+ * @obsolete not really used anywhere??
+ * @param cs {string} the string
+ * @return integer 
+ */
 exports.toBaseTen = function (cs) {
   var dollarIndex = cs.indexOf('$');
   var beforeDollar = cs.substring(0, dollarIndex);
@@ -57,13 +89,34 @@ exports.toBaseTen = function (cs) {
   }) + fromDollar;
 };
 
+
+/**
+ * ==================== Changeset Functions =======================
+ */
+
+/**
+ * returns the required length of the text before changeset 
+ * can be applied
+ * @param cs {string} String representation of the Changeset
+ */ 
 exports.oldLen = function (cs) {
   return exports.unpack(cs).oldLen;
 };
+
+/**
+ * returns the length of the text after changeset is applied
+ * @param cs {string} String representation of the Changeset
+ */ 
 exports.newLen = function (cs) {
   return exports.unpack(cs).newLen;
 };
 
+/**
+ * this function creates an iterator which decodes string changeset operations
+ * @param opsStr {string} String encoding of the change operations to be performed 
+ * @param optStartIndex {int} from where in the string should the iterator start 
+ * @return {Op} type object iterator 
+ */
 exports.opIterator = function (opsStr, optStartIndex) {
   //print(opsStr);
   var regex = /((?:\*[0-9a-z]+)*)(?:\|([0-9a-z]+))?([-+=])([0-9a-z]+)|\?|/g;
@@ -129,12 +182,21 @@ exports.opIterator = function (opsStr, optStartIndex) {
   };
 };
 
+/**
+ * Cleans an Op object
+ * @param {Op} object to be cleared
+ */
 exports.clearOp = function (op) {
   op.opcode = '';
   op.chars = 0;
   op.lines = 0;
   op.attribs = '';
 };
+
+/**
+ * Creates a new Op object
+ * @param optOpcode the type operation of the Op object
+ */
 exports.newOp = function (optOpcode) {
   return {
     opcode: (optOpcode || ''),
@@ -143,6 +205,11 @@ exports.newOp = function (optOpcode) {
     attribs: ''
   };
 };
+
+/**
+ * Clones an Op
+ * @param op Op to be cloned
+ */
 exports.cloneOp = function (op) {
   return {
     opcode: op.opcode,
@@ -151,12 +218,22 @@ exports.cloneOp = function (op) {
     attribs: op.attribs
   };
 };
+
+/**
+ * Copies op1 to op2
+ * @param op1 src Op
+ * @param op2 dest Op
+ */
 exports.copyOp = function (op1, op2) {
   op2.opcode = op1.opcode;
   op2.chars = op1.chars;
   op2.lines = op1.lines;
   op2.attribs = op1.attribs;
 };
+
+/**
+ * Writes the Op in a string the way that changesets need it
+ */
 exports.opString = function (op) {
   // just for debugging
   if (!op.opcode) return 'null';
@@ -164,11 +241,19 @@ exports.opString = function (op) {
   assem.append(op);
   return assem.toString();
 };
+
+/**
+ * Used just for debugging
+ */
 exports.stringOp = function (str) {
   // just for debugging
   return exports.opIterator(str).next();
 };
 
+/**
+ * Used to check if a Changeset if valid
+ * @param cs {Changeset} Changeset to be checked
+ */
 exports.checkRep = function (cs) {
   // doesn't check things that require access to attrib pool (e.g. attribute order)
   // or original string (e.g. newline positions)
@@ -218,6 +303,15 @@ exports.checkRep = function (cs) {
   return cs;
 }
 
+
+/**
+ * ==================== Util Functions =======================
+ */
+
+/**
+ * creates an object that allows you to append operations (type Op) and also
+ * compresses them if possible
+ */
 exports.smartOpAssembler = function () {
   // Like opAssembler but able to produce conforming exportss
   // from slightly looser input, at the cost of speed.
@@ -474,6 +568,10 @@ if (_opt) {
   };
 }
 
+/**
+ * A custom made String Iterator
+ * @param str {string} String to be iterated over
+ */ 
 exports.stringIterator = function (str) {
   var curIndex = 0;
 
@@ -510,6 +608,9 @@ exports.stringIterator = function (str) {
   };
 };
 
+/**
+ * A custom made StringBuffer 
+ */
 exports.stringAssembler = function () {
   var pieces = [];
 
@@ -526,7 +627,11 @@ exports.stringAssembler = function () {
   };
 };
 
-// "lines" need not be an array as long as it supports certain calls (lines_foo inside).
+/**
+ * This class allows to iterate and modify texts which have several lines
+ * It is used for applying Changesets on arrays of lines
+ * Note from prev docs: "lines" need not be an array as long as it supports certain calls (lines_foo inside).
+ */
 exports.textLinesMutator = function (lines) {
   // Mutates lines, an array of strings, in place.
   // Mutation operations have the same constraints as exports operations
@@ -781,6 +886,21 @@ exports.textLinesMutator = function (lines) {
   return self;
 };
 
+/**
+ * Function allowing iterating over two Op strings. 
+ * @params in1 {string} first Op string
+ * @params idx1 {int} integer where 1st iterator should start
+ * @params in2 {string} second Op string
+ * @params idx2 {int} integer where 2nd iterator should start
+ * @params func {function} which decides how 1st or 2nd iterator 
+ *         advances. When opX.opcode = 0, iterator X advances to
+ *         next element
+ *         func has signature f(op1, op2, opOut)
+ *             op1 - current operation of the first iterator
+ *             op2 - current operation of the second iterator
+ *             opOut - result operator to be put into Changeset
+ * @return {string} the integrated changeset
+ */
 exports.applyZip = function (in1, idx1, in2, idx2, func) {
   var iter1 = exports.opIterator(in1, idx1);
   var iter2 = exports.opIterator(in2, idx2);
@@ -802,6 +922,11 @@ exports.applyZip = function (in1, idx1, in2, idx2, func) {
   return assem.toString();
 };
 
+/**
+ * Unpacks a string encoded Changeset into a proper Changeset object
+ * @params cs {string} String encoded Changeset
+ * @returns {Changeset} a Changeset class
+ */
 exports.unpack = function (cs) {
   var headerRegex = /Z:([0-9a-z]+)([><])([0-9a-z]+)|/;
   var headerMatch = headerRegex.exec(cs);
@@ -823,6 +948,14 @@ exports.unpack = function (cs) {
   };
 };
 
+/**
+ * Packs Changeset object into a string 
+ * @params oldLen {int} Old length of the Changeset
+ * @params newLen {int] New length of the Changeset
+ * @params opsStr {string} String encoding of the changes to be made
+ * @params bank {string} Charbank of the Changeset
+ * @returns {Changeset} a Changeset class
+ */
 exports.pack = function (oldLen, newLen, opsStr, bank) {
   var lenDiff = newLen - oldLen;
   var lenDiffStr = (lenDiff >= 0 ? '>' + exports.numToString(lenDiff) : '<' + exports.numToString(-lenDiff));
@@ -831,6 +964,11 @@ exports.pack = function (oldLen, newLen, opsStr, bank) {
   return a.join('');
 };
 
+/**
+ * Applies a Changeset to a string
+ * @params cs {string} String encoded Changeset
+ * @params str {string} String to which a Changeset should be applied
+ */
 exports.applyToText = function (cs, str) {
   var unpacked = exports.unpack(cs);
   exports.assert(str.length == unpacked.oldLen, "mismatched apply: ", str.length, " / ", unpacked.oldLen);
@@ -856,6 +994,11 @@ exports.applyToText = function (cs, str) {
   return assem.toString();
 };
 
+/**
+ * applies a changeset on an array of lines
+ * @param CS {Changeset} the changeset to be applied
+ * @param lines The lines to which the changeset needs to be applied
+ */
 exports.mutateTextLines = function (cs, lines) {
   var unpacked = exports.unpack(cs);
   var csIter = exports.opIterator(unpacked.ops);
@@ -878,6 +1021,13 @@ exports.mutateTextLines = function (cs, lines) {
   mut.close();
 };
 
+/**
+ * Composes two attribute strings (see below) into one.
+ * @param att1 {string} first attribute string
+ * @param att2 {string} second attribue string
+ * @param resultIsMutaton {boolean} 
+ * @param pool {AttribPool} attribute pool 
+ */
 exports.composeAttributes = function (att1, att2, resultIsMutation, pool) {
   // att1 and att2 are strings like "*3*f*1c", asMutation is a boolean.
   // Sometimes attribute (key,value) pairs are treated as attribute presence
@@ -935,6 +1085,10 @@ exports.composeAttributes = function (att1, att2, resultIsMutation, pool) {
   return buf.toString();
 };
 
+/**
+ * Function used as parameter for applyZip to apply a Changeset to an 
+ * attribute 
+ */
 exports._slicerZipperFunc = function (attOp, csOp, opOut, pool) {
   // attOp is the op from the sequence that is being operated on, either an
   // attribution string or the earlier of two exportss being composed.
@@ -1021,6 +1175,12 @@ exports._slicerZipperFunc = function (attOp, csOp, opOut, pool) {
   }
 };
 
+/**
+ * Applies a Changeset to the attribs string of a AText.
+ * @param cs {string} Changeset
+ * @param astr {string} the attribs string of a AText
+ * @param pool {AttribsPool} the attibutes pool
+ */
 exports.applyToAttribution = function (cs, astr, pool) {
   var unpacked = exports.unpack(cs);
 
@@ -1129,6 +1289,11 @@ exports.mutateAttributionLines = function (cs, lines, pool) {
   //dmesg("-> "+lines.toSource());
 };
 
+/**
+ * joins several Attribution lines
+ * @param theAlines collection of Attribution lines
+ * @returns {string} joined Attribution lines
+ */
 exports.joinAttributionLines = function (theAlines) {
   var assem = exports.mergingOpAssembler();
   for (var i = 0; i < theAlines.length; i++) {
@@ -1179,10 +1344,20 @@ exports.splitAttributionLines = function (attrOps, text) {
   return lines;
 };
 
+/**
+ * splits text into lines
+ * @param {string} text to be splitted
+ */
 exports.splitTextLines = function (text) {
   return text.match(/[^\n]*(?:\n|[^\n]$)/g);
 };
 
+/**
+ * compose two Changesets
+ * @param cs1 {Changeset} first Changeset
+ * @param cs2 {Changeset} second Changeset
+ * @param pool {AtribsPool} Attribs pool
+ */
 exports.compose = function (cs1, cs2, pool) {
   var unpacked1 = exports.unpack(cs1);
   var unpacked2 = exports.unpack(cs2);
@@ -1225,10 +1400,14 @@ exports.compose = function (cs1, cs2, pool) {
   return exports.pack(len1, len3, newOps, bankAssem.toString());
 };
 
+/**
+ * returns a function that tests if a string of attributes
+ * (e.g. *3*4) contains a given attribute key,value that
+ * is already present in the pool.
+ * @param attribPair array [key,value] of the attribute 
+ * @param pool {AttribPool} Attribute pool
+ */
 exports.attributeTester = function (attribPair, pool) {
-  // returns a function that tests if a string of attributes
-  // (e.g. *3*4) contains a given attribute key,value that
-  // is already present in the pool.
   if (!pool) {
     return never;
   }
@@ -1247,10 +1426,27 @@ exports.attributeTester = function (attribPair, pool) {
   }
 };
 
+/**
+ * creates the identity Changeset of length N
+ * @param N {int} length of the identity changeset
+ */
 exports.identity = function (N) {
   return exports.pack(N, N, "", "");
 };
 
+
+/**
+ * creates a Changeset which works on oldFullText and removes text 
+ * from spliceStart to spliceStart+numRemoved and inserts newText 
+ * instead. Also gives possibility to add attributes optNewTextAPairs 
+ * for the new text.
+ * @param oldFullText {string} old text
+ * @param spliecStart {int} where splicing starts
+ * @param numRemoved {int} number of characters to be removed
+ * @param newText {string} string to be inserted
+ * @param optNewTextAPairs {string} new pairs to be inserted
+ * @param pool {AttribPool} Attribution Pool
+ */
 exports.makeSplice = function (oldFullText, spliceStart, numRemoved, newText, optNewTextAPairs, pool) {
   var oldLen = oldFullText.length;
 
@@ -1271,8 +1467,14 @@ exports.makeSplice = function (oldFullText, spliceStart, numRemoved, newText, op
   return exports.pack(oldLen, newLen, assem.toString(), newText);
 };
 
+/**
+ * Transforms a changeset into a list of splices in the form
+ * [startChar, endChar, newText] meaning replace text from
+ * startChar to endChar with newText
+ * @param cs Changeset
+ */
 exports.toSplices = function (cs) {
-  // get a list of splices, [startChar, endChar, newText]
+  // 
   var unpacked = exports.unpack(cs);
   var splices = [];
 
@@ -1302,6 +1504,9 @@ exports.toSplices = function (cs) {
   return splices;
 };
 
+/**
+ * 
+ */
 exports.characterRangeFollow = function (cs, startChar, endChar, insertionsAfter) {
   var newStartChar = startChar;
   var newEndChar = endChar;
@@ -1346,6 +1551,14 @@ exports.characterRangeFollow = function (cs, startChar, endChar, insertionsAfter
   return [newStartChar, newEndChar];
 };
 
+/**
+ * Iterate over attributes in a changeset and move them from
+ * oldPool to newPool
+ * @param cs {Changeset} Chageset/attribution string to be iterated over
+ * @param oldPool {AttribPool} old attributes pool
+ * @param newPool {AttribPool} new attributes pool
+ * @return {string} the new Changeset
+ */
 exports.moveOpsToNewPool = function (cs, oldPool, newPool) {
   // works on exports or attribution string
   var dollarPos = cs.indexOf('$');
@@ -1363,13 +1576,22 @@ exports.moveOpsToNewPool = function (cs, oldPool, newPool) {
   }) + fromDollar;
 };
 
+/**
+ * create an attribution inserting a text
+ * @param text {string} text to be inserted
+ */
 exports.makeAttribution = function (text) {
   var assem = exports.smartOpAssembler();
   assem.appendOpWithText('+', text);
   return assem.toString();
 };
 
-// callable on a exports, attribution string, or attribs property of an op
+/**
+ * Iterates over attributes in exports, attribution string, or attribs property of an op
+ * and runs function func on them
+ * @param cs {Changeset} changeset
+ * @param func {function} function to be called
+ */ 
 exports.eachAttribNumber = function (cs, func) {
   var dollarPos = cs.indexOf('$');
   if (dollarPos < 0) {
@@ -1383,12 +1605,21 @@ exports.eachAttribNumber = function (cs, func) {
   });
 };
 
-// callable on a exports, attribution string, or attribs property of an op,
-// though it may easily create adjacent ops that can be merged.
+/**
+ * Filter attributes which should remain in a Changeset
+ * callable on a exports, attribution string, or attribs property of an op,
+ * though it may easily create adjacent ops that can be merged.
+ * @param cs {Changeset} changeset to be filtered
+ * @param filter {function} fnc which returns true if an 
+ *        attribute X (int) should be kept in the Changeset
+ */ 
 exports.filterAttribNumbers = function (cs, filter) {
   return exports.mapAttribNumbers(cs, filter);
 };
 
+/**
+ * does exactly the same as exports.filterAttribNumbers 
+ */ 
 exports.mapAttribNumbers = function (cs, func) {
   var dollarPos = cs.indexOf('$');
   if (dollarPos < 0) {
@@ -1410,6 +1641,12 @@ exports.mapAttribNumbers = function (cs, func) {
   return newUpToDollar + cs.substring(dollarPos);
 };
 
+/**
+ * Create a Changeset going from Identity to a certain state
+ * @params text {string} text of the final change
+ * @attribs attribs {string} optional, operations which insert 
+ *    the text and also puts the right attributes
+ */
 exports.makeAText = function (text, attribs) {
   return {
     text: text,
@@ -1417,6 +1654,12 @@ exports.makeAText = function (text, attribs) {
   };
 };
 
+/**
+ * Apply a Changeset to a AText 
+ * @param cs {Changeset} Changeset to be applied
+ * @param atext {AText} 
+ * @param pool {AttribPool} Attribute Pool to add to
+ */
 exports.applyToAText = function (cs, atext, pool) {
   return {
     text: exports.applyToText(cs, atext.text),
@@ -1424,6 +1667,10 @@ exports.applyToAText = function (cs, atext, pool) {
   };
 };
 
+/**
+ * Clones a AText structure
+ * @param atext {AText} 
+ */
 exports.cloneAText = function (atext) {
   return {
     text: atext.text,
@@ -1431,11 +1678,20 @@ exports.cloneAText = function (atext) {
   };
 };
 
+/**
+ * Copies a AText structure from atext1 to atext2
+ * @param atext {AText} 
+ */
 exports.copyAText = function (atext1, atext2) {
   atext2.text = atext1.text;
   atext2.attribs = atext1.attribs;
 };
 
+/**
+ * Append the set of operations from atext to an assembler
+ * @param atext {AText} 
+ * @param assem Assembler like smartOpAssembler
+ */
 exports.appendATextToAssembler = function (atext, assem) {
   // intentionally skips last newline char of atext
   var iter = exports.opIterator(atext.attribs);
@@ -1469,6 +1725,11 @@ exports.appendATextToAssembler = function (atext, assem) {
   }
 };
 
+/**
+ * Creates a clone of a Changeset and it's APool
+ * @param cs {Changeset} 
+ * @param pool {AtributePool}
+ */
 exports.prepareForWire = function (cs, pool) {
   var newPool = AttributePoolFactory.createAttributePool();;
   var newCs = exports.moveOpsToNewPool(cs, pool, newPool);
@@ -1478,15 +1739,32 @@ exports.prepareForWire = function (cs, pool) {
   };
 };
 
+/**
+ * Checks if a changeset s the identity changeset
+ */
 exports.isIdentity = function (cs) {
   var unpacked = exports.unpack(cs);
   return unpacked.ops == "" && unpacked.oldLen == unpacked.newLen;
 };
 
+/**
+ * returns all the values of attributes with a certain key 
+ * in an Op attribs string 
+ * @param attribs {string} Attribute string of a Op
+ * @param key {string} string to be seached for
+ * @param pool {AttribPool} attribute pool
+ */
 exports.opAttributeValue = function (op, key, pool) {
   return exports.attribsAttributeValue(op.attribs, key, pool);
 };
 
+/**
+ * returns all the values of attributes with a certain key 
+ * in an attribs string 
+ * @param attribs {string} Attribute string
+ * @param key {string} string to be seached for
+ * @param pool {AttribPool} attribute pool
+ */
 exports.attribsAttributeValue = function (attribs, key, pool) {
   var value = '';
   if (attribs) {
@@ -1499,6 +1777,11 @@ exports.attribsAttributeValue = function (attribs, key, pool) {
   return value;
 };
 
+/**
+ * Creates a Changeset builder for a string with initial 
+ * length oldLen. Allows to add/remove parts of it
+ * @param oldLen {int} Old length
+ */
 exports.builder = function (oldLen) {
   var assem = exports.smartOpAssembler();
   var o = exports.newOp();
diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 78ff098a..4114b63c 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -49,8 +49,7 @@ function Ace2Editor()
     {
       var that = this;
       var args = arguments;
-
-      function action()
+      var action = function()
       {
         func.apply(that, args);
       }
@@ -71,78 +70,47 @@ function Ace2Editor()
 
   function doActionsPendingInit()
   {
-    for (var i = 0; i < actionsPendingInit.length; i++)
-    {
-      actionsPendingInit[i]();
-    }
+    $.each(actionsPendingInit, function(i,fn){
+      fn()
+    });
     actionsPendingInit = [];
   }
-
+  
   ace2.registry[info.id] = info;
 
-  editor.importText = pendingInit(function(newCode, undoable)
-  {
-    info.ace_importText(newCode, undoable);
-  });
-  editor.importAText = pendingInit(function(newCode, apoolJsonObj, undoable)
-  {
-    info.ace_importAText(newCode, apoolJsonObj, undoable);
+  // The following functions (prefixed by 'ace_')  are exposed by editor, but
+  // execution is delayed until init is complete
+  var aceFunctionsPendingInit = ['importText', 'importAText', 'focus',
+  'setEditable', 'getFormattedCode', 'setOnKeyPress', 'setOnKeyDown',
+  'setNotifyDirty', 'setProperty', 'setBaseText', 'setBaseAttributedText',
+  'applyChangesToBase', 'applyPreparedChangesetToBase',
+  'setUserChangeNotificationCallback', 'setAuthorInfo',
+  'setAuthorSelectionRange', 'callWithAce', 'execCommand', 'replaceRange'];
+  
+  $.each(aceFunctionsPendingInit, function(i,fnName){
+    var prefix = 'ace_';
+    var name = prefix + fnName;
+    editor[fnName] = pendingInit(function(){
+      info[prefix + fnName].apply(this, arguments);
+    });
   });
+  
   editor.exportText = function()
   {
     if (!loaded) return "(awaiting init)\n";
     return info.ace_exportText();
   };
+  
   editor.getFrame = function()
   {
     return info.frame || null;
   };
-  editor.focus = pendingInit(function()
-  {
-    info.ace_focus();
-  });
-  editor.setEditable = pendingInit(function(newVal)
-  {
-    info.ace_setEditable(newVal);
-  });
-  editor.getFormattedCode = function()
-  {
-    return info.ace_getFormattedCode();
-  };
-  editor.setOnKeyPress = pendingInit(function(handler)
-  {
-    info.ace_setOnKeyPress(handler);
-  });
-  editor.setOnKeyDown = pendingInit(function(handler)
-  {
-    info.ace_setOnKeyDown(handler);
-  });
-  editor.setNotifyDirty = pendingInit(function(handler)
-  {
-    info.ace_setNotifyDirty(handler);
-  });
-
-  editor.setProperty = pendingInit(function(key, value)
-  {
-    info.ace_setProperty(key, value);
-  });
+  
   editor.getDebugProperty = function(prop)
   {
     return info.ace_getDebugProperty(prop);
   };
 
-  editor.setBaseText = pendingInit(function(txt)
-  {
-    info.ace_setBaseText(txt);
-  });
-  editor.setBaseAttributedText = pendingInit(function(atxt, apoolJsonObj)
-  {
-    info.ace_setBaseAttributedText(atxt, apoolJsonObj);
-  });
-  editor.applyChangesToBase = pendingInit(function(changes, optAuthor, apoolJsonObj)
-  {
-    info.ace_applyChangesToBase(changes, optAuthor, apoolJsonObj);
-  });
   // prepareUserChangeset:
   // Returns null if no new changes or ACE not ready.  Otherwise, bundles up all user changes
   // to the latest base text into a Changeset, which is returned (as a string if encodeAsString).
@@ -157,24 +125,6 @@ function Ace2Editor()
     if (!loaded) return null;
     return info.ace_prepareUserChangeset();
   };
-  editor.applyPreparedChangesetToBase = pendingInit(
-
-  function()
-  {
-    info.ace_applyPreparedChangesetToBase();
-  });
-  editor.setUserChangeNotificationCallback = pendingInit(function(callback)
-  {
-    info.ace_setUserChangeNotificationCallback(callback);
-  });
-  editor.setAuthorInfo = pendingInit(function(author, authorInfo)
-  {
-    info.ace_setAuthorInfo(author, authorInfo);
-  });
-  editor.setAuthorSelectionRange = pendingInit(function(author, start, end)
-  {
-    info.ace_setAuthorSelectionRange(author, start, end);
-  });
 
   editor.getUnhandledErrors = function()
   {
@@ -183,19 +133,7 @@ function Ace2Editor()
     return info.ace_getUnhandledErrors();
   };
 
-  editor.callWithAce = pendingInit(function(fn, callStack, normalize)
-  {
-    return info.ace_callWithAce(fn, callStack, normalize);
-  });
 
-  editor.execCommand = pendingInit(function(cmd, arg1)
-  {
-    info.ace_execCommand(cmd, arg1);
-  });
-  editor.replaceRange = pendingInit(function(start, end, text)
-  {
-    info.ace_replaceRange(start, end, text);
-  });
 
   function sortFilesByEmbeded(files) {
     var embededFiles = [];
@@ -228,8 +166,8 @@ function Ace2Editor()
   }
   function pushScriptsTo(buffer) {
     /* Folling is for packaging regular expression. */
-    /* $$INCLUDE_JS("../static/js/ace2_inner.js"); */
-    var ACE_SOURCE = '../static/js/ace2_inner.js';
+    /* $$INCLUDE_JS("../minified/ace2_inner.js?callback=require.define"); */
+    var ACE_SOURCE = '../minified/ace2_inner.js?callback=require.define';
     if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[ACE_SOURCE]) {
       buffer.push('<script type="text/javascript">');
       buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]);
@@ -242,7 +180,7 @@ function Ace2Editor()
       buffer.push('<script type="text/javascript">');
       buffer.push('require.setRootURI("../minified/"); require.setLibraryURI("../minified/plugins/"); require.setGlobalKeyPath("require");');
       buffer.push('<\/script>');
-      buffer.push('<script type="application/javascript" src="' + file + '"><\/script>');
+      buffer.push('<script type="application/javascript" src="' + ACE_SOURCE + '"><\/script>');
       buffer.push('<script type="text/javascript">');
       buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
       buffer.push('<\/script>');
diff --git a/src/static/js/ace2_common.js b/src/static/js/ace2_common.js
index 7f79f1c0..425600a8 100644
--- a/src/static/js/ace2_common.js
+++ b/src/static/js/ace2_common.js
@@ -141,6 +141,9 @@ function htmlPrettyEscape(str)
   return Security.escapeHTML(str).replace(/\r?\n/g, '\\n');
 }
 
+var noop = function(){};
+var identity = function(x){return x};
+
 exports.isNodeText = isNodeText;
 exports.object = object;
 exports.extend = extend;
@@ -155,3 +158,5 @@ exports.binarySearch = binarySearch;
 exports.binarySearchInfinite = binarySearchInfinite;
 exports.htmlPrettyEscape = htmlPrettyEscape;
 exports.map = map;
+exports.noop = noop;
+exports.identity = identity;
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index 67535d86..78de7e22 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -21,6 +21,7 @@
  */
 
 var Ace2Common = require('ep_etherpad-lite/static/js/ace2_common');
+
 // Extract useful method defined in the other module.
 var isNodeText = Ace2Common.isNodeText;
 var object = Ace2Common.object;
@@ -32,10 +33,10 @@ var isArray = Ace2Common.isArray;
 var browser = Ace2Common.browser;
 var getAssoc = Ace2Common.getAssoc;
 var setAssoc = Ace2Common.setAssoc;
-var binarySearch = Ace2Common.binarySearch;
 var binarySearchInfinite = Ace2Common.binarySearchInfinite;
 var htmlPrettyEscape = Ace2Common.htmlPrettyEscape;
 var map = Ace2Common.map;
+var noop = Ace2Common.noop;
 
 var makeChangesetTracker = require('ep_etherpad-lite/static/js/changesettracker').makeChangesetTracker;
 var colorutils = require('ep_etherpad-lite/static/js/colorutils').colorutils;
@@ -49,9 +50,8 @@ var newSkipList = require('ep_etherpad-lite/static/js/skiplist').newSkipList;
 var undoModule = require('ep_etherpad-lite/static/js/undomodule').undoModule;
 var makeVirtualLineView = require('ep_etherpad-lite/static/js/virtual_lines').makeVirtualLineView;
 
-function OUTER(gscope)
-{
 
+function Ace2Inner(){
   var DEBUG = false; //$$ build script replaces the string "var DEBUG=true;//$$" with "var DEBUG=false;"
   // changed to false 
   var isSetUp = false;
@@ -122,13 +122,13 @@ function OUTER(gscope)
       iframePadRight = 0;
 
   var console = (DEBUG && window.console);
+  
   if (!window.console)
   {
     var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
     console = {};
     for (var i = 0; i < names.length; ++i)
-    console[names[i]] = function()
-    {};
+    console[names[i]] = noop;
     //console.error = function(str) { alert(str); };
   }
 
@@ -147,14 +147,6 @@ function OUTER(gscope)
     };
   }
 
-  function noop()
-  {}
-
-  function identity(x)
-  {
-    return x;
-  }
-
   // "dmesg" is for displaying messages in the in-page output pane
   // visible when "?djs=1" is appended to the pad URL.  It generally
   // remains a no-op unless djs is enabled, but we make a habit of
@@ -237,18 +229,34 @@ function OUTER(gscope)
             bgcolor = fadeColor(bgcolor, info.fade);
           }
           
-          // Text color
-          var txtcolor = (colorutils.luminosity(colorutils.css2triple(bgcolor)) < 0.5) ? '#ffffff' : '#000000';
-          
           var authorStyle = dynamicCSS.selectorStyle(getAuthorColorClassSelector(
           getAuthorClassName(author)));
-          authorStyle.backgroundColor = bgcolor;
-          authorStyle.color = txtcolor;
-          
           var authorStyleTop = dynamicCSSTop.selectorStyle(getAuthorColorClassSelector(
           getAuthorClassName(author)));
+          var anchorStyle = dynamicCSS.selectorStyle(getAuthorColorClassSelector(
+          getAuthorClassName(author))+' > a')
+          
+          // author color
+          authorStyle.backgroundColor = bgcolor;
           authorStyleTop.backgroundColor = bgcolor;
-          authorStyleTop.color = txtcolor;
+          
+          // text contrast
+          if(colorutils.luminosity(colorutils.css2triple(bgcolor)) < 0.5)
+          {
+            authorStyle.color = '#ffffff';
+            authorStyleTop.color = '#ffffff';
+          }else{
+            authorStyle.color = null;
+            authorStyleTop.color = null;
+          }
+          
+          // anchor text contrast
+          if(colorutils.luminosity(colorutils.css2triple(bgcolor)) < 0.55)
+          {
+            anchorStyle.color = colorutils.triple2css(colorutils.complementary(colorutils.css2triple(bgcolor)));
+          }else{
+            anchorStyle.color = null;
+          }
         }
       }
     }
@@ -338,7 +346,7 @@ function OUTER(gscope)
   editorInfo.ace_getRep = function()
   {
     return rep;
-  }
+  };
 
   var currentCallStack = null;
 
@@ -460,12 +468,11 @@ function OUTER(gscope)
         submitOldEvent(cs.editEvent);
         if (cs.domClean && cs.type != "setup")
         {
-          if (cs.isUserChange)
-          {
-            if (cs.repChanged) parenModule.notifyChange();
-            else parenModule.notifyTick();
-          }
-          recolorModule.recolorLines();
+          // if (cs.isUserChange)
+          // {
+          //  if (cs.repChanged) parenModule.notifyChange();
+          //  else parenModule.notifyTick();
+          // }
           if (cs.selectionAffected)
           {
             updateBrowserSelectionFromRep();
@@ -522,230 +529,7 @@ function OUTER(gscope)
   {
     return rep.lines.atOffset(charOffset).key;
   }
-
-  var recolorModule = (function()
-  {
-    var dirtyLineKeys = {};
-
-    var module = {};
-    module.setCharNeedsRecoloring = function(offset)
-    {
-      if (offset >= rep.alltext.length)
-      {
-        offset = rep.alltext.length - 1;
-      }
-      dirtyLineKeys[getLineKeyForOffset(offset)] = true;
-    }
-
-    module.setCharRangeNeedsRecoloring = function(offset1, offset2)
-    {
-      if (offset1 >= rep.alltext.length)
-      {
-        offset1 = rep.alltext.length - 1;
-      }
-      if (offset2 >= rep.alltext.length)
-      {
-        offset2 = rep.alltext.length - 1;
-      }
-      var firstEntry = rep.lines.atOffset(offset1);
-      var lastKey = rep.lines.atOffset(offset2).key;
-      dirtyLineKeys[lastKey] = true;
-      var entry = firstEntry;
-      while (entry && entry.key != lastKey)
-      {
-        dirtyLineKeys[entry.key] = true;
-        entry = rep.lines.next(entry);
-      }
-    }
-
-    module.recolorLines = function()
-    {
-      for (var k in dirtyLineKeys)
-      {
-        recolorLineByKey(k);
-      }
-      dirtyLineKeys = {};
-    }
-
-    return module;
-  })();
-
-  var parenModule = (function()
-  {
-    var module = {};
-    module.notifyTick = function()
-    {
-      handleFlashing(false);
-    };
-    module.notifyChange = function()
-    {
-      handleFlashing(true);
-    };
-    module.shouldNormalizeOnChar = function(c)
-    {
-      if (parenFlashRep.active)
-      {
-        // avoid highlight style from carrying on to typed text
-        return true;
-      }
-      c = String.fromCharCode(c);
-      return !!(bracketMap[c]);
-    }
-
-    var parenFlashRep = {
-      active: false,
-      whichChars: null,
-      whichLineKeys: null,
-      expireTime: null
-    };
-    var bracketMap = {
-      '(': 1,
-      ')': -1,
-      '[': 2,
-      ']': -2,
-      '{': 3,
-      '}': -3
-    };
-    var bracketRegex = /[{}\[\]()]/g;
-
-    function handleFlashing(docChanged)
-    {
-      function getSearchRange(aroundLoc)
-      {
-        var rng = getVisibleCharRange();
-        var d = 100; // minimum radius
-        var e = 3000; // maximum radius;
-        if (rng[0] > aroundLoc - d) rng[0] = aroundLoc - d;
-        if (rng[0] < aroundLoc - e) rng[0] = aroundLoc - e;
-        if (rng[0] < 0) rng[0] = 0;
-        if (rng[1] < aroundLoc + d) rng[1] = aroundLoc + d;
-        if (rng[1] > aroundLoc + e) rng[1] = aroundLoc + e;
-        if (rng[1] > rep.lines.totalWidth()) rng[1] = rep.lines.totalWidth();
-        return rng;
-      }
-
-      function findMatchingVisibleBracket(startLoc, forwards)
-      {
-        var rng = getSearchRange(startLoc);
-        var str = rep.alltext.substring(rng[0], rng[1]);
-        var bstr = str.replace(bracketRegex, '('); // handy for searching
-        var loc = startLoc - rng[0];
-        var bracketState = [];
-        var foundParen = false;
-        var goodParen = false;
-
-        function nextLoc()
-        {
-          if (loc < 0) return;
-          if (forwards) loc++;
-          else loc--;
-          if (loc < 0 || loc >= str.length) loc = -1;
-          if (loc >= 0)
-          {
-            if (forwards) loc = bstr.indexOf('(', loc);
-            else loc = bstr.lastIndexOf('(', loc);
-          }
-        }
-        while ((!foundParen) && (loc >= 0))
-        {
-          if (getCharType(loc + rng[0]) == "p")
-          {
-            var b = bracketMap[str.charAt(loc)]; // -1, 1, -2, 2, -3, 3
-            var into = forwards;
-            var typ = b;
-            if (typ < 0)
-            {
-              into = !into;
-              typ = -typ;
-            }
-            if (into) bracketState.push(typ);
-            else
-            {
-              var recent = bracketState.pop();
-              if (recent != typ)
-              {
-                foundParen = true;
-                goodParen = false;
-              }
-              else if (bracketState.length == 0)
-              {
-                foundParen = true;
-                goodParen = true;
-              }
-            }
-          }
-          //console.log(bracketState.toSource());
-          if ((!foundParen) && (loc >= 0)) nextLoc();
-        }
-        if (!foundParen) return null;
-        return {
-          chr: (loc + rng[0]),
-          good: goodParen
-        };
-      }
-
-      var r = parenFlashRep;
-      var charsToHighlight = null;
-      var linesToUnhighlight = null;
-      if (r.active && (docChanged || (now() > r.expireTime)))
-      {
-        linesToUnhighlight = r.whichLineKeys;
-        r.active = false;
-      }
-      if ((!r.active) && docChanged && isCaret() && caretColumn() > 0)
-      {
-        var caret = caretDocChar();
-        if (caret > 0 && getCharType(caret - 1) == "p")
-        {
-          var charBefore = rep.alltext.charAt(caret - 1);
-          if (bracketMap[charBefore])
-          {
-            var lookForwards = (bracketMap[charBefore] > 0);
-            var findResult = findMatchingVisibleBracket(caret - 1, lookForwards);
-            if (findResult)
-            {
-              var mateLoc = findResult.chr;
-              var mateGood = findResult.good;
-              r.active = true;
-              charsToHighlight = {};
-              charsToHighlight[caret - 1] = 'flash';
-              charsToHighlight[mateLoc] = (mateGood ? 'flash' : 'flashbad');
-              r.whichLineKeys = [];
-              r.whichLineKeys.push(getLineKeyForOffset(caret - 1));
-              r.whichLineKeys.push(getLineKeyForOffset(mateLoc));
-              r.expireTime = now() + 4000;
-              newlyActive = true;
-            }
-          }
-        }
-
-      }
-      if (linesToUnhighlight)
-      {
-        recolorLineByKey(linesToUnhighlight[0]);
-        recolorLineByKey(linesToUnhighlight[1]);
-      }
-      if (r.active && charsToHighlight)
-      {
-        function f(txt, cls, next, ofst)
-        {
-          var flashClass = charsToHighlight[ofst];
-          if (cls)
-          {
-            next(txt, cls + " " + flashClass);
-          }
-          else next(txt, cls);
-        }
-        for (var c in charsToHighlight)
-        {
-          recolorLinesInRange((+c), (+c) + 1, null, f);
-        }
-      }
-    }
-
-    return module;
-  })();
-
+  
   function dispose()
   {
     disposed = true;
@@ -779,7 +563,7 @@ function OUTER(gscope)
         alineLength += o.chars;
         if (opIter.hasNext())
         {
-          if (o.lines != 0) error();
+          if (o.lines !== 0) error();
         }
         else
         {
@@ -1097,9 +881,9 @@ function OUTER(gscope)
   editorInfo.ace_callWithAce = function(fn, callStack, normalize)
   {
     var wrapper = function()
-      {
-        return fn(editorInfo);
-        }
+    {
+      return fn(editorInfo);
+    };
         
         
         
@@ -1110,7 +894,7 @@ function OUTER(gscope)
       {
         editorInfo.ace_fastIncorp(9);
         wrapper1();
-      }
+      };
     }
 
     if (callStack !== undefined)
@@ -1121,61 +905,49 @@ function OUTER(gscope)
     {
       return wrapper();
     }
-  }
+  };
 
+  // This methed exposes a setter for some ace properties
+  // @param key the name of the parameter
+  // @param value the value to set to
   editorInfo.ace_setProperty = function(key, value)
   {
-    var k = key.toLowerCase();
-    if (k == "wraps")
-    {
-      setWraps(value);
-    }
-    else if (k == "showsauthorcolors")
-    {
-      setClassPresence(root, "authorColors", !! value);
-    }
-    else if (k == "showsuserselections")
-    {
-      setClassPresence(root, "userSelections", !! value);
-    }
-    else if (k == "showslinenumbers")
-    {
-      hasLineNumbers = !! value;
-      // disable line numbers on mobile devices
-      if (browser.mobile) hasLineNumbers = false;
-      setClassPresence(sideDiv, "sidedivhidden", !hasLineNumbers);
-      fixView();
-    }
-    else if (k == "grayedout")
-    {
-      setClassPresence(outerWin.document.body, "grayedout", !! value);
-    }
-    else if (k == "dmesg")
-    {
-      dmesg = value;
-      window.dmesg = value;
-    }
-    else if (k == 'userauthor')
-    {
-      thisAuthor = String(value);
-    }
-    else if (k == 'styled')
-    {
-      setStyled(value);
-    }
-    else if (k == 'textface')
-    {
-      setTextFace(value);
-    }
-    else if (k == 'textsize')
-    {
-      setTextSize(value);
-    }
-    else if (k == 'rtlistrue')
-    {
-      setClassPresence(root, "rtl", !! value);
+    
+    // Convinience function returning a setter for a class on an element    
+    var setClassPresenceNamed = function(element, cls){
+      return function(value){
+         setClassPresence(element, cls, !! value)
+      }
+    };
+    
+    // These properties are exposed
+    var setters = {
+      wraps: setWraps,
+      showsauthorcolors: setClassPresenceNamed(root, "authorColors"),
+      showsuserselections: setClassPresenceNamed(root, "userSelections"),
+      showslinenumbers : function(value){
+        hasLineNumbers = !! value;
+        // disable line numbers on mobile devices
+        if (browser.mobile) hasLineNumbers = false;
+        setClassPresence(sideDiv, "sidedivhidden", !hasLineNumbers);
+        fixView();
+      },
+      grayedout: setClassPresenceNamed(outerWin.document.body, "grayedout"),
+      dmesg: function(){ dmesg = window.dmesg = value; },
+      userauthor: function(value){ thisAuthor = String(value); },
+      styled: setStyled,
+      textface: setTextFace,
+      textsize: setTextSize,
+      rtlistrue: setClassPresenceNamed(root, "rtl")
+    };
+    
+    var setter = setters[key.toLowerCase()];
+    
+    // check if setter is present 
+    if(setter !== undefined){
+      setter(value)
     }
-  }
+  };
 
   editorInfo.ace_setBaseText = function(txt)
   {
@@ -1274,12 +1046,12 @@ function OUTER(gscope)
           lastElapsed = elapsed;
           return false;
         }
-        }
+      };
         
     isTimeUp.elapsed = function()
     {
       return now() - startTime;
-    }
+    };
     return isTimeUp;
   }
 
@@ -1337,7 +1109,7 @@ function OUTER(gscope)
       {
         unschedule();
       }
-    }
+    };
   }
 
   function fastIncorp(n)
@@ -1529,7 +1301,7 @@ function OUTER(gscope)
     }
     var text = lineEntry.text;
     var width = lineEntry.width; // text.length+1
-    if (text.length == 0)
+    if (text.length === 0)
     {
       // allow getLineStyleFilter to set line-div styles
       var func = linestylefilter.getLineStyleFilter(
@@ -1548,12 +1320,6 @@ function OUTER(gscope)
     }
   }
 
-
-  function getCharType(charIndex)
-  {
-    return '';
-  }
-
   var observedChanges;
 
   function clearObservedChanges()
@@ -1662,17 +1428,19 @@ function OUTER(gscope)
     var p = PROFILER("getSelection", false);
     var selection = getSelection();
     p.end();
-    if (selection)
+    
+    function topLevel(n)
     {
-      function topLevel(n)
+      if ((!n) || n == root) return null;
+      while (n.parentNode != root)
       {
-        if ((!n) || n == root) return null;
-        while (n.parentNode != root)
-        {
-          n = n.parentNode;
-        }
-        return n;
+        n = n.parentNode;
       }
+      return n;
+    }
+    
+    if (selection)
+    {
       var node1 = topLevel(selection.startPoint.node);
       var node2 = topLevel(selection.endPoint.node);
       if (node1) observeChangesAroundNode(node1);
@@ -1745,7 +1513,7 @@ function OUTER(gscope)
     {
       a = dirtyRanges[j][0];
       b = dirtyRanges[j][1];
-      if (!((a == 0 || getCleanNodeByKey(rep.lines.atIndex(a - 1).key)) && (b == rep.lines.length() || getCleanNodeByKey(rep.lines.atIndex(b).key))))
+      if (!((a === 0 || getCleanNodeByKey(rep.lines.atIndex(a - 1).key)) && (b == rep.lines.length() || getCleanNodeByKey(rep.lines.atIndex(b).key))))
       {
         dirtyRangesCheckOut = false;
         break;
@@ -1786,7 +1554,7 @@ function OUTER(gscope)
       var range = dirtyRanges[i];
       a = range[0];
       b = range[1];
-      var firstDirtyNode = (((a == 0) && root.firstChild) || getCleanNodeByKey(rep.lines.atIndex(a - 1).key).nextSibling);
+      var firstDirtyNode = (((a === 0) && root.firstChild) || getCleanNodeByKey(rep.lines.atIndex(a - 1).key).nextSibling);
       firstDirtyNode = (firstDirtyNode && isNodeDirty(firstDirtyNode) && firstDirtyNode);
       var lastDirtyNode = (((b == rep.lines.length()) && root.lastChild) || getCleanNodeByKey(rep.lines.atIndex(b).key).previousSibling);
       lastDirtyNode = (lastDirtyNode && isNodeDirty(lastDirtyNode) && lastDirtyNode);
@@ -2084,7 +1852,7 @@ function OUTER(gscope)
   function handleReturnIndentation()
   {
     // on return, indent to level of previous line
-    if (isCaret() && caretColumn() == 0 && caretLine() > 0)
+    if (isCaret() && caretColumn() === 0 && caretLine() > 0)
     {
       var lineNum = caretLine();
       var thisLine = rep.lines.atIndex(lineNum);
@@ -2166,10 +1934,10 @@ function OUTER(gscope)
     var lineNode = lineEntry.lineNode;
     var n = lineNode;
     var after = false;
-    if (charsLeft == 0)
+    if (charsLeft === 0)
     {
       var index = 0;
-      if (browser.msie && line == (rep.lines.length() - 1) && lineNode.childNodes.length == 0)
+      if (browser.msie && line == (rep.lines.length() - 1) && lineNode.childNodes.length === 0)
       {
         // best to stay at end of last empty div in IE
         index = 1;
@@ -2233,7 +2001,7 @@ function OUTER(gscope)
     // assuming the point is not in a dirty node.
     if (point.node == root)
     {
-      if (point.index == 0)
+      if (point.index === 0)
       {
         return [0, 0];
       }
@@ -2271,7 +2039,7 @@ function OUTER(gscope)
           n = parNode;
         }
       }
-      if (n.id == "") console.debug("BAD");
+      if (n.id === "") console.debug("BAD");
       if (n.firstChild && isBlockElement(n.firstChild))
       {
         col += 1; // lineMarker
@@ -2496,7 +2264,7 @@ function OUTER(gscope)
 
   function performDocumentReplaceCharRange(startChar, endChar, newText)
   {
-    if (startChar == endChar && newText.length == 0)
+    if (startChar == endChar && newText.length === 0)
     {
       return;
     }
@@ -2513,7 +2281,7 @@ function OUTER(gscope)
         endChar--;
         newText = '\n' + newText.substring(0, newText.length - 1);
       }
-      else if (newText.length == 0)
+      else if (newText.length === 0)
       {
         // a delete at end
         startChar--;
@@ -2531,8 +2299,8 @@ function OUTER(gscope)
 
   function performDocumentReplaceRange(start, end, newText)
   {
-    if (start == undefined) start = rep.selStart;
-    if (end == undefined) end = rep.selEnd;
+    if (start === undefined) start = rep.selStart;
+    if (end === undefined) end = rep.selEnd;
 
     //dmesg(String([start.toSource(),end.toSource(),newText.toSource()]));
     // start[0]: <--- start[1] --->CCCCCCCCCCC\n
@@ -2772,7 +2540,7 @@ function OUTER(gscope)
       spliceEnd--;
       commonEnd++;
     }
-    if (shortOldText.length == 0 && spliceStart == rep.alltext.length && shortNewText.length > 0)
+    if (shortOldText.length === 0 && spliceStart == rep.alltext.length && shortNewText.length > 0)
     {
       // inserting after final newline, bad
       spliceStart--;
@@ -2780,7 +2548,7 @@ function OUTER(gscope)
       shortNewText = '\n' + shortNewText.slice(0, -1);
       shiftFinalNewlineToBeforeNewText = true;
     }
-    if (spliceEnd == rep.alltext.length && shortOldText.length > 0 && shortNewText.length == 0)
+    if (spliceEnd == rep.alltext.length && shortOldText.length > 0 && shortNewText.length === 0)
     {
       // deletion at end of rep.alltext
       if (rep.alltext.charAt(spliceStart - 1) == '\n')
@@ -2792,7 +2560,7 @@ function OUTER(gscope)
       }
     }
 
-    if (!(shortOldText.length == 0 && shortNewText.length == 0))
+    if (!(shortOldText.length === 0 && shortNewText.length === 0))
     {
       var oldDocText = rep.alltext;
       var oldLen = oldDocText.length;
@@ -2800,15 +2568,15 @@ function OUTER(gscope)
       var spliceStartLine = rep.lines.indexOfOffset(spliceStart);
       var spliceStartLineStart = rep.lines.offsetOfIndex(spliceStartLine);
 
-      function startBuilder()
+      var startBuilder = function()
       {
         var builder = Changeset.builder(oldLen);
         builder.keep(spliceStartLineStart, spliceStartLine);
         builder.keep(spliceStart - spliceStartLineStart);
         return builder;
-      }
+      };
 
-      function eachAttribRun(attribs, func /*(startInNewText, endInNewText, attribs)*/ )
+      var eachAttribRun = function(attribs, func /*(startInNewText, endInNewText, attribs)*/ )
       {
         var attribsIter = Changeset.opIterator(attribs);
         var textIndex = 0;
@@ -2824,7 +2592,7 @@ function OUTER(gscope)
           }
           textIndex = nextIndex;
         }
-      }
+      };
 
       var justApplyStyles = (shortNewText == shortOldText);
       var theChangeset;
@@ -3024,7 +2792,7 @@ function OUTER(gscope)
     var newEndIter = attribIterator(newARuns, true);
     while (commonEnd < minLen)
     {
-      if (commonEnd == 0)
+      if (commonEnd === 0)
       {
         // assume newline in common
         oldEndIter();
@@ -3167,10 +2935,11 @@ function OUTER(gscope)
         lineClass = ''; // non-null to cause update
       };
 
-      function writeClass()
+      var writeClass = function()
       {
         if (lineClass !== null) lineElem.className = lineClass;
-      }
+      };
+      
       result.prepareForAdd = writeClass;
       result.finishUpdate = writeClass;
       result.getInnerHTML = function()
@@ -3397,7 +3166,7 @@ function OUTER(gscope)
       }
     }
 
-    if (N == 0)
+    if (N === 0)
     {
       p.cancel();
       if (!isConsecutive(0))
@@ -3519,26 +3288,20 @@ function OUTER(gscope)
 
   function handleClick(evt)
   {
-    //hide the dropdowns
-    if(window.top.padeditbar){ // required in case its in an iframe should probably use parent..  See Issue 327 https://github.com/Pita/etherpad-lite/issues/327
-      window.top.padeditbar.toogleDropDown("none");
-    }
-  
     inCallStack("handleClick", function()
     {
       idleWorkTimer.atMost(200);
     });
 
+    function isLink(n)
+    {
+      return (n.tagName || '').toLowerCase() == "a" && n.href;
+    }
+    
     // only want to catch left-click
     if ((!evt.ctrlKey) && (evt.button != 2) && (evt.button != 3))
     {
       // find A tag with HREF
-
-
-      function isLink(n)
-      {
-        return (n.tagName || '').toLowerCase() == "a" && n.href;
-      }
       var n = evt.target;
       while (n && n.parentNode && !isLink(n))
       {
@@ -3558,6 +3321,10 @@ function OUTER(gscope)
         evt.preventDefault();
       }
     }
+    //hide the dropdownso
+    if(window.parent.parent.padeditbar){ // required in case its in an iframe should probably use parent..  See Issue 327 https://github.com/Pita/etherpad-lite/issues/327
+      window.parent.parent.padeditbar.toogleDropDown("none");
+    }
   }
 
   function doReturnKey()
@@ -3613,7 +3380,7 @@ function OUTER(gscope)
 
     var firstLine, lastLine;
     firstLine = rep.selStart[0];
-    lastLine = Math.max(firstLine, rep.selEnd[0] - ((rep.selEnd[1] == 0) ? 1 : 0));
+    lastLine = Math.max(firstLine, rep.selEnd[0] - ((rep.selEnd[1] === 0) ? 1 : 0));
 
     var mods = [];
     for (var n = firstLine; n <= lastLine; n++)
@@ -3747,7 +3514,7 @@ function OUTER(gscope)
     //separated. If it returns null, it means that the list was not cut, try
     //from the current one.
     var line = caretLine();
-    if(line != -1 && renumberList(line+1)==null)
+    if(line != -1 && renumberList(line+1) === null)
     {
       renumberList(line);
     }
@@ -3968,7 +3735,7 @@ function OUTER(gscope)
       }
       else if (type == "keypress")
       {
-        if ((!specialHandled) && parenModule.shouldNormalizeOnChar(charCode))
+        if ((!specialHandled) && false /*parenModule.shouldNormalizeOnChar(charCode)*/)
         {
           idleWorkTimer.atMost(0);
         }
@@ -3985,7 +3752,7 @@ function OUTER(gscope)
       }
 
       // Is part of multi-keystroke international character on Firefox Mac
-      var isFirefoxHalfCharacter = (browser.mozilla && evt.altKey && charCode == 0 && keyCode == 0);
+      var isFirefoxHalfCharacter = (browser.mozilla && evt.altKey && charCode === 0 && keyCode === 0);
 
       // Is part of multi-keystroke international character on Safari Mac
       var isSafariHalfCharacter = (browser.safari && evt.altKey && keyCode == 229);
@@ -4084,7 +3851,7 @@ function OUTER(gscope)
     {
       var text = entry.text;
       var content;
-      if (text.length == 0)
+      if (text.length === 0)
       {
         content = '<span style="color: #aaa">--</span>';
       }
@@ -4150,27 +3917,27 @@ function OUTER(gscope)
       var selectionParent = origSelectionRange.parentElement();
       if (selectionParent.ownerDocument != doc) return null;
 
-      function newRange()
+      var newRange = function()
       {
         return doc.body.createTextRange();
-      }
+      };
 
-      function rangeForElementNode(nd)
+      var rangeForElementNode = function(nd)
       {
         var rng = newRange();
         // doesn't work on text nodes
         rng.moveToElementText(nd);
         return rng;
-      }
+      };
 
-      function pointFromCollapsedRange(rng)
+      var pointFromCollapsedRange = function(rng)
       {
         var parNode = rng.parentElement();
         var elemBelow = -1;
         var elemAbove = parNode.childNodes.length;
         var rangeWithin = rangeForElementNode(parNode);
 
-        if (rng.compareEndPoints("StartToStart", rangeWithin) == 0)
+        if (rng.compareEndPoints("StartToStart", rangeWithin) === 0)
         {
           return {
             node: parNode,
@@ -4178,7 +3945,7 @@ function OUTER(gscope)
             maxIndex: 1
           };
         }
-        else if (rng.compareEndPoints("EndToEnd", rangeWithin) == 0)
+        else if (rng.compareEndPoints("EndToEnd", rangeWithin) === 0)
         {
           if (isBlockElement(parNode) && parNode.nextSibling)
           {
@@ -4196,7 +3963,7 @@ function OUTER(gscope)
             maxIndex: 1
           };
         }
-        else if (parNode.childNodes.length == 0)
+        else if (parNode.childNodes.length === 0)
         {
           return {
             node: parNode,
@@ -4305,9 +4072,10 @@ function OUTER(gscope)
           index: tn.nodeValue.length,
           maxIndex: tn.nodeValue.length
         };
-      }
+      };
+      
       var selection = {};
-      if (origSelectionRange.compareEndPoints("StartToEnd", origSelectionRange) == 0)
+      if (origSelectionRange.compareEndPoints("StartToEnd", origSelectionRange) === 0)
       {
         // collapsed
         var pnt = pointFromCollapsedRange(origSelectionRange);
@@ -4327,10 +4095,10 @@ function OUTER(gscope)
         selection.startPoint = pointFromCollapsedRange(start);
         selection.endPoint = pointFromCollapsedRange(end);
 /*if ((!selection.startPoint.node.isText) && (!selection.endPoint.node.isText)) {
-	  console.log(selection.startPoint.node.uniqueId()+","+
-		      selection.startPoint.index+" / "+
-		      selection.endPoint.node.uniqueId()+","+
-		      selection.endPoint.index);
+  console.log(selection.startPoint.node.uniqueId()+","+
+    selection.startPoint.index+" / "+
+    selection.endPoint.node.uniqueId()+","+
+    selection.endPoint.index);
 	}*/
       }
       return selection;
@@ -4373,7 +4141,7 @@ function OUTER(gscope)
               maxIndex: n.nodeValue.length
             };
           }
-          else if (childCount == 0)
+          else if (childCount === 0)
           {
             return {
               node: n,
@@ -4499,7 +4267,7 @@ function OUTER(gscope)
           setCollapsedBefore(s, n);
           s.move("character", point.index);
         }
-        else if (point.index == 0)
+        else if (point.index === 0)
         {
           setCollapsedBefore(s, n);
         }
@@ -4587,7 +4355,7 @@ function OUTER(gscope)
             while (p.node.childNodes.length > 0)
             {
               //&& (p.node == root || p.node.parentNode == root)) {
-              if (p.index == 0)
+              if (p.index === 0)
               {
                 p.node = p.node.firstChild;
                 p.maxIndex = nodeMaxIndex(p.node);
@@ -4690,7 +4458,7 @@ function OUTER(gscope)
   function fixView()
   {
     // calling this method repeatedly should be fast
-    if (getInnerWidth() == 0 || getInnerHeight() == 0)
+    if (getInnerWidth() === 0 || getInnerHeight() === 0)
     {
       return;
     }
@@ -4902,7 +4670,6 @@ function OUTER(gscope)
 
   function bindTheEventHandlers()
   {
-    bindEventHandler(window, "unload", teardown);
     bindEventHandler(document, "keydown", handleKeyEvent);
     bindEventHandler(document, "keypress", handleKeyEvent);
     bindEventHandler(document, "keyup", handleKeyEvent);
@@ -5109,7 +4876,7 @@ function OUTER(gscope)
     }
     if (!isNodeText(node))
     {
-      if (index == 0) return leftOf(node);
+      if (index === 0) return leftOf(node);
       else return rightOf(node);
     }
     else
@@ -5390,7 +5157,7 @@ function OUTER(gscope)
 
     var firstLine, lastLine;
     firstLine = rep.selStart[0];
-    lastLine = Math.max(firstLine, rep.selEnd[0] - ((rep.selEnd[1] == 0) ? 1 : 0));
+    lastLine = Math.max(firstLine, rep.selEnd[0] - ((rep.selEnd[1] === 0) ? 1 : 0));
 
     var allLinesAreList = true;
     for (var n = firstLine; n <= lastLine; n++)
@@ -5600,7 +5367,7 @@ function OUTER(gscope)
               // move by "paragraph", a feature that Firefox lacks but IE and Safari both have
               if (up)
               {
-                if (focusCaret[1] == 0 && canChangeLines)
+                if (focusCaret[1] === 0 && canChangeLines)
                 {
                   focusCaret[0]--;
                   focusCaret[1] = 0;
@@ -5828,16 +5595,19 @@ function OUTER(gscope)
   {
     var newNumLines = rep.lines.length();
     if (newNumLines < 1) newNumLines = 1;
-	//update height of all current line numbers
+    //update height of all current line numbers
+  
+    var a = sideDivInner.firstChild;
+    var b = doc.body.firstChild;
+    var n = 0;
+    
     if (currentCallStack && currentCallStack.domClean)
     {
-      var a = sideDivInner.firstChild;
-      var b = doc.body.firstChild;
-      var n = 0;
+
       while (a && b)
       {
-	if(n > lineNumbersShown) //all updated, break
-	  break;
+        if(n > lineNumbersShown) //all updated, break
+        break;
 
         var h = (b.clientHeight || b.offsetHeight);
         if (b.nextSibling)
@@ -5853,12 +5623,12 @@ function OUTER(gscope)
         {
           var hpx = h + "px";
           if (a.style.height != hpx) {
-	    a.style.height = hpx;
-	  }
+            a.style.height = hpx;
+          }
         }
         a = a.nextSibling;
         b = b.nextSibling;
-	n++;
+        n++;
       }
     }	
 	
@@ -5872,17 +5642,20 @@ function OUTER(gscope)
         lineNumbersShown++;
         var n = lineNumbersShown;
         var div = odoc.createElement("DIV");	
-	//calculate height for new line number
-	var h = (b.clientHeight || b.offsetHeight);
-	if (b.nextSibling)
-	  h = b.nextSibling.offsetTop - b.offsetTop;
-	if(h) // apply style to div
-	  div.style.height = h +"px";
+        //calculate height for new line number
+        var h = (b.clientHeight || b.offsetHeight);
+        
+        if (b.nextSibling)
+          h = b.nextSibling.offsetTop - b.offsetTop;
+        
+        if(h) // apply style to div
+          div.style.height = h +"px";
 			
         div.appendChild(odoc.createTextNode(String(n)));
-	fragment.appendChild(div);
-	b = b.nextSibling;
+        fragment.appendChild(div);
+        b = b.nextSibling;
       }
+      
       container.appendChild(fragment);
       while (lineNumbersShown > newNumLines)
       {
@@ -5892,8 +5665,6 @@ function OUTER(gscope)
     }
   }
 
-};
-
-OUTER(this);
+}
 
-exports.OUTER = OUTER; // This is probably unimportant.
+exports.editor = new Ace2Inner();
diff --git a/src/static/js/broadcast.js b/src/static/js/broadcast.js
index f0a62701..1284226f 100644
--- a/src/static/js/broadcast.js
+++ b/src/static/js/broadcast.js
@@ -26,47 +26,16 @@ var AttribPool = require('ep_etherpad-lite/static/js/AttributePoolFactory').crea
 var Changeset = require('ep_etherpad-lite/static/js/Changeset');
 var linestylefilter = require('ep_etherpad-lite/static/js/linestylefilter').linestylefilter;
 var colorutils = require('ep_etherpad-lite/static/js/colorutils').colorutils;
+var Ace2Common = require('ep_etherpad-lite/static/js/ace2_common');
+
+var map = Ace2Common.map;
+var forEach = Ace2Common.forEach;
 
 // These parameters were global, now they are injected. A reference to the
 // Timeslider controller would probably be more appropriate.
 function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider)
 {
   var changesetLoader = undefined;
-  // just in case... (todo: this must be somewhere else in the client code.)
-  // Below Array#map code was direct pasted by AppJet/Etherpad, licence unknown. Possible source: http://www.tutorialspoint.com/javascript/array_map.htm
-  if (!Array.prototype.map)
-  {
-    Array.prototype.map = function(fun /*, thisp*/ )
-    {
-      var len = this.length >>> 0;
-      if (typeof fun != "function") throw new TypeError();
-
-      var res = new Array(len);
-      var thisp = arguments[1];
-      for (var i = 0; i < len; i++)
-      {
-        if (i in this) res[i] = fun.call(thisp, this[i], i, this);
-      }
-
-      return res;
-    };
-  }
-
-  // Below Array#forEach code was direct pasted by AppJet/Etherpad, licence unknown. Possible source: http://www.tutorialspoint.com/javascript/array_foreach.htm
-  if (!Array.prototype.forEach)
-  {
-    Array.prototype.forEach = function(fun /*, thisp*/ )
-    {
-      var len = this.length >>> 0;
-      if (typeof fun != "function") throw new TypeError();
-
-      var thisp = arguments[1];
-      for (var i = 0; i < len; i++)
-      {
-        if (i in this) fun.call(thisp, this[i], i, this);
-      }
-    };
-  }
 
   // Below Array#indexOf code was direct pasted by AppJet/Etherpad, licence unknown. Possible source: http://www.tutorialspoint.com/javascript/array_indexof.htm
   if (!Array.prototype.indexOf)
@@ -99,11 +68,6 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
     }
   }
 
-  function randomString()
-  {
-    return "_" + Math.floor(Math.random() * 1000000);
-  }
-
   // for IE
   if ($.browser.msie)
   {
@@ -115,7 +79,7 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
     {}
   }
 
-  var userId = "hiddenUser" + randomString();
+
   var socketId;
   //var socket;
   var channelState = "DISCONNECTED";
@@ -191,10 +155,7 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
     // splice the lines
     splice: function(start, numRemoved, newLinesVA)
     {
-      var newLines = Array.prototype.slice.call(arguments, 2).map(
-
-      function(s)
-      {
+      var newLines = map(Array.prototype.slice.call(arguments, 2), function(s) {
         return s;
       });
 
@@ -316,10 +277,13 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
     padContents.currentTime += timeDelta * 1000;
     debugLog('Time Delta: ', timeDelta)
     updateTimer();
-    BroadcastSlider.setAuthors(padContents.getActiveAuthors().map(function(name)
+    
+    var authors = map(padContents.getActiveAuthors(), function(name)
     {
       return authorData[name];
-    }));
+    });
+    
+    BroadcastSlider.setAuthors(authors);
   }
 
   function updateTimer()
@@ -419,10 +383,11 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
 
       changesetLoader.queueUp(start, 1, update);
     }
-    BroadcastSlider.setAuthors(padContents.getActiveAuthors().map(function(name)
-    {
+    
+    var authors = map(padContents.getActiveAuthors(), function(name){
       return authorData[name];
-    }));
+    });
+    BroadcastSlider.setAuthors(authors);
   }
 
   changesetLoader = {
@@ -561,10 +526,12 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
         var authorMap = {};
         authorMap[obj.author] = obj.data;
         receiveAuthorData(authorMap);
-        BroadcastSlider.setAuthors(padContents.getActiveAuthors().map(function(name)
-        {
+        
+        var authors = map(padContents.getActiveAuthors(),function(name) {
           return authorData[name];
-        }));
+        });
+        
+        BroadcastSlider.setAuthors(authors);
       }
       else if (obj['type'] == "NEW_SAVEDREV")
       {
@@ -616,53 +583,6 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
     }));
   }
 
-/*function setUpSocket()
-  {
-    // required for Comet
-    if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0)))
-    {
-      document.domain = document.domain; // for comet
-    }
-
-    var success = false;
-    callCatchingErrors("setUpSocket", function ()
-    {
-      appLevelDisconnectReason = null;
-
-      socketId = String(Math.floor(Math.random() * 1e12));
-      socket = new WebSocket(socketId);
-      socket.onmessage = wrapRecordingErrors("socket.onmessage", handleMessageFromServer);
-      socket.onclosed = wrapRecordingErrors("socket.onclosed", handleSocketClosed);
-      socket.onopen = wrapRecordingErrors("socket.onopen", function ()
-      {
-        setChannelState("CONNECTED");
-        var msg = {
-          type: "CLIENT_READY",
-          roomType: 'padview',
-          roomName: 'padview/' + clientVars.viewId,
-          data: {
-            lastRev: clientVars.revNum,
-            userInfo: {
-              userId: userId
-            }
-          }
-        };
-        sendMessage(msg);
-      });
-      // socket.onhiccup = wrapRecordingErrors("socket.onhiccup", handleCometHiccup);
-      // socket.onlogmessage = function(x) {debugLog(x); };
-      socket.connect();
-      success = true;
-    });
-    if (success)
-    {
-      //initialStartConnectTime = +new Date();
-    }
-    else
-    {
-      abandonConnection("initsocketfail");
-    }
-  }*/
 
   function setChannelState(newChannelState, moreInfo)
   {
@@ -691,7 +611,7 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
   window.onload = function ()
   {
     window['isloaded'] = true;
-    window['onloadFuncts'].forEach(function (funct)
+    forEach(window['onloadFuncts'],function (funct)
     {
       funct();
     });
diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 943ab09f..0e3ea60b 100644
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -42,13 +42,13 @@ var chat = (function()
       chat.show();
       if(!isStuck || fromInitialCall) { // Stick it to
         padcookie.setPref("chatAlwaysVisible", true);
-        $('#chatbox').css({"right":"0px", "top":"36px", "border-radius":"0px", "height":"auto", "border-right":"none", "border-left":"1px solid #ccc", "border-top":"none", "background-color":"#f1f1f1", "width":"185px"});
+        $('#chatbox').addClass("stickyChat");
         $('#chattext').css({"top":"0px"});
         $('#editorcontainer').css({"right":"192px", "width":"auto"});
         isStuck = true;
       } else { // Unstick it
         padcookie.setPref("chatAlwaysVisible", false);
-        $('#chatbox').css({"right":"20px", "top":"auto", "border-top-left-radius":"5px", "border-top-right-radius":"5px", "border-right":"1px solid #999", "height":"200px", "border-top":"1px solid #999", "background-color":"#f7f7f7"});
+        $('#chatbox').removeClass("stickyChat");
         $('#chattext').css({"top":"25px"});
         $('#editorcontainer').css({"right":"0px", "width":"100%"});
         isStuck = false;
diff --git a/src/static/js/collab_client.js b/src/static/js/collab_client.js
index 384b49d6..4cb7b07e 100644
--- a/src/static/js/collab_client.js
+++ b/src/static/js/collab_client.js
@@ -84,13 +84,6 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
     {}
   };
 
-  $(window).bind("unload", function()
-  {
-    if (getSocket())
-    {
-      setChannelState("DISCONNECTED", "unload");
-    }
-  });
   if ($.browser.mozilla)
   {
     // Prevent "escape" from taking effect and canceling a comet connection;
diff --git a/src/static/js/colorutils.js b/src/static/js/colorutils.js
index 9bba39ad..5fbefb4d 100644
--- a/src/static/js/colorutils.js
+++ b/src/static/js/colorutils.js
@@ -120,4 +120,19 @@ colorutils.blend = function(c1, c2, t)
   return [colorutils.scale(t, c1[0], c2[0]), colorutils.scale(t, c1[1], c2[1]), colorutils.scale(t, c1[2], c2[2])];
 }
 
+colorutils.invert = function(c)
+{
+  return [1 - c[0], 1 - c[1], 1- c[2]];
+}
+
+colorutils.complementary = function(c)
+{
+  var inv = colorutils.invert(c);
+  return [
+    (inv[0] >= c[0]) ? Math.min(inv[0] * 1.30, 1) : (c[0] * 0.30),
+    (inv[1] >= c[1]) ? Math.min(inv[1] * 1.59, 1) : (c[1] * 0.59),
+    (inv[2] >= c[2]) ? Math.min(inv[2] * 1.11, 1) : (c[2] * 0.11)
+  ];
+}
+
 exports.colorutils = colorutils;
diff --git a/src/static/js/domline.js b/src/static/js/domline.js
index 3df98dc0..11532409 100644
--- a/src/static/js/domline.js
+++ b/src/static/js/domline.js
@@ -28,15 +28,12 @@
 
 var Security = require('ep_etherpad-lite/static/js/security');
 var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
-var map = require('ep_etherpad-lite/static/js/ace2_common').map;
+var Ace2Common = require('ep_etherpad-lite/static/js/ace2_common');
+var map = Ace2Common.map;
+var noop = Ace2Common.noop;
+var identity = Ace2Common.identity;
 
 var domline = {};
-domline.noop = function()
-{};
-domline.identity = function(x)
-{
-  return x;
-};
 
 domline.addToLineClass = function(lineClass, cls)
 {
@@ -60,11 +57,11 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
 {
   var result = {
     node: null,
-    appendSpan: domline.noop,
-    prepareForAdd: domline.noop,
-    notifyAdded: domline.noop,
-    clearSpans: domline.noop,
-    finishUpdate: domline.noop,
+    appendSpan: noop,
+    prepareForAdd: noop,
+    notifyAdded: noop,
+    clearSpans: noop,
+    finishUpdate: noop,
     lineMarker: 0
   };
 
@@ -91,7 +88,7 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
   {
     return domline.processSpaces(s, doesWrap);
   }
-  var identity = domline.identity;
+
   var perTextNodeProcess = (doesWrap ? identity : processSpaces);
   var perHtmlLineProcess = (doesWrap ? processSpaces : identity);
   var lineClass = 'ace-line';
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index 06125159..7be7b348 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -146,6 +146,12 @@ function savePassword()
   document.location=document.location;
 }
 
+function ieTestXMLHTTP(){
+  // Test for IE known XML HTTP issue
+  if ($.browser.msie && !window.XMLHttpRequest){
+    $("#editorloadingbox").html("You do not have XML HTTP enabled in your browser. <a target='_blank' href='https://github.com/Pita/etherpad-lite/wiki/How-to-enable-native-XMLHTTP-support-in-IE'>Fix this issue</a>");
+  }
+}
 function handshake()
 {
   var loc = document.location;
@@ -158,7 +164,8 @@ function handshake()
   //connect
   socket = pad.socket = io.connect(url, {
     resource: resource,
-    'max reconnection attempts': 3
+    'max reconnection attempts': 3,
+    'sync disconnect on unload' : false
   });
 
   function sendClientReady(isReconnect)
@@ -216,15 +223,19 @@ function handshake()
     sendClientReady(true);
   });
   
-  socket.on('disconnect', function () {
-    function disconnectEvent()
-    {
-      pad.collabClient.setChannelState("DISCONNECTED", "reconnect_timeout");
+  socket.on('disconnect', function (reason) {
+    if(reason == "booted"){
+      pad.collabClient.setChannelState("DISCONNECTED");
+    } else {
+      function disconnectEvent()
+      {
+        pad.collabClient.setChannelState("DISCONNECTED", "reconnect_timeout");
+      }
+      
+      pad.collabClient.setChannelState("RECONNECTING");
+      
+      disconnectTimeout = setTimeout(disconnectEvent, 10000);
     }
-    
-    pad.collabClient.setChannelState("RECONNECTING");
-    
-    disconnectTimeout = setTimeout(disconnectEvent, 10000);
   });
 
   var receivedClientVars = false;
@@ -276,7 +287,7 @@ function handshake()
         pad.changeViewOption('showLineNumbers', false);
       }
 
-      // If the noColors value is set to true then we need to hide the backround colors on the ace spans
+      // If the noColors value is set to true then we need to hide the background colors on the ace spans
       if (settings.noColors == true)
       {
         pad.changeViewOption('noColors', true);
@@ -364,7 +375,6 @@ var pad = {
   {
     return clientVars.userIsGuest;
   },
-  //
   getUserId: function()
   {
     return pad.myUserInfo.userId;
@@ -384,16 +394,13 @@ var pad = {
 
     $(document).ready(function()
     {
+      // test for XML HTTP capabiites
+      ieTestXMLHTTP();
       // start the custom js
       if (typeof customStart == "function") customStart();
       getParams();
       handshake();
     });
-
-    $(window).unload(function()
-    {
-      pad.dispose();
-    });
   },
   _afterHandshake: function()
   {
@@ -422,7 +429,7 @@ var pad = {
 
     // order of inits is important here:
     padcookie.init(clientVars.cookiePrefsToSet, this);
-  
+      
     $("#widthprefcheck").click(pad.toggleWidthPref);
     // $("#sidebarcheck").click(pad.togglewSidebar);
 
@@ -477,6 +484,13 @@ var pad = {
       {
         padeditor.ace.focus();
       }, 0);
+      if(padcookie.getPref("chatAlwaysVisible")){ // if we have a cookie for always showing chat then show it
+        chat.stickToScreen(true); // stick it to the screen
+        $('#options-stickychat').prop("checked", true); // set the checkbox to on
+      }
+      if(padcookie.getPref("showAuthorshipColors") == false){
+	pad.changeViewOption('showAuthorColors', false);
+      }
     }
   },
   dispose: function()
@@ -741,6 +755,7 @@ var pad = {
 
     // pad.determineSidebarVisibility(isConnected && !isInitialConnect);
     pad.determineChatVisibility(isConnected && !isInitialConnect);
+    pad.determineAuthorshipColorsVisibility();
 
   },
 /*  determineSidebarVisibility: function(asNowConnectedFeedback)
@@ -770,6 +785,16 @@ var pad = {
       $('#options-stickychat').prop("checked", false); // set the checkbox for off
     }
   },
+  determineAuthorshipColorsVisibility: function(){
+    var authColCookie = padcookie.getPref('showAuthorshipColors');
+    if (authColCookie){
+      pad.changeViewOption('showAuthorColors', true);
+      $('#options-colorscheck').prop("checked", true);
+    }
+    else {
+      $('#options-colorscheck').prop("checked", false);
+    }
+  },
   handleCollabAction: function(action)
   {
     if (action == "commitPerformed")
@@ -972,3 +997,4 @@ exports.handshake = handshake;
 exports.pad = pad;
 exports.init = init;
 exports.alertBar = alertBar;
+
diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index b112f5f7..27fc82f7 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -239,14 +239,14 @@ var padeditbar = (function()
         var readonlyLink = basePath + "/ro/" + clientVars.readOnlyId;
         $('#embedinput').val("<iframe name='embed_readonly' src='" + readonlyLink + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
         $('#linkinput').val(readonlyLink);
-        $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=H|0&chl=" + readonlyLink);
+        $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + readonlyLink);
       }
       else
       {
         var padurl = window.location.href.split("?")[0];
         $('#embedinput').val("<iframe name='embed_readwrite' src='" + padurl + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
         $('#linkinput').val(padurl);
-        $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=H|0&chl=" + padurl);
+        $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + padurl);
       }
     }
   };
diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js
index c3e65e19..c809befe 100644
--- a/src/static/js/pad_editor.js
+++ b/src/static/js/pad_editor.js
@@ -69,6 +69,7 @@ var padeditor = (function()
       });
       padutils.bindCheckboxChange($("#options-colorscheck"), function()
       {
+        padcookie.setPref('showAuthorshipColors', padutils.getCheckbox("#options-colorscheck"));
         pad.changeViewOption('showAuthorColors', padutils.getCheckbox("#options-colorscheck"));
       });
       $("#viewfontmenu").change(function()
diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js
index 4d6a1dfc..acbb4fa7 100644
--- a/src/static/js/pad_impexp.js
+++ b/src/static/js/pad_impexp.js
@@ -95,11 +95,6 @@ var padimpexp = (function()
       }, 0);
       $('#importarrow').stop(true, true).hide();
       $('#importstatusball').show();
-      
-      $("#import .importframe").load(function()
-      {
-        importDone();
-      });
     }
     return ret;
   }
@@ -107,8 +102,6 @@ var padimpexp = (function()
   function importFailed(msg)
   {
     importErrorMessage(msg);
-    importDone();
-    addImportFrames();
   }
 
   function importDone()
@@ -120,6 +113,7 @@ var padimpexp = (function()
     }, 0);
     $('#importstatusball').hide();
     importClearTimeout();
+    addImportFrames();
   }
 
   function importClearTimeout()
@@ -131,11 +125,19 @@ var padimpexp = (function()
     }
   }
 
-  function importErrorMessage(msg)
+  function importErrorMessage(status)
   {
+    var msg="";
+  
+    if(status === "convertFailed"){
+      msg = "We were not able to import this file. Please use a different document format or copy paste manually";
+    } else if(status === "uploadFailed"){
+      msg = "The upload failed, please try again";
+    }
+  
     function showError(fade)
     {
-      $('#importmessagefail').html('<strong style="color: red">Import failed:</strong> ' + (msg || 'Please try a different file.'))[(fade ? "fadeIn" : "show")]();
+      $('#importmessagefail').html('<strong style="color: red">Import failed:</strong> ' + (msg || 'Please copy paste'))[(fade ? "fadeIn" : "show")]();
     }
 
     if ($('#importexport .importmessage').is(':visible'))
@@ -175,39 +177,6 @@ var padimpexp = (function()
     importDone();
   }
 
-  function importApplicationSuccessful(data, textStatus)
-  {
-    if (data.substr(0, 2) == "ok")
-    {
-      if ($('#importexport .importmessage').is(':visible'))
-      {
-        $('#importexport .importmessage').hide();
-      }
-      $('#importmessagesuccess').html('<strong style="color: green">Import successful!</strong>').show();
-      $('#importformfilediv').hide();
-      window.setTimeout(function()
-      {
-        $('#importmessagesuccess').fadeOut("slow", function()
-        {
-          $('#importformfilediv').show();
-        });
-        if (hidePanelCall)
-        {
-          hidePanelCall();
-        }
-      }, 3000);
-    }
-    else if (data.substr(0, 4) == "fail")
-    {
-      importErrorMessage("Couldn't update pad contents. This can happen if your web browser has \"cookies\" disabled.");
-    }
-    else if (data.substr(0, 4) == "msg:")
-    {
-      importErrorMessage(data.substr(4));
-    }
-    importDone();
-  }
-
   ///// export
 
   function cantExport()
@@ -257,8 +226,7 @@ var padimpexp = (function()
         $("#exportworda").remove();
         $("#exportpdfa").remove();
         $("#exportopena").remove();
-        $("#importexport").css({"height":"115px"});
-        $("#importexportline").css({"height":"115px"});
+        $(".importformdiv").remove();
         $("#import").html("Import is not available.  To enable import please install abiword");
       }
       else if(clientVars.abiwordAvailable == "withoutPDF")
@@ -292,16 +260,14 @@ var padimpexp = (function()
       $('#importform').submit(fileInputSubmit);
       $('.disabledexport').click(cantExport);
     },
-    handleFrameCall: function(callName, argsArray)
+    handleFrameCall: function(status)
     {
-      if (callName == 'importFailed')
+      if (status !== "ok")
       {
-        importFailed(argsArray[0]);
-      }
-      else if (callName == 'importSuccessful')
-      {
-        importSuccessful(argsArray[0]);
+        importFailed(status);
       }
+      
+      importDone();
     },
     disable: function()
     {
diff --git a/src/static/js/skiplist.js b/src/static/js/skiplist.js
index 385f08f0..190bc55b 100644
--- a/src/static/js/skiplist.js
+++ b/src/static/js/skiplist.js
@@ -21,7 +21,7 @@
  */
 
 
-
+var noop = require('./ace2_common').noop;
 
 
 function newSkipList()
@@ -41,9 +41,6 @@ function newSkipList()
     };
   }
 
-  function noop()
-  {}
-
   // if there are N elements in the skiplist, "start" is element -1 and "end" is element N
   var start = {
     key: null,
diff --git a/src/static/pad.html b/src/static/pad.html
index 38595daf..f82abaa2 100644
--- a/src/static/pad.html
+++ b/src/static/pad.html
@@ -5,100 +5,70 @@
 
         <meta charset="utf-8">
         <meta name="robots" content="noindex, nofollow">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
 
         <link href="../static/css/pad.css" rel="stylesheet">
         <link href="../static/custom/pad.css" rel="stylesheet">
         <style title="dynamicsyntax"></style>
 
+        <!-- head and body had been removed intentionally -->
+
         <div id="editbar">
             <ul id="menu_left">
-                <li onClick="window.pad&amp;&amp;pad.editbarClick('bold');return false" >
-                    <a title="Bold (ctrl-B)">
-                        <div class="buttonicon buttonicon-bold"></div>
-                    </a>
+                <li id="bold" onClick="window.pad&amp;&amp;pad.editbarClick('bold');return false">
+                    <a class="buttonicon buttonicon-bold" title="Bold (ctrl-B)"></a>
                 </li>
-                <li onClick="window.pad&amp;&amp;pad.editbarClick('italic'); return false;" >
-                    <a title="Italics (ctrl-I)">
-                        <div class="buttonicon buttonicon-italic"></div>
-                    </a>
+                <li id="italic" onClick="window.pad&amp;&amp;pad.editbarClick('italic'); return false;">
+                    <a class="buttonicon buttonicon-italic" title="Italics (ctrl-I)"></a>
                 </li>
-                <li onClick="window.pad&amp;&amp;pad.editbarClick('underline');return false;" >
-                    <a title="Underline (ctrl-U)">
-                        <div class="buttonicon buttonicon-underline"></div>
-                    </a>
+                <li id="underline" onClick="window.pad&amp;&amp;pad.editbarClick('underline');return false;" >
+                    <a class="buttonicon buttonicon-underline" title="Underline (ctrl-U)"></a>
                 </li>
-                <li onClick="window.pad&amp;&amp;pad.editbarClick('strikethrough');return false;" >
-                    <a title="Strikethrough">
-                        <div class="buttonicon buttonicon-strikethrough"></div>
-                    </a>
+                <li id="strikethrough" onClick="window.pad&amp;&amp;pad.editbarClick('strikethrough');return false;">
+                    <a class="buttonicon buttonicon-strikethrough" title="Strikethrough"></a>
                 </li>
                 <li class="separator"></li>
-                <li onClick="window.pad&amp;&amp;pad.editbarClick('insertorderedlist');return false;" >
-                    <a title="Toggle Ordered List">
-                        <div class="buttonicon buttonicon-insertorderedlist"></div>
-                    </a>
+                <li id="oderedlist" onClick="window.pad&amp;&amp;pad.editbarClick('insertorderedlist');return false;">
+                    <a class="buttonicon buttonicon-insertorderedlist" title="Toggle Ordered List"></a>
                 </li>
-                <li onClick="window.pad&amp;&amp;pad.editbarClick('insertunorderedlist');return false;" >
-                    <a title="Toggle Bullet List">
-                        <div class="buttonicon buttonicon-insertunorderedlist"></div>
-                    </a>
+                <li id="unoderedlist" onClick="window.pad&amp;&amp;pad.editbarClick('insertunorderedlist');return false;">
+                    <a class="buttonicon buttonicon-insertunorderedlist" title="Toggle Bullet List"></a>
                 </li>
-                <li onClick="window.pad&amp;&amp;pad.editbarClick('indent');return false;" >
-                    <a title="Indent">
-                        <div class="buttonicon buttonicon-indent"></div>
-                    </a>
+                <li id="indent" onClick="window.pad&amp;&amp;pad.editbarClick('indent');return false;">
+                    <a class="buttonicon buttonicon-indent" title="Indent"></a>
                 </li>
-                <li onClick="window.pad&amp;&amp;pad.editbarClick('outdent');return false;" >
-                    <a title="Unindent">
-                        <div class="buttonicon buttonicon-outdent"></div>
-                    </a>
+                <li id="outdent" onClick="window.pad&amp;&amp;pad.editbarClick('outdent');return false;">
+                    <a class="buttonicon buttonicon-outdent" title="Unindent"></a>
                 </li>
                 <li class="separator"></li>
-                <li onClick="window.pad&amp;&amp;pad.editbarClick('undo');return false;" >
-                    <a title="Undo (ctrl-Z)">
-                        <div class="buttonicon buttonicon-undo"></div>
-                    </a>
+                <li id="undo" onClick="window.pad&amp;&amp;pad.editbarClick('undo');return false;">
+                    <a class="buttonicon buttonicon-undo" title="Undo (ctrl-Z)"></a>
                 </li>
-                <li onClick="window.pad&amp;&amp;pad.editbarClick('redo');return false;" >
-                    <a title="Redo (ctrl-Y)">
-                        <div class="buttonicon buttonicon-redo"></div>
-                    </a>
+                <li id="redo" onClick="window.pad&amp;&amp;pad.editbarClick('redo');return false;">
+                    <a class="buttonicon buttonicon-redo" title="Redo (ctrl-Y)"></a>
                 </li>
                 <li class="separator"></li>
-                <li id="clearAuthorship" onClick="window.pad&amp;&amp;pad.editbarClick('clearauthorship');return false;" >
-                    <a title="Clear Authorship Colors">
-                        <div class="buttonicon buttonicon-clearauthorship"></div>
-                    </a>
+                <li id="clearAuthorship" onClick="window.pad&amp;&amp;pad.editbarClick('clearauthorship');return false;">
+                    <a class="buttonicon buttonicon-clearauthorship" title="Clear Authorship Colors"></a>
                 </li>
             </ul>    
             <ul id="menu_right">
-                <li onClick="window.pad&amp;&amp;pad.editbarClick('settings');return false;">
-                    <a id="settingslink" title="Settings of this pad">
-                        <div class="buttonicon buttonicon-settings"></div>
-                    </a>
+                <li id="settingslink" onClick="window.pad&amp;&amp;pad.editbarClick('settings');return false;">
+                    <a class="buttonicon buttonicon-settings" id="settingslink" title="Settings of this pad"></a>
                 </li>
-                <li onClick="window.pad&amp;&amp;pad.editbarClick('import_export');return false;">
-                    <a id="exportlink" title="Import/Export from/to different document formats">
-                        <div class="buttonicon buttonicon-import_export"></div>
-                    </a>
+                <li id="importexportlink" onClick="window.pad&amp;&amp;pad.editbarClick('import_export');return false;">
+                    <a class="buttonicon buttonicon-import_export" id="exportlink" title="Import/Export from/to different document formats"></a>
                 </li>
-                <li onClick="window.pad&amp;&amp;pad.editbarClick('embed');return false;" >
-                    <a id="embedlink" title="Share and Embed this pad">
-                        <div class="buttonicon buttonicon-embed"></div>
-                    </a>
+                <li id="embedlink" onClick="window.pad&amp;&amp;pad.editbarClick('embed');return false;" >
+                    <a class="buttonicon buttonicon-embed" id="embedlink" title="Share and Embed this pad"></a>
                 </li>
                 <li class="separator"></li>
                 <li id="timesliderlink" onClick="document.location = document.location.pathname+ '/timeslider'">
-                    <a title="Show the history of this pad">
-                        <div class="buttonicon buttonicon-history"></div>
-                    </a>
+                    <a class="buttonicon buttonicon-history" title="Show the history of this pad"></a>
                 </li>
-                <li id="usericon" onClick="window.pad&amp;&amp;pad.editbarClick('showusers');return false;" >
-                    <a title="Show connected users">
-                        <div class="buttonicon buttonicon-showusers" id="usericonback"></div>
-                        <span id="online_count">1</span>
-                    </a>
+                <li id="usericon" onClick="window.pad&amp;&amp;pad.editbarClick('showusers');return false;" title="Show connected users">
+                    <span class="buttonicon buttonicon-showusers" id="usericonback"></span>
+                    <span id="online_count">1</span>
                 </li>
             </ul>
         </div>
@@ -133,14 +103,14 @@
 
         <div id="settingsmenu" class="popup">
             <h1>Pad settings</h1>
-            <div class="left_popup">
+            <div class="column">
                 <h2>My view</h2>
                 <p>
                     <input type="checkbox" id="options-stickychat" onClick="chat.stickToScreen();">
                     <label for="options-stickychat">Chat always on screen</label>
                 </p>
                 <p>
-                    <input type="checkbox" id="options-colorscheck" checked>
+                    <input type="checkbox" id="options-colorscheck">
                     <label for="options-colorscheck">Authorship colors</label>
                 </p>
                 <p>
@@ -155,7 +125,7 @@
                     </select>
                 </p>
             </div>
-            <div class="right_popup">
+            <div class="column">
                 <h2>Global view</h2>
                 <p>Currently nothing.</p>
                 <p class="note">These options affect everyone viewing this pad.</p>
@@ -163,7 +133,7 @@
         </div>
 
         <div id="importexport" class="popup">
-            <div class="left_popup">
+            <div class="column">
                 <h2>Import from text file, HTML, PDF, Word, ODT or RTF</h2><br>
                 <form id="importform" method="post" action="" target="importiframe" enctype="multipart/form-data">
                     <div class="importformdiv" id="importformfilediv"> 
@@ -182,7 +152,7 @@
                     </div> 
                 </form>
             </div>
-            <div class="right_popup">
+            <div class="column">
                 <h2>Export current pad as</h2>
                 <a id="exporthtmla" target="_blank" class="exportlink"><div class="exporttype" id="exporthtml">HTML</div></a>
                 <a id="exportplaina" target="_blank" class="exportlink"><div class="exporttype" id="exportplain">Plain text</div></a>
@@ -218,11 +188,9 @@
 
         <div id="chatthrob"></div>
 
-        <div id="chaticon">
-            <a onClick="chat.show();return false;" title="Open the chat for this pad">
-                <span id="chatlabel">Chat</span>
-                <div class="buttonicon buttonicon-chat"></div>
-            </a>
+        <div id="chaticon" title="Open the chat for this pad" onclick="chat.show();return false;">
+            <span id="chatlabel">Chat</span>
+            <span class="buttonicon buttonicon-chat"></span>
             <span id="chatcounter">0</span>
         </div>
 
@@ -292,7 +260,7 @@
         <script type="text/javascript" src="../static/js/require-kernel.js"></script>
         <script type="text/javascript" src="../static/js/jquery.js"></script>
         <script type="text/javascript" src="../socket.io/socket.io.js"></script>
-        <script type="text/javascript" src="../minified/pad.js"></script>
+        <script type="text/javascript" src="../minified/pad.js?callback=require.define"></script>
         <script type="text/javascript">
             var clientVars = {};
             (function () {
diff --git a/src/static/timeslider.html b/src/static/timeslider.html
index e807e258..377740f7 100644
--- a/src/static/timeslider.html
+++ b/src/static/timeslider.html
@@ -200,7 +200,7 @@
 <script type="text/javascript" src="../../../static/js/require-kernel.js"></script>
 <script type="text/javascript" src="../../../static/js/jquery.js"></script>
 <script type="text/javascript" src="../../../socket.io/socket.io.js"></script>
-<script type="text/javascript" src="../../../minified/timeslider.js"></script>
+<script type="text/javascript" src="../../../minified/timeslider.js?callback=require.define"></script>
 <script type="text/javascript" src="../../../static/custom/timeslider.js"></script>
 <script type="text/javascript" >
   var clientVars = {};