diff --git a/bin/app/data/color_schemes/bad_rainbow.xml b/bin/app/data/color_schemes/bad_rainbow.xml
index cbe55b37..4c02b6b1 100644
--- a/bin/app/data/color_schemes/bad_rainbow.xml
+++ b/bin/app/data/color_schemes/bad_rainbow.xml
@@ -383,7 +383,7 @@
 					<normal>transparent</normal>
 				</fill>
 				<text>
-					<normal>white</normal>
+					<normal>#B1B1B1</normal>
 				</text>
 			</text>
 		</node>
@@ -455,7 +455,7 @@
 		<hover>#878787</hover>
 		<text>#878787</text>
 	</tab>
-	
+
 	<bookmark>
 		<button>
 			<icon>black</icon>
@@ -463,5 +463,5 @@
 			<icon_hover>white</icon_hover>
 		</button>
 	</bookmark>
-	
+
 </config>
diff --git a/bin/app/data/color_schemes/bright.xml b/bin/app/data/color_schemes/bright.xml
index fcc87ba3..d0393f60 100644
--- a/bin/app/data/color_schemes/bright.xml
+++ b/bin/app/data/color_schemes/bright.xml
@@ -354,7 +354,7 @@
 					<normal>transparent</normal>
 				</fill>
 				<text>
-					<normal>black</normal>
+					<normal>#B2B2B2</normal>
 				</text>
 			</text>
 		</node>
diff --git a/bin/app/data/color_schemes/dark.xml b/bin/app/data/color_schemes/dark.xml
index dc0db031..3eed9e97 100644
--- a/bin/app/data/color_schemes/dark.xml
+++ b/bin/app/data/color_schemes/dark.xml
@@ -357,7 +357,7 @@
 					<normal>transparent</normal>
 				</fill>
 				<text>
-					<normal>white</normal>
+					<normal>#777777</normal>
 				</text>
 			</text>
 		</node>
@@ -429,7 +429,7 @@
 		<hover>#878787</hover>
 		<text>#878787</text>
 	</tab>
-	
+
 	<bookmark>
 		<button>
 			<icon>black</icon>
@@ -437,5 +437,5 @@
 			<icon_hover>white</icon_hover>
 		</button>
 	</bookmark>
-	
+
 </config>
diff --git a/setup/MacOSX/bundle_install.sh.in b/setup/MacOSX/bundle_install.sh.in
index bde9eaa5..322a7bd4 100755
--- a/setup/MacOSX/bundle_install.sh.in
+++ b/setup/MacOSX/bundle_install.sh.in
@@ -90,6 +90,8 @@ mkdir -p $RES_DIR/user/log
 cp ../../../bin/app/user/window_settings.ini $RES_DIR/user/window_settings.ini
 cp ../../../bin/app/data/fallback/ApplicationSettings.xml $RES_DIR/user/ApplicationSettings.xml
 
+cp -R ../../../bin/app/data/3rd_party_licenses $BIN_DIR/3rd_party_licenses
+
 echo -e $INFO "Copying dynamic libraries."
 for LIB_PATH in ${DYNLIB_PATHS[@]}
 do
diff --git a/src/lib/component/controller/GraphController.cpp b/src/lib/component/controller/GraphController.cpp
index 5c18b97b..94d8bc6e 100644
--- a/src/lib/component/controller/GraphController.cpp
+++ b/src/lib/component/controller/GraphController.cpp
@@ -746,7 +746,9 @@ void GraphController::bundleNodes()
 	bool fileOrMacroActive = false;
 	for (std::shared_ptr<DummyNode> node : m_dummyNodes)
 	{
-		if (node->bundleInfo.isActive && node->data->isType(Node::NODE_FILE | Node::NODE_MACRO))
+		if (node->bundleInfo.isActive && (
+			node->data->isType(Node::NODE_FILE | Node::NODE_MACRO) ||
+			node->data->findEdgeOfType(Edge::EDGE_INCLUDE | Edge::EDGE_MACRO_USAGE) != nullptr))
 		{
 			fileOrMacroActive = true;
 			break;