diff --git a/themes/puml-theme-aws-orange.puml b/themes/puml-theme-aws-orange.puml
index 52ae7915a..6acffafbf 100644
--- a/themes/puml-theme-aws-orange.puml
+++ b/themes/puml-theme-aws-orange.puml
@@ -105,6 +105,26 @@ skinparam useBetaStyle false
 !$SUCCESS_TEXT = $WHITE
 !$WARNING_TEXT = $WHITE
 !$DANGER_TEXT  = $WHITE
+!$PRIMARY_TEXT = $WHITE
+!$HEADER_TEXT  = $WHITE
+''
+!if ($PUML_OUTLINE == "true")
+	!$HEADER_TEXT  = $PRIMARY_TEXT
+	!$PRIMARY_TEXT = $PRIMARY_LIGHT
+	!$INFO_TEXT    = $INFO_LIGHT
+	!$WARNING_TEXT = $WARNING_LIGHT
+	!$DARK_BG      = $PUML_BGCOLOR
+	!$INFO_BG      = $PUML_BGCOLOR
+	!$DANGER_BG    = $PUML_BGCOLOR
+	!$WARNING_BG   = $PUML_BGCOLOR
+	!$SECONDARY_BG = $PUML_BGCOLOR
+!else
+	!$DARK_BG      = $DARK
+	!$INFO_BG      = $INFO
+	!$DANGER_BG    = $DANGER
+	!$WARNING_BG   = $WARNING
+	!$SECONDARY_BG = $SECONDARY
+!endif
 ''
 '' Called to make the text in the color of SUCCESS
 ''
@@ -154,24 +174,6 @@ skinparam useBetaStyle false
 	!endif
 !endprocedure
 ''
-!if ($PUML_OUTLINE == "true")
-	!$HEADER_TEXT  = $PRIMARY_TEXT
-	!$PRIMARY_TEXT = $PRIMARY_LIGHT
-	!$INFO_TEXT    = $INFO_LIGHT
-	!$WARNING_TEXT = $WARNING_LIGHT
-	!$DARK_BG      = $PUML_BGCOLOR
-	!$INFO_BG      = $PUML_BGCOLOR
-	!$DANGER_BG    = $PUML_BGCOLOR
-	!$WARNING_BG   = $PUML_BGCOLOR
-	!$SECONDARY_BG = $PUML_BGCOLOR
-!else
-	!$DARK_BG      = $DARK
-	!$INFO_BG      = $INFO
-	!$DANGER_BG    = $DANGER
-	!$WARNING_BG   = $WARNING
-	!$SECONDARY_BG = $SECONDARY
-!endif
-''
 '' HTTP Methods
 ''
 !_POST   = "<color #007a3e>POST</color>"
@@ -184,10 +186,11 @@ skinparam useBetaStyle false
 '' Style settings
 ''
 <style>
+mindmapDiagram {
   root {
-    BackgroundColor $BGCOLOR
+    BackgroundColor $PUML_BGCOLOR
     FontColor $PRIMARY_TEXT
-    HyperLinkColor $ORANGE
+    HyperLinkColor $INFO_BG
     LineColor $PRIMARY_DARK
     LineThickness 1
     Margin 10
@@ -197,7 +200,7 @@ skinparam useBetaStyle false
   node {
    Padding 15
    roundcorner 20
-   BackgroundColor $PRIMARY-$PRIMARY_DARK
+   BackgroundColor $PRIMARY_BG-$PRIMARY_DARK
   }
   caption {
     LineThickness 0
@@ -206,35 +209,36 @@ skinparam useBetaStyle false
     LineThickness 0
   }
   groupHeader {
-    BackgroundColor $SECONDARY
-    FontColor $INFO
+    BackgroundColor $SECONDARY_BG
+    FontColor $INFO_BG
     FontStyle bold
   }
   header {
     LineThickness 0
   }
   referenceHeader {
-    BackgroundColor $BGCOLOR
-    FontColor $DARK
+    BackgroundColor $PUML_BGCOLOR
+    FontColor $DARK_BG
     FontStyle bold
   }
   separator {
     BackgroundColor $FGCOLOR
-    FontColor $BGCOLOR
+    FontColor $PUML_BGCOLOR
     FontStyle bold
   }
   title {
 	FontSize 20
 	BorderRoundCorner            8
 	BorderThickness 	         1
-	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
-	FontColor $PRIMARY
-	BorderColor $SECONDARY
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY_BG
+	FontColor $PRIMARY_TEXT
+	BorderColor $SECONDARY_BG
   }
+}
 nwdiagDiagram {
   network {
     $primary_scheme()    
-    LineColor $PRIMARY
+    LineColor $PRIMARY_BG
     LineThickness 1.0
     FontColor $PRIMARY_DARK
   }
@@ -246,7 +250,7 @@ nwdiagDiagram {
     LineColor $PRIMARY_DARK
   }
   group {
-    BackGroundColor $LIGHT
+    BackGroundColor $LIGHT_BG
     LineColor $LIGHT_DARK
     LineThickness 2.0
     Margin 5
@@ -256,7 +260,7 @@ nwdiagDiagram {
 ganttDiagram {
   task {
     $primary_scheme()
-	LineColor $PRIMARY
+	LineColor $PRIMARY_BG
     Margin 10
     Padding 6
   }
@@ -266,19 +270,19 @@ ganttDiagram {
     BackGroundColor $INFO_BG
   }
   separator {
-	LineColor $SECONDARY
+	LineColor $SECONDARY_BG
     BackGroundColor $secondary_scheme()
     FontColor $SECONDARY_TEXT
   }
   milestone {
-	FontColor $INFO
-	FontSize 24
+	FontColor $INFO_BG
+	FontSize 16
 	FontStyle italic
 	BackGroundColor $DIAMOND_BG
 	LineColor $SECONDARY_DARK
   }
   timeline {
-    BackgroundColor $SECONDARY
+    BackgroundColor $SECONDARY_BG
     FontColor $SECONDARY_TEXT
   }
   closed {
diff --git a/themes/puml-theme-black-knight.puml b/themes/puml-theme-black-knight.puml
index c410bdc5a..921ce0c5d 100644
--- a/themes/puml-theme-black-knight.puml
+++ b/themes/puml-theme-black-knight.puml
@@ -198,7 +198,7 @@ skinparam  {
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-bluegray.puml b/themes/puml-theme-bluegray.puml
index d2dccb7ae..7fe12a9e4 100644
--- a/themes/puml-theme-bluegray.puml
+++ b/themes/puml-theme-bluegray.puml
@@ -163,7 +163,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-cerulean-outline.puml b/themes/puml-theme-cerulean-outline.puml
index 569bc3f2c..6a38ef533 100644
--- a/themes/puml-theme-cerulean-outline.puml
+++ b/themes/puml-theme-cerulean-outline.puml
@@ -169,7 +169,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-cerulean.puml b/themes/puml-theme-cerulean.puml
index 855977eac..842fa7397 100644
--- a/themes/puml-theme-cerulean.puml
+++ b/themes/puml-theme-cerulean.puml
@@ -173,7 +173,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-cyborg-outline.puml b/themes/puml-theme-cyborg-outline.puml
index 53ffcfb6d..2372376da 100644
--- a/themes/puml-theme-cyborg-outline.puml
+++ b/themes/puml-theme-cyborg-outline.puml
@@ -174,7 +174,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-cyborg.puml b/themes/puml-theme-cyborg.puml
index 9ed4781d5..7a66370cf 100644
--- a/themes/puml-theme-cyborg.puml
+++ b/themes/puml-theme-cyborg.puml
@@ -177,7 +177,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-hacker.puml b/themes/puml-theme-hacker.puml
index 71887e407..d7afd40ec 100644
--- a/themes/puml-theme-hacker.puml
+++ b/themes/puml-theme-hacker.puml
@@ -148,7 +148,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-lightgray.puml b/themes/puml-theme-lightgray.puml
index 0e1726189..0806c88f9 100644
--- a/themes/puml-theme-lightgray.puml
+++ b/themes/puml-theme-lightgray.puml
@@ -159,7 +159,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-materia-outline.puml b/themes/puml-theme-materia-outline.puml
index 043dbf90b..79db04a6f 100644
--- a/themes/puml-theme-materia-outline.puml
+++ b/themes/puml-theme-materia-outline.puml
@@ -169,7 +169,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-materia.puml b/themes/puml-theme-materia.puml
index bfebc8a09..7d9a2e5c1 100644
--- a/themes/puml-theme-materia.puml
+++ b/themes/puml-theme-materia.puml
@@ -171,7 +171,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-metal.puml b/themes/puml-theme-metal.puml
index acaf331d1..e8122f393 100644
--- a/themes/puml-theme-metal.puml
+++ b/themes/puml-theme-metal.puml
@@ -177,7 +177,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-minty.puml b/themes/puml-theme-minty.puml
index 8251cd871..2d40609e3 100644
--- a/themes/puml-theme-minty.puml
+++ b/themes/puml-theme-minty.puml
@@ -177,7 +177,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-sandstone.puml b/themes/puml-theme-sandstone.puml
index aa3611a65..008267e77 100644
--- a/themes/puml-theme-sandstone.puml
+++ b/themes/puml-theme-sandstone.puml
@@ -177,7 +177,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-silver.puml b/themes/puml-theme-silver.puml
index 9f8f590f3..3020e1a20 100644
--- a/themes/puml-theme-silver.puml
+++ b/themes/puml-theme-silver.puml
@@ -159,7 +159,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-sketchy-outline.puml b/themes/puml-theme-sketchy-outline.puml
index b79b53dd8..7cfdb8525 100644
--- a/themes/puml-theme-sketchy-outline.puml
+++ b/themes/puml-theme-sketchy-outline.puml
@@ -176,7 +176,7 @@ skinparam shadowing false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-sketchy.puml b/themes/puml-theme-sketchy.puml
index dcaa7afef..36486de3e 100644
--- a/themes/puml-theme-sketchy.puml
+++ b/themes/puml-theme-sketchy.puml
@@ -179,7 +179,7 @@ skinparam shadowing false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-spacelab.puml b/themes/puml-theme-spacelab.puml
index dd9f68b61..2af39b60e 100644
--- a/themes/puml-theme-spacelab.puml
+++ b/themes/puml-theme-spacelab.puml
@@ -177,7 +177,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-superhero-outline.puml b/themes/puml-theme-superhero-outline.puml
index cd4316e25..74ddc75d5 100644
--- a/themes/puml-theme-superhero-outline.puml
+++ b/themes/puml-theme-superhero-outline.puml
@@ -174,7 +174,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-superhero.puml b/themes/puml-theme-superhero.puml
index c90b6426b..f684b8e9a 100644
--- a/themes/puml-theme-superhero.puml
+++ b/themes/puml-theme-superhero.puml
@@ -177,7 +177,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK
diff --git a/themes/puml-theme-united.puml b/themes/puml-theme-united.puml
index d27064932..46dc5c8d8 100644
--- a/themes/puml-theme-united.puml
+++ b/themes/puml-theme-united.puml
@@ -177,7 +177,7 @@ skinparam useBetaStyle false
 	}
 	milestone {
 		FontColor $INFO
-		FontSize 24
+		FontSize 16
 		FontStyle italic
 		BackGroundColor $SECONDARY
 		LineColor $SECONDARY_DARK