diff --git a/Rectify11Installer/Core/Backend/Themes.cs b/Rectify11Installer/Core/Backend/Themes.cs
index dba49d862..a289e0b9e 100644
--- a/Rectify11Installer/Core/Backend/Themes.cs
+++ b/Rectify11Installer/Core/Backend/Themes.cs
@@ -334,6 +334,9 @@ private static void InstallMfe()
             Helper.SafeDirectoryDeletion(path, false);
             string t = InstallOptions.TabbedNotMica ? "T" : "";
             string val = "";
+
+            // TODO: Use CRectifyUtil
+
             if (InstallOptions.ThemeLight) val = t + "lightrectified.conf";
             else if (InstallOptions.ThemeDark) val = t + "darkrectified.conf";
             else if (InstallOptions.ThemePDark) val = t + "darkrectified.conf";
diff --git a/RectifyControlPanel2 b/RectifyControlPanel2
index 01146292e..8b1f694f7 160000
--- a/RectifyControlPanel2
+++ b/RectifyControlPanel2
@@ -1 +1 @@
-Subproject commit 01146292ec2fcbdf77c4ae1644a0a6472e29ae06
+Subproject commit 8b1f694f7ae0f64bdfe2e7682d99b30b4551a237