diff --git a/src/qml/level/MelodyPage.qml b/src/qml/level/MelodyPage.qml
index fbc0b5abd2c1cf6d2005557936220afdd8fef890..3de5dc92d4458c33caa6f8b2562fe0668bb53ede 100644
--- a/src/qml/level/MelodyPage.qml
+++ b/src/qml/level/MelodyPage.qml
@@ -5,7 +5,8 @@
 import "../"
 import "../score"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import QtQuick.Controls 2.12
 import Score 1.0
 
diff --git a/src/qml/level/RangePage.qml b/src/qml/level/RangePage.qml
index 83a0023e3bdbff4ff59c531aac7ef193897ce3dd..9b29910a6ae0b97ebeb3fc397a93c315a2b1c889 100644
--- a/src/qml/level/RangePage.qml
+++ b/src/qml/level/RangePage.qml
@@ -5,7 +5,8 @@
 import "../"
 import "../score"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import QtQuick.Controls 2.12
 import Score 1.0
 
diff --git a/src/qml/score/MelodyPreview.qml b/src/qml/score/MelodyPreview.qml
index fb0562f945e1d48d310a0b2d596a3a19204882e0..ec331dfb7478d867bfbfeb0dd8068cdf5342374d 100644
--- a/src/qml/score/MelodyPreview.qml
+++ b/src/qml/score/MelodyPreview.qml
@@ -4,7 +4,8 @@
 
 import "../"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import Score 1.0
 
 TpopupDialog {
diff --git a/src/qml/score/Scordature.qml b/src/qml/score/Scordature.qml
index 541b57a748df3736794570090565cc34454c3b69..6b03608a8378778f61d98bb3ac1d8f82c7f8ca20 100644
--- a/src/qml/score/Scordature.qml
+++ b/src/qml/score/Scordature.qml
@@ -3,7 +3,8 @@
  * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses)   */
 
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import Score 1.0
 
 Grid {
diff --git a/src/qml/score/Score.qml b/src/qml/score/Score.qml
index 138e444ce752cebcf8c0ae787dc7944efd5393e1..0696ffe083264cff7afe4b469bec9ca5df25c5e6 100644
--- a/src/qml/score/Score.qml
+++ b/src/qml/score/Score.qml
@@ -100,12 +100,10 @@ Flickable {
             if (allowAdding) {
                 if (!delControl)
                     delControl = Qt.createComponent("qrc:/score/DelControl.qml").createObject(contentItem);
-
                 if (!noteAdd)
                     noteAdd = Qt.createComponent("qrc:/score/NoteAdd.qml").createObject(contentItem);
-
                 if (!scoreToobox)
-                    scoreToobox = Qt.createComponent("qrc:/score/ScoreToolbox.qml").createObject(parent);
+                    scoreToobox = Qt.createComponent("qrc:/score/ScoreToolbox.qml").createObject(score);
 
             }
         }
@@ -117,7 +115,7 @@ Flickable {
                 });
             }
             if (!scoreToobox && !readOnly)
-                scoreToobox = Qt.createComponent("qrc:/score/ScoreToolbox.qml").createObject(parent);
+                scoreToobox = Qt.createComponent("qrc:/score/ScoreToolbox.qml").createObject(score);
 
         }
         onScoreWasCleared: ensureVisible(0, 0)
diff --git a/src/qml/score/ScoreCursor.qml b/src/qml/score/ScoreCursor.qml
index 910bc957faee96effca6c86744af0ae6ab5cd117..fb61fea39757fd6798bdb708fe4a5096cffc1ef4 100644
--- a/src/qml/score/ScoreCursor.qml
+++ b/src/qml/score/ScoreCursor.qml
@@ -15,8 +15,8 @@ NoteCursor {
     // hide cursor after click on a note to show what was selected
     Connections {
         target: scoreObj
-        onClicked: allow = false
-        onActiveYposChanged: allow = scoreObj.activeYpos > 0
+        function onClicked() : void { allow = false }
+        function onActiveYposChanged() : void { allow = scoreObj.activeYpos > 0 }
     }
 
 }
diff --git a/src/qml/score/ScoreToolbox.qml b/src/qml/score/ScoreToolbox.qml
index 0346127dbd8484f67686b0ef8e4e6ea655167a33..ad6121b911c15f46ca524ef3d5c22b0d289ed762 100644
--- a/src/qml/score/ScoreToolbox.qml
+++ b/src/qml/score/ScoreToolbox.qml
@@ -118,7 +118,7 @@ ControlBase {
 
                         Connections {
                             target: item
-                            function onClicked : void {
+                            function onClicked() : void {
                                 scoreObj.workRtmValue = item.rhythm;
                                 scoreObj.workRtmRest = item.rest;
                             }
diff --git a/src/qml/settings/ScorePage.qml b/src/qml/settings/ScorePage.qml
index c0b99019f2847b6db85bb40f910d2c6d7fe0a996..4e3a48e20c38a16285f5f1780c2e8aaed20694e1 100644
--- a/src/qml/settings/ScorePage.qml
+++ b/src/qml/settings/ScorePage.qml
@@ -4,7 +4,8 @@
 
 import "../"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import QtQuick.Controls 2.12
 import QtQuick.Layouts
 import Score 1.0
diff --git a/src/qml/sound/+android/TunerDialog.qml b/src/qml/sound/+android/TunerDialog.qml
index 12aaee7ee23b839bb0e41f0d66650e2c52db551b..396eb285e78e3899fa7b53c97c455c987f45dc24 100644
--- a/src/qml/sound/+android/TunerDialog.qml
+++ b/src/qml/sound/+android/TunerDialog.qml
@@ -2,7 +2,8 @@
  * Copyright (C) 2018-2021 by Tomasz Bojczuk (seelook@gmail.com)     *
  * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses)   */
 
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import QtQuick.Controls 2.12
 
 import Nootka 1.0
@@ -268,7 +269,7 @@ TtunerDialogItem {
 
   Connections {
     target: SOUND
-    onVolumeUpPressed: volSlider.value++
-    onVolumeDownPressed: volSlider.value--
+    function onVolumeUpPressed() : void { volSlider.value++ }
+    function onVolumeDownPressed() : void { volSlider.value-- }
   }
 }
diff --git a/src/qml/sound/NotesDiffBar.qml b/src/qml/sound/NotesDiffBar.qml
index b4ee49ea90cb5408100c17b515a765694370ac93..584a71933657609e9adf6ba8010eb2a58fdb5b0f 100644
--- a/src/qml/sound/NotesDiffBar.qml
+++ b/src/qml/sound/NotesDiffBar.qml
@@ -4,7 +4,8 @@
 
 import "../"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import QtQuick.Controls 2.12
 
 TnotesBarItem {
diff --git a/src/qml/sound/TunerDialog.qml b/src/qml/sound/TunerDialog.qml
index 72d9f22aa33c44849776762f0917b3d30d85cd46..10a681949d16001cb7b8f84841ae8c55c8359821 100644
--- a/src/qml/sound/TunerDialog.qml
+++ b/src/qml/sound/TunerDialog.qml
@@ -6,7 +6,8 @@ import "../"
 import "../settings"
 import Nootka 1.0
 import Nootka.Dialogs 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import QtQuick.Controls 2.12
 
 TtunerDialogItem {
@@ -312,15 +313,13 @@ TtunerDialogItem {
 
     Connections {
         target: SOUND
-        onVolumeUpPressed: {
+        function onVolumeUpPressed() : void {
             if (NOO.isAndroid())
                 volSlider.value++;
-
         }
-        onVolumeDownPressed: {
+        function onVolumeDownPressed() : void {
             if (NOO.isAndroid())
                 volSlider.value--;
-
         }
     }
 
diff --git a/src/qml/wizard/WizardGuitars.qml b/src/qml/wizard/WizardGuitars.qml
index 83b3095fd881fd4ea3aa5bfbb6f43580ebd88cd9..37adede0ca25026356536ffd0af964f1e1ed9e32 100644
--- a/src/qml/wizard/WizardGuitars.qml
+++ b/src/qml/wizard/WizardGuitars.qml
@@ -5,7 +5,8 @@
 import "../"
 import "../score"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import Score 1.0
 
 Column {
diff --git a/src/qml/wizard/WizardMode.qml b/src/qml/wizard/WizardMode.qml
index 993e9f905f17f4f1fa958a712f924eb2ac18fb62..0ae41d7831dc64db5e4546cfa84e2b62686202b5 100644
--- a/src/qml/wizard/WizardMode.qml
+++ b/src/qml/wizard/WizardMode.qml
@@ -5,7 +5,8 @@
 import "../"
 import "../score"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import QtQuick.Controls 2.12
 import Score 1.0
 
diff --git a/src/qml/wizard/WizardOther.qml b/src/qml/wizard/WizardOther.qml
index 099a41e21382af3fb91fe66986c9c0acdf50b4a6..6486d6728ab01a5c6e2828281f700363d304f85c 100644
--- a/src/qml/wizard/WizardOther.qml
+++ b/src/qml/wizard/WizardOther.qml
@@ -5,7 +5,8 @@
 import "../"
 import "../score"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import Score 1.0
 
 Column {
diff --git a/src/qml/wizard/WizardPiano.qml b/src/qml/wizard/WizardPiano.qml
index 6929859f2d694af940b4cc4e187d95389d6c5df3..3cb9a1cec9f90a6173a13f26587f1c34ab3e9efd 100644
--- a/src/qml/wizard/WizardPiano.qml
+++ b/src/qml/wizard/WizardPiano.qml
@@ -5,7 +5,8 @@
 import "../"
 import "../score"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import Score 1.0
 
 Column {
diff --git a/src/qml/wizard/WizardUkulele.qml b/src/qml/wizard/WizardUkulele.qml
index 866edf2ab2966d19f4753224585db73b23ac416e..303e41f0f7a34bf2d40a55db241e41d4c34ecaa6 100644
--- a/src/qml/wizard/WizardUkulele.qml
+++ b/src/qml/wizard/WizardUkulele.qml
@@ -5,7 +5,8 @@
 import "../"
 import "../score"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import Score 1.0
 
 Column {