diff --git a/themes/puml-theme-aws-orange.puml b/themes/puml-theme-aws-orange.puml
index 8be964c48..333fc153f 100644
--- a/themes/puml-theme-aws-orange.puml
+++ b/themes/puml-theme-aws-orange.puml
@@ -181,6 +181,58 @@ skinparam useBetaStyle false
 !_PATCH  = "<color #b5bd00>PATCH</color>"
 !_HEAD   = "<color #9012fe>HEAD</color>"
 ''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
+''
 '' Global Default Values
 ''
 skinparam defaultFontName       "Verdana"
diff --git a/themes/puml-theme-black-knight.puml b/themes/puml-theme-black-knight.puml
index dc90e2d3e..79461e638 100644
--- a/themes/puml-theme-black-knight.puml
+++ b/themes/puml-theme-black-knight.puml
@@ -106,7 +106,58 @@ skinparam  {
     TitleFontSize 18
     ' TitleFontColor $PRIMARY_TEXT
 }
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-bluegray.puml b/themes/puml-theme-bluegray.puml
index 7c579ed01..4780142de 100644
--- a/themes/puml-theme-bluegray.puml
+++ b/themes/puml-theme-bluegray.puml
@@ -71,7 +71,58 @@ skinparam useBetaStyle false
 	BorderColor $SECONDARY_DARK
 	BackgroundColor $WHITE-#fefefe
 !endprocedure
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-cerulean-outline.puml b/themes/puml-theme-cerulean-outline.puml
index 0847912ad..c241e92bb 100644
--- a/themes/puml-theme-cerulean-outline.puml
+++ b/themes/puml-theme-cerulean-outline.puml
@@ -77,7 +77,58 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY
 	BackgroundColor $BGCOLOR
 !endprocedure
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $BGCOLOR
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $BGCOLOR
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-cerulean.puml b/themes/puml-theme-cerulean.puml
index 776c564db..060f0d6fa 100644
--- a/themes/puml-theme-cerulean.puml
+++ b/themes/puml-theme-cerulean.puml
@@ -81,7 +81,58 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY
 	BackgroundColor $PRIMARY_LIGHT-$PRIMARY
 !endprocedure
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-cyborg-outline.puml b/themes/puml-theme-cyborg-outline.puml
index 0123499f3..1c348f63c 100644
--- a/themes/puml-theme-cyborg-outline.puml
+++ b/themes/puml-theme-cyborg-outline.puml
@@ -85,7 +85,55 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY_DARK
 	BackgroundColor $BGCOLOR
 !endprocedure
-
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $BGCOLOR
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $BGCOLOR
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-cyborg.puml b/themes/puml-theme-cyborg.puml
index f841958b6..da6ae4424 100644
--- a/themes/puml-theme-cyborg.puml
+++ b/themes/puml-theme-cyborg.puml
@@ -85,7 +85,58 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY_DARK
 	BackgroundColor $PRIMARY
 !endprocedure
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-hacker.puml b/themes/puml-theme-hacker.puml
index 5238a3298..e08b172af 100644
--- a/themes/puml-theme-hacker.puml
+++ b/themes/puml-theme-hacker.puml
@@ -56,7 +56,58 @@ skinparam useBetaStyle false
 	BackgroundColor $PRIMARY_LIGHT-$PRIMARY
 !endprocedure
 
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-lightgray.puml b/themes/puml-theme-lightgray.puml
index 0a211ecda..78ff68be1 100644
--- a/themes/puml-theme-lightgray.puml
+++ b/themes/puml-theme-lightgray.puml
@@ -67,7 +67,58 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY_LIGHT
 	BackgroundColor $PRIMARY_LIGHT-$PRIMARY
 !endprocedure
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-materia-outline.puml b/themes/puml-theme-materia-outline.puml
index cd5914061..444015d58 100644
--- a/themes/puml-theme-materia-outline.puml
+++ b/themes/puml-theme-materia-outline.puml
@@ -80,7 +80,55 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY
 	BackgroundColor $BGCOLOR
 !endprocedure
-
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $BGCOLOR
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $BGCOLOR
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-materia.puml b/themes/puml-theme-materia.puml
index 4f62eb088..4eec636a8 100644
--- a/themes/puml-theme-materia.puml
+++ b/themes/puml-theme-materia.puml
@@ -79,7 +79,58 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY
 	BackgroundColor $PRIMARY_LIGHT-$PRIMARY
 !endprocedure
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-metal.puml b/themes/puml-theme-metal.puml
index dfe32883a..ce0d4eeed 100644
--- a/themes/puml-theme-metal.puml
+++ b/themes/puml-theme-metal.puml
@@ -85,7 +85,58 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY_DARK
 	BackgroundColor $PRIMARY-$PRIMARY_DARK
 !endprocedure
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-minty.puml b/themes/puml-theme-minty.puml
index 6bb600ba1..53e990d90 100644
--- a/themes/puml-theme-minty.puml
+++ b/themes/puml-theme-minty.puml
@@ -85,7 +85,58 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY
 	BackgroundColor $PRIMARY_LIGHT
 !endprocedure
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-resume-light.puml b/themes/puml-theme-resume-light.puml
deleted file mode 100644
index 8592a7577..000000000
--- a/themes/puml-theme-resume-light.puml
+++ /dev/null
@@ -1,48 +0,0 @@
-''
-'' Author: Brett Schwarz
-'' 
-
-!$THEME = "resume-light"
-
-!if %not(%variable_exists("$BGCOLOR"))
-!$BGCOLOR = "transparent"
-!endif
-
-skinparam backgroundColor $BGCOLOR
-skinparam useBetaStyle false
-
-
-skinparam  {
-    skinparam defaultFontName   "Verdana"
-    skinparam defaultFontSize   12
-    defaultTextAlignment        center
-    shadowing                   false
-    RoundCorner                 10
-    TitleFontSize               18
-}
-<style>
-    wbsDiagram {
-        LineColor #f0f0f0
-        BorderThickness 3
-        BackgroundColor #f9f9f9
-        FontColor #6a9fb5
-        :depth(0) {
-            fontSize 16
-            fontStyle bold
-        }
-        :depth(1) {
-            fontSize 14
-            padding 5
-            fontStyle bold
-        }
-        :depth(2) {
-            fontSize 12
-            padding 3
-        }
-        :depth(3) {
-            fontSize 10
-            padding 2
-        }
-
-    }
-</style>
diff --git a/themes/puml-theme-sandstone.puml b/themes/puml-theme-sandstone.puml
index f72c8c4b2..f8137a416 100644
--- a/themes/puml-theme-sandstone.puml
+++ b/themes/puml-theme-sandstone.puml
@@ -85,7 +85,58 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY_DARK
 	BackgroundColor $PRIMARY
 !endprocedure
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-silver.puml b/themes/puml-theme-silver.puml
index 20a73c0c9..5fdbf7e73 100644
--- a/themes/puml-theme-silver.puml
+++ b/themes/puml-theme-silver.puml
@@ -67,7 +67,58 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY_LIGHT
 	BackgroundColor $PRIMARY-$PRIMARY_DARK
 !endprocedure
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-sketchy-outline.puml b/themes/puml-theme-sketchy-outline.puml
index e49d0d1b9..44e1e9c4a 100644
--- a/themes/puml-theme-sketchy-outline.puml
+++ b/themes/puml-theme-sketchy-outline.puml
@@ -87,7 +87,55 @@ skinparam shadowing false
 	BorderColor $PRIMARY
 	BackgroundColor $BGCOLOR
 !endprocedure
-
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $BGCOLOR
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $BGCOLOR
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-sketchy.puml b/themes/puml-theme-sketchy.puml
index 117a189ad..55433637d 100644
--- a/themes/puml-theme-sketchy.puml
+++ b/themes/puml-theme-sketchy.puml
@@ -87,7 +87,58 @@ skinparam shadowing false
 	BorderColor $PRIMARY
 	BackgroundColor $PRIMARY_LIGHT
 !endprocedure
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-spacelab.puml b/themes/puml-theme-spacelab.puml
index 6711d0379..fe4bfada0 100644
--- a/themes/puml-theme-spacelab.puml
+++ b/themes/puml-theme-spacelab.puml
@@ -85,7 +85,58 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY_DARK
 	BackgroundColor $PRIMARY_LIGHT-$PRIMARY_DARK
 !endprocedure
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-superhero-outline.puml b/themes/puml-theme-superhero-outline.puml
index ec9548d13..608a75871 100644
--- a/themes/puml-theme-superhero-outline.puml
+++ b/themes/puml-theme-superhero-outline.puml
@@ -85,7 +85,55 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY_DARK
 	BackgroundColor $BGCOLOR
 !endprocedure
-
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $BGCOLOR
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $BGCOLOR
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-superhero.puml b/themes/puml-theme-superhero.puml
index f63fb6e00..918450c4a 100644
--- a/themes/puml-theme-superhero.puml
+++ b/themes/puml-theme-superhero.puml
@@ -85,7 +85,58 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY_DARK
 	BackgroundColor $PRIMARY
 !endprocedure
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''
diff --git a/themes/puml-theme-united.puml b/themes/puml-theme-united.puml
index 4e518cd2d..8c9ac51a8 100644
--- a/themes/puml-theme-united.puml
+++ b/themes/puml-theme-united.puml
@@ -85,7 +85,58 @@ skinparam useBetaStyle false
 	BorderColor $PRIMARY_DARK
 	BackgroundColor $PRIMARY
 !endprocedure
-
+''
+'' Style settings
+''
+<style>
+  root {
+    BackgroundColor $BGCOLOR
+    FontColor $PRIMARY_TEXT
+    HyperLinkColor $ORANGE
+    LineColor $PRIMARY_DARK
+    LineThickness 1
+    Margin 10
+    Padding 6
+    Shadowing 0.0
+  }
+  node {
+   Padding 15
+   roundcorner 20
+   BackgroundColor $PRIMARY-$PRIMARY_DARK
+  }
+  caption {
+    LineThickness 0
+  }
+  footer {
+    LineThickness 0
+  }
+  groupHeader {
+    BackgroundColor $SECONDARY
+    FontColor $INFO
+    FontStyle bold
+  }
+  header {
+    LineThickness 0
+  }
+  referenceHeader {
+    BackgroundColor $BGCOLOR
+    FontColor $DARK
+    FontStyle bold
+  }
+  separator {
+    BackgroundColor $FGCOLOR
+    FontColor $BGCOLOR
+    FontStyle bold
+  }
+  title {
+	FontSize 20
+	BorderRoundCorner            8
+	BorderThickness 	         1
+	BackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	FontColor $PRIMARY
+	BorderColor $SECONDARY
+  }
+</style>
 ''
 '' Global Default Values
 ''