diff --git a/CHANGELOG.md b/CHANGELOG.md
index e25be975..b85ef5c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - fixed icon overlay issue with high DPI scaling
 - fixed behaviour on multiple selection (thanks okrc) [#2903](https://github.com/sandboxie-plus/Sandboxie/pull/2903)
 - fixed issue with default box grouping (thanks okrc) [#2910](https://github.com/sandboxie-plus/Sandboxie/pull/2910)
+- fixed The checkbox for the Open System Protected Storage setting appears to be unchecked [#2866](https://github.com/sandboxie-plus/Sandboxie/issues/2866)
+- fixed Firewall Rules - Colors make testing difficult in dark mode [#2900](https://github.com/sandboxie-plus/Sandboxie/issues/2900)
 
 
 
@@ -36,7 +38,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - added global setting to disable overlay icons
 - added ability to specify Sandboxie.ini location in registry
   - open "HKLM\SYSTEM\CurrentControlSet\Services\SbieDrv" and set "IniPath" [#2837](https://github.com/sandboxie-plus/Sandboxie/issues/2837)
-  - use a REG_SZ string for the path, like "\\??\C:\my_path\my_sandboxie.ini"
+  - use a REG_SZ string for the path, like "\??\C:\my_path\my_sandboxie.ini"
 
 ### Changed
 - improved handling of DLL injection failure
diff --git a/SandboxiePlus/SandMan/Windows/OptionsNetwork.cpp b/SandboxiePlus/SandMan/Windows/OptionsNetwork.cpp
index f442f55e..39a27909 100644
--- a/SandboxiePlus/SandMan/Windows/OptionsNetwork.cpp
+++ b/SandboxiePlus/SandMan/Windows/OptionsNetwork.cpp
@@ -680,27 +680,29 @@ void COptionsWindow::OnDelNetFwRule()
 
 void COptionsWindow__SetRowColor(QTreeWidgetItem* pItem, bool bMatch, bool bConflict = false, bool bBlock = false, bool bActive = false)
 {
+	#define setColor(i, b) theGUI->m_DarkTheme ? pItem->setForeground(i, b) : pItem->setBackground(i, b)
+
 	for (int i = 0; i < pItem->columnCount(); i++)
 	{
 		if (!bMatch)
 		{
-			pItem->setBackground(i, Qt::white); // todo dark mode
+			setColor(i, Qt::white);
 		}
 		else if(bConflict)
-			pItem->setBackground(i, QColor(255, 255, 0)); // yellow
+			setColor(i, QColor(255, 255, 0)); // yellow
 		else if (!bBlock)
 		{
 			if (bActive)
-				pItem->setBackground(i, QColor(128, 255, 128)); // dark green
+				setColor(i, QColor(128, 255, 128)); // dark green
 			else
-				pItem->setBackground(i, QColor(224, 240, 224)); // light green
+				setColor(i, QColor(224, 240, 224)); // light green
 		}
 		else
 		{
 			if (bActive)
-				pItem->setBackground(i, QColor(255, 128, 128)); // dark red
+				setColor(i, QColor(255, 128, 128)); // dark red
 			else
-				pItem->setBackground(i, QColor(240, 224, 224)); // light red
+				setColor(i, QColor(240, 224, 224)); // light red
 		}
 	}
 }
diff --git a/SandboxiePlus/SandMan/Windows/OptionsWindow.cpp b/SandboxiePlus/SandMan/Windows/OptionsWindow.cpp
index 58ba7bea..81e320d2 100644
--- a/SandboxiePlus/SandMan/Windows/OptionsWindow.cpp
+++ b/SandboxiePlus/SandMan/Windows/OptionsWindow.cpp
@@ -779,6 +779,8 @@ void COptionsWindow::LoadConfig()
 
 	m_HoldChange = true;
 
+	LoadTemplates();
+
 	LoadGeneral();
 
 	LoadGroups();
@@ -798,8 +800,6 @@ void COptionsWindow::LoadConfig()
 
 	LoadAdvanced();
 	LoadDebug();
-
-	LoadTemplates();
 	
 	UpdateBoxType();