Index: gc_lang/fr/webext/background.js
==================================================================
--- gc_lang/fr/webext/background.js
+++ gc_lang/fr/webext/background.js
@@ -117,25 +117,22 @@
         dParam: { sDictionary: sDictionary, bActivate: bActivate },
         dInfo: {}
     });
 }
 
-function initSCOptions (dSavedOptions) {
-    if (!dSavedOptions.hasOwnProperty("sc_options")) {
+function initSCOptions (oData) {
+    if (!oData.hasOwnProperty("sc_options")) {
         browser.storage.local.set({"sc_options": {
             extended: true,
             community: true,
             personal: true
         }});
-        setDictionaryOnOff("extended", true);
         setDictionaryOnOff("community", true);
         setDictionaryOnOff("personal", true);
     } else {
-        let dOptions = dSavedOptions.sc_options;
-        setDictionaryOnOff("extended", dOptions["extended"]);
-        setDictionaryOnOff("community", dOptions["community"]);
-        setDictionaryOnOff("personal", dOptions["personal"]);
+        setDictionaryOnOff("community", oData.sc_options["community"]);
+        setDictionaryOnOff("personal", oData.sc_options["personal"]);
     }
 }
 
 function setDictionary (sDictionary, oDictionary) {
     xGCEWorker.postMessage({
@@ -143,37 +140,41 @@
         dParam: { sDictionary: sDictionary, oDict: oDictionary },
         dInfo: {}
     });
 }
 
-function setSpellingDictionary (dSavedDictionary) {
-    if (dSavedDictionary.hasOwnProperty("oExtendedDictionary")) {
-        setDictionary("extended", dSavedDictionary["oExtendedDictionary"]);
-    }
-    if (dSavedDictionary.hasOwnProperty("oCommunityDictionary")) {
-        setDictionary("community", dSavedDictionary["oCommunityDictionary"]);
-    }
-    if (dSavedDictionary.hasOwnProperty("oPersonalDictionary")) {
-        setDictionary("personal", dSavedDictionary["oPersonalDictionary"]);
+function setSpellingDictionaries (oData) {
+    if (oData.hasOwnProperty("oPersonalDictionary")) {
+        // deprecated
+        console.log("personal dictionary migration");
+        browser.storage.local.set({ "dictionaries": { "__personal__": oData["oPersonalDictionary"] } });
+        setDictionary("personal", oData["oPersonalDictionary"]);
+        browser.storage.local.remove("oPersonalDictionary");
+    }
+    if (oData.hasOwnProperty("dictionaries")) {
+        if (oData.dictionaries.hasOwnProperty("__personal__")) {
+            setDictionary("personal", oData.dictionaries["__personal__"]);
+        }
+        if (oData.dictionaries.hasOwnProperty("__community__")) {
+            setDictionary("personal", oData.dictionaries["__community__"]);
+        }
     }
 }
 
 function init () {
     if (bChrome) {
         browser.storage.local.get("gc_options", initGrammarChecker);
         browser.storage.local.get("ui_options", initUIOptions);
-        browser.storage.local.get("oExtendedDictionary", setSpellingDictionary);
-        browser.storage.local.get("oCommunityDictionary", setSpellingDictionary);
-        browser.storage.local.get("oPersonalDictionary", setSpellingDictionary);
+        browser.storage.local.get("dictionaries", setSpellingDictionaries);
+        browser.storage.local.get("oPersonalDictionary", setSpellingDictionaries); // deprecated
         browser.storage.local.get("sc_options", initSCOptions);
         return;
     }
     browser.storage.local.get("gc_options").then(initGrammarChecker, showError);
     browser.storage.local.get("ui_options").then(initUIOptions, showError);
-    browser.storage.local.get("oExtendedDictionary").then(setSpellingDictionary, showError);
-    browser.storage.local.get("oCommunityDictionary").then(setSpellingDictionary, showError);
-    browser.storage.local.get("oPersonalDictionary").then(setSpellingDictionary, showError);
+    browser.storage.local.get("dictionaries").then(setSpellingDictionaries, showError);
+    browser.storage.local.get("oPersonalDictionary").then(setSpellingDictionaries, showError); // deprecated
     browser.storage.local.get("sc_options").then(initSCOptions, showError);
 }
 
 init();
 
@@ -215,10 +216,16 @@
             xGCEWorker.postMessage(oRequest);
             break;
         case "openURL":
             browser.tabs.create({url: dParam.sURL});
             break;
+        case "openConjugueurTab":
+            openConjugueurTab();
+            break;
+        case "openLexiconEditor":
+            openLexiconEditor(dParam["dictionary"]);
+            break;
         default:
             console.log("[background] Unknown command: " + sCommand);
             console.log(oRequest);
     }
     //sendResponse({response: "response from background script"});
@@ -226,10 +233,11 @@
 
 browser.runtime.onMessage.addListener(handleMessage);
 
 
 function handleConnexion (xPort) {
+    // Messages from tabs
     let iPortId = xPort.sender.tab.id; // identifier for the port: each port can be found at dConnx[iPortId]
     dConnx.set(iPortId, xPort);
     xPort.onMessage.addListener(function (oRequest) {
         let {sCommand, dParam, dInfo} = oRequest;
         switch (sCommand) {
@@ -348,15 +356,27 @@
             break;
         case "conjugueur_window":
             openConjugueurWindow();
             break;
         case "lex_editor":
-            openLexEditor();
+            openLexiconEditor();
             break;
     }
 });
 
+
+/*
+    Lexicon editor tab
+*/
+let nTabLexiconEditor = null;
+
+browser.tabs.onRemoved.addListener(function (nTabId, xRemoveInfo) {
+    if (nTabId === nTabLexiconEditor) {
+        nTabLexiconEditor = null;
+    }
+});
+
 
 /*
     Actions
 */
 
@@ -370,21 +390,28 @@
 function sendCommandToTab (sCommand, iTab) {
     let xTabPort = dConnx.get(iTab);
     xTabPort.postMessage({sActionDone: sCommand, result: null, dInfo: null, bEnd: false, bError: false});
 }
 
-function openLexEditor () {
-    if (bChrome) {
-        browser.tabs.create({
+function openLexiconEditor (sName="__personal__") {
+    if (nTabLexiconEditor === null) {
+        if (bChrome) {
+            browser.tabs.create({
+                url: browser.extension.getURL("panel/lex_editor.html")
+            }, onLexiconEditorOpened);
+            return;
+        }
+        let xLexEditor = browser.tabs.create({
             url: browser.extension.getURL("panel/lex_editor.html")
         });
-        return;
+        xLexEditor.then(onLexiconEditorOpened, onError);
     }
-    let xLexEditor = browser.tabs.create({
-        url: browser.extension.getURL("panel/lex_editor.html")
-    });
-    xLexEditor.then(onCreated, onError);
+}
+
+function onLexiconEditorOpened (xTab) {
+    //console.log(xTab);
+    nTabLexiconEditor = xTab.id;
 }
 
 function openConjugueurTab () {
     if (bChrome) {
         browser.tabs.create({
@@ -421,7 +448,7 @@
 function onCreated (xWindowInfo) {
     //console.log(`Created window: ${xWindowInfo.id}`);
 }
 
 function onError (error) {
-    console.log(`Error: ${error}`);
+    console.log(error);
 }

Index: gc_lang/fr/webext/gce_worker.js
==================================================================
--- gc_lang/fr/webext/gce_worker.js
+++ gc_lang/fr/webext/gce_worker.js
@@ -318,13 +318,10 @@
     //console.log("setDictionary", sDictionary);
     switch (sDictionary) {
         case "main":
             oSpellChecker.setMainDictionary(oDict);
             break;
-        case "extended":
-            oSpellChecker.setExtendedDictionary(oDict);
-            break;
         case "community":
             oSpellChecker.setCommunityDictionary(oDict);
             break;
         case "personal":
             oSpellChecker.setPersonalDictionary(oDict);
@@ -340,17 +337,10 @@
         postMessage(createResponse("setDictionary", "# Error. SpellChecker not loaded.", dInfo, true));
         return;
     }
     //console.log("setDictionaryOnOff", sDictionary, bActivate);
     switch (sDictionary) {
-        case "extended":
-            if (bActivate) {
-                oSpellChecker.activateExtendedDictionary();
-            } else {
-                oSpellChecker.deactivateExtendedDictionary();
-            }
-            break;
         case "community":
             if (bActivate) {
                 oSpellChecker.activateCommunityDictionary();
             } else {
                 oSpellChecker.deactivateCommunityDictionary();

Index: gc_lang/fr/webext/panel/lex_editor.css
==================================================================
--- gc_lang/fr/webext/panel/lex_editor.css
+++ gc_lang/fr/webext/panel/lex_editor.css
@@ -48,10 +48,15 @@
 h3 {
     margin: 3px 0 2px 0;
     color: hsl(210, 50%, 50%);
     font: bold 16px "Trebuchet MS", "Fira Sans", "Liberation Sans", sans-serif;
 }
+
+#dic_selector {
+    color: hsl(210, 50%, 50%);
+    font: bold 16px "Trebuchet MS", "Fira Sans", "Liberation Sans", sans-serif;
+}
 
 details {
     font-size: 11px;
     font-variant: small-caps;
     color: hsl(210, 50%, 50%);
@@ -65,10 +70,11 @@
 }
 details.inline {
     padding: 3px;
     width: 260px;
 }
+
 
 
 /*
     Main buttons
 */
@@ -247,11 +253,11 @@
     box-shadow: 0 0 2px hsl(150, 60%, 50%);
 }
 
 
 #lexicon_page {
-    
+
 }
 
 
 /*
     Search page

Index: gc_lang/fr/webext/panel/lex_editor.html
==================================================================
--- gc_lang/fr/webext/panel/lex_editor.html
+++ gc_lang/fr/webext/panel/lex_editor.html
@@ -3,28 +3,35 @@
   <head>
     <link rel="stylesheet" type="text/css" href="lex_editor.css" />
     <title>Grammalecte · Éditeur lexical</title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
   </head>
-  
+
   <body>
 
     <div class="inbox">
 
       <h1>Éditeur lexical</h1>
 
       <div class="big_block">
         <div class="dic_container">
-          <div><h3>Dictionnaire personnel</h3></div>
-          <div>Enregistré le : <span id="dic_save_date">—</span></div>
+          <div><h3>Dictionnaire</h3></div>
+          <div>
+            <select id="dic_selector">
+              <option value="__personal__">personnel</option>
+              <option value="__community__">communautaire</option>
+            </select>
+          </div>
+          <div>[<span id="dic_save_date">—</span>]</div>
           <div><span id="dic_num_entries">0</span> entrées</div>
-          <!--<div id="import_button" class="fright">Importer</div>-->
-          <div class="fright">
+          <div>
             <input type="file" id="import_input" accept=".json" style="display: none;">
             <label id="import_button" for="import_input">Importer</label>
           </div>
-          <div id="export_button" class="fright">Exporter</div>
+          <div id="export_button">Exporter</div>
+        </div>
+        <div class="dic_container">
 
         </div>
         <progress id="wait_progress" value="0"></progress>
       </div>
 
@@ -154,11 +161,11 @@
                           <div class="examples_true">Je suis venu.<br/>Je suis parti.</div>
                           <div class="examples_false">J’ai venu.<br/>J’ai parti.</div>
                         </div>
                       </details>
                     </div>
-                      
+
                     <div class="space_container">
                       <div>
                         <input type="checkbox" id="up_v_aa" value="a" /><label for="up_v_aa"> avoir</label>
                       </div>
                       <details class="inline">
@@ -229,15 +236,15 @@
                   <p><input type="text" id="tags" name="tags" class="large" maxlength="20" value="" pattern="^:[a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ:._-]+$" placeholder="étiquettes" /></p>
                 </div>
               </div>
             </div>
           </div> <!-- #new_word_generator -->
-          
+
           <div id="generated_words">
             <h2>Mots générés</h2>
             <table id="generated_words_table">
-              
+
             </table>
             <div id="buttonline">
               <div id="add_to_lexicon">Ajouter au lexique</div>
             </div>
           </div> <!-- #generated_words -->
@@ -253,11 +260,11 @@
           </div>
           <p>Nombre d’entrées : <span id="num_entries">0</span>.</p>
         </div>
 
         <table id="lexicon_table">
-              
+
         </table>
       </div> <!-- #lexicon_page -->
 
 
       <div id="search_page">
@@ -281,11 +288,11 @@
           </div>
 
           <div>
             <h2>Résultats</h2>
             <table id="search_table">
-                  
+
             </table>
           </div>
         </div>
       </div> <!-- #search_page -->
 
@@ -311,11 +318,11 @@
             <p>Il est déconseillé d’utiliser la catégorie ‹Autre› pour générer autre chose que des noms, des adjectifs, des noms propres, des verbes et des adverbes. Il n’y a aucune garantie que les étiquettes pour les autres catégories, notamment les mots grammaticaux, ne changeront pas.</p>
           </div>
 
           <div>
             <table id="tags_table">
-              
+
             </table>
           </div>
         </div>
       </div> <!-- #info_page -->
 
@@ -331,7 +338,7 @@
     <script src="../grammalecte/fr/conj.js"></script>
     <script src="../grammalecte/fr/conj_generator.js"></script>
     <script src="../grammalecte/fr/lexicographe.js"></script>
     <script src="lex_editor.js"></script>
   </body>
-  
+
 </html>

Index: gc_lang/fr/webext/panel/lex_editor.js
==================================================================
--- gc_lang/fr/webext/panel/lex_editor.js
+++ gc_lang/fr/webext/panel/lex_editor.js
@@ -125,12 +125,15 @@
 
     clear () {
         while (this.xTable.firstChild) {
             this.xTable.removeChild(this.xTable.firstChild);
         }
+        this.lEntry = [];
+        this.nEntry = 0;
         this.iEntryIndex = 0;
         this._createHeader();
+        this.showEntryNumber();
     }
 
     fill (lFlex) {
         this.clear();
         if (lFlex.length > 0) {
@@ -490,39 +493,75 @@
             showError(e);
         }
     }
 }
 
-
-const oBinaryDict = {
-    
-    oIBDAWG: null,
-
-    load: function () {
-        if (bChrome) {
-            browser.storage.local.get("oPersonalDictionary", this._load.bind(this));
-            return;
-        }
-        let xPromise = browser.storage.local.get("oPersonalDictionary");
-        xPromise.then(this._load.bind(this), showError);
-    },
-
-    _load: function (oResult) {
-        if (!oResult.hasOwnProperty("oPersonalDictionary")) {
-            hideElement("export_button");
-            return;
-        }
-        let oJSON = oResult.oPersonalDictionary;
-        if (oJSON) {
-            this.__load(oJSON);
+const oDictHandler = {
+    oDictionaries: null,
+
+    loadDictionaries: function () {
+        if (bChrome) {
+            browser.storage.local.get("dictionaries", this._loadDictionaries.bind(this));
+            return;
+        }
+        let xPromise = browser.storage.local.get("dictionaries");
+        xPromise.then(this._loadDictionaries.bind(this), showError);
+    },
+
+    _loadDictionaries: function (oResult) {
+        if (!oResult.hasOwnProperty("dictionaries")) {
+            return;
+        }
+        this.oDictionaries = oResult.dictionaries;
+        oBinaryDict.load("__personal__");
+    },
+
+    getDictionary: function (sName) {
+        if (this.oDictionaries  &&  this.oDictionaries.hasOwnProperty(sName)) {
+            //console.log(this.oDictionaries[sName]);
+            return this.oDictionaries[sName];
+        }
+        return null;
+    },
+
+    saveDictionary: function (sName, oJSON) {
+        this.oDictionaries[sName] = oJSON;
+        if (sName == "__personal__") {
+            browser.runtime.sendMessage({ sCommand: "setDictionary", dParam: {sDictionary: "personal", oDict: oJSON}, dInfo: {} });
+        }
+        else if (sName == "__community__") {
+            browser.runtime.sendMessage({ sCommand: "setDictionary", dParam: {sDictionary: "community", oDict: oJSON}, dInfo: {} });
+        }
+        else {
+            // TODO: merge sub-dictionaries
+        }
+        this.storeDictionaries();
+    },
+
+    storeDictionaries: function () {
+        browser.storage.local.set({ "dictionaries": this.oDictionaries });
+    }
+}
+
+const oBinaryDict = {
+
+    oIBDAWG: null,
+    sName: null,
+
+    load: function (sName) {
+        console.log("lexicon editor, load: " + sName);
+        this.sName = sName;
+        let oJSON = oDictHandler.getDictionary(sName);
+        if (oJSON) {
+            this.parseDict(oJSON);
         } else {
             oLexiconTable.clear();
             this.setDictData(0, "[néant]");
         }
     },
 
-    __load: function (oJSON) {
+    parseDict: function (oJSON) {
         try {
             this.oIBDAWG = new IBDAWG(oJSON);
         }
         catch (e) {
             console.error(e);
@@ -530,39 +569,34 @@
             return;
         }
         let lEntry = [];
         for (let aRes of this.oIBDAWG.select()) {
             lEntry.push(aRes);
-        }        
+        }
         oLexiconTable.fill(lEntry);
         this.setDictData(this.oIBDAWG.nEntry, this.oIBDAWG.sDate);
     },
 
-    save: function (oJSON) {
-        browser.storage.local.set({ "oPersonalDictionary": oJSON });
-        browser.runtime.sendMessage({ sCommand: "setDictionary", dParam: {sDictionary: "personal", oDict: oJSON}, dInfo: {} });
-    },
-
     import: function () {
-        let xInput = document.getElementById("import_input"); 
+        let xInput = document.getElementById("import_input");
         let xFile = xInput.files[0];
         let xURL = URL.createObjectURL(xFile);
         let sJSON = helpers.loadFile(xURL);
         if (sJSON) {
             try {
                 let oJSON = JSON.parse(sJSON);
-                this.__load(oJSON);
-                this.save(oJSON);
+                this.parseDict(oJSON);
+                oDictHandler.saveDictionary(this.sName, oJSON);
             }
             catch (e) {
                 console.error(e);
                 this.setDictData(0, "#Erreur. Voir la console.");
                 return;
             }
         } else {
             this.setDictData(0, "[néant]");
-            this.save(null);
+            oDictHandler.saveDictionary(this.sName, null);
         }
     },
 
     setDictData: function (nEntries, sDate) {
         document.getElementById("dic_num_entries").textContent = nEntries;
@@ -573,35 +607,36 @@
             showElement("export_button");
         }
     },
 
     listen: function () {
+        document.getElementById("dic_selector").addEventListener("change", () => {this.load(document.getElementById("dic_selector").value)}, false);
         document.getElementById("save_button").addEventListener("click", () => { this.build(); }, false);
         document.getElementById("export_button").addEventListener("click", () => { this.export(); }, false);
         document.getElementById("import_input").addEventListener("change", () => { this.import(); }, false);
     },
 
     build: function () {
         let xProgressNode = document.getElementById("wait_progress");
         let lEntry = oLexiconTable.getEntries();
         if (lEntry.length > 0) {
-            let oDAWG = new DAWG(lEntry, "S", "fr", "Français", "Dictionnaire personnel", xProgressNode);
+            let oDAWG = new DAWG(lEntry, "S", "fr", "Français", this.sName, xProgressNode);
             let oJSON = oDAWG.createBinaryJSON(1);
-            this.save(oJSON);
+            oDictHandler.saveDictionary(this.sName, oJSON);
             this.oIBDAWG = new IBDAWG(oJSON);
             this.setDictData(this.oIBDAWG.nEntry, this.oIBDAWG.sDate);
         } else {
+            oDictHandler.saveDictionary(this.sName, null);
             this.setDictData(0, "[néant]");
-            this.save(null);
         }
         hideElement("save_button");
     },
 
     export: function () {
-        let xBlob = new Blob([ JSON.stringify(this.oIBDAWG.getJSON()) ], {type: 'application/json'}); 
+        let xBlob = new Blob([ JSON.stringify(this.oIBDAWG.getJSON()) ], {type: 'application/json'});
         let sURL = URL.createObjectURL(xBlob);
-        browser.downloads.download({ filename: "fr.personal.json", url: sURL, saveAs: true });
+        browser.downloads.download({ filename: "fr."+this.sName+".json", url: sURL, saveAs: true });
     }
 }
 
 
 const oSearch = {
@@ -664,10 +699,10 @@
 const oTagsTable = new Table("tags_table", ["Étiquette", "Signification"], "wait_progress", "", false);
 
 
 oTagsInfo.load();
 oSearch.load();
-oBinaryDict.load();
+oDictHandler.loadDictionaries();
 oBinaryDict.listen();
 oGenerator.listen();
 oTabulations.listen();
 oSearch.listen();

Index: gc_lang/fr/webext/panel/main.css
==================================================================
--- gc_lang/fr/webext/panel/main.css
+++ gc_lang/fr/webext/panel/main.css
@@ -84,11 +84,11 @@
 }
 body {
     width: 450px;
     height: 500px;
 }
-/* 
+/*
     Maximal height of a panel in WebExtention seems to be 500px.
     When going over this limit, a scrollbar appears which destructs the
     horizontal balance of elements.
     --> vertical scrolling is done with overflow in #page.
         #page must have the same height than body.
@@ -245,10 +245,29 @@
     font-size: 16px;
     text-align: center;
     cursor: pointer;
 }
 
+
+.option_section {
+    padding: 10px;
+    margin-top: 10px;
+    border-radius: 5px;
+    background-color: hsl(210, 20%, 96%);
+}
+.option_section label {
+    font-size: 16px;
+    line-height: 20px;
+    color: hsl(210, 20%, 50%);
+    font-weight: bold;
+}
+.option_description {
+    padding: 0 0 0 20px;
+    color: hsl(0, 0%, 0%);
+    font-size: 12px;
+}
+
 
 /*
     Spell checking options
 */
 #sc_options_page {
@@ -265,30 +284,19 @@
 #sc_options_page h2 {
     margin-top: 20px;
     font: normal 22px 'Yanone Kaffeesatz', "Oswald", "Liberation Sans Narrow", sans-serif;
     color: hsl(210, 50%, 50%);
 }
-
-/*
-    Options
-*/
-.option_section {
-    padding: 10px;
-    margin-top: 10px;
-    border-radius: 5px;
-    background-color: hsl(210, 20%, 96%);
-}
-.option_section label {
-    font-size: 16px;
-    line-height: 20px;
-    color: hsl(210, 20%, 50%);
-    font-weight: bold;
-}
-.option_description {
-    padding: 0 0 0 20px;
-    color: hsl(0, 0%, 0%);
-    font-size: 12px;
+.dic_button {
+    float: right;
+    padding: 2px 10px;
+    background-color: hsl(210, 50%, 50%);
+    color: hsl(210, 10%, 96%);
+    cursor: pointer;
+    font-size: 14px;
+    font-variant-caps: small-caps;
+    border-radius: 3px;
 }
 
 
 /*
   Test page
@@ -372,11 +380,11 @@
 .double-bounce2 {
     animation-delay: -1.0s;
 }
 
 @keyframes sk-bounce {
-    0%, 100% { 
+    0%, 100% {
         transform: scale(0.0);
-    } 50% { 
+    } 50% {
         transform: scale(1.0);
     }
 }

Index: gc_lang/fr/webext/panel/main.html
==================================================================
--- gc_lang/fr/webext/panel/main.html
+++ gc_lang/fr/webext/panel/main.html
@@ -106,26 +106,23 @@
 
         <section id="sc_options_page" class="page">
           <h1>OPTIONS ORTHOGRAPHIQUES</h1>
           <div id="hunspell_options">
             <h2>DICTIONNAIRES DE GRAMMALECTE</h2>
-            <p class="dictionaries_info">Ces dictionnaires ne sont utilisés que lors de l’analyse grammaticale.</p>
             <div class="option_section" id="main_dic_box">
-                <p><input type="checkbox" id="main_dic" data-dictionary="personal" checked disabled="disabled" /> <label for="main_dic">Dictionnaire principal</label></p>
-                <p class="option_description">Environ 83 000 entrées, 500 000 flexions.<br/>Ni éditable, ni désactivable.</p>
-            </div>
-            <div class="option_section" id="extended_dic_box" style="opacity: .33;">
-                <p><input type="checkbox" id="extended_dic" data-dictionary="personal" disabled="disabled" /> <label for="extended_dic">Dictionnaire étendu</label></p>
-                <p class="option_description">Fonctionnalité à venir.</p>
-            </div>
-            <div class="option_section" id="community_dic_box" style="opacity: .33;">
-                <p><input type="checkbox" id="community_dic" data-dictionary="personal" disabled="disabled" /> <label for="community_dic">Dictionnaire communautaire</label></p>
-                <p class="option_description">Fonctionnalité à venir.</p>
+                <p><input type="checkbox" id="main_dic" data-dictionary="main" checked disabled="disabled" /> <label for="main_dic">Dictionnaire principal</label></p>
+                <p class="option_description">Environ 83 000 entrées, 500 000 flexions.<br/>Ni éditable, ni désactivable.<br/>Ce dictionnaire est créé à partir du dictionnaire orthographique pour Firefox et LibreOffice, conçu sur le <a id="link_grammalecte" class="link" data-url="http://grammalecte.net/home.php?prj=fr">site de Grammalecte</a>.</p>
+            </div>
+            <div class="option_section" id="community_dic_box">
+                <p><input type="checkbox" id="community_dic" data-dictionary="community" /> <label for="community_dic">Dictionnaire communautaire</label></p>
+                <div class="dic_button" id="dic_community_button">Éditer</div>
+                <p class="option_description">Ce dictionnaire est créé et édité via l’éditeur lexical et est sauvegardé sur un serveur en ligne accessible à tous les membres.</p>
             </div>
             <div class="option_section" id="personal_dic_box">
                 <p><input type="checkbox" id="personal_dic" data-dictionary="personal" /> <label for="personal_dic">Dictionnaire personnel</label></p>
-                <p class="option_description">Ce dictionnaire est créé et édité via l’éditeur lexical.</p>
+                <div class="dic_button" id="dic_personal_button">Éditer</div>
+                <p class="option_description">Ce dictionnaire est créé et édité via l’éditeur lexical et n’est pas partagé.</p>
             </div>
           </div>
 
           <div id="hunspell_options" style="display: none; opacity: .25">
             <h2>DICTIONNAIRES HUNSPELL</h2>

Index: gc_lang/fr/webext/panel/main.js
==================================================================
--- gc_lang/fr/webext/panel/main.js
+++ gc_lang/fr/webext/panel/main.js
@@ -70,11 +70,29 @@
             }
             else if (xElem.id.startsWith("link_")) {
                 browser.tabs.create({url: xElem.dataset.url});
             }
             else if (xElem.id == "conj_button") {
-                openConjugueurTab();
+                browser.runtime.sendMessage({
+                    sCommand: "openConjugueurTab",
+                    dParam: {},
+                    dInfo: {}
+                });
+            }
+            else if (xElem.id == "dic_community_button") {
+                browser.runtime.sendMessage({
+                    sCommand: "openLexiconEditor",
+                    dParam: { "dictionary": "__community__"},
+                    dInfo: {}
+                });
+            }
+            else if (xElem.id == "dic_personal_button") {
+                browser.runtime.sendMessage({
+                    sCommand: "openLexiconEditor",
+                    dParam: { "dictionary": "__personal__"},
+                    dInfo: {}
+                });
             }
         } else if (xElem.className.startsWith("select")) {
             showPage(xElem.dataset.page);
         }/* else if (xElem.tagName === "A") {
             openURL(xElem.getAttribute("href"));
@@ -82,11 +100,11 @@
     },
     false
 );
 
 
-/* 
+/*
     Message sender
     and response handling
 */
 function handleResponse (oResponse) {
     console.log(`[Panel] received:`);
@@ -98,11 +116,11 @@
     console.log(error);
 }
 
 function sendMessageAndWaitResponse (oData) {
     let xPromise = browser.runtime.sendMessage(oData);
-    xPromise.then(handleResponse, handleError);  
+    xPromise.then(handleResponse, handleError);
 }
 
 
 /*
     Messages received
@@ -156,36 +174,10 @@
 
 function showTestResult (sText) {
     document.getElementById("tests_result").textContent = sText;
 }
 
-function openConjugueurTab () {
-    if (bChrome) {
-        browser.tabs.create({
-            url: browser.extension.getURL("panel/conjugueur.html")
-        });
-        return;
-    }
-    let xConjTab = browser.tabs.create({
-        url: browser.extension.getURL("panel/conjugueur.html")
-    });
-    xConjTab.then(onCreated, onError);
-}
-
-function openConjugueurTab () {
-    if (bChrome) {
-        browser.tabs.create({
-            url: browser.extension.getURL("panel/conjugueur.html")
-        });
-        return;
-    }
-    let xConjTab = browser.tabs.create({
-        url: browser.extension.getURL("panel/conjugueur.html")
-    });
-    xConjTab.then(onCreated, onError);
-}
-
 
 /*
     UI options
 */
 function displayUIOptionsLoadedFromStorage () {
@@ -235,18 +227,18 @@
         console.log("no sc options found");
         return;
     }
     dOptions = dOptions.sc_options;
     //document.getElementById("extended_dic").checked = dOptions.extended_dic;
-    //document.getElementById("community_dic").checked = dOptions.community_dic;
+    document.getElementById("community_dic").checked = dOptions.community_dic;
     document.getElementById("personal_dic").checked = dOptions.personal;
 }
 
 function storeSCOptions () {
     browser.storage.local.set({"sc_options": {
         extended: false,
-        community: false,
+        community: document.getElementById("community_dic").checked,
         personal: document.getElementById("personal_dic").checked
     }});
 }