Index: gc_core/py/oxt/helpers.py
==================================================================
--- gc_core/py/oxt/helpers.py
+++ gc_core/py/oxt/helpers.py
@@ -19,12 +19,11 @@
         from apso_utils import console
         console()
     except:
         try:
             xContext = uno.getComponentContext()
-            xSvMgr = xContext.getServiceManager()
-            xPathSettings = xSvMgr.createInstanceWithContext("com.sun.star.util.PathSettings", xContext)
+            xPathSettings = xContext.ServiceManager.createInstanceWithContext("com.sun.star.util.PathSettings", xContext)
             spPyInstallion = uno.fileUrlToSystemPath(xPathSettings.Module)
             subprocess.Popen(spPyInstallion + os.sep + "python")  # Start Python interactive Shell
         except:
             traceback.print_exc()
 

Index: gc_lang/fr/mailext/content/overlay.css
==================================================================
--- gc_lang/fr/mailext/content/overlay.css
+++ gc_lang/fr/mailext/content/overlay.css
@@ -37,11 +37,11 @@
     color: hsl(210, 50%, 40%);
     font-size: 14px;
     font-weight: bold;
 }
 #textformatter-progressbar {
-    padding: 5px;
+    width: 470px;
 }
 #textformatter-timer {
     padding: 5px;
 }
 

Index: gc_lang/fr/mailext/content/overlay.js
==================================================================
--- gc_lang/fr/mailext/content/overlay.js
+++ gc_lang/fr/mailext/content/overlay.js
@@ -42,10 +42,18 @@
             let xPromise = this.xGCEWorker.post('loadGrammarChecker', [prefs.getCharPref("sGCOptions"), "Thunderbird"]);
             xPromise.then(
                 function (aVal) {
                     console.log(aVal);
                     prefs.setCharPref("sGCOptions", aVal);
+                    // spelling dictionary
+                    if (prefs.getCharPref("sMainDicName")) {
+                        let sMainDicName = prefs.getCharPref("sMainDicName");
+                        if (sMainDicName == "fr-classic.json" || sMainDicName == "fr-reform.json") {
+                            that.xGCEWorker.post("setDictionary", ["main", sMainDicName]);
+                        }
+                    }
+                    // personal dictionary
                     if (prefs.getBoolPref("bPersonalDictionary")) {
                         let sDicJSON = oFileHandler.loadFile("fr.personal.json");
                         if (sDicJSON) {
                             that.xGCEWorker.post('setDictionary', ["personal", sDicJSON]);
                         }
@@ -824,11 +832,10 @@
                 }
                 document.getElementById("o_group_misc").checked = false;
                 this.switchGroup("o_group_misc");
             }
             document.getElementById('textformatter-progressbar').value = document.getElementById('textformatter-progressbar').max;
-            document.getElementById('textformatter-progressbar').value = "Formatage terminé.";
             // end of processing
 
             //window.setCursor("auto"); // restore pointer
             const t1 = Date.now();
             document.getElementById('textformatter-timer').textContent = this.getTimeRes((t1-t0)/1000);

Index: gc_lang/fr/mailext/content/overlay.xul
==================================================================
--- gc_lang/fr/mailext/content/overlay.xul
+++ gc_lang/fr/mailext/content/overlay.xul
@@ -3,10 +3,11 @@
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/messenger.css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://grammarchecker/locale/overlay.dtd">
 
 <overlay id="grammarchecker-overlay"
+         xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
   <script type="application/javascript" src="resource://grammalecte/text.js"/>
@@ -343,12 +344,11 @@
         </vbox>
       </hbox>
 
       <hbox id="textformatter-commands">
         <button id="reset" label="&tf.button.default;" oncommand="oTextFormatter.onReset(event);" />
-        <!-- <html:progress id="textformatter-progressbar" max="470">-->
-        <label id="textformatter-progressbar" width="470">...</label>
+        <html:progress id="textformatter-progressbar" max="6"></html:progress>
         <label id="textformatter-timer" width="50"></label>
         <button id="apply" label="&tf.button.apply;" oncommand="oTextFormatter.onApply(event);" />
         <button id="close" label="&tf.button.close;" oncommand="oTextFormatter.onClosePanel(event);" />
       </hbox>
 

Index: gc_lang/fr/mailext/content/spell_options.css
==================================================================
--- gc_lang/fr/mailext/content/spell_options.css
+++ gc_lang/fr/mailext/content/spell_options.css
@@ -1,36 +1,46 @@
 /* CSS */
 
 #grouptitle {
-	font-size: 16px;
-	font-weight: bold;
-	color: hsl(0, 50%, 50%);
+    font-size: 16px;
+    font-weight: bold;
+    color: hsl(0, 50%, 50%);
 }
 
 .option {
-	font-size: 16px;
-	font-weight: bold;
-	color: hsl(210, 50%, 50%);
+    font-size: 16px;
+    font-weight: bold;
+    color: hsl(210, 50%, 50%);
+}
+
+.suboption {
+    margin-left: 30px;
+    font-size: 16px;
+    font-weight: bold;
+    color: hsl(210, 50%, 50%);
+}
+.suboption2 {
+    margin-left: 30px;
 }
 
 description {
-	width: 340px;
+    width: 340px;
 }
 
 .dicdescr {
-	margin-left: 27px;
+      margin-left: 27px;
 }
 
 .disabled {
-  opacity: .25;
+    opacity: .25;
 }
 
 
 .dialogheader-title {
-  margin: 5px;
-  padding: 5px 8px;
-  border: 1px solid hsl(210, 50%, 80%);
-  background-color: hsl(210, 50%, 50%);
-  color: hsl(210, 10%, 90%);
-  font-size: larger;
-  font-weight: bold;
+    margin: 5px;
+    padding: 5px 8px;
+    border: 1px solid hsl(210, 50%, 80%);
+    background-color: hsl(210, 50%, 50%);
+    color: hsl(210, 10%, 90%);
+    font-size: larger;
+    font-weight: bold;
 }

Index: gc_lang/fr/mailext/content/spell_options.js
==================================================================
--- gc_lang/fr/mailext/content/spell_options.js
+++ gc_lang/fr/mailext/content/spell_options.js
@@ -12,12 +12,25 @@
 var oDialogControl = {
     load: function () {
         try {
             // center window
             document.getElementById('grammalecte-spelloptions-window').centerWindowOnScreen();
-            // Graphspell dictionaries
+            // main spelling dictionary
+            let sMainDicName = prefs.getCharPref('sMainDicName');
+            console.log("spelling dictionary:", sMainDicName);
+            if (sMainDicName == "fr-classic.json") {
+                document.getElementById("classic").checked = true;
+            }
+            else if (sMainDicName == "fr-reform.json") {
+                document.getElementById("reform").checked = true;
+            }
+            else if (sMainDicName == "fr-allvars.json") {
+                document.getElementById("allvars").checked = true;
+            }
+            // personal dictionary
             document.getElementById('personal_dic').checked = prefs.getBoolPref('bPersonalDictionary');
+            // listen
             this.listen();
         }
         catch (e) {
             console.error(e);
         }
@@ -24,15 +37,40 @@
     },
     listen: function () {
         document.addEventListener("dialogaccept", (event) => {
             oDialogControl.setDictionaries();
         });
+        document.getElementById("classic").addEventListener("click", (event) => {
+            oDialogControl.changeMainDicUI("classic");
+        });
+        document.getElementById("reform").addEventListener("click", (event) => {
+            oDialogControl.changeMainDicUI("reform");
+        });
+        document.getElementById("allvars").addEventListener("click", (event) => {
+            oDialogControl.changeMainDicUI("allvars");
+        });
+    },
+    changeMainDicUI (sDic) {
+        document.getElementById("classic").checked = ("classic" === sDic);
+        document.getElementById("reform").checked = ("reform" === sDic);
+        document.getElementById("allvars").checked = ("allvars" === sDic);
     },
     setDictionaries: function () {
-        oSpellControl.init();
-        this._setGraphspellDictionaries();
-    },
-    _setGraphspellDictionaries: function () {
+        //oSpellControl.init();
+        // main spelling dictionary
+        let sMainDicName = "";
+        if (document.getElementById("classic").checked) {
+            sMainDicName = "fr-classic.json";
+        }
+        else if (document.getElementById("reform").checked) {
+            sMainDicName = "fr-reform.json";
+        }
+        else if (document.getElementById("allvars").checked) {
+            sMainDicName = "fr-allvars.json";
+        }
+        console.log("selected spelling dictionary:", sMainDicName);
+        prefs.setCharPref("sMainDicName", sMainDicName);
+        // personal dictionary
         let bActivate = document.getElementById('personal_dic').checked;
         prefs.setBoolPref("bPersonalDictionary", bActivate);
     }
 };

Index: gc_lang/fr/mailext/content/spell_options.xul
==================================================================
--- gc_lang/fr/mailext/content/spell_options.xul
+++ gc_lang/fr/mailext/content/spell_options.xul
@@ -8,11 +8,11 @@
   id="grammalecte-spelloptions-window"
   title="&window.title;"
   orient="vertical"
   buttons="accept,cancel"
   width="400"
-  height="300"
+  height="330"
   onload="oDialogControl.load();"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Other elements go here -->
 
@@ -39,10 +39,21 @@
       <caption id="grouptitle" label="&grouptitle_graphspell;" />
       <description id="warning">&warning_graphspell;</description>
 
       <checkbox id="main_dic" class="option" label="&option.main_dic.label;" disabled="true" checked="true" />
       <description class="dicdescr">&option.main_dic.descr;</description>
+      <label class="suboption" value="&option.main_dic.spelling;" />
+      <hbox class="suboption2" >
+        <checkbox id="classic" label="&option.main_dic.classic;" checked="false" />
+        <checkbox id="reform" label="&option.main_dic.reform;" checked="false" />
+        <checkbox id="allvars" label="&option.main_dic.allvars;" checked="false" />
+      </hbox>
+      <!--<radiogroup id="main_dic_name" class="suboption2" orient="horizontal">
+        <radio id="classic" label="&option.main_dic.classic;" value="fr-classic.json" />
+        <radio id="reform" label="&option.main_dic.reform;" value="fr-reform.json" />
+        <radio id="allvars" label="&option.main_dic.allvars;" value="fr-allvars.json" />
+      </radiogroup>-->
 
       <checkbox id="community_dic" class="option disabled" label="&option.community_dic.label;" disabled="true" />
       <description class="dicdescr disabled">&option.community_dic.descr;</description>
 
       <checkbox id="personal_dic" class="option" label="&option.personal_dic.label;" />

Index: gc_lang/fr/mailext/defaults/preferences/grammarchecker.js
==================================================================
--- gc_lang/fr/mailext/defaults/preferences/grammarchecker.js
+++ gc_lang/fr/mailext/defaults/preferences/grammarchecker.js
@@ -3,8 +3,8 @@
 pref("extensions.grammarchecker.bDictModern", false);
 pref("extensions.grammarchecker.bDictClassic", true);
 pref("extensions.grammarchecker.bDictReform", false);
 pref("extensions.grammarchecker.bDictClassicReform", false);
 pref("extensions.grammarchecker.bCheckSignature", true);
-pref("extensions.grammarchecker.bExtendedDictionary", false);
+pref("extensions.grammarchecker.sMainDicName", "fr-allvars.json");
 pref("extensions.grammarchecker.bCommunityDictionary", false);
 pref("extensions.grammarchecker.bPersonalDictionary", true);

Index: gc_lang/fr/mailext/gce_worker.js
==================================================================
--- gc_lang/fr/mailext/gce_worker.js
+++ gc_lang/fr/mailext/gce_worker.js
@@ -353,11 +353,11 @@
         return;
     }
     //console.log("setDictionary", sDictionary);
     switch (sDictionary) {
         case "main":
-            oSpellChecker.setMainDictionary(oDict);
+            oSpellChecker.setMainDictionary(oDict, dInfo["sExtPath"]+"/grammalecte/graphspell/_dictionaries");
             break;
         case "community":
             oSpellChecker.setCommunityDictionary(oDict);
             break;
         case "personal":

Index: gc_lang/fr/mailext/locale/en/spell_options.dtd
==================================================================
--- gc_lang/fr/mailext/locale/en/spell_options.dtd
+++ gc_lang/fr/mailext/locale/en/spell_options.dtd
@@ -3,10 +3,14 @@
 
 <!ENTITY grouptitle_graphspell "Graphspell Dictionaries (Grammalecte)">
 <!ENTITY warning_graphspell "These dictionaries are used only when analyzing texts.">
 <!ENTITY option.main_dic.label "Main dictionary">
 <!ENTITY option.main_dic.descr "About 83 000 entries, 500 000 flexions. Not editable, not deactivable.">
+<!ENTITY option.main_dic.spelling "Spelling">
+<!ENTITY option.main_dic.classic "Classic">
+<!ENTITY option.main_dic.reform "Reform 1990">
+<!ENTITY option.main_dic.allvars "All variants">
 <!ENTITY option.community_dic.label "Community dictionary">
 <!ENTITY option.community_dic.descr "Feature to come..">
 <!ENTITY option.personal_dic.label "Personal dictionary">
 <!ENTITY option.personal_dic.descr "The personal dictionary is created and edited via the lexicon editor.">
 

Index: gc_lang/fr/mailext/locale/fr/spell_options.dtd
==================================================================
--- gc_lang/fr/mailext/locale/fr/spell_options.dtd
+++ gc_lang/fr/mailext/locale/fr/spell_options.dtd
@@ -3,10 +3,14 @@
 
 <!ENTITY grouptitle_graphspell "Dictionnaires de Grammalecte">
 <!ENTITY warning_graphspell "Ces dictionnaires ne sont utilisés que lors de l’analyse grammaticale.">
 <!ENTITY option.main_dic.label "Dictionnaire principal">
 <!ENTITY option.main_dic.descr "Environ 83 000 entrées, 500 000 flexions. Ni éditable, ni désactivable.">
+<!ENTITY option.main_dic.spelling "Orthographe">
+<!ENTITY option.main_dic.classic "Classique">
+<!ENTITY option.main_dic.reform "Réforme 1990">
+<!ENTITY option.main_dic.allvars "Toutes variantes">
 <!ENTITY option.community_dic.label "Dictionnaire communautaire">
 <!ENTITY option.community_dic.descr "Fonctionnalité à venir.">
 <!ENTITY option.personal_dic.label "Dictionnaire personnel">
 <!ENTITY option.personal_dic.descr "Le dictionnaire personnel est créé et édité via l’éditeur lexical.">
 

Index: gc_lang/fr/mailext/worker/gce_worker.js
==================================================================
--- gc_lang/fr/mailext/worker/gce_worker.js
+++ gc_lang/fr/mailext/worker/gce_worker.js
@@ -75,20 +75,21 @@
             console.log("# Error: " + e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message);
         }
     }
 }
 
-function setDictionary (sTypeDic, sDicJSON) {
+function setDictionary (sTypeDic, sDictionary) {
     try {
         console.log("set dictionary: " + sTypeDic);
-        let oJSON = JSON.parse(sDicJSON);
         switch (sTypeDic) {
-            case "extended":
+            case "main":
+                oSpellChecker.setMainDictionary(sDictionary);
                 break;
             case "community":
                 break;
             case "personal":
+                let oJSON = JSON.parse(sDictionary);
                 oSpellChecker.setPersonalDictionary(oJSON);
                 break;
             default:
                 console.log("[GCE worker] unknown dictionary type");
         }