diff --git a/themes/puml-theme-aws-orange.puml b/themes/puml-theme-aws-orange.puml
index c6f16193b..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
+	FontColor $INFO_BG
 	FontSize 16
 	FontStyle italic
 	BackGroundColor $DIAMOND_BG
 	LineColor $SECONDARY_DARK
   }
   timeline {
-    BackgroundColor $SECONDARY
+    BackgroundColor $SECONDARY_BG
     FontColor $SECONDARY_TEXT
   }
   closed {