diff --git a/plantuml/default-skin.ipu b/plantuml/default-skin.ipu
index 71d4d6d..856fdbd 100644
--- a/plantuml/default-skin.ipu
+++ b/plantuml/default-skin.ipu
@@ -1,3 +1,5 @@
+skin rose
+
 skinparam {
 
 	' use the strictuml style - no circles, no footboxes, no drop shadows, and proper arrows
@@ -6,26 +8,183 @@
 	' slightly rounded boxes
 	RoundCorner 8
 
-	' make PNGs transparent
-	BackgroundColor transparent
+	' transparent would be better, but seems to be problematic for some diagrams
+    ' (black background fill on some things)
+	BackgroundColor white
 
 	' slightly increase space around participants (currently has a bug with participant creation)
 	'ParticipantPadding 5
 
-	DefaultFontName Roboto Condensed
-	TitleFontName Open Sans
+	DefaultFontName "Open Sans"
+    DefaultFontStyle plain
+	TitleFontName "Open Sans"
 	TitleFontStyle bold
 	TitleFontSize 18
 
-	Database {
-		' the default border no longer matches the normal colors (bug?), so fix this
-		BorderColor #A80036
+	Artifact {
+
+		' make stereotypes less ugly
+		Stereotype {
+			Font {
+				Size 10
+				Style plain
+			}
+		}
+
 	}
 
+	Card {
+
+		' make stereotypes less ugly
+		Stereotype {
+			Font {
+				Size 10
+				Style plain
+			}
+		}
+
+	}
+
+	Cloud {
+
+		' make stereotypes less ugly
+		Stereotype {
+			Font {
+				Size 10
+				Style plain
+			}
+		}
+
+	}
+
+	Database {
+
+        ' 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 {
+			Font {
+				Size 10
+				Style plain
+			}
+		}
+
+	}
+
+	File {
+
+		' make stereotypes less ugly
+		Stereotype {
+			Font {
+				Size 10
+				Style plain
+			}
+		}
+
+	}
+
+	Folder {
+
+		' make stereotypes less ugly
+		Stereotype {
+			Font {
+				Size 10
+				Style plain
+			}
+		}
+
+	}
+
+	Frame {
+
+		' make stereotypes less ugly
+		Stereotype {
+			Font {
+				Size 10
+				Style plain
+			}
+		}
+
+	}
+
+	Hexagon {
+
+		' make stereotypes less ugly
+		Stereotype {
+			Font {
+				Size 10
+				Style plain
+			}
+		}
+
+	}
+
+	Node {
+
+		' make stereotypes less ugly
+		Stereotype {
+			Font {
+				Size 10
+				Style plain
+			}
+		}
+
+	}
+
+	Package {
+
+		' make stereotypes less ugly
+		Stereotype {
+			Font {
+				Size 10
+				Style plain
+			}
+		}
+
+	}
+
+	Rectangle {
+
+		' make stereotypes less ugly
+		Stereotype {
+			Font {
+				Size 10
+				Style plain
+			}
+		}
+
+	}
+
+	Storage {
+
+		' make stereotypes less ugly
+		Stereotype {
+			Font {
+				Size 10
+				Style plain
+			}
+		}
+
+	}
+
+    Usecase {
+
+		' make stereotypes less ugly
+		Stereotype {
+			Font {
+				Size 10
+				Style plain
+			}
+		}
+
+    }
+
 	Sequence {
 
 		' for some reason sequence diagrams are ignoring the default font, so set it explicitly
-		TitleFontName Open Sans
+		TitleFontName "Open Sans"
 		TitleFontStyle bold
 		TitleFontSize 18
 
@@ -48,7 +207,10 @@
 
 	Class {
 
+        FontStyle bold
+
 		' get rid of access modifier icons
+        ' use AttributeIconSize default to override this for ERDs
 		AttributeIconSize 0
 
 		' shrink message font size
@@ -64,4 +226,26 @@
 
 	}
 
+    Note {
+        FontSize 11
+        BackgroundColor LightGreen
+    }
+
+    State {
+
+        FontStyle bold
+
+		' shrink message font size
+		ArrowFontSize 10
+
+		' make stereotypes less ugly
+		Stereotype {
+			Font {
+				Size 10
+				Style plain
+			}
+		}
+
+    }
+
 }