3 files changed, 573 insertions, 552 deletions

diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index a328efcc5468..14d9a0649267 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	solfege
-PORTVERSION=	3.16.4
+PORTVERSION=	3.18.7
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
 PKGNAMESUFFIX=	-nosound
diff --git a/audio/solfege/distinfo b/audio/solfege/distinfo
index 4bf47daa6ae1..c6a3f1be4d65 100644
--- a/audio/solfege/distinfo
+++ b/audio/solfege/distinfo
@@ -1,3 +1,3 @@
-MD5 (solfege-3.16.4.tar.gz) = 3c7c4ca1774260ae18e6346d0d1f3c82
-SHA256 (solfege-3.16.4.tar.gz) = 10a0acddd8f41c638eea56478dcdbcb4c0d0a013dba9c2530d759173a7591463
-SIZE (solfege-3.16.4.tar.gz) = 4827876
+MD5 (solfege-3.18.7.tar.gz) = c65df6e0eb7a724b8a81e41d23344e02
+SHA256 (solfege-3.18.7.tar.gz) = 5efae213e4c5418ffc8679c2e284fdc03217f3329a3c68a44328904ce2bd9404
+SIZE (solfege-3.18.7.tar.gz) = 5017655
diff --git a/audio/solfege/pkg-plist b/audio/solfege/pkg-plist
index cfbad708a0ce..982e28b17e2f 100644
--- a/audio/solfege/pkg-plist
+++ b/audio/solfege/pkg-plist
@@ -1,13 +1,13 @@
 bin/solfege
-%%ETCDIR%%
+etc/solfege
 share/applications/solfege.desktop
-share/pixmaps/solfege.png
+share/locale/et/LC_MESSAGES/solfege.mo
+share/locale/fa/LC_MESSAGES/solfege.mo
 share/locale/cs/LC_MESSAGES/solfege.mo
 share/locale/da/LC_MESSAGES/solfege.mo
 share/locale/de/LC_MESSAGES/solfege.mo
-share/locale/eo/LC_MESSAGES/solfege.mo
 share/locale/es/LC_MESSAGES/solfege.mo
-share/locale/et/LC_MESSAGES/solfege.mo
+share/locale/eo/LC_MESSAGES/solfege.mo
 share/locale/fi/LC_MESSAGES/solfege.mo
 share/locale/fr/LC_MESSAGES/solfege.mo
 share/locale/gl/LC_MESSAGES/solfege.mo
@@ -22,7 +22,303 @@ share/locale/sv/LC_MESSAGES/solfege.mo
 share/locale/tr/LC_MESSAGES/solfege.mo
 share/locale/vi/LC_MESSAGES/solfege.mo
 share/locale/zh_CN/LC_MESSAGES/solfege.mo
-%%DATADIR%%/default.config
+share/pixmaps/solfege.png
+%%DATADIR%%/solfege/exercises/rhythmdictation.py
+%%DATADIR%%/solfege/exercises/rhythmdictation2.py
+%%DATADIR%%/solfege/exercises/tuner.py
+%%DATADIR%%/solfege/exercises/rhythmdictation.pyc
+%%DATADIR%%/solfege/exercises/rhythmdictation2.pyc
+%%DATADIR%%/solfege/exercises/tuner.pyc
+%%DATADIR%%/solfege/mpd/mpdutils.py
+%%DATADIR%%/solfege/mpd/mpdutils.pyc
+%%DATADIR%%/solfege/soundcard/soundcardexceptions.py
+%%DATADIR%%/solfege/soundcard/soundcardexceptions.pyc
+%%DATADIR%%/solfege/__init__.py
+%%DATADIR%%/solfege/_version.py
+%%DATADIR%%/solfege/abstract.py
+%%DATADIR%%/solfege/application.py
+%%DATADIR%%/solfege/buildinfo.py
+%%DATADIR%%/solfege/cfg.py
+%%DATADIR%%/solfege/configwindow.py
+%%DATADIR%%/solfege/const.py
+%%DATADIR%%/solfege/dataparser.py
+%%DATADIR%%/solfege/esel.py
+%%DATADIR%%/solfege/filesystem.py
+%%DATADIR%%/solfege/fpeditor.py
+%%DATADIR%%/solfege/frontpage.py
+%%DATADIR%%/solfege/gpath.py
+%%DATADIR%%/solfege/gu.py
+%%DATADIR%%/solfege/history.py
+%%DATADIR%%/solfege/i18n.py
+%%DATADIR%%/solfege/inputwidgets.py
+%%DATADIR%%/solfege/instrumentselector.py
+%%DATADIR%%/solfege/languages.py
+%%DATADIR%%/solfege/lessonfile.py
+%%DATADIR%%/solfege/lessonfile_editor_main.py
+%%DATADIR%%/solfege/lessonfilegui.py
+%%DATADIR%%/solfege/mainwin.py
+%%DATADIR%%/solfege/multipleintervalconfigwidget.py
+%%DATADIR%%/solfege/notenamespinbutton.py
+%%DATADIR%%/solfege/optionparser.py
+%%DATADIR%%/solfege/osutils.py
+%%DATADIR%%/solfege/pmwiki.py
+%%DATADIR%%/solfege/practisesheetdlg.py
+%%DATADIR%%/solfege/profilemanager.py
+%%DATADIR%%/solfege/reportbug.py
+%%DATADIR%%/solfege/reportlib.py
+%%DATADIR%%/solfege/rhythmwidget.py
+%%DATADIR%%/solfege/runtime.py
+%%DATADIR%%/solfege/specialwidgets.py
+%%DATADIR%%/solfege/startup.py
+%%DATADIR%%/solfege/statistics.py
+%%DATADIR%%/solfege/statisticsviewer.py
+%%DATADIR%%/solfege/stock.py
+%%DATADIR%%/solfege/testlib.py
+%%DATADIR%%/solfege/tracebackwindow.py
+%%DATADIR%%/solfege/trainingsetdlg.py
+%%DATADIR%%/solfege/utils.py
+%%DATADIR%%/solfege/uuid.py
+%%DATADIR%%/solfege/winlang.py
+%%DATADIR%%/solfege/winreg.py
+%%DATADIR%%/solfege/xrandom.py
+%%DATADIR%%/solfege/__init__.pyc
+%%DATADIR%%/solfege/_version.pyc
+%%DATADIR%%/solfege/abstract.pyc
+%%DATADIR%%/solfege/application.pyc
+%%DATADIR%%/solfege/buildinfo.pyc
+%%DATADIR%%/solfege/cfg.pyc
+%%DATADIR%%/solfege/configwindow.pyc
+%%DATADIR%%/solfege/const.pyc
+%%DATADIR%%/solfege/dataparser.pyc
+%%DATADIR%%/solfege/esel.pyc
+%%DATADIR%%/solfege/filesystem.pyc
+%%DATADIR%%/solfege/fpeditor.pyc
+%%DATADIR%%/solfege/frontpage.pyc
+%%DATADIR%%/solfege/gpath.pyc
+%%DATADIR%%/solfege/gu.pyc
+%%DATADIR%%/solfege/history.pyc
+%%DATADIR%%/solfege/i18n.pyc
+%%DATADIR%%/solfege/inputwidgets.pyc
+%%DATADIR%%/solfege/instrumentselector.pyc
+%%DATADIR%%/solfege/languages.pyc
+%%DATADIR%%/solfege/lessonfile.pyc
+%%DATADIR%%/solfege/lessonfile_editor_main.pyc
+%%DATADIR%%/solfege/lessonfilegui.pyc
+%%DATADIR%%/solfege/mainwin.pyc
+%%DATADIR%%/solfege/multipleintervalconfigwidget.pyc
+%%DATADIR%%/solfege/notenamespinbutton.pyc
+%%DATADIR%%/solfege/optionparser.pyc
+%%DATADIR%%/solfege/osutils.pyc
+%%DATADIR%%/solfege/pmwiki.pyc
+%%DATADIR%%/solfege/practisesheetdlg.pyc
+%%DATADIR%%/solfege/profilemanager.pyc
+%%DATADIR%%/solfege/reportbug.pyc
+%%DATADIR%%/solfege/reportlib.pyc
+%%DATADIR%%/solfege/rhythmwidget.pyc
+%%DATADIR%%/solfege/runtime.pyc
+%%DATADIR%%/solfege/specialwidgets.pyc
+%%DATADIR%%/solfege/startup.pyc
+%%DATADIR%%/solfege/statistics.pyc
+%%DATADIR%%/solfege/statisticsviewer.pyc
+%%DATADIR%%/solfege/stock.pyc
+%%DATADIR%%/solfege/testlib.pyc
+%%DATADIR%%/solfege/tracebackwindow.pyc
+%%DATADIR%%/solfege/trainingsetdlg.pyc
+%%DATADIR%%/solfege/utils.pyc
+%%DATADIR%%/solfege/uuid.pyc
+%%DATADIR%%/solfege/winlang.pyc
+%%DATADIR%%/solfege/winreg.pyc
+%%DATADIR%%/solfege/xrandom.pyc
+%%DATADIR%%/help/C/about-statistics.html
+%%DATADIR%%/help/C/mpd-module.html
+%%DATADIR%%/help/C/profile-manager.html
+%%DATADIR%%/help/C/figures/profile-manager.png
+%%DATADIR%%/help/C/figures/statistics.png
+%%DATADIR%%/help/eo/extending-solfege.html
+%%DATADIR%%/help/eo/about-statistics.html
+%%DATADIR%%/help/eo/bug-reporting.html
+%%DATADIR%%/help/eo/chordvoicing-module.html
+%%DATADIR%%/help/eo/compareintervals-module.html
+%%DATADIR%%/help/eo/dictation-module.html
+%%DATADIR%%/help/eo/dictation.html
+%%DATADIR%%/help/eo/ear-training-test-printout-editor.html
+%%DATADIR%%/help/eo/elembuilder-module.html
+%%DATADIR%%/help/eo/elembuilder.html
+%%DATADIR%%/help/eo/gpl.html
+%%DATADIR%%/help/eo/harmonicinterval-module.html
+%%DATADIR%%/help/eo/harmonicinterval.html
+%%DATADIR%%/help/eo/idbyname-cadences.html
+%%DATADIR%%/help/eo/idbyname-chords.html
+%%DATADIR%%/help/eo/idbyname-intonation.html
+%%DATADIR%%/help/eo/idbyname-module.html
+%%DATADIR%%/help/eo/identifybpm-module.html
+%%DATADIR%%/help/eo/identifybpm.html
+%%DATADIR%%/help/eo/idproperty-module.html
+%%DATADIR%%/help/eo/idproperty.html
+%%DATADIR%%/help/eo/idtone-module.html
+%%DATADIR%%/help/eo/idtone.html
+%%DATADIR%%/help/eo/index.html
+%%DATADIR%%/help/eo/inverting-intervals.html
+%%DATADIR%%/help/eo/lesson-files.html
+%%DATADIR%%/help/eo/melodicinterval-module.html
+%%DATADIR%%/help/eo/melodicinterval.html
+%%DATADIR%%/help/eo/midi-instrument-names.html
+%%DATADIR%%/help/eo/mpd-module.html
+%%DATADIR%%/help/eo/music-theory.html
+%%DATADIR%%/help/eo/nameinterval-module.html
+%%DATADIR%%/help/eo/nameinterval.html
+%%DATADIR%%/help/eo/online-resources.html
+%%DATADIR%%/help/eo/preferences-window.html
+%%DATADIR%%/help/eo/profile-manager.html
+%%DATADIR%%/help/eo/rhythm-module.html
+%%DATADIR%%/help/eo/rhythm.html
+%%DATADIR%%/help/eo/rhythmtapping-module.html
+%%DATADIR%%/help/eo/rhythmtapping2-module.html
+%%DATADIR%%/help/eo/rhythmtapping2.html
+%%DATADIR%%/help/eo/scales.html
+%%DATADIR%%/help/eo/singanswer-module.html
+%%DATADIR%%/help/eo/singchord-module.html
+%%DATADIR%%/help/eo/singchord.html
+%%DATADIR%%/help/eo/singinterval-module.html
+%%DATADIR%%/help/eo/singinterval.html
+%%DATADIR%%/help/eo/solfege-exercise-helps.html
+%%DATADIR%%/help/eo/solfege-intro.html
+%%DATADIR%%/help/eo/theory-intervals.html
+%%DATADIR%%/help/eo/trainingset-editor.html
+%%DATADIR%%/help/eo/twelvetone-module.html
+%%DATADIR%%/help/eo/twelvetone.html
+%%DATADIR%%/help/et/extending-solfege.html
+%%DATADIR%%/help/et/solfege-exercise-helps.html
+%%DATADIR%%/help/et/solfege-intro.html
+%%DATADIR%%/help/et/about-statistics.html
+%%DATADIR%%/help/et/bug-reporting.html
+%%DATADIR%%/help/et/chordvoicing-module.html
+%%DATADIR%%/help/et/compareintervals-module.html
+%%DATADIR%%/help/et/dictation-module.html
+%%DATADIR%%/help/et/dictation.html
+%%DATADIR%%/help/et/ear-training-test-printout-editor.html
+%%DATADIR%%/help/et/elembuilder-module.html
+%%DATADIR%%/help/et/elembuilder.html
+%%DATADIR%%/help/et/gpl.html
+%%DATADIR%%/help/et/harmonicinterval-module.html
+%%DATADIR%%/help/et/harmonicinterval.html
+%%DATADIR%%/help/et/idbyname-cadences.html
+%%DATADIR%%/help/et/idbyname-chords.html
+%%DATADIR%%/help/et/idbyname-intonation.html
+%%DATADIR%%/help/et/idbyname-module.html
+%%DATADIR%%/help/et/identifybpm-module.html
+%%DATADIR%%/help/et/identifybpm.html
+%%DATADIR%%/help/et/idproperty-module.html
+%%DATADIR%%/help/et/idproperty.html
+%%DATADIR%%/help/et/idtone-module.html
+%%DATADIR%%/help/et/idtone.html
+%%DATADIR%%/help/et/index.html
+%%DATADIR%%/help/et/inverting-intervals.html
+%%DATADIR%%/help/et/lesson-files.html
+%%DATADIR%%/help/et/melodicinterval-module.html
+%%DATADIR%%/help/et/melodicinterval.html
+%%DATADIR%%/help/et/midi-instrument-names.html
+%%DATADIR%%/help/et/mpd-module.html
+%%DATADIR%%/help/et/music-theory.html
+%%DATADIR%%/help/et/nameinterval-module.html
+%%DATADIR%%/help/et/nameinterval.html
+%%DATADIR%%/help/et/online-resources.html
+%%DATADIR%%/help/et/preferences-window.html
+%%DATADIR%%/help/et/profile-manager.html
+%%DATADIR%%/help/et/rhythm-module.html
+%%DATADIR%%/help/et/rhythm.html
+%%DATADIR%%/help/et/rhythmtapping-module.html
+%%DATADIR%%/help/et/rhythmtapping2-module.html
+%%DATADIR%%/help/et/rhythmtapping2.html
+%%DATADIR%%/help/et/scales.html
+%%DATADIR%%/help/et/singanswer-module.html
+%%DATADIR%%/help/et/singchord-module.html
+%%DATADIR%%/help/et/singchord.html
+%%DATADIR%%/help/et/singinterval-module.html
+%%DATADIR%%/help/et/singinterval.html
+%%DATADIR%%/help/et/solfege-exercise-helps.html
+%%DATADIR%%/help/et/solfege-intro.html
+%%DATADIR%%/help/et/theory-intervals.html
+%%DATADIR%%/help/et/trainingset-editor.html
+%%DATADIR%%/help/et/twelvetone-module.html
+%%DATADIR%%/help/et/twelvetone.html
+%%DATADIR%%/help/fr/about-statistics.html
+%%DATADIR%%/help/fr/mpd-module.html
+%%DATADIR%%/help/fr/profile-manager.html
+%%DATADIR%%/help/gl/about-statistics.html
+%%DATADIR%%/help/gl/mpd-module.html
+%%DATADIR%%/help/gl/profile-manager.html
+%%DATADIR%%/help/nb/about-statistics.html
+%%DATADIR%%/help/nb/mpd-module.html
+%%DATADIR%%/help/nb/profile-manager.html
+%%DATADIR%%/help/nl/about-statistics.html
+%%DATADIR%%/help/nl/mpd-module.html
+%%DATADIR%%/help/nl/profile-manager.html
+%%DATADIR%%/help/pl/extending-solfege.html
+%%DATADIR%%/help/pl/solfege-exercise-helps.html
+%%DATADIR%%/help/pl/solfege-intro.html
+%%DATADIR%%/help/pl/about-statistics.html
+%%DATADIR%%/help/pl/bug-reporting.html
+%%DATADIR%%/help/pl/chordvoicing-module.html
+%%DATADIR%%/help/pl/compareintervals-module.html
+%%DATADIR%%/help/pl/dictation-module.html
+%%DATADIR%%/help/pl/dictation.html
+%%DATADIR%%/help/pl/ear-training-test-printout-editor.html
+%%DATADIR%%/help/pl/elembuilder-module.html
+%%DATADIR%%/help/pl/elembuilder.html
+%%DATADIR%%/help/pl/extending-solfege.html
+%%DATADIR%%/help/pl/gpl.html
+%%DATADIR%%/help/pl/harmonicinterval-module.html
+%%DATADIR%%/help/pl/harmonicinterval.html
+%%DATADIR%%/help/pl/idbyname-cadences.html
+%%DATADIR%%/help/pl/idbyname-chords.html
+%%DATADIR%%/help/pl/idbyname-intonation.html
+%%DATADIR%%/help/pl/idbyname-module.html
+%%DATADIR%%/help/pl/identifybpm-module.html
+%%DATADIR%%/help/pl/identifybpm.html
+%%DATADIR%%/help/pl/idproperty-module.html
+%%DATADIR%%/help/pl/idproperty.html
+%%DATADIR%%/help/pl/idtone-module.html
+%%DATADIR%%/help/pl/idtone.html
+%%DATADIR%%/help/pl/index.html
+%%DATADIR%%/help/pl/inverting-intervals.html
+%%DATADIR%%/help/pl/lesson-files.html
+%%DATADIR%%/help/pl/melodicinterval-module.html
+%%DATADIR%%/help/pl/melodicinterval.html
+%%DATADIR%%/help/pl/midi-instrument-names.html
+%%DATADIR%%/help/pl/mpd-module.html
+%%DATADIR%%/help/pl/music-theory.html
+%%DATADIR%%/help/pl/nameinterval-module.html
+%%DATADIR%%/help/pl/nameinterval.html
+%%DATADIR%%/help/pl/online-resources.html
+%%DATADIR%%/help/pl/preferences-window.html
+%%DATADIR%%/help/pl/profile-manager.html
+%%DATADIR%%/help/pl/rhythm-module.html
+%%DATADIR%%/help/pl/rhythm.html
+%%DATADIR%%/help/pl/rhythmtapping-module.html
+%%DATADIR%%/help/pl/rhythmtapping2-module.html
+%%DATADIR%%/help/pl/rhythmtapping2.html
+%%DATADIR%%/help/pl/scales.html
+%%DATADIR%%/help/pl/singanswer-module.html
+%%DATADIR%%/help/pl/singchord-module.html
+%%DATADIR%%/help/pl/singchord.html
+%%DATADIR%%/help/pl/singinterval-module.html
+%%DATADIR%%/help/pl/singinterval.html
+%%DATADIR%%/help/pl/solfege-exercise-helps.html
+%%DATADIR%%/help/pl/solfege-intro.html
+%%DATADIR%%/help/pl/theory-intervals.html
+%%DATADIR%%/help/pl/trainingset-editor.html
+%%DATADIR%%/help/pl/twelvetone-module.html
+%%DATADIR%%/help/pl/twelvetone.html
+%%DATADIR%%/help/pt_BR/about-statistics.html
+%%DATADIR%%/help/pt_BR/mpd-module.html
+%%DATADIR%%/help/pt_BR/profile-manager.html
+%%DATADIR%%/help/ru/about-statistics.html
+%%DATADIR%%/help/ru/mpd-module.html
+%%DATADIR%%/help/ru/profile-manager.html
+%%DATADIR%%/help/tr/about-statistics.html
+%%DATADIR%%/help/tr/mpd-module.html
+%%DATADIR%%/help/tr/profile-manager.html
 %%DATADIR%%/exercises/standard/csound-tree.txt
 %%DATADIR%%/exercises/standard/debugtree.txt
 %%DATADIR%%/exercises/standard/learningtree.txt
@@ -30,7 +326,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/exercises/standard/lesson-files/altered-2
 %%DATADIR%%/exercises/standard/lesson-files/barnesanger
 %%DATADIR%%/exercises/standard/lesson-files/besifring
-%%DATADIR%%/exercises/standard/lesson-files/bin/csound-play-harmonic-interval.sh
 %%DATADIR%%/exercises/standard/lesson-files/bpm
 %%DATADIR%%/exercises/standard/lesson-files/cadense-1
 %%DATADIR%%/exercises/standard/lesson-files/chord-7b9-maj79
@@ -359,12 +654,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/exercises/standard/lesson-files/id-tone-cde-7
 %%DATADIR%%/exercises/standard/lesson-files/id-tone-cde-8
 %%DATADIR%%/exercises/standard/lesson-files/id-tone-cde-9
-%%DATADIR%%/exercises/standard/lesson-files/include/interval-elements
-%%DATADIR%%/exercises/standard/lesson-files/include/jazz-progression-elements
-%%DATADIR%%/exercises/standard/lesson-files/include/mma-grooves
-%%DATADIR%%/exercises/standard/lesson-files/include/progression-elements
-%%DATADIR%%/exercises/standard/lesson-files/include/sc-master
-%%DATADIR%%/exercises/standard/lesson-files/include/solfege-voicing.mma
 %%DATADIR%%/exercises/standard/lesson-files/interval_in_key_maj
 %%DATADIR%%/exercises/standard/lesson-files/interval_in_key_min
 %%DATADIR%%/exercises/standard/lesson-files/jsb-inventions
@@ -415,9 +704,9 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/exercises/standard/lesson-files/mma-2
 %%DATADIR%%/exercises/standard/lesson-files/mma-3
 %%DATADIR%%/exercises/standard/lesson-files/mma-4-C
-%%DATADIR%%/exercises/standard/lesson-files/mma-7-C
 %%DATADIR%%/exercises/standard/lesson-files/mma-4-harmonic-minor
 %%DATADIR%%/exercises/standard/lesson-files/mma-4-natural-minor
+%%DATADIR%%/exercises/standard/lesson-files/mma-7-C
 %%DATADIR%%/exercises/standard/lesson-files/mma-7-harmonic-minor
 %%DATADIR%%/exercises/standard/lesson-files/mma-7-natural-minor
 %%DATADIR%%/exercises/standard/lesson-files/nameinterval-1
@@ -440,6 +729,9 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/exercises/standard/lesson-files/rhythm-self-config-binary
 %%DATADIR%%/exercises/standard/lesson-files/rhythm-self-config-ternary
 %%DATADIR%%/exercises/standard/lesson-files/rhythm-ternary
+%%DATADIR%%/exercises/standard/lesson-files/rhythmdict-1
+%%DATADIR%%/exercises/standard/lesson-files/rhythmdict-gen-1
+%%DATADIR%%/exercises/standard/lesson-files/rhythmdict-gen-2
 %%DATADIR%%/exercises/standard/lesson-files/rhythmtapping2-self-config-binary
 %%DATADIR%%/exercises/standard/lesson-files/rhythmtapping2-self-config-ternary
 %%DATADIR%%/exercises/standard/lesson-files/sc-6tones
@@ -558,19 +850,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/exercises/standard/lesson-files/sc-sim-elem
 %%DATADIR%%/exercises/standard/lesson-files/sc-sim-name
 %%DATADIR%%/exercises/standard/lesson-files/sc-sim-s
-%%DATADIR%%/exercises/standard/lesson-files/share/fanfare.midi
-%%DATADIR%%/exercises/standard/lesson-files/share/fanfare.mp3
-%%DATADIR%%/exercises/standard/lesson-files/share/fanfare.ogg
-%%DATADIR%%/exercises/standard/lesson-files/share/fanfare.wav
-%%DATADIR%%/exercises/standard/lesson-files/share/fifth-pure-220.00.wav
-%%DATADIR%%/exercises/standard/lesson-files/share/fifth-pure-247.5.wav
-%%DATADIR%%/exercises/standard/lesson-files/share/fifth-pure-293.33.wav
-%%DATADIR%%/exercises/standard/lesson-files/share/fifth-small-220.00.wav
-%%DATADIR%%/exercises/standard/lesson-files/share/fifth-small-247.5.wav
-%%DATADIR%%/exercises/standard/lesson-files/share/fifth-small-293.33.wav
-%%DATADIR%%/exercises/standard/lesson-files/share/fil1.sco
-%%DATADIR%%/exercises/standard/lesson-files/share/sinus-ad.orc
-%%DATADIR%%/exercises/standard/lesson-files/share/sinus.orc
 %%DATADIR%%/exercises/standard/lesson-files/sing-chord-tone
 %%DATADIR%%/exercises/standard/lesson-files/sing-intervals
 %%DATADIR%%/exercises/standard/lesson-files/sing-intervals-10
@@ -606,169 +885,34 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/exercises/standard/lesson-files/tapping-easy
 %%DATADIR%%/exercises/standard/lesson-files/tapping-mid
 %%DATADIR%%/exercises/standard/lesson-files/three-prog-root
+%%DATADIR%%/exercises/standard/lesson-files/tunertest
 %%DATADIR%%/exercises/standard/lesson-files/twelvetone
 %%DATADIR%%/exercises/standard/lesson-files/volkslieder1
 %%DATADIR%%/exercises/standard/lesson-files/volkslieder2
-%%DATADIR%%/exercises/standard/regression-lesson-files/chord-no-name
-%%DATADIR%%/exercises/standard/regression-lesson-files/chord-wav-music
-%%DATADIR%%/exercises/standard/regression-lesson-files/chordvoicing-lessonfile-exception
+%%DATADIR%%/exercises/standard/lesson-files/bin/csound-play-harmonic-interval.sh
+%%DATADIR%%/exercises/standard/lesson-files/share/fanfare.midi
+%%DATADIR%%/exercises/standard/lesson-files/share/fanfare.mp3
+%%DATADIR%%/exercises/standard/lesson-files/share/fanfare.ogg
+%%DATADIR%%/exercises/standard/lesson-files/share/fanfare.wav
+%%DATADIR%%/exercises/standard/lesson-files/share/fifth-pure-220.00.wav
+%%DATADIR%%/exercises/standard/lesson-files/share/fifth-pure-247.5.wav
+%%DATADIR%%/exercises/standard/lesson-files/share/fifth-pure-293.33.wav
+%%DATADIR%%/exercises/standard/lesson-files/share/fifth-small-220.00.wav
+%%DATADIR%%/exercises/standard/lesson-files/share/fifth-small-247.5.wav
+%%DATADIR%%/exercises/standard/lesson-files/share/fifth-small-293.33.wav
+%%DATADIR%%/exercises/standard/lesson-files/share/fil1.sco
+%%DATADIR%%/exercises/standard/lesson-files/share/sinus-ad.orc
+%%DATADIR%%/exercises/standard/lesson-files/share/sinus.orc
+%%DATADIR%%/exercises/standard/lesson-files/include
+%%DATADIR%%/exercises/standard/lesson-files/include/interval-elements
+%%DATADIR%%/exercises/standard/lesson-files/include/jazz-progression-elements
+%%DATADIR%%/exercises/standard/lesson-files/include/mma-grooves
+%%DATADIR%%/exercises/standard/lesson-files/include/progression-elements
+%%DATADIR%%/exercises/standard/lesson-files/include/sc-master
+%%DATADIR%%/exercises/standard/lesson-files/include/solfege-voicing.mma
 %%DATADIR%%/exercises/standard/regression-lesson-files/chordvoicing-mpd-exception
-%%DATADIR%%/exercises/standard/regression-lesson-files/compareintervals-1
-%%DATADIR%%/exercises/standard/regression-lesson-files/compareintervals-2
-%%DATADIR%%/exercises/standard/regression-lesson-files/compareintervals-3
-%%DATADIR%%/exercises/standard/regression-lesson-files/compareintervals-4
-%%DATADIR%%/exercises/standard/regression-lesson-files/dictation-exception-handling
-%%DATADIR%%/exercises/standard/regression-lesson-files/dictation-no-questions
-%%DATADIR%%/exercises/standard/regression-lesson-files/elembuilder-bad-tonic
-%%DATADIR%%/exercises/standard/regression-lesson-files/elembuilder-scale-1
-%%DATADIR%%/exercises/standard/regression-lesson-files/elembuilder-scale-2
-%%DATADIR%%/exercises/standard/regression-lesson-files/elembuilder-scale-3
-%%DATADIR%%/exercises/standard/regression-lesson-files/elembuilder-scale-4
-%%DATADIR%%/exercises/standard/regression-lesson-files/elembuilder-scale-5
-%%DATADIR%%/exercises/standard/regression-lesson-files/harmonicprogression-lessonfile-exception
-%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-assignment-to-reserved-word
-%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-at_question_start-1
-%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-at_question_start-2
-%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-at_question_start-3
-%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-bad-cuemusic
-%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-mediafiles
-%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-missing-.wav-file
-%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-noquestionsinfile
-%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-syntax-error-1
-%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-syntax-error-2
-%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-unsupported-named-block
-%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-vmusic
-%%DATADIR%%/exercises/standard/regression-lesson-files/idproperty-1
-%%DATADIR%%/exercises/standard/regression-lesson-files/idproperty-2
-%%DATADIR%%/exercises/standard/regression-lesson-files/idproperty-3
-%%DATADIR%%/exercises/standard/regression-lesson-files/idproperty-4
-%%DATADIR%%/exercises/standard/regression-lesson-files/nameinterval-bad-tones-header-var
-%%DATADIR%%/exercises/standard/regression-lesson-files/nameinterval-constraints
-%%DATADIR%%/exercises/standard/regression-lesson-files/rhythmtapping-1
-%%DATADIR%%/exercises/standard/regression-lesson-files/rhythmtapping-2
-%%DATADIR%%/exercises/standard/regression-lesson-files/rhythmtapping-3
-%%DATADIR%%/exercises/standard/regression-lesson-files/rhythmtapping-4
 %%DATADIR%%/exercises/standard/regression-lesson-files/rhythmtapping-bad-mpd-code
-%%DATADIR%%/exercises/standard/regression-lesson-files/rhythmtapping2-1
-%%DATADIR%%/exercises/standard/regression-lesson-files/rvoice
 %%DATADIR%%/exercises/standard/regression-lesson-files/singanswer-bad-mpd-code
-%%DATADIR%%/exercises/standard/regression-lesson-files/singanswer-missing-.wav-file
-%%DATADIR%%/exercises/standard/regression-lesson-files/singanswer-missing-question_text
-%%DATADIR%%/exercises/standard/regression-lesson-files/transpose-accidentals
-%%DATADIR%%/exercises/standard/regression-lesson-files/transpose-key
-%%DATADIR%%/exercises/standard/regression-lesson-files/xx-chord-exceptions
-%%DATADIR%%/exercises/standard/regression-lesson-files/xx-chordvoicing-exceptions
-%%DATADIR%%/exercises/standard/regression-lesson-files/xx-dictation-exceptions
-%%DATADIR%%/exercises/standard/regression-lesson-files/xx-elembuilder-exceptions
-%%DATADIR%%/exercises/standard/regression-lesson-files/xx-harmonicprogressiondictation-exceptions
-%%DATADIR%%/exercises/standard/regression-lesson-files/xx-idbyname-exceptions
-%%DATADIR%%/exercises/standard/regression-lesson-files/xx-idproperty-exceptions
-%%DATADIR%%/exercises/standard/regression-lesson-files/xx-rhythmtapping-exceptions
-%%DATADIR%%/exercises/standard/regression-lesson-files/xx-singanswer-exceptions
-%%DATADIR%%/exercises/standard/regression-lesson-files/xx-singchord-exceptions
-%%DATADIR%%/feta/feta20-accidentals--1.xpm
-%%DATADIR%%/feta/feta20-accidentals--2.xpm
-%%DATADIR%%/feta/feta20-accidentals-0.xpm
-%%DATADIR%%/feta/feta20-accidentals-1.xpm
-%%DATADIR%%/feta/feta20-accidentals-2.xpm
-%%DATADIR%%/feta/feta20-clefs-C.xpm
-%%DATADIR%%/feta/feta20-clefs-F.xpm
-%%DATADIR%%/feta/feta20-clefs-G.xpm
-%%DATADIR%%/feta/feta20-dots-dot.xpm
-%%DATADIR%%/feta/feta20-flags-d3.xpm
-%%DATADIR%%/feta/feta20-flags-d4.xpm
-%%DATADIR%%/feta/feta20-flags-d5.xpm
-%%DATADIR%%/feta/feta20-flags-d6.xpm
-%%DATADIR%%/feta/feta20-flags-u3.xpm
-%%DATADIR%%/feta/feta20-flags-u4.xpm
-%%DATADIR%%/feta/feta20-flags-u5.xpm
-%%DATADIR%%/feta/feta20-flags-u6.xpm
-%%DATADIR%%/feta/feta20-noteheads-0.xpm
-%%DATADIR%%/feta/feta20-noteheads-1.xpm
-%%DATADIR%%/feta/feta20-noteheads-2.xpm
-%%DATADIR%%/feta/feta20-number-0.xpm
-%%DATADIR%%/feta/feta20-number-1.xpm
-%%DATADIR%%/feta/feta20-number-2.xpm
-%%DATADIR%%/feta/feta20-number-3.xpm
-%%DATADIR%%/feta/feta20-number-4.xpm
-%%DATADIR%%/feta/feta20-number-5.xpm
-%%DATADIR%%/feta/feta20-number-6.xpm
-%%DATADIR%%/feta/feta20-number-7.xpm
-%%DATADIR%%/feta/feta20-number-8.xpm
-%%DATADIR%%/feta/feta20-number-9.xpm
-%%DATADIR%%/feta/feta20-rests--1.xpm
-%%DATADIR%%/feta/feta20-rests--2.xpm
-%%DATADIR%%/feta/feta20-rests--4.xpm
-%%DATADIR%%/feta/feta20-rests-0.xpm
-%%DATADIR%%/feta/feta20-rests-0o.xpm
-%%DATADIR%%/feta/feta20-rests-1.xpm
-%%DATADIR%%/feta/feta20-rests-1o.xpm
-%%DATADIR%%/feta/feta20-rests-2.xpm
-%%DATADIR%%/feta/feta20-rests-3.xpm
-%%DATADIR%%/feta/feta20-rests-4.xpm
-%%DATADIR%%/feta/feta20-rests-5.xpm
-%%DATADIR%%/feta/feta20-rests-6.xpm
-%%DATADIR%%/feta/feta20-rests-7.xpm
-%%DATADIR%%/graphics/double-flat.png
-%%DATADIR%%/graphics/double-flat.svg
-%%DATADIR%%/graphics/double-sharp.png
-%%DATADIR%%/graphics/double-sharp.svg
-%%DATADIR%%/graphics/erase.png
-%%DATADIR%%/graphics/erase.svg
-%%DATADIR%%/graphics/flat.png
-%%DATADIR%%/graphics/flat.svg
-%%DATADIR%%/graphics/happyface.png
-%%DATADIR%%/graphics/holder.png
-%%DATADIR%%/graphics/identify-bpm.png
-%%DATADIR%%/graphics/identify-chord.png
-%%DATADIR%%/graphics/image-not-found.png
-%%DATADIR%%/graphics/natural.png
-%%DATADIR%%/graphics/natural.svg
-%%DATADIR%%/graphics/notehead.png
-%%DATADIR%%/graphics/notehead.svg
-%%DATADIR%%/graphics/rhythm-c12c12c12.png
-%%DATADIR%%/graphics/rhythm-c12c12r12.png
-%%DATADIR%%/graphics/rhythm-c12r12c12.png
-%%DATADIR%%/graphics/rhythm-c16c16c16c16.png
-%%DATADIR%%/graphics/rhythm-c16c16c16c16c16c16.png
-%%DATADIR%%/graphics/rhythm-c16c16c16c16c8.png
-%%DATADIR%%/graphics/rhythm-c16c16c4.png
-%%DATADIR%%/graphics/rhythm-c16c16c8.png
-%%DATADIR%%/graphics/rhythm-c16c16c8c16c16.png
-%%DATADIR%%/graphics/rhythm-c16c16c8c8.png
-%%DATADIR%%/graphics/rhythm-c16c8..png
-%%DATADIR%%/graphics/rhythm-c16c8c16.png
-%%DATADIR%%/graphics/rhythm-c4..png
-%%DATADIR%%/graphics/rhythm-c4.png
-%%DATADIR%%/graphics/rhythm-c4c16c16.png
-%%DATADIR%%/graphics/rhythm-c4c8.png
-%%DATADIR%%/graphics/rhythm-c8.c16.png
-%%DATADIR%%/graphics/rhythm-c8c16c16.png
-%%DATADIR%%/graphics/rhythm-c8c16c16c16c16.png
-%%DATADIR%%/graphics/rhythm-c8c16c16c8.png
-%%DATADIR%%/graphics/rhythm-c8c4.png
-%%DATADIR%%/graphics/rhythm-c8c8.png
-%%DATADIR%%/graphics/rhythm-c8c8c16c16.png
-%%DATADIR%%/graphics/rhythm-c8c8c8.png
-%%DATADIR%%/graphics/rhythm-r12c12c12.png
-%%DATADIR%%/graphics/rhythm-r12c12r12.png
-%%DATADIR%%/graphics/rhythm-r12r12c12.png
-%%DATADIR%%/graphics/rhythm-r16c16c16c16.png
-%%DATADIR%%/graphics/rhythm-r16c16c8.png
-%%DATADIR%%/graphics/rhythm-r16c8..png
-%%DATADIR%%/graphics/rhythm-r16c8c16.png
-%%DATADIR%%/graphics/rhythm-r4.png
-%%DATADIR%%/graphics/rhythm-r8c16c16.png
-%%DATADIR%%/graphics/rhythm-r8c8.png
-%%DATADIR%%/graphics/rhythm-r8r16c16.png
-%%DATADIR%%/graphics/rhythm-wrong.png
-%%DATADIR%%/graphics/sadface.png
-%%DATADIR%%/graphics/sharp.png
-%%DATADIR%%/graphics/sharp.svg
-%%DATADIR%%/graphics/solfege.png
-%%DATADIR%%/graphics/solfege.svg
-%%DATADIR%%/graphics/solfege.xpm
-%%DATADIR%%/graphics/test-sound.png
 %%DATADIR%%/hash-bug-workaround/cadense-1
 %%DATADIR%%/hash-bug-workaround/chord-dim-aug-min-major
 %%DATADIR%%/hash-bug-workaround/chord-m7-7-maj7-m7b5-dim7
@@ -1303,9 +1447,114 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/hash-bug-workaround2/sing-intervals
 %%DATADIR%%/hash-bug-workaround2/sing-intervals-10
 %%DATADIR%%/hash-bug-workaround2/sing-intervals-tritonus-7
-%%DATADIR%%/help-menu.xml
-%%DATADIR%%/help/C/bug-reporting.html
+%%DATADIR%%/default.config
+%%DATADIR%%/feta/feta20-accidentals--1.xpm
+%%DATADIR%%/feta/feta20-accidentals--2.xpm
+%%DATADIR%%/feta/feta20-accidentals-0.xpm
+%%DATADIR%%/feta/feta20-accidentals-1.xpm
+%%DATADIR%%/feta/feta20-accidentals-2.xpm
+%%DATADIR%%/feta/feta20-clefs-C.xpm
+%%DATADIR%%/feta/feta20-clefs-F.xpm
+%%DATADIR%%/feta/feta20-clefs-G.xpm
+%%DATADIR%%/feta/feta20-dots-dot.xpm
+%%DATADIR%%/feta/feta20-flags-d3.xpm
+%%DATADIR%%/feta/feta20-flags-d4.xpm
+%%DATADIR%%/feta/feta20-flags-d5.xpm
+%%DATADIR%%/feta/feta20-flags-d6.xpm
+%%DATADIR%%/feta/feta20-flags-u3.xpm
+%%DATADIR%%/feta/feta20-flags-u4.xpm
+%%DATADIR%%/feta/feta20-flags-u5.xpm
+%%DATADIR%%/feta/feta20-flags-u6.xpm
+%%DATADIR%%/feta/feta20-noteheads-0.xpm
+%%DATADIR%%/feta/feta20-noteheads-1.xpm
+%%DATADIR%%/feta/feta20-noteheads-2.xpm
+%%DATADIR%%/feta/feta20-number-0.xpm
+%%DATADIR%%/feta/feta20-number-1.xpm
+%%DATADIR%%/feta/feta20-number-2.xpm
+%%DATADIR%%/feta/feta20-number-3.xpm
+%%DATADIR%%/feta/feta20-number-4.xpm
+%%DATADIR%%/feta/feta20-number-5.xpm
+%%DATADIR%%/feta/feta20-number-6.xpm
+%%DATADIR%%/feta/feta20-number-7.xpm
+%%DATADIR%%/feta/feta20-number-8.xpm
+%%DATADIR%%/feta/feta20-number-9.xpm
+%%DATADIR%%/feta/feta20-rests--1.xpm
+%%DATADIR%%/feta/feta20-rests--2.xpm
+%%DATADIR%%/feta/feta20-rests--4.xpm
+%%DATADIR%%/feta/feta20-rests-0.xpm
+%%DATADIR%%/feta/feta20-rests-0o.xpm
+%%DATADIR%%/feta/feta20-rests-1.xpm
+%%DATADIR%%/feta/feta20-rests-1o.xpm
+%%DATADIR%%/feta/feta20-rests-2.xpm
+%%DATADIR%%/feta/feta20-rests-3.xpm
+%%DATADIR%%/feta/feta20-rests-4.xpm
+%%DATADIR%%/feta/feta20-rests-5.xpm
+%%DATADIR%%/feta/feta20-rests-6.xpm
+%%DATADIR%%/feta/feta20-rests-7.xpm
+%%DATADIR%%/graphics/double-flat.png
+%%DATADIR%%/graphics/double-flat.svg
+%%DATADIR%%/graphics/double-sharp.png
+%%DATADIR%%/graphics/double-sharp.svg
+%%DATADIR%%/graphics/erase.png
+%%DATADIR%%/graphics/erase.svg
+%%DATADIR%%/graphics/flat.png
+%%DATADIR%%/graphics/flat.svg
+%%DATADIR%%/graphics/happyface.png
+%%DATADIR%%/graphics/holder.png
+%%DATADIR%%/graphics/identify-bpm.png
+%%DATADIR%%/graphics/identify-chord.png
+%%DATADIR%%/graphics/image-not-found.png
+%%DATADIR%%/graphics/natural.png
+%%DATADIR%%/graphics/natural.svg
+%%DATADIR%%/graphics/notehead.png
+%%DATADIR%%/graphics/notehead.svg
+%%DATADIR%%/graphics/rhythm-c12c12c12.png
+%%DATADIR%%/graphics/rhythm-c12c12r12.png
+%%DATADIR%%/graphics/rhythm-c12r12c12.png
+%%DATADIR%%/graphics/rhythm-c16c16c16c16.png
+%%DATADIR%%/graphics/rhythm-c16c16c16c16c16c16.png
+%%DATADIR%%/graphics/rhythm-c16c16c16c16c8.png
+%%DATADIR%%/graphics/rhythm-c16c16c4.png
+%%DATADIR%%/graphics/rhythm-c16c16c8.png
+%%DATADIR%%/graphics/rhythm-c16c16c8c16c16.png
+%%DATADIR%%/graphics/rhythm-c16c16c8c8.png
+%%DATADIR%%/graphics/rhythm-c16c8..png
+%%DATADIR%%/graphics/rhythm-c16c8c16.png
+%%DATADIR%%/graphics/rhythm-c4..png
+%%DATADIR%%/graphics/rhythm-c4.png
+%%DATADIR%%/graphics/rhythm-c4c16c16.png
+%%DATADIR%%/graphics/rhythm-c4c8.png
+%%DATADIR%%/graphics/rhythm-c8.c16.png
+%%DATADIR%%/graphics/rhythm-c8c16c16.png
+%%DATADIR%%/graphics/rhythm-c8c16c16c16c16.png
+%%DATADIR%%/graphics/rhythm-c8c16c16c8.png
+%%DATADIR%%/graphics/rhythm-c8c4.png
+%%DATADIR%%/graphics/rhythm-c8c8.png
+%%DATADIR%%/graphics/rhythm-c8c8c16c16.png
+%%DATADIR%%/graphics/rhythm-c8c8c8.png
+%%DATADIR%%/graphics/rhythm-r12c12c12.png
+%%DATADIR%%/graphics/rhythm-r12c12r12.png
+%%DATADIR%%/graphics/rhythm-r12r12c12.png
+%%DATADIR%%/graphics/rhythm-r16c16c16c16.png
+%%DATADIR%%/graphics/rhythm-r16c16c8.png
+%%DATADIR%%/graphics/rhythm-r16c8..png
+%%DATADIR%%/graphics/rhythm-r16c8c16.png
+%%DATADIR%%/graphics/rhythm-r4.png
+%%DATADIR%%/graphics/rhythm-r8c16c16.png
+%%DATADIR%%/graphics/rhythm-r8c8.png
+%%DATADIR%%/graphics/rhythm-r8r16c16.png
+%%DATADIR%%/graphics/rhythm-wrong.png
+%%DATADIR%%/graphics/sadface.png
+%%DATADIR%%/graphics/sharp.png
+%%DATADIR%%/graphics/sharp.svg
+%%DATADIR%%/graphics/solfege.png
+%%DATADIR%%/graphics/solfege.svg
+%%DATADIR%%/graphics/solfege.xpm
+%%DATADIR%%/graphics/test-sound.png
 %%DATADIR%%/help/C/chordvoicing-module.html
+%%DATADIR%%/help/C/identifybpm-module.html
+%%DATADIR%%/help/C/twelvetone-module.html
+%%DATADIR%%/help/C/bug-reporting.html
 %%DATADIR%%/help/C/compareintervals-module.html
 %%DATADIR%%/help/C/dictation-module.html
 %%DATADIR%%/help/C/dictation.html
@@ -1345,7 +1594,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/C/idbyname-chords.html
 %%DATADIR%%/help/C/idbyname-intonation.html
 %%DATADIR%%/help/C/idbyname-module.html
-%%DATADIR%%/help/C/identifybpm-module.html
 %%DATADIR%%/help/C/identifybpm.html
 %%DATADIR%%/help/C/idproperty-module.html
 %%DATADIR%%/help/C/idproperty.html
@@ -1354,20 +1602,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/C/index.html
 %%DATADIR%%/help/C/inverting-intervals.html
 %%DATADIR%%/help/C/lesson-files.html
-%%DATADIR%%/help/C/melodicinterval-module.html
-%%DATADIR%%/help/C/melodicinterval.html
-%%DATADIR%%/help/C/midi-instrument-names.html
-%%DATADIR%%/help/C/mpd-module.html
-%%DATADIR%%/help/C/music-theory.html
-%%DATADIR%%/help/C/nameinterval-module.html
-%%DATADIR%%/help/C/nameinterval.html
-%%DATADIR%%/help/C/online-resources.html
-%%DATADIR%%/help/C/preferences-window.html
-%%DATADIR%%/help/C/rhythm-module.html
-%%DATADIR%%/help/C/rhythm.html
-%%DATADIR%%/help/C/rhythmtapping-module.html
-%%DATADIR%%/help/C/rhythmtapping2-module.html
-%%DATADIR%%/help/C/rhythmtapping2.html
 %%DATADIR%%/help/C/ly/inverting-intervals.png
 %%DATADIR%%/help/C/ly/theory-intervals-1.png
 %%DATADIR%%/help/C/ly/theory-intervals-fifths-1.png
@@ -1381,7 +1615,19 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/C/ly/theory-intervals-sevenths.png
 %%DATADIR%%/help/C/ly/theory-intervals-sixths.png
 %%DATADIR%%/help/C/ly/theory-intervals-thirds.png
-%%DATADIR%%/help/C/scales.html
+%%DATADIR%%/help/C/melodicinterval-module.html
+%%DATADIR%%/help/C/melodicinterval.html
+%%DATADIR%%/help/C/midi-instrument-names.html
+%%DATADIR%%/help/C/music-theory.html
+%%DATADIR%%/help/C/nameinterval-module.html
+%%DATADIR%%/help/C/nameinterval.html
+%%DATADIR%%/help/C/online-resources.html
+%%DATADIR%%/help/C/preferences-window.html
+%%DATADIR%%/help/C/rhythm-module.html
+%%DATADIR%%/help/C/rhythm.html
+%%DATADIR%%/help/C/rhythmtapping-module.html
+%%DATADIR%%/help/C/rhythmtapping2-module.html
+%%DATADIR%%/help/C/rhythmtapping2.html
 %%DATADIR%%/help/C/scales/aug.html
 %%DATADIR%%/help/C/scales/beb.html
 %%DATADIR%%/help/C/scales/blu.html
@@ -1641,6 +1887,7 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/C/scales/pen.html
 %%DATADIR%%/help/C/scales/sim.html
 %%DATADIR%%/help/C/scales/who.html
+%%DATADIR%%/help/C/scales.html
 %%DATADIR%%/help/C/singanswer-module.html
 %%DATADIR%%/help/C/singchord-module.html
 %%DATADIR%%/help/C/singchord.html
@@ -1650,112 +1897,17 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/C/solfege-intro.html
 %%DATADIR%%/help/C/theory-intervals.html
 %%DATADIR%%/help/C/trainingset-editor.html
-%%DATADIR%%/help/C/twelvetone-module.html
 %%DATADIR%%/help/C/twelvetone.html
-%%DATADIR%%/help/eo/bug-reporting.html
-%%DATADIR%%/help/eo/chordvoicing-module.html
-%%DATADIR%%/help/eo/compareintervals-module.html
-%%DATADIR%%/help/eo/dictation-module.html
-%%DATADIR%%/help/eo/dictation.html
-%%DATADIR%%/help/eo/ear-training-test-printout-editor.html
-%%DATADIR%%/help/eo/elembuilder-module.html
-%%DATADIR%%/help/eo/elembuilder.html
 %%DATADIR%%/help/eo/extending-solfege.html
-%%DATADIR%%/help/eo/gpl.html
-%%DATADIR%%/help/eo/harmonicinterval-module.html
-%%DATADIR%%/help/eo/harmonicinterval.html
-%%DATADIR%%/help/eo/idbyname-cadences.html
-%%DATADIR%%/help/eo/idbyname-chords.html
-%%DATADIR%%/help/eo/idbyname-intonation.html
-%%DATADIR%%/help/eo/idbyname-module.html
-%%DATADIR%%/help/eo/identifybpm-module.html
-%%DATADIR%%/help/eo/identifybpm.html
-%%DATADIR%%/help/eo/idproperty-module.html
-%%DATADIR%%/help/eo/idproperty.html
-%%DATADIR%%/help/eo/idtone-module.html
-%%DATADIR%%/help/eo/idtone.html
-%%DATADIR%%/help/eo/index.html
-%%DATADIR%%/help/eo/inverting-intervals.html
-%%DATADIR%%/help/eo/lesson-files.html
-%%DATADIR%%/help/eo/melodicinterval-module.html
-%%DATADIR%%/help/eo/melodicinterval.html
-%%DATADIR%%/help/eo/midi-instrument-names.html
-%%DATADIR%%/help/eo/mpd-module.html
-%%DATADIR%%/help/eo/music-theory.html
-%%DATADIR%%/help/eo/nameinterval-module.html
-%%DATADIR%%/help/eo/nameinterval.html
-%%DATADIR%%/help/eo/online-resources.html
-%%DATADIR%%/help/eo/preferences-window.html
-%%DATADIR%%/help/eo/rhythm-module.html
-%%DATADIR%%/help/eo/rhythm.html
-%%DATADIR%%/help/eo/rhythmtapping-module.html
-%%DATADIR%%/help/eo/rhythmtapping2-module.html
-%%DATADIR%%/help/eo/rhythmtapping2.html
-%%DATADIR%%/help/eo/scales.html
-%%DATADIR%%/help/eo/singanswer-module.html
-%%DATADIR%%/help/eo/singchord-module.html
-%%DATADIR%%/help/eo/singchord.html
-%%DATADIR%%/help/eo/singinterval-module.html
-%%DATADIR%%/help/eo/singinterval.html
 %%DATADIR%%/help/eo/solfege-exercise-helps.html
 %%DATADIR%%/help/eo/solfege-intro.html
-%%DATADIR%%/help/eo/theory-intervals.html
-%%DATADIR%%/help/eo/trainingset-editor.html
-%%DATADIR%%/help/eo/twelvetone-module.html
-%%DATADIR%%/help/eo/twelvetone.html
-%%DATADIR%%/help/et/bug-reporting.html
-%%DATADIR%%/help/et/chordvoicing-module.html
-%%DATADIR%%/help/et/compareintervals-module.html
-%%DATADIR%%/help/et/dictation-module.html
-%%DATADIR%%/help/et/dictation.html
-%%DATADIR%%/help/et/ear-training-test-printout-editor.html
-%%DATADIR%%/help/et/elembuilder-module.html
-%%DATADIR%%/help/et/elembuilder.html
 %%DATADIR%%/help/et/extending-solfege.html
-%%DATADIR%%/help/et/gpl.html
-%%DATADIR%%/help/et/harmonicinterval-module.html
-%%DATADIR%%/help/et/harmonicinterval.html
-%%DATADIR%%/help/et/idbyname-cadences.html
-%%DATADIR%%/help/et/idbyname-chords.html
-%%DATADIR%%/help/et/idbyname-intonation.html
-%%DATADIR%%/help/et/idbyname-module.html
-%%DATADIR%%/help/et/identifybpm-module.html
-%%DATADIR%%/help/et/identifybpm.html
-%%DATADIR%%/help/et/idproperty-module.html
-%%DATADIR%%/help/et/idproperty.html
-%%DATADIR%%/help/et/idtone-module.html
-%%DATADIR%%/help/et/idtone.html
-%%DATADIR%%/help/et/index.html
-%%DATADIR%%/help/et/inverting-intervals.html
-%%DATADIR%%/help/et/lesson-files.html
-%%DATADIR%%/help/et/melodicinterval-module.html
-%%DATADIR%%/help/et/melodicinterval.html
-%%DATADIR%%/help/et/midi-instrument-names.html
-%%DATADIR%%/help/et/mpd-module.html
-%%DATADIR%%/help/et/music-theory.html
-%%DATADIR%%/help/et/nameinterval-module.html
-%%DATADIR%%/help/et/nameinterval.html
-%%DATADIR%%/help/et/online-resources.html
-%%DATADIR%%/help/et/preferences-window.html
-%%DATADIR%%/help/et/rhythm-module.html
-%%DATADIR%%/help/et/rhythm.html
-%%DATADIR%%/help/et/rhythmtapping-module.html
-%%DATADIR%%/help/et/rhythmtapping2-module.html
-%%DATADIR%%/help/et/rhythmtapping2.html
-%%DATADIR%%/help/et/scales.html
-%%DATADIR%%/help/et/singanswer-module.html
-%%DATADIR%%/help/et/singchord-module.html
-%%DATADIR%%/help/et/singchord.html
-%%DATADIR%%/help/et/singinterval-module.html
-%%DATADIR%%/help/et/singinterval.html
 %%DATADIR%%/help/et/solfege-exercise-helps.html
 %%DATADIR%%/help/et/solfege-intro.html
-%%DATADIR%%/help/et/theory-intervals.html
-%%DATADIR%%/help/et/trainingset-editor.html
-%%DATADIR%%/help/et/twelvetone-module.html
-%%DATADIR%%/help/et/twelvetone.html
-%%DATADIR%%/help/fr/bug-reporting.html
 %%DATADIR%%/help/fr/chordvoicing-module.html
+%%DATADIR%%/help/fr/identifybpm-module.html
+%%DATADIR%%/help/fr/twelvetone-module.html
+%%DATADIR%%/help/fr/bug-reporting.html
 %%DATADIR%%/help/fr/compareintervals-module.html
 %%DATADIR%%/help/fr/dictation-module.html
 %%DATADIR%%/help/fr/dictation.html
@@ -1787,7 +1939,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/fr/idbyname-chords.html
 %%DATADIR%%/help/fr/idbyname-intonation.html
 %%DATADIR%%/help/fr/idbyname-module.html
-%%DATADIR%%/help/fr/identifybpm-module.html
 %%DATADIR%%/help/fr/identifybpm.html
 %%DATADIR%%/help/fr/idproperty-module.html
 %%DATADIR%%/help/fr/idproperty.html
@@ -1799,7 +1950,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/fr/melodicinterval-module.html
 %%DATADIR%%/help/fr/melodicinterval.html
 %%DATADIR%%/help/fr/midi-instrument-names.html
-%%DATADIR%%/help/fr/mpd-module.html
 %%DATADIR%%/help/fr/music-theory.html
 %%DATADIR%%/help/fr/nameinterval-module.html
 %%DATADIR%%/help/fr/nameinterval.html
@@ -1820,10 +1970,11 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/fr/solfege-intro.html
 %%DATADIR%%/help/fr/theory-intervals.html
 %%DATADIR%%/help/fr/trainingset-editor.html
-%%DATADIR%%/help/fr/twelvetone-module.html
 %%DATADIR%%/help/fr/twelvetone.html
-%%DATADIR%%/help/gl/bug-reporting.html
 %%DATADIR%%/help/gl/chordvoicing-module.html
+%%DATADIR%%/help/gl/identifybpm-module.html
+%%DATADIR%%/help/gl/twelvetone-module.html
+%%DATADIR%%/help/gl/bug-reporting.html
 %%DATADIR%%/help/gl/compareintervals-module.html
 %%DATADIR%%/help/gl/dictation-module.html
 %%DATADIR%%/help/gl/dictation.html
@@ -1838,7 +1989,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/gl/idbyname-chords.html
 %%DATADIR%%/help/gl/idbyname-intonation.html
 %%DATADIR%%/help/gl/idbyname-module.html
-%%DATADIR%%/help/gl/identifybpm-module.html
 %%DATADIR%%/help/gl/identifybpm.html
 %%DATADIR%%/help/gl/idproperty-module.html
 %%DATADIR%%/help/gl/idproperty.html
@@ -1850,7 +2000,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/gl/melodicinterval-module.html
 %%DATADIR%%/help/gl/melodicinterval.html
 %%DATADIR%%/help/gl/midi-instrument-names.html
-%%DATADIR%%/help/gl/mpd-module.html
 %%DATADIR%%/help/gl/music-theory.html
 %%DATADIR%%/help/gl/nameinterval-module.html
 %%DATADIR%%/help/gl/nameinterval.html
@@ -1871,10 +2020,11 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/gl/solfege-intro.html
 %%DATADIR%%/help/gl/theory-intervals.html
 %%DATADIR%%/help/gl/trainingset-editor.html
-%%DATADIR%%/help/gl/twelvetone-module.html
 %%DATADIR%%/help/gl/twelvetone.html
-%%DATADIR%%/help/nb/bug-reporting.html
 %%DATADIR%%/help/nb/chordvoicing-module.html
+%%DATADIR%%/help/nb/identifybpm-module.html
+%%DATADIR%%/help/nb/twelvetone-module.html
+%%DATADIR%%/help/nb/bug-reporting.html
 %%DATADIR%%/help/nb/compareintervals-module.html
 %%DATADIR%%/help/nb/dictation-module.html
 %%DATADIR%%/help/nb/dictation.html
@@ -1906,7 +2056,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/nb/idbyname-chords.html
 %%DATADIR%%/help/nb/idbyname-intonation.html
 %%DATADIR%%/help/nb/idbyname-module.html
-%%DATADIR%%/help/nb/identifybpm-module.html
 %%DATADIR%%/help/nb/identifybpm.html
 %%DATADIR%%/help/nb/idproperty-module.html
 %%DATADIR%%/help/nb/idproperty.html
@@ -1918,7 +2067,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/nb/melodicinterval-module.html
 %%DATADIR%%/help/nb/melodicinterval.html
 %%DATADIR%%/help/nb/midi-instrument-names.html
-%%DATADIR%%/help/nb/mpd-module.html
 %%DATADIR%%/help/nb/music-theory.html
 %%DATADIR%%/help/nb/nameinterval-module.html
 %%DATADIR%%/help/nb/nameinterval.html
@@ -1939,10 +2087,11 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/nb/solfege-intro.html
 %%DATADIR%%/help/nb/theory-intervals.html
 %%DATADIR%%/help/nb/trainingset-editor.html
-%%DATADIR%%/help/nb/twelvetone-module.html
 %%DATADIR%%/help/nb/twelvetone.html
-%%DATADIR%%/help/nl/bug-reporting.html
 %%DATADIR%%/help/nl/chordvoicing-module.html
+%%DATADIR%%/help/nl/identifybpm-module.html
+%%DATADIR%%/help/nl/twelvetone-module.html
+%%DATADIR%%/help/nl/bug-reporting.html
 %%DATADIR%%/help/nl/compareintervals-module.html
 %%DATADIR%%/help/nl/dictation-module.html
 %%DATADIR%%/help/nl/dictation.html
@@ -1957,7 +2106,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/nl/idbyname-chords.html
 %%DATADIR%%/help/nl/idbyname-intonation.html
 %%DATADIR%%/help/nl/idbyname-module.html
-%%DATADIR%%/help/nl/identifybpm-module.html
 %%DATADIR%%/help/nl/identifybpm.html
 %%DATADIR%%/help/nl/idproperty-module.html
 %%DATADIR%%/help/nl/idproperty.html
@@ -1969,7 +2117,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/nl/melodicinterval-module.html
 %%DATADIR%%/help/nl/melodicinterval.html
 %%DATADIR%%/help/nl/midi-instrument-names.html
-%%DATADIR%%/help/nl/mpd-module.html
 %%DATADIR%%/help/nl/music-theory.html
 %%DATADIR%%/help/nl/nameinterval-module.html
 %%DATADIR%%/help/nl/nameinterval.html
@@ -1990,61 +2137,11 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/nl/solfege-intro.html
 %%DATADIR%%/help/nl/theory-intervals.html
 %%DATADIR%%/help/nl/trainingset-editor.html
-%%DATADIR%%/help/nl/twelvetone-module.html
 %%DATADIR%%/help/nl/twelvetone.html
-%%DATADIR%%/help/pl/bug-reporting.html
-%%DATADIR%%/help/pl/chordvoicing-module.html
-%%DATADIR%%/help/pl/compareintervals-module.html
-%%DATADIR%%/help/pl/dictation-module.html
-%%DATADIR%%/help/pl/dictation.html
-%%DATADIR%%/help/pl/ear-training-test-printout-editor.html
-%%DATADIR%%/help/pl/elembuilder-module.html
-%%DATADIR%%/help/pl/elembuilder.html
-%%DATADIR%%/help/pl/extending-solfege.html
-%%DATADIR%%/help/pl/gpl.html
-%%DATADIR%%/help/pl/harmonicinterval-module.html
-%%DATADIR%%/help/pl/harmonicinterval.html
-%%DATADIR%%/help/pl/idbyname-cadences.html
-%%DATADIR%%/help/pl/idbyname-chords.html
-%%DATADIR%%/help/pl/idbyname-intonation.html
-%%DATADIR%%/help/pl/idbyname-module.html
-%%DATADIR%%/help/pl/identifybpm-module.html
-%%DATADIR%%/help/pl/identifybpm.html
-%%DATADIR%%/help/pl/idproperty-module.html
-%%DATADIR%%/help/pl/idproperty.html
-%%DATADIR%%/help/pl/idtone-module.html
-%%DATADIR%%/help/pl/idtone.html
-%%DATADIR%%/help/pl/index.html
-%%DATADIR%%/help/pl/inverting-intervals.html
-%%DATADIR%%/help/pl/lesson-files.html
-%%DATADIR%%/help/pl/melodicinterval-module.html
-%%DATADIR%%/help/pl/melodicinterval.html
-%%DATADIR%%/help/pl/midi-instrument-names.html
-%%DATADIR%%/help/pl/mpd-module.html
-%%DATADIR%%/help/pl/music-theory.html
-%%DATADIR%%/help/pl/nameinterval-module.html
-%%DATADIR%%/help/pl/nameinterval.html
-%%DATADIR%%/help/pl/online-resources.html
-%%DATADIR%%/help/pl/preferences-window.html
-%%DATADIR%%/help/pl/rhythm-module.html
-%%DATADIR%%/help/pl/rhythm.html
-%%DATADIR%%/help/pl/rhythmtapping-module.html
-%%DATADIR%%/help/pl/rhythmtapping2-module.html
-%%DATADIR%%/help/pl/rhythmtapping2.html
-%%DATADIR%%/help/pl/scales.html
-%%DATADIR%%/help/pl/singanswer-module.html
-%%DATADIR%%/help/pl/singchord-module.html
-%%DATADIR%%/help/pl/singchord.html
-%%DATADIR%%/help/pl/singinterval-module.html
-%%DATADIR%%/help/pl/singinterval.html
-%%DATADIR%%/help/pl/solfege-exercise-helps.html
-%%DATADIR%%/help/pl/solfege-intro.html
-%%DATADIR%%/help/pl/theory-intervals.html
-%%DATADIR%%/help/pl/trainingset-editor.html
-%%DATADIR%%/help/pl/twelvetone-module.html
-%%DATADIR%%/help/pl/twelvetone.html
-%%DATADIR%%/help/pt_BR/bug-reporting.html
 %%DATADIR%%/help/pt_BR/chordvoicing-module.html
+%%DATADIR%%/help/pt_BR/identifybpm-module.html
+%%DATADIR%%/help/pt_BR/twelvetone-module.html
+%%DATADIR%%/help/pt_BR/bug-reporting.html
 %%DATADIR%%/help/pt_BR/compareintervals-module.html
 %%DATADIR%%/help/pt_BR/dictation-module.html
 %%DATADIR%%/help/pt_BR/dictation.html
@@ -2075,7 +2172,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/pt_BR/idbyname-chords.html
 %%DATADIR%%/help/pt_BR/idbyname-intonation.html
 %%DATADIR%%/help/pt_BR/idbyname-module.html
-%%DATADIR%%/help/pt_BR/identifybpm-module.html
 %%DATADIR%%/help/pt_BR/identifybpm.html
 %%DATADIR%%/help/pt_BR/idproperty-module.html
 %%DATADIR%%/help/pt_BR/idproperty.html
@@ -2087,7 +2183,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/pt_BR/melodicinterval-module.html
 %%DATADIR%%/help/pt_BR/melodicinterval.html
 %%DATADIR%%/help/pt_BR/midi-instrument-names.html
-%%DATADIR%%/help/pt_BR/mpd-module.html
 %%DATADIR%%/help/pt_BR/music-theory.html
 %%DATADIR%%/help/pt_BR/nameinterval-module.html
 %%DATADIR%%/help/pt_BR/nameinterval.html
@@ -2108,10 +2203,11 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/pt_BR/solfege-intro.html
 %%DATADIR%%/help/pt_BR/theory-intervals.html
 %%DATADIR%%/help/pt_BR/trainingset-editor.html
-%%DATADIR%%/help/pt_BR/twelvetone-module.html
 %%DATADIR%%/help/pt_BR/twelvetone.html
-%%DATADIR%%/help/ru/bug-reporting.html
 %%DATADIR%%/help/ru/chordvoicing-module.html
+%%DATADIR%%/help/ru/identifybpm-module.html
+%%DATADIR%%/help/ru/twelvetone-module.html
+%%DATADIR%%/help/ru/bug-reporting.html
 %%DATADIR%%/help/ru/compareintervals-module.html
 %%DATADIR%%/help/ru/dictation-module.html
 %%DATADIR%%/help/ru/dictation.html
@@ -2126,7 +2222,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/ru/idbyname-chords.html
 %%DATADIR%%/help/ru/idbyname-intonation.html
 %%DATADIR%%/help/ru/idbyname-module.html
-%%DATADIR%%/help/ru/identifybpm-module.html
 %%DATADIR%%/help/ru/identifybpm.html
 %%DATADIR%%/help/ru/idproperty-module.html
 %%DATADIR%%/help/ru/idproperty.html
@@ -2138,7 +2233,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/ru/melodicinterval-module.html
 %%DATADIR%%/help/ru/melodicinterval.html
 %%DATADIR%%/help/ru/midi-instrument-names.html
-%%DATADIR%%/help/ru/mpd-module.html
 %%DATADIR%%/help/ru/music-theory.html
 %%DATADIR%%/help/ru/nameinterval-module.html
 %%DATADIR%%/help/ru/nameinterval.html
@@ -2159,11 +2253,12 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/ru/solfege-intro.html
 %%DATADIR%%/help/ru/theory-intervals.html
 %%DATADIR%%/help/ru/trainingset-editor.html
-%%DATADIR%%/help/ru/twelvetone-module.html
 %%DATADIR%%/help/ru/twelvetone.html
 %%DATADIR%%/help/style.css
-%%DATADIR%%/help/tr/bug-reporting.html
 %%DATADIR%%/help/tr/chordvoicing-module.html
+%%DATADIR%%/help/tr/identifybpm-module.html
+%%DATADIR%%/help/tr/twelvetone-module.html
+%%DATADIR%%/help/tr/bug-reporting.html
 %%DATADIR%%/help/tr/compareintervals-module.html
 %%DATADIR%%/help/tr/dictation-module.html
 %%DATADIR%%/help/tr/dictation.html
@@ -2195,7 +2290,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/tr/idbyname-chords.html
 %%DATADIR%%/help/tr/idbyname-intonation.html
 %%DATADIR%%/help/tr/idbyname-module.html
-%%DATADIR%%/help/tr/identifybpm-module.html
 %%DATADIR%%/help/tr/identifybpm.html
 %%DATADIR%%/help/tr/idproperty-module.html
 %%DATADIR%%/help/tr/idproperty.html
@@ -2207,7 +2301,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/tr/melodicinterval-module.html
 %%DATADIR%%/help/tr/melodicinterval.html
 %%DATADIR%%/help/tr/midi-instrument-names.html
-%%DATADIR%%/help/tr/mpd-module.html
 %%DATADIR%%/help/tr/music-theory.html
 %%DATADIR%%/help/tr/nameinterval-module.html
 %%DATADIR%%/help/tr/nameinterval.html
@@ -2228,99 +2321,51 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/help/tr/solfege-intro.html
 %%DATADIR%%/help/tr/theory-intervals.html
 %%DATADIR%%/help/tr/trainingset-editor.html
-%%DATADIR%%/help/tr/twelvetone-module.html
 %%DATADIR%%/help/tr/twelvetone.html
-%%DATADIR%%/solfege.gtkrc
-%%DATADIR%%/solfege/__init__.py
-%%DATADIR%%/solfege/__init__.pyc
-%%DATADIR%%/solfege/_version.py
-%%DATADIR%%/solfege/_version.pyc
-%%DATADIR%%/solfege/abstract.py
-%%DATADIR%%/solfege/abstract.pyc
-%%DATADIR%%/solfege/application.py
-%%DATADIR%%/solfege/application.pyc
-%%DATADIR%%/solfege/buildinfo.py
-%%DATADIR%%/solfege/buildinfo.pyc
-%%DATADIR%%/solfege/cfg.py
-%%DATADIR%%/solfege/cfg.pyc
-%%DATADIR%%/solfege/configwindow.py
-%%DATADIR%%/solfege/configwindow.pyc
-%%DATADIR%%/solfege/const.py
-%%DATADIR%%/solfege/const.pyc
-%%DATADIR%%/solfege/dataparser.py
-%%DATADIR%%/solfege/dataparser.pyc
-%%DATADIR%%/solfege/exceptiondialog.py
-%%DATADIR%%/solfege/exceptiondialog.pyc
+%%DATADIR%%/help-menu.xml
+%%DATADIR%%/solfege/exercises
 %%DATADIR%%/solfege/exercises/__init__.py
-%%DATADIR%%/solfege/exercises/__init__.pyc
 %%DATADIR%%/solfege/exercises/chord.py
-%%DATADIR%%/solfege/exercises/chord.pyc
 %%DATADIR%%/solfege/exercises/chordvoicing.py
-%%DATADIR%%/solfege/exercises/chordvoicing.pyc
 %%DATADIR%%/solfege/exercises/compareintervals.py
-%%DATADIR%%/solfege/exercises/compareintervals.pyc
 %%DATADIR%%/solfege/exercises/dictation.py
-%%DATADIR%%/solfege/exercises/dictation.pyc
 %%DATADIR%%/solfege/exercises/elembuilder.py
-%%DATADIR%%/solfege/exercises/elembuilder.pyc
 %%DATADIR%%/solfege/exercises/harmonicinterval.py
-%%DATADIR%%/solfege/exercises/harmonicinterval.pyc
 %%DATADIR%%/solfege/exercises/harmonicprogressiondictation.py
-%%DATADIR%%/solfege/exercises/harmonicprogressiondictation.pyc
 %%DATADIR%%/solfege/exercises/idbyname.py
-%%DATADIR%%/solfege/exercises/idbyname.pyc
 %%DATADIR%%/solfege/exercises/identifybpm.py
-%%DATADIR%%/solfege/exercises/identifybpm.pyc
 %%DATADIR%%/solfege/exercises/idproperty.py
-%%DATADIR%%/solfege/exercises/idproperty.pyc
 %%DATADIR%%/solfege/exercises/idtone.py
-%%DATADIR%%/solfege/exercises/idtone.pyc
 %%DATADIR%%/solfege/exercises/melodicinterval.py
-%%DATADIR%%/solfege/exercises/melodicinterval.pyc
 %%DATADIR%%/solfege/exercises/nameinterval.py
-%%DATADIR%%/solfege/exercises/nameinterval.pyc
 %%DATADIR%%/solfege/exercises/rhythm.py
-%%DATADIR%%/solfege/exercises/rhythm.pyc
 %%DATADIR%%/solfege/exercises/rhythmtapping.py
-%%DATADIR%%/solfege/exercises/rhythmtapping.pyc
 %%DATADIR%%/solfege/exercises/rhythmtapping2.py
-%%DATADIR%%/solfege/exercises/rhythmtapping2.pyc
 %%DATADIR%%/solfege/exercises/singanswer.py
-%%DATADIR%%/solfege/exercises/singanswer.pyc
 %%DATADIR%%/solfege/exercises/singchord.py
-%%DATADIR%%/solfege/exercises/singchord.pyc
 %%DATADIR%%/solfege/exercises/singinterval.py
-%%DATADIR%%/solfege/exercises/singinterval.pyc
 %%DATADIR%%/solfege/exercises/twelvetone.py
+%%DATADIR%%/solfege/exercises/__init__.pyc
+%%DATADIR%%/solfege/exercises/chord.pyc
+%%DATADIR%%/solfege/exercises/chordvoicing.pyc
+%%DATADIR%%/solfege/exercises/compareintervals.pyc
+%%DATADIR%%/solfege/exercises/dictation.pyc
+%%DATADIR%%/solfege/exercises/elembuilder.pyc
+%%DATADIR%%/solfege/exercises/harmonicinterval.pyc
+%%DATADIR%%/solfege/exercises/harmonicprogressiondictation.pyc
+%%DATADIR%%/solfege/exercises/idbyname.pyc
+%%DATADIR%%/solfege/exercises/identifybpm.pyc
+%%DATADIR%%/solfege/exercises/idproperty.pyc
+%%DATADIR%%/solfege/exercises/idtone.pyc
+%%DATADIR%%/solfege/exercises/melodicinterval.pyc
+%%DATADIR%%/solfege/exercises/nameinterval.pyc
+%%DATADIR%%/solfege/exercises/rhythm.pyc
+%%DATADIR%%/solfege/exercises/rhythmtapping.pyc
+%%DATADIR%%/solfege/exercises/rhythmtapping2.pyc
+%%DATADIR%%/solfege/exercises/singanswer.pyc
+%%DATADIR%%/solfege/exercises/singchord.pyc
+%%DATADIR%%/solfege/exercises/singinterval.pyc
 %%DATADIR%%/solfege/exercises/twelvetone.pyc
-%%DATADIR%%/solfege/filesystem.py
-%%DATADIR%%/solfege/filesystem.pyc
-%%DATADIR%%/solfege/fpeditor.py
-%%DATADIR%%/solfege/fpeditor.pyc
-%%DATADIR%%/solfege/frontpage.py
-%%DATADIR%%/solfege/frontpage.pyc
-%%DATADIR%%/solfege/gpath.py
-%%DATADIR%%/solfege/gpath.pyc
-%%DATADIR%%/solfege/gu.py
-%%DATADIR%%/solfege/gu.pyc
-%%DATADIR%%/solfege/history.py
-%%DATADIR%%/solfege/history.pyc
-%%DATADIR%%/solfege/i18n.py
-%%DATADIR%%/solfege/i18n.pyc
-%%DATADIR%%/solfege/inputwidgets.py
-%%DATADIR%%/solfege/inputwidgets.pyc
-%%DATADIR%%/solfege/instrumentselector.py
-%%DATADIR%%/solfege/instrumentselector.pyc
-%%DATADIR%%/solfege/languages.py
-%%DATADIR%%/solfege/languages.pyc
-%%DATADIR%%/solfege/lessonfile.py
-%%DATADIR%%/solfege/lessonfile.pyc
-%%DATADIR%%/solfege/lessonfile_editor_main.py
-%%DATADIR%%/solfege/lessonfile_editor_main.pyc
-%%DATADIR%%/solfege/lessonfilegui.py
-%%DATADIR%%/solfege/lessonfilegui.pyc
-%%DATADIR%%/solfege/mainwin.py
-%%DATADIR%%/solfege/mainwin.pyc
 %%DATADIR%%/solfege/mpd/__init__.py
 %%DATADIR%%/solfege/mpd/__init__.pyc
 %%DATADIR%%/solfege/mpd/_exceptions.py
@@ -2335,8 +2380,6 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/solfege/mpd/interval.pyc
 %%DATADIR%%/solfege/mpd/mfutils.py
 %%DATADIR%%/solfege/mpd/mfutils.pyc
-%%DATADIR%%/solfege/mpd/mpdutils.py
-%%DATADIR%%/solfege/mpd/mpdutils.pyc
 %%DATADIR%%/solfege/mpd/musicalpitch.py
 %%DATADIR%%/solfege/mpd/musicalpitch.pyc
 %%DATADIR%%/solfege/mpd/musicdisplayer.py
@@ -2349,24 +2392,61 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/solfege/mpd/requests.pyc
 %%DATADIR%%/solfege/mpd/track.py
 %%DATADIR%%/solfege/mpd/track.pyc
-%%DATADIR%%/solfege/multipleintervalconfigwidget.py
-%%DATADIR%%/solfege/multipleintervalconfigwidget.pyc
-%%DATADIR%%/solfege/notenamespinbutton.py
-%%DATADIR%%/solfege/notenamespinbutton.pyc
-%%DATADIR%%/solfege/optionparser.py
-%%DATADIR%%/solfege/optionparser.pyc
-%%DATADIR%%/solfege/osutils.py
-%%DATADIR%%/solfege/osutils.pyc
-%%DATADIR%%/solfege/pmwiki.py
-%%DATADIR%%/solfege/pmwiki.pyc
-%%DATADIR%%/solfege/practisesheetdlg.py
-%%DATADIR%%/solfege/practisesheetdlg.pyc
-%%DATADIR%%/solfege/reportbug.py
-%%DATADIR%%/solfege/reportbug.pyc
-%%DATADIR%%/solfege/reportlib.py
-%%DATADIR%%/solfege/reportlib.pyc
-%%DATADIR%%/solfege/runtime.py
-%%DATADIR%%/solfege/runtime.pyc
+%%DATADIR%%/exercises/standard/regression-lesson-files/chord-no-name
+%%DATADIR%%/exercises/standard/regression-lesson-files/chord-wav-music
+%%DATADIR%%/exercises/standard/regression-lesson-files/chordvoicing-lessonfile-exception
+%%DATADIR%%/exercises/standard/regression-lesson-files/compareintervals-1
+%%DATADIR%%/exercises/standard/regression-lesson-files/compareintervals-2
+%%DATADIR%%/exercises/standard/regression-lesson-files/compareintervals-3
+%%DATADIR%%/exercises/standard/regression-lesson-files/compareintervals-4
+%%DATADIR%%/exercises/standard/regression-lesson-files/dictation-exception-handling
+%%DATADIR%%/exercises/standard/regression-lesson-files/dictation-no-questions
+%%DATADIR%%/exercises/standard/regression-lesson-files/elembuilder-bad-tonic
+%%DATADIR%%/exercises/standard/regression-lesson-files/elembuilder-scale-1
+%%DATADIR%%/exercises/standard/regression-lesson-files/elembuilder-scale-2
+%%DATADIR%%/exercises/standard/regression-lesson-files/elembuilder-scale-3
+%%DATADIR%%/exercises/standard/regression-lesson-files/elembuilder-scale-4
+%%DATADIR%%/exercises/standard/regression-lesson-files/elembuilder-scale-5
+%%DATADIR%%/exercises/standard/regression-lesson-files/harmonicprogression-lessonfile-exception
+%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-assignment-to-reserved-word
+%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-at_question_start-1
+%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-at_question_start-2
+%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-at_question_start-3
+%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-bad-cuemusic
+%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-mediafiles
+%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-missing-.wav-file
+%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-noquestionsinfile
+%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-syntax-error-1
+%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-syntax-error-2
+%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-unsupported-named-block
+%%DATADIR%%/exercises/standard/regression-lesson-files/idbyname-vmusic
+%%DATADIR%%/exercises/standard/regression-lesson-files/idproperty-1
+%%DATADIR%%/exercises/standard/regression-lesson-files/idproperty-2
+%%DATADIR%%/exercises/standard/regression-lesson-files/idproperty-3
+%%DATADIR%%/exercises/standard/regression-lesson-files/idproperty-4
+%%DATADIR%%/exercises/standard/regression-lesson-files/nameinterval-bad-tones-header-var
+%%DATADIR%%/exercises/standard/regression-lesson-files/nameinterval-constraints
+%%DATADIR%%/exercises/standard/regression-lesson-files/rhythmtapping-1
+%%DATADIR%%/exercises/standard/regression-lesson-files/rhythmtapping-2
+%%DATADIR%%/exercises/standard/regression-lesson-files/rhythmtapping-3
+%%DATADIR%%/exercises/standard/regression-lesson-files/rhythmtapping-4
+%%DATADIR%%/exercises/standard/regression-lesson-files/rhythmtapping2-1
+%%DATADIR%%/exercises/standard/regression-lesson-files/rvoice
+%%DATADIR%%/exercises/standard/regression-lesson-files/singanswer-missing-.wav-file
+%%DATADIR%%/exercises/standard/regression-lesson-files/singanswer-missing-question_text
+%%DATADIR%%/exercises/standard/regression-lesson-files/transpose-accidentals
+%%DATADIR%%/exercises/standard/regression-lesson-files/transpose-key
+%%DATADIR%%/exercises/standard/regression-lesson-files/xx-chord-exceptions
+%%DATADIR%%/exercises/standard/regression-lesson-files/xx-chordvoicing-exceptions
+%%DATADIR%%/exercises/standard/regression-lesson-files/xx-dictation-exceptions
+%%DATADIR%%/exercises/standard/regression-lesson-files/xx-elembuilder-exceptions
+%%DATADIR%%/exercises/standard/regression-lesson-files/xx-harmonicprogressiondictation-exceptions
+%%DATADIR%%/exercises/standard/regression-lesson-files/xx-idbyname-exceptions
+%%DATADIR%%/exercises/standard/regression-lesson-files/xx-idproperty-exceptions
+%%DATADIR%%/exercises/standard/regression-lesson-files/xx-rhythmtapping-exceptions
+%%DATADIR%%/exercises/standard/regression-lesson-files/xx-singanswer-exceptions
+%%DATADIR%%/exercises/standard/regression-lesson-files/xx-singchord-exceptions
+%%DATADIR%%/solfege.gtkrc
 %%DATADIR%%/solfege/soundcard/__init__.py
 %%DATADIR%%/solfege/soundcard/__init__.pyc
 %%DATADIR%%/solfege/soundcard/exporter.py
@@ -2383,97 +2463,44 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 %%DATADIR%%/solfege/soundcard/oss_sequencer2.pyc
 %%DATADIR%%/solfege/soundcard/solfege_c_midi.py
 %%DATADIR%%/solfege/soundcard/solfege_c_midi.pyc
-%%DATADIR%%/solfege/soundcard/soundcardexceptions.py
-%%DATADIR%%/solfege/soundcard/soundcardexceptions.pyc
 %%DATADIR%%/solfege/soundcard/synth_common.py
 %%DATADIR%%/solfege/soundcard/synth_common.pyc
 %%DATADIR%%/solfege/soundcard/winsynth.py
 %%DATADIR%%/solfege/soundcard/winsynth.pyc
-%%DATADIR%%/solfege/specialwidgets.py
-%%DATADIR%%/solfege/specialwidgets.pyc
-%%DATADIR%%/solfege/statistics.py
-%%DATADIR%%/solfege/statistics.pyc
-%%DATADIR%%/solfege/statisticsviewer.py
-%%DATADIR%%/solfege/statisticsviewer.pyc
-%%DATADIR%%/solfege/stock.py
-%%DATADIR%%/solfege/stock.pyc
-%%DATADIR%%/solfege/testlib.py
-%%DATADIR%%/solfege/testlib.pyc
-%%DATADIR%%/solfege/tracebackwindow.py
-%%DATADIR%%/solfege/tracebackwindow.pyc
-%%DATADIR%%/solfege/trainingsetdlg.py
-%%DATADIR%%/solfege/trainingsetdlg.pyc
-%%DATADIR%%/solfege/tuner.py
-%%DATADIR%%/solfege/tuner.pyc
-%%DATADIR%%/solfege/utils.py
-%%DATADIR%%/solfege/utils.pyc
-%%DATADIR%%/solfege/uuid.py
-%%DATADIR%%/solfege/uuid.pyc
-%%DATADIR%%/solfege/winlang.py
-%%DATADIR%%/solfege/winlang.pyc
-%%DATADIR%%/solfege/winreg.py
-%%DATADIR%%/solfege/winreg.pyc
-%%DATADIR%%/solfege/xrandom.py
-%%DATADIR%%/solfege/xrandom.pyc
 %%DATADIR%%/ui.xml
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/da/LC_MESSAGES
-@dirrmtry share/locale/da
-@dirrmtry share/locale/de/LC_MESSAGES
-@dirrmtry share/locale/de
-@dirrmtry share/locale/eo/LC_MESSAGES
-@dirrmtry share/locale/eo
-@dirrmtry share/locale/es/LC_MESSAGES
-@dirrmtry share/locale/es
-@dirrmtry share/locale/et/LC_MESSAGES
-@dirrmtry share/locale/et
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/fr/LC_MESSAGES
-@dirrmtry share/locale/fr
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/hu/LC_MESSAGES
-@dirrmtry share/locale/hu
-@dirrmtry share/locale/it/LC_MESSAGES
-@dirrmtry share/locale/it
-@dirrmtry share/locale/nb/LC_MESSAGES
-@dirrmtry share/locale/nb
-@dirrmtry share/locale/nl/LC_MESSAGES
-@dirrmtry share/locale/nl
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt_BR/LC_MESSAGES
-@dirrmtry share/locale/pl_BR
-@dirrmtry share/locale/ru/LC_MESSAGES
-@dirrmtry share/locale/ru
-@dirrmtry share/locale/sv/LC_MESSAGES
-@dirrmtry share/locale/sv
-@dirrmtry share/locale/tr/LC_MESSAGES
-@dirrmtry share/locale/tr
-@dirrmtry share/locale/vi/LC_MESSAGES
-@dirrmtry share/locale/vi
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
+@dirrm %%DATADIR%%/themes/svg
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/src
 @dirrm %%DATADIR%%/solfege/soundcard
-@dirrm %%DATADIR%%/solfege/mpd
+@dirrm %%DATADIR%%/exercises/standard/regression-lesson-files
+@dirrm %%DATADIR%%/exercises/standard/lesson-files/bin
+@dirrm %%DATADIR%%/exercises/standard/lesson-files/share
+@dirrm %%DATADIR%%/exercises/standard/lesson-files/include
+@dirrm %%DATADIR%%/exercises/standard/lesson-files
+@dirrm %%DATADIR%%/exercises/standard
+@dirrm %%DATADIR%%/exercises
 @dirrm %%DATADIR%%/solfege/exercises
+@dirrm %%DATADIR%%/solfege/mpd
 @dirrm %%DATADIR%%/solfege
+@dirrm %%DATADIR%%/lesson-files/share
+@dirrm %%DATADIR%%/lesson-files/include
+@dirrm %%DATADIR%%/lesson-files/bin
+@dirrm %%DATADIR%%/lesson-files
+@dirrm %%DATADIR%%/learningtrees
 @dirrm %%DATADIR%%/help/tr/figures
 @dirrm %%DATADIR%%/help/tr
 @dirrm %%DATADIR%%/help/ru
 @dirrm %%DATADIR%%/help/pt_BR/figures
 @dirrm %%DATADIR%%/help/pt_BR
-@dirrm %%DATADIR%%/help/pl
-@dirrm %%DATADIR%%/help/nl
 @dirrm %%DATADIR%%/help/nb/figures
 @dirrm %%DATADIR%%/help/nb
+@dirrm %%DATADIR%%/help/nl
 @dirrm %%DATADIR%%/help/gl
 @dirrm %%DATADIR%%/help/fr/figures
 @dirrm %%DATADIR%%/help/fr
-@dirrm %%DATADIR%%/help/et
 @dirrm %%DATADIR%%/help/eo
+@dirrm %%DATADIR%%/help/et
+@dirrm %%DATADIR%%/help/pl
 @dirrm %%DATADIR%%/help/C/scales/images/triads
 @dirrm %%DATADIR%%/help/C/scales/images/quadriads
 @dirrm %%DATADIR%%/help/C/scales/images/modes/scales
@@ -2481,20 +2508,14 @@ share/locale/zh_CN/LC_MESSAGES/solfege.mo
 @dirrm %%DATADIR%%/help/C/scales/images/modes
 @dirrm %%DATADIR%%/help/C/scales/images
 @dirrm %%DATADIR%%/help/C/scales
-@dirrm %%DATADIR%%/help/C/figures
 @dirrm %%DATADIR%%/help/C/ly
+@dirrm %%DATADIR%%/help/C/figures
 @dirrm %%DATADIR%%/help/C
 @dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/hash-bug-workaround2
-@dirrm %%DATADIR%%/hash-bug-workaround
 @dirrm %%DATADIR%%/graphics
 @dirrm %%DATADIR%%/feta
-@dirrm %%DATADIR%%/exercises/standard/regression-lesson-files
-@dirrm %%DATADIR%%/exercises/standard/lesson-files/share
-@dirrm %%DATADIR%%/exercises/standard/lesson-files/include
-@dirrm %%DATADIR%%/exercises/standard/lesson-files/bin
-@dirrm %%DATADIR%%/exercises/standard/lesson-files
-@dirrm %%DATADIR%%/exercises/standard
-@dirrm %%DATADIR%%/exercises
+@dirrm %%DATADIR%%/example-lesson-files
+@dirrm %%DATADIR%%/hash-bug-workaround
+@dirrm %%DATADIR%%/hash-bug-workaround2
 @dirrm %%DATADIR%%
 @dirrmtry share/applications