diff --git a/plugins/Cardinal/src/AudioFile.cpp b/plugins/Cardinal/src/AudioFile.cpp
index 5bec077..699cb59 100644
--- a/plugins/Cardinal/src/AudioFile.cpp
+++ b/plugins/Cardinal/src/AudioFile.cpp
@@ -541,10 +541,10 @@ struct AudioFileWidget : ModuleWidgetWithSideScrews<23> {
         setModule(module);
         setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/AudioFile.svg")));
 
-        addChild(createWidget<ScrewBlack>(Vec(RACK_GRID_WIDTH, 0)));
-        addChild(createWidget<ScrewBlack>(Vec(box.size.x - 4 * RACK_GRID_WIDTH, 0)));
-        addChild(createWidget<ScrewBlack>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
-        addChild(createWidget<ScrewBlack>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
+        addChild(createWidget<ThemedScrew>(Vec(RACK_GRID_WIDTH, 0)));
+        addChild(createWidget<ThemedScrew>(Vec(box.size.x - 4 * RACK_GRID_WIDTH, 0)));
+        addChild(createWidget<ThemedScrew>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
+        addChild(createWidget<ThemedScrew>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
 
         addOutput(createOutput<PJ301MPort>(Vec(startX_Out, startY_list * 0.5f - padding + 2.0f), module, 0));
         addOutput(createOutput<PJ301MPort>(Vec(startX_Out, startY_list * 0.5f + 2.0f), module, 1));
diff --git a/plugins/Cardinal/src/ExpanderInputMIDI.cpp b/plugins/Cardinal/src/ExpanderInputMIDI.cpp
index 921130f..61dc369 100644
--- a/plugins/Cardinal/src/ExpanderInputMIDI.cpp
+++ b/plugins/Cardinal/src/ExpanderInputMIDI.cpp
@@ -303,8 +303,8 @@ struct CardinalExpanderForInputMIDIWidget : ModuleWidgetWith3HP {
         setModule(m);
         setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ExpanderMIDI.svg")));
 
-        addChild(createWidget<ScrewBlack>(Vec(RACK_GRID_WIDTH, 0)));
-        addChild(createWidget<ScrewBlack>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
+        addChild(createWidget<ThemedScrew>(Vec(RACK_GRID_WIDTH, 0)));
+        addChild(createWidget<ThemedScrew>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
 
         for (int i=0; i<CardinalExpanderForInputMIDI::NUM_INPUTS; ++i)
             addInput(createInput<PJ301MPort>(Vec(startX + 4.0f, startY + padding * i), m, i));
diff --git a/plugins/Cardinal/src/ExpanderOutputMIDI.cpp b/plugins/Cardinal/src/ExpanderOutputMIDI.cpp
index 776ff83..ce583ce 100644
--- a/plugins/Cardinal/src/ExpanderOutputMIDI.cpp
+++ b/plugins/Cardinal/src/ExpanderOutputMIDI.cpp
@@ -507,8 +507,8 @@ struct CardinalExpanderForOutputMIDIWidget : ModuleWidgetWith3HP {
         setModule(m);
         setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ExpanderMIDI.svg")));
 
-        addChild(createWidget<ScrewBlack>(Vec(RACK_GRID_WIDTH, 0)));
-        addChild(createWidget<ScrewBlack>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
+        addChild(createWidget<ThemedScrew>(Vec(RACK_GRID_WIDTH, 0)));
+        addChild(createWidget<ThemedScrew>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
 
         for (int i=0; i<CardinalExpanderForOutputMIDI::NUM_OUTPUTS; ++i)
             addOutput(createOutput<PJ301MPort>(Vec(startX + 4.0f, startY + padding * i), m, i));
diff --git a/plugins/Cardinal/src/ModuleWidgets.hpp b/plugins/Cardinal/src/ModuleWidgets.hpp
index 3541cea..8c8c0b3 100644
--- a/plugins/Cardinal/src/ModuleWidgets.hpp
+++ b/plugins/Cardinal/src/ModuleWidgets.hpp
@@ -55,15 +55,15 @@ struct ModuleWidgetWithSideScrews : ModuleWidget {
 
     void createAndAddScrews() {
         if (hp > 3) {
-            addChild(createWidget<ScrewBlack>(Vec(RACK_GRID_WIDTH, 0)));
-            addChild(createWidget<ScrewBlack>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));
-            addChild(createWidget<ScrewBlack>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
-            addChild(createWidget<ScrewBlack>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
+            addChild(createWidget<ThemedScrew>(Vec(RACK_GRID_WIDTH, 0)));
+            addChild(createWidget<ThemedScrew>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));
+            addChild(createWidget<ThemedScrew>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
+            addChild(createWidget<ThemedScrew>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
         } else {
-            addChild(createWidget<ScrewBlack>(Vec(0, 0)));
-            addChild(createWidget<ScrewBlack>(Vec(box.size.x - RACK_GRID_WIDTH, 0)));
-            addChild(createWidget<ScrewBlack>(Vec(0, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
-            addChild(createWidget<ScrewBlack>(Vec(box.size.x - RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
+            addChild(createWidget<ThemedScrew>(Vec(0, 0)));
+            addChild(createWidget<ThemedScrew>(Vec(box.size.x - RACK_GRID_WIDTH, 0)));
+            addChild(createWidget<ThemedScrew>(Vec(0, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
+            addChild(createWidget<ThemedScrew>(Vec(box.size.x - RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
         }
     }
 
diff --git a/src/custom/dep.cpp b/src/custom/dep.cpp
index a7fd1e2..ad14bbf 100644
--- a/src/custom/dep.cpp
+++ b/src/custom/dep.cpp
@@ -1310,25 +1310,6 @@ NSVGimage* nsvgParseFromFileCardinal(const char* const filename, const char* con
             goto postparse;
         }
 
-        // Special case for light/dark screws
-        if (std::strncmp(filename + (filenamelen-15), "/ScrewBlack.svg", 15) == 0 && filename[filenamelen-16] != '.')
-        {
-            const std::string silverfilename = std::string(filename).substr(0, filenamelen-9) + "Silver.svg";
-            hasLightMode = true;
-            shapesOrig = shapesMOD = nullptr;
-            handleMOD = nsvgParseFromFile(silverfilename.c_str(), units, dpi);
-            goto postparse;
-        }
-
-        if (std::strncmp(filename + (filenamelen-16), "/ScrewSilver.svg", 16) == 0 && filename[filenamelen-17] != '.')
-        {
-            const std::string blackfilename = std::string(filename).substr(0, filenamelen-10) + "Black.svg";
-            hasDarkMode = true;
-            shapesOrig = shapesMOD = nullptr;
-            handleMOD = nsvgParseFromFile(blackfilename.c_str(), units, dpi);
-            goto postparse;
-        }
-
 #if 0
         // Special case for GlueTheGiant
         if (std::strstr(filename, "/GlueTheGiant/res/") != nullptr)