diff --git a/C4_Component.puml b/C4_Component.puml
index e545fd3..2ae09f4 100644
--- a/C4_Component.puml
+++ b/C4_Component.puml
@@ -2,7 +2,7 @@
 !if %variable_exists("RELATIVE_INCLUDE")
   !include ./C4_Container.puml
 !else
-  !include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+  !include https://raw.githubusercontent.com/kirchsth/C4-PlantUML/feature/all_plantuml_elements/C4_Container.puml
 !endif
 
 ' Scope: A single container.
diff --git a/C4_Container.puml b/C4_Container.puml
index 8129fc7..e9a4c68 100644
--- a/C4_Container.puml
+++ b/C4_Container.puml
@@ -2,7 +2,7 @@
 !if %variable_exists("RELATIVE_INCLUDE")
   !include ./C4_Context.puml
 !else
-  !include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Context.puml
+  !include https://raw.githubusercontent.com/kirchsth/C4-PlantUML/feature/all_plantuml_elements/C4_Context.puml
 !endif
 
 ' Scope: A single software system.
diff --git a/C4_Context.puml b/C4_Context.puml
index 4fccc6a..34952cb 100644
--- a/C4_Context.puml
+++ b/C4_Context.puml
@@ -2,7 +2,7 @@
 !if %variable_exists("RELATIVE_INCLUDE")
   !include ./C4.puml
 !else
-  !include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4.puml
+  !include https://raw.githubusercontent.com/kirchsth/C4-PlantUML/feature/all_plantuml_elements/C4.puml
 !endif
 
 ' Scope: A single software system.
diff --git a/C4_Deployment.puml b/C4_Deployment.puml
index 20ed8b3..e0a3838 100644
--- a/C4_Deployment.puml
+++ b/C4_Deployment.puml
@@ -2,7 +2,7 @@
 !if %variable_exists("RELATIVE_INCLUDE")
   !include ./C4_Container.puml
 !else
-  !include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml
+  !include https://raw.githubusercontent.com/kirchsth/C4-PlantUML/feature/all_plantuml_elements/C4_Container.puml
 !endif
 
 ' Colors
diff --git a/C4_Dynamic.puml b/C4_Dynamic.puml
index f12cb86..f4980b3 100644
--- a/C4_Dynamic.puml
+++ b/C4_Dynamic.puml
@@ -2,7 +2,7 @@
 !if %variable_exists("RELATIVE_INCLUDE")
   !include ./C4_Component.puml
 !else
-  !include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Component.puml
+  !include https://raw.githubusercontent.com/kirchsth/C4-PlantUML/feature/all_plantuml_elements/C4_Component.puml
 !endif
 
 ' Scope: Interactions in an enterprise, software system or container.
diff --git a/C4_Sequence.puml b/C4_Sequence.puml
index 2da951c..a25bbea 100644
--- a/C4_Sequence.puml
+++ b/C4_Sequence.puml
@@ -2,7 +2,7 @@
 !if %variable_exists("RELATIVE_INCLUDE")
   !include ./C4_Component.puml
 !else
-  !include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Component.puml
+  !include https://raw.githubusercontent.com/kirchsth/C4-PlantUML/feature/all_plantuml_elements/C4_Component.puml
 !endif
 
 ' Scope: Interactions in an enterprise, software system or container.
diff --git a/percy/TestAllPlantUmlElements.puml b/percy/TestAllPlantUmlElements.puml
index 35b64d3..5be17e8 100644
--- a/percy/TestAllPlantUmlElements.puml
+++ b/percy/TestAllPlantUmlElements.puml
@@ -1,11 +1,15 @@
 @startuml
+
+' If UNLOCK_ALL_PLANT_ELEMENTS is set BEFORE the first C4_* file is loaded,
+' nearly "all" PlantUML elements can be used like
+'   Component(StorageA, "Storage A ", $plant="storage")
+!UNLOCK_ALL_PLANT_ELEMENTS = 1
+
 ' convert it with additional command line argument -DRELATIVE_INCLUDE="./.." to use locally
 !if %variable_exists("RELATIVE_INCLUDE")
-  !include %get_variable_value("RELATIVE_INCLUDE")/Unlock_All_Elements.puml
   !include %get_variable_value("RELATIVE_INCLUDE")/C4_Component.puml
 !else
-  !include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/Unlock_All_Elements.puml
-  !include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Component.puml
+  !include https://raw.githubusercontent.com/kirchsth/C4-PlantUML/feature/all_plantuml_elements/C4_Component.puml
 !endif
 
 ' !theme C4_united from <C4/themes>