diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 122150979e..57709282e1 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -287,10 +287,20 @@ jobs:
       - name:                       Checkout code
         uses:                       actions/checkout@v7
         with:
-          # only Android needs the oboe submodule, so don't fetch it for other builds
-          submodules:               ${{ matrix.config.target_os == 'android' }}
+          submodules:               false
           fetch-depth:              ${{ matrix.config.checkout_fetch_depth || '1' }}
 
+      - name:                       Initialize Submodules
+        shell: bash
+        run: |
+          # clone mverb for all platforms
+          git submodule update --init libs/mverb
+
+          # clone oboe only for android builds
+          if [[ "${{ matrix.config.target_os }}" == "android" ]]; then
+            git submodule update --init libs/oboe
+          fi
+
       - name:                       Cache Mac dependencies
         if:                         matrix.config.target_os == 'macos'
         uses:                       actions/cache@v6
diff --git a/.gitmodules b/.gitmodules
index 819ad73047..f61a791095 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "libs/oboe"]
 	path = libs/oboe
 	url = ../../google/oboe.git
+[submodule "libs/mverb"]
+	path = libs/mverb
+	url = https://github.com/martineastwood/mverb.git
diff --git a/COMPILING.md b/COMPILING.md
index c6ac38b098..3314596e6c 100644
--- a/COMPILING.md
+++ b/COMPILING.md
@@ -17,7 +17,19 @@ First of all, you need to get the Jamulus source code. You can either download i
 - For .tar.gz [use this link](https://github.com/jamulussoftware/jamulus/archive/latest.tar.gz) to download the latest release
 - For .zip [use this link](https://github.com/jamulussoftware/jamulus/archive/latest.zip)
 - If you use `git`, [set it up](https://docs.github.com/en/get-started/quickstart/set-up-git) – preferably with SSH if you want to contribute.
-Then run `git clone git@github.com:jamulussoftware/jamulus` in Terminal to get the bleeding edge version directly from GitHub.
+Then run
+```
+git clone git@github.com:jamulussoftware/jamulus
+```
+in Terminal to get the bleeding edge version directly from GitHub.
+- The reverberation is done by MVerb and you need to pull it in as a submodule.
+```
+# Change into the jamulus/ directory
+cd jamulus
+# Initialize submodule MVerb
+git submodule update --init libs/mverb
+```
+
 
 ## Linux
 
diff --git a/Jamulus.pro b/Jamulus.pro
index fa956ef6d5..c77568fb58 100644
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -90,6 +90,8 @@ DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
 DEFINES += QT_NO_DEPRECATED_WARNINGS
 
 win32 {
+    # fixes error C7525: inline variables require at least '/std:c++17'
+    CONFIG += c++17
     DEFINES -= UNICODE # fixes issue with ASIO SDK (asiolist.cpp is not unicode compatible)
     DEFINES += NOMINMAX # solves a compiler error in qdatetime.h (Qt5)
     RC_FILE = src/res/win-mainicon.rc
@@ -403,7 +405,8 @@ HEADERS += src/plugins/audioreverb.h \
     src/recorder/jamrecorder.h \
     src/recorder/creaperproject.h \
     src/recorder/cwavestream.h \
-    src/signalhandler.h
+    src/signalhandler.h \
+    libs/mverb/MVerb.h
 
 !contains(CONFIG, "serveronly") {
     HEADERS += src/client.h \
diff --git a/libs/mverb b/libs/mverb
new file mode 160000
index 0000000000..9f9512e9d9
--- /dev/null
+++ b/libs/mverb
@@ -0,0 +1 @@
+Subproject commit 9f9512e9d990fcf265e00fc7c2ee47ad20c8019f
diff --git a/src/client.cpp b/src/client.cpp
index fb9bab5478..cbc71e436b 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1345,7 +1345,7 @@ void CClient::Init()
     Channel.SetAudioStreamProperties ( eAudioCompressionType, iCeltNumCodedBytes, iSndCrdFrameSizeFactor, iNumAudioChannels );
 
     // init reverberation
-    AudioReverb.Init ( eAudioChannelConf, iStereoBlockSizeSam, SYSTEM_SAMPLE_RATE_HZ );
+    AudioReverb.Init ( eAudioChannelConf, iStereoBlockSizeSam );
 
     // init the sound card conversion buffers
     if ( bSndCrdConversionBufferRequired )
diff --git a/src/client.h b/src/client.h
index fb77930723..fe60510814 100644
--- a/src/client.h
+++ b/src/client.h
@@ -189,14 +189,12 @@ class CClient : public QObject
     void SetAudioInFader ( const int iNV ) { iAudioInFader = iNV; }
 
     int  GetReverbLevel() const { return iReverbLevel; }
+    int  GetReverbPreset() const { return AudioReverb.getPreset(); }
     void SetReverbLevel ( const int iNL ) { iReverbLevel = iNL; }
+    void SetReverbPreset ( const int iNP ) { AudioReverb.setPreset ( iNP ); }
 
     bool IsReverbOnLeftChan() const { return bReverbOnLeftChan; }
-    void SetReverbOnLeftChan ( const bool bIL )
-    {
-        bReverbOnLeftChan = bIL;
-        AudioReverb.Clear();
-    }
+    void SetReverbOnLeftChan ( const bool bIL ) { bReverbOnLeftChan = bIL; }
 
     void SetDoAutoSockBufSize ( const bool bValue );
     bool GetDoAutoSockBufSize() const { return Channel.GetDoAutoSockBufSize(); }
diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp
index ad92a0f8e1..8b409f668e 100644
--- a/src/clientsettingsdlg.cpp
+++ b/src/clientsettingsdlg.cpp
@@ -380,6 +380,15 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet
     cbxInputBoost->setWhatsThis ( strInputBoost );
     cbxInputBoost->setAccessibleName ( tr ( "Input Boost combo box" ) );
 
+    // reverb preset
+    QString strReverbPreset = "<b>" + tr ( "Reverb Preset" ) + ":</b> " +
+                              tr ( "Jamulus uses MVerb by Martin Eastwood for reverberation. "
+                                   "MVerb comes with a set of presets you can select here. "
+                                   "Available Presets: Subtle, Stadium, Cupboard, Dark, Halves " );
+    lblInputBoost->setWhatsThis ( strReverbPreset );
+    cbxInputBoost->setWhatsThis ( strReverbPreset );
+    cbxInputBoost->setAccessibleName ( tr ( "Reverb Preset combo box" ) );
+
     // custom directories
     QString strCustomDirectories = "<b>" + tr ( "Custom Directories" ) + ":</b> " +
                                    tr ( "If you need to add additional directories to the Connect dialog Directory drop down, "
@@ -555,6 +564,15 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet
     // factor is 1-based while index is 0-based:
     cbxInputBoost->setCurrentIndex ( pSettings->iInputBoost - 1 );
 
+    // Rever Preset combo box
+    cbxReverbPreset->clear();
+    cbxReverbPreset->addItem ( "Subtle" );
+    cbxReverbPreset->addItem ( "Stadium" );
+    cbxReverbPreset->addItem ( "Cupboard" );
+    cbxReverbPreset->addItem ( "Dark" );
+    cbxReverbPreset->addItem ( "Halves" );
+    cbxReverbPreset->setCurrentIndex ( pClient->GetReverbPreset() );
+
     // init number of mixer rows
     spnMixerRows->setValue ( pSettings->iNumMixerPanelRows );
 
@@ -786,6 +804,11 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet
                        this,
                        &CClientSettingsDlg::OnInputBoostChanged );
 
+    QObject::connect ( cbxReverbPreset,
+                       static_cast<void ( QComboBox::* ) ( int )> ( &QComboBox::activated ),
+                       this,
+                       &CClientSettingsDlg::OnReverbPresetChanged );
+
     // buttons
 #if defined( _WIN32 ) && !defined( WITH_JACK )
     // Driver Setup button is only available for Windows when JACK is not used
@@ -1389,6 +1412,8 @@ void CClientSettingsDlg::OnInputBoostChanged()
     pClient->SetInputBoost ( pSettings->iInputBoost );
 }
 
+void CClientSettingsDlg::OnReverbPresetChanged() { pClient->SetReverbPreset ( cbxReverbPreset->currentIndex() ); }
+
 void CClientSettingsDlg::OnAliasTextChanged ( const QString& strNewName )
 {
     // check length
diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h
index 7844f64117..6564e21ca9 100644
--- a/src/clientsettingsdlg.h
+++ b/src/clientsettingsdlg.h
@@ -109,6 +109,7 @@ public slots:
     void OnCustomDirectoriesChanged ( bool bDelete );
     void OnNewClientLevelEditingFinished() { pSettings->iNewClientFaderLevel = edtNewClientLevel->text().toInt(); }
     void OnInputBoostChanged();
+    void OnReverbPresetChanged();
     void OnSndCrdBufferDelayButtonGroupClicked ( QAbstractButton* button );
     void OnSoundcardActivated ( int iSndDevIdx );
     void OnLInChanActivated ( int iChanIdx );
diff --git a/src/clientsettingsdlgbase.ui b/src/clientsettingsdlgbase.ui
index 842ab9220c..8e15b59077 100644
--- a/src/clientsettingsdlgbase.ui
+++ b/src/clientsettingsdlgbase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>534</width>
-    <height>591</height>
+    <height>652</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -30,7 +30,7 @@
       </sizepolicy>
      </property>
      <property name="currentIndex">
-      <number>3</number>
+      <number>2</number>
      </property>
      <property name="usesScrollButtons">
       <bool>true</bool>
@@ -45,7 +45,7 @@
          <item>
           <spacer name="horizontalSpacer">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -60,10 +60,10 @@
            <item>
             <spacer name="verticalSpacer_8">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeType">
-              <enum>QSizePolicy::Preferred</enum>
+              <enum>QSizePolicy::Policy::Preferred</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -209,7 +209,7 @@
            <item>
             <spacer name="verticalSpacer_7">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -305,7 +305,7 @@
                      </sizepolicy>
                     </property>
                     <property name="alignment">
-                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                     <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
                     </property>
                     <property name="minimum">
                      <number>1</number>
@@ -332,7 +332,7 @@
            <item>
             <spacer name="verticalSpacer_9">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -347,7 +347,7 @@
          <item>
           <spacer name="horizontalSpacer_2">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -399,10 +399,10 @@
            <item>
             <spacer name="verticalSpacer_3">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeType">
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::Policy::Expanding</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -431,7 +431,7 @@
            <item>
             <spacer name="verticalSpacer_5">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -450,10 +450,10 @@
               </sizepolicy>
              </property>
              <property name="frameShape">
-              <enum>QFrame::NoFrame</enum>
+              <enum>QFrame::Shape::NoFrame</enum>
              </property>
              <property name="frameShadow">
-              <enum>QFrame::Plain</enum>
+              <enum>QFrame::Shadow::Plain</enum>
              </property>
              <layout class="QVBoxLayout" name="_2">
               <property name="leftMargin">
@@ -600,10 +600,10 @@
            <item>
             <spacer name="verticalSpacer_6">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeType">
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::Policy::Expanding</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -654,7 +654,7 @@
            <item>
             <spacer name="verticalSpacer_10">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -717,10 +717,10 @@
          <item>
           <spacer name="horizontalSpacer_3">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeType">
-            <enum>QSizePolicy::MinimumExpanding</enum>
+            <enum>QSizePolicy::Policy::MinimumExpanding</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -759,7 +759,7 @@
                    <string>Local</string>
                   </property>
                   <property name="alignment">
-                   <set>Qt::AlignCenter</set>
+                   <set>Qt::AlignmentFlag::AlignCenter</set>
                   </property>
                   <property name="wordWrap">
                    <bool>false</bool>
@@ -772,7 +772,7 @@
                    <string>Server</string>
                   </property>
                   <property name="alignment">
-                   <set>Qt::AlignCenter</set>
+                   <set>Qt::AlignmentFlag::AlignCenter</set>
                   </property>
                   <property name="wordWrap">
                    <bool>false</bool>
@@ -789,7 +789,7 @@
                    <string>Size</string>
                   </property>
                   <property name="alignment">
-                   <set>Qt::AlignCenter</set>
+                   <set>Qt::AlignmentFlag::AlignCenter</set>
                   </property>
                   <property name="wordWrap">
                    <bool>false</bool>
@@ -802,7 +802,7 @@
                    <string>Size</string>
                   </property>
                   <property name="alignment">
-                   <set>Qt::AlignCenter</set>
+                   <set>Qt::AlignmentFlag::AlignCenter</set>
                   </property>
                   <property name="wordWrap">
                    <bool>false</bool>
@@ -816,10 +816,10 @@
                 <item>
                  <spacer>
                   <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
+                   <enum>Qt::Orientation::Horizontal</enum>
                   </property>
                   <property name="sizeType">
-                   <enum>QSizePolicy::Minimum</enum>
+                   <enum>QSizePolicy::Policy::Minimum</enum>
                   </property>
                   <property name="sizeHint" stdset="0">
                    <size>
@@ -841,20 +841,20 @@
                    <number>1</number>
                   </property>
                   <property name="orientation">
-                   <enum>Qt::Vertical</enum>
+                   <enum>Qt::Orientation::Vertical</enum>
                   </property>
                   <property name="tickPosition">
-                   <enum>QSlider::TicksBothSides</enum>
+                   <enum>QSlider::TickPosition::TicksBothSides</enum>
                   </property>
                  </widget>
                 </item>
                 <item>
                  <spacer>
                   <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
+                   <enum>Qt::Orientation::Horizontal</enum>
                   </property>
                   <property name="sizeType">
-                   <enum>QSizePolicy::Minimum</enum>
+                   <enum>QSizePolicy::Policy::Minimum</enum>
                   </property>
                   <property name="sizeHint" stdset="0">
                    <size>
@@ -876,10 +876,10 @@
                    <number>1</number>
                   </property>
                   <property name="orientation">
-                   <enum>Qt::Vertical</enum>
+                   <enum>Qt::Orientation::Vertical</enum>
                   </property>
                   <property name="tickPosition">
-                   <enum>QSlider::TicksBothSides</enum>
+                   <enum>QSlider::TickPosition::TicksBothSides</enum>
                   </property>
                  </widget>
                 </item>
@@ -915,7 +915,7 @@
                 <item row="0" column="4">
                  <spacer name="horizontalSpacer_9">
                   <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
+                   <enum>Qt::Orientation::Horizontal</enum>
                   </property>
                   <property name="sizeHint" stdset="0">
                    <size>
@@ -931,7 +931,7 @@
                    <string>kbps</string>
                   </property>
                   <property name="alignment">
-                   <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                   <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
                   </property>
                  </widget>
                 </item>
@@ -941,7 +941,7 @@
                    <string>val</string>
                   </property>
                   <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
                   </property>
                   <property name="margin">
                    <number>2</number>
@@ -951,7 +951,7 @@
                 <item row="0" column="0">
                  <spacer name="horizontalSpacer_10">
                   <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
+                   <enum>Qt::Orientation::Horizontal</enum>
                   </property>
                   <property name="sizeHint" stdset="0">
                    <size>
@@ -971,10 +971,10 @@
          <item>
           <spacer name="horizontalSpacer_5">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeType">
-            <enum>QSizePolicy::Minimum</enum>
+            <enum>QSizePolicy::Policy::Minimum</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -1000,7 +1000,7 @@
            <item>
             <spacer name="horizontalSpacer_6">
              <property name="orientation">
-              <enum>Qt::Horizontal</enum>
+              <enum>Qt::Orientation::Horizontal</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -1015,10 +1015,10 @@
              <item>
               <spacer name="verticalSpacer_2">
                <property name="orientation">
-                <enum>Qt::Vertical</enum>
+                <enum>Qt::Orientation::Vertical</enum>
                </property>
                <property name="sizeType">
-                <enum>QSizePolicy::MinimumExpanding</enum>
+                <enum>QSizePolicy::Policy::MinimumExpanding</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
@@ -1055,7 +1055,7 @@
              <item>
               <spacer name="verticalSpacer_4">
                <property name="orientation">
-                <enum>Qt::Vertical</enum>
+                <enum>Qt::Orientation::Vertical</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
@@ -1092,7 +1092,7 @@
              <item>
               <spacer name="verticalSpacer_11">
                <property name="orientation">
-                <enum>Qt::Vertical</enum>
+                <enum>Qt::Orientation::Vertical</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
@@ -1115,10 +1115,33 @@
              <item>
               <widget class="QComboBox" name="cbxInputBoost"/>
              </item>
+             <item>
+              <spacer name="verticalSpacer_20">
+               <property name="orientation">
+                <enum>Qt::Orientation::Vertical</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>20</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QLabel" name="lblReverbPreset">
+               <property name="text">
+                <string>Reverb Preset</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QComboBox" name="cbxReverbPreset"/>
+             </item>
              <item>
               <spacer name="verticalSpacer_13">
                <property name="orientation">
-                <enum>Qt::Vertical</enum>
+                <enum>Qt::Orientation::Vertical</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
@@ -1144,7 +1167,7 @@
              <item>
               <spacer name="verticalSpacer_15">
                <property name="orientation">
-                <enum>Qt::Vertical</enum>
+                <enum>Qt::Orientation::Vertical</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
@@ -1159,7 +1182,7 @@
            <item>
             <spacer name="horizontalSpacer_4">
              <property name="orientation">
-              <enum>Qt::Horizontal</enum>
+              <enum>Qt::Orientation::Horizontal</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -1176,10 +1199,10 @@
            <item>
             <spacer name="horizontalSpacer_7">
              <property name="orientation">
-              <enum>Qt::Horizontal</enum>
+              <enum>Qt::Orientation::Horizontal</enum>
              </property>
              <property name="sizeType">
-              <enum>QSizePolicy::Preferred</enum>
+              <enum>QSizePolicy::Policy::Preferred</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -1206,7 +1229,7 @@
                    <string>Pan</string>
                   </property>
                   <property name="alignment">
-                   <set>Qt::AlignCenter</set>
+                   <set>Qt::AlignmentFlag::AlignCenter</set>
                   </property>
                   <property name="buddy">
                    <cstring>sldAudioPan</cstring>
@@ -1218,10 +1241,10 @@
                   <item>
                    <spacer>
                     <property name="orientation">
-                     <enum>Qt::Horizontal</enum>
+                     <enum>Qt::Orientation::Horizontal</enum>
                     </property>
                     <property name="sizeType">
-                     <enum>QSizePolicy::Minimum</enum>
+                     <enum>QSizePolicy::Policy::Minimum</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -1252,20 +1275,20 @@
                      <number>1</number>
                     </property>
                     <property name="orientation">
-                     <enum>Qt::Horizontal</enum>
+                     <enum>Qt::Orientation::Horizontal</enum>
                     </property>
                     <property name="tickPosition">
-                     <enum>QSlider::TicksBothSides</enum>
+                     <enum>QSlider::TickPosition::TicksBothSides</enum>
                     </property>
                    </widget>
                   </item>
                   <item>
                    <spacer>
                     <property name="orientation">
-                     <enum>Qt::Horizontal</enum>
+                     <enum>Qt::Orientation::Horizontal</enum>
                     </property>
                     <property name="sizeType">
-                     <enum>QSizePolicy::Minimum</enum>
+                     <enum>QSizePolicy::Policy::Minimum</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -1289,7 +1312,7 @@
                    <string>Center</string>
                   </property>
                   <property name="alignment">
-                   <set>Qt::AlignCenter</set>
+                   <set>Qt::AlignmentFlag::AlignCenter</set>
                   </property>
                   <property name="wordWrap">
                    <bool>false</bool>
@@ -1304,10 +1327,10 @@
            <item>
             <spacer name="horizontalSpacer_8">
              <property name="orientation">
-              <enum>Qt::Horizontal</enum>
+              <enum>Qt::Orientation::Horizontal</enum>
              </property>
              <property name="sizeType">
-              <enum>QSizePolicy::Preferred</enum>
+              <enum>QSizePolicy::Policy::Preferred</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -1324,7 +1347,7 @@
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -1383,7 +1406,6 @@
               </property>
               <property name="font">
                <font>
-                <weight>50</weight>
                 <bold>false</bold>
                </font>
               </property>
@@ -1408,7 +1430,6 @@
               </property>
               <property name="font">
                <font>
-                <weight>50</weight>
                 <bold>false</bold>
                </font>
               </property>
@@ -1502,7 +1523,7 @@
             <item>
              <spacer name="horizontalSpacer_15">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -1522,7 +1543,7 @@
             <item>
              <spacer name="horizontalSpacer_18">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -1538,7 +1559,6 @@
            <widget class="QGroupBox" name="grbMidiMuteMyself">
             <property name="font">
              <font>
-              <weight>50</weight>
               <bold>false</bold>
              </font>
             </property>
@@ -1561,7 +1581,6 @@
                  </property>
                  <property name="font">
                   <font>
-                   <weight>50</weight>
                    <bold>false</bold>
                   </font>
                  </property>
@@ -1580,7 +1599,6 @@
                  </property>
                  <property name="font">
                   <font>
-                   <weight>50</weight>
                    <bold>false</bold>
                   </font>
                  </property>
@@ -1596,7 +1614,6 @@
                 <widget class="QPushButton" name="butLearnMuteMyself">
                  <property name="font">
                   <font>
-                   <weight>50</weight>
                    <bold>false</bold>
                   </font>
                  </property>
@@ -1611,7 +1628,7 @@
                <item>
                 <spacer name="horizontalSpacer_17">
                  <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
+                  <enum>Qt::Orientation::Horizontal</enum>
                  </property>
                  <property name="sizeHint" stdset="0">
                   <size>
@@ -1629,7 +1646,7 @@
           <item row="3" column="0">
            <spacer name="verticalSpacer_18">
             <property name="orientation">
-             <enum>Qt::Vertical</enum>
+             <enum>Qt::Orientation::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -1642,7 +1659,7 @@
           <item row="5" column="0">
            <spacer name="verticalSpacer_17">
             <property name="orientation">
-             <enum>Qt::Vertical</enum>
+             <enum>Qt::Orientation::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -1657,7 +1674,7 @@
             <item row="3" column="0">
              <spacer name="verticalSpacer_14">
               <property name="orientation">
-               <enum>Qt::Vertical</enum>
+               <enum>Qt::Orientation::Vertical</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -1671,7 +1688,6 @@
              <widget class="QGroupBox" name="grbMidiFader">
               <property name="font">
                <font>
-                <weight>50</weight>
                 <bold>false</bold>
                </font>
               </property>
@@ -1694,7 +1710,6 @@
                    </property>
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -1713,7 +1728,6 @@
                    </property>
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -1726,7 +1740,6 @@
                   <widget class="QPushButton" name="butLearnFaderOffset">
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -1741,7 +1754,7 @@
                  <item>
                   <spacer name="horizontalSpacer_11">
                    <property name="orientation">
-                    <enum>Qt::Horizontal</enum>
+                    <enum>Qt::Orientation::Horizontal</enum>
                    </property>
                    <property name="sizeHint" stdset="0">
                     <size>
@@ -1755,7 +1768,6 @@
                   <widget class="QLabel" name="lblFaderCount">
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -1774,7 +1786,6 @@
                    </property>
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -1795,7 +1806,6 @@
              <widget class="QGroupBox" name="grbMidiMute">
               <property name="font">
                <font>
-                <weight>50</weight>
                 <bold>false</bold>
                </font>
               </property>
@@ -1818,7 +1828,6 @@
                    </property>
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -1837,7 +1846,6 @@
                    </property>
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -1850,7 +1858,6 @@
                   <widget class="QPushButton" name="butLearnMuteOffset">
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -1865,7 +1872,7 @@
                  <item>
                   <spacer name="horizontalSpacer_14">
                    <property name="orientation">
-                    <enum>Qt::Horizontal</enum>
+                    <enum>Qt::Orientation::Horizontal</enum>
                    </property>
                    <property name="sizeHint" stdset="0">
                     <size>
@@ -1879,7 +1886,6 @@
                   <widget class="QLabel" name="lblMuteCount">
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -1898,7 +1904,6 @@
                    </property>
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -1918,7 +1923,7 @@
             <item row="1" column="0">
              <spacer name="verticalSpacer_12">
               <property name="orientation">
-               <enum>Qt::Vertical</enum>
+               <enum>Qt::Orientation::Vertical</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -1932,7 +1937,6 @@
              <widget class="QGroupBox" name="grbMidiSolo">
               <property name="font">
                <font>
-                <weight>50</weight>
                 <bold>false</bold>
                </font>
               </property>
@@ -1955,7 +1959,6 @@
                    </property>
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -1974,7 +1977,6 @@
                    </property>
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -1987,7 +1989,6 @@
                   <widget class="QPushButton" name="butLearnSoloOffset">
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -2002,7 +2003,7 @@
                  <item>
                   <spacer name="horizontalSpacer_13">
                    <property name="orientation">
-                    <enum>Qt::Horizontal</enum>
+                    <enum>Qt::Orientation::Horizontal</enum>
                    </property>
                    <property name="sizeHint" stdset="0">
                     <size>
@@ -2016,7 +2017,6 @@
                   <widget class="QLabel" name="lblSoloCount">
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -2035,7 +2035,6 @@
                    </property>
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -2056,7 +2055,6 @@
              <widget class="QGroupBox" name="grbMidiPan">
               <property name="font">
                <font>
-                <weight>50</weight>
                 <bold>false</bold>
                </font>
               </property>
@@ -2079,7 +2077,6 @@
                    </property>
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -2098,7 +2095,6 @@
                    </property>
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -2111,7 +2107,6 @@
                   <widget class="QPushButton" name="butLearnPanOffset">
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -2126,7 +2121,7 @@
                  <item>
                   <spacer name="horizontalSpacer_12">
                    <property name="orientation">
-                    <enum>Qt::Horizontal</enum>
+                    <enum>Qt::Orientation::Horizontal</enum>
                    </property>
                    <property name="sizeHint" stdset="0">
                     <size>
@@ -2140,7 +2135,6 @@
                   <widget class="QLabel" name="lblPanCount">
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -2159,7 +2153,6 @@
                    </property>
                    <property name="font">
                     <font>
-                     <weight>50</weight>
                      <bold>false</bold>
                     </font>
                    </property>
@@ -2179,7 +2172,7 @@
             <item row="5" column="0">
              <spacer name="verticalSpacer_16">
               <property name="orientation">
-               <enum>Qt::Vertical</enum>
+               <enum>Qt::Orientation::Vertical</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -2213,7 +2206,7 @@
             <item>
              <spacer name="horizontalSpacer_16">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -2228,7 +2221,7 @@
           <item row="1" column="0">
            <spacer name="verticalSpacer_19">
             <property name="orientation">
-             <enum>Qt::Vertical</enum>
+             <enum>Qt::Orientation::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
diff --git a/src/plugins/audioreverb.cpp b/src/plugins/audioreverb.cpp
index a10c415bb8..2e0a9885bb 100644
--- a/src/plugins/audioreverb.cpp
+++ b/src/plugins/audioreverb.cpp
@@ -2,206 +2,69 @@
 * Audio Reverberation                                                          *
 \******************************************************************************/
 /*
-    The following code is based on "JCRev: John Chowning's reverberator class"
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2004
-    which is in "The Synthesis ToolKit in C++ (STK)"
-    http://ccrma.stanford.edu/software/stk
-
-    Original description:
-    This class is derived from the CLM JCRev function, which is based on the use
-    of networks of simple allpass and comb delay filters. This class implements
-    three series allpass units, followed by four parallel comb filters, and two
-    decorrelation delay lines in parallel at the output.
+    The following code calls MVerb for reverberation.
+    MVerb was written by Martin Eastwood.
+    https://github.com/martineastwood/mverb
 */
 
 #include "audioreverb.h"
 
-void CAudioReverb::Init ( const EAudChanConf eNAudioChannelConf, const int iNStereoBlockSizeSam, const int iSampleRate, const float fT60 )
+void CAudioReverb::Init ( const EAudChanConf eNAudioChannelConf, const int iNStereoBlockSizeSam )
 {
-    // store parameters
     eAudioChannelConf   = eNAudioChannelConf;
     iStereoBlockSizeSam = iNStereoBlockSizeSam;
 
-    // delay lengths for 44100 Hz sample rate
-    int         lengths[9] = { 1116, 1356, 1422, 1617, 225, 341, 441, 211, 179 };
-    const float scaler     = static_cast<float> ( iSampleRate ) / 44100.0f;
-
-    if ( scaler != 1.0f )
-    {
-        for ( int i = 0; i < 9; i++ )
-        {
-            int delay = static_cast<int> ( floorf ( scaler * lengths[i] ) );
+    // Jamulus uses interleaved stereo, mverb operates on a 2-dimensional array instead
+    // Calculate the number of frames for each channel ( iStereoBlockSizeSam / 2 )
+    numFrames = iStereoBlockSizeSam >> 1;
 
-            if ( ( delay & 1 ) == 0 )
-            {
-                delay++;
-            }
+    // These buffers get filled with dry signal and are then passed to mverb
+    // They need to be vectors as the windows builds fail when arrays are used
+    bufL.resize ( numFrames );
+    bufR.resize ( numFrames );
 
-            while ( !isPrime ( delay ) )
-            {
-                delay += 2;
-            }
-
-            lengths[i] = delay;
-        }
-    }
-
-    for ( int i = 0; i < 3; i++ )
-    {
-        allpassDelays[i].Init ( lengths[i + 4] );
-    }
+    mverb->setSampleRate ( static_cast<float> ( SYSTEM_SAMPLE_RATE_HZ ) );
+    loadPreset();
+}
 
-    for ( int i = 0; i < 4; i++ )
+void CAudioReverb::loadPreset()
+{
+    for ( int i = 0; i < MVerb<float>::NUM_PARAMS; i++ )
     {
-        combDelays[i].Init ( lengths[i] );
-        combFilters[i].setPole ( 0.2f );
+        mverb->setParameter ( i, presets[iPreset][i] );
     }
-
-    setT60 ( fT60, iSampleRate );
-    outLeftDelay.Init ( lengths[7] );
-    outRightDelay.Init ( lengths[8] );
-    allpassCoefficient = 0.7f;
-    Clear();
 }
 
-bool CAudioReverb::isPrime ( const int number )
+void CAudioReverb::Process ( CVector<int16_t>& vecsStereoInOut, const bool bReverbOnLeftChan, const float fReverbGain )
 {
-    /*
-        Returns true if argument value is prime. Taken from "class Effect" in
-        "STK abstract effects parent class".
-    */
-    if ( number == 2 )
-    {
-        return true;
-    }
 
-    if ( number & 1 )
+    // One buffer to pass to mverb's process function
+    float* fInput[2] = { bufL.data(), bufR.data() };
+
+    if ( eAudioChannelConf == CC_STEREO )
     {
-        for ( int i = 3; i < static_cast<int> ( sqrtf ( static_cast<float> ( number ) ) ) + 1; i += 2 )
+        for ( int i = 0, j = 0; j < numFrames; i += 2, j++ )
         {
-            if ( ( number % i ) == 0 )
-            {
-                return false;
-            }
+            // True stereo reverb
+            bufL[j] = static_cast<float> ( vecsStereoInOut[i] ) / fMaxShort;
+            bufR[j] = static_cast<float> ( vecsStereoInOut[i + 1] ) / fMaxShort;
         }
-
-        return true; // prime
     }
     else
     {
-        return false; // even
+        for ( int i = 0, j = 0; j < numFrames; i += 2, j++ )
+        {
+            // For Mono and Mono-in/Stereo-out only one channel is selected and copied into both fInput channels
+            bufR[j] = bufL[j] = static_cast<float> ( vecsStereoInOut[i + !bReverbOnLeftChan] ) / fMaxShort;
+        }
     }
-}
 
-void CAudioReverb::Clear()
-{
-    // reset and clear all internal state
-    allpassDelays[0].Reset ( 0 );
-    allpassDelays[1].Reset ( 0 );
-    allpassDelays[2].Reset ( 0 );
-    combDelays[0].Reset ( 0 );
-    combDelays[1].Reset ( 0 );
-    combDelays[2].Reset ( 0 );
-    combDelays[3].Reset ( 0 );
-    combFilters[0].Reset();
-    combFilters[1].Reset();
-    combFilters[2].Reset();
-    combFilters[3].Reset();
-    outRightDelay.Reset ( 0 );
-    outLeftDelay.Reset ( 0 );
-}
+    mverb->process ( fInput, fInput, numFrames );
 
-void CAudioReverb::setT60 ( const float fT60, const int iSampleRate )
-{
-    // set the reverberation T60 decay time
-    for ( int i = 0; i < 4; i++ )
+    for ( int i = 0, j = 0; j < numFrames; i += 2, j++ )
     {
-        combCoefficient[i] = powf ( 10.0f, static_cast<float> ( -3.0f * combDelays[i].Size() / ( fT60 * iSampleRate ) ) );
+        // Mix wet and dry signal
+        vecsStereoInOut[i]     = Float2Short ( vecsStereoInOut[i] + bufL[j] * fMaxShort * fReverbGain );
+        vecsStereoInOut[i + 1] = Float2Short ( vecsStereoInOut[i + 1] + bufR[j] * fMaxShort * fReverbGain );
     }
 }
-
-void CAudioReverb::COnePole::setPole ( const float fPole )
-{
-    // calculate IIR filter coefficients based on the pole value
-    fA = -fPole;
-    fB = 1.0f - fPole;
-}
-
-float CAudioReverb::COnePole::Calc ( const float fIn )
-{
-    // calculate IIR filter
-    fLastSample = fB * fIn - fA * fLastSample;
-
-    return fLastSample;
-}
-
-void CAudioReverb::Process ( CVector<int16_t>& vecsStereoInOut, const bool bReverbOnLeftChan, const float fAttenuation )
-{
-    float fMixedInput, temp, temp0, temp1, temp2;
-
-    for ( int i = 0; i < iStereoBlockSizeSam; i += 2 )
-    {
-        // we sum up the stereo input channels (in case mono input is used, a zero
-        // shall be input for the right channel)
-        if ( eAudioChannelConf == CC_STEREO )
-        {
-            fMixedInput = 0.5f * ( vecsStereoInOut[i] + vecsStereoInOut[i + 1] );
-        }
-        else
-        {
-            if ( bReverbOnLeftChan )
-            {
-                fMixedInput = vecsStereoInOut[i];
-            }
-            else
-            {
-                fMixedInput = vecsStereoInOut[i + 1];
-            }
-        }
-
-        temp  = allpassDelays[0].Get();
-        temp0 = allpassCoefficient * temp;
-        temp0 += fMixedInput;
-        allpassDelays[0].Add ( temp0 );
-        temp0 = -( allpassCoefficient * temp0 ) + temp;
-
-        temp  = allpassDelays[1].Get();
-        temp1 = allpassCoefficient * temp;
-        temp1 += temp0;
-        allpassDelays[1].Add ( temp1 );
-        temp1 = -( allpassCoefficient * temp1 ) + temp;
-
-        temp  = allpassDelays[2].Get();
-        temp2 = allpassCoefficient * temp;
-        temp2 += temp1;
-        allpassDelays[2].Add ( temp2 );
-        temp2 = -( allpassCoefficient * temp2 ) + temp;
-
-        const float temp3 = temp2 + combFilters[0].Calc ( combCoefficient[0] * combDelays[0].Get() );
-        const float temp4 = temp2 + combFilters[1].Calc ( combCoefficient[1] * combDelays[1].Get() );
-        const float temp5 = temp2 + combFilters[2].Calc ( combCoefficient[2] * combDelays[2].Get() );
-        const float temp6 = temp2 + combFilters[3].Calc ( combCoefficient[3] * combDelays[3].Get() );
-
-        combDelays[0].Add ( temp3 );
-        combDelays[1].Add ( temp4 );
-        combDelays[2].Add ( temp5 );
-        combDelays[3].Add ( temp6 );
-
-        const float filtout = temp3 + temp4 + temp5 + temp6;
-
-        outLeftDelay.Add ( filtout );
-        outRightDelay.Add ( filtout );
-
-        // inplace apply the attenuated reverb signal (for stereo always apply
-        // reverberation effect on both channels)
-        if ( ( eAudioChannelConf == CC_STEREO ) || bReverbOnLeftChan )
-        {
-            vecsStereoInOut[i] = Float2Short ( ( 1.0f - fAttenuation ) * vecsStereoInOut[i] + 0.5f * fAttenuation * outLeftDelay.Get() );
-        }
-
-        if ( ( eAudioChannelConf == CC_STEREO ) || !bReverbOnLeftChan )
-        {
-            vecsStereoInOut[i + 1] = Float2Short ( ( 1.0f - fAttenuation ) * vecsStereoInOut[i + 1] + 0.5f * fAttenuation * outRightDelay.Get() );
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/plugins/audioreverb.h b/src/plugins/audioreverb.h
index a5da6fac61..63bb18d59a 100644
--- a/src/plugins/audioreverb.h
+++ b/src/plugins/audioreverb.h
@@ -2,56 +2,72 @@
 * Audio Reverberation                                                          *
 \******************************************************************************/
 /*
-    The following code is based on "JCRev: John Chowning's reverberator class"
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2004
-    which is in "The Synthesis ToolKit in C++ (STK)"
-    http://ccrma.stanford.edu/software/stk
-
-    Original description:
-    This class is derived from the CLM JCRev function, which is based on the use
-    of networks of simple allpass and comb delay filters. This class implements
-    three series allpass units, followed by four parallel comb filters, and two
-    decorrelation delay lines in parallel at the output.
+    The following code calls MVerb for reverberation.
+    MVerb was written by Martin Eastwood.
+    https://github.com/martineastwood/mverb
 */
 
 #pragma once
 #include "util.h"
+#include "libs/mverb/MVerb.h"
 
 class CAudioReverb
 {
 public:
-    CAudioReverb() {}
+    CAudioReverb()
+    {
+        fMaxShort = static_cast<float> ( _MAXSHORT );
+        iPreset   = STADIUM;
+
+        // Create MVerb on the heap
+        mverb = std::unique_ptr<MVerb<float>> ( new MVerb<float>() );
+        mverb->setSampleRate ( SYSTEM_SAMPLE_RATE_HZ );
+        loadPreset();
+    }
 
-    void Init ( const EAudChanConf eNAudioChannelConf, const int iNStereoBlockSizeSam, const int iSampleRate, const float fT60 = 1.1f );
+    void Init ( const EAudChanConf eNAudioChannelConf, const int iNStereoBlockSizeSam );
 
     void Clear();
-    void Process ( CVector<int16_t>& vecsStereoInOut, const bool bReverbOnLeftChan, const float fAttenuation );
+    void Process ( CVector<int16_t>& vecsStereoInOut, const bool bReverbOnLeftChan, const float fReverbGain );
+    void setPreset ( const int iNPreset )
+    {
+        // silently fail if preset doesn't exist
+        if ( MathUtils::InRange<int> ( iNPreset, SUBTLE, HALVES ) )
+        {
+            iPreset = iNPreset;
+            loadPreset();
+        }
+    };
+    int getPreset() const { return iPreset; };
 
 protected:
-    void setT60 ( const float fT60, const int iSampleRate );
-    bool isPrime ( const int number );
+    std::unique_ptr<MVerb<float>> mverb;
+
+    void         loadPreset();
+    EAudChanConf eAudioChannelConf;
+    int          iStereoBlockSizeSam;
+    float        fMaxShort;
+    int          iPreset;
+
+    int                numFrames;
+    std::vector<float> bufL;
+    std::vector<float> bufR;
 
-    class COnePole
+    enum
     {
-    public:
-        COnePole() : fA ( 0 ), fB ( 0 ) { Reset(); }
-        void  setPole ( const float fPole );
-        float Calc ( const float fIn );
-        void  Reset() { fLastSample = 0; }
-
-    protected:
-        float fA;
-        float fB;
-        float fLastSample;
+        SUBTLE          = 0,
+        STADIUM         = 1,
+        CUPBOARD        = 2,
+        DARK            = 3,
+        HALVES          = 4,
+        NUM_REV_PRESETS = 5
     };
 
-    EAudChanConf eAudioChannelConf;
-    int          iStereoBlockSizeSam;
-    CFIFO<float> allpassDelays[3];
-    CFIFO<float> combDelays[4];
-    COnePole     combFilters[4];
-    CFIFO<float> outLeftDelay;
-    CFIFO<float> outRightDelay;
-    float        allpassCoefficient;
-    float        combCoefficient[4];
+    constexpr static inline float const presets[NUM_REV_PRESETS][MVerb<float>::NUM_PARAMS] = { { .5, .5, .5, .5, .5, 1., 1., .5, .75 },
+                                                                                               { 0., .5, 1., .5, 0., 1., 1., .35, .75 },
+                                                                                               { 0., .5, 1., .5, 0., 1., 1., 1., .75 },
+                                                                                               { .9, .5, .1, .5, 0., 1., 1., 1., .75 },
+                                                                                               { .5, .5, .5, .5, .5, 1., 1., .5, .75 }
+
+    };
 };
diff --git a/src/settings.cpp b/src/settings.cpp
index bdc453913e..4d8fec898b 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -508,6 +508,12 @@ void CClientSettings::ReadSettingsFromXML ( const QDomDocument& IniXMLDocument,
         pClient->SetReverbOnLeftChan ( bValue );
     }
 
+    // reverb preset
+    if ( GetNumericIniSet ( IniXMLDocument, "client", "revpreset", 0, 4, iValue ) )
+    {
+        pClient->SetReverbPreset ( iValue );
+    }
+
     // sound card selection
     const QString strError = pClient->SetSndCrdDev ( FromBase64ToString ( GetIniSetting ( IniXMLDocument, "client", "auddev_base64", "" ) ) );
 
@@ -951,6 +957,9 @@ void CClientSettings::WriteSettingsToXML ( QDomDocument& IniXMLDocument, bool is
     // reverberation channel assignment
     SetFlagIniSet ( IniXMLDocument, "client", "reverblchan", pClient->IsReverbOnLeftChan() );
 
+    // reverb preset
+    SetNumericIniSet ( IniXMLDocument, "client", "revpreset", pClient->GetReverbPreset() );
+
     // sound card selection
     PutIniSetting ( IniXMLDocument, "client", "auddev_base64", ToBase64 ( pClient->GetSndCrdDev() ) );