diff --git a/C4.puml b/C4.puml
index eeb21eb..5c1210d 100644
--- a/C4.puml
+++ b/C4.puml
@@ -50,13 +50,9 @@ skinparam defaultFontName "Comic Sans MS"
center footer Warning: Created for discussion, needs to be validated
!endfunction
-!function LAYOUT_TOP_DOWN()
-top to bottom direction
-!endfunction
+!function LAYOUT_TOP_DOWN() return top to bottom direction
-!function LAYOUT_LEFT_RIGHT()
-left to right direction
-!endfunction
+!function LAYOUT_LEFT_RIGHT() return left to right direction
' Boundaries
' ##################################
diff --git a/C4_Component.puml b/C4_Component.puml
index d645f95..f9164ba 100644
--- a/C4_Component.puml
+++ b/C4_Component.puml
@@ -36,11 +36,11 @@ skinparam database<> {
hide stereotype
legend right
|= |= Type |
-|<$PERSON_BG_COLOR> | person |
-|<$EXTERNAL_PERSON_BG_COLOR> | external person |
-|<$SYSTEM_BG_COLOR> | system |
-|<$EXTERNAL_SYSTEM_BG_COLOR> | external system |
-|<$CONTAINER_BG_COLOR> | container |
+| | person |
+| | external person |
+| | system |
+| | external system |
+| | container |
|<$COMPONENT_BG_COLOR> | component |
endlegend
!endfunction
diff --git a/C4_Container.puml b/C4_Container.puml
index 680c23e..4dff9d8 100644
--- a/C4_Container.puml
+++ b/C4_Container.puml
@@ -36,10 +36,10 @@ skinparam database<> {
hide stereotype
legend right
|= |= Type |
-|<$PERSON_BG_COLOR> | person |
-|<$EXTERNAL_PERSON_BG_COLOR> | external person |
-|<$SYSTEM_BG_COLOR> | system |
-|<$EXTERNAL_SYSTEM_BG_COLOR> | external system |
+| | person |
+| | external person |
+| | system |
+| | external system |
|<$CONTAINER_BG_COLOR> | container |
endlegend
!endfunction
diff --git a/LayoutOptions.md b/LayoutOptions.md
index 7890f12..69a0705 100644
--- a/LayoutOptions.md
+++ b/LayoutOptions.md
@@ -6,16 +6,16 @@ PlantUML uses [Graphviz](https://www.graphviz.org/) for his graph visualization.
For this reason, C4-PlantUML also comes with some layout options.
-## LAYOUT_TOP_DOWN() or LAYOUT_LEFT_RIGHT()
+## LAYOUT_TOP_DOWN or LAYOUT_LEFT_RIGHT
-With the two macros `LAYOUT_TOP_DOWN()` and `LAYOUT_LEFT_RIGHT()` it is possible to easily change the flow visualization of the diagram. `LAYOUT_TOP_DOWN()` is the default.
+With the two macros `LAYOUT_TOP_DOWN` and `LAYOUT_LEFT_RIGHT` it is possible to easily change the flow visualization of the diagram. `LAYOUT_TOP_DOWN` is the default.
```csharp
@startuml LAYOUT_TOP_DOWN Sample
!include 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') {
@@ -28,15 +28,15 @@ Rel(web_app, twitter, "Gets tweets from", "HTTPS")
@enduml
```
-
+
-Using `LAYOUT_LEFT_RIGHT()`
+Using `LAYOUT_LEFT_RIGHT`
```csharp
@startuml LAYOUT_LEFT_RIGHT Sample
!include https://raw.githubusercontent.com/RicardoNiepel/C4-PlantUML/master/C4_Container.puml
-LAYOUT_LEFT_RIGHT()
+LAYOUT_LEFT_RIGHT
Person(admin, "Administrator")
System_Boundary(c1, 'Sample') {
@@ -49,7 +49,7 @@ Rel(web_app, twitter, "Gets tweets from", "HTTPS")
@enduml
```
-
+
## LAYOUT_WITH_LEGEND()
diff --git a/README.md b/README.md
index fa437c2..08c7f08 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ It is possible to save them directly inside VS Code: [Creating your own snippets
C4-PlantUML also comes with some layout options to make it easy and reuseable to create nice and useful diagrams:
-* [LAYOUT_TOP_DOWN() or LAYOUT_LEFT_RIGHT()](LayoutOptions.md#layout_top_down-or-layout_left_right)
+* [LAYOUT_TOP_DOWN or LAYOUT_LEFT_RIGHT](LayoutOptions.md#layout_top_down-or-layout_left_right)
* [LAYOUT_WITH_LEGEND()](LayoutOptions.md#layout_with_legend)
* [LAYOUT_AS_SKETCH()](LayoutOptions.md#layout_as_sketch)
diff --git a/samples/C4_Container Diagram Sample - bigbankplc.puml b/samples/C4_Container Diagram Sample - bigbankplc.puml
index 066ea63..64b15d5 100644
--- a/samples/C4_Container Diagram Sample - bigbankplc.puml
+++ b/samples/C4_Container Diagram Sample - bigbankplc.puml
@@ -3,7 +3,7 @@
' uncomment the following line and comment the first to use locally
' !include C4_Container.puml
-LAYOUT_TOP_DOWN()
+LAYOUT_TOP_DOWN
'LAYOUT_AS_SKETCH()
LAYOUT_WITH_LEGEND()
diff --git a/samples/C4_Container Diagram Sample - message bus.puml b/samples/C4_Container Diagram Sample - message bus.puml
index 5b4100c..32aea14 100644
--- a/samples/C4_Container Diagram Sample - message bus.puml
+++ b/samples/C4_Container Diagram Sample - message bus.puml
@@ -6,7 +6,7 @@
skinparam wrapWidth 200
skinparam maxMessageSize 200
-LAYOUT_TOP_DOWN()
+LAYOUT_TOP_DOWN
'LAYOUT_AS_SKETCH()
LAYOUT_WITH_LEGEND()
diff --git a/samples/C4_Container Diagram Sample - techtribesjs.puml b/samples/C4_Container Diagram Sample - techtribesjs.puml
index a2a8c80..afc0498 100644
--- a/samples/C4_Container Diagram Sample - techtribesjs.puml
+++ b/samples/C4_Container Diagram Sample - techtribesjs.puml
@@ -3,7 +3,7 @@
' uncomment the following line and comment the first to use locally
' !include C4_Container.puml
-LAYOUT_TOP_DOWN()
+LAYOUT_TOP_DOWN
'LAYOUT_AS_SKETCH()
LAYOUT_WITH_LEGEND()
diff --git a/samples/C4_Context Diagram Sample - bigbankplc-landscape.puml b/samples/C4_Context Diagram Sample - bigbankplc-landscape.puml
index e29f8f5..bde9f0f 100644
--- a/samples/C4_Context Diagram Sample - bigbankplc-landscape.puml
+++ b/samples/C4_Context Diagram Sample - bigbankplc-landscape.puml
@@ -3,7 +3,7 @@
' uncomment the following line and comment the first to use locally
' !include C4_Context.puml
-'LAYOUT_TOP_DOWN()
+'LAYOUT_TOP_DOWN
'LAYOUT_AS_SKETCH()
LAYOUT_WITH_LEGEND()
diff --git a/samples/C4_Context Diagram Sample - enterprise.puml b/samples/C4_Context Diagram Sample - enterprise.puml
index c11da10..d68162b 100644
--- a/samples/C4_Context Diagram Sample - enterprise.puml
+++ b/samples/C4_Context Diagram Sample - enterprise.puml
@@ -3,7 +3,7 @@
' uncomment the following line and comment the first to use locally
' !include C4_Context.puml
-LAYOUT_TOP_DOWN()
+LAYOUT_TOP_DOWN
'LAYOUT_AS_SKETCH()
LAYOUT_WITH_LEGEND()