diff --git a/CMakeLists.txt b/CMakeLists.txt
index d285d77c4006..245d59fe697c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -717,17 +717,17 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/preferences/settingsmanager.cpp
   src/preferences/upgrade.cpp
   src/recording/recordingmanager.cpp
-  src/skin/colorschemeparser.cpp
-  src/skin/imgcolor.cpp
-  src/skin/imginvert.cpp
-  src/skin/imgloader.cpp
-  src/skin/launchimage.cpp
-  src/skin/legacyskinparser.cpp
-  src/skin/pixmapsource.cpp
-  src/skin/skincontext.cpp
+  src/skin/legacy/colorschemeparser.cpp
+  src/skin/legacy/imgcolor.cpp
+  src/skin/legacy/imginvert.cpp
+  src/skin/legacy/imgloader.cpp
+  src/skin/legacy/launchimage.cpp
+  src/skin/legacy/legacyskinparser.cpp
+  src/skin/legacy/pixmapsource.cpp
+  src/skin/legacy/skincontext.cpp
+  src/skin/legacy/svgparser.cpp
+  src/skin/legacy/tooltips.cpp
   src/skin/skinloader.cpp
-  src/skin/svgparser.cpp
-  src/skin/tooltips.cpp
   src/soundio/sounddevice.cpp
   src/soundio/sounddevicenetwork.cpp
   src/soundio/sounddeviceportaudio.cpp
diff --git a/src/mixxx.cpp b/src/mixxx.cpp
index e9c1be28d173..3d38eb1358e2 100644
--- a/src/mixxx.cpp
+++ b/src/mixxx.cpp
@@ -57,8 +57,8 @@
 #include "mixer/playermanager.h"
 #include "preferences/settingsmanager.h"
 #include "recording/recordingmanager.h"
-#include "skin/launchimage.h"
-#include "skin/legacyskinparser.h"
+#include "skin/legacy/launchimage.h"
+#include "skin/legacy/legacyskinparser.h"
 #include "skin/skinloader.h"
 #include "soundio/soundmanager.h"
 #include "sources/soundsourceproxy.h"
diff --git a/src/preferences/dialog/dlgprefinterface.cpp b/src/preferences/dialog/dlgprefinterface.cpp
index 7e05dff1545e..d78d1f2a3967 100644
--- a/src/preferences/dialog/dlgprefinterface.cpp
+++ b/src/preferences/dialog/dlgprefinterface.cpp
@@ -14,7 +14,7 @@
 #include "mixxx.h"
 #include "moc_dlgprefinterface.cpp"
 #include "preferences/usersettings.h"
-#include "skin/legacyskinparser.h"
+#include "skin/legacy/legacyskinparser.h"
 #include "skin/skinloader.h"
 #include "util/screensaver.h"
 #include "util/widgethelper.h"
diff --git a/src/skin/colorschemeparser.cpp b/src/skin/legacy/colorschemeparser.cpp
similarity index 94%
rename from src/skin/colorschemeparser.cpp
rename to src/skin/legacy/colorschemeparser.cpp
index 481152f39f2f..60258c31b2f9 100644
--- a/src/skin/colorschemeparser.cpp
+++ b/src/skin/legacy/colorschemeparser.cpp
@@ -1,16 +1,16 @@
-#include "skin/colorschemeparser.h"
+#include "skin/legacy/colorschemeparser.h"
 
 #include "widget/wpixmapstore.h"
 #include "widget/wimagestore.h"
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
 #include "util/xml.h"
-#include "skin/imgsource.h"
-#include "skin/imgloader.h"
-#include "skin/imgcolor.h"
-#include "skin/imginvert.h"
-#include "skin/legacyskinparser.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/imgsource.h"
+#include "skin/legacy/imgloader.h"
+#include "skin/legacy/imgcolor.h"
+#include "skin/legacy/imginvert.h"
+#include "skin/legacy/legacyskinparser.h"
+#include "skin/legacy/skincontext.h"
 
 void ColorSchemeParser::setupLegacyColorSchemes(const QDomElement& docElem,
         UserSettingsPointer pConfig,
diff --git a/src/skin/colorschemeparser.h b/src/skin/legacy/colorschemeparser.h
similarity index 84%
rename from src/skin/colorschemeparser.h
rename to src/skin/legacy/colorschemeparser.h
index 95ea0a331201..dc39a21a55b9 100644
--- a/src/skin/colorschemeparser.h
+++ b/src/skin/legacy/colorschemeparser.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "preferences/usersettings.h"
-#include "skin/legacyskinparser.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/legacyskinparser.h"
+#include "skin/legacy/skincontext.h"
 
 class ImgSource;
 
diff --git a/src/skin/imgcolor.cpp b/src/skin/legacy/imgcolor.cpp
similarity index 100%
rename from src/skin/imgcolor.cpp
rename to src/skin/legacy/imgcolor.cpp
diff --git a/src/skin/imgcolor.h b/src/skin/legacy/imgcolor.h
similarity index 100%
rename from src/skin/imgcolor.h
rename to src/skin/legacy/imgcolor.h
diff --git a/src/skin/imginvert.cpp b/src/skin/legacy/imginvert.cpp
similarity index 100%
rename from src/skin/imginvert.cpp
rename to src/skin/legacy/imginvert.cpp
diff --git a/src/skin/imginvert.h b/src/skin/legacy/imginvert.h
similarity index 100%
rename from src/skin/imginvert.h
rename to src/skin/legacy/imginvert.h
diff --git a/src/skin/imgloader.cpp b/src/skin/legacy/imgloader.cpp
similarity index 100%
rename from src/skin/imgloader.cpp
rename to src/skin/legacy/imgloader.cpp
diff --git a/src/skin/imgloader.h b/src/skin/legacy/imgloader.h
similarity index 100%
rename from src/skin/imgloader.h
rename to src/skin/legacy/imgloader.h
diff --git a/src/skin/imgsource.h b/src/skin/legacy/imgsource.h
similarity index 100%
rename from src/skin/imgsource.h
rename to src/skin/legacy/imgsource.h
diff --git a/src/skin/launchimage.cpp b/src/skin/legacy/launchimage.cpp
similarity index 98%
rename from src/skin/launchimage.cpp
rename to src/skin/legacy/launchimage.cpp
index 8751ed2495e8..3dff7ba6cf8b 100644
--- a/src/skin/launchimage.cpp
+++ b/src/skin/legacy/launchimage.cpp
@@ -1,4 +1,4 @@
-#include "skin/launchimage.h"
+#include "skin/legacy/launchimage.h"
 
 #include <QHBoxLayout>
 #include <QLabel>
diff --git a/src/skin/launchimage.h b/src/skin/legacy/launchimage.h
similarity index 100%
rename from src/skin/launchimage.h
rename to src/skin/legacy/launchimage.h
diff --git a/src/skin/legacyskinparser.cpp b/src/skin/legacy/legacyskinparser.cpp
similarity index 99%
rename from src/skin/legacyskinparser.cpp
rename to src/skin/legacy/legacyskinparser.cpp
index fa520650de1e..add3060dda30 100644
--- a/src/skin/legacyskinparser.cpp
+++ b/src/skin/legacy/legacyskinparser.cpp
@@ -1,4 +1,4 @@
-#include "skin/legacyskinparser.h"
+#include "skin/legacy/legacyskinparser.h"
 
 #include <QDir>
 #include <QGridLayout>
@@ -21,9 +21,9 @@
 #include "mixer/playermanager.h"
 #include "moc_legacyskinparser.cpp"
 #include "recording/recordingmanager.h"
-#include "skin/colorschemeparser.h"
-#include "skin/launchimage.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/colorschemeparser.h"
+#include "skin/legacy/launchimage.h"
+#include "skin/legacy/skincontext.h"
 #include "util/cmdlineargs.h"
 #include "util/timer.h"
 #include "util/valuetransformer.h"
diff --git a/src/skin/legacyskinparser.h b/src/skin/legacy/legacyskinparser.h
similarity index 98%
rename from src/skin/legacyskinparser.h
rename to src/skin/legacy/legacyskinparser.h
index 95ceba473559..0a703a3818eb 100644
--- a/src/skin/legacyskinparser.h
+++ b/src/skin/legacy/legacyskinparser.h
@@ -9,8 +9,8 @@
 
 #include "preferences/usersettings.h"
 #include "proto/skin.pb.h"
-#include "skin/skinparser.h"
-#include "skin/tooltips.h"
+#include "skin/legacy/skinparser.h"
+#include "skin/legacy/tooltips.h"
 #include "util/memory.h"
 #include "vinylcontrol/vinylcontrolmanager.h"
 
diff --git a/src/skin/pixmapsource.cpp b/src/skin/legacy/pixmapsource.cpp
similarity index 96%
rename from src/skin/pixmapsource.cpp
rename to src/skin/legacy/pixmapsource.cpp
index 97300ee3c938..8b8cb698f3fe 100644
--- a/src/skin/pixmapsource.cpp
+++ b/src/skin/legacy/pixmapsource.cpp
@@ -1,7 +1,7 @@
 #include <QtDebug>
 #include <QCryptographicHash>
 
-#include "skin/pixmapsource.h"
+#include "skin/legacy/pixmapsource.h"
 #include "util/assert.h"
 
 PixmapSource::PixmapSource()
diff --git a/src/skin/pixmapsource.h b/src/skin/legacy/pixmapsource.h
similarity index 100%
rename from src/skin/pixmapsource.h
rename to src/skin/legacy/pixmapsource.h
diff --git a/src/skin/skincontext.cpp b/src/skin/legacy/skincontext.cpp
similarity index 99%
rename from src/skin/skincontext.cpp
rename to src/skin/legacy/skincontext.cpp
index 997666372708..2e4f5b76ef3f 100644
--- a/src/skin/skincontext.cpp
+++ b/src/skin/legacy/skincontext.cpp
@@ -4,8 +4,8 @@
 #include <QAction>
 #include <QScriptValueIterator>
 
-#include "skin/skincontext.h"
-#include "skin/svgparser.h"
+#include "skin/legacy/skincontext.h"
+#include "skin/legacy/svgparser.h"
 #include "util/cmdlineargs.h"
 #include "util/math.h"
 
diff --git a/src/skin/skincontext.h b/src/skin/legacy/skincontext.h
similarity index 99%
rename from src/skin/skincontext.h
rename to src/skin/legacy/skincontext.h
index d043c76d0be8..bb9fc27ed03b 100644
--- a/src/skin/skincontext.h
+++ b/src/skin/legacy/skincontext.h
@@ -13,7 +13,7 @@
 #include <QRegExp>
 
 #include "preferences/usersettings.h"
-#include "skin/pixmapsource.h"
+#include "skin/legacy/pixmapsource.h"
 #include "util/color/color.h"
 #include "widget/wsingletoncontainer.h"
 #include "widget/wpixmapstore.h"
diff --git a/src/skin/skinparser.h b/src/skin/legacy/skinparser.h
similarity index 100%
rename from src/skin/skinparser.h
rename to src/skin/legacy/skinparser.h
diff --git a/src/skin/svgparser.cpp b/src/skin/legacy/svgparser.cpp
similarity index 99%
rename from src/skin/svgparser.cpp
rename to src/skin/legacy/svgparser.cpp
index f1235cf911ff..d69221a60210 100644
--- a/src/skin/svgparser.cpp
+++ b/src/skin/legacy/svgparser.cpp
@@ -2,7 +2,7 @@
 #include <QStringList>
 #include <QScriptValue>
 
-#include "skin/svgparser.h"
+#include "skin/legacy/svgparser.h"
 
 SvgParser::SvgParser(const SkinContext* pParentContext)
         : m_pParentContext(pParentContext),
diff --git a/src/skin/svgparser.h b/src/skin/legacy/svgparser.h
similarity index 95%
rename from src/skin/svgparser.h
rename to src/skin/legacy/svgparser.h
index 273e2372fb81..470a5baab36d 100644
--- a/src/skin/svgparser.h
+++ b/src/skin/legacy/svgparser.h
@@ -4,7 +4,7 @@
 #include <QDomNode>
 #include <QDomElement>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 
 // A class for managing the svg files
diff --git a/src/skin/tooltips.cpp b/src/skin/legacy/tooltips.cpp
similarity index 99%
rename from src/skin/tooltips.cpp
rename to src/skin/legacy/tooltips.cpp
index 37cca0acb10d..81ca02821e60 100644
--- a/src/skin/tooltips.cpp
+++ b/src/skin/legacy/tooltips.cpp
@@ -1,4 +1,4 @@
-#include "skin/tooltips.h"
+#include "skin/legacy/tooltips.h"
 
 #include "moc_tooltips.cpp"
 
diff --git a/src/skin/tooltips.h b/src/skin/legacy/tooltips.h
similarity index 100%
rename from src/skin/tooltips.h
rename to src/skin/legacy/tooltips.h
diff --git a/src/skin/skinloader.cpp b/src/skin/skinloader.cpp
index 8f8d727591ec..d54fbab610ed 100644
--- a/src/skin/skinloader.cpp
+++ b/src/skin/skinloader.cpp
@@ -6,13 +6,13 @@
 #include <QtDebug>
 
 #include "vinylcontrol/vinylcontrolmanager.h"
-#include "skin/legacyskinparser.h"
+#include "skin/legacy/legacyskinparser.h"
 #include "controllers/controllermanager.h"
 #include "library/library.h"
 #include "effects/effectsmanager.h"
 #include "mixer/playermanager.h"
 #include "util/debug.h"
-#include "skin/launchimage.h"
+#include "skin/legacy/launchimage.h"
 #include "util/timer.h"
 #include "recording/recordingmanager.h"
 
diff --git a/src/test/skincontext_test.cpp b/src/test/skincontext_test.cpp
index 2c05e22e1f3c..4f6f6e627038 100644
--- a/src/test/skincontext_test.cpp
+++ b/src/test/skincontext_test.cpp
@@ -1,7 +1,7 @@
 #include <QDomDocument>
 
 #include "test/mixxxtest.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class SkinContextTest : public MixxxTest {
   public:
diff --git a/src/util/valuetransformer.h b/src/util/valuetransformer.h
index 95a46a5bda65..e3069ff2e912 100644
--- a/src/util/valuetransformer.h
+++ b/src/util/valuetransformer.h
@@ -3,7 +3,7 @@
 #include <QList>
 #include <QDomElement>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class TransformNode {
   public:
diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 951fa352fc01..0046640a77ea 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -1,6 +1,6 @@
 #include <QtDebug>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "waveform/renderers/waveformsignalcolors.h"
 #include "widget/wskincolor.h"
 
diff --git a/src/waveform/renderers/waveformmarkrange.cpp b/src/waveform/renderers/waveformmarkrange.cpp
index 93eb207f0b78..b5451edc2657 100644
--- a/src/waveform/renderers/waveformmarkrange.cpp
+++ b/src/waveform/renderers/waveformmarkrange.cpp
@@ -3,7 +3,7 @@
 #include <QPainter>
 #include <QtDebug>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "waveformsignalcolors.h"
 #include "widget/wskincolor.h"
 
diff --git a/src/waveform/renderers/waveformmarkset.h b/src/waveform/renderers/waveformmarkset.h
index 996fd957dd78..2f893ca85dd0 100644
--- a/src/waveform/renderers/waveformmarkset.h
+++ b/src/waveform/renderers/waveformmarkset.h
@@ -3,7 +3,7 @@
 #include <QList>
 
 #include "waveformmark.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/memory.h"
 
 class WaveformWidgetRenderer;
diff --git a/src/waveform/renderers/waveformrenderbackground.h b/src/waveform/renderers/waveformrenderbackground.h
index a877e19ceb49..a2c0461ea451 100644
--- a/src/waveform/renderers/waveformrenderbackground.h
+++ b/src/waveform/renderers/waveformrenderbackground.h
@@ -5,7 +5,7 @@
 #include <QPaintEvent>
 #include <QPainter>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/class.h"
 #include "waveformrendererabstract.h"
 
diff --git a/src/waveform/renderers/waveformrenderbeat.h b/src/waveform/renderers/waveformrenderbeat.h
index 6d3aff520392..439b23c3e454 100644
--- a/src/waveform/renderers/waveformrenderbeat.h
+++ b/src/waveform/renderers/waveformrenderbeat.h
@@ -2,7 +2,7 @@
 
 #include <QColor>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/class.h"
 #include "waveform/renderers/waveformrendererabstract.h"
 
diff --git a/src/waveform/renderers/waveformrendererendoftrack.h b/src/waveform/renderers/waveformrendererendoftrack.h
index fd18f9a0183b..0733f93ae50e 100644
--- a/src/waveform/renderers/waveformrendererendoftrack.h
+++ b/src/waveform/renderers/waveformrendererendoftrack.h
@@ -4,7 +4,7 @@
 #include <QTime>
 //#include <QLinearGradient>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/class.h"
 #include "waveform/renderers/waveformrendererabstract.h"
 #include "waveform/waveformwidgetfactory.h"
diff --git a/src/waveform/renderers/waveformrendererpreroll.h b/src/waveform/renderers/waveformrendererpreroll.h
index 47236275d14e..ee3c6aeb79d0 100644
--- a/src/waveform/renderers/waveformrendererpreroll.h
+++ b/src/waveform/renderers/waveformrendererpreroll.h
@@ -2,7 +2,7 @@
 
 #include <QColor>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/class.h"
 #include "waveform/renderers/waveformrendererabstract.h"
 
diff --git a/src/waveform/renderers/waveformrenderersignalbase.h b/src/waveform/renderers/waveformrenderersignalbase.h
index ea7ec99781e3..8cc8aed0122e 100644
--- a/src/waveform/renderers/waveformrenderersignalbase.h
+++ b/src/waveform/renderers/waveformrenderersignalbase.h
@@ -2,7 +2,7 @@
 
 #include "waveformrendererabstract.h"
 #include "waveformsignalcolors.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class ControlObject;
 class ControlProxy;
diff --git a/src/waveform/renderers/waveformrendermark.h b/src/waveform/renderers/waveformrendermark.h
index 54900ec963ab..1df86471e450 100644
--- a/src/waveform/renderers/waveformrendermark.h
+++ b/src/waveform/renderers/waveformrendermark.h
@@ -2,7 +2,7 @@
 
 #include <QObject>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/class.h"
 #include "util/color/color.h"
 #include "waveform/renderers/waveformmarkset.h"
diff --git a/src/waveform/renderers/waveformrendermarkrange.h b/src/waveform/renderers/waveformrendermarkrange.h
index 63c0b5a234f2..df268e7affef 100644
--- a/src/waveform/renderers/waveformrendermarkrange.h
+++ b/src/waveform/renderers/waveformrendermarkrange.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "preferences/usersettings.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "waveform/renderers/waveformmarkrange.h"
 #include "waveform/renderers/waveformrendererabstract.h"
 
diff --git a/src/waveform/renderers/waveformsignalcolors.h b/src/waveform/renderers/waveformsignalcolors.h
index 30bab4997555..05eb74e0006c 100644
--- a/src/waveform/renderers/waveformsignalcolors.h
+++ b/src/waveform/renderers/waveformsignalcolors.h
@@ -3,7 +3,7 @@
 #include <QColor>
 #include <QDomNode>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class WaveformSignalColors {
   public:
diff --git a/src/waveform/waveformwidgetfactory.h b/src/waveform/waveformwidgetfactory.h
index 8d106347769d..514a1a9402b2 100644
--- a/src/waveform/waveformwidgetfactory.h
+++ b/src/waveform/waveformwidgetfactory.h
@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "preferences/usersettings.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/performancetimer.h"
 #include "util/singleton.h"
 #include "waveform/waveform.h"
diff --git a/src/widget/effectwidgetutils.h b/src/widget/effectwidgetutils.h
index 3d2b2c75a939..65040c67d6a6 100644
--- a/src/widget/effectwidgetutils.h
+++ b/src/widget/effectwidgetutils.h
@@ -6,7 +6,7 @@
 #include "effects/defs.h"
 #include "effects/effectrack.h"
 #include "effects/effectslot.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class EffectWidgetUtils {
   public:
diff --git a/src/widget/paintable.cpp b/src/widget/paintable.cpp
index 073d7ba841ab..18af669b1621 100644
--- a/src/widget/paintable.cpp
+++ b/src/widget/paintable.cpp
@@ -4,7 +4,7 @@
 #include <QString>
 #include <QtDebug>
 
-#include "skin/imgloader.h"
+#include "skin/legacy/imgloader.h"
 
 #include "util/math.h"
 #include "util/memory.h"
diff --git a/src/widget/paintable.h b/src/widget/paintable.h
index 9f3aa591f50e..01126a2e07ea 100644
--- a/src/widget/paintable.h
+++ b/src/widget/paintable.h
@@ -10,8 +10,8 @@
 #include <QRectF>
 #include <QString>
 
-#include "skin/imgsource.h"
-#include "skin/pixmapsource.h"
+#include "skin/legacy/imgsource.h"
+#include "skin/legacy/pixmapsource.h"
 
 // Wrapper around QImage and QSvgRenderer to support rendering SVG images in
 // high fidelity.
diff --git a/src/widget/wbattery.h b/src/widget/wbattery.h
index e645a8184a7b..1698e9a037c5 100644
--- a/src/widget/wbattery.h
+++ b/src/widget/wbattery.h
@@ -5,7 +5,7 @@
 #include <QScopedPointer>
 #include <QVector>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "widget/wlabel.h"
 #include "widget/wpixmapstore.h"
 #include "widget/wwidget.h"
diff --git a/src/widget/wbeatspinbox.h b/src/widget/wbeatspinbox.h
index 6800d15da5f3..c88a990d6fde 100644
--- a/src/widget/wbeatspinbox.h
+++ b/src/widget/wbeatspinbox.h
@@ -3,7 +3,7 @@
 #include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "widget/wbasewidget.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include <QDoubleSpinBox>
 #include <QLineEdit>
 
diff --git a/src/widget/wcombobox.h b/src/widget/wcombobox.h
index b871419a5a5d..1d0395458dff 100644
--- a/src/widget/wcombobox.h
+++ b/src/widget/wcombobox.h
@@ -5,7 +5,7 @@
 #include <QEvent>
 
 #include "widget/wbasewidget.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class WComboBox : public QComboBox, public WBaseWidget {
     Q_OBJECT
diff --git a/src/widget/wcoverart.h b/src/widget/wcoverart.h
index 5888513abc41..766479c4c280 100644
--- a/src/widget/wcoverart.h
+++ b/src/widget/wcoverart.h
@@ -9,7 +9,7 @@
 #include "mixer/basetrackplayer.h"
 #include "preferences/usersettings.h"
 #include "library/coverartcache.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "widget/trackdroptarget.h"
 #include "widget/wbasewidget.h"
 #include "widget/wcoverartmenu.h"
diff --git a/src/widget/wdisplay.h b/src/widget/wdisplay.h
index 0aca733810c5..988101012e6c 100644
--- a/src/widget/wdisplay.h
+++ b/src/widget/wdisplay.h
@@ -7,7 +7,7 @@
 
 #include "widget/wwidget.h"
 #include "widget/wpixmapstore.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class WDisplay : public WWidget {
    Q_OBJECT
diff --git a/src/widget/weffect.h b/src/widget/weffect.h
index 8334a1cd5fc8..02bc7afd83b1 100644
--- a/src/widget/weffect.h
+++ b/src/widget/weffect.h
@@ -4,7 +4,7 @@
 
 #include "widget/wlabel.h"
 #include "effects/effectslot.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class EffectsManager;
 
diff --git a/src/widget/weffectbuttonparameter.h b/src/widget/weffectbuttonparameter.h
index 5b204efc8a3a..d7b6b49e8bcf 100644
--- a/src/widget/weffectbuttonparameter.h
+++ b/src/widget/weffectbuttonparameter.h
@@ -4,7 +4,7 @@
 
 #include "widget/wlabel.h"
 #include "widget/weffectparameterbase.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class EffectsManager;
 
diff --git a/src/widget/weffectchain.h b/src/widget/weffectchain.h
index 2bfa9658c6b8..829fc8daffd1 100644
--- a/src/widget/weffectchain.h
+++ b/src/widget/weffectchain.h
@@ -6,7 +6,7 @@
 
 #include "effects/effectchainslot.h"
 #include "widget/wlabel.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class EffectsManager;
 
diff --git a/src/widget/weffectparameter.h b/src/widget/weffectparameter.h
index 1dd8265d622c..11ffc8ada8ae 100644
--- a/src/widget/weffectparameter.h
+++ b/src/widget/weffectparameter.h
@@ -4,7 +4,7 @@
 
 #include "widget/wlabel.h"
 #include "widget/weffectparameterbase.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class EffectsManager;
 
diff --git a/src/widget/weffectparameterbase.h b/src/widget/weffectparameterbase.h
index 18acf5e1c517..b086942daa2f 100644
--- a/src/widget/weffectparameterbase.h
+++ b/src/widget/weffectparameterbase.h
@@ -4,7 +4,7 @@
 
 #include "widget/wlabel.h"
 #include "effects/effectparameterslotbase.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class EffectsManager;
 
diff --git a/src/widget/weffectpushbutton.h b/src/widget/weffectpushbutton.h
index 63f5366a7407..8a5bafbec9c1 100644
--- a/src/widget/weffectpushbutton.h
+++ b/src/widget/weffectpushbutton.h
@@ -9,7 +9,7 @@
 #include "widget/wpushbutton.h"
 #include "effects/effectsmanager.h"
 #include "effects/defs.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class WEffectPushButton : public WPushButton {
     Q_OBJECT
diff --git a/src/widget/weffectselector.h b/src/widget/weffectselector.h
index dd358af06728..2b7fb5a71e7b 100644
--- a/src/widget/weffectselector.h
+++ b/src/widget/weffectselector.h
@@ -4,7 +4,7 @@
 #include <QComboBox>
 #include "effects/effectrack.h"
 #include "effects/effectslot.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class EffectsManager;
 
diff --git a/src/widget/whotcuebutton.h b/src/widget/whotcuebutton.h
index 1f3ecd7bdbc5..7be8827da3b4 100644
--- a/src/widget/whotcuebutton.h
+++ b/src/widget/whotcuebutton.h
@@ -4,7 +4,7 @@
 #include <QMouseEvent>
 #include <QWidget>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/parented_ptr.h"
 #include "widget/wcuemenupopup.h"
 #include "widget/wpushbutton.h"
diff --git a/src/widget/wimagestore.cpp b/src/widget/wimagestore.cpp
index a6bb4edc58e3..b6c6cd7f4eba 100644
--- a/src/widget/wimagestore.cpp
+++ b/src/widget/wimagestore.cpp
@@ -4,7 +4,7 @@
 #include <QSvgRenderer>
 #include <QPainter>
 
-#include "skin/imgloader.h"
+#include "skin/legacy/imgloader.h"
 #include "util/assert.h"
 
 
diff --git a/src/widget/wimagestore.h b/src/widget/wimagestore.h
index 249356a3ad97..0edb181904a6 100644
--- a/src/widget/wimagestore.h
+++ b/src/widget/wimagestore.h
@@ -5,8 +5,8 @@
 #include <QSharedPointer>
 #include <unordered_map>
 
-#include "skin/imgsource.h"
-#include "skin/pixmapsource.h"
+#include "skin/legacy/imgsource.h"
+#include "skin/legacy/pixmapsource.h"
 #include "util/memory.h"
 
 class WImageStore {
diff --git a/src/widget/wknobcomposed.h b/src/widget/wknobcomposed.h
index 789e2d1dbf0e..ee39f5615ce2 100644
--- a/src/widget/wknobcomposed.h
+++ b/src/widget/wknobcomposed.h
@@ -5,7 +5,7 @@
 #include <QMouseEvent>
 #include <QWheelEvent>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/widgetrendertimer.h"
 #include "widget/wwidget.h"
 #include "widget/knobeventhandler.h"
diff --git a/src/widget/wlabel.h b/src/widget/wlabel.h
index d29bfe8b811d..0b061d89687e 100644
--- a/src/widget/wlabel.h
+++ b/src/widget/wlabel.h
@@ -4,7 +4,7 @@
 #include <QEvent>
 
 #include "widget/wbasewidget.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class WLabel : public QLabel, public WBaseWidget {
     Q_OBJECT
diff --git a/src/widget/wlibrary.h b/src/widget/wlibrary.h
index ea47661538b0..9875a0e066b5 100644
--- a/src/widget/wlibrary.h
+++ b/src/widget/wlibrary.h
@@ -7,7 +7,7 @@
 #include <QEvent>
 
 #include "library/libraryview.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "widget/wbasewidget.h"
 
 class KeyboardEventFilter;
diff --git a/src/widget/wnumber.h b/src/widget/wnumber.h
index 780b8f2ba768..0aaeffc7554f 100644
--- a/src/widget/wnumber.h
+++ b/src/widget/wnumber.h
@@ -3,7 +3,7 @@
 #include <QLabel>
 
 #include "widget/wlabel.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class WNumber : public WLabel  {
     Q_OBJECT
diff --git a/src/widget/wnumberdb.h b/src/widget/wnumberdb.h
index e8f7a1b66105..61295a0a6fab 100644
--- a/src/widget/wnumberdb.h
+++ b/src/widget/wnumberdb.h
@@ -3,7 +3,7 @@
 #include <QLabel>
 
 #include "widget/wnumber.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class WNumberDb : public WNumber {
     Q_OBJECT
diff --git a/src/widget/woverview.h b/src/widget/woverview.h
index 560d641caebb..5e61249853a7 100644
--- a/src/widget/woverview.h
+++ b/src/widget/woverview.h
@@ -18,7 +18,7 @@
 #include <QPixmap>
 
 #include "analyzer/analyzerprogress.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "track/track_decl.h"
 #include "util/color/color.h"
 #include "util/parented_ptr.h"
diff --git a/src/widget/wpixmapstore.cpp b/src/widget/wpixmapstore.cpp
index bf007dce2334..519e150394c3 100644
--- a/src/widget/wpixmapstore.cpp
+++ b/src/widget/wpixmapstore.cpp
@@ -5,7 +5,7 @@
 #include <QtDebug>
 
 #include "util/math.h"
-#include "skin/imgloader.h"
+#include "skin/legacy/imgloader.h"
 
 // static
 QHash<QString, WeakPaintablePointer> WPixmapStore::m_paintableCache;
diff --git a/src/widget/wpixmapstore.h b/src/widget/wpixmapstore.h
index bab91657c575..46be3fcbdc37 100644
--- a/src/widget/wpixmapstore.h
+++ b/src/widget/wpixmapstore.h
@@ -10,8 +10,8 @@
 #include <QRectF>
 #include <QString>
 
-#include "skin/imgsource.h"
-#include "skin/pixmapsource.h"
+#include "skin/legacy/imgsource.h"
+#include "skin/legacy/pixmapsource.h"
 #include "widget/paintable.h"
 
 
diff --git a/src/widget/wpushbutton.h b/src/widget/wpushbutton.h
index 6a644a956f6a..b5977f76990a 100644
--- a/src/widget/wpushbutton.h
+++ b/src/widget/wpushbutton.h
@@ -9,7 +9,7 @@
 #include <QVector>
 
 #include "control/controlpushbutton.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/fpclassify.h"
 #include "widget/controlwidgetconnection.h"
 #include "widget/wpixmapstore.h"
diff --git a/src/widget/wrecordingduration.h b/src/widget/wrecordingduration.h
index a67821bf84c8..2fb545372ee2 100644
--- a/src/widget/wrecordingduration.h
+++ b/src/widget/wrecordingduration.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "widget/wlabel.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "recording/recordingmanager.h"
 
 class WRecordingDuration: public WLabel {
diff --git a/src/widget/wsearchlineedit.cpp b/src/widget/wsearchlineedit.cpp
index e77352f88f87..779427d5f7d2 100644
--- a/src/widget/wsearchlineedit.cpp
+++ b/src/widget/wsearchlineedit.cpp
@@ -5,7 +5,7 @@
 #include <QStyle>
 
 #include "moc_wsearchlineedit.cpp"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/assert.h"
 #include "util/logger.h"
 #include "wskincolor.h"
diff --git a/src/widget/wsingletoncontainer.cpp b/src/widget/wsingletoncontainer.cpp
index 7e390c852f70..225e2c5ce5b5 100644
--- a/src/widget/wsingletoncontainer.cpp
+++ b/src/widget/wsingletoncontainer.cpp
@@ -3,7 +3,7 @@
 #include <QLayout>
 
 #include "moc_wsingletoncontainer.cpp"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/assert.h"
 #include "widget/wlibrary.h"
 
diff --git a/src/widget/wskincolor.cpp b/src/widget/wskincolor.cpp
index d1c0357431b5..f5ee17de48f1 100644
--- a/src/widget/wskincolor.cpp
+++ b/src/widget/wskincolor.cpp
@@ -1,6 +1,6 @@
 #include "wskincolor.h"
 
-#include "skin/imgloader.h"
+#include "skin/legacy/imgloader.h"
 
 QSharedPointer<ImgSource> WSkinColor::loader
     = QSharedPointer<ImgSource>(new ImgLoader());
diff --git a/src/widget/wskincolor.h b/src/widget/wskincolor.h
index 687a6597cfd6..9df081ee84e7 100644
--- a/src/widget/wskincolor.h
+++ b/src/widget/wskincolor.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <QSharedPointer>
-#include "skin/imgsource.h"
+#include "skin/legacy/imgsource.h"
 
 class WSkinColor {
   public:
diff --git a/src/widget/wslidercomposed.h b/src/widget/wslidercomposed.h
index a79cda8127a1..971964c1410d 100644
--- a/src/widget/wslidercomposed.h
+++ b/src/widget/wslidercomposed.h
@@ -8,7 +8,7 @@
 #include <QMouseEvent>
 #include <QResizeEvent>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/widgetrendertimer.h"
 #include "widget/slidereventhandler.h"
 #include "widget/wwidget.h"
diff --git a/src/widget/wspinny.h b/src/widget/wspinny.h
index 3ce401d61f2d..acfb54f1c094 100644
--- a/src/widget/wspinny.h
+++ b/src/widget/wspinny.h
@@ -8,7 +8,7 @@
 #include "library/dlgcoverartfullsize.h"
 #include "mixer/basetrackplayer.h"
 #include "preferences/usersettings.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "track/track_decl.h"
 #include "vinylcontrol/vinylsignalquality.h"
 #include "widget/trackdroptarget.h"
diff --git a/src/widget/wsplitter.h b/src/widget/wsplitter.h
index bf5f76435505..af87706a41f4 100644
--- a/src/widget/wsplitter.h
+++ b/src/widget/wsplitter.h
@@ -5,7 +5,7 @@
 #include <QSplitter>
 
 #include "preferences/usersettings.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "widget/wbasewidget.h"
 
 class WSplitter : public QSplitter, public WBaseWidget {
diff --git a/src/widget/wstarrating.h b/src/widget/wstarrating.h
index 805febc598ef..2936f0115e83 100644
--- a/src/widget/wstarrating.h
+++ b/src/widget/wstarrating.h
@@ -6,7 +6,7 @@
 
 #include "control/controlpushbutton.h"
 #include "library/starrating.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "track/track_decl.h"
 #include "track/trackid.h"
 #include "widget/wwidget.h"
diff --git a/src/widget/wstatuslight.h b/src/widget/wstatuslight.h
index 41fabdf53e86..42206b24ce4b 100644
--- a/src/widget/wstatuslight.h
+++ b/src/widget/wstatuslight.h
@@ -9,7 +9,7 @@
 
 #include "widget/wwidget.h"
 #include "widget/wpixmapstore.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 /// A general purpose status light for indicating boolean events.
 class WStatusLight : public WWidget  {
diff --git a/src/widget/wtime.h b/src/widget/wtime.h
index d82cc708e140..ebae01695082 100644
--- a/src/widget/wtime.h
+++ b/src/widget/wtime.h
@@ -6,7 +6,7 @@
 #include <QTimer>
 
 #include "widget/wlabel.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class WTime: public WLabel {
     Q_OBJECT
diff --git a/src/widget/wtrackproperty.h b/src/widget/wtrackproperty.h
index 2a8b3e2d0a0f..26398334b3f5 100644
--- a/src/widget/wtrackproperty.h
+++ b/src/widget/wtrackproperty.h
@@ -5,7 +5,7 @@
 #include <QMouseEvent>
 
 #include "preferences/usersettings.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "track/track_decl.h"
 #include "track/trackid.h"
 #include "util/parented_ptr.h"
diff --git a/src/widget/wtrackwidgetgroup.h b/src/widget/wtrackwidgetgroup.h
index 761d3fb0ecf3..d30172fcb265 100644
--- a/src/widget/wtrackwidgetgroup.h
+++ b/src/widget/wtrackwidgetgroup.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "track/track_decl.h"
 #include "track/trackid.h"
 #include "util/parented_ptr.h"
diff --git a/src/widget/wvumeter.h b/src/widget/wvumeter.h
index d88a4fc79029..988f0c463e3a 100644
--- a/src/widget/wvumeter.h
+++ b/src/widget/wvumeter.h
@@ -8,7 +8,7 @@
 
 #include "widget/wwidget.h"
 #include "widget/wpixmapstore.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/performancetimer.h"
 
 class WVuMeter : public WWidget  {
diff --git a/src/widget/wwaveformviewer.h b/src/widget/wwaveformviewer.h
index 14d88320c4dd..f2cfcb778178 100644
--- a/src/widget/wwaveformviewer.h
+++ b/src/widget/wwaveformviewer.h
@@ -7,7 +7,7 @@
 #include <QList>
 #include <QMutex>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "track/track_decl.h"
 #include "util/parented_ptr.h"
 #include "waveform/renderers/waveformmark.h"
diff --git a/src/widget/wwidgetgroup.cpp b/src/widget/wwidgetgroup.cpp
index b6838915dfb7..32a4d14de237 100644
--- a/src/widget/wwidgetgroup.cpp
+++ b/src/widget/wwidgetgroup.cpp
@@ -6,7 +6,7 @@
 #include <QStylePainter>
 
 #include "moc_wwidgetgroup.cpp"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/debug.h"
 #include "widget/wpixmapstore.h"
 #include "widget/wwidget.h"