Index: gc_lang/fr/build.py
==================================================================
--- gc_lang/fr/build.py
+++ gc_lang/fr/build.py
@@ -89,12 +89,15 @@
     for sp in os.listdir(spDict):
         if os.path.isdir(spDict+"/"+sp):
             hZip.write(spDict+"/"+sp+"/"+sp+".dic", "content/dictionaries/"+sp+"/"+sp+".dic")
             hZip.write(spDict+"/"+sp+"/"+sp+".aff", "content/dictionaries/"+sp+"/"+sp+".aff")
     hZip.close()
-    spfDebugProfile = dVars['win_tb_debug_extension_path']  if platform.system() == "Windows"  else dVars['linux_tb_debug_extension_path']
-    helpers.unzip(spfZip, spfDebugProfile)
+    spDebugProfile = dVars['win_tb_debug_extension_path']  if platform.system() == "Windows"  else dVars['linux_tb_debug_extension_path']
+    helpers.unzip(spfZip, spDebugProfile)
+    spfBetaExtension = dVars['win_tb_beta_extension_filepath']  if platform.system() == "Windows"  else dVars['linux_tb_beta_extension_filepath']
+    #helpers.unzip(spfZip, spBetaProfile)
+    file_util.copy_file(spfZip, spfBetaExtension)
 
 
 def _createOptionsForThunderbird (dVars):
     dVars['sXULTabs'] = ""
     dVars['sXULTabPanels'] = ""

Index: gc_lang/fr/config.ini
==================================================================
--- gc_lang/fr/config.ini
+++ gc_lang/fr/config.ini
@@ -53,12 +53,19 @@
 linux_fx_nightly_path = /usr/bin/firefox
 
 # Thunderbird
 tb_identifier = French-GC-TB@grammalecte.net
 tb_name = Grammalecte [fr]
+win_tb_path = C:\Program Files (x86)\Mozilla Thunderbird\thunderbird.exe
+#win_tb_beta_path = C:\Program Files (x86)\Mozilla Thunderbird (Beta)\thunderbird.exe
+win_tb_beta_path = C:\Program Files (x86)\Mozilla Thunderbird (Beta)\thunderbird.exe
+linux_tb_path = /usr/bin/thunderbird
+linux_tb_beta_path = /usr/bin/thunderbird
 win_tb_debug_extension_path = D:\_temp\tb-debug.profile\extensions\French-GC-TB@grammalecte.net
 linux_tb_debug_extension_path = ~/tb-debug.profile/extensions/French-GC-TB@grammalecte.net
+win_tb_beta_extension_filepath = D:\_temp\tb-beta.profile\extensions\French-GC-TB@grammalecte.net.xpi
+linux_tb_beta_extension_filepath = ~/tb-beta.profile/extensions/French-GC-TB@grammalecte.net.xpi
 # Set Thunderbird folder in your PATH variable
 # Create a local profile:
 #     	thunderbird -CreateProfile "debug _build\tb-debug.profile"
 # Or you can use the GUI with:
 #	 	thunderbird -P

Index: gc_lang/fr/dictionnaire/_templates/moz/install.rdf
==================================================================
--- gc_lang/fr/dictionnaire/_templates/moz/install.rdf
+++ gc_lang/fr/dictionnaire/_templates/moz/install.rdf
@@ -33,11 +33,11 @@
 
     <em:targetApplication>
         <Description>
             <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> <!-- Thunderbird -->
             <em:minVersion>14.0</em:minVersion>
-            <em:maxVersion>53.*</em:maxVersion>
+            <em:maxVersion>61.*</em:maxVersion>
         </Description>
     </em:targetApplication>
 
     <em:targetApplication>
         <Description>

Index: gc_lang/fr/tb/chrome.manifest
==================================================================
--- gc_lang/fr/tb/chrome.manifest
+++ gc_lang/fr/tb/chrome.manifest
@@ -4,6 +4,6 @@
 resource grammalecte ./grammalecte-js/
 locale	grammarchecker	fr	locale/fr/
 locale	grammarchecker	en	locale/en/
 skin	grammarchecker	classic/1.0	skin/
 overlay	chrome://messenger/content/messengercompose/messengercompose.xul	chrome://grammarchecker/content/overlay.xul
-style	chrome://global/content/customizeToolbar.xul	chrome://grammarchecker/content/overlay.css
+style	chrome://messenger/content/customizeToolbar.xul	chrome://grammarchecker/content/overlay.css

Index: gc_lang/fr/tb/content/about.css
==================================================================
--- gc_lang/fr/tb/content/about.css
+++ gc_lang/fr/tb/content/about.css
@@ -23,5 +23,24 @@
 	font-size: 16px;
 	text-align: center;
 	color: hsl(210, 50%, 50%);
 	cursor: pointer;
 }
+
+
+/*
+    TB Next: fix dialogheaders
+*/
+dialogheader {
+  -moz-binding: url("chrome://messenger/content/generalBindings.xml#dialogheader");
+  margin: 0 5px 5px;
+  border: 1px solid ThreeDDarkShadow;
+  padding: 5px 8px;
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.dialogheader-title {
+  margin: 0 !important;
+  font-size: larger;
+  font-weight: bold;
+}

Index: gc_lang/fr/tb/content/about.js
==================================================================
--- gc_lang/fr/tb/content/about.js
+++ gc_lang/fr/tb/content/about.js
@@ -1,25 +1,21 @@
 // JavaScript
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
-//const { require } = Cu.import("resource://gre/modules/commonjs/toolkit/require.js", {});
-
-function echo (...args) {
-    Services.console.logStringMessage(args.join(" -- ") + "\n");
-}
+//const Cu = Components.utils;
 
 
 function openInBrowserURL (sURL) {
     // method found in S3.Google.Translator
     try {
         openURL(sURL);
         // Works in overlay.js, but not here… Seems there is no documentation available about this feature on Mozilla.org
     }
     catch (e) {
-        Cu.reportError(e);
+        console.error(e);
+        //Cu.reportError(e);
     }
 }
 
 function openInTabURL (sURL) {
     // method found in S3.Google.Translator
@@ -31,8 +27,9 @@
         if (xTabmail) {
             xTabmail.openTab('contentTab', { contentPage: sURL });
         }
     }
     catch (e) {
-        Cu.reportError(e);
+        console.error(e);
+        //Cu.reportError(e);
     }
 }

Index: gc_lang/fr/tb/content/about.xul
==================================================================
--- gc_lang/fr/tb/content/about.xul
+++ gc_lang/fr/tb/content/about.xul
@@ -32,7 +32,7 @@
   <image src="chrome://grammarchecker/skin/Algoo_logo.png" style="cursor: pointer;"
     onclick="openInTabURL('https://www.algoo.fr/?from=grammalecte-tb');" />
   <label id="contrib" value="&contrib;"
     onclick="openInTabURL('https://www.dicollecte.org/#thanks');" />
 
-  <script type="application/x-javascript" src="about.js"/>
+  <script type="application/javascript" src="about.js"/>
 </dialog>

Index: gc_lang/fr/tb/content/conjugueur.css
==================================================================
--- gc_lang/fr/tb/content/conjugueur.css
+++ gc_lang/fr/tb/content/conjugueur.css
@@ -39,5 +39,24 @@
 	font-weight: bold;
 }
 label.cj {
 	font-size: 11px;
 }
+
+
+/*
+    TB Next: fix dialogheaders
+*/
+dialogheader {
+  -moz-binding: url("chrome://messenger/content/generalBindings.xml#dialogheader");
+  margin: 0 5px 5px;
+  border: 1px solid ThreeDDarkShadow;
+  padding: 5px 8px;
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.dialogheader-title {
+  margin: 0 !important;
+  font-size: larger;
+  font-weight: bold;
+}

Index: gc_lang/fr/tb/content/conjugueur.js
==================================================================
--- gc_lang/fr/tb/content/conjugueur.js
+++ gc_lang/fr/tb/content/conjugueur.js
@@ -1,48 +1,44 @@
 // JavaScript
 
-const Cu = Components.utils;
-const { require } = Cu.import("resource://gre/modules/commonjs/toolkit/require.js", {});
-const conj = require("resource://grammalecte/fr/conj.js");
-
-
-function echo (...args) {
-    Services.console.logStringMessage(args.join(" -- ") + "\n");
-}
+//const Cu = Components.utils;
+//const { require } = Cu.import("resource://gre/modules/commonjs/toolkit/require.js", {});
+//const conj = require("resource://grammalecte/fr/conj.js");
 
 
 let oConj = {
     init: function () {
-        let that = this;
+        console.log("Init conjugueur");
         try {
             // button
-            document.getElementById('conjugate').addEventListener("click", function (event) {
-                that.getVerbAndConjugate();
+            document.getElementById('conjugate').addEventListener("click", (xEvent) => {
+                this.getVerbAndConjugate();
             });
             // text field
-            document.getElementById('verb').addEventListener("change", function (event) {
-                that.getVerbAndConjugate();
+            document.getElementById('verb').addEventListener("change", (xEvent) => {
+                this.getVerbAndConjugate();
             });
             // options
-            document.getElementById('oneg').addEventListener("click", function (event) {
-                that._displayResults();
-            });
-            document.getElementById('opro').addEventListener("click", function (event) {
-                that._displayResults();
-            });
-            document.getElementById('oint').addEventListener("click", function (event) {
-                that._displayResults();
-            });
-            document.getElementById('ofem').addEventListener("click", function (event) {
-                that._displayResults();
-            });
-            document.getElementById('otco').addEventListener("click", function (event) {
-                that._displayResults();
+            document.getElementById('oneg').addEventListener("click", (xEvent) => {
+                this._displayResults();
+            });
+            document.getElementById('opro').addEventListener("click", (xEvent) => {
+                this._displayResults();
+            });
+            document.getElementById('oint').addEventListener("click", (xEvent) => {
+                this._displayResults();
+            });
+            document.getElementById('ofem').addEventListener("click", (xEvent) => {
+                this._displayResults();
+            });
+            document.getElementById('otco').addEventListener("click", (xEvent) => {
+                this._displayResults();
             });
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
         this.conjugate("être");
     },
 
     oVerb: null,
@@ -83,11 +79,11 @@
                     document.getElementById('verb').style = "color: #BB4411;";
                 } else {
                     document.getElementById('verb_title').textContent = sVerb;
                     document.getElementById('verb').style = "color: #999999;";
                     document.getElementById('verb').value = "";
-                    this.oVerb = new conj.Verb(sVerb);
+                    this.oVerb = new Verb(sVerb);
                     let sRawInfo = this.oVerb._sRawInfo;
                     document.getElementById('info').textContent = this.oVerb.sInfo;
                     document.getElementById('opro').textContent = "pronominal";
                     if (sRawInfo.endsWith("zz")) {
                         document.getElementById('opro').checked = false;
@@ -127,11 +123,12 @@
                     this._displayResults();
                 }
             }
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     },
 
     _displayResults: function () {
         if (this.oVerb === null) {
@@ -237,11 +234,12 @@
                 document.getElementById('condb6').textContent = " ";
             }
             document.getElementById('verb').Text = "";
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     },
 
     _setTitles: function () {
         try {
@@ -266,12 +264,13 @@
                 document.getElementById('condb_temps').textContent = "Passé (2ᵉ forme)";
                 document.getElementById('impe_temps').textContent = "Passé";
             }
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     }
 };
 
+conj.init(helpers.loadFile("resource://grammalecte/fr/conj_data.json"));
 oConj.init();
-

Index: gc_lang/fr/tb/content/conjugueur.xul
==================================================================
--- gc_lang/fr/tb/content/conjugueur.xul
+++ gc_lang/fr/tb/content/conjugueur.xul
@@ -4,11 +4,11 @@
 
 <dialog
   id="grammalecte-conjugueur-window"
   title="Grammalecte · Conjugueur…"
   orient="vertical"
-  width="550"
+  width="580"
   buttons="extra1"
   buttonlabelextra1="Conjuguer"
   ondialogextra1="oConj.getVerbAndConjugate();"
   defaultButton="extra1"
   onload=""
@@ -152,7 +152,9 @@
         <label id="condb6" class="cj">.</label>
       </groupbox>
     </column>
   </columns>
 
-  <script type="application/x-javascript" src="conjugueur.js"/>
+  <script type="application/javascript" src="resource://grammalecte/graphspell/helpers.js"/>
+  <script type="application/javascript" src="resource://grammalecte/fr/conj.js"/>
+  <script type="application/javascript" src="conjugueur.js"/>
 </dialog>

Index: gc_lang/fr/tb/content/editor.js
==================================================================
--- gc_lang/fr/tb/content/editor.js
+++ gc_lang/fr/tb/content/editor.js
@@ -19,15 +19,13 @@
 
     * _getParsableNodes (xRootNode=this.xEditor.rootElement) {
         // recursive function
         try {
             for (let xNode of xRootNode.childNodes) {
-                //echo("tag: " + xNode.tagName);
                 if (xNode.className !== "moz-cite-prefix" && xNode.tagName !== "BLOCKQUOTE"
                     && (xNode.nodeType == Node.TEXT_NODE || (xNode.nodeType == Node.ELEMENT_NODE && !xNode.textContent.startsWith(">")))
                     && xNode.textContent !== "") {
-                    //echo("<"+xNode.tagName+">["+xNode.textContent+"]");
                     if (xNode.tagName === undefined) {
                         if (!prefs.getBoolPref("bCheckSignature") && xNode.textContent.startsWith("-- ")) {
                             break;
                         }
                         yield xNode;
@@ -37,11 +35,12 @@
                         yield* this._getParsableNodes(xNode);
                     }
                 }
             }
         } catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     };
 
     * getParagraphs () {
         try {
@@ -50,11 +49,12 @@
                 this.lNode.push(xNode);
                 yield [i, this._getTextFromNode(xNode)];
                 i += 1;
             }
         } catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     };
 
     getContent () {
         try {
@@ -65,19 +65,21 @@
                 }
                 sContent += sHTML;
             }
             return sContent;
         } catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     };
 
     getParagraph (iPara) {
         try {
             return this._getTextFromNode(this.lNode[iPara]);
         } catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     };
 
     writeParagraph (iPara, sText) {
         try {
@@ -86,11 +88,12 @@
                 xNode.innerHTML = sText;
             } else {
                 xNode.textContent = sText;
             }
         } catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     };
 
     changeParagraph (iPara, sModif, iStart, iEnd) {
         let sText = this.getParagraph(iPara);
@@ -101,9 +104,10 @@
         try {
             let gSpellChecker = this.xEditor.getInlineSpellChecker(true);
             let sLang = gSpellChecker.spellChecker.GetCurrentDictionary();
             return sLang.slice(0, 2);
         } catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     };
 }

Index: gc_lang/fr/tb/content/gc_options.css
==================================================================
--- gc_lang/fr/tb/content/gc_options.css
+++ gc_lang/fr/tb/content/gc_options.css
@@ -3,5 +3,24 @@
 .section {
 	font-size: 16px;
 	font-weight: bold;
 	color: hsl(210, 50%, 50%);
 }
+
+/*
+    TB Next: fix dialogheaders
+*/
+dialogheader {
+  -moz-binding: url("chrome://messenger/content/generalBindings.xml#dialogheader");
+  margin: 0 5px 5px;
+  border: 1px solid ThreeDDarkShadow;
+  padding: 5px 8px;
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.dialogheader-title {
+  margin: 0 !important;
+  font-size: larger;
+  font-weight: bold;
+}
+

Index: gc_lang/fr/tb/content/gc_options.js
==================================================================
--- gc_lang/fr/tb/content/gc_options.js
+++ gc_lang/fr/tb/content/gc_options.js
@@ -1,48 +1,43 @@
 // JavaScript
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+// const Cu = Components.utils;
 const prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService).getBranch("extensions.grammarchecker.");
-//const { require } = Cu.import("resource://gre/modules/commonjs/toolkit/require.js", {});
 
-function echo (...args) {
-    Services.console.logStringMessage(args.join(" -- ") + "\n");
-}
 
 var oOptControl = {
     oOptions: null,
     load: function () {
         this._setDialogOptions(false);
     },
     _setDialogOptions: function (bDefaultOptions=false) {
         try {
             sOptions = bDefaultOptions ? prefs.getCharPref("sGCDefaultOptions") : prefs.getCharPref("sGCOptions");
-            //echo(">> " + sOptions);
             this.oOptions = JSON.parse(sOptions);
             for (let sParam in this.oOptions) {
-                //echo(sParam + ":" + oOptions[sParam]);
                 if (document.getElementById("option_"+sParam) !== null) {
                     document.getElementById("option_"+sParam).checked = this.oOptions[sParam];
                 }
             }
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     },
     save: function () {
         try {
             for (let xNode of document.getElementsByClassName("option")) {
                 this.oOptions[xNode.id.slice(7)] = xNode.checked;
             }
             prefs.setCharPref("sGCOptions", JSON.stringify(this.oOptions));
-            //echo("<< " + JSON.stringify(this.oOptions));
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     },
     reset: function () {
         this._setDialogOptions(true);
     }

Index: gc_lang/fr/tb/content/gc_options.xul
==================================================================
--- gc_lang/fr/tb/content/gc_options.xul
+++ gc_lang/fr/tb/content/gc_options.xul
@@ -29,8 +29,8 @@
     <tabpanels>
 ${sXULTabPanels}
     </tabpanels>
   </tabbox>
 
-  <script type="application/x-javascript" src="gc_options.js" />
+  <script type="application/javascript" src="gc_options.js" />
 
 </dialog>

ADDED   gc_lang/fr/tb/content/options.css
Index: gc_lang/fr/tb/content/options.css
==================================================================
--- /dev/null
+++ gc_lang/fr/tb/content/options.css
@@ -0,0 +1,19 @@
+/* CSS */
+
+/*
+    TB Next: fix dialogheaders
+*/
+dialogheader {
+  -moz-binding: url("chrome://messenger/content/generalBindings.xml#dialogheader");
+  margin: 0 5px 5px;
+  border: 1px solid ThreeDDarkShadow;
+  padding: 5px 8px;
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.dialogheader-title {
+  margin: 0 !important;
+  font-size: larger;
+  font-weight: bold;
+}

ADDED   gc_lang/fr/tb/content/options.js
Index: gc_lang/fr/tb/content/options.js
==================================================================
--- /dev/null
+++ gc_lang/fr/tb/content/options.js
@@ -0,0 +1,36 @@
+// JavaScript
+
+"use strict";
+
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+// const Cu = Components.utils;
+const prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService).getBranch("extensions.grammarchecker.");
+
+
+var oOptControl = {
+
+    load: function () {
+        try {
+            document.getElementById('check_signature').checked = prefs.getBoolPref('bCheckSignature');
+        }
+        catch (e) {
+            console.error(e);
+            // Cu.reportError(e);
+        }
+    },
+
+    save: function () {
+        try {
+            prefs.setBoolPref('bCheckSignature', document.getElementById('check_signature').checked);
+        }
+        catch (e) {
+            console.error(e);
+            // Cu.reportError(e);
+        }
+    }
+}
+
+
+oOptControl.load();

Index: gc_lang/fr/tb/content/options.xul
==================================================================
--- gc_lang/fr/tb/content/options.xul
+++ gc_lang/fr/tb/content/options.xul
@@ -1,24 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://grammarchecker/content/options.css" type="text/css"?>
 
-<!DOCTYPE prefwindow SYSTEM "chrome://grammarchecker/locale/options.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://grammarchecker/locale/options.dtd">
 
-<prefwindow id="grammarcheckerPreferences"
-  title="&prefwindow.title;"
+<dialog
+  id="grammalecte-options-window"
+  title="&window.title;"
+  orient="vertical"
+  buttons="accept, cancel"
+  ondialogaccept="oOptControl.save();"
+  ondialogcancel="return;"
+  defaultButton="accept"
+  width="400"
+  onload="document.getElementById('grammalecte-options-window').centerWindowOnScreen();"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <prefpane id="pane1" label="&pane1.title;">
-    <dialogheader id="grammalecte-title" title="&pane1.title;" description="" />
-    <preferences>
-      <preference id="check_signature" name="extensions.grammarchecker.bCheckSignature" type="bool" />
-      <!--<preference id="gc_options" name="extensions.grammarchecker.sGCOptions" type="string" />
-      <preference id="tf_options" name="extensions.grammarchecker.sTFOptions" type="string" />
-      <preference id="mothertongue" name="extensions.grammarchecker.mothertongue" type="string"/>-->
-    </preferences>
-    <checkbox label="&check_signature.label;" accesskey="&check_signature.accesskey;"  preference="check_signature"/>
-    <!--<label accesskey="&gc_options.accesskey;" control="texturlpref1">&gc_options.label;</label><textbox id="texturlpref1" preference="gc_options"/>
-    <label accesskey="&tf_options.accesskey;" control="texturlpref2">&tf_options.label;</label><textbox id="texturlpref2" preference="tf_options"/>
-    <label accesskey="&mothertongue.accesskey;" control="textmothertongue">&mothertongue.label;</label><textbox id="textmothertongue" preference="mothertongue"/>-->
-    <!--<description>&panel.description;</description>-->
-  </prefpane>
-</prefwindow>
+  <!-- Other elements go here -->
+  
+  <dialogheader id="grammalecte-title" title="&dialogheader.label;" description="" />
+
+  <checkbox id="check_signature" label="&check_signature.label;" accesskey="&check_signature.accesskey;" />
+
+  <script type="application/javascript" src="options.js" />
+
+</dialog>

Index: gc_lang/fr/tb/content/overlay.css
==================================================================
--- gc_lang/fr/tb/content/overlay.css
+++ gc_lang/fr/tb/content/overlay.css
@@ -185,5 +185,24 @@
 .bs, .pleo, .neg, .redon1, .redon2, .mc, .date, .notype {
     background-color: hsl(180, 50%, 40%);
     color: hsl(180, 10%, 96%);
     border-radius: 3px;
 }
+
+
+/*
+    TB Next: fix dialogheaders
+*/
+dialogheader {
+  -moz-binding: url("chrome://messenger/content/generalBindings.xml#dialogheader");
+  margin: 0 5px 5px;
+  border: 1px solid ThreeDDarkShadow;
+  padding: 5px 8px;
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.dialogheader-title {
+  margin: 0 !important;
+  font-size: larger;
+  font-weight: bold;
+}

Index: gc_lang/fr/tb/content/overlay.js
==================================================================
--- gc_lang/fr/tb/content/overlay.js
+++ gc_lang/fr/tb/content/overlay.js
@@ -4,27 +4,18 @@
 
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
-const { require } = Cu.import("resource://gre/modules/commonjs/toolkit/require.js", {});
+//const { require } = Cu.import("resource://gre/modules/commonjs/toolkit/require.js", {});
 
-const { BasePromiseWorker } = Cu.import('resource://gre/modules/PromiseWorker.jsm', {});
-const Task = Cu.import("resource://gre/modules/Task.jsm").Task;
+const { BasePromiseWorker } = ChromeUtils.import('resource://gre/modules/PromiseWorker.jsm', {});
+const Task = ChromeUtils.import("resource://gre/modules/Task.jsm").Task;
 const prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService).getBranch("extensions.grammarchecker.");
-//Cu.import("resource://gre/modules/Console.jsm"); // doesn’t work
-//const xConsole = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
-//xConsole.logStringMessage("Grammalecte: " + args.join(" · ")); // useless now. Use: Services.console.logStringMessage("***");
-
-const text = require("resource://grammalecte/text.js");
-const tf = require("resource://grammalecte/fr/textformatter.js");
-
-
-function echo (...args) {
-    dump(args.join(" -- ") + "\n");  // obsolete since TB 52?
-    Services.console.logStringMessage("Grammalecte: " + args.join(" · "));
-}
+
+//const text = require("resource://grammalecte/text.js");
+//const tf = require("resource://grammalecte/fr/textformatter.js");
 
 
 const oConverterToExponent = {
     dNumbers: new Map ([
         ["1", "¹"], ["2", "²"], ["3", "³"], ["4", "⁴"], ["5", "⁵"],
@@ -44,87 +35,87 @@
     // you must use var to be able to call this object from elsewhere
     xGCEWorker: null,
     loadGC: function () {
         if (this.xGCEWorker === null) {
             // Grammar checker
-            echo('Loading Grammalecte');
+            console.log('Loading Grammalecte');
             this.xGCEWorker = new BasePromiseWorker('chrome://promiseworker/content/gce_worker.js');
             let that = this;
             let xPromise = this.xGCEWorker.post('loadGrammarChecker', [prefs.getCharPref("sGCOptions"), "Thunderbird"]);
             xPromise.then(
                 function (aVal) {
-                    echo(aVal);
+                    console.log(aVal);
                     prefs.setCharPref("sGCOptions", aVal);
                     if (prefs.getBoolPref("bPersonalDictionary")) {
                         let sDicJSON = oFileHandler.loadFile("fr.personal.json");
                         if (sDicJSON) {
                             that.xGCEWorker.post('setDictionary', ["personal", sDicJSON]);
                         }
                     }
                 },
-                function (aReason) { echo('Promise rejected - ', aReason); }
+                function (aReason) { console.log('Promise rejected - ', aReason); }
             ).catch(
-                function (aCaught) { echo('Promise Error - ', aCaught); }
+                function (aCaught) { console.log('Promise Error - ', aCaught); }
             );
 
         }
     },
     fullTests: function () {
-        echo('Performing tests... Wait...');
+        console.log('Performing tests... Wait...');
         let xPromise = this.xGCEWorker.post('fullTests', ['{"nbsp":true, "esp":true, "unit":true, "num":true}']);
         xPromise.then(
             function (aVal) {
-                echo('Done.');
-                echo(aVal);
+                console.log('Done.');
+                console.log(aVal);
             },
-            function (aReason) { echo('Promise rejected', aReason); }
+            function (aReason) { console.log('Promise rejected', aReason); }
         ).catch(
-            function (aCaught) { echo('Promise Error', aCaught); }
+            function (aCaught) { console.log('Promise Error', aCaught); }
         );
     },
     test: function (sText) {
-        echo("Test...");
+        console.log("Test...");
         let xPromise = this.xGCEWorker.post('parse', [sText, "FR", true]);
         xPromise.then(
             function (aVal) {
                 let lErr = JSON.parse(aVal);
                 if (lErr.length > 0) {
                     for (let dErr of lErr) {
-                        echo(text.getReadableError(dErr));
+                        console.log(text.getReadableError(dErr));
                     }
                 } else {
-                    echo("no error found");
+                    console.log("no error found");
                 }
             },
-            function (aReason) { echo('Promise rejected', aReason); }
+            function (aReason) { console.log('Promise rejected', aReason); }
         ).catch(
-            function (aCaught) { echo('Promise Error', aCaught); }
+            function (aCaught) { console.log('Promise Error', aCaught); }
         );
     },
     setOptions: function () {
-        echo('Set options');
+        console.log('Set options');
         let xPromise = this.xGCEWorker.post('setOptions', [prefs.getCharPref("sGCOptions")]);
         xPromise.then(
             function (aVal) {
-                echo(aVal);
+                console.log(aVal);
                 prefs.setCharPref("sGCOptions", aVal);
             },
-            function (aReason) { echo('Promise rejected', aReason); }
+            function (aReason) { console.log('Promise rejected', aReason); }
         ).catch(
-            function (aCaught) { echo('Promise Error', aCaught); }
+            function (aCaught) { console.log('Promise Error', aCaught); }
         );
     },
     resetOptions: function () {
         let xPromise = this.xGCEWorker.post('resetOptions');
         xPromise.then(
             function (aVal) {
-                echo(aVal);
+                console.log(aVal);
                 prefs.setCharPref("sGCOptions", aVal);
             },
-            function (aReason) { echo('Promise rejected', aReason); }
+            function (aReason) { console.log('Promise rejected', aReason); }
         ).catch(
-            function (aCaught) { echo('Promise Error', aCaught); }
+            function (aCaught) { console.log('Promise Error', aCaught); }
         );
     },
     _getGCResultPromise: function (sParagraph, sLang, bDebug, bContext) {
         // For some reason, you can’t use result of PromiseWorker within a Task,
         // you have to wrap it in a common Promise. Task and yield can be replaced with async / await when it is available.
@@ -176,11 +167,12 @@
             return nParagraph;
         }).then(function (res) {
             that.setInfo("Nombre de paragraphes analysés : " + res);
         }, function (e) {
             that.setInfo("Erreur : " + e.message);
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         });
     },
     createResultNode: function (xEditor, sParagraph, iParagraph, aGrammErr, aSpellErr) {
         let xResultNode = document.createElement("div");
         xResultNode.setAttribute("id", "resnode" + iParagraph);
@@ -193,11 +185,11 @@
             let xResultNode = document.getElementById("resnode"+iParagraph);
             xResultNode.textContent = "…………… réanalyse en cours ……………";
             let sParagraph = xEditor.getParagraph(iParagraph);
             let xPromise = this._getGCResultPromise(sParagraph, "FR", false, false);
             xPromise.then(function (res) {
-                //echo("res: " + res);
+                //console.log("res: " + res);
                 xResultNode.textContent = "";
                 let oRes = JSON.parse(res);
                 if (oRes.aGrammErr.length > 0 || oRes.aSpellErr.length > 0) {
                     that.fillResultNode(xResultNode, xEditor, sParagraph, iParagraph, oRes.aGrammErr, oRes.aSpellErr);
                 }
@@ -204,11 +196,12 @@
             }, function (res) {
                 xResultNode.textContent = "Erreur: " + res;
             });
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     },
     fillResultNode: function (xResultNode, xEditor, sParagraph, iParagraph, aGrammErr, aSpellErr) {
         try {
             if (aGrammErr.length === 0  &&  aSpellErr.length === 0) {
@@ -254,11 +247,12 @@
             for (let xNode of lNodeError) {
                 xResultNode.appendChild(xNode);
             }
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
             xResultNode.textContent = "# Error: " + e.message;
         }
     },
     _createNodeGCErrorDescription: function (xEditor, nError, dErr, iParagraph) {
         let xNodeDiv = document.createElement("div");
@@ -362,11 +356,10 @@
                             n += 1;
                         }
                     } else {
                         xNodeSuggLine.appendChild(document.createTextNode("Aucune suggestion."));
                     }
-                    
                 },
                 function (aReason) { console.error('Promise rejected - ', aReason); }
             ).catch(
                 function (aCaught) { console.error('Promise Error - ', aCaught); }
             );
@@ -374,11 +367,11 @@
         xNodeSuggLine.appendChild(xNodeSuggButton);
         xNodeDiv.appendChild(xNodeSuggLine);
         return xNodeDiv;
     },
     loadUI: function() {
-        echo("loadUI");
+        console.log("loadUI");
         this._strings = document.getElementById("grammarchecker-strings");
         let that = this;
         let nsGrammarCommand = {
             isCommandEnabled: function (aCommand, dummy) {
                 return (IsDocumentEditable() && !IsInHTMLSourceMode());
@@ -403,11 +396,12 @@
             document.persist(xNavBar.id, "currentset");
             try {
                 BrowserToolboxCustomizeDone(true);
             }
             catch (e) {
-                Cu.reportError(e);
+                console.error(e);
+                // Cu.reportError(e);
             }
         }
     },
     clearPreview: function() {
         let xPreview = document.getElementById("grammalecte-errors");
@@ -419,11 +413,12 @@
             try {
                 xEditor.QueryInterface(Ci.nsIEditorStyleSheets);
                 xEditor.addOverrideStyleSheet("chrome://grammarchecker/content/overlay.css");
             }
             catch (e) {
-                Cu.reportError(e);
+                console.error(e);
+                // Cu.reportError(e);
             }
         }
         this.setInfo("[vide]");
     },
     setInfo: function (sText) {
@@ -439,11 +434,12 @@
     openDialog: function (sWhat, sName="", sOptions="") {
         try {
             window.openDialog(sWhat, sName, sOptions);
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     },
     openInTabURL: function (sURL) {
         // method found in S3.Google.Translator
         try {
@@ -454,20 +450,22 @@
             if (xTabmail) {
                 xTabmail.openTab('contentTab', { contentPage: sURL });
             }
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     },
     openInBrowserURL: function (sURL) {
         // method found in S3.Google.Translator
         try {
             openURL(sURL);
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     },
     onParseText: function (e) {
         this.parse();
     },
@@ -477,24 +475,24 @@
     onOpenGCOptions: function (e) {
         let that = this;
         let xPromise = this.xGCEWorker.post('getDefaultOptions');
         xPromise.then(
             function (aVal) {
-                echo(aVal);
+                console.log(aVal);
                 prefs.setCharPref("sGCDefaultOptions", aVal);
             },
-            function (aReason) { echo('Promise rejected', aReason); }
+            function (aReason) { console.log('Promise rejected', aReason); }
         ).catch(
-            function (aCaught) { echo('Promise Error', aCaught); }
+            function (aCaught) { console.log('Promise Error', aCaught); }
         ).then(
             function () {
                 that.openDialog("chrome://grammarchecker/content/gc_options.xul", "", "chrome, dialog, modal, resizable=no");
                 that.setOptions();
             },
-            function (aReason) { echo('Error options dialog', aReason); }
+            function (aReason) { console.log('Error options dialog', aReason); }
         ).catch(
-            function (aCaught) { echo('Error', aCaught); }
+            function (aCaught) { console.log('Error', aCaught); }
         );
     },
     onOpenSpellOptions: function (e) {
         this.openDialog("chrome://grammarchecker/content/spell_options.xul", "", "chrome, dialog, modal, resizable=no");
     },
@@ -530,11 +528,12 @@
     _setDictionary: function (sDicName, sOptName) {
         try {
             oSpellControl.setExtensionDictFolder(sDicName, prefs.getBoolPref(sOptName));
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     }
 }
 
 
@@ -549,11 +548,12 @@
             } else {
                 this.reset();
             }
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     },
     apply: function () {
         try {
             this.saveOptions();
@@ -566,19 +566,20 @@
                 xEditor.writeParagraph(iParagraph, sParagraph);
                 iParagraph += 1;
             }
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     },
     saveOptions: function () {
         let oOptions = {};
         for (let xNode of document.getElementsByClassName("option")) {
             oOptions[xNode.id] = xNode.checked;
         }
-        //echo("save options: " + JSON.stringify(oOptions));
+        //console.log("save options: " + JSON.stringify(oOptions));
         prefs.setCharPref("sTFOptions", JSON.stringify(oOptions));
     },
     setOptionsInPanel: function (oOptions) {
         for (let sOptName in oOptions) {
             //console.log(sOptName + ":" + oOptions[sOptName]);
@@ -609,11 +610,12 @@
                     this.switchGroup(xNode.id);
                 }
             }
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
     },
     resetProgressBar: function () {
         document.getElementById('progressbar').value = 0;
         document.getElementById('time_res').textContent = "";
@@ -885,28 +887,30 @@
             //window.setCursor("auto"); // restore pointer
             const t1 = Date.now();
             document.getElementById('time_res').textContent = this.getTimeRes((t1-t0)/1000);
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
         return sText;
     },
     formatText: function (sText, sOptName) {
         let nCount = 0;
         try {
-            if (!tf.oReplTable.hasOwnProperty(sOptName)) {
-                echo("# Error. TF: there is no option “" + sOptName+ "”.");
+            if (!oReplTable.hasOwnProperty(sOptName)) {
+                console.log("# Error. TF: there is no option “" + sOptName+ "”.");
                 return [sText, nCount];
             }
-            for (let [zRgx, sRep] of tf.oReplTable[sOptName]) {
+            for (let [zRgx, sRep] of oReplTable[sOptName]) {
                 nCount += (sText.match(zRgx) || []).length;
                 sText = sText.replace(zRgx, sRep);
             }
         }
         catch (e) {
-            Cu.reportError(e);
+            console.error(e);
+            // Cu.reportError(e);
         }
         return [sText, nCount];
     }
 }
 
@@ -920,11 +924,11 @@
         oTextFormatter.resetProgressBar();
     }
 }, false);
 
 window.addEventListener("load", function (xEvent) {
-    oDictIgniter.init();
+    // oDictIgniter.init();
     oGrammarChecker.loadGC();
     //oGrammarChecker.fullTests();
 }, false);
 
 window.addEventListener("compose-window-init", function (xEvent) {

Index: gc_lang/fr/tb/content/overlay.xul
==================================================================
--- gc_lang/fr/tb/content/overlay.xul
+++ gc_lang/fr/tb/content/overlay.xul
@@ -4,15 +4,18 @@
 <!DOCTYPE overlay SYSTEM "chrome://grammarchecker/locale/overlay.dtd">
 
 <overlay id="grammarchecker-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="overlay.js"/>
-  <script type="application/x-javascript" src="file_handler.js"/>
-  <script type="application/x-javascript" src="spellchecker.js"/>
-  <script type="application/x-javascript" src="editor.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="resource://grammalecte/text.js"/>
+  <script type="application/javascript" src="resource://grammalecte/fr/textformatter.js"/>
+  <script type="application/javascript" src="overlay.js"/>
+  <script type="application/javascript" src="file_handler.js"/>
+  <script type="application/javascript" src="spellchecker.js"/>
+  <script type="application/javascript" src="editor.js"/>
+
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="grammarchecker-strings" src="chrome://grammarchecker/locale/grammarchecker.properties"/>
   </stringbundleset>
 

Index: gc_lang/fr/tb/content/spell_options.css
==================================================================
--- gc_lang/fr/tb/content/spell_options.css
+++ gc_lang/fr/tb/content/spell_options.css
@@ -19,7 +19,26 @@
 .dicdescr {
 	margin-left: 27px;
 }
 
 .disabled {
-	opacity: .25;
+  opacity: .25;
+}
+
+
+/*
+    TB Next: fix dialogheaders
+*/
+dialogheader {
+  -moz-binding: url("chrome://messenger/content/generalBindings.xml#dialogheader");
+  margin: 0 5px 5px;
+  border: 1px solid ThreeDDarkShadow;
+  padding: 5px 8px;
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.dialogheader-title {
+  margin: 0 !important;
+  font-size: larger;
+  font-weight: bold;
 }

Index: gc_lang/fr/tb/content/spell_options.js
==================================================================
--- gc_lang/fr/tb/content/spell_options.js
+++ gc_lang/fr/tb/content/spell_options.js
@@ -3,23 +3,18 @@
 "use strict";
 
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+// const Cu = Components.utils;
 const prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService).getBranch("extensions.grammarchecker.");
-const { require } = Cu.import("resource://gre/modules/commonjs/toolkit/require.js", {});
-
-
-function echo (...args) {
-	Services.console.logStringMessage(args.join(" -- ") + "\n");
-}
 
 
 var oDialogControl = {
 	load: function () {
 		try {
+			document.getElementById('grammalecte-spelloptions-window').centerWindowOnScreen();
 			// Graphspell dictionaries
 			document.getElementById('personal_dic').checked = prefs.getBoolPref('bPersonalDictionary');
 			// Hunspell dictionaries
 			document.getElementById('fr-FR-modern').checked = prefs.getBoolPref('bDictModern');
 			document.getElementById('fr-FR-classic').checked = prefs.getBoolPref('bDictClassic');
@@ -27,11 +22,12 @@
 			document.getElementById('fr-FR-classic-reform').checked = prefs.getBoolPref('bDictClassicReform');
 			// center window
 			document.getElementById('grammalecte-spelloptions-window').centerWindowOnScreen();
 		}
 		catch (e) {
-			Cu.reportError(e);
+			console.error(e);
+			// Cu.reportError(e);
 		}
 	},
 	setDictionaries: function () {
 		oSpellControl.init();
 		this._setGraphspellDictionaries();
@@ -45,13 +41,14 @@
 			let bActivate = document.getElementById(sDicName).checked;
 			oSpellControl.setExtensionDictFolder(sDicName, bActivate);
 			prefs.setBoolPref(sOptName, bActivate);
 		}
 		catch (e) {
-			Cu.reportError(e);
+			console.error(e);
+			// Cu.reportError(e);
 		}
 	},
 	_setGraphspellDictionaries: function () {
 		let bActivate = document.getElementById('personal_dic').checked;
 		prefs.setBoolPref("bPersonalDictionary", bActivate);
 	}
 };

Index: gc_lang/fr/tb/content/spell_options.xul
==================================================================
--- gc_lang/fr/tb/content/spell_options.xul
+++ gc_lang/fr/tb/content/spell_options.xul
@@ -9,33 +9,35 @@
   title="&window.title;"
   orient="vertical"
   buttons="accept,cancel"
   ondialogaccept="oDialogControl.setDictionaries();"
   ondialogcancel="return;"
-  width="800"
-  height="680"
+  width="400"
+  height="480"
   onload="oDialogControl.load();"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Other elements go here -->
-  
+
   <dialogheader id="grammalecte-title" title="&dialogheader.label;" description=""/>
 
   <hbox>
+    <!--
     <groupbox with="380">
       <caption id="grouptitle" label="&grouptitle_hunspell;" />
       <description id="warning">&warning_hunspell;</description>
-      
+
       <checkbox id="fr-FR-modern" class="option" label="&option.modern.label;" />
       <description class="dicdescr">&option.modern.descr;</description>
       <checkbox id="fr-FR-classic" class="option" label="&option.classic.label;" />
       <description class="dicdescr">&option.classic.descr;</description>
       <checkbox id="fr-FR-reform" class="option" label="&option.reform.label;" />
       <description class="dicdescr">&option.reform.descr;</description>
       <checkbox id="fr-FR-classic-reform" class="option" label="&option.allvar.label;" />
       <description class="dicdescr">&option.allvar.descr;</description>
     </groupbox>
+    -->
 
     <groupbox with="380">
       <caption id="grouptitle" label="&grouptitle_graphspell;" />
       <description id="warning">&warning_graphspell;</description>
 
@@ -51,9 +53,9 @@
       <checkbox id="personal_dic" class="option" label="&option.personal_dic.label;" />
       <description class="dicdescr">&option.personal_dic.descr;</description>
     </groupbox>
   </hbox>
 
-  <script type="application/x-javascript" src="spell_options.js"/>
-  <script type="application/x-javascript" src="spellchecker.js"/>
+  <script type="application/javascript" src="spell_options.js"/>
+  <script type="application/javascript" src="spellchecker.js"/>
 
 </dialog>

Index: gc_lang/fr/tb/content/spellchecker.js
==================================================================
--- gc_lang/fr/tb/content/spellchecker.js
+++ gc_lang/fr/tb/content/spellchecker.js
@@ -1,154 +1,158 @@
 // JavaScript
 
 /*
-	Hunspell wrapper
-
-	XPCOM obsolete (?), but there is nothing else...
-	Overly complicated and weird. To throw away ASAP if possible.
-
-	And you can’t access to this from a PromiseWorker (it sucks).
-
-	https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Reference/Interface/mozISpellCheckingEngine
-	https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Using_spell_checking_in_XUL
-	https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Reference/Interface/nsIFile
-	https://developer.mozilla.org/en-US/docs/Mozilla/JavaScript_code_modules/FileUtils.jsm
+    Hunspell wrapper
+
+    XPCOM obsolete (?), but there is nothing else...
+    Overly complicated and weird. To throw away ASAP if possible.
+
+    And you can’t access to this from a PromiseWorker (it sucks).
+
+    https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Reference/Interface/mozISpellCheckingEngine
+    https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Using_spell_checking_in_XUL
+    https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Reference/Interface/nsIFile
+    https://developer.mozilla.org/en-US/docs/Mozilla/JavaScript_code_modules/FileUtils.jsm
 */
 
 "use strict";
 
 /*
+// Loaded in another file
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 const { require } = Cu.import("resource://gre/modules/commonjs/toolkit/require.js", {});
 */
 
-
-const FileUtils = Cu.import("resource://gre/modules/FileUtils.jsm").FileUtils;
-const AddonManager = Cu.import("resource://gre/modules/AddonManager.jsm").AddonManager;
-
-/*
-const parser = Cc["@mozilla.org/parserutils;1"].getService(Ci.nsIParserUtils);
-const persodict = Cc["@mozilla.org/spellchecker/personaldictionary;1"].getService(Ci.mozIPersonalDictionary);
-*/
-
-const system = require("sdk/system");
+const FileUtils = ChromeUtils.import("resource://gre/modules/FileUtils.jsm").FileUtils;
+const AddonManager = ChromeUtils.import("resource://gre/modules/AddonManager.jsm").AddonManager;
 
 
 var oSpellControl = {
-	xSCEngine: null,
-	init: function () {
-		if (this.xSCEngine === null) {
-			try {
-				let sSpellchecker = "@mozilla.org/spellchecker/myspell;1";
-				if ("@mozilla.org/spellchecker/hunspell;1" in Cc) {
-				    sSpellchecker = "@mozilla.org/spellchecker/hunspell;1";
-				}
-				if ("@mozilla.org/spellchecker/engine;1" in Cc) {
-				    sSpellchecker = "@mozilla.org/spellchecker/engine;1";
-				}
-				this.xSCEngine = Cc[sSpellchecker].getService(Ci.mozISpellCheckingEngine);
-			}
-			catch (e) {
-				echo("Can’t initiate the spellchecker.");
-				Cu.reportError(e);
-			}
-		}
-	},
-	getDictionariesList: function () {
-		this.init();
-		try {
-			let l = {};
-			let c = {};
-			this.xSCEngine.getDictionaryList(l, c);
-			return l.value;
-		}
-		catch (e) {
-			Cu.reportError(e);
-			return [];
-		}
-	},
-	setDictionary: function (sLocale) {
-		if (this.getDictionariesList().includes(sLocale)) {
-			try {
-				this.xSCEngine.dictionary = sLocale; // en-US, fr, etc.
-				return true;
-			}
-			catch (e) {
-				Cu.reportError(e);
-				return false;
-			}
-		} else {
-			echo("Warning. No dictionary for locale: " + sLocale);
-			echo("Existing dictionaries: " + this.getDictionariesList().join(" | "));
-		}
-		return false;
-	},
-	check: function (sWord) {
-		// todo: check in personal dict?
-		try {
-			return this.xSCEngine.check(sWord);
-		}
-		catch (e) {
-			Cu.reportError(e);
-			return false;
-		}
-	},
-	suggest: function (sWord) {
-		try {
-			let lSugg = {};
-			this.xSCEngine.suggest(sWord, lSugg, {});
-			return lSugg.value;
-		   	// lSugg.value is a JavaScript Array of strings
-		}
-		catch (e) {
-			Cu.reportError(e);
-			return ['#Erreur.'];
-		}
-	},
-	addDirectory: function (sFolder) {
-		try {
-			let xNsiFolder = new FileUtils.File(sFolder);
-			this.xSCEngine.addDirectory(xNsiFolder);
-		}
-		catch (e) {
-			echo("Unable to add directory: " + sFolder);
-			Cu.reportError(e);
-		}
-	},
-	removeDirectory: function (sFolder) {
-		// does not work but no exception raised (bug?)
-		try {
-			let xNsiFolder = new FileUtils.File(sFolder);
-			this.xSCEngine.removeDirectory(xNsiFolder);
-		}
-		catch (e) {
-			echo("Unable to remove directory: " + sFolder);
-			Cu.reportError(e);
-		}
-	},
-	setExtensionDictFolder: function (sDictName, bActivate) {
-		try {
-			let that = this;
-			let sPath = "/content/dictionaries/" + sDictName;
-			AddonManager.getAddonByID("French-GC-TB@grammalecte.net", function (addon) {
-				let xURI = addon.getResourceURI(sPath);
-				//console.log("> " + xURI.path);
-				let sFolder = xURI.path;
-				if (system.platform === "winnt") {
-					sFolder = sFolder.slice(1).replace(/\//g, "\\\\");
-				}
-				//console.log("> " + sFolder);
-				if (bActivate) {
-					that.addDirectory(sFolder);
-				} else {
-					that.removeDirectory(sFolder);
-				}
-			});
-		}
-		catch (e) {
-			echo("Unable to add extension folder");
-			Cu.reportError(e);
-		}
-	}
+    xSCEngine: null,
+    init: function () {
+        if (this.xSCEngine === null) {
+            try {
+                let sSpellchecker = "@mozilla.org/spellchecker/myspell;1";
+                if ("@mozilla.org/spellchecker/hunspell;1" in Cc) {
+                    sSpellchecker = "@mozilla.org/spellchecker/hunspell;1";
+                }
+                if ("@mozilla.org/spellchecker/engine;1" in Cc) {
+                    sSpellchecker = "@mozilla.org/spellchecker/engine;1";
+                }
+                this.xSCEngine = Cc[sSpellchecker].getService(Ci.mozISpellCheckingEngine);
+            }
+            catch (e) {
+                console.log("Can’t initiate the spellchecker.");
+                console.error(e);
+                // Cu.reportError(e);
+            }
+        }
+    },
+    getDictionariesList: function () {
+        this.init();
+        try {
+            let l = {};
+            let c = {};
+            this.xSCEngine.getDictionaryList(l, c);
+            return l.value;
+        }
+        catch (e) {
+            console.error(e);
+            // Cu.reportError(e);
+            return [];
+        }
+    },
+    setDictionary: function (sLocale) {
+        if (this.getDictionariesList().includes(sLocale)) {
+            try {
+                this.xSCEngine.dictionary = sLocale; // en-US, fr, etc.
+                return true;
+            }
+            catch (e) {
+                console.error(e);
+                // Cu.reportError(e);
+                return false;
+            }
+        } else {
+            console.log("Warning. No dictionary for locale: " + sLocale);
+            console.log("Existing dictionaries: " + this.getDictionariesList().join(" | "));
+        }
+        return false;
+    },
+    check: function (sWord) {
+        // todo: check in personal dict?
+        try {
+            return this.xSCEngine.check(sWord);
+        }
+        catch (e) {
+            console.error(e);
+            // Cu.reportError(e);
+            return false;
+        }
+    },
+    suggest: function (sWord) {
+        try {
+            let lSugg = {};
+            this.xSCEngine.suggest(sWord, lSugg, {});
+            return lSugg.value;
+            // lSugg.value is a JavaScript Array of strings
+        }
+        catch (e) {
+            console.error(e);
+            // Cu.reportError(e);
+            return ['#Erreur.'];
+        }
+    },
+    addDirectory: function (sFolder) {
+        try {
+            let xNsiFolder = new FileUtils.File(sFolder);
+            this.xSCEngine.addDirectory(xNsiFolder);
+        }
+        catch (e) {
+            console.log("Unable to add directory: " + sFolder);
+            console.error(e);
+            // Cu.reportError(e);
+        }
+    },
+    removeDirectory: function (sFolder) {
+        // does not work but no exception raised (bug?)
+        try {
+            let xNsiFolder = new FileUtils.File(sFolder);
+            this.xSCEngine.removeDirectory(xNsiFolder);
+        }
+        catch (e) {
+            console.log("Unable to remove directory: " + sFolder);
+            console.error(e);
+            // Cu.reportError(e);
+        }
+    },
+    setExtensionDictFolder: function (sDictName, bActivate) {
+        try {
+            let that = this;
+            let sPath = "/content/dictionaries/" + sDictName;
+            AddonManager.getAddonByID("French-GC-TB@grammalecte.net", function (addon) {
+                let xURI = addon.getResourceURI(sPath);
+                //console.log(xURI);
+                let sFolder = xURI.filePath;
+                if (sFolder !== undefined) {
+                    if (/^\/[A-Z]:\//.test(sFolder)) {
+                        // Windows path
+                        sFolder = sFolder.slice(1).replace(/\//g, "\\\\");
+                    }
+                    console.log("folder: " + sFolder);
+                    if (bActivate) {
+                        that.addDirectory(sFolder);
+                    } else {
+                        that.removeDirectory(sFolder);
+                    }
+                }
+            });
+        }
+        catch (e) {
+            console.log("Unable to add extension folder");
+            console.error(e);
+            // Cu.reportError(e);
+        }
+    }
 };

Index: gc_lang/fr/tb/install.rdf
==================================================================
--- gc_lang/fr/tb/install.rdf
+++ gc_lang/fr/tb/install.rdf
@@ -7,17 +7,17 @@
     <em:type>2</em:type>
     <em:version>${version}</em:version>
     <em:creator>${author}</em:creator>
     <em:description>${description}</em:description>
     <em:homepageURL>${link}</em:homepageURL>
-    <em:optionsURL>chrome://grammarchecker/content/options.xul</em:optionsURL>
+    <!--<em:optionsURL>chrome://grammarchecker/content/options.xul</em:optionsURL>-->
     <em:unpack>true</em:unpack>
 
     <em:targetApplication>
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> <!-- thunderbird -->
-        <em:minVersion>45.8.0</em:minVersion>
-        <em:maxVersion>56.*</em:maxVersion>
+        <em:minVersion>59.0</em:minVersion>
+        <em:maxVersion>61.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>
 </RDF>

Index: gc_lang/fr/tb/locale/en/options.dtd
==================================================================
--- gc_lang/fr/tb/locale/en/options.dtd
+++ gc_lang/fr/tb/locale/en/options.dtd
@@ -1,7 +1,6 @@
-<!ENTITY prefwindow.title "Grammalecte · Options">
-<!ENTITY pane1.title "Other options">
-<!ENTITY pane1.description "Options are available in the menu Grammalecte in composing windows.">
-<!ENTITY mothertongue.label "Mother tongue:">
-<!ENTITY mothertongue.accesskey "M">
+<!ENTITY window.title "Grammalecte · Options">
+<!ENTITY dialogheader.label "Other options">
 <!ENTITY check_signature.label "Check signature text (in text mode)">
 <!ENTITY check_signature.accesskey "C">
+
+

Index: gc_lang/fr/tb/locale/fr/options.dtd
==================================================================
--- gc_lang/fr/tb/locale/fr/options.dtd
+++ gc_lang/fr/tb/locale/fr/options.dtd
@@ -1,7 +1,4 @@
-<!ENTITY prefwindow.title "Grammalecte · Options">
-<!ENTITY pane1.title "Autres options">
-<!ENTITY pane1.description "Les options sont disponibles dans le menu Grammalecte des fenêtres de rédaction.">
-<!ENTITY mothertongue.label "Langue maternelle:">
-<!ENTITY mothertongue.accesskey "M">
+<!ENTITY window.title "Grammalecte · Options">
+<!ENTITY dialogheader.label "Autres options">
 <!ENTITY check_signature.label "Vérifier le texte de la signature (en mode texte)">
 <!ENTITY check_signature.accesskey "V">

Index: graphspell-js/helpers.js
==================================================================
--- graphspell-js/helpers.js
+++ graphspell-js/helpers.js
@@ -51,18 +51,11 @@
         // load ressources in workers (suggested by Mozilla extensions reviewers)
         // for more options have a look here: https://gist.github.com/Noitidart/ec1e6b9a593ec7e3efed
         // if not in workers, use sdk/data.load() instead
         try {
             let xRequest;
-            if (typeof XMLHttpRequest !== "undefined") {
-                xRequest = new XMLHttpRequest();
-            } else {
-                // JS sucks again… necessary for Thunderbird
-                let { Cc, Ci } = require("chrome");
-                xRequest = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance();
-                xRequest.QueryInterface(Ci.nsIXMLHttpRequest);
-            }
+            xRequest = new XMLHttpRequest();
             xRequest.open('GET', spf, false); // 3rd arg is false for synchronous, sync is acceptable in workers
             xRequest.overrideMimeType('text/json');
             xRequest.send();
             return xRequest.responseText;
         }

Index: make.py
==================================================================
--- make.py
+++ make.py
@@ -363,10 +363,11 @@
     xParser.add_argument("-apd", "--add_personal_dictionary", help="add personal dictionary to the build", action="store_true")
     xParser.add_argument("-fx", "--firefox", help="Launch Firefox Developper for WebExtension testing", action="store_true")
     xParser.add_argument("-we", "--web_ext", help="Launch Firefox Nightly for WebExtension testing", action="store_true")
     xParser.add_argument("-l", "--lint_web_ext", help="web-ext lint on the WebExtension", action="store_true")
     xParser.add_argument("-tb", "--thunderbird", help="Launch Thunderbird", action="store_true")
+    xParser.add_argument("-tbb", "--thunderbird_beta", help="Launch Thunderbird Beta", action="store_true")
     xParser.add_argument("-i", "--install", help="install the extension in Writer (path of unopkg must be set in config.ini)", action="store_true")
     xArgs = xParser.parse_args()
 
     if xArgs.build_data:
         xArgs.build_data_before = True
@@ -456,15 +457,21 @@
                     # https://github.com/mozilla/web-ext/issues/932
                     # os.system(r'web-ext run --firefox="' + spfFirefox + r'" --browser-console --firefox-profile=C:\Users\EAK\AppData\Roaming\Mozilla\Firefox\Profiles\e26559tw.debug --keep-profile-changes')
 
             # Thunderbird
             if xArgs.thunderbird:
-                os.system("thunderbird -jsconsole -P debug")
+                spfThunderbird = '"'+dVars['win_tb_path']+'"'  if platform.system() == "Windows"  else dVars['linux_tb_path']
+                print(spfThunderbird)
+                os.system(spfThunderbird + ' -jsconsole -P debug')
+            if xArgs.thunderbird_beta:
+                spfThunderbird = '"'+dVars['win_tb_beta_path']+'"'  if platform.system() == "Windows"  else dVars['linux_tb_beta_path']
+                print(spfThunderbird)
+                os.system(spfThunderbird + ' -jsconsole -P beta')
         else:
             print("Folder not found: gc_lang/"+sLang)
 
     oNow = datetime.datetime.now()
     print("============== MAKE GRAMMALECTE [finished] at {0.hour:>2} h {0.minute:>2} min {0.second:>2} s ==============".format(oNow))
 
 
 if __name__ == '__main__':
     main()