diff --git a/CHANGELOG.md b/CHANGELOG.md
index 330dd944b36..0a42aa9f831 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,8 @@
 * Show when passthrough mode is active on overview waveforms [#2575](https://github.com/mixxxdj/mixxx/pull/2575) [#2616](https://github.com/mixxxdj/mixxx/pull/2616)
 * Changed format of currently playing track in window title from "artist, title" to "artist - title" [#2807](https://github.com/mixxxdj/mixxx/pull/2807)
 * Workaround Linux skin change crash [#3144](https://github.com/mixxxdj/mixxx/pull/3144) [lp:1885009](https://bugs.launchpad.net/mixxx/+bug/1885009)
+* Fix touch control [lp:1895431](https://bugs.launchpad.net/mixxx/+bug/1895431)
+* Fix broken knob interaction on touchscreens [#3512](https://github.com/mixxxdj/mixxx/pull/3512)
 
 ### Music Feature Analysis ###
 * Multithreaded analysis for much faster batch analysis on multicore CPUs [#1624](https://github.com/mixxxdj/mixxx/pull/1624) [#2142](https://github.com/mixxxdj/mixxx/pull/2142) [lp:1641153](https://bugs.launchpad.net/mixxx/+bug/1641153)
@@ -56,6 +58,9 @@
 * MusicBrainz: Handle 301 status response [#2510](https://github.com/mixxxdj/mixxx/pull/2510)
 * MusicBrainz: Add extended metadata support [lp:1581256](https://bugs.launchpad.net/mixxx/+bug/1581256) [#2522](https://github.com/mixxxdj/mixxx/pull/2522)
 * TagLib: Fix detection of empty or missing file tags [lp:1865957](https://bugs.launchpad.net/mixxx/+bug/1865957) [#2535](https://github.com/mixxxdj/mixxx/pull/2535)
+* Fix caching of duplicate tracks that reference the same file [#3027](https://github.com/mixxxdj/mixxx/pull/3027)
+* Use 6 instead of only 4 compatible musical keys (major/minor) [#3205](https://github.com/mixxxdj/mixxx/pull/3205)
+* Fix possible crash when trying to refocus the tracks table while another Mixxx window has focus [#3201](https://github.com/mixxxdj/mixxx/pull/3201)
 
 ### Audio Codecs ###
 * Add FFmpeg audio decoder, bringing support for ALAC files [#1356](https://github.com/mixxxdj/mixxx/pull/1356)
@@ -63,6 +68,11 @@
 * Add Opus streaming and recording support. [lp:1338413](https://bugs.launchpad.net/mixxx/+bug/1338413)
 * Remove support for SoundSource plugins because the code was not well-maintained and could lead to crashes [lp:1792747](https://bugs.launchpad.net/mixxx/+bug/1792747)
 
+### Audio Engine ###
+* Fix loss of precision when dealing with floating-point sample positions while setting loop out position and seeking using vinyl control [#3126](https://github.com/mixxxdj/mixxx/pull/3126) [#3127](https://github.com/mixxxdj/mixxx/pull/3127)
+* Prevent moving a loop beyond track end [#3117](https://github.com/mixxxdj/mixxx/pull/3117) [lp:1799574](https://bugs.launchpad.net/mixxx/+bug/1799574)
+* Fix possible memory corruption using JACK on Linux [#3160](https://github.com/mixxxdj/mixxx/pull/3160)
+
 ### Controllers ###
 * Improve workflow for configuring controller mappings and editing mappings [#2569](https://github.com/mixxxdj/mixxx/pull/2569)
 * Improve error reporting from controller scripts [#2588](https://github.com/mixxxdj/mixxx/pull/2588)
@@ -73,24 +83,16 @@
 * Add controller mapping for Roland DJ-505 [#2111](https://github.com/mixxxdj/mixxx/pull/2111)
 * Update controller mapping for Allen & Heath Xone K2 to add intro/outro cues [#2236](https://github.com/mixxxdj/mixxx/pull/2236)
 * Add controller mapping for Numark iDJ Live II [#2818](https://github.com/mixxxdj/mixxx/pull/2818)
+* Add controller mapping for Hercules DJControl Inpulse 200 [#2542](https://github.com/mixxxdj/mixxx/pull/2542)
+* Add controller mapping for Hercules DJControl Jogvision [#2370](https://github.com/mixxxdj/mixxx/pull/2370)
 
 ### Development ###
 * Add CMake build system with Ccache support for faster compilation time [#2280](https://github.com/mixxxdj/mixxx/pull/2280)
   * Note: The old SCons build system is still supported for 2.3. We will be removing it for Mixxx 2.4.
 * Make Mixxx compile even though `QT_NO_OPENGL` or `QT_OPENGL_ES_2` is defined (fixes build on Raspberry Pi) [lp:1863440](https://bugs.launchpad.net/mixxx/+bug/1863440) [#2504](https://github.com/mixxxdj/mixxx/pull/2504)
 
-## [2.2.5](https://launchpad.net/mixxx/+milestone/2.2.5) (Unreleased)
-
-* Add controller mapping for Hercules DJControl Inpulse 200 [#2542](https://github.com/mixxxdj/mixxx/pull/2542)
-* Add controller mapping for Hercules DJControl Jogvision [#2370](https://github.com/mixxxdj/mixxx/pull/2370)
+### Packaging ###
 * Fix missing manual in deb package [lp:1889776](https://bugs.launchpad.net/mixxx/+bug/1889776)
-* Fix caching of duplicate tracks that reference the same file [#3027](https://github.com/mixxxdj/mixxx/pull/3027)
-* Fix loss of precision when dealing with floating-point sample positions while setting loop out position and seeking using vinyl control [#3126](https://github.com/mixxxdj/mixxx/pull/3126) [#3127](https://github.com/mixxxdj/mixxx/pull/3127)
-* Prevent moving a loop beyond track end [#3117](https://github.com/mixxxdj/mixxx/pull/3117) [lp:1799574](https://bugs.launchpad.net/mixxx/+bug/1799574)
-* Use 6 instead of only 4 compatible musical keys (major/minor) [#3205](https://github.com/mixxxdj/mixxx/pull/3205)
-* Fix possible memory corruption using JACK on Linux [#3160](https://github.com/mixxxdj/mixxx/pull/3160)
-* Fix possible crash when trying to refocus the tracks table while another Mixxx window has focus [#3201](https://github.com/mixxxdj/mixxx/pull/3201)
-* Fix touch control [lp:1895431](https://bugs.launchpad.net/mixxx/+bug/1895431)
 
 ## [2.2.4](https://launchpad.net/mixxx/+milestone/2.2.4) (2020-06-27)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a236f3961a..fe626d873dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1071,7 +1071,7 @@ set(MIXXX_INSTALL_DOCDIR "./doc")
 set(MIXXX_INSTALL_LICENSEDIR "./doc")
 if (APPLE AND MACOS_BUNDLE)
   set(MIXXX_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}")
-  set(MACOS_BUNDLE_NAME Mixxx)
+  set(MACOS_BUNDLE_NAME mixxx)
   set(MIXXX_INSTALL_PREFIX "${MACOS_BUNDLE_NAME}.app")
   set(MIXXX_INSTALL_DATADIR "${MIXXX_INSTALL_PREFIX}/Contents/Resources")
   set(MIXXX_INSTALL_DOCDIR "${MIXXX_INSTALL_DATADIR}")
@@ -2147,6 +2147,7 @@ if(WIN32 AND STATIC_DEPS)
 endif()
 
 # Threads
+set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 target_link_libraries(mixxx-lib PUBLIC Threads::Threads)
 
@@ -2705,7 +2706,7 @@ if(APPLE AND MACOS_BUNDLE)
             get_filename_component(_qt_plugin_file "${_qt_plugin_path}" NAME)
             get_filename_component(_qt_plugin_type "${_qt_plugin_path}" PATH)
             get_filename_component(_qt_plugin_type "${_qt_plugin_type}" NAME)
-            set(_qt_plugin_dest "${_prefix}/Contents/plugins/${_qt_plugin_type}")
+            set(_qt_plugin_dest "${_prefix}/Contents/PlugIns/${_qt_plugin_type}")
             install(FILES "${_qt_plugin_path}"
                 DESTINATION "${_qt_plugin_dest}")
             set(${_qt_plugins_var}
diff --git a/src/musicbrainz/crc.cpp b/src/musicbrainz/crc.cpp
index a1857e18d81..0340f152c76 100644
--- a/src/musicbrainz/crc.cpp
+++ b/src/musicbrainz/crc.cpp
@@ -1,5 +1,5 @@
 /**
- * \file crc.cpp
+ * \file crc.c
  * Functions and types for CRC checks.
  *
  * Generated on Sun Oct 24 10:58:31 2010,
@@ -14,269 +14,78 @@
  *    Algorithm    = table-driven
  *****************************************************************************/
 #include "musicbrainz/crc.h"
-
 #include <stdint.h>
 #include <stdlib.h>
 
 /**
  * Static table used for the table_driven implementation.
  *****************************************************************************/
-static const crc_t crc_table[256] = {0x00000000,
-        0x77073096,
-        0xee0e612c,
-        0x990951ba,
-        0x076dc419,
-        0x706af48f,
-        0xe963a535,
-        0x9e6495a3,
-        0x0edb8832,
-        0x79dcb8a4,
-        0xe0d5e91e,
-        0x97d2d988,
-        0x09b64c2b,
-        0x7eb17cbd,
-        0xe7b82d07,
-        0x90bf1d91,
-        0x1db71064,
-        0x6ab020f2,
-        0xf3b97148,
-        0x84be41de,
-        0x1adad47d,
-        0x6ddde4eb,
-        0xf4d4b551,
-        0x83d385c7,
-        0x136c9856,
-        0x646ba8c0,
-        0xfd62f97a,
-        0x8a65c9ec,
-        0x14015c4f,
-        0x63066cd9,
-        0xfa0f3d63,
-        0x8d080df5,
-        0x3b6e20c8,
-        0x4c69105e,
-        0xd56041e4,
-        0xa2677172,
-        0x3c03e4d1,
-        0x4b04d447,
-        0xd20d85fd,
-        0xa50ab56b,
-        0x35b5a8fa,
-        0x42b2986c,
-        0xdbbbc9d6,
-        0xacbcf940,
-        0x32d86ce3,
-        0x45df5c75,
-        0xdcd60dcf,
-        0xabd13d59,
-        0x26d930ac,
-        0x51de003a,
-        0xc8d75180,
-        0xbfd06116,
-        0x21b4f4b5,
-        0x56b3c423,
-        0xcfba9599,
-        0xb8bda50f,
-        0x2802b89e,
-        0x5f058808,
-        0xc60cd9b2,
-        0xb10be924,
-        0x2f6f7c87,
-        0x58684c11,
-        0xc1611dab,
-        0xb6662d3d,
-        0x76dc4190,
-        0x01db7106,
-        0x98d220bc,
-        0xefd5102a,
-        0x71b18589,
-        0x06b6b51f,
-        0x9fbfe4a5,
-        0xe8b8d433,
-        0x7807c9a2,
-        0x0f00f934,
-        0x9609a88e,
-        0xe10e9818,
-        0x7f6a0dbb,
-        0x086d3d2d,
-        0x91646c97,
-        0xe6635c01,
-        0x6b6b51f4,
-        0x1c6c6162,
-        0x856530d8,
-        0xf262004e,
-        0x6c0695ed,
-        0x1b01a57b,
-        0x8208f4c1,
-        0xf50fc457,
-        0x65b0d9c6,
-        0x12b7e950,
-        0x8bbeb8ea,
-        0xfcb9887c,
-        0x62dd1ddf,
-        0x15da2d49,
-        0x8cd37cf3,
-        0xfbd44c65,
-        0x4db26158,
-        0x3ab551ce,
-        0xa3bc0074,
-        0xd4bb30e2,
-        0x4adfa541,
-        0x3dd895d7,
-        0xa4d1c46d,
-        0xd3d6f4fb,
-        0x4369e96a,
-        0x346ed9fc,
-        0xad678846,
-        0xda60b8d0,
-        0x44042d73,
-        0x33031de5,
-        0xaa0a4c5f,
-        0xdd0d7cc9,
-        0x5005713c,
-        0x270241aa,
-        0xbe0b1010,
-        0xc90c2086,
-        0x5768b525,
-        0x206f85b3,
-        0xb966d409,
-        0xce61e49f,
-        0x5edef90e,
-        0x29d9c998,
-        0xb0d09822,
-        0xc7d7a8b4,
-        0x59b33d17,
-        0x2eb40d81,
-        0xb7bd5c3b,
-        0xc0ba6cad,
-        0xedb88320,
-        0x9abfb3b6,
-        0x03b6e20c,
-        0x74b1d29a,
-        0xead54739,
-        0x9dd277af,
-        0x04db2615,
-        0x73dc1683,
-        0xe3630b12,
-        0x94643b84,
-        0x0d6d6a3e,
-        0x7a6a5aa8,
-        0xe40ecf0b,
-        0x9309ff9d,
-        0x0a00ae27,
-        0x7d079eb1,
-        0xf00f9344,
-        0x8708a3d2,
-        0x1e01f268,
-        0x6906c2fe,
-        0xf762575d,
-        0x806567cb,
-        0x196c3671,
-        0x6e6b06e7,
-        0xfed41b76,
-        0x89d32be0,
-        0x10da7a5a,
-        0x67dd4acc,
-        0xf9b9df6f,
-        0x8ebeeff9,
-        0x17b7be43,
-        0x60b08ed5,
-        0xd6d6a3e8,
-        0xa1d1937e,
-        0x38d8c2c4,
-        0x4fdff252,
-        0xd1bb67f1,
-        0xa6bc5767,
-        0x3fb506dd,
-        0x48b2364b,
-        0xd80d2bda,
-        0xaf0a1b4c,
-        0x36034af6,
-        0x41047a60,
-        0xdf60efc3,
-        0xa867df55,
-        0x316e8eef,
-        0x4669be79,
-        0xcb61b38c,
-        0xbc66831a,
-        0x256fd2a0,
-        0x5268e236,
-        0xcc0c7795,
-        0xbb0b4703,
-        0x220216b9,
-        0x5505262f,
-        0xc5ba3bbe,
-        0xb2bd0b28,
-        0x2bb45a92,
-        0x5cb36a04,
-        0xc2d7ffa7,
-        0xb5d0cf31,
-        0x2cd99e8b,
-        0x5bdeae1d,
-        0x9b64c2b0,
-        0xec63f226,
-        0x756aa39c,
-        0x026d930a,
-        0x9c0906a9,
-        0xeb0e363f,
-        0x72076785,
-        0x05005713,
-        0x95bf4a82,
-        0xe2b87a14,
-        0x7bb12bae,
-        0x0cb61b38,
-        0x92d28e9b,
-        0xe5d5be0d,
-        0x7cdcefb7,
-        0x0bdbdf21,
-        0x86d3d2d4,
-        0xf1d4e242,
-        0x68ddb3f8,
-        0x1fda836e,
-        0x81be16cd,
-        0xf6b9265b,
-        0x6fb077e1,
-        0x18b74777,
-        0x88085ae6,
-        0xff0f6a70,
-        0x66063bca,
-        0x11010b5c,
-        0x8f659eff,
-        0xf862ae69,
-        0x616bffd3,
-        0x166ccf45,
-        0xa00ae278,
-        0xd70dd2ee,
-        0x4e048354,
-        0x3903b3c2,
-        0xa7672661,
-        0xd06016f7,
-        0x4969474d,
-        0x3e6e77db,
-        0xaed16a4a,
-        0xd9d65adc,
-        0x40df0b66,
-        0x37d83bf0,
-        0xa9bcae53,
-        0xdebb9ec5,
-        0x47b2cf7f,
-        0x30b5ffe9,
-        0xbdbdf21c,
-        0xcabac28a,
-        0x53b39330,
-        0x24b4a3a6,
-        0xbad03605,
-        0xcdd70693,
-        0x54de5729,
-        0x23d967bf,
-        0xb3667a2e,
-        0xc4614ab8,
-        0x5d681b02,
-        0x2a6f2b94,
-        0xb40bbe37,
-        0xc30c8ea1,
-        0x5a05df1b,
-        0x2d02ef8d};
+static const crc_t crc_table[256] = {
+    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
+    0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
+    0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+    0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+    0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
+    0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
+    0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+    0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
+    0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
+    0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+    0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
+    0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
+    0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
+    0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+    0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
+    0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
+    0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
+    0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+    0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+    0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
+    0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
+    0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
+    0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+    0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+    0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
+    0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
+    0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+    0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
+    0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
+    0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+    0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
+    0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
+    0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
+    0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+    0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
+    0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
+    0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+    0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+    0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
+    0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
+    0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
+    0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
+    0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+};
 
 /**
  * Reflect all bits of a \a data word of \a data_len bytes.
@@ -285,7 +94,8 @@ static const crc_t crc_table[256] = {0x00000000,
  * \param data_len     The width of \a data expressed in number of bits.
  * \return             The reflected data.
  *****************************************************************************/
-crc_t crc_reflect(crc_t data, size_t data_len) {
+crc_t crc_reflect(crc_t data, size_t data_len)
+{
     unsigned int i;
     crc_t ret;
 
@@ -297,6 +107,7 @@ crc_t crc_reflect(crc_t data, size_t data_len) {
     return ret;
 }
 
+
 /**
  * Update the crc value with new data.
  *
@@ -305,7 +116,8 @@ crc_t crc_reflect(crc_t data, size_t data_len) {
  * \param data_len Number of bytes in the \a data buffer.
  * \return         The updated crc value.
  *****************************************************************************/
-crc_t crc_update(crc_t crc, const unsigned char* data, size_t data_len) {
+crc_t crc_update(crc_t crc, const unsigned char *data, size_t data_len)
+{
     unsigned int tbl_idx;
 
     while (data_len--) {
diff --git a/src/util/font.h b/src/util/font.h
index f5b760e8e1d..d421623842f 100644
--- a/src/util/font.h
+++ b/src/util/font.h
@@ -12,7 +12,15 @@ class FontUtils {
     static void initializeFonts(const QString& resourcePath) {
         QDir fontsDir(resourcePath);
         if (!fontsDir.cd("fonts")) {
-            qWarning("FontUtils::initializeFonts: cd fonts failed");
+#ifdef __LINUX__
+            // If the fonts already have been installed via the package
+            // manager, this is okay. We currently have no way to verify that
+            // though.
+            qDebug()
+#else
+            qWarning()
+#endif
+                    << "No fonts directory found in" << resourcePath;
             return;
         }