diff --git a/packages/editor/lang/de.json b/packages/editor/lang/de.json
index c67fa4b8..371b4934 100644
--- a/packages/editor/lang/de.json
+++ b/packages/editor/lang/de.json
@@ -113,9 +113,6 @@
     "editor-panel.tooltip-topic-border-color": {
         "defaultMessage": "Randfarbe"
     },
-    "editor-panel.tooltip-topic-fill-color": {
-        "defaultMessage": "Füllfarbe"
-    },
     "editor-panel.tooltip-topic-font-bigger": {
         "defaultMessage": "Größer"
     },
@@ -221,19 +218,40 @@
     "icon-picker.show-images": {
         "defaultMessage": "Bilder anzeigen"
     },
-    "editor-panel.tooltip-connection-style": {
-        "defaultMessage": "Verbindungsstil"
-    },
-    "editor-panel.tooltip-connection-style-curved-thin": {
-        "defaultMessage": "Dünne Kurve"
-    },
-    "editor-panel.tooltip-connection-style-curved-thick": {
-        "defaultMessage": "Dicke Kurve"
-    },
     "editor-panel.tooltip-connection-style-polyline": {
         "defaultMessage": "Polylinie"
     },
     "editor-panel.tooltip-connection-style-polyline-curved": {
-        "defaultMessage": "Gekrümmte Polylinie"
+        "defaultMessage": "Gebogene Polylinie"
+    },
+    "shortcut-help-pane.overwrite-edit-topic": {
+        "defaultMessage": "Thementext überschreiben"
+    },
+    "shortcut-help-pane.overwrite-edit-topic-key": {
+        "defaultMessage": "Beginnen Sie mit dem Schreiben über das ausgewählte Thema"
+    },
+    "editor-panel.tooltip-connection-color": {
+        "defaultMessage": "Farbe"
+    },
+    "editor-panel.tooltip-connection-color-default": {
+        "defaultMessage": "Standardfarbe"
+    },
+    "editor-panel.tooltip-connection-style": {
+        "defaultMessage": "Verbindungsstil"
+    },
+    "editor-panel.tooltip-connection-style-curved-thick": {
+        "defaultMessage": "Weite Kurve"
+    },
+    "editor-panel.tooltip-connection-style-curved-thin": {
+        "defaultMessage": "Schlanke Kurve"
+    },
+    "editor-panel.tooltip-topic-border-color-default": {
+        "defaultMessage": "Standardrandfarbe"
+    },
+    "editor-panel.tooltip-topic-fill-color": {
+        "defaultMessage": "Füllfarbe"
+    },
+    "editor-panel.tooltip-topic-fill-color-default": {
+        "defaultMessage": "Standardfüllfarbe"
     }
 }
\ No newline at end of file
diff --git a/packages/editor/lang/en.json b/packages/editor/lang/en.json
index 3b45d93f..eb398ec7 100644
--- a/packages/editor/lang/en.json
+++ b/packages/editor/lang/en.json
@@ -62,14 +62,20 @@
   "editor-panel.tooltip-add-topic": {
     "defaultMessage": "Add Topic"
   },
+  "editor-panel.tooltip-connection-color": {
+    "defaultMessage": "Color"
+  },
+  "editor-panel.tooltip-connection-color-default": {
+    "defaultMessage": "Default color"
+  },
   "editor-panel.tooltip-connection-style": {
     "defaultMessage": "Connection Style"
   },
-  "editor-panel.tooltip-connection-style-curved-thin": {
-    "defaultMessage": "Thin Curve"
-  },
   "editor-panel.tooltip-connection-style-curved-thick": {
-    "defaultMessage": "Think Curve"
+    "defaultMessage": "Thick Curved"
+  },
+  "editor-panel.tooltip-connection-style-curved-thin": {
+    "defaultMessage": "Thin Curved"
   },
   "editor-panel.tooltip-connection-style-polyline": {
     "defaultMessage": "Simple Polyline"
@@ -83,9 +89,15 @@
   "editor-panel.tooltip-topic-border-color": {
     "defaultMessage": "Border color"
   },
+  "editor-panel.tooltip-topic-border-color-default": {
+    "defaultMessage": "Default border color"
+  },
   "editor-panel.tooltip-topic-fill-color": {
     "defaultMessage": "Fill color"
   },
+  "editor-panel.tooltip-topic-fill-color-default": {
+    "defaultMessage": "Default fill color"
+  },
   "editor-panel.tooltip-topic-font-bigger": {
     "defaultMessage": "Bigger"
   },
@@ -192,7 +204,7 @@
     "defaultMessage": "Edit topic text"
   },
   "shortcut-help-pane.edit-topic-key": {
-    "defaultMessage": "Just start typing"
+    "defaultMessage": "F2 or Double Click"
   },
   "shortcut-help-pane.navigation": {
     "defaultMessage": "Navigation"
@@ -200,6 +212,12 @@
   "shortcut-help-pane.navigation-keys": {
     "defaultMessage": "Arrow keys"
   },
+  "shortcut-help-pane.overwrite-edit-topic": {
+    "defaultMessage": "Overwrite topic text"
+  },
+  "shortcut-help-pane.overwrite-edit-topic-key": {
+    "defaultMessage": "Type on a selected topic"
+  },
   "shortcut-help-pane.redo": {
     "defaultMessage": "Redo edition"
   },
diff --git a/packages/editor/lang/es.json b/packages/editor/lang/es.json
index d1af87b5..bc8f5631 100644
--- a/packages/editor/lang/es.json
+++ b/packages/editor/lang/es.json
@@ -95,9 +95,6 @@
     "editor-panel.tooltip-topic-border-color": {
         "defaultMessage": "Color del border"
     },
-    "editor-panel.tooltip-topic-fill-color": {
-        "defaultMessage": "Color del figura"
-    },
     "editor-panel.tooltip-topic-font-bigger": {
         "defaultMessage": "Incrementar"
     },
@@ -215,19 +212,40 @@
     "icon-picker.show-images": {
         "defaultMessage": "Mostrar imagenes"
     },
-    "editor-panel.tooltip-connection-style": {
-        "defaultMessage": "Estilo de Connexión"
-    },
-    "editor-panel.tooltip-connection-style-curved-thin": {
-        "defaultMessage": "Curva fina"
-    },
-    "editor-panel.tooltip-connection-style-curved-thick": {
-        "defaultMessage": "Curva guesa"
-    },
     "editor-panel.tooltip-connection-style-polyline": {
         "defaultMessage": "Polilinea"
     },
     "editor-panel.tooltip-connection-style-polyline-curved": {
         "defaultMessage": "Polilinea Curva"
+    },
+    "shortcut-help-pane.overwrite-edit-topic": {
+        "defaultMessage": "Sobrescribir el texto del tópico"
+    },
+    "shortcut-help-pane.overwrite-edit-topic-key": {
+        "defaultMessage": "Comenzar a escibribir en el tópico seleccionado"
+    },
+    "editor-panel.tooltip-connection-color": {
+        "defaultMessage": "Color"
+    },
+    "editor-panel.tooltip-connection-color-default": {
+        "defaultMessage": "Color por defecto"
+    },
+    "editor-panel.tooltip-connection-style": {
+        "defaultMessage": "Estilo de conexión"
+    },
+    "editor-panel.tooltip-connection-style-curved-thick": {
+        "defaultMessage": "Curva ancha"
+    },
+    "editor-panel.tooltip-connection-style-curved-thin": {
+        "defaultMessage": "Curva delgada"
+    },
+    "editor-panel.tooltip-topic-border-color-default": {
+        "defaultMessage": "Color de border por defecto"
+    },
+    "editor-panel.tooltip-topic-fill-color": {
+        "defaultMessage": "Color de relleno"
+    },
+    "editor-panel.tooltip-topic-fill-color-default": {
+        "defaultMessage": "Color de relleno por defecto"
     }
 }
\ No newline at end of file
diff --git a/packages/editor/lang/fr.json b/packages/editor/lang/fr.json
index 0ebf7713..bc5ec6c9 100644
--- a/packages/editor/lang/fr.json
+++ b/packages/editor/lang/fr.json
@@ -95,9 +95,6 @@
     "editor-panel.tooltip-topic-border-color": {
         "defaultMessage": "Color del borde"
     },
-    "editor-panel.tooltip-topic-fill-color": {
-        "defaultMessage": "Color del cotenido"
-    },
     "editor-panel.tooltip-topic-font-bigger": {
         "defaultMessage": "Grande"
     },
@@ -215,19 +212,40 @@
     "icon-picker.show-images": {
         "defaultMessage": "Afficher les images"
     },
-    "editor-panel.tooltip-connection-style": {
-        "defaultMessage": "Style de connexion"
-    },
-    "editor-panel.tooltip-connection-style-curved-thin": {
-        "defaultMessage": "Mince courbe"
-    },
-    "editor-panel.tooltip-connection-style-curved-thick": {
-        "defaultMessage": "épaisse courbé"
-    },
     "editor-panel.tooltip-connection-style-polyline": {
         "defaultMessage": "Polyligne"
     },
     "editor-panel.tooltip-connection-style-polyline-curved": {
-        "defaultMessage": "Polyligne courbe"
+        "defaultMessage": "Courbe polyligne"
+    },
+    "shortcut-help-pane.overwrite-edit-topic": {
+        "defaultMessage": "Sobrescribir el texto del tópico"
+    },
+    "shortcut-help-pane.overwrite-edit-topic-key": {
+        "defaultMessage": "Commencer à écrire sur le sujet sélectionné"
+    },
+    "editor-panel.tooltip-connection-color": {
+        "defaultMessage": "Couleur"
+    },
+    "editor-panel.tooltip-connection-color-default": {
+        "defaultMessage": "Couleur par défaut"
+    },
+    "editor-panel.tooltip-connection-style": {
+        "defaultMessage": "Style de connexion"
+    },
+    "editor-panel.tooltip-connection-style-curved-thick": {
+        "defaultMessage": "Courbe large"
+    },
+    "editor-panel.tooltip-connection-style-curved-thin": {
+        "defaultMessage": "Courbe mince"
+    },
+    "editor-panel.tooltip-topic-border-color-default": {
+        "defaultMessage": "Couleur de bordure par défaut"
+    },
+    "editor-panel.tooltip-topic-fill-color": {
+        "defaultMessage": "La couleur de remplissage"
+    },
+    "editor-panel.tooltip-topic-fill-color-default": {
+        "defaultMessage": "Color de relleno por defecto"
     }
 }
\ No newline at end of file
diff --git a/packages/editor/src/compiled-lang/de.json b/packages/editor/src/compiled-lang/de.json
index 0e44521a..c8da8953 100644
--- a/packages/editor/src/compiled-lang/de.json
+++ b/packages/editor/src/compiled-lang/de.json
@@ -131,6 +131,18 @@
       "value": "Thema hinzufügen"
     }
   ],
+  "editor-panel.tooltip-connection-color": [
+    {
+      "type": 0,
+      "value": "Farbe"
+    }
+  ],
+  "editor-panel.tooltip-connection-color-default": [
+    {
+      "type": 0,
+      "value": "Standardfarbe"
+    }
+  ],
   "editor-panel.tooltip-connection-style": [
     {
       "type": 0,
@@ -140,13 +152,13 @@
   "editor-panel.tooltip-connection-style-curved-thick": [
     {
       "type": 0,
-      "value": "Dicke Kurve"
+      "value": "Weite Kurve"
     }
   ],
   "editor-panel.tooltip-connection-style-curved-thin": [
     {
       "type": 0,
-      "value": "Dünne Kurve"
+      "value": "Schlanke Kurve"
     }
   ],
   "editor-panel.tooltip-connection-style-polyline": [
@@ -158,7 +170,7 @@
   "editor-panel.tooltip-connection-style-polyline-curved": [
     {
       "type": 0,
-      "value": "Gekrümmte Polylinie"
+      "value": "Gebogene Polylinie"
     }
   ],
   "editor-panel.tooltip-delete-topic": [
@@ -173,12 +185,24 @@
       "value": "Randfarbe"
     }
   ],
+  "editor-panel.tooltip-topic-border-color-default": [
+    {
+      "type": 0,
+      "value": "Standardrandfarbe"
+    }
+  ],
   "editor-panel.tooltip-topic-fill-color": [
     {
       "type": 0,
       "value": "Füllfarbe"
     }
   ],
+  "editor-panel.tooltip-topic-fill-color-default": [
+    {
+      "type": 0,
+      "value": "Standardfüllfarbe"
+    }
+  ],
   "editor-panel.tooltip-topic-font-bigger": [
     {
       "type": 0,
@@ -413,6 +437,18 @@
       "value": "Pfeiltasten"
     }
   ],
+  "shortcut-help-pane.overwrite-edit-topic": [
+    {
+      "type": 0,
+      "value": "Thementext überschreiben"
+    }
+  ],
+  "shortcut-help-pane.overwrite-edit-topic-key": [
+    {
+      "type": 0,
+      "value": "Beginnen Sie mit dem Schreiben über das ausgewählte Thema"
+    }
+  ],
   "shortcut-help-pane.redo": [
     {
       "type": 0,
diff --git a/packages/editor/src/compiled-lang/en.json b/packages/editor/src/compiled-lang/en.json
index 4b3e3f7b..31847b61 100644
--- a/packages/editor/src/compiled-lang/en.json
+++ b/packages/editor/src/compiled-lang/en.json
@@ -125,6 +125,18 @@
       "value": "Add Topic"
     }
   ],
+  "editor-panel.tooltip-connection-color": [
+    {
+      "type": 0,
+      "value": "Color"
+    }
+  ],
+  "editor-panel.tooltip-connection-color-default": [
+    {
+      "type": 0,
+      "value": "Default color"
+    }
+  ],
   "editor-panel.tooltip-connection-style": [
     {
       "type": 0,
@@ -134,13 +146,13 @@
   "editor-panel.tooltip-connection-style-curved-thick": [
     {
       "type": 0,
-      "value": "Think Curve"
+      "value": "Thick Curved"
     }
   ],
   "editor-panel.tooltip-connection-style-curved-thin": [
     {
       "type": 0,
-      "value": "Thin Curve"
+      "value": "Thin Curved"
     }
   ],
   "editor-panel.tooltip-connection-style-polyline": [
@@ -167,12 +179,24 @@
       "value": "Border color"
     }
   ],
+  "editor-panel.tooltip-topic-border-color-default": [
+    {
+      "type": 0,
+      "value": "Default border color"
+    }
+  ],
   "editor-panel.tooltip-topic-fill-color": [
     {
       "type": 0,
       "value": "Fill color"
     }
   ],
+  "editor-panel.tooltip-topic-fill-color-default": [
+    {
+      "type": 0,
+      "value": "Default fill color"
+    }
+  ],
   "editor-panel.tooltip-topic-font-bigger": [
     {
       "type": 0,
@@ -386,7 +410,7 @@
   "shortcut-help-pane.edit-topic-key": [
     {
       "type": 0,
-      "value": "Just start typing"
+      "value": "F2 or Double Click"
     }
   ],
   "shortcut-help-pane.navigation": [
@@ -401,6 +425,18 @@
       "value": "Arrow keys"
     }
   ],
+  "shortcut-help-pane.overwrite-edit-topic": [
+    {
+      "type": 0,
+      "value": "Overwrite topic text"
+    }
+  ],
+  "shortcut-help-pane.overwrite-edit-topic-key": [
+    {
+      "type": 0,
+      "value": "Type on a selected topic"
+    }
+  ],
   "shortcut-help-pane.redo": [
     {
       "type": 0,
diff --git a/packages/editor/src/compiled-lang/es.json b/packages/editor/src/compiled-lang/es.json
index 40ab985f..2ed11653 100644
--- a/packages/editor/src/compiled-lang/es.json
+++ b/packages/editor/src/compiled-lang/es.json
@@ -125,22 +125,34 @@
       "value": "Agregar tópico"
     }
   ],
+  "editor-panel.tooltip-connection-color": [
+    {
+      "type": 0,
+      "value": "Color"
+    }
+  ],
+  "editor-panel.tooltip-connection-color-default": [
+    {
+      "type": 0,
+      "value": "Color por defecto"
+    }
+  ],
   "editor-panel.tooltip-connection-style": [
     {
       "type": 0,
-      "value": "Estilo de Connexión"
+      "value": "Estilo de conexión"
     }
   ],
   "editor-panel.tooltip-connection-style-curved-thick": [
     {
       "type": 0,
-      "value": "Curva guesa"
+      "value": "Curva ancha"
     }
   ],
   "editor-panel.tooltip-connection-style-curved-thin": [
     {
       "type": 0,
-      "value": "Curva fina"
+      "value": "Curva delgada"
     }
   ],
   "editor-panel.tooltip-connection-style-polyline": [
@@ -167,10 +179,22 @@
       "value": "Color del border"
     }
   ],
+  "editor-panel.tooltip-topic-border-color-default": [
+    {
+      "type": 0,
+      "value": "Color de border por defecto"
+    }
+  ],
   "editor-panel.tooltip-topic-fill-color": [
     {
       "type": 0,
-      "value": "Color del figura"
+      "value": "Color de relleno"
+    }
+  ],
+  "editor-panel.tooltip-topic-fill-color-default": [
+    {
+      "type": 0,
+      "value": "Color de relleno por defecto"
     }
   ],
   "editor-panel.tooltip-topic-font-bigger": [
@@ -401,6 +425,18 @@
       "value": "Cursor"
     }
   ],
+  "shortcut-help-pane.overwrite-edit-topic": [
+    {
+      "type": 0,
+      "value": "Sobrescribir el texto del tópico"
+    }
+  ],
+  "shortcut-help-pane.overwrite-edit-topic-key": [
+    {
+      "type": 0,
+      "value": "Comenzar a escibribir en el tópico seleccionado"
+    }
+  ],
   "shortcut-help-pane.redo": [
     {
       "type": 0,
diff --git a/packages/editor/src/compiled-lang/fr.json b/packages/editor/src/compiled-lang/fr.json
index f1003760..28331e59 100644
--- a/packages/editor/src/compiled-lang/fr.json
+++ b/packages/editor/src/compiled-lang/fr.json
@@ -125,6 +125,18 @@
       "value": "Agregar Topico"
     }
   ],
+  "editor-panel.tooltip-connection-color": [
+    {
+      "type": 0,
+      "value": "Couleur"
+    }
+  ],
+  "editor-panel.tooltip-connection-color-default": [
+    {
+      "type": 0,
+      "value": "Couleur par défaut"
+    }
+  ],
   "editor-panel.tooltip-connection-style": [
     {
       "type": 0,
@@ -134,13 +146,13 @@
   "editor-panel.tooltip-connection-style-curved-thick": [
     {
       "type": 0,
-      "value": "épaisse courbé"
+      "value": "Courbe large"
     }
   ],
   "editor-panel.tooltip-connection-style-curved-thin": [
     {
       "type": 0,
-      "value": "Mince courbe"
+      "value": "Courbe mince"
     }
   ],
   "editor-panel.tooltip-connection-style-polyline": [
@@ -152,7 +164,7 @@
   "editor-panel.tooltip-connection-style-polyline-curved": [
     {
       "type": 0,
-      "value": "Polyligne courbe"
+      "value": "Courbe polyligne"
     }
   ],
   "editor-panel.tooltip-delete-topic": [
@@ -167,10 +179,22 @@
       "value": "Color del borde"
     }
   ],
+  "editor-panel.tooltip-topic-border-color-default": [
+    {
+      "type": 0,
+      "value": "Couleur de bordure par défaut"
+    }
+  ],
   "editor-panel.tooltip-topic-fill-color": [
     {
       "type": 0,
-      "value": "Color del cotenido"
+      "value": "La couleur de remplissage"
+    }
+  ],
+  "editor-panel.tooltip-topic-fill-color-default": [
+    {
+      "type": 0,
+      "value": "Color de relleno por defecto"
     }
   ],
   "editor-panel.tooltip-topic-font-bigger": [
@@ -401,6 +425,18 @@
       "value": "Touches directionnelles"
     }
   ],
+  "shortcut-help-pane.overwrite-edit-topic": [
+    {
+      "type": 0,
+      "value": "Sobrescribir el texto del tópico"
+    }
+  ],
+  "shortcut-help-pane.overwrite-edit-topic-key": [
+    {
+      "type": 0,
+      "value": "Commencer à écrire sur le sujet sélectionné"
+    }
+  ],
   "shortcut-help-pane.redo": [
     {
       "type": 0,