Index: lams_build/conf/etherpad/etherpad-lite/settings.json
===================================================================
diff -u -re43f0bd30b5df2f0c65f7cb75474c76ef253b39a -r68fc7659b76cba8c48bbfaa1a777fba0cd3cf3d5
--- lams_build/conf/etherpad/etherpad-lite/settings.json	(.../settings.json)	(revision e43f0bd30b5df2f0c65f7cb75474c76ef253b39a)
+++ lams_build/conf/etherpad/etherpad-lite/settings.json	(.../settings.json)	(revision 68fc7659b76cba8c48bbfaa1a777fba0cd3cf3d5)
@@ -56,6 +56,9 @@
  *    "password": "${PASSW}"  // if PASSW is not defined would result in password === null
  *    "password": "${PASSW:}" // if PASSW is not defined would result in password === ''
  *
+ *    If you want to use an empty value (null) as default value for a variable,
+ *    simply do not set it, without putting any colons: "${ABIWORD}".
+ *
  * 3) if you want to use newlines in the default value of a string parameter,
  *    use "\n" as usual.
  *
@@ -87,6 +90,32 @@
   "skinName": "no-skin",
 
   /*
+   * Skin Variants
+   *
+   * Use the UI skin variants builder at /p/test#skinvariantsbuilder
+   *
+   * For the colibris skin only, you can choose how to render the three main
+   * containers:
+   * - toolbar (top menu with icons)
+   * - editor (containing the text of the pad)
+   * - background (area outside of editor, mostly visible when using page style)
+   *
+   * For each of the 3 containers you can choose 4 color combinations:
+   * super-light, light, dark, super-dark.
+   *
+   * For example, to make the toolbar dark, you will include "dark-toolbar" into
+   * skinVariants.
+   *
+   * You can provide multiple skin variants separated by spaces. Default
+   * skinVariant is "super-light-toolbar super-light-editor light-background".
+   *
+   * For the editor container, you can also make it full width by adding
+   * "full-width-editor" variant (by default editor is rendered as a page, with
+   * a max-width of 900px).
+   */
+  "skinVariants": "super-light-toolbar super-light-editor light-background",
+
+  /*
    * IP and port which Etherpad should bind at.
    *
    * Binding to a Unix socket is also supported: just use an empty string for
@@ -168,14 +197,15 @@
    */
   "defaultPadText" : "",
 
+
   /*
    * Default Pad behavior.
    *
    * Change them if you want to override.
    */
   "padOptions": {
     "noColors":         false,
-    "showControls":     true,
+    "showControls":     false,
     "showChat":         false,
     "showLineNumbers":  false,
     "useMonospaceFont": false,
@@ -465,7 +495,6 @@
       ["timeslider_export", "timeslider_returnToPad"]
     ]
   },
-  
 
   /*
    * Expose Etherpad version in the web interface and in the Server http header.