diff --git a/public/config.js.sample b/public/config.js.sample
index 23912ea..9fb2e12 100644
--- a/public/config.js.sample
+++ b/public/config.js.sample
@@ -3,49 +3,58 @@
 
 window.TrivabbleConf = {
     // The amount of time to wait after a connection failure
-    POLLING_DELAY:        2000,
+    //POLLING_DELAY:        2000,
 
     // Whether WebSockets should be used, if possible
-    ENABLE_WEBSOCKETS:    true,
+    //ENABLE_WEBSOCKETS:    true,
 
     // Whether Server Sent Events should be used, if available
-    ENABLE_EVENT_SOURCE:  true,
+    //ENABLE_EVENT_SOURCE:  true,
 
     // Max consecutive tries before blacklisting WebSockets for the current session
-    MAX_WEBSOCKET_ERRORS: 1,
+    //MAX_WEBSOCKET_ERRORS: 1,
 
     // To tweak only if your webserver is shared with other conflicting resources at / (e.g. Yunohost integration)
-    APP_PATH: "",
+    //APP_PATH: "",
 
     // The API entry point. Default value: APP_PATH + '/:trivabble'
-    API_ENTRY_POINT: "/:trivabble",
+    //API_ENTRY_POINT: "/:trivabble",
 
-    // The color of the flash light when double clicking on a cell
-    FLASH_LIGHT_COLOR: "#EE6633",
+    // Wether sounds should be played when receiving messages
+    //ENABLE_MSG_SOUND: true,
 
-    // The list of durations of the flash light available in the settings box
-    FLASH_LIGHT_DURATIONS: [800, 1600, 3200],
+    // Wether sounds should be played when moving tiles
+    //ENABLE_TILE_SOUND: true,
 
-    // The defaut flash light duration. If not set, the value at the middle of the previous array is used.
-    FLASH_LIGHT_DURATION: 1600,
+    // Spell checker activation
+    //ENABLE_SPELL_CHECKER: false,
 
     // The list of durations used to detect a double tap available in the settings box
-    DOUBLE_TAP_DURATIONS: [650, 1100, 1800, 3000, 5000],
+    //DOUBLE_TAP_DURATIONS: [650, 1100, 1800, 3000, 5000],
 
     // The defaut double tap duration. If not set, the value at the middle of the previous array is used.
-    DOUBLE_TAP_DURATION: 1800,
+    //DOUBLE_TAP_DURATION: 1800,
+
+    // The color of the flash light when double clicking on a cell
+    //FLASH_LIGHT_COLOR: "#EE6633",
+
+    // The list of durations of the flash light available in the settings box
+    //FLASH_LIGHT_DURATIONS: [800, 1600, 3200],
+
+    // The defaut flash light duration. If not set, the value at the middle of the previous array is used.
+    //FLASH_LIGHT_DURATION: 1600,
 
     // The default premium for playing seven tiles on a turn
-    PREMIUM_SEVEN_TILES: 50,
+    //PREMIUM_SEVEN_TILES: 50,
 
     // Score is automically affected to last player. If false, score is automatically affected to the player who pressed the Score button
-    SCORE_LAST_PLAYER: true,
+    //SCORE_LAST_PLAYER: true,
 
     // Timer activation
-    ENABLE_TIMER: false,
+    //ENABLE_TIMER: false,
 
     // Cell captions. Could be "clip", "dots", "none" or "short"
-    CELL_CAPTIONS: "dots",
+    //CELL_CAPTIONS: "dots",
 
     // I don't like trailing commas, here is a nice message for you reading this file :-)
     HAVE_FUN: true
diff --git a/public/trivabble.js b/public/trivabble.js
index 69bf197..a3d38c9 100644
--- a/public/trivabble.js
+++ b/public/trivabble.js
@@ -52,14 +52,15 @@
     setConf("ENABLE_EVENT_SOURCE",   true);
     setConf("MAX_WEBSOCKET_ERRORS",  1);
     setConf("APP_PATH",              "");
+    setConf("API_ENTRY_POINT",       Conf.APP_PATH + "/:trivabble");
     setConf("ENABLE_MSG_SOUND",      true);
     setConf("ENABLE_TILE_SOUND",     true);
+    setConf("ENABLE_SPELL_CHECKER",  false);
     setConf("DOUBLE_TAP_DURATIONS",  [650, 1100, 1800, 3000, 5000]);
     setConf("DOUBLE_TAP_DURATION",   middle("DOUBLE_TAP_DURATIONS"));
+    setConf("FLASH_LIGHT_COLOR",     "#ee6633");
     setConf("FLASH_LIGHT_DURATIONS", [800, 1600, 3200]);
     setConf("FLASH_LIGHT_DURATION",  middle("FLASH_LIGHT_DURATIONS"));
-    setConf("FLASH_LIGHT_COLOR",     "#ee6633");
-    setConf("API_ENTRY_POINT",       Conf.APP_PATH + "/:trivabble");
     setConf("PREMIUM_SEVEN_TILES",   50);
     setConf("SCORE_LAST_PLAYER",     true);
     setConf("ENABLE_TIMER",          false);