diff --git a/C4.puml b/C4.puml
index d28711a..654d07b 100644
--- a/C4.puml
+++ b/C4.puml
@@ -43,12 +43,12 @@ skinparam rectangle<<boundary>> {
 ' Layout
 ' ##################################
 
-!definelong LAYOUT_AS_SKETCH
+!procedure LAYOUT_AS_SKETCH()
 skinparam backgroundColor #EEEBDC
 skinparam handwritten true
 skinparam defaultFontName "Comic Sans MS"
 center footer <font color=red>Warning:</font> Created for discussion, needs to be validated
-!enddefinelong
+!endprocedure
 
 !define LAYOUT_TOP_DOWN top to bottom direction
 !define LAYOUT_LEFT_RIGHT left to right direction
diff --git a/C4_Component.puml b/C4_Component.puml
index 40a8a24..6317a1e 100644
--- a/C4_Component.puml
+++ b/C4_Component.puml
@@ -32,7 +32,7 @@ skinparam database<<component>> {
 ' Layout
 ' ##################################
 
-!definelong LAYOUT_WITH_LEGEND
+!procedure LAYOUT_WITH_LEGEND()
 hide stereotype
 legend right
 |=              |= Type |
@@ -43,7 +43,7 @@ legend right
 |<CONTAINER_BG_COLOR>   | container |
 |<COMPONENT_BG_COLOR>   | component |
 endlegend
-!enddefinelong
+!endprocedure
 
 ' Elements
 ' ##################################
diff --git a/C4_Container.puml b/C4_Container.puml
index 2bc697c..53b101d 100644
--- a/C4_Container.puml
+++ b/C4_Container.puml
@@ -32,7 +32,7 @@ skinparam database<<container>> {
 ' Layout
 ' ##################################
 
-!definelong LAYOUT_WITH_LEGEND
+!procedure LAYOUT_WITH_LEGEND()
 hide stereotype
 legend right
 |=              |= Type |
@@ -42,7 +42,7 @@ legend right
 |<EXTERNAL_SYSTEM_BG_COLOR>      | external system |
 |<CONTAINER_BG_COLOR>   | container |
 endlegend
-!enddefinelong
+!endprocedure
 
 ' Elements
 ' ##################################
diff --git a/C4_Context.puml b/C4_Context.puml
index a28a9cb..eda491a 100644
--- a/C4_Context.puml
+++ b/C4_Context.puml
@@ -63,7 +63,7 @@ skinparam database<<external_system>> {
 ' Layout
 ' ##################################
 
-!definelong LAYOUT_WITH_LEGEND
+!procedure LAYOUT_WITH_LEGEND()
 hide stereotype
 legend right
 |=              |= Type |
@@ -72,7 +72,7 @@ legend right
 |<SYSTEM_BG_COLOR>   | system |
 |<EXTERNAL_SYSTEM_BG_COLOR>      | external system |
 endlegend
-!enddefinelong
+!endprocedure
 
 ' Elements
 ' ##################################
diff --git a/LayoutOptions.md b/LayoutOptions.md
index c5b64b4..7e17e3e 100644
--- a/LayoutOptions.md
+++ b/LayoutOptions.md
@@ -15,7 +15,7 @@ With the two macros `LAYOUT_TOP_DOWN` and `LAYOUT_LEFT_RIGHT` it is possible to
 !includeurl https://raw.githubusercontent.com/RicardoNiepel/C4-PlantUML/master/C4_Container.puml
 
 /' Not needed because this is the default '/
-LAYOUT_TOP_DOWN
+LAYOUT_TOP_DOWN()
 
 Person(admin, "Administrator")
 System_Boundary(c1, 'Sample') {
@@ -36,7 +36,7 @@ Using `LAYOUT_LEFT_RIGHT`
 @startuml LAYOUT_LEFT_RIGHT Sample
 !includeurl https://raw.githubusercontent.com/RicardoNiepel/C4-PlantUML/master/C4_Container.puml
 
-LAYOUT_LEFT_RIGHT
+LAYOUT_LEFT_RIGHT()
 
 Person(admin, "Administrator")
 System_Boundary(c1, 'Sample') {
@@ -63,7 +63,7 @@ This can be enabled with `LAYOUT_WITH_LEGEND`.
 @startuml LAYOUT_WITH_LEGEND Sample
 !includeurl https://raw.githubusercontent.com/RicardoNiepel/C4-PlantUML/master/C4_Container.puml
 
-LAYOUT_WITH_LEGEND
+LAYOUT_WITH_LEGEND()
 
 Person(admin, "Administrator")
 System_Boundary(c1, 'Sample') {
@@ -96,7 +96,7 @@ With `LAYOUT_AS_SKETCH` you can make a difference.
 @startuml LAYOUT_AS_SKETCH Sample
 !includeurl https://raw.githubusercontent.com/RicardoNiepel/C4-PlantUML/master/C4_Container.puml
 
-LAYOUT_AS_SKETCH
+LAYOUT_AS_SKETCH()
 
 Person(admin, "Administrator")
 System_Boundary(c1, 'Sample') {
diff --git a/samples/C4_Component Diagram Sample - bigbankplc.puml b/samples/C4_Component Diagram Sample - bigbankplc.puml
index 491a725..4770af7 100644
--- a/samples/C4_Component Diagram Sample - bigbankplc.puml	
+++ b/samples/C4_Component Diagram Sample - bigbankplc.puml	
@@ -3,7 +3,7 @@
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Component.puml
 
-LAYOUT_WITH_LEGEND
+LAYOUT_WITH_LEGEND()
 
 title Component diagram for Internet Banking System - API Application
 
diff --git a/samples/C4_Container Diagram Sample - bigbankplc.puml b/samples/C4_Container Diagram Sample - bigbankplc.puml
index 56dccd9..2339004 100644
--- a/samples/C4_Container Diagram Sample - bigbankplc.puml	
+++ b/samples/C4_Container Diagram Sample - bigbankplc.puml	
@@ -3,9 +3,9 @@
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Container.puml
 
-LAYOUT_TOP_DOWN
-'LAYOUT_AS_SKETCH
-LAYOUT_WITH_LEGEND
+LAYOUT_TOP_DOWN()
+'LAYOUT_AS_SKETCH()
+LAYOUT_WITH_LEGEND()
 
 title Container diagram for Internet Banking System
 
diff --git a/samples/C4_Container Diagram Sample - message bus.puml b/samples/C4_Container Diagram Sample - message bus.puml
index d8485ff..5a0b789 100644
--- a/samples/C4_Container Diagram Sample - message bus.puml	
+++ b/samples/C4_Container Diagram Sample - message bus.puml	
@@ -6,9 +6,9 @@
 skinparam wrapWidth 200
 skinparam maxMessageSize 200
 
-LAYOUT_TOP_DOWN
-'LAYOUT_AS_SKETCH
-LAYOUT_WITH_LEGEND
+LAYOUT_TOP_DOWN()
+'LAYOUT_AS_SKETCH()
+LAYOUT_WITH_LEGEND()
 
 
 Person(customer, Customer, "A customer")
diff --git a/samples/C4_Container Diagram Sample - techtribesjs.puml b/samples/C4_Container Diagram Sample - techtribesjs.puml
index dbd0569..171031d 100644
--- a/samples/C4_Container Diagram Sample - techtribesjs.puml	
+++ b/samples/C4_Container Diagram Sample - techtribesjs.puml	
@@ -3,9 +3,9 @@
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Container.puml
 
-LAYOUT_TOP_DOWN
-'LAYOUT_AS_SKETCH
-LAYOUT_WITH_LEGEND
+LAYOUT_TOP_DOWN()
+'LAYOUT_AS_SKETCH()
+LAYOUT_WITH_LEGEND()
 
 
 Person_Ext(anonymous_user, "Anonymous User")
diff --git a/samples/C4_Context Diagram Sample - bigbankplc-landscape.puml b/samples/C4_Context Diagram Sample - bigbankplc-landscape.puml
index a4b3f4b..2625f11 100644
--- a/samples/C4_Context Diagram Sample - bigbankplc-landscape.puml	
+++ b/samples/C4_Context Diagram Sample - bigbankplc-landscape.puml	
@@ -3,9 +3,9 @@
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Context.puml
 
-'LAYOUT_TOP_DOWN
-'LAYOUT_AS_SKETCH
-LAYOUT_WITH_LEGEND
+'LAYOUT_TOP_DOWN()
+'LAYOUT_AS_SKETCH()
+LAYOUT_WITH_LEGEND()
 
 title System Landscape diagram for Big Bank plc
 
diff --git a/samples/C4_Context Diagram Sample - bigbankplc.puml b/samples/C4_Context Diagram Sample - bigbankplc.puml
index 70778cd..06469b1 100644
--- a/samples/C4_Context Diagram Sample - bigbankplc.puml	
+++ b/samples/C4_Context Diagram Sample - bigbankplc.puml	
@@ -3,7 +3,7 @@
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Context.puml
 
-LAYOUT_WITH_LEGEND
+LAYOUT_WITH_LEGEND()
 
 title System Context diagram for Internet Banking System
 
diff --git a/samples/C4_Context Diagram Sample - enterprise.puml b/samples/C4_Context Diagram Sample - enterprise.puml
index c58f636..67556ca 100644
--- a/samples/C4_Context Diagram Sample - enterprise.puml	
+++ b/samples/C4_Context Diagram Sample - enterprise.puml	
@@ -3,9 +3,9 @@
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Context.puml
 
-LAYOUT_TOP_DOWN
-'LAYOUT_AS_SKETCH
-LAYOUT_WITH_LEGEND
+LAYOUT_TOP_DOWN()
+'LAYOUT_AS_SKETCH()
+LAYOUT_WITH_LEGEND()
 
 Person(customer, "Customer", "A customer of Widgets Limited.")