diff --git a/themes/puml-theme-aws-orange.puml b/themes/puml-theme-aws-orange.puml
index 475fbebf3..52ae7915a 100644
--- a/themes/puml-theme-aws-orange.puml
+++ b/themes/puml-theme-aws-orange.puml
@@ -231,6 +231,7 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
+nwdiagDiagram {
   network {
     $primary_scheme()    
     LineColor $PRIMARY
@@ -251,6 +252,7 @@ skinparam useBetaStyle false
     Margin 5
     Padding 5
   }
+}
 ganttDiagram {
   task {
     $primary_scheme()
diff --git a/themes/puml-theme-black-knight.puml b/themes/puml-theme-black-knight.puml
index 4346f0dd0..c410bdc5a 100644
--- a/themes/puml-theme-black-knight.puml
+++ b/themes/puml-theme-black-knight.puml
@@ -157,25 +157,27 @@ skinparam  {
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_LIGHT
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_LIGHT
-    LineColor $PRIMARY_LIGHT
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_LIGHT
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_LIGHT
+		LineColor $PRIMARY_LIGHT
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-bluegray.puml b/themes/puml-theme-bluegray.puml
index 9722821e1..d2dccb7ae 100644
--- a/themes/puml-theme-bluegray.puml
+++ b/themes/puml-theme-bluegray.puml
@@ -122,25 +122,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_DARK
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_DARK
-    LineColor $PRIMARY_DARK
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_DARK
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_DARK
+		LineColor $PRIMARY_DARK
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-cerulean-outline.puml b/themes/puml-theme-cerulean-outline.puml
index 570901442..569bc3f2c 100644
--- a/themes/puml-theme-cerulean-outline.puml
+++ b/themes/puml-theme-cerulean-outline.puml
@@ -128,25 +128,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_DARK
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_DARK
-    LineColor $PRIMARY_DARK
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_DARK
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_DARK
+		LineColor $PRIMARY_DARK
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-cerulean.puml b/themes/puml-theme-cerulean.puml
index d328ac0cf..855977eac 100644
--- a/themes/puml-theme-cerulean.puml
+++ b/themes/puml-theme-cerulean.puml
@@ -132,25 +132,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_DARK
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_DARK
-    LineColor $PRIMARY_DARK
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_DARK
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_DARK
+		LineColor $PRIMARY_DARK
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-cyborg-outline.puml b/themes/puml-theme-cyborg-outline.puml
index 82615d4fe..53ffcfb6d 100644
--- a/themes/puml-theme-cyborg-outline.puml
+++ b/themes/puml-theme-cyborg-outline.puml
@@ -133,25 +133,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_LIGHT
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_LIGHT
-    LineColor $PRIMARY_LIGHT
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_LIGHT
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_LIGHT
+		LineColor $PRIMARY_LIGHT
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-cyborg.puml b/themes/puml-theme-cyborg.puml
index a0faa7556..9ed4781d5 100644
--- a/themes/puml-theme-cyborg.puml
+++ b/themes/puml-theme-cyborg.puml
@@ -136,25 +136,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_LIGHT
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_LIGHT
-    LineColor $PRIMARY_LIGHT
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_LIGHT
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_LIGHT
+		LineColor $PRIMARY_LIGHT
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-hacker.puml b/themes/puml-theme-hacker.puml
index 67364b661..71887e407 100644
--- a/themes/puml-theme-hacker.puml
+++ b/themes/puml-theme-hacker.puml
@@ -107,25 +107,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_LIGHT
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_LIGHT
-    LineColor $PRIMARY_LIGHT
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_LIGHT
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_LIGHT
+		LineColor $PRIMARY_LIGHT
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-lightgray.puml b/themes/puml-theme-lightgray.puml
index 4386799df..0e1726189 100644
--- a/themes/puml-theme-lightgray.puml
+++ b/themes/puml-theme-lightgray.puml
@@ -118,25 +118,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_DARK
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_DARK
-    LineColor $PRIMARY_DARK
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_DARK
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_DARK
+		LineColor $PRIMARY_DARK
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-materia-outline.puml b/themes/puml-theme-materia-outline.puml
index ed0facab8..043dbf90b 100644
--- a/themes/puml-theme-materia-outline.puml
+++ b/themes/puml-theme-materia-outline.puml
@@ -128,25 +128,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_DARK
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_DARK
-    LineColor $PRIMARY_DARK
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_DARK
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_DARK
+		LineColor $PRIMARY_DARK
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-materia.puml b/themes/puml-theme-materia.puml
index c3f9f7817..bfebc8a09 100644
--- a/themes/puml-theme-materia.puml
+++ b/themes/puml-theme-materia.puml
@@ -130,25 +130,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_DARK
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_DARK
-    LineColor $PRIMARY_DARK
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_DARK
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_DARK
+		LineColor $PRIMARY_DARK
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-metal.puml b/themes/puml-theme-metal.puml
index 1bb8f5dde..acaf331d1 100644
--- a/themes/puml-theme-metal.puml
+++ b/themes/puml-theme-metal.puml
@@ -136,25 +136,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_DARK
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_DARK
-    LineColor $PRIMARY_DARK
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_DARK
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_DARK
+		LineColor $PRIMARY_DARK
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-minty.puml b/themes/puml-theme-minty.puml
index fca700e04..8251cd871 100644
--- a/themes/puml-theme-minty.puml
+++ b/themes/puml-theme-minty.puml
@@ -136,25 +136,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_DARK
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_DARK
-    LineColor $PRIMARY_DARK
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_DARK
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_DARK
+		LineColor $PRIMARY_DARK
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-sandstone.puml b/themes/puml-theme-sandstone.puml
index 8fe6d609c..aa3611a65 100644
--- a/themes/puml-theme-sandstone.puml
+++ b/themes/puml-theme-sandstone.puml
@@ -136,25 +136,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_DARK
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_DARK
-    LineColor $PRIMARY_DARK
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_DARK
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_DARK
+		LineColor $PRIMARY_DARK
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-silver.puml b/themes/puml-theme-silver.puml
index 0083423df..9f8f590f3 100644
--- a/themes/puml-theme-silver.puml
+++ b/themes/puml-theme-silver.puml
@@ -118,25 +118,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_DARK
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_DARK
-    LineColor $PRIMARY_DARK
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_DARK
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_DARK
+		LineColor $PRIMARY_DARK
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-sketchy-outline.puml b/themes/puml-theme-sketchy-outline.puml
index f03c49a4c..b79b53dd8 100644
--- a/themes/puml-theme-sketchy-outline.puml
+++ b/themes/puml-theme-sketchy-outline.puml
@@ -135,25 +135,27 @@ skinparam shadowing false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_DARK
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_DARK
-    LineColor $PRIMARY_DARK
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_DARK
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_DARK
+		LineColor $PRIMARY_DARK
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-sketchy.puml b/themes/puml-theme-sketchy.puml
index 9878cff1e..dcaa7afef 100644
--- a/themes/puml-theme-sketchy.puml
+++ b/themes/puml-theme-sketchy.puml
@@ -138,25 +138,27 @@ skinparam shadowing false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_DARK
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_DARK
-    LineColor $PRIMARY_DARK
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_DARK
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_DARK
+		LineColor $PRIMARY_DARK
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-spacelab.puml b/themes/puml-theme-spacelab.puml
index 72daa7971..dd9f68b61 100644
--- a/themes/puml-theme-spacelab.puml
+++ b/themes/puml-theme-spacelab.puml
@@ -136,25 +136,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_DARK
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_DARK
-    LineColor $PRIMARY_DARK
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_DARK
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_DARK
+		LineColor $PRIMARY_DARK
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-superhero-outline.puml b/themes/puml-theme-superhero-outline.puml
index 2884d664a..cd4316e25 100644
--- a/themes/puml-theme-superhero-outline.puml
+++ b/themes/puml-theme-superhero-outline.puml
@@ -133,25 +133,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_LIGHT
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_LIGHT
-    LineColor $PRIMARY_LIGHT
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_LIGHT
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_LIGHT
+		LineColor $PRIMARY_LIGHT
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-superhero.puml b/themes/puml-theme-superhero.puml
index 7ac6cbd8b..c90b6426b 100644
--- a/themes/puml-theme-superhero.puml
+++ b/themes/puml-theme-superhero.puml
@@ -136,25 +136,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_LIGHT
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_LIGHT
-    LineColor $PRIMARY_LIGHT
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_LIGHT
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_LIGHT
+		LineColor $PRIMARY_LIGHT
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {
diff --git a/themes/puml-theme-united.puml b/themes/puml-theme-united.puml
index ebb830249..d27064932 100644
--- a/themes/puml-theme-united.puml
+++ b/themes/puml-theme-united.puml
@@ -136,25 +136,27 @@ skinparam useBetaStyle false
 	FontColor $PRIMARY
 	BorderColor $SECONDARY
   }
-  network {
-    $primary_scheme()    
-    LineColor $PRIMARY
-    LineThickness 1.0
-    FontColor $PRIMARY_DARK
-  }
-  server {
-    $primary_scheme()
-  }
-  arrow {
-    FontColor $PRIMARY_DARK
-    LineColor $PRIMARY_DARK
-  }
-  group {
-    BackGroundColor $LIGHT
-    LineColor $LIGHT_DARK
-    LineThickness 2.0
-    Margin 5
-    Padding 5
+  nwdiagDiagram {
+	network {
+		$primary_scheme()    
+		LineColor $PRIMARY
+		LineThickness 1.0
+		FontColor $PRIMARY_DARK
+	}
+	server {
+		$primary_scheme()
+	}
+	arrow {
+		FontColor $PRIMARY_DARK
+		LineColor $PRIMARY_DARK
+	}
+	group {
+		BackGroundColor $LIGHT
+		LineColor $LIGHT_DARK
+		LineThickness 2.0
+		Margin 5
+		Padding 5
+	}
   }
   ganttDiagram {
 	task {