diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70d4954448f..2530efeff70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2075,6 +2075,7 @@ add_executable(mixxx-test
   src/test/configobject_test.cpp
   src/test/controller_mapping_validation_test.cpp
   src/test/controller_mapping_settings_test.cpp
+  src/test/controllers/controller_columnid_regression_test.cpp
   src/test/controllerscriptenginelegacy_test.cpp
   src/test/controlobjecttest.cpp
   src/test/controlobjectaliastest.cpp
diff --git a/res/controllers/Traktor Kontrol S4 MK3.hid.xml b/res/controllers/Traktor Kontrol S4 MK3.hid.xml
index 881d44849aa..0c6f835c972 100644
--- a/res/controllers/Traktor Kontrol S4 MK3.hid.xml	
+++ b/res/controllers/Traktor Kontrol S4 MK3.hid.xml	
@@ -191,9 +191,9 @@
                 </description>
             </option>
             <option
-                variable="mixerControlsMixAuxOnShift"
+                variable="mixerControlsMicAuxOnShift"
                 type="boolean"
-                default="false"
+                default="true"
                 label="Shift to mix microphones or auxiliary lines">
                 <description>
                     When shifting decks, the mixer controls microphones or auxiliary lines. If both a microphone and an auxiliary are configured on the same channel, the mixer will prioritize controlling the auxiliary.
@@ -352,19 +352,19 @@
                     <value label="Artist" default="true">1</value>
                     <value label="Title">2</value>
                     <value label="Album">3</value>
-                    <value label="Albumartist">4</value>
+                    <value label="Album Artist">4</value>
                     <value label="Year">5</value>
                     <value label="Genre">6</value>
                     <value label="Composer">7</value>
                     <value label="Grouping">8</value>
-                    <value label="Tracknumber">9</value>
-                    <value label="Filetype">10</value>
+                    <value label="Track Number">9</value>
+                    <value label="File Type">10</value>
                     <value label="Native Location">11</value>
                     <value label="Comment">12</value>
                     <value label="Duration">13</value>
                     <value label="Bitrate">14</value>
                     <value label="BPM">15</value>
-                    <value label="ReplayGain">16</value>
+                    <value label="Replay Gain">16</value>
                     <value label="Datetime Added">17</value>
                     <value label="Times Played">18</value>
                     <value label="Rating">19</value>
@@ -379,19 +379,19 @@
                     <value label="Artist">1</value>
                     <value label="Title" default="true">2</value>
                     <value label="Album">3</value>
-                    <value label="Albumartist">4</value>
+                    <value label="Album Artist">4</value>
                     <value label="Year">5</value>
                     <value label="Genre">6</value>
                     <value label="Composer">7</value>
                     <value label="Grouping">8</value>
-                    <value label="Tracknumber">9</value>
-                    <value label="Filetype">10</value>
+                    <value label="Track Number">9</value>
+                    <value label="File Type">10</value>
                     <value label="Native Location">11</value>
                     <value label="Comment">12</value>
                     <value label="Duration">13</value>
                     <value label="Bitrate">14</value>
                     <value label="BPM">15</value>
-                    <value label="ReplayGain">16</value>
+                    <value label="Replay Gain">16</value>
                     <value label="Datetime Added">17</value>
                     <value label="Times Played">18</value>
                     <value label="Rating">19</value>
@@ -406,19 +406,19 @@
                     <value label="Artist">1</value>
                     <value label="Title">2</value>
                     <value label="Album">3</value>
-                    <value label="Albumartist">4</value>
+                    <value label="Album Artist">4</value>
                     <value label="Year">5</value>
                     <value label="Genre">6</value>
                     <value label="Composer">7</value>
                     <value label="Grouping">8</value>
-                    <value label="Tracknumber">9</value>
-                    <value label="Filetype">10</value>
+                    <value label="Track Number">9</value>
+                    <value label="File Type">10</value>
                     <value label="Native Location">11</value>
                     <value label="Comment">12</value>
                     <value label="Duration">13</value>
                     <value label="Bitrate">14</value>
                     <value label="BPM" default="true">15</value>
-                    <value label="ReplayGain">16</value>
+                    <value label="Replay Gain">16</value>
                     <value label="Datetime Added">17</value>
                     <value label="Times Played">18</value>
                     <value label="Rating">19</value>
@@ -433,19 +433,19 @@
                     <value label="Artist">1</value>
                     <value label="Title">2</value>
                     <value label="Album">3</value>
-                    <value label="Albumartist">4</value>
+                    <value label="Album Artist">4</value>
                     <value label="Year">5</value>
                     <value label="Genre">6</value>
                     <value label="Composer">7</value>
                     <value label="Grouping">8</value>
-                    <value label="Tracknumber">9</value>
-                    <value label="Filetype">10</value>
+                    <value label="Track Number">9</value>
+                    <value label="File Type">10</value>
                     <value label="Native Location">11</value>
                     <value label="Comment">12</value>
                     <value label="Duration">13</value>
                     <value label="Bitrate">14</value>
                     <value label="BPM">15</value>
-                    <value label="ReplayGain">16</value>
+                    <value label="Replay Gain">16</value>
                     <value label="Datetime Added">17</value>
                     <value label="Times Played">18</value>
                     <value label="Rating">19</value>
@@ -460,19 +460,19 @@
                     <value label="Artist">1</value>
                     <value label="Title">2</value>
                     <value label="Album">3</value>
-                    <value label="Albumartist">4</value>
+                    <value label="Album Artist">4</value>
                     <value label="Year">5</value>
                     <value label="Genre">6</value>
                     <value label="Composer">7</value>
                     <value label="Grouping">8</value>
-                    <value label="Tracknumber">9</value>
-                    <value label="Filetype">10</value>
+                    <value label="Track Number">9</value>
+                    <value label="File Type">10</value>
                     <value label="Native Location">11</value>
                     <value label="Comment">12</value>
                     <value label="Duration">13</value>
                     <value label="Bitrate">14</value>
                     <value label="BPM">15</value>
-                    <value label="ReplayGain">16</value>
+                    <value label="Replay Gain">16</value>
                     <value label="Datetime Added">17</value>
                     <value label="Times Played">18</value>
                     <value label="Rating">19</value>
@@ -487,19 +487,19 @@
                     <value label="Artist">1</value>
                     <value label="Title">2</value>
                     <value label="Album">3</value>
-                    <value label="Albumartist">4</value>
+                    <value label="Album Artist">4</value>
                     <value label="Year">5</value>
                     <value label="Genre">6</value>
                     <value label="Composer">7</value>
                     <value label="Grouping">8</value>
-                    <value label="Tracknumber">9</value>
-                    <value label="Filetype">10</value>
+                    <value label="Track Number">9</value>
+                    <value label="File Type">10</value>
                     <value label="Native Location">11</value>
                     <value label="Comment">12</value>
                     <value label="Duration">13</value>
                     <value label="Bitrate">14</value>
                     <value label="BPM">15</value>
-                    <value label="ReplayGain">16</value>
+                    <value label="Replay Gain">16</value>
                     <value label="Datetime Added">17</value>
                     <value label="Times Played">18</value>
                     <value label="Rating">19</value>
@@ -513,7 +513,7 @@
                 variable="loopWheelMoveFactor"
                 type="integer"
                 min="20"
-                max="250"
+                max="500"
                 step="2"
                 default="50"
                 label="Jogwheel sensitivity in loop mode" />
diff --git a/res/controllers/Traktor-Kontrol-S4-MK3.js b/res/controllers/Traktor-Kontrol-S4-MK3.js
index 23ecf83b0da..7f167085065 100644
--- a/res/controllers/Traktor-Kontrol-S4-MK3.js
+++ b/res/controllers/Traktor-Kontrol-S4-MK3.js
@@ -40,7 +40,7 @@ const KeyboardColors = [
 
 /*
  * USER CONFIGURABLE SETTINGS
- * Change settings in the preferences (Mixxx >= 2.5)
+ * Change settings in the preferences
  */
 
 const DeckColors = [
@@ -88,7 +88,7 @@ const WheelLedBlinkOnTrackEnd = !!engine.getSetting("wheelLedBlinkOnTrackEnd");
 
 // When shifting either decks, the mixer will control microphones or auxiliary lines. If there is both a mic and an configure on the same channel, the mixer will control the auxiliary.
 // Default: false
-const MixerControlsMixAuxOnShift = !!engine.getSetting("mixerControlsMixAuxOnShift");
+const MixerControlsMixAuxOnShift = !!engine.getSetting("mixerControlsMicAuxOnShift");
 
 // Define how many wheel moves are sampled to compute the speed. The more you have, the more the speed is accurate, but the
 // less responsive it gets in Mixxx. Default: 5
diff --git a/src/controllers/legacycontrollersettings.h b/src/controllers/legacycontrollersettings.h
index 559227007a6..b7d2f378d9c 100644
--- a/src/controllers/legacycontrollersettings.h
+++ b/src/controllers/legacycontrollersettings.h
@@ -359,6 +359,10 @@ class LegacyControllerEnumSetting
         return QJSValue(stringify());
     }
 
+    const QList<std::tuple<QString, QString>>& options() const {
+        return m_options;
+    }
+
     QString stringify() const override {
         return std::get<0>(m_options.value(static_cast<int>(m_savedValue)));
     }
@@ -416,6 +420,7 @@ class LegacyControllerEnumSetting
     size_t m_editedValue;
 
     friend class LegacyControllerMappingSettingsTest_enumSettingEditing_Test;
+    friend class ControllerS4MK3SettingTest_ensureLibrarySettingValueAndEnumEquals;
 };
 
 template<>
diff --git a/src/test/controllers/controller_columnid_regression_test.cpp b/src/test/controllers/controller_columnid_regression_test.cpp
new file mode 100644
index 00000000000..81f3379a4fd
--- /dev/null
+++ b/src/test/controllers/controller_columnid_regression_test.cpp
@@ -0,0 +1,79 @@
+/*
+ This test case is used to ensure that hardcoded CO value in the the settings
+ definition matches with Mixxx value and will help detecting regression if they
+ are ever updated.
+
+ Currently, the S4 MK3 is referencing library column ID in its setting, so this
+ test ensure that the value always matches with the Mixxx spec. New controllers
+ can be added by duplicated the `ensureS4MK3` case and adapt as needed
+*/
+#include "controllers/legacycontrollermapping.h"
+#include "controllers/legacycontrollermappingfilehandler.h"
+#include "library/trackmodel.h"
+#include "test/mixxxtest.h"
+#include "util/time.h"
+
+class ControllerLibraryColumnIDRegressionTest : public MixxxTest {
+  protected:
+    void SetUp() override {
+        mixxx::Time::setTestMode(true);
+        mixxx::Time::setTestElapsedTime(mixxx::Duration::fromMillis(10));
+    }
+
+    void TearDown() override {
+        mixxx::Time::setTestMode(false);
+    }
+
+    static QHash<QString, TrackModel::SortColumnId> COLUMN_MAPPING;
+};
+
+QHash<QString, TrackModel::SortColumnId>
+        ControllerLibraryColumnIDRegressionTest::COLUMN_MAPPING = {
+                {"Artist", TrackModel::SortColumnId::Artist},
+                {"Title", TrackModel::SortColumnId::Title},
+                {"Album", TrackModel::SortColumnId::Album},
+                {"Album Artist", TrackModel::SortColumnId::AlbumArtist},
+                {"Year", TrackModel::SortColumnId::Year},
+                {"Genre", TrackModel::SortColumnId::Genre},
+                {"Composer", TrackModel::SortColumnId::Composer},
+                {"Grouping", TrackModel::SortColumnId::Grouping},
+                {"Track Number", TrackModel::SortColumnId::TrackNumber},
+                {"File Type", TrackModel::SortColumnId::FileType},
+                {"Native Location", TrackModel::SortColumnId::NativeLocation},
+                {"Comment", TrackModel::SortColumnId::Comment},
+                {"Duration", TrackModel::SortColumnId::Duration},
+                {"Bitrate", TrackModel::SortColumnId::BitRate},
+                {"BPM", TrackModel::SortColumnId::Bpm},
+                {"Replay Gain", TrackModel::SortColumnId::ReplayGain},
+                {"Datetime Added", TrackModel::SortColumnId::DateTimeAdded},
+                {"Times Played", TrackModel::SortColumnId::TimesPlayed},
+                {"Rating", TrackModel::SortColumnId::Rating},
+                {"Key", TrackModel::SortColumnId::Key},
+                // More mapping can be added here if needed.
+                // NOTE: If some of the missing value are referenced in a
+                // controller setting, test case will fail.
+};
+
+TEST_F(ControllerLibraryColumnIDRegressionTest, ensureS4MK3) {
+    std::shared_ptr<LegacyControllerMapping> pMapping =
+            LegacyControllerMappingFileHandler::loadMapping(
+                    QFileInfo("res/controllers/Traktor Kontrol S4 MK3.hid.xml"), QDir());
+    EXPECT_TRUE(pMapping);
+    auto settings = pMapping->getSettings();
+    EXPECT_TRUE(!settings.isEmpty());
+
+    const int expectedSettingCount = 6; // Number of settings using library count.
+    int count = 0;
+    for (const auto& setting : settings) {
+        if (!setting->variableName().startsWith("librarySortableColumns")) {
+            continue;
+        }
+        auto pEnum = std::dynamic_pointer_cast<LegacyControllerEnumSetting>(setting);
+        EXPECT_TRUE(pEnum);
+        for (const auto& opt : pEnum->options()) {
+            EXPECT_EQ(static_cast<int>(COLUMN_MAPPING[std::get<0>(opt)]), std::get<1>(opt).toInt());
+        }
+        count++;
+    }
+    EXPECT_EQ(count, expectedSettingCount);
+}