Index: gc_lang/fr/xpi/data/gc_panel.js
==================================================================
--- gc_lang/fr/xpi/data/gc_panel.js
+++ gc_lang/fr/xpi/data/gc_panel.js
@@ -43,14 +43,12 @@
 
 self.port.on("addParagraph", function (sText, iParagraph, sJSON) {
 	addParagraph(sText, iParagraph, sJSON);
 });
 
-self.port.on("refreshParagraph", function (sIdParagr, sHtml) {
-	document.getElementById("paragr"+sIdParagr).innerHTML = sHtml;
-	let sClassName = (sHtml.includes('<u id="err')) ? "paragraph softred" : "paragraph softgreen";
-	document.getElementById("paragr"+sIdParagr).className = sClassName;
+self.port.on("refreshParagraph", function (sText, sIdParagr, sJSON) {
+	refreshParagraph(sText, sIdParagr, sJSON);
 });
 
 self.port.on("showMessage", function (sText) {
 	document.getElementById("message").textContent = sText;
 	document.getElementById("messagebox").style.display = "block";
@@ -127,17 +125,15 @@
 		let xNodeDiv = document.createElement("div");
 		xNodeDiv.className = "paragraph_block";
 		// paragraph
 		let xParagraph = document.createElement("p");
 		xParagraph.id = "paragr" + iParagraph.toString();
-		xParagraph.className = (true) ? "paragraph" : "paragraph softred";
 		xParagraph.lang = "fr";
-		xParagraph.style.spellchecker = "false";
+		xParagraph.setAttribute("spellcheck", false);
 		let oErrors = JSON.parse(sJSON);
-		let aSpellErr = oErrors.aSpellErr;
-		let aGrammErr = oErrors.aGrammErr;
-		_tagParagraph(sText, xParagraph, iParagraph, aGrammErr, aSpellErr);
+		xParagraph.className = (oErrors.aGrammErr.length || oErrors.aSpellErr.length) ? "paragraph softred" : "paragraph";
+		_tagParagraph(sText, xParagraph, iParagraph, oErrors.aGrammErr, oErrors.aSpellErr);
 		xNodeDiv.appendChild(xParagraph);
 		// actions
 		let xDivActions = document.createElement("div");
 		xDivActions.className = "actions";
 		let xDivClose = document.createElement("div");
@@ -156,10 +152,23 @@
 		xDivActions.appendChild(xDivEdit);
 		xDivActions.appendChild(xDivCheck);
 		xNodeDiv.appendChild(xDivActions);
 		document.getElementById("errorlist").appendChild(xNodeDiv);
 	}
+	catch (e) {
+		showError(e);
+	}
+}
+
+function refreshParagraph (sText, sIdParagr, sJSON) {
+	try {
+		let xParagraph = document.getElementById("paragr"+sIdParagr);
+		let oErrors = JSON.parse(sJSON);
+		xParagraph.className = (oErrors.aGrammErr.length || oErrors.aSpellErr.length) ? "paragraph softred" : "paragraph softgreen";
+		xParagraph.textContent = "";
+		_tagParagraph(sText, xParagraph, sIdParagr, oErrors.aGrammErr, oErrors.aSpellErr);
+	}
 	catch (e) {
 		showError(e);
 	}
 }
 
@@ -217,11 +226,11 @@
 
 function _getGrammarTooltip (oErr) {
 	let xSpan = document.createElement("span");
 	xSpan.id = "tooltip" + oErr['sId'];
 	xSpan.className = "tooltip";
-	xSpan.setAttribute("contenteditable", "false");
+	xSpan.setAttribute("contenteditable", false);
 	xSpan.appendChild(document.createTextNode(oErr["sMessage"]+" "));
 	xSpan.appendChild(_createIgnoreButton(oErr["sId"]));
 	if (oErr["URL"] !== "") {
 		xSpan.appendChild(_createInfoLink(oErr["URL"]));
 	}

Index: gc_lang/fr/xpi/gce_worker.js
==================================================================
--- gc_lang/fr/xpi/gce_worker.js
+++ gc_lang/fr/xpi/gce_worker.js
@@ -88,22 +88,10 @@
     let aGrammErr = gce.parse(sText, sLang, bDebug, bContext);
     let aSpellErr = oTokenizer.getSpellingErrors(sText, oDict);
     return JSON.stringify({ aGrammErr: aGrammErr, aSpellErr: aSpellErr });
 }
 
-function parseAndTag (sText, iParagraph, sLang, bDebug) {
-    sText = text.addHtmlEntities(sText);
-    let aGrammErr = gce.parse(sText, sLang, bDebug);
-    let aSpellErr = oTokenizer.getSpellingErrors(sText, oDict);
-    let sHtml = text.tagParagraph(sText, iParagraph, aGrammErr, aSpellErr);
-    return sHtml;
-}
-
-function parseAndGenerateParagraph (sText, iParagraph, sLang, bDebug) {
-    return text.createHTMLBlock(parseAndTag(sText, iParagraph, sLang, bDebug), iParagraph);
-}
-
 function getOptions () {
     return gce.getOptions()._toString();
 }
 
 function getDefaultOptions () {

Index: gc_lang/fr/xpi/ui.js
==================================================================
--- gc_lang/fr/xpi/ui.js
+++ gc_lang/fr/xpi/ui.js
@@ -347,14 +347,15 @@
     }
     return true;
 }
 
 function checkAndSendToPanel (sIdParagraph, sText) {
-    let xPromise = xGCEWorker.post('parseAndTag', [sText, parseInt(sIdParagraph), "FR", false]);
+    let xPromise = xGCEWorker.post('parseAndSpellcheck', [sText, "FR", false, false]);
     xPromise.then(
         function (aVal) {
-            xGCPanel.port.emit("refreshParagraph", sIdParagraph, aVal);
+            sText = text.addHtmlEntities(sText);
+            xGCPanel.port.emit("refreshParagraph", sText, sIdParagraph, aVal);
         },
         function (aReason) {
             console.error('Promise rejected - ', aReason);
         }
     ).catch(