diff --git a/.vscode/C4.code-snippets b/.vscode/C4.code-snippets
index 2bdb30c..44731eb 100644
--- a/.vscode/C4.code-snippets
+++ b/.vscode/C4.code-snippets
@@ -3,7 +3,7 @@
 		"scope": "plantuml",
 		"prefix": "Include C4 Context Diagram",
 		"body": [
-			"!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Context.puml"
+			"!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Context.puml"
 		],
 		"description": "Include C4 Context Diagram"
 	},
@@ -11,7 +11,7 @@
 		"scope": "plantuml",
 		"prefix": "Include C4 Container Diagram",
 		"body": [
-			"!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml"
+			"!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml"
 		],
 		"description": "Include C4 Container Diagram"
 	},
@@ -19,7 +19,7 @@
 		"scope": "plantuml",
 		"prefix": "Include C4 Component Diagram",
 		"body": [
-			"!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Component.puml"
+			"!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Component.puml"
 		],
 		"description": "Include C4 Component Diagram"
 	},
@@ -27,7 +27,7 @@
 		"scope": "plantuml",
 		"prefix": "Include C4 Deployment Diagram",
 		"body": [
-			"!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Deployment.puml"
+			"!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Deployment.puml"
 		],
 		"description": "Include C4 Deployment Diagram"
 	},
@@ -35,7 +35,7 @@
 		"scope": "plantuml",
 		"prefix": "Include C4 Dynamic Diagram",
 		"body": [
-			"!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Dynamic.puml"
+			"!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Dynamic.puml"
 		],
 		"description": "Include C4 Dynamic Diagram"
 	},
diff --git a/C4_Component.puml b/C4_Component.puml
index ef92391..fdbb4aa 100644
--- a/C4_Component.puml
+++ b/C4_Component.puml
@@ -1,4 +1,4 @@
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Container.puml
 
diff --git a/C4_Container.puml b/C4_Container.puml
index 996304f..9a7e2a4 100644
--- a/C4_Container.puml
+++ b/C4_Container.puml
@@ -1,4 +1,4 @@
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Context.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Context.puml
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Context.puml
 
diff --git a/C4_Context.puml b/C4_Context.puml
index d15e73a..d4b0225 100644
--- a/C4_Context.puml
+++ b/C4_Context.puml
@@ -1,4 +1,4 @@
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4.puml
 ' uncomment the following line and comment the first to use locally
 ' !include C4.puml
 
diff --git a/C4_Deployment.puml b/C4_Deployment.puml
index 7d65d84..6097bce 100644
--- a/C4_Deployment.puml
+++ b/C4_Deployment.puml
@@ -1,4 +1,4 @@
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Container.puml
 
diff --git a/C4_Dynamic.puml b/C4_Dynamic.puml
index b41eb63..91d0c1d 100644
--- a/C4_Dynamic.puml
+++ b/C4_Dynamic.puml
@@ -1,4 +1,4 @@
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Component.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Component.puml
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Component.puml
 
diff --git a/LayoutOptions.md b/LayoutOptions.md
index ec984e4..eeb1b7c 100644
--- a/LayoutOptions.md
+++ b/LayoutOptions.md
@@ -12,7 +12,7 @@ With the two macros `LAYOUT_TOP_DOWN()` and `LAYOUT_LEFT_RIGHT()` it is possible
 
 ```csharp
 @startuml LAYOUT_TOP_DOWN Sample
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 
 /' Not needed because this is the default '/
 LAYOUT_TOP_DOWN()
@@ -35,7 +35,7 @@ Using `LAYOUT_LEFT_RIGHT()`
 
 ```csharp
 @startuml LAYOUT_LEFT_RIGHT Sample
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 
 LAYOUT_LEFT_RIGHT()
 
@@ -63,7 +63,7 @@ This can be enabled with `LAYOUT_WITH_LEGEND()`.
 
 ```csharp
 @startuml LAYOUT_WITH_LEGEND Sample
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 
 LAYOUT_WITH_LEGEND()
 
@@ -97,7 +97,7 @@ With `LAYOUT_AS_SKETCH()` you can make a difference.
 
 ```csharp
 @startuml LAYOUT_AS_SKETCH Sample
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 
 LAYOUT_AS_SKETCH()
 
@@ -122,7 +122,7 @@ This can be enabled with `HIDE_STEREOTYPE()`.
 
 ```csharp
 @startuml HIDE_STEREOTYPE Sample
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 
 HIDE_STEREOTYPE()
 
diff --git a/README.md b/README.md
index 8cddaa4..b904f90 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Just remember to change the `!include` statements at the top of the files.
 If you want to use the always up-to-date version in this repo, use the following:
 
 ```c#
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 ```
 
 Now let's create a C4 Container diagram:
@@ -41,7 +41,7 @@ After you have included `C4_Container.puml` you can use the defined macro defini
 
 ```csharp
 @startuml C4_Elements
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 
 Person(personAlias, "Label", "Optional Description")
 Container(containerAlias, "Label", "Technology", "Optional Description")
@@ -59,7 +59,7 @@ Take a look a look at the following sample of a C4 Container Diagram:
 
 ```csharp
 @startuml Basic Sample
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 
 Person(admin, "Administrator")
 System_Boundary(c1, "Sample System") {
@@ -78,7 +78,7 @@ Entities can also be decorated with icons using the last parameter, for example:
 
 ```cs
 @startuml
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 
 !define DEVICONS https://raw.githubusercontent.com/tupadr3/plantuml-icon-font-sprites/master/devicons
 !define FONTAWESOME https://raw.githubusercontent.com/tupadr3/plantuml-icon-font-sprites/master/font-awesome-5
@@ -108,7 +108,7 @@ Rel_R(api, db, "Reads/Writes")
 Diagram types 
 
 * System Context & System Landscape diagrams
-  * Import: `!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Context.puml`
+  * Import: `!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Context.puml`
   * Macros: 
     * `Person(alias, label, ?description, ?sprite)`
     * `Person_Ext`
@@ -118,7 +118,7 @@ Diagram types
     * `Enterprise_Boundary(alias, label)`
     * `System_Boundary` 
 * Container diagram
-  * Import: `!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml`
+  * Import: `!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml`
   * Additional Macros: 
     * `Container(alias, label, technology, ?description, ?sprite)`
     * `ContainerDb`
@@ -128,7 +128,7 @@ Diagram types
     * `ContainerQueue_Ext`
     * `Container_Boundary(alias, label)`
 * Component diagram
-  * Import: `!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Component.puml`
+  * Import: `!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Component.puml`
   * Additional Macros: 
     * `Component(alias, label, technology, ?description, ?sprite)`
     * `ComponentDb`
@@ -137,13 +137,13 @@ Diagram types
     * `ComponentDb_Ext`
     * `ComponentQueue_Ext`
 * Dynamic diagram
-  * Import: `!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Dynamic.puml`
+  * Import: `!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Dynamic.puml`
   * Additional Macros: 
     * `RelIndex(index, from, to, label)`
     * `increment()`
     * `setIndex(number)`
 * Deployment diagram
-  * Import: `!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Deployment.puml`
+  * Import: `!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Deployment.puml`
   * Additional Macros: 
     * `Deployment_Node(alias, label, ?type)`
 
diff --git a/samples/C4_Component Diagram Sample - bigbankplc.puml b/samples/C4_Component Diagram Sample - bigbankplc.puml
index 8eea756..e40890e 100644
--- a/samples/C4_Component Diagram Sample - bigbankplc.puml	
+++ b/samples/C4_Component Diagram Sample - bigbankplc.puml	
@@ -1,5 +1,5 @@
 @startuml
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Component.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Component.puml
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Component.puml
 
diff --git a/samples/C4_Container Diagram Sample - bigbankplc-icons.puml b/samples/C4_Container Diagram Sample - bigbankplc-icons.puml
index e2fdc07..5c400ae 100644
--- a/samples/C4_Container Diagram Sample - bigbankplc-icons.puml	
+++ b/samples/C4_Container Diagram Sample - bigbankplc-icons.puml	
@@ -1,5 +1,5 @@
 @startuml
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 !define DEVICONS https://raw.githubusercontent.com/tupadr3/plantuml-icon-font-sprites/master/devicons
 !define FONTAWESOME https://raw.githubusercontent.com/tupadr3/plantuml-icon-font-sprites/master/font-awesome-5
 ' uncomment the following line and comment the first to use locally
diff --git a/samples/C4_Container Diagram Sample - bigbankplc.puml b/samples/C4_Container Diagram Sample - bigbankplc.puml
index 5affd26..de51381 100644
--- a/samples/C4_Container Diagram Sample - bigbankplc.puml	
+++ b/samples/C4_Container Diagram Sample - bigbankplc.puml	
@@ -1,5 +1,5 @@
 @startuml
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Container.puml
 
diff --git a/samples/C4_Container Diagram Sample - message bus.puml b/samples/C4_Container Diagram Sample - message bus.puml
index 5318f45..dd38e1c 100644
--- a/samples/C4_Container Diagram Sample - message bus.puml	
+++ b/samples/C4_Container Diagram Sample - message bus.puml	
@@ -1,5 +1,5 @@
 @startuml "messagebus"
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Container.puml
 
diff --git a/samples/C4_Container Diagram Sample - techtribesjs.puml b/samples/C4_Container Diagram Sample - techtribesjs.puml
index fcbc60a..1855a46 100644
--- a/samples/C4_Container Diagram Sample - techtribesjs.puml	
+++ b/samples/C4_Container Diagram Sample - techtribesjs.puml	
@@ -1,5 +1,5 @@
 @startuml "techtribesjs"
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Container.puml
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Container.puml
 
diff --git a/samples/C4_Context Diagram Sample - bigbankplc-landscape.puml b/samples/C4_Context Diagram Sample - bigbankplc-landscape.puml
index 5546bd8..0ea3c80 100644
--- a/samples/C4_Context Diagram Sample - bigbankplc-landscape.puml	
+++ b/samples/C4_Context Diagram Sample - bigbankplc-landscape.puml	
@@ -1,5 +1,5 @@
 @startuml
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Context.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Context.puml
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Context.puml
 
diff --git a/samples/C4_Context Diagram Sample - bigbankplc.puml b/samples/C4_Context Diagram Sample - bigbankplc.puml
index e5e12fb..3f053d5 100644
--- a/samples/C4_Context Diagram Sample - bigbankplc.puml	
+++ b/samples/C4_Context Diagram Sample - bigbankplc.puml	
@@ -1,5 +1,5 @@
 @startuml
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Context.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Context.puml
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Context.puml
 
diff --git a/samples/C4_Context Diagram Sample - enterprise.puml b/samples/C4_Context Diagram Sample - enterprise.puml
index 629bacd..57644c9 100644
--- a/samples/C4_Context Diagram Sample - enterprise.puml	
+++ b/samples/C4_Context Diagram Sample - enterprise.puml	
@@ -1,5 +1,5 @@
 @startuml "enterprise"
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Context.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Context.puml
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Context.puml
 
diff --git a/samples/C4_Deployment Diagram Sample - bigbankplc.puml b/samples/C4_Deployment Diagram Sample - bigbankplc.puml
index 087200b..9ae2998 100644
--- a/samples/C4_Deployment Diagram Sample - bigbankplc.puml	
+++ b/samples/C4_Deployment Diagram Sample - bigbankplc.puml	
@@ -1,5 +1,5 @@
 @startuml
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Deployment.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Deployment.puml
 ' uncomment the following line and comment the first to use locally
 ' !include C4_Deployment.puml
 
diff --git a/samples/C4_Dynamic Diagram Sample - bigbankplc.puml b/samples/C4_Dynamic Diagram Sample - bigbankplc.puml
index 4fbaafc..5db8d05 100644
--- a/samples/C4_Dynamic Diagram Sample - bigbankplc.puml	
+++ b/samples/C4_Dynamic Diagram Sample - bigbankplc.puml	
@@ -1,5 +1,5 @@
 @startuml
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Dynamic.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Dynamic.puml
 
 LAYOUT_WITH_LEGEND()
 
diff --git a/samples/C4_Dynamic Diagram Sample - message bus.puml b/samples/C4_Dynamic Diagram Sample - message bus.puml
index bf9bea6..d17b06d 100644
--- a/samples/C4_Dynamic Diagram Sample - message bus.puml	
+++ b/samples/C4_Dynamic Diagram Sample - message bus.puml	
@@ -1,5 +1,5 @@
 @startuml
-!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Dynamic.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/v2.0.0/C4_Dynamic.puml
 
 LAYOUT_TOP_DOWN()
 LAYOUT_WITH_LEGEND()