diff --git a/src/eepp/ui/uitextnode.cpp b/src/eepp/ui/uitextnode.cpp
index 446a86d38..6c5c1757d 100644
--- a/src/eepp/ui/uitextnode.cpp
+++ b/src/eepp/ui/uitextnode.cpp
@@ -45,6 +45,14 @@ std::string UITextNode::getPropertyString( const PropertyDefinition* propertyDef
 			break;
 	}
 
+	const StyleSheetProperty* prop = getUIStyle()->getProperty( propertyDef->getPropertyId() );
+	if ( prop )
+		return prop->value();
+
+	if ( propertyDef->isInherited() && getParent() && getParent()->isWidget() )
+		return static_cast<UIWidget*>( getParent() )
+			->getPropertyString( propertyDef, propertyIndex );
+
 	return UIWidget::getPropertyString( propertyDef, propertyIndex );
 }
 
diff --git a/src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp b/src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp
index b7553e162..a781e097b 100644
--- a/src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp
+++ b/src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp
@@ -541,7 +541,12 @@ int TerminalDisplay::resetColor( const Uint32& index, const char* name ) {
 				}
 			}
 		}
-	} else {
+	} else if ( String::iequals( "default", name ) ) {
+		unsigned char r, g, b;
+		getColor( index, &r, &g, &b );
+		col = Color( r, g, b, 255 );
+		colorParsed = true;
+	} else if ( Color::isColorString( std::string_view{ name }, true ) ) {
 		col = Color::fromString( name );
 		colorParsed = true;
 	}
diff --git a/src/thirdparty/efsw b/src/thirdparty/efsw
index deaeca387..347397c0e 160000
--- a/src/thirdparty/efsw
+++ b/src/thirdparty/efsw
@@ -1 +1 @@
-Subproject commit deaeca387572e26e07f4504757a7a75b373c5b26
+Subproject commit 347397c0e36165326d445379a06105d3c02e1244