diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e3a364..e46a314 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.10 FATAL_ERROR) # because of c++17
 
 project(amuse)
 
+if(POLICY CMP0072)
+  cmake_policy(SET CMP0072 NEW)
+endif()
+
 if (NOT MSVC)
   set(CMAKE_CXX_STANDARD 20)
   set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -81,9 +85,15 @@ target_include_directories(amuse PUBLIC include)
 target_link_libraries(amuse PUBLIC
   athena-core
   lzokay
+  logvisor
+  fmt
   ${ZLIB_LIBRARIES}
 )
 
+target_atdna(amuse atdna_AudioGroupPool.cpp include/amuse/AudioGroupPool.hpp)
+target_atdna(amuse atdna_AudioGroupProject.cpp include/amuse/AudioGroupProject.hpp)
+target_atdna(amuse atdna_AudioGroupSampleDirectory.cpp include/amuse/AudioGroupSampleDirectory.hpp)
+
 if(NX)
   target_sources(amuse PRIVATE include/switch_math.hpp)
 endif()
@@ -157,11 +167,11 @@ if(TARGET boo AND NOT WINDOWS_STORE AND NOT NX)
   endif()
 
   # Editor
-  find_package(Qt5 COMPONENTS Widgets)
-  if (Qt5Widgets_FOUND)
-    message(STATUS "Qt5 found, amuse-gui will be built")
+  find_package(Qt6 COMPONENTS Widgets PATHS /usr/local/opt/qt)
+  if (Qt6Widgets_FOUND)
+    message(STATUS "Qt6 found, amuse-gui will be built")
     add_subdirectory(Editor)
   else()
-    message(STATUS "Qt5 not found, amuse-gui will not be built")
+    message(STATUS "Qt6 not found, amuse-gui will not be built")
   endif()
 endif()
diff --git a/Editor/ADSREditor.cpp b/Editor/ADSREditor.cpp
index 928267f..a903b04 100644
--- a/Editor/ADSREditor.cpp
+++ b/Editor/ADSREditor.cpp
@@ -153,9 +153,9 @@ void ADSRView::mousePressEvent(QMouseEvent* ev) {
       QPointF((width() - 30.0) * ((adTime + 1.0) / totalTime) + 30.0, sustainY),
   };
   const qreal dists[] = {
-      PointDistance(ev->localPos(), points[0]),
-      PointDistance(ev->localPos(), points[1]),
-      PointDistance(ev->localPos(), points[2]),
+      PointDistance(ev->position(), points[0]),
+      PointDistance(ev->position(), points[1]),
+      PointDistance(ev->position(), points[2]),
   };
 
   int minDist = 0;
@@ -196,16 +196,16 @@ void ADSRView::mouseMoveEvent(QMouseEvent* ev) {
   qreal totalTime = adTime + 1.0 + relTime;
 
   if (m_dragPoint == 0) {
-    const qreal newAttack = std::max(0.0, (ev->localPos().x() - 30.0) / (width() - 30.0) * totalTime);
+    const qreal newAttack = std::max(0.0, (ev->position().x() - 30.0) / (width() - 30.0) * totalTime);
     const qreal delta = newAttack - aTime;
     ctrls->setAttackAndDecay(newAttack, std::max(0.0, ctrls->m_decay->value() - delta), m_cycleIdx);
   } else if (m_dragPoint == 1) {
-    const qreal newDecay = std::max(0.0, (ev->localPos().x() - 30.0) * totalTime / (width() - 30.0) - aTime);
-    const qreal newSustain = (-ev->localPos().y() + (height() - 16.0)) / (height() - 16.0);
+    const qreal newDecay = std::max(0.0, (ev->position().x() - 30.0) * totalTime / (width() - 30.0) - aTime);
+    const qreal newSustain = (-ev->position().y() + (height() - 16.0)) / (height() - 16.0);
     ctrls->setDecayAndSustain(newDecay, newSustain * 100.0, m_cycleIdx);
   } else if (m_dragPoint == 2) {
     const qreal newRelease =
-        std::max(0.0, (width() - 30.0) * (adTime + 1.0) / (ev->localPos().x() - 30.0) - (adTime + 1.0));
+        std::max(0.0, (width() - 30.0) * (adTime + 1.0) / (ev->position().x() - 30.0) - (adTime + 1.0));
     ctrls->setRelease(newRelease, m_cycleIdx);
     ctrls->m_release->setValue(newRelease);
   }
diff --git a/Editor/CMakeLists.txt b/Editor/CMakeLists.txt
index e13a8f1..d6b4660 100644
--- a/Editor/CMakeLists.txt
+++ b/Editor/CMakeLists.txt
@@ -7,13 +7,13 @@ set(CMAKE_AUTOUIC ON)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-find_package(Qt5 COMPONENTS LinguistTools Network Qml Svg Widgets Xml REQUIRED)
+find_package(Qt6 COMPONENTS LinguistTools Network Qml SvgWidgets Widgets Xml REQUIRED)
 
 configure_file(resources/translation_res.qrc translation_res.qrc @ONLY)
 set(TRANSLATIONS
   resources/lang_de.ts
 )
-QT5_CREATE_TRANSLATION(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../lib ${TRANSLATIONS})
+QT6_CREATE_TRANSLATION(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../lib ${TRANSLATIONS})
 
 add_executable(amuse-gui WIN32 MACOSX_BUNDLE
   ADSREditor.cpp
@@ -137,11 +137,11 @@ set_target_properties(amuse-gui PROPERTIES
 target_link_libraries(amuse-gui
   ${PLAT_LIBS}
 
-  Qt5::Network
-  Qt5::Qml
-  Qt5::Svg
-  Qt5::Widgets
-  Qt5::Xml
+  Qt6::Network
+  Qt6::Qml
+  Qt6::SvgWidgets
+  Qt6::Widgets
+  Qt6::Xml
 
   amuse
   athena-core
diff --git a/Editor/Common.cpp b/Editor/Common.cpp
index 440d644..d3f6808 100644
--- a/Editor/Common.cpp
+++ b/Editor/Common.cpp
@@ -73,8 +73,8 @@ void ShowInGraphicalShell(QWidget* parent, const QString& pathIn) {
   // we cannot select a file here, because no file browser really supports it...
   const QString folder = fileInfo.isDir() ? fileInfo.absoluteFilePath() : fileInfo.filePath();
   QProcess browserProc;
-  const QString browserArgs = QStringLiteral("xdg-open \"%1\"").arg(QFileInfo(folder).path());
-  browserProc.startDetached(browserArgs);
+  const QStringList browserArgs = QStringList() << QStringLiteral("%1").arg(QFileInfo(folder).path());
+  browserProc.startDetached(QStringLiteral("xdg-open"), browserArgs);
 #endif
 }
 
diff --git a/Editor/CurveEditor.cpp b/Editor/CurveEditor.cpp
index 0203cc0..98e3ad1 100644
--- a/Editor/CurveEditor.cpp
+++ b/Editor/CurveEditor.cpp
@@ -137,11 +137,11 @@ void CurveView::mouseMoveEvent(QMouseEvent* ev) {
   }
 
   const qreal xIncrement = (width() - 30.0) / 127.0;
-  const int idx = int(std::round((ev->localPos().x() - 30.0) / xIncrement));
+  const int idx = int(std::round((ev->position().x() - 30.0) / xIncrement));
   if (idx < 0 || idx > 127) {
     return;
   }
-  const int val = 127 - std::clamp(0, int(std::round(ev->localPos().y() / (height() - 16.0) * 127.0)), 127);
+  const int val = 127 - std::clamp(0, int(std::round(ev->position().y() / (height() - 16.0) * 127.0)), 127);
 
   CurveEditUndoCommand::RedoData newData;
   auto& curve = static_cast<amuse::Curve&>(table);
diff --git a/Editor/EditorWidget.cpp b/Editor/EditorWidget.cpp
index e6ef335..00e5752 100644
--- a/Editor/EditorWidget.cpp
+++ b/Editor/EditorWidget.cpp
@@ -226,7 +226,7 @@ AddRemoveButtons::AddRemoveButtons(QWidget* parent)
 static QIcon ListingDeleteIcon;
 static QIcon ListingDeleteHoveredIcon;
 
-void ListingDeleteButton::enterEvent(QEvent* event) { setIcon(ListingDeleteHoveredIcon); }
+void ListingDeleteButton::enterEvent(QEnterEvent* event) { setIcon(ListingDeleteHoveredIcon); }
 
 void ListingDeleteButton::leaveEvent(QEvent* event) { setIcon(ListingDeleteIcon); }
 
@@ -264,7 +264,7 @@ bool BaseObjectDelegate::editorEvent(QEvent* event, QAbstractItemModel* model, c
       connect(findUsagesAction, &QAction::triggered, this, &BaseObjectDelegate::doFindUsages);
       menu->addAction(findUsagesAction);
 
-      menu->popup(ev->globalPos());
+      menu->popup(ev->globalPosition().toPoint());
     }
   }
   return false;
diff --git a/Editor/EditorWidget.hpp b/Editor/EditorWidget.hpp
index 0841e92..e734085 100644
--- a/Editor/EditorWidget.hpp
+++ b/Editor/EditorWidget.hpp
@@ -229,7 +229,7 @@ class ListingDeleteButton : public QPushButton {
   Q_OBJECT
 public:
   explicit ListingDeleteButton(QWidget* parent = Q_NULLPTR);
-  void enterEvent(QEvent* event) override;
+  void enterEvent(QEnterEvent* event) override;
   void leaveEvent(QEvent* event) override;
 };
 
diff --git a/Editor/KeyboardWidget.cpp b/Editor/KeyboardWidget.cpp
index 41ec70e..9876ff2 100644
--- a/Editor/KeyboardWidget.cpp
+++ b/Editor/KeyboardWidget.cpp
@@ -39,7 +39,7 @@ KeyboardOctave::KeyboardOctave(int octave, const QString& svgPath, QWidget* pare
     const auto& naturalKeyName = NaturalKeyNames[i];
 
     if (renderer()->elementExists(naturalKeyName)) {
-      m_natural[i] = renderer()->matrixForElement(naturalKeyName).mapRect(renderer()->boundsOnElement(naturalKeyName));
+      m_natural[i] = renderer()->transformForElement(naturalKeyName).mapRect(renderer()->boundsOnElement(naturalKeyName));
     }
   }
 
@@ -47,7 +47,7 @@ KeyboardOctave::KeyboardOctave(int octave, const QString& svgPath, QWidget* pare
     const auto& sharpKeyName = SharpKeyNames[i];
 
     if (renderer()->elementExists(sharpKeyName)) {
-      m_sharp[i] = renderer()->matrixForElement(sharpKeyName).mapRect(renderer()->boundsOnElement(sharpKeyName));
+      m_sharp[i] = renderer()->transformForElement(sharpKeyName).mapRect(renderer()->boundsOnElement(sharpKeyName));
     }
   }
 
@@ -151,7 +151,7 @@ void KeyboardWidget::mouseReleaseEvent(QMouseEvent* event) {
   m_holding = false;
 }
 
-void KeyboardWidget::enterEvent(QEvent* event) {
+void KeyboardWidget::enterEvent(QEnterEvent* event) {
   if (m_statusFocus)
     m_statusFocus->enter();
 }
@@ -179,7 +179,7 @@ KeyboardSlider::KeyboardSlider(QWidget* parent) : QSlider(parent) {}
 
 KeyboardSlider::~KeyboardSlider() = default;
 
-void KeyboardSlider::enterEvent(QEvent* event) {
+void KeyboardSlider::enterEvent(QEnterEvent* event) {
   if (m_statusFocus)
     m_statusFocus->enter();
 }
diff --git a/Editor/KeyboardWidget.hpp b/Editor/KeyboardWidget.hpp
index fc3ad66..7f41c42 100644
--- a/Editor/KeyboardWidget.hpp
+++ b/Editor/KeyboardWidget.hpp
@@ -54,7 +54,7 @@ public:
   void mouseMoveEvent(QMouseEvent* event) override;
   void mousePressEvent(QMouseEvent* event) override;
   void mouseReleaseEvent(QMouseEvent* event) override;
-  void enterEvent(QEvent* event) override;
+  void enterEvent(QEnterEvent* event) override;
   void leaveEvent(QEvent* event) override;
   void wheelEvent(QWheelEvent* event) override;
   void showEvent(QShowEvent* event) override;
@@ -74,7 +74,7 @@ public:
   explicit KeyboardSlider(QWidget* parent = Q_NULLPTR);
   ~KeyboardSlider() override;
 
-  void enterEvent(QEvent* event) override;
+  void enterEvent(QEnterEvent* event) override;
   void leaveEvent(QEvent* event) override;
   void setStatusFocus(StatusBarFocus* statusFocus);
   void sliderChange(SliderChange change) override;
diff --git a/Editor/KeymapEditor.cpp b/Editor/KeymapEditor.cpp
index 274a189..7dacd6c 100644
--- a/Editor/KeymapEditor.cpp
+++ b/Editor/KeymapEditor.cpp
@@ -138,7 +138,7 @@ int KeymapView::getKey(const QPoint& localPos) const {
 }
 
 void KeymapView::mouseMoveEvent(QMouseEvent* ev) {
-  const int octave = ev->x() / 280;
+  const int octave = ev->position().x() / 280;
   const int key = getKey(ev->pos() - QPoint(octave * 280, height() / 2 - 100));
 
   if (octave >= 0 && key >= 0) {
@@ -174,7 +174,7 @@ KeymapView::KeymapView(QWidget* parent)
 
     if (m_octaveRenderer.elementExists(naturalKeyName)) {
       m_natural[i] =
-          m_octaveRenderer.matrixForElement(naturalKeyName).mapRect(m_octaveRenderer.boundsOnElement(naturalKeyName));
+          m_octaveRenderer.transformForElement(naturalKeyName).mapRect(m_octaveRenderer.boundsOnElement(naturalKeyName));
     }
   }
 
@@ -183,7 +183,7 @@ KeymapView::KeymapView(QWidget* parent)
 
     if (m_octaveRenderer.elementExists(sharpKeyName)) {
       m_sharp[i] =
-          m_octaveRenderer.matrixForElement(sharpKeyName).mapRect(m_octaveRenderer.boundsOnElement(sharpKeyName));
+          m_octaveRenderer.transformForElement(sharpKeyName).mapRect(m_octaveRenderer.boundsOnElement(sharpKeyName));
     }
   }
 
diff --git a/Editor/LayersEditor.cpp b/Editor/LayersEditor.cpp
index 5209e64..4a41f24 100644
--- a/Editor/LayersEditor.cpp
+++ b/Editor/LayersEditor.cpp
@@ -519,7 +519,7 @@ void LayersTableView::deleteSelection() {
 
   std::vector<std::pair<amuse::LayerMapping, int>> data;
   data.reserve(list.size());
-  for (const QModelIndex idx : list) {
+  for (const QModelIndex& idx : list) {
     data.emplace_back(amuse::LayerMapping{}, idx.row());
   }
 
diff --git a/Editor/MainWindow.cpp b/Editor/MainWindow.cpp
index 492f7bc..4809fb8 100644
--- a/Editor/MainWindow.cpp
+++ b/Editor/MainWindow.cpp
@@ -29,6 +29,8 @@
 #include <amuse/Engine.hpp>
 #include <boo/audiodev/IAudioVoiceEngine.hpp>
 
+#include <cmath>
+
 MainWindow::MainWindow(QWidget* parent)
 : QMainWindow(parent)
 , m_navIt(m_navList.begin())
@@ -261,7 +263,7 @@ void MainWindow::updateWindowTitle() {
 void MainWindow::updateRecentFileActions() {
   const QSettings settings;
   const QStringList files = settings.value(QStringLiteral("recentFileList")).toStringList();
-  const int numRecentFiles = std::min(files.size(), int(MaxRecentFiles));
+  const int numRecentFiles = std::min(files.size(), qsizetype(MaxRecentFiles));
 
   for (int i = 0; i < numRecentFiles; ++i) {
     const QString text = QStringLiteral("&%1 %2").arg(i + 1).arg(QDir(files[i]).dirName());
@@ -519,8 +521,9 @@ bool MainWindow::_setEditor(EditorWidget* editor, bool appendNav) {
   m_interactiveSeq.reset();
   if (editor != m_ui.editorContents->currentWidget() && m_ui.editorContents->currentWidget() != m_faceSvg)
     getEditorWidget()->unloadData();
-  if (appendNav && m_navIt != m_navList.end())
-    m_navList.erase(m_navIt + 1, m_navList.end());
+  if (appendNav && m_navIt != m_navList.end()) {
+      m_navList.erase(std::next(m_navIt, 1), m_navList.end());
+  }
   if (!editor || !editor->valid()) {
     m_ui.editorContents->setCurrentWidget(m_faceSvg);
     updateWindowTitle();
@@ -1189,7 +1192,7 @@ bool TreeDelegate::editorEvent(QEvent* event, QAbstractItemModel* __model, const
       connect(renameAction, &QAction::triggered, this, &TreeDelegate::doRename);
       menu->addAction(renameAction);
 
-      menu->popup(ev->globalPos());
+      menu->popup(ev->globalPosition().toPoint());
     }
   }
 
@@ -1484,12 +1487,12 @@ void MainWindow::newLayersAction() {
 }
 
 void MainWindow::updateNavigationButtons() {
-  m_goForward->setDisabled(m_navIt == m_navList.end() || m_navIt + 1 == m_navList.end());
+  m_goForward->setDisabled(m_navIt == m_navList.end() || std::next(m_navIt, 1) == m_navList.end());
   m_goBack->setDisabled(m_navIt == m_navList.begin());
 }
 
 void MainWindow::goForward() {
-  if (m_navIt == m_navList.end() || m_navIt + 1 == m_navList.end())
+  if (m_navIt == m_navList.end() || std::next(m_navIt, 1) == m_navList.end())
     return;
   ++m_navIt;
   openEditor(*m_navIt, false);
diff --git a/Editor/MainWindow.hpp b/Editor/MainWindow.hpp
index 24c2ffb..9e6e95e 100644
--- a/Editor/MainWindow.hpp
+++ b/Editor/MainWindow.hpp
@@ -5,7 +5,6 @@
 #include <memory>
 
 #include <QFileDialog>
-#include <QLinkedList>
 #include <QMainWindow>
 #include <QMessageBox>
 #include <QStyledItemDelegate>
@@ -113,8 +112,8 @@ class MainWindow : public QMainWindow {
   Ui::MainWindow m_ui;
   QAction* m_goBack;
   QAction* m_goForward;
-  QLinkedList<ProjectModel::INode*> m_navList;
-  QLinkedList<ProjectModel::INode*>::iterator m_navIt;
+  std::list<ProjectModel::INode*> m_navList;
+  std::list<ProjectModel::INode*>::iterator m_navIt;
   QAction* m_clearRecentFileAct;
   QAction* m_recentFileActs[MaxRecentFiles];
   TreeDelegate m_treeDelegate;
diff --git a/Editor/ProjectModel.cpp b/Editor/ProjectModel.cpp
index b9f2ffe..d79bff4 100644
--- a/Editor/ProjectModel.cpp
+++ b/Editor/ProjectModel.cpp
@@ -22,7 +22,7 @@ QIcon ProjectModel::SongGroupNode::Icon;
 QIcon ProjectModel::SoundGroupNode::Icon;
 
 OutlineFilterProxyModel::OutlineFilterProxyModel(ProjectModel* source)
-: QSortFilterProxyModel(source), m_usageKey({}, Qt::CaseInsensitive) {
+: QSortFilterProxyModel(source), m_usageKey({}, QRegularExpression::CaseInsensitiveOption) {
   setSourceModel(source);
   setRecursiveFilteringEnabled(true);
   setFilterCaseSensitivity(Qt::CaseInsensitive);
@@ -31,10 +31,10 @@ OutlineFilterProxyModel::OutlineFilterProxyModel(ProjectModel* source)
 void OutlineFilterProxyModel::setFilterRegExp(const QString& pattern) {
   if (pattern.startsWith(QStringLiteral("usages:"))) {
     m_usageKey.setPattern(pattern.mid(7));
-    QSortFilterProxyModel::setFilterRegExp(QString());
+    QSortFilterProxyModel::setFilterRegularExpression(QString());
   } else {
     m_usageKey.setPattern(QString());
-    QSortFilterProxyModel::setFilterRegExp(pattern);
+    QSortFilterProxyModel::setFilterRegularExpression(pattern);
   }
 }
 
@@ -498,8 +498,12 @@ ProjectModel::BasePoolObjectNode* ProjectModel::CollectionNode::nodeOfId(amuse::
 }
 
 ProjectModel::ProjectModel(const QString& path, QObject* parent)
-: QAbstractItemModel(parent), m_dir(path), m_outlineProxy(this), m_nullProxy(this), m_pageObjectProxy(this) {
-  m_root = amuse::MakeObj<RootNode>();
+: QAbstractItemModel(parent)
+, m_dir(path)
+, m_root(amuse::MakeObj<RootNode>())
+, m_outlineProxy(this)
+, m_nullProxy(this)
+, m_pageObjectProxy(this) {
 
   GroupNode::Icon = QIcon(QStringLiteral(":/icons/IconGroup.svg"));
   SongGroupNode::Icon = QIcon(QStringLiteral(":/icons/IconSongGroup.svg"));
diff --git a/Editor/ProjectModel.hpp b/Editor/ProjectModel.hpp
index 5443806..0d86395 100644
--- a/Editor/ProjectModel.hpp
+++ b/Editor/ProjectModel.hpp
@@ -38,7 +38,7 @@ enum AmuseItemEditFlags {
 
 class OutlineFilterProxyModel : public QSortFilterProxyModel {
   Q_OBJECT
-  QRegExp m_usageKey;
+  QRegularExpression m_usageKey;
 
 public:
   explicit OutlineFilterProxyModel(ProjectModel* source);
@@ -91,10 +91,6 @@ public:
 
 private:
   QDir m_dir;
-  OutlineFilterProxyModel m_outlineProxy;
-  NullItemProxyModel m_nullProxy;
-  PageObjectProxyModel m_pageObjectProxy;
-
   amuse::ProjectDatabase m_projectDatabase;
   std::unordered_map<QString, std::unique_ptr<amuse::AudioGroupDatabase>> m_groups;
 
@@ -380,6 +376,11 @@ public:
   QString MakeDedupedSubprojectName(const QString& origName);
   static QString MakeDedupedName(const QString& origName, amuse::NameDB* db);
 
+private:
+  OutlineFilterProxyModel m_outlineProxy;
+  NullItemProxyModel m_nullProxy;
+  PageObjectProxyModel m_pageObjectProxy;
+
 public:
   explicit ProjectModel(const QString& path, QObject* parent = Q_NULLPTR);
   ~ProjectModel() override;
diff --git a/Editor/SongGroupEditor.cpp b/Editor/SongGroupEditor.cpp
index 001a94b..9111ed7 100644
--- a/Editor/SongGroupEditor.cpp
+++ b/Editor/SongGroupEditor.cpp
@@ -390,7 +390,7 @@ bool MIDIFileDelegate::editorEvent(QEvent* event, QAbstractItemModel* model, con
       connect(sngAction, &QAction::triggered, this, &MIDIFileDelegate::doExportSNG);
       menu->addAction(sngAction);
 
-      menu->popup(ev->globalPos());
+      menu->popup(ev->globalPosition().toPoint());
     }
   }
   return false;
@@ -1172,7 +1172,7 @@ void PageTableView::deleteSelection() {
 
   std::vector<std::pair<uint8_t, amuse::SongGroupIndex::PageEntry>> data;
   data.reserve(list.size());
-  for (const QModelIndex idx : list) {
+  for (const QModelIndex& idx : list) {
     data.emplace_back(model()->data(idx).toInt() - 1, amuse::SongGroupIndex::PageEntry{});
   }
 
diff --git a/Editor/SoundMacroEditor.cpp b/Editor/SoundMacroEditor.cpp
index f963df2..64ab342 100644
--- a/Editor/SoundMacroEditor.cpp
+++ b/Editor/SoundMacroEditor.cpp
@@ -243,7 +243,7 @@ CommandWidget::CommandWidget(QWidget* parent, amuse::SoundMacro::ICmd* cmd, amus
           cb->setFixedHeight(30);
           cb->setProperty("fieldIndex", f);
           cb->setProperty("fieldName", fieldName);
-          for (const auto choice : field.m_choices) {
+          for (const auto& choice : field.m_choices) {
             if (choice.empty()) {
               break;
             }
@@ -514,7 +514,10 @@ void SoundMacroListing::startAutoscroll(QWidget* source, QMouseEvent* event, int
     m_autoscrollTimer = startTimer(50);
   m_autoscrollDelta = delta;
   m_autoscrollSource = source;
-  m_autoscrollEvent = *event;
+  if (m_autoscrollEvent) {
+    delete m_autoscrollEvent;
+  }
+  m_autoscrollEvent = event->clone();
 }
 
 void SoundMacroListing::stopAutoscroll() {
@@ -523,6 +526,9 @@ void SoundMacroListing::stopAutoscroll() {
     m_autoscrollTimer = -1;
   }
   m_autoscrollDelta = 0;
+  if (m_autoscrollEvent) {
+    delete m_autoscrollEvent;
+  }
   m_autoscrollSource = nullptr;
 }
 
@@ -534,7 +540,7 @@ void SoundMacroListing::timerEvent(QTimerEvent* event) {
     int valueDelta = bar->value() - oldValue;
     if (valueDelta != 0) {
       if (m_autoscrollSource)
-        QApplication::sendEvent(m_autoscrollSource, &m_autoscrollEvent);
+        QApplication::sendEvent(m_autoscrollSource, m_autoscrollEvent);
       update();
     }
   }
@@ -811,7 +817,7 @@ CatalogueItem::CatalogueItem(amuse::SoundMacro::CmdOp op, const QString& name, c
 CatalogueItem::CatalogueItem(const CatalogueItem& other, QWidget* parent) : QWidget(parent), m_op(other.getCmdOp()) {
   QHBoxLayout* layout = new QHBoxLayout;
   QHBoxLayout* oldLayout = static_cast<QHBoxLayout*>(other.layout());
-  m_iconLab.setPixmap(*static_cast<QLabel*>(oldLayout->itemAt(0)->widget())->pixmap());
+  m_iconLab.setPixmap(static_cast<QLabel*>(oldLayout->itemAt(0)->widget())->pixmap(Qt::ReturnByValue));
   layout->addWidget(&m_iconLab);
   m_label.setText(static_cast<QLabel*>(oldLayout->itemAt(1)->widget())->text());
   layout->addWidget(&m_label);
diff --git a/Editor/SoundMacroEditor.hpp b/Editor/SoundMacroEditor.hpp
index 49415ef..7006e34 100644
--- a/Editor/SoundMacroEditor.hpp
+++ b/Editor/SoundMacroEditor.hpp
@@ -115,7 +115,7 @@ class SoundMacroListing : public QWidget {
   int m_autoscrollTimer = -1;
   int m_autoscrollDelta = 0;
   QWidget* m_autoscrollSource = nullptr;
-  QMouseEvent m_autoscrollEvent = {{}, {}, {}, {}, {}};
+  QMouseEvent* m_autoscrollEvent = nullptr;
   void startAutoscroll(QWidget* source, QMouseEvent* event, int delta);
   void stopAutoscroll();
   bool beginDrag(CommandWidget* widget);
diff --git a/Editor/StudioSetupWidget.cpp b/Editor/StudioSetupWidget.cpp
index 6640bfa..d616e65 100644
--- a/Editor/StudioSetupWidget.cpp
+++ b/Editor/StudioSetupWidget.cpp
@@ -496,7 +496,10 @@ void EffectListing::startAutoscroll(QWidget* source, QMouseEvent* event, int del
     m_autoscrollTimer = startTimer(50);
   m_autoscrollDelta = delta;
   m_autoscrollSource = source;
-  m_autoscrollEvent = *event;
+  if (m_autoscrollEvent != nullptr) {
+    delete m_autoscrollEvent;
+  }
+  m_autoscrollEvent = event->clone();
 }
 
 void EffectListing::stopAutoscroll() {
@@ -505,6 +508,9 @@ void EffectListing::stopAutoscroll() {
     m_autoscrollTimer = -1;
   }
   m_autoscrollDelta = 0;
+  if (m_autoscrollEvent != nullptr) {
+    delete m_autoscrollEvent;
+  }
   m_autoscrollSource = nullptr;
 }
 
@@ -516,7 +522,7 @@ void EffectListing::timerEvent(QTimerEvent* event) {
     int valueDelta = bar->value() - oldValue;
     if (valueDelta != 0) {
       if (m_autoscrollSource)
-        QApplication::sendEvent(m_autoscrollSource, &m_autoscrollEvent);
+        QApplication::sendEvent(m_autoscrollSource, m_autoscrollEvent);
       update();
     }
   }
@@ -740,7 +746,7 @@ EffectCatalogueItem::EffectCatalogueItem(const EffectCatalogueItem& other, QWidg
 : QWidget(parent), m_type(other.getType()) {
   QHBoxLayout* layout = new QHBoxLayout;
   QHBoxLayout* oldLayout = static_cast<QHBoxLayout*>(other.layout());
-  m_iconLab.setPixmap(*static_cast<QLabel*>(oldLayout->itemAt(0)->widget())->pixmap());
+  m_iconLab.setPixmap(static_cast<QLabel*>(oldLayout->itemAt(0)->widget())->pixmap(Qt::ReturnByValue));
   layout->addWidget(&m_iconLab);
   m_label.setText(static_cast<QLabel*>(oldLayout->itemAt(1)->widget())->text());
   layout->addWidget(&m_label);
diff --git a/Editor/StudioSetupWidget.hpp b/Editor/StudioSetupWidget.hpp
index 758a0c4..fceaf1a 100644
--- a/Editor/StudioSetupWidget.hpp
+++ b/Editor/StudioSetupWidget.hpp
@@ -126,7 +126,7 @@ class EffectListing : public QWidget {
   int m_autoscrollTimer = -1;
   int m_autoscrollDelta = 0;
   QWidget* m_autoscrollSource = nullptr;
-  QMouseEvent m_autoscrollEvent = {{}, {}, {}, {}, {}};
+  QMouseEvent* m_autoscrollEvent = nullptr;
   void startAutoscroll(QWidget* source, QMouseEvent* event, int delta);
   void stopAutoscroll();
   bool beginDrag(EffectWidget* widget);
diff --git a/Editor/main.cpp b/Editor/main.cpp
index b111a9e..1e6da72 100644
--- a/Editor/main.cpp
+++ b/Editor/main.cpp
@@ -56,7 +56,7 @@ MainWindow* g_MainWindow = nullptr;
 
 int main(int argc, char* argv[]) {
   QApplication::setAttribute(Qt::AA_Use96Dpi);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
   QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
   QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif
diff --git a/Editor/platforms/freedesktop/CMakeLists.txt b/Editor/platforms/freedesktop/CMakeLists.txt
index 5bb5674..0e3983f 100644
--- a/Editor/platforms/freedesktop/CMakeLists.txt
+++ b/Editor/platforms/freedesktop/CMakeLists.txt
@@ -1,6 +1,6 @@
-include_directories(${LIBPNG_INCLUDE_DIR})
 add_executable(amuse-mkqticon mkqticon.c)
-target_link_libraries(amuse-mkqticon ${PNG_LIB} ${ZLIB_LIBRARIES})
+target_link_libraries(amuse-mkqticon ${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
+target_include_directories(amuse-mkqticon PRIVATE ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 
 macro(declare_qticon_target)
 add_custom_command(OUTPUT ${amuse_BINARY_DIR}/Editor/platforms/freedesktop/mainicon_qt.bin
diff --git a/Editor/resources/lang_de.ts b/Editor/resources/lang_de.ts
index 2e3087c..5f877fc 100644
--- a/Editor/resources/lang_de.ts
+++ b/Editor/resources/lang_de.ts
@@ -676,344 +676,344 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="63"/>
+        <location filename="../MainWindow.cpp" line="65"/>
         <source>Go Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="68"/>
+        <location filename="../MainWindow.cpp" line="70"/>
         <source>Go Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="116"/>
+        <location filename="../MainWindow.cpp" line="118"/>
         <source>Clear Recent Projects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="244"/>
+        <location filename="../MainWindow.cpp" line="246"/>
         <source>Amuse[*]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="251"/>
+        <location filename="../MainWindow.cpp" line="253"/>
         <source>%1/%2/%3[*] - Amuse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="258"/>
+        <location filename="../MainWindow.cpp" line="260"/>
         <source>%1[*] - Amuse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="282"/>
-        <location filename="../MainWindow.cpp" line="758"/>
+        <location filename="../MainWindow.cpp" line="284"/>
+        <location filename="../MainWindow.cpp" line="761"/>
         <source>The directory at &apos;%1&apos; must not be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="283"/>
-        <location filename="../MainWindow.cpp" line="759"/>
+        <location filename="../MainWindow.cpp" line="285"/>
+        <location filename="../MainWindow.cpp" line="762"/>
         <source>Directory empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="286"/>
+        <location filename="../MainWindow.cpp" line="288"/>
         <source>The directory at &apos;%1&apos; must exist for the Amuse editor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="287"/>
+        <location filename="../MainWindow.cpp" line="289"/>
         <source>Directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="290"/>
+        <location filename="../MainWindow.cpp" line="292"/>
         <source>__amuse_test__</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="294"/>
+        <location filename="../MainWindow.cpp" line="296"/>
         <source>The directory at &apos;%1&apos; must be writable for the Amuse editor: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="297"/>
+        <location filename="../MainWindow.cpp" line="299"/>
         <source>Unable to write to directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="369"/>
+        <location filename="../MainWindow.cpp" line="371"/>
         <source>No Audio Devices Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="381"/>
+        <location filename="../MainWindow.cpp" line="383"/>
         <source>Virtual MIDI-In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="399"/>
+        <location filename="../MainWindow.cpp" line="401"/>
         <source>No MIDI Devices Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="458"/>
+        <location filename="../MainWindow.cpp" line="460"/>
         <source>SUSTAIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="711"/>
-        <location filename="../MainWindow.cpp" line="852"/>
+        <location filename="../MainWindow.cpp" line="714"/>
+        <location filename="../MainWindow.cpp" line="855"/>
         <source>Unsaved Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="711"/>
+        <location filename="../MainWindow.cpp" line="714"/>
         <source>Save Changes in %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="736"/>
+        <location filename="../MainWindow.cpp" line="739"/>
         <source>New Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="762"/>
+        <location filename="../MainWindow.cpp" line="765"/>
         <source>The directory at &apos;%1&apos; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="763"/>
+        <location filename="../MainWindow.cpp" line="766"/>
         <source>Bad Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="777"/>
+        <location filename="../MainWindow.cpp" line="780"/>
         <source>Opening</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="777"/>
-        <location filename="../MainWindow.cpp" line="880"/>
-        <location filename="../MainWindow.cpp" line="961"/>
-        <location filename="../MainWindow.cpp" line="998"/>
-        <location filename="../MainWindow.cpp" line="1043"/>
+        <location filename="../MainWindow.cpp" line="780"/>
+        <location filename="../MainWindow.cpp" line="883"/>
+        <location filename="../MainWindow.cpp" line="964"/>
+        <location filename="../MainWindow.cpp" line="1001"/>
+        <location filename="../MainWindow.cpp" line="1046"/>
         <source>Scanning Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="787"/>
+        <location filename="../MainWindow.cpp" line="790"/>
         <source>Opening %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="802"/>
+        <location filename="../MainWindow.cpp" line="805"/>
         <source>Open Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="852"/>
+        <location filename="../MainWindow.cpp" line="855"/>
         <source>Discard Changes in %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="880"/>
+        <location filename="../MainWindow.cpp" line="883"/>
         <source>Reloading Samples</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="891"/>
+        <location filename="../MainWindow.cpp" line="894"/>
         <source>Scanning %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="900"/>
+        <location filename="../MainWindow.cpp" line="903"/>
         <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="912"/>
+        <location filename="../MainWindow.cpp" line="915"/>
         <source>The file at &apos;%1&apos; could not be interpreted as a MusyX container.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="913"/>
+        <location filename="../MainWindow.cpp" line="916"/>
         <source>Unsupported MusyX Container</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="918"/>
+        <location filename="../MainWindow.cpp" line="921"/>
         <source>Sample Import Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="919"/>
+        <location filename="../MainWindow.cpp" line="922"/>
         <source>Amuse can import samples as WAV files for ease of editing, import original compressed data for lossless repacking, or both. Exporting the project will prefer whichever version was modified most recently.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="923"/>
+        <location filename="../MainWindow.cpp" line="926"/>
         <source>Import Compressed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="923"/>
+        <location filename="../MainWindow.cpp" line="926"/>
         <source>Import WAVs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="923"/>
+        <location filename="../MainWindow.cpp" line="926"/>
         <source>Import Both</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="937"/>
+        <location filename="../MainWindow.cpp" line="940"/>
         <source>Raw Import Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="938"/>
+        <location filename="../MainWindow.cpp" line="941"/>
         <source>Would you like to scan for all MusyX group files in this directory?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="946"/>
+        <location filename="../MainWindow.cpp" line="949"/>
         <source>Project Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="946"/>
+        <location filename="../MainWindow.cpp" line="949"/>
         <source>What should this project be named?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="961"/>
-        <location filename="../MainWindow.cpp" line="998"/>
+        <location filename="../MainWindow.cpp" line="964"/>
+        <location filename="../MainWindow.cpp" line="1001"/>
         <source>Importing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="969"/>
-        <location filename="../MainWindow.cpp" line="1004"/>
+        <location filename="../MainWindow.cpp" line="972"/>
+        <location filename="../MainWindow.cpp" line="1007"/>
         <source>Importing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1019"/>
+        <location filename="../MainWindow.cpp" line="1022"/>
         <source>Import Songs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1043"/>
+        <location filename="../MainWindow.cpp" line="1046"/>
         <source>Exporting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1049"/>
+        <location filename="../MainWindow.cpp" line="1052"/>
         <source>Exporting %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1064"/>
-        <location filename="../MainWindow.cpp" line="1080"/>
+        <location filename="../MainWindow.cpp" line="1067"/>
+        <location filename="../MainWindow.cpp" line="1083"/>
         <source>Import C Headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1065"/>
+        <location filename="../MainWindow.cpp" line="1068"/>
         <source>&lt;p&gt;Importing names from C headers depends on up-to-date, consistent names relative to the sound group data.&lt;/p&gt;&lt;p&gt;Headers are imported on a per-subproject basis from a single directory. Headers must be named with the form &lt;code&gt;&amp;lt;subproject&amp;gt;.h&lt;/code&gt;.&lt;/p&gt;&lt;p&gt;Group, Song and SFX definitions are matched according to the following forms:&lt;pre&gt;#define GRP&amp;lt;name&amp;gt; &amp;lt;id&amp;gt;
 #define SNG&amp;lt;name&amp;gt; &amp;lt;id&amp;gt;
 #define SFX&amp;lt;name&gt; &amp;lt;id&amp;gt;&lt;/pre&gt;&lt;/p&gt;&lt;p&gt;&lt;strong&gt;This operation cannot be undone! It is recommended to make a backup of the project directory before proceeding.&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;Continue?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1103"/>
+        <location filename="../MainWindow.cpp" line="1106"/>
         <source>Export C Headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1309"/>
+        <location filename="../MainWindow.cpp" line="1312"/>
         <source>New Subproject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1309"/>
+        <location filename="../MainWindow.cpp" line="1312"/>
         <source>What should this subproject be named?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1329"/>
+        <location filename="../MainWindow.cpp" line="1332"/>
         <source>New SFX Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1329"/>
+        <location filename="../MainWindow.cpp" line="1332"/>
         <source>What should the new SFX group in %1 be named?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1353"/>
+        <location filename="../MainWindow.cpp" line="1356"/>
         <source>New Song Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1353"/>
+        <location filename="../MainWindow.cpp" line="1356"/>
         <source>What should the new Song group in %1 be named?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1403"/>
+        <location filename="../MainWindow.cpp" line="1406"/>
         <source>New ADSR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1403"/>
+        <location filename="../MainWindow.cpp" line="1406"/>
         <source>What should the new ADSR in %1 be named?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1426"/>
+        <location filename="../MainWindow.cpp" line="1429"/>
         <source>New Curve</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1426"/>
+        <location filename="../MainWindow.cpp" line="1429"/>
         <source>What should the new Curve in %1 be named?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1449"/>
+        <location filename="../MainWindow.cpp" line="1452"/>
         <source>New Keymap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1449"/>
+        <location filename="../MainWindow.cpp" line="1452"/>
         <source>What should the new Keymap in %1 be named?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1472"/>
+        <location filename="../MainWindow.cpp" line="1475"/>
         <source>New Layers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1472"/>
+        <location filename="../MainWindow.cpp" line="1475"/>
         <source>What should the new Layers in %1 be named?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1566"/>
+        <location filename="../MainWindow.cpp" line="1569"/>
         <source>About Amuse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1805"/>
+        <location filename="../MainWindow.cpp" line="1808"/>
         <source>Export Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1805"/>
+        <location filename="../MainWindow.cpp" line="1808"/>
         <source>%1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1231,341 +1231,341 @@
 <context>
     <name>ProjectModel</name>
     <message>
-        <location filename="../ProjectModel.cpp" line="711"/>
-        <location filename="../ProjectModel.cpp" line="721"/>
-        <location filename="../ProjectModel.cpp" line="730"/>
-        <location filename="../ProjectModel.cpp" line="740"/>
-        <location filename="../ProjectModel.cpp" line="748"/>
-        <location filename="../ProjectModel.cpp" line="786"/>
+        <location filename="../ProjectModel.cpp" line="715"/>
+        <location filename="../ProjectModel.cpp" line="725"/>
+        <location filename="../ProjectModel.cpp" line="734"/>
+        <location filename="../ProjectModel.cpp" line="744"/>
+        <location filename="../ProjectModel.cpp" line="752"/>
+        <location filename="../ProjectModel.cpp" line="790"/>
         <source>Export Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="711"/>
-        <location filename="../ProjectModel.cpp" line="761"/>
-        <location filename="../ProjectModel.cpp" line="786"/>
+        <location filename="../ProjectModel.cpp" line="715"/>
+        <location filename="../ProjectModel.cpp" line="765"/>
+        <location filename="../ProjectModel.cpp" line="790"/>
         <source>Unable to find group %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="721"/>
+        <location filename="../ProjectModel.cpp" line="725"/>
         <source>Unable to export %1.proj</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="730"/>
+        <location filename="../ProjectModel.cpp" line="734"/>
         <source>Unable to export %1.pool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="740"/>
+        <location filename="../ProjectModel.cpp" line="744"/>
         <source>Unable to export %1.sdir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="748"/>
+        <location filename="../ProjectModel.cpp" line="752"/>
         <source>Unable to export %1.samp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="761"/>
+        <location filename="../ProjectModel.cpp" line="765"/>
         <source>Import Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="771"/>
+        <location filename="../ProjectModel.cpp" line="775"/>
         <source>Export Header Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="771"/>
+        <location filename="../ProjectModel.cpp" line="775"/>
         <source>Unable to open %1 for reading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="792"/>
+        <location filename="../ProjectModel.cpp" line="796"/>
         <source>File Exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="792"/>
+        <location filename="../ProjectModel.cpp" line="796"/>
         <source>%1 already exists. Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="841"/>
+        <location filename="../ProjectModel.cpp" line="845"/>
         <source>Sound Macros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="843"/>
+        <location filename="../ProjectModel.cpp" line="847"/>
         <source>ADSRs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="844"/>
+        <location filename="../ProjectModel.cpp" line="848"/>
         <source>Curves</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="845"/>
+        <location filename="../ProjectModel.cpp" line="849"/>
         <source>Keymaps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="846"/>
+        <location filename="../ProjectModel.cpp" line="850"/>
         <source>Layers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="847"/>
+        <location filename="../ProjectModel.cpp" line="851"/>
         <source>Samples</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1099"/>
+        <location filename="../ProjectModel.cpp" line="1103"/>
         <source>Naming Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1099"/>
+        <location filename="../ProjectModel.cpp" line="1103"/>
         <source>%1 already exists in this context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1103"/>
+        <location filename="../ProjectModel.cpp" line="1107"/>
         <source>Rename %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1222"/>
+        <location filename="../ProjectModel.cpp" line="1226"/>
         <source>Subproject Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1223"/>
+        <location filename="../ProjectModel.cpp" line="1227"/>
         <source>The subproject %1 is already defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1231"/>
-        <location filename="../ProjectModel.cpp" line="1786"/>
-        <location filename="../ProjectModel.cpp" line="1919"/>
+        <location filename="../ProjectModel.cpp" line="1235"/>
+        <location filename="../ProjectModel.cpp" line="1790"/>
+        <location filename="../ProjectModel.cpp" line="1923"/>
         <source>Add Subproject %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1313"/>
+        <location filename="../ProjectModel.cpp" line="1317"/>
         <source>Sound Group Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1313"/>
-        <location filename="../ProjectModel.cpp" line="1335"/>
+        <location filename="../ProjectModel.cpp" line="1317"/>
+        <location filename="../ProjectModel.cpp" line="1339"/>
         <source>The group %1 is already defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1318"/>
-        <location filename="../ProjectModel.cpp" line="1635"/>
-        <location filename="../ProjectModel.cpp" line="1926"/>
+        <location filename="../ProjectModel.cpp" line="1322"/>
+        <location filename="../ProjectModel.cpp" line="1639"/>
+        <location filename="../ProjectModel.cpp" line="1930"/>
         <source>Add Sound Group %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1335"/>
+        <location filename="../ProjectModel.cpp" line="1339"/>
         <source>Song Group Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1340"/>
-        <location filename="../ProjectModel.cpp" line="1627"/>
-        <location filename="../ProjectModel.cpp" line="1933"/>
+        <location filename="../ProjectModel.cpp" line="1344"/>
+        <location filename="../ProjectModel.cpp" line="1631"/>
+        <location filename="../ProjectModel.cpp" line="1937"/>
         <source>Add Song Group %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1436"/>
+        <location filename="../ProjectModel.cpp" line="1440"/>
         <source>Sound Macro Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1436"/>
+        <location filename="../ProjectModel.cpp" line="1440"/>
         <source>The macro %1 is already defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1447"/>
-        <location filename="../ProjectModel.cpp" line="1942"/>
+        <location filename="../ProjectModel.cpp" line="1451"/>
+        <location filename="../ProjectModel.cpp" line="1946"/>
         <source>Add Sound Macro %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1464"/>
+        <location filename="../ProjectModel.cpp" line="1468"/>
         <source>ADSR Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1464"/>
+        <location filename="../ProjectModel.cpp" line="1468"/>
         <source>The ADSR %1 is already defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1471"/>
-        <location filename="../ProjectModel.cpp" line="1660"/>
-        <location filename="../ProjectModel.cpp" line="1949"/>
+        <location filename="../ProjectModel.cpp" line="1475"/>
+        <location filename="../ProjectModel.cpp" line="1664"/>
+        <location filename="../ProjectModel.cpp" line="1953"/>
         <source>Add ADSR %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1488"/>
+        <location filename="../ProjectModel.cpp" line="1492"/>
         <source>Curve Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1488"/>
+        <location filename="../ProjectModel.cpp" line="1492"/>
         <source>The Curve %1 is already defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1495"/>
-        <location filename="../ProjectModel.cpp" line="1668"/>
-        <location filename="../ProjectModel.cpp" line="1956"/>
+        <location filename="../ProjectModel.cpp" line="1499"/>
+        <location filename="../ProjectModel.cpp" line="1672"/>
+        <location filename="../ProjectModel.cpp" line="1960"/>
         <source>Add Curve %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1512"/>
+        <location filename="../ProjectModel.cpp" line="1516"/>
         <source>Keymap Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1512"/>
+        <location filename="../ProjectModel.cpp" line="1516"/>
         <source>The Keymap %1 is already defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1518"/>
-        <location filename="../ProjectModel.cpp" line="1683"/>
-        <location filename="../ProjectModel.cpp" line="1963"/>
+        <location filename="../ProjectModel.cpp" line="1522"/>
+        <location filename="../ProjectModel.cpp" line="1687"/>
+        <location filename="../ProjectModel.cpp" line="1967"/>
         <source>Add Keymap %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1535"/>
+        <location filename="../ProjectModel.cpp" line="1539"/>
         <source>Layers Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1535"/>
+        <location filename="../ProjectModel.cpp" line="1539"/>
         <source>Layers %1 is already defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1541"/>
-        <location filename="../ProjectModel.cpp" line="1699"/>
-        <location filename="../ProjectModel.cpp" line="1970"/>
+        <location filename="../ProjectModel.cpp" line="1545"/>
+        <location filename="../ProjectModel.cpp" line="1703"/>
+        <location filename="../ProjectModel.cpp" line="1974"/>
         <source>Add Layers %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1547"/>
-        <location filename="../ProjectModel.cpp" line="1556"/>
+        <location filename="../ProjectModel.cpp" line="1551"/>
+        <location filename="../ProjectModel.cpp" line="1560"/>
         <source>-copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1645"/>
+        <location filename="../ProjectModel.cpp" line="1649"/>
         <source>Add SoundMacro %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1841"/>
+        <location filename="../ProjectModel.cpp" line="1845"/>
         <source>Cut SongGroup %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1844"/>
+        <location filename="../ProjectModel.cpp" line="1848"/>
         <source>Cut SFXGroup %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1847"/>
+        <location filename="../ProjectModel.cpp" line="1851"/>
         <source>Cut SoundMacro %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1850"/>
+        <location filename="../ProjectModel.cpp" line="1854"/>
         <source>Cut ADSR %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1853"/>
+        <location filename="../ProjectModel.cpp" line="1857"/>
         <source>Cut Curve %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1856"/>
+        <location filename="../ProjectModel.cpp" line="1860"/>
         <source>Cut Keymap %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1859"/>
+        <location filename="../ProjectModel.cpp" line="1863"/>
         <source>Cut Layers %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1991"/>
+        <location filename="../ProjectModel.cpp" line="1995"/>
         <source>Delete Subproject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1992"/>
+        <location filename="../ProjectModel.cpp" line="1996"/>
         <source>&lt;p&gt;The subproject %1 will be permanently deleted from the project. Sample files will be permanently removed from the file system.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;This action cannot be undone!&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;Continue?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2006"/>
+        <location filename="../ProjectModel.cpp" line="2010"/>
         <source>Delete SongGroup %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2009"/>
+        <location filename="../ProjectModel.cpp" line="2013"/>
         <source>Delete SFXGroup %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2012"/>
+        <location filename="../ProjectModel.cpp" line="2016"/>
         <source>Delete SoundMacro %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2015"/>
+        <location filename="../ProjectModel.cpp" line="2019"/>
         <source>Delete ADSR %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2018"/>
+        <location filename="../ProjectModel.cpp" line="2022"/>
         <source>Delete Curve %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2021"/>
+        <location filename="../ProjectModel.cpp" line="2025"/>
         <source>Delete Keymap %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2024"/>
+        <location filename="../ProjectModel.cpp" line="2028"/>
         <source>Delete Layers %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2028"/>
+        <location filename="../ProjectModel.cpp" line="2032"/>
         <source>Delete Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2029"/>
+        <location filename="../ProjectModel.cpp" line="2033"/>
         <source>&lt;p&gt;The sample %1 will be permanently deleted from the file system. &lt;p&gt;&lt;strong&gt;This action cannot be undone!&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;Continue?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1573,7 +1573,7 @@
 <context>
     <name>QDialogButtonBox</name>
     <message>
-        <location filename="../MainWindow.cpp" line="1828"/>
+        <location filename="../MainWindow.cpp" line="1831"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1581,12 +1581,12 @@
 <context>
     <name>QMessageBox</name>
     <message>
-        <location filename="../MainWindow.cpp" line="1552"/>
+        <location filename="../MainWindow.cpp" line="1555"/>
         <source>&lt;h3&gt;About Amuse&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1554"/>
+        <location filename="../MainWindow.cpp" line="1557"/>
         <source>&lt;p&gt;Amuse is an alternate editor and runtime library for MusyX sound groups.&lt;/p&gt;&lt;p&gt;MusyX originally served as a widely-deployed audio system for developing games on the Nintendo 64, GameCube, and GameBoy Advance.&lt;/p&gt;&lt;p&gt;Amuse is available under the MIT license.&lt;br&gt;Please see &lt;a href=&quot;https://gitlab.axiodl.com/AxioDL/amuse/blob/master/LICENSE&quot;&gt;https://gitlab.axiodl.com/AxioDL/amuse/blob/master/LICENSE&lt;/a&gt; for futher information.&lt;/p&gt;&lt;p&gt;Copyright (C) 2015-2018 Antidote / Jackoalan.&lt;/p&gt;&lt;p&gt;MusyX is a trademark of Factor 5, LLC.&lt;/p&gt;&lt;p&gt;Nintendo 64, GameCube, and GameBoy Advance are trademarks of Nintendo Co., Ltd.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1893,72 +1893,72 @@
 <context>
     <name>SoundMacroCatalogue</name>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="826"/>
+        <location filename="../SoundMacroEditor.cpp" line="832"/>
         <source>Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="826"/>
+        <location filename="../SoundMacroEditor.cpp" line="832"/>
         <source>Pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="827"/>
+        <location filename="../SoundMacroEditor.cpp" line="833"/>
         <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="827"/>
+        <location filename="../SoundMacroEditor.cpp" line="833"/>
         <source>Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="828"/>
+        <location filename="../SoundMacroEditor.cpp" line="834"/>
         <source>Special</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="828"/>
+        <location filename="../SoundMacroEditor.cpp" line="834"/>
         <source>Structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="829"/>
+        <location filename="../SoundMacroEditor.cpp" line="835"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="832"/>
+        <location filename="../SoundMacroEditor.cpp" line="838"/>
         <source>Commands to control the voice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="833"/>
+        <location filename="../SoundMacroEditor.cpp" line="839"/>
         <source>Commands to control the voice&apos;s pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="834"/>
+        <location filename="../SoundMacroEditor.cpp" line="840"/>
         <source>Commands to control the voice&apos;s sample playback</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="835"/>
+        <location filename="../SoundMacroEditor.cpp" line="841"/>
         <source>Commands to setup the voice&apos;s mixing process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="836"/>
+        <location filename="../SoundMacroEditor.cpp" line="842"/>
         <source>Miscellaneous commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="837"/>
+        <location filename="../SoundMacroEditor.cpp" line="843"/>
         <source>Commands to control macro branching</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="838"/>
+        <location filename="../SoundMacroEditor.cpp" line="844"/>
         <source>Commands to control the voice&apos;s volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1974,17 +1974,17 @@
 <context>
     <name>SoundMacroListing</name>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="569"/>
+        <location filename="../SoundMacroEditor.cpp" line="575"/>
         <source>Reorder %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="681"/>
+        <location filename="../SoundMacroEditor.cpp" line="687"/>
         <source>Insert %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="726"/>
+        <location filename="../SoundMacroEditor.cpp" line="732"/>
         <source>Delete %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2015,17 +2015,17 @@
 <context>
     <name>StudioSetupWidget</name>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="927"/>
+        <location filename="../StudioSetupWidget.cpp" line="933"/>
         <source>Studio Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="944"/>
+        <location filename="../StudioSetupWidget.cpp" line="950"/>
         <source>Aux A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="945"/>
+        <location filename="../StudioSetupWidget.cpp" line="951"/>
         <source>Aux B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2041,52 +2041,52 @@
 <context>
     <name>TreeDelegate</name>
     <message>
-        <location filename="../MainWindow.cpp" line="1133"/>
+        <location filename="../MainWindow.cpp" line="1136"/>
         <source>Export GameCube Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1141"/>
+        <location filename="../MainWindow.cpp" line="1144"/>
         <source>Find Usages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1149"/>
+        <location filename="../MainWindow.cpp" line="1152"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1157"/>
+        <location filename="../MainWindow.cpp" line="1160"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1165"/>
+        <location filename="../MainWindow.cpp" line="1168"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1173"/>
+        <location filename="../MainWindow.cpp" line="1176"/>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1178"/>
+        <location filename="../MainWindow.cpp" line="1181"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1186"/>
+        <location filename="../MainWindow.cpp" line="1189"/>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1215"/>
+        <location filename="../MainWindow.cpp" line="1218"/>
         <source>Exporting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1215"/>
+        <location filename="../MainWindow.cpp" line="1218"/>
         <source>Exporting %1</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/include/amuse/Voice.hpp b/include/amuse/Voice.hpp
index f3b035e..13211fc 100644
--- a/include/amuse/Voice.hpp
+++ b/include/amuse/Voice.hpp
@@ -15,6 +15,13 @@
 #include "amuse/Studio.hpp"
 
 namespace amuse {
+constexpr float convertMusyXPanToAmusePan(uint32_t pan) {
+  //  Amuse expects pan values to be between [-1,1] while MusyX expects pan to be between [0,127], we need to make sure
+  //  to map the values properly, we do this by subtracting the center value and then dividing, thus forcing [0, 127] into
+  //  [-1,1], we must also make sure clamp the result so we don't over or underflow.
+  return std::clamp(static_cast<float>(pan - 64) / 63.f, -1.f, 1.f);
+}
+
 class IBackendVoice;
 struct Keymap;
 struct LayerMapping;
diff --git a/lib/AudioGroupProject.cpp b/lib/AudioGroupProject.cpp
index 958b8a3..3cb2116 100644
--- a/lib/AudioGroupProject.cpp
+++ b/lib/AudioGroupProject.cpp
@@ -57,8 +57,11 @@ static void ReadRangedObjectIds(NameDB* db, athena::io::IStreamReader& r, NameDB
 
 template <athena::Endian DNAE, class T>
 static void WriteRangedObjectIds(athena::io::IStreamWriter& w, const T& list) {
-  if (list.cbegin() == list.cend())
+  if (list.cbegin() == list.cend()) {
+    uint16_t term = 0xffff;
+    athena::io::Write<athena::io::PropType::None>::Do<decltype(term), DNAE>({}, term, w);
     return;
+  }
   bool inRange = false;
   uint16_t lastId = list.cbegin()->first.id & 0x3fff;
   for (auto it = list.cbegin() + 1; it != list.cend(); ++it) {
diff --git a/lib/Emitter.cpp b/lib/Emitter.cpp
index a07fff8..34292fa 100644
--- a/lib/Emitter.cpp
+++ b/lib/Emitter.cpp
@@ -105,8 +105,16 @@ void Emitter::_update() {
 
 void Emitter::setVectors(const float* pos, const float* dir) {
   for (size_t i = 0; i < m_pos.size(); ++i) {
-    m_pos[i] = pos[i];
-    m_dir[i] = dir[i];
+    if (!std::isnan(pos[i])) {
+      m_pos[i] = pos[i];
+    } else {
+      m_pos[i] = 0.f;
+    }
+    if (!std::isnan(dir[i])) {
+      m_dir[i] = dir[i];
+    } else {
+      m_dir[i] = 0.f;
+    }
   }
   m_dirty = true;
 }
diff --git a/lib/Listener.cpp b/lib/Listener.cpp
index c948837..7ecb8b2 100644
--- a/lib/Listener.cpp
+++ b/lib/Listener.cpp
@@ -12,10 +12,26 @@ static constexpr Vector3f Cross(const Vector3f& a, const Vector3f& b) {
 
 void Listener::setVectors(const float* pos, const float* dir, const float* heading, const float* up) {
   for (int i = 0; i < 3; ++i) {
-    m_pos[i] = pos[i];
-    m_dir[i] = dir[i];
-    m_heading[i] = heading[i];
-    m_up[i] = up[i];
+    if (!std::isnan(pos[i])) {
+      m_pos[i] = pos[i];
+    } else {
+      m_pos[i] = 0.f;
+    }
+    if (!std::isnan(dir[i])) {
+      m_dir[i] = dir[i];
+    } else {
+      m_dir[i] = 0.f;
+    }
+    if (!std::isnan(heading[i])) {
+      m_heading[i] = heading[i];
+    } else {
+      m_heading[i] = 0.f;
+    }
+    if (std::isnan(up[i])) {
+      m_up[i] = up[i];
+    } else {
+      m_heading[i] = 0.f;
+    }
   }
 
   m_heading = Normalize(m_heading);