diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/POTFILES.in b/POTFILES.in
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/install.sh b/install.sh
index d3e5360..a86cda5 100755
--- a/install.sh
+++ b/install.sh
@@ -3,16 +3,11 @@
 glib-compile-schemas ./notes@maestroschan.fr/schemas
 
 if (( $EUID == 0 )); then
-	if [ ! -d "/usr/share/gnome-shell/extensions" ]; then
-		mkdir /usr/share/gnome-shell/extensions
-	fi
 	INSTALL_DIR="/usr/share/gnome-shell/extensions"
 else
-	if [ ! -d "$HOME/.local/share/gnome-shell/extensions" ]; then
-		mkdir $HOME/.local/share/gnome-shell/extensions
-	fi
 	INSTALL_DIR="$HOME/.local/share/gnome-shell/extensions"
 fi
+mkdir -p $INSTALL_DIR
 
 echo "Installing extension files in $INSTALL_DIR/notes@maestroschan.fr"
 cp -r notes@maestroschan.fr $INSTALL_DIR
diff --git a/notes@maestroschan.fr.zip b/notes@maestroschan.fr.zip
old mode 100644
new mode 100755
index 6a93160..452da02
Binary files a/notes@maestroschan.fr.zip and b/notes@maestroschan.fr.zip differ
diff --git a/notes@maestroschan.fr/convenience.js b/notes@maestroschan.fr/convenience.js
old mode 100644
new mode 100755
diff --git a/notes@maestroschan.fr/extension.js b/notes@maestroschan.fr/extension.js
old mode 100644
new mode 100755
index 502f6c2..5314f69
--- a/notes@maestroschan.fr/extension.js
+++ b/notes@maestroschan.fr/extension.js
@@ -1,3 +1,6 @@
+// notes@maestroschan.fr/extension.js
+// GPL v3
+// Copyright Romain F. T.
 
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
@@ -203,18 +206,6 @@ function bringToPrimaryMonitorOnly() {
 	});
 }
 
-function updateVisibility() {
-	if (Main.overview.viewSelector._activePage != Main.overview.viewSelector._workspacesPage) {
-		GLOBAL_BUTTON._onlyHideNotes();
-		return;
-	}
-	if (global.screen.get_workspace_by_index(global.screen.get_active_workspace_index()).list_windows() == '') {
-		GLOBAL_BUTTON._showNotes();
-	} else {
-		GLOBAL_BUTTON._onlyHideNotes();
-	}
-}
-
 function updateLayoutSetting() {
 	ALL_NOTES.forEach(function (n) {
 		n.remove_from_the_right_actor();
diff --git a/notes@maestroschan.fr/locale/fr/LC_MESSAGES/notes-extension.mo b/notes@maestroschan.fr/locale/fr/LC_MESSAGES/notes-extension.mo
old mode 100644
new mode 100755
index 837f54d..e91d64b
Binary files a/notes@maestroschan.fr/locale/fr/LC_MESSAGES/notes-extension.mo and b/notes@maestroschan.fr/locale/fr/LC_MESSAGES/notes-extension.mo differ
diff --git a/notes@maestroschan.fr/locale/fr/LC_MESSAGES/notes-extension.po b/notes@maestroschan.fr/locale/fr/LC_MESSAGES/notes-extension.po
index 166978a..b95b300 100644
--- a/notes@maestroschan.fr/locale/fr/LC_MESSAGES/notes-extension.po
+++ b/notes@maestroschan.fr/locale/fr/LC_MESSAGES/notes-extension.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-02 23:02+0200\n"
+"POT-Creation-Date: 2019-08-29 19:44+0200\n"
 "PO-Revision-Date: 2019-03-21 00:03+0100\n"
 "Last-Translator: Romain F. T. <rrroschan@gmail.com>\n"
 "Language-Team: French <none>\n"
@@ -19,110 +19,114 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 3.32.0\n"
 
-#: notes@maestroschan.fr/extension.js:91
+#: notes@maestroschan.fr/extension.js:94
 msgid "Show notes"
 msgstr "Montrer les notes"
 
-#: notes@maestroschan.fr/menus.js:66
+#: notes@maestroschan.fr/menus.js:82
 msgid "Custom color"
 msgstr "Couleur personnalisée"
 
-#: notes@maestroschan.fr/menus.js:68 notes@maestroschan.fr/prefs.ui:160
+#: notes@maestroschan.fr/menus.js:88 notes@maestroschan.fr/prefs.ui:158
 msgid "Settings"
 msgstr "Paramètres"
 
-#: notes@maestroschan.fr/menus.js:88
+#: notes@maestroschan.fr/menus.js:145 notes@maestroschan.fr/prefs.ui:124
+msgid "Apply"
+msgstr "Appliquer"
+
+#: notes@maestroschan.fr/menus.js:153
 msgid "Font size"
 msgstr "Taille"
 
-#: notes@maestroschan.fr/menus.js:237
+#: notes@maestroschan.fr/menus.js:300
 msgid "Select All"
 msgstr "Sélectionner tout"
 
-#: notes@maestroschan.fr/noteBox.js:132
+#: notes@maestroschan.fr/noteBox.js:134
 msgid "New"
 msgstr "Nouveau"
 
-#: notes@maestroschan.fr/noteBox.js:136
+#: notes@maestroschan.fr/noteBox.js:138
 msgid "Delete"
 msgstr "Supprimer"
 
-#: notes@maestroschan.fr/noteBox.js:140
+#: notes@maestroschan.fr/noteBox.js:142
 msgid "Note options"
 msgstr "Options de la note"
 
-#: notes@maestroschan.fr/noteBox.js:152
+#: notes@maestroschan.fr/noteBox.js:154
 msgid "Resize"
 msgstr "Redimensionner"
 
-#: notes@maestroschan.fr/noteBox.js:199 notes@maestroschan.fr/noteBox.js:221
+#: notes@maestroschan.fr/noteBox.js:176
 msgid "Back"
 msgstr "Retour"
 
-#: notes@maestroschan.fr/noteBox.js:206 notes@maestroschan.fr/prefs.ui:125
-msgid "Apply"
-msgstr "Appliquer"
-
-#: notes@maestroschan.fr/noteBox.js:228
+#: notes@maestroschan.fr/noteBox.js:183
 msgid "Delete this note?"
 msgstr "Supprimer cette note?"
 
-#: notes@maestroschan.fr/noteBox.js:230
+#: notes@maestroschan.fr/noteBox.js:185
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: notes@maestroschan.fr/noteBox.js:256
+#: notes@maestroschan.fr/noteBox.js:210
 msgid "Type here…"
 msgstr "Tapez ici…"
 
-#: notes@maestroschan.fr/prefs.js:45
+#: notes@maestroschan.fr/prefs.js:48
 msgid "On the background"
 msgstr "Sur le bureau"
 
-#: notes@maestroschan.fr/prefs.js:46
+#: notes@maestroschan.fr/prefs.js:49
 msgid "Above everything"
 msgstr "Au-dessus de tout"
 
-#: notes@maestroschan.fr/prefs.js:146
+#: notes@maestroschan.fr/prefs.js:140
+msgid "version:"
+msgstr "version :"
+
+#: notes@maestroschan.fr/prefs.js:152
 msgid "Report bugs or ideas"
 msgstr "Rapporter des bugs ou des idées"
 
-#: notes@maestroschan.fr/prefs.ui:20
+#: notes@maestroschan.fr/prefs.ui:19
 msgid "Position of notes"
 msgstr "Position des notes"
 
-#: notes@maestroschan.fr/prefs.ui:42
+#: notes@maestroschan.fr/prefs.ui:41
 msgid "\"On the background\" is incompatible with desktop icons."
 msgstr "\"Sur le bureau\" est incompatible avec les icônes sur le bureau."
 
-#: notes@maestroschan.fr/prefs.ui:58
+#: notes@maestroschan.fr/prefs.ui:57
 msgid "Automatic focus"
 msgstr "Focus automatique"
 
-#: notes@maestroschan.fr/prefs.ui:91
+#: notes@maestroschan.fr/prefs.ui:90
 msgid "Use a keyboard shortcut"
 msgstr "Utiliser un raccourci clavier"
 
-#: notes@maestroschan.fr/prefs.ui:92
+#: notes@maestroschan.fr/prefs.ui:91
 msgid "Use a keyboard shortcut to toggle notes"
 msgstr "Utiliser un raccourci clavier pour afficher/masquer les notes"
 
-#: notes@maestroschan.fr/prefs.ui:114
+#: notes@maestroschan.fr/prefs.ui:113
 msgid "Default value is <Super>n"
 msgstr "La valeur par défaut est <Super>n"
 
-#: notes@maestroschan.fr/prefs.ui:137
+#: notes@maestroschan.fr/prefs.ui:136
 msgid "Hide the icon"
 msgstr "Masquer l'icône"
 
-#: notes@maestroschan.fr/prefs.ui:190
+#: notes@maestroschan.fr/prefs.ui:187
 msgid ""
 "<b>Show/hide all notes:</b> click on the icon in the GNOME Shell top bar."
 msgstr ""
 "<b>Montrer/masquer toutes les notes :</b> cliquer sur l'icône dans la barre "
 "supérieure de GNOME Shell."
 
-#: notes@maestroschan.fr/prefs.ui:198
+#: notes@maestroschan.fr/prefs.ui:195
 msgid ""
 "<b>Create a note:</b> click on the \"+\" button at the left of a note "
 "header, it will create a new note, with the same color and the same font "
@@ -132,36 +136,42 @@ msgstr ""
 "d'une note, ça créera une nouvelle note, avec la même couleur et la même "
 "taille de police que celle sur laquelle vous avez cliqué."
 
-#: notes@maestroschan.fr/prefs.ui:209
+#: notes@maestroschan.fr/prefs.ui:206
 msgid ""
 "<b>Move a note:</b> drag the blank space in the center of the note header."
 msgstr ""
 "<b>Déplacer une note :</b> agripper et déplacer l'espace vide dans l'en-tête "
 "de la note."
 
-#: notes@maestroschan.fr/prefs.ui:217
+#: notes@maestroschan.fr/prefs.ui:214
 msgid ""
 "<b>Resize a note:</b> drag the resize button at the right of the note header."
 msgstr ""
 "<b>Redimensionner une note :</b> agripper et déplacer le bouton de "
 "redimensionnement sur la droite de l'en-tête de la note."
 
-#: notes@maestroschan.fr/prefs.ui:225
+#: notes@maestroschan.fr/prefs.ui:222
 msgid "<b>Delete a note:</b> click on the wastebasket icon and confirm."
 msgstr ""
 "<b>Supprimer une note :</b> cliquer sur l'icône de la corbeille et confirmer."
 
-#: notes@maestroschan.fr/prefs.ui:233
+#: notes@maestroschan.fr/prefs.ui:228
 msgid "Using the extension"
 msgstr "Utilisation"
 
-#: notes@maestroschan.fr/prefs.ui:249
+#: notes@maestroschan.fr/prefs.ui:243
 msgid "<b>Change color:</b> click on the menu button, and select a color."
 msgstr ""
 "<b>Changer la couleur :</b> cliquer sur le bouton du menu, et sélectionner "
 "une couleur."
 
-#: notes@maestroschan.fr/prefs.ui:260
+#: notes@maestroschan.fr/prefs.ui:251
+msgid "The \"Custom color\" submenu allows you to select precisely a color."
+msgstr ""
+"Le sous-menu \"Couleur personnalisée\" permet de choisir précisément une "
+"couleur."
+
+#: notes@maestroschan.fr/prefs.ui:262
 msgid ""
 "<b>Change font size:</b> click on the menu button, and increase or decrease "
 "the font size with \"+\" and \"-\" buttons."
@@ -169,11 +179,53 @@ msgstr ""
 "<b>Changer la taille de police :</b> cliquer sur le bouton du menu, et "
 "augmenter ou diminuer la taille de la police avec les boutons \"+\" et \"-\"."
 
-#: notes@maestroschan.fr/prefs.ui:268
+#: notes@maestroschan.fr/prefs.ui:270
+msgid ""
+"<b>Advanced settings:</b> click on the \"Settings\" menu item to access the "
+"settings dialog."
+msgstr ""
+"<b>Paramètres avancés :</b> cliquez sur l'item \"Paramètres\" du menu pour "
+"accéder à la fenêtre des paramètres."
+
+#: notes@maestroschan.fr/prefs.ui:276
 msgid "Customizing notes"
 msgstr "Personnaliser les notes"
 
-#: notes@maestroschan.fr/prefs.ui:282
+#: notes@maestroschan.fr/prefs.ui:291
+msgid "The dialog window you're reading provides several settings:"
+msgstr "La fenêtre que vous lisez fournit plusieurs paramètres :"
+
+#: notes@maestroschan.fr/prefs.ui:299
+msgid ""
+"<b>Position of notes:</b> select whether you want the notes to be shown "
+"above the windows or underneath them."
+msgstr ""
+"<b>Position des notes :</b> choisissez si vous voulez afficher les notes par-"
+"dessus les fenêtres ou en-dessous."
+
+#: notes@maestroschan.fr/prefs.ui:307
+msgid ""
+"<b>Automatic focus:</b> if this is enabled, the notes will automatically get "
+"the keyboard focus when you hover them with the mouse pointer."
+msgstr ""
+"<b>Focus automatique :</b> si ce paramètre est activé, les notes vont "
+"automatiquement prendre le focus du clavier quand vous les survolerez avec "
+"le curseur de la souris."
+
+#: notes@maestroschan.fr/prefs.ui:315
+msgid ""
+"<b>Keyboard shortcut:</b> hide/show notes with a keyboard shortcut. If this "
+"is enabled, the icon in the top bar can be hidden."
+msgstr ""
+"<b>Raccourci clavier :</b> afficher/masquer les notes avec un raccourci "
+"clavier. Si cece est activé , l'icône dans la barre supérieure peut être "
+"cachée."
+
+#: notes@maestroschan.fr/prefs.ui:321
+msgid "The settings window"
+msgstr "Fenêtre des paramètres"
+
+#: notes@maestroschan.fr/prefs.ui:337
 msgid ""
 "Your notes are saved to the disk on various occasions (mainly when you hide "
 "them). If you want to <b>get a copy of your notes</b>, this button opens the "
@@ -183,28 +235,28 @@ msgstr ""
 "(principalement  quand vous les masquez. Si vous voulez <b>faire une copie "
 "de vos notes</b>, ce bouton ouvre le dossier où elles se trouvent."
 
-#: notes@maestroschan.fr/prefs.ui:288
+#: notes@maestroschan.fr/prefs.ui:343
 msgid "Open the storage directory"
 msgstr "Ouvrir le dossier de stockage des notes"
 
-#: notes@maestroschan.fr/prefs.ui:298
+#: notes@maestroschan.fr/prefs.ui:353
 msgid ""
 "Files ending with \"_state\" contain the color and position of your notes"
 msgstr ""
 "Les fichiers aux noms terminant par \"_state\" contiennent la couleur et la "
 "position de vos notes"
 
-#: notes@maestroschan.fr/prefs.ui:308
+#: notes@maestroschan.fr/prefs.ui:363
 msgid "Files ending with \"_text\" contain the text written in your notes"
 msgstr ""
 "Les fichiers aux noms terminant par \"_text\" contiennent le texte écrit "
 "dans vos notes"
 
-#: notes@maestroschan.fr/prefs.ui:317
+#: notes@maestroschan.fr/prefs.ui:372
 msgid "Backup your notes"
 msgstr "Sauvegarder vos notes"
 
-#: notes@maestroschan.fr/prefs.ui:331
+#: notes@maestroschan.fr/prefs.ui:387
 msgid ""
 "Click on this button if you accidentally moved a note out of your primary "
 "monitor\n"
@@ -215,39 +267,39 @@ msgstr ""
 "(exemple : si vous aviez des notes sur un écran secondaire maintenant "
 "débranché)."
 
-#: notes@maestroschan.fr/prefs.ui:338
+#: notes@maestroschan.fr/prefs.ui:394
 msgid "Bring back all notes to the primary monitor"
 msgstr "Ramener toutes les notes sur le moniteur principal"
 
-#: notes@maestroschan.fr/prefs.ui:344
+#: notes@maestroschan.fr/prefs.ui:400
 msgid "Lost some notes?"
 msgstr "Notes perdues ?"
 
-#: notes@maestroschan.fr/prefs.ui:354
+#: notes@maestroschan.fr/prefs.ui:411
 msgid "Help"
 msgstr "Aide"
 
-#: notes@maestroschan.fr/prefs.ui:368
+#: notes@maestroschan.fr/prefs.ui:424
 msgid "Notes"
 msgstr "Notes"
 
-#: notes@maestroschan.fr/prefs.ui:380
+#: notes@maestroschan.fr/prefs.ui:433
 msgid "Sticky notes for the GNOME Shell desktop."
 msgstr "Post-its pour le bureau GNOME Shell."
 
-#: notes@maestroschan.fr/prefs.ui:399
+#: notes@maestroschan.fr/prefs.ui:458
 msgid "Author:"
 msgstr "Auteur :"
 
-#: notes@maestroschan.fr/prefs.ui:414
+#: notes@maestroschan.fr/prefs.ui:473
 msgid "Translators:"
 msgstr "Traducteurs :"
 
-#: notes@maestroschan.fr/prefs.ui:419
+#: notes@maestroschan.fr/prefs.ui:478
 msgid "translator-credits"
 msgstr "Romain F. T."
 
-#: notes@maestroschan.fr/prefs.ui:437
+#: notes@maestroschan.fr/prefs.ui:507
 msgid "About"
 msgstr "À propos"
 
diff --git a/notes@maestroschan.fr/locale/it/LC_MESSAGES/notes-extension.mo b/notes@maestroschan.fr/locale/it/LC_MESSAGES/notes-extension.mo
old mode 100644
new mode 100755
diff --git a/notes@maestroschan.fr/locale/it/LC_MESSAGES/notes-extension.po b/notes@maestroschan.fr/locale/it/LC_MESSAGES/notes-extension.po
index e199bcb..4f26c7a 100644
--- a/notes@maestroschan.fr/locale/it/LC_MESSAGES/notes-extension.po
+++ b/notes@maestroschan.fr/locale/it/LC_MESSAGES/notes-extension.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-02 23:02+0200\n"
+"POT-Creation-Date: 2019-08-29 19:44+0200\n"
 "PO-Revision-Date: 2018-11-07 14:42+0100\n"
 "Last-Translator: Jimmy Scionti <jimmy.scionti@gmail.com>\n"
 "Language-Team: \n"
@@ -18,111 +18,115 @@ msgstr ""
 "X-Generator: Poedit 2.0.6\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: notes@maestroschan.fr/extension.js:91
+#: notes@maestroschan.fr/extension.js:94
 msgid "Show notes"
 msgstr ""
 
-#: notes@maestroschan.fr/menus.js:66
+#: notes@maestroschan.fr/menus.js:82
 msgid "Custom color"
 msgstr "Colore personalizzato"
 
-#: notes@maestroschan.fr/menus.js:68 notes@maestroschan.fr/prefs.ui:160
+#: notes@maestroschan.fr/menus.js:88 notes@maestroschan.fr/prefs.ui:158
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: notes@maestroschan.fr/menus.js:88
+#: notes@maestroschan.fr/menus.js:145 notes@maestroschan.fr/prefs.ui:124
+msgid "Apply"
+msgstr "Applica"
+
+#: notes@maestroschan.fr/menus.js:153
 msgid "Font size"
 msgstr ""
 
-#: notes@maestroschan.fr/menus.js:237
+#: notes@maestroschan.fr/menus.js:300
 msgid "Select All"
 msgstr "Seleziona tutto"
 
-#: notes@maestroschan.fr/noteBox.js:132
+#: notes@maestroschan.fr/noteBox.js:134
 msgid "New"
 msgstr "Nuova"
 
-#: notes@maestroschan.fr/noteBox.js:136
+#: notes@maestroschan.fr/noteBox.js:138
 msgid "Delete"
 msgstr "Elimina"
 
-#: notes@maestroschan.fr/noteBox.js:140
+#: notes@maestroschan.fr/noteBox.js:142
 msgid "Note options"
 msgstr "Opzioni note"
 
-#: notes@maestroschan.fr/noteBox.js:152
+#: notes@maestroschan.fr/noteBox.js:154
 msgid "Resize"
 msgstr "Ridimensiona"
 
-#: notes@maestroschan.fr/noteBox.js:199 notes@maestroschan.fr/noteBox.js:221
+#: notes@maestroschan.fr/noteBox.js:176
 msgid "Back"
 msgstr "Indietro"
 
-#: notes@maestroschan.fr/noteBox.js:206 notes@maestroschan.fr/prefs.ui:125
-msgid "Apply"
-msgstr "Applica"
-
-#: notes@maestroschan.fr/noteBox.js:228
+#: notes@maestroschan.fr/noteBox.js:183
 msgid "Delete this note?"
 msgstr "Eliminare questa nota?"
 
-#: notes@maestroschan.fr/noteBox.js:230
+#: notes@maestroschan.fr/noteBox.js:185
 msgid "Confirm"
 msgstr ""
 
-#: notes@maestroschan.fr/noteBox.js:256
+#: notes@maestroschan.fr/noteBox.js:210
 msgid "Type here…"
 msgstr "Scrivi qui…"
 
-#: notes@maestroschan.fr/prefs.js:45
+#: notes@maestroschan.fr/prefs.js:48
 msgid "On the background"
 msgstr "Sullo sfondo"
 
-#: notes@maestroschan.fr/prefs.js:46
+#: notes@maestroschan.fr/prefs.js:49
 msgid "Above everything"
 msgstr "In primo piano"
 
-#: notes@maestroschan.fr/prefs.js:146
+#: notes@maestroschan.fr/prefs.js:140
+msgid "version:"
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.js:152
 msgid "Report bugs or ideas"
 msgstr "Segnala errori o invia idee"
 
-#: notes@maestroschan.fr/prefs.ui:20
+#: notes@maestroschan.fr/prefs.ui:19
 msgid "Position of notes"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:42
+#: notes@maestroschan.fr/prefs.ui:41
 msgid "\"On the background\" is incompatible with desktop icons."
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:58
+#: notes@maestroschan.fr/prefs.ui:57
 msgid "Automatic focus"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:91
+#: notes@maestroschan.fr/prefs.ui:90
 msgid "Use a keyboard shortcut"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:92
+#: notes@maestroschan.fr/prefs.ui:91
 msgid "Use a keyboard shortcut to toggle notes"
 msgstr ""
 "Utilizza una scorciatoia da tastiera per attivare o disattivare le note"
 
-#: notes@maestroschan.fr/prefs.ui:114
+#: notes@maestroschan.fr/prefs.ui:113
 msgid "Default value is <Super>n"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:137
+#: notes@maestroschan.fr/prefs.ui:136
 msgid "Hide the icon"
 msgstr "Nascondi l'icona"
 
-#: notes@maestroschan.fr/prefs.ui:190
+#: notes@maestroschan.fr/prefs.ui:187
 msgid ""
 "<b>Show/hide all notes:</b> click on the icon in the GNOME Shell top bar."
 msgstr ""
 "<b>Mostra/nascondi tutte le note:</b> click sull'icona nel pannello di GNOME "
 "Shell."
 
-#: notes@maestroschan.fr/prefs.ui:198
+#: notes@maestroschan.fr/prefs.ui:195
 msgid ""
 "<b>Create a note:</b> click on the \"+\" button at the left of a note "
 "header, it will create a new note, with the same color and the same font "
@@ -132,34 +136,38 @@ msgstr ""
 "nota, così creerai una nuova nota dello stesso colore e con la stessa "
 "dimensione del testo di quella selezionata."
 
-#: notes@maestroschan.fr/prefs.ui:209
+#: notes@maestroschan.fr/prefs.ui:206
 msgid ""
 "<b>Move a note:</b> drag the blank space in the center of the note header."
 msgstr ""
 "<b>Muovi una nota:</b> tieni premuto sullo spazio vuoto nel barra della nota "
 "e trascina.à"
 
-#: notes@maestroschan.fr/prefs.ui:217
+#: notes@maestroschan.fr/prefs.ui:214
 msgid ""
 "<b>Resize a note:</b> drag the resize button at the right of the note header."
 msgstr ""
 "<b>Ridimensiona una nota:</b> tieni premuto il pulsante di ridimensionamento "
 "sulla destra della barra della nota e trascina."
 
-#: notes@maestroschan.fr/prefs.ui:225
+#: notes@maestroschan.fr/prefs.ui:222
 msgid "<b>Delete a note:</b> click on the wastebasket icon and confirm."
 msgstr "<b>Elimina una nota:</b> click sul pulsante del cestino e conferma."
 
-#: notes@maestroschan.fr/prefs.ui:233
+#: notes@maestroschan.fr/prefs.ui:228
 msgid "Using the extension"
 msgstr "Guida all'utilizzo"
 
-#: notes@maestroschan.fr/prefs.ui:249
+#: notes@maestroschan.fr/prefs.ui:243
 msgid "<b>Change color:</b> click on the menu button, and select a color."
 msgstr ""
 "<b>Cambia colore:</b> click sul pulsante del menu e seleziona un colore."
 
-#: notes@maestroschan.fr/prefs.ui:260
+#: notes@maestroschan.fr/prefs.ui:251
+msgid "The \"Custom color\" submenu allows you to select precisely a color."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:262
 msgid ""
 "<b>Change font size:</b> click on the menu button, and increase or decrease "
 "the font size with \"+\" and \"-\" buttons."
@@ -167,11 +175,43 @@ msgstr ""
 "<b>Cambia dimensione del testo:</b> click sul pulsante del menu e aumenta o "
 "diminuisci la dimensione del testo usando i pulsanti \"+\" e \"-\"."
 
-#: notes@maestroschan.fr/prefs.ui:268
+#: notes@maestroschan.fr/prefs.ui:270
+msgid ""
+"<b>Advanced settings:</b> click on the \"Settings\" menu item to access the "
+"settings dialog."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:276
 msgid "Customizing notes"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:282
+#: notes@maestroschan.fr/prefs.ui:291
+msgid "The dialog window you're reading provides several settings:"
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:299
+msgid ""
+"<b>Position of notes:</b> select whether you want the notes to be shown "
+"above the windows or underneath them."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:307
+msgid ""
+"<b>Automatic focus:</b> if this is enabled, the notes will automatically get "
+"the keyboard focus when you hover them with the mouse pointer."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:315
+msgid ""
+"<b>Keyboard shortcut:</b> hide/show notes with a keyboard shortcut. If this "
+"is enabled, the icon in the top bar can be hidden."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:321
+msgid "The settings window"
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:337
 msgid ""
 "Your notes are saved to the disk on various occasions (mainly when you hide "
 "them). If you want to <b>get a copy of your notes</b>, this button opens the "
@@ -181,24 +221,24 @@ msgstr ""
 "quando le nascondi). Se vuoi una <b>copia delle tue note</b>, questo "
 "pulsante apre la cartella in cui si trovano."
 
-#: notes@maestroschan.fr/prefs.ui:288
+#: notes@maestroschan.fr/prefs.ui:343
 msgid "Open the storage directory"
 msgstr "Apri la cartella di salvataggio"
 
-#: notes@maestroschan.fr/prefs.ui:298
+#: notes@maestroschan.fr/prefs.ui:353
 msgid ""
 "Files ending with \"_state\" contain the color and position of your notes"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:308
+#: notes@maestroschan.fr/prefs.ui:363
 msgid "Files ending with \"_text\" contain the text written in your notes"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:317
+#: notes@maestroschan.fr/prefs.ui:372
 msgid "Backup your notes"
 msgstr "Backup delle tue note"
 
-#: notes@maestroschan.fr/prefs.ui:331
+#: notes@maestroschan.fr/prefs.ui:387
 msgid ""
 "Click on this button if you accidentally moved a note out of your primary "
 "monitor\n"
@@ -208,39 +248,39 @@ msgstr ""
 "dello schermo primario\n"
 "(esempio: se avevi delle note su uno schermo secondario che hai disconnesso)."
 
-#: notes@maestroschan.fr/prefs.ui:338
+#: notes@maestroschan.fr/prefs.ui:394
 msgid "Bring back all notes to the primary monitor"
 msgstr "Riporta tutte le note sullo schermo primario"
 
-#: notes@maestroschan.fr/prefs.ui:344
+#: notes@maestroschan.fr/prefs.ui:400
 msgid "Lost some notes?"
 msgstr "Hai perso delle note?"
 
-#: notes@maestroschan.fr/prefs.ui:354
+#: notes@maestroschan.fr/prefs.ui:411
 msgid "Help"
 msgstr "Aiuto"
 
-#: notes@maestroschan.fr/prefs.ui:368
+#: notes@maestroschan.fr/prefs.ui:424
 msgid "Notes"
 msgstr "Note"
 
-#: notes@maestroschan.fr/prefs.ui:380
+#: notes@maestroschan.fr/prefs.ui:433
 msgid "Sticky notes for the GNOME Shell desktop."
 msgstr "Note adesive per l'interfaccia GNOME Shell."
 
-#: notes@maestroschan.fr/prefs.ui:399
+#: notes@maestroschan.fr/prefs.ui:458
 msgid "Author:"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:414
+#: notes@maestroschan.fr/prefs.ui:473
 msgid "Translators:"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:419
+#: notes@maestroschan.fr/prefs.ui:478
 msgid "translator-credits"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:437
+#: notes@maestroschan.fr/prefs.ui:507
 msgid "About"
 msgstr "Informazioni"
 
diff --git a/notes@maestroschan.fr/locale/nl/LC_MESSAGES/notes-extension.mo b/notes@maestroschan.fr/locale/nl/LC_MESSAGES/notes-extension.mo
old mode 100644
new mode 100755
index 44f4798..25c1152
Binary files a/notes@maestroschan.fr/locale/nl/LC_MESSAGES/notes-extension.mo and b/notes@maestroschan.fr/locale/nl/LC_MESSAGES/notes-extension.mo differ
diff --git a/notes@maestroschan.fr/locale/nl/LC_MESSAGES/notes-extension.po b/notes@maestroschan.fr/locale/nl/LC_MESSAGES/notes-extension.po
index 2fb1578..5ddfd09 100644
--- a/notes@maestroschan.fr/locale/nl/LC_MESSAGES/notes-extension.po
+++ b/notes@maestroschan.fr/locale/nl/LC_MESSAGES/notes-extension.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-02 23:02+0200\n"
+"POT-Creation-Date: 2019-08-29 19:44+0200\n"
 "PO-Revision-Date: 2019-04-21 12:27+0200\n"
 "Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
 "Language-Team: Dutch <vistausss@outlook.com>\n"
@@ -18,110 +18,114 @@ msgstr ""
 "X-Generator: Poedit 2.1.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: notes@maestroschan.fr/extension.js:91
+#: notes@maestroschan.fr/extension.js:94
 msgid "Show notes"
 msgstr "Notities tonen"
 
-#: notes@maestroschan.fr/menus.js:66
+#: notes@maestroschan.fr/menus.js:82
 msgid "Custom color"
 msgstr "Aangepaste kleur"
 
-#: notes@maestroschan.fr/menus.js:68 notes@maestroschan.fr/prefs.ui:160
+#: notes@maestroschan.fr/menus.js:88 notes@maestroschan.fr/prefs.ui:158
 msgid "Settings"
 msgstr "Instellingen"
 
-#: notes@maestroschan.fr/menus.js:88
+#: notes@maestroschan.fr/menus.js:145 notes@maestroschan.fr/prefs.ui:124
+msgid "Apply"
+msgstr "Toepassen"
+
+#: notes@maestroschan.fr/menus.js:153
 msgid "Font size"
-msgstr "Tekstgrootte"
+msgstr "Grootte"
 
-#: notes@maestroschan.fr/menus.js:237
+#: notes@maestroschan.fr/menus.js:300
 msgid "Select All"
 msgstr "Alles selecteren"
 
-#: notes@maestroschan.fr/noteBox.js:132
+#: notes@maestroschan.fr/noteBox.js:134
 msgid "New"
 msgstr "Nieuw"
 
-#: notes@maestroschan.fr/noteBox.js:136
+#: notes@maestroschan.fr/noteBox.js:138
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: notes@maestroschan.fr/noteBox.js:140
+#: notes@maestroschan.fr/noteBox.js:142
 msgid "Note options"
 msgstr "Notitie-opties"
 
-#: notes@maestroschan.fr/noteBox.js:152
+#: notes@maestroschan.fr/noteBox.js:154
 msgid "Resize"
 msgstr "Grootte wijzigen"
 
-#: notes@maestroschan.fr/noteBox.js:199 notes@maestroschan.fr/noteBox.js:221
+#: notes@maestroschan.fr/noteBox.js:176
 msgid "Back"
 msgstr "Terug"
 
-#: notes@maestroschan.fr/noteBox.js:206 notes@maestroschan.fr/prefs.ui:125
-msgid "Apply"
-msgstr "Toepassen"
-
-#: notes@maestroschan.fr/noteBox.js:228
+#: notes@maestroschan.fr/noteBox.js:183
 msgid "Delete this note?"
 msgstr "Wil je deze notitie verwijderen?"
 
-#: notes@maestroschan.fr/noteBox.js:230
+#: notes@maestroschan.fr/noteBox.js:185
 msgid "Confirm"
 msgstr "Bevestigen"
 
-#: notes@maestroschan.fr/noteBox.js:256
+#: notes@maestroschan.fr/noteBox.js:210
 msgid "Type here…"
 msgstr "Typ hier…"
 
-#: notes@maestroschan.fr/prefs.js:45
+#: notes@maestroschan.fr/prefs.js:48
 msgid "On the background"
 msgstr "Op de achtergrond"
 
-#: notes@maestroschan.fr/prefs.js:46
+#: notes@maestroschan.fr/prefs.js:49
 msgid "Above everything"
 msgstr "Bovenop alles"
 
-#: notes@maestroschan.fr/prefs.js:146
+#: notes@maestroschan.fr/prefs.js:140
+msgid "version:"
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.js:152
 msgid "Report bugs or ideas"
 msgstr "Meld bugs of deel ideeën"
 
-#: notes@maestroschan.fr/prefs.ui:20
+#: notes@maestroschan.fr/prefs.ui:19
 msgid "Position of notes"
 msgstr "Positie van notities"
 
-#: notes@maestroschan.fr/prefs.ui:42
+#: notes@maestroschan.fr/prefs.ui:41
 msgid "\"On the background\" is incompatible with desktop icons."
 msgstr "\"Op de achtergrond\" is niet compatibel met bureaubladpictogrammen."
 
-#: notes@maestroschan.fr/prefs.ui:58
+#: notes@maestroschan.fr/prefs.ui:57
 msgid "Automatic focus"
 msgstr "Automatisch focussen"
 
-#: notes@maestroschan.fr/prefs.ui:91
+#: notes@maestroschan.fr/prefs.ui:90
 msgid "Use a keyboard shortcut"
 msgstr "Sneltoets gebruiken"
 
-#: notes@maestroschan.fr/prefs.ui:92
+#: notes@maestroschan.fr/prefs.ui:91
 msgid "Use a keyboard shortcut to toggle notes"
 msgstr "Sneltoets gebruiken om notities te tonen/verbergen"
 
-#: notes@maestroschan.fr/prefs.ui:114
+#: notes@maestroschan.fr/prefs.ui:113
 msgid "Default value is <Super>n"
 msgstr "De standaardwaarde is <Super>n"
 
-#: notes@maestroschan.fr/prefs.ui:137
+#: notes@maestroschan.fr/prefs.ui:136
 msgid "Hide the icon"
 msgstr "Pictogram verbergen"
 
-#: notes@maestroschan.fr/prefs.ui:190
+#: notes@maestroschan.fr/prefs.ui:187
 msgid ""
 "<b>Show/hide all notes:</b> click on the icon in the GNOME Shell top bar."
 msgstr ""
 "<b>Toon/Verberg alle notities:</b> klik op het pictogram op de bovenste balk "
 "van GNOME Shell."
 
-#: notes@maestroschan.fr/prefs.ui:198
+#: notes@maestroschan.fr/prefs.ui:195
 msgid ""
 "<b>Create a note:</b> click on the \"+\" button at the left of a note "
 "header, it will create a new note, with the same color and the same font "
@@ -131,33 +135,37 @@ msgstr ""
 "creëert een nieuwe notitie met dezelfde kleur en lettergrootte als de "
 "notitie waarop je hebt geklikt."
 
-#: notes@maestroschan.fr/prefs.ui:209
+#: notes@maestroschan.fr/prefs.ui:206
 msgid ""
 "<b>Move a note:</b> drag the blank space in the center of the note header."
 msgstr ""
 "<b>Verplaats een notitie:</b> versleep vanaf de lege ruimte in de notitiekop."
 
-#: notes@maestroschan.fr/prefs.ui:217
+#: notes@maestroschan.fr/prefs.ui:214
 msgid ""
 "<b>Resize a note:</b> drag the resize button at the right of the note header."
 msgstr ""
 "<b>Wijzig de grootte van een notitie:</b> versleep vanaf de knop 'Grootte "
 "wijzigen', rechts op de notitiekop."
 
-#: notes@maestroschan.fr/prefs.ui:225
+#: notes@maestroschan.fr/prefs.ui:222
 msgid "<b>Delete a note:</b> click on the wastebasket icon and confirm."
 msgstr ""
 "<b>Verwijder een notitie:</b> klik op het prullenbakpictogram en bevestig."
 
-#: notes@maestroschan.fr/prefs.ui:233
+#: notes@maestroschan.fr/prefs.ui:228
 msgid "Using the extension"
 msgstr "De extensie gebruiken"
 
-#: notes@maestroschan.fr/prefs.ui:249
+#: notes@maestroschan.fr/prefs.ui:243
 msgid "<b>Change color:</b> click on the menu button, and select a color."
 msgstr "<b>Wijzig de kleur:</b> klik op de menuknop en kies een kleur."
 
-#: notes@maestroschan.fr/prefs.ui:260
+#: notes@maestroschan.fr/prefs.ui:251
+msgid "The \"Custom color\" submenu allows you to select precisely a color."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:262
 msgid ""
 "<b>Change font size:</b> click on the menu button, and increase or decrease "
 "the font size with \"+\" and \"-\" buttons."
@@ -165,11 +173,43 @@ msgstr ""
 "<b>Wijzig de lettergrootte:</b> klik op de menuknop en vergroot/verklein de "
 "letters middels de knoppen '+' en '-'."
 
-#: notes@maestroschan.fr/prefs.ui:268
+#: notes@maestroschan.fr/prefs.ui:270
+msgid ""
+"<b>Advanced settings:</b> click on the \"Settings\" menu item to access the "
+"settings dialog."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:276
 msgid "Customizing notes"
 msgstr "Motities aanpassen"
 
-#: notes@maestroschan.fr/prefs.ui:282
+#: notes@maestroschan.fr/prefs.ui:291
+msgid "The dialog window you're reading provides several settings:"
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:299
+msgid ""
+"<b>Position of notes:</b> select whether you want the notes to be shown "
+"above the windows or underneath them."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:307
+msgid ""
+"<b>Automatic focus:</b> if this is enabled, the notes will automatically get "
+"the keyboard focus when you hover them with the mouse pointer."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:315
+msgid ""
+"<b>Keyboard shortcut:</b> hide/show notes with a keyboard shortcut. If this "
+"is enabled, the icon in the top bar can be hidden."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:321
+msgid "The settings window"
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:337
 msgid ""
 "Your notes are saved to the disk on various occasions (mainly when you hide "
 "them). If you want to <b>get a copy of your notes</b>, this button opens the "
@@ -179,26 +219,26 @@ msgstr ""
 "verbergt). Als je een <b>reservekopie wilt van je notities</b>, dan kun je "
 "middels deze knop de bijbehorende map openen."
 
-#: notes@maestroschan.fr/prefs.ui:288
+#: notes@maestroschan.fr/prefs.ui:343
 msgid "Open the storage directory"
 msgstr "Opslagmap openen"
 
-#: notes@maestroschan.fr/prefs.ui:298
+#: notes@maestroschan.fr/prefs.ui:353
 msgid ""
 "Files ending with \"_state\" contain the color and position of your notes"
 msgstr ""
 "Bestandsnamen die eindigen op '_state' bevatten de kleur en positie van je "
 "notities"
 
-#: notes@maestroschan.fr/prefs.ui:308
+#: notes@maestroschan.fr/prefs.ui:363
 msgid "Files ending with \"_text\" contain the text written in your notes"
 msgstr "Bestanden die eindigen op '_text' bevatten de tekst van je notities"
 
-#: notes@maestroschan.fr/prefs.ui:317
+#: notes@maestroschan.fr/prefs.ui:372
 msgid "Backup your notes"
 msgstr "Notities back-uppen"
 
-#: notes@maestroschan.fr/prefs.ui:331
+#: notes@maestroschan.fr/prefs.ui:387
 msgid ""
 "Click on this button if you accidentally moved a note out of your primary "
 "monitor\n"
@@ -209,39 +249,39 @@ msgstr ""
 "(voorbeeld: je had notities op een secundair beeldscherm staan dat je "
 "vervolgens hebt afgekoppeld)."
 
-#: notes@maestroschan.fr/prefs.ui:338
+#: notes@maestroschan.fr/prefs.ui:394
 msgid "Bring back all notes to the primary monitor"
 msgstr "Alle notities terugzetten op primair beeldscherm"
 
-#: notes@maestroschan.fr/prefs.ui:344
+#: notes@maestroschan.fr/prefs.ui:400
 msgid "Lost some notes?"
 msgstr "Ontbreken er notities?"
 
-#: notes@maestroschan.fr/prefs.ui:354
+#: notes@maestroschan.fr/prefs.ui:411
 msgid "Help"
 msgstr "Hulp"
 
-#: notes@maestroschan.fr/prefs.ui:368
+#: notes@maestroschan.fr/prefs.ui:424
 msgid "Notes"
 msgstr "Notities"
 
-#: notes@maestroschan.fr/prefs.ui:380
+#: notes@maestroschan.fr/prefs.ui:433
 msgid "Sticky notes for the GNOME Shell desktop."
 msgstr "Plakbriefjes voor de GNOME Shell-werkomgeving."
 
-#: notes@maestroschan.fr/prefs.ui:399
+#: notes@maestroschan.fr/prefs.ui:458
 msgid "Author:"
 msgstr "Auteur:"
 
-#: notes@maestroschan.fr/prefs.ui:414
+#: notes@maestroschan.fr/prefs.ui:473
 msgid "Translators:"
 msgstr "Vertalers:"
 
-#: notes@maestroschan.fr/prefs.ui:419
+#: notes@maestroschan.fr/prefs.ui:478
 msgid "translator-credits"
 msgstr "Heimen Stoffels"
 
-#: notes@maestroschan.fr/prefs.ui:437
+#: notes@maestroschan.fr/prefs.ui:507
 msgid "About"
 msgstr "Over"
 
diff --git a/notes@maestroschan.fr/locale/notes-extension.pot b/notes@maestroschan.fr/locale/notes-extension.pot
old mode 100644
new mode 100755
index 92719d4..95fc73d
--- a/notes@maestroschan.fr/locale/notes-extension.pot
+++ b/notes@maestroschan.fr/locale/notes-extension.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-02 23:02+0200\n"
+"POT-Creation-Date: 2019-08-29 19:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,209 +17,249 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: notes@maestroschan.fr/extension.js:91
+#: notes@maestroschan.fr/extension.js:94
 msgid "Show notes"
 msgstr ""
 
-#: notes@maestroschan.fr/menus.js:66
+#: notes@maestroschan.fr/menus.js:82
 msgid "Custom color"
 msgstr ""
 
-#: notes@maestroschan.fr/menus.js:68 notes@maestroschan.fr/prefs.ui:160
+#: notes@maestroschan.fr/menus.js:88 notes@maestroschan.fr/prefs.ui:158
 msgid "Settings"
 msgstr ""
 
-#: notes@maestroschan.fr/menus.js:88
+#: notes@maestroschan.fr/menus.js:145 notes@maestroschan.fr/prefs.ui:124
+msgid "Apply"
+msgstr ""
+
+#: notes@maestroschan.fr/menus.js:153
 msgid "Font size"
 msgstr ""
 
-#: notes@maestroschan.fr/menus.js:237
+#: notes@maestroschan.fr/menus.js:300
 msgid "Select All"
 msgstr ""
 
-#: notes@maestroschan.fr/noteBox.js:132
+#: notes@maestroschan.fr/noteBox.js:134
 msgid "New"
 msgstr ""
 
-#: notes@maestroschan.fr/noteBox.js:136
+#: notes@maestroschan.fr/noteBox.js:138
 msgid "Delete"
 msgstr ""
 
-#: notes@maestroschan.fr/noteBox.js:140
+#: notes@maestroschan.fr/noteBox.js:142
 msgid "Note options"
 msgstr ""
 
-#: notes@maestroschan.fr/noteBox.js:152
+#: notes@maestroschan.fr/noteBox.js:154
 msgid "Resize"
 msgstr ""
 
-#: notes@maestroschan.fr/noteBox.js:199 notes@maestroschan.fr/noteBox.js:221
+#: notes@maestroschan.fr/noteBox.js:176
 msgid "Back"
 msgstr ""
 
-#: notes@maestroschan.fr/noteBox.js:206 notes@maestroschan.fr/prefs.ui:125
-msgid "Apply"
-msgstr ""
-
-#: notes@maestroschan.fr/noteBox.js:228
+#: notes@maestroschan.fr/noteBox.js:183
 msgid "Delete this note?"
 msgstr ""
 
-#: notes@maestroschan.fr/noteBox.js:230
+#: notes@maestroschan.fr/noteBox.js:185
 msgid "Confirm"
 msgstr ""
 
-#: notes@maestroschan.fr/noteBox.js:256
+#: notes@maestroschan.fr/noteBox.js:210
 msgid "Type here…"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.js:45
+#: notes@maestroschan.fr/prefs.js:48
 msgid "On the background"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.js:46
+#: notes@maestroschan.fr/prefs.js:49
 msgid "Above everything"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.js:146
+#: notes@maestroschan.fr/prefs.js:140
+msgid "version:"
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.js:152
 msgid "Report bugs or ideas"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:20
+#: notes@maestroschan.fr/prefs.ui:19
 msgid "Position of notes"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:42
+#: notes@maestroschan.fr/prefs.ui:41
 msgid "\"On the background\" is incompatible with desktop icons."
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:58
+#: notes@maestroschan.fr/prefs.ui:57
 msgid "Automatic focus"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:91
+#: notes@maestroschan.fr/prefs.ui:90
 msgid "Use a keyboard shortcut"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:92
+#: notes@maestroschan.fr/prefs.ui:91
 msgid "Use a keyboard shortcut to toggle notes"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:114
+#: notes@maestroschan.fr/prefs.ui:113
 msgid "Default value is <Super>n"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:137
+#: notes@maestroschan.fr/prefs.ui:136
 msgid "Hide the icon"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:190
+#: notes@maestroschan.fr/prefs.ui:187
 msgid ""
 "<b>Show/hide all notes:</b> click on the icon in the GNOME Shell top bar."
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:198
+#: notes@maestroschan.fr/prefs.ui:195
 msgid ""
 "<b>Create a note:</b> click on the \"+\" button at the left of a note "
 "header, it will create a new note, with the same color and the same font "
 "size as the note you clicked on."
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:209
+#: notes@maestroschan.fr/prefs.ui:206
 msgid ""
 "<b>Move a note:</b> drag the blank space in the center of the note header."
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:217
+#: notes@maestroschan.fr/prefs.ui:214
 msgid ""
 "<b>Resize a note:</b> drag the resize button at the right of the note header."
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:225
+#: notes@maestroschan.fr/prefs.ui:222
 msgid "<b>Delete a note:</b> click on the wastebasket icon and confirm."
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:233
+#: notes@maestroschan.fr/prefs.ui:228
 msgid "Using the extension"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:249
+#: notes@maestroschan.fr/prefs.ui:243
 msgid "<b>Change color:</b> click on the menu button, and select a color."
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:260
+#: notes@maestroschan.fr/prefs.ui:251
+msgid "The \"Custom color\" submenu allows you to select precisely a color."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:262
 msgid ""
 "<b>Change font size:</b> click on the menu button, and increase or decrease "
 "the font size with \"+\" and \"-\" buttons."
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:268
+#: notes@maestroschan.fr/prefs.ui:270
+msgid ""
+"<b>Advanced settings:</b> click on the \"Settings\" menu item to access the "
+"settings dialog."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:276
 msgid "Customizing notes"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:282
+#: notes@maestroschan.fr/prefs.ui:291
+msgid "The dialog window you're reading provides several settings:"
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:299
+msgid ""
+"<b>Position of notes:</b> select whether you want the notes to be shown "
+"above the windows or underneath them."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:307
+msgid ""
+"<b>Automatic focus:</b> if this is enabled, the notes will automatically get "
+"the keyboard focus when you hover them with the mouse pointer."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:315
+msgid ""
+"<b>Keyboard shortcut:</b> hide/show notes with a keyboard shortcut. If this "
+"is enabled, the icon in the top bar can be hidden."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:321
+msgid "The settings window"
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:337
 msgid ""
 "Your notes are saved to the disk on various occasions (mainly when you hide "
 "them). If you want to <b>get a copy of your notes</b>, this button opens the "
 "folder where they are."
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:288
+#: notes@maestroschan.fr/prefs.ui:343
 msgid "Open the storage directory"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:298
+#: notes@maestroschan.fr/prefs.ui:353
 msgid ""
 "Files ending with \"_state\" contain the color and position of your notes"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:308
+#: notes@maestroschan.fr/prefs.ui:363
 msgid "Files ending with \"_text\" contain the text written in your notes"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:317
+#: notes@maestroschan.fr/prefs.ui:372
 msgid "Backup your notes"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:331
+#: notes@maestroschan.fr/prefs.ui:387
 msgid ""
 "Click on this button if you accidentally moved a note out of your primary "
 "monitor\n"
 "(example: if you had notes on a secondary monitor and unplugged it)."
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:338
+#: notes@maestroschan.fr/prefs.ui:394
 msgid "Bring back all notes to the primary monitor"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:344
+#: notes@maestroschan.fr/prefs.ui:400
 msgid "Lost some notes?"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:354
+#: notes@maestroschan.fr/prefs.ui:411
 msgid "Help"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:368
+#: notes@maestroschan.fr/prefs.ui:424
 msgid "Notes"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:380
+#: notes@maestroschan.fr/prefs.ui:433
 msgid "Sticky notes for the GNOME Shell desktop."
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:399
+#: notes@maestroschan.fr/prefs.ui:458
 msgid "Author:"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:414
+#: notes@maestroschan.fr/prefs.ui:473
 msgid "Translators:"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:419
+#: notes@maestroschan.fr/prefs.ui:478
 msgid "translator-credits"
 msgstr ""
 
-#: notes@maestroschan.fr/prefs.ui:437
+#: notes@maestroschan.fr/prefs.ui:507
 msgid "About"
 msgstr ""
diff --git a/notes@maestroschan.fr/locale/tr/LC_MESSAGES/notes-extension.mo b/notes@maestroschan.fr/locale/tr/LC_MESSAGES/notes-extension.mo
old mode 100644
new mode 100755
index 23b06c7..034c431
Binary files a/notes@maestroschan.fr/locale/tr/LC_MESSAGES/notes-extension.mo and b/notes@maestroschan.fr/locale/tr/LC_MESSAGES/notes-extension.mo differ
diff --git a/notes@maestroschan.fr/locale/tr/LC_MESSAGES/notes-extension.po b/notes@maestroschan.fr/locale/tr/LC_MESSAGES/notes-extension.po
index 877a3ad..a1d4723 100644
--- a/notes@maestroschan.fr/locale/tr/LC_MESSAGES/notes-extension.po
+++ b/notes@maestroschan.fr/locale/tr/LC_MESSAGES/notes-extension.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-02 23:02+0200\n"
+"POT-Creation-Date: 2019-08-29 19:44+0200\n"
 "PO-Revision-Date: 2019-04-19 02:59+0300\n"
 "Last-Translator: Serdar Sağlam <teknomobil@yandex.com>\n"
 "Language-Team: Türkçe <teknomobil@yandex.com>\n"
@@ -17,110 +17,114 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.2.1\n"
 
-#: notes@maestroschan.fr/extension.js:91
+#: notes@maestroschan.fr/extension.js:94
 msgid "Show notes"
 msgstr "Notları göster"
 
-#: notes@maestroschan.fr/menus.js:66
+#: notes@maestroschan.fr/menus.js:82
 msgid "Custom color"
 msgstr "Özel renk"
 
-#: notes@maestroschan.fr/menus.js:68 notes@maestroschan.fr/prefs.ui:160
+#: notes@maestroschan.fr/menus.js:88 notes@maestroschan.fr/prefs.ui:158
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: notes@maestroschan.fr/menus.js:88
+#: notes@maestroschan.fr/menus.js:145 notes@maestroschan.fr/prefs.ui:124
+msgid "Apply"
+msgstr "Uygula"
+
+#: notes@maestroschan.fr/menus.js:153
 msgid "Font size"
-msgstr "Yazı boyutu"
+msgstr "Boyutu"
 
-#: notes@maestroschan.fr/menus.js:237
+#: notes@maestroschan.fr/menus.js:300
 msgid "Select All"
 msgstr "Tümünü Seç"
 
-#: notes@maestroschan.fr/noteBox.js:132
+#: notes@maestroschan.fr/noteBox.js:134
 msgid "New"
 msgstr "Yeni"
 
-#: notes@maestroschan.fr/noteBox.js:136
+#: notes@maestroschan.fr/noteBox.js:138
 msgid "Delete"
 msgstr "Sil"
 
-#: notes@maestroschan.fr/noteBox.js:140
+#: notes@maestroschan.fr/noteBox.js:142
 msgid "Note options"
 msgstr "Not seçenekleri"
 
-#: notes@maestroschan.fr/noteBox.js:152
+#: notes@maestroschan.fr/noteBox.js:154
 msgid "Resize"
 msgstr "Boyutlandır"
 
-#: notes@maestroschan.fr/noteBox.js:199 notes@maestroschan.fr/noteBox.js:221
+#: notes@maestroschan.fr/noteBox.js:176
 msgid "Back"
 msgstr "Geri"
 
-#: notes@maestroschan.fr/noteBox.js:206 notes@maestroschan.fr/prefs.ui:125
-msgid "Apply"
-msgstr "Uygula"
-
-#: notes@maestroschan.fr/noteBox.js:228
+#: notes@maestroschan.fr/noteBox.js:183
 msgid "Delete this note?"
 msgstr "Not silinsin mi ?"
 
-#: notes@maestroschan.fr/noteBox.js:230
+#: notes@maestroschan.fr/noteBox.js:185
 msgid "Confirm"
 msgstr "Onayla"
 
-#: notes@maestroschan.fr/noteBox.js:256
+#: notes@maestroschan.fr/noteBox.js:210
 msgid "Type here…"
 msgstr "Notunu buraya yaz…"
 
-#: notes@maestroschan.fr/prefs.js:45
+#: notes@maestroschan.fr/prefs.js:48
 msgid "On the background"
 msgstr "Arka planda hep açık"
 
-#: notes@maestroschan.fr/prefs.js:46
+#: notes@maestroschan.fr/prefs.js:49
 msgid "Above everything"
 msgstr "Her şeyin üstünde"
 
-#: notes@maestroschan.fr/prefs.js:146
+#: notes@maestroschan.fr/prefs.js:140
+msgid "version:"
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.js:152
 msgid "Report bugs or ideas"
 msgstr "Hata raporla veya öneri gönder"
 
-#: notes@maestroschan.fr/prefs.ui:20
+#: notes@maestroschan.fr/prefs.ui:19
 msgid "Position of notes"
 msgstr "Notların konumu"
 
-#: notes@maestroschan.fr/prefs.ui:42
+#: notes@maestroschan.fr/prefs.ui:41
 msgid "\"On the background\" is incompatible with desktop icons."
 msgstr "\"Arka planda hep açık\" masaüstü simgeleriyle uyumlu değil."
 
-#: notes@maestroschan.fr/prefs.ui:58
+#: notes@maestroschan.fr/prefs.ui:57
 msgid "Automatic focus"
 msgstr "Otomatik odaklama"
 
-#: notes@maestroschan.fr/prefs.ui:91
+#: notes@maestroschan.fr/prefs.ui:90
 msgid "Use a keyboard shortcut"
 msgstr "Klavye kısayolu kullan"
 
-#: notes@maestroschan.fr/prefs.ui:92
+#: notes@maestroschan.fr/prefs.ui:91
 msgid "Use a keyboard shortcut to toggle notes"
 msgstr "Notları açmak için klavye kısayolu kullan"
 
-#: notes@maestroschan.fr/prefs.ui:114
+#: notes@maestroschan.fr/prefs.ui:113
 msgid "Default value is <Super>n"
 msgstr "Öntanımlı değer şudur <Super>n"
 
-#: notes@maestroschan.fr/prefs.ui:137
+#: notes@maestroschan.fr/prefs.ui:136
 msgid "Hide the icon"
 msgstr "Simgeyi gizle"
 
-#: notes@maestroschan.fr/prefs.ui:190
+#: notes@maestroschan.fr/prefs.ui:187
 msgid ""
 "<b>Show/hide all notes:</b> click on the icon in the GNOME Shell top bar."
 msgstr ""
 "<b>Tüm notları göster/gizle:</b> Gnome Shell üst çubuğundaki simgeye "
 "tıklayın."
 
-#: notes@maestroschan.fr/prefs.ui:198
+#: notes@maestroschan.fr/prefs.ui:195
 msgid ""
 "<b>Create a note:</b> click on the \"+\" button at the left of a note "
 "header, it will create a new note, with the same color and the same font "
@@ -130,33 +134,37 @@ msgstr ""
 "tıklattığınız notla aynı renk ve aynı yazı tipi boyutunda yeni bir not "
 "oluşturur."
 
-#: notes@maestroschan.fr/prefs.ui:209
+#: notes@maestroschan.fr/prefs.ui:206
 msgid ""
 "<b>Move a note:</b> drag the blank space in the center of the note header."
 msgstr ""
 "<b>Not Taşıma:</b> çubuğun ortasındaki boşluğa basıp istediğiniz yere "
 "sürükleyin."
 
-#: notes@maestroschan.fr/prefs.ui:217
+#: notes@maestroschan.fr/prefs.ui:214
 msgid ""
 "<b>Resize a note:</b> drag the resize button at the right of the note header."
 msgstr ""
 "<b>Boyutlandırma:</b> çubuğun en sağındaki boyutlandırma düğmesine basıp "
 "sürükleyin."
 
-#: notes@maestroschan.fr/prefs.ui:225
+#: notes@maestroschan.fr/prefs.ui:222
 msgid "<b>Delete a note:</b> click on the wastebasket icon and confirm."
 msgstr "<b>Not silme:</b> çöp kutusu simgesine tıklayın ve onay verin."
 
-#: notes@maestroschan.fr/prefs.ui:233
+#: notes@maestroschan.fr/prefs.ui:228
 msgid "Using the extension"
 msgstr "Eklentinin kullanımı"
 
-#: notes@maestroschan.fr/prefs.ui:249
+#: notes@maestroschan.fr/prefs.ui:243
 msgid "<b>Change color:</b> click on the menu button, and select a color."
 msgstr "<b>Renk değiştirme:</b> menü düğmesine tıklayın ve bir renk seçin."
 
-#: notes@maestroschan.fr/prefs.ui:260
+#: notes@maestroschan.fr/prefs.ui:251
+msgid "The \"Custom color\" submenu allows you to select precisely a color."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:262
 msgid ""
 "<b>Change font size:</b> click on the menu button, and increase or decrease "
 "the font size with \"+\" and \"-\" buttons."
@@ -164,11 +172,43 @@ msgstr ""
 "<b>Yazı tipi boyutu:</b> menü düğmesine tıklayın ve yazı tipi boyutunu \"+\" "
 "ve \"-\" düğmeleriyle artırın veya azaltın."
 
-#: notes@maestroschan.fr/prefs.ui:268
+#: notes@maestroschan.fr/prefs.ui:270
+msgid ""
+"<b>Advanced settings:</b> click on the \"Settings\" menu item to access the "
+"settings dialog."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:276
 msgid "Customizing notes"
 msgstr "Notların özelleştirilmesi"
 
-#: notes@maestroschan.fr/prefs.ui:282
+#: notes@maestroschan.fr/prefs.ui:291
+msgid "The dialog window you're reading provides several settings:"
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:299
+msgid ""
+"<b>Position of notes:</b> select whether you want the notes to be shown "
+"above the windows or underneath them."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:307
+msgid ""
+"<b>Automatic focus:</b> if this is enabled, the notes will automatically get "
+"the keyboard focus when you hover them with the mouse pointer."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:315
+msgid ""
+"<b>Keyboard shortcut:</b> hide/show notes with a keyboard shortcut. If this "
+"is enabled, the icon in the top bar can be hidden."
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:321
+msgid "The settings window"
+msgstr ""
+
+#: notes@maestroschan.fr/prefs.ui:337
 msgid ""
 "Your notes are saved to the disk on various occasions (mainly when you hide "
 "them). If you want to <b>get a copy of your notes</b>, this button opens the "
@@ -178,24 +218,24 @@ msgstr ""
 "yedeklenir) Gerekirse <b>notların bir kopyasını alabilirsiniz</b>, eklenen "
 "notlara aşağıdan ulaşabilirsiniz."
 
-#: notes@maestroschan.fr/prefs.ui:288
+#: notes@maestroschan.fr/prefs.ui:343
 msgid "Open the storage directory"
 msgstr "Notların depolandığı dizini aç"
 
-#: notes@maestroschan.fr/prefs.ui:298
+#: notes@maestroschan.fr/prefs.ui:353
 msgid ""
 "Files ending with \"_state\" contain the color and position of your notes"
 msgstr "\"_state\" ile biten dosyalar notlarınızın rengini ve konumunu içerir"
 
-#: notes@maestroschan.fr/prefs.ui:308
+#: notes@maestroschan.fr/prefs.ui:363
 msgid "Files ending with \"_text\" contain the text written in your notes"
 msgstr "\"_text\" ile biten dosyalar notlarınızda yazılan metni içerir"
 
-#: notes@maestroschan.fr/prefs.ui:317
+#: notes@maestroschan.fr/prefs.ui:372
 msgid "Backup your notes"
 msgstr "Notlarınızı yedekleyin"
 
-#: notes@maestroschan.fr/prefs.ui:331
+#: notes@maestroschan.fr/prefs.ui:387
 msgid ""
 "Click on this button if you accidentally moved a note out of your primary "
 "monitor\n"
@@ -205,39 +245,39 @@ msgstr ""
 "tıklayın \n"
 "(örnek: Eğer ikinci bir monitörde notlarınız varsa ve fişten çekmişseniz)."
 
-#: notes@maestroschan.fr/prefs.ui:338
+#: notes@maestroschan.fr/prefs.ui:394
 msgid "Bring back all notes to the primary monitor"
 msgstr "Tüm notları birincil ana ekrana geri getir"
 
-#: notes@maestroschan.fr/prefs.ui:344
+#: notes@maestroschan.fr/prefs.ui:400
 msgid "Lost some notes?"
 msgstr "Notlarını mı kaybettin?"
 
-#: notes@maestroschan.fr/prefs.ui:354
+#: notes@maestroschan.fr/prefs.ui:411
 msgid "Help"
 msgstr "Yardım"
 
-#: notes@maestroschan.fr/prefs.ui:368
+#: notes@maestroschan.fr/prefs.ui:424
 msgid "Notes"
 msgstr "Notlar"
 
-#: notes@maestroschan.fr/prefs.ui:380
+#: notes@maestroschan.fr/prefs.ui:433
 msgid "Sticky notes for the GNOME Shell desktop."
 msgstr "GNOME Kabuğu için masaüstü yapışkan notlar."
 
-#: notes@maestroschan.fr/prefs.ui:399
+#: notes@maestroschan.fr/prefs.ui:458
 msgid "Author:"
 msgstr "Hazırlayan:"
 
-#: notes@maestroschan.fr/prefs.ui:414
+#: notes@maestroschan.fr/prefs.ui:473
 msgid "Translators:"
 msgstr "Çeviren:"
 
-#: notes@maestroschan.fr/prefs.ui:419
+#: notes@maestroschan.fr/prefs.ui:478
 msgid "translator-credits"
 msgstr "Serdar Sağlam"
 
-#: notes@maestroschan.fr/prefs.ui:437
+#: notes@maestroschan.fr/prefs.ui:507
 msgid "About"
 msgstr "Hakkında"
 
diff --git a/notes@maestroschan.fr/menus.js b/notes@maestroschan.fr/menus.js
old mode 100644
new mode 100755
index a2cf050..179e29d
--- a/notes@maestroschan.fr/menus.js
+++ b/notes@maestroschan.fr/menus.js
@@ -1,3 +1,6 @@
+// notes@maestroschan.fr/menus.js
+// GPL v3
+// Copyright Romain F. T.
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
@@ -10,6 +13,7 @@ const Util = imports.misc.util;
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
 const Convenience = Me.imports.convenience;
+const Extension = Me.imports.extension;
 
 const Gettext = imports.gettext.domain('notes-extension');
 const _ = Gettext.gettext;
@@ -35,7 +39,7 @@ class OptionsMenu {
 	}
 
 	_redisplay () {
-		this.super_menu.removeAll();
+		this.super_menu.removeAll(); //-----------------------------------------
 		
 		this.size_item = new PopupMenu.PopupBaseMenuItem({
 			reactive: false,
@@ -44,6 +48,11 @@ class OptionsMenu {
 			style_class: null,
 			can_focus: false
 		});
+		this.super_menu.addMenuItem(this.size_item);
+		this._buildSizeItem();
+		
+		this._appendSeparator(); //---------------------------------------------
+		
 		this.color1_item = new PopupMenu.PopupBaseMenuItem({
 			reactive: false,
 			activate: false,
@@ -51,6 +60,12 @@ class OptionsMenu {
 			style_class: null,
 			can_focus: false
 		});
+		this._addColorButton('red', 1);
+		this._addColorButton('green', 1);
+		this._addColorButton('blue', 1);
+		this._addColorButton('black', 1);
+		this.super_menu.addMenuItem(this.color1_item);
+		
 		this.color2_item = new PopupMenu.PopupBaseMenuItem({
 			reactive: false,
 			activate: false,
@@ -58,28 +73,78 @@ class OptionsMenu {
 			style_class: null,
 			can_focus: false
 		});
-		
-		this.super_menu.addMenuItem(this.size_item);
-		this._appendSeparator();
-		this.super_menu.addMenuItem(this.color1_item);
-		this.super_menu.addMenuItem(this.color2_item);
-		this._appendMenuItem( _("Custom color") ).connect('activate', this._onCustom.bind(this));
-		this._appendSeparator();
-		this._appendMenuItem( _("Settings") ).connect('activate', this._onSettings.bind(this));
-		
-		//----------------------------------------------------------------------
-		
-		this._addColorButton('red', 1);
-		this._addColorButton('green', 1);
-		this._addColorButton('blue', 1);
-		this._addColorButton('black', 1);
-		
 		this._addColorButton('cyan', 2);
 		this._addColorButton('magenta', 2);
 		this._addColorButton('yellow', 2);
 		this._addColorButton('white', 2);
+		this.super_menu.addMenuItem(this.color2_item);
 		
-		this._buildSizeItem();
+		let colorSubmenuItem = new PopupMenu.PopupSubMenuMenuItem(_("Custom color"));
+		this.super_menu.addMenuItem(colorSubmenuItem);
+		this._buildCustomColorMenu(colorSubmenuItem.menu);
+		
+		this._appendSeparator(); //---------------------------------------------
+		
+		this.super_menu.addAction(_("Settings"), this._onSettings);
+	}
+
+	_buildCustomColorMenu (colorSubmenu) {
+		let colorR_item = new PopupMenu.PopupBaseMenuItem({
+			reactive: false,
+			activate: false,
+			hover: false,
+			style_class: null,
+			can_focus: false
+		});
+		let colorG_item = new PopupMenu.PopupBaseMenuItem({
+			reactive: false,
+			activate: false,
+			hover: false,
+			style_class: null,
+			can_focus: false
+		});
+		let colorB_item = new PopupMenu.PopupBaseMenuItem({
+			reactive: false,
+			activate: false,
+			hover: false,
+			style_class: null,
+			can_focus: false
+		});
+		
+		this.colorEntryR = new St.Entry({
+			can_focus: true,
+			track_hover: true,
+			x_expand: true
+		});
+		this.colorEntryG = new St.Entry({
+			can_focus: true,
+			track_hover: true,
+			x_expand: true
+		});
+		this.colorEntryB = new St.Entry({
+			can_focus: true,
+			track_hover: true,
+			x_expand: true
+		});
+		
+		let rgb = this._source._note.customColor;
+		this.colorEntryR.set_text(rgb.split(',')[0]);
+		this.colorEntryG.set_text(rgb.split(',')[1]);
+		this.colorEntryB.set_text(rgb.split(',')[2]);
+		this.colorEntryR.style = 'background-color: #BB3322; color: #FFFFFF';
+		this.colorEntryG.style = 'background-color: #22BB33; color: #FFFFFF';
+		this.colorEntryB.style = 'background-color: #2233BB; color: #FFFFFF';
+		colorR_item.actor.add(this.colorEntryR, { expand: true });
+		colorG_item.actor.add(this.colorEntryG, { expand: true });
+		colorB_item.actor.add(this.colorEntryB, { expand: true });
+		
+		colorSubmenu.addMenuItem(colorR_item);
+		colorSubmenu.addMenuItem(colorG_item);
+		colorSubmenu.addMenuItem(colorB_item);
+		
+		let applyMenuItem = new PopupMenu.PopupMenuItem(_("Apply"));
+		applyMenuItem.connect('activate', this._onApplyCustom.bind(this));
+		colorSubmenu.addMenuItem(applyMenuItem);
 	}
 
 	_buildSizeItem () {
@@ -139,18 +204,16 @@ class OptionsMenu {
 		this.super_menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
 	}
 
-	_appendMenuItem (labelText) {
-		let item = new PopupMenu.PopupMenuItem(labelText);
-		this.super_menu.addMenuItem(item);
-		return item;
-	}
-
-	_onCustom () {
-		this._source._note.showColor();
+	_onApplyCustom () {
+		let r = Number(this.colorEntryR.get_text());
+		let g = Number(this.colorEntryG.get_text());
+		let b = Number(this.colorEntryB.get_text());
+		this._source._note.applyColor(r, g, b);
 	}
 
 	_onSettings () {
 		Util.spawn(['gnome-shell-extension-prefs', 'notes@maestroschan.fr']);
+		Extension.GLOBAL_BUTTON._hideNotes();
 	}
 
 	_onApply (color, button) {
diff --git a/notes@maestroschan.fr/metadata.json b/notes@maestroschan.fr/metadata.json
old mode 100644
new mode 100755
index ea7fe4e..09b2106
--- a/notes@maestroschan.fr/metadata.json
+++ b/notes@maestroschan.fr/metadata.json
@@ -1,16 +1,16 @@
 {
-  "_generated": "Generated by SweetTooth, do not edit", 
-  "description": "Sticky notes for the GNOME Shell desktop.", 
-  "gettext-domain": "notes-extension", 
-  "name": "Notes", 
-  "shell-version": [
-    "3.26",
-    "3.28",
-    "3.30",
-    "3.32"
-  ], 
-  "url": "https://github.com/maoschanz/notes-extension-gnome", 
-  "uuid": "notes@maestroschan.fr", 
-  "settings-schema": "org.gnome.shell.extensions.notes-extension",
-  "version": 0
+	"_generated": "Generated by SweetTooth, do not edit",
+	"description": "Sticky notes for the GNOME Shell desktop.",
+	"gettext-domain": "notes-extension",
+	"name": "Notes",
+	"shell-version": [
+		"3.26",
+		"3.28",
+		"3.30",
+		"3.32"
+	],
+	"url": "https://github.com/maoschanz/notes-extension-gnome",
+	"uuid": "notes@maestroschan.fr",
+	"settings-schema": "org.gnome.shell.extensions.notes-extension",
+	"version": 0
 }
diff --git a/notes@maestroschan.fr/noteBox.js b/notes@maestroschan.fr/noteBox.js
old mode 100644
new mode 100755
index 5eb0dc2..598a4da
--- a/notes@maestroschan.fr/noteBox.js
+++ b/notes@maestroschan.fr/noteBox.js
@@ -1,4 +1,6 @@
-
+// notes@maestroschan.fr/noteBox.js
+// GPL v3
+// Copyright Romain F. T.
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
@@ -160,53 +162,6 @@ var NoteBox = class NoteBox {
 		ctrlButton.actor.connect('motion-event', this._onResizeMotion.bind(this));
 		ctrlButton.actor.connect('button-release-event', this._onRelease.bind(this));
 		
-		// This is the interface for custom color. It is mainly useless. The whole box is hidden by
-		// default, and will be shown instead of the regular header if the user needs it.
-		this.color_box = new St.BoxLayout({
-			vertical: false,
-			visible: false,
-			reactive: true,
-			x_expand: true,
-			y_expand: false,
-			style_class: 'boxStyle',
-		});
-		
-		this.colorEntryR = new St.Entry({
-			name: 'colorEntryR',
-			can_focus: true,
-			track_hover: true,
-			x_expand: true
-		});
-		this.colorEntryV = new St.Entry({
-			name: 'colorEntryV',
-			can_focus: true,
-			track_hover: true,
-			x_expand: true
-		});
-		this.colorEntryB = new St.Entry({
-			name: 'colorEntryB',
-			can_focus: true,
-			track_hover: true,
-			x_expand: true
-		});
-		this.colorEntryR.set_text(this.customColor.split(',')[0]);
-		this.colorEntryV.set_text(this.customColor.split(',')[1]);
-		this.colorEntryB.set_text(this.customColor.split(',')[2]);
-		this.colorEntryR.style = 'background-color: #BB3322; color: #FFFFFF';
-		this.colorEntryV.style = 'background-color: #22BB33; color: #FFFFFF';
-		this.colorEntryB.style = 'background-color: #2233BB; color: #FFFFFF';
-		
-		let btnBack1 = new Menus.RoundButton(this, 'go-previous-symbolic', _("Back"));
-		btnBack1.actor.connect('clicked', this.hideColor.bind(this));
-		this.color_box.add(btnBack1.actor);
-
-		this.color_box.add_actor(this.colorEntryR);
-		this.color_box.add_actor(this.colorEntryV);
-		this.color_box.add_actor(this.colorEntryB);
-		let btnApply = new Menus.RoundButton(this, 'object-select-symbolic', _("Apply"));
-		btnApply.actor.connect('clicked', this.applyColor.bind(this));
-		this.color_box.add(btnApply.actor);
-		
 		// This is the UI for deletion. The whole box is hidden by default, and will
 		// be shown instead of the regular header if the user needs it.
 		this.delete_box = new St.BoxLayout({
@@ -235,7 +190,6 @@ var NoteBox = class NoteBox {
 		
 		this.actor.add_actor(this.buttons_box);
 		this.actor.add_actor(this.delete_box);
-		this.actor.add_actor(this.color_box);
 		
 		//-------------
 		
@@ -263,10 +217,7 @@ var NoteBox = class NoteBox {
 		clutterText.set_activatable(false); // we can press Enter
 		clutterText.set_line_wrap(true);
 		clutterText.set_line_wrap_mode(imports.gi.Pango.WrapMode.WORD_CHAR);
-		
-		this.applyNoteStyle();
-		this.applyColor();
-		
+
 		this.entry_box = new St.BoxLayout({
 			reactive: true,
 			x_expand: true,
@@ -286,12 +237,22 @@ var NoteBox = class NoteBox {
 		this._setNotePosition();
 		this.loadText();
 		Menus.addContextMenu(this.noteEntry, this);
+		this._initStyle();
 		
 		this.grabX = this._x + 100;
 		this.grabY = this._y + 10;
 	}
+	
+	_initStyle () {
+		let initialRGB_r = this.customColor.split(',')[0];
+		let initialRGB_g = this.customColor.split(',')[1];
+		let initialRGB_b = this.customColor.split(',')[2];
+		this.applyColor(initialRGB_r, initialRGB_g, initialRGB_b);
+		this.applyActorStyle();
+		this.applyNoteStyle();
+	}
 
-	getKeyFocus() {
+	getKeyFocus () {
 		if (this.actor == null) { return; } //XXX shouldn't exist
 		if (this.entry_is_visible) {
 			this.noteEntry.grab_key_focus();
@@ -399,18 +360,6 @@ var NoteBox = class NoteBox {
 		this.buttons_box.visible = true;
 	}
 
-	showColor () {
-		this.redraw();
-		this.buttons_box.visible = false;
-		this.color_box.visible = true;
-	}
-
-	hideColor () {
-		this.redraw();
-		this.color_box.visible = false;
-		this.buttons_box.visible = true;
-	}
-
 	blackFontColor () {
 		this._fontColor = '#000000';
 		this.applyActorStyle();
@@ -433,47 +382,15 @@ var NoteBox = class NoteBox {
 	// This weird crap applies the custom color from the 3 entries. It requires
 	// string manipulations since the color is set in a text file in the 'r,g,b'
 	// format. Also, the text coloration needs to be updated.
-	applyColor () {
-		let temp = '';
-		let total = 0;
-		if(Number(this.colorEntryR.get_text()) < 0) {
-			temp += '0,';
-			total += 0;
-			this.colorEntryR.set_text('0');
-		} else if(Number(this.colorEntryR.get_text()) > 255) {
-			temp += '255,';
-			total += 255;
-			this.colorEntryR.set_text('255');
-		} else {
-			temp += Number(this.colorEntryR.get_text()).toString() + ',';
-			total += Number(this.colorEntryR.get_text());
-		}
-		if(Number(this.colorEntryV.get_text()) < 0) {
-			temp += '0,';
-			total += 0;
-			this.colorEntryV.set_text('0');
-		} else if(Number(this.colorEntryV.get_text()) > 255) {
-			temp += '255,';
-			total += 255;
-			this.colorEntryV.set_text('255');
-		} else {
-			temp += Number(this.colorEntryV.get_text()).toString() + ',';
-			total += Number(this.colorEntryV.get_text());
-		}
-		if(Number(this.colorEntryB.get_text()) < 0) {
-			temp += '0';
-			total += 0;
-			this.colorEntryB.set_text('0');
-		} else if(Number(this.colorEntryB.get_text()) > 255) {
-			temp += '255';
-			total += 255;
-			this.colorEntryR.set_text('255');
-		} else {
-			temp += Number(this.colorEntryB.get_text()).toString();
-			total += Number(this.colorEntryB.get_text());
-		}
-		this.customColor = temp;
-		if (total > 250) {
+	applyColor (r, g, b) {
+		if (Number.isNaN(r)) { r = 255; }
+		if (Number.isNaN(g)) { g = 255; }
+		if (Number.isNaN(b)) { b = 255; }
+		r = Math.min(Math.max(0, r), 255);
+		g = Math.min(Math.max(0, g), 255);
+		b = Math.min(Math.max(0, b), 255);
+		this.customColor = r.toString() + ',' + g.toString() + ',' + b.toString();
+		if (r + g + b > 250) {
 			this.blackFontColor();
 		} else {
 			this.whiteFontColor();
@@ -483,41 +400,33 @@ var NoteBox = class NoteBox {
 	}
 
 	applyPresetColor (color) {
-		this.blackFontColor();
-		let temp;
 		switch(color) {
 			case 'red':
-				temp = '250,0,0';
-				this.whiteFontColor();
+				this.applyColor(250, 0, 0);
 				break;
 			case 'magenta':
-				temp = '255,0,255';
+				this.applyColor(255, 0, 255);
 				break;
 			case 'yellow':
-				temp = '255,255,0';
+				this.applyColor(255, 255, 0);
 				break;
 			case 'white':
-				temp = '255,255,255';
+				this.applyColor(255, 255, 255);
 				break;
 			case 'cyan':
-				temp = '0,255,255';
+				this.applyColor(0, 255, 255);
 				break;
 			case 'green':
-				temp = '0,255,0';
+				this.applyColor(0, 255, 0);
 				break;
 			case 'blue':
-				temp = '0,0,250';
-				this.whiteFontColor();
+				this.applyColor(0, 0, 250);
 				break;
 			case 'black':
 			default:
-				temp = '10,10,10';
-				this.whiteFontColor();
+				this.applyColor(10, 10, 10);
 				break;
 		}
-		this.customColor = temp;
-		this.applyNoteStyle();
-		this.applyActorStyle();
 	}
 
 	loadText () {
diff --git a/notes@maestroschan.fr/prefs.js b/notes@maestroschan.fr/prefs.js
old mode 100644
new mode 100755
index 7f2eca0..4ae2d0e
--- a/notes@maestroschan.fr/prefs.js
+++ b/notes@maestroschan.fr/prefs.js
@@ -1,3 +1,6 @@
+// notes@maestroschan.fr/prefs.js
+// GPL v3
+// Copyright Romain F. T.
 
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
@@ -113,8 +116,8 @@ const NotesSettingsWidget = new GObject.Class({
 		);
 		builder.get_object('image2').set_from_pixbuf(
 			GdkPixbuf.Pixbuf.new_from_file_at_size(
-			              Me.path + '/screenshots/help_picture_2.png', 383, 233)
-		); // TODO update this picture and write about "custom color"
+			              Me.path + '/screenshots/help_picture_2.png', 380, 300)
+		);
 		
 		let data_button = builder.get_object('backup_btn');
 		data_button.connect('clicked', (widget) => {
@@ -130,25 +133,27 @@ const NotesSettingsWidget = new GObject.Class({
 		
 		builder.get_object('about_icon').set_from_pixbuf(
 			GdkPixbuf.Pixbuf.new_from_file_at_size(Me.path +
-			                         '/screenshots/about_picture.png', 326, 228)
+			                         '/screenshots/about_picture.png', 163, 114)
+//			                         '/screenshots/about_picture.png', 326, 228)
 		);
 		
+		let a_version = _("version:") + ' ' + Me.metadata.version.toString();
+		builder.get_object('label_version').set_label(a_version)
+		
 		let translation_credits = builder.get_object('translation_credits').get_label();
 		if (translation_credits == 'translator-credits') {
 			builder.get_object('translation_label').set_label('');
 			builder.get_object('translation_credits').set_label('');
 		}
 		
-		let linkBox = builder.get_object('link_box'); // FIXME padding ???
-		let a_version = ' (v' + Me.metadata.version.toString() + ') ';
+		let linkBox = builder.get_object('link_box');
 		
-		let url_button = new Gtk.LinkButton({
+		let url_button1 = new Gtk.LinkButton({
 			label: _("Report bugs or ideas"),
 			uri: Me.metadata.url.toString()
 		});
 		
-		linkBox.pack_start(url_button, false, false, 0);
-		linkBox.pack_end(new Gtk.Label({ label: a_version, halign: Gtk.Align.START }), false, false, 0);
+		linkBox.pack_start(url_button1, false, false, 0);
 		
 		//----------------------------------------------------------------------
 		
diff --git a/notes@maestroschan.fr/prefs.ui b/notes@maestroschan.fr/prefs.ui
old mode 100644
new mode 100755
index 222c0d2..cd20c57
--- a/notes@maestroschan.fr/prefs.ui
+++ b/notes@maestroschan.fr/prefs.ui
@@ -3,228 +3,223 @@
 	<object class="GtkStack" id="prefs_stack">
 		<property name="transition-type">slide-left-right</property>
 
+	<!--"Settings" page-->
 		<child>
-			<object class="GtkScrolledWindow" id="settings_page">
-				<child>
-					<object class="GtkGrid">
-						<property name="expand">True</property>
-						<property name="row-spacing">12</property>
-						<property name="column-spacing">36</property>
-						<property name="halign">center</property>
-						<property name="margin">24</property>
-
-						<child>
-							<object class="GtkLabel">
-								<property name="halign">end</property>
-								<property name="expand">False</property>
-								<property name="label" translatable="yes">Position of notes</property>
-							</object>
-							<packing>
-								<property name="left-attach">0</property>
-								<property name="top-attach">0</property>
-							</packing>
-						</child>
-						<child>
-							<object class="GtkComboBoxText" id="position_combobox">
-								<property name="expand">False</property>
-							</object>
-							<packing>
-								<property name="left-attach">1</property>
-								<property name="top-attach">0</property>
-							</packing>
-						</child>
+			<object class="GtkGrid">
+				<property name="expand">True</property>
+				<property name="row-spacing">12</property>
+				<property name="column-spacing">36</property>
+				<property name="halign">center</property>
+				<property name="margin">24</property>
 
-						<child>
-							<object class="GtkLabel">
-								<property name="expand">False</property>
-								<property name="wrap">True</property>
-								<property name="halign">center</property>
-								<property name="label" translatable="yes">"On the background" is incompatible with desktop icons.</property>
-								<style>
-									<class name="dim-label"/>
-								</style>
-							</object>
-							<packing>
-								<property name="width">2</property>
-								<property name="left-attach">0</property>
-								<property name="top-attach">1</property>
-							</packing>
-						</child>
+				<child>
+					<object class="GtkLabel">
+						<property name="halign">end</property>
+						<property name="expand">False</property>
+						<property name="label" translatable="yes">Position of notes</property>
+					</object>
+					<packing>
+						<property name="left-attach">0</property>
+						<property name="top-attach">0</property>
+					</packing>
+				</child>
+				<child>
+					<object class="GtkComboBoxText" id="position_combobox">
+						<property name="expand">False</property>
+					</object>
+					<packing>
+						<property name="left-attach">1</property>
+						<property name="top-attach">0</property>
+					</packing>
+				</child>
 
-						<child>
-							<object class="GtkLabel">
-								<property name="halign">end</property>
-								<property name="expand">False</property>
-								<property name="label" translatable="yes">Automatic focus</property>
-							</object>
-							<packing>
-								<property name="left-attach">0</property>
-								<property name="top-attach">2</property>
-							</packing>
-						</child>
-						<child>
-							<object class="GtkSwitch" id="focus_switch">
-								<property name="expand">False</property>
-								<property name="halign">start</property>
-							</object>
-							<packing>
-								<property name="left-attach">1</property>
-								<property name="top-attach">2</property>
-							</packing>
-						</child>
-						
-						<child>
-							<object class="GtkSeparator">
-								<property name="expand">False</property>
-							</object>
-							<packing>
-								<property name="left-attach">0</property>
-								<property name="top-attach">3</property>
-								<property name="width">2</property>
-							</packing>
-						</child>
+				<child>
+					<object class="GtkLabel">
+						<property name="expand">False</property>
+						<property name="wrap">True</property>
+						<property name="halign">center</property>
+						<property name="label" translatable="yes">"On the background" is incompatible with desktop icons.</property>
+						<style>
+							<class name="dim-label"/>
+						</style>
+					</object>
+					<packing>
+						<property name="width">2</property>
+						<property name="left-attach">0</property>
+						<property name="top-attach">1</property>
+					</packing>
+				</child>
 
-						<child>
-							<object class="GtkLabel">
-								<property name="expand">False</property>
-								<property name="halign">end</property>
-								<property name="label" translatable="yes">Use a keyboard shortcut</property>
-								<property name="tooltip_text" translatable="yes">Use a keyboard shortcut to toggle notes</property>
-							</object>
-							<packing>
-								<property name="left-attach">0</property>
-								<property name="top-attach">7</property>
-							</packing>
-						</child>
-						<child>
-							<object class="GtkSwitch" id="keybinding_switch">
-								<property name="expand">False</property>
-								<property name="halign">start</property>
-							</object>
-							<packing>
-								<property name="left-attach">1</property>
-								<property name="top-attach">7</property>
-							</packing>
-						</child>
+				<child>
+					<object class="GtkLabel">
+						<property name="halign">end</property>
+						<property name="expand">False</property>
+						<property name="label" translatable="yes">Automatic focus</property>
+					</object>
+					<packing>
+						<property name="left-attach">0</property>
+						<property name="top-attach">2</property>
+					</packing>
+				</child>
+				<child>
+					<object class="GtkSwitch" id="focus_switch">
+						<property name="expand">False</property>
+						<property name="halign">start</property>
+					</object>
+					<packing>
+						<property name="left-attach">1</property>
+						<property name="top-attach">2</property>
+					</packing>
+				</child>
+				
+				<child>
+					<object class="GtkSeparator">
+						<property name="expand">False</property>
+					</object>
+					<packing>
+						<property name="left-attach">0</property>
+						<property name="top-attach">3</property>
+						<property name="width">2</property>
+					</packing>
+				</child>
 
-						<child>
-							<object class="GtkEntry" id="keybinding_entry">
-								<property name="expand">False</property>
-								<property name="halign">end</property>
-								<property name="tooltip_text" translatable="yes">Default value is &lt;Super&gt;n</property>
-							</object>
-							<packing>
-								<property name="left-attach">0</property>
-								<property name="top-attach">8</property>
-							</packing>
-						</child>
-						<child>
-							<object class="GtkButton" id="keybinding_button">
-								<property name="expand">False</property>
-								<property name="halign">start</property>
-								<property name="label" translatable="yes">Apply</property>
-							</object>
-							<packing>
-								<property name="left-attach">1</property>
-								<property name="top-attach">8</property>
-							</packing>
-						</child>
+				<child>
+					<object class="GtkLabel">
+						<property name="expand">False</property>
+						<property name="halign">end</property>
+						<property name="label" translatable="yes">Use a keyboard shortcut</property>
+						<property name="tooltip_text" translatable="yes">Use a keyboard shortcut to toggle notes</property>
+					</object>
+					<packing>
+						<property name="left-attach">0</property>
+						<property name="top-attach">7</property>
+					</packing>
+				</child>
+				<child>
+					<object class="GtkSwitch" id="keybinding_switch">
+						<property name="expand">False</property>
+						<property name="halign">start</property>
+					</object>
+					<packing>
+						<property name="left-attach">1</property>
+						<property name="top-attach">7</property>
+					</packing>
+				</child>
 
-						<child>
-							<object class="GtkLabel">
-								<property name="halign">end</property>
-								<property name="expand">False</property>
-								<property name="label" translatable="yes">Hide the icon</property>
-							</object>
-							<packing>
-								<property name="left-attach">0</property>
-								<property name="top-attach">9</property>
-							</packing>
-						</child>
-						<child>
-							<object class="GtkSwitch" id="hide_switch">
-								<property name="expand">False</property>
-								<property name="halign">start</property>
-							</object>
-							<packing>
-								<property name="left-attach">1</property>
-								<property name="top-attach">9</property>
-							</packing>
-						</child>
+				<child>
+					<object class="GtkEntry" id="keybinding_entry">
+						<property name="expand">False</property>
+						<property name="halign">end</property>
+						<property name="tooltip_text" translatable="yes">Default value is &lt;Super&gt;n</property>
+					</object>
+					<packing>
+						<property name="left-attach">0</property>
+						<property name="top-attach">8</property>
+					</packing>
+				</child>
+				<child>
+					<object class="GtkButton" id="keybinding_button">
+						<property name="expand">False</property>
+						<property name="halign">start</property>
+						<property name="label" translatable="yes">Apply</property>
+					</object>
+					<packing>
+						<property name="left-attach">1</property>
+						<property name="top-attach">8</property>
+					</packing>
+				</child>
 
+				<child>
+					<object class="GtkLabel">
+						<property name="halign">end</property>
+						<property name="expand">False</property>
+						<property name="label" translatable="yes">Hide the icon</property>
+					</object>
+					<packing>
+						<property name="left-attach">0</property>
+						<property name="top-attach">9</property>
+					</packing>
+				</child>
+				<child>
+					<object class="GtkSwitch" id="hide_switch">
+						<property name="expand">False</property>
+						<property name="halign">start</property>
 					</object>
+					<packing>
+						<property name="left-attach">1</property>
+						<property name="top-attach">9</property>
+					</packing>
 				</child>
+
 			</object>
 			<packing>
+<!--				<property name="icon-name">preferences-other-symbolic</property>-->
 				<property name="name">settings_page</property>
 				<property name="title" translatable="yes">Settings</property>
 			</packing>
 		</child>
 
+		<!--"Help" page-->
 		<child>
-			<object class="GtkScrolledWindow" id="help_page">
+			<object class="GtkBox">
+				<property name="expand">True</property>
+				<property name="orientation">horizontal</property>
 				<child>
-					<object class="GtkBox">
-						<property name="expand">True</property>
-						<property name="orientation">horizontal</property>
-						<child>
-							<object class="GtkStackSidebar" id="sidebar">
-								<property name="stack">help_stack</property>
-							</object>
-						</child>
+					<object class="GtkStackSidebar" id="sidebar">
+						<property name="stack">help_stack</property>
+					</object>
+				</child>
+				<child>
+					<object class="GtkScrolledWindow">
 						<child>
 							<object class="GtkStack" id="help_stack">
 								<child>
-									<object class="GtkScrolledWindow">
+									<object class="GtkBox">
+										<property name="orientation">vertical</property>
+										<property name="expand">True</property>
+										<property name="margin">15</property>
+										<property name="spacing">10</property>
+										<child>
+											<object class="GtkLabel">
+												<property name="halign">start</property>
+												<property name="wrap">True</property>
+												<property name="use-markup">True</property>
+												<property name="label" translatable="yes">&lt;b&gt;Show/hide all notes:&lt;/b&gt; click on the icon in the GNOME Shell top bar.</property>
+											</object>
+										</child>
+										<child>
+											<object class="GtkLabel">
+												<property name="halign">start</property>
+												<property name="wrap">True</property>
+												<property name="use-markup">True</property>
+												<property name="label" translatable="yes">&lt;b&gt;Create a note:&lt;/b&gt; click on the "+" button at the left of a note header, it will create a new note, with the same color and the same font size as the note you clicked on.</property>
+											</object>
+										</child>
+										<child>
+											<object class="GtkImage" id="image1"></object>
+										</child>
+										<child>
+											<object class="GtkLabel">
+												<property name="halign">start</property>
+												<property name="wrap">True</property>
+												<property name="use-markup">True</property>
+												<property name="label" translatable="yes">&lt;b&gt;Move a note:&lt;/b&gt; drag the blank space in the center of the note header.</property>
+											</object>
+										</child>
 										<child>
-											<object class="GtkBox">
-												<property name="orientation">vertical</property>
-												<property name="expand">True</property>
-												<property name="margin">15</property>
-												<property name="spacing">10</property>
-												<child>
-													<object class="GtkLabel">
-														<property name="halign">start</property>
-														<property name="wrap">True</property>
-														<property name="use-markup">True</property>
-														<property name="label" translatable="yes">&lt;b&gt;Show/hide all notes:&lt;/b&gt; click on the icon in the GNOME Shell top bar.</property>
-													</object>
-												</child>
-												<child>
-													<object class="GtkLabel">
-														<property name="halign">start</property>
-														<property name="wrap">True</property>
-														<property name="use-markup">True</property>
-														<property name="label" translatable="yes">&lt;b&gt;Create a note:&lt;/b&gt; click on the "+" button at the left of a note header, it will create a new note, with the same color and the same font size as the note you clicked on.</property>
-													</object>
-												</child>
-												<child>
-													<object class="GtkImage" id="image1"></object>
-												</child>
-												<child>
-													<object class="GtkLabel">
-														<property name="halign">start</property>
-														<property name="wrap">True</property>
-														<property name="use-markup">True</property>
-														<property name="label" translatable="yes">&lt;b&gt;Move a note:&lt;/b&gt; drag the blank space in the center of the note header.</property>
-													</object>
-												</child>
-												<child>
-													<object class="GtkLabel">
-														<property name="halign">start</property>
-														<property name="wrap">True</property>
-														<property name="use-markup">True</property>
-														<property name="label" translatable="yes">&lt;b&gt;Resize a note:&lt;/b&gt; drag the resize button at the right of the note header.</property>
-													</object>
-												</child>
+											<object class="GtkLabel">
+												<property name="halign">start</property>
+												<property name="wrap">True</property>
+												<property name="use-markup">True</property>
+												<property name="label" translatable="yes">&lt;b&gt;Resize a note:&lt;/b&gt; drag the resize button at the right of the note header.</property>
+											</object>
+										</child>
 s												<child>
-													<object class="GtkLabel">
-														<property name="halign">start</property>
-														<property name="wrap">True</property>
-														<property name="use-markup">True</property>
-														<property name="label" translatable="yes">&lt;b&gt;Delete a note:&lt;/b&gt; click on the wastebasket icon and confirm.</property>
-													</object>
-												</child>
+											<object class="GtkLabel">
+												<property name="halign">start</property>
+												<property name="wrap">True</property>
+												<property name="use-markup">True</property>
+												<property name="label" translatable="yes">&lt;b&gt;Delete a note:&lt;/b&gt; click on the wastebasket icon and confirm.</property>
 											</object>
 										</child>
 									</object>
@@ -233,33 +228,46 @@ s												<child>
 										<property name="title" translatable="yes">Using the extension</property>
 									</packing>
 								</child>
+								
 								<child>
-									<object class="GtkScrolledWindow">
+									<object class="GtkBox">
+										<property name="orientation">vertical</property>
+										<property name="expand">True</property>
+										<property name="margin">15</property>
+										<property name="spacing">10</property>
+										<child>
+											<object class="GtkLabel">
+												<property name="halign">start</property>
+												<property name="wrap">True</property>
+												<property name="use-markup">True</property>
+												<property name="label" translatable="yes">&lt;b&gt;Change color:&lt;/b&gt; click on the menu button, and select a color.</property>
+											</object>
+										</child>
+										<child>
+											<object class="GtkLabel">
+												<property name="halign">start</property>
+												<property name="wrap">True</property>
+												<property name="use-markup">True</property>
+												<property name="label" translatable="yes">The "Custom color" submenu allows you to select precisely a color.</property>
+											</object>
+										</child>
+										<child>
+											<object class="GtkImage" id="image2"></object>
+										</child>
+										<child>
+											<object class="GtkLabel">
+												<property name="halign">start</property>
+												<property name="wrap">True</property>
+												<property name="use-markup">True</property>
+												<property name="label" translatable="yes">&lt;b&gt;Change font size:&lt;/b&gt; click on the menu button, and increase or decrease the font size with "+" and "-" buttons.</property>
+											</object>
+										</child>
 										<child>
-											<object class="GtkBox">
-												<property name="orientation">vertical</property>
-												<property name="expand">True</property>
-												<property name="margin">15</property>
-												<property name="spacing">10</property>
-												<child>
-													<object class="GtkLabel">
-														<property name="halign">start</property>
-														<property name="wrap">True</property>
-														<property name="use-markup">True</property>
-														<property name="label" translatable="yes">&lt;b&gt;Change color:&lt;/b&gt; click on the menu button, and select a color.</property>
-													</object>
-												</child>
-												<child>
-													<object class="GtkImage" id="image2"></object>
-												</child>
-												<child>
-													<object class="GtkLabel">
-														<property name="halign">start</property>
-														<property name="wrap">True</property>
-														<property name="use-markup">True</property>
-														<property name="label" translatable="yes">&lt;b&gt;Change font size:&lt;/b&gt; click on the menu button, and increase or decrease the font size with "+" and "-" buttons.</property>
-													</object>
-												</child>
+											<object class="GtkLabel">
+												<property name="halign">start</property>
+												<property name="wrap">True</property>
+												<property name="use-markup">True</property>
+												<property name="label" translatable="yes">&lt;b&gt;Advanced settings:&lt;/b&gt; click on the "Settings" menu item to access the settings dialog.</property>
 											</object>
 										</child>
 									</object>
@@ -268,6 +276,53 @@ s												<child>
 										<property name="title" translatable="yes">Customizing notes</property>
 									</packing>
 								</child>
+								
+								<child>
+									<object class="GtkBox">
+										<property name="orientation">vertical</property>
+										<property name="expand">True</property>
+										<property name="margin">15</property>
+										<property name="spacing">10</property>
+										<child>
+											<object class="GtkLabel">
+												<property name="halign">start</property>
+												<property name="wrap">True</property>
+												<property name="use-markup">True</property>
+												<property name="label" translatable="yes">The dialog window you're reading provides several settings:</property>
+											</object>
+										</child>
+										<child>
+											<object class="GtkLabel">
+												<property name="halign">start</property>
+												<property name="wrap">True</property>
+												<property name="use-markup">True</property>
+												<property name="label" translatable="yes">&lt;b&gt;Position of notes:&lt;/b&gt; select whether you want the notes to be shown above the windows or underneath them.</property>
+											</object>
+										</child>
+										<child>
+											<object class="GtkLabel">
+												<property name="halign">start</property>
+												<property name="wrap">True</property>
+												<property name="use-markup">True</property>
+												<property name="label" translatable="yes">&lt;b&gt;Automatic focus:&lt;/b&gt; if this is enabled, the notes will automatically get the keyboard focus when you hover them with the mouse pointer.</property>
+											</object>
+										</child>
+										<child>
+											<object class="GtkLabel">
+												<property name="halign">start</property>
+												<property name="wrap">True</property>
+												<property name="use-markup">True</property>
+												<property name="label" translatable="yes">&lt;b&gt;Keyboard shortcut:&lt;/b&gt; hide/show notes with a keyboard shortcut. If this is enabled, the icon in the top bar can be hidden.</property>
+											</object>
+										</child>
+									</object>
+									<packing>
+										<property name="name">page2</property>
+										<property name="title" translatable="yes">The settings window</property>
+									</packing>
+								</child>
+								
+								
 								<child>
 									<object class="GtkBox">
 										<property name="orientation">vertical</property>
@@ -313,10 +368,11 @@ s												<child>
 										</child>
 									</object>
 									<packing>
-										<property name="name">page2</property>
+										<property name="name">page3</property>
 										<property name="title" translatable="yes">Backup your notes</property>
 									</packing>
 								</child>
+								
 								<child>
 									<object class="GtkBox">
 										<property name="orientation">vertical</property>
@@ -340,7 +396,7 @@ s												<child>
 										</child>
 									</object>
 									<packing>
-										<property name="name">page3</property>
+										<property name="name">page4</property>
 										<property name="title" translatable="yes">Lost some notes?</property>
 									</packing>
 								</child>
@@ -350,47 +406,50 @@ s												<child>
 				</child>
 			</object>
 			<packing>
+<!--				<property name="icon-name">help-faq-symbolic</property>-->
 				<property name="name">help_page</property>
 				<property name="title" translatable="yes">Help</property>
 			</packing>
 		</child>
 
+		<!--"About" page-->
 		<child>
-			<object class="GtkScrolledWindow">
+			<object class="GtkBox">
+				<property name="spacing">12</property>
+				<property name="margin">24</property>
+				<property name="orientation">vertical</property>
+				<child>
+					<object class="GtkLabel">
+						<property name="halign">center</property>
+						<property name="label" translatable="yes">Notes</property>
+						<attributes>
+							<attribute name="weight" value="bold"/>
+							<attribute name="scale" value="2"/>
+						</attributes>
+					</object>
+				</child>
+				<child>
+					<object class="GtkLabel">
+						<property name="label" translatable="yes">Sticky notes for the GNOME Shell desktop.</property>
+					</object>
+				</child>
+				<child>
+					<object class="GtkImage" id="about_icon"></object>
+				</child>
+				<child>
+					<object class="GtkLabel" id="label_version">
+						<property name="halign">center</property>
+						<property name="label"></property>
+					</object>
+				</child>
+				<!-- pack_end above this line -->
 				<child>
 					<object class="GtkBox">
-						<property name="spacing">12</property>
-						<property name="margin">24</property>
-						<property name="orientation">vertical</property>
-						<child>
-							<object class="GtkLabel">
-								<property name="halign">center</property>
-								<property name="label" translatable="yes">Notes</property>
-								<attributes>
-									<attribute name="weight" value="bold"/>
-<!--									<attribute name="scale" value="2"/>-->
-								</attributes>
-							</object>
-						</child>
-						<child>
-							<object class="GtkImage" id="about_icon"></object>
-						</child>
-						<child>
-							<object class="GtkLabel" id="label_description">
-								<property name="label" translatable="yes">Sticky notes for the GNOME Shell desktop.</property>
-							</object>
-						</child>
-						<child>
-							<object class="GtkBox" id="link_box">
-								<property name="spacing">12</property>
-							</object>
-							<packing>
-								<property name="pack-type">end</property>
-							</packing>
-						</child>
 						<child>
 							<object class="GtkBox">
 								<property name="spacing">12</property>
+								<property name="valign">end</property>
+								<property name="orientation">vertical</property>
 								<child>
 									<object class="GtkBox">
 										<property name="spacing">12</property>
@@ -420,19 +479,30 @@ s												<child>
 											</object>
 										</child>
 									</object>
-									<packing>
-										<property name="pack-type">end</property>
-									</packing>
 								</child>
 							</object>
+							<packing>
+								<property name="pack-type">start</property>
+							</packing>
+						</child>
+						<child>
+							<object class="GtkBox" id="link_box">
+								<property name="spacing">12</property>
+								<property name="valign">end</property>
+								<property name="orientation">vertical</property>
+							</object>
 							<packing>
 								<property name="pack-type">end</property>
 							</packing>
 						</child>
 					</object>
+					<packing>
+						<property name="pack-type">end</property>
+					</packing>
 				</child>
 			</object>
 			<packing>
+<!--				<property name="icon-name">help-about-symbolic</property>-->
 				<property name="name">about_page</property>
 				<property name="title" translatable="yes">About</property>
 			</packing>
diff --git a/notes@maestroschan.fr/schemas/gschemas.compiled b/notes@maestroschan.fr/schemas/gschemas.compiled
index 20a6eb9..46adfb1 100644
Binary files a/notes@maestroschan.fr/schemas/gschemas.compiled and b/notes@maestroschan.fr/schemas/gschemas.compiled differ
diff --git a/notes@maestroschan.fr/schemas/org.gnome.shell.extensions.notes-extension.gschema.xml b/notes@maestroschan.fr/schemas/org.gnome.shell.extensions.notes-extension.gschema.xml
old mode 100644
new mode 100755
diff --git a/notes@maestroschan.fr/screenshots/about_picture.png b/notes@maestroschan.fr/screenshots/about_picture.png
old mode 100644
new mode 100755
diff --git a/notes@maestroschan.fr/screenshots/help_picture_1.png b/notes@maestroschan.fr/screenshots/help_picture_1.png
old mode 100644
new mode 100755
diff --git a/notes@maestroschan.fr/screenshots/help_picture_2.png b/notes@maestroschan.fr/screenshots/help_picture_2.png
index 8558fe7..d772a41 100644
Binary files a/notes@maestroschan.fr/screenshots/help_picture_2.png and b/notes@maestroschan.fr/screenshots/help_picture_2.png differ
diff --git a/notes@maestroschan.fr/stylesheet.css b/notes@maestroschan.fr/stylesheet.css
old mode 100644
new mode 100755