diff --git a/plantuml/default-skin.ipu b/plantuml/default-skin.ipu
index 1f6ec13..59ead1a 100644
--- a/plantuml/default-skin.ipu
+++ b/plantuml/default-skin.ipu
@@ -21,10 +21,6 @@
 
 	Artifact {
 
-        ' for some reason half of the elements for deployment diagrams have a black border
-        ' instead of the default reddish
-		BorderColor #A80036
-
 		' make stereotypes less ugly
 		Stereotype {
 			Font {
@@ -37,10 +33,6 @@
 
 	Card {
 
-        ' for some reason half of the elements for deployment diagrams have a black border
-        ' instead of the default reddish
-		BorderColor #A80036
-
 		' make stereotypes less ugly
 		Stereotype {
 			Font {
@@ -53,10 +45,6 @@
 
 	Cloud {
 
-        ' for some reason half of the elements for deployment diagrams have a black border
-        ' instead of the default reddish
-		BorderColor #A80036
-
 		' make stereotypes less ugly
 		Stereotype {
 			Font {
@@ -69,9 +57,9 @@
 
 	Database {
 
-        ' for some reason half of the elements for deployment diagrams have a black border
-        ' instead of the default reddish
-		BorderColor #A80036
+        ' Databases default to a black border, which is fine in deployment
+        ' diagrams, but can look a bit out of place in other contexts.
+		' DatabaseBorderColor #A80036 will fix it when needed.
 
 		' make stereotypes less ugly
 		Stereotype {
@@ -85,10 +73,6 @@
 
 	File {
 
-        ' for some reason half of the elements for deployment diagrams have a black border
-        ' instead of the default reddish
-		BorderColor #A80036
-
 		' make stereotypes less ugly
 		Stereotype {
 			Font {
@@ -101,10 +85,6 @@
 
 	Folder {
 
-        ' for some reason half of the elements for deployment diagrams have a black border
-        ' instead of the default reddish
-		BorderColor #A80036
-
 		' make stereotypes less ugly
 		Stereotype {
 			Font {
@@ -117,10 +97,6 @@
 
 	Frame {
 
-        ' for some reason half of the elements for deployment diagrams have a black border
-        ' instead of the default reddish
-		BorderColor #A80036
-
 		' make stereotypes less ugly
 		Stereotype {
 			Font {
@@ -133,10 +109,6 @@
 
 	Hexagon {
 
-        ' for some reason half of the elements for deployment diagrams have a black border
-        ' instead of the default reddish
-		BorderColor #A80036
-
 		' make stereotypes less ugly
 		Stereotype {
 			Font {
@@ -149,10 +121,6 @@
 
 	Node {
 
-        ' for some reason half of the elements for deployment diagrams have a black border
-        ' instead of the default reddish
-		BorderColor #A80036
-
 		' make stereotypes less ugly
 		Stereotype {
 			Font {
@@ -165,10 +133,6 @@
 
 	Package {
 
-        ' for some reason half of the elements for deployment diagrams have a black border
-        ' instead of the default reddish
-		BorderColor #A80036
-
 		' make stereotypes less ugly
 		Stereotype {
 			Font {
@@ -181,10 +145,6 @@
 
 	Rectangle {
 
-        ' for some reason half of the elements for deployment diagrams have a black border
-        ' instead of the default reddish
-		BorderColor #A80036
-
 		' make stereotypes less ugly
 		Stereotype {
 			Font {
@@ -197,10 +157,6 @@
 
 	Storage {
 
-        ' for some reason half of the elements for deployment diagrams have a black border
-        ' instead of the default reddish
-		BorderColor #A80036
-
 		' make stereotypes less ugly
 		Stereotype {
 			Font {